- Add LDFLAGS to CONFIGURE_ENV and MAKE_ENV (as it was done with LDFLAGS)

- Fix all ports that add {CPP,LD}FLAGS to *_ENV to modify flags instead

PR:		157936
Submitted by:	myself
Exp-runs by:	pav
Approved by:	pav

30 files changed, 38 insertions, 44 deletions

diff --git a/comms/anyremote/Makefile b/comms/anyremote/Makefile
index 33fe1d9e3a88..07b1b0ce9ff4 100644
--- a/comms/anyremote/Makefile
+++ b/comms/anyremote/Makefile
@@ -15,8 +15,8 @@ COMMENT=	Remote control service over Bluetooth, infrared or tcp/ip networking
 
 USE_GNOME=	glib20
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 LICENSE=	GPLv2
 
diff --git a/comms/bforce/Makefile b/comms/bforce/Makefile
index 77a887d7d8f4..536f17348fe3 100644
--- a/comms/bforce/Makefile
+++ b/comms/bforce/Makefile
@@ -17,7 +17,7 @@ COMMENT=	Simple ifcico like Fidonet technology mailer
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CFLAGS="${CFLAGS} -fno-builtin"
+CFLAGS+=	-fno-builtin
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/source
 SUB_FILES=	pkg-message
diff --git a/comms/dfu-programmer/Makefile b/comms/dfu-programmer/Makefile
index f7b12b9899bc..3d34308a45b0 100644
--- a/comms/dfu-programmer/Makefile
+++ b/comms/dfu-programmer/Makefile
@@ -14,7 +14,8 @@ MAINTAINER=	elbarto@ArcadeBSD.org
 COMMENT=	Device Firmware Update based USB programmer for Atmel chips
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 MAKE_JOBS_SAFE=	yes
 
 PLIST_FILES=	bin/dfu-programmer
diff --git a/comms/efax-gtk/Makefile b/comms/efax-gtk/Makefile
index 25ce6693b523..98fd21ac5a18 100644
--- a/comms/efax-gtk/Makefile
+++ b/comms/efax-gtk/Makefile
@@ -33,7 +33,6 @@ CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
 LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 
 CONFIGURE_ARGS+=	--with-gtk-version=gtk2
-CONFIGURE_ENV+=		LDFLAGS="${LDFLAGS}"
 
 .if defined(WITHOUT_NLS)
 CONFIGURE_ARGS+=--disable-nls
diff --git a/comms/ghfaxviewer/Makefile b/comms/ghfaxviewer/Makefile
index 6b304e91249c..1635111e2521 100644
--- a/comms/ghfaxviewer/Makefile
+++ b/comms/ghfaxviewer/Makefile
@@ -20,8 +20,8 @@ LIB_DEPENDS=	tiff.4:${PORTSDIR}/graphics/tiff
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack gconf gnomeprint
 USE_AUTOTOOLS=	libtool
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 MAN1=	halifax.1 ghfaxviewer.1
 
diff --git a/comms/gmfsk/Makefile b/comms/gmfsk/Makefile
index 836954861f6f..b544498199c8 100644
--- a/comms/gmfsk/Makefile
+++ b/comms/gmfsk/Makefile
@@ -19,8 +19,8 @@ LIB_DEPENDS=	fftw.2:${PORTSDIR}/math/fftw
 GNU_CONFIGURE=	yes
 # This is pure evil but it looks like autoconf 2.53 has a bug in linking the
 # preprocessor include tests.  The following line is a work around.
-CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib" \
-		CPPFLAGS="-I${LOCALBASE}/include"
+CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
 USE_GMAKE=	yes
 USE_GNOME=	libgnomeui gnomehack gnomeprefix
 INSTALLS_OMF=	yes
diff --git a/comms/gnocky/Makefile b/comms/gnocky/Makefile
index e57e3d246765..4b021568cff6 100644
--- a/comms/gnocky/Makefile
+++ b/comms/gnocky/Makefile
@@ -19,8 +19,8 @@ LIB_DEPENDS=	gnokii.7:${PORTSDIR}/comms/gnokii
 USE_BZIP2=	yes
 USE_GNOME=	gtk20 libglade2
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 OPTIONS=	NLS	"Build with Native Language Support"	on
 
diff --git a/comms/gnokii/Makefile b/comms/gnokii/Makefile
index 062b75cb4f98..3209b57de209 100644
--- a/comms/gnokii/Makefile
+++ b/comms/gnokii/Makefile
@@ -31,14 +31,14 @@ MAKE_JOBS_SAFE=	yes
 WANT_GNOME=	yes
 USE_GNOME=	intltool
 GNU_CONFIGURE=	yes
-CPPFLAGS=	${CFLAGS} -I${LOCALBASE}/include -fPIC
+CPPFLAGS+=	${CFLAGS} -I${LOCALBASE}/include -fPIC
 CONFIGURE_ARGS+=	--with-libintl-prefix=${LOCALBASE} --enable-security \
 			--with-xgnokiidir=${PREFIX}/share
 CONFIGURE_ENV+=	MSGFMT="${LOCALBASE}/bin/msgfmt" \
 		XGETTEXT="${LOCALBASE}/bin/xgettext" \
-		LDFLAGS="-L${LOCALBASE}/lib" \
 		LIBS="-L${WRKSRC}/common -L${LOCALBASE}/lib" \
 		PKG_CONFIG="${LOCALBASE}/bin/pkg-config"
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 SUB_FILES+=	pkg-message
 PORTDOCS=	*
diff --git a/comms/gnuradio/Makefile b/comms/gnuradio/Makefile
index 87302e8cba80..e61af00fa1da 100644
--- a/comms/gnuradio/Makefile
+++ b/comms/gnuradio/Makefile
@@ -40,8 +40,8 @@ USE_PERL5=	yes
 USE_AUTOTOOLS=	autoconf libtool
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 CONFIGURE_ARGS=	--with-boost-include-dir="${LOCALBASE}/include/" \
 		--enable-grc \
diff --git a/comms/gsmlib/Makefile b/comms/gsmlib/Makefile
index cd18a4966e1b..972de6a56626 100644
--- a/comms/gsmlib/Makefile
+++ b/comms/gsmlib/Makefile
@@ -21,7 +21,6 @@ COMMENT=	A library to access GSM mobile phones through GSM modems
 USE_GNOME=	lthack
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
-CONFIGURE_ENV=	LDFLAGS="${LDFLAGS}"
 USE_LDCONFIG=	yes
 
 MAN1=	gsmctl.1 gsmpb.1 gsmsendsms.1 gsmsmsstore.1
diff --git a/comms/hamlib/Makefile b/comms/hamlib/Makefile
index 63fde84e76c2..f97352724056 100644
--- a/comms/hamlib/Makefile
+++ b/comms/hamlib/Makefile
@@ -21,7 +21,8 @@ USE_TCL=	yes
 USE_PYTHON=	yes
 USE_AUTOTOOLS=	autoconf libtool libltdl
 USE_LDCONFIG=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
 CONFIGURE_ARGS=	--with-perl-binding \
 		--enable-tcl-binding --with-tcl=${TCL_LIBDIR} \
 		--with-python-binding --without-rigmatrix
diff --git a/comms/kpsk/Makefile b/comms/kpsk/Makefile
index df406228ff0c..18ec28b37942 100644
--- a/comms/kpsk/Makefile
+++ b/comms/kpsk/Makefile
@@ -19,8 +19,7 @@ USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_KDELIBS_VER=3
 USE_AUTOTOOLS=	libtool
-CONFIGURE_ENV=	CPPFLAGS="-D_POSIX_C_SOURCE -I${LOCALBASE}/include" \
-		USER_LDFLAGS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" USER_LDFLAGS="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS=	--enable-debug=full
 
 post-patch:
diff --git a/comms/libimobiledevice/Makefile b/comms/libimobiledevice/Makefile
index aa1b95caaeba..2202386ed4d1 100644
--- a/comms/libimobiledevice/Makefile
+++ b/comms/libimobiledevice/Makefile
@@ -25,7 +25,7 @@ LIB_DEPENDS=	gnutls.47:${PORTSDIR}/security/gnutls \
 USE_BZIP2=	yes
 USE_GNOME=	glib20
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib"
+LDFLAGS+=	-L${LOCALBASE}/lib
 MAKE_JOBS_SAFE=	yes
 CFLAGS+=	-I${LOCALBASE}/include
 USE_LDCONFIG=	yes
diff --git a/comms/libticables/Makefile b/comms/libticables/Makefile
index f01ea81289ec..6bf54a51c152 100644
--- a/comms/libticables/Makefile
+++ b/comms/libticables/Makefile
@@ -14,7 +14,8 @@ MASTER_SITES=		SF/tilp/OldFiles
 MAINTAINER=	tijl@coosemans.org
 COMMENT=	TI calculator link cables library
 
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 USE_GETTEXT=	yes
 USE_GNOME=	gnomehack pkgconfig
 USE_AUTOTOOLS=	libtool
diff --git a/comms/libticables2/Makefile b/comms/libticables2/Makefile
index fe3ed98c342e..bd425d00d3cf 100644
--- a/comms/libticables2/Makefile
+++ b/comms/libticables2/Makefile
@@ -30,7 +30,6 @@ PLIST_SUB=	NLS="@comment "
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
-CONFIGURE_ENV=	LDFLAGS="${LDFLAGS}"
 
 .include <bsd.port.pre.mk>
 
diff --git a/comms/libticalcs2/Makefile b/comms/libticalcs2/Makefile
index 806bc72f123b..2069c0fc9d94 100644
--- a/comms/libticalcs2/Makefile
+++ b/comms/libticalcs2/Makefile
@@ -33,6 +33,5 @@ PLIST_SUB=	NLS="@comment "
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
-CONFIGURE_ENV=	LDFLAGS="${LDFLAGS}"
 
 .include <bsd.port.mk>
diff --git a/comms/linpsk/Makefile b/comms/linpsk/Makefile
index 2c48bc6b655f..00739dfc3d47 100644
--- a/comms/linpsk/Makefile
+++ b/comms/linpsk/Makefile
@@ -25,7 +25,6 @@ GNU_CONFIGURE=	yes
 
 CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
 LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--with-qtdir=${LOCALBASE} --prefix=${PREFIX}
 
 SUB_FILES=	pkg-message
diff --git a/comms/linrad/Makefile b/comms/linrad/Makefile
index 961512241425..63ac54486b71 100644
--- a/comms/linrad/Makefile
+++ b/comms/linrad/Makefile
@@ -23,8 +23,8 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-0${PORTVERSION}
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--prefix=${PREFIX} --sysconfdir=${PREFIX}
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 USE_GMAKE=	yes
 USE_BZIP2=	yes
 ALL_TARGET=	xlinrad
diff --git a/comms/lirc/Makefile b/comms/lirc/Makefile
index 353e5908ddb6..3ba8eaf07df8 100644
--- a/comms/lirc/Makefile
+++ b/comms/lirc/Makefile
@@ -33,7 +33,6 @@ CONFIGURE_ARGS=		--enable-sandboxed --with-devdir=/var/run/lirc \
 			--sysconfdir=${PREFIX}/etc
 CPPFLAGS+=		-I${LOCALBASE}/include
 LDFLAGS+=		-L${LOCALBASE}/lib
-CONFIGURE_ENV+=		LDFLAGS="${LDFLAGS}"
 
 OPTIONS=	MINIMAL "Build with minmal dependencies" Off \
 		DEBUG "Build debug version" Off
diff --git a/comms/nokryptia/Makefile b/comms/nokryptia/Makefile
index 90338cce6039..dc560313a10b 100644
--- a/comms/nokryptia/Makefile
+++ b/comms/nokryptia/Makefile
@@ -18,7 +18,8 @@ LIB_DEPENDS=	id3-3.8.3:${PORTSDIR}/audio/id3lib
 
 GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
 
 MAN1=		nokryptia.1
 PLIST_FILES=	bin/nokryptia
diff --git a/comms/py-lirc/Makefile b/comms/py-lirc/Makefile
index a2ad7f696abd..3347ce6043f5 100644
--- a/comms/py-lirc/Makefile
+++ b/comms/py-lirc/Makefile
@@ -21,7 +21,6 @@ LIB_DEPENDS=	lirc_client.2:${PORTSDIR}/comms/lirc
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-MAKE_ENV=	LDFLAGS="${LDFLAGS}"
 PLIST_FILES=	%%PYTHON_SITELIBDIR%%/pylircmodule.so
 
 USE_PYTHON=	yes
diff --git a/comms/scmxx/Makefile b/comms/scmxx/Makefile
index 6f6d1915a27f..b6e56bc14a87 100644
--- a/comms/scmxx/Makefile
+++ b/comms/scmxx/Makefile
@@ -19,9 +19,9 @@ USE_GMAKE=	yes
 USE_ICONV=	yes
 USE_GETTEXT=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		CFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CFLAGS+=	-I${LOCALBASE}/include
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 MAN1=		scmxx.1
 MANLANG=	"" ru de it
diff --git a/comms/spandsp/Makefile b/comms/spandsp/Makefile
index 5642bbc1b19e..113d6c9e4809 100644
--- a/comms/spandsp/Makefile
+++ b/comms/spandsp/Makefile
@@ -21,8 +21,8 @@ GNU_CONFIGURE=	yes
 USE_AUTOTOOLS=	libtool
 USE_GMAKE=	yes
 
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/comms/tcpser/Makefile b/comms/tcpser/Makefile
index 6209a5421314..52d4dbb8a8ca 100644
--- a/comms/tcpser/Makefile
+++ b/comms/tcpser/Makefile
@@ -16,7 +16,7 @@ COMMENT=	TCPSER turns serial port into an emulated Hayes compatible modem
 WRKSRC=		${WRKDIR}/tcpser
 USE_GMAKE=	yes
 CFLAGS+=	${PTHREAD_CFLAGS}
-MAKE_ENV+=	LDFLAGS=${PTHREAD_LIBS}
+LDFLAGS+=	${PTHREAD_LIBS}
 PORTDOCS=	README CHANGES
 PLIST_FILES=	bin/tcpser
 
diff --git a/comms/tilp2/Makefile b/comms/tilp2/Makefile
index f84a44565494..d1e81811e7ff 100644
--- a/comms/tilp2/Makefile
+++ b/comms/tilp2/Makefile
@@ -35,7 +35,6 @@ PLIST_SUB=	NLS="@comment "
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS+=	--without-kde
-CONFIGURE_ENV=	LDFLAGS="${LDFLAGS}"
 
 MAN1=	tilp.1
 
diff --git a/comms/tlf/Makefile b/comms/tlf/Makefile
index 95129f809f05..b3986ce42c1a 100644
--- a/comms/tlf/Makefile
+++ b/comms/tlf/Makefile
@@ -22,7 +22,7 @@ USE_AUTOTOOLS=	autoconf libtool aclocal automake
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--includedir="${LOCALBASE}/include" \
 		--libdir="${LOCALBASE}/lib"
-CONFIGURE_ENV=	LDFLAGS="${PTHREAD_LIBS}"
+LDFLAGS+=	${PTHREAD_LIBS}
 OPTIONS=	HAMLIB "Use hamlib" ON
 
 MAN1=		tlf.1
diff --git a/comms/trustedqsl/Makefile b/comms/trustedqsl/Makefile
index 7415ea64ecd9..dd1165fe3033 100644
--- a/comms/trustedqsl/Makefile
+++ b/comms/trustedqsl/Makefile
@@ -20,7 +20,8 @@ LIB_DEPENDS=	expat.6:${PORTSDIR}/textproc/expat2
 USE_PERL5=	yes
 USE_WX=		2.6
 USE_LDCONFIG=	yes
-MAKE_ENV=	INCDIR="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
+MAKE_ENV=	INCDIR="-I${LOCALBASE}/include"
+LDFLAGS+=	-L${LOCALBASE}/lib
 MAKE_JOBS_UNSAFE=	yes
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
diff --git a/comms/wsjt/Makefile b/comms/wsjt/Makefile
index d3ba4d8cf8c6..6c1473eb3f3a 100644
--- a/comms/wsjt/Makefile
+++ b/comms/wsjt/Makefile
@@ -31,8 +31,8 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-gfortran --prefix=${LOCALBASE} \
 		--with-portaudio-include-dir=${LOCALBASE}/include/portaudio2 \
 		--with-portaudio-lib-dir=${LOCALBASE}/lib/portaudio2
-CONFIGURE_ENV=	CFLAGS+="-I${LOCALBASE}/include" \
-		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
+CFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 USE_PYTHON=	2.5+
 USE_AUTOTOOLS=	libtool
 PLIST_SUB=	PYVER=${PYTHON_VERSION:S/python//} \
diff --git a/comms/wspr/Makefile b/comms/wspr/Makefile
index 3332f04d11ed..b9a382f83192 100644
--- a/comms/wspr/Makefile
+++ b/comms/wspr/Makefile
@@ -33,8 +33,8 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-gfortran --prefix=${LOCALBASE} \
 		--with-portaudio-include-dir=${LOCALBASE}/include/portaudio2 \
 		--with-portaudio-lib-dir=${LOCALBASE}/lib/portaudio2
-CONFIGURE_ENV=	CFLAGS+="-I${LOCALBASE}/include" \
-		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
+CFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 USE_PYTHON=	2.5+
 USE_AUTOTOOLS=	libtool
 PLIST_SUB=	PYVER=${PYTHON_VERSION:S/python//} \
diff --git a/comms/xnecview/Makefile b/comms/xnecview/Makefile
index d2b2fb12e6f6..443f03174179 100644
--- a/comms/xnecview/Makefile
+++ b/comms/xnecview/Makefile
@@ -20,8 +20,6 @@ RUN_DEPENDS=	nec2c:${PORTSDIR}/comms/nec2c
 USE_GNOME=	gtk20
 USE_GMAKE=	yes
 
-MAKE_ENV=	LDFLAGS="${LDFLAGS}"
-
 MAN1=		xnecview.1
 PLIST_FILES=	bin/xnecview