--- embedaddon/mpd/src/Makefile	2019/10/22 13:49:55	1.1.1.5
+++ embedaddon/mpd/src/Makefile	2021/03/17 00:39:23	1.1.1.6
@@ -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 2021/03/17 00:39:23 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
@@ -120,7 +111,18 @@ DPADD+=		${LIBNETGRAPH}
 LDADD+=		-L/usr/lib -lradius
 DPADD+=		${LIBRADIUS}
 
+# 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}"'
@@ -160,7 +162,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 +275,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 )