--- embedaddon/mpd/src/Makefile	2019/10/22 13:49:55	1.1.1.5
+++ embedaddon/mpd/src/Makefile	2023/09/27 11:08:00	1.1.1.6.2.1
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.1.1.5 2019/10/22 13:49:55 misho Exp $
+# $Id: Makefile,v 1.1.1.6.2.1 2023/09/27 11:08:00 misho Exp $
 #
 # Makefile for mpd, multi-link PPP daemon for FreeBSD
 #
@@ -11,18 +11,9 @@ PROG?=			mpd5
 PREFIX?=		/usr/local
 LOCALBASE?=		${PREFIX}
 BINDIR?=		${PREFIX}/sbin
-VERSION=		5.8
-
-.if defined(OSVERSION)
-.if ${OSVERSION} > 1100100
+VERSION=		5.9
+NOMAN=
 MK_MAN=			no
-.else
-NO_MAN=
-.endif
-.else
-MK_MAN=			no
-NO_MAN=
-.endif
 
 BINOWN!=		/usr/bin/id -n -u
 BINGRP!=		/usr/bin/id -n -g
@@ -56,7 +47,7 @@ ECP_DES=		yes
 USE_NG_BPF=		yes
 USE_NG_CAR=		yes
 USE_NG_DEFLATE=		yes
-USE_NG_IPACCT=		yes
+USE_NG_IPACCT?=		yes
 USE_NG_MPPC=		yes
 USE_NG_NAT=		yes
 USE_NG_NETFLOW=		yes
@@ -69,6 +60,7 @@ USE_TCP_WRAP=		yes
 #USE_AUTH_OPIE=		yes
 USE_AUTH_PAM=		yes
 USE_AUTH_SYSTEM=	yes
+USE_RADIUS?=		yes
 
 # Build without builtin web server.
 #NOWEB=			yes
@@ -117,10 +109,23 @@ CFLAGS+=	-DUSE_SYSTEM
 LDADD+=		-lnetgraph -lutil
 DPADD+=		${LIBNETGRAPH}
 
+.if defined ( USE_RADIUS ) && ( ${USE_RADIUS} == yes )
 LDADD+=		-L/usr/lib -lradius
 DPADD+=		${LIBRADIUS}
+.endif
 
+# Obtained from bsd.port.mk
+.if !defined ( OSVERSION )
+OSVERSION!=	awk '/^\#define[[:blank:]]__FreeBSD_version/ {print $$3}' < /usr/include/sys/param.h
+.endif
+
+.sinclude "/etc/src.conf"
+
+.if ${OSVERSION} < 1200084 || defined ( WITHOUT_REPRODUCIBLE_BUILD )
 MPD_VERSION!=	echo -n "${VERSION} (`id -un`@`uname -n` `LC_TIME=C date +'%R %v'`)"
+.else
+MPD_VERSION!=	echo -n "${VERSION}"
+.endif
 
 CFLAGS+=	-DPATH_CONF_DIR='"${MPD_CONF_DIR}"'
 CFLAGS+=	-DMPD_VERSION='"${MPD_VERSION}"'
@@ -145,14 +150,20 @@ CFLAGS+=	-DMPD_VENDOR='"${MPD_VENDOR}"'
 CFLAGS+=	-DSYSLOG_FACILITY='"${SYSLOG_FACILITY}"'
 .endif
 
+CFLAGS+=	-DOPENSSL_API_COMPAT=10100
+
 # Standard sources
 
 STDSRCS=        assert.c auth.c bund.c rep.c ccp.c chap.c \
 		console.c command.c ecp.c event.c fsm.c iface.c input.c \
 		ip.c ipcp.c ipv6cp.c lcp.c link.c log.c main.c mbuf.c mp.c \
-		msg.c ngfunc.c pap.c phys.c proto.c radius.c radsrv.c timer.c \
-		util.c vars.c eap.c msoft.c ippool.c
+		msg.c ngfunc.c pap.c phys.c proto.c timer.c \
+		util.c vars.c msoft.c ippool.c
 
+.if defined ( USE_RADIUS ) && ( ${USE_RADIUS} == yes )
+STDSRCS+=	eap.c radius.c radsrv.c
+.endif
+
 .if defined ( NOWEB )
 CFLAGS+=	-DNOWEB
 .else
@@ -160,7 +171,7 @@ STDSRCS+=	web.c
 LDADD+=		-lssl
 .endif
 
-CFLAGS+=	-DNOLIBPDEL -I./contrib/libpdel
+CFLAGS+=	-DNOLIBPDEL -I. -I./contrib/libpdel
 PDPATH1=	contrib/libpdel/util:contrib/libpdel/structs
 PDPATH2=	contrib/libpdel/structs/type
 .if defined ( NOWEB )
@@ -273,7 +284,7 @@ DPADD+=		${LIBPCAP}
 .if defined ( USE_NG_CAR )
 CFLAGS+=	-DUSE_NG_CAR
 .endif
-.if defined ( USE_NG_IPACCT )
+.if defined ( USE_NG_IPACCT ) && ( ${USE_NG_IPACCT} == yes )
 CFLAGS+=	-DUSE_NG_IPACCT -nostdinc -I/usr/include -I${LOCALBASE}/include
 .endif
 .if defined ( USE_NG_NAT )