14 files changed, 29 insertions, 30 deletions

diff --git a/net-mgmt/ap-utils/Makefile b/net-mgmt/ap-utils/Makefile
index 823d45d24a82..2a348e469736 100644
--- a/net-mgmt/ap-utils/Makefile
+++ b/net-mgmt/ap-utils/Makefile
@@ -12,9 +12,8 @@ COMMENT=	Set of utilities to configure and monitor wireless access points
 
 GNU_CONFIGURE=	yes
 USES=		iconv tar:bzip2
-CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib"
 CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-lintl -L${LOCALBASE}/lib
+LIBS+=		-L${LOCALBASE}/lib -lintl
 
 OPTIONS_DEFINE=	DOCS NLS
 OPTIONS_SUB=	yes
diff --git a/net-mgmt/bwm-ng/Makefile b/net-mgmt/bwm-ng/Makefile
index 25400a6e391e..68373a710160 100644
--- a/net-mgmt/bwm-ng/Makefile
+++ b/net-mgmt/bwm-ng/Makefile
@@ -14,10 +14,11 @@ LIB_DEPENDS=	libstatgrab.so:${PORTSDIR}/devel/libstatgrab
 
 GNU_CONFIGURE=	yes
 USES=		pkgconfig
+USE_CSTD=	gnu89
 PLIST_FILES=	bin/bwm-ng man/man1/bwm-ng.1.gz
 
-CONFIGURE_ENV=	CPPFLAGS="-std=gnu89 `pkg-config --cflags libstatgrab`" \
-		LIBS="`pkg-config --libs libstatgrab`"
 CONFIGURE_ARGS=	--with-libstatgrab
+CPPFLAGS+=	`pkg-config --cflags libstatgrab`
+LIBS+=		`pkg-config --libs libstatgrab`
 
 .include <bsd.port.mk>
diff --git a/net-mgmt/collectd/Makefile b/net-mgmt/collectd/Makefile
index a261d1186e1e..ba1704cff427 100644
--- a/net-mgmt/collectd/Makefile
+++ b/net-mgmt/collectd/Makefile
@@ -61,7 +61,7 @@ USE_LDCONFIG=	yes
 CONFLICTS=	collectd-5.[0-9]*
 
 CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
+LIBS+=		-L${LOCALBASE}/lib
 
 .include <bsd.port.options.mk>
 
@@ -249,7 +249,7 @@ USES+=		pkgconfig
 CONFIGURE_ARGS+=--enable-interface
 LIB_DEPENDS+=	libstatgrab.so:${PORTSDIR}/devel/libstatgrab
 PLIST_SUB+=	INTERFACE=""
-CONFIGURE_ENV+=	LIBS="`pkg-config --libs libstatgrab`"
+LIBS+=		`pkg-config --libs libstatgrab`
 .else
 CONFIGURE_ARGS+=--disable-interface
 PLIST_SUB+=	INTERFACE="@comment "
diff --git a/net-mgmt/collectd5/Makefile b/net-mgmt/collectd5/Makefile
index 29ab37ed766e..4a8d2ce6b6bb 100644
--- a/net-mgmt/collectd5/Makefile
+++ b/net-mgmt/collectd5/Makefile
@@ -65,7 +65,7 @@ USE_LDCONFIG=	yes
 CONFLICTS=	collectd-4.[0-9]*
 
 CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
+LIBS+=		-L${LOCALBASE}/lib
 
 PLIST_SUB+=	RESETPREFIX=${PREFIX}
 
@@ -212,7 +212,7 @@ PLIST_SUB+=	DBI="@comment "
 .if ${PORT_OPTIONS:MGCRYPT}
 LIB_DEPENDS+=	libgcrypt.so:${PORTSDIR}/security/libgcrypt
 CONFIGURE_ARGS+=--with-libgcrypt=${LOCALBASE}
-LDFLAGS+=	-lgcrypt
+LIBS+=		-lgcrypt
 .else
 CONFIGURE_ARGS+=--without-libgcrypt
 .endif
@@ -384,7 +384,7 @@ PLIST_SUB+=	RRDTOOL="@comment "
 .if ${PORT_OPTIONS:MSTATGRAB}
 USES+=		pkgconfig
 LIB_DEPENDS+=	libstatgrab.so:${PORTSDIR}/devel/libstatgrab
-CONFIGURE_ENV+=	LIBS="`pkg-config --libs libstatgrab`"
+LIBS+=		`pkg-config --libs libstatgrab`
 CONFIGURE_ARGS+=--with-libstatgrab=${LOCALBASE} \
 		--enable-disk \
 		--enable-interface
diff --git a/net-mgmt/disco/Makefile b/net-mgmt/disco/Makefile
index 665ab46cf7c2..68f5804a98bb 100644
--- a/net-mgmt/disco/Makefile
+++ b/net-mgmt/disco/Makefile
@@ -11,8 +11,8 @@ MAINTAINER=	jadawin@FreeBSD.org
 COMMENT=	IP discovery and fingerprinting utility
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib"
 CPPFLAGS+=	-I${LOCALBASE}/include
+LIBS+=		-L${LOCALBASE}/lib
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
diff --git a/net-mgmt/flow-extract/Makefile b/net-mgmt/flow-extract/Makefile
index efc847a18b0a..8657bce1caef 100644
--- a/net-mgmt/flow-extract/Makefile
+++ b/net-mgmt/flow-extract/Makefile
@@ -16,12 +16,12 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 BUILD_DEPENDS=	${LOCALBASE}/include/ftlib.h:${PORTSDIR}/net-mgmt/flow-tools
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
-MAKE_ARGS=	CC="${CC}" CFLAGS="${CFLAGS}" LIBS="${LDFLAGS}"
+MAKE_ARGS=	CC="${CC}" CFLAGS="${CFLAGS}" LIBS="${LIBS}"
 
 PLIST_FILES=	bin/flow-extract man/man1/${PORTNAME}.1.gz
 
 CFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	${LOCALBASE}/lib/libft.a -lz
+LIBS+=		${LOCALBASE}/lib/libft.a -lz
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/flow-extract ${STAGEDIR}${PREFIX}/bin
diff --git a/net-mgmt/icinga/Makefile b/net-mgmt/icinga/Makefile
index a0aad834ef7c..706eb4e8b18b 100644
--- a/net-mgmt/icinga/Makefile
+++ b/net-mgmt/icinga/Makefile
@@ -31,8 +31,8 @@ ICINGAWWWDIR?=	www/icinga
 ICINGAHTMURL?=	/icinga
 ICINGACGIURL?=	${ICINGAHTMURL}/cgi-bin
 
-CPPFLAGS+=	-I${LOCALBASE}/include -fPIC
-CFLAGS+=	${CPPFLAGS}
+CPPFLAGS+=	-I${LOCALBASE}/include
+LIBS+=		-L${LOCALBASE}/lib
 
 CONFIGURE_ARGS=	--with-command-user=${ICINGAUSER} \
 		--with-command-group=${WWWGRP} \
@@ -53,8 +53,7 @@ CONFIGURE_ARGS=	--with-command-user=${ICINGAUSER} \
 		--enable-event-broker \
 		--enable-nanosleep
 
-CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib" \
-		PERL=${PERL} \
+CONFIGURE_ENV=	PERL=${PERL} \
 		HOME=${WRKDIR} # prevent creation of .rnd file
 
 INSTALL_TARGET=	install install-config install-eventhandlers install-webconf
diff --git a/net-mgmt/nagios/Makefile b/net-mgmt/nagios/Makefile
index 47b658efd31a..5770d40a4e3e 100644
--- a/net-mgmt/nagios/Makefile
+++ b/net-mgmt/nagios/Makefile
@@ -41,11 +41,11 @@ CONFIGURE_ARGS=	--with-command-user=${NAGIOSUSER} \
 		--with-httpd-conf=${PREFIX}/etc \
 		--with-checkresult-dir=${NAGIOSDIR}/checkresults \
 		--disable-statuswrl
-CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib" \
-		PERL=${PERL}
+CONFIGURE_ENV=	PERL=${PERL}
 
-CPPFLAGS+=	-I${LOCALBASE}/include -fPIC
+CPPFLAGS+=	-I${LOCALBASE}/include
 CFLAGS+=	${CPPFLAGS}
+LIBS+=		-L${LOCALBASE}/lib
 
 MAKE_JOBS_UNSAFE=	yes
 
diff --git a/net-mgmt/nagios4/Makefile b/net-mgmt/nagios4/Makefile
index bb19a877b218..433267f98338 100644
--- a/net-mgmt/nagios4/Makefile
+++ b/net-mgmt/nagios4/Makefile
@@ -39,11 +39,11 @@ CONFIGURE_ARGS=	--with-command-user=${NAGIOSUSER} \
 		--with-checkresult-dir=${NAGIOSDIR}/checkresults \
 		--disable-statuswrl \
 		--enable-event-broker
-CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib" \
-		PERL=${PERL}
+CONFIGURE_ENV=	PERL=${PERL}
 
-CPPFLAGS+=	-I${LOCALBASE}/include -fPIC
+CPPFLAGS+=	-I${LOCALBASE}/include
 CFLAGS+=	${CPPFLAGS}
+LIBS+=		-L${LOCALBASE}/lib
 
 INSTALL_TARGET=	install install-commandmode install-config
 PLIST_SUB=	NAGIOSDIR=${NAGIOSDIR} \
diff --git a/net-mgmt/nbtscan/Makefile b/net-mgmt/nbtscan/Makefile
index ebb6a5e05809..19d16909ba02 100644
--- a/net-mgmt/nbtscan/Makefile
+++ b/net-mgmt/nbtscan/Makefile
@@ -14,8 +14,8 @@ COMMENT=	NetBIOS name network scanner
 
 GNU_CONFIGURE=	yes
 
-CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib"
 CPPFLAGS+=	-I${LOCALBASE}/include
+LIBS+=		-L${LOCALBASE}/lib
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}a
 ALL_TARGET=	nbtscan
diff --git a/net-mgmt/nefu/Makefile b/net-mgmt/nefu/Makefile
index 036dcca604ab..cb160a218bbd 100644
--- a/net-mgmt/nefu/Makefile
+++ b/net-mgmt/nefu/Makefile
@@ -14,11 +14,11 @@ COMMENT=	A network monitoring daemon
 USE_RC_SUBR=	nefu
 GNU_CONFIGURE=		yes
 MAKE_JOBS_UNSAFE=	yes
-CONFIGURE_ENV=		LIBS="-L${LOCALBASE}/lib" \
-			YACC=${YACC} \
+CONFIGURE_ENV=		YACC=${YACC} \
 			OPENSSL_CFLAGS="-I${OPENSSLINC}" \
 			OPENSSL_LIBS="-L${OPENSSLLIB} -lcrypto -lssl"
 CPPFLAGS+=		-I${LOCALBASE}/include
+LIBS+=			-L${LOCALBASE}/lib
 CONFIGURE_ARGS+=	--with-ssl=${OPENSSLBASE} \
 			--without-sasl \
 			--without-zlib \
diff --git a/net-mgmt/rate/Makefile b/net-mgmt/rate/Makefile
index 4c06318ea5ca..2314b37dec11 100644
--- a/net-mgmt/rate/Makefile
+++ b/net-mgmt/rate/Makefile
@@ -7,9 +7,9 @@ CATEGORIES=	net-mgmt
 MASTER_SITES=	http://s-tech.elsat.net.pl/bmtools/
 
 MAINTAINER=	mich@FreeBSD.org
-COMMENT=	A traffic analysis command-line utility
+COMMENT=	Traffic analysis command-line utility
 
-MAKE_ARGS=	${MAKE_ENV}
+MAKE_ARGS=	CC="${CC}" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
 LDFLAGS+=	-lcompat
 CFLAGS+=	-DOPEN_BSD=1 -DHAVE_REGEX -DSTREAM_ANALYZER -DIOCTL_GETWINSIZE -DAUTOSENSE_DLH
 
diff --git a/net-mgmt/sing/Makefile b/net-mgmt/sing/Makefile
index 2cc3343c357d..45c781cfe2c6 100644
--- a/net-mgmt/sing/Makefile
+++ b/net-mgmt/sing/Makefile
@@ -18,9 +18,9 @@ BUILD_DEPENDS=	${LIBNET_CONFIG}:${PORTSDIR}/net/libnet10
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--with-libpcap-prefix=/usr
-CONFIGURE_ENV=	LIBS="`${LIBNET_CONFIG} --libs`"
 CPPFLAGS+=	`${LIBNET_CONFIG} --defines` \
 		`${LIBNET_CONFIG} --cflags`
+LIBS+=		`${LIBNET_CONFIG} --libs`
 PLIST_FILES=	sbin/sing \
 		man/man8/sing.8.gz
 
diff --git a/net-mgmt/snmp4nagios/Makefile b/net-mgmt/snmp4nagios/Makefile
index cb340e37ca32..23b0bb6a548d 100644
--- a/net-mgmt/snmp4nagios/Makefile
+++ b/net-mgmt/snmp4nagios/Makefile
@@ -33,8 +33,8 @@ CONFIGURE_ARGS=	--sbindir=${PREFIX}/${NAGIOSWWWDIR}/cgi-bin \
 		--with-pngdir=${NAGIOSDIR}/snmp4nagios/png \
 		--prefix=${PREFIX}
 
-CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib"
-CFLAGS+=	-I${LOCALBASE}/include
+CPPFLAGS+=	-I${LOCALBASE}/include
+LIBS+=		-L${LOCALBASE}/lib
 
 .include <bsd.port.pre.mk>