- 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

14 files changed, 21 insertions, 29 deletions

diff --git a/x11-fm/FSViewer/Makefile b/x11-fm/FSViewer/Makefile
index 9435ba207f4b..5c0d0c5b4166 100644
--- a/x11-fm/FSViewer/Makefile
+++ b/x11-fm/FSViewer/Makefile
@@ -23,10 +23,9 @@ LIB_DEPENDS=	wraster.4:${PORTSDIR}/x11-wm/windowmaker
 USE_XORG=	x11 xmu
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 
-CPPFLAGS=	`pkg-config --cflags WINGs`
-LDFLAGS=	`pkg-config --libs WINGs`
+CPPFLAGS+=	`pkg-config --cflags WINGs`
+LDFLAGS+=	`pkg-config --libs WINGs`
 
 post-install:
 	${MKDIR} ${PREFIX}/share/doc/FSViewer
diff --git a/x11-fm/dfm/Makefile b/x11-fm/dfm/Makefile
index e1b5f6a7d700..13d291a715f5 100644
--- a/x11-fm/dfm/Makefile
+++ b/x11-fm/dfm/Makefile
@@ -19,8 +19,8 @@ WRKSRC=		${WRKDIR}/${PORTNAME}
 USE_XORG=	xpm
 USE_GNOME=	imlib
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
 CONFIGURE_ARGS=	--enable-imlib-icons
 
 MAN1=		dfm.1x
diff --git a/x11-fm/emelfm2/Makefile b/x11-fm/emelfm2/Makefile
index 84adae9dca7a..f2a0d0627bac 100644
--- a/x11-fm/emelfm2/Makefile
+++ b/x11-fm/emelfm2/Makefile
@@ -21,7 +21,7 @@ INSTALL_TARGET=	install
 
 CFLAGS+=	${PTHREAD_CFLAGS}
 LDFLAGS+=	${PTHREAD_LIBS}
-MAKE_ENV=	LDFLAGS="${LDFLAGS}" DOC_DIR="${DOCSDIR}/" MAN_DIR="${MAN1PREFIX}/man/man1"
+MAKE_ENV=	DOC_DIR="${DOCSDIR}/" MAN_DIR="${MAN1PREFIX}/man/man1"
 MAN1=		emelfm2.1
 
 OPTIONS=	DEBUG	"Enable debugging messages" off \
diff --git a/x11-fm/fsv/Makefile b/x11-fm/fsv/Makefile
index dfd8a108e08e..66416f837c50 100644
--- a/x11-fm/fsv/Makefile
+++ b/x11-fm/fsv/Makefile
@@ -21,10 +21,9 @@ USE_GL=		gl
 USE_GNOME=	gtk12
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-GL-prefix=${LOCALBASE}/lib
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 
-CPPFLAGS=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
+CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 
 post-extract:
 	-@${RM} ${WRKSRC}/lib/getopt*
diff --git a/x11-fm/gentoo/Makefile b/x11-fm/gentoo/Makefile
index f37492ff5f1f..9ee078282a29 100644
--- a/x11-fm/gentoo/Makefile
+++ b/x11-fm/gentoo/Makefile
@@ -19,13 +19,12 @@ OPTIONS=	FAM "File Alteration Monitor Support" off
 USE_GNOME=	gnomehack gtk20
 USE_GETTEXT=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \
-		MKDIR_P="${MKDIR}"
+CONFIGURE_ENV=	MKDIR_P="${MKDIR}"
 
 MAN1=		gentoo.1
 
-CPPFLAGS=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .include <bsd.port.pre.mk>
 
diff --git a/x11-fm/gnome-commander2/Makefile b/x11-fm/gnome-commander2/Makefile
index f0c6e8ca01d0..12e876e4aae8 100644
--- a/x11-fm/gnome-commander2/Makefile
+++ b/x11-fm/gnome-commander2/Makefile
@@ -29,8 +29,8 @@ USE_GMAKE=	yes
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool autoconf:env aclocal:env automake:env
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 INSTALLS_OMF=	yes
 
 MAN1=		gnome-commander.1
diff --git a/x11-fm/mtoolsfm/Makefile b/x11-fm/mtoolsfm/Makefile
index 974e2b245b77..7fd22448dbb0 100644
--- a/x11-fm/mtoolsfm/Makefile
+++ b/x11-fm/mtoolsfm/Makefile
@@ -20,8 +20,8 @@ RUN_DEPENDS=	mtools:${PORTSDIR}/emulators/mtools
 USE_GNOME=	gnomehack gtk12
 USE_GETTEXT=	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-conffile="${PREFIX}/etc/mtoolsfm.conf"
 
 MAN1=		mtoolsfm.1
diff --git a/x11-fm/nautilus/Makefile b/x11-fm/nautilus/Makefile
index 11f846155763..d38f097de580 100644
--- a/x11-fm/nautilus/Makefile
+++ b/x11-fm/nautilus/Makefile
@@ -30,9 +30,9 @@ USE_GNOME=	gnomeprefix gnomehack intlhack gnomedesktop \
 GNOME_DESKTOP_VERSION=2
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="${PTHREAD_LIBS} -L${LOCALBASE}/lib -liconv" \
+CONFIGURE_ENV=	LIBS="${PTHREAD_LIBS} -L${LOCALBASE}/lib -liconv" \
 		LIBPNG="-L${LOCALBASE}/lib -lpng -lz"
+CPPFLAGS+=	-I${LOCALBASE}/include
 CONFIGURE_ARGS=	--enable-static --disable-packagekit
 MAKE_ENV=	G_CHARSET_ALIAS="${LOCALBASE}/libdata/charset.alias"
 
diff --git a/x11-fm/pcmanfm/Makefile b/x11-fm/pcmanfm/Makefile
index 348d26724959..f0abbf42b0d1 100644
--- a/x11-fm/pcmanfm/Makefile
+++ b/x11-fm/pcmanfm/Makefile
@@ -23,7 +23,6 @@ USE_GMAKE=	yes
 USE_FAM=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
-CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 
 OPTIONS=	NLS "Native Language Support (devel/gettext)" on
 
diff --git a/x11-fm/tdfsb/Makefile b/x11-fm/tdfsb/Makefile
index 12a9b29934d3..60190c4cf6fa 100644
--- a/x11-fm/tdfsb/Makefile
+++ b/x11-fm/tdfsb/Makefile
@@ -25,9 +25,9 @@ USE_GNOME=	pkgconfig
 PORTDOCS=	README
 PLIST_FILES=	bin/${PORTNAME}
 
-CPPFLAGS=	`${pkgconfig_DETECT} --cflags SDL_image glut` \
+CPPFLAGS+=	`${pkgconfig_DETECT} --cflags SDL_image glut` \
 		`${LOCALBASE}/bin/smpeg-config --cflags`
-LDFLAGS=	`${pkgconfig_DETECT} --libs SDL_image glut` \
+LDFLAGS+=	`${pkgconfig_DETECT} --libs SDL_image glut` \
 		`${LOCALBASE}/bin/smpeg-config --libs`
 
 .include <bsd.port.pre.mk>
diff --git a/x11-fm/tkdesk/Makefile b/x11-fm/tkdesk/Makefile
index e726e097027a..cb7cfe6385ce 100644
--- a/x11-fm/tkdesk/Makefile
+++ b/x11-fm/tkdesk/Makefile
@@ -29,7 +29,6 @@ USE_TK_BUILD=	yes
 USE_TK=		yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--with-tcl=${TCL_LIBDIR} \
 		--with-tk=${TK_LIBDIR} \
 		--with-blt=${LOCALBASE} \
@@ -39,7 +38,7 @@ MAKE_ENV=	LIB_RUNTIME_DIR="${LOCABASE}/lib"
 MAN1=		tkdesk.1 cd-tkdesk.1 ed-tkdesk.1 od-tkdesk.1
 
 CPPFLAG=	-I${LOCALBASE}/include/itcl3.4
-LDFLAGS=	-L${LOCALBASE}/lib -litcl
+LDFLAGS+=	-L${LOCALBASE}/lib -litcl
 
 post-patch:
 	@${GREP} -lR "<malloc\.h>" ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} -e \
diff --git a/x11-fm/xdiskusage/Makefile b/x11-fm/xdiskusage/Makefile
index 766dfb74b6c7..e677ea00e4c9 100644
--- a/x11-fm/xdiskusage/Makefile
+++ b/x11-fm/xdiskusage/Makefile
@@ -23,8 +23,6 @@ USE_GMAKE=	yes
 CXXFLAGS+=	`fltk-config --cxxflags`
 LDFLAGS+=	`fltk-config --ldflags`
 
-MAKE_ENV+=	LDFLAGS="${LDFLAGS}"
-
 PLIST_FILES=	bin/xdiskusage
 MAN1=		xdiskusage.1
 
diff --git a/x11-fm/xfe/Makefile b/x11-fm/xfe/Makefile
index 8be9e46b6855..dfa4bfb9bb89 100644
--- a/x11-fm/xfe/Makefile
+++ b/x11-fm/xfe/Makefile
@@ -22,7 +22,6 @@ USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
 LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
-CONFIGURE_ENV=	LDFLAGS="${LDFLAGS}"
 
 MAN1=		xfe.1 xfi.1 xfp.1 xfv.1 xfw.1
 
diff --git a/x11-fm/xnc/Makefile b/x11-fm/xnc/Makefile
index 8ed1f5b0adab..6e768b7f0614 100644
--- a/x11-fm/xnc/Makefile
+++ b/x11-fm/xnc/Makefile
@@ -31,8 +31,8 @@ USE_GETTEXT=	yes
 GNU_CONFIGURE=	yes
 USE_XORG=	x11 xext xt
 CONFIGURE_ARGS+=--with-pty=BSD --with-libintl-prefix=${LOCALBASE}
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
 
 MAN1=		ives.1 xjpegroot.1 xnc.1 xnlaunch.1 iedit.1 iview.1