--- embedaddon/mpd/src/Makefile	2013/07/22 08:44:29	1.1.1.2
+++ embedaddon/mpd/src/Makefile	2016/11/01 09:56:12	1.1.1.3
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.1.1.2 2013/07/22 08:44:29 misho Exp $
+# $Id: Makefile,v 1.1.1.3 2016/11/01 09:56:12 misho Exp $
 #
 # Makefile for mpd, multi-link PPP daemon for FreeBSD
 #
@@ -10,10 +10,12 @@
 PROG?=			mpd5
 PREFIX?=		/usr/local
 BINDIR?=		${PREFIX}/sbin
-VERSION=		5.7
+VERSION=		5.8
 NOMAN=
 NO_MAN=
 
+BINOWN!=		/usr/bin/id -n -u
+BINGRP!=		/usr/bin/id -n -g
 
 # Default configuration directory
 
@@ -78,7 +80,7 @@ COPTS+=			-DPROTO_NAME_LIST
 
 # Compiler & linker flags
 
-.if defined ( USE_TCP_WRAP )
+.if exists ( /usr/lib/libwrap.so ) && defined ( USE_TCP_WRAP )
 ## filter TCP accept connections
 LDADD+=		-lwrap
 DPADD+=		${LIBWRAP}
@@ -92,7 +94,7 @@ DPADD+=		${LIBOPIE}
 COPTS+=		-DUSE_OPIE
 .endif
 
-.if defined ( USE_AUTH_PAM )
+.if exists ( /usr/lib/libpam.so ) && defined ( USE_AUTH_PAM )
 LDADD+=		-lpam
 DPADD+=		${LIBPAM}
 COPTS+=		-DUSE_PAM
@@ -117,12 +119,10 @@ LDADD+=		-L${PREFIX}/lib
 LDADD+=		-lpdel
 LDADD+=		-lexpat
 .endif
-LDADD+=		-lssl
 
 MPD_VERSION!=	echo -n "${VERSION} (`id -un`@`uname -n` `LC_TIME=C date +'%R %v'`)"
 
-COPTS+=		-DPATH_CONF_DIR=\"${MPD_CONF_DIR}\"
-COPTS+=		-DSYSLOG_FACILITY=${SYSLOG_FACILITY}
+COPTS+=		-DPATH_CONF_DIR='"${MPD_CONF_DIR}"'
 COPTS+=		-DMPD_VERSION='"${MPD_VERSION}"'
 COPTS+=		-g
 COPTS+=		-Wall \
@@ -139,9 +139,13 @@ COPTS+=		-Wall \
 		-I${PREFIX}/include
 
 .if defined ( MPD_VENDOR )
-COPTS+=		'-DMPD_VENDOR="${MPD_VENDOR}"'
+COPTS+=		-DMPD_VENDOR='"${MPD_VENDOR}"'
 .endif
 
+.if defined ( SYSLOG_FACILITY )
+COPTS+=		-DSYSLOG_FACILITY='"${SYSLOG_FACILITY}"'
+.endif
+
 # Standard sources
 
 STDSRCS=        assert.c auth.c bund.c rep.c ccp.c chap.c \
@@ -154,6 +158,7 @@ STDSRCS=        assert.c auth.c bund.c rep.c ccp.c cha
 COPTS+=		-DNOWEB
 .else
 STDSRCS+=	web.c
+LDADD+=		-lssl
 .endif
 
 .if defined ( NOLIBPDEL )
@@ -295,12 +300,17 @@ COPTS+=         -DUSE_FETCH
 LDADD+=		-lfetch
 DPADD+=		${LIBFETCH}
 .endif
+.if defined ( SMALL_SYSTEM )
+COPTS+=         -DSMALL_SYSTEM
+.endif
 
 # Add in required support files and libraries
-
-.if defined ( NEED_DES )
 LDADD+=		-lcrypto
 DPADD+=		${LIBCRYPTO}
+
+.if exists ( /usr/lib/libexecinfo.so )
+LDADD+=		-lexecinfo
+COPTS+=		-DUSE_BACKTRACE
 .endif
 
 # Now add standard sources