- 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, 53 insertions, 58 deletions

diff --git a/x11-wm/afterstep-stable/Makefile b/x11-wm/afterstep-stable/Makefile
index 25214023bf8e..5f40f9d789a6 100644
--- a/x11-wm/afterstep-stable/Makefile
+++ b/x11-wm/afterstep-stable/Makefile
@@ -32,7 +32,6 @@ USE_GNOME=	glib20 gtk20 pango
 USE_ICONV=	yes
 USE_XORG+=	ice sm x11 xcursor xext xfixes xi xinerama xrandr xrender
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS+=--disable-ascp \
 		--enable-i18n \
 		--disable-send-postcard-to-developer \
diff --git a/x11-wm/amaterus/Makefile b/x11-wm/amaterus/Makefile
index ed76300f77c8..a196f13b90c6 100644
--- a/x11-wm/amaterus/Makefile
+++ b/x11-wm/amaterus/Makefile
@@ -19,9 +19,8 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 USE_GNOME=	gtk12 libxml
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	LDFLAGS="${LDFLAGS}"
 
-CPPFLAGS=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .include <bsd.port.mk>
diff --git a/x11-wm/bbkeys/Makefile b/x11-wm/bbkeys/Makefile
index 1f457627a648..98b740233268 100644
--- a/x11-wm/bbkeys/Makefile
+++ b/x11-wm/bbkeys/Makefile
@@ -19,8 +19,8 @@ BUILD_DEPENDS=	blackbox:${PORTSDIR}/x11-wm/blackbox
 USE_PERL5_BUILD=	yes
 USE_XORG=	x11 xext
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="`pkg-config --cflags xft`" \
-		LDFLAGS="`pkg-config --libs xft`"
+CPPFLAGS+=	`pkg-config --cflags xft`
+LDFLAGS+=	`pkg-config --libs xft`
 
 MAN1=		bbkeys.1
 MAN5=		bbkeysrc.5
diff --git a/x11-wm/bbpager/Makefile b/x11-wm/bbpager/Makefile
index c4441d8146be..060b52e29ebc 100644
--- a/x11-wm/bbpager/Makefile
+++ b/x11-wm/bbpager/Makefile
@@ -19,8 +19,8 @@ BUILD_DEPENDS=	blackbox:${PORTSDIR}/x11-wm/blackbox
 USE_GNOME=	gnomehack pkgconfig
 USE_XORG=	xext sm x11 xau xcursor xi
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="`pkg-config --cflags xft`" \
-		LDFLAGS="`pkg-config --libs xft`"
+CPPFLAGS+=	`pkg-config --cflags xft`
+LDFLAGS+=	`pkg-config --libs xft`
 
 DOCS=		AUTHORS BUGS COPYING ChangeLog INSTALL NEWS \
 		README TODO
diff --git a/x11-wm/compiz-plugins-extra/Makefile b/x11-wm/compiz-plugins-extra/Makefile
index b9390dc6d045..4e964a288c3b 100644
--- a/x11-wm/compiz-plugins-extra/Makefile
+++ b/x11-wm/compiz-plugins-extra/Makefile
@@ -58,8 +58,8 @@ GCONF_SCHEMAS=	compiz-3d.schemas \
 		compiz-wallpaper.schemas \
 		compiz-widget.schemas
 
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--enable-schemas
 
 post-patch:
diff --git a/x11-wm/compiz-plugins-main/Makefile b/x11-wm/compiz-plugins-main/Makefile
index a0a432088b1a..928614402fbe 100644
--- a/x11-wm/compiz-plugins-main/Makefile
+++ b/x11-wm/compiz-plugins-main/Makefile
@@ -56,8 +56,8 @@ GCONF_SCHEMAS=	compiz-animation.schemas \
 		compiz-vpswitch.schemas \
 		compiz-shift.schemas
 
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--enable-schemas
 
 .include <bsd.port.mk>
diff --git a/x11-wm/compiz-plugins-unsupported/Makefile b/x11-wm/compiz-plugins-unsupported/Makefile
index c8828ec7518e..7d97bb8949c7 100644
--- a/x11-wm/compiz-plugins-unsupported/Makefile
+++ b/x11-wm/compiz-plugins-unsupported/Makefile
@@ -39,8 +39,8 @@ GCONF_SCHEMAS=	compiz-atlantis.schemas \
 		compiz-snow.schemas \
 		compiz-tile.schemas
 
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--enable-schemas
 
 .include <bsd.port.mk>
diff --git a/x11-wm/compiz/Makefile b/x11-wm/compiz/Makefile
index 6bcd369edb33..9b5c1e31faf8 100644
--- a/x11-wm/compiz/Makefile
+++ b/x11-wm/compiz/Makefile
@@ -67,7 +67,7 @@ GCONF_SCHEMAS=	gwd.schemas \
 		compiz-zoom.schemas
 
 CONFIGURE_ARGS=	--disable-kde4
-CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 
 OPTIONS=	RSVG "Enable librsvg2 support" on \
 		GTK "Enable gtk2 support" on \
diff --git a/x11-wm/devilspie/Makefile b/x11-wm/devilspie/Makefile
index 07787b58da58..7ae7b80a0d81 100644
--- a/x11-wm/devilspie/Makefile
+++ b/x11-wm/devilspie/Makefile
@@ -18,8 +18,8 @@ USE_GNOME=	libwnck
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 MAN1=		devilspie.1
 PORTDOCS=	AUTHORS NEWS README TODO
diff --git a/x11-wm/ede/Makefile b/x11-wm/ede/Makefile
index ed74234dff72..abe068ec7076 100644
--- a/x11-wm/ede/Makefile
+++ b/x11-wm/ede/Makefile
@@ -21,7 +21,6 @@ WRKSRC=		${WRKDIR}/${PORTNAME}
 USE_XORG=	x11
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV+=	CFLAGS="${CFLAGS}"
 
 pre-configure:
 	@cd ${WRKSRC}; ${ACLOCAL}
diff --git a/x11-wm/emerald/Makefile b/x11-wm/emerald/Makefile
index 2b4ff8849139..ee3c8aae1c46 100644
--- a/x11-wm/emerald/Makefile
+++ b/x11-wm/emerald/Makefile
@@ -31,8 +31,8 @@ USE_AUTOTOOLS=	libtool
 MAN1=		emerald.1 \
 		emerald-theme-manager.1
 
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 
 # XXX - might want to change that
 post-patch:
diff --git a/x11-wm/epplets/Makefile b/x11-wm/epplets/Makefile
index b93a7e67e6cc..2f7fac95cf85 100644
--- a/x11-wm/epplets/Makefile
+++ b/x11-wm/epplets/Makefile
@@ -25,8 +25,8 @@ USE_GL=		glut
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool autoconf
 USE_LDCONFIG=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--disable-auto-respawn
 
 .include <bsd.port.pre.mk>
diff --git a/x11-wm/fluxbox/Makefile b/x11-wm/fluxbox/Makefile
index 4a055280a95b..a749ca21ddd8 100644
--- a/x11-wm/fluxbox/Makefile
+++ b/x11-wm/fluxbox/Makefile
@@ -82,13 +82,13 @@ CONFIGURE_ARGS+=	--enable-xinerama
 
 .if !defined(WITHOUT_NLS)
 USE_ICONV=		yes
-CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
-			LIBS="-L${LOCALBASE}/lib -liconv"
+CONFIGURE_ENV=		LIBS="-L${LOCALBASE}/lib -liconv"
+CPPFLAGS+=		-I${LOCALBASE}/include
 CONFIGURE_ARGS+=	--enable-nls
 PLIST_SUB+=		NLS:=""
 .else
-CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
-			LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV=		LIBS="-L${LOCALBASE}/lib"
+CPPFLAGS+=		-I${LOCALBASE}/include
 CONFIGURE_ARGS+=	--disable-nls
 PLIST_SUB+=		NLS:="@comment "
 .endif
diff --git a/x11-wm/icewm/Makefile b/x11-wm/icewm/Makefile
index 692577f21ac0..2f98b694cb34 100644
--- a/x11-wm/icewm/Makefile
+++ b/x11-wm/icewm/Makefile
@@ -19,7 +19,8 @@ USE_XORG=	x11 ice xinerama xext xrandr sm
 USE_GNOME=	gtk20 # gdkpixbuf really :-)
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--enable-shaped-decorations \
 		--enable-guievents \
 		--with-cfgdir=${DATADIR} \
diff --git a/x11-wm/jwm/Makefile b/x11-wm/jwm/Makefile
index 64ff6967ba47..597c492eb611 100644
--- a/x11-wm/jwm/Makefile
+++ b/x11-wm/jwm/Makefile
@@ -21,8 +21,8 @@ USE_XORG=	xpm
 GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
 CFLAGS+=	-I${LOCALBASE}/include
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 MAN1=		jwm.1
 
diff --git a/x11-wm/libcompizconfig/Makefile b/x11-wm/libcompizconfig/Makefile
index fac64a508363..be30298106d0 100644
--- a/x11-wm/libcompizconfig/Makefile
+++ b/x11-wm/libcompizconfig/Makefile
@@ -24,8 +24,8 @@ USE_AUTOTOOLS=	libtool
 
 USE_GNOME=	gnomehack intltool libxml2
 
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 
 post-patch:
 	echo ${OSVERSION}
diff --git a/x11-wm/libwraster/Makefile b/x11-wm/libwraster/Makefile
index cb9e088ec88e..271704523321 100644
--- a/x11-wm/libwraster/Makefile
+++ b/x11-wm/libwraster/Makefile
@@ -30,8 +30,8 @@ USE_XORG=	xpm xft
 USE_PERL5=	yes
 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-pixmapdir=${PREFIX}/include/X11/pixmaps \
 		--with-nlsdir=${PREFIX}/share/locale \
 		--with-libs-from="-L${LOCALBASE}/lib" \
diff --git a/x11-wm/lwm/Makefile b/x11-wm/lwm/Makefile
index a4165656df5c..e1d07fa4f7e2 100644
--- a/x11-wm/lwm/Makefile
+++ b/x11-wm/lwm/Makefile
@@ -22,7 +22,7 @@ PORTDOCS=	AUTHORS BUGS ChangeLog README TODO
 PLIST_FILES=	bin/${PORTNAME}
 
 CFLAGS+=	`pkg-config --cflags sm x11 xext` -DSHAPE
-LDFLAGS=	`pkg-config --libs sm x11 xext`
+LDFLAGS+=	`pkg-config --libs sm x11 xext`
 
 post-patch:
 	@${LN} -sf ${PORTNAME}.man ${WRKSRC}/${PORTNAME}.1
diff --git a/x11-wm/lxsession/Makefile b/x11-wm/lxsession/Makefile
index 62010979a789..050e0cec0e30 100644
--- a/x11-wm/lxsession/Makefile
+++ b/x11-wm/lxsession/Makefile
@@ -29,7 +29,6 @@ MAN1=		lxsession.1 lxsession-logout.1
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
-CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 
 .if !defined(WITHOUT_NLS)
 USE_GETTEXT=	yes
diff --git a/x11-wm/matchbox/Makefile b/x11-wm/matchbox/Makefile
index 38a1f89dd0f3..4ae1129bc08f 100644
--- a/x11-wm/matchbox/Makefile
+++ b/x11-wm/matchbox/Makefile
@@ -19,8 +19,8 @@ LICENSE=	GPLv2
 USE_BZIP2=	yes
 USE_XORG=	xfixes xcursor xext
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 PLIST_FILES=	bin/matchbox-window-manager bin/matchbox-remote \
 		etc/matchbox/kbdconfig
diff --git a/x11-wm/metacity/Makefile b/x11-wm/metacity/Makefile
index 8cab1fee8da2..ca7bf437364c 100644
--- a/x11-wm/metacity/Makefile
+++ b/x11-wm/metacity/Makefile
@@ -27,8 +27,8 @@ USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
 USE_GNOME=	gnomeprefix intlhack gnomehack gconf2 ltverhack gtk20
 USE_LDCONFIG=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 MAKE_ENV=	G_CHARSET_ALIAS="${LOCALBASE}/libdata/charset.alias"
 
 GCONF_SCHEMAS=	metacity.schemas
diff --git a/x11-wm/mutter/Makefile b/x11-wm/mutter/Makefile
index d69c635f9672..8d26c9befa28 100644
--- a/x11-wm/mutter/Makefile
+++ b/x11-wm/mutter/Makefile
@@ -29,8 +29,8 @@ USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
 USE_GNOME=	gnomeprefix gnomehack intlhack gtk20 gconf2 ltverhack
 USE_LDCONFIG=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 GCONF_SCHEMAS=	mutter.schemas
 
diff --git a/x11-wm/obconf/Makefile b/x11-wm/obconf/Makefile
index e028aa30c034..c5f41bcf29e9 100644
--- a/x11-wm/obconf/Makefile
+++ b/x11-wm/obconf/Makefile
@@ -19,14 +19,13 @@ LIB_DEPENDS=	startup-notification-1.0:${PORTSDIR}/x11/startup-notification \
 
 USE_GNOME=	gnomehier libglade2
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	LDFLAGS="${LDFLAGS}" \
-		OPENBOX_CFLAGS="`pkg-config --cflags obrender-3.5 obt-3.5`" \
+CONFIGURE_ENV=	OPENBOX_CFLAGS="`pkg-config --cflags obrender-3.5 obt-3.5`" \
 		OPENBOX_LIBS="`pkg-config --libs obrender-3.5 obt-3.5`"
 CONFIGURE_ARGS=	--sysconfdir=${PREFIX}/etc/openbox
 MAKE_ARGS=	mkdir_p='${MKDIR}'
 
-CPPFLAGS=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 PORTDOCS=	ABOUT-NLS AUTHORS README TODO
 
diff --git a/x11-wm/pekwm/Makefile b/x11-wm/pekwm/Makefile
index 4e77aa2b6033..591878c25cb0 100644
--- a/x11-wm/pekwm/Makefile
+++ b/x11-wm/pekwm/Makefile
@@ -27,7 +27,7 @@ CONFIGURE_ARGS+=--enable-shape --enable-xinerama --enable-xrandr \
 		--enable-image-png --disable-debug \
 		--disable-pedantic
 CFLAGS+=	-DICONV_CONST -I${LOCALBASE}/include
-CONFIGURE_ENV=	LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib -liconv"
+LDFLAGS+=	-L${LOCALBASE}/lib -liconv
 MAN1=		pekwm.1
 MANCOMPRESSED=	no
 
diff --git a/x11-wm/phluid/Makefile b/x11-wm/phluid/Makefile
index b7f2399b431a..80e618754953 100644
--- a/x11-wm/phluid/Makefile
+++ b/x11-wm/phluid/Makefile
@@ -17,7 +17,7 @@ COMMENT=	A window manager that emphasizes efficiency, speed, and beauty
 USE_GMAKE=	yes
 USE_EFL=	imlib2
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib -lm"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib -lm
 
 .include <bsd.port.mk>
diff --git a/x11-wm/sawfish/Makefile b/x11-wm/sawfish/Makefile
index 1f1fcf584f3c..761e780a1f01 100644
--- a/x11-wm/sawfish/Makefile
+++ b/x11-wm/sawfish/Makefile
@@ -27,7 +27,6 @@ USE_GNOME=	gnomehack gtk20
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share \
 		--datadir=${PREFIX}/share
 INSTALLS_ICONS=	yes
@@ -36,8 +35,8 @@ MANCOMPRESSED=	yes
 MAN1=		sawfish.1 sawfish-client.1 sawfish-config.1
 INFO=		sawfish
 
-CPPFLAGS=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 post-patch:
 	@${REINPLACE_CMD} -e \
diff --git a/x11-wm/waimea-devel/Makefile b/x11-wm/waimea-devel/Makefile
index 7cea4a9eade6..b082ba1955b1 100644
--- a/x11-wm/waimea-devel/Makefile
+++ b/x11-wm/waimea-devel/Makefile
@@ -26,8 +26,8 @@ USE_GMAKE=	yes
 USE_ICONV=	yes
 USE_XORG=	x11
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 OPTIONS=	PNG "Enable PNG support" On \
 		SVG "Enable SVG support" On \
diff --git a/x11-wm/windowmaker/Makefile b/x11-wm/windowmaker/Makefile
index c80ee6170692..cb58b8578a40 100644
--- a/x11-wm/windowmaker/Makefile
+++ b/x11-wm/windowmaker/Makefile
@@ -31,8 +31,8 @@ USE_XORG=	xpm xft
 USE_PERL5=	yes
 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-pixmapdir=${PREFIX}/include/X11/pixmaps \
 		--with-nlsdir=${PREFIX}/share/locale \
 		--with-libs-from="-L${LOCALBASE}/lib" \
diff --git a/x11-wm/wmanager/files/patch-aa b/x11-wm/wmanager/files/patch-aa
index 81056832f586..6dfbf13c58ae 100644
--- a/x11-wm/wmanager/files/patch-aa
+++ b/x11-wm/wmanager/files/patch-aa
@@ -36,7 +36,7 @@ diff -urN -urN -x .svn ../vendor/wmanager/Makefile ./Makefile
 -LDDIRS    = -L/usr/X11R6/lib -L/usr/lib -L/usr/local/lib
 -
 +LD        = $(CXX)
-+LDFLAGS   ?= -lGL -lfltk -lXext -lX11 -lm ${PTHREAD_LIBS}
++LDFLAGS   += -lGL -lfltk -lXext -lX11 -lm ${PTHREAD_LIBS}
 +LDDIRS    = -L$(x11lib)
  
  # install settings
diff --git a/x11-wm/xfce/Makefile b/x11-wm/xfce/Makefile
index b7b9b52d3e62..20759a43e55b 100644
--- a/x11-wm/xfce/Makefile
+++ b/x11-wm/xfce/Makefile
@@ -21,8 +21,8 @@ USE_XORG=	x11 xpm
 USE_GETTEXT=	yes
 USE_GNOME=	gdkpixbuf
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--with-conf-dir=${PREFIX}/etc/xfce \
 		--with-data-dir=${PREFIX}/share/xfce \
 		--with-locale-dir=${PREFIX}/share/locale \