67 files changed, 123 insertions, 132 deletions

diff --git a/x11/3ddesktop/Makefile b/x11/3ddesktop/Makefile
index ddff903e262b..e7c2976ea1bc 100644
--- a/x11/3ddesktop/Makefile
+++ b/x11/3ddesktop/Makefile
@@ -17,7 +17,6 @@ COMMENT=	3D Virtual Desktop Switcher
 USE_GL=		glut
 USE_EFL=	imlib2
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 
 MAN1=		3ddesk.1 3ddeskd.1
 PORTDOCS=	README README.windowmanagers
@@ -25,8 +24,8 @@ PLIST_FILES=	bin/3ddesk bin/3ddeskd etc/3ddesktop.conf \
 		%%DATADIR%%/digits.bmp
 PLIST_DIRS=	%%DATADIR%%
 
-CPPFLAGS=	-I${LOCALBASE}/include -DHAVE_DECL_GETOPT ${PTHREAD_CFLAGS}
-LDFLAGS=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
+CPPFLAGS+=	-I${LOCALBASE}/include -DHAVE_DECL_GETOPT ${PTHREAD_CFLAGS}
+LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 
 post-patch:
 	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
diff --git a/x11/alltray/Makefile b/x11/alltray/Makefile
index 0fff26346ae8..6dcb0bbd7f97 100644
--- a/x11/alltray/Makefile
+++ b/x11/alltray/Makefile
@@ -17,7 +17,8 @@ COMMENT=	Dock any application with no native tray icon
 USE_GNOME=	gtk20
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 MAN1=		alltray.1
 
diff --git a/x11/aterm/Makefile b/x11/aterm/Makefile
index d0f43e29b514..8f4dbcbd49cd 100644
--- a/x11/aterm/Makefile
+++ b/x11/aterm/Makefile
@@ -23,7 +23,8 @@ CONFIGURE_ARGS= --enable-wtmp \
 		--disable-thai \
 		--without-afterstep-config
 
-CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 OPTIONS=	TRANS "Transparency support" on \
 		BSDEL "BSD-style backspace and delete" on \
diff --git a/x11/avant-window-navigator/Makefile b/x11/avant-window-navigator/Makefile
index 90168af06ab7..440ba98aca2c 100644
--- a/x11/avant-window-navigator/Makefile
+++ b/x11/avant-window-navigator/Makefile
@@ -28,8 +28,8 @@ USE_GETTEXT=	yes
 USE_LDCONFIG=	yes
 INSTALLS_ICONS=	yes
 USE_XORG=	x11 xproto xcomposite xrender
-CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" \
-		CPPFLAGS="-I${LOCALBASE}/include"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 MAKE_JOBS_SAFE=	yes
 
 AWN_DESKTOP?=	agnostic
diff --git a/x11/bbrun/Makefile b/x11/bbrun/Makefile
index efe718c31647..30fef53bf759 100644
--- a/x11/bbrun/Makefile
+++ b/x11/bbrun/Makefile
@@ -19,7 +19,6 @@ WRKSRC=		${WRKDIR}/${DISTNAME}/bbrun
 USE_XORG=	xpm
 USE_GNOME=	gtk20
 USE_GMAKE=	yes
-MAKE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 
 PORTDOCS=	README
 PLIST_FILES=	bin/bbrun
diff --git a/x11/brightside/Makefile b/x11/brightside/Makefile
index 63dd7390882d..d980bf83436a 100644
--- a/x11/brightside/Makefile
+++ b/x11/brightside/Makefile
@@ -20,8 +20,8 @@ USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 USE_GNOME=	gnomeprefix gnomehack libwnck libgnomeui
 CONFIGURE_ARGS=	--enable-tray-icon
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 GCONF_SCHEMAS=	brightside.schemas
 
diff --git a/x11/erun/Makefile b/x11/erun/Makefile
index b2608282c42e..2adffaa0832d 100644
--- a/x11/erun/Makefile
+++ b/x11/erun/Makefile
@@ -23,8 +23,8 @@ WRKSRC=		${WRKDIR}/${PORTNAME}
 
 USE_GL=	gl
 USE_EFL=	imlib2
-CPPFLAGS=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS=	-L${LOCALBASE}/lib -lepplet -lImlib2 -lGL ${PTHREAD_LIBS}
+CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS+=	-L${LOCALBASE}/lib -lepplet -lImlib2 -lGL ${PTHREAD_LIBS}
 
 do-build:
 	cd ${WRKSRC} && ${CC} ${CFLAGS} ${CPPFLAGS} -o ${PORTNAME}.epplet \
diff --git a/x11/eterm/Makefile b/x11/eterm/Makefile
index 027b9c2fdbce..31b464868f85 100644
--- a/x11/eterm/Makefile
+++ b/x11/eterm/Makefile
@@ -23,8 +23,8 @@ CONFIGURE_ARGS?=--enable-trans --enable-utmp \
 		--enable-xim --with-theme-update \
 		--with-backspace=bs --without-terminfo \
 		--enable-multi-charset
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 OPTIONS=	MMX	"With MMX instruction set" off
 USE_XORG=	x11 xt
 USE_ICONV=	yes
diff --git a/x11/fireflies/Makefile b/x11/fireflies/Makefile
index bf48e7f1d641..e9c9fb376993 100644
--- a/x11/fireflies/Makefile
+++ b/x11/fireflies/Makefile
@@ -18,8 +18,8 @@ GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_GL=		yes
 
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/GL" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include/GL
+LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--with-bindir=${LOCALBASE}/bin/xscreensaver-hacks \
 		--with-confdir=${LOCALBASE}/share/xscreensaver/config
 PLIST_SUB=	VERSION=${PORTVERSION}
diff --git a/x11/florence/Makefile b/x11/florence/Makefile
index dbcdc03cf242..f7a9a3437e31 100644
--- a/x11/florence/Makefile
+++ b/x11/florence/Makefile
@@ -31,6 +31,5 @@ GCONF_SCHEMAS=	florence.schemas
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
-CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 
 .include <bsd.port.mk>
diff --git a/x11/gdkxft/Makefile b/x11/gdkxft/Makefile
index 27ae7bd199f7..6aa6ebdd62f3 100644
--- a/x11/gdkxft/Makefile
+++ b/x11/gdkxft/Makefile
@@ -20,8 +20,8 @@ USE_AUTOTOOLS=	libtool
 USE_GNOME=	gtk12
 USE_ICONV=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib -lgnuregex -liconv" \
-		CFLAGS="${CFLAGS} `pkg-config xft --cflags`"
+LDFLAGS+=	-L${LOCALBASE}/lib -lgnuregex -liconv
+CFLAGS+=	`pkg-config xft --cflags`
 CONFIGURE_ARGS=	--sbindir=${PREFIX}/bin \
 		--without-gnome
 USE_LDCONFIG=	yes
diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile
index d0d989df3847..1a62853c707c 100644
--- a/x11/gdm/Makefile
+++ b/x11/gdm/Makefile
@@ -46,10 +46,10 @@ GCONF_SCHEMAS=	gdm-simple-greeter.schemas
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-working-directory=${PREFIX}/etc/gdm/home \
 		--with-at-spi-registryd-directory=${LOCALBASE}/libexec
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -DHAS_SA_LEN" \
-		LDFLAGS="-L${LOCALBASE}/lib" \
-		LIBS="-lm" \
+CONFIGURE_ENV=	LIBS="-lm" \
 		GTKDOC="false"
+CPPFLAGS+=	-I${LOCALBASE}/include -DHAS_SA_LEN
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 SUB_FILES+=	gdm.pam
 
diff --git a/x11/ggiterm/Makefile b/x11/ggiterm/Makefile
index 6953e0a58de1..b8cd868db8a4 100644
--- a/x11/ggiterm/Makefile
+++ b/x11/ggiterm/Makefile
@@ -18,7 +18,8 @@ LIB_DEPENDS=	ggi.2:${PORTSDIR}/graphics/libggi
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-ggi-prefix=${LOCALBASE}
-CONFIGURE_ENV=	CPPFLAGS="${PTHREAD_CFLAGS}" LDFLAGS="${PTHREAD_LIBS}"
+CPPFLAGS+=	${PTHREAD_CFLAGS}
+LDFLAGS+=	${PTHREAD_LIBS}
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 SUB_FILES=	pkg-message
diff --git a/x11/gmrun/Makefile b/x11/gmrun/Makefile
index 386dab30f94a..ed25ab252486 100644
--- a/x11/gmrun/Makefile
+++ b/x11/gmrun/Makefile
@@ -20,8 +20,8 @@ USE_GNOME=	gtk20
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 MAKE_JOBS_SAFE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--disable-stlport
 
 PORTDOCS=	README
diff --git a/x11/gnome-applets/Makefile b/x11/gnome-applets/Makefile
index 0b692899a299..17d90546f04b 100644
--- a/x11/gnome-applets/Makefile
+++ b/x11/gnome-applets/Makefile
@@ -39,9 +39,9 @@ USE_GSTREAMER=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-mixer-applet \
 		--disable-networkmanager
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
-		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" \
-		OS_SYS="/usr/include"
+CONFIGURE_ENV=	OS_SYS="/usr/include"
+CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 
 GCONF_SCHEMAS=	charpick.schemas drivemount.schemas geyes.schemas \
 		mixer.schemas multiload.schemas stickynotes.schemas
@@ -61,7 +61,7 @@ LIB_DEPENDS+=	notify.4:${PORTSDIR}/devel/libnotify
 .endif
 
 .if ${ARCH} != "i386" && ${ARCH} != "amd64"
-CONFIGURE_ENV+=	CFLAGS="${CFLAGS} -fPIC"
+CFLAGS+=	-fPIC
 PLIST_SUB=	BATTERY="@comment "
 .else
 GCONF_SCHEMAS+=	battstat.schemas
diff --git a/x11/gnome-desktop/Makefile b/x11/gnome-desktop/Makefile
index 5a358b67d2bc..1762fcc7e830 100644
--- a/x11/gnome-desktop/Makefile
+++ b/x11/gnome-desktop/Makefile
@@ -34,8 +34,8 @@ INSTALLS_OMF=	yes
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool
 CONFIGURE_ARGS=	--with-gnome-distributor="FreeBSD GNOME Project"
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 MAN1=	gnome-about.1
 
diff --git a/x11/gnome-libs/Makefile b/x11/gnome-libs/Makefile
index c36b73969a08..54a668122b03 100644
--- a/x11/gnome-libs/Makefile
+++ b/x11/gnome-libs/Makefile
@@ -28,8 +28,8 @@ USE_GETTEXT=	yes
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-test-gnome
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
 
 MAN1=		dns-helper.1 gconfigger.1 gnome-bug.1 gnome-config.1 \
 		gnome-doc.1 gnome-dump-metadata.1 gnome-gen-mimedb.1 \
diff --git a/x11/gnome-menus/Makefile b/x11/gnome-menus/Makefile
index 40a2dd77bad8..421bd0f3cf53 100644
--- a/x11/gnome-menus/Makefile
+++ b/x11/gnome-menus/Makefile
@@ -25,8 +25,8 @@ USE_GNOME=	gnomeprefix gnomehack intlhack glib20 ltverhack
 USE_AUTOTOOLS=	libtool
 USE_PYTHON=	yes
 USE_LDCONFIG=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|applications.menu||' \
diff --git a/x11/gnome-panel/Makefile b/x11/gnome-panel/Makefile
index 4887b4cf240d..bc2d84c50678 100644
--- a/x11/gnome-panel/Makefile
+++ b/x11/gnome-panel/Makefile
@@ -36,8 +36,8 @@ WANT_GNOME=	yes
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
 CONFIGURE_ARGS=	--disable-network-manager
-CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib"
-CPPFLAGS="-I${LOCALBASE}/include"
+LDFLAGS+=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
 
 MAN1=		gnome-panel.1
 GCONF_SCHEMAS=	clock.schemas fish.schemas \
diff --git a/x11/gnome-screensaver/Makefile b/x11/gnome-screensaver/Makefile
index 55cb5c7ea4a1..e23121595bd5 100644
--- a/x11/gnome-screensaver/Makefile
+++ b/x11/gnome-screensaver/Makefile
@@ -31,8 +31,8 @@ USE_GNOME=	gnomeprefix gnomehack intlhack gnomemenus libgnomekbd \
 CONFIGURE_ARGS=	--with-gdm-config=${LOCALBASE}/etc/gdm/custom.conf \
 		--with-xscreensaverdir=${XSCREENSAVER_DIR} \
 		--with-xscreensaverhackdir=${LOCALBASE}/bin/xscreensaver-hacks
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 GCONF_SCHEMAS=	gnome-screensaver.schemas
 MAN1=		gnome-screensaver-command.1 gnome-screensaver-preferences.1 \
diff --git a/x11/gnome-session/Makefile b/x11/gnome-session/Makefile
index 6a6783ab652c..73a300af4c01 100644
--- a/x11/gnome-session/Makefile
+++ b/x11/gnome-session/Makefile
@@ -37,8 +37,8 @@ GNOME_DESKTOP_VERSION=2
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-docbook-docs
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 MAN1=		gnome-session.1 gnome-wm.1 gnome-session-properties.1 \
 		gnome-session-save.1
diff --git a/x11/gnome-shell/Makefile b/x11/gnome-shell/Makefile
index 6328c31a7fbe..6387ac9ec82b 100644
--- a/x11/gnome-shell/Makefile
+++ b/x11/gnome-shell/Makefile
@@ -34,7 +34,7 @@ USE_GNOME=	gnomeprefix gnomehack intlhack gtk20 gconf2 gnomemenus \
 		gnomedesktop ltverhack libgnomeui librsvg2
 USE_GSTREAMER=	theora
 USE_LDCONFIG=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include/js -I${LOCALBASE}/include/nspr"
+CPPFLAGS+=	-I${LOCALBASE}/include/js -I${LOCALBASE}/include/nspr
 
 GCONF_SCHEMAS=	gnome-shell.schemas
 
diff --git a/x11/gnome-swallow/Makefile b/x11/gnome-swallow/Makefile
index 0d4896a2083b..1fcc595ae40c 100644
--- a/x11/gnome-swallow/Makefile
+++ b/x11/gnome-swallow/Makefile
@@ -18,9 +18,9 @@ USE_XORG=	x11
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack gnomepanel libgnomeui
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include `pkg-config --cflags libgnomeui-2.0`" \
-		LDFLAGS="-L${LOCALBASE}/lib" \
-		LIBS="`pkg-config --libs libgnomeui-2.0`"
+CONFIGURE_ENV=	LIBS="`pkg-config --libs libgnomeui-2.0`"
+CPPFLAGS+=	-I${LOCALBASE}/include `pkg-config --cflags libgnomeui-2.0`
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
diff --git a/x11/gnome-terminal/Makefile b/x11/gnome-terminal/Makefile
index 7cde07c31a2c..0bd93b725e06 100644
--- a/x11/gnome-terminal/Makefile
+++ b/x11/gnome-terminal/Makefile
@@ -25,8 +25,8 @@ USE_XORG=	sm
 USE_GNOME=	gnomeprefix gnomehack intlhack gconf2 vte gnomedocutils \
 		libgnome
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 GCONF_SCHEMAS=	gnome-terminal.schemas
 
diff --git a/x11/gsynaptics/Makefile b/x11/gsynaptics/Makefile
index 1bf04512fcc8..ecaacf1b750d 100644
--- a/x11/gsynaptics/Makefile
+++ b/x11/gsynaptics/Makefile
@@ -23,8 +23,8 @@ USE_GMAKE=	yes
 USE_PERL5=	yes
 GNU_CONFIGURE=	yes
 
-CONFIGURE_ENV=	CPPFLAGS=-I${LOCALBASE}/include \
-		LDFLAGS=-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 MAN1=		gsynaptics.1 gsynaptics-init.1
 
diff --git a/x11/gtkterm2/Makefile b/x11/gtkterm2/Makefile
index f20ea44a5a08..9821c0e14e41 100644
--- a/x11/gtkterm2/Makefile
+++ b/x11/gtkterm2/Makefile
@@ -17,7 +17,6 @@ COMMENT=	A simple GTK-2 terminal with tabs
 USE_GNOME=	vte
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 
 PORTDOCS=	README
 PLIST_FILES=	bin/gtkterm2 \
@@ -25,8 +24,8 @@ PLIST_FILES=	bin/gtkterm2 \
 		%%DATADIR%%/pixmaps/gtkterm2.png
 PLIST_DIRS=	%%DATADIR%%/pixmaps %%DATADIR%%
 
-CPPFLAGS=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|^CFLAGS=""||g' ${WRKSRC}/configure
diff --git a/x11/libdnd/Makefile b/x11/libdnd/Makefile
index b80251e08886..a6d5ee07d85c 100644
--- a/x11/libdnd/Makefile
+++ b/x11/libdnd/Makefile
@@ -20,8 +20,8 @@ USE_XORG=	x11 xmu ice xaw
 USE_LDCONFIG=	yes
 WRKSRC=		${WRKDIR}/DND/DNDlib
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include/" \
-		LDFLAGS="-L${LOCALBASE}/lib/"
+CPPFLAGS+=	-I${LOCALBASE}/include/
+LDFLAGS+=	-L${LOCALBASE}/lib/
 MAKE_JOBS_UNSAFE=	yes
 
 post-install:
diff --git a/x11/libfm/Makefile b/x11/libfm/Makefile
index 49eb62579a22..25b44eef3867 100644
--- a/x11/libfm/Makefile
+++ b/x11/libfm/Makefile
@@ -24,13 +24,11 @@ USE_FAM=	yes
 USE_LDCONFIG=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
-CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS+=--prefix=${LOCALBASE} --sysconfdir=${LOCALBASE}/etc
 
 .if !defined(WITHOUT_NLS)
 USE_GETTEXT=	yes
 PLIST_SUB+=	NLS=""
-CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 .else
 CONFIGURE_ARGS+=--disable-nls
 PLIST_SUB+=	NLS="@comment "
diff --git a/x11/libgnome-java/Makefile b/x11/libgnome-java/Makefile
index ba0cebb46594..07c4f50bba55 100644
--- a/x11/libgnome-java/Makefile
+++ b/x11/libgnome-java/Makefile
@@ -28,9 +28,9 @@ JAVA_VERSION=	1.5+
 JAVA_OS=	native
 USE_GNOME=	gnomehack libgnomeui
 CONFIGURE_ARGS=	--without-gcj-compile --with-jardir=${JAVAJARDIR}
-CONFIGURE_ENV=	CPPFLAGS="-I${JAVA_HOME}/include -I${JAVA_HOME}/include/freebsd" \
-		ac_cv_path_DB1="nocommand" \
+CONFIGURE_ENV=	ac_cv_path_DB1="nocommand" \
 		ac_cv_path_DB2="nocommand"
+CPPFLAGS+=	-I${JAVA_HOME}/include -I${JAVA_HOME}/include/freebsd
 MAKE_JOBS_UNSAFE=	yes
 
 # jikes related
diff --git a/x11/libgnome/Makefile b/x11/libgnome/Makefile
index 82dcda4dc4ba..12c4878055f5 100644
--- a/x11/libgnome/Makefile
+++ b/x11/libgnome/Makefile
@@ -32,8 +32,8 @@ USE_BISON=	build
 USE_XORG=	xpm
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 SUB_FILES=	pkg-deinstall
 
diff --git a/x11/libgnomekbd/Makefile b/x11/libgnomekbd/Makefile
index c4d0030d9caf..9aac3868fb29 100644
--- a/x11/libgnomekbd/Makefile
+++ b/x11/libgnomekbd/Makefile
@@ -24,8 +24,8 @@ INSTALLS_ICONS=	yes
 USE_GETTEXT=	yes
 USE_LDCONFIG=	yes
 USE_GMAKE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 GCONF_SCHEMAS=	desktop_gnome_peripherals_keyboard_xkb.schemas
 
diff --git a/x11/libsynaptics/Makefile b/x11/libsynaptics/Makefile
index c28b8dec67fd..3e6ccb13b6f6 100644
--- a/x11/libsynaptics/Makefile
+++ b/x11/libsynaptics/Makefile
@@ -20,8 +20,8 @@ USE_LDCONFIG=	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
 
 post-patch:
 	@${REINPLACE_CMD} -e 's/%%PTHREAD_LIBS%%/${PTHREAD_LIBS}/g' \
diff --git a/x11/libxklavier/Makefile b/x11/libxklavier/Makefile
index 472800596b95..d756764b5729 100644
--- a/x11/libxklavier/Makefile
+++ b/x11/libxklavier/Makefile
@@ -32,8 +32,7 @@ CONFIGURE_ARGS=	--disable-doxygen \
 		--with-xmodmap-base=${LOCALBASE}/share/xmodmap \
 		--disable-gtk-doc \
 		--with-html-dir=${GNOME_HTML_DIR}
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 PLIST_SUB=	VERSION=${PORTVERSION}
 
diff --git a/x11/menu-cache/Makefile b/x11/menu-cache/Makefile
index a3248758d546..04054bdb4b42 100644
--- a/x11/menu-cache/Makefile
+++ b/x11/menu-cache/Makefile
@@ -21,6 +21,5 @@ USE_GMAKE=	yes
 USE_FAM=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
-CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 
 .include <bsd.port.mk>
diff --git a/x11/mgapdesk/Makefile b/x11/mgapdesk/Makefile
index 7672c72f3ef5..bb58dc9215fb 100644
--- a/x11/mgapdesk/Makefile
+++ b/x11/mgapdesk/Makefile
@@ -27,7 +27,7 @@ WRKSRC=		${WRKDIR}/${PORTNAME}
 .include <bsd.port.pre.mk>
 
 .if (${ARCH} == "alpha")
-CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS} -lio"
+LDFLAGS+=	-lio
 .endif
 
 .if ${ARCH} == "sparc64" || ${ARCH} == "ia64"
diff --git a/x11/mlterm/Makefile b/x11/mlterm/Makefile
index 091d87365b1f..bb3d8524a382 100644
--- a/x11/mlterm/Makefile
+++ b/x11/mlterm/Makefile
@@ -25,7 +25,8 @@ CONFIGURE_ARGS=	--with-imagelib=gdk-pixbuf2 --enable-utmp \
 		--mandir="${LOCALBASE}/man" --enable-optimize-redrawing \
 		--with-tools="mlclient,mlconfig,mlterm-menu,mlcc,w3mmlconfig,mlimgloader" \
 		--disable-iiimf
-CONFIGURE_ENV=	LIBS="${LIBS} -L${LOCALBASE}/lib ${PTHREAD_LIBS} -lintl" CFLAGS="${CFLAGS} -I${LOCALBASE}/include"
+CONFIGURE_ENV=	LIBS="${LIBS} -L${LOCALBASE}/lib ${PTHREAD_LIBS} -lintl"
+CFLAGS+=	-I${LOCALBASE}/include
 MAKE_JOBS_UNSAFE=	yes
 OPTIONS=	FRIBIDI	"Use Fribidi for BiDi rendering" off \
 		UIM "uim support (experimental)" off \
diff --git a/x11/mrxvt/Makefile b/x11/mrxvt/Makefile
index c130458cedbc..29e819775fe7 100644
--- a/x11/mrxvt/Makefile
+++ b/x11/mrxvt/Makefile
@@ -38,8 +38,8 @@ LIB_DEPENDS+=	Xft.2:${PORTSDIR}/x11-fonts/libXft
 CONFIGURE_ARGS+=	--enable-xft
 .endif
 
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
-		LIBS="${LIBS} -L${LOCALBASE}/lib"
+CONFIGURE_ENV=	LIBS="${LIBS} -L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
 
 .if !defined(NOPORTDOCS)
 PORTDOCS=	TIPS \
diff --git a/x11/multi-gnome-terminal/Makefile b/x11/multi-gnome-terminal/Makefile
index 8821d4fdf600..64f23c5b6f89 100644
--- a/x11/multi-gnome-terminal/Makefile
+++ b/x11/multi-gnome-terminal/Makefile
@@ -19,8 +19,8 @@ INSTALLS_OMF=	yes
 USE_GNOME=	gnomehack gnomeprefix libglade
 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=		mgt-helper.1 multi-gnome-terminal.1
 
diff --git a/x11/numlockx/Makefile b/x11/numlockx/Makefile
index 501f118f92d9..0a983d9bcf38 100644
--- a/x11/numlockx/Makefile
+++ b/x11/numlockx/Makefile
@@ -16,13 +16,12 @@ COMMENT=	Turns on numlock in X
 
 USE_XORG=	x11 xext xtst
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 MAKE_ARGS=	ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \
 		AUTOHEADER="${TRUE}"
 
 PLIST_FILES=	bin/numlockx
 
-CPPFLAGS=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .include <bsd.port.mk>
diff --git a/x11/powershell/Makefile b/x11/powershell/Makefile
index d99b4a2c514f..cbaad3d02c2c 100644
--- a/x11/powershell/Makefile
+++ b/x11/powershell/Makefile
@@ -16,8 +16,8 @@ COMMENT=	A terminal emulator for the X11
 
 USE_GNOME=	gnomelibs gnomehier
 USE_AUTOTOOLS=	autoconf
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include  `${IMLIB_CONFIG} --cflags`" \
-		LDFLAGS="-L${LOCALBASE}/lib  `${IMLIB_CONFIG} --libs`"
+CPPFLAGS+=	-I${LOCALBASE}/include  `${IMLIB_CONFIG} --cflags`
+LDFLAGS+=	-L${LOCALBASE}/lib  `${IMLIB_CONFIG} --libs`
 ALL_TARGET=	${PORTNAME}
 
 .include <bsd.port.mk>
diff --git a/x11/rxvt-unicode/Makefile b/x11/rxvt-unicode/Makefile
index 66027e74f093..7a702b39390a 100644
--- a/x11/rxvt-unicode/Makefile
+++ b/x11/rxvt-unicode/Makefile
@@ -22,7 +22,7 @@ RUN_DEPENDS=	${LOCALBASE}/bin/fc-cache:${PORTSDIR}/x11-fonts/fontconfig	\
 USE_GNOME=		pkgconfig
 USE_XORG=		xpm xft xrender
 GNU_CONFIGURE=		yes
-CPPFLAGS=		-I${LOCALBASE}/include
+CPPFLAGS+=		-I${LOCALBASE}/include
 CONFIGURE_ENV=		LIBS="-lutil"
 CONFIGURE_ARGS=		--enable-everything --with-term=rxvt	\
 			--with-terminfo=${LOCALBASE}/share/misc/terminfo.db
diff --git a/x11/sisctrl/Makefile b/x11/sisctrl/Makefile
index 8628bc3ba899..dad85ffdf93a 100644
--- a/x11/sisctrl/Makefile
+++ b/x11/sisctrl/Makefile
@@ -19,8 +19,8 @@ USE_GNOME=	gtk20
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	 --with-xv-path=${LOCALBASE}/lib
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 PLIST_FILES=	bin/sisctrl
 MAN1=		sisctrl.1x
diff --git a/x11/startup-notification/Makefile b/x11/startup-notification/Makefile
index f3c5b93cb4b6..0e40070f24f1 100644
--- a/x11/startup-notification/Makefile
+++ b/x11/startup-notification/Makefile
@@ -24,8 +24,8 @@ USE_GMAKE=	yes
 USE_GNOME=	gnomehack pkgconfig ltasneededhack
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS+=ac_cv_lib_ICE_IceConnectionNumber=no
 
 .include <bsd.port.mk>
diff --git a/x11/thinglaunch/Makefile b/x11/thinglaunch/Makefile
index 849813130204..437646399538 100644
--- a/x11/thinglaunch/Makefile
+++ b/x11/thinglaunch/Makefile
@@ -16,8 +16,8 @@ COMMENT=	A very fast launcher program for X
 USE_XORG=	x11 xproto
 MAKE_JOBS_SAFE=	yes
 
-CPPFLAGS=	-I${LOCALBASE}/include -lX11
-LDFLAGS=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include -lX11
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 PLIST_FILES=	bin/thinglaunch
 
diff --git a/x11/wdm/Makefile b/x11/wdm/Makefile
index 96a757a35617..a18d2b2296b8 100644
--- a/x11/wdm/Makefile
+++ b/x11/wdm/Makefile
@@ -29,8 +29,7 @@ NOT_FOR_ARCHS=	sparc64
 USE_XORG=	x11 xmu
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \
-		DEF_SERVER="${DEF_SERVER}" XRDB_PATH="${XRDB_PATH}"
+CONFIGURE_ENV=	DEF_SERVER="${DEF_SERVER}" XRDB_PATH="${XRDB_PATH}"
 CONFIGURE_ARGS=	--with-logdir=/var/log \
 		--with-runlockdir=/var/run \
 		--with-wdmdir=${WDMDIR} \
@@ -45,8 +44,8 @@ CONFIGURE_ARGS=	--with-logdir=/var/log \
 
 MAN1=	wdm.1 wdmLogin.1
 
-CPPFLAGS=	-I${LOCALBASE}/include -DCSRG_BASED -DHAS_SETUSERCONTEXT
-LDFLAGS=	-L${LOCALBASE}/lib -lintl
+CPPFLAGS+=	-I${LOCALBASE}/include -DCSRG_BASED -DHAS_SETUSERCONTEXT
+LDFLAGS+=	-L${LOCALBASE}/lib -lintl
 
 DEF_SERVER?=	${LOCALBASE}/bin/X
 XRDB_PATH?=	${LOCALBASE}/bin/xrdb
diff --git a/x11/wmappl/Makefile b/x11/wmappl/Makefile
index a5d3f1a985f5..8e3392be8cff 100644
--- a/x11/wmappl/Makefile
+++ b/x11/wmappl/Makefile
@@ -18,9 +18,7 @@ COMMENT=	An application launcher dockapp similar to wmbutton
 
 GNU_CONFIGURE=	yes
 USE_XORG=	xpm x11 xext sm ice
-MAKE_ENV=	DATADIR="${DATADIR}" \
-		CPPFLAGS="${CPPFLAGS}" \
-		LDFLAGS="${LDFLAGS}"
+MAKE_ENV=	DATADIR="${DATADIR}"
 
 MAN1=	wmappl.1
 MAN5=	wmapplrc.5
diff --git a/x11/workrave/Makefile b/x11/workrave/Makefile
index 7a2f57a527a8..88309bb5c81c 100644
--- a/x11/workrave/Makefile
+++ b/x11/workrave/Makefile
@@ -31,8 +31,8 @@ MAKE_JOBS_SAFE=	yes
 USE_GNOME=	gnomeprefix gnomehack intlhack gconf2 intltool
 USE_GSTREAMER=	good
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib" \
-		LIBS="`pkg-config --libs libgnomeui-2.0`"
+CONFIGURE_ENV=	LIBS="`pkg-config --libs libgnomeui-2.0`"
+LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--enable-gconf --disable-pulse
 
 .include <bsd.port.pre.mk>
diff --git a/x11/wterm/Makefile b/x11/wterm/Makefile
index 41be01623681..e6f477153477 100644
--- a/x11/wterm/Makefile
+++ b/x11/wterm/Makefile
@@ -23,7 +23,7 @@ CONFIGURE_ARGS=	--enable-transparency --enable-xpm-background \
 		--enable-next-scrollbar --enable-utmp --enable-wtmp \
 		--enable-menubar --enable-graphics --with-term=xterm-color \
 		--with-xpm-includes=${LOCALBASE} --with-xpm-library=${LOCALBASE}
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/WINGs"
+CPPFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include/WINGs
 
 MAN1=		wterm.1
 PLIST_FILES=	bin/wterm
diff --git a/x11/x3270/Makefile b/x11/x3270/Makefile
index 21ce12c4cdbc..aa8d03eadda3 100644
--- a/x11/x3270/Makefile
+++ b/x11/x3270/Makefile
@@ -23,9 +23,9 @@ USE_ICONV=	yes
 USE_XORG=	ice sm x11 xaw xext xmu xt
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--without-pr3287 --with-fontdir=local --disable-dbcs
-CONFIGURE_ENV=	CPPFLAGS="-I${PREFIX}/include" \
-		LDFLAGS="-L${PREFIX}/lib" \
-		LIBS="-L${PREFIX}/lib"
+CONFIGURE_ENV=	LIBS="-L${PREFIX}/lib"
+CPPFLAGS+=	-I${PREFIX}/include
+LDFLAGS+=	-L${PREFIX}/lib
 .if defined(WITHOUT_OPENSSL)
 CONFIGURE_ARGS+=	--disable-ssl
 .else
diff --git a/x11/xautomation/Makefile b/x11/xautomation/Makefile
index b07012a81424..685a0ce830e6 100644
--- a/x11/xautomation/Makefile
+++ b/x11/xautomation/Makefile
@@ -19,8 +19,8 @@ LIB_DEPENDS=	png.6:${PORTSDIR}/graphics/png
 
 USE_XORG=	xtst
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 PLIST_FILES=	bin/pat2ppm bin/patextract bin/png2pat bin/rgb2pat \
 		bin/visgrep bin/xmousepos bin/xte
diff --git a/x11/xbindkeys/Makefile b/x11/xbindkeys/Makefile
index 6c28f7d69b64..232f1bedcffb 100644
--- a/x11/xbindkeys/Makefile
+++ b/x11/xbindkeys/Makefile
@@ -19,8 +19,8 @@ OPTIONS=	GUILE "Guile support" off \
 
 USE_XORG=	x11 xi
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 MAN1=		xbindkeys.1
 PLIST_FILES=	bin/xbindkeys %%EXAMPLESDIR%%/xbindkeysrc
diff --git a/x11/xdialog/Makefile b/x11/xdialog/Makefile
index 44904d51a333..4d85cac59d31 100644
--- a/x11/xdialog/Makefile
+++ b/x11/xdialog/Makefile
@@ -20,12 +20,11 @@ COMMENT=	A drop in replacement for the "dialog" or "cdialog" programs
 USE_BZIP2=	yes
 USE_GNOME=	gtk12
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 
 MAN1=		Xdialog.1
 
-CPPFLAGS=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .if defined(WITHOUT_NLS)
 CONFIGURE_ARGS+=	--disable-nls
diff --git a/x11/xfree86_xkb_xml/Makefile b/x11/xfree86_xkb_xml/Makefile
index 3579aeb05b51..f352fd6d2f94 100644
--- a/x11/xfree86_xkb_xml/Makefile
+++ b/x11/xfree86_xkb_xml/Makefile
@@ -21,7 +21,7 @@ USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 USE_PERL5_BUILD=yes
 CONFIGURE_ARGS=	--with-xkb-base=${LOCALBASE}/lib/X11/xkb
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .include <bsd.port.mk>
diff --git a/x11/xkeyboard-config/Makefile b/x11/xkeyboard-config/Makefile
index bc18185b84ca..b40a0c247b55 100644
--- a/x11/xkeyboard-config/Makefile
+++ b/x11/xkeyboard-config/Makefile
@@ -27,7 +27,7 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-xkb-base=${PREFIX}/share/X11/xkb \
 		--with-xkb-rules-symlink=xorg
 CPPFLAGS+=	-I${LOCALBASE}/include
-CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib"
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .if defined(WITHOUT_NLS)
 CONFIGURE_ARGS+=	--disable-nls
diff --git a/x11/xloadimage/Makefile b/x11/xloadimage/Makefile
index b2d71e96a2a1..24478cd45ae5 100644
--- a/x11/xloadimage/Makefile
+++ b/x11/xloadimage/Makefile
@@ -32,8 +32,8 @@ PATCHREV=	.2
 
 USE_XORG=	x11
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	LDFLAGS=-L${LOCALBASE}/lib
 
+LDFLAGS+=	-L${LOCALBASE}/lib
 CPPFLAGS+=	-I${LOCALBASE}/include
 
 MAN1=		xloadimage.1 uufilter.1
diff --git a/x11/xpyb/Makefile b/x11/xpyb/Makefile
index 95f10b9cc077..e3d2e0c28111 100644
--- a/x11/xpyb/Makefile
+++ b/x11/xpyb/Makefile
@@ -24,8 +24,9 @@ USE_PYTHON=	2.5+
 USE_GNOME=	gnomehack
 PORTDOCS=	README COPYING INSTALL NEWS XcbPythonBinding.txt
 
-GNU_CONFIGURE=yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-I${LOCALBASE}/lib"
+GNU_CONFIGURE=	yes
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .include <bsd.port.pre.mk>
 
diff --git a/x11/xrestop/Makefile b/x11/xrestop/Makefile
index 14cd6c293cda..b9f255461f15 100644
--- a/x11/xrestop/Makefile
+++ b/x11/xrestop/Makefile
@@ -20,9 +20,9 @@ USE_GNOME=	pkgconfig
 USE_NCURSES=	yes
 GNU_CONFIGURE=	yes
 
-CONFIGURE_ENV=	CFLAGS=-I${LOCALBASE}/include \
-		LDFLAGS=-L${LOCALBASE}/lib \
-		XLIBS="-L${LOCALBASE}/lib -lX11"
+CONFIGURE_ENV=	XLIBS="-L${LOCALBASE}/lib -lX11"
+LDFLAGS+=	-L${LOCALBASE}/lib
+CFLAGS+=	-I${LOCALBASE}/include
 
 MAN1=		xrestop.1
 PLIST_FILES=	bin/xrestop
diff --git a/x11/xscreensaver-gnome/Makefile b/x11/xscreensaver-gnome/Makefile
index 82d40c19d9f5..360dd0d4601a 100644
--- a/x11/xscreensaver-gnome/Makefile
+++ b/x11/xscreensaver-gnome/Makefile
@@ -34,9 +34,9 @@ CONFIGURE_ARGS=	--with-gtk --with-gl --with-gle --with-pixbuf --with-xpm \
 		--with-configdir=${PREFIX}/share/xscreensaver/config \
 		--with-dpms-ext --with-xinerama-ext --with-xf86vmode-ext \
 		--with-xf86gamma-ext --with-randr-ext --enable-locking
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib" \
-		LIBS="-lintl"
+CONFIGURE_ENV=	LIBS="-lintl"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 OPTIONS?=	PAM "Pluggable Authentication Module support" on \
 		KEYRING "Enable GnomeKeyring integration (needs PAM)" on \
diff --git a/x11/xscreensaver.app/Makefile b/x11/xscreensaver.app/Makefile
index 3c40f9dc374e..c8390b0caf49 100644
--- a/x11/xscreensaver.app/Makefile
+++ b/x11/xscreensaver.app/Makefile
@@ -18,8 +18,8 @@ LIB_DEPENDS=	dockapp.2:${PORTSDIR}/x11-wm/libdockapp
 
 PLIST_FILES=	bin/XScreenSaver.App
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib" \
-		CPPFLAGS="-I${LOCALBASE}/include"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 MAKE_ARGS=	"LDFLAGS+=-L${LOCALBASE}/lib"
 
diff --git a/x11/xsel-conrad/Makefile b/x11/xsel-conrad/Makefile
index d87a14c5ac7f..9ff2947b9cbe 100644
--- a/x11/xsel-conrad/Makefile
+++ b/x11/xsel-conrad/Makefile
@@ -18,7 +18,7 @@ COMMENT=	Access X selection from command line
 CONFLICTS=	xsel-[0-9]*
 USE_XORG=	x11 xext xt xproto ice sm
 CFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib -lXext -lX11
+LDFLAGS+=	-L${LOCALBASE}/lib -lXext -lX11
 MAN1=		${PORTNAME}.1
 PLIST_FILES=	bin/${PORTNAME}
 PORTDOCS=	ChangeLog README
diff --git a/x11/xsel/Makefile b/x11/xsel/Makefile
index 428c3eb45c61..84f78e01ff55 100644
--- a/x11/xsel/Makefile
+++ b/x11/xsel/Makefile
@@ -19,7 +19,7 @@ CONFLICTS=	xsel-conrad-[0-9]*
 USE_BZIP2=	yes
 USE_XORG=	xmu xaw xt xproto xkbfile
 CFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib -lXt -lXaw
+LDFLAGS+=	-L${LOCALBASE}/lib -lXt -lXaw
 MAN1=		${PORTNAME}.1
 PLIST_FILES=	bin/${PORTNAME}
 PORTDOCS=	${PORTNAME}.html
diff --git a/x11/xstroke/Makefile b/x11/xstroke/Makefile
index 849a0617600e..245e846add6d 100644
--- a/x11/xstroke/Makefile
+++ b/x11/xstroke/Makefile
@@ -20,15 +20,14 @@ LICENSE_COMB=	dual
 USE_BISON=	build
 USE_XORG=	xft x11 xext xi xtst
 USE_IMAKE=	yes
-MAKE_ENV=	LDFLAGS="${LDFLAGS}"
 
 MAN1=		xstroke.1
 PLIST_FILES=	bin/xstroke %%ETCDIR%%/alphabet
 PLIST_DIRS=	%%ETCDIR%%
 
 CFLAGS+=	-I.
-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-patch:
 	@${REINPLACE_CMD} -e "s,%%PREFIX%%,${PREFIX},g" ${WRKSRC}/etc/Imakefile
diff --git a/x11/xtermcontrol/Makefile b/x11/xtermcontrol/Makefile
index 05ad51d9bf57..6155fa1736a2 100644
--- a/x11/xtermcontrol/Makefile
+++ b/x11/xtermcontrol/Makefile
@@ -18,8 +18,8 @@ RUN_DEPENDS=	xterm:${PORTSDIR}/x11/xterm
 
 USE_GETTEXT=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
 
 PLIST_FILES=	bin/xtermcontrol
 MAN1=		${PORTNAME}.1
diff --git a/x11/xvmcinfo/Makefile b/x11/xvmcinfo/Makefile
index 3524a282e979..0c423323ca80 100644
--- a/x11/xvmcinfo/Makefile
+++ b/x11/xvmcinfo/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Print out XvMC extension adaptor information
 
 USE_XORG=	xvmc xv x11
 
-LDFLAGS=	-lXvMC -lXv -lX11
+LDFLAGS+=	-lXvMC -lXv -lX11
 NO_WRKSUBDIR=	defined
 
 PLIST_FILES=	bin/xvmcinfo
diff --git a/x11/yakuake/Makefile b/x11/yakuake/Makefile
index 5448f4b4dedf..7469b72505a8 100644
--- a/x11/yakuake/Makefile
+++ b/x11/yakuake/Makefile
@@ -20,6 +20,6 @@ USE_KDEBASE_VER=3
 USE_GMAKE=	yes
 USE_GETTEXT=	yes
 
-CONFIGURE_ENV+=	LDFLAGS="${PTHREAD_LIBS}"
+LDFLAGS+=	${PTHREAD_LIBS}
 
 .include <bsd.port.mk>
diff --git a/x11/yelp/Makefile b/x11/yelp/Makefile
index df720e976ec5..1cd19df9b729 100644
--- a/x11/yelp/Makefile
+++ b/x11/yelp/Makefile
@@ -30,8 +30,8 @@ USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack intlhack gconf2 gnomedocutils
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--with-gecko=${GECKO} \
 		--with-gecko-home=${LOCALBASE}/lib/${GECKO}
 MAKE_ENV=	G_CHARSET_ALIAS="${LOCALBASE}/libdata/charset.alias"
diff --git a/x11/zenity/Makefile b/x11/zenity/Makefile
index 03ccc5ea658d..1705efbc3bea 100644
--- a/x11/zenity/Makefile
+++ b/x11/zenity/Makefile
@@ -25,8 +25,8 @@ USE_BZIP2=	yes
 USE_GETTEXT=	yes
 GNU_CONFIGURE=	yes
 INSTALLS_OMF=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
-		LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
 
 MAN1=		zenity.1