diff --git Mk/bsd.cmake.mk Mk/bsd.cmake.mk
index badd838..7326802 100644
--- Mk/bsd.cmake.mk
+++ Mk/bsd.cmake.mk
@@ -60,6 +60,9 @@ CMAKE_ARGS+=	-DCMAKE_C_COMPILER:STRING="${CC}" \
 				-DCMAKE_CXX_FLAGS_RELEASE:STRING="${CXXFLAGS}" \
 				-DCMAKE_INSTALL_PREFIX:PATH="${CMAKE_INSTALL_PREFIX}" \
 				-DCMAKE_BUILD_TYPE:STRING="${CMAKE_BUILD_TYPE}" \
+				-DCMAKE_EXE_LINKER_FLAGS="${LDFLAGS}" \
+				-DCMAKE_SHARED_LINKER_FLAGS="${LDFLAGS}" \
+				-DCMAKE_MODULE_LINKER_FLAGS="${LDFLAGS}" \
 				-DTHREADS_HAVE_PTHREAD_ARG:BOOL=YES
 
 #
@@ -88,10 +91,10 @@ PLIST_SUB+=	CMAKE_BUILD_TYPE="${CMAKE_BUILD_TYPE:L}"
 .if defined(CMAKE_USE_PTHREAD)
 CFLAGS+=		${PTHREAD_CFLAGS}
 CXXFLAGS+=		${PTHREAD_CFLAGS}
+LDFLAGS+=		${PTHREAD_LIBS}
 
 CMAKE_ARGS+=	-DCMAKE_THREAD_LIBS:STRING="${PTHREAD_LIBS}" \
-				-DCMAKE_USE_PTHREADS:BOOL=ON \
-				-DCMAKE_EXE_LINKER_FLAGS:STRING="${PTHREAD_LIBS}"
+				-DCMAKE_USE_PTHREADS:BOOL=ON
 .endif
 
 #
diff --git Mk/bsd.database.mk Mk/bsd.database.mk
index 073cd03..77edbe6 100644
--- Mk/bsd.database.mk
+++ Mk/bsd.database.mk
@@ -225,7 +225,6 @@ IGNORE=		cannot install: unknown PostgreSQL version: ${PGSQL_VER}
 .endif # Check for correct version
 CPPFLAGS+=		-I${LOCALBASE}/include
 LDFLAGS+=		-L${LOCALBASE}/lib
-CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 .endif # USE_PGSQL
 
 
diff --git Mk/bsd.efl.mk Mk/bsd.efl.mk
index d44a859..81e1167 100644
--- Mk/bsd.efl.mk
+++ Mk/bsd.efl.mk
@@ -520,9 +520,9 @@ LIB_DEPENDS+=	${_${LIB}_SLIB}.${_${LIB}_VERSION}:${PORTSDIR}/${_${LIB}_CATEGORY}
 #
 # Initialize configure enviropment
 #
-CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include" \
-		CFLAGS="-I${LOCALBASE}/include ${CFLAGS}" \
-		LDFLAGS="-L${LOCALBASE}/lib ${LDFLAGS}"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
+CFLAGS+=	-I${LOCALBASE}/include
 
 PLIST_SUB+=	E17_ARCH=freebsd${OSREL}-${ARCH}
 
diff --git Mk/bsd.gnustep.mk Mk/bsd.gnustep.mk
index aac7915..4a1547c 100644
--- Mk/bsd.gnustep.mk
+++ Mk/bsd.gnustep.mk
@@ -452,6 +452,7 @@ do-configure:
 	@(cd ${CONFIGURE_WRKSRC}; . ${GNUSTEP_MAKEFILES}/GNUstep.sh; \
 	    if ! ${SETENV} CC="${CC}" CXX="${CXX}" \
 		CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" \
+		CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \
 		INSTALL="/usr/bin/install -c -o ${BINOWN} -g ${BINGRP}" \
 		INSTALL_DATA="${INSTALL} -c" \
 		INSTALL_PROGRAM="${INSTALL} -c" \
diff --git Mk/bsd.kde.mk Mk/bsd.kde.mk
index 51515ea..edef4e6 100644
--- Mk/bsd.kde.mk
+++ Mk/bsd.kde.mk
@@ -92,8 +92,9 @@ QTCPPFLAGS+=		-D_GETOPT_H		# added to work around broken getopt.h #inc
 .if !defined (QT_NONSTANDARD)
 CONFIGURE_ARGS+=--with-extra-libs="${LOCALBASE}/lib" \
 				--with-extra-includes="${LOCALBASE}/include"
-CONFIGURE_ENV+=	MOC="${MOC}" CPPFLAGS="${CPPFLAGS} ${QTCPPFLAGS}" LIBS="${QTCFGLIBS}" \
+CONFIGURE_ENV+=	MOC="${MOC}" LIBS="${QTCFGLIBS}" \
 				QTDIR="${QT_CVS_PREFIX}" KDEDIR="${KDE_CVS_PREFIX}"
+CPPFLAGS+=		${QTCPPFLAGS}
 .endif
 
 .elif ${USE_QT_VER} == 3
@@ -123,8 +124,9 @@ CONFIGURE_ARGS+=--with-qt-includes=${QT_PREFIX}/include \
 				--with-qt-libraries=${QT_PREFIX}/lib \
 				--with-extra-libs=${LOCALBASE}/lib \
 				--with-extra-includes=${LOCALBASE}/include
-CONFIGURE_ENV+=	MOC="${MOC}" CPPFLAGS="${CPPFLAGS} ${QTCPPFLAGS}" LIBS="${QTCFGLIBS}" \
+CONFIGURE_ENV+=	MOC="${MOC}" LIBS="${QTCFGLIBS}" \
 				QTDIR="${QT_PREFIX}" KDEDIR="${KDE_PREFIX}"
+CPPFLAGS+=		${QTCPPFLAGS}
 .endif # !defined(QT_NONSTANDARD)
 
 .else
diff --git Mk/bsd.ncurses.mk Mk/bsd.ncurses.mk
index 4e83881..8eb30a7 100644
--- Mk/bsd.ncurses.mk
+++ Mk/bsd.ncurses.mk
@@ -91,8 +91,6 @@ NCURSES_LDFLAGS+=	-rpath=${NCURSESRPATH}
 .if defined(LDFLAGS)
 LDFLAGS+=${NCURSES_LDFLAGS}
 .else
-LDFLAGS=${NCURSES_LDFLAGS}
+LDFLAGS+=${NCURSES_LDFLAGS}
 .endif
 
-CONFIGURE_ENV+=		LDFLAGS="${LDFLAGS}"
-MAKE_ENV+=		LDFLAGS="${LDFLAGS}"
diff --git Mk/bsd.openssl.mk Mk/bsd.openssl.mk
index 90b9656..f4733ac 100644
--- Mk/bsd.openssl.mk
+++ Mk/bsd.openssl.mk
@@ -135,14 +135,8 @@ CFLAGS+=		-Wl,-rpath,${OPENSSLRPATH}
 .endif
 OPENSSL_LDFLAGS+=	-rpath=${OPENSSLRPATH}
 
-.if defined(LDFLAGS)
 LDFLAGS+=${OPENSSL_LDFLAGS}
-.else
-LDFLAGS=${OPENSSL_LDFLAGS}
-.endif
 
-CONFIGURE_ENV+=		LDFLAGS="${LDFLAGS}"
-MAKE_ENV+=		LDFLAGS="${LDFLAGS}"
 MAKE_ENV+=		OPENSSLLIB=${OPENSSLLIB} OPENSSLINC=${OPENSSLINC} \
 			OPENSSLBASE=${OPENSSLBASE} OPENSSLDIR=${OPENSSLDIR}
 
diff --git Mk/bsd.port.mk Mk/bsd.port.mk
index eae7c44..0d4fe2e 100644
--- Mk/bsd.port.mk
+++ Mk/bsd.port.mk
@@ -2200,6 +2200,7 @@ MAKE_ENV+=		PREFIX=${PREFIX} \
 			MOTIFLIB="${MOTIFLIB}" LIBDIR="${LIBDIR}" \
 			CC="${CC}" CFLAGS="${CFLAGS}" \
 			CPP="${CPP}" CPPFLAGS="${CPPFLAGS}" \
+			LDFLAGS="${LDFLAGS}" \
 			CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" \
 			MANPREFIX="${MANPREFIX}"
 
@@ -3689,6 +3690,7 @@ do-configure:
 	    ${SET_LATE_CONFIGURE_ARGS} \
 		if ! ${SETENV} CC="${CC}" CPP="${CPP}" CXX="${CXX}" \
 	    CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}" CXXFLAGS="${CXXFLAGS}" \
+	    LDFLAGS="${LDFLAGS}" \
 	    INSTALL="/usr/bin/install -c ${_BINOWNGRP}" \
 	    INSTALL_DATA="${INSTALL_DATA}" \
 	    INSTALL_LIB="${INSTALL_LIB}" \
diff --git Mk/bsd.qt.mk Mk/bsd.qt.mk
index 4762cde..0a27c00 100644
--- Mk/bsd.qt.mk
+++ Mk/bsd.qt.mk
@@ -25,8 +25,9 @@ CONFIGURE_ARGS+=--with-qt-includes=${QT_INCDIR} \
 		--with-qt-libraries=${QT_LIBDIR} \
 		--with-extra-libs=${LOCALBASE}/lib \
 		--with-extra-includes=${LOCALBASE}/include
-CONFIGURE_ENV+=	MOC="${MOC}" UIC="${UIC}" CPPFLAGS="${CPPFLAGS} ${QTCPPFLAGS}" LIBS="${QTCFGLIBS}" \
+CONFIGURE_ENV+=	MOC="${MOC}" UIC="${UIC}" LIBS="${QTCFGLIBS}" \
 		QMAKE="${QMAKE}" QMAKESPEC="${QMAKESPEC}" QTDIR="${QT_PREFIX}"
+CPPFLAGS+=	${QTCPPFLAGS}
 MAKE_ENV+=	QMAKESPEC="${QMAKESPEC}"
 .endif # !defined(QT_NONSTANDARD)
 
diff --git accessibility/accerciser/Makefile accessibility/accerciser/Makefile
index 2e20587..258c6ff 100644
--- accessibility/accerciser/Makefile
+++ accessibility/accerciser/Makefile
@@ -25,8 +25,8 @@ INSTALLS_OMF=	yes
 INSTALLS_ICONS=	yes
 GNU_CONFIGURE=	yes
 USE_DISPLAY=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 GCONF_SCHEMAS=	accerciser.schemas
 MAN1=		accerciser.1
diff --git accessibility/at-poke/Makefile accessibility/at-poke/Makefile
index df5a675..417a33e 100644
--- accessibility/at-poke/Makefile
+++ accessibility/at-poke/Makefile
@@ -18,7 +18,7 @@ COMMENT=	Accessibility testing and poking tool
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix libglade2 libgailgnome
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .include <bsd.port.mk>
diff --git accessibility/at-spi/Makefile accessibility/at-spi/Makefile
index f87f110..7b85d1d 100644
--- accessibility/at-spi/Makefile
+++ accessibility/at-spi/Makefile
@@ -28,8 +28,8 @@ USE_PYTHON=	yes
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-static
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 GCONF_SCHEMAS=	at-spi.schemas
 
diff --git accessibility/at-spi2-atk/Makefile accessibility/at-spi2-atk/Makefile
index af037e1..3a9f376 100644
--- accessibility/at-spi2-atk/Makefile
+++ accessibility/at-spi2-atk/Makefile
@@ -26,8 +26,8 @@ USE_GMAKE=	yes
 USE_GNOME=	gnomehack gnomehier intlhack gconf2 libxml2
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-static
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 GCONF_SCHEMAS=	at-spi2.schemas
 
 .include <bsd.port.mk>
diff --git accessibility/at-spi2-core/Makefile accessibility/at-spi2-core/Makefile
index ff63c8d..f3a594b 100644
--- accessibility/at-spi2-core/Makefile
+++ accessibility/at-spi2-core/Makefile
@@ -26,7 +26,7 @@ USE_GNOME=	gnomehack gnomehier intlhack
 USE_XORG=	x11 xi xtst
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-static
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .include <bsd.port.mk>
diff --git accessibility/atk/Makefile accessibility/atk/Makefile
index ba7b69b..cdc8418 100644
--- accessibility/atk/Makefile
+++ accessibility/atk/Makefile
@@ -30,9 +30,9 @@ USE_GNOME=	gnomehack glib20 ltverhack referencehack
 CONFIGURE_ARGS=	--enable-static \
 		--disable-gtk-doc \
 		--with-html-dir=${PREFIX}/share/doc
-CPPFLAGS=	-I${LOCALBASE}/include
-CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib" \
-		AUTOCONF=${TRUE} AUTOMAKE=${TRUE}
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
+CONFIGURE_ENV=	AUTOCONF=${TRUE} AUTOMAKE=${TRUE}
 
 post-patch:
 	@${REINPLACE_CMD} -e "/^SUBDIRS =/s/tests//" \
diff --git accessibility/atkmm/Makefile accessibility/atkmm/Makefile
index 0e4d19d..34a9448 100644
--- accessibility/atkmm/Makefile
+++ accessibility/atkmm/Makefile
@@ -22,8 +22,8 @@ USE_GMAKE=	yes
 MAKE_JOBS_SAFE=	yes
 USE_GNOME=	gnomehack atk
 GNU_CONFIGURE=	yes
-CPPFLAGS=	-I${LOCALBASE}/include
-CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--disable-documentation
 
 .include <bsd.port.mk>
diff --git accessibility/dasher/Makefile accessibility/dasher/Makefile
index 250808b..8b33001 100644
--- accessibility/dasher/Makefile
+++ accessibility/dasher/Makefile
@@ -29,8 +29,8 @@ WANT_GNOME=	yes
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
 INSTALLS_OMF=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 GCONF_SCHEMAS=	dasher.schemas
 MAN1=		dasher.1
diff --git accessibility/eflite/Makefile accessibility/eflite/Makefile
index 7ee5eb5..59d4aaa 100644
--- accessibility/eflite/Makefile
+++ accessibility/eflite/Makefile
@@ -33,7 +33,7 @@ CONFIGURE_ARGS+=	--with-vox=${FL_VOX}
 CONFIGURE_ARGS+=	--with-vox=cmu_us_kal16
 .endif
 
-CONFIGURE_ENV+=		flite_dir=${LOCALBASE}
+CONFIGURE_ENV+=	flite_dir=${LOCALBASE}
 
 PLIST_FILES=	bin/eflite
 PORTDOCS=	AUTHORS CREDITS ChangeLog INSTALL README
diff --git accessibility/gnome-mag/Makefile accessibility/gnome-mag/Makefile
index 0351c48..8277994 100644
--- accessibility/gnome-mag/Makefile
+++ accessibility/gnome-mag/Makefile
@@ -22,8 +22,8 @@ USE_GMAKE=	yes
 USE_GETTEXT=	yes
 USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 DOCSDIR=	${PREFIX}/share/doc/gnome-mag-${PORTVERSION}
 
diff --git accessibility/gnome-speech/Makefile accessibility/gnome-speech/Makefile
index 47e4195..70e2179 100644
--- accessibility/gnome-speech/Makefile
+++ accessibility/gnome-speech/Makefile
@@ -21,8 +21,8 @@ USE_GNOME=	gnomehack gnomeprefix libbonobo
 GNU_CONFIGURE=  yes
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--enable-static
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .include <bsd.port.pre.mk>
 
diff --git accessibility/gnopernicus/Makefile accessibility/gnopernicus/Makefile
index 26c3e22..ffe04da 100644
--- accessibility/gnopernicus/Makefile
+++ accessibility/gnopernicus/Makefile
@@ -26,8 +26,8 @@ INSTALLS_ICONS=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack intlhack libgnomeui atspi gnomespeech
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include `pkg-config --cflags gtk+-2.0`" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include `pkg-config --cflags gtk+-2.0`
+LDFLAGS+=	-L${LOCALBASE}/lib
 MAKE_ENV=	SED="${SED}"
 
 GCONF_SCHEMAS=	brlmonitor.schemas gnopernicus.schemas remote.schemas
diff --git accessibility/gok/Makefile accessibility/gok/Makefile
index 63bc6a6..926a2bc 100644
--- accessibility/gok/Makefile
+++ accessibility/gok/Makefile
@@ -27,8 +27,8 @@ USE_GNOME=	gnomehack gnomeprefix intlhack libgnomeui atspi libwnck \
 USE_GMAKE=	yes
 INSTALLS_ICONS=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 GCONF_SCHEMAS=	gok.schemas
 
diff --git accessibility/mousetweaks/Makefile accessibility/mousetweaks/Makefile
index 208d4dc..12cd84f 100644
--- accessibility/mousetweaks/Makefile
+++ accessibility/mousetweaks/Makefile
@@ -22,8 +22,8 @@ USE_GMAKE=	yes
 USE_GETTEXT=	yes
 INSTALLS_OMF=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 GCONF_SCHEMAS=	mousetweaks.schemas pointer-capture-applet.schemas
 MAN1=		dwell-click-applet.1 mousetweaks.1 pointer-capture-applet.1
diff --git accessibility/orca/Makefile accessibility/orca/Makefile
index e7ad1ef..e9a9c29 100644
--- accessibility/orca/Makefile
+++ accessibility/orca/Makefile
@@ -34,8 +34,8 @@ USE_GNOME=	gnomeprefix gnomehack libgnomeui gnomespeech pygnome2 \
 		pygnomedesktop
 INSTALLS_ICONS=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 MAN1=		orca.1
 
diff --git accessibility/py-atspi/Makefile accessibility/py-atspi/Makefile
index f5ae0ee..f130466 100644
--- accessibility/py-atspi/Makefile
+++ accessibility/py-atspi/Makefile
@@ -27,7 +27,7 @@ USE_GMAKE=	yes
 USE_GNOME=	gnomehack gnomehier intlhack gtk20 libxml2
 GNU_CONFIGURE=	yes
 USE_PYTHON=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .include <bsd.port.mk>
diff --git accessibility/speech-dispatcher/Makefile accessibility/speech-dispatcher/Makefile
index 65a4c50..f3b647b 100644
--- accessibility/speech-dispatcher/Makefile
+++ accessibility/speech-dispatcher/Makefile
@@ -22,9 +22,9 @@ LIB_DEPENDS=	dotconf.0:${PORTSDIR}/devel/dotconf \
 USE_GNOME=	glib20 pkgconfig
 MAKE_JOBS_SAFE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib"
 USE_GMAKE=	yes
 CFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 USE_LDCONFIG=	${PREFIX}/lib ${PREFIX}/lib/${PORTNAME}
 
 CONFFILES=	clients/emacs.conf clients/gnome-speech.conf \
diff --git archivers/dact/Makefile archivers/dact/Makefile
index ef3294c..a2679ff 100644
--- archivers/dact/Makefile
+++ archivers/dact/Makefile
@@ -23,8 +23,8 @@ USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 MAKE_JOBS_SAFE=	yes
 CONFIGURE_ARGS=	--libdir=${PREFIX}/lib
-CPPFLAGS=	${CXXFLAGS} -I${LOCALBASE}/include
-CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	${CXXFLAGS} -I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 MAKE_ARGS=	TOBUILD="dact libdact.so dact.conf"
 
 MAN1=		dact.1
diff --git archivers/epkg/Makefile archivers/epkg/Makefile
index 21e86fb..3b1ae0a 100644
--- archivers/epkg/Makefile
+++ archivers/epkg/Makefile
@@ -19,7 +19,8 @@ LIB_DEPENDS=	curl.6:${PORTSDIR}/ftp/curl \
 		expat.6:${PORTSDIR}/textproc/expat2
 
 HAS_CONFIGURE=	YES
-CONFIGURE_ENV=	CPPFLAGS=-I${LOCALBASE}/include LDFLAGS=-L${PREFIX}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--disable-encap --disable-epkg-install --without-libtar \
 		--with-libfget \
 		--prefix=${PREFIX}
diff --git archivers/file-roller/Makefile archivers/file-roller/Makefile
index 299c8ec..9bb3931 100644
--- archivers/file-roller/Makefile
+++ archivers/file-roller/Makefile
@@ -32,8 +32,8 @@ USE_GNOME=	gnomeprefix intlhack gnomehack desktopfileutils gnomedocutils \
 GNOME_DESKTOP_VERSION=2
 USE_XORG=	sm
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--disable-packagekit
 
 PORTDOCS=	AUTHORS NEWS README TODO ChangeLog
diff --git archivers/grzip/Makefile archivers/grzip/Makefile
index 55d4519..e06bc63 100644
--- archivers/grzip/Makefile
+++ archivers/grzip/Makefile
@@ -19,7 +19,6 @@ USE_GETTEXT=	yes
 USE_LDCONFIG=	yes
 CFLAGS+=	-I${LOCALBASE}/include -fPIC
 LDFLAGS+=	-L${LOCALBASE}/lib -lintl
-MAKE_ENV+=	LDFLAGS="${LDFLAGS}"
 ALL_TARGET=	${PORTNAME}
 WRAPPERS=	grztar grzdiff grzgrep grzmore
 PLIST_FILES=	bin/${PORTNAME} bin/grunzip bin/grzcat ${WRAPPERS:S|^|bin/|} \
diff --git archivers/gtar/Makefile archivers/gtar/Makefile
index 278fd62..e576eb1 100644
--- archivers/gtar/Makefile
+++ archivers/gtar/Makefile
@@ -27,9 +27,9 @@ GNU_CONFIGURE=	yes
 MAKE_JOBS_SAFE=	yes
 CONFIGURE_ARGS=	--program-prefix=g \
 		--disable-silent-rules
-CONFIGURE_ENV=	CPPFLAGS='-I${LOCALBASE}/include' \
-		LDFLAGS='-L${LOCALBASE}/lib ${LDSTATIC}' \
-		DEFAULT_ARCHIVE=/dev/sa0 \
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib ${LDSTATIC}
+CONFIGURE_ENV=	DEFAULT_ARCHIVE=/dev/sa0 \
 		DEFAULT_RMT_COMMAND=/etc/rmt
 
 .if defined(WANT_STATIC)
@@ -60,7 +60,7 @@ RUN_DEPENDS+=	xz:${PORTSDIR}/archivers/xz
 .if ${OSVERSION} < 800040
 CONFIGURE_ENV+=	gl_cv_func_mknod_works=no
 .else
-CONFIGURE_ENV+= gl_cv_func_mknod_works=yes
+CONFIGURE_ENV+=	gl_cv_func_mknod_works=yes
 .endif
 
 .include <bsd.port.post.mk>
diff --git archivers/libarchive/Makefile archivers/libarchive/Makefile
index 4f1fe9f..f23844b 100644
--- archivers/libarchive/Makefile
+++ archivers/libarchive/Makefile
@@ -46,8 +46,7 @@ MAN5=		cpio.5 \
 
 CFLAGS+=	"-I${LOCALBASE}/include"
 CPPFLAGS+=	"-I${LOCALBASE}/include"
-MAKE_ENV+=	LDFLAGS="-L${LOCALBASE}/lib"
-CONFIGURE_ENV+=	LDFLAGS="-L${LOCALBASE}/lib"
+LDFLAGS+=	"-L${LOCALBASE}/lib"
 
 check:
 	(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} check)
diff --git archivers/libcomprex/Makefile archivers/libcomprex/Makefile
index bc223b7..a965eb0 100644
--- archivers/libcomprex/Makefile
+++ archivers/libcomprex/Makefile
@@ -20,8 +20,8 @@ COMMENT=	Transparently handles automatic compression and decompression of files
 GNU_CONFIGURE=	yes
 USE_AUTOTOOLS=	libtool
 USE_GNOME=	gnomehack pkgconfig
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib -lintl"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib -lintl
 USE_LDCONFIG=	yes
 
 .if !defined(WITHOUT_NLS)
diff --git archivers/liborange/Makefile archivers/liborange/Makefile
index d2c2553..9c41596 100644
--- archivers/liborange/Makefile
+++ archivers/liborange/Makefile
@@ -31,8 +31,6 @@ USE_GNOME=	gnomehack
 USE_ICONV=	yes
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
-CONFIGURE_ENV=	CFLAGS="${CFLAGS}" \
-		LDFLAGS="${LDFLAGS}"
 USE_LDCONFIG=	yes
 
 MAN1=		orange.1
diff --git archivers/libpar2/Makefile archivers/libpar2/Makefile
index 319dd15..fdf4159 100644
--- archivers/libpar2/Makefile
+++ archivers/libpar2/Makefile
@@ -18,8 +18,8 @@ LIB_DEPENDS=	sigc-2.0:${PORTSDIR}/devel/libsigc++20
 
 GNU_CONFIGURE=	yes
 
-CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib" \
-		CPPFLAGS="-I${LOCALBASE}/include"
+LDFLAGS+=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
 
 USE_LDCONFIG=	yes
 
diff --git archivers/libunrar/Makefile archivers/libunrar/Makefile
index d34c00f..ca70541 100644
--- archivers/libunrar/Makefile
+++ archivers/libunrar/Makefile
@@ -19,7 +19,6 @@ WRKSRC=		${WRKDIR}/unrar
 
 USE_GMAKE=	yes
 MAKEFILE=	makefile.unix
-MAKE_ENV=	LDFLAGS="${LDFLAGS}"
 ALL_TARGET=	lib
 USE_LDCONFIG=	yes
 
diff --git archivers/libunrar4/Makefile archivers/libunrar4/Makefile
index 8f4d396..eca879c 100644
--- archivers/libunrar4/Makefile
+++ archivers/libunrar4/Makefile
@@ -18,7 +18,6 @@ WRKSRC=		${WRKDIR}/unrar
 
 USE_GMAKE=	yes
 MAKEFILE=	makefile.unix
-MAKE_ENV=	LDFLAGS="${LDFLAGS}"
 ALL_TARGET=	lib
 USE_LDCONFIG=	yes
 
diff --git archivers/lrzip/Makefile archivers/lrzip/Makefile
index 1e657e3..4b49504 100644
--- archivers/lrzip/Makefile
+++ archivers/lrzip/Makefile
@@ -20,8 +20,8 @@ LIB_DEPENDS=	lzo2:${PORTSDIR}/archivers/lzo2
 LICENSE=	GPLv2
 
 CFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS+=	--enable-asm
-CONFIGURE_ENV+=	LDFLAGS=-L${LOCALBASE}/lib
 GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
diff --git archivers/lzop/Makefile archivers/lzop/Makefile
index 8cb3953..a697a0b 100644
--- archivers/lzop/Makefile
+++ archivers/lzop/Makefile
@@ -23,7 +23,7 @@ LIB_DEPENDS=	lzo.1:${PORTSDIR}/archivers/lzo
 
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
-CONFIGURE_ENV+=	LDFLAGS="-L${LOCALBASE}/lib"
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 MAN1=		lzop.1
 PLIST_FILES=	bin/lzop
diff --git archivers/par2cmdline-tbb/Makefile archivers/par2cmdline-tbb/Makefile
index 068678a..50abc2e 100644
--- archivers/par2cmdline-tbb/Makefile
+++ archivers/par2cmdline-tbb/Makefile
@@ -21,8 +21,8 @@ LICENSE=	GPLv2
 
 ONLY_FOR_ARCHS=	i386 amd64 ia64
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 USE_AUTOTOOLS=	aclocal automake autoconf
 USE_GCC=	4.2+
 
diff --git archivers/pxz/Makefile archivers/pxz/Makefile
index 9c20ad1..c5b7aa9 100644
--- archivers/pxz/Makefile
+++ archivers/pxz/Makefile
@@ -32,7 +32,6 @@ MAKE_ENV+=	BINDIR=${PREFIX}/bin \
 LIB_DEPENDS+=	lzma.5:${PORTSDIR}/archivers/xz
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
-MAKE_ENV+=	LDFLAGS="${LDFLAGS}"
 .endif
 
 .if ${ARCH} == "sparc64"
diff --git archivers/rpm/Makefile archivers/rpm/Makefile
index 4889e58..930d135 100644
--- archivers/rpm/Makefile
+++ archivers/rpm/Makefile
@@ -33,8 +33,8 @@ PLIST_SUB+=	NLS="@comment "
 .else
 USE_GETTEXT=	yes
 PLIST_SUB+=	NLS=""
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib -lintl -liconv"
+CPPFLAGS+=	-I${LOCALBASE}/include
+CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib -lintl -liconv"
 .endif
 
 MAN1=		gendiff.1
diff --git archivers/rpm4/Makefile archivers/rpm4/Makefile
index 290b07f..b442b47 100644
--- archivers/rpm4/Makefile
+++ archivers/rpm4/Makefile
@@ -66,7 +66,6 @@ PLIST_SUB+=	NLS=""
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS+=--without-db \
 		--with-popt-prefix="${LOCALBASE}" \
 		--sysconfdir=${PREFIX}/etc \
diff --git archivers/rpm5/Makefile archivers/rpm5/Makefile
index 0f86a7c..594130e 100644
--- archivers/rpm5/Makefile
+++ archivers/rpm5/Makefile
@@ -61,7 +61,7 @@ CONFIGURE_ARGS+=--without-lua \
 
 .if defined(WITH_PERL)
 CONFIGURE_ARGS+=--with-perl
-CONFIGURE_ENV+=__PERL=${PERL}
+CONFIGURE_ENV+=	__PERL=${PERL}
 USE_PERL5=	yes
 PLIST_SUB+=	PERL=""
 .else
@@ -71,7 +71,7 @@ PLIST_SUB+=	PERL="@comment "
 
 .if defined(WITH_PYTHON)
 CONFIGURE_ARGS+=--with-python=${PYTHON_VER}
-CONFIGURE_ENV+=__PYTHON=${PYTHON_CMD}
+CONFIGURE_ENV+=	__PYTHON=${PYTHON_CMD}
 USE_PYTHON=	yes
 PLIST_SUB+=	PYTHON=""
 CPPFLAGS+=	-I${PYTHON_INCLUDEDIR}
@@ -96,7 +96,6 @@ CONFIGURE_ARGS+=--with-apidocs
 CPPFLAGS+=	-I${BDB_INCLUDE_DIR} -I${LOCALBASE}/include -I${LOCALBASE}/include/xar
 LDFLAGS+=	-L${BDB_LIB_DIR} -L${LOCALBASE}/lib
 
-CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS+=--with-db=external --with-bugreport="${MAINTAINER}" \
 		--with-sqlite=external --with-dbabi=db \
 		--with-zlib=external \
diff --git archivers/unalz/Makefile archivers/unalz/Makefile
index e3154c4..706b6c0 100644
--- archivers/unalz/Makefile
+++ archivers/unalz/Makefile
@@ -20,8 +20,8 @@ LICENSE_FILE=	${WRKSRC}/readme.txt
 USE_ICONV=	yes
 PLIST_FILES=	bin/unalz
 MAKEFILE=	Makefile.freebsd
-MAKE_ENV=	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
-		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 WRKSRC=		${WRKDIR}/unalz
 
 pre-patch:
diff --git archivers/unmakeself/Makefile archivers/unmakeself/Makefile
index 1520029..c4dc399 100644
--- archivers/unmakeself/Makefile
+++ archivers/unmakeself/Makefile
@@ -13,7 +13,7 @@ DISTFILES=
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Extract Makeself archives
 
-LDFLAGS=	-larchive -lbz2 -lz -lcrypto -lmd
+LDFLAGS+=	-larchive -lbz2 -lz -lcrypto -lmd
 NO_WRKSUBDIR=	yes
 
 PLIST_FILES=	bin/unmakeself
diff --git archivers/xarchiver/Makefile archivers/xarchiver/Makefile
index 7d2d810..f04daad 100644
--- archivers/xarchiver/Makefile
+++ archivers/xarchiver/Makefile
@@ -26,8 +26,8 @@ INSTALLS_ICONS=	yes
 
 .if !defined(WITHOUT_NLS)
 USE_GETTEXT=	yes
-CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 PLIST_SUB+=	NLS=""
 .else
 PLIST_SUB+=	NLS="@comment "
diff --git astro/celestia/Makefile astro/celestia/Makefile
index 93c9d90..7e3948e 100644
--- astro/celestia/Makefile
+++ astro/celestia/Makefile
@@ -27,8 +27,8 @@ USE_LUA=	5.0+	# should be optional, but the build fails without it
 WANT_GNOME=	yes
 
 CXXFLAGS+=	-fsigned-char	# fix text rendering (see Gentoo bug 316573)
-CPPFLAGS=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 
 UI_LIST=	glut gtk gnome kde
 CELESTIA_UI?=	glut
diff --git astro/fowsr/Makefile astro/fowsr/Makefile
index 703bfc3..d7b50d4 100644
--- astro/fowsr/Makefile
+++ astro/fowsr/Makefile
@@ -38,9 +38,8 @@ do-install:
 
 .if ${OSVERSION} < 800069
 LIB_DEPENDS+=	usb:${PORTSDIR}/devel/libusb
-CFLAGS+=	-I${PREFIX}/include
-LDFLAGS+=	"-L${PREFIX}/lib"
-MAKE_ENV+=	"LDFLAGS=${LDFLAGS}"
+CFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 .endif
 
 .include <bsd.port.post.mk>
diff --git astro/glunarclock/Makefile astro/glunarclock/Makefile
index 23043b7..db464fb 100644
--- astro/glunarclock/Makefile
+++ astro/glunarclock/Makefile
@@ -20,9 +20,9 @@ USE_GNOME=	gnomehack gnomepanel gnomeprefix intlhack libgnomeui
 USE_GMAKE=	yes
 USE_GETTEXT=	yes
 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`"
+CPPFLAGS+=	-I${LOCALBASE}/include `pkg-config --cflags libgnomeui-2.0`
+LDFLAGS+=	-L${LOCALBASE}/lib
+CONFIGURE_ENV=	LIBS="`pkg-config --libs libgnomeui-2.0`"
 INSTALLS_OMF=	yes
 
 PLIST_SUB=	VERSION="${PORTVERSION:R}"
diff --git astro/gpsdrive/Makefile astro/gpsdrive/Makefile
index 3284c66..68fbb18 100644
--- astro/gpsdrive/Makefile
+++ astro/gpsdrive/Makefile
@@ -23,8 +23,8 @@ USE_GNOME=	gtk20
 USE_AUTOTOOLS=	libtool
 MAKE_JOBS_UNSAFE=	yes
 
-CONFIGURE_ENV=	CPPFLAGS=-I${LOCALBASE}/include \
-		LDFLAGS=-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--disable-garmin
 USE_LDCONFIG=	yes
 
diff --git astro/libroadnav/Makefile astro/libroadnav/Makefile
index 481ad4b..720cac2 100644
--- astro/libroadnav/Makefile
+++ astro/libroadnav/Makefile
@@ -21,7 +21,8 @@ USE_GMAKE=	yes
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-wx-prefix=${LOCALBASE} --with-wx-config=${WX_CONFIG}
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 PORTDOCS=	*
 
diff --git astro/mymoon/Makefile astro/mymoon/Makefile
index 6c5762f..598602e 100644
--- astro/mymoon/Makefile
+++ astro/mymoon/Makefile
@@ -23,8 +23,8 @@ WRKSRC=		${WRKDIR}/${PORTNAME}
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 PLIST_FILES=	bin/mymoon
 
diff --git astro/nightfall/Makefile astro/nightfall/Makefile
index f8bc9b6..f7c58b1 100644
--- astro/nightfall/Makefile
+++ astro/nightfall/Makefile
@@ -23,8 +23,8 @@ USE_PERL5=	yes
 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
 CONFIGURE_ARGS=	--with-locale-prefix=${PREFIX}/share/locale
 
 MAN1=		nightfall.1
diff --git astro/nova/Makefile astro/nova/Makefile
index 3d8a6c8..0dc70a1 100644
--- astro/nova/Makefile
+++ astro/nova/Makefile
@@ -27,8 +27,8 @@ LIB_DEPENDS=	sigc-1.2.5:${PORTSDIR}/devel/libsigc++12 \
 RUN_DEPENDS=	${LOCALBASE}/share/nova/catalogs/sky2000.ncd:${PORTSDIR}/astro/sky2000
 
 USE_AUTOTOOLS=	libtool
-CONFIGURE_ENV=	CPPFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	${CXXFLAGS} -I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--datadir=${DATADIR}
 
 .include <bsd.port.mk>
diff --git astro/openuniverse/Makefile astro/openuniverse/Makefile
index 4f0ec02..cb1915f 100644
--- astro/openuniverse/Makefile
+++ astro/openuniverse/Makefile
@@ -25,9 +25,9 @@ USE_GMAKE=	yes
 CONFIGURE_ARGS=	--includedir="${LOCALBASE}/include" \
 		--libdir="${LOCALBASE}/lib" \
 
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include/GL -I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib -lm"  \
-		LIBS="-lcompat" PTHREAD_LIBS="${PTHREAD_LIBS}"
+CONFIGURE_ENV=	LIBS="-lcompat" PTHREAD_LIBS="${PTHREAD_LIBS}"
+CPPFLAGS+=	-I${LOCALBASE}/include/GL -I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib -lm
 MAKE_ENV=	PTHREAD_LIBS="${PTHREAD_LIBS}"
 
 .include <bsd.port.mk>
diff --git astro/rmap/Makefile astro/rmap/Makefile
index a7dd8ad..c5f94e3 100644
--- astro/rmap/Makefile
+++ astro/rmap/Makefile
@@ -20,7 +20,7 @@ MAN1=		rmap.1
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 
-CPPFLAGS=	-I${LOCALBASE}/include
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LIBS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib"
 
 .include <bsd.port.mk>
diff --git astro/roadnav/Makefile astro/roadnav/Makefile
index ef93ff3..b3f6127 100644
--- astro/roadnav/Makefile
+++ astro/roadnav/Makefile
@@ -23,7 +23,8 @@ USE_GMAKE=	yes
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-wx-prefix=${LOCALBASE} --with-wx-config=${WX_CONFIG}
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 PORTDOCS=	*
 
diff --git astro/starplot/Makefile astro/starplot/Makefile
index 5c2d45b..1a4b469 100644
--- astro/starplot/Makefile
+++ astro/starplot/Makefile
@@ -18,8 +18,8 @@ USE_GNOME=	gnomehack gtk20
 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=		starconvert.1 starpkg.1 starplot.1
 
diff --git astro/viking/Makefile astro/viking/Makefile
index 4d6d9f8..2cc97af 100644
--- astro/viking/Makefile
+++ astro/viking/Makefile
@@ -19,8 +19,8 @@ RUN_DEPENDS=	gpsbabel:${PORTSDIR}/astro/gpsbabel
 
 OPTIONS=	GPSD	"Enable realtime GPS tracking"	off
 
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CPPFLAGS}" \
-		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CPPFLAGS}
+LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
 INSTALLS_OMF=	yes
diff --git astro/xplanet/Makefile astro/xplanet/Makefile
index 6db314e..a07a842 100644
--- astro/xplanet/Makefile
+++ astro/xplanet/Makefile
@@ -17,8 +17,8 @@ GNU_CONFIGURE=	yes
 USE_XORG=	xt xscrnsaver
 USE_GNOME=	#
 CONFIGURE_ARGS=	--with-map-extension=jpg
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib -lm"
+CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib -lm"
+CPPFLAGS+=	-I${LOCALBASE}/include
 
 OPTIONS=	FREETYPE "Enable Freetype support" on \
 		PANGO "Enable PANGO support" on \
diff --git astro/xtide/Makefile astro/xtide/Makefile
index 3c66fa3..17930e9 100644
--- astro/xtide/Makefile
+++ astro/xtide/Makefile
@@ -24,13 +24,12 @@ LICENSE=	GPLv3
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 
 MAN1=		tide.1
 MAN8=		xttpd.8
 
-CPPFLAGS=	-I../${TCD_DISTNAME} -I${LOCALBASE}/include/libpng
-LDFLAGS=	-L../${TCD_DISTNAME}/.libs -L${LOCALBASE}/lib
+CPPFLAGS+=	-I../${TCD_DISTNAME} -I${LOCALBASE}/include/libpng
+LDFLAGS+=	-L../${TCD_DISTNAME}/.libs -L${LOCALBASE}/lib
 MAKE_JOBS_SAFE=	yes
 
 TCD_DISTNAME=	libtcd-2.2.5
diff --git audio/adplay/Makefile audio/adplay/Makefile
index 48bc403..81a5f0f 100644
--- audio/adplay/Makefile
+++ audio/adplay/Makefile
@@ -30,7 +30,6 @@ CPPFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include/libbinio
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 CONFIGURE_ARGS+=	--sharedstatedir=${DATADIR}
-CONFIGURE_ENV+=		LDFLAGS="${LDFLAGS}"
 
 LICENSE=	GPLv2
 MAN1=		adplay.1
diff --git audio/akode-plugins-ffmpeg/Makefile audio/akode-plugins-ffmpeg/Makefile
index 68352f7..708c4ca 100644
--- audio/akode-plugins-ffmpeg/Makefile
+++ audio/akode-plugins-ffmpeg/Makefile
@@ -35,7 +35,7 @@ USE_GMAKE=	yes
 WRKSRC=		${WRKDIR}/akode-${PORTVERSION}
 USE_LDCONFIG=	yes
 
-CONFIGURE_ENV+=	LDFLAGS=-L${WRKSRC}/akode/lib/.libs
+LDFLAGS+=	-L${WRKSRC}/akode/lib/.libs
 CONFIGURE_ARGS+=--with-extra-libs=${LOCALBASE}/lib \
 		--with-extra-includes=${LOCALBASE}/include
 
diff --git audio/akode-plugins-jack/Makefile audio/akode-plugins-jack/Makefile
index 59be97b..9d97000 100644
--- audio/akode-plugins-jack/Makefile
+++ audio/akode-plugins-jack/Makefile
@@ -33,7 +33,7 @@ USE_GMAKE=	yes
 WRKSRC=		${WRKDIR}/akode-${PORTVERSION}
 USE_LDCONFIG=	yes
 
-CONFIGURE_ENV+=	LDFLAGS=-L${WRKSRC}/akode/lib/.libs
+LDFLAGS+=	-L${WRKSRC}/akode/lib/.libs
 CONFIGURE_ARGS+=--with-extra-libs=${LOCALBASE}/lib \
 		--with-extra-includes=${LOCALBASE}/include
 
diff --git audio/akode-plugins-mpc/Makefile audio/akode-plugins-mpc/Makefile
index 4b8847b..5007c3d 100644
--- audio/akode-plugins-mpc/Makefile
+++ audio/akode-plugins-mpc/Makefile
@@ -35,7 +35,7 @@ PLIST_FILES=	lib/libakode_mpc_decoder.a \
 		lib/libakode_mpc_decoder.la \
 		lib/libakode_mpc_decoder.so
 
-CONFIGURE_ENV+=	LDFLAGS=-L${WRKSRC}/akode/lib/.libs
+LDFLAGS+=	-L${WRKSRC}/akode/lib/.libs
 CONFIGURE_ARGS+=--with-extra-libs=${LOCALBASE}/lib \
 		--with-extra-includes=${LOCALBASE}/include
 
diff --git audio/akode-plugins-mpeg/Makefile audio/akode-plugins-mpeg/Makefile
index 3bbcdda..836f2ba 100644
--- audio/akode-plugins-mpeg/Makefile
+++ audio/akode-plugins-mpeg/Makefile
@@ -37,7 +37,7 @@ PLIST_FILES=	lib/libakode_mpeg_decoder.a \
 		lib/libakode_mpeg_decoder.la \
 		lib/libakode_mpeg_decoder.so
 
-CONFIGURE_ENV+=	LDFLAGS=-L${WRKSRC}/akode/lib/.libs
+LDFLAGS+=	-L${WRKSRC}/akode/lib/.libs
 CONFIGURE_ARGS+=--with-extra-libs=${LOCALBASE}/lib \
 		--with-extra-includes=${LOCALBASE}/include
 
diff --git audio/akode-plugins-oss/Makefile audio/akode-plugins-oss/Makefile
index 75a5ebf..934b392 100644
--- audio/akode-plugins-oss/Makefile
+++ audio/akode-plugins-oss/Makefile
@@ -35,7 +35,7 @@ PLIST_FILES=	lib/libakode_oss_sink.a \
 		lib/libakode_oss_sink.la \
 		lib/libakode_oss_sink.so
 
-CONFIGURE_ENV+=	LDFLAGS=-L${WRKSRC}/akode/lib/.libs
+LDFLAGS+=	-L${WRKSRC}/akode/lib/.libs
 CONFIGURE_ARGS+=--with-extra-libs=${LOCALBASE}/lib \
 		--with-extra-includes=${LOCALBASE}/include
 
diff --git audio/akode-plugins-pulseaudio/Makefile audio/akode-plugins-pulseaudio/Makefile
index a50fee9..109b1ca 100644
--- audio/akode-plugins-pulseaudio/Makefile
+++ audio/akode-plugins-pulseaudio/Makefile
@@ -36,7 +36,7 @@ USE_LDCONFIG=	yes
 PLIST_FILES=	lib/libakode_polyp_sink.a lib/libakode_polyp_sink.la \
 		lib/libakode_polyp_sink.so
 
-CONFIGURE_ENV+=	LDFLAGS=-L${WRKSRC}/akode/lib/.libs
+LDFLAGS+=	-L${WRKSRC}/akode/lib/.libs
 CONFIGURE_ARGS+=--with-extra-libs=${LOCALBASE}/lib \
 		--with-extra-includes=${LOCALBASE}/include
 
diff --git audio/akode-plugins-resampler/Makefile audio/akode-plugins-resampler/Makefile
index deb4ec1..120a45f 100644
--- audio/akode-plugins-resampler/Makefile
+++ audio/akode-plugins-resampler/Makefile
@@ -37,7 +37,7 @@ PLIST_FILES=	lib/libakode_src_resampler.a \
 		lib/libakode_src_resampler.la \
 		lib/libakode_src_resampler.so
 
-CONFIGURE_ENV+=	LDFLAGS=-L${WRKSRC}/akode/lib/.libs
+LDFLAGS+=	-L${WRKSRC}/akode/lib/.libs
 CONFIGURE_ARGS+=--with-extra-libs=${LOCALBASE}/lib \
 		--with-extra-includes=${LOCALBASE}/include
 
diff --git audio/akode-plugins-xiph/Makefile audio/akode-plugins-xiph/Makefile
index bef06bc..d36279c 100644
--- audio/akode-plugins-xiph/Makefile
+++ audio/akode-plugins-xiph/Makefile
@@ -41,7 +41,7 @@ PLIST_FILES=	lib/libakode_xiph_decoder.a \
 		lib/libakode_xiph_decoder.la \
 		lib/libakode_xiph_decoder.so
 
-CONFIGURE_ENV+=	LDFLAGS=-L${WRKSRC}/akode/lib/.libs
+LDFLAGS+=	-L${WRKSRC}/akode/lib/.libs
 CONFIGURE_ARGS+=--with-extra-libs=${LOCALBASE}/lib \
 		--with-extra-includes=${LOCALBASE}/include
 
diff --git audio/alsa-plugins/Makefile audio/alsa-plugins/Makefile
index 773667b..2df8756 100644
--- audio/alsa-plugins/Makefile
+++ audio/alsa-plugins/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS=	asound.2:${PORTSDIR}/audio/alsa-lib
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 USE_GNOME=	pkgconfig
-CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib"
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 OPTIONS=	JACK		"JACK audio support (requires SAMPLERATE)"	Off \
 		LAVC		"libavcodec support"	Off \
@@ -43,7 +43,7 @@ CONFIGURE_ARGS+=	--disable-jack
 
 .if defined(WITH_LAVC)
 CONFIGURE_ARGS+=	--enable-avcodec
-CONFIGURE_ENV+=		CFLAGS=-I${LOCALBASE}/include
+CFLAGS+=		-I${LOCALBASE}/include
 LIB_DEPENDS+=		avcodec.1:${PORTSDIR}/multimedia/ffmpeg
 PLIST_SUB+=		LAVC=""
 .else
diff --git audio/alsa-utils/Makefile audio/alsa-utils/Makefile
index e68033e..417bc81 100644
--- audio/alsa-utils/Makefile
+++ audio/alsa-utils/Makefile
@@ -22,7 +22,7 @@ RUN_DEPENDS=	${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:${PORTSDIR}/a
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CFLAGS="-I${LOCALBASE}/include"
+CFLAGS+=	-I${LOCALBASE}/include
 
 MAN1_EN=	aconnect.1 alsactl.1 alsamixer.1 amidi.1 amixer.1 aplay.1 aplaymidi.1 \
 		arecordmidi.1 aseqdump.1 aseqnet.1 iecset.1 speaker-test.1
@@ -42,11 +42,11 @@ CONFIGURE_ARGS+=--disable-xmlto
 .endif
 
 .if defined(WITHOUT_NLS)
-CONFIGURE_ENV+=	LDFLAGS="-L${LOCALBASE}/lib"
+LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS+=--disable-nls
 PLIST_SUB+=	NLS="@comment "
 .else
-CONFIGURE_ENV+=	LDFLAGS="-L${LOCALBASE}/lib -lintl"
+LDFLAGS+=	-L${LOCALBASE}/lib -lintl
 USE_GETTEXT=	yes
 PLIST_SUB+=	NLS=""
 .endif
diff --git audio/aqualung/Makefile audio/aqualung/Makefile
index 7a09f10..ca3e3dc 100644
--- audio/aqualung/Makefile
+++ audio/aqualung/Makefile
@@ -42,9 +42,8 @@ USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--program-transform-name="" --with-alsa=no --with-ifp=no \
 		--with-cdda=no
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
-CPPFLAGS=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib -lstrfunc
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib -lstrfunc
 MAN1=		${PORTNAME}.1
 
 OPTIONS=	JACK "Enable JACK low-latency audio server support" Off \
diff --git audio/audacity-devel/Makefile audio/audacity-devel/Makefile
index 911b3aa..a2f3b21 100644
--- audio/audacity-devel/Makefile
+++ audio/audacity-devel/Makefile
@@ -68,9 +68,7 @@ CPPFLAGS+=	-I${WRKSRC}/lib-src/portsmf -I${WRKSRC}/lib-src/portaudio-v19/include
 CXXFLAGS+=	-I${WRKSRC}/lib-src/portsmf -I${WRKSRC}/lib-src/portaudio-v19/include -I${LOCALBASE}/include ${SSE_CFLAGS} ${PTHREAD_CFLAGS}
 CFLAGS+=	-I${WRKSRC}/lib-src/portsmf -I${WRKSRC}/lib-src/portaudio-v19/include -I${LOCALBASE}/include ${SSE_CFLAGS} ${PTHREAD_CFLAGS}
 
-CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS}" \
-		CPPFLAGS="${CPPFLAGS}" \
-		WX_CONFIG="${WX_CONFIG}"
+CONFIGURE_ENV+=	WX_CONFIG="${WX_CONFIG}"
 
 .if !defined(NOPORTDOCS)
 MAKE_ENV=	DOC=yes
diff --git audio/audacity/Makefile audio/audacity/Makefile
index 1ca7f8f..57c87d5 100644
--- audio/audacity/Makefile
+++ audio/audacity/Makefile
@@ -37,9 +37,9 @@ OPTIONS=	ID3TAG	"ID3 tag support"		off \
 SSE_CFLAGS=	-mno-sse -mno-sse2
 .endif
 
-CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib ${PTHREAD_LIBS}" \
-		CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include ${SSE_CFLAGS} ${PTHREAD_CFLAGS}" \
-		CFLAGS="${CFLAGS} -I${LOCALBASE}/include ${SSE_CFLAGS} ${PTHREAD_CFLAGS}"
+CFLAGS+=	-I${LOCALBASE}/include ${SSE_CFLAGS} ${PTHREAD_CFLAGS}
+CPPFLAGS+=	-I${LOCALBASE}/include ${SSE_CFLAGS} ${PTHREAD_CFLAGS}
+LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 
 .if !defined(NOPORTDOCS)
 MAKE_ENV=	DOC=yes
diff --git audio/audiere/Makefile audio/audiere/Makefile
index 3e2aaea..834fbe1 100644
--- audio/audiere/Makefile
+++ audio/audiere/Makefile
@@ -20,9 +20,9 @@ WANT_WX=	yes
 USE_AUTOTOOLS=	autoconf
 USE_LDCONFIG=	yes
 
-CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib" \
-		CPPFLAGS="-I${LOCALBASE}/include/speex -I${LOCALBASE}/include" \
-		PTHREAD_LIBS="${PTHREAD_LIBS}" PTHREAD_CFLAGS="${PTHREAD_CFLAGS}"
+CONFIGURE_ENV=	PTHREAD_LIBS="${PTHREAD_LIBS}" PTHREAD_CFLAGS="${PTHREAD_CFLAGS}"
+CPPFLAGS+=	-I${LOCALBASE}/include/speex -I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 PORTDOCS=	changelog.txt cvs.txt dependencies.txt faq.txt glossary.txt \
 		license.txt overview.txt readme.txt release-howto.txt \
diff --git audio/aumix/Makefile audio/aumix/Makefile
index dffa57c..ec7a481 100644
--- audio/aumix/Makefile
+++ audio/aumix/Makefile
@@ -24,8 +24,8 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--includedir="${LOCALBASE}/include" \
 		--enable-own-labels \
 		--libdir="${LOCALBASE}/lib"
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 MAN1=		aumix.1 xaumix.1 mute.1
 PLIST_DIRS=	share/aumix
diff --git audio/blop/Makefile audio/blop/Makefile
index 9a868c2..101dd97 100644
--- audio/blop/Makefile
+++ audio/blop/Makefile
@@ -17,13 +17,12 @@ BUILD_DEPENDS=	${LOCALBASE}/include/ladspa.h:${PORTSDIR}/audio/ladspa
 
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--with-ladspa-prefix="${LOCALBASE}"
 
 OPTIONS=	NLS "Native language support" on
 
-CPPFLAGS=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .include <bsd.port.pre.mk>
 
diff --git audio/bmp-mac/Makefile audio/bmp-mac/Makefile
index 744b696..115330c 100644
--- audio/bmp-mac/Makefile
+++ audio/bmp-mac/Makefile
@@ -20,7 +20,6 @@ LIB_DEPENDS=	beep.2:${PORTSDIR}/multimedia/beep-media-player \
 
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}"
 USE_AUTOTOOLS=	autoconf libtool
 CPPFLAGS+=	"-I${LOCALBASE}/include"
 PLUGDIR=	lib/bmp/Input
diff --git audio/cantus_3/Makefile audio/cantus_3/Makefile
index d5a9670..c7433a5 100644
--- audio/cantus_3/Makefile
+++ audio/cantus_3/Makefile
@@ -30,9 +30,8 @@ USE_GMAKE=	yes
 USE_GNOME=	gnomehack gnomeprefix libglade2 glib20
 USE_LDCONFIG=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
+LDFLAGS+=	-L${LOCALBASE}/lib
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--program-transform-name="" --disable-static
 WRKSRC=		${WRKDIR}/${DISTNAME:S/.src//}
 
diff --git audio/cowbell/Makefile audio/cowbell/Makefile
index da3864b..3e83c48 100644
--- audio/cowbell/Makefile
+++ audio/cowbell/Makefile
@@ -22,7 +22,8 @@ GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_GETTEXT=	yes
 USE_ICONV=	yes
-CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .include <bsd.port.pre.mk>
 
diff --git audio/darkice/Makefile audio/darkice/Makefile
index fa10aef..daf890c 100644
--- audio/darkice/Makefile
+++ audio/darkice/Makefile
@@ -26,8 +26,9 @@ OPTIONS=	VORBIS "Ogg Vorbis support" on \
 
 USE_AUTOTOOLS=	aclocal autoconf
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${PTHREAD_CFLAGS}" LDFLAGS="${PTHREAD_LIBS}" \
-		ac_cv_prog_acx_pthread_config=no
+CONFIGURE_ENV=	ac_cv_prog_acx_pthread_config=no
+CPPFLAGS+=	${PTHREAD_CFLAGS}
+LDFLAGS+=	${PTHREAD_LIBS}
 CONFIGURE_ARGS=	--without-alsa
 
 SUB_FILES=	pkg-message
diff --git audio/denemo/Makefile audio/denemo/Makefile
index 3e41f4c..5085749c 100644
--- audio/denemo/Makefile
+++ audio/denemo/Makefile
@@ -33,8 +33,8 @@ CONFIGURE_ARGS=	--enable-jack \
 PORTDOCS=	*
 PORTEXAMPLES=	*
 
-CPPFLAGS=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .include <bsd.port.options.mk>
 .include <bsd.port.pre.mk>
diff --git audio/dvda-author/Makefile audio/dvda-author/Makefile
index 4f62cbb..13e8fb1 100644
--- audio/dvda-author/Makefile
+++ audio/dvda-author/Makefile
@@ -37,6 +37,5 @@ CONFIGURE_ARGS=	--with-flac=${LOCALBASE}/lib/libFLAC.so \
 .if defined(NOPORTDOCS)
 CONFIGURE_ARGS+=	--docdir=${WRKDIR}/doc
 .endif
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 
 .include <bsd.port.mk>
diff --git audio/easytag-devel/Makefile audio/easytag-devel/Makefile
index 3d8fed0..5fe2169 100644
--- audio/easytag-devel/Makefile
+++ audio/easytag-devel/Makefile
@@ -27,8 +27,8 @@ USE_BZIP2=	yes
 USE_GETTEXT=	yes
 USE_GNOME=	gnomehack gnomeprefix gtk20 desktopfileutils
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -DHAVE_GTK" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include -DHAVE_GTK
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .if defined(WITH_WAVPACK)
 LIB_DEPENDS+=		wavpack.2:${PORTSDIR}/audio/wavpack
diff --git audio/easytag/Makefile audio/easytag/Makefile
index 9d2f3ee..6a2c18d 100644
--- audio/easytag/Makefile
+++ audio/easytag/Makefile
@@ -26,8 +26,8 @@ USE_BZIP2=	yes
 USE_GETTEXT=	yes
 USE_GNOME=	gnomehack gnomeprefix gtk20 desktopfileutils
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -DHAVE_GTK" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include -DHAVE_GTK
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .if defined(WITH_WAVPACK)
 LIB_DEPENDS+=		wavpack.2:${PORTSDIR}/audio/wavpack
diff --git audio/ecasound/Makefile audio/ecasound/Makefile
index 395494f..4d5da85 100644
--- audio/ecasound/Makefile
+++ audio/ecasound/Makefile
@@ -27,7 +27,6 @@ LICENSE_COMB=	dual
 
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
-CONFIGURE_ENV=	LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--disable-pyecasound \
 		--disable-rubyecasound \
 		--enable-sys-readline
@@ -38,8 +37,8 @@ MAN1=		ecaconvert.1 ecafixdc.1 ecalength.1 ecamonitor.1 \
 		ecasound-iam.1 ecatools.1
 MAN5=		ecasoundrc.5
 
-CPPFLAGS=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
+CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 
 .include <bsd.port.pre.mk>
 
diff --git audio/ermixer/Makefile audio/ermixer/Makefile
index fd9bfe0..8cded70 100644
--- audio/ermixer/Makefile
+++ audio/ermixer/Makefile
@@ -27,8 +27,8 @@ USE_PERL5_BUILD=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 
-CONFIGURE_ENV+=	LDFLAGS="${PTHREAD_LIBS}"
-CONFIGURE_ENV+=	CPPFLAGS="${PTHREAD_CFLAGS}"
+LDFLAGS+=	${PTHREAD_LIBS}
+CPPFLAGS+=	${PTHREAD_CFLAGS}
 PLIST_FILES=	bin/ermixer
 
 .include <bsd.port.pre.mk>
diff --git audio/espeak/Makefile audio/espeak/Makefile
index 8f8d1c0..095925a 100644
--- audio/espeak/Makefile
+++ audio/espeak/Makefile
@@ -20,8 +20,7 @@ LIB_DEPENDS=	portaudio:${PORTSDIR}/audio/portaudio
 CONFLICTS=	speak-1.[0-9]
 
 MAKE_ENV+=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
-		PTHREAD_LIBS="${PTHREAD_LIBS}" CPPFLAGS="${CPPFLAGS}" \
-		LDFLAGS="${LDFLAGS}"
+		PTHREAD_LIBS="${PTHREAD_LIBS}"
 
 USE_GMAKE=	yes
 USE_GCC=	4.2+
diff --git audio/extace/Makefile audio/extace/Makefile
index 2bf02de..bcd95fc 100644
--- audio/extace/Makefile
+++ audio/extace/Makefile
@@ -18,8 +18,8 @@ LIB_DEPENDS=	fftw3.5:${PORTSDIR}/math/fftw3
 
 USE_GNOME=	esound gnomehack gnomehier gtk20
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 PLIST_FILES=	bin/extace \
 		share/gnome/apps/Multimedia/extace.desktop
diff --git audio/ezstream/Makefile audio/ezstream/Makefile
index 983c830..52acd11 100644
--- audio/ezstream/Makefile
+++ audio/ezstream/Makefile
@@ -24,7 +24,6 @@ USE_GNOME=	libxml2
 USE_ICONV=	yes
 USE_RC_SUBR=	${PORTNAME}
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 
 MAN1=		ezstream.1 ezstream-file.sh.1
 PORTDOCS=	NEWS README
@@ -34,8 +33,8 @@ PORTEXAMPLES=	ezstream_metadata.xml ezstream_mp3.xml \
 		ezstream_vorbis.xml meta.sh play.sh
 PLIST_FILES=	bin/ezstream bin/ezstream-file.sh etc/ezstream/ezstream.xml '@dirrm etc/ezstream'
 
-CPPFLAGS=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
+CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 
 .include <bsd.port.pre.mk>
 
diff --git audio/faac/Makefile audio/faac/Makefile
index feedc7e..dbc2d8c 100644
--- audio/faac/Makefile
+++ audio/faac/Makefile
@@ -26,8 +26,8 @@ USE_AUTOTOOLS=	aclocal autoheader automake autoconf libtool
 ACLOCAL_ARGS=	-I . -I ${LOCALBASE}/share/aclocal
 AUTOMAKE_ARGS=	--add-missing
 CONFIGURE_ARGS=	--with-mp4v2
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 USE_LDCONFIG=	yes
 
 MAN1=		faac.1
diff --git audio/faad/Makefile audio/faad/Makefile
index c685df2..583d7ba 100644
--- audio/faad/Makefile
+++ audio/faad/Makefile
@@ -22,8 +22,8 @@ MAKE_JOBS_SAFE=	yes
 USE_AUTOTOOLS=	aclocal autoheader automake autoconf libtool
 ACLOCAL_ARGS=	-I . -I ${LOCALBASE}/share/aclocal
 AUTOMAKE_ARGS=	--add-missing
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
-		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 USE_LDCONFIG=	yes
 
 MAN1=		faad.1
diff --git audio/firefly/Makefile audio/firefly/Makefile
index 4f8d757..c8065cc 100644
--- audio/firefly/Makefile
+++ audio/firefly/Makefile
@@ -26,10 +26,10 @@ LIB_DEPENDS=	ogg:${PORTSDIR}/audio/libogg \
 CONFLICTS=	mt-daapd-0.2.*
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CFLAGS+="${PTHREAD_CFLAGS}" \
-		CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib" \
-		LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CFLAGS+=	${PTHREAD_CFLAGS}
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=		--prefix=${PREFIX} --with-id3tag=${PREFIX} \
 			--enable-sqlite3 --enable-oggvorbis --enable-flac
diff --git audio/flac/Makefile audio/flac/Makefile
index 231fda4..9421588 100644
--- audio/flac/Makefile
+++ audio/flac/Makefile
@@ -22,7 +22,7 @@ CONFIGURE_ARGS=	--enable-sse \
 		--with-ogg="${LOCALBASE}" \
 		--disable-thorough-tests \
 		--disable-xmms-plugin
-CONFIGURE_ENV=	CPPFLAGS="-I${WRKSRC}/include"
+CPPFLAGS+=	-I${WRKSRC}/include
 MAKE_JOBS_SAFE=	yes
 
 .if !defined(WITHOUT_ICONV)
diff --git audio/fluidsynth/Makefile audio/fluidsynth/Makefile
index a385896..4e73aca 100644
--- audio/fluidsynth/Makefile
+++ audio/fluidsynth/Makefile
@@ -22,7 +22,6 @@ OPTIONS=	JACK "Enable Jack audio support" On \
 USE_GNOME=	glib20 gnomehack pkgconfig
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--disable-alsa-support --disable-midishare \
 		--disable-coreaudio --disable-coremidi \
 		--disable-dart --disable-lash \
@@ -31,8 +30,8 @@ USE_LDCONFIG=	yes
 
 MAN1=		fluidsynth.1
 
-CPPFLAGS=	${PA2_CFLAGS} -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS=	${PA2_LIBS} -L${LOCALBASE}/lib ${PTHREAD_LIBS}
+CPPFLAGS+=	${PA2_CFLAGS} -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS+=	${PA2_LIBS} -L${LOCALBASE}/lib ${PTHREAD_LIBS}
 
 .include <bsd.port.pre.mk>
 
diff --git audio/freealut/Makefile audio/freealut/Makefile
index 05b7800..d574225 100644
--- audio/freealut/Makefile
+++ audio/freealut/Makefile
@@ -16,7 +16,8 @@ COMMENT=	The OpenAL Utility Toolkit
 
 USE_AUTOTOOLS=	libtool
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 USE_GMAKE=	yes
 USE_GNOME=	pkgconfig gnomehack
 USE_OPENAL=	al
diff --git audio/ghostess/Makefile audio/ghostess/Makefile
index f05016b..34a0a83 100644
--- audio/ghostess/Makefile
+++ audio/ghostess/Makefile
@@ -30,13 +30,12 @@ USE_BZIP2=	yes
 USE_GNOME=	gtk20
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--with-jackmidi
 
 MAN1=		ghostess.1
 PLIST_FILES=	bin/ghostess bin/ghostess_universal_gui
 
-CPPFLAGS=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .include <bsd.port.mk>
diff --git audio/gigedit/Makefile audio/gigedit/Makefile
index 7b679cc..11d77a0 100644
--- audio/gigedit/Makefile
+++ audio/gigedit/Makefile
@@ -21,8 +21,8 @@ RUN_DEPENDS=	${LOCALBASE}/lib/linuxsampler/liblinuxsampler.so.3:${PORTSDIR}/audi
 BUILD_DEPENDS=	${RUN_DEPENDS}
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 USE_GMAKE=	yes
 USE_GETTEXT=	yes
 USE_LDCONFIG=	yes
diff --git audio/gimmix/Makefile audio/gimmix/Makefile
index 6b18692..763d663 100644
--- audio/gimmix/Makefile
+++ audio/gimmix/Makefile
@@ -37,8 +37,8 @@ MAN1=		gimmix.1
 CONFIGURE_ENV=	DATADIRNAME=share
 
 .if !defined(WITHOUT_NLS)
-CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib -lintl"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib -lintl
 CONFIGURE_ARGS+=	--enable-nls
 USE_GETTEXT=	yes
 PLIST_SUB+=	NLS=""
diff --git audio/glame/Makefile audio/glame/Makefile
index f639a40..1f46bad 100644
--- audio/glame/Makefile
+++ audio/glame/Makefile
@@ -26,13 +26,12 @@ USE_GETTEXT=	yes
 GNU_CONFIGURE=	yes
 USE_AUTOTOOLS=	libltdl libtool
 USE_GMAKE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \
-		MAKEINFO="makeinfo --no-split"
+CONFIGURE_ENV=	MAKEINFO="makeinfo --no-split"
 
 INFO=		glame glame-dev
 
-CPPFLAGS=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib -lltdl
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib -lltdl
 
 post-extract:
 	@cd ${WRKSRC}/doc && ${RM} -f *.info*
diff --git audio/gmpc-mserver/Makefile audio/gmpc-mserver/Makefile
index 7f87585..bd25faf 100644
--- audio/gmpc-mserver/Makefile
+++ audio/gmpc-mserver/Makefile
@@ -23,8 +23,8 @@ RUN_DEPENDS=	gmpc:${PORTSDIR}/audio/gmpc
 
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 USE_GNOME=	gnomehack pkgconfig glib20 gtk20 libxml2
 USE_GETTEXT=	yes
 
diff --git audio/gmpc/Makefile audio/gmpc/Makefile
index 80e0c26..6fe5190 100644
--- audio/gmpc/Makefile
+++ audio/gmpc/Makefile
@@ -28,7 +28,8 @@ USE_GNOME=	gnomehack pkgconfig glib20 gtk20 libglade2
 INSTALLS_ICONS=	yes
 USE_GETTEXT=	yes
 CONFIGURE_ARGS=	--enable-system-libsexy
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 MAN1=		gmpc-remote.1 gmpc.1
 
diff --git audio/gnapster/Makefile audio/gnapster/Makefile
index 3b0eb57..2dcfa63 100644
--- audio/gnapster/Makefile
+++ audio/gnapster/Makefile
@@ -22,8 +22,8 @@ USE_GETTEXT=	yes
 USE_GNOME=	imlib
 WANT_GNOME=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .include <bsd.port.pre.mk>
 
diff --git audio/gnome-media/Makefile audio/gnome-media/Makefile
index 9af09efb..0961672 100644
--- audio/gnome-media/Makefile
+++ audio/gnome-media/Makefile
@@ -31,8 +31,8 @@ GNOME_DESKTOP_VERSION=2
 USE_GNOME=	gnomeprefix gnomehack intlhack gtk20 libxml2 gconf2
 USE_GSTREAMER=	gconf good
 CONFIGURE_ARGS=	--disable-gstmix
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 GCONF_SCHEMAS=	gnome-audio-profiles.schemas \
 		gnome-sound-recorder.schemas
diff --git audio/gnomoradio/Makefile audio/gnomoradio/Makefile
index 138b9e7..cde6d6d 100644
--- audio/gnomoradio/Makefile
+++ audio/gnomoradio/Makefile
@@ -26,8 +26,8 @@ USE_GNOME=		gnomehack gnomeprefix
 USE_AUTOTOOLS=		libtool
 USE_LDCONFIG=		yes
 LIBTOOLFLAGS=		--tag=CXX
-CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
-			LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|CCLD = $$(CC)|CCLD = $$(CXX)|; \
diff --git audio/gogo-petit/Makefile audio/gogo-petit/Makefile
index 9650595..8417737 100644
--- audio/gogo-petit/Makefile
+++ audio/gogo-petit/Makefile
@@ -25,8 +25,7 @@ AS =		nasm
 AFLAGS =	-f elf -Ox
 ALL_TARGET=	test
 MAKE_ENV+=	AS="${AS}" \
-		AFLAGS="${AFLAGS}" \
-		LDFLAGS="${LDFLAGS}"
+		AFLAGS="${AFLAGS}"
 
 ONLY_FOR_ARCHS=	i386
 PLIST_FILES=	bin/gogo-petit
diff --git audio/goobox/Makefile audio/goobox/Makefile
index aa429d3..b72f9fa 100644
--- audio/goobox/Makefile
+++ audio/goobox/Makefile
@@ -28,8 +28,8 @@ USE_GSTREAMER=	cdparanoia gconf core
 GNU_CONFIGURE=	yes
 INSTALLS_OMF=	yes
 INSTALLS_ICONS=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 GCONF_SCHEMAS=	goobox.schemas
 
diff --git audio/gqmpeg-devel/Makefile audio/gqmpeg-devel/Makefile
index 099aae6..8d83d7e 100644
--- audio/gqmpeg-devel/Makefile
+++ audio/gqmpeg-devel/Makefile
@@ -34,8 +34,8 @@ USE_XORG=	xext xrender xinerama xi xrandr xcursor xcomposite xdamage x11 \
 USE_GNOME=	gtk20
 GNU_CONFIGURE=  yes
 
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib" \
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 CONFLICTS=	gqmpeg-0.2*
 
diff --git audio/gqmpeg/Makefile audio/gqmpeg/Makefile
index 619ceae..2dd7823 100644
--- audio/gqmpeg/Makefile
+++ audio/gqmpeg/Makefile
@@ -28,8 +28,8 @@ USE_GNOME=	gdkpixbuf
 WANT_GNOME=	yes
 USE_AUTOTOOLS=	autoconf213 libtool
 
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib" \
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 MAN1=		gqmpeg.1
 
diff --git audio/gqradio/Makefile audio/gqradio/Makefile
index c369b525..2c9935a 100644
--- audio/gqradio/Makefile
+++ audio/gqradio/Makefile
@@ -19,8 +19,8 @@ USE_GNOME=	gtk20 gnomehack gnomeprefix
 
 ONLY_FOR_ARCHS=	alpha i386 ia64
 
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib" \
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|\(doc/gqradio\)-\$$VERSION|\1|' \
diff --git audio/grip/Makefile audio/grip/Makefile
index 20ea1bb..d971c0c 100644
--- audio/grip/Makefile
+++ audio/grip/Makefile
@@ -21,8 +21,8 @@ USE_XORG=	x11
 USE_GNOME=	gnomehack gnomeprefix libgnomeui vte
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 OPTIONS=	CDPARANOIA "Ripper: Enable cdparanoia support" on \
 		CDDA2WAV "Ripper: cdda2wav: Install sysutils/cdrtools" off
diff --git audio/gspeakers/Makefile audio/gspeakers/Makefile
index 67dc7fb..06e5703 100644
--- audio/gspeakers/Makefile
+++ audio/gspeakers/Makefile
@@ -20,8 +20,8 @@ USE_GNOME=	gnomeprefix libxml2
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	automake:env
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 CFLAGS+=	-O0
 
diff --git audio/gtick/Makefile audio/gtick/Makefile
index ed5c359..cb67018 100644
--- audio/gtick/Makefile
+++ audio/gtick/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS=	sndfile.1:${PORTSDIR}/audio/libsndfile \
 
 GNU_CONFIGURE=	yes
 USE_GNOME=	gtk20
-CONFIGURE_ENV+=	LDFLAGS="-L${LOCALBASE}/lib"
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 MAN1=	gtick.1
 
diff --git audio/gtkpod/Makefile audio/gtkpod/Makefile
index 64a8889..031427f 100644
--- audio/gtkpod/Makefile
+++ audio/gtkpod/Makefile
@@ -22,7 +22,8 @@ USE_GETTEXT=	yes
 USE_GMAKE=	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
 INSTALLS_ICONS=	yes
 MAN1=		gtkpod.1
 
diff --git audio/hawkvoice/Makefile audio/hawkvoice/Makefile
index dab21d0..22a5cc6 100644
--- audio/hawkvoice/Makefile
+++ audio/hawkvoice/Makefile
@@ -20,10 +20,9 @@ USE_GMAKE=	yes
 MAKEFILE=	makefile.linux
 USE_LDCONFIG=	yes
 
-LDFLAGS=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
-CPPFLAGS=	-I${LOCALBASE}/include
-MAKE_ENV=	LDFLAGS="${LDFLAGS}" CPPFLAGS="${CPPFLAGS}" \
-		MAKE="${GMAKE}"
+LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
+CPPFLAGS+=	-I${LOCALBASE}/include
+MAKE_ENV=	MAKE="${GMAKE}"
 
 WRKSRC=	${WRKDIR}/HawkVoiceDI/src
 
diff --git audio/icecast2/Makefile audio/icecast2/Makefile
index 68907a5..4d7e904 100644
--- audio/icecast2/Makefile
+++ audio/icecast2/Makefile
@@ -30,7 +30,8 @@ USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 USE_RC_SUBR=	icecast2.sh
 SUB_FILES+=	pkg-message
-CONFIGURE_ENV=	OGG_PREFIX=${LOCALBASE} CFLAGS=-I${LOCALBASE}/include
+CONFIGURE_ENV=	OGG_PREFIX=${LOCALBASE}
+CFLAGS+=	-I${LOCALBASE}/include
 
 DOCSDIR=	${PREFIX}/share/doc/icecast
 WRKSRC=		${WRKDIR}/icecast-${PORTVERSION}
diff --git audio/ices/Makefile audio/ices/Makefile
index d0df6f0..e428aad 100644
--- audio/ices/Makefile
+++ audio/ices/Makefile
@@ -19,8 +19,8 @@ LIB_DEPENDS=	shout.5:${PORTSDIR}/audio/libshout2 \
 		vorbis.4:${PORTSDIR}/audio/libvorbis \
 		xml2.5:${PORTSDIR}/textproc/libxml2
 
-CONFIGURE_ENV=	CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \
-		LDFLAGS="${PTHREAD_LIBS} -L${LOCALBASE}/lib"
+CFLAGS+=	${PTHREAD_CFLAGS} -I${LOCALBASE}/include
+LDFLAGS+=	${PTHREAD_LIBS} -L${LOCALBASE}/lib
 USE_GMAKE=	yes
 GNU_CONFIGURE=  yes
 USE_BZIP2=	yes
diff --git audio/ices0/Makefile audio/ices0/Makefile
index 5151ad9..fc6fe77 100644
--- audio/ices0/Makefile
+++ audio/ices0/Makefile
@@ -22,8 +22,8 @@ OPTIONS=	FLAC "Enable flac transcoding support" Off \
 		VORBIS "Enable ogg/vorbis transcoding support" Off \
 		PYTHON "Enable Python scripting" On
 
-CONFIGURE_ENV=	CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \
-		LDFLAGS="${PTHREAD_LIBS} -L${LOCALBASE}/lib"
+CFLAGS+=	${PTHREAD_CFLAGS} -I${LOCALBASE}/include
+LDFLAGS+=	${PTHREAD_LIBS} -L${LOCALBASE}/lib
 USE_PERL5=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=  yes
diff --git audio/id3lib/Makefile audio/id3lib/Makefile
index 22eaa97..a2d5c2d 100644
--- audio/id3lib/Makefile
+++ audio/id3lib/Makefile
@@ -17,11 +17,10 @@ COMMENT=	Library for manipulating ID3v1/v1.1 and ID3v2 tags
 USE_AUTOTOOLS=	libtool
 USE_ICONV=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 USE_LDCONFIG=	yes
 
-CPPFLAGS=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 post-extract:
 	@${RM} -rf ${WRKSRC}/zlib
diff --git audio/istream/Makefile audio/istream/Makefile
index df49665..0ed8151 100644
--- audio/istream/Makefile
+++ audio/istream/Makefile
@@ -20,7 +20,7 @@ USE_GSTREAMER=	yes
 USE_XORG=	xtst
 GNU_CONFIGURE=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}c
-CONFIGURE_ENV=	CPPFLAGS="`pkg-config --cflags libgnomeui-2.0`"
+CPPFLAGS+=	`pkg-config --cflags libgnomeui-2.0`
 MAKE_JOBS_SAFE=	yes
 
 post-patch:
diff --git audio/jack-rack/Makefile audio/jack-rack/Makefile
index 9f18af4..5aa4570 100644
--- audio/jack-rack/Makefile
+++ audio/jack-rack/Makefile
@@ -24,8 +24,8 @@ USE_GNOME=	libgnomeui libxml2
 USE_GETTEXT=	yes
 USE_PYTHON=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--disable-ladcca --disable-lash
 
 post-patch:
diff --git audio/jack/Makefile audio/jack/Makefile
index 22f82dd..ca7cba3 100644
--- audio/jack/Makefile
+++ audio/jack/Makefile
@@ -21,9 +21,10 @@ LIB_DEPENDS=	portaudio.0:${PORTSDIR}/audio/portaudio \
 		celt0.2:${PORTSDIR}/audio/celt
 
 LATEST_LINK=	jack
-CONFIGURE_ENV=	LIBS="${PTHREAD_LIBS}" LDFLAGS="-L${LOCALBASE}/lib" \
-		CPPFLAGS="-I${LOCALBASE}/include" \
-		CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}"
+CONFIGURE_ENV=	LIBS="${PTHREAD_LIBS}"
+CFLAGS+=	${PTHREAD_CFLAGS}
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS+=--enable-portaudio \
 		--with-default-tmpdir=/tmp
 GNU_CONFIGURE=	yes
diff --git audio/julius/Makefile audio/julius/Makefile
index ddc7e47..e590971 100644
--- audio/julius/Makefile
+++ audio/julius/Makefile
@@ -21,8 +21,8 @@ MANCOMPRESSED=	no
 GNU_CONFIGURE=	yes
 USE_ICONV=	yes
 
-CONFIGURE_ENV=	LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib -liconv" \
-		CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib -liconv
 MANLANG=	"" ja
 MAN1=	accept_check.1 \
 	adinrec.1 \
diff --git audio/ksmp3play/Makefile audio/ksmp3play/Makefile
index 3580321..91ff005 100644
--- audio/ksmp3play/Makefile
+++ audio/ksmp3play/Makefile
@@ -21,12 +21,11 @@ NO_WRKSUBDIR=	yes
 USE_GNOME=	gnomehack
 USE_SDL=	sdl
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 
 MAN1=		ksmp3play.1
 
-CPPFLAGS=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 post-install:
 .if !defined(NOPORTDOCS)
diff --git audio/lash/Makefile audio/lash/Makefile
index 6298135..c1305cd 100644
--- audio/lash/Makefile
+++ audio/lash/Makefile
@@ -25,12 +25,11 @@ USE_GNOME=	gnomehack gtk20 libxml2
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-alsa-midi
-CONFIGURE_ENV=	LDFLAGS="${LDFLAGS}"
 USE_LDCONFIG=	yes
 MAKE_JOBS_SAFE=	yes
 
-CPPFLAGS=	-I${LOCALBASE}/include/dssi -I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include/dssi -I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .include <bsd.port.pre.mk>
 
diff --git audio/liba52/Makefile audio/liba52/Makefile
index c9bec52..51bb0b4 100644
--- audio/liba52/Makefile
+++ audio/liba52/Makefile
@@ -29,8 +29,8 @@ USE_LDCONFIG=	yes
 BUILD_DEPENDS+=	${LOCALBASE}/lib/libdjbfft.a:${PORTSDIR}/math/djbfft
 RUN_DEPENDS+=	${LOCALBASE}/lib/libdjbfft.a:${PORTSDIR}/math/djbfft
 
-CONFIGURE_ENV+=	CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
-		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
+CFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS+=	--enable-djbfft
 .endif
 
diff --git audio/libaacplus/Makefile audio/libaacplus/Makefile
index 9bfcffa..d682cc0 100644
--- audio/libaacplus/Makefile
+++ audio/libaacplus/Makefile
@@ -34,8 +34,8 @@ AUTOMAKE_ARGS=	--add-missing
 ACLOCAL_ARGS=	--acdir=${ACLOCAL_DIR} \
 		-I ${LOCALBASE}/share/aclocal -I ${WRKSRC}/m4
 LIBTOOLIZE_ARGS=--automake
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include"\
-		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 MAN1=		aacplusenc.1
 
diff --git audio/libcanberra/Makefile audio/libcanberra/Makefile
index bd094df..41c53af 100644
--- audio/libcanberra/Makefile
+++ audio/libcanberra/Makefile
@@ -23,8 +23,8 @@ USE_GNOME=	gnomeprefix gnomehack gtk20 ltverhack gconf2
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool libltdl
 CONFIGURE_ARGS=	--disable-lynx --disable-tdb --disable-alsa
-CPPFLAGS=	-I${LOCALBASE}/include
-CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .if !defined(SLAVEPORT)
 GCONF_SCHEMAS=	libcanberra.schemas
diff --git audio/libcddb/Makefile audio/libcddb/Makefile
index 40e51ac..41a7afd 100644
--- audio/libcddb/Makefile
+++ audio/libcddb/Makefile
@@ -21,7 +21,7 @@ USE_GNOME=	gnomehack pkgconfig
 USE_ICONV=	yes
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--without-cdio
-CONFIGURE_ENV=	CPPFLAGS="-DICONV_CONST=\"const\" -I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-DICONV_CONST="const" -I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .include <bsd.port.mk>
diff --git audio/libgpod/Makefile audio/libgpod/Makefile
index 4977af9..824d23b 100644
--- audio/libgpod/Makefile
+++ audio/libgpod/Makefile
@@ -25,8 +25,8 @@ USE_GNOME=	gtk20
 USE_SQLITE=	3
 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=	--without-hal --with-html-dir="${PREFIX}/share/doc"
 
 OPTIONS=	IMOBILE	"Support Apple iPhone/iPod Touch" on \
diff --git audio/libmp3splt/Makefile audio/libmp3splt/Makefile
index 49fb5c2..b2e33d2 100644
--- audio/libmp3splt/Makefile
+++ audio/libmp3splt/Makefile
@@ -81,6 +81,6 @@ PLIST_FILES+=	"@dirrmtry share/locale/de_DE"
 .endif
 
 CPPFLAGS+=	-I${LOCALBASE}/include
-CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .include <bsd.port.post.mk>
diff --git audio/libmtp/Makefile audio/libmtp/Makefile
index 6457331..ecd8c00 100644
--- audio/libmtp/Makefile
+++ audio/libmtp/Makefile
@@ -16,14 +16,13 @@ COMMENT=	Media Transfer Protocol (MTP) library
 LICENSE=	LGPL21
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	LDFLAGS="${LDFLAGS}" CPPFLAGS="${CPPFLAGS}"
 USE_GNOME=	gnomehack
 USE_LDCONFIG=	yes
 USE_ICONV=	yes
 MAKE_JOBS_SAFE=	yes
 
-CPPFLAGS=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib -liconv
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib -liconv
 
 .include <bsd.port.pre.mk>
 .if ${OSVERSION} < 800069
diff --git audio/libmusicbrainz/Makefile audio/libmusicbrainz/Makefile
index 5ace2bc..760b240 100644
--- audio/libmusicbrainz/Makefile
+++ audio/libmusicbrainz/Makefile
@@ -22,8 +22,8 @@ CONFLICTS=	musicbrainz-1.*
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack pkgconfig
 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
 USE_LDCONFIG=	yes
 
diff --git audio/libnjb/Makefile audio/libnjb/Makefile
index 890cc87..d6e0cde 100644
--- audio/libnjb/Makefile
+++ audio/libnjb/Makefile
@@ -15,8 +15,8 @@ COMMENT=	C library, API for communicating with Creative and Dell audio players
 
 USE_AUTOTOOLS=	libtool
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 USE_LDCONFIG=	yes
 
 .include <bsd.port.pre.mk>
diff --git audio/libofa/Makefile audio/libofa/Makefile
index bbf0f60..3d939d6 100644
--- audio/libofa/Makefile
+++ audio/libofa/Makefile
@@ -23,8 +23,8 @@ USE_DOS2UNIX=	yes
 USE_AUTOTOOLS=	libtool
 USE_GNOME=	gnomehack pkgconfig
 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
 USE_LDCONFIG=	yes
 
diff --git audio/libshout2/Makefile audio/libshout2/Makefile
index 3d6c175..e4c99fc 100644
--- audio/libshout2/Makefile
+++ audio/libshout2/Makefile
@@ -20,8 +20,8 @@ LIB_DEPENDS=	speex.1:${PORTSDIR}/audio/speex \
 		theora.0:${PORTSDIR}/multimedia/libtheora \
 		vorbis.4:${PORTSDIR}/audio/libvorbis
 
-CONFIGURE_ENV=	CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \
-		LDFLAGS="${PTHREAD_LIBS} -L${LOCALBASE}/lib"
+CFLAGS+=	${PTHREAD_CFLAGS} -I${LOCALBASE}/include
+LDFLAGS+=	${PTHREAD_LIBS} -L${LOCALBASE}/lib
 USE_LDCONFIG=	yes
 USE_GMAKE=	yes
 MAKE_JOBS_SAFE=	yes
diff --git audio/libsndfile/Makefile audio/libsndfile/Makefile
index 843e86e..6681e86 100644
--- audio/libsndfile/Makefile
+++ audio/libsndfile/Makefile
@@ -24,7 +24,7 @@ CONFIGURE_ARGS=	--disable-gcc-pipe \
 		--disable-alsa \
 		--disable-octave
 CPPFLAGS+=	-isystem /usr/include -isystem ${LOCALBASE}/include
-CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib"
+LDFLAGS+=	-L${LOCALBASE}/lib
 USE_LDCONFIG=	yes
 
 MAN1=		sndfile-concat.1 sndfile-cmp.1 sndfile-convert.1 \
diff --git audio/libtunepimp-old/Makefile audio/libtunepimp-old/Makefile
index 9e883cb..72e3fa8 100644
--- audio/libtunepimp-old/Makefile
+++ audio/libtunepimp-old/Makefile
@@ -31,8 +31,8 @@ USE_GMAKE=	yes
 USE_GNOME=	gnomehack pkgconfig
 USE_AUTOTOOLS=	libtool
 CONFIGURE_ARGS=	--libdir=${PREFIX}/lib/tunepimp-0.4 --includedir=${PREFIX}/include/tunepimp-0.4
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib -liconv"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib -liconv
 USE_LDCONFIG=	${PREFIX}/lib/tunepimp-0.4
 
 post-patch:
diff --git audio/libtunepimp/Makefile audio/libtunepimp/Makefile
index 501f379..4cfd496 100644
--- audio/libtunepimp/Makefile
+++ audio/libtunepimp/Makefile
@@ -31,8 +31,8 @@ CONFLICTS=	trm-0*
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack pkgconfig
 USE_AUTOTOOLS=	libtool
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib -liconv"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib -liconv
 USE_LDCONFIG=	yes
 
 post-patch:
diff --git audio/linuxsampler/Makefile audio/linuxsampler/Makefile
index 375de39..6ef8a32 100644
--- audio/linuxsampler/Makefile
+++ audio/linuxsampler/Makefile
@@ -32,19 +32,19 @@ USE_GNOME=	gnomehack
 USE_SQLITE=	3
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
-CONFIGURE_ENV=	LDFLAGS="${LDFLAGS}" HAVE_UNIX98=1
+CONFIGURE_ENV=	HAVE_UNIX98=1
 USE_LDCONFIG=	yes
 MAKE_JOBS_SAFE=	yes
 
 MAN1=		linuxsampler.1
 
-CPPFLAGS=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .include <bsd.port.pre.mk>
 
 .if defined(WITHOUT_JACK)
-CONFIGURE_ARGS+=--disable-jack-driver	
+CONFIGURE_ARGS+=--disable-jack-driver
 .else
 LIB_DEPENDS+=	jack.0:${PORTSDIR}/audio/jack
 .endif
@@ -66,7 +66,7 @@ BUILD_DEPENDS+=	dssi>=0:${PORTSDIR}/audio/dssi
 RUN_DEPENDS+=	dssi>=0:${PORTSDIR}/audio/dssi
 PLIST_SUB+=	DSSI=""
 .else
-CONFIGURE_ENV+=	ac_cv_header_dssi_h=no	
+CONFIGURE_ENV+=	ac_cv_header_dssi_h=no
 PLIST_SUB+=	DSSI="@comment "
 .endif
 
diff --git audio/liteamp/Makefile audio/liteamp/Makefile
index 1ddc3ce..45edc4f 100644
--- audio/liteamp/Makefile
+++ audio/liteamp/Makefile
@@ -29,8 +29,8 @@ MAKE_JOBS_SAFE=	yes
 
 MAN1=		liteamp.1
 
-CPPFLAGS=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 post-patch:
 	@${REINPLACE_CMD} -e \
diff --git audio/madplay/Makefile audio/madplay/Makefile
index 01cc405..61a905d 100644
--- audio/madplay/Makefile
+++ audio/madplay/Makefile
@@ -24,7 +24,7 @@ LICENSE=	GPLv2
 WANT_GNOME=	yes
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib"
+LDFLAGS+=	-L${LOCALBASE}/lib
 ALL_TARGET=	all madtime
 
 MAN1=		abxtest.1 madplay.1
diff --git audio/mangler/Makefile audio/mangler/Makefile
index 6762d76..3e14227 100644
--- audio/mangler/Makefile
+++ audio/mangler/Makefile
@@ -25,7 +25,6 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--without-alsa
 USE_LDCONFIG=	yes
 
-CONFIGURE_ENV=	CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
diff --git audio/mhwaveedit/Makefile audio/mhwaveedit/Makefile
index 804c39a..7f97708 100644
--- audio/mhwaveedit/Makefile
+++ audio/mhwaveedit/Makefile
@@ -21,8 +21,8 @@ USE_GNOME=	gnomehack gtk20
 WANT_GNOME=	yes
 WANT_SDL=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--disable-optimization --without-alsalib
 
 PLIST_FILES=	bin/mhwaveedit \
diff --git audio/milkytracker/Makefile audio/milkytracker/Makefile
index 986408e..9057785 100644
--- audio/milkytracker/Makefile
+++ audio/milkytracker/Makefile
@@ -25,7 +25,6 @@ MAKE_JOBS_SAFE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS+=	--disable-alsatest --without-alsa
 
 LICENSE=	GPLv3
diff --git audio/mixmos/Makefile audio/mixmos/Makefile
index 556422f..e0b259a 100644
--- audio/mixmos/Makefile
+++ audio/mixmos/Makefile
@@ -16,8 +16,8 @@ COMMENT=	A GTK2 audio mixer
 
 USE_GNOME=	gtk20
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 MAN1=		mixmos.1
 
diff --git audio/moc/Makefile audio/moc/Makefile
index 1038627..e9bdc28 100644
--- audio/moc/Makefile
+++ audio/moc/Makefile
@@ -18,12 +18,11 @@ USE_GMAKE=	yes
 USE_BZIP2=	yes
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 
 MAN1=		mocp.1
 
-CPPFLAGS=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 OPTIONS=	JACK "JACK support" off \
 		MP3 "MP3 support" on \
diff --git audio/mp3_check/Makefile audio/mp3_check/Makefile
index 5fa3084..d46bca3 100644
--- audio/mp3_check/Makefile
+++ audio/mp3_check/Makefile
@@ -14,8 +14,6 @@ MASTER_SITES=	SF/mp3check/mp3check/${PORTVERSION}
 MAINTAINER=	ericb@thedeepsky.com
 COMMENT=	Verifies the integrity of mp3 audio files
 
-MAKE_ENV=	CPPFLAGS="${CPPFLAGS}" \
-		LDFLAGS="${LDFLAGS}"
 PLIST_FILES=	bin/mp3_check
 
 .include <bsd.port.mk>
diff --git audio/mp3blaster/Makefile audio/mp3blaster/Makefile
index 7a47eee..1d6737f 100644
--- audio/mp3blaster/Makefile
+++ audio/mp3blaster/Makefile
@@ -17,14 +17,13 @@ COMMENT=	MP3 console ncurses-based player
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 WANT_GNOME=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--with-cxxflags="${CXXFLAGS}"
 MAKE_JOBS_SAFE=	yes
 
 MAN1=		mp3blaster.1 nmixer.1 splay.1
 
-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}
 
 OPTIONS=	LIRC "LIRC support" off \
 		SIDPLAY "Sidplayer support" on \
diff --git audio/mp3plot/Makefile audio/mp3plot/Makefile
index eb476f9..1be7561 100644
--- audio/mp3plot/Makefile
+++ audio/mp3plot/Makefile
@@ -22,15 +22,14 @@ OPTIONS=	GD "Enable support for GD library" on \
 LICENSE=	GPLv2
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS+=--with-boost-program-options=boost_program_options \
 		--with-boost-thread=boost_thread
 
 MAN1=		${PORTNAME}.1
 PLIST_FILES=	bin/${PORTNAME}
 
-CPPFLAGS=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
+CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 
 .include <bsd.port.pre.mk>
 
diff --git audio/mp3splt-gtk/Makefile audio/mp3splt-gtk/Makefile
index cb473d5..a3529af 100644
--- audio/mp3splt-gtk/Makefile
+++ audio/mp3splt-gtk/Makefile
@@ -23,8 +23,8 @@ LIB_DEPENDS=	mp3splt:${PORTSDIR}/audio/libmp3splt \
 USE_AUTOTOOLS=	libltdl
 USE_GSTREAMER=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" \
-		CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS+=	--enable-audacious --with-mp3splt=${LOCALBASE} --with-mp3splt-includes=${LOCALBASE}/include --with-mp3splt-libraries=${LOCALBASE}/lib --disable-mp3splttest
 
 MAN1=	mp3splt-gtk.1
diff --git audio/mp3splt/Makefile audio/mp3splt/Makefile
index 254629b..f8cb3b3 100644
--- audio/mp3splt/Makefile
+++ audio/mp3splt/Makefile
@@ -17,8 +17,8 @@ LIB_DEPENDS=	mp3splt:${PORTSDIR}/audio/libmp3splt
 
 USE_AUTOTOOLS=	libltdl
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" \
-		CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS+=--enable-oggsplt_symlink --disable-mp3splttest
 
 OPTIONS=	NLS "Native language support" on
diff --git audio/mpc/Makefile audio/mpc/Makefile
index f5557b2..feba367 100644
--- audio/mpc/Makefile
+++ audio/mpc/Makefile
@@ -22,8 +22,6 @@ GNU_CONFIGURE=	yes
 USE_GNOME=	pkgconfig
 LDFLAGS+=	-L${LOCALBASE}/lib
 CFLAGS+=	-I${LOCALBASE}/include
-CONFIGURE_ENV=	CFLAGS="${CFLAGS}" \
-		LDFLAGS="${LDFLAGS}"
 
 PORTDOCS=	AUTHORS README NEWS
 
diff --git audio/mpg123/Makefile audio/mpg123/Makefile
index c2b4adf..0d9639b 100644
--- audio/mpg123/Makefile
+++ audio/mpg123/Makefile
@@ -25,8 +25,9 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-optimization=0 \
 		--with-audio=oss \
 		--with-default-audio=oss
-CONFIGURE_ENV=	CONFIG_SHELL=${SH} CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
-	       	LDFLAGS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV=	CONFIG_SHELL=${SH}
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 MAN1=		mpg123.1
 
diff --git audio/mpg321/Makefile audio/mpg321/Makefile
index f8a1e70..bd0e149 100644
--- audio/mpg321/Makefile
+++ audio/mpg321/Makefile
@@ -31,8 +31,8 @@ MPG321_SCROBBLER_PLUGIN_NAME?=	321
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-mpg123-symlink
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 MAKE_JOBS_SAFE=	yes
 
 MAN1=		mpg321.1
diff --git audio/mpiosh/Makefile audio/mpiosh/Makefile
index 3b3e7a0..0bde42f 100644
--- audio/mpiosh/Makefile
+++ audio/mpiosh/Makefile
@@ -22,8 +22,8 @@ USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	aclocal automake autoconf libtool
 ACLOCAL_ARGS=	-I . -I ${LOCALBASE}/share/aclocal
 AUTOMAKE_ARGS=	--add-missing
-CONFIGURE_ENV=	CFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib -liconv"
+CFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib -liconv
 
 .include <bsd.port.pre.mk>
 
diff --git audio/muine/Makefile audio/muine/Makefile
index 4fb98f5..9214345 100644
--- audio/muine/Makefile
+++ audio/muine/Makefile
@@ -32,8 +32,8 @@ USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
 
-CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 GCONF_SCHEMAS=	muine.schemas
 
diff --git audio/muse/Makefile audio/muse/Makefile
index 5824ff5..344de13 100644
--- audio/muse/Makefile
+++ audio/muse/Makefile
@@ -23,11 +23,10 @@ USE_GETTEXT=	yes
 USE_GMAKE=	yes
 WANT_GNOME=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--disable-debug --disable-lubrify --disable-rpath
-CPPFLAGS=	-I${LOCALBASE}/include -DHAVE_DECL_GETOPT -DHAVE_SYS_UIO_H \
+CPPFLAGS+=	-I${LOCALBASE}/include -DHAVE_DECL_GETOPT -DHAVE_SYS_UIO_H \
 		${PTHREAD_CFLAGS}
-LDFLAGS=	-L${LOCALBASE}/lib ${PTHREAD_LIBS} -lintl
+LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS} -lintl
 
 OPTIONS=	X11	"Build with X11 support" on \
 		MP3	"Build with MP3 support" on \
diff --git audio/musicbox-tag-editor/Makefile audio/musicbox-tag-editor/Makefile
index 234cae1..ade54ec 100644
--- audio/musicbox-tag-editor/Makefile
+++ audio/musicbox-tag-editor/Makefile
@@ -20,8 +20,8 @@ LIB_DEPENDS=		tag:${PORTSDIR}/audio/taglib
 
 USE_GNOME=		gnomehack gnomeprefix libglade2
 GNU_CONFIGURE=		yes
-CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
-			LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 # do not conflict with audio/musicbox
 CONFIGURE_ARGS=		--program-suffix=-tag-editor
 
diff --git audio/musicpd/Makefile audio/musicpd/Makefile
index f418221..942a34b 100644
--- audio/musicpd/Makefile
+++ audio/musicpd/Makefile
@@ -25,8 +25,8 @@ GNU_CONFIGURE=	yes
 USE_GNOME=	glib20
 
 USE_RC_SUBR=	${PORTNAME}
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 CFLAGS+=	-I${PREFIX}/include
 
diff --git audio/ncmpc/Makefile audio/ncmpc/Makefile
index ac47023..ed413c5 100644
--- audio/ncmpc/Makefile
+++ audio/ncmpc/Makefile
@@ -17,8 +17,8 @@ LIB_DEPENDS=	mpdclient:${PORTSDIR}/audio/libmpdclient
 
 GNU_CONFIGURE=	yes
 USE_GNOME=	glib20
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 OPTIONS=	NLS "Native language support" on \
 		LYRICS "Compile with lyrics screen" on
diff --git audio/ncmpcpp/Makefile audio/ncmpcpp/Makefile
index 93fa743..d3a462d 100644
--- audio/ncmpcpp/Makefile
+++ audio/ncmpcpp/Makefile
@@ -24,8 +24,8 @@ USE_NCURSES=	yes
 USE_GNOME=	glib20
 USE_AUTOTOOLS=	automake aclocal libtool
 ACLOCAL_ARGS=	--acdir=${ACLOCAL_DIR} -I ${LOCALBASE}/share/aclocal
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib -lpthread"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 
 MAN1=	ncmpcpp.1
 MAKE_JOBS_SAFE=	yes
diff --git audio/normalize/Makefile audio/normalize/Makefile
index 31b5ae2..fc99f6d 100644
--- audio/normalize/Makefile
+++ audio/normalize/Makefile
@@ -18,10 +18,9 @@ LIB_DEPENDS=	mad.2:${PORTSDIR}/audio/libmad
 
 USE_BZIP2=		yes
 GNU_CONFIGURE=		yes
-CONFIGURE_ENV=		CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=		--disable-helper-search
-CPPFLAGS=		-I${LOCALBASE}/include
-LDFLAGS=		-L${LOCALBASE}/lib
+CPPFLAGS+=		-I${LOCALBASE}/include
+LDFLAGS+=		-L${LOCALBASE}/lib
 
 MAN1=		normalize.1 normalize-mp3.1
 
diff --git audio/nosefart/Makefile audio/nosefart/Makefile
index 7944ca9..b86813b 100644
--- audio/nosefart/Makefile
+++ audio/nosefart/Makefile
@@ -18,8 +18,7 @@ COMMENT=	A player for NES Sound Format (NSF)
 USE_GMAKE=	yes
 
 MAKE_ENV=	INSTALL="${INSTALL}" COPY="${COPY}" STRIP="${STRIP}"\
-		BINGRP="${BINGRP}" BINMODE="${BINMODE}" BINOWN="${BINOWN}"\
-		LDFLAGS="${LDFLAGS}"
+		BINGRP="${BINGRP}" BINMODE="${BINMODE}" BINOWN="${BINOWN}"
 PLIST_FILES=	bin/nosefart
 
 pre-build:
diff --git audio/ocp/Makefile audio/ocp/Makefile
index 4bbd860..dbcde64 100644
--- audio/ocp/Makefile
+++ audio/ocp/Makefile
@@ -33,13 +33,8 @@ WANT_GNOME=	desktopfileutils
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
-CFLAGS+=	-L${LOCALBASE}/lib
-CXXFLAGS+=	-L${LOCALBASE}/lib
-
-CONFIGURE_ENV=	CFLAGS="${CFLAGS} ${CPPFLAGS}" \
-		CXXFLAGS="${CXXFLAGS} ${CPPFLAGS}" \
-		CPPFLAGS="${CPPFLAGS}" \
-		LDFLAGS="${LDFLAGS}"
+CFLAGS+=	-L${LOCALBASE}/lib ${CPPFLAGS}
+CXXFLAGS+=	-L${LOCALBASE}/lib ${CPPFLAGS}
 
 CONFIGURE_ARGS=	--with-dir-suffix="" \
 		--without-alsa \
diff --git audio/openal-soft/Makefile audio/openal-soft/Makefile
index ad065d0..b76854d 100644
--- audio/openal-soft/Makefile
+++ audio/openal-soft/Makefile
@@ -29,7 +29,7 @@ OPTIONS=	PULSEAUDIO	"Enable sound streaming using PulseAudio" off
 .if defined(WITH_PULSEAUDIO)
 LIB_DEPENDS+=	pulse-simple.0:${PORTSDIR}/audio/pulseaudio
 CFLAGS+=	-Iinclude -I${LOCALBASE}/include
-CONFIGURE_ENV+=	LDFLAGS="-L${LOCALBASE}/lib"
+LDFLAGS+=	-L${LOCALBASE}/lib
 CMAKE_ARGS+=	-DPULSEAUDIO:BOOL=ON
 .else
 CMAKE_ARGS+=	-DPULSEAUDIO:BOOL=OFF
diff --git audio/openal/Makefile audio/openal/Makefile
index 1988cce..f5ef3db 100644
--- audio/openal/Makefile
+++ audio/openal/Makefile
@@ -19,7 +19,8 @@ CONFLICTS=	openal-soft-[0-9]*
 
 USE_AUTOTOOLS=	libtool
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--enable-capture
 USE_GMAKE=	yes
 USE_GNOME=	pkgconfig gnomehack
diff --git audio/orpheus/Makefile audio/orpheus/Makefile
index c253162..567c2d0 100644
--- audio/orpheus/Makefile
+++ audio/orpheus/Makefile
@@ -24,7 +24,7 @@ HAS_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	autoconf
 
-CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib"
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 OPTIONS=	NLS	"Native language support"	on \
 		CDDB	"CDDB audio CD' auto fetch track info support"	on \
diff --git audio/osalp/Makefile audio/osalp/Makefile
index ac021f6..d299fd4 100644
--- audio/osalp/Makefile
+++ audio/osalp/Makefile
@@ -21,9 +21,8 @@ LIB_DEPENDS=	mp3lame.0:${PORTSDIR}/audio/lame \
 
 GNU_CONFIGURE=	yes
 CFLAGS+=	-fPIC -DPIC
-CPPFLAGS=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--enable-all
 
 USE_LDCONFIG=	yes
diff --git audio/pd/Makefile audio/pd/Makefile
index fc3b407..e8537ff 100644
--- audio/pd/Makefile
+++ audio/pd/Makefile
@@ -24,14 +24,13 @@ USE_TK_BUILD=	yes
 USE_TK_WRAPPER=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	LDFLAGS="${LDFLAGS}"
 MAKEFILE=	makefile
 MAKE_JOBS_UNSAFE=	yes
 
 MAN1=		pd.1 pdreceive.1 pdsend.1
 
-CPPFLAGS=	-I${TCL_INCLUDEDIR}
-LDFLAGS=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${TCL_INCLUDEDIR}
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 post-patch:
 	@${FIND} ${PATCH_WRKSRC} -name "*.[ch]" | ${XARGS} ${REINPLACE_CMD} -e \
diff --git audio/pidgin-musictracker/Makefile audio/pidgin-musictracker/Makefile
index 01b6cd0..f7780ab 100644
--- audio/pidgin-musictracker/Makefile
+++ audio/pidgin-musictracker/Makefile
@@ -22,6 +22,7 @@ LIB_DEPENDS=	pcre.0:${PORTSDIR}/devel/pcre
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	"CPPFLAGS=-I${LOCALBASE}/include" "LIBS=-L${LOCALBASE}/lib"
+CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
 
 .include <bsd.port.mk>
diff --git audio/playgsf/Makefile audio/playgsf/Makefile
index 9fbd73c..06f0c37 100644
--- audio/playgsf/Makefile
+++ audio/playgsf/Makefile
@@ -28,8 +28,8 @@ CFLAGS+=	-O0
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-MAKE_ENV+=	LIBS="${LDFLAGS}" LDFLAGS="${LDFLAGS}"
-CONFIGURE_ENV+=	CC="${CC}" CXX="${CXX}" LDFLAGS="${LDFLAGS}" LIBS="${LDFLAGS}" CFLAGS="${CFLAGS}"
+MAKE_ENV+=	LIBS="${LDFLAGS}"
+CONFIGURE_ENV+=	LIBS="${LDFLAGS}"
 
 PLIST_FILES=	bin/playgsf
 
diff --git audio/pms/Makefile audio/pms/Makefile
index e8ba748..7ae359f 100644
--- audio/pms/Makefile
+++ audio/pms/Makefile
@@ -23,7 +23,7 @@ USE_GNOME=	glib20
 MAN1=	${PORTNAME}.1
 PLIST_FILES=	bin/${PORTNAME}
 
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .include <bsd.port.mk>
diff --git audio/pocketsphinx/Makefile audio/pocketsphinx/Makefile
index 621e1d6..60b9bbd 100644
--- audio/pocketsphinx/Makefile
+++ audio/pocketsphinx/Makefile
@@ -19,8 +19,8 @@ USE_LDCONFIG=	yes
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
 
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/sphinxbase" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include/sphinxbase
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 MAKE_ENV=	MKDIR="${MKDIR}" \
 		OSVERSION=${OSVERSION}
diff --git audio/pulseaudio/Makefile audio/pulseaudio/Makefile
index 6ac9afc..8057703 100644
--- audio/pulseaudio/Makefile
+++ audio/pulseaudio/Makefile
@@ -34,13 +34,13 @@ GNU_CONFIGURE=	yes
 USE_AUTOTOOLS=	libltdl libtool
 USE_GMAKE=	yes
 MAKE_JOBS_UNSAFE=yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib" \
-		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
+CONFIGURE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		PTHREAD_LIBS="${PTHREAD_LIBS}" \
 		OPENSSL_CFLAGS="-I/usr/include" \
 		OPENSSL_LIBS="-lcrypto -lssl" \
 		LIBS="-lm -lintl"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 CONFIGURE_ARGS=	--localstatedir=/var \
 		--with-database=gdbm \
diff --git audio/py-pyliblo/Makefile audio/py-pyliblo/Makefile
index e662d16..46ebaa6 100644
--- audio/py-pyliblo/Makefile
+++ audio/py-pyliblo/Makefile
@@ -19,8 +19,8 @@ LIB_DEPENDS=	lo.7:${PORTSDIR}/audio/liblo
 
 USE_PYTHON=		yes
 USE_PYDISTUTILS=	yes
-MAKE_ENV+=		PREFIX=${PREFIX} LOCALBASE=${LOCALBASE} \
-			LDFLAGS="-L${LOCALBASE}/lib"
+MAKE_ENV+=		PREFIX=${PREFIX} LOCALBASE=${LOCALBASE}
+LDFLAGS+=		-L${LOCALBASE}/lib
 
 MAN1=	dump_osc.1 send_osc.1
 
diff --git audio/q-audio/Makefile audio/q-audio/Makefile
index 9a99638..281a526 100644
--- audio/q-audio/Makefile
+++ audio/q-audio/Makefile
@@ -28,6 +28,5 @@ DATADIR=	${PREFIX}/share/q
 CFLAGS+=	-I${LOCALBASE}/include/portaudio2 -I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib/portaudio2 -L${LOCALBASE}/lib
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV+=	CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
 
 .include <bsd.port.mk>
diff --git audio/raop_play/Makefile audio/raop_play/Makefile
index 7dc178f..e4caf5b 100644
--- audio/raop_play/Makefile
+++ audio/raop_play/Makefile
@@ -23,7 +23,7 @@ RUN_DEPENDS=	mpg321:${PORTSDIR}/audio/mpg321 \
 		flac:${PORTSDIR}/audio/flac
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	LDFLAGS="`fltk-config --ldflags`"
+LDFLAGS+=	`fltk-config --ldflags`
 USE_GMAKE=	yes
 USE_GNOME=	glib20
 
diff --git audio/rezound/Makefile audio/rezound/Makefile
index 2903cd9..6dec765 100644
--- audio/rezound/Makefile
+++ audio/rezound/Makefile
@@ -20,7 +20,8 @@ LIB_DEPENDS=	FOX-1.4:${PORTSDIR}/x11-toolkits/fox14
 
 USE_BISON=	build
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--disable-alsa
 
 OPTIONS=	LARGEFILE	"Enable 64-bit I/O support (not yet!)"	off \
diff --git audio/rhythmbox/Makefile audio/rhythmbox/Makefile
index 500823b..e9912b3 100644
--- audio/rhythmbox/Makefile
+++ audio/rhythmbox/Makefile
@@ -41,9 +41,10 @@ CONFIGURE_ARGS=	--disable-vala --with-libbrasero-media \
 		--without-libnautilus-burn
 INSTALLS_ICONS=	yes
 USE_LDCONFIG=	yes
-CONFIGURE_ENV=	LIBS="-lm" \
-		LDFLAGS="-L${LOCALBASE}/lib" \
-		CPPFLAGS="-I${LOCALBASE}/include"
+CONFIGURE_ENV=	LIBS="-lm"
+
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 GCONF_SCHEMAS=	rhythmbox.schemas
 
diff --git audio/rioutil/Makefile audio/rioutil/Makefile
index e6a9028..4bc0fc8 100644
--- audio/rioutil/Makefile
+++ audio/rioutil/Makefile
@@ -17,13 +17,12 @@ COMMENT=	A program to inferface with the Rio600, Rio800, and psa[play devices
 USE_AUTOTOOLS=	libtool
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 USE_LDCONFIG=	yes
 
 MAN1=		rioutil.1
 
-CPPFLAGS=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .include <bsd.port.pre.mk>
 
diff --git audio/rosegarden/Makefile audio/rosegarden/Makefile
index e7669bf..b039c6c 100644
--- audio/rosegarden/Makefile
+++ audio/rosegarden/Makefile
@@ -32,7 +32,7 @@ QT_COMPONENTS=	gui xml network corelib sql qt3support \
 		rcc_build moc_build uic_build linguist_build
 LDFLAGS+=	-L${LOCALBASE}/lib
 CPPFLAGS+=	-I${LOCALBASE}/include
-CONFIGURE_ENV+=	QTLIBDIR=${QT_LIBDIR} LDFLAGS="${LDFLAGS}"
+CONFIGURE_ENV+=	QTLIBDIR=${QT_LIBDIR}
 GNU_CONFIGURE=	yes
 MAKE_JOBS_SAFE=	yes
 INSTALLS_ICONS=	yes
diff --git audio/rplay/Makefile audio/rplay/Makefile
index 313ef8b..926ef50 100644
--- audio/rplay/Makefile
+++ audio/rplay/Makefile
@@ -18,8 +18,8 @@ LIB_DEPENDS=	gsm.1:${PORTSDIR}/audio/gsm
 
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
 
 MAN1=		rplay.1 rptp.1
 MAN5=		rplay.conf.5 rplay.helpers.5 rplay.hosts.5 rplay.servers.5
diff --git audio/ruby-xmms/Makefile audio/ruby-xmms/Makefile
index 927c1d7..3a337f0 100644
--- audio/ruby-xmms/Makefile
+++ audio/ruby-xmms/Makefile
@@ -26,7 +26,9 @@ INSTALL_TARGET=	site-install
 
 DOCS=		AUTHORS COPYING ChangeLog README doc
 
-CONFIGURE_ENV+=	CFLAGS="${PTHREAD_CFLAGS}" LDFLAGS="${PTHREAD_LIBS}"
+CFLAGS+=	${PTHREAD_CFLAGS}
+LDFLAGS+=	${PTHREAD_LIBS}
+CONFIGURE_ENV+=	CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
 
 post-install:
 .if !defined(NOPORTDOCS)
diff --git audio/schism/Makefile audio/schism/Makefile
index 4cfaa4f..cda88e1 100644
--- audio/schism/Makefile
+++ audio/schism/Makefile
@@ -22,11 +22,6 @@ USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 MAKE_JOBS_SAFE=	yes
 
-CONFIGURE_ENV=	CFLAGS="${CFLAGS} ${CPPFLAGS}" \
-		CXXFLAGS="${CXXFLAGS} ${CPPFLAGS}" \
-		CPPFLAGS="${CPPFLAGS}" \
-		LDFLAGS="${LDFLAGS}"
-
 LICENSE=	GPLv2
 PLIST_FILES=	bin/${PORTNAME}
 
diff --git audio/scrobbler/Makefile audio/scrobbler/Makefile
index 57f9a5d..e7f2805 100644
--- audio/scrobbler/Makefile
+++ audio/scrobbler/Makefile
@@ -24,7 +24,8 @@ CONFLICTS=	bmp-scrobbler-[0-9]* \
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 SLAVEDIRS=	audio/xmms-scrobbler audio/bmp-scrobbler
 
diff --git audio/sdl_mixer/Makefile audio/sdl_mixer/Makefile
index 6fa1868..789b0c9 100644
--- audio/sdl_mixer/Makefile
+++ audio/sdl_mixer/Makefile
@@ -20,9 +20,9 @@ USE_SDL=	sdl
 USE_GNOME=	pkgconfig gnomehack
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
-CPPFLAGS+=	-DCONFIG_FILE_ETC_TIMIDITY \"${LOCALBASE}/etc/timidity.cfg\"
+LDFLAGS+=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+CPPFLAGS+=	-DCONFIG_FILE_ETC_TIMIDITY=\"${LOCALBASE}/etc/timidity.cfg\"
 USE_LDCONFIG=	yes
 
 OPTIONS=	MIKMOD		"Enable MOD music via libMikMod"	On \
diff --git audio/sdl_sound/Makefile audio/sdl_sound/Makefile
index de26ec6..5811f72 100644
--- audio/sdl_sound/Makefile
+++ audio/sdl_sound/Makefile
@@ -19,7 +19,8 @@ COMMENT=	A SDL audio library and player for some popular sound file formats
 USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
 USE_SDL=	sdl
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 OPTIONS=	FLAC "Enable FLAC decoding support" on \
 		MIKMOD "Enable MOD decoding support using mikmod" on \
diff --git audio/sidplayer/Makefile audio/sidplayer/Makefile
index 830abf7..d917c44 100644
--- audio/sidplayer/Makefile
+++ audio/sidplayer/Makefile
@@ -22,11 +22,6 @@ MAKE_JOBS_SAFE=	yes
 
 SDLINCLUDEDIR=	SDL
 
-CONFIGURE_ENV=	CFLAGS="${CFLAGS} ${CPPFLAGS}" \
-		CXXFLAGS="${CXXFLAGS} ${CPPFLAGS}" \
-		CPPFLAGS="${CPPFLAGS}" \
-		LDFLAGS="${LDFLAGS}"
-
 LICENSE=	GPLv2
 
 post-patch:
diff --git audio/smasher/Makefile audio/smasher/Makefile
index fe6b132..1c660af 100644
--- audio/smasher/Makefile
+++ audio/smasher/Makefile
@@ -22,8 +22,8 @@ LIB_DEPENDS=	sndfile.1:${PORTSDIR}/audio/libsndfile \
 GNU_CONFIGURE=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 CONFIGURE_ARGS=	--with-wx-config=${LOCALBASE}/bin/wxgtk2-2.8-config
-CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib" \
-		CPPFLAGS="-I${LOCALBASE}/include"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 USE_XORG=	x11
 USE_LDCONFIG=	yes
diff --git audio/snd/Makefile audio/snd/Makefile
index b67e54b..b727627 100644
--- audio/snd/Makefile
+++ audio/snd/Makefile
@@ -26,7 +26,6 @@ OPTIONS=	ESD	"Use Enlightened Sound Daemon"		on  \
 
 WANT_GNOME=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--with-float-samples
 MAKEFILE=	makefile
 ALL_TARGET=	audinfo snd snd-info sndplay
@@ -35,8 +34,8 @@ MAKE_JOBS_UNSAFE=	yes
 MAN1=		snd.1
 
 CFLAGS+=	-I${LOCALBASE}/include
-CPPFLAGS=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .include <bsd.port.pre.mk>
 
diff --git audio/sound-juicer/Makefile audio/sound-juicer/Makefile
index 438bb15..2577f7c 100644
--- audio/sound-juicer/Makefile
+++ audio/sound-juicer/Makefile
@@ -33,8 +33,8 @@ USE_GSTREAMER=	cdparanoia vorbis flac gconf good gio
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-ignore-missing-cd
 INSTALLS_ICONS=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 MAN1=		sound-juicer.1
 GCONF_SCHEMAS=	sound-juicer.schemas
diff --git audio/soundtracker/Makefile audio/soundtracker/Makefile
index 7bb8281..83fec70 100644
--- audio/soundtracker/Makefile
+++ audio/soundtracker/Makefile
@@ -19,8 +19,8 @@ LIB_DEPENDS=	sndfile.1:${PORTSDIR}/audio/libsndfile
 
 USE_GNOME=	esound gdkpixbuf gnomehack
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 OPTIONS=	GNOME "use GNOME 1.x (enables envelope editors)" off \
 		I386_ASM "i386 asm optimizations (potentially unstable)" off \
diff --git audio/sox/Makefile audio/sox/Makefile
index 7229e4d..7b992ba 100644
--- audio/sox/Makefile
+++ audio/sox/Makefile
@@ -54,7 +54,6 @@ OPTIONS=	ALSA "ALSA output driver" off \
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
-CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS+=	--with-pkgconfigdir="${PREFIX}/libdata/pkgconfig"
 CONFIGURE_ARGS+=	--with-distro="${CONFIGURE_TARGET} ${PKGNAME}"
 
diff --git audio/speex/Makefile audio/speex/Makefile
index 3a8af4b..e9a3807 100644
--- audio/speex/Makefile
+++ audio/speex/Makefile
@@ -25,8 +25,8 @@ USE_AUTOTOOLS=	libtool
 GNU_CONFIGURE=	yes
 MAKE_JOBS_SAFE=	yes
 CONFIGURE_ARGS=	--with-ogg-dir=${LOCALBASE}
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 MAN1=		speexdec.1 speexenc.1
 
diff --git audio/sphinx3/Makefile audio/sphinx3/Makefile
index 2a29344..a6877c2 100644
--- audio/sphinx3/Makefile
+++ audio/sphinx3/Makefile
@@ -19,8 +19,8 @@ USE_LDCONFIG=	yes
 USE_GMAKE=	yes
 USE_AUTOTOOLS=libtool
 
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/sphinxbase" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include/sphinxbase
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 MAKE_ENV=	MKDIR="${MKDIR}" \
 		OSVERSION=${OSVERSION}
diff --git audio/sphinxbase/Makefile audio/sphinxbase/Makefile
index 1fa33b3..1828081 100644
--- audio/sphinxbase/Makefile
+++ audio/sphinxbase/Makefile
@@ -20,8 +20,8 @@ USE_GMAKE=	yes
 USE_GNOME=	gnomehack
 USE_AUTOTOOLS=	libtool
 
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 MAKE_ENV=	MKDIR="${MKDIR}" \
 		OSVERSION=${OSVERSION}
diff --git audio/spiralsynthmodular/Makefile audio/spiralsynthmodular/Makefile
index e55ac70..55f6898 100644
--- audio/spiralsynthmodular/Makefile
+++ audio/spiralsynthmodular/Makefile
@@ -24,8 +24,8 @@ USE_XORG=	x11
 GNU_CONFIGURE=	yes
 
 CONFIGURE_ENV=	FLTK_CONFIG="${FLTK_CONFIG}" \
-		CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
 		LIBS="${LIBS} -L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CPPFLAGS+=	-I${LOCALBASE}/include
 
 .if defined(WITH_OPTIMIZED_CFLAGS)
 CFLAGS+=	-O3 -ffast-math
diff --git audio/streamripper/Makefile audio/streamripper/Makefile
index b64114b..9368b99 100644
--- audio/streamripper/Makefile
+++ audio/streamripper/Makefile
@@ -29,7 +29,6 @@ LICENSE=	GPLv2
 USE_GNOME=	glib20
 USE_ICONV=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--without-included-libmad \
 		--without-included-tre \
 		--with-included-argv \
@@ -39,8 +38,8 @@ MAN1=		streamripper.1
 PLIST_FILES=	bin/streamripper
 
 CFLAGS+=	-DANSI_PROTOTYPES
-CPPFLAGS=	-I${LOCALBASE}/include
-LDFLAGS=	-Lcdk-${CDK_VERSION} -L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-Lcdk-${CDK_VERSION} -L${LOCALBASE}/lib
 
 CDK_VERSION=	5.0-20060507
 
diff --git audio/streamtranscoder/Makefile audio/streamtranscoder/Makefile
index bde7d2f..2a43516 100644
--- audio/streamtranscoder/Makefile
+++ audio/streamtranscoder/Makefile
@@ -21,7 +21,8 @@ LIB_DEPENDS=	ogg:${PORTSDIR}/audio/libogg \
 		mp3lame:${PORTSDIR}/audio/lame
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 PLIST_FILES=	bin/streamTranscoder
 PORTDOCS=	AUTHORS README
diff --git audio/streamtuner/Makefile audio/streamtuner/Makefile
index 589a7b1..b3954bf 100644
--- audio/streamtuner/Makefile
+++ audio/streamtuner/Makefile
@@ -23,9 +23,8 @@ USE_GNOME=		gtk20 gnomehack gnomeprefix
 USE_GMAKE=		yes
 INSTALLS_OMF=		yes
 GNU_CONFIGURE=		yes
-CPPFLAGS=		-I${LOCALBASE}/include
-LDFLAGS=		-L${LOCALBASE}/lib
-CONFIGURE_ENV=		CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
+CPPFLAGS+=		-I${LOCALBASE}/include
+LDFLAGS+=		-L${LOCALBASE}/lib
 
 OPTIONS=		SHOUTCAST "SHOUTcast plugin" on \
 			LIVE365 "Live365 plugin" on \
diff --git audio/sweep/Makefile audio/sweep/Makefile
index 701bc86..c8178a6 100644
--- audio/sweep/Makefile
+++ audio/sweep/Makefile
@@ -26,8 +26,8 @@ USE_GNOME=	gnomehack gtk20
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--with-extralibdir=${LOCALBASE}/lib \
 		--with-extraincdir=${LOCALBASE}/include \
 		--with-vorbis-libraries=${LOCALBASE}/lib \
diff --git audio/swhplugins/Makefile audio/swhplugins/Makefile
index 2326b38..4ac8098 100644
--- audio/swhplugins/Makefile
+++ audio/swhplugins/Makefile
@@ -25,9 +25,8 @@ ONLY_FOR_ARCHS=	i386 amd64
 USE_AUTOTOOLS=	libtool
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CPPFLAGS=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 USE_LDCONFIG=	yes
 
 CFLAGS+=	-fPIC -DPIC
diff --git audio/tagger/Makefile audio/tagger/Makefile
index 9d0f098..463cb19 100644
--- audio/tagger/Makefile
+++ audio/tagger/Makefile
@@ -18,8 +18,8 @@ USE_BZIP2=	yes
 USE_GMAKE=	yes
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS+=prefix=${PREFIX} mandir=${MANPREFIX}/man
-CONFIGURE_ENV+=	CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
-	LDFLAGS="-L${LOCALBASE}/lib"
+CFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 PLIST_FILES=	bin/tagger
 
diff --git audio/tagtool/Makefile audio/tagtool/Makefile
index 699a117..75256cd 100644
--- audio/tagtool/Makefile
+++ audio/tagtool/Makefile
@@ -22,11 +22,10 @@ USE_GNOME=	gnomehack intlhack libglade2
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 INSTALLS_ICONS=	yes
 
-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:
 	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
diff --git audio/terminatorx/Makefile audio/terminatorx/Makefile
index 97fb5711..4af5303 100644
--- audio/terminatorx/Makefile
+++ audio/terminatorx/Makefile
@@ -34,7 +34,6 @@ USE_GNOME=	gnomehack gnomehier gtk20 libxml2
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	aclocal autoheader automake autoconf
 ACLOCAL_ARGS=	-I ${LOCALBASE}/share/aclocal
-CONFIGURE_ENV=	LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--disable-alsa \
 		--disable-alsamidi \
 		--disable-scheduler
@@ -42,8 +41,8 @@ INSTALLS_OMF=	yes
 
 MAN1=		terminatorX.1
 
-CPPFLAGS=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
+CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 
 .include <bsd.port.pre.mk>
 
diff --git audio/timidity++/Makefile audio/timidity++/Makefile
index b418124..7214088 100644
--- audio/timidity++/Makefile
+++ audio/timidity++/Makefile
@@ -40,7 +40,7 @@ EXTRACT_AFTER_ARGS=| ${TAR} -xpf - --exclude '*/libarc/*'	\
 CONFIGURE_ARGS=	--enable-interface=ncurses,vt100,server \
 		--program-transform-name= --enable-network
 CPPFLAGS+=	-I${LOCALBASE}/include/libarc
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS=-export-dynamic
+LDFLAGS+=	-export-dynamic
 
 DOCFILES=	README.alsaseq README.dl README.m2m README.mts README.sf
 DOCLANG=	C ja_JP.eucJP
diff --git audio/timidity++/Makefile.interface audio/timidity++/Makefile.interface
index 71fa3e5..2794aed 100644
--- audio/timidity++/Makefile.interface
+++ audio/timidity++/Makefile.interface
@@ -25,7 +25,7 @@ PKGMESSAGE=	${NONEXISTENT}
 .endif
 
 CONFIGURE_ENV+=	SHLD="${CC} -shared ${LDFLAGS}"
-LDFLAGS=	-export-dynamic
+LDFLAGS+=	-export-dynamic
 
 CONFIGURE_ARGS+=--enable-dynamic=${INTERFACE}
 
diff --git audio/tse3/Makefile audio/tse3/Makefile
index b987237..48a3044 100644
--- audio/tse3/Makefile
+++ audio/tse3/Makefile
@@ -16,7 +16,8 @@ COMMENT=	A MIDI library
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
 CONFIGURE_ARGS=	--without-doc-install
-CONFIGURE_ENV=	CPPFLAGS="${PTHREAD_CFLAGS}" LDFLAGS="${PTHREAD_LIBS}"
+CPPFLAGS+=	${PTHREAD_CFLAGS}
+LDFLAGS+=	${PTHREAD_LIBS}
 USE_LDCONFIG=	yes
 MAKE_JOBS_UNSAFE=	yes
 
diff --git audio/umodplayer/Makefile audio/umodplayer/Makefile
index 0b94be5..433d712 100644
--- audio/umodplayer/Makefile
+++ audio/umodplayer/Makefile
@@ -22,13 +22,12 @@ BUILD_DEPENDS=	${LOCALBASE}/lib/libaiff.a:${PORTSDIR}/audio/libaiff
 
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	--prefix=${PREFIX}
-MAKE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 
 PLIST_FILES=	bin/${PORTNAME}
 MAN1=		${PORTNAME}.1
 
-CPPFLAGS=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 post-patch:
 	@${REINPLACE_CMD} -e \
diff --git audio/vagalume/Makefile audio/vagalume/Makefile
index bb856dd..cfb8aef 100644
--- audio/vagalume/Makefile
+++ audio/vagalume/Makefile
@@ -34,8 +34,8 @@ OPTIONS=	DBUS "Build with DBUS support" on \
 
 .if !defined(WITHOUT_NLS)
 USE_GETTEXT=	yes
-CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 PLIST_SUB+=	NLS=""
 .else
 PLIST_SUB+=	NLS="@comment "
diff --git audio/vorbis-tools/Makefile audio/vorbis-tools/Makefile
index e643721..2e795460 100644
--- audio/vorbis-tools/Makefile
+++ audio/vorbis-tools/Makefile
@@ -23,10 +23,10 @@ LIB_DEPENDS=	ao.4:${PORTSDIR}/audio/libao \
 		vorbis.4:${PORTSDIR}/audio/libvorbis
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib" \
-		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
+CONFIGURE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		PTHREAD_LIBS="${PTHREAD_LIBS}"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 MAKE_JOBS_SAFE=	yes
 
 .if !defined(WITHOUT_NLS)
diff --git audio/vorbisgain/Makefile audio/vorbisgain/Makefile
index 3aab50d..f5246f9 100644
--- audio/vorbisgain/Makefile
+++ audio/vorbisgain/Makefile
@@ -18,8 +18,8 @@ COMMENT=	Calculates the perceived sound level of an Ogg Vorbis file
 LIB_DEPENDS=	vorbis.4:${PORTSDIR}/audio/libvorbis
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 MAN1=		vorbisgain.1
 PLIST_FILES=	bin/vorbisgain
diff --git audio/wavbreaker/Makefile audio/wavbreaker/Makefile
index d47088c..79a93ac 100644
--- audio/wavbreaker/Makefile
+++ audio/wavbreaker/Makefile
@@ -18,9 +18,9 @@ OPTIONS=	PULSE "Pulseaudio soundserver support" OFF
 USE_GNOME=	gnomehack gtk20 libxml2
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib" \
-		PKG_CONFIG="${LOCALBASE}/bin/pkg-config"
+CONFIGURE_ENV=	PKG_CONFIG="${LOCALBASE}/bin/pkg-config"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--disable-alsa
 INSTALLS_ICONS=	yes
 
diff --git audio/wavpack/Makefile audio/wavpack/Makefile
index 92f2381..33c1858 100644
--- audio/wavpack/Makefile
+++ audio/wavpack/Makefile
@@ -20,8 +20,6 @@ USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" \
-		LDFLAGS="${LDFLAGS}"
 
 OPTIONS=	MMX "Enable MMX optimizations (x86 only)" Off
 
diff --git audio/whysynth/Makefile audio/whysynth/Makefile
index 9595584..307d674 100644
--- audio/whysynth/Makefile
+++ audio/whysynth/Makefile
@@ -27,9 +27,8 @@ USE_BZIP2=	yes
 USE_GNOME=	gtk20
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
-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 audio/wsoundserver/Makefile audio/wsoundserver/Makefile
index 8b87555..51edf68 100644
--- audio/wsoundserver/Makefile
+++ audio/wsoundserver/Makefile
@@ -25,7 +25,7 @@ USE_AUTOTOOLS=	libtool
 WANT_GNOME=	yes
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include/WINGs"
+CPPFLAGS+=	-I${LOCALBASE}/include/WINGs
 CONFIGURE_ARGS+=--x-includes=${LOCALBASE}/include \
 		--x-libraries=${LOCALBASE}/lib \
 		--with-libs-from=-L${LOCALBASE}/lib \
diff --git audio/wxguitar/Makefile audio/wxguitar/Makefile
index 4d84ddc..4f1dc1c 100644
--- audio/wxguitar/Makefile
+++ audio/wxguitar/Makefile
@@ -21,7 +21,8 @@ GNU_CONFIGURE=	yes
 USE_WX=		2.8+
 WX_UNICODE=	yes
 CONFIGURE_ARGS=	--with-wx-config=${WX_CONFIG}
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 MAKE_JOBS_SAFE=	yes
 
 WRKSRC=		${WRKDIR}/wxGuitar
diff --git audio/xmms-ahx/Makefile audio/xmms-ahx/Makefile
index bfaa993..26e4b4e 100644
--- audio/xmms-ahx/Makefile
+++ audio/xmms-ahx/Makefile
@@ -26,7 +26,8 @@ GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gtk12
 USE_LDCONFIG=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 LICENSE=	GPLv2
 
diff --git audio/xmms-audiofile/Makefile audio/xmms-audiofile/Makefile
index 02c7139..930e026 100644
--- audio/xmms-audiofile/Makefile
+++ audio/xmms-audiofile/Makefile
@@ -24,8 +24,8 @@ USE_GNOME=	gtk12
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 
-CONFIGURE_ENV=	CFLAGS="${CFLAGS} -L${LOCALBASE}/lib ${PTHREAD_CFLAGS}" \
-		LIBS="${LIBS} ${PTHREAD_LIBS}"
+CONFIGURE_ENV=	LIBS="${LIBS} ${PTHREAD_LIBS}"
+CFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_CFLAGS}
 
 post-patch:
 	@${REINPLACE_CMD} -e \
diff --git audio/xmms-cdread/Makefile audio/xmms-cdread/Makefile
index d56b429..258dfd6 100644
--- audio/xmms-cdread/Makefile
+++ audio/xmms-cdread/Makefile
@@ -22,7 +22,7 @@ USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 
-CONFIGURE_ENV=	CFLAGS="${CFLAGS} -L${LOCALBASE}/lib"
+CFLAGS+=	-L${LOCALBASE}/lib
 
 PLIST_FILES=	lib/xmms/Input/libcdread.so lib/xmms/Input/libcdread.la
 
diff --git audio/xmms-crossfade/Makefile audio/xmms-crossfade/Makefile
index 2676130..78f3527 100644
--- audio/xmms-crossfade/Makefile
+++ audio/xmms-crossfade/Makefile
@@ -34,7 +34,6 @@ CONFIGURE_ARGS+=	--enable-player=${APP}
 LIB_DEPENDS+=	samplerate.1:${PORTSDIR}/audio/libsamplerate
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
-CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS+=--enable-samplerate
 .endif
 
diff --git audio/xmms-fc/Makefile audio/xmms-fc/Makefile
index 7914141..3fe6721 100644
--- audio/xmms-fc/Makefile
+++ audio/xmms-fc/Makefile
@@ -25,15 +25,14 @@ RUN_DEPENDS=	xmms:${PORTSDIR}/multimedia/xmms
 USE_BZIP2=	yes
 USE_GNOME=	gtk12
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	LDFLAGS="${LDFLAGS}" \
-		ac_cv_lib_fc14audiodecoder_fc14dec_new=yes
+CONFIGURE_ENV=	ac_cv_lib_fc14audiodecoder_fc14dec_new=yes
 CONFIGURE_ARGS=	--disable-gtktest
 USE_LDCONFIG=	yes
 
 PLIST_FILES=	lib/xmms/Input/fcdecoder.so lib/xmms/Input/fcdecoder.la
 
-CPPFLAGS=	-I${WRKDIR}/${LIBFC_DISTNAME}/src
-LDFLAGS=	-L${WRKDIR}/${LIBFC_DISTNAME}/src/.libs -lstdc++
+CPPFLAGS+=	-I${WRKDIR}/${LIBFC_DISTNAME}/src
+LDFLAGS+=	-L${WRKDIR}/${LIBFC_DISTNAME}/src/.libs -lstdc++
 
 LIBFC_PORTNAME=	libfc14audiodecoder
 LIBFC_PORTVERSION=	1.0.2
diff --git audio/xmms-jack/Makefile audio/xmms-jack/Makefile
index e462117..855256a 100644
--- audio/xmms-jack/Makefile
+++ audio/xmms-jack/Makefile
@@ -22,12 +22,11 @@ WRKSRC=		${WRKDIR}/${PORTNAME}
 USE_GNOME=	gtk12
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 
 PLIST_FILES=	lib/xmms/Output/libjackout.so
 
-CPPFLAGS=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
+CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 
 .include <bsd.port.pre.mk>
 
diff --git audio/xmms-mad/Makefile audio/xmms-mad/Makefile
index 36e5f30..8e43c8b 100644
--- audio/xmms-mad/Makefile
+++ audio/xmms-mad/Makefile
@@ -21,12 +21,11 @@ USE_BZIP2=	yes
 USE_GNOME=	gtk12
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 
 PLIST_FILES=	lib/xmms/Input/libxmmsmad.so
 
-CPPFLAGS=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 do-install:
 	cd ${WRKSRC}/src/.libs \
diff --git audio/xmms-mp3cue/Makefile audio/xmms-mp3cue/Makefile
index ebc8a6c..5f6fbe2 100644
--- audio/xmms-mp3cue/Makefile
+++ audio/xmms-mp3cue/Makefile
@@ -25,7 +25,7 @@ PLIST_SUB=	PORTDOCS=${DISTNAME}
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "amd64" || ${ARCH} == "ia64"
-CONFIGURE_ENV=	CFLAGS="${CFLAGS} -fPIC"
+CFLAGS+=	-fPIC
 .endif
 
 post-patch:
diff --git audio/xmms-wavpack/Makefile audio/xmms-wavpack/Makefile
index 479a2f0..f7bd43f 100644
--- audio/xmms-wavpack/Makefile
+++ audio/xmms-wavpack/Makefile
@@ -18,8 +18,8 @@ LIB_DEPENDS=	wavpack.2:${PORTSDIR}/audio/wavpack \
 
 USE_BZIP2=	yes
 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
 
 post-install:
diff --git audio/xmms-xymms/Makefile audio/xmms-xymms/Makefile
index 0c0ea61..7c43c5f 100644
--- audio/xmms-xymms/Makefile
+++ audio/xmms-xymms/Makefile
@@ -23,7 +23,8 @@ USE_GNOME=	gtk12
 USE_LDCONFIG=	yes
 MAKE_JOBS_SAFE=	yes
 
-CONFIGURE_ENV=	CPPFLAGS="${PTHREAD_CFLAGS}" LDFLAGS="${PTHREAD_LIBS}"
+CPPFLAGS+=	${PTHREAD_CFLAGS}
+LDFLAGS+=	${PTHREAD_LIBS}
 
 PLIST_FILES=	lib/xmms/Input/libxymms.a \
 		lib/xmms/Input/libxymms.la \
diff --git audio/xmms2-scrobbler/Makefile audio/xmms2-scrobbler/Makefile
index b92d75d..4eb8640 100644
--- audio/xmms2-scrobbler/Makefile
+++ audio/xmms2-scrobbler/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS=	xmmsclient.6:${PORTSDIR}/audio/xmms2 \
 		curl.6:${PORTSDIR}/ftp/curl
 
 USE_GMAKE=	yes
-MAKE_ENV=	LDFLAGS="${PTHREAD_LIBS}"
+LDFLAGS+=	${PTHREAD_LIBS}
 
 PLIST_FILES=	bin/xmms2-scrobbler
 PORTDOCS=	README
diff --git audio/xsynth-dssi/Makefile audio/xsynth-dssi/Makefile
index 2d5c1c8..b0b4dc2 100644
--- audio/xsynth-dssi/Makefile
+++ audio/xsynth-dssi/Makefile
@@ -25,9 +25,8 @@ LICENSE_COMB=	multi
 USE_GNOME=	gtk20
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
-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 audio/yamt/Makefile audio/yamt/Makefile
index 95dcb4b..0f8f149 100644
--- audio/yamt/Makefile
+++ audio/yamt/Makefile
@@ -19,8 +19,8 @@ COMMENT=	Yet Another Mp3 Tool which helps you to organize your mp3s
 USE_GMAKE=	yes
 USE_GNOME=	gnomelibs gnomehack gnomeprefix
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
diff --git audio/zinf/Makefile audio/zinf/Makefile
index 6e1f98b..6b57c04 100644
--- audio/zinf/Makefile
+++ audio/zinf/Makefile
@@ -24,11 +24,10 @@ USE_PERL5=	yes
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--enable-ipv6
 
-CPPFLAGS=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
+CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 
 .include <bsd.port.pre.mk>
 
diff --git benchmarks/forkbomb/Makefile benchmarks/forkbomb/Makefile
index 6e956de..7d60cd0 100644
--- benchmarks/forkbomb/Makefile
+++ benchmarks/forkbomb/Makefile
@@ -15,9 +15,6 @@ MASTER_SITE_SUBDIR=	system/benchmark
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	System stress testing tool
 
-MAKE_ENV+=	CPPFLAGS="${CPPFLAGS}" \
-		LDFLAGS="${LDFLAGS}"
-
 MAN8=		forkbomb.8
 PLIST_FILES=	sbin/forkbomb
 
diff --git benchmarks/gtkperf/Makefile benchmarks/gtkperf/Makefile
index ffd773c..29a776c 100644
--- benchmarks/gtkperf/Makefile
+++ benchmarks/gtkperf/Makefile
@@ -23,8 +23,8 @@ USE_GNOME=		gtk20 gnomeprefix
 .if !defined(WITHOUT_NLS)
 USE_GETTEXT=		yes
 USE_ICONV=		yes
-CONFIGURE_ENV+=		CPPFLAGS="-I${LOCALBASE}/include" \
-			LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS+=	--enable-nls
 PLIST_SUB=		NLS=""
 .else
diff --git benchmarks/iozone/Makefile benchmarks/iozone/Makefile
index aee53c1..72fde40 100644
--- benchmarks/iozone/Makefile
+++ benchmarks/iozone/Makefile
@@ -34,7 +34,7 @@ OPTIONS=	THREADS "Enable threading (uses pthreads)"	on \
 
 .if defined (WITH_THREADS)
 CFLAGS+=	${PTHREAD_CFLAGS}
-MAKE_ENV=	LDFLAGS=${PTHREAD_LIBS}
+LDFLAGS+=	${PTHREAD_LIBS}
 .else
 CFLAGS+=-DNO_THREADS
 .endif
diff --git benchmarks/iperf/Makefile benchmarks/iperf/Makefile
index de7215b..00a9795 100644
--- benchmarks/iperf/Makefile
+++ benchmarks/iperf/Makefile
@@ -32,7 +32,7 @@ CONFIGURE_ARGS+=	--disable-ipv6
 .if defined(WITHOUT_THREADS)
 CONFIGURE_ARGS+=	--disable-threads
 .else
-CONFIGURE_ENV+=		CFLAGS+=${PTHREAD_LIBS}
+CFLAGS+=	${PTHREAD_LIBS}
 .endif
 
 post-install:
diff --git benchmarks/polygraph/Makefile benchmarks/polygraph/Makefile
index 44adb23..e3e3182 100644
--- benchmarks/polygraph/Makefile
+++ benchmarks/polygraph/Makefile
@@ -18,7 +18,7 @@ MAINTAINER=	as@bsdgroup.de
 COMMENT=	A benchmarking tool for Web proxies
 
 GNU_CONFIGURE=	YES
-CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS} -Wno-deprecated"
+CPPFLAGS+=	-Wno-deprecated
 CONFIGURE_ARGS+=--datadir=${DATADIR}
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
diff --git benchmarks/polygraph31/Makefile benchmarks/polygraph31/Makefile
index e1263f8..e50dbe8 100644
--- benchmarks/polygraph31/Makefile
+++ benchmarks/polygraph31/Makefile
@@ -17,7 +17,7 @@ MAINTAINER=	adrian@FreeBSD.org
 COMMENT=	A benchmarking tool for Web proxies
 
 GNU_CONFIGURE=	YES
-CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS} -Wno-deprecated"
+CPPFLAGS+=	-Wno-deprecated
 CONFIGURE_ARGS+=--datadir=${DATADIR}
 WRKSRC=		${WRKDIR}/${PORTNAME:S/31//}-${PORTVERSION}
 
diff --git benchmarks/postal/Makefile benchmarks/postal/Makefile
index da69452..55264b5 100644
--- benchmarks/postal/Makefile
+++ benchmarks/postal/Makefile
@@ -39,6 +39,5 @@ CONFIGURE_ARGS+=	--disable-openssl
 
 CFLAGS+=	${PTHREAD_CFLAGS}
 LDFLAGS+=	${PTHREAD_LIBS}
-CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS}"
 
 .include <bsd.port.post.mk>
diff --git benchmarks/sipp/Makefile benchmarks/sipp/Makefile
index 3d4b8de..12c7c8e 100644
--- benchmarks/sipp/Makefile
+++ benchmarks/sipp/Makefile
@@ -22,8 +22,8 @@ MAN1=		sipp.1
 
 USE_GMAKE=	yes
 CPP=		${CXX}
-MAKE_ENV+=	CPPFLAGS="${CXXFLAGS}" \
-		CCLINK="${CXX}"
+MAKE_ENV+=	CCLINK="${CXX}"
+CPPFLAGS+=	${CXXFLAGS}
 WRKSRC=		${WRKDIR}/sipp.svn
 
 OPTIONS=	OPENSSL		"OpenSSL support (for digest auth and SIP over TLS)" on \
diff --git benchmarks/webbench/Makefile benchmarks/webbench/Makefile
index e3d1625..8fc6154 100644
--- benchmarks/webbench/Makefile
+++ benchmarks/webbench/Makefile
@@ -14,7 +14,6 @@ MASTER_SITE_SUBDIR=	apps/www/servers
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Simple forking web benchmark
 
-MAKE_ENV+=	LDFLAGS="${LDFLAGS}"
 MAKE_ARGS+=	CFLAGS="${CPPFLAGS} ${CFLAGS}"
 
 .if !defined(NO_INSTALL_MANPAGES)
diff --git biology/crux/Makefile biology/crux/Makefile
index f483a50..3a464a4 100644
--- biology/crux/Makefile
+++ biology/crux/Makefile
@@ -27,7 +27,6 @@ OPTIONS=       SYS_LINALG "Enable system ATLAS/LAPACK" Off
 
 CPPFLAGS+=      -I${LOCALBASE}/include
 LDFLAGS+=       -L${LOCALBASE}/lib
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 USE_FORTRAN=   yes
 .if defined(WITH_SYS_LINALG)
 CONFIGURE_ARGS+= --enable-sys-linalg
diff --git biology/embassy/Makefile biology/embassy/Makefile
index 09156c4..41d1b14 100644
--- biology/embassy/Makefile
+++ biology/embassy/Makefile
@@ -46,8 +46,10 @@ OPTIONS=	DOMAINATRIX	"Protein domain apps" on \
 		IPRSCAN		"InterPro scan" on \
 		CBSTOOLS	"CBS Tools" on
 
-CONFIGURE_ENV+=	CPPFLAGS="-I${PREFIX}/include -I${LOCALBASE}/include -I${LOCALBASE}/emboss/include" \
-		LDFLAGS="-L${PREFIX}/lib -L${LOCALBASE}/lib -L${LOCALBASE}/emboss/lib"
+CPPFLAGS+=	-I${PREFIX}/include -I${LOCALBASE}/include -I${LOCALBASE}/emboss/include
+LDFLAGS+=	-L${PREFIX}/lib -L${LOCALBASE}/lib -L${LOCALBASE}/emboss/lib
+
+CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 
 EMBASSY_WRKDIR=		${WRKSRC}/EMBASSY
 DOMAINATRIX_VERSION=	0.1.0
diff --git biology/mopac/Makefile biology/mopac/Makefile
index b51e171..20eb748 100644
--- biology/mopac/Makefile
+++ biology/mopac/Makefile
@@ -22,12 +22,11 @@ USE_GMAKE=	yes
 USE_AUTOTOOLS=	aclocal automake autoconf libtool
 ACLOCAL_ARGS=	-I ${LOCALBASE}/share/aclocal
 AUTOMAKE_ARGS=	--add-missing --copy
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 MAKE_JOBS_SAFE=	yes
 USE_LDCONFIG=	yes
 
-CPPFLAGS=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 MOPAC_SUBVERSION=	1.11
 
diff --git biology/protomol/Makefile biology/protomol/Makefile
index 102dd98..3fc6b76 100644
--- biology/protomol/Makefile
+++ biology/protomol/Makefile
@@ -27,8 +27,6 @@ CONFIGURE_ARGS+=	--without-irix_mipspro_mpi
 CPPFLAGS+=	-I${LOCALBASE}/include
 CXXFLAGS+=	-L${LOCALBASE}/lib
 
-CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}" CXXFLAGS="${CXXFLAGS}"
-
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 OPTIONS=	GLUT "Use glut" on
diff --git biology/xdrawchem/Makefile biology/xdrawchem/Makefile
index e95f483..7743131 100644
--- biology/xdrawchem/Makefile
+++ biology/xdrawchem/Makefile
@@ -21,8 +21,8 @@ USE_GMAKE=	yes
 USE_QT_VER=	3
 
 CONFIGURE_ENV=	QTINCDIR="${LOCALBASE}/include" \
-		QTLIBDIR="${LOCALBASE}/lib" \
-		LDFLAGS="${LDFLAGS} -lm"
+		QTLIBDIR="${LOCALBASE}/lib"
+LDFLAGS+=	-lm
 
 MAKE_ARGS+=	LDFLAGS+="-lqt-mt ${PTHREAD_LIBS}"
 
diff --git cad/brlcad/Makefile cad/brlcad/Makefile
index 61d82fe..751c0e4 100644
--- cad/brlcad/Makefile
+++ cad/brlcad/Makefile
@@ -34,8 +34,7 @@ USE_GNOME=	gnomehack
 CPPFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include/tcl8.5\
  -I${LOCALBASE}/include/tk8.5 -I${LOCALBASE}/include/tnt
 LDFLAGS+=	-L${LOCALBASE}/lib
-CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \
-		TKINCDIR=${LOCALBASE}/include/tk8.5
+CONFIGURE_ENV+=	TKINCDIR=${LOCALBASE}/include/tk8.5
 CONFIGURE_ARGS+=--with-libs="-lpng ${EXTRA_LIBS}" --program-transform-name=""	\
 	--x-includes=${LOCALBASE}/include --x-libraries=${LOCALBASE}/libs	\
 	--disable-jove-build --disable-strict-build --disable-warnings		\
diff --git cad/geda-gattrib/Makefile cad/geda-gattrib/Makefile
index 16a6e27..2b4692b 100644
--- cad/geda-gattrib/Makefile
+++ cad/geda-gattrib/Makefile
@@ -30,8 +30,8 @@ USE_GMAKE=	yes
 INSTALLS_ICONS=	yes
 CONFIGURE_ARGS=	--with-docdir="${DOCSDIR}" --disable-update-mime-database \
 		--disable-update-desktop-database
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .if !defined(WITHOUT_NLS)
 USE_GETTEXT=	yes
diff --git cad/geda-gschem/Makefile cad/geda-gschem/Makefile
index d7610d2..8a687d3 100644
--- cad/geda-gschem/Makefile
+++ cad/geda-gschem/Makefile
@@ -31,8 +31,8 @@ INSTALLS_ICONS=	yes
 CONFIGURE_ARGS=	--enable-gdgeda --with-docdir=${DOCSDIR} \
 		--disable-update-mime-database \
 		--disable-update-desktop-database
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 MAN1=		gschem.1
 
diff --git cad/geda-netlist/Makefile cad/geda-netlist/Makefile
index bfaddac..725adfb 100644
--- cad/geda-netlist/Makefile
+++ cad/geda-netlist/Makefile
@@ -27,8 +27,8 @@ DOCSDIR=	${PREFIX}/share/doc/geda
 GNU_CONFIGURE=	yes
 USE_GNOME=	gtk20
 CONFIGURE_ARGS=	--with-docdir=${DOCSDIR}
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 MAN1=		gnetlist.1
 
diff --git cad/geda-symbols/Makefile cad/geda-symbols/Makefile
index 8c2e9cb..dec427e 100644
--- cad/geda-symbols/Makefile
+++ cad/geda-symbols/Makefile
@@ -22,8 +22,8 @@ DOCSDIR=	${PREFIX}/share/doc/geda
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-docdir=${DOCSDIR}
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 post-patch:
 	@${REINPLACE_CMD} -E \
diff --git cad/geda-symcheck/Makefile cad/geda-symcheck/Makefile
index cea6d79..bdd2644 100644
--- cad/geda-symcheck/Makefile
+++ cad/geda-symcheck/Makefile
@@ -27,8 +27,8 @@ DATADIR=	${PREFIX}/share/geda
 GNU_CONFIGURE=	yes
 USE_GNOME=	gtk20
 CONFIGURE_ARGS=	--with-docdir=${DOCSDIR}
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 MAN1=		gsymcheck.1
 
diff --git cad/geda-utils/Makefile cad/geda-utils/Makefile
index d509828..7b5f22f 100644
--- cad/geda-utils/Makefile
+++ cad/geda-utils/Makefile
@@ -30,8 +30,8 @@ USE_GNOME=	gtk20
 USE_PERL5_RUN=	yes
 USE_PYTHON_RUN=	yes
 CONFIGURE_ARGS=	--with-docdir=${DOCSDIR}
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 MAN1=		grenum.1
 
diff --git cad/gerbv/Makefile cad/gerbv/Makefile
index f8f5df4..2c74248 100644
--- cad/gerbv/Makefile
+++ cad/gerbv/Makefile
@@ -19,7 +19,6 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 USE_GNOME=	desktopfileutils gnomehack gtk20
 USE_AUTOTOOLS=	libtool
-CONFIGURE_ENV=	LDFLAGS="${LDFLAGS}"
 USE_LDCONFIG=	yes
 INSTALLS_ICONS=	yes
 
@@ -27,8 +26,8 @@ PLIST_SUB=	VERSION="${PORTVERSION}"
 
 MAN1=		gerbv.1
 
-CPPFLAGS=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 post-patch:
 	@${REINPLACE_CMD} -e '/^SUBDIRS =/s|desktop||g' ${WRKSRC}/Makefile.in
diff --git cad/gwave/Makefile cad/gwave/Makefile
index af82d22..7bc867d 100644
--- cad/gwave/Makefile
+++ cad/gwave/Makefile
@@ -20,8 +20,8 @@ LIB_DEPENDS=	guile.21:${PORTSDIR}/lang/guile \
 USE_GNOME=	gtk12
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
 
 OPTIONS=	PLOTUTILS "Use GNU plotutils for plotting" off \
 		GNUPLOT "Use gnuplot for plotting" on \
diff --git cad/irsim/Makefile cad/irsim/Makefile
index edfccb7..2fbf79f 100644
--- cad/irsim/Makefile
+++ cad/irsim/Makefile
@@ -22,7 +22,7 @@ CONFIGURE_WRKSRC=	${WRKSRC}/scripts/
 
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
-CONFIGURE_ENV+=	PIC_CFLAGS="-fpic" LDFLAGS="${LDFLAGS}" \
+CONFIGURE_ENV+=	PIC_CFLAGS="-fpic" \
 		PTHREAD_LIBS="${PTHREAD_LIBS}"
 
 OPTIONS=	SCHEME	"Enable built-in Scheme interpreter" on \
diff --git cad/libgeda/Makefile cad/libgeda/Makefile
index fdc1361..4b0f604 100644
--- cad/libgeda/Makefile
+++ cad/libgeda/Makefile
@@ -25,8 +25,8 @@ USE_GNOME=	gtk20 gnomehack
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--disable-update-mime-database \
 		--disable-update-desktop-database
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .if !defined(WITHOUT_NLS)
 USE_GETTEXT=	yes
diff --git cad/magic/Makefile cad/magic/Makefile
index 2d90d6f..c9a2fd2 100644
--- cad/magic/Makefile
+++ cad/magic/Makefile
@@ -27,7 +27,6 @@ USE_TCL=	yes
 USE_TK=		yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--with-tcl=${TCL_LIBDIR} --with-tk=${TK_LIBDIR}
 ALL_TARGET=	tcllibrary
 MAKE_JOBS_UNSAFE=yes
@@ -36,8 +35,8 @@ MAN1=		ext2sim.1 ext2spice.1 extcheck.1 magic.1
 MAN5=		cmap.5 displays.5 dlys.5 dstyle.5 ext.5 glyphs.5 mag.5 \
 		net.5 sim.5
 
-CPPFLAGS=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .include <bsd.port.pre.mk>
 
diff --git cad/netgen/Makefile cad/netgen/Makefile
index ffbcffb..d0d1e7c 100644
--- cad/netgen/Makefile
+++ cad/netgen/Makefile
@@ -27,7 +27,6 @@ USE_XORG=	xmu xi
 GNU_CONFIGURE=	yes
 LDFLAGS+=	-L${LOCALBASE}/lib
 CPPFLAGS+=	-I${LOCALBASE}/include -I${TCL_INCLUDEDIR} -I${TK_INCLUDEDIR} -I${TK_LIBDIR}/Togl-1.7
-CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS}" CPPFLAGS="${CPPFLAGS}"
 CONFIGURE_ARGS+=	--with-tcl=${TCL_LIBDIR} --with-tk=${TK_LIBDIR} --enable-jpeglib
 
 FETCH_BEFORE_ARGS+=	-o ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}
diff --git cad/opencascade-tutorial/Makefile cad/opencascade-tutorial/Makefile
index 6bd7978..7c6b4c9 100644
--- cad/opencascade-tutorial/Makefile
+++ cad/opencascade-tutorial/Makefile
@@ -30,7 +30,7 @@ CONFIGURE_ARGS=	--with-gl-include=${LOCALBASE}/include	\
 		--with-qt-dir=${QTDIR}			\
 		--enable-qt-mt				\
 		--with-cascade-dir=${CASROOT}
-CONFIGURE_ENV=	LDFLAGS="${LDFLAGS} ${PTHREAD_LIBS}"
+LDFLAGS+=	${PTHREAD_LIBS}
 
 WRKSRC=		${WRKDIR}/opencascade-${PORTVERSION}/samples/tutorial
 CONFIGURE_LOG=	adm/${OPSYS}/config.log
diff --git cad/opencascade/Makefile cad/opencascade/Makefile
index b19a6c0..b6a1cc3 100644
--- cad/opencascade/Makefile
+++ cad/opencascade/Makefile
@@ -65,8 +65,9 @@ CONFIGURE_ARGS=	--with-tcl=${TCL_LIBDIR}				\
 		--with-stlport-libname=stlport_${STL_COMPILER}		\
 		--with-stlport-library=${LOCALBASE}/lib			\
 		--enable-production=yes
-CONFIGURE_ENV=	CPPFLAGS="${CXXFLAGS} ${GCC4WA} -I${LOCALBASE}/include	\
-		-I${TCL_INCLUDEDIR} -I${TK_INCLUDEDIR}" ARCH=${ARCH} LD=${CXX}
+CONFIGURE_ENV=	ARCH=${ARCH} LD=${CXX}
+CPPFLAGS+=	${CXXFLAGS} ${GCC4WA} -I${LOCALBASE}/include	\
+		-I${TCL_INCLUDEDIR} -I${TK_INCLUDEDIR}
 # We strip the libs
 MAKE_ENV=	INSTALL_STRIP_FLAG=-s OCC_BUILDDIR="${PATCH_WRKSRC}"	\
 		OCC_INSTALLDIR="${OCCROOT}" PTHREAD_LIBS="${PTHREAD_LIBS}" LD=${CXX}
diff --git cad/pcb/Makefile cad/pcb/Makefile
index aa486d1..d2edcaa 100644
--- cad/pcb/Makefile
+++ cad/pcb/Makefile
@@ -24,9 +24,9 @@ USE_AUTOTOOLS=	autoconf
 USE_GMAKE=	yes
 USE_TK_RUN=	83
 INSTALLS_ICONS=	yes
-CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
-		LDFLAGS="${PTHREAD_LIBS} -L${LOCALBASE}/lib" \
-		INSTALL_DATA="/usr/bin/install ${COPY} ${_SHROWNGRP} -m ${SHAREMODE}"
+CONFIGURE_ENV+=	INSTALL_DATA="/usr/bin/install ${COPY} ${_SHROWNGRP} -m ${SHAREMODE}"
+CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS+=	${PTHREAD_LIBS} -L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--docdir=${DOCSDIR} --disable-nls
 PORTDOCS= pcb.html pcb.ps refcard.ps pcb.pdf refcard.pdf pad.gif	\
 	puller.gif thermal.gif pad.png puller.png thermal.png examples	\
diff --git cad/salome/Makefile.ext cad/salome/Makefile.ext
index 420b57c..f7fd798 100644
--- cad/salome/Makefile.ext
+++ cad/salome/Makefile.ext
@@ -292,7 +292,7 @@ PLIST_SUB+=     MPI="@comment "
 .endif
 .endif
 
-CONFIGURE_ENV+=		LDFLAGS="${LDFLAGS}" CXXFLAGS="${QSCIFLAGS} ${QTFLAGS} ${CXXFLAGS} " CPPFLAGS="${CPPFLAGS}"
+CXXFLAGS+=	${QSCIFLAGS} ${QTFLAGS}
 
 .include <bsd.port.pre.mk>
 
diff --git chinese/oto/Makefile chinese/oto/Makefile
index fb37fcd..266c94f 100644
--- chinese/oto/Makefile
+++ chinese/oto/Makefile
@@ -16,8 +16,8 @@ COMMENT=	Show you font info and add new 'name' and 'cmap' tables
 USE_ICONV=	yes
 GNU_CONFIGURE=	YES
 USE_GMAKE=	YES
-CPPFLAGS=	-I${LOCALBASE}/include
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LIBS="-L${LOCALBASE}/lib -liconv"
+CPPFLAGS+=	-I${LOCALBASE}/include
+CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib -liconv"
 
 post-patch:
 	@${FIND} ${WRKSRC}/src/ -type f -print0 | \
diff --git chinese/oxim/Makefile chinese/oxim/Makefile
index fdd017b..c35dc86 100644
--- chinese/oxim/Makefile
+++ chinese/oxim/Makefile
@@ -29,8 +29,6 @@ GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib -liconv
-CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}" \
-		LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS+=--disable-bimsphone-module \
 		--disable-static \
 		--with-conf-dir=${PREFIX}/etc/${PORTNAME} \
@@ -75,7 +73,7 @@ PLIST_SUB+=	UNICODE="@comment "
 # TODO WITHOUT_NLS knob
 #.if !defined(WITHOUT_NLS)
 USE_GETTEXT=	yes
-CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS} -lintl"
+LDFLAGS+=	-lintl
 PLIST_SUB+=	NLS=""
 #.else
 #CONFIGURE_ARGS+=--disable-nls
diff --git chinese/pcmanx/Makefile chinese/pcmanx/Makefile
index 2c88fa5..e402de7 100644
--- chinese/pcmanx/Makefile
+++ chinese/pcmanx/Makefile
@@ -35,7 +35,6 @@ USE_GETTEXT=	yes
 PLIST_SUB+=	NLS=""
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
-CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 .else
 CONFIGURE_ARGS+=--disable-nls
 PLIST_SUB+=	NLS="@comment "
diff --git chinese/qterm/Makefile chinese/qterm/Makefile
index a889e47..77fb5c7 100644
--- chinese/qterm/Makefile
+++ chinese/qterm/Makefile
@@ -20,7 +20,7 @@ USE_PERL5_BUILD=yes
 USE_QT_VER=	3
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-mt --prefix=${PREFIX}
-CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib"
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .if !defined(WITHOUT_PYTHON)
 USE_PYTHON=	2.5+
diff --git chinese/scim-array/Makefile chinese/scim-array/Makefile
index 376edfe..ca765b5 100644
--- chinese/scim-array/Makefile
+++ chinese/scim-array/Makefile
@@ -25,7 +25,6 @@ USE_ICONV=	yes
 
 CFLAGS+=	-fPIC
 CPPFLAGS+=	-I${LOCALBASE}/include
-CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}"
 
 pre-configure:
 	@${REINPLACE_CMD} -e "s,@SCIM_MODULEDIR@,$$(pkg-config --variable=moduledir scim | ${SED} -e s,`pkg-config --variable=prefix scim`,${PREFIX},)," ${WRKSRC}/src/Makefile.in
diff --git chinese/scim-chewing/Makefile chinese/scim-chewing/Makefile
index 9116c89..65a032a 100644
--- chinese/scim-chewing/Makefile
+++ chinese/scim-chewing/Makefile
@@ -25,7 +25,7 @@ USE_GNOME=	intltool
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 
-CONFIGURE_ENV+=	CPPFLAGS="-D__STDC_ISO_10646__ -I${LOCALBASE}/include"
+CPPFLAGS+=	-D__STDC_ISO_10646__ -I${LOCALBASE}/include
 
 post-patch:
 	@${REINPLACE_CMD} -e 's,@DATADIRNAME@,share,g' ${WRKSRC}/po/Makefile.in.in
diff --git chinese/scim-fcitx/Makefile chinese/scim-fcitx/Makefile
index 3c96bf3..117e738 100644
--- chinese/scim-fcitx/Makefile
+++ chinese/scim-fcitx/Makefile
@@ -26,10 +26,10 @@ MAKE_JOBS_UNSAFE=	yes
 
 WRKSRC=		${WRKDIR}/fcitx
 
-CONFIGURE_ENV+=	LDFLAGS="-L${LOCALBASE}/lib -lintl" \
-		CPPFLAGS="-I${LOCALBASE}/include" \
-		SCIM_DATADIR=${PREFIX}/share/scim \
+CONFIGURE_ENV+=	SCIM_DATADIR=${PREFIX}/share/scim \
 		SCIM_ICONDIR=${PREFIX}/share/scim/icons
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib -lintl
 
 SUB_FILES=	pkg-message
 
diff --git chinese/scim-pinyin/Makefile chinese/scim-pinyin/Makefile
index 9f24231..0c81a0d 100644
--- chinese/scim-pinyin/Makefile
+++ chinese/scim-pinyin/Makefile
@@ -23,9 +23,10 @@ USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
 
 CONFIGURE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
-		PTHREAD_LIBS="${PTHREAD_LIBS}" \
-		CPPFLAGS="-I${LOCALBASE}/include -D__STDC_ISO_10646__" \
-		LDFLAGS="-L${LOCALBASE}/lib -lintl"
+		PTHREAD_LIBS="${PTHREAD_LIBS}"
+
+CPPFLAGS+=	-I${LOCALBASE}/include -D__STDC_ISO_10646__
+LDFLAGS+=	-L${LOCALBASE}/lib -lintl
 
 .include <bsd.port.pre.mk>
 
diff --git chinese/scim-tables/Makefile chinese/scim-tables/Makefile
index c293e9c..ec9b0c4 100644
--- chinese/scim-tables/Makefile
+++ chinese/scim-tables/Makefile
@@ -23,9 +23,9 @@ GNU_CONFIGURE=	yes
 
 CPPFLAGS+=	-I${LOCALBASE}/include -D__STDC_ISO_10646__
 
-CONFIGURE_ENV+=	LDFLAGS="-L${LOCALBASE}/lib -lintl" \
-		SCIM_DATADIR=${PREFIX}/share/scim \
+CONFIGURE_ENV+=	SCIM_DATADIR=${PREFIX}/share/scim \
 		SCIM_ICONDIR=${PREFIX}/share/scim/icons
+LDFLAGS+=	-L${LOCALBASE}/lib -lintl
 
 CONFIGURE_ARGS+=	--disable-skim-support
 
diff --git chinese/srecite/Makefile chinese/srecite/Makefile
index b4f4449..c1e3288 100644
--- chinese/srecite/Makefile
+++ chinese/srecite/Makefile
@@ -19,8 +19,8 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A tool for the Chinese people to study foreign language
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack gnomeprefix libgnomeui
 
diff --git chinese/zhcon/Makefile chinese/zhcon/Makefile
index 1448967..eff4404 100644
--- chinese/zhcon/Makefile
+++ chinese/zhcon/Makefile
@@ -22,8 +22,8 @@ USE_ICONV=	yes
 # Don't bother to add ".if !defined(WITHOUT_NLS)", zhcon requires libintl
 USE_GETTEXT=	yes
 CONFIGURE_ARGS=	--with-libintl-prefix=${LOCALBASE}
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 PKGMESSAGE=	${WRKDIR}/pkg-message
 SUB_FILES=	pkg-message
diff --git comms/anyremote/Makefile comms/anyremote/Makefile
index 33fe1d9..07b1b0c 100644
--- comms/anyremote/Makefile
+++ 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 comms/bforce/Makefile comms/bforce/Makefile
index 77a887d..536f173 100644
--- comms/bforce/Makefile
+++ 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 comms/dfu-programmer/Makefile comms/dfu-programmer/Makefile
index f7b12b9..3d34308 100644
--- comms/dfu-programmer/Makefile
+++ 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 comms/efax-gtk/Makefile comms/efax-gtk/Makefile
index 25ce669..98fd21a 100644
--- comms/efax-gtk/Makefile
+++ 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 comms/ghfaxviewer/Makefile comms/ghfaxviewer/Makefile
index 6b304e9..1635111 100644
--- comms/ghfaxviewer/Makefile
+++ 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 comms/gmfsk/Makefile comms/gmfsk/Makefile
index 8369548..b544498 100644
--- comms/gmfsk/Makefile
+++ 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 comms/gnocky/Makefile comms/gnocky/Makefile
index e57e3d2..4b02156 100644
--- comms/gnocky/Makefile
+++ 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 comms/gnokii/Makefile comms/gnokii/Makefile
index 062b75c..3209b57 100644
--- comms/gnokii/Makefile
+++ 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 comms/gnuradio/Makefile comms/gnuradio/Makefile
index 87302e8..e61af00 100644
--- comms/gnuradio/Makefile
+++ 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 comms/gsmlib/Makefile comms/gsmlib/Makefile
index cd18a49..972de6a 100644
--- comms/gsmlib/Makefile
+++ 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 comms/hamlib/Makefile comms/hamlib/Makefile
index 63fde84..f973527 100644
--- comms/hamlib/Makefile
+++ 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 comms/kpsk/Makefile comms/kpsk/Makefile
index df40622..18ec28b 100644
--- comms/kpsk/Makefile
+++ 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 comms/libimobiledevice/Makefile comms/libimobiledevice/Makefile
index aa1b95c..2202386 100644
--- comms/libimobiledevice/Makefile
+++ 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 comms/libticables/Makefile comms/libticables/Makefile
index f01ea81..6bf54a5 100644
--- comms/libticables/Makefile
+++ 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 comms/libticables2/Makefile comms/libticables2/Makefile
index fe3ed98..bd425d0 100644
--- comms/libticables2/Makefile
+++ 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 comms/libticalcs2/Makefile comms/libticalcs2/Makefile
index 806bc72..2069c0f 100644
--- comms/libticalcs2/Makefile
+++ 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 comms/linpsk/Makefile comms/linpsk/Makefile
index 2c48bc6..00739df 100644
--- comms/linpsk/Makefile
+++ 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 comms/linrad/Makefile comms/linrad/Makefile
index 9615122..63ac544 100644
--- comms/linrad/Makefile
+++ 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 comms/lirc/Makefile comms/lirc/Makefile
index 353e590..3ba8eaf 100644
--- comms/lirc/Makefile
+++ 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 comms/nokryptia/Makefile comms/nokryptia/Makefile
index 90338cc..dc56031 100644
--- comms/nokryptia/Makefile
+++ 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 comms/py-lirc/Makefile comms/py-lirc/Makefile
index a2ad7f6..3347ce6 100644
--- comms/py-lirc/Makefile
+++ 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 comms/scmxx/Makefile comms/scmxx/Makefile
index 6f6d191..b6e56bc 100644
--- comms/scmxx/Makefile
+++ 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 comms/spandsp/Makefile comms/spandsp/Makefile
index 5642bbc..113d6c9 100644
--- comms/spandsp/Makefile
+++ 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 comms/tcpser/Makefile comms/tcpser/Makefile
index 6209a54..52d4dbb 100644
--- comms/tcpser/Makefile
+++ 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 comms/tilp2/Makefile comms/tilp2/Makefile
index f84a445..d1e8181 100644
--- comms/tilp2/Makefile
+++ 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 comms/tlf/Makefile comms/tlf/Makefile
index 95129f8..b3986ce 100644
--- comms/tlf/Makefile
+++ 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 comms/trustedqsl/Makefile comms/trustedqsl/Makefile
index 7415ea6..dd1165f 100644
--- comms/trustedqsl/Makefile
+++ 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 comms/wsjt/Makefile comms/wsjt/Makefile
index d3ba4d8..6c1473e 100644
--- comms/wsjt/Makefile
+++ 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 comms/wspr/Makefile comms/wspr/Makefile
index 3332f04..b9a382f 100644
--- comms/wspr/Makefile
+++ 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 comms/xnecview/Makefile comms/xnecview/Makefile
index d2b2fb1..443f031 100644
--- comms/xnecview/Makefile
+++ 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
 
diff --git converters/ascii2binary/Makefile converters/ascii2binary/Makefile
index 43f4efb..09c284f 100644
--- converters/ascii2binary/Makefile
+++ converters/ascii2binary/Makefile
@@ -19,7 +19,8 @@ USE_GETTEXT=	yes
 LICENSE=	GPLv3
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS=-I${LOCALBASE}/include LDFLAGS=-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 PLIST_FILES=	bin/ascii2binary bin/binary2ascii
diff --git converters/cocot/Makefile converters/cocot/Makefile
index a9c8dda..de9372e 100644
--- converters/cocot/Makefile
+++ converters/cocot/Makefile
@@ -17,7 +17,8 @@ USE_BZIP2=	yes
 USE_ICONV=	yes
 GNU_CONFIGURE=	yes
 
-CONFIGURE_ENV=	CPPFLAGS=-I${LOCALBASE}/include LDFLAGS=-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 DOCS_EN=	COPYING ChangeLog
 DOCS_JA=	ChangeLog.ja README.ja
diff --git converters/enca/Makefile converters/enca/Makefile
index db884d4..9ffc783 100644
--- converters/enca/Makefile
+++ converters/enca/Makefile
@@ -29,8 +29,8 @@ USE_LDCONFIG=	yes
 MAKE_JOBS_SAFE=	yes
 CONFIGURE_ARGS=	--with-html-dir=${DOCSDIR}
 
-CONFIGURE_ENV=	CPPFLAGS=-I${LOCALBASE}/include \
-		LDFLAGS=-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 MAN1=	enca.1
 MLINKS=	enca.1 enconv.1
diff --git converters/fix-mime-charset/Makefile converters/fix-mime-charset/Makefile
index ebf2ce6..fd9b6fe 100644
--- converters/fix-mime-charset/Makefile
+++ converters/fix-mime-charset/Makefile
@@ -21,8 +21,8 @@ PORTDOCS=	README.koi8r README
 GNU_CONFIGURE=	yes
 USE_PERL5_BUILD=	yes
 
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
 
 MAN1=		fix-mime-charset.1
 PLIST_FILES=	bin/fix-mime-charset
diff --git converters/ical2html/Makefile converters/ical2html/Makefile
index 9e81b85..0cd1082 100644
--- converters/ical2html/Makefile
+++ converters/ical2html/Makefile
@@ -17,7 +17,7 @@ LIB_DEPENDS=	ical.44:${PORTSDIR}/devel/libical
 
 GNU_CONFIGURE=	yes
 
-CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include/libical -I${LOCALBASE}/include" \
-		LDFLAGS=-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include/libical -I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .include <bsd.port.mk>
diff --git converters/pdf2djvu/Makefile converters/pdf2djvu/Makefile
index 2074d94..24d1784 100644
--- converters/pdf2djvu/Makefile
+++ converters/pdf2djvu/Makefile
@@ -20,8 +20,8 @@ LIB_DEPENDS=	poppler.13:${PORTSDIR}/graphics/poppler
 LIB_DEPENDS+=	djvulibre.24:${PORTSDIR}/graphics/djvulibre-nox11
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	LIBS=${PTHREAD_LIBS} \
-		CPPFLAGS=-I${LOCALBASE}/include
+CONFIGURE_ENV=	LIBS=${PTHREAD_LIBS}
+CPPFLAGS+=	-I${LOCALBASE}/include
 USE_GMAKE=	yes
 
 PLIST_FILES=	bin/pdf2djvu
diff --git converters/rcctools/Makefile converters/rcctools/Makefile
index 92c2e74..15a59c2 100644
--- converters/rcctools/Makefile
+++ converters/rcctools/Makefile
@@ -19,8 +19,8 @@ LIB_DEPENDS=	rcc.2:${PORTSDIR}/devel/librcc
 USE_BZIP2=	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/rcc-recode
 
diff --git converters/recode/Makefile converters/recode/Makefile
index 18a205d..b369c51 100644
--- converters/recode/Makefile
+++ converters/recode/Makefile
@@ -20,8 +20,8 @@ USE_AUTOTOOLS=	libtool
 USE_PERL5=	yes
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--without-included-gettext
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 CFLAGS+=	-fPIC
 
 MAN1=		recode.1
diff --git converters/uudeview/Makefile converters/uudeview/Makefile
index 2eb39d3..46d9d08 100644
--- converters/uudeview/Makefile
+++ converters/uudeview/Makefile
@@ -16,7 +16,7 @@ COMMENT=	A program for uu/xx/Base64/BinHex/yEnc de-/encoding
 LIB_DEPENDS=	uu.3:${PORTSDIR}/converters/uulib
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib"
+LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--disable-tcl
 
 .include <bsd.port.pre.mk>
diff --git converters/xdeview/Makefile converters/xdeview/Makefile
index a5b3a96..c067f44 100644
--- converters/xdeview/Makefile
+++ converters/xdeview/Makefile
@@ -32,12 +32,12 @@ DOCFILES=	${FILESDIR}/porting.notes
 USE_TK=		82+
 
 .include <bsd.port.pre.mk>
-CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib \
-			-lX11 -ltcl${TCL_VER:S/.//} \
-			-ltk${TCL_VER:S/.//} -lm" \
-		CPPFLAGS="-I${TCL_INCLUDEDIR} -DHAVE_TCL \
-			-I${TK_INCLUDEDIR} -DHAVE_TK \
-			-I${LOCALBASE}/include"
+CPPFLAGS+=	-I${TCL_INCLUDEDIR} -DHAVE_TCL \
+		-I${TK_INCLUDEDIR} -DHAVE_TK \
+		-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib \
+		-lX11 -ltcl${TCL_VER:S/.//} \
+		-ltk${TCL_VER:S/.//} -lm
 
 post-install:
 	${STRIP_CMD} ${PREFIX}/bin/uuwish
diff --git converters/ytnef/Makefile converters/ytnef/Makefile
index 12e8005..0632de6 100644
--- converters/ytnef/Makefile
+++ converters/ytnef/Makefile
@@ -22,7 +22,6 @@ GNU_CONFIGURE=	yes
 
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
-CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS}"
 
 PLIST_FILES=	bin/ytnef bin/ytnefprocess.pl bin/ytnefprint
 PORTDOCS=	AUTHORS NEWS README
diff --git databases/animenfo-client-gtk/Makefile databases/animenfo-client-gtk/Makefile
index fa40cae..941461e 100644
--- databases/animenfo-client-gtk/Makefile
+++ databases/animenfo-client-gtk/Makefile
@@ -25,7 +25,6 @@ USE_GMAKE=	yes
 USE_GETTEXT=	yes
 USE_GNOME=	gtk20
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CPPFLAGS+=	${PTHREAD_CFLAGS} -I${LOCALBASE}/include
 CFLAGS+=	${CPPFLAGS}
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git databases/beansdb/Makefile databases/beansdb/Makefile
index c7c8405..5a75d97 100644
--- databases/beansdb/Makefile
+++ databases/beansdb/Makefile
@@ -15,8 +15,7 @@ MAINTAINER=	qingfeng@douban.com
 COMMENT=	Yet anonther distributed key-value storage system from Douban Inc
 
 GNU_CONFIGURE=	yes
-CFLAGS+=	-pthread
-MAKE_ENV+=	CFLAGS="${CFLAGS}"
+CFLAGS+=	${PTHREAD_LIBS}
 
 MAN1=		beansdb.1
 PLIST_FILES=	bin/beansdb
diff --git databases/cego/Makefile databases/cego/Makefile
index c6bb130f..a71d3bb 100644
--- databases/cego/Makefile
+++ databases/cego/Makefile
@@ -18,8 +18,8 @@ LIB_DEPENDS=	lfc.1:${PORTSDIR}/devel/lfc \
 		lfcxml.1:${PORTSDIR}/devel/lfcxml
 
 GNU_CONFIGURE=	yes
-CPPFLAGS=	"-I${LOCALBASE}/include"
-CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	autoconf:env
diff --git databases/clip/Makefile databases/clip/Makefile
index f55d312..af291e5 100644
--- databases/clip/Makefile
+++ databases/clip/Makefile
@@ -37,8 +37,8 @@ USE_XORG+=	x11 xau ice xproto xmu xpm
 WANT_GNOME=	yes
 SUB_FILES=	pkg-message
 PKGMESSAGE=	${WRKDIR}/pkg-message
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 OPTIONS=	IODBC		"iODBC support"				on \
 		UNIXODBC	"unixODBC support (not with iODBC)"	off \
diff --git databases/cyrus-imspd/Makefile databases/cyrus-imspd/Makefile
index dbe62fa8..ffb7421 100644
--- databases/cyrus-imspd/Makefile
+++ databases/cyrus-imspd/Makefile
@@ -19,7 +19,6 @@ LIB_DEPENDS=	sasl2.2:${PORTSDIR}/security/cyrus-sasl2
 
 GNU_CONFIGURE=	YES
 CPPFLAGS+=	-I${LOCALBASE}/include
-CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}"
 CONFIGURE_ARGS=	--prefix=${PREFIX} \
 		--with-sasldir=${LOCALBASE} \
 		--with-sasl=${LOCALBASE} \
diff --git databases/dbtool/Makefile databases/dbtool/Makefile
index bfdc951..ddb8d21 100644
--- databases/dbtool/Makefile
+++ databases/dbtool/Makefile
@@ -31,8 +31,8 @@ RUN_DEPENDS+=	bash:${PORTSDIR}/shells/bash
 LICENSE=	GPLv2
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV+=	LIBS="-L${LOCALBASE}/lib" \
-		CPPFLAGS="${CXXFLAGS} -I${LOCALBASE}/include ${DB_INC}"
+CONFIGURE_ENV+=	LIBS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	${CXXFLAGS} -I${LOCALBASE}/include ${DB_INC}
 
 USE_GMAKE=	yes
 REINPLACE_ARGS=	-i ""
diff --git databases/dbview/Makefile databases/dbview/Makefile
index 16ad452..e748339 100644
--- databases/dbview/Makefile
+++ databases/dbview/Makefile
@@ -14,8 +14,6 @@ MASTER_SITE_SUBDIR=	apps/database/proprietary
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	View dBase III files
 
-MAKE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
-
 MAN1=		dbview.1
 DOCS=		README dBASE
 
diff --git databases/evolution-data-server/Makefile databases/evolution-data-server/Makefile
index 7ff4df0..5dd1ac5 100644
--- databases/evolution-data-server/Makefile
+++ databases/evolution-data-server/Makefile
@@ -39,8 +39,8 @@ CONFIGURE_ARGS=	--enable-static \
 		--enable-gnome-keyring=yes \
 		--with-openldap=yes \
 		--with-libdb=${LOCALBASE}
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${BDB_INCLUDE_DIR} ${PTHREAD_CFLAGS}" \
-		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CPPFLAGS+=	-I${LOCALBASE}/include -I${BDB_INCLUDE_DIR} ${PTHREAD_CFLAGS}
+LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 
 PLIST_SUB=	VERSION="2.32" EVO_VERSION="1.2"
 
diff --git databases/firebird20-server/Makefile databases/firebird20-server/Makefile
index 7ed6966..4ab4bbe 100644
--- databases/firebird20-server/Makefile
+++ databases/firebird20-server/Makefile
@@ -80,8 +80,7 @@ CLIENT_BIN=	gpre isql-fb qli
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-CONFIGURE_ENV+=	CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" \
-		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
+CONFIGURE_ENV+=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		PTHREAD_LIBS="${PTHREAD_LIBS}"
 
 .if !defined(NOPORTDOCS)
diff --git databases/firebird21-server/Makefile databases/firebird21-server/Makefile
index 1e8bb59..acb5b5d 100644
--- databases/firebird21-server/Makefile
+++ databases/firebird21-server/Makefile
@@ -83,8 +83,7 @@ CLIENT_BIN=	gpre isql-fb qli
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-CONFIGURE_ENV+=	CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" \
-		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
+CONFIGURE_ENV+=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		PTHREAD_LIBS="${PTHREAD_LIBS}"
 
 .if !defined(NOPORTDOCS)
diff --git databases/firebird25-server/Makefile databases/firebird25-server/Makefile
index 1a5c37c..8be4e9b 100644
--- databases/firebird25-server/Makefile
+++ databases/firebird25-server/Makefile
@@ -41,8 +41,7 @@ CONFIGURE_ARGS=	--with-system-editline \
 		--with-fbsbin=${PREFIX}/sbin \
 		--with-fbsecure-db=${LOCALSTATEDIR} \
 		--with-fbudf=${LIBEXECDIR}/UDF
-CONFIGURE_ENV+=	CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" \
-		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
+CONFIGURE_ENV+=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		PTHREAD_LIBS="${PTHREAD_LIBS}"
 
 CFLAGS+=	-I${LOCALBASE}/include
diff --git databases/flamerobin/Makefile databases/flamerobin/Makefile
index d155289..f91b0d4 100644
--- databases/flamerobin/Makefile
+++ databases/flamerobin/Makefile
@@ -22,7 +22,7 @@ WX_PREMK=	yes
 WX_UNICODE=	yes
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 SUB_FILES=	pkg-message
 MAN1=		flamerobin.1
diff --git databases/flare/Makefile databases/flare/Makefile
index 43e2126..b020469 100644
--- databases/flare/Makefile
+++ databases/flare/Makefile
@@ -22,7 +22,8 @@ LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -DHAVE_KQUEUE" LDFLAGS=-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include -DHAVE_KQUEUE
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 USE_RC_SUBR=	flared flarei
 SUB_FILES=	pkg-message
diff --git databases/freetds-devel/Makefile databases/freetds-devel/Makefile
index bfb0d40..1fd7dab 100644
--- databases/freetds-devel/Makefile
+++ databases/freetds-devel/Makefile
@@ -22,7 +22,7 @@ USE_GMAKE=	yes
 GNU_GONFIGURE=	yes
 USE_AUTOTOOLS=	autoconf:env libtool
 CPPFLAGS+=	"-I${LOCALBASE}/include"
-CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib"
+LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--with-tdsver=${TDS_VER}
 USE_LDCONFIG=	yes
 
diff --git databases/freetds/Makefile databases/freetds/Makefile
index 6c1aa41..68e768a 100644
--- databases/freetds/Makefile
+++ databases/freetds/Makefile
@@ -21,8 +21,8 @@ USE_ICONV=	yes
 USE_GMAKE=	yes
 GNU_GONFIGURE=	yes
 USE_AUTOTOOLS=	autoconf:env libtool
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--with-tdsver=${TDS_VER}
 USE_LDCONFIG=	yes
 
diff --git databases/gbib/Makefile databases/gbib/Makefile
index aa2c0de..c9162c0 100644
--- databases/gbib/Makefile
+++ databases/gbib/Makefile
@@ -20,8 +20,8 @@ USE_GNOME=	gnomelibs
 USE_GMAKE=	yes
 USE_GETTEXT=	yes
 USE_AUTOTOOLS=	libtool
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib -lintl"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib -lintl
 MAKE_ARGS=	ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \
 		AUTOHEADER="${TRUE}"
 
diff --git databases/gigabase/Makefile databases/gigabase/Makefile
index e77c61f..25d4377 100644
--- databases/gigabase/Makefile
+++ databases/gigabase/Makefile
@@ -17,7 +17,8 @@ WRKSRC=		${WRKDIR}/${PORTNAME}
 
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
-CONFIGURE_ENV=	CPPFLAGS="${PTHREAD_CFLAGS}" LDFLAGS="${PTHREAD_LIBS}"
+CPPFLAGS+=	${PTHREAD_CFLAGS}
+LDFLAGS+=	${PTHREAD_LIBS}
 USE_LDCONFIG=	yes
 
 .include <bsd.port.pre.mk>
diff --git databases/glom/Makefile databases/glom/Makefile
index ebae539..76e244d 100644
--- databases/glom/Makefile
+++ databases/glom/Makefile
@@ -38,8 +38,8 @@ USE_GNOME=	gnomedocutils gnomehack gnomeprefix pygnomeextras
 USE_LDCONFIG=	yes
 USE_PGSQL=	yes
 INSTALLS_OMF=	yes
-CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--with-postgres-utils=${LOCALBASE}/bin
 INSTALLS_ICONS=	yes
 
diff --git databases/gnome-db/Makefile databases/gnome-db/Makefile
index 533f999..cda56e1 100644
--- databases/gnome-db/Makefile
+++ databases/gnome-db/Makefile
@@ -24,8 +24,8 @@ INSTALLS_OMF=	yes
 USE_AUTOTOOLS=	libtool
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="${PTHREAD_LIBS} -L${LOCALBASE}/lib -lintl"
+CONFIGURE_ENV=	LIBS="${PTHREAD_LIBS} -L${LOCALBASE}/lib -lintl"
+CPPFLAGS+=	-I${LOCALBASE}/include
 PLIST_SUB=	VERSION=${PORTVERSION}
 
 DOCSDIR=	${PREFIX}/share/doc/gnomedb
diff --git databases/hk_classes/Makefile databases/hk_classes/Makefile
index cad6975..4bdada2 100644
--- databases/hk_classes/Makefile
+++ databases/hk_classes/Makefile
@@ -22,9 +22,9 @@ USE_PYTHON=	yes
 USE_GNOME=	pkgconfig
 USE_GETTEXT=	yes
 CXXFLAGS+=	${PTHREAD_CFLAGS}
-LDFLAGS=	${PTHREAD_LIBS} -L${LOCALBASE}/lib -largp -lintl
+LDFLAGS+=	${PTHREAD_LIBS} -L${LOCALBASE}/lib -largp -lintl
 USE_AUTOTOOLS=	libtool
-CONFIGURE_ENV+=	PYTHON_VERSION=${PYTHON_VERSION:S/python//} LDFLAGS="${LDFLAGS}"
+CONFIGURE_ENV+=	PYTHON_VERSION=${PYTHON_VERSION:S/python//}
 CONFIGURE_ARGS+=--with-python-libdir=${PYTHON_LIBDIR} \
 		--with-python-incdir=${PYTHON_INCLUDEDIR} \
 		--with-fontconfig-incdir=${LOCALBASE}/include/fontconfig \
@@ -56,8 +56,8 @@ USE_MYSQL=	yes
 CONFIGURE_ARGS+=	--with-mysql-dir=${LOCALBASE} \
 			--with-mysql-incdir=${LOCALBASE}/include/mysql \
 			--with-mysql-libdir=${LOCALBASE}/lib/mysql
-CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib -L${LOCALBASE}/lib/mysql"
+CONFIGURE_ENV+=	LIBS="-L${LOCALBASE}/lib -L${LOCALBASE}/lib/mysql"
+CPPFLAGS+=	-I${LOCALBASE}/include
 PLIST_SUB+=	MYSQL=""
 .else
 CONFIGURE_ARGS+=	--without-mysql
@@ -68,7 +68,8 @@ PLIST_SUB+=	MYSQL="@comment "
 USE_PGSQL=	yes
 CONFIGURE_ARGS+=	--with-postgres-incdir=${LOCALBASE}/include/ \
 			--with-postgres-libdir=${LOCALBASE}/lib
-CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include" LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV+=	LIBS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
 PLIST_SUB+=	POSTGRESQL=""
 .else
 CONFIGURE_ARGS+=	--without-postgres
diff --git databases/libgda/Makefile databases/libgda/Makefile
index b23a9ba..3c05b81 100644
--- databases/libgda/Makefile
+++ databases/libgda/Makefile
@@ -29,8 +29,8 @@ USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-gtk-doc
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib -lintl -lgdbm"
+CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib -lintl -lgdbm"
+CPPFLAGS+=	-I${LOCALBASE}/include
 PLIST_SUB=	VERSION=${PORTVERSION}
 MAKE_JOBS_UNSAFE=yes
 
diff --git databases/libgda2/Makefile databases/libgda2/Makefile
index b9ba55e..7c25189 100644
--- databases/libgda2/Makefile
+++ databases/libgda2/Makefile
@@ -35,8 +35,8 @@ INSTALLS_OMF=	yes
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--without-bdb
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib -lintl"
+CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib -lintl"
+CPPFLAGS+=	-I${LOCALBASE}/include
 
 MAN1=		gda-config-tool.1
 MAN5=		gda-config.5
diff --git databases/libgda3/Makefile databases/libgda3/Makefile
index 2c5017a..326f6d8 100644
--- databases/libgda3/Makefile
+++ databases/libgda3/Makefile
@@ -32,8 +32,8 @@ USE_GNOME=	gnomeprefix gnomehack glib20 libxslt intlhack referencehack
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--without-bdb --without-sybase
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib -lintl"
+CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib -lintl"
+CPPFLAGS+=	-I${LOCALBASE}/include
 
 .include <bsd.port.pre.mk>
 
diff --git databases/libgda4/Makefile databases/libgda4/Makefile
index 7351567..345beca 100644
--- databases/libgda4/Makefile
+++ databases/libgda4/Makefile
@@ -40,8 +40,8 @@ MAKE_JOBS_UNSAFE=yes
 CONFIGURE_ARGS=	--without-oracle \
 		--disable-crypto \
 		--enable-introspection=no
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib -lintl"
+CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib -lintl"
+CPPFLAGS+=	-I${LOCALBASE}/include
 
 .if ${LIBGDA4_SLAVE}=="no"
 OPTIONS=	UI "Build UI tools" on
diff --git databases/libgnomedb/Makefile databases/libgnomedb/Makefile
index 528e2e2..9d0428e 100644
--- databases/libgnomedb/Makefile
+++ databases/libgnomedb/Makefile
@@ -28,8 +28,8 @@ USE_GETTEXT=	yes
 GNU_CONFIGURE=	yes
 INSTALLS_OMF=	yes
 USE_LDCONFIG=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 GCONF_SCHEMAS=	libgnomedb-3.0.schemas
 
diff --git databases/libiodbc/Makefile databases/libiodbc/Makefile
index 46fb93d..6ccaa29 100644
--- databases/libiodbc/Makefile
+++ databases/libiodbc/Makefile
@@ -19,14 +19,13 @@ CONFLICTS=	unixODBC-[0-9]*
 USE_GNOME=	gnomehack pkgconfig
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--with-iodbc-inidir=${ETCDIR}
 USE_LDCONFIG=	yes
 
 MAN1=		iodbc-config.1 iodbctest.1 iodbctestw.1
 
-CPPFLAGS=	${PTHREAD_CFLAGS} -D_BSD_WCHAR_T_DEFINED_
-LDFLAGS=	${PTHREAD_LIBS}
+CPPFLAGS+=	${PTHREAD_CFLAGS} -D_BSD_WCHAR_T_DEFINED_
+LDFLAGS+=	${PTHREAD_LIBS}
 
 .if defined(WITH_GUI)
 USE_GNOME+=	gtk20
diff --git databases/libzdb/Makefile databases/libzdb/Makefile
index b3a4b37..1385683 100644
--- databases/libzdb/Makefile
+++ databases/libzdb/Makefile
@@ -23,12 +23,11 @@ OPTIONS=	MYSQL "Add MySQL support" on \
 USE_GNOME=	gnomehack
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 USE_LDCONFIG=	yes
 MAKE_JOBS_SAFE=	yes
 
-CPPFLAGS=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
+CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 
 .include <bsd.port.pre.mk>
 
diff --git databases/luasql-mysql/Makefile databases/luasql-mysql/Makefile
index dcb05d8..033a5f0 100644
--- databases/luasql-mysql/Makefile
+++ databases/luasql-mysql/Makefile
@@ -28,10 +28,9 @@ LUASQL_DRIVER?=	mysql
 MAKE_ENV+=	LUA_DIR=${LUA_SUBDIR} \
 		LUA_INC=${LUA_INCDIR} \
 		LUA_LIBDIR=${LUA_LIBDIR} \
-		LDFLAGS="-shared" \
 		LUA_VERSION_NUM="${LUA_VER_STR}0" \
 		T=${LUASQL_DRIVER}
-
+LDFLAGS+=	-shared
 CFLAGS+=	-fPIC
 
 PLIST_SUB+=	LUA_MIDLIBDIR=${LUA_MODLIBDIR}
diff --git databases/memcached/Makefile databases/memcached/Makefile
index 8b0fa48..d81be53 100644
--- databases/memcached/Makefile
+++ databases/memcached/Makefile
@@ -53,9 +53,8 @@ CONFIGURE_ARGS+=	--enable-replication
 LIB_DEPENDS+=		sasl2.2:${PORTSDIR}/security/cyrus-sasl2
 CONFIGURE_ARGS+=	--enable-sasl
 CFLAGS+=		-I${LOCALBASE}/include
-CPPFLAGS=		${CFLAGS}
+CPPFLAGS+=		${CFLAGS}
 LDFLAGS+=		-L${LOCALBASE}/lib
-CONFIGURE_ENV+=		CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 .else
 CONFIGURE_ARGS+=	--disable-sasl
 .endif
diff --git databases/memcached12/Makefile databases/memcached12/Makefile
index 51fcb28..5816403 100644
--- databases/memcached12/Makefile
+++ databases/memcached12/Makefile
@@ -58,7 +58,6 @@ LIB_DEPENDS+=		sasl2.2:${PORTSDIR}/security/cyrus-sasl2
 CONFIGURE_ARGS+=	--enable-sasl
 CFLAGS+=		-I${LOCALBASE}/include
 LDFLAGS+=		-L${LOCALBASE}/lib
-CONFIGURE_ENV+=		LDFLAGS="${LDFLAGS}"
 .else
 CONFIGURE_ARGS+=	--disable-sasl
 .endif
diff --git databases/memcachedb/Makefile databases/memcachedb/Makefile
index 7c53e82..2a9d248 100644
--- databases/memcachedb/Makefile
+++ databases/memcachedb/Makefile
@@ -19,9 +19,8 @@ LIB_DEPENDS=	event-1.4:${PORTSDIR}/devel/libevent
 CFLAGS=		-I"${BDB_INCLUDE_DIR}"
 CONFIGURE_ARGS=	--enable-threads --with-bdb="${LOCALBASE}" \
 		--with-libevent="${LOCALBASE}"
-CONFIGURE_ENV=	CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
 GNU_CONFIGURE=	yes
-LDFLAGS=	-l"${BDB_LIB_NAME}" -L"${LOCALBASE}/lib"
+LDFLAGS+=	-l"${BDB_LIB_NAME}" -L"${LOCALBASE}/lib"
 MCDBDIR?=	/var/db/memcachedb
 USE_BDB=	47+
 USE_RC_SUBR=	${PORTNAME}
diff --git databases/memcacheq/Makefile databases/memcacheq/Makefile
index 82e86ed..67926c7 100644
--- databases/memcacheq/Makefile
+++ databases/memcacheq/Makefile
@@ -20,7 +20,6 @@ LIB_DEPENDS=	event-1.4:${PORTSDIR}/devel/libevent
 
 CFLAGS+=	-I"${BDB_INCLUDE_DIR}"
 LDFLAGS+=	-l"${BDB_LIB_NAME}" -L"${LOCALBASE}/lib"
-CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS}"
 
 USE_RC_SUBR=	memcacheq
 USE_BDB=	47+
diff --git databases/mergeant/Makefile databases/mergeant/Makefile
index 9f0ad88..70426d0 100644
--- databases/mergeant/Makefile
+++ databases/mergeant/Makefile
@@ -25,7 +25,7 @@ GNU_CONFIGURE=	yes
 INSTALLS_OMF=	yes
 INSTALLS_ICONS=	yes
 USE_LDCONFIG=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .include <bsd.port.mk>
diff --git databases/my2cego/Makefile databases/my2cego/Makefile
index 96914b0..1ba9ae3 100644
--- databases/my2cego/Makefile
+++ databases/my2cego/Makefile
@@ -18,8 +18,8 @@ LIB_DEPENDS=	lfc.1:${PORTSDIR}/devel/lfc \
 
 LICENSE=	GPLv2
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	autoconf:env
 PLIST_FILES=	bin/my2cego
diff --git databases/mysql-connector-odbc/Makefile databases/mysql-connector-odbc/Makefile
index 87f5dd2..f218eeb 100644
--- databases/mysql-connector-odbc/Makefile
+++ databases/mysql-connector-odbc/Makefile
@@ -25,7 +25,7 @@ USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool libltdl
 USE_LDCONFIG=	yes
 CFLAGS+=		-L${LOCALBASE}/lib
-LDFLAGS=	-L${LOCALBASE}/lib
+LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--with-mysql-path=${LOCALBASE} --without-samples \
 		--disable-gui --enable-test=no
 
diff --git databases/mysql-proxy/Makefile databases/mysql-proxy/Makefile
index 74cef5f..81e99c1 100644
--- databases/mysql-proxy/Makefile
+++ databases/mysql-proxy/Makefile
@@ -20,8 +20,8 @@ LIB_DEPENDS=	event-1.4:${PORTSDIR}/devel/libevent \
 
 CONFIGURE_ARGS+=	--with-lua=lua-5.1 --with-mysql=${LOCALBASE}/bin/mysql_config --docdir=${DATADIR} --enable-self-contained
 CFLAGS+=	-I${LOCALBASE}/include
-CONFIGURE_ENV+=	LDFLAGS="-L${LOCALBASE}/lib -L${LUA_LIBDIR}" \
-		PKG_CONFIG_PATH="${LUA_PREFIX}/share/doc/${LUA_SUBDIR}/etc"
+CONFIGURE_ENV+=	PKG_CONFIG_PATH="${LUA_PREFIX}/share/doc/${LUA_SUBDIR}/etc"
+LDFLAGS+=	-L${LOCALBASE}/lib -L${LUA_LIBDIR}
 GNU_CONFIGURE=	yes
 USE_GNOME=	pkgconfig
 USE_ICONV=	yes
diff --git databases/mysql-q4m/Makefile databases/mysql-q4m/Makefile
index 09b7682..35e314d 100644
--- databases/mysql-q4m/Makefile
+++ databases/mysql-q4m/Makefile
@@ -23,8 +23,8 @@ USE_MYSQL=	yes
 WANT_MYSQL_VER?=	51
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \
-		LDFLAGS="${PTHREAD_LIBS} -L${LOCALBASE}/lib -L${LOCALBASE}/lib/mysql"
+CPPFLAGS+=	${PTHREAD_CFLAGS} -I${LOCALBASE}/include
+LDFLAGS+=	${PTHREAD_LIBS} -L${LOCALBASE}/lib -L${LOCALBASE}/lib/mysql
 CONFIGURE_ARGS=	--prefix="${PREFIX}" \
 		--libdir="${PREFIX}/lib/mysql/plugin" \
 		--with-mysql="$$(cd ${PORTSDIR}/databases/mysql${MYSQL_VER}-server; ${MAKE} -V WRKSRC)"
diff --git databases/mysql-workbench51/Makefile databases/mysql-workbench51/Makefile
index f34562f..72960fd 100644
--- databases/mysql-workbench51/Makefile
+++ databases/mysql-workbench51/Makefile
@@ -58,8 +58,7 @@ DATADIR=	${PREFIX}/share/mysql-workbench
 CXXFLAGS+=	-I${LOCALBASE}/include -I${LUA_INCDIR}
 LDFLAGS+=	-L${LOCALBASE}/lib -L${LUA_LIBDIR}
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	GNOME2_DIR="${LOCALBASE}" LDFLAGS="${LDFLAGS}"  LUA_LIBS="-llua"
-
+CONFIGURE_ENV=	GNOME2_DIR="${LOCALBASE}" LUA_LIBS="-llua"
 
 USE_MYSQL=	client
 DEFAULT_MYSQL_VER=	51
diff --git databases/mysql2odbc/Makefile databases/mysql2odbc/Makefile
index 277add2..d606c90 100644
--- databases/mysql2odbc/Makefile
+++ databases/mysql2odbc/Makefile
@@ -38,7 +38,8 @@ CONFIGURE_ARGS=	--with-iodbc
 .endif
 
 CONFIGURE_ARGS+=--libdir=${PREFIX}/mysql2odbc
-CONFIGURE_ENV=	CPPFLAGS="${PTHREAD_CFLAGS}" LDFLAGS="${PTHREAD_LIBS}"
+CPPFLAGS+=	${PTHREAD_CFLAGS}
+LDFLAGS+=	${PTHREAD_LIBS}
 
 USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
diff --git databases/mysqlcppapi/Makefile databases/mysqlcppapi/Makefile
index 0a78817..7f25f1c 100644
--- databases/mysqlcppapi/Makefile
+++ databases/mysqlcppapi/Makefile
@@ -19,8 +19,8 @@ USE_MYSQL=	yes
 USE_GNOME=	pkgconfig gnomehack
 GNU_CONFIGURE=	yes
 
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--with-mysql=${LOCALBASE}
 USE_LDCONFIG=	yes
 
diff --git databases/opendbx/Makefile databases/opendbx/Makefile
index cb3d300..f0ee180 100644
--- databases/opendbx/Makefile
+++ databases/opendbx/Makefile
@@ -20,7 +20,6 @@ USE_AUTOTOOLS=	libtool
 CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
 LDFLAGS+=	${PTHREAD_LIBS} -L${WRKSRC}/lib -L${LOCALBASE}/lib
 CONFIGURE_ARGS+=	--with-backends="${CONFIGURE_MODULES}"
-CONFIGURE_ENV+=		CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 
 USE_LDCONFIG=	${PREFIX}/lib/opendbx
 
diff --git databases/p5-BDB/Makefile databases/p5-BDB/Makefile
index c01e086..efd47e1 100644
--- databases/p5-BDB/Makefile
+++ databases/p5-BDB/Makefile
@@ -21,7 +21,7 @@ RUN_DEPENDS=	p5-common-sense>=0:${PORTSDIR}/devel/p5-common-sense
 PORTSCOUT=	skipv:1.801
 
 CFLAGS+=	-I${BDB_INCLUDE_DIR}
-MAKE_ENV=	LDFLAGS="${LDFLAGS} ${PTHREAD_LIBS}"
+LDFLAGS+=	${PTHREAD_LIBS}
 PERL_CONFIGURE=	yes
 USE_BDB=	43+
 
diff --git databases/pecl-handlersocket/Makefile databases/pecl-handlersocket/Makefile
index b4a35e2..2cc6939 100644
--- databases/pecl-handlersocket/Makefile
+++ databases/pecl-handlersocket/Makefile
@@ -23,7 +23,7 @@ USE_PHP=	yes
 USE_PHPEXT=	yes
 
 CONFIGURE_ARGS=	--with-handlersocket=${LOCALBASE}
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib ${EXTRA_LIBS}"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib ${EXTRA_LIBS}
 
 .include <bsd.port.mk>
diff --git databases/pecl-rrd/Makefile databases/pecl-rrd/Makefile
index 4d81683..6638c41 100644
--- databases/pecl-rrd/Makefile
+++ databases/pecl-rrd/Makefile
@@ -18,7 +18,7 @@ COMMENT=	PHP bindings to rrd tool system
 
 LIB_DEPENDS=	rrd:${PORTSDIR}/databases/rrdtool
 
-CONFIGURE_ENV+=	LDFLAGS="-L${LOCALBASE}/lib"
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 LICENSE=	PHP301
 
diff --git databases/pgadmin3/Makefile databases/pgadmin3/Makefile
index 0a2fc3c..7d7fb6d 100644
--- databases/pgadmin3/Makefile
+++ databases/pgadmin3/Makefile
@@ -23,7 +23,8 @@ USE_GMAKE=	yes
 IGNORE_WITH_PGSQL=	73 74 80 81 82
 DEFAULT_PGSQL_VER?=	83
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${PTHREAD_CFLAGS}" LIBS="${PTHREAD_LIBS}"
+CONFIGURE_ENV=	LIBS="${PTHREAD_LIBS}"
+CPPFLAGS+=	${PTHREAD_CFLAGS}
 CONFIGURE_ARGS=	--with-wx-version=${USE_WX}
 USE_GNOME=	libxml2 libxslt
 USE_WX=		2.8
diff --git databases/postgresql-tcltk/Makefile databases/postgresql-tcltk/Makefile
index 5812689..6d7d96d 100644
--- databases/postgresql-tcltk/Makefile
+++ databases/postgresql-tcltk/Makefile
@@ -35,16 +35,13 @@ INCLUDES+=	-I${TCL_INCDIR}
 TCL_INCDIR=	${LOCALBASE}/include/tcl${TCLVERSION}
 TCLCONFIG=	${LOCALBASE}/lib/tcl${TCLVERSION}
 MAKE_ENV+=	TCL_INCDIR=${TCL_INCDIR}
-CONFIGURE_ENV+=	LIBS="-lm -L${LOCALBASE}/lib -ltcl${TCLVERSION:S/.//}" \
-		CFLAGS=-DPGTCL_USE_TCLOBJ
+CONFIGURE_ENV+=	LIBS="-lm -L${LOCALBASE}/lib -ltcl${TCLVERSION:S/.//}"
+CFLAGS+=	-DPGTCL_USE_TCLOBJ
 
 .if defined(WITHOUT_X11)
 WITHOUT_TK=	yes
 .endif
 
-CONFIGURE_ENV+=	LIBS="-lm -L${LOCALBASE}/lib -ltcl${TCLVERSION:S/.//}" \
-		CFLAGS=-DPGTCL_USE_TCLOBJ
-
 .if defined(WITHOUT_TK)
 CONFIGURE_ARGS+=	--without-tk
 INCDIRS=	${TCL_INCDIR}
diff --git databases/postgresql82-server/Makefile databases/postgresql82-server/Makefile
index ab69ca9..b5dab8d 100644
--- databases/postgresql82-server/Makefile
+++ databases/postgresql82-server/Makefile
@@ -42,7 +42,7 @@ CONFIGURE_ARGS+=--with-libraries=${PREFIX}/lib \
 		--with-includes=${PREFIX}/lib \
 		--enable-thread-safety \
 		--with-docdir=${DOCSDIR}
-CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS}" INCLUDES=${INCLUDES} \
+CONFIGURE_ENV+=	INCLUDES=${INCLUDES} \
 		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		PTHREAD_LIBS="${PTHREAD_LIBS}"
 
diff --git databases/postgresql83-server/Makefile databases/postgresql83-server/Makefile
index 99e0193..a51c093 100644
--- databases/postgresql83-server/Makefile
+++ databases/postgresql83-server/Makefile
@@ -44,7 +44,7 @@ CONFIGURE_ARGS+=--with-libraries=${PREFIX}/lib \
 		--with-includes=${PREFIX}/lib \
 		--enable-thread-safety \
 		--with-docdir=${DOCSDIR}
-CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS}" INCLUDES="${INCLUDES}" \
+CONFIGURE_ENV+=	INCLUDES="${INCLUDES}" \
 		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		PTHREAD_LIBS="${PTHREAD_LIBS}"
 
diff --git databases/postgresql84-server/Makefile databases/postgresql84-server/Makefile
index 32437f5..68823ae 100644
--- databases/postgresql84-server/Makefile
+++ databases/postgresql84-server/Makefile
@@ -44,8 +44,7 @@ INCLUDES+=	-I${LOCALBASE}/include
 CONFIGURE_ARGS+=--with-libraries=${PREFIX}/lib \
 		--with-includes=${PREFIX}/include \
 		--enable-thread-safety
-CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS}" \
-		INCLUDES="${INCLUDES}" \
+CONFIGURE_ENV+=	INCLUDES="${INCLUDES}" \
 		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		PTHREAD_LIBS="${PTHREAD_LIBS}"
 
diff --git databases/postgresql90-server/Makefile databases/postgresql90-server/Makefile
index 5e702a3..4bb7492 100644
--- databases/postgresql90-server/Makefile
+++ databases/postgresql90-server/Makefile
@@ -42,8 +42,7 @@ INCLUDES+=	-I${LOCALBASE}/include
 CONFIGURE_ARGS+=--with-libraries=${PREFIX}/lib \
 		--with-includes=${PREFIX}/include \
 		--enable-thread-safety
-CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS}" \
-		INCLUDES="${INCLUDES}" \
+CONFIGURE_ENV+=	INCLUDES="${INCLUDES}" \
 		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		PTHREAD_LIBS="${PTHREAD_LIBS}"
 
diff --git databases/postgresql91-server/Makefile databases/postgresql91-server/Makefile
index 262423b..deaf9a1 100644
--- databases/postgresql91-server/Makefile
+++ databases/postgresql91-server/Makefile
@@ -43,8 +43,7 @@ INCLUDES+=	-I${LOCALBASE}/include
 CONFIGURE_ARGS+=--with-libraries=${PREFIX}/lib \
 		--with-includes=${PREFIX}/include \
 		--enable-thread-safety
-CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS}" \
-		INCLUDES="${INCLUDES}" \
+CONFIGURE_ENV+=	INCLUDES="${INCLUDES}" \
 		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		PTHREAD_LIBS="${PTHREAD_LIBS}"
 
diff --git databases/pxlib/Makefile databases/pxlib/Makefile
index 5ee5c0f..3c928cd 100644
--- databases/pxlib/Makefile
+++ databases/pxlib/Makefile
@@ -22,7 +22,8 @@ USE_ICONV=	yes
 USE_GETTEXT=	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
 
 USE_LDCONFIG=	yes
 
diff --git databases/pxtools/Makefile databases/pxtools/Makefile
index 933b742..28c00ed 100644
--- databases/pxtools/Makefile
+++ databases/pxtools/Makefile
@@ -16,9 +16,8 @@ COMMENT=	Collection of tools to work with Paradox databases
 
 GNU_CONFIGURE=	yes
 USE_GETTEXT=	yes
-CPPFLAGS=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|-O2|${CFLAGS}|' \
diff --git databases/qdbm/Makefile databases/qdbm/Makefile
index b4af520..076fba7 100644
--- databases/qdbm/Makefile
+++ databases/qdbm/Makefile
@@ -22,8 +22,8 @@ CONFIGURE_ARGS=	--enable-zlib \
 		--enable-iconv \
 		--enable-pthread
 CFLAGS+=	${PTHREAD_CFLAGS}
-CONFIGURE_ENV=	CPPFLAGS="${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \
-		LDFLAGS="${PTHREAD_LIBS} -L${LOCALBASE}/lib"
+CPPFLAGS+=	${PTHREAD_CFLAGS} -I${LOCALBASE}/include
+LDFLAGS+=	${PTHREAD_LIBS} -L${LOCALBASE}/lib
 MAKE_ARGS=	RELCFLAGS="${CFLAGS}" \
 		MYDATADIR="${DOCSDIR}" MYDOCS="${PORTDOCS}"
 .if !defined(NOPORTDOCS)
diff --git databases/rrdtool/Makefile databases/rrdtool/Makefile
index d445468..4d0b495 100644
--- databases/rrdtool/Makefile
+++ databases/rrdtool/Makefile
@@ -96,7 +96,6 @@ RUN_DEPENDS+=	${LOCALBASE}/lib/X11/fonts/dejavu:${PORTSDIR}/x11-fonts/dejavu
 CPPFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include/freetype2
 LDFLAGS+=	-L${LOCALBASE}/lib
 CFLAGS:=	${CFLAGS:N-ffast-math}
-CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 
 MAN1=		bin_dec_hex.1 cdeftutorial.1 rpntutorial.1 rrd-beginners.1 \
 		rrdbuild.1 rrdcached.1 rrdcgi.1 rrdcreate.1 rrddump.1 \
diff --git databases/rrdtool12/Makefile databases/rrdtool12/Makefile
index cf5d21d..1f9b222 100644
--- databases/rrdtool12/Makefile
+++ databases/rrdtool12/Makefile
@@ -70,7 +70,6 @@ PLIST_SUB+=	WITH_PERL="@comment "
 CPPFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include/libart-2.0 -I${LOCALBASE}/include/freetype2
 LDFLAGS+=	-L${LOCALBASE}/lib
 CFLAGS:=	${CFLAGS:N-ffast-math}
-CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 
 MAN1=		bin_dec_hex.1 cdeftutorial.1 rpntutorial.1 rrd-beginners.1 \
 		rrdbuild.1 rrdcgi.1 rrdcreate.1 rrddump.1 rrdfetch.1 rrdfirst.1 \
diff --git databases/sqlcached/Makefile databases/sqlcached/Makefile
index a41e8f8..d2c4888 100644
--- databases/sqlcached/Makefile
+++ databases/sqlcached/Makefile
@@ -16,7 +16,7 @@ COMMENT=	A cache daemon using SQL for data manipulation
 
 LIB_DEPENDS=	sqlite.2:${PORTSDIR}/databases/sqlite2
 
-MAKE_ENV+=	LDFLAGS=-L${LOCALBASE}/lib
+LDFLAGS+=	-L${LOCALBASE}/lib
 CFLAGS=		-O2 -Wall -I${LOCALBASE}/include
 
 WRKSRC=	${WRKDIR}/${PORTNAME}
diff --git databases/sqlite3/Makefile databases/sqlite3/Makefile
index a67e9c7..190e25f 100644
--- databases/sqlite3/Makefile
+++ databases/sqlite3/Makefile
@@ -31,6 +31,7 @@ USE_TCL_BUILD=	84+
 CONFIGURE_ENV+=	TCLSH_CMD="${TCLSH}" \
 		TCLLIBDIR="${PREFIX}/lib/${PORTNAME}" \
 		ac_cv_search_pthread_create=""
+CPPFLAGS+=	-I. -I./src
 
 # Use an in-ram database for temporary tables (never,no,yes,always),
 # which is equivalent of SQLITE_TEMP_STORE=[0,1,2,3]
@@ -205,9 +206,6 @@ CONFIGURE_ARGS+=	--enable-load-extension
 CONFIGURE_ARGS+=	--disable-load-extension
 .endif
 
-CONFIGURE_ENV+=		CPPFLAGS="-I. -I./src ${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
-MAKE_ENV+=		CPPFLAGS="-I. -I./src ${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
-
 .include <bsd.port.pre.mk>
 
 .if defined(TCL_VER) && ${TCL_VER} > 8.4
diff --git databases/sqlrelay/Makefile databases/sqlrelay/Makefile
index b4f985e..0256d38 100644
--- databases/sqlrelay/Makefile
+++ databases/sqlrelay/Makefile
@@ -19,8 +19,8 @@ LIB_DEPENDS=	rudiments.1:${PORTSDIR}/devel/rudiments
 WANT_GNOME=	yes
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	autoconf libtool
-CONFIGURE_ENV=		${SQLRELAY_CONFIGURE_ENV} \
-			CPPFLAGS="-I${LOCALBASE}/include"
+CPPFLAGS+=	-I${LOCALBASE}/include
+CONFIGURE_ENV=		${SQLRELAY_CONFIGURE_ENV}
 CONFIGURE_ARGS=		${SQLRELAY_CONFIGURE_ARGS} \
 			--disable-tcl \
 			--disable-java \
diff --git databases/tokyotyrant/Makefile databases/tokyotyrant/Makefile
index 8f1e758..0102829 100644
--- databases/tokyotyrant/Makefile
+++ databases/tokyotyrant/Makefile
@@ -27,14 +27,14 @@ MAN8=		ttservctl.8
 
 OPTIONS=	LUA	"Enable LUA support" off
 
-CONFIGURE_ENV+=	LDFLAGS="-L${LOCALBASE}/lib"
+LDFLAGS+=	-L${LOCALBASE}/lib
 CFLAGS+=	-I${LOCALBASE}/include
 
 .include <bsd.port.pre.mk>
 
 .if defined(WITH_LUA)
 CONFIGURE_ARGS+=	--enable-lua
-CONFIGURE_ENV+=	LDFLAGS="-L${LUA_LIBDIR}"
+LDFLAGS+=	-L${LUA_LIBDIR}
 CFLAGS+=	-I${LUA_INCDIR}
 USE_LUA=	yes
 .else
diff --git databases/virtuoso/Makefile databases/virtuoso/Makefile
index 30ca4b6..980630a 100644
--- databases/virtuoso/Makefile
+++ databases/virtuoso/Makefile
@@ -28,8 +28,8 @@ CONFIGURE_ARGS=	--with-readline\
 		--enable-bpel-vad\
 		--datadir="${PREFIX}"\
 		--localstatedir="${PREFIX}"
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}"\
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS+=	-L${LOCALBASE}/lib
 USE_RC_SUBR=	virtuoso.sh
 ONLY_FOR_ARCHS=	i386 amd64
 USERS=		virtuoso
diff --git deskutils/abacus/Makefile deskutils/abacus/Makefile
index a14a9a6..1a1cc15 100644
--- deskutils/abacus/Makefile
+++ deskutils/abacus/Makefile
@@ -25,7 +25,6 @@ USE_XORG=	x11
 USE_TK=		82
 USE_TCL=	82
 
-MAKE_ENV=	LDFLAGS="${LDFLAGS}"
 CFLAGS+=	-I$(LOCALBASE)/include \
 		-I$(LOCALBASE)/include/tcl8.2 \
 		-I$(LOCALBASE)/include/tk8.2
diff --git deskutils/alacarte/Makefile deskutils/alacarte/Makefile
index f5eeed4..75f4d91 100644
--- deskutils/alacarte/Makefile
+++ deskutils/alacarte/Makefile
@@ -23,8 +23,8 @@ USE_GETTEXT=	yes
 USE_PYTHON=	yes
 INSTALLS_ICONS=	yes
 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|applications.menu|gnome-applications.menu|' \
diff --git deskutils/babytrans/Makefile deskutils/babytrans/Makefile
index f5b145d..9eb595a 100644
--- deskutils/babytrans/Makefile
+++ deskutils/babytrans/Makefile
@@ -18,8 +18,8 @@ COMMENT=	GTK+/GNOME front-end for Babylon Translator .dic files
 USE_GETTEXT=	yes
 USE_GNOME=	gtk12 gnomehack gnomeprefix
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	${CXXFLAGS} -I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 USE_GMAKE=	yes
 PKGMESSAGE=	${WRKDIR}/pkg-message
 SUB_FILES=	pkg-message
diff --git deskutils/bmp-docklet/Makefile deskutils/bmp-docklet/Makefile
index 91e049b..5fedec3 100644
--- deskutils/bmp-docklet/Makefile
+++ deskutils/bmp-docklet/Makefile
@@ -24,8 +24,8 @@ USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack intlhack
-CONFIGURE_ENV=	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 deskutils/buoh/Makefile deskutils/buoh/Makefile
index 9dd5ed1..ace6978 100644
--- deskutils/buoh/Makefile
+++ deskutils/buoh/Makefile
@@ -22,8 +22,8 @@ USE_GMAKE=	yes
 USE_GNOME=	gnomehack gnomeprefix intlhack libgnomeui
 INSTALLS_ICONS=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 DOCS=		AUTHORS COPYING ChangeLog NEWS README TODO
 GCONF_SCHEMAS=	buoh.schemas
diff --git deskutils/calibre/Makefile deskutils/calibre/Makefile
index f16eac6..f73d58f 100644
--- deskutils/calibre/Makefile
+++ deskutils/calibre/Makefile
@@ -53,8 +53,7 @@ WRKSRC=		${WRKDIR}/${PORTNAME}
 PYSETUP=	setup.py
 CFLAGS+=	"-I${LOCALBASE}/include"
 LDFLAGS+=	"-L${LOCALBASE}/lib"
-MAKE_ENV+=	LDFLAGS="${LDFLAGS}" \
-		FC_INC_DIR="${LOCALBASE}/include/fontconfig" \
+MAKE_ENV+=	FC_INC_DIR="${LOCALBASE}/include/fontconfig" \
 		FC_LIB_DIR="${LOCALBASE}/lib" \
 		OVERRIDE_CFLAGS="${CFLAGS}" \
 		OVERRIDE_LDFLAGS="${LDFLAGS}"
diff --git deskutils/conduit/Makefile deskutils/conduit/Makefile
index 5810ae7..21e8e55 100644
--- deskutils/conduit/Makefile
+++ deskutils/conduit/Makefile
@@ -33,8 +33,8 @@ GNU_CONFIGURE=	yes
 USE_GETTEXT=	yes
 INSTALLS_OMF=	yes
 INSTALLS_ICONS=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 USE_GNOME=	pygnome2 gnomeprefix
 OPTIONS=	NAUTILUS "Enable Nautilus Plugin" On \
 		EOG "Enable Eye-Of-Gnome Plugin" On
diff --git deskutils/contacts/Makefile deskutils/contacts/Makefile
index 8ee1d81..8c040fc 100644
--- deskutils/contacts/Makefile
+++ deskutils/contacts/Makefile
@@ -15,7 +15,8 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	smyru@heron.pl
 COMMENT=	Simple yet powerful address book based on Evolution data server
 
-CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib" CPPFLAGS="-I${LOCALBASE}/include"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 USE_GMAKE=	yes
 USE_GNOME=	gtk20 gnomehier evolutiondataserver gnomevfs2
diff --git deskutils/deskbar-applet/Makefile deskutils/deskbar-applet/Makefile
index f1fcee1..457beb5 100644
--- deskutils/deskbar-applet/Makefile
+++ deskutils/deskbar-applet/Makefile
@@ -28,8 +28,8 @@ USE_DISPLAY=	yes
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
 INSTALLS_OMF=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 GCONF_SCHEMAS=	deskbar-applet.schemas
 
diff --git deskutils/dlume/Makefile deskutils/dlume/Makefile
index b3d26b5..cd47546 100644
--- deskutils/dlume/Makefile
+++ deskutils/dlume/Makefile
@@ -16,8 +16,8 @@ COMMENT=	GTK2 address book
 
 USE_GNOME=	gnomehack gnomeprefix gtk20 libxml2
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 MAN1=		${PORTNAME}.1
 PLIST_FILES=	bin/dlume share/pixmaps/dlume.png
diff --git deskutils/doodle/Makefile deskutils/doodle/Makefile
index 73e3175..0806e4d 100644
--- deskutils/doodle/Makefile
+++ deskutils/doodle/Makefile
@@ -23,7 +23,8 @@ GNU_CONFIGURE=	yes
 USE_GETTEXT=	yes
 USE_FAM=	yes
 USE_LDCONFIG=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 MAN1=		doodle.1 doodled.1
 MAN3=		libdoodle.3
diff --git deskutils/drivel/Makefile deskutils/drivel/Makefile
index b429d28..5f2f055 100644
--- deskutils/drivel/Makefile
+++ deskutils/drivel/Makefile
@@ -25,15 +25,14 @@ USE_GNOME=	gconf2 gnomedocutils gnomevfs2 gtksourceview2
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
-CONFIGURE_ENV=	LDFLAGS="${LDFLAGS}"
 INSTALLS_ICONS=	yes
 INSTALLS_OMF=	yes
 MAKE_JOBS_SAFE=	yes
 
 GCONF_SCHEMAS=	drivel.schemas
 
-CPPFLAGS=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .include <bsd.port.pre.mk>
 
diff --git deskutils/evolution-jescs/Makefile deskutils/evolution-jescs/Makefile
index 67641cc..59c61b0 100644
--- deskutils/evolution-jescs/Makefile
+++ deskutils/evolution-jescs/Makefile
@@ -27,8 +27,8 @@ USE_GETTEXT=	yes
 USE_GNOME=	gnomeprefix gnomehack intlhack
 INSTALLS_ICONS=	yes
 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
 
 EVO_VERSION=	2.28
diff --git deskutils/fbreader/Makefile deskutils/fbreader/Makefile
index 5accc44..259a688 100644
--- deskutils/fbreader/Makefile
+++ deskutils/fbreader/Makefile
@@ -48,7 +48,7 @@ CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 MAKE_ENV+=	TARGET_ARCH=desktop UI_TYPE=${UI} TARGET_STATUS=${STATUS} \
 		ROOTDIR=${WRKSRC} INSTALLDIR=${PREFIX} LIBDIR=${PREFIX}/lib \
-		LD="${CXX}" LDFLAGS="${LDFLAGS}"
+		LD="${CXX}"
 MAKE_ARGS+=	MAKE=${GMAKE} LIBDIR=${PREFIX}/lib
 
 post-patch:
diff --git deskutils/ganyremote/Makefile deskutils/ganyremote/Makefile
index f36d964..d34743d 100644
--- deskutils/ganyremote/Makefile
+++ deskutils/ganyremote/Makefile
@@ -18,8 +18,8 @@ RUN_DEPENDS=	anyremote:${PORTSDIR}/comms/anyremote
 GNU_CONFIGURE=	yes
 USE_PYTHON=	yes
 USE_GNOME=	pygtk2
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 PORTDOCS=	AUTHORS COPYING README ChangeLog
 
diff --git deskutils/gdesklets/Makefile deskutils/gdesklets/Makefile
index 0836434..ff766ec 100644
--- deskutils/gdesklets/Makefile
+++ deskutils/gdesklets/Makefile
@@ -28,13 +28,12 @@ USE_PYTHON=	yes
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 INSTALLS_ICONS=	yes
 
 MAN1=		${PORTNAME}.1
 
-CPPFLAGS=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
+CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 
 .include <bsd.port.pre.mk>
 
diff --git deskutils/genius/Makefile deskutils/genius/Makefile
index 5255ad2..6717dea 100644
--- deskutils/genius/Makefile
+++ deskutils/genius/Makefile
@@ -24,8 +24,8 @@ USE_BZIP2=	yes
 USE_GNOME=	gnomehack gnomeprefix gnomevfs2 gtksourceview2 intlhack vte
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--disable-extra-gcc-optimization
 USE_LDCONFIG=	yes
 INSTALLS_ICONS=	yes
diff --git deskutils/gimmie/Makefile deskutils/gimmie/Makefile
index f199d0d..0784dd7 100644
--- deskutils/gimmie/Makefile
+++ deskutils/gimmie/Makefile
@@ -27,8 +27,8 @@ USE_PYTHON=	yes
 GCONF_SCHEMAS=	gimmie.schemas
 INSTALLS_ICONS=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .if !defined(WITHOUT_NLS)
 USE_GETTEXT=	yes
diff --git deskutils/glabels/Makefile deskutils/glabels/Makefile
index c56f035..3f53540 100644
--- deskutils/glabels/Makefile
+++ deskutils/glabels/Makefile
@@ -24,8 +24,8 @@ USE_GETTEXT=	yes
 INSTALLS_OMF=	yes
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 MAN1=		glabels.1
 
diff --git deskutils/global-menu/Makefile deskutils/global-menu/Makefile
index b3fb780..feaff71 100644
--- deskutils/global-menu/Makefile
+++ deskutils/global-menu/Makefile
@@ -24,9 +24,8 @@ GNU_CONFIGURE=		yes
 USE_GMAKE=		yes
 USE_AUTOTOOLS=		libtool automake:env autoheader:env
 INSTALLS_ICONS=		yes
-CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
-			LDFLAGS="-L${LOCALBASE}/lib"
-
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 OPTIONS=		XFCE4_PANEL "Xfce panel applet" Off
 
diff --git deskutils/gnochm/Makefile deskutils/gnochm/Makefile
index bb56d7d..469d9f2 100644
--- deskutils/gnochm/Makefile
+++ deskutils/gnochm/Makefile
@@ -22,8 +22,8 @@ USE_GNOME=	gnomehack gnomeprefix intlhack pygnome2 pygtk2 pygnomeextras
 GNU_CONFIGURE=	yes
 USE_PYTHON=	2.2+
 USE_GETTEXT=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 GCONF_SCHEMAS=	gnochm.schemas
 INSTALLS_OMF=	yes
diff --git deskutils/gnome-blog/Makefile deskutils/gnome-blog/Makefile
index 3c35888..8be175b 100644
--- deskutils/gnome-blog/Makefile
+++ deskutils/gnome-blog/Makefile
@@ -22,8 +22,8 @@ USE_GETTEXT=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack gnomeprefix pygnome2 intlhack
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 GCONF_SCHEMAS=	gnomeblog.schemas
 
diff --git deskutils/gnome-main-menu/Makefile deskutils/gnome-main-menu/Makefile
index 283e121..0035d51 100644
--- deskutils/gnome-main-menu/Makefile
+++ deskutils/gnome-main-menu/Makefile
@@ -23,9 +23,9 @@ USE_GNOME=	gnomehack gnomeprefix gnomepanel intlhack eel2 gnomedesktop \
 USE_GMAKE=	yes
 USE_GETTEXT=	yes
 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
 
 GCONF_SCHEMAS=	application-browser.schemas slab.schemas
 
diff --git deskutils/gnome-utils/Makefile deskutils/gnome-utils/Makefile
index 9031848..4999543 100644
--- deskutils/gnome-utils/Makefile
+++ deskutils/gnome-utils/Makefile
@@ -29,8 +29,8 @@ INSTALLS_ICONS=	yes
 USE_GNOME=	gnomeprefix gnomehack intlhack gnomepanel ltverhack
 USE_AUTOTOOLS=	libtool
 CONFIGURE_ARGS=	--enable-maintainer-flags=no
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 MAN1=		gnome-dictionary.1 gnome-screenshot.1 gnome-search-tool.1 \
 		gnome-system-log.1 baobab.1
diff --git deskutils/gnote/Makefile deskutils/gnote/Makefile
index dd84b751..3abc33c 100644
--- deskutils/gnote/Makefile
+++ deskutils/gnote/Makefile
@@ -28,9 +28,9 @@ GCONF_SCHEMAS=	gnote.schemas
 USE_AUTOTOOLS=	libtool
 INSTALLS_ICONS=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib" \
-		PANELAPPLET_SERVER_DIR="${PREFIX}/libdata/bonobo/servers"
+CONFIGURE_ENV=	PANELAPPLET_SERVER_DIR="${PREFIX}/libdata/bonobo/servers"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--disable-dbus
 DOCS=		AUTHORS COPYING ChangeLog NEWS README TODO
 MAN1=		gnote.1
diff --git deskutils/gnotime/Makefile deskutils/gnotime/Makefile
index 1be6631..586d3e3 100644
--- deskutils/gnotime/Makefile
+++ deskutils/gnotime/Makefile
@@ -26,8 +26,7 @@ USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool libltdl
 LIBTOOLFILES=	configure ../${QOF_DISTNAME}/configure
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \
-		LIBQOF_CFLAGS="${LIBQOF_CFLAGS}" LIBQOF_LIBS="${LIBQOF_LIBS}"
+CONFIGURE_ENV=	LIBQOF_CFLAGS="${LIBQOF_CFLAGS}" LIBQOF_LIBS="${LIBQOF_LIBS}"
 USE_LDCONFIG=	yes
 INSTALLS_OMF=	yes
 
@@ -38,8 +37,8 @@ QOF_VERSION=	0.7.5
 QOF_DISTNAME=	qof-${QOF_VERSION}
 QOF_WRKSRC=	${WRKDIR}/${QOF_DISTNAME}
 
-CPPFLAGS=	-I${LOCALBASE}/include `pkg-config --cflags libgnomeui-2.0`
-LDFLAGS=	-L${LOCALBASE}/lib `pkg-config --libs libgnomeui-2.0`
+CPPFLAGS+=	-I${LOCALBASE}/include `pkg-config --cflags libgnomeui-2.0`
+LDFLAGS+=	-L${LOCALBASE}/lib `pkg-config --libs libgnomeui-2.0`
 LIBQOF_CFLAGS=	-I${QOF_WRKSRC}/qof
 LIBQOF_LIBS=	-L${QOF_WRKSRC}/qof/.libs -lqof
 
@@ -57,6 +56,7 @@ pre-configure:
 	@(cd ${QOF_WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \
 		CC="${CC}" CFLAGS="${CFLAGS}" \
 		CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" \
+		CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \
 		./configure --prefix=${PREFIX} --disable-error-on-warning \
 		--disable-sqlite --disable-gdasql)
 
diff --git deskutils/google-gadgets/Makefile deskutils/google-gadgets/Makefile
index 3d806f8..2b66cc1 100644
--- deskutils/google-gadgets/Makefile
+++ deskutils/google-gadgets/Makefile
@@ -36,7 +36,8 @@ USE_GMAKE=	yes
 USE_GCC=	4.2+
 USE_GSTREAMER=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CFLAGS="${CFLAGS} -I${LOCALBASE}/include -Wno-deprecated-declarations" LDFLAGS="-L${LOCALBASE}/lib"
+LDFLAGS+=	-L${LOCALBASE}/lib
+CFLAGS+=	-I${LOCALBASE}/include -Wno-deprecated-declarations
 CONFIGURE_ARGS=	--disable-werror --enable-ltdl-install=no --with-browser-plugins-dir=${LOCALBASE}/lib/browser_plugins
 USE_AUTOTOOLS=	libtool:env autoconf:env automake:env aclocal:env libltdl
 WANT_GNOME=	yes
@@ -79,7 +80,7 @@ pre-everything::
 
 .include <bsd.port.pre.mk>
 
-CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include -Wno-deprecated-declarations"
+CPPFLAGS+=	-I${LOCALBASE}/include -Wno-deprecated-declarations
 
 .if ${OSVERSION} < 700000
 IGNORE=	needs 7.X or higher
diff --git deskutils/gruler/Makefile deskutils/gruler/Makefile
index 915b279..7d5d44e 100644
--- deskutils/gruler/Makefile
+++ deskutils/gruler/Makefile
@@ -16,8 +16,8 @@ COMMENT=	A simple customizable GTK screen ruler
 
 USE_GNOME=	gnomeprefix gnomehack libgnomeui libglade2
 USE_AUTOTOOLS=	libtool
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib -export-dynamic"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib -export-dynamic
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|^CFLAGS=""||' ${WRKSRC}/configure
diff --git deskutils/gtimer/Makefile deskutils/gtimer/Makefile
index f76d205..76f8cab 100644
--- deskutils/gtimer/Makefile
+++ deskutils/gtimer/Makefile
@@ -21,12 +21,11 @@ USE_PERL5_BUILD=yes
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 
 MAN1=		${PORTNAME}.1
 
-CPPFLAGS=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|1.1.7|${PORTVERSION}|g' ${WRKSRC}/configure
diff --git deskutils/gtodo/Makefile deskutils/gtodo/Makefile
index 8a38222..52b1d3e 100644
--- deskutils/gtodo/Makefile
+++ deskutils/gtodo/Makefile
@@ -18,8 +18,8 @@ USE_GMAKE=	yes
 USE_GETTEXT=	yes
 USE_GNOME=	gnomeprefix gnomehack gnomevfs2
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 GCONF_SCHEMAS=	gtodo.schemas
 
diff --git deskutils/gucharmap/Makefile deskutils/gucharmap/Makefile
index aa134ff..99a9e8a 100644
--- deskutils/gucharmap/Makefile
+++ deskutils/gucharmap/Makefile
@@ -24,8 +24,8 @@ USE_GNOME=	gnomeprefix intlhack gnomehack gtk20 gnomedocutils gconf2
 GNU_CONFIGURE=	yes
 INSTALLS_OMF=	yes
 USE_LDCONFIG=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-	       	LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 GCONF_SCHEMAS=	gucharmap.schemas
 
diff --git deskutils/gworkspace-gwmetadata/Makefile deskutils/gworkspace-gwmetadata/Makefile
index d558ca6..2a46e7c 100644
--- deskutils/gworkspace-gwmetadata/Makefile
+++ deskutils/gworkspace-gwmetadata/Makefile
@@ -35,7 +35,6 @@ UNIQUENAME=	${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}
 WRKSRC=		${WRKDIR}/gworkspace-${PORTVERSION}/GWMetadata
 CONFIGURE_ARGS+=	--with-sqlite-include=${LOCALBASE}/include
 CONFIGURE_ARGS+=	--with-sqlite-library=${LOCALBASE}/lib
-CONFIGURE_ENV+=		LDFLAGS="${LDFLAGS}"
 DEFAULT_LIBVERSION=	0.1.0
 MAKE_ENV+=	GNUSTEP_INSTALLATION_DOMAIN=SYSTEM
 
diff --git deskutils/hamster-applet/Makefile deskutils/hamster-applet/Makefile
index 58529b4..03da8a4 100644
--- deskutils/hamster-applet/Makefile
+++ deskutils/hamster-applet/Makefile
@@ -29,8 +29,8 @@ USE_GNOME=	gnomeprefix intlhack gnomehack pygnomedesktop \
 		gnomecontrolcenter2 gnomedocutils
 INSTALLS_OMF=	yes
 INSTALLS_ICONS=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-	       	LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 GCONF_SCHEMAS=	hamster-applet.schemas
 
diff --git deskutils/kchmviewer/Makefile deskutils/kchmviewer/Makefile
index b9a2c2e..30b5a68 100644
--- deskutils/kchmviewer/Makefile
+++ deskutils/kchmviewer/Makefile
@@ -21,9 +21,9 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
 DO_NOT_COMPILE+=chmlib
-CONFIGURE_ENV+= LDFLAGS="${PTHREAD_LIBS} -L${LOCALBASE}/lib" \
-		CPPFLAGS="-I${LOCALBASE}/include" \
-		DO_NOT_COMPILE="${DO_NOT_COMPILE}"
+CONFIGURE_ENV+=	DO_NOT_COMPILE="${DO_NOT_COMPILE}"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	${PTHREAD_LIBS} -L${LOCALBASE}/lib
 
 .if !defined(WITHOUT_KDE)
 USE_KDELIBS_VER=3
diff --git deskutils/kdepim3/Makefile deskutils/kdepim3/Makefile
index 5840773..310407d 100644
--- deskutils/kdepim3/Makefile
+++ deskutils/kdepim3/Makefile
@@ -63,7 +63,7 @@ LIB_DEPENDS+=	gnokii:${PORTSDIR}/comms/gnokii
 .endif # defined ($(WITH_GNOKII))
 
 .if defined(DO_NOT_COMPILE)
-CONFIGURE_ENV+=DO_NOT_COMPILE="${DO_NOT_COMPILE}"
+CONFIGURE_ENV+=	DO_NOT_COMPILE="${DO_NOT_COMPILE}"
 .endif # defined(DO_NOT_COMPILE)
 
 pre-everything::
diff --git deskutils/kickpim/Makefile deskutils/kickpim/Makefile
index e6bdd36..01667e5 100644
--- deskutils/kickpim/Makefile
+++ deskutils/kickpim/Makefile
@@ -18,7 +18,7 @@ USE_BZIP2=		yes
 USE_GMAKE=		yes
 USE_AUTOTOOLS=		libtool
 USE_LDCONFIG=		yes
-CONFIGURE_ENV=		LDFLAGS="${PTHREAD_LIBS}"
+LDFLAGS+=	${PTHREAD_LIBS}
 MAKE_JOBS_UNSAFE=	yes
 
 post-extract:
diff --git deskutils/krefty/Makefile deskutils/krefty/Makefile
index c905bd3..46ef787 100644
--- deskutils/krefty/Makefile
+++ deskutils/krefty/Makefile
@@ -17,7 +17,7 @@ USE_KDELIBS_VER=3
 USE_LDCONFIG=	yes
 INSTALLS_ICONS=	yes
 USE_AUTOTOOLS=	libtool
-CONFIGURE_ENV=	LDFLAGS="${PTHREAD_LIBS}"
+LDFLAGS+=	${PTHREAD_LIBS}
 
 DOCSDIR=	share/doc/HTML
 
diff --git deskutils/libopensync-plugin-synce-legacy/Makefile deskutils/libopensync-plugin-synce-legacy/Makefile
index 33c41ab..00eafda 100644
--- deskutils/libopensync-plugin-synce-legacy/Makefile
+++ deskutils/libopensync-plugin-synce-legacy/Makefile
@@ -25,7 +25,5 @@ USE_GNOME=	glib20 libxml2
 
 CFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
 LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
-CONFIGURE_ENV=	CFLAGS="${CFLAGS}" \
-		LDFLAGS="${LDFLAGS}"
 
 .include <bsd.port.mk>
diff --git deskutils/ljit/Makefile deskutils/ljit/Makefile
index c152a6f..4291325 100644
--- deskutils/ljit/Makefile
+++ deskutils/ljit/Makefile
@@ -21,8 +21,8 @@ LIB_DEPENDS=	curl.6:${PORTSDIR}/ftp/curl
 RUN_DEPENDS=	convert:${PORTSDIR}/graphics/ImageMagick
 
 GNU_CONFIGURE=	yes
-CPPFLAGS=	-I${LOCALBASE}/include
-CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 USE_GETTEXT=	yes
 USE_GNOME=	gtk20
 
diff --git deskutils/logjam/Makefile deskutils/logjam/Makefile
index 7603c63..7785f85 100644
--- deskutils/logjam/Makefile
+++ deskutils/logjam/Makefile
@@ -24,8 +24,8 @@ WANT_GNOME=	yes
 GNU_CONFIGURE=	yes
 USE_GNOME=	gnomehack gnomeprefix gtk20 libxml2 intlhack
 CONFIGURE_ARGS=	--program-transform-name="s/$$//"
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CPPFLAGS+=	-I${LOCALBASE}/include
 
 .ifndef(WITHOUT_GTKSPELL)
 LIB_DEPENDS+=		gtkspell.0:${PORTSDIR}/textproc/gtkspell
diff --git deskutils/mdh/Makefile deskutils/mdh/Makefile
index 7e92e10..9dc2485 100644
--- deskutils/mdh/Makefile
+++ deskutils/mdh/Makefile
@@ -18,10 +18,9 @@ USE_BZIP2=	yes
 USE_GNOME=	gtk20
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 
-CPPFLAGS=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .if defined(WITHOUT_GTOP)
 CONFIGURE_ARGS+=	--disable-gtop
diff --git deskutils/multisync/Makefile deskutils/multisync/Makefile
index eb693c6..f71d526 100644
--- deskutils/multisync/Makefile
+++ deskutils/multisync/Makefile
@@ -20,7 +20,8 @@ USE_BZIP2=	yes
 USE_GNOME=	gnomehack gnomeprefix libgnomeui
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	automake:env libtool
-CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include" LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV+=	LIBS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
 MAKE_JOBS_UNSAFE=	yes
 
 pre-configure:
diff --git deskutils/nautilus-actions/Makefile deskutils/nautilus-actions/Makefile
index c05b9ae..5e453d33 100644
--- deskutils/nautilus-actions/Makefile
+++ deskutils/nautilus-actions/Makefile
@@ -24,8 +24,8 @@ USE_GETTEXT=	yes
 USE_GNOME=	nautilus2 intlhack
 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=	--with-nautilus-extdir=${LOCALBASE}/lib/nautilus/extensions-2.0
 
 PORTDOCS=	AUTHORS COPYING ChangeLog ChangeLog-2008 ChangeLog-2009 INSTALL \
diff --git deskutils/nautilus-locked-folder/Makefile deskutils/nautilus-locked-folder/Makefile
index 0cfeddf..b39ccae 100644
--- deskutils/nautilus-locked-folder/Makefile
+++ deskutils/nautilus-locked-folder/Makefile
@@ -19,10 +19,12 @@ COMMENT=	Nautilus plugin that allows you to encrypt the contents of a folder
 USE_AUTOTOOLS=	libtool
 GNU_CONFIGURE=	yes
 USE_GNOME=	nautilus2 eel2 libgnomeui
+CONFIGURE_ENV=	LIBS="-lssl"
 PKGCONFIGS=	gtk+-2.0 libglade-2.0 libnautilus-extension libgnomeui-2.0
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include `pkg-config --cflags ${PKGCONFIGS}`" \
-		LDFLASG="-L${LOCALBASE}/lib `pkg-config --libs ${PKGCONFIGS}`" \
-		LIBS="-lssl"
+# XXX: if was LDFLASG="..." Since variable is spelled incorrect,
+# this may be not needed at all
+LDFLAGS+=	-L${LOCALBASE}/lib `pkg-config --libs ${PKGCONFIGS}`
+CPPFLAGS+=	-I${LOCALBASE}/include `pkg-config --cflags ${PKGCONFIGS}`
 PLIST_FILES=	lib/nautilus/extensions-2.0/libnautilus-locked-folder.a \
 		lib/nautilus/extensions-2.0/libnautilus-locked-folder.la \
 		lib/nautilus/extensions-2.0/libnautilus-locked-folder.so
diff --git deskutils/nautilus-open-terminal/Makefile deskutils/nautilus-open-terminal/Makefile
index 5e0dc39..2b5dc13 100644
--- deskutils/nautilus-open-terminal/Makefile
+++ deskutils/nautilus-open-terminal/Makefile
@@ -21,8 +21,8 @@ GNU_CONFIGURE=	yes
 USE_GNOME=	nautilus2 gnomeprefix intlhack gnomehack
 USE_GETTEXT=	yes
 USE_LDCONFIG=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include `pkg-config --cflags gnome-vfs-2.0`" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include `pkg-config --cflags gnome-vfs-2.0`
+LDFLAGS+=	-L${LOCALBASE}/lib
 GCONF_SCHEMAS=	nautilus-open-terminal.schemas
 
 .include <bsd.port.mk>
diff --git deskutils/nautilus-sendto/Makefile deskutils/nautilus-sendto/Makefile
index b044fe6..5f2fa28 100644
--- deskutils/nautilus-sendto/Makefile
+++ deskutils/nautilus-sendto/Makefile
@@ -23,8 +23,8 @@ USE_GNOME=	intlhack gnomeprefix nautilus2 gnomehack \
 		evolutiondataserver
 GNOME_DESKTOP_VERSION=2
 USE_GETTEXT=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--with-plugins="${SENDTO_PLUGINS}"
 
 OPTIONS=	PIDGIN	"Build pidgin sendto plugin" off \
diff --git deskutils/notification-daemon/Makefile deskutils/notification-daemon/Makefile
index e31e531..5905516 100644
--- deskutils/notification-daemon/Makefile
+++ deskutils/notification-daemon/Makefile
@@ -27,8 +27,8 @@ USE_XORG=	x11
 INSTALLS_ICONS=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-dbus-services=${PREFIX}/share/dbus-1/services
-CPPFLAGS=	-I${LOCALBASE}/include
-CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 CONFLICTS=	xfce4-notification-daemon-[0-9]* xfce4-notifyd-[0-9]*
 
diff --git deskutils/ontv/Makefile deskutils/ontv/Makefile
index 5369395..ccb2155 100644
--- deskutils/ontv/Makefile
+++ deskutils/ontv/Makefile
@@ -28,7 +28,8 @@ USE_GNOME=	gnomehack gnomeprefix pygnomedesktop pygnomeextras
 USE_GMAKE=	yes
 USE_PYTHON=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 GCONF_SCHEMAS=	ontv.schemas
 INSTALLS_ICONS=	yes
 
diff --git deskutils/orage/Makefile deskutils/orage/Makefile
index d082684..a9d3f12 100644
--- deskutils/orage/Makefile
+++ deskutils/orage/Makefile
@@ -26,7 +26,7 @@ USE_GNOME=	gtk20 intltool intlhack pkgconfig
 USE_XFCE=	configenv libgui panel
 USE_XORG=	xext xrender xinerama xi xrandr xcursor xcomposite xdamage x11 \
 		xfixes
-CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib"
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 OPTIONS=	BDB	"Enable BDB support"		off \
 		ICAL	"Enable libical support"	off
@@ -44,7 +44,7 @@ CONFIGURE_ARGS+=--with-bdb4=no
 
 .if defined(WITH_ICAL)
 LIB_DEPENDS+=	ical.44:${PORTSDIR}/devel/libical
-CONFIGURE_ENV+=	CFLAGS="${CLFAGS} -I${LOCALBASE}/include/libical"
+CFLAGS+=	-I${LOCALBASE}/include/libical
 PLIST_SUB+=	WITH_ICAL="@comment "
 .else
 CONFIGURE_ARGS+=--disable-libical
diff --git deskutils/osmo/Makefile deskutils/osmo/Makefile
index 06acdbc..aaea422 100644
--- deskutils/osmo/Makefile
+++ deskutils/osmo/Makefile
@@ -26,8 +26,8 @@ USE_GETTEXT=	yes
 INSTALLS_ICONS=	yes
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV+=	CFLAGS="${CFLAGS} -I${LOCALBASE}/include/libical" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+LDFLAGS+=	-L${LOCALBASE}/lib
+CFLAGS+=	-I${LOCALBASE}/include/libical
 
 USE_GMAKE=	yes
 
diff --git deskutils/pinot/Makefile deskutils/pinot/Makefile
index 151e544..d280251 100644
--- deskutils/pinot/Makefile
+++ deskutils/pinot/Makefile
@@ -43,7 +43,8 @@ LICENSE=	GPLv2
 LDFLAGS+=	-L${LOCALBASE}/lib
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-http=curl --with-ssl=${OPENSSLBASE} --enable-libarchive
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" MKDIR_P="${MKDIR}"
+CONFIGURE_ENV=	MKDIR_P="${MKDIR}"
+CPPFLAGS+=	-I${LOCALBASE}/include
 
 USE_XORG=	pixman
 USE_GETTEXT=	yes
diff --git deskutils/planner/Makefile deskutils/planner/Makefile
index d1c8c7c..3c20461 100644
--- deskutils/planner/Makefile
+++ deskutils/planner/Makefile
@@ -28,8 +28,8 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-static \
 		--disable-python \
 		--disable-python-plugin
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 GCONF_SCHEMAS=	planner.schemas
 
diff --git deskutils/rubrica/Makefile deskutils/rubrica/Makefile
index 5060769..e9625a7 100644
--- deskutils/rubrica/Makefile
+++ deskutils/rubrica/Makefile
@@ -25,13 +25,12 @@ USE_GNOME=	gconf2 gnomehack gnomeprefix libglade2
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
-CONFIGURE_ENV=	LDFLAGS="${LDFLAGS}"
 MAKE_JOBS_SAFE=	yes
 
 GCONF_SCHEMAS=	rubrica2.schemas
 
-CPPFLAGS=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 post-patch:
 	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
diff --git deskutils/semantik/Makefile deskutils/semantik/Makefile
index 155c9a1..d96c36c 100644
--- deskutils/semantik/Makefile
+++ deskutils/semantik/Makefile
@@ -26,8 +26,8 @@ USE_QT_VER=	4
 QT_COMPONENTS=	corelib gui linguist svg webkit xml \
 		moc_build qmake_build uic_build
 MAKE_JOBS_SAFE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		PATH="${KDE4_PREFIX}/bin:$$PATH" WAF_HOME="${WRKSRC}"
+CONFIGURE_ENV=	PATH="${KDE4_PREFIX}/bin:$$PATH" WAF_HOME="${WRKSRC}"
+CPPFLAGS+=	-I${LOCALBASE}/include
 CFLAGS+=	-I${LOCALBASE}/include
 USE_LDCONFIG=	yes
 
diff --git deskutils/simpleagenda/Makefile deskutils/simpleagenda/Makefile
index 6e9fbd2..e0c6ef8 100644
--- deskutils/simpleagenda/Makefile
+++ deskutils/simpleagenda/Makefile
@@ -26,7 +26,6 @@ USE_GNUSTEP_INSTALL=	yes
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 CFLAGS+=	-I${LOCALBASE}/include
-CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}"
 ADDITIONAL_OBJCFLAGS=	'-Dsel_isEqual(x,y) (x==y)'
 
 pre-configure:
diff --git deskutils/superswitcher/Makefile deskutils/superswitcher/Makefile
index b731eb3..c04406f 100644
--- deskutils/superswitcher/Makefile
+++ deskutils/superswitcher/Makefile
@@ -21,8 +21,8 @@ RUN_DEPENDS=	gnome-autogen.sh:${PORTSDIR}/devel/gnome-common
 USE_GMAKE=	yes
 USE_GNOME=	gtk20 libwnck pango
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 post-extract:
 	@${FIND} ${WRKSRC} -name Makefile | ${XARGS} ${RM} -f
diff --git deskutils/tagutils/Makefile deskutils/tagutils/Makefile
index b8cf526..7bf7255 100644
--- deskutils/tagutils/Makefile
+++ deskutils/tagutils/Makefile
@@ -20,7 +20,7 @@ USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 USE_GNOME=	gnomehack glib20 pkgconfig
 USE_LDCONFIG=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .include <bsd.port.mk>
diff --git deskutils/taskjuggler/Makefile deskutils/taskjuggler/Makefile
index 6930d05..f078924 100644
--- deskutils/taskjuggler/Makefile
+++ deskutils/taskjuggler/Makefile
@@ -31,8 +31,8 @@ USE_PERL5_RUN=	yes
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	autoconf:env automake:env libtool
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
-		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_CFLAGS}"
+CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_CFLAGS}
 CONFIGURE_ARGS=	--with-docdir=${EXAMPLESDIR}/
 USE_LDCONFIG=	yes
 
diff --git deskutils/timer-applet/Makefile deskutils/timer-applet/Makefile
index 631e17e..4ee6a2a 100644
--- deskutils/timer-applet/Makefile
+++ deskutils/timer-applet/Makefile
@@ -23,8 +23,8 @@ USE_PYTHON=	2.5+
 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
 CONFIGURE_ARGS=	--libdir=${PREFIX}/libexec
 
 GCONF_SCHEMAS=	timer-applet.schemas
diff --git deskutils/xchm/Makefile deskutils/xchm/Makefile
index 3a2e5a2..4ce3a4e 100644
--- deskutils/xchm/Makefile
+++ deskutils/xchm/Makefile
@@ -19,8 +19,8 @@ GNU_CONFIGURE=	yes
 USE_WX=		2.6+
 WX_UNICODE=	yes
 WX_CONF_ARGS=	absolute
-CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
-CPPFLAGS=	"-I${LOCALBASE}/include"
+LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
+CPPFLAGS+=	-I${LOCALBASE}/include
 
 LICENSE=	GPLv2
 
diff --git deskutils/xfce4-volstatus-icon/Makefile deskutils/xfce4-volstatus-icon/Makefile
index b3a4d72..3da55cf 100644
--- deskutils/xfce4-volstatus-icon/Makefile
+++ deskutils/xfce4-volstatus-icon/Makefile
@@ -28,8 +28,8 @@ USE_GNOME=	gtk20 intltool intlhack pkgconfig
 USE_XORG=	x11
 USE_XFCE=	libexo libgui libutil
 USE_GETTEXT=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-	LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 LICENSE=	GPLv2
 LICENSE_FILE_GPLv2=	${WRKSRC}/COPYING
diff --git deskutils/xneur/Makefile deskutils/xneur/Makefile
index c25d8cf..74d92e2 100644
--- deskutils/xneur/Makefile
+++ deskutils/xneur/Makefile
@@ -25,7 +25,6 @@ USE_ICONV=	yes
 LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
 CONFIGURE_ARGS=	--disable-static --libdir=${PREFIX}/lib/xneur
-CONFIGURE_ENV=	LDFLAGS="${LDFLAGS}"
 
 USE_LDCONFIG=	yes
 INSTALLS_ICONS=	yes
diff --git deskutils/xpad/Makefile deskutils/xpad/Makefile
index e17e112..920c12b 100644
--- deskutils/xpad/Makefile
+++ deskutils/xpad/Makefile
@@ -20,8 +20,8 @@ USE_GMAKE=	yes
 USE_XORG=	x11 sm
 USE_GNOME=	pkgconfig gtk20 gnomehier intltool
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	${CXXFLAGS} -I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 MAN1=		xpad.1
 
diff --git devel/ORBit/Makefile devel/ORBit/Makefile
index a7c999e..a55537f 100644
--- devel/ORBit/Makefile
+++ devel/ORBit/Makefile
@@ -21,8 +21,8 @@ USE_GNOME=	glib12
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS= --disable-indent
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 INFO=		libIDL
 
diff --git devel/ORBit2/Makefile devel/ORBit2/Makefile
index 4b88381..0c4ce73 100644
--- devel/ORBit2/Makefile
+++ devel/ORBit2/Makefile
@@ -27,8 +27,8 @@ USE_AUTOTOOLS=	libtool
 USE_GNOME=	gnomehack libidl ltverhack referencehack
 CONFIGURE_ARGS=	--with-html-dir=${PREFIX}/share/doc \
 		--disable-gtk-doc
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
diff --git devel/aegis/Makefile devel/aegis/Makefile
index 8f6c93f..e2ab28e 100644
--- devel/aegis/Makefile
+++ devel/aegis/Makefile
@@ -23,8 +23,8 @@ USE_TK=		yes
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	"-I${LOCALBASE}/include"
 CONFIGURE_ARGS=	--with-nlsdir="${PREFIX}/share/locale"
-CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib" \
-		WISH="${WISH}"
+CONFIGURE_ENV=	WISH="${WISH}"
+LDFLAGS+=	-L${LOCALBASE}/lib
 MAKE_JOBS_UNSAFE=	yes
 
 # XXX Manpages are installed into ${DATADIR} too -- there's no easy way to
diff --git devel/allegro/Makefile devel/allegro/Makefile
index 6e95b17..0e9adea 100644
--- devel/allegro/Makefile
+++ devel/allegro/Makefile
@@ -101,8 +101,8 @@ PLIST_SUB+=	PROFILE="@comment "
 
 .if !defined(WITHOUT_THREADS)
 CONFIGURE_ARGS+=--enable-pthreads
-CONFIGURE_ENV=	CPPFLAGS="${PTHREAD_CFLAGS} -DHAVE_LIBPTHREAD" \
-		LDFLAGS="${PTHREAD_LIBS}"
+CPPFLAGS+=	${PTHREAD_CFLAGS} -DHAVE_LIBPTHREAD
+LDFLAGS+=	${PTHREAD_LIBS}
 .else
 CONFIGURE_ARGS+=--disable-pthreads
 .endif
diff --git devel/anjuta-extras/Makefile devel/anjuta-extras/Makefile
index 750c587..d7176d6 100644
--- devel/anjuta-extras/Makefile
+++ devel/anjuta-extras/Makefile
@@ -21,8 +21,8 @@ USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_GNOME=	intltool
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include " \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include 
+LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS+=--disable-plugin-valgrind \
 		--localedir=${PREFIX}/share
 
diff --git devel/anjuta/Makefile devel/anjuta/Makefile
index e7f17c4..936bc4f 100644
--- devel/anjuta/Makefile
+++ devel/anjuta/Makefile
@@ -41,8 +41,8 @@ USE_PERL5=	yes
 USE_PYTHON=	yes
 USE_GNOME=	gnomeprefix gnomehack vte gtksourceview2 libgda4
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--with-symbol-db-shm=/tmp \
 		--disable-vala \
 		--enable-introspection=no
diff --git devel/avarice/Makefile devel/avarice/Makefile
index 52cd049..bc1c0bd 100644
--- devel/avarice/Makefile
+++ devel/avarice/Makefile
@@ -20,7 +20,8 @@ USE_BZIP2=	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=		avarice.1 ice-gdb.1 ice-insight.1
 
diff --git devel/avr-binutils/Makefile devel/avr-binutils/Makefile
index 9a8bf05..3adb18c 100644
--- devel/avr-binutils/Makefile
+++ devel/avr-binutils/Makefile
@@ -23,8 +23,8 @@ USE_GMAKE=	yes
 USE_GETTEXT=	build
 CONFIGURE_ARGS=	--target=avr
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV+= CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+LDFLAGS+=	-L${LOCALBASE}/lib
+CFLAGS+=	-I${LOCALBASE}/include
 .if (${MACHINE_ARCH} == "amd64")
 MACHINE_ARCH=	x86_64
 .endif
diff --git devel/avrdude/Makefile devel/avrdude/Makefile
index 3f280f3..716ef9b 100644
--- devel/avrdude/Makefile
+++ devel/avrdude/Makefile
@@ -18,7 +18,8 @@ MAN1=		avrdude.1
 MANCOMPRESSED=	no
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CFLAGS=-I${LOCALBASE}/include LDFLAGS=-L${LOCALBASE}/lib
+LDFLAGS+=	-L${LOCALBASE}/lib
+CFLAGS+=	-I${LOCALBASE}/include
 MAKE_JOBS_UNSAFE=	yes
 
 .include <bsd.port.pre.mk>
diff --git devel/bennugd-modules/Makefile devel/bennugd-modules/Makefile
index 5b23b08..216921b 100644
--- devel/bennugd-modules/Makefile
+++ devel/bennugd-modules/Makefile
@@ -22,8 +22,8 @@ LIB_DEPENDS=	png.6:${PORTSDIR}/graphics/png
 
 USE_SDL=	sdl mixer
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" \
-		CPPFLAGS="-I${LOCALBASE}/include"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 CONFIGURE_ARGS=	--libdir="${PREFIX}/lib/bennugd"
 MAKE_JOBS_SAFE=	yes
 
diff --git devel/binutils/Makefile devel/binutils/Makefile
index 18e79aa..f8c6e8b 100644
--- devel/binutils/Makefile
+++ devel/binutils/Makefile
@@ -31,7 +31,7 @@ LICENSE_FILE_GPLv3=	${WRKSRC}/COPYING3
 LICENSE_FILE_LGPL3=	${WRKSRC}/COPYING3.LIB
 
 CFLAGS+=	-I${LOCALBASE}/include
-CONFIGURE_ENV+=	LDFLAGS="-L${LOCALBASE}/lib"
+LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS+=	--with-system-zlib \
 			--disable-werror \
 			--with-gmp=${LOCALBASE} \
diff --git devel/bison/Makefile devel/bison/Makefile
index afb7705..cb755db 100644
--- devel/bison/Makefile
+++ devel/bison/Makefile
@@ -20,8 +20,8 @@ RUN_DEPENDS=	gm4:${PORTSDIR}/devel/m4
 
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 MAN1=		bison.1
 INFO=		bison
diff --git devel/bonobo-conf/Makefile devel/bonobo-conf/Makefile
index 31bc6eb..94814be 100644
--- devel/bonobo-conf/Makefile
+++ devel/bonobo-conf/Makefile
@@ -20,8 +20,8 @@ USE_GNOME=	gnomeprefix gnomehack bonobo gconf
 USE_GETTEXT=	yes
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|echo aout|echo elf|g' \
diff --git devel/bonobo/Makefile devel/bonobo/Makefile
index d9a73e1..e1b97f6 100644
--- devel/bonobo/Makefile
+++ devel/bonobo/Makefile
@@ -24,8 +24,8 @@ USE_GETTEXT=	yes
 GNOME_HTML_DIR=	${PREFIX}/share/doc/bonobo
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|echo aout|echo elf|g' \
diff --git devel/bug-buddy/Makefile devel/bug-buddy/Makefile
index abffc2b..f5c9f41 100644
--- devel/bug-buddy/Makefile
+++ devel/bug-buddy/Makefile
@@ -27,8 +27,8 @@ GNU_CONFIGURE=	yes
 USE_GNOME=	gnomeprefix gnomehack intlhack libbonobo \
 		gnomedocutils evolutiondataserver
 GNOME_DESKTOP_VERSION=2
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 GCONF_SCHEMAS=	bug-buddy.schemas
 
diff --git devel/ccrtp/Makefile devel/ccrtp/Makefile
index 3ecf3b2..aefb3a5 100644
--- devel/ccrtp/Makefile
+++ devel/ccrtp/Makefile
@@ -20,8 +20,8 @@ USE_GMAKE=	yes
 USE_GNOME=	pkgconfig
 USE_LDCONFIG=	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}
 INFO=	ccrtp
 
 post-patch:
diff --git devel/cgdb/Makefile devel/cgdb/Makefile
index d91961e..4aa9a4b 100644
--- devel/cgdb/Makefile
+++ devel/cgdb/Makefile
@@ -28,7 +28,6 @@ BUILD_DEPENDS+=	${LOCALBASE}/lib/libreadline.so.6:${PORTSDIR}/devel/readline
 RUN_DEPENDS=	${BUILD_DEPENDS}
 LDFLAGS+=	-rpath ${LOCALBASE}/lib
 CONFIGURE_ARGS+=	--with-readline=${LOCALBASE}
-CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS}"
 .endif
 
 post-patch:
diff --git devel/cgit/Makefile devel/cgit/Makefile
index e215262..f454d38 100644
--- devel/cgit/Makefile
+++ devel/cgit/Makefile
@@ -27,10 +27,10 @@ USE_ICONV=	yes
 USE_GMAKE=	yes
 USE_OPENSSL=	yes
 CFLAGS+=	-I${LOCALBASE}/include
-MAKE_ENV+=	LDFLAGS="-L${LOCALBASE}/lib" \
-		CGIT_SCRIPT_PATH=${WWWDIR} \
+MAKE_ENV+=	CGIT_SCRIPT_PATH=${WWWDIR} \
 		CGIT_CONFIG=${PREFIX}/etc/cgitrc \
 		NEEDS_LIBICONV=yes
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 SUB_FILES=	pkg-message
 SUB_LIST+=	PORTNAME=${PORTNAME}
diff --git devel/clanlib/Makefile devel/clanlib/Makefile
index c30727e..5eb20d4 100644
--- devel/clanlib/Makefile
+++ devel/clanlib/Makefile
@@ -28,7 +28,6 @@ CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
 LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 USE_AUTOTOOLS=	libtool
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--disable-clanJavaScript --disable-docs
 USE_GMAKE=	yes
 USE_XORG=	x11 xmu xi
diff --git devel/commoncpp/Makefile devel/commoncpp/Makefile
index d5e4a70..05bfa60 100644
--- devel/commoncpp/Makefile
+++ devel/commoncpp/Makefile
@@ -19,12 +19,11 @@ USE_LDCONFIG=	yes
 USE_GNOME=	gnomehack
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \
-		ac_cv_path_DOXYGEN=no
+CONFIGURE_ENV=	ac_cv_path_DOXYGEN=no
 
 INFO=		commoncpp2
 
-CPPFLAGS=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
+CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 
 .include <bsd.port.mk>
diff --git devel/cook/Makefile devel/cook/Makefile
index 5a7c42a..c14e4f1 100644
--- devel/cook/Makefile
+++ devel/cook/Makefile
@@ -17,8 +17,9 @@ MAINTAINER=	jasone@FreeBSD.org
 COMMENT=	Like make(1), but more powerful and clean
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS=-I${LOCALBASE}/include LDFLAGS=-L${LOCALBASE}/lib \
-		YACC=yacc
+CONFIGURE_ENV=	YACC=yacc
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 MAKE_JOBS_UNSAFE=	yes
 
 MAN1=	c_incl.1 cook.1 cook_bom.1 cook_lic.1 cook_rsh.1 cookfp.1 cooktime.1 \
diff --git devel/cppcheck/Makefile devel/cppcheck/Makefile
index 633bec2..c7a281a 100644
--- devel/cppcheck/Makefile
+++ devel/cppcheck/Makefile
@@ -21,7 +21,6 @@ USE_GMAKE=	yes
 USE_BZIP2=	yes
 LDFLAGS+=	${PTHREAD_LIBS} -L${LOCALBASE}/lib
 CPPFLAGS+=	-I${LOCALBASE}/include
-MAKE_ENV+=	LDFLAGS="${LDFLAGS}"
 
 PLIST_FILES=	bin/cppcheck
 
diff --git devel/cppi/Makefile devel/cppi/Makefile
index 7af6ffe..377fae4 100644
--- devel/cppi/Makefile
+++ devel/cppi/Makefile
@@ -17,7 +17,7 @@ COMMENT=	A tool to indent the C preprocessor directives
 USE_XZ=		yes
 USE_GETTEXT=	yes                                                             
 GNU_CONFIGURE=	yes
-CPPFLAGS=	-I${LOCALBASE}/include
+CPPFLAGS+=	-I${LOCALBASE}/include
 
 PLIST_FILES=	bin/cppi
 MAN1=		cppi.1
diff --git devel/cutter/Makefile devel/cutter/Makefile
index 9a32091..c04d37d 100644
--- devel/cutter/Makefile
+++ devel/cutter/Makefile
@@ -16,7 +16,7 @@ COMMENT=	Unit Testing Framework for C and C++
 LIB_DEPENDS=	cairo:${PORTSDIR}/graphics/cairo \
 		pangocairo:${PORTSDIR}/x11-toolkits/pango
 
-CPPFLAGS=	"-I${LOCALBASE}/include"
+CPPFLAGS+=	"-I${LOCALBASE}/include"
 CONFIGURE_ARGS=	--disable-gtk-doc-html --with-html-dir=${PREFIX}/share/doc
 GNU_CONFIGURE=	yes
 USE_GETTEXT=	yes
diff --git devel/cvsd/Makefile devel/cvsd/Makefile
index 59a8524..924bceb 100644
--- devel/cvsd/Makefile
+++ devel/cvsd/Makefile
@@ -19,7 +19,6 @@ EXTRA_PATCHES=	${FILESDIR}/extra-cvsd-buildroot.in
 
 USE_PERL5=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--with-libwrap
 MAKE_ARGS=	ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \
 		AUTOHEADER="${TRUE}"
diff --git devel/cxxtools/Makefile devel/cxxtools/Makefile
index 12355b1..08660fe 100644
--- devel/cxxtools/Makefile
+++ devel/cxxtools/Makefile
@@ -18,8 +18,8 @@ PATCH_STRIP=	-p1
 USE_ICONV=	yes
 USE_CSTD=	gnu89
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}"
-CONFIGURE_ENV+=	LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 MAKE_JOBS_SAFE=	yes
 
 .include <bsd.port.pre.mk>
diff --git devel/datadesigner/Makefile devel/datadesigner/Makefile
index c65db3e..ed10658 100644
--- devel/datadesigner/Makefile
+++ devel/datadesigner/Makefile
@@ -22,8 +22,8 @@ USE_ICONV=	yes
 USE_WX=		2.4
 WX_CONF_ARGS=	absolute
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	${CXXFLAGS} -I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .if !defined(WITHOUT_NLS)
 USE_GETTEXT=	yes
diff --git devel/dbus-glib/Makefile devel/dbus-glib/Makefile
index 97cc7e0..7b9ecdf 100644
--- devel/dbus-glib/Makefile
+++ devel/dbus-glib/Makefile
@@ -24,8 +24,8 @@ USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--with-test-socket-dir=${WRKDIR} \
 		--disable-gtk-doc \
 		--with-html-dir=${PREFIX}/share/doc
-CPPFLAGS=	-I${LOCALBASE}/include
-CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 
 PLIST_SUB=	VERSION="1.0"
 
diff --git devel/dbus-qt3/Makefile devel/dbus-qt3/Makefile
index a446421..908edff 100644
--- devel/dbus-qt3/Makefile
+++ devel/dbus-qt3/Makefile
@@ -24,8 +24,9 @@ USE_BZIP2=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
-CONFIGURE_ENV=	QTDIR=${LOCALBASE} CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CONFIGURE_ENV=	QTDIR=${LOCALBASE}
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 
 PLIST_SUB=	VERSION="1.0"
 
diff --git devel/dbus-sharp/Makefile devel/dbus-sharp/Makefile
index 7e33bca..2288a16 100644
--- devel/dbus-sharp/Makefile
+++ devel/dbus-sharp/Makefile
@@ -35,9 +35,9 @@ CONFIGURE_ARGS=	--enable-mono \
 		--with-session-socket-dir=/var/tmp \
 		--disable-doxygen-docs \
 		--disable-xml-docs
-CONFIGURE_ENV=  CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib" \
-		PTHREAD_LIBS="${PTHREAD_LIBS}"
+CONFIGURE_ENV=	PTHREAD_LIBS="${PTHREAD_LIBS}"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .include "${.CURDIR}/../../lang/mono/bsd.mono.mk"
 .include <bsd.port.mk>
diff --git devel/dbus/Makefile devel/dbus/Makefile
index 5f9fc45..37b2eec 100644
--- devel/dbus/Makefile
+++ devel/dbus/Makefile
@@ -28,9 +28,9 @@ CONFIGURE_ARGS=--localstatedir=/var \
 		--with-session-socket-dir=/var/tmp \
 		--disable-doxygen-docs \
 		--disable-xml-docs
+CONFIGURE_ENV=	PTHREAD_LIBS="${PTHREAD_LIBS}"
 CPPFLAGS+=	-I${LOCALBASE}/include
-CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" \
-		PTHREAD_LIBS="${PTHREAD_LIBS}"
+LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 
 USE_RC_SUBR=	dbus
 USE_GNOME_SUBR=	yes
diff --git devel/dconf/Makefile devel/dconf/Makefile
index 5bb5840..b5245ec 100644
--- devel/dconf/Makefile
+++ devel/dconf/Makefile
@@ -29,8 +29,8 @@ 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
 
 pre-build:
 	${GMAKE} -C ${WRKSRC}/client dconf-client.c libdconf.so.0
diff --git devel/ddd/Makefile devel/ddd/Makefile
index c3a32be..2d00adf 100644
--- devel/ddd/Makefile
+++ devel/ddd/Makefile
@@ -24,8 +24,6 @@ GNU_CONFIGURE=	yes
 CFLAGS+=	-Wno-deprecated
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
-CONFIGURE_ENV=	CPPFLAGS='${CPPFLAGS}' \
-		LDFLAGS='${LDFLAGS}'
 CONFIGURE_ARGS=	--with-motif-libraries="${LIBXMDIR}" \
 		--with-readline-libraries=/usr/lib
 
diff --git devel/desktop-file-utils/Makefile devel/desktop-file-utils/Makefile
index 5dc0726..b18e8a7 100644
--- devel/desktop-file-utils/Makefile
+++ devel/desktop-file-utils/Makefile
@@ -21,8 +21,9 @@ USE_GMAKE=	yes
 WANT_GNOME=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--without-lispdir
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib" EMACS="no"
+CONFIGURE_ENV=	EMACS="no"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 MAN1=		desktop-file-install.1 desktop-file-validate.1 \
 		update-desktop-database.1
diff --git devel/devhelp/Makefile devel/devhelp/Makefile
index aa1772c..46e50d6 100644
--- devel/devhelp/Makefile
+++ devel/devhelp/Makefile
@@ -29,8 +29,8 @@ GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
 USE_LDCONFIG=	yes
 GCONF_SCHEMAS=	devhelp.schemas
-CONFIGURE_ENV=	CPPFLAGS="${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \
-		LDFLAGS="${PTHREAD_LIBS} -L${LOCALBASE}/lib"
+CPPFLAGS+=	${PTHREAD_CFLAGS} -I${LOCALBASE}/include
+LDFLAGS+=	${PTHREAD_LIBS} -L${LOCALBASE}/lib
 
 OPTIONS=		GEDIT "Enable GEdit plug-in support" off
 
diff --git devel/dia2code/Makefile devel/dia2code/Makefile
index 8917191..8b15ffd 100644
--- devel/dia2code/Makefile
+++ devel/dia2code/Makefile
@@ -17,8 +17,8 @@ COMMENT=	A small utility used to generate code from a Dia diagram
 USE_GNOME=	libxml2
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 MAKE_ARGS=	ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOHEADER="${TRUE}" \
 		AUTOMAKE="${TRUE}"
 
diff --git devel/directfb/Makefile devel/directfb/Makefile
index 8049c36..e5e5467 100644
--- devel/directfb/Makefile
+++ devel/directfb/Makefile
@@ -26,7 +26,8 @@ OPTIONS=	FREETYPE2	"Enable Freetype support" on \
 		UNIQUE		"Enable Unique (WM Module)" off \
 		TESTS		"Install test apps" off
 
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" LDFLAGS="${PTHREAD_LIBS}"
+CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS+=	${PTHREAD_LIBS}
 USE_AUTOTOOLS=	libtool
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
diff --git devel/distcc/Makefile devel/distcc/Makefile
index 0056ab3..04e523b 100644
--- devel/distcc/Makefile
+++ devel/distcc/Makefile
@@ -25,8 +25,9 @@ USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-gprof --disable-Werror
 WANT_GNOME=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib" \
-		PTHREAD_LIBS="${PTHREAD_LIBS}"
+CONFIGURE_ENV=	PTHREAD_LIBS="${PTHREAD_LIBS}"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 DISTCCD_PIDFILE=/var/run/distccd.pid
 USE_RC_SUBR=	distccd.sh
 SUB_LIST=	DISTCCD_PIDFILE=${DISTCCD_PIDFILE}
diff --git devel/dklibs/Makefile devel/dklibs/Makefile
index 0d893ed..3daabc1 100644
--- devel/dklibs/Makefile
+++ devel/dklibs/Makefile
@@ -35,10 +35,8 @@ CONFIGURE_ARGS+=	--datadir=${DATADIR} \
 			--datarootdir=${DATADIR} \
 			--sysconfdir=${ETCDIR}
 
-CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS}"
-
 # Need -lc for RELENG_6 support.
-MAKE_ENV+=	LDFLAGS="-L${LOCALBASE}/lib -L${BDB_LIB_DIR} -lc"
+LDFLAGS+=	-L${LOCALBASE}/lib -L${BDB_LIB_DIR} -lc
 
 .if !defined(NO_INSTALL_MANPAGES)
 MAN3=		dk.3 \
diff --git devel/dprog/Makefile devel/dprog/Makefile
index 4190a56..19d8b02 100644
--- devel/dprog/Makefile
+++ devel/dprog/Makefile
@@ -18,8 +18,8 @@ COMMENT=	A language for specifying dynamic programming algorithms
 LIB_DEPENDS=	popt.0:${PORTSDIR}/devel/popt
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	${CXXFLAGS} -I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 OPTIONS=	EMACS "Install emacs syntax files" on
 
diff --git devel/dwarfdump/Makefile devel/dwarfdump/Makefile
index f456e8d..039a307 100644
--- devel/dwarfdump/Makefile
+++ devel/dwarfdump/Makefile
@@ -19,8 +19,8 @@ BUILD_DEPENDS=	${LOCALBASE}/lib/libdwarf.a:${PORTSDIR}/devel/libdwarf
 WRKSRC=		${WRKDIR}/dwarf-${PORTVERSION}/dwarfdump
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV+=	CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+LDFLAGS+=	-L${LOCALBASE}/lib
+CFLAGS+=	-I${LOCALBASE}/include
 
 MAN1=		dwarfdump.1
 
diff --git devel/eggdbus/Makefile devel/eggdbus/Makefile
index a18e2f3..cb883bb 100644
--- devel/eggdbus/Makefile
+++ devel/eggdbus/Makefile
@@ -24,8 +24,8 @@ MAKE_JOBS_UNSAFE=yes
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--localstatedir=/var
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .if defined(NO_INSTALL_MANPAGES)
 CONFIGURE_ARGS+=--disable-man-pages
diff --git devel/fastdep/Makefile devel/fastdep/Makefile
index 12afce3..26fa3af 100644
--- devel/fastdep/Makefile
+++ devel/fastdep/Makefile
@@ -17,7 +17,6 @@ COMMENT=	Fast dependency generator for C/C++ files
 USE_GMAKE=	yes
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-local-gnugetopt
-MAKE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 
 DOCS=		AUTHORS CHANGELOG INSTALL README \
 		doc/fastdep.html doc/fastdep.pdf doc/c*.htm
diff --git devel/fga/Makefile devel/fga/Makefile
index df87bb1..3d9db9b 100644
--- devel/fga/Makefile
+++ devel/fga/Makefile
@@ -20,8 +20,6 @@ USE_GMAKE=	yes
 CFLAGS+=	${PTHREAD_CFLAGS}
 LDFLAGS+=	${PTHREAD_LIBS}
 
-MAKE_ENV+=	LDFLAGS="${LDFLAGS}"
-
 EXAMPLES=	graph_gen maxbit tsp tsp_bf
 
 .if !defined(NOPORTDOCS)
diff --git devel/fhist/Makefile devel/fhist/Makefile
index 1825617..60d825a 100644
--- devel/fhist/Makefile
+++ devel/fhist/Makefile
@@ -15,7 +15,6 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Utilities to maintain file history, do file comparisions and merges
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 ALL_TARGET=	binaries po
 MAKE_JOBS_UNSAFE=	yes
 
@@ -23,8 +22,8 @@ MAN1=		fcomp.1 fhist.1 fmerge.1
 PLIST_FILES=	bin/fcomp bin/fhist bin/fmerge
 
 CFLAGS+=	-I${LOCALBASE}/include
-CPPFLAGS=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .include <bsd.port.pre.mk>
 
diff --git devel/g-wrap/Makefile devel/g-wrap/Makefile
index 79fdf2e..9d7a893 100644
--- devel/g-wrap/Makefile
+++ devel/g-wrap/Makefile
@@ -30,7 +30,7 @@ USE_GMAKE=	yes
 USE_GNOME=	glib20 gnomehack
 NOT_FOR_ARCHS=	ia64
 
-CONFIGURE_ENV+=		CFLAGS="${CFLAGS} -fPIC"
+CFLAGS+=		-fPIC
 CONFIGURE_ARGS=		--disable-Werror
 
 post-patch:
diff --git devel/gamin/Makefile devel/gamin/Makefile
index e3bf5db..9607217 100644
--- devel/gamin/Makefile
+++ devel/gamin/Makefile
@@ -22,9 +22,8 @@ USE_GNOME?=	gnomehack _glib20
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS?=--with-html-dir=${PREFIX}/share/doc \
 		--without-python
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS} -DHAVE_LINUX" \
-		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
-CPPFLAGS=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
+CPPFLAGS+=	-DHAVE_LINUX -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
 
 CONFLICTS=	fam-[0-9]*
 
diff --git devel/gaul/Makefile devel/gaul/Makefile
index 9a01be9..5858907 100644
--- devel/gaul/Makefile
+++ devel/gaul/Makefile
@@ -24,8 +24,8 @@ USE_AUTOTOOLS=	libtool
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
-		LDFLAGS="-L${LOCALBASE}/lib -lcurses ${PTHREAD_LIBS}"
+CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS+=	-L${LOCALBASE}/lib -lcurses ${PTHREAD_LIBS}
 USE_LDCONFIG=	yes
 
 post-patch:
diff --git devel/gconf/Makefile devel/gconf/Makefile
index 08b4780..ba57720 100644
--- devel/gconf/Makefile
+++ devel/gconf/Makefile
@@ -27,8 +27,8 @@ USE_GNOME=	gnomeprefix gnomehack glib12 gtk12 oaf libxml orbit
 USE_GETTEXT=	yes
 USE_LDCONFIG=	yes
 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
 
 .include <bsd.port.mk>
diff --git devel/gconf2/Makefile devel/gconf2/Makefile
index 4582b40..4a5254f 100644
--- devel/gconf2/Makefile
+++ devel/gconf2/Makefile
@@ -38,8 +38,8 @@ CONFIGURE_ARGS=	--with-html-dir=${PREFIX}/share/doc \
 		--disable-gtk-doc
 #		--enable-gconf-source=${PREFIX}/etc/gconf/schemas \
 
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 MAN1=		gconftool-2.1 gsettings-data-convert.1 \
 		gsettings-schema-convert.1
 
diff --git devel/gdb/Makefile devel/gdb/Makefile
index 77a1d3e..ee4b343 100644
--- devel/gdb/Makefile
+++ devel/gdb/Makefile
@@ -23,7 +23,7 @@ USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_ICONV=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV+=	CONFIGURED_M4=m4 CONFIGURED_BISON=byacc LDFLAGS="${LDFLAGS}"
+CONFIGURE_ENV+=	CONFIGURED_M4=m4 CONFIGURED_BISON=byacc
 CONFIGURE_ARGS=	--program-suffix=${PORTVERSION:S/.//g} \
 		--with-libiconv-prefix=${LOCALBASE} \
 		--with-system-readline \
diff --git devel/geany/Makefile devel/geany/Makefile
index 3a1eae0..d3b3b48 100644
--- devel/geany/Makefile
+++ devel/geany/Makefile
@@ -18,8 +18,8 @@ INSTALLS_ICONS=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gtk20
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 OPTIONS=	VTE	"Enable Virtual Terminal Emulation support"	on \
 		NLS	"Enable Native Language support"		on
diff --git devel/gearmand/Makefile devel/gearmand/Makefile
index d11ad70..363194d 100644
--- devel/gearmand/Makefile
+++ devel/gearmand/Makefile
@@ -149,11 +149,11 @@ MAN8=		gearmand.8
 # This hack is required for the test programs invoked by configure,
 # in the event that libmemcached was compiled with SASL support.
 .if exists(${LOCALBASE}/lib/libsasl.so)
-CONFIGURE_ENV+=	LDFLAGS="-L${LOCALBASE}/lib -lsasl"
+LDFLAGS+=	-L${LOCALBASE}/lib -lsasl
 .elif exists(${LOCALBASE}/lib/libsasl2.a)
-CONFIGURE_ENV+=	LDFLAGS="-L${LOCALBASE}/lib -lsasl2"
+LDFLAGS+=	-L${LOCALBASE}/lib -lsasl2
 .else
-CONFIGURE_ENV+=	LDFLAGS="-L${LOCALBASE}/lib"
+LDFLAGS+=	-L${LOCALBASE}/lib
 .endif
 
 .ifdef(WITH_DRIZZLE)
diff --git devel/gettext/Makefile devel/gettext/Makefile
index 689c571..dc58f03 100644
--- devel/gettext/Makefile
+++ devel/gettext/Makefile
@@ -26,9 +26,9 @@ CONFIGURE_ENV=	ACLOCAL="${TRUE}" \
 		AUTOMAKE="${TRUE}" \
 		AUTOHEADER="${TRUE}" \
 		MAKEINFO="makeinfo --no-split" \
-		CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib" \
 		EMACS="no"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--disable-csharp --disable-threads --disable-openmp \
 		--with-included-gettext --with-included-glib \
 		--with-included-libcroco --with-included-libxml \
diff --git devel/giggle/Makefile devel/giggle/Makefile
index 216ade3..bdc7531 100644
--- devel/giggle/Makefile
+++ devel/giggle/Makefile
@@ -27,8 +27,8 @@ USE_GNOME=	glib20 gtk20 gtksourceview2 libglade2
 USE_GETTEXT=	yes
 USE_LDCONFIG=	yes
 INSTALLS_ICONS=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib -lintl"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib -lintl
 PLIST_SUB+=	GIGGLE_VER=${PORTVERSION}
 
 .include <bsd.port.options.mk>
diff --git devel/gindent/Makefile devel/gindent/Makefile
index c9e69af..e105852 100644
--- devel/gindent/Makefile
+++ devel/gindent/Makefile
@@ -18,8 +18,8 @@ MAINTAINER=	johans@FreeBSD.org
 COMMENT=	GNU indent
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -DBERKELEY_DEFAULTS=1" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include -DBERKELEY_DEFAULTS=1
+LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--program-prefix=g
 MAKE_JOBS_UNSAFE=	yes
 
diff --git devel/gio-fam-backend/Makefile devel/gio-fam-backend/Makefile
index 4be1789..c3a0cb7 100644
--- devel/gio-fam-backend/Makefile
+++ devel/gio-fam-backend/Makefile
@@ -32,9 +32,9 @@ USE_FAM=	yes
 USE_GMAKE=	yes
 MAKE_JOBS_SAFE=	yes
 CONFIGURE_ARGS=	--enable-static --with-libiconv=gnu
-CPPFLAGS=	-I${LOCALBASE}/include
-CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib -lintl" \
-		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
+CONFIGURE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		PTHREAD_LIBS="${PTHREAD_LIBS}"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib -lintl
 
 .include <bsd.port.mk>
diff --git devel/glade2/Makefile devel/glade2/Makefile
index dfd7f6c..3793f66 100644
--- devel/glade2/Makefile
+++ devel/glade2/Makefile
@@ -25,8 +25,8 @@ INSTALLS_OMF=	yes
 GNU_CONFIGURE=	yes
 USE_GNOME=	gnomeprefix intlhack gnomehack gtk20 desktopfileutils
 USE_GMAKE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 OPTIONS=	GNOME "Enable gnome support" on #\
 #		GNOMEDB "Enable libgnomedb support" off
diff --git devel/glade3/Makefile devel/glade3/Makefile
index da51a9f..607d03c 100644
--- devel/glade3/Makefile
+++ devel/glade3/Makefile
@@ -25,8 +25,8 @@ USE_GETTEXT=	yes
 INSTALLS_OMF=	yes
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
-		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 DOCSDIR=	${PREFIX}/share/doc/gladeui
 
diff --git devel/glib-java/Makefile devel/glib-java/Makefile
index 8ddd86d..467d90c 100644
--- devel/glib-java/Makefile
+++ devel/glib-java/Makefile
@@ -25,7 +25,7 @@ JAVA_VERSION=	1.5+
 JAVA_OS=	native
 USE_GNOME=	gnomehack glib20
 CONFIGURE_ARGS=	--without-gcj-compile --with-jardir=${JAVAJARDIR}
-CONFIGURE_ENV=	CPPFLAGS="-I${JAVA_HOME}/include -I${JAVA_HOME}/include/freebsd"
+CPPFLAGS+=	-I${JAVA_HOME}/include -I${JAVA_HOME}/include/freebsd
 GLIB_API_VERSION=	0.4
 PLIST_SUB=		GLIB_API_VERSION=${GLIB_API_VERSION} PORTNAME=${PORTNAME}
 PKGMESSAGE=		${WRKDIR}/pkg-message
diff --git devel/glib20/Makefile devel/glib20/Makefile
index 1b1e98c..658a568 100644
--- devel/glib20/Makefile
+++ devel/glib20/Makefile
@@ -47,10 +47,10 @@ CONFIGURE_ARGS=	--enable-static --with-libiconv=gnu \
 		--disable-dtrace \
 		--with-pcre=system \
 		--disable-fam
-CPPFLAGS=	-I${LOCALBASE}/include
-CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib -lintl" \
-		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
+CONFIGURE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		PTHREAD_LIBS="${PTHREAD_LIBS}"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib -lintl
 
 OPTIONS=	COLLATION_FIX "fix string collation" off
 
diff --git devel/glog/Makefile devel/glog/Makefile
index 53e3f97..efda154 100644
--- devel/glog/Makefile
+++ devel/glog/Makefile
@@ -21,7 +21,7 @@ USE_LDCONFIG=	yes
 USE_GCC=	4.2+
 PROJECTHOST=	google-glog
 
-CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib -lexecinfo"
+LDFLAGS+=	-L${LOCALBASE}/lib -lexecinfo
 
 .include <bsd.port.pre.mk>
 
diff --git devel/gnome-crash/Makefile devel/gnome-crash/Makefile
index 11a5ced..912df61 100644
--- devel/gnome-crash/Makefile
+++ devel/gnome-crash/Makefile
@@ -17,7 +17,7 @@ COMMENT=	A small coredump analysis tool for GNOME
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack libglade gnomeprint
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
 
 .include <bsd.port.mk>
diff --git devel/gnome-vfs-monikers/Makefile devel/gnome-vfs-monikers/Makefile
index bd25b6d..ca0a193 100644
--- devel/gnome-vfs-monikers/Makefile
+++ devel/gnome-vfs-monikers/Makefile
@@ -17,7 +17,7 @@ COMMENT=	Gnome-vfs monikers module
 USE_GNOME=	gnomevfs2 libbonobo
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 
 .include <bsd.port.mk>
diff --git devel/gnome-vfs/Makefile devel/gnome-vfs/Makefile
index 78dd001..540f254 100644
--- devel/gnome-vfs/Makefile
+++ devel/gnome-vfs/Makefile
@@ -34,7 +34,7 @@ CONFIGURE_ARGS=	--enable-openssl \
 		--disable-howl \
 		--with-hal-mount=/sbin/mount \
 		--with-hal-umount=/sbin/umount
-CONFIGURE_ENV=	CPPFLAGS="${PTHREAD_CFLAGS} -I${LOCALBASE}/include -DPTHREAD_LIB=\"${PTHREAD_LIBS}\""
+CPPFLAGS+=	${PTHREAD_CFLAGS} -I${LOCALBASE}/include -DPTHREAD_LIB="${PTHREAD_LIBS}"
 LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 
 PKGINSTALL=	${WRKDIR}/pkg-install
diff --git devel/gnome-vfs1/Makefile devel/gnome-vfs1/Makefile
index a9f619b..2c7e99f 100644
--- devel/gnome-vfs1/Makefile
+++ devel/gnome-vfs1/Makefile
@@ -24,9 +24,9 @@ USE_GNOME=	gnomehack gnomeprefix glib12 libxml gtk12 orbit gconf \
 USE_GETTEXT=	yes
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
-CONFIGURE_ENV=	CPPFLAGS="${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib" \
+CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib" \
 		BSD_PTHREAD_LIBS=${PTHREAD_LIBS}
+CPPFLAGS+=	${PTHREAD_CFLAGS} -I${LOCALBASE}/include
 
 LATEST_LINK=	gnome-vfs1
 
diff --git devel/gnustep-make/Makefile devel/gnustep-make/Makefile
index 9b357dd..27352b2 100644
--- devel/gnustep-make/Makefile
+++ devel/gnustep-make/Makefile
@@ -21,8 +21,7 @@ GNU_CONFIGURE=	yes
 
 MAKE_FLAGS=	OPTFLAG="${CFLAGS}"
 CFLAGS+=	${PTHREAD_CFLAGS}
-CONFIGURE_ENV+=	INSTALL_PROGRAM="${INSTALL} -c" INSTALL_DATA="${INSTALL} -c" \
-		CFLAGS="${CFLAGS}"
+CONFIGURE_ENV+=	INSTALL_PROGRAM="${INSTALL} -c" INSTALL_DATA="${INSTALL} -c"
 CONFIGURE_ARGS+=	--with-thread-lib="${PTHREAD_LIBS}"
 CONFIGURE_ARGS+=	--with-config-file=${GNUSTEP_PREFIX}/GNUstep.conf
 CONFIGURE_ARGS+=	--with-layout=gnustep
diff --git devel/gob2/Makefile devel/gob2/Makefile
index 7e8b8a1..8208212 100644
--- devel/gob2/Makefile
+++ devel/gob2/Makefile
@@ -17,8 +17,8 @@ COMMENT=	A preprocessor for making GObjects with inline C
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 USE_GNOME=	glib20
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 PLIST_FILES=	bin/gob2 share/aclocal/gob2.m4 ${EXAMPLES:S/^/%%EXAMPLESDIR%%\//}
 PLIST_DIRS=	%%EXAMPLESDIR%%
diff --git devel/gobject-introspection/Makefile devel/gobject-introspection/Makefile
index fab6815..fff14c2 100644
--- devel/gobject-introspection/Makefile
+++ devel/gobject-introspection/Makefile
@@ -28,8 +28,8 @@ USE_GETTEXT=	yes
 USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
 MAKE_JOBS_UNSAFE=yes
-CPPFLAGS=	-I${LOCALBASE}/include
-CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--disable-tests
 
 # Force it to put the .cache in ${WRKSRC} instead of ~/.cache. ports/143260
diff --git devel/goffice/Makefile devel/goffice/Makefile
index 35f4dc0..763931a 100644
--- devel/goffice/Makefile
+++ devel/goffice/Makefile
@@ -26,8 +26,8 @@ USE_GNOME=	gnomeprefix gnomehack intlhack gtk20 libgsf ltverhack
 USE_GETTEXT=	yes
 USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
-CPPFLAGS=	"-I${LOCALBASE}/include"
-CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 PLIST_SUB=	VERSION=${PORTVERSION} \
 		SHORT_VER=0.8
 
diff --git devel/goffice04/Makefile devel/goffice04/Makefile
index 968ffa7..118f403 100644
--- devel/goffice04/Makefile
+++ devel/goffice04/Makefile
@@ -26,8 +26,8 @@ USE_GNOME=	gnomeprefix gnomehack intlhack libgnomeprint libglade2 \
 USE_GETTEXT=	yes
 USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 PLIST_SUB=	VERSION=${PORTVERSION}
 
diff --git devel/goffice06/Makefile devel/goffice06/Makefile
index 1a753bb..38a5d52 100644
--- devel/goffice06/Makefile
+++ devel/goffice06/Makefile
@@ -26,8 +26,8 @@ USE_GNOME=	gnomeprefix gnomehack intlhack libgnomeprint libglade2 \
 USE_GETTEXT=	yes
 USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 PLIST_SUB=	VERSION=${PORTVERSION}
 
diff --git devel/goffice1/Makefile devel/goffice1/Makefile
index 03fd163..e8ec7fa 100644
--- devel/goffice1/Makefile
+++ devel/goffice1/Makefile
@@ -24,8 +24,8 @@ USE_GNOME=	gnomeprefix gnomehack intlhack libgnomeprint libglade2 \
 USE_GETTEXT=	yes
 USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 PLIST_SUB=	VERSION=${PORTVERSION}
 
diff --git devel/gpsim/Makefile devel/gpsim/Makefile
index 008c7c1..716b45d 100644
--- devel/gpsim/Makefile
+++ devel/gpsim/Makefile
@@ -21,7 +21,8 @@ RUN_DEPENDS=	gpasm:${PORTSDIR}/devel/gputils
 USE_AUTOTOOLS=	libtool
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .include <bsd.port.pre.mk>
 
diff --git devel/gtranslator/Makefile devel/gtranslator/Makefile
index 3ac9cc6..8324453 100644
--- devel/gtranslator/Makefile
+++ devel/gtranslator/Makefile
@@ -23,8 +23,8 @@ USE_GMAKE=	yes
 USE_GETTEXT=	yes
 INSTALLS_OMF=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib -lgnuregex"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib -lgnuregex
 CONFIGURE_ARGS=	--disable-debug \
 		--enable-compile-warnings=no
 
diff --git devel/guichan/Makefile devel/guichan/Makefile
index 38a6692..d3720d7 100644
--- devel/guichan/Makefile
+++ devel/guichan/Makefile
@@ -20,8 +20,8 @@ GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 USE_GNOME=	gnomehack
 
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 
 OPTIONS=	SDL	"Enable SDL support" On \
 		ALLEGRO	"Enable Allegro support" Off \
diff --git devel/guikachu/Makefile devel/guikachu/Makefile
index 7f881c0..9e111d5 100644
--- devel/guikachu/Makefile
+++ devel/guikachu/Makefile
@@ -21,8 +21,8 @@ LIB_DEPENDS=	gnomeuimm-2.6.1:${PORTSDIR}/x11-toolkits/libgnomeuimm26 \
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack intlhack libgnomeui
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 GCONF_SCHEMAS=	guikachu-form-editor.schemas guikachu-interface.schemas \
 		guikachu-mainwin.schemas
diff --git devel/gvfs/Makefile devel/gvfs/Makefile
index 6353d38..b05b9c2 100644
--- devel/gvfs/Makefile
+++ devel/gvfs/Makefile
@@ -26,8 +26,8 @@ USE_GMAKE=	yes
 USE_GETTEXT=	yes
 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=	--disable-obexftp
 OPTIONS=	FUSE "Enable fuse" off \
 		AVAHI "Enable AVAHI" on \
diff --git devel/idutils/Makefile devel/idutils/Makefile
index 44b4278..e001715 100644
--- devel/idutils/Makefile
+++ devel/idutils/Makefile
@@ -19,8 +19,8 @@ LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 USE_XZ=		yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 INFO=		idutils
 MAN1=		aid.1 defid.1 eid.1 fid.1 fnid.1 gid.1 lid.1 mkid.1 xtokid.1
diff --git devel/ixlib/Makefile devel/ixlib/Makefile
index 3613559..8d83042 100644
--- devel/ixlib/Makefile
+++ devel/ixlib/Makefile
@@ -19,8 +19,8 @@ USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	${CFLAGS} -I${LOCALBASE}/include
 MAKE_ENV+=	SED="sed"
 USE_LDCONFIG=	yes
 
diff --git devel/jna/files/patch-native_Makefile devel/jna/files/patch-native_Makefile
index 90d7f16..3a4d947 100644
--- devel/jna/files/patch-native_Makefile
+++ devel/jna/files/patch-native_Makefile
@@ -3,6 +3,15 @@ $FreeBSD$
 
 --- native/Makefile.orig
 +++ native/Makefile
+@@ -20,6 +20,8 @@
+ # protection simply by defining HAVE_PROTECTION.  This has been enabled
+ # only for those platforms on which it has been tested successfully.
+ 
++unexport LDFLAGS
++
+ OS=$(shell uname | sed -e 's/\(CYGWIN\|MINGW32\).*/win32/g' \
+                         -e 's/SunOS.*/solaris/g' \
+                         -e 's/FreeBSD.*/freebsd/g' \
 @@ -135,7 +135,7 @@
  ifeq ($(OS),freebsd)
  ARCH=$(shell uname -m | sed 's/i.86/i386/g')
diff --git devel/json-glib/Makefile devel/json-glib/Makefile
index afe6991..acc1af8 100644
--- devel/json-glib/Makefile
+++ devel/json-glib/Makefile
@@ -22,7 +22,7 @@ USE_XZ=		yes
 USE_GNOME=	glib20 gnomehack gnomeprefix ltverhack
 USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
-CPPFLAGS=	-I${LOCALBASE}/include
-CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .include <bsd.port.mk>
diff --git devel/jzmq/Makefile devel/jzmq/Makefile
index b018d82..60d89654 100644
--- devel/jzmq/Makefile
+++ devel/jzmq/Makefile
@@ -23,7 +23,8 @@ USE_JAVA=	1.4+
 USE_LDCONFIG=	yes
 
 CONFIGURE_ARGS=	--with-zeromq=${LOCALBASE}
-CONFIGURE_ENV=	JAVA_HOME=${JAVA_HOME} LDFLAGS=${PTHREAD_LIBS}
+CONFIGURE_ENV=	JAVA_HOME=${JAVA_HOME}
+LDFLAGS+=	${PTHREAD_LIBS}
 GNU_CONFIGURE=	yes
 
 PLIST_FILES=	%%JAVAJARDIR%%/zmq.jar	\
diff --git devel/kscope/Makefile devel/kscope/Makefile
index 48ffa91..7f0a96c 100644
--- devel/kscope/Makefile
+++ devel/kscope/Makefile
@@ -27,7 +27,8 @@ USE_AUTOTOOLS=	libtool
 USE_GMAKE=	yes
 
 MAKE_ENV=	EXTRA_LIBRARIES="-L${LOCALBASE}/lib"
-CONFIGURE_ENV=	CXXFLAGS="${PTHREAD_CFLAGS}" LDFLAGS="${PTHREAD_LIBS}"
+LDFLAGS+=	${PTHREAD_LIBS}
+CXXFLAGS+=	${PTHREAD_CFLAGS}
 CONFIGURE_ARGS+=--with-extra-includes=${LOCALBASE}/include \
 		--with-extra-libs=${LOCALBASE}/lib
 
diff --git devel/kyra/Makefile devel/kyra/Makefile
index 796c96e..e2197de 100644
--- devel/kyra/Makefile
+++ devel/kyra/Makefile
@@ -25,8 +25,8 @@ USE_AUTOTOOLS=	libtool
 USE_SDL=	image sdl
 USE_GNOME=	lthack
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 USE_LDCONFIG=	yes
 
 .include <bsd.port.mk>
diff --git devel/lfcxml/Makefile devel/lfcxml/Makefile
index 5717fd9..82fd63a 100644
--- devel/lfcxml/Makefile
+++ devel/lfcxml/Makefile
@@ -16,8 +16,8 @@ LIB_DEPENDS=	lfc.1:${PORTSDIR}/devel/lfc
 
 LICENSE=	GPLv2
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	autoconf:env
 
diff --git devel/libIDL/Makefile devel/libIDL/Makefile
index 9f99ed5..832c9f3 100644
--- devel/libIDL/Makefile
+++ devel/libIDL/Makefile
@@ -24,8 +24,8 @@ USE_GNOME=	gnomehack glib20
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-html-dir=${PREFIX}/share/doc
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 INFO=		libIDL2
 
diff --git devel/libassetml/Makefile devel/libassetml/Makefile
index ef40279..aa5c1f5 100644
--- devel/libassetml/Makefile
+++ devel/libassetml/Makefile
@@ -23,8 +23,8 @@ USE_GNOME=	gnomehack lthack gnomeprefix glib20 libxml2 pkgconfig
 USE_GETTEXT=	yes
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
-CONFIGURE_ENV=	CFLAGS=-I${LOCALBASE}/include \
-		LDFLAGS=-L${LOCALBASE}/lib
+LDFLAGS+=	-L${LOCALBASE}/lib
+CFLAGS+=	-I${LOCALBASE}/include
 
 INFO=	libassetml
 
diff --git devel/libast/Makefile devel/libast/Makefile
index 0f76d80..2c59f63 100644
--- devel/libast/Makefile
+++ devel/libast/Makefile
@@ -21,8 +21,8 @@ USE_AUTOTOOLS=	libtool
 USE_GNOME=	gnomehack
 USE_EFL=	imlib2
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 USE_LDCONFIG=	yes
 
 .include <bsd.port.pre.mk>
diff --git devel/libbinio/Makefile devel/libbinio/Makefile
index a36c28e..12954ab 100644
--- devel/libbinio/Makefile
+++ devel/libbinio/Makefile
@@ -22,10 +22,8 @@ MAKE_JOBS_SAFE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-CONFIGURE_ENV=	CFLAGS="${CFLAGS} ${CPPFLAGS}" \
-		CXXFLAGS="${CXXFLAGS} ${CPPFLAGS}" \
-		CPPFLAGS="${CPPFLAGS}" \
-		LDFLAGS="${LDFLAGS}"
+CFLAGS+=	${CPPFLAGS}
+CXXFLAGS+=	${CPPFLAGS}
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|^\(SUBDIRS\ =\).*|\1 src|; \
diff --git devel/libbonobo/Makefile devel/libbonobo/Makefile
index e89182d..21bb9cb 100644
--- devel/libbonobo/Makefile
+++ devel/libbonobo/Makefile
@@ -31,8 +31,8 @@ USE_PERL5=	yes
 USE_GNOME=	gnomehack intlhack libxml2 orbit2 referencehack
 CONFIGURE_ARGS=	--with-html-dir=${PREFIX}/share/doc \
 		--disable-gtk-doc
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 MAKE_ENV=	gnomelocaledir=${PREFIX}/share/locale
 
 MAN1=		bonobo-activation-server.1
diff --git devel/libccid/Makefile devel/libccid/Makefile
index b88f04c8..482a037 100644
--- devel/libccid/Makefile
+++ devel/libccid/Makefile
@@ -23,10 +23,10 @@ GNU_CONFIGURE=	yes
 USE_PERL5_BUILD=yes
 CONFIGURE_ARGS=	--enable-usbdropdir=${PREFIX}/lib/pcsc/drivers \
 		--enable-ccidtwindir=${PREFIX}/lib/pcsc/drivers/serial
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
-		LDFLAGS="${LDFLAGS} ${PTHREAD_LIBS}" \
-		LIBUSB_CFLAGS="-I${LOCALBASE}/include" \
+CONFIGURE_ENV=	LIBUSB_CFLAGS="-I${LOCALBASE}/include" \
 		LIBUSB_LIBS="-L${LOCALBASE}/lib -lusb"
+CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS+=	${PTHREAD_LIBS}
 
 PLIST_SUB=	VER=${PORTVERSION}
 
diff --git devel/libdlna/Makefile devel/libdlna/Makefile
index 110f97d..870dc44 100644
--- devel/libdlna/Makefile
+++ devel/libdlna/Makefile
@@ -28,7 +28,6 @@ MAKE_JOBS_UNSAFE=	yes
 CONFIGURE_ARGS+=	--prefix="${PREFIX}" --disable-optimize \
 			--includedir=${LOCALBASE}/include \
 			--libdir=${LOCALBASE}/lib
-CONFIGURE_ENV+=		LDFLAGS="${LDFLAGS}" CFLAGS="${CFLAGS}"
 
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
diff --git devel/libdwarf/Makefile devel/libdwarf/Makefile
index ef10f39..b426d20 100644
--- devel/libdwarf/Makefile
+++ devel/libdwarf/Makefile
@@ -25,8 +25,8 @@ BUILD_DEPENDS+=	${LOCALBASE}/lib/libelf.so.0:${PORTSDIR}/devel/libelf
 WRKSRC=		${WRKDIR}/dwarf-${PORTVERSION}/libdwarf
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV+=	CFLAGS="${CFLAGS} -I. -I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+LDFLAGS+=	-L${LOCALBASE}/lib
+CFLAGS+=	-I. -I${LOCALBASE}/include
 
 USE_DOS2UNIX=	*.h
 
diff --git devel/libelf/Makefile devel/libelf/Makefile
index aa96ae1..bd33b4d 100644
--- devel/libelf/Makefile
+++ devel/libelf/Makefile
@@ -29,8 +29,8 @@ USE_LDCONFIG=	yes
 NOMAN=		defined
 
 .if !defined(WITHOUT_NLS)
-CPPFLAGS=	"-I${LOCALBASE}/include"
-CONFIGURE_ENV+=	LDFLAGS="-L${LOCALBASE}/lib -lintl"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib -lintl
 CONFIGURE_ARGS+=	--enable-nls
 USE_GETTEXT=	yes
 PLIST_SUB+=	GETTEXT=""
diff --git devel/libftdi/Makefile devel/libftdi/Makefile
index 206d735..34e18f2 100644
--- devel/libftdi/Makefile
+++ devel/libftdi/Makefile
@@ -17,7 +17,7 @@ OPTIONS=	BOOST	"Build with boost"	off
 
 USE_AUTOTOOLS=		autoconf libtool automake
 GNU_CONFIGURE=		yes
-CONFIGURE_ENV=		CFLAGS="${CFLAGS} -I${LOCALBASE}/include"
+CFLAGS+=		-I${LOCALBASE}/include
 USE_LDCONFIG=		yes
 USE_GNOME=		pkgconfig gnomehack
 
diff --git devel/libgalago/Makefile devel/libgalago/Makefile
index a85678f..b056f7c 100644
--- devel/libgalago/Makefile
+++ devel/libgalago/Makefile
@@ -24,7 +24,8 @@ USE_GETTEXT=	yes
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-tests
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 post-configure:
 	@${ECHO_CMD} "#define HAVE_STRCHR 1" >> ${WRKSRC}/config.h
diff --git devel/libgconf-java/Makefile devel/libgconf-java/Makefile
index 0f5804b..e923766 100644
--- devel/libgconf-java/Makefile
+++ devel/libgconf-java/Makefile
@@ -28,7 +28,7 @@ JAVA_VERSION=	1.5+
 JAVA_OS=	native
 USE_GNOME=	gnomehack gconf2
 CONFIGURE_ARGS=	--without-gcj-compile --with-jardir=${JAVAJARDIR}
-CONFIGURE_ENV=	CPPFLAGS="-I${JAVA_HOME}/include -I${JAVA_HOME}/include/freebsd"
+CPPFLAGS+=	-I${JAVA_HOME}/include -I${JAVA_HOME}/include/freebsd
 
 GCONF_API_VERSION=	2.12
 GTK_API_VERSION=	2.10
diff --git devel/libgdata/Makefile devel/libgdata/Makefile
index f5dae65..69e93d6 100644
--- devel/libgdata/Makefile
+++ devel/libgdata/Makefile
@@ -24,8 +24,8 @@ USE_GMAKE=	yes
 MAKE_JOBS_SAFE=	yes
 USE_AUTOTOOLS=	libtool
 USE_GNOME=	gnomehack intltool ltverhack glib20
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include " \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include 
+LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS+=--with-html-dir="${PREFIX}/share/doc"
 
 .include <bsd.port.mk>
diff --git devel/libgiigic/Makefile devel/libgiigic/Makefile
index bf0ecea..4496cf1 100644
--- devel/libgiigic/Makefile
+++ devel/libgiigic/Makefile
@@ -24,7 +24,8 @@ USE_BZIP2=	yes
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 
-CONFIGURE_ENV=	CPPFLAGS="${PTHREAD_CFLAGS}" LDFLAGS="${PTHREAD_LIBS}"
+CPPFLAGS+=	${PTHREAD_CFLAGS}
+LDFLAGS+=	${PTHREAD_LIBS}
 
 MAN3=		gicActionLazyAction.3 \
 		gicActionWrite.3 \
diff --git devel/libglade-java/Makefile devel/libglade-java/Makefile
index 7fd9746..e31fdf4 100644
--- devel/libglade-java/Makefile
+++ devel/libglade-java/Makefile
@@ -30,7 +30,7 @@ JAVA_VERSION=	1.5+
 JAVA_OS=	native
 USE_GNOME=	gnomehack libglade2
 CONFIGURE_ARGS=	--without-gcj-compile --with-jardir=${JAVAJARDIR}
-CONFIGURE_ENV=	CPPFLAGS="-I${JAVA_HOME}/include -I${JAVA_HOME}/include/freebsd"
+CPPFLAGS+=	-I${JAVA_HOME}/include -I${JAVA_HOME}/include/freebsd
 
 GLADE_API_VERSION=	2.12
 GTK_API_VERSION=	2.10
diff --git devel/libglade/Makefile devel/libglade/Makefile
index e523e72..ea3f6f5 100644
--- devel/libglade/Makefile
+++ devel/libglade/Makefile
@@ -21,7 +21,7 @@ USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-bonobo --enable-gnomedb
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
 
 .include <bsd.port.mk>
diff --git devel/libglade2/Makefile devel/libglade2/Makefile
index 735874e..63a66c6 100644
--- devel/libglade2/Makefile
+++ devel/libglade2/Makefile
@@ -31,8 +31,8 @@ USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--with-html-dir=${PREFIX}/share/doc \
 		--disable-gtk-doc \
 		--with-xml-catalog=${LOCALBASE}/share/xml/catalog.ports
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 PLIST_SUB=	XMLCATALOG="${LOCALBASE}/bin/xmlcatalog" \
 		CATALOG_PORTS_XML="${LOCALBASE}/share/xml/catalog.ports"
diff --git devel/libgsf-gnome/Makefile devel/libgsf-gnome/Makefile
index bef568f..33dec36 100644
--- devel/libgsf-gnome/Makefile
+++ devel/libgsf-gnome/Makefile
@@ -22,8 +22,8 @@ PLIST=		${.CURDIR}/pkg-plist
 USE_GNOME=	gnomehack libgsf gnomevfs2 libbonobo ltverhack intlhack
 CONFIGURE_ARGS=	--with-html-dir=${PREFIX}/share/doc/gsf \
 		--with-bz2 --with-gnome-vfs --with-gio
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib -lgsf-1"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib -lgsf-1
 
 GSF_SLAVE=	yes
 
diff --git devel/libgsf/Makefile devel/libgsf/Makefile
index edb46cb..9bef796 100644
--- devel/libgsf/Makefile
+++ devel/libgsf/Makefile
@@ -28,8 +28,8 @@ USE_GNOME?=	gnomehack gnomeprefix glib20 libxml2 ltverhack intlhack
 USE_AUTOTOOLS=	libtool
 CONFIGURE_ARGS?=--without-gnome-vfs --without-python --with-gio \
 		--without-bonobo
-CONFIGURE_ENV?=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .if !defined(GSF_SLAVE)
 MAN1=		gsf.1 gsf-office-thumbnailer.1 gsf-vba-dump.1
diff --git devel/libgtop/Makefile devel/libgtop/Makefile
index e409d3a..d03b221 100644
--- devel/libgtop/Makefile
+++ devel/libgtop/Makefile
@@ -28,8 +28,8 @@ USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool
 CONFIGURE_ARGS=	--disable-gtk-doc \
 		--with-html-dir=${PREFIX}/share/doc
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -DHAVE_NET_IF_VAR_H" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include -DHAVE_NET_IF_VAR_H
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 INFO=		libgtop2
 
diff --git devel/libgutenfetch/Makefile devel/libgutenfetch/Makefile
index 987acc7..93d7251 100644
--- devel/libgutenfetch/Makefile
+++ devel/libgutenfetch/Makefile
@@ -18,8 +18,8 @@ LIB_DEPENDS=	curl:${PORTSDIR}/ftp/curl:install
 
 USE_AUTOTOOLS=	libtool
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
 USE_GMAKE=	yes
 USE_BZIP2=	yes
 
diff --git devel/libical/Makefile devel/libical/Makefile
index 47c5db3..a83df97 100644
--- devel/libical/Makefile
+++ devel/libical/Makefile
@@ -19,7 +19,7 @@ GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_PERL5_BUILD=yes
 USE_LDCONFIG=	yes
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include"
+CPPFLAGS+=	-I${LOCALBASE}/include
 
 .if !defined(WITHOUT_PYTHON)
 CONFIGURE_ARGS=	--enable-python=yes
@@ -30,7 +30,7 @@ CONFIGURE_ARGS=	--enable-python=no
 
 .include <bsd.port.pre.mk>
 .if ${ARCH} == "amd64" || ${ARCH} == "ia64"
-CONFIGURE_ENV+=	CFLAGS="${CFLAGS} -fPIC"
+CFLAGS+=	-fPIC
 .endif
 
 .include <bsd.port.post.mk>
diff --git devel/libleaftag/Makefile devel/libleaftag/Makefile
index 82c0ca2..5022ce0 100644
--- devel/libleaftag/Makefile
+++ devel/libleaftag/Makefile
@@ -20,7 +20,7 @@ GNU_CONFIGURE=	yes
 USE_GNOME=	gnomehack glib20 pkgconfig
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--with-html-dir=${PREFIX}/share/doc
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .include <bsd.port.mk>
diff --git devel/libmaa/Makefile devel/libmaa/Makefile
index 0643fd1..e6df2e6 100644
--- devel/libmaa/Makefile
+++ devel/libmaa/Makefile
@@ -17,7 +17,7 @@ COMMENT=	Provides a few data structures and helpful functions
 ALL_TARGET=	lib
 CONFIGURE_ARGS=	--without-local-zlib --with-cflags="${CFLAGS}" \
 		--with-etcdir=${PREFIX}/etc
-CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib"
+LDFLAGS+=	-L${LOCALBASE}/lib
 CPPFLAGS+=	-I${LOCALBASE}/include
 GNU_CONFIGURE=	yes
 USE_AUTOTOOLS=	libtool
diff --git devel/libmba/Makefile devel/libmba/Makefile
index 343cdde..b568b50 100644
--- devel/libmba/Makefile
+++ devel/libmba/Makefile
@@ -21,8 +21,8 @@ LIB_DEPENDS=	expat.6:${PORTSDIR}/textproc/expat2
 USE_GMAKE=	yes
 MAKE_ENV=	prefix="${PREFIX}" \
 		MINVERSION="${SHLIB_MAJOR}" \
-		RPM_OPT_FLAGS="${CFLAGS} -I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+		RPM_OPT_FLAGS="${CFLAGS} -I${LOCALBASE}/include"
+LDFLAGS+=	-L${LOCALBASE}/lib
 MAKE_JOBS_UNSAFE=	yes
 PLIST_SUB=	SHLIB_MAJOR="${SHLIB_MAJOR}"
 USE_LDCONFIG=	yes
diff --git devel/libnfc/Makefile devel/libnfc/Makefile
index a0e0b3c..c9d456a 100644
--- devel/libnfc/Makefile
+++ devel/libnfc/Makefile
@@ -83,8 +83,8 @@ RUN_DEPENDS+=	${LOCALBASE}/lib/pcsc/drivers/ifd-ccid.bundle/Contents/FreeBSD/lib
 .if defined(WITH_PN531USB) || defined(WITH_PN533USB)
 .if ${OSVERSION} < 800069
 LIB_DEPENDS+=	usb-0.1:${PORTSDIR}/devel/libusb
-CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
-		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 .endif
 .endif
 
diff --git devel/libnotify/Makefile devel/libnotify/Makefile
index 57f5632..2451455 100644
--- devel/libnotify/Makefile
+++ devel/libnotify/Makefile
@@ -26,7 +26,7 @@ USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool
-CPPFLAGS=	-I${LOCALBASE}/include
-CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .include <bsd.port.mk>
diff --git devel/libnotifymm/Makefile devel/libnotifymm/Makefile
index d3c2a9a..ebf4574 100644
--- devel/libnotifymm/Makefile
+++ devel/libnotifymm/Makefile
@@ -26,7 +26,7 @@ EXPIRATION_DATE=2011-09-23
 USE_BZIP2=	yes
 USE_AUTOTOOLS=	libtool
 USE_GNOME=	pkgconfig gnomehack gnomeprefix ltverhack
-CONFIGURE_ENV=	CPPFLAGS="-I${WRKSRC}/libnotify `pkg-config --cflags glibmm-2.4 libnotify gtkmm-2.4`"
+CPPFLAGS+=	-I${WRKSRC}/libnotify `pkg-config --cflags glibmm-2.4 libnotify gtkmm-2.4`
 USE_LDCONFIG=	yes
 
 .include <bsd.port.mk>
diff --git devel/liboobs/Makefile devel/liboobs/Makefile
index acd86dd..f7c4a99 100644
--- devel/liboobs/Makefile
+++ devel/liboobs/Makefile
@@ -26,7 +26,7 @@ GNU_CONFIGURE=	yes
 USE_GNOME=	gnomehack glib20
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--with-html-dir=${PREFIX}/share/doc --with-hal
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include"
+CPPFLAGS+=	-I${LOCALBASE}/include
 
 .include <bsd.port.pre.mk>
 
diff --git devel/liboop/Makefile devel/liboop/Makefile
index 75a5947..5f1921d 100644
--- devel/liboop/Makefile
+++ devel/liboop/Makefile
@@ -24,13 +24,12 @@ USE_AUTOTOOLS=	libtool
 USE_BZIP2=	yes
 USE_GNOME=	glib12 glib20 gnomehack
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--with-libwww
 USE_LDCONFIG=	yes
 MAKE_JOBS_UNSAFE=	yes
 
-CPPFLAGS=	-I${LOCALBASE}/include/tcl8.4 -I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include/tcl8.4 -I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|8\.4|84|g' ${WRKSRC}/configure
diff --git devel/libopensync022/Makefile devel/libopensync022/Makefile
index 3a66e9a..214f357 100644
--- devel/libopensync022/Makefile
+++ devel/libopensync022/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS=	sqlite3.8:${PORTSDIR}/databases/sqlite3
 RUN_DEPENDS=	swig1.3:${PORTSDIR}/devel/swig13
 
 USE_BZIP2=	yes
-CONFIGURE_ENV=	LDFLAGS="${PTHREAD_LIBS}"
+LDFLAGS+=	${PTHREAD_LIBS}
 GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
 USE_PYTHON=	yes
diff --git devel/libopkele/Makefile devel/libopkele/Makefile
index 68d15c5..e4d7ea0 100644
--- devel/libopkele/Makefile
+++ devel/libopkele/Makefile
@@ -26,11 +26,10 @@ USE_LDCONFIG=	yes
 USE_GNOME=	pkgconfig
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	"OPENSSL_CFLAGS=${CFLAGS} -l${OPENSSLINC}" \
-		OPENSSL_LIBS=-L${OPENSSLLIB} \
-		CPPFLAGS=-I${LOCALBASE}/include
-
+		OPENSSL_LIBS=-L${OPENSSLLIB}
+CPPFLAGS+=	-I${LOCALBASE}/include
 CFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS=	"-L${LOCALBASE}/lib"
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .include <bsd.port.pre.mk>
 
diff --git devel/libpafe/Makefile devel/libpafe/Makefile
index e2321e8..3601f8b 100644
--- devel/libpafe/Makefile
+++ devel/libpafe/Makefile
@@ -27,8 +27,8 @@ PLIST_DIRS=	include/libpafe
 
 .if ${OSVERSION} < 800069
 LIB_DEPENDS+=	usb-0.1:${PORTSDIR}/devel/libusb
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS} -I${PREFIX}/include" \
-		LDFLAGS="${LDFLAGS} -L${PREFIX}/lib"
+CPPFLAGS+=	-I${PREFIX}/include
+LDFLAGS+=	-L${PREFIX}/lib
 .endif
 
 .include <bsd.port.post.mk>
diff --git devel/libphish/Makefile devel/libphish/Makefile
index 94d60f3..9fe23bb 100644
--- devel/libphish/Makefile
+++ devel/libphish/Makefile
@@ -20,10 +20,9 @@ USE_AUTOTOOLS=	libtool
 USE_BZIP2=	yes
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 
-CPPFLAGS=	-I${LOCALBASE}/include -DFreeBSD
-LDFLAGS=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include -DFreeBSD
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 post-install:
 .if !defined(NOPORTDOCS)
diff --git devel/libpthread-stubs/Makefile devel/libpthread-stubs/Makefile
index 540d113..0913a91 100644
--- devel/libpthread-stubs/Makefile
+++ devel/libpthread-stubs/Makefile
@@ -24,7 +24,7 @@ GNU_CONFIGURE=	yes
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} < 700000
-CONFIGURE_ENV+=	LDFLAGS=-lpthread
+LDFLAGS+=	-lpthread
 .endif
 
 .include <bsd.port.post.mk>
diff --git devel/librcc/Makefile devel/librcc/Makefile
index 39cfadb..381c8e1 100644
--- devel/librcc/Makefile
+++ devel/librcc/Makefile
@@ -30,11 +30,10 @@ USE_ICONV=	yes
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	autoheader
 
-CPPFLAGS=	-I${LOCALBASE}/include
+CPPFLAGS+=	-I${LOCALBASE}/include
 LIBS=		-L${LOCALBASE}/lib
 
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" \
-		LIBS="${LIBS}" \
+CONFIGURE_ENV=	LIBS="${LIBS}" \
 		PTHREAD_LIBS="${PTHREAD_LIBS}"
 
 OPTIONS=	BDB "Translation database support" off \
diff --git devel/libsigcx/Makefile devel/libsigcx/Makefile
index 8e43961..7bdcc02 100644
--- devel/libsigcx/Makefile
+++ devel/libsigcx/Makefile
@@ -21,8 +21,9 @@ LIB_DEPENDS=	sigc-1.2.5:${PORTSDIR}/devel/libsigc++12
 USE_GNOME=	gnomehack gtk20
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
-CONFIGURE_ENV=	CPPFLAGS="${PTHREAD_CFLAGS}" LDFLAGS="${PTHREAD_LIBS}" \
-		ac_cv_path_DOXYGEN=""
+CONFIGURE_ENV=	ac_cv_path_DOXYGEN=""
+CPPFLAGS+=	${PTHREAD_CFLAGS}
+LDFLAGS+=	${PTHREAD_LIBS}
 USE_LDCONFIG=	yes
 
 .include <bsd.port.mk>
diff --git devel/libsoup/Makefile devel/libsoup/Makefile
index ed0ff90..ed37b0d 100644
--- devel/libsoup/Makefile
+++ devel/libsoup/Makefile
@@ -30,8 +30,8 @@ USE_AUTOTOOLS=	libtool
 USE_GMAKE=	yes
 CONFIGURE_ARGS=	--with-html-dir=${PREFIX}/share/doc \
 		--disable-gtk-doc
-CPPFLAGS=	-I${LOCALBASE}/include
-CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 PLIST_SUB=	VERSION="2.4"
 
diff --git devel/libsoup22/Makefile devel/libsoup22/Makefile
index e2dde7b..83dbe9b 100644
--- devel/libsoup22/Makefile
+++ devel/libsoup22/Makefile
@@ -27,8 +27,8 @@ USE_AUTOTOOLS=	libtool
 USE_GMAKE=	yes
 CONFIGURE_ARGS=	--with-html-dir=${PREFIX}/share/doc \
 		--disable-gtk-doc
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 PLIST_SUB=	VERSION="2.2"
 
diff --git devel/libtar/Makefile devel/libtar/Makefile
index 3a11110..daf1d15 100644
--- devel/libtar/Makefile
+++ devel/libtar/Makefile
@@ -17,7 +17,6 @@ COMMENT=	A library for manipulating POSIX and GNU tar files
 USE_GMAKE=		yes
 GNU_CONFIGURE=		yes
 USE_LDCONFIG=	yes
-CONFIGURE_ENV=		CPPFLAGS="${CPPFLAGS}"
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/lib/libtar.so.0 ${PREFIX}/lib
diff --git devel/libtifiles2/Makefile devel/libtifiles2/Makefile
index 1c56564..c241900 100644
--- devel/libtifiles2/Makefile
+++ devel/libtifiles2/Makefile
@@ -31,6 +31,5 @@ PLIST_SUB=	NLS="@comment "
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
-CONFIGURE_ENV=	LDFLAGS="${LDFLAGS}"
 
 .include <bsd.port.mk>
diff --git devel/libunicode/Makefile devel/libunicode/Makefile
index 4caa9f3..8823100 100644
--- devel/libunicode/Makefile
+++ devel/libunicode/Makefile
@@ -23,8 +23,8 @@ GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share \
 		--datadir=${PREFIX}/share
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 .include <bsd.port.mk>
diff --git devel/libuninum/Makefile devel/libuninum/Makefile
index 9fad8cf..a74c591 100644
--- devel/libuninum/Makefile
+++ devel/libuninum/Makefile
@@ -17,7 +17,6 @@ COMMENT=	Library for converting Unicode strings to numbers
 LIB_DEPENDS=	gmp.10:${PORTSDIR}/math/gmp
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS}"
 MAKE_ENV+=	INCLUDES="-I${LOCALBASE}/include"
 LDFLAGS+=	-L${LOCALBASE}/lib
 USE_LDCONFIG=	yes
diff --git devel/libvanessa_adt/Makefile devel/libvanessa_adt/Makefile
index 1a35096..bf46787 100644
--- devel/libvanessa_adt/Makefile
+++ devel/libvanessa_adt/Makefile
@@ -21,8 +21,8 @@ USE_LDCONFIG=	YES
 
 USE_AUTOTOOLS=	libtool
 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} "s,^SUBDIRS = libvanessa_adt test debian,SUBDIRS = libvanessa_adt," \
diff --git devel/libvanessa_socket/Makefile devel/libvanessa_socket/Makefile
index 3f35612..89bd42c 100644
--- devel/libvanessa_socket/Makefile
+++ devel/libvanessa_socket/Makefile
@@ -24,7 +24,7 @@ MAN1=		vanessa_socket_pipe.1
 USE_AUTOTOOLS=	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
 
 .include <bsd.port.mk>
diff --git devel/libzrtpcpp/Makefile devel/libzrtpcpp/Makefile
index 6b30155..220f148 100644
--- devel/libzrtpcpp/Makefile
+++ devel/libzrtpcpp/Makefile
@@ -24,7 +24,6 @@ USE_OPENSSL=	yes
 
 CPPFLAGS+=	-I${LOCALBASE}/include -I${OPENSSLINC}
 LDFLAGS+=	-L${LOCALBASE}/lib -L${OPENSSLLIB}
-CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 USE_LDCONFIG=	yes
 
 post-patch:
diff --git devel/libzvbi/Makefile devel/libzvbi/Makefile
index 7854d36..24d58c3 100644
--- devel/libzvbi/Makefile
+++ devel/libzvbi/Makefile
@@ -25,7 +25,8 @@ GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 MAN1=		zvbi-ntsc-cc.1
 
-CONFIGURE_ENV= CFLAGS="${CFLAGS} -I${LOCALBASE}/include" LIBS="-L${LOCALBASE}/lib -L/usr/lib"
+CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib -L/usr/lib"
+CFLAGS+=	-I${LOCALBASE}/include
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure
diff --git devel/log4cplus/Makefile devel/log4cplus/Makefile
index f0526f3..f94c018 100644
--- devel/log4cplus/Makefile
+++ devel/log4cplus/Makefile
@@ -17,8 +17,8 @@ COMMENT=	A logging library for C++
 USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV+=	CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}" \
-		LDFLAGS="${LDFLAGS} ${PTHREAD_LIBS}"
+LDFLAGS+=	${PTHREAD_LIBS}
+CFLAGS+=	${PTHREAD_CFLAGS}
 MAKE_JOBS_UNSAFE=	yes
 
 .if !defined(NOPORTDOCS)
diff --git devel/log4cpp/Makefile devel/log4cpp/Makefile
index 9e6037a..2cf0a2c 100644
--- devel/log4cpp/Makefile
+++ devel/log4cpp/Makefile
@@ -17,7 +17,8 @@ COMMENT=	A library of C++ classes for flexible logging
 USE_AUTOTOOLS=	libtool
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${PTHREAD_CFLAGS}" LDFLAGS="${PTHREAD_LIBS}"
+CPPFLAGS+=	${PTHREAD_CFLAGS}
+LDFLAGS+=	${PTHREAD_LIBS}
 CONFIGURE_ARGS=	--with-pthreads --disable-html-docs
 USE_LDCONFIG=	yes
 
diff --git devel/log4shib/Makefile devel/log4shib/Makefile
index 2e0c008..e601d5f 100644
--- devel/log4shib/Makefile
+++ devel/log4shib/Makefile
@@ -18,7 +18,8 @@ USE_AUTOTOOLS=	libtool
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 USE_GNOME=	pkgconfig gnomehack
-CONFIGURE_ENV=	CPPFLAGS="${PTHREAD_CFLAGS}" LDFLAGS="${PTHREAD_LIBS}"
+CPPFLAGS+=	${PTHREAD_CFLAGS}
+LDFLAGS+=	${PTHREAD_LIBS}
 CONFIGURE_ARGS=	--with-pthreads --disable-html-docs --disable-doxygen
 USE_LDCONFIG=	yes
 
diff --git devel/love/Makefile devel/love/Makefile
index fcbc4ed..25552e3 100644
--- devel/love/Makefile
+++ devel/love/Makefile
@@ -25,9 +25,9 @@ USE_SDL=	sdl mixer
 USE_GL=		gl glu
 USE_LUA=	5.1+
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/freetype2 \
-		-I${LUA_INCDIR} `${SDL_CONFIG} --cflags`" \
-		LDFLAGS="-L${LOCALBASE}/lib -L${LUA_LIBDIR}"
+CPPFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include/freetype2 \
+		-I${LUA_INCDIR} `${SDL_CONFIG} --cflags`
+LDFLAGS+=	-L${LOCALBASE}/lib -L${LUA_LIBDIR}
 CONFIGURE_ARGS=	--bindir=${PREFIX}/bin --libdir=${PREFIX}/lib
 
 PLIST_FILES=	bin/love
diff --git devel/luabind/Makefile devel/luabind/Makefile
index a60c1f8..28a6fca 100644
--- devel/luabind/Makefile
+++ devel/luabind/Makefile
@@ -18,8 +18,8 @@ LIB_DEPENDS=	boost_python.4:${PORTSDIR}/devel/boost-python-libs
 USE_LUA=	5.1+
 USE_LDCONFIG=	yes
 
-CPPFLAGS=	-I.. -I${LUA_INCDIR} -I${LOCALBASE}/include
-LDFLAGS=	-L${LUA_LIBDIR}
+CPPFLAGS+=	-I.. -I${LUA_INCDIR} -I${LOCALBASE}/include
+LDFLAGS+=	-L${LUA_LIBDIR}
 CXXFLAGS+=	-fPIC
 
 PORTDOCS=	*
diff --git devel/mico/Makefile devel/mico/Makefile
index f4a54f0..459b750 100644
--- devel/mico/Makefile
+++ devel/mico/Makefile
@@ -58,7 +58,7 @@ CONFIGURE_ARGS+=	--disable-coss
 MICO_SERVICE=		"@comment "
 .endif
 
-CONFIGURE_ENV+=		CXXFLAGS="${CPPFLAGS} -Wno-unused"
+CXXFLAGS+=		${CPPFLAGS} -Wno-unused
 
 .if defined(WITH_X11)
 USE_XORG=		x11
@@ -84,7 +84,6 @@ MICO_GTK=		"@comment "
 LIB_DEPENDS=		tcl83:${PORTSDIR}/lang/tcl83
 CONFIGURE_ARGS+=	--with-tcl
 CPPFLAGS+=		-I${LOCALBASE}/include/tcl8.3
-CONFIGURE_ENV+=		CPPFLAGS=${CPPFLAGS}
 .else
 MICO_TCL=		"@comment "
 .endif
diff --git devel/monotone/Makefile devel/monotone/Makefile
index 07ececf..6a053e5 100644
--- devel/monotone/Makefile
+++ devel/monotone/Makefile
@@ -30,9 +30,9 @@ USE_GMAKE=	yes
 USE_LUA=	5.1+
 
 GNU_CONFIGURE=	yes
-CPPFLAGS=	-I${LOCALBASE}/include
-CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib" \
-		MAKEINFO="makeinfo --no-split"
+CONFIGURE_ENV=	MAKEINFO="makeinfo --no-split"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 PLIST_FILES=	bin/mtn bin/mtn-cleanup bin/mtnopt \
 		share/monotone/hooks/authorize_remote_automate.lua \
diff --git devel/newt/Makefile devel/newt/Makefile
index 99122c7..7a56bbe 100644
--- devel/newt/Makefile
+++ devel/newt/Makefile
@@ -54,7 +54,7 @@ USE_TCL=	84+
 TCLSUFFIX=	-${TCL_NODOT}
 MAKE_ENV+=	WITH_TCL=yes TCL_LIBDIR=${TCL_LIBDIR:Q}
 PLIST_SUB+=	TCLOPT="" TCL_VER=${TCL_VER}${_TCL_THREADS_SUFFIX}
-CONFIGURE_ENV+=	CPPFLAGS=-I${TCL_INCLUDEDIR:Q}
+CPPFLAGS+=	-I${TCL_INCLUDEDIR:Q}
 SUB_FILES+=	pkgIndex.tcl
 
 pre-su-install:
diff --git devel/oaf/Makefile devel/oaf/Makefile
index 48aaba8..b3c9aac 100644
--- devel/oaf/Makefile
+++ devel/oaf/Makefile
@@ -29,8 +29,8 @@ GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS= --enable-static --enable-shared \
 		--disable-more-warnings
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib -lintl"
+CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib -lintl"
+CPPFLAGS+=	-I${LOCALBASE}/include
 
 MAN1=	oafd.1
 
diff --git devel/obby/Makefile devel/obby/Makefile
index 980c698..59461cb 100644
--- devel/obby/Makefile
+++ devel/obby/Makefile
@@ -24,7 +24,8 @@ CONFIGURE_ARGS=	--without-howl
 USE_LDCONFIG=	yes
 
 .if !defined(WITHOUT_NLS)
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 USE_GETTEXT=	yes
 PLIST_SUB+=	NLS=""
 .else
diff --git devel/ocaml-sdl/Makefile devel/ocaml-sdl/Makefile
index f53bc0c..d57be32 100644
--- devel/ocaml-sdl/Makefile
+++ devel/ocaml-sdl/Makefile
@@ -25,8 +25,8 @@ USE_OCAML_FINDLIB=yes
 USE_OCAML_LDCONFIG=yes
 USE_SDL=	sdl ttf image mixer
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+LDFLAGS+=	-L${LOCALBASE}/lib
+CFLAGS+=	-I${LOCALBASE}/include
 CONFIGURE_ARGS=	--with-findlib
 
 DOCSDIR=	${PREFIX}/share/doc/ocaml/${PORTNAME}
diff --git devel/ois/Makefile devel/ois/Makefile
index 06d592d..f4e9d89 100644
--- devel/ois/Makefile
+++ devel/ois/Makefile
@@ -23,7 +23,8 @@ USE_XORG=	x11 xaw
 USE_LDCONFIG=	yes
 MAKE_JOBS_SAFE=	yes
 
-CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib" CPPFLAGS="-I${LOCALBASE}/include"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
diff --git devel/omniNotify/Makefile devel/omniNotify/Makefile
index 9ede9ef..8ccddd7 100644
--- devel/omniNotify/Makefile
+++ devel/omniNotify/Makefile
@@ -33,8 +33,7 @@ MAKEFILE=	GNUmakefile
 USE_LDCONFIG=	yes
 
 CONFIGURE_SCRIPT=	../configure
-CONFIGURE_ENV+=	CC=${CC} CFLAGS="${CFLAGS}" CXX=${CXX} CXXFLAGS="${CXXFLAGS}" \
-		CPP=${CPP} PYTHON=${PYTHON_CMD}
+CONFIGURE_ENV+=	PYTHON=${PYTHON_CMD}
 CONFIGURE_ARGS=	--with-omniorb=${LOCALBASE}
 
 .include <bsd.port.pre.mk>
diff --git devel/omniORB/Makefile devel/omniORB/Makefile
index 17b2e42..bce9907 100644
--- devel/omniORB/Makefile
+++ devel/omniORB/Makefile
@@ -20,8 +20,7 @@ USE_OPENSSL=	yes
 USE_GNOME=	pkgconfig
 USE_LDCONFIG=	yes
 MAKEFILE=	GNUmakefile
-CONFIGURE_ENV+=	CC=${CC} CFLAGS="${CFLAGS}" CXX=${CXX} CPP=${CPP} \
-		PYTHON=${PYTHON_CMD}
+CONFIGURE_ENV+=	PYTHON=${PYTHON_CMD}
 CONFIGURE_ARGS=	--datadir=${DATADIR} --with-openssl=${OPENSSLBASE} \
 		--with-omniORB-config=${PREFIX}/etc/omniORB.cfg \
 		--with-omniNames-logdir=/var/log
diff --git devel/pcre++/Makefile devel/pcre++/Makefile
index 9bffe68..f080076 100644
--- devel/pcre++/Makefile
+++ devel/pcre++/Makefile
@@ -21,8 +21,8 @@ PCRE_CONFIG?=	${LOCALBASE}/bin/pcre-config
 USE_AUTOTOOLS=	libtool
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="`${PCRE_CONFIG} --cflags`" \
-		LDFLAGS="`${PCRE_CONFIG} --libs`"
+CPPFLAGS+=	`${PCRE_CONFIG} --cflags`
+LDFLAGS+=	`${PCRE_CONFIG} --libs`
 USE_LDCONFIG=	yes
 
 MAN3=		Pcre.3
diff --git devel/pecl-statgrab/Makefile devel/pecl-statgrab/Makefile
index db05760..5afda4a 100644
--- devel/pecl-statgrab/Makefile
+++ devel/pecl-statgrab/Makefile
@@ -22,8 +22,8 @@ LIB_DEPENDS=	statgrab.8:${PORTSDIR}/devel/libstatgrab
 USE_PHP=	yes
 USE_PHPEXT=	yes
 
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib -ldevstat ${EXTRA_LIBS}"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib -ldevstat ${EXTRA_LIBS}
 
 CONFIGURE_ARGS=	--with-statgrab=${LOCALBASE}
 
diff --git devel/picprog/Makefile devel/picprog/Makefile
index 9f91b4c..aaf5a56 100644
--- devel/picprog/Makefile
+++ devel/picprog/Makefile
@@ -15,8 +15,6 @@ COMMENT=	Serial port pic16c84 programmer
 
 USE_GMAKE=	yes
 
-MAKE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
-
 PLIST_FILES=	bin/picprog
 MAN1=		picprog.1
 
diff --git devel/pikdev/Makefile devel/pikdev/Makefile
index f810e2b..35fa7d9 100644
--- devel/pikdev/Makefile
+++ devel/pikdev/Makefile
@@ -26,9 +26,7 @@ USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
 LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 CPPFLAGS+=	-I${LOCALBASE}/include
-CONFIGURE_ENV=	LDFLAGS="${LDFLAGS}" CPPFLAGS="${CPPFLAGS}" CFLAGS="${CFLAGS}"
 CONFIGURE_ARGS+=	--with-pic=yes
-MAKE_ENV=	LDFLAGS="${LDFLAGS}" CPPFLAGS="${CPPFLAGS}"
 SUB_FILES=	pkg-message
 
 OPTIONS=	DEBUG	"Enable debug information"	off \
diff --git devel/popt/Makefile devel/popt/Makefile
index f9ac93b..604b4b7 100644
--- devel/popt/Makefile
+++ devel/popt/Makefile
@@ -15,8 +15,8 @@ COMMENT=	A getopt(3) like library with a number of enhancements, from Redhat
 
 CONFIGURE_ARGS=	--with-libiconv-prefix=${LOCALBASE} \
 		--program-prefix=""
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 GNU_CONFIGURE=	yes
 USE_AUTOTOOLS=	libtool
 USE_GNOME=	gnomehack
diff --git devel/present/Makefile devel/present/Makefile
index 59fa943..94889dc 100644
--- devel/present/Makefile
+++ devel/present/Makefile
@@ -20,8 +20,8 @@ LIB_DEPENDS=	goffice-1.2:${PORTSDIR}/devel/goffice1
 USE_BZIP2=	yes
 USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 USE_GNOME=	gnomehack intlhack ltverhack
 
 .include <bsd.port.mk>
diff --git devel/protobuf-c/Makefile devel/protobuf-c/Makefile
index 179791a..de0da6b 100644
--- devel/protobuf-c/Makefile
+++ devel/protobuf-c/Makefile
@@ -21,7 +21,7 @@ USE_LDCONFIG=	yes
 USE_GNOME=	gnomehack pkgconfig
 
 CPPFLAGS+=	-I${LOCALBASE}/include
-CONFIGURE_ENV+=	LDFLAGS=-L${LOCALBASE}/lib
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|GREP "\\-L"|GREP "bin/ld"|g' ${WRKSRC}/configure
diff --git devel/ptlib26/Makefile devel/ptlib26/Makefile
index 26d32b5..7146045 100644
--- devel/ptlib26/Makefile
+++ devel/ptlib26/Makefile
@@ -80,8 +80,8 @@ PLIST_SUB+=	BSDVIDEO="@comment "
 
 .if defined(WITH_V4L)
 CONFIGURE_ARGS+=--enable-v4l --enable-v4l2
-CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include ${CPPFLAGS}" \
-		LDFLAGS="-L${LOCALBASE}/lib ${LDFLAGS}"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 PLIST_SUB+=	V4L=""
 BUILD_DEPENDS+=	${LOCALBASE}/include/linux/videodev.h:${PORTSDIR}/multimedia/v4l_compat
 LIB_DEPENDS+=	v4l1.0:${PORTSDIR}/multimedia/libv4l
diff --git devel/pwlib/Makefile devel/pwlib/Makefile
index 31f2887..11c4bbe 100644
--- devel/pwlib/Makefile
+++ devel/pwlib/Makefile
@@ -36,13 +36,10 @@ MAKE_JOBS_UNSAFE=	yes
 
 
 CFLAGS=		-O1
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS} -O1 -I${WRKSRC}/include -I${LOCALBASE}/include" \
-		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" \
-		PTHREAD_LIBS="${PTHREAD_LIBS}" \
-		CFLAGS="${CFLAGS}"
-MAKE_ENV=	CPPFLAGS="${CPPFLAGS} -O1 -I${WRKSRC}/include -I${LOCALBASE}/include" \
-		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" \
-		STDCCFLAGS+="-I${LOCALBASE}"
+CONFIGURE_ENV=	PTHREAD_LIBS="${PTHREAD_LIBS}"
+MAKE_ENV=	STDCCFLAGS+="-I${LOCALBASE}"
+CPPFLAGS+=	-O1 -I${WRKSRC}/include -I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .if ${OSVERSION} >= 700042
 CONFIGURE_ENV+=	ATOMICITY_H="<ext/atomicity.h>"
diff --git devel/py-itools/Makefile devel/py-itools/Makefile
index 1bf921e..511231a 100644
--- devel/py-itools/Makefile
+++ devel/py-itools/Makefile
@@ -22,7 +22,7 @@ RUN_DEPENDS+=	${BUILD_DEPENDS}
 LIB_DEPENDS=	glib:${PORTSDIR}/devel/glib20 \
 		soup:${PORTSDIR}/devel/libsoup
 
-MAKE_ENV+=	LDFLAGS="-L${LOCALBASE}/lib"
+LDFLAGS+=	-L${LOCALBASE}/lib
 USE_PYTHON=	2.6+
 USE_PYDISTUTILS=	yes
 
diff --git devel/py-libgsf/Makefile devel/py-libgsf/Makefile
index a105bb7..4b79f63 100644
--- devel/py-libgsf/Makefile
+++ devel/py-libgsf/Makefile
@@ -22,8 +22,8 @@ USE_GNOME=	gnomehack libgsf_gnome gnomevfs2 ltverhack intlhack pygtk2
 USE_PYTHON=	yes
 CONFIGURE_ARGS=	--with-html-dir=${PREFIX}/share/doc/gsf \
 		--disable-gtk-doc --with-bz2 --with-gnome --with-python
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 GCONF_SCHEMAS=
 GSF_SLAVE=	yes
diff --git devel/py-omniorb/Makefile devel/py-omniorb/Makefile
index 48d5e7a..0f81490 100644
--- devel/py-omniorb/Makefile
+++ devel/py-omniorb/Makefile
@@ -38,8 +38,7 @@ MAKEFILE=	GNUmakefile
 USE_LDCONFIG=	yes
 
 CONFIGURE_SCRIPT=	../configure
-CONFIGURE_ENV+=	CC=${CC} CFLAGS="${CFLAGS}" CXX=${CXX} CXXFLAGS="${CXXFLAGS}" \
-		CPP=${CPP} PYTHON=${PYTHON_CMD}
+CONFIGURE_ENV+=	PYTHON=${PYTHON_CMD}
 CONFIGURE_ARGS=	--with-openssl=${OPENSSLBASE} --with-omniorb=${LOCALBASE}
 
 pre-configure:
diff --git devel/py-orbit/Makefile devel/py-orbit/Makefile
index a772e57..c11841e 100644
--- devel/py-orbit/Makefile
+++ devel/py-orbit/Makefile
@@ -26,6 +26,6 @@ USE_GNOME=	gnomehack orbit2
 USE_PYTHON=	yes
 GNU_CONFIGURE=	yes
 ORBIT_CONFIG=	${LOCALBASE}/bin/orbit2-config
-CONFIGURE_ENV=	LDFLAGS="${PTHREAD_LIBS}"
+LDFLAGS+=	${PTHREAD_LIBS}
 
 .include <bsd.port.mk>
diff --git devel/py-shapely/Makefile devel/py-shapely/Makefile
index 194648b..e3d105d 100644
--- devel/py-shapely/Makefile
+++ devel/py-shapely/Makefile
@@ -17,7 +17,6 @@ COMMENT=	Python Package for Manipulation 2D Geospatial Geometry
 LIB_DEPENDS=	geos_c.8:${PORTSDIR}/graphics/geos
 
 CFLAGS+=	-I${LOCALBASE}/include
-MAKE_ENV+=	CFLAGS="${CFLAGS}"
 USE_PYTHON=	2.5+
 USE_PYDISTUTILS=	easy_install
 
diff --git devel/raknet/Makefile devel/raknet/Makefile
index bf43d4b..1d7ee63 100644
--- devel/raknet/Makefile
+++ devel/raknet/Makefile
@@ -27,8 +27,8 @@ ACLOCAL_ARGS=	--acdir=${ACLOCAL_DIR} \
 	-I ${LOCALBASE}/share/aclocal \
 	-I ${WRKDIR}/autotools/m4
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include" \
-				LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 USE_DOS2UNIX=	yes
 DOS2UNIX_REGEX=	.*\.(cpp|h)
diff --git devel/regexx/Makefile devel/regexx/Makefile
index 0939a38..07a0897 100644
--- devel/regexx/Makefile
+++ devel/regexx/Makefile
@@ -18,7 +18,7 @@ COMMENT=	A complete regular expressions C++ solution
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
-MAKE_ENV+=      INCLUDES="-I${WRKSRC}/pcre"
+MAKE_ENV+=	INCLUDES="-I${WRKSRC}/pcre"
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|@LIBTOOL@|${LIBTOOL}|g ; \
diff --git devel/regexxer/Makefile devel/regexxer/Makefile
index 64f2c5b..c5db8e5 100644
--- devel/regexxer/Makefile
+++ devel/regexxer/Makefile
@@ -22,8 +22,8 @@ USE_GETTEXT=		yes
 GNU_CONFIGURE=		yes
 USE_GMAKE=		yes
 USE_GNOME=		gnomehack gnomeprefix intltool intlhack
-CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
-			LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=		-I${LOCALBASE}/include
+LDFLAGS+=		-L${LOCALBASE}/lib
 
 GCONF_SCHEMAS=		regexxer.schemas
 INSTALLS_ICONS=		regexxer.png
diff --git devel/rsvndump/Makefile devel/rsvndump/Makefile
index 5d093fa..f67fbb7 100644
--- devel/rsvndump/Makefile
+++ devel/rsvndump/Makefile
@@ -32,7 +32,7 @@ PLIST_FILES+=	bin/rsvndump
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} < 700041
-CONFIGURE_ENV+=	LDFLAGS=${PTHREAD_LIBS}
+LDFLAGS+=	${PTHREAD_LIBS}
 .endif
 
 .if !defined(NOPORTDOCS)
diff --git devel/sdl12/Makefile devel/sdl12/Makefile
index 405cbad..3c2b4f8 100644
--- devel/sdl12/Makefile
+++ devel/sdl12/Makefile
@@ -26,7 +26,6 @@ USE_GNOME=	gnomehack pkgconfig
 USE_ICONV=	yes
 CONFIGURE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}"	\
 		PTHREAD_LIBS="${PTHREAD_LIBS}"		\
-		LDFLAGS="${LDFLAGS}"			\
 		ac_cv_header_libusbhid_h=no
 
 CFLAGS+=	${PTHREAD_CFLAGS} -I${LOCALBASE}/include
diff --git devel/seed/Makefile devel/seed/Makefile
index 94ebad5..ff664df 100644
--- devel/seed/Makefile
+++ devel/seed/Makefile
@@ -34,8 +34,8 @@ USE_GNOME=	gnomehack gtk20 intltool libxml2
 USE_LDCONFIG=	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
 CONFIGURE_ARGS+=--enable-gtk-doc=no --with-webkit=1.0
 
 MAN1=		seed.1
diff --git devel/sfslite-dbg/Makefile devel/sfslite-dbg/Makefile
index 75a16bf..d081efd 100644
--- devel/sfslite-dbg/Makefile
+++ devel/sfslite-dbg/Makefile
@@ -13,5 +13,5 @@ COMMENT=	sfslite with dmalloc and without optimization
 LIB_DEPENDS+=	dmalloc:${PORTSDIR}/devel/dmalloc
 PKG_INSTALL=	${MASTERDIR}/pkg-install
 
-CONFIGURE_ENV+=	CFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+LDFLAGS+=	-L${LOCALBASE}/lib
+CFLAGS+=	-I${LOCALBASE}/include
diff --git devel/shmap/Makefile devel/shmap/Makefile
index 026f7f4..62123d6 100644
--- devel/shmap/Makefile
+++ devel/shmap/Makefile
@@ -19,8 +19,8 @@ LIB_DEPENDS=	mm.14:${PORTSDIR}/devel/mm
 
 USE_AUTOTOOLS=	libtool
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 USE_LDCONFIG=	yes
 
 .include <bsd.port.mk>
diff --git devel/silc-toolkit/Makefile devel/silc-toolkit/Makefile
index 8c7bddf..24881bb 100644
--- devel/silc-toolkit/Makefile
+++ devel/silc-toolkit/Makefile
@@ -46,7 +46,7 @@ PLIST_SUB+=	PORTDOCS="@comment "
 .ifndef(WITH_PTHREADS)
 CONFIGURE_ARGS+=	--without-pthreads
 .else
-CONFIGURE_ENV+=	CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS} ${PTHREAD_LIBS}"
+CFLAGS+=	${PTHREAD_CFLAGS} ${PTHREAD_LIBS}
 .endif
 
 pre-everything::
diff --git devel/simgear/Makefile devel/simgear/Makefile
index 8f42acd..e675cf4 100644
--- devel/simgear/Makefile
+++ devel/simgear/Makefile
@@ -36,7 +36,6 @@ USE_GL=		gl glu glut
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
-CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--with-jpeg-factory
 
 post-patch:
diff --git devel/soup/Makefile devel/soup/Makefile
index ec81e0e..c012996 100644
--- devel/soup/Makefile
+++ devel/soup/Makefile
@@ -23,7 +23,7 @@ USE_GNOME=	gnomehack glib12 libxml
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-html-dir=${PREFIX}/share/doc --disable-gtk-doc
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
 
 .include <bsd.port.mk>
diff --git devel/srecord/Makefile devel/srecord/Makefile
index 5c55dc0..dd4ab64 100644
--- devel/srecord/Makefile
+++ devel/srecord/Makefile
@@ -19,8 +19,8 @@ BUILD_DEPENDS=	${LOCALBASE}/include/boost/shared_ptr.hpp:${PORTSDIR}/devel/boost
 LIB_DEPENDS=	gcrypt.18:${PORTSDIR}/security/libgcrypt
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
 MAKE_JOBS_UNSAFE=	yes
 
 PLIST_FILES=	bin/srec_cat \
diff --git devel/styx/Makefile devel/styx/Makefile
index b9a3088..3cef89d 100644
--- devel/styx/Makefile
+++ devel/styx/Makefile
@@ -19,8 +19,8 @@ USE_AUTOTOOLS=	libtool
 USE_ICONV=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
-		LDFLAGS="-L${LOCALBASE}/lib -liconv ${PTHREAD_LIBS}"
+CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS+=	-L${LOCALBASE}/lib -liconv ${PTHREAD_LIBS}
 CONFIGURE_ARGS=	--includedir=${PREFIX}/include/${PORTNAME}
 USE_LDCONFIG=	yes
 
diff --git devel/subcommander/Makefile devel/subcommander/Makefile
index efb8c13..e51115a 100644
--- devel/subcommander/Makefile
+++ devel/subcommander/Makefile
@@ -26,8 +26,9 @@ USE_GMAKE=	yes
 USE_QT_VER=	3
 CONFIGURE_ARGS+=--with-boost=${LOCALBASE} --with-neon=${LOCALBASE} \
 		--with-subversion=${LOCALBASE}
-CONFIGURE_ENV=	QTDIR=${LOCALBASE} CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CONFIGURE_ENV=	QTDIR=${LOCALBASE}
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 
 NO_LATEST_LINK=	yes
 
diff --git devel/subcommander2/Makefile devel/subcommander2/Makefile
index ecb16a7..eb68530 100644
--- devel/subcommander2/Makefile
+++ devel/subcommander2/Makefile
@@ -38,8 +38,8 @@ CONFIGURE_ARGS+=	--with-boost=${LOCALBASE}/include --with-neon=${LOCALBASE} \
 			--with-apr=${LOCALBASE}/bin/apr-1-config \
 			--with-apr-util=${LOCALBASE}/bin/apu-1-config \
 			--with-openssl=${OPENSSLBASE}
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib -L${LOCALBASE}/lib/qt4 ${PTHREAD_LIBS}"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib -L${LOCALBASE}/lib/qt4 ${PTHREAD_LIBS}
 
 post-extract:
 	@${CHMOD} +x ${WRKSRC}/configure
diff --git devel/synfig/Makefile devel/synfig/Makefile
index c1e1a43..b482a0c 100644
--- devel/synfig/Makefile
+++ devel/synfig/Makefile
@@ -29,8 +29,8 @@ USE_GNOME=	gnomehack glib20
 USE_GETTEXT=	yes
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 ALL_TARGET=	-j`${SYSCTL} -n hw.ncpu`
 
 post-patch:
diff --git devel/tdl/Makefile devel/tdl/Makefile
index 30012ad..d49938a 100644
--- devel/tdl/Makefile
+++ devel/tdl/Makefile
@@ -16,7 +16,6 @@ COMMENT=	To-do list manager
 HAS_CONFIGURE=	yes
 
 CONFIGURE_ARGS+=	--prefix=${PREFIX}
-CONFIGURE_ENV=	CC="${CC}" CFLAGS="${CFLAGS}"
 
 MAN1=	tdl.1
 MLINKS=	tdl.1 tdla.1 tdl.1 tdll.1 tdl.1 tdld.1 tdl.1 tdlg.1
diff --git devel/thunar-vcs-plugin/Makefile devel/thunar-vcs-plugin/Makefile
index 7a6830c..3ad8aa1 100644
--- devel/thunar-vcs-plugin/Makefile
+++ devel/thunar-vcs-plugin/Makefile
@@ -25,7 +25,7 @@ USE_GNOME=	desktopfileutils gnomehack gtk20 glib20 intltool intlhack \
 USE_XFCE=	configenv libexo libutil thunar
 INSTALLS_ICONS=	yes
 
-CONFIGURE_ENV+=	LDFLAGS="-L${LOCALBASE}/lib"
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 OPTIONS=	NLS "Enable Native Language Support" on \
 		GIT "Enable Git support" off \
diff --git devel/tokamak/Makefile devel/tokamak/Makefile
index 5fa5833..3602079 100644
--- devel/tokamak/Makefile
+++ devel/tokamak/Makefile
@@ -29,7 +29,7 @@ PORTDOCS=	*
 .include <bsd.port.pre.mk>
 
 .if !defined(WITH_DEBUG)
-MAKE_ENV+=	CPPFLAGS=-DNDEBUG
+CPPFLAGS+=	-DNDEBUG
 .endif
 
 post-extract:
diff --git devel/ucommon/Makefile devel/ucommon/Makefile
index 45349dd..cd0a2dc 100644
--- devel/ucommon/Makefile
+++ devel/ucommon/Makefile
@@ -17,7 +17,7 @@ COMMENT=	A very light-weight C++ design patternlibrary
 USE_GNOME=	pkgconfig gnomehack
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV+=	LDFLAGS="${PTHREAD_LIBS}"
+LDFLAGS+=	${PTHREAD_LIBS}
 
 MAN1=	args.1 car.1 commoncpp-config.1 mdsum.1 scrub-files.1 sockaddr.1 \
 	ucommon-config.1 zerofill.1
diff --git devel/urjtag/Makefile devel/urjtag/Makefile
index d15094a..e4d6340 100644
--- devel/urjtag/Makefile
+++ devel/urjtag/Makefile
@@ -19,10 +19,10 @@ BUILD_DEPENDS=	${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	LEX=${LOCALBASE}/bin/flex \
-		CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV=	LEX=${LOCALBASE}/bin/flex
 
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 CFLAGS+=	--std=c99
 
 MAN1=		jtag.1 bsdl2jtag.1
diff --git devel/wand-libconfig/Makefile devel/wand-libconfig/Makefile
index 7b9ddfc..aab86d2 100644
--- devel/wand-libconfig/Makefile
+++ devel/wand-libconfig/Makefile
@@ -20,7 +20,7 @@ GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 USE_GMAKE=	yes
 
-CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib"
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 PLIST_FILES=	include/libconfig.h lib/libconfig.a lib/libconfig.la \
 		lib/libconfig.so lib/libconfig.so.1
diff --git devel/wininfo/Makefile devel/wininfo/Makefile
index da3e3ed..af12607 100644
--- devel/wininfo/Makefile
+++ devel/wininfo/Makefile
@@ -5,23 +5,23 @@
 # $FreeBSD$
 #
 
-PORTNAME=		wininfo
-PORTVERSION=		0.7
+PORTNAME=	wininfo
+PORTVERSION=	0.7
 PORTREVISION=	9
-CATEGORIES=		devel
-MASTER_SITES=		http://www.freedesktop.org/software/wininfo/
+CATEGORIES=	devel
+MASTER_SITES=	http://www.freedesktop.org/software/wininfo/
 
-MAINTAINER=		ports@FreeBSD.org
-COMMENT=		A window information utility
+MAINTAINER=	ports@FreeBSD.org
+COMMENT=	A window information utility
 
-USE_XORG=		xext xrender xinerama xrandr xi xfixes xcursor \
-			xcomposite x11 xres
-USE_GNOME=		gtk20 gnomeprefix pkgconfig 
-GNU_CONFIGURE=		yes
+USE_XORG=	xext xrender xinerama xrandr xi xfixes xcursor \
+		xcomposite x11 xres
+USE_GNOME=	gtk20 gnomeprefix pkgconfig
+GNU_CONFIGURE=	yes
 
-CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
-			LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
-MAN1=			wininfo.1
+MAN1=		wininfo.1
 
 .include <bsd.port.mk>
diff --git devel/xdg-user-dirs/Makefile devel/xdg-user-dirs/Makefile
index 55fe495..cef4a1d 100644
--- devel/xdg-user-dirs/Makefile
+++ devel/xdg-user-dirs/Makefile
@@ -17,7 +17,7 @@ GNU_CONFIGURE=	yes
 USE_GETTEXT=	yes
 USE_ICONV=	yes
 USE_GMAKE=	yes
-CONFIGURE_ENV+=	CFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+LDFLAGS+=	-L${LOCALBASE}/lib
+CFLAGS+=	-I${LOCALBASE}/include
 
 .include <bsd.port.mk>
diff --git devel/xwpe/Makefile devel/xwpe/Makefile
index b1a99d0..e1a2e89 100644
--- devel/xwpe/Makefile
+++ devel/xwpe/Makefile
@@ -20,7 +20,6 @@ COMMENT=	A Borland-like IDE programming environment
 USE_GMAKE=	yes
 USE_XORG=	sm ice x11
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=
 CONFIGURE_ARGS=	--libdir=${PREFIX}/share
 ALL_TARGET=	# none
 
diff --git devel/yasm/Makefile devel/yasm/Makefile
index 7fc6394..6685c9f 100644
--- devel/yasm/Makefile
+++ devel/yasm/Makefile
@@ -20,8 +20,8 @@ MAKE_JOBS_SAFE=	yes
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--disable-python --disable-python-bindings
-CONFIGURE_ENV+=	CPPFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	${CXXFLAGS} -I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .include <bsd.port.pre.mk>
 
diff --git devel/ztcl/Makefile devel/ztcl/Makefile
index c2a6502..582c5d1 100644
--- devel/ztcl/Makefile
+++ devel/ztcl/Makefile
@@ -29,10 +29,8 @@ INFO=		${PORTNAME} ${PORTNAME}-zlib
 CONFIGURE_ARGS+=	--with-tcl=${TCL_LIBDIR} \
 		--with-tclinclude=${TCL_INCLUDEDIR} \
 		--with-tclmorescripts=${PREFIX}/libexec/tclmore
-CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS} -I ${PREFIX}/include -I ${TCL_INCLUDEDIR}" \
-		LDFLAGS="${LDFLAGS} -L ${PREFIX}/lib"
-MAKE_ENV+=	CPPFLAGS="${CPPFLAGS} -I ${PREFIX}/include -I ${TCL_INCLUDEDIR}" \
-		LDFLAGS="${LDFLAGS} -L ${PREFIX}/lib"
+CPPFLAGS+=	-I ${PREFIX}/include -I ${TCL_INCLUDEDIR}
+LDFLAGS+=	-L ${PREFIX}/lib
 
 .if !defined(NOPORTDOCS)
 PORTDOCS=	*
diff --git dns/autotrust/Makefile dns/autotrust/Makefile
index 2762109..9063063 100644
--- dns/autotrust/Makefile
+++ dns/autotrust/Makefile
@@ -18,9 +18,8 @@ LIB_DEPENDS+=	ldns.1:${PORTSDIR}/dns/ldns \
 		unbound.2:${PORTSDIR}/dns/unbound
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
 CFLAGS=		-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
+LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 
 MAN8=		autotrust.8
 
diff --git dns/dhisd/Makefile dns/dhisd/Makefile
index 3a60c77..87e9461 100644
--- dns/dhisd/Makefile
+++ dns/dhisd/Makefile
@@ -18,7 +18,6 @@ LIB_DEPENDS=	gmp.10:${PORTSDIR}/math/gmp
 
 CFLAGS+=	-I${PREFIX}/include
 LDFLAGS+=	-L${PREFIX}/lib
-MAKE_ENV=	LDFLAGS="${LDFLAGS}"
 
 DOCFILES=	CONTRIBUTORS COPYRIGHT INSTALL MODULES README
 
diff --git dns/fastresolve/Makefile dns/fastresolve/Makefile
index 17087e6..1119c15 100644
--- dns/fastresolve/Makefile
+++ dns/fastresolve/Makefile
@@ -24,9 +24,9 @@ USE_BZIP2=	yes
 USE_PERL5=	yes
 GNU_CONFIGURE=	yes
 MAKE_JOBS_SAFE=	yes
-CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib" \
-		CXXFLAGS="-I${LOCALBASE}/include" \
-		PERL=${PERL}
+CONFIGURE_ENV=	PERL=${PERL}
+LDFLAGS+=	-L${LOCALBASE}/lib
+CXXFLAGS+=	-I${LOCALBASE}/include
 USE_AUTOTOOLS=	aclocal14 automake14 autoconf213
 
 USE_BDB=	yes
diff --git dns/ldapdns/Makefile dns/ldapdns/Makefile
index 76aeec0..0d809f5 100644
--- dns/ldapdns/Makefile
+++ dns/ldapdns/Makefile
@@ -21,7 +21,6 @@ LICENSE=	GPLv2
 
 USE_OPENLDAP=	yes
 HAS_CONFIGURE=	yes
-CONFIGURE_ENV=	CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--prefix=${PREFIX}
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git dns/libidn/Makefile dns/libidn/Makefile
index 9bccfdc..75af052 100644
--- dns/libidn/Makefile
+++ dns/libidn/Makefile
@@ -19,8 +19,8 @@ USE_ICONV=	yes
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 USE_PERL5_BUILD=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
 
 INFO=	libidn
 
diff --git dns/posadis/Makefile dns/posadis/Makefile
index 9418010..982816c 100644
--- dns/posadis/Makefile
+++ dns/posadis/Makefile
@@ -18,7 +18,8 @@ LIB_DEPENDS=	poslib.0:${PORTSDIR}/devel/poslib
 
 USE_AUTOTOOLS=	autoconf libltdl libtool
 USE_LDCONFIG=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .if defined(WITH_FAM) || exists(${LOCALBASE}/lib/libfam.so)
 CONFIGURE_ARGS=	--enable-fam
diff --git editors/abiword/Makefile editors/abiword/Makefile
index ccd869d..bc61649 100644
--- editors/abiword/Makefile
+++ editors/abiword/Makefile
@@ -32,8 +32,8 @@ USE_GETTEXT=	yes
 USE_GNOME=	gnomehack libxml2 gtk20 desktopfileutils librsvg2
 WANT_GNOME=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--without-gnomevfs --disable-collab-backend-xmpp \
 		--disable-collab-backend-sugar
 USE_LDCONFIG=	yes
diff --git editors/conglomerate/Makefile editors/conglomerate/Makefile
index f2e2fed..ea68c7b 100644
--- editors/conglomerate/Makefile
+++ editors/conglomerate/Makefile
@@ -17,8 +17,8 @@ INSTALLS_OMF=	yes
 USE_GMAKE=	yes
 USE_GNOME=	libgnomeui gtksourceview gnomeprefix gnomehack intlhack
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .include <bsd.port.pre.mk>
 
diff --git editors/cooledit/Makefile editors/cooledit/Makefile
index f3642ee..dd0cce3 100644
--- editors/cooledit/Makefile
+++ editors/cooledit/Makefile
@@ -21,13 +21,12 @@ USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 USE_XORG=	x11 xt
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 USE_LDCONFIG=	yes
 
 MAN1=		cooledit.1 coolman.1 smalledit.1
 
-CPPFLAGS=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
+CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 CFLAGS+=	-DHAVE_MBRTOWC
 
 .if defined(WITH_NEXT_LOOK)
diff --git editors/elvis/Makefile editors/elvis/Makefile
index e4196fc..830bbc3 100644
--- editors/elvis/Makefile
+++ editors/elvis/Makefile
@@ -40,7 +40,7 @@ CONFIGURE_ARGS+=	--without-xft
 USE_XORG=	xft xt
 CONFIGURE_ARGS+=	--libs="${LDFLAGS}"
 CFLAGS+=	`freetype-config --cflags`
-LDFLAGS=	`freetype-config --libs`
+LDFLAGS+=	`freetype-config --libs`
 .endif
 .endif
 
diff --git editors/emacs-devel/Makefile editors/emacs-devel/Makefile
index c01001b..fd0d2de 100644
--- editors/emacs-devel/Makefile
+++ editors/emacs-devel/Makefile
@@ -33,7 +33,6 @@ USE_GMAKE=	yes
 USE_XZ=		yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
-CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--localstatedir=/var
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 USE_AUTOTOOLS=	autoconf:env automake:env aclocal:env autoheader:env
diff --git editors/emacs.app/Makefile editors/emacs.app/Makefile
index 851ac14..69d1e76 100644
--- editors/emacs.app/Makefile
+++ editors/emacs.app/Makefile
@@ -28,7 +28,7 @@ WRKSRC=		${WRKDIR}/${DISTNAME}
 CPPFLAGS+=	-I${GNUSTEP_SYSTEM_ROOT}/Library/Headers
 CFLAGS+=	-I${GNUSTEP_SYSTEM_ROOT}/Library/Headers
 LDFLAGS+=	-L${GNUSTEP_SYSTEM_ROOT}/Library/Libraries
-CONFIGURE_ENV+=	CC=${CC} CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" MAKE="${GMAKE}"
+CONFIGURE_ENV+=	MAKE="${GMAKE}"
 CONFIGURE_ENV+=	GNUSTEP_SYSTEM_HEADERS="${GNUSTEP_SYSTEM_ROOT}/Library/Headers"
 BASEDIR=	${WRKSRC}/nextstep/build/Emacs.app
 CONFIGURE_ARGS+=	--without-gcc --with-ns --without-x --with-pop \
diff --git editors/emacs/Makefile editors/emacs/Makefile
index a8a52a5..701fc0d 100644
--- editors/emacs/Makefile
+++ editors/emacs/Makefile
@@ -31,8 +31,8 @@ EMACS_VER=	23.3
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_BZIP2=	yes
-CPPFLAGS=	"-I${LOCALBASE}/include"
-CONFIGURE_ENV+=	LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--localstatedir=/var
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
diff --git editors/emacs21/Makefile editors/emacs21/Makefile
index dbd151f..f5910ef 100644
--- editors/emacs21/Makefile
+++ editors/emacs21/Makefile
@@ -62,7 +62,6 @@ LATEST_LINK=	emacs21
 
 .if ${ARCH} == "ia64"
 CFLAGS:=	${CFLAGS:C/-O.?/-O0/g}
-CONFIGURE_ENV=	CFLAGS="${CFLAGS}"
 .endif
 
 pre-everything::
diff --git editors/fxite/Makefile editors/fxite/Makefile
index 1a75694..406b437 100644
--- editors/fxite/Makefile
+++ editors/fxite/Makefile
@@ -22,7 +22,6 @@ USE_PKGCONFIG=	yes
 GNU_CONFIGURE=	yes
 CXXFLAGS+=	-g -O0 -fPIC
 LDFLAGS+=	-L${LOCALBASE}/lib -lintl
-CONFIGURE_ENV=	LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS+=--with-system-lua \
 		--with-lua-pkg=lua-${LUA_VER}
 
diff --git editors/gedit-plugins/Makefile editors/gedit-plugins/Makefile
index 80124e3..7ddfd62 100644
--- editors/gedit-plugins/Makefile
+++ editors/gedit-plugins/Makefile
@@ -28,8 +28,8 @@ USE_GETTEXT=	yes
 USE_AUTOTOOLS=	libtool
 USE_GNOME=	gnomehack gnomeprefix intlhack gnomevfs2
 WANT_GNOME=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 GCONF_SCHEMAS=	gedit-show-tabbar-plugin.schemas \
 		gedit-drawspaces.schemas
diff --git editors/gedit/Makefile editors/gedit/Makefile
index 3758401..bd31ad7 100644
--- editors/gedit/Makefile
+++ editors/gedit/Makefile
@@ -32,8 +32,8 @@ USE_GNOME=	gnomeprefix gnomehack intlhack gconf2 gtksourceview2 \
 		desktopfileutils gnomedocutils ltasneededhack
 GNOME_DESKTOP_VERSION=2
 WANT_GNOME=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 PLIST_SUB=	VERSION="2.20"
 
 MAN1=		gedit.1
diff --git editors/ghex/Makefile editors/ghex/Makefile
index 0771110..0a52224 100644
--- editors/ghex/Makefile
+++ editors/ghex/Makefile
@@ -24,8 +24,8 @@ USE_GETTEXT=	yes
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
 USE_LDCONFIG=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 GCONF_SCHEMAS=	ghex2.schemas
 
diff --git editors/glimmer/Makefile editors/glimmer/Makefile
index db5db41..26c379b 100644
--- editors/glimmer/Makefile
+++ editors/glimmer/Makefile
@@ -26,8 +26,8 @@ USE_GNOME=	gnomeprefix gnomehack gnomelibs gnomeprint gnomevfs \
 USE_GETTEXT=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-regex
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I/usr/include/gnu" \
-		LIBS="-L${LOCALBASE}/lib -lgnuregex"
+CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib -lgnuregex"
+CPPFLAGS+=	-I${LOCALBASE}/include -I/usr/include/gnu
 
 .if exists(/usr/lib/libcrypto.a)
 PYTHON_LIBS=	-lssl -lcrypto
diff --git editors/gmanedit/Makefile editors/gmanedit/Makefile
index 4c359ac..6226c97 100644
--- editors/gmanedit/Makefile
+++ editors/gmanedit/Makefile
@@ -18,8 +18,8 @@ USE_GNOME=	gnomehack gtk20
 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=		gmanedit.1
 
diff --git editors/gnotepad+/Makefile editors/gnotepad+/Makefile
index d4849b3..932d07cf 100644
--- editors/gnotepad+/Makefile
+++ editors/gnotepad+/Makefile
@@ -27,13 +27,12 @@ WANT_GNOME=	yes
 USE_GNOME=	gnomeprefix gtk12
 USE_GETTEXT=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	LDFLAGS="${LDFLAGS}"
 MAKE_JOBS_SAFE=	yes
 
 MAN1=		gnp.1
 
-CPPFLAGS=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 DOCVERSION=	1.2.0
 
diff --git editors/gobby/Makefile editors/gobby/Makefile
index 76e00dc..2e0e574 100644
--- editors/gobby/Makefile
+++ editors/gobby/Makefile
@@ -40,8 +40,8 @@ CONFIGURE_ARGS+=--without-gtkspell
 .endif
 
 .if !defined(WITHOUT_NLS)
-CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib -lintl"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib -lintl
 CONFIGURE_ARGS+=	--enable-nls
 USE_GETTEXT=	yes
 PLIST_SUB+=	NLS=""
diff --git editors/gphpedit/Makefile editors/gphpedit/Makefile
index f2327c1..b9b204b 100644
--- editors/gphpedit/Makefile
+++ editors/gphpedit/Makefile
@@ -19,8 +19,8 @@ COMMENT=	PHP, HTML and CSS development environment for GNOME 2.x
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack libgnomeui libgtkhtml
 USE_AUTOTOOLS=	libtool
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 MAKE_JOBS_UNSAFE=	yes
 
 .if !defined(WITHOUT_PHP)
diff --git editors/hte/Makefile editors/hte/Makefile
index eda55f4..aaeeabd 100644
--- editors/hte/Makefile
+++ editors/hte/Makefile
@@ -39,7 +39,8 @@ PKGNAMESUFFIX=	-nox11
 CONFIGURE_ARGS+=--disable-x11-textmode
 .else
 USE_XORG=	x11
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 .endif
 
 .if !defined(NOPORTDOCS)
diff --git editors/joe/Makefile editors/joe/Makefile
index 599c326..071b35a 100644
--- editors/joe/Makefile
+++ editors/joe/Makefile
@@ -25,8 +25,8 @@ USE_GMAKE=	yes
 USE_ICONV=	yes
 USE_NCURSES=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib -liconv"
+CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib -liconv"
+CPPFLAGS+=	-I${LOCALBASE}/include
 
 ALL_TARGET=	${PORTNAME}
 MAN1=		${PORTNAME}.1
diff --git editors/joe2/Makefile editors/joe2/Makefile
index f265539..4036229 100644
--- editors/joe2/Makefile
+++ editors/joe2/Makefile
@@ -21,8 +21,8 @@ CONFLICTS=	joe-3*
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 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
 
 ALL_TARGET=	${PORTNAME}
 MAN1=		${PORTNAME}.1
diff --git editors/leafpad/Makefile editors/leafpad/Makefile
index 09d5028..8a292f3 100644
--- editors/leafpad/Makefile
+++ editors/leafpad/Makefile
@@ -18,11 +18,10 @@ USE_GNOME=	gtk20 desktopfileutils intlhack
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--enable-chooser
 INSTALLS_ICONS=	yes
-CPPFLAGS=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
+CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 
 PORTDOCS=	AUTHORS COPYING ChangeLog INSTALL README
 
diff --git editors/libreoffice/Makefile editors/libreoffice/Makefile
index 2f3b96a..5de9a83 100644
--- editors/libreoffice/Makefile
+++ editors/libreoffice/Makefile
@@ -223,8 +223,7 @@ MANCOMPRESSED=	yes
 
 .include <bsd.port.options.mk>
 
-LDFLAGS=
-MAKE_ENV+= 	USE_GMAKE=1 DESTDIR=${LODESTDIR}
+MAKE_ENV+=	USE_GMAKE=1 DESTDIR=${LODESTDIR}
 
 CPPFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include/db${BDB_VER} -L${LOCALBASE}/lib
 
diff --git editors/mlview/Makefile editors/mlview/Makefile
index ab88d84..356782f 100644
--- editors/mlview/Makefile
+++ editors/mlview/Makefile
@@ -20,7 +20,8 @@ USE_AUTOTOOLS=	autoconf libtool
 USE_GNOME=	eel2 gnomehack gnomeprefix gtksourceview libgnomeui
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include `pkg-config --cflags gnome-vfs-2.0 libgnomeui-2.0`" LIBS="-L${LOCALBASE}/lib `pkg-config --libs gnome-vfs-2.0 libgnomeui-2.0`"
+CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib `pkg-config --libs gnome-vfs-2.0 libgnomeui-2.0`"
+CPPFLAGS+=	-I${LOCALBASE}/include `pkg-config --cflags gnome-vfs-2.0 libgnomeui-2.0`
 
 GCONF_SCHEMAS=	mlview.schemas
 
diff --git editors/morla/Makefile editors/morla/Makefile
index ff0ea91..f8a3d67 100644
--- editors/morla/Makefile
+++ editors/morla/Makefile
@@ -24,7 +24,8 @@ RUN_DEPENDS=	dot:${PORTSDIR}/graphics/graphviz
 OPTIONS=	XULRUNNER	"Install xulrunner as JavaScript engine" off
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I/${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--with-gconf=auto
 USE_GETTEXT=	yes
 USE_GNOME=	gconf2 libgtkhtml libxslt
diff --git editors/nano/Makefile editors/nano/Makefile
index 943f100..a1ce025 100644
--- editors/nano/Makefile
+++ editors/nano/Makefile
@@ -17,8 +17,8 @@ COMMENT=	Nano's ANOther editor, an enhanced free Pico clone
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--docdir=${DOCSDIR}
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 MAKE_JOBS_SAFE=	yes
 
 LICENSE=	GPLv3
diff --git editors/nvi-devel/Makefile editors/nvi-devel/Makefile
index 653081c..432ac5e 100644
--- editors/nvi-devel/Makefile
+++ editors/nvi-devel/Makefile
@@ -36,7 +36,7 @@ CONFIGURE_ARGS+=	--enable-widechar
 .endif
 
 CPPFLAGS+=		-I${BDB_INCLUDE_DIR} -I${LOCALBASE}/include
-CONFIGURE_ENV+=		LDFLAGS="-L${BDB_LIB_DIR} -L${LOCALBASE}/lib"
+LDFLAGS+=		-L${BDB_LIB_DIR} -L${LOCALBASE}/lib
 
 # configure is 555, so you can't do a "make configure" as non-root.
 post-patch:
diff --git editors/openoffice.org-2/Makefile editors/openoffice.org-2/Makefile
index 9645393..f058df2 100644
--- editors/openoffice.org-2/Makefile
+++ editors/openoffice.org-2/Makefile
@@ -98,9 +98,10 @@ OOOCXX=		${CCACHE_PREFIX} ${CXX}
 OOOCC=		${CC}
 OOOCXX=		${CXX}
 .endif
-CONFIGURE_ENV+=	CC="${OOOCC}" CXX="${OOOCXX}"		\
-		CPPFLAGS="-I${LOCALBASE}/include"	\
-		LDFLAGS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV+=	CC="${OOOCC}" CXX="${OOOCXX}"
+
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 BUILD_DEPENDS+=	zip:${PORTSDIR}/archivers/zip \
 		${LOCALBASE}/bin/unzip:${PORTSDIR}/archivers/unzip \
diff --git editors/openoffice.org-3-RC/Makefile editors/openoffice.org-3-RC/Makefile
index f216db1..bd9fb93 100644
--- editors/openoffice.org-3-RC/Makefile
+++ editors/openoffice.org-3-RC/Makefile
@@ -106,9 +106,9 @@ OOOCC=		${CC}
 OOOCXX=		${CXX}
 .endif
 CONFIGURE_ENV+=	CC="${OOOCC}" CXX="${OOOCXX}"		\
-		CPPFLAGS="-I${LOCALBASE}/include"	\
-		LDFLAGS="-L${LOCALBASE}/lib" \
 		PATH=${WRKSRC}/solenv/bin:$$PATH
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 BUILD_DEPENDS+=	zip:${PORTSDIR}/archivers/zip \
 		${LOCALBASE}/bin/unzip:${PORTSDIR}/archivers/unzip \
diff --git editors/openoffice.org-3-devel/Makefile editors/openoffice.org-3-devel/Makefile
index 4243cd2..de7a5c7 100644
--- editors/openoffice.org-3-devel/Makefile
+++ editors/openoffice.org-3-devel/Makefile
@@ -115,9 +115,9 @@ OOOCC=		${CC}
 OOOCXX=		${CXX}
 .endif
 CONFIGURE_ENV+=	CC="${OOOCC}" CXX="${OOOCXX}"		\
-		CPPFLAGS="-I${LOCALBASE}/include"	\
-		LDFLAGS="-L${LOCALBASE}/lib" \
 		PATH=${WRKSRC}/solenv/bin:$$PATH
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 BUILD_DEPENDS+=	zip:${PORTSDIR}/archivers/zip \
 		${LOCALBASE}/bin/unzip:${PORTSDIR}/archivers/unzip \
diff --git editors/openoffice.org-3/Makefile editors/openoffice.org-3/Makefile
index 9f2521b..e1d38d4 100644
--- editors/openoffice.org-3/Makefile
+++ editors/openoffice.org-3/Makefile
@@ -105,9 +105,9 @@ OOOCC=		${CC}
 OOOCXX=		${CXX}
 .endif
 CONFIGURE_ENV+=	CC="${OOOCC}" CXX="${OOOCXX}"		\
-		CPPFLAGS="-I${LOCALBASE}/include"	\
-		LDFLAGS="-L${LOCALBASE}/lib" \
 		PATH=${WRKSRC}/solenv/bin:$$PATH
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 BUILD_DEPENDS+=	zip:${PORTSDIR}/archivers/zip \
 		${LOCALBASE}/bin/unzip:${PORTSDIR}/archivers/unzip \
diff --git editors/openoffice.org-vcltesttool/Makefile editors/openoffice.org-vcltesttool/Makefile
index 6490b5b..fa46a0d 100644
--- editors/openoffice.org-vcltesttool/Makefile
+++ editors/openoffice.org-vcltesttool/Makefile
@@ -70,9 +70,9 @@ OOOCXX=		${CXX}
 .endif
 
 CONFIGURE_ENV+=	CC="${OOOCC}" CXX="${OOOCXX}"		\
-		CPPFLAGS="-I${LOCALBASE}/include"	\
-		LDFLAGS="-L${LOCALBASE}/lib" \
 		PATH=${WRKSRC}/solenv/bin:$$PATH
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 BUILD_DEPENDS+=	zip:${PORTSDIR}/archivers/zip \
 		${LOCALBASE}/bin/unzip:${PORTSDIR}/archivers/unzip \
diff --git editors/poedit/Makefile editors/poedit/Makefile
index 9c360c8..6f44235 100644
--- editors/poedit/Makefile
+++ editors/poedit/Makefile
@@ -28,14 +28,13 @@ WITH_BDB_HIGHEST=	yes
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \
-		WXRC="${WXRC_CMD}"
+CONFIGURE_ENV=	WXRC="${WXRC_CMD}"
 INSTALLS_ICONS=	yes
 
 MAN1=		poedit.1
 
-CPPFLAGS=	-I${BDB_INCLUDE_DIR} -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS=	-L${BDB_LIB_DIR} -L${LOCALBASE}/lib ${PTHREAD_LIBS}
+CPPFLAGS+=	-I${BDB_INCLUDE_DIR} -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS+=	-L${BDB_LIB_DIR} -L${LOCALBASE}/lib ${PTHREAD_LIBS}
 
 .include <bsd.port.pre.mk>
 
diff --git editors/rospell/Makefile editors/rospell/Makefile
index 08476e4..758a085 100644
--- editors/rospell/Makefile
+++ editors/rospell/Makefile
@@ -23,7 +23,7 @@ USE_XORG=	x11 xext
 USE_QT_VER=	3
 
 MAKE_ENV+=	PTHREAD_CFLAGS=${PTHREAD_CFLAGS} PTHREAD_LIBS=${PTHREAD_LIBS}
-CONFIGURE_ENV=	LDFLAGS="${LDFLAGS} ${PTHREAD_LIBS}"
+LDFLAGS+=	${PTHREAD_LIBS}
 
 MAKEFILE=	BSDmakefile
 
diff --git editors/scribes/Makefile editors/scribes/Makefile
index 305dfcd..c670718 100644
--- editors/scribes/Makefile
+++ editors/scribes/Makefile
@@ -22,8 +22,8 @@ USE_GMAKE=	yes
 USE_GNOME=	pygnomedesktop pygnomeextras gnomeprefix
 USE_PYTHON=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 GCONF_SCHEMAS=	scribes.schemas
 INSTALLS_ICONS=	yes
diff --git editors/texmacs/Makefile editors/texmacs/Makefile
index cfbf788..6fcd447 100644
--- editors/texmacs/Makefile
+++ editors/texmacs/Makefile
@@ -28,8 +28,8 @@ USE_ICONV=	yes
 USE_GMAKE=	yes
 USE_GHOSTSCRIPT=	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-optimize="${CXXFLAGS}" \
 		--with-iconv="${LOCALBASE}"
 
diff --git editors/vigor/Makefile editors/vigor/Makefile
index 02d4738..2c30466 100644
--- editors/vigor/Makefile
+++ editors/vigor/Makefile
@@ -21,7 +21,7 @@ USE_TK_BUILD=	yes
 USE_XORG=	x11
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--program-transform-name="s,0,1,"
-CONFIGURE_ENV+=	LDFLAGS="-L${LOCALBASE}/lib"
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/build
 CFLAGS+=	-I${LOCALBASE}/include/tcl${TCL_VER} -I${LOCALBASE}/include/tk${TK_VER}
diff --git editors/xmlcopyeditor/Makefile editors/xmlcopyeditor/Makefile
index 05f7577..b8aff2a 100644
--- editors/xmlcopyeditor/Makefile
+++ editors/xmlcopyeditor/Makefile
@@ -40,8 +40,8 @@ LIB_DEPENDS+=	xerces-c.27:${PORTSDIR}/textproc/xerces-c2 \
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 USE_AUTOTOOLS=	libtool
-CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include \
-			-I${LOCALBASE}/include/libxml2 ${PTHREAD_CFLAGS}" \
-		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CPPFLAGS+=	-I${LOCALBASE}/include \
+		-I${LOCALBASE}/include/libxml2 ${PTHREAD_CFLAGS}
+LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 
 .include <bsd.port.mk>
diff --git editors/xmleditor/Makefile editors/xmleditor/Makefile
index 8361f6e..125b9e4 100644
--- editors/xmleditor/Makefile
+++ editors/xmleditor/Makefile
@@ -21,8 +21,8 @@ USE_BISON=	build
 USE_GNOME=	gnomehack libglade
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 MAKE_ARGS=	ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \
 		AUTOHEADER="${TRUE}"
 USE_LDCONFIG=	yes
diff --git editors/zile/Makefile editors/zile/Makefile
index 279ee2c..bc61706 100644
--- editors/zile/Makefile
+++ editors/zile/Makefile
@@ -16,15 +16,14 @@ COMMENT=	Small emacs-like text editor
 USE_GMAKE=	yes
 USE_PERL5_BUILD=yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--without-included-regex
 
 MAN1=		${PORTNAME}.1
 PLIST_FILES=	bin/${PORTNAME} %%DATADIR%%/FAQ %%DATADIR%%/dotzile-extra.el
 PLIST_DIRS=	%%DATADIR%%
 
-CPPFLAGS=	-isystem /usr/include/gnu
-LDFLAGS=	-lgnuregex
+CPPFLAGS+=	-isystem /usr/include/gnu
+LDFLAGS+=	-lgnuregex
 
 post-patch:
 	@${REINPLACE_CMD} -e \
diff --git emulators/advancemame/Makefile emulators/advancemame/Makefile
index f6187ed3..a53b933 100644
--- emulators/advancemame/Makefile
+++ emulators/advancemame/Makefile
@@ -19,8 +19,8 @@ USE_GL=		yes
 USE_GMAKE=	yes
 USE_SDL=	sdl
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CFLAGS="${CFLAGS} -idirafter ${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+LDFLAGS+=	-L${LOCALBASE}/lib
+CFLAGS+=	-idirafter ${LOCALBASE}/include
 
 OPTIONS=	FREETYPE "Enable FreeType2 support" off \
 		SLANG "Enable sLang support (for video driver)" off
diff --git emulators/advancemenu/Makefile emulators/advancemenu/Makefile
index 302590b..f9423f8 100644
--- emulators/advancemenu/Makefile
+++ emulators/advancemenu/Makefile
@@ -19,7 +19,8 @@ USE_GL=		yes
 USE_GMAKE=	yes
 USE_SDL=	sdl
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 OPTIONS=	FREETYPE "Enable FreeType2 support" off \
 		SLANG "Enable sLang support (for video driver)" off
diff --git emulators/advancemess/Makefile emulators/advancemess/Makefile
index ba9e25f..a4ea872 100644
--- emulators/advancemess/Makefile
+++ emulators/advancemess/Makefile
@@ -20,8 +20,8 @@ USE_GL=		yes
 USE_GMAKE=	yes
 USE_SDL=	sdl
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CFLAGS="${CFLAGS} -idirafter ${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+LDFLAGS+=	-L${LOCALBASE}/lib
+CFLAGS+=	-idirafter ${LOCALBASE}/include
 
 OPTIONS=	FREETYPE "Enable FreeType2 support" off \
 		SLANG "Enable sLang support (for video driver)" off
diff --git emulators/atari800/Makefile emulators/atari800/Makefile
index 9751b48..7804e83 100644
--- emulators/atari800/Makefile
+++ emulators/atari800/Makefile
@@ -26,12 +26,11 @@ WRKSRC=		${WRKDIR}/${DISTNAME}/src
 
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	LDFLAGS="${LDFLAGS}"
 
 MAN1=		atari800.1
 
 CFLAGS+=	-I${LOCALBASE}/include/libpng
-LDFLAGS=	-L${LOCALBASE}/lib
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 ATARI_XF=	ataribas.rom atariosb.rom atarixl.rom demos1.xfd \
 		demos2.xfd dos25.xfd mydos45d.atr
diff --git emulators/bochs/Makefile emulators/bochs/Makefile
index 262789e..461a54d 100644
--- emulators/bochs/Makefile
+++ emulators/bochs/Makefile
@@ -19,7 +19,6 @@ LIB_DEPENDS=	asound.2:${PORTSDIR}/audio/alsa-lib
 
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
-CONFIGURE_ENV=	LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--disable-docbook
 
 OPTIONS=	A20_PIN "Enable support for A20 pin" on \
@@ -73,8 +72,8 @@ OPTIONS=	A20_PIN "Enable support for A20 pin" on \
 
 CFLAGS+=	-fno-exceptions -fomit-frame-pointer ${CPPFLAGS}
 CXXFLAGS+=	-fno-rtti
-CPPFLAGS=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 MANCOMPRESSED=	yes
 MAN1=		bochs.1 bochs-dlx.1 bxcommit.1 bximage.1
diff --git emulators/cingb/Makefile emulators/cingb/Makefile
index b1d3867..f2405e1 100644
--- emulators/cingb/Makefile
+++ emulators/cingb/Makefile
@@ -17,14 +17,13 @@ COMMENT=	Yet another Nintendo GameBoy(tm) emulator
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 USE_XORG=	x11 xext
-MAKE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 ALL_TARGET=	standard
 
 PORTDOCS=	README README.FAQ
 PLIST_FILES=	bin/cingb bin/cingb_conf
 
-CPPFLAGS=	${PTHREAD_CFLAGS}
-LDFLAGS=	${PTHREAD_LIBS}
+CPPFLAGS+=	${PTHREAD_CFLAGS}
+LDFLAGS+=	${PTHREAD_LIBS}
 
 .include <bsd.port.pre.mk>
 
diff --git emulators/dosbox/Makefile emulators/dosbox/Makefile
index cb8521e..b216ead 100644
--- emulators/dosbox/Makefile
+++ emulators/dosbox/Makefile
@@ -24,7 +24,6 @@ MAN1=		dosbox.1
 PKGMESSAGE=	${WRKDIR}/pkg-message
 
 CPPFLAGS+=		-I${LOCALBASE}/include
-CONFIGURE_ENV+=		CPPFLAGS="${CPPFLAGS}"
 CONFIGURE_ARGS+=	--enable-core-inline
 
 post-patch:
diff --git emulators/dynamips-community/Makefile emulators/dynamips-community/Makefile
index 2545bcf..ca4022b 100644
--- emulators/dynamips-community/Makefile
+++ emulators/dynamips-community/Makefile
@@ -32,8 +32,7 @@ MAKE_ENV=	\
 		DYNAMIPS_CODE=${DYNAMIPS_CODE} \
 		DYNAMIPS_ARCH=${DYNAMIPS_ARCH} \
 		PTHREAD_CFLAGS=${PTHREAD_CFLAGS} \
-		PTHREAD_LIBS=${PTHREAD_LIBS} \
-		LDFLAGS="${LDFLAGS}"
+		PTHREAD_LIBS=${PTHREAD_LIBS}
 
 .include <bsd.port.pre.mk>
 
diff --git emulators/dynamips-devel/Makefile emulators/dynamips-devel/Makefile
index f5ec350..fa8d871 100644
--- emulators/dynamips-devel/Makefile
+++ emulators/dynamips-devel/Makefile
@@ -24,8 +24,7 @@ USE_GMAKE=	yes
 ALL_TARGET=	${PORTNAME} nvram_export
 MAKE_ENV=	DYNAMIPS_ARCH=${DYNAMIPS_ARCH}\
 		PTHREAD_CFLAGS=${PTHREAD_CFLAGS}\
-		PTHREAD_LIBS=${PTHREAD_LIBS}\
-		LDFLAGS="${LDFLAGS}"
+		PTHREAD_LIBS=${PTHREAD_LIBS}
 MAKE_JOBS_UNSAFE=	yes
 
 PLIST_FILES=	bin/${PORTNAME} bin/nvram_export
diff --git emulators/dynamips/Makefile emulators/dynamips/Makefile
index 83b66e2..518f12c 100644
--- emulators/dynamips/Makefile
+++ emulators/dynamips/Makefile
@@ -20,8 +20,7 @@ USE_GMAKE=	yes
 ALL_TARGET=	${PORTNAME} nvram_export
 MAKE_ENV=	DYNAMIPS_ARCH=${DYNAMIPS_ARCH}\
 		PTHREAD_CFLAGS=${PTHREAD_CFLAGS}\
-		PTHREAD_LIBS=${PTHREAD_LIBS}\
-		LDFLAGS="${LDFLAGS}"
+		PTHREAD_LIBS=${PTHREAD_LIBS}
 MAKE_JOBS_UNSAFE=	yes
 
 PLIST_FILES=	bin/${PORTNAME} bin/nvram_export
diff --git emulators/frodo/Makefile emulators/frodo/Makefile
index 41d7338..fdfd81f 100644
--- emulators/frodo/Makefile
+++ emulators/frodo/Makefile
@@ -22,7 +22,6 @@ ALL_TARGET=	Frodo
 WRKNAME=	Frodo-4.1b
 WRKSRC=		${WRKDIR}/${WRKNAME}/Src
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV+=	CFLAGS="${CFLAGS}"
 .if !defined(WITHOUT_SDL)
 USE_SDL=	sdl
 .endif
diff --git emulators/fuse/Makefile emulators/fuse/Makefile
index 1047fe9..e83bdfc 100644
--- emulators/fuse/Makefile
+++ emulators/fuse/Makefile
@@ -24,8 +24,8 @@ GNU_CONFIGURE=	yes
 USE_GNOME=	libxml2 glib20 gtk20
 
 CONFIGURE_ARGS+=--without-alsa --without-joystick
-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=		fuse.1
 
diff --git emulators/gbe/Makefile emulators/gbe/Makefile
index 6189f89..1dbbe2d 100644
--- emulators/gbe/Makefile
+++ emulators/gbe/Makefile
@@ -18,12 +18,11 @@ COMMENT=	Nintendo GameBoy(tm) emulator with GNU source code
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 USE_XORG=	x11
-MAKE_ENV=	LDFLAGS="${LDFLAGS}"
 
 PLIST_FILES=	bin/gbe
 
-CPPFLAGS=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/gbe ${PREFIX}/bin
diff --git emulators/generator-cbiere/Makefile emulators/generator-cbiere/Makefile
index 2ffdb90..959ea75 100644
--- emulators/generator-cbiere/Makefile
+++ emulators/generator-cbiere/Makefile
@@ -32,8 +32,8 @@ OPTIONS=	OPTIMIZED_CFLAGS "Enable compilation optimizations" on \
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--program-transform-name=s/${PORTNAME}/${PORTNAME}${PKGNAMESUFFIX}/
 CONFIGURE_ARGS+=--with-gtk
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 PLIST_FILES=	bin/${PORTNAME}${PKGNAMESUFFIX}-gtk
 
diff --git emulators/generator/Makefile emulators/generator/Makefile
index 9aab06c..9ddc094 100644
--- emulators/generator/Makefile
+++ emulators/generator/Makefile
@@ -21,8 +21,8 @@ USE_SDL=	sdl
 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+=--with-gtk
 
 MAKE_ARGS=	ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \
diff --git emulators/gngb/Makefile emulators/gngb/Makefile
index 0afd856..cbd1ca3 100644
--- emulators/gngb/Makefile
+++ emulators/gngb/Makefile
@@ -17,12 +17,11 @@ COMMENT=	GameBoy(tm) emulator
 USE_SDL=	sdl
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 
 PLIST_FILES=	bin/gngb
 
-CPPFLAGS=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 MAN1=		gngb.1
 
diff --git emulators/gngeo/Makefile emulators/gngeo/Makefile
index bddebd6..fcfc98e 100644
--- emulators/gngeo/Makefile
+++ emulators/gngeo/Makefile
@@ -21,11 +21,10 @@ USE_GL=		yes
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--program-transform-name="" --disable-gp2x
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 MAKE_JOBS_UNSAFE=	yes
 
-CPPFLAGS=	${CFLAGS} `${SDL_CONFIG} --cflags` -I${LOCALBASE}/include
-LDFLAGS=	`${SDL_CONFIG} --libs` -L${LOCALBASE}/lib
+CPPFLAGS+=	${CFLAGS} `${SDL_CONFIG} --cflags` -I${LOCALBASE}/include
+LDFLAGS+=	`${SDL_CONFIG} --libs` -L${LOCALBASE}/lib
 
 SUB_FILES=	pkg-message
 
diff --git emulators/gnuboy/Makefile emulators/gnuboy/Makefile
index 6e2f9e0..b2012ef 100644
--- emulators/gnuboy/Makefile
+++ emulators/gnuboy/Makefile
@@ -23,15 +23,14 @@ LIB_DEPENDS=	vga.1:${PORTSDIR}/graphics/svgalib
 USE_SDL=	sdl
 USE_XORG=	x11
 USE_AUTOTOOLS=	autoconf
-CONFIGURE_ENV=	LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--with-sdl
 MAKE_JOBS_SAFE=	yes
 
 PORTDOCS=	*
 PLIST_FILES=	bin/sdlgnuboy bin/sgnuboy bin/xgnuboy
 
-CPPFLAGS=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 do-install:
 .for file in sdlgnuboy sgnuboy xgnuboy
diff --git emulators/gxmame/Makefile emulators/gxmame/Makefile
index 4b08f4f..53ab5ef 100644
--- emulators/gxmame/Makefile
+++ emulators/gxmame/Makefile
@@ -23,7 +23,7 @@ USE_GNOME=	gtk20 intlhack gnomehack gnomeprefix
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 
-CONFIGURE_ENV=	LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
+LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--with-xmame-dir=${LOCALBASE}/share/xmame
 
 .if defined(WITHOUT_NLS)
diff --git emulators/hugo/Makefile emulators/hugo/Makefile
index 2b5b9a2..e8912af 100644
--- emulators/hugo/Makefile
+++ emulators/hugo/Makefile
@@ -20,7 +20,7 @@ GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_SDL=	sdl
 LDFLAGS+=	-L${LOCALBASE}/lib
-CONFIGURE_ENV+=	SDL_CONFIG="${SDL_CONFIG}" LDFLAGS="${LDFLAGS}"
+CONFIGURE_ENV+=	SDL_CONFIG="${SDL_CONFIG}"
 
 .if !defined(WITHOUT_NETPLAY)
 USE_SDL+=	net
diff --git emulators/jzintv/Makefile emulators/jzintv/Makefile
index 75bfaed..f63185d 100644
--- emulators/jzintv/Makefile
+++ emulators/jzintv/Makefile
@@ -25,7 +25,6 @@ USE_SDL=	sdl
 USE_ZIP=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include `${SDL_CONFIG} --cflags`
 LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS} `${SDL_CONFIG} --libs`
-MAKE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 
 OPTIONS=	TOOLS "Install additional tools" off
 TOOLS=		as1600 crc32 dasm1600 dis1600 frombit_r gms2rom imvtoppm rom2bin \
diff --git emulators/mednafen/Makefile emulators/mednafen/Makefile
index d976cbd..39eb2ed 100644
--- emulators/mednafen/Makefile
+++ emulators/mednafen/Makefile
@@ -27,7 +27,6 @@ USE_XORG=	x11
 USE_GL=		glut
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD}
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 WRKSRC=	${WRKDIR}/${PORTNAME}
 SUB_FILES=	pkg-message
 
diff --git emulators/mtools/Makefile emulators/mtools/Makefile
index a45d3f4..4434fe4 100644
--- emulators/mtools/Makefile
+++ emulators/mtools/Makefile
@@ -18,8 +18,7 @@ COMMENT=	A collection of tools for manipulating MSDOS files
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \
-		ac_cv_header_malloc_h=no
+CONFIGURE_ENV=	ac_cv_header_malloc_h=no
 CONFIGURE_ARGS=	--enable-xdf
 
 SUB_FILES=	pkg-message
diff --git emulators/o2em/Makefile emulators/o2em/Makefile
index ed459c5..8809c6a 100644
--- emulators/o2em/Makefile
+++ emulators/o2em/Makefile
@@ -23,7 +23,7 @@ WRKSRC=			${WRKDIR}/o2em117src
 MAKEFILE=		Makefile.freebsd
 USE_ZIP=		yes
 USE_GMAKE=		yes
-MAKE_ENV=		LDFLAGS="${PTHREAD_LIBS}"
+LDFLAGS+=		${PTHREAD_LIBS}
 
 post-extract:
 	@${FIND} -E ${WRKDIR} -type f -iregex ".*\.(c|h|txt)" -print0 | \
diff --git emulators/open-vm-tools/Makefile emulators/open-vm-tools/Makefile
index 344b627..485d47b 100644
--- emulators/open-vm-tools/Makefile
+++ emulators/open-vm-tools/Makefile
@@ -42,8 +42,8 @@ CONFIGURE_ARGS+=	--disable-unity
 .endif
 LIB_DEPENDS+=		gtkmm-2.4:${PORTSDIR}/x11-toolkits/gtkmm24
 CONFIGURE_ARGS+=	--with-x
-CONFIGURE_ENV+=		LDFLAGS="-L${LOCALBASE}/lib" \
-			CPPFLAGS="-I${LOCALBASE}/include"
+CPPFLAGS+=		-I${LOCALBASE}/include
+LDFLAGS+=		-L${LOCALBASE}/lib
 USE_XORG=		x11 ice sm xext xineramaproto xinerama xrandr xrender \
 			xtst
 USE_GNOME=		gtk20 glib20
diff --git emulators/pcsxr/Makefile emulators/pcsxr/Makefile
index 5c22eee..75aa67f 100644
--- emulators/pcsxr/Makefile
+++ emulators/pcsxr/Makefile
@@ -33,7 +33,6 @@ GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 USE_CSTD=	gnu89
-CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--enable-opengl --enable-libcdio
 USE_LDCONFIG=	yes
 
diff --git emulators/qemu-devel/Makefile emulators/qemu-devel/Makefile
index 827c319..44067d3 100644
--- emulators/qemu-devel/Makefile
+++ emulators/qemu-devel/Makefile
@@ -29,7 +29,7 @@ USE_PYTHON=	yes
 USE_GNOME=	glib20
 USE_PERL5_BUILD=	yes
 PATCH_STRIP=	-p1
-MAKE_ENV+=	BSD_MAKE="${MAKE}" LDFLAGS="${LDFLAGS}"
+MAKE_ENV+=	BSD_MAKE="${MAKE}"
 MAN1=		qemu.1 qemu-img.1
 MAN8=		qemu-nbd.8
 ONLY_FOR_ARCHS=	amd64 i386 powerpc # XXX someone wants to debug sparc64 hosts?
diff --git emulators/qemu/Makefile emulators/qemu/Makefile
index d99a5b7..7badffb 100644
--- emulators/qemu/Makefile
+++ emulators/qemu/Makefile
@@ -21,7 +21,7 @@ HAS_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_PERL5_BUILD=	yes
 PATCH_STRIP=	-p1
-MAKE_ENV+=	BSD_MAKE="${MAKE}" LDFLAGS="${LDFLAGS}"
+MAKE_ENV+=	BSD_MAKE="${MAKE}"
 MAN1=		qemu.1 qemu-img.1
 ONLY_FOR_ARCHS=	amd64 i386
 CONFLICTS=	qemu-devel-[0-9]*
diff --git emulators/snes9x-gtk/Makefile emulators/snes9x-gtk/Makefile
index 1c8c47e..212bd86 100644
--- emulators/snes9x-gtk/Makefile
+++ emulators/snes9x-gtk/Makefile
@@ -26,8 +26,8 @@ USE_GNOME=	gtk20 desktopfileutils pkgconfig intltool libglade2 libxml2
 GNU_CONFIGURE=	yes
 USE_GETTEXT=	yes
 USE_SDL=	sdl
-CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS+=	--without-alsa
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/gtk
diff --git emulators/snes9x/Makefile emulators/snes9x/Makefile
index 449b5e8..5aecba0 100644
--- emulators/snes9x/Makefile
+++ emulators/snes9x/Makefile
@@ -23,8 +23,8 @@ USE_XORG=	x11 sm ice xext
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--without-extensions
-CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 MAKE_ARGS=	INCLUDES="-I${WRKSRC}/unzip -I${WRKSRC} -I${LOCALBASE}/include \
 		${PTHREAD_CFLAGS}" LDLIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" \
 		OPTIMISE="${CXXFLAGS}"
diff --git emulators/stella/Makefile emulators/stella/Makefile
index 0909f77..0f3e6cd 100644
--- emulators/stella/Makefile
+++ emulators/stella/Makefile
@@ -22,8 +22,8 @@ USE_SDL=	sdl
 USE_GMAKE=	yes
 HAS_CONFIGURE=	yes
 
-CPPFLAGS=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 post-patch:
 	@${REINPLACE_CMD} -e \
diff --git emulators/tiemu3/Makefile emulators/tiemu3/Makefile
index f727882..d1c77d4 100644
--- emulators/tiemu3/Makefile
+++ emulators/tiemu3/Makefile
@@ -28,7 +28,6 @@ USE_SDL=	sdl
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib -export-dynamic
 CONFIGURE_ARGS=	--disable-gdb
-CONFIGURE_ENV=	LDFLAGS="${LDFLAGS}"
 
 MAN1=		tiemu.1
 
diff --git emulators/vice/Makefile emulators/vice/Makefile
index 0e0b3bd..62a88cb 100644
--- emulators/vice/Makefile
+++ emulators/vice/Makefile
@@ -56,7 +56,6 @@ CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 CPPFLAGS+=	-I${LOCALBASE}/include
 PKG_CONFIG?=	${LOCALBASE}/bin/pkg-config
-CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ENV+=	PKG_CONFIG="${LOCALBASE}/bin/pkg-config"
 CONFIGURE_ARGS+=	--enable-fullscreen --enable-ipv6 --disable-dependency-tracking
 MAN1=		vice.1 c1541.1 petcat.1
diff --git emulators/visualos/Makefile emulators/visualos/Makefile
index b6e3e63..dcc9279 100644
--- emulators/visualos/Makefile
+++ emulators/visualos/Makefile
@@ -17,8 +17,8 @@ COMMENT=	A visual simulator of an operating system to help understand how OSes w
 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=		VisualOS.1
 
diff --git emulators/wine/Makefile emulators/wine/Makefile
index fac405b..b367f1a 100644
--- emulators/wine/Makefile
+++ emulators/wine/Makefile
@@ -28,7 +28,7 @@ LIB_DEPENDS=	fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig \
 		png.6:${PORTSDIR}/graphics/png \
 		xml2:${PORTSDIR}/textproc/libxml2
 
-CPPFLAGS=	"-I${LOCALBASE}/include"
+CPPFLAGS+=	"-I${LOCALBASE}/include"
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--verbose --disable-tests \
 		--without-alsa --without-capi --with-glu \
@@ -36,8 +36,8 @@ CONFIGURE_ARGS+=--verbose --disable-tests \
 		--with-opengl --without-mpg123 --with-oss --without-sane \
 		--without-v4l --without-xcomposite --without-xinerama \
 		--with-xrandr
-CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib" \
-		FLEX="${LOCALBASE}/bin/flex"
+CONFIGURE_ENV=	FLEX="${LOCALBASE}/bin/flex"
+LDFLAGS+=	-L${LOCALBASE}/lib
 WINELIBDIR?=	${PREFIX}/lib
 .if !defined(USE_LDCONFIG32)
 USE_LDCONFIG=	${WINELIBDIR} ${WINELIBDIR}/wine
diff --git emulators/x48/Makefile emulators/x48/Makefile
index 710ea2d..e416f90 100644
--- emulators/x48/Makefile
+++ emulators/x48/Makefile
@@ -20,7 +20,7 @@ COMMENT=	An HP48 SX/GX graphic calculator emulator
 LICENSE=	GPLv3
 
 GNU_CONFIGURE=	yes
-CPPFLAGS=	-I${LOCALBASE}/include
+CPPFLAGS+=	-I${LOCALBASE}/include
 CONFIGURE_ENV=	LIBS=-lutil
 USE_GMAKE=	yes
 USE_XORG=	x11 xext xt
diff --git emulators/xcpc/Makefile emulators/xcpc/Makefile
index 9c61e3b..ebd6a17 100644
--- emulators/xcpc/Makefile
+++ emulators/xcpc/Makefile
@@ -15,7 +15,8 @@ MAINTAINER=	pixel@hugbox.org
 COMMENT=	A portable Amstrad 464&/664/6128 emulator
 
 HAS_CONFIGURE=	yes
-CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS+=--prefix=${PREFIX}
 
 USE_XORG=	ice
diff --git emulators/xsystem35/Makefile emulators/xsystem35/Makefile
index b414c7a..187fab3 100644
--- emulators/xsystem35/Makefile
+++ emulators/xsystem35/Makefile
@@ -35,8 +35,8 @@ CONFIGURE_ARGS=	--without-included-gettext \
 		--with-cachesize=20 \
 		--enable-midi=seq,extp,raw \
 		--enable-cdrom=bsd,mp3
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .if ${HAVE_GNOME:Mesound}!=""
 USE_GNOME+=	esound
diff --git emulators/zsnes/Makefile emulators/zsnes/Makefile
index 02316ee..5fd614d4 100644
--- emulators/zsnes/Makefile
+++ emulators/zsnes/Makefile
@@ -36,7 +36,6 @@ USE_SDL=	sdl
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--disable-cpucheck
-CONFIGURE_ENV=	CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 
 MAN1=		zsnes.1
 PLIST_FILES=	bin/zsnes
diff --git finance/aqbanking/Makefile finance/aqbanking/Makefile
index 4b8af49..ceeb727 100644
--- finance/aqbanking/Makefile
+++ finance/aqbanking/Makefile
@@ -30,7 +30,6 @@ OPTIONS=	APIDOC "Full API documentation (requires Doxygen)" off \
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-release="yes"
-CONFIGURE_ENV=	LDFLAGS="${LDFLAGS}"
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 MAKE_JOBS_UNSAFE=	yes
diff --git finance/gnofin/Makefile finance/gnofin/Makefile
index 354ab48..ac22c38 100644
--- finance/gnofin/Makefile
+++ finance/gnofin/Makefile
@@ -19,8 +19,8 @@ USE_GNOME=	gnomehack gnomelibs gnomeprefix
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .if !defined(WITHOUT_NLS)
 USE_GETTEXT=yes
diff --git finance/gnucash-docs/Makefile finance/gnucash-docs/Makefile
index 55d348f..ce13df9 100644
--- finance/gnucash-docs/Makefile
+++ finance/gnucash-docs/Makefile
@@ -24,6 +24,6 @@ INSTALLS_OMF=	yes
 USE_GMAKE=	yes
 USE_GNOME=	libxml2 gnomehier
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include"
+CPPFLAGS+=	-I${LOCALBASE}/include
 
 .include <bsd.port.mk>
diff --git finance/gnucash/Makefile finance/gnucash/Makefile
index b7da8a7..ad6eca6 100644
--- finance/gnucash/Makefile
+++ finance/gnucash/Makefile
@@ -45,7 +45,7 @@ USE_GNOME=	gnomeprefix libglade2 libgnomeui
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
-CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib"
+LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--disable-error-on-warning \
 		--disable-doxygen
 
diff --git finance/grisbi/Makefile finance/grisbi/Makefile
index 90981ce..3c5bdec 100644
--- finance/grisbi/Makefile
+++ finance/grisbi/Makefile
@@ -27,8 +27,8 @@ INSTALLS_ICONS=	yes
 
 MAN1=		grisbi.1
 
-CPPFLAGS=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 
 .if defined(WITHOUT_NLS)
 CONFIGURE_ARGS+=--disable-nls
diff --git finance/homebank/Makefile finance/homebank/Makefile
index f01e413..9449e7b 100644
--- finance/homebank/Makefile
+++ finance/homebank/Makefile
@@ -22,11 +22,10 @@ USE_GNOME=	desktopfileutils gnomehier gtk20
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 INSTALLS_ICONS=	yes
 
-CPPFLAGS=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
+CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 
 .include <bsd.port.pre.mk>
 
diff --git finance/ledger/Makefile finance/ledger/Makefile
index 81851c2..a03c03f 100644
--- finance/ledger/Makefile
+++ finance/ledger/Makefile
@@ -25,7 +25,6 @@ USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include/w3c-libwww
 LDFLAGS+=	-L${LOCALBASE}/lib
-CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS}"
 
 NO_INSTALL_MANPAGES=	yes
 INFO=	ledger
diff --git finance/libofx/Makefile finance/libofx/Makefile
index 163b03c..ba18004 100644
--- finance/libofx/Makefile
+++ finance/libofx/Makefile
@@ -21,15 +21,14 @@ USE_ICONV=	yes
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	aclocal autoheader automake autoconf libtool
 ACLOCAL_ARGS=	-I m4
-CONFIGURE_ENV=	LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--disable-doxygen --disable-dot --disable-gengetopt \
 		--with-opensp-includes=${LOCALBASE}/include/OpenSP \
 		--with-opensp-libs=${LOCALBASE}/lib
 MAKE_JOBS_SAFE=	yes
 USE_LDCONFIG=	yes
 
-CPPFLAGS=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
diff --git finance/quantlib/Makefile finance/quantlib/Makefile
index 5d12119..b8b492f 100644
--- finance/quantlib/Makefile
+++ finance/quantlib/Makefile
@@ -21,9 +21,8 @@ WRKSRC=		${WRKDIR}/QuantLib-${PORTVERSION}
 
 USE_AUTOTOOLS=	libtool
 GNU_CONFIGURE=	yes
-CPPFLAGS=	${PTHREAD_CFLAGS} -I${LOCALBASE}/include
-LDFLAGS=	${PTHREAD_LIBS} -L${LOCALBASE}/lib
-MAKE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
+CPPFLAGS+=	${PTHREAD_CFLAGS} -I${LOCALBASE}/include
+LDFLAGS+=	${PTHREAD_LIBS} -L${LOCALBASE}/lib
 USE_LDCONFIG=	yes
 
 MAN1=		quantlib-config.1 quantlib-test-suite.1
diff --git finance/quantlib/pkg-plist finance/quantlib/pkg-plist
index b3b55ea..aa7dce9 100644
--- finance/quantlib/pkg-plist
+++ finance/quantlib/pkg-plist
@@ -1,4 +1,5 @@
 bin/quantlib-config
+bin/quantlib-test-suite
 include/ql/auto_link.hpp
 include/ql/cashflow.hpp
 include/ql/cashflows/all.hpp
diff --git french/med/Makefile french/med/Makefile
index f97c9d3..d25836a 100644
--- french/med/Makefile
+++ french/med/Makefile
@@ -27,8 +27,10 @@ SHORT_TK_VER=	${TK_VER:S/.//}
 USE_FORTRAN=	yes
 FFLAGS+=	-O2
 
-CONFIGURE_ENV=	HDF5HOME=${LOCALBASE} CPPFLAGS="${PTHREAD_CFLAGS}"	\
-		LDFLAGS="${PTHREAD_LIBS}" WISH=${LOCALBASE}/bin/wish${TK_VER}
+CONFIGURE_ENV=	HDF5HOME=${LOCALBASE} 	\
+		WISH=${LOCALBASE}/bin/wish${TK_VER}
+CPPFLAGS+=	${PTHREAD_CFLAGS}
+LDFLAGS+=	${PTHREAD_LIBS}
 CONFIGURE_ARGS=	--with-f90=${FC} --docdir=${DOCSDIR}
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
diff --git french/verbiste/Makefile french/verbiste/Makefile
index 67fbd6d..40fb054 100644
--- french/verbiste/Makefile
+++ french/verbiste/Makefile
@@ -23,9 +23,8 @@ USE_GNOME=	gnomehack ltverhack libxml2
 USE_ICONV=	yes
 USE_LDCONFIG=	yes
 
-CPPFLAGS=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 MAN1=		french-conjugator.1 french-deconjugator.1
 MAN3=		verbiste.3
diff --git ftp/curl/Makefile ftp/curl/Makefile
index 842c414..bc437ae 100644
--- ftp/curl/Makefile
+++ ftp/curl/Makefile
@@ -151,7 +151,6 @@ CONFIGURE_ARGS+=	--enable-ldap
 USE_OPENLDAP=	yes
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
-ADDFLAGS=	true
 .if defined(WITH_LDAPS)
 CONFIGURE_ARGS+=	--enable-ldaps
 .else
@@ -205,9 +204,6 @@ CONFIGURE_ARGS+=	--disable-proxy
 .endif
 
 CONFIGURE_ENV+=	LOCALBASE="${LOCALBASE}"
-.if defined(ADDFLAGS)
-CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS}"
-.endif
 
 DOCS=		BINDINGS BUGS CONTRIBUTE DISTRO-DILEMMA FAQ FEATURES \
 		HISTORY INSTALL INSTALL.devcpp INTERNALS KNOWN_BUGS \
diff --git ftp/curlpp/Makefile ftp/curlpp/Makefile
index 8e2596f..5ff5a95 100644
--- ftp/curlpp/Makefile
+++ ftp/curlpp/Makefile
@@ -19,8 +19,8 @@ COMMENT=	A C++ wrapper for libcurl
 LIB_DEPENDS=	curl.6:${PORTSDIR}/ftp/curl
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--disable-ewarning --without-boost
 USE_LDCONFIG=	yes
 
diff --git ftp/filezilla/Makefile ftp/filezilla/Makefile
index 8064887..d56becf 100644
--- ftp/filezilla/Makefile
+++ ftp/filezilla/Makefile
@@ -33,7 +33,7 @@ WX_CONF_ARGS=	relative
 WX_UNICODE=	yes
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
-CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib"
+LDFLAGS+=	-L${LOCALBASE}/lib
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 MAN1=		filezilla.1 fzputtygen.1 fzsftp.1
diff --git ftp/frox/Makefile ftp/frox/Makefile
index ba51e01..86c5eca 100644
--- ftp/frox/Makefile
+++ ftp/frox/Makefile
@@ -57,7 +57,7 @@ WITH_CCP=	yes
 CONFIGURE_ARGS+=	--enable-ipfilter
 .endif
 .if defined(WITH_PF)
-CONFIGURE_ENV+=		"CPPFLAGS=-DPF"
+CPPFLAGS+=		-DPF
 .endif
 .if defined(WITH_VIRUS_SCAN)
 CONFIGURE_ARGS+=	--enable-virus-scan
diff --git ftp/gftp/Makefile ftp/gftp/Makefile
index c027a1b..5fa5eb5 100644
--- ftp/gftp/Makefile
+++ ftp/gftp/Makefile
@@ -19,8 +19,8 @@ COMMENT=	A free multithreaded GTK-based GUI ftp and sftp client
 GNU_CONFIGURE=	yes
 
 CONFIGURE_ARGS=	--without-included-gettext
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
 
 WANT_GNOME=	yes
 
diff --git ftp/gwget/Makefile ftp/gwget/Makefile
index 760beda..607229f 100644
--- ftp/gwget/Makefile
+++ ftp/gwget/Makefile
@@ -28,8 +28,8 @@ USE_GNOME=	gnomeprefix gnomehack gtk20 gconf2 libgnomeui \
 		desktopfileutils
 INSTALLS_ICONS=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 GCONF_SCHEMAS=	${PORTNAME}.schemas
 
diff --git ftp/kbear/Makefile ftp/kbear/Makefile
index 286118a..187a10c 100644
--- ftp/kbear/Makefile
+++ ftp/kbear/Makefile
@@ -24,7 +24,8 @@ USE_KDELIBS_VER=3
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
-CONFIGURE_ENV=	XML2POT=${TRUE} PO2XML=${TRUE} LDFLAGS="${PTHREAD_LIBS}"
+CONFIGURE_ENV=	XML2POT=${TRUE} PO2XML=${TRUE}
+LDFLAGS+=	${PTHREAD_LIBS}
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|-O2|-fPIC|g; s|-lpthread|${PTHREAD_LIBS}|g' \
diff --git ftp/pavuk/Makefile ftp/pavuk/Makefile
index 6ead7be..2f361b6 100644
--- ftp/pavuk/Makefile
+++ ftp/pavuk/Makefile
@@ -18,15 +18,14 @@ USE_BZIP2=	yes
 WANT_GNOME=	yes
 USE_OPENSSL=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--with-locale-dir=${PREFIX}/share/locale \
 		--disable-debug --disable-gnome --disable-js \
 		--enable-utf-8 --enable-threads
 
 MAN1=		pavuk.1
 
-CPPFLAGS=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .include <bsd.port.pre.mk>
 
diff --git ftp/pureadmin/Makefile ftp/pureadmin/Makefile
index 95cc57d..ef05507 100644
--- ftp/pureadmin/Makefile
+++ ftp/pureadmin/Makefile
@@ -20,11 +20,10 @@ USE_FAM=	yes
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 INSTALLS_ICONS=	yes
 
-CPPFLAGS=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
+CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 
 PORTDOCS=	index.txt introduction.txt main_window.txt \
 		preferences.txt user_manager.txt
diff --git ftp/quftp/Makefile ftp/quftp/Makefile
index 3efcfa0..e212ac8 100644
--- ftp/quftp/Makefile
+++ ftp/quftp/Makefile
@@ -19,7 +19,6 @@ LIB_DEPENDS=	readline.6:${PORTSDIR}/devel/readline
 GNU_CONFIGURE=	yes
 
 CFLAGS+=	${PTHREAD_CFLAGS} -L${LOCALBASE}/lib ${PTHREAD_LIBS}
-CONFIGURE_ENV=	CFLAGS="${CFLAGS}"
 
 MAN1=		quftp.1
 PLIST_FILES=	bin/quftp
diff --git ftp/rexx-curl/Makefile ftp/rexx-curl/Makefile
index da0bf73..bd4057e 100644
--- ftp/rexx-curl/Makefile
+++ ftp/rexx-curl/Makefile
@@ -23,7 +23,8 @@ RUN_DEPENDS=	rexx:${PORTSDIR}/lang/rexx-regina
 
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${PTHREAD_CFLAGS}" LDFLAGS="${PTHREAD_LIBS}"
+CPPFLAGS+=	${PTHREAD_CFLAGS}
+LDFLAGS+=	${PTHREAD_LIBS}
 CONFIGURE_ARGS=	--with-rexx=regina
 USE_LDCONFIG=	yes
 
diff --git ftp/urlgfe/Makefile ftp/urlgfe/Makefile
index e3376c9..ab08b4b 100644
--- ftp/urlgfe/Makefile
+++ ftp/urlgfe/Makefile
@@ -20,7 +20,7 @@ USE_GNOME=	gtk20 lthack
 WANT_GNOME=	yes
 USE_OPENSSL=	yes
 USE_AUTOTOOLS=	libtool
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include"
+CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 .include <bsd.port.pre.mk>
diff --git ftp/vsftpd-ext/Makefile ftp/vsftpd-ext/Makefile
index 8ae8bf2..8d32a73 100644
--- ftp/vsftpd-ext/Makefile
+++ ftp/vsftpd-ext/Makefile
@@ -51,8 +51,6 @@ WITH_OPENSSL_PORT=	yes
 SSL_SUFFIX=	-ssl
 CFLAGS+=	-I${OPENSSLINC}
 LDFLAGS+=	-L${OPENSSLLIB}
-.else
-MAKE_ENV+=	LDFLAGS="${LDFLAGS}"
 .endif
 
 do-configure:
diff --git ftp/vsftpd/Makefile ftp/vsftpd/Makefile
index 4a9d2ec..bf112a3 100644
--- ftp/vsftpd/Makefile
+++ ftp/vsftpd/Makefile
@@ -40,8 +40,6 @@ USE_RC_SUBR=	vsftpd.sh
 SSL_SUFFIX=	-ssl
 CFLAGS+=	-I${OPENSSLINC}
 LDFLAGS+=	-L${OPENSSLLIB}
-.else
-MAKE_ENV+=	LDFLAGS="${LDFLAGS}"
 .endif
 
 .if defined(WITH_PIDFILE)
diff --git ftp/wget/Makefile ftp/wget/Makefile
index 63326f7..6cffc21 100644
--- ftp/wget/Makefile
+++ ftp/wget/Makefile
@@ -20,8 +20,6 @@ USE_XZ=		yes
 USE_GMAKE=	yes
 USE_PERL5_BUILD=yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}" \
-		LDFLAGS="${LDFLAGS}"
 MAKE_JOBS_SAFE=	yes
 
 OPTIONS=	GNUTLS "Support for SSL via GnuTLS" Off \
diff --git ftp/wgetpro/Makefile ftp/wgetpro/Makefile
index 421a7d3..405f937 100644
--- ftp/wgetpro/Makefile
+++ ftp/wgetpro/Makefile
@@ -20,7 +20,6 @@ RESTRICTED=	"may implement United States Patent 6,041,345"
 USE_OPENSSL=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 
 .if defined(WITHOUT_NLS)
 CONFIGURE_ARGS+=	--disable-nls
diff --git ftp/wput/Makefile ftp/wput/Makefile
index 9e7675c..bea0d75 100644
--- ftp/wput/Makefile
+++ ftp/wput/Makefile
@@ -20,9 +20,8 @@ PORTEXAMPLES=	USAGE.examples USAGE.resumehandling USAGE.urlhandling \
 		passwordfile wputrc
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="${LDFLAGS}" \
-		LIBS="${LDFLAGS}"
+CONFIGURE_ENV=	LIBS="${LDFLAGS}"
+CFLAGS+=	-I${LOCALBASE}/include
 MAKE_JOBS_UNSAFE=yes
 
 OPTIONS=	TLS "Enable TLS support" On \
diff --git ftp/wzdftpd/Makefile ftp/wzdftpd/Makefile
index 7081df9..a700458 100644
--- ftp/wzdftpd/Makefile
+++ ftp/wzdftpd/Makefile
@@ -21,8 +21,8 @@ GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 USE_GNOME=	pkgconfig ltverhack
 CONFIGURE_ARGS+=	--without-pam --disable-pgsql --disable-bonjour
-CONFIGURE_ENV=	CPPFLAGS="${CPPLAGS} -I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
-		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 PKGMESSAGE=	${WRKDIR}/pkg-message
 
 OPTIONS=	UTF8 "Enable UTF8 support" off \
diff --git games/8kingdoms/Makefile games/8kingdoms/Makefile
index 613fcbf..37cd62f 100644
--- games/8kingdoms/Makefile
+++ games/8kingdoms/Makefile
@@ -26,7 +26,6 @@ GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 CONFIGURE_ARGS+=	--datadir=${DATADIR}
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 
 PLIST=		${WRKDIR}/pkg-plist
 SUB_FILES=	pkg-message
diff --git games/abuse_sdl/Makefile games/abuse_sdl/Makefile
index 1a7854a..d179a51 100644
--- games/abuse_sdl/Makefile
+++ games/abuse_sdl/Makefile
@@ -22,13 +22,12 @@ USE_GL=		gl
 USE_SDL=	mixer sdl
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--with-assetdir=${DATADIR} --enable-release
 MAKE_JOBS_SAFE=	yes
 
 MAN6=		abuse.6 abuse-tool.6
 
-CPPFLAGS=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .include <bsd.port.mk>
diff --git games/adgali/Makefile games/adgali/Makefile
index 92d5c3e..eb7e7415 100644
--- games/adgali/Makefile
+++ games/adgali/Makefile
@@ -27,8 +27,8 @@ USE_SDL=	sdl
 USE_XORG=	xpm
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib -lexecinfo"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib -lexecinfo
 CONFIGURE_ARGS=	--enable-compile-optim=no
 USE_LDCONFIG=	yes
 
diff --git games/adonthell/Makefile games/adonthell/Makefile
index 2fd1876..7350900 100644
--- games/adonthell/Makefile
+++ games/adonthell/Makefile
@@ -24,14 +24,13 @@ USE_PYTHON=	yes
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \
-		PYPACKAGE="${PYTHON_CMD}" ac_cv_path_P_SWIG=no
+CONFIGURE_ENV=	PYPACKAGE="${PYTHON_CMD}" ac_cv_path_P_SWIG=no
 CONFIGURE_ARGS=	--disable-py-debug
 
 PLIST_SUB=	VERSION="${PORTVERSION:R}"
 
-CPPFLAGS=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
+CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 
 WEDGE_VERSION=	0.3.4
 
diff --git games/afternoonstalker/Makefile games/afternoonstalker/Makefile
index 352fb0c..48161af 100644
--- games/afternoonstalker/Makefile
+++ games/afternoonstalker/Makefile
@@ -20,9 +20,8 @@ LICENSE=	GPLv2
 
 USE_SDL=	mixer sdl
 GNU_CONFIGURE=	yes
-CPPFLAGS=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 MAN6=		afternoonstalker.6
 PORTDOCS=	AUTHORS COPYING INSTALL NEWS README THANKS TODO
diff --git games/alephone/Makefile games/alephone/Makefile
index 4ec0f7a..534179c 100644
--- games/alephone/Makefile
+++ games/alephone/Makefile
@@ -24,8 +24,8 @@ USE_GL=		yes
 USE_LUA=	5.1
 USE_SDL=	image ttf net sdl sound
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${LUA_INCDIR}" \
-		LDFLAGS="-L${LOCALBASE}/lib -L${LUA_LIBDIR}"
+CPPFLAGS+=	-I${LOCALBASE}/include -I${LUA_INCDIR}
+LDFLAGS+=	-L${LOCALBASE}/lib -L${LUA_LIBDIR}
 
 DATADIR=	${PREFIX}/share/AlephOne
 
diff --git games/alienarena/Makefile games/alienarena/Makefile
index 05c4e7a..5ae8a18 100644
--- games/alienarena/Makefile
+++ games/alienarena/Makefile
@@ -26,8 +26,8 @@ USE_DOS2UNIX=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_WRKSRC=${WRKDIR}/${PORTNAME}-7.51/
-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}
 CONFIGURE_ARGS+=--with-xf86vm \
 		--with-xf86dga
 		
diff --git games/allacrost/Makefile games/allacrost/Makefile
index f7f9d3f..b4a9682 100644
--- games/allacrost/Makefile
+++ games/allacrost/Makefile
@@ -35,8 +35,8 @@ USE_GETTEXT=	yes
 MAKE_JOBS_SAFE=	yes
 
 CONFIGURE_ARGS=	--datadir=${DATADIR}
-CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib -L${LUA_LIBDIR}" \
-		CPPFLAGS="-I${LOCALBASE}/include -I${LUA_INCDIR}"
+CPPFLAGS+=	-I${LOCALBASE}/include -I${LUA_INCDIR}
+LDFLAGS+=	-L${LOCALBASE}/lib -L${LUA_LIBDIR}
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
diff --git games/antrix/Makefile games/antrix/Makefile
index 54044cc..9f3bb56 100644
--- games/antrix/Makefile
+++ games/antrix/Makefile
@@ -27,7 +27,6 @@ USE_LDCONFIG=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--prefix=${PREFIX} --sysconfdir=${PREFIX}/etc --datadir=${PREFIX}/share
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 
 run-autotools-automake:
 	@(cd ${CONFIGURE_WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${AUTOMAKE} ${AUTOMAKE_ARGS})
diff --git games/apricots/Makefile games/apricots/Makefile
index fbd3bf5..6f550b8 100644
--- games/apricots/Makefile
+++ games/apricots/Makefile
@@ -21,7 +21,8 @@ USE_GMAKE=	yes
 USE_SDL=	sdl
 MAKE_JOBS_SAFE=	yes
 
-CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib" CPPFLAGS="-I${LOCALBASE}/include"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 PORTDOCS=	README
 
diff --git games/asc/Makefile games/asc/Makefile
index e6b4e66..0a33bf6 100644
--- games/asc/Makefile
+++ games/asc/Makefile
@@ -37,7 +37,6 @@ LUA_COMPS=	lua
 USE_PERL5_BUILD=yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 
 MAN6=		asc.6 asc_demount.6 asc_mapedit.6 asc_mount.6 \
 		asc_weaponguide.6
@@ -47,8 +46,8 @@ PLIST_FILES=	bin/asc bin/asc_demount bin/asc_mapedit bin/asc_mount \
 PLIST_DIRS=	${ASC_MUSICDIR} %%DATADIR%%
 
 CFLAGS+=	-D_UNICODE_BROKEN_
-CPPFLAGS=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .include <bsd.port.pre.mk>
 
diff --git games/atomix/Makefile games/atomix/Makefile
index 4380d51..ce0ea20 100644
--- games/atomix/Makefile
+++ games/atomix/Makefile
@@ -21,8 +21,8 @@ USE_BZIP2=	yes
 USE_GETTEXT=	yes
 USE_GNOME=	gnomeprefix gnomehack intlhack libgnomeui
 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/games\.games/games:games/' ${WRKSRC}/Makefile.in
diff --git games/atr3d/Makefile games/atr3d/Makefile
index 3f863cd..c1aceb4 100644
--- games/atr3d/Makefile
+++ games/atr3d/Makefile
@@ -28,13 +28,11 @@ USE_XORG=	xmu xi x11
 USE_PERL5_BUILD=yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-sound
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \
-		SDL_CONFIG="${SDL_CONFIG}"
+CONFIGURE_ENV=	SDL_CONFIG="${SDL_CONFIG}"
 USE_AUTOTOOLS=	automake autoconf
 
-CPPFLAGS=	-I${LOCALBASE}/include -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS=	-L${LOCALBASE}/lib -L${LOCALBASE}/lib ${PTHREAD_LIBS}
-
+CPPFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS+=	-L${LOCALBASE}/lib -L${LOCALBASE}/lib ${PTHREAD_LIBS}
 
 .include <bsd.port.pre.mk>
 
diff --git games/belooted/Makefile games/belooted/Makefile
index 63900f5..6a6e686 100644
--- games/belooted/Makefile
+++ games/belooted/Makefile
@@ -21,8 +21,8 @@ USE_GNOME=	gtk20 desktopfileutils
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 PORTDOCS=	AUTHORS COPYING ChangeLog INSTALL NEWS README TODO
 
diff --git games/bitefusion/Makefile games/bitefusion/Makefile
index 33de52e..459dd10 100644
--- games/bitefusion/Makefile
+++ games/bitefusion/Makefile
@@ -17,8 +17,8 @@ COMMENT=	A snake game with 8 levels
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_SDL=	sdl
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 MAKE_JOBS_SAFE=	yes
 
 PLIST_FILES=	bin/bitefusion
diff --git games/blokish/Makefile games/blokish/Makefile
index 91449a9..6c5209d 100644
--- games/blokish/Makefile
+++ games/blokish/Makefile
@@ -21,8 +21,8 @@ USE_GMAKE=	yes
 USE_GL=		gl
 USE_WX=		2.6+
 
-CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib" \
-		CPPFLAGS="-I${LOCALBASE}/include"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 MAKEFILE=	makefile
 
diff --git games/bomberclone/Makefile games/bomberclone/Makefile
index 6ec14cc..5eda269 100644
--- games/bomberclone/Makefile
+++ games/bomberclone/Makefile
@@ -19,8 +19,8 @@ GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 CONFIGURE_ARGS=	--target=""
-CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" \
-		CXXFLAGS="${PTHREAD_CFLAGS} -I${LOCALBASE}/include"
+LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
+CXXFLAGS+=	${PTHREAD_CFLAGS} -I${LOCALBASE}/include
 
 post-extract:
 	${FIND} ${WRKSRC} -type d -name CVS | ${XARGS} ${RM} -rf ;
diff --git games/bomberinstinct/Makefile games/bomberinstinct/Makefile
index d6ab52a..1ec8ef6 100644
--- games/bomberinstinct/Makefile
+++ games/bomberinstinct/Makefile
@@ -22,8 +22,8 @@ USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 USE_PERL5_BUILD=yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
-		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS} -lintl"
+CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS} -lintl
 
 pre-patch:
 	@${FIND} ${WRKSRC} -name "*.[ch]" | \
diff --git games/bombermaze/Makefile games/bombermaze/Makefile
index 9fa6d8a..fd345ba 100644
--- games/bombermaze/Makefile
+++ games/bombermaze/Makefile
@@ -18,8 +18,8 @@ USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack gnomelibs gdkpixbuf
 USE_GETTEXT=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 CFLAGS+=	-fpermissive
 
diff --git games/bomns/Makefile games/bomns/Makefile
index 6ae0c09..9aad4d2 100644
--- games/bomns/Makefile
+++ games/bomns/Makefile
@@ -19,8 +19,8 @@ WANT_GNOME=	yes
 INSTALLS_ICONS=	yes
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="`${SDL_CONFIG} --cflags`" \
-		LDFLAGS="`${SDL_CONFIG} --libs`"
+CPPFLAGS+=	`${SDL_CONFIG} --cflags`
+LDFLAGS+=	`${SDL_CONFIG} --libs`
 CONFIGURE_ARGS=	--program-transform-name=
 
 OPTIONS=	EDITOR "Enable building of the map editor" on \
diff --git games/briquolo/Makefile games/briquolo/Makefile
index afc69c5..58aa1be 100644
--- games/briquolo/Makefile
+++ games/briquolo/Makefile
@@ -26,7 +26,8 @@ USE_GMAKE=	yes
 USE_GNOME=	desktopfileutils
 USE_XORG=	x11
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 PLIST_SUB=	VERSION="${PORTVERSION}"
 
diff --git games/bumprace/Makefile games/bumprace/Makefile
index eeaec6e..399f985 100644
--- games/bumprace/Makefile
+++ games/bumprace/Makefile
@@ -19,8 +19,8 @@ GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_SDL=	sdl mixer image
 
-CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib" \
-		CPPFLAGS="-I${LOCALBASE}/include"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 PORTDOCS=	FAQ README
 
diff --git games/burgerspace/Makefile games/burgerspace/Makefile
index 243b4fe..91f1899 100644
--- games/burgerspace/Makefile
+++ games/burgerspace/Makefile
@@ -20,9 +20,8 @@ LICENSE=	GPLv2
 
 USE_SDL=	mixer sdl
 GNU_CONFIGURE=	yes
-CPPFLAGS=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 MAN6=		burgerspace.6 burgerspace-server.6
 PORTDOCS=	AUTHORS COPYING INSTALL NEWS README THANKS TODO
diff --git games/burrtools/Makefile games/burrtools/Makefile
index 0d48653..e86971c 100644
--- games/burrtools/Makefile
+++ games/burrtools/Makefile
@@ -25,8 +25,8 @@ USE_GL=		glu
 USE_GMAKE=	yes
 USE_GCC=	4.2+
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="`fltk-config --cxxflags`" \
-		LDFLAGS="`fltk-config --ldflags`"
+CPPFLAGS+=	`fltk-config --cxxflags`
+LDFLAGS+=	`fltk-config --ldflags`
 MAKE_JOBS_SAFE=	yes
 
 LICENSE=	GPLv3
diff --git games/bygfoot/Makefile games/bygfoot/Makefile
index dba8aa4..8970d67 100644
--- games/bygfoot/Makefile
+++ games/bygfoot/Makefile
@@ -22,6 +22,7 @@ RUN_DEPENDS=	zip:${PORTSDIR}/archivers/zip \
 GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
 USE_GNOME=	gtk20
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 
 .include <bsd.port.mk>
diff --git games/bzflag/Makefile games/bzflag/Makefile
index 0b20732..d3606c2 100644
--- games/bzflag/Makefile
+++ games/bzflag/Makefile
@@ -21,7 +21,8 @@ USE_GL=		yes
 USE_GMAKE=	yes
 USE_PERL5_BUILD=yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${PTHREAD_CFLAGS}" LDFLAGS="${PTHREAD_LIBS}"
+CPPFLAGS+=	${PTHREAD_CFLAGS}
+LDFLAGS+=	${PTHREAD_LIBS}
 MAKE_ARGS=	ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \
 		AUTOHEADER="${TRUE}"
 
diff --git games/ceferino/Makefile games/ceferino/Makefile
index aaeca9b..8fa9146 100644
--- games/ceferino/Makefile
+++ games/ceferino/Makefile
@@ -19,7 +19,6 @@ GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD}
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 
 CEFEDIRS=	ima music levels sounds
 
diff --git games/chanta/Makefile games/chanta/Makefile
index b717e2c..8820ffd 100644
--- games/chanta/Makefile
+++ games/chanta/Makefile
@@ -19,7 +19,6 @@ USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD}
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 
 CHANTADIRS=	data ima
 
diff --git games/chroma/Makefile games/chroma/Makefile
index 45bdbc4..df849a0 100644
--- games/chroma/Makefile
+++ games/chroma/Makefile
@@ -19,8 +19,9 @@ USE_BZIP2=	yes
 USE_GETTEXT=	yes
 MAKE_JOBS_SAFE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib" LIBS="-lintl" \
-		CPPFLAGS="-I${LOCALBASE}/include"
+CONFIGURE_ENV=	LIBS="-lintl"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 PORTDOCS=	README
 
diff --git games/chromium-bsu/Makefile games/chromium-bsu/Makefile
index c2c08a7..6105b82 100644
--- games/chromium-bsu/Makefile
+++ games/chromium-bsu/Makefile
@@ -19,8 +19,8 @@ LIB_DEPENDS=	glpng.1:${PORTSDIR}/graphics/glpng \
 
 GNU_CONFIGURE=	yes
 USE_GL=		gl glu
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--disable-glc
 MAKE_JOBS_SAFE=	yes
 
diff --git games/concentration/Makefile games/concentration/Makefile
index c3b52c2..5753a18 100644
--- games/concentration/Makefile
+++ games/concentration/Makefile
@@ -19,9 +19,8 @@ GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_SDL=	sdl mixer image ttf
 
-CONFIGURE_ENV=	LDFLAGS="`${SDL_CONFIG} --libs`" \
-		CPPFLAGS="`${SDL_CONFIG} --cflags`" \
-		SDL_CONFIG="${SDL_CONFIG}"
+CPPFLAGS+=	`${SDL_CONFIG} --cflags`
+LDFLAGS+=	`${SDL_CONFIG} --libs`
 
 MAN6=		concentration.6
 
diff --git games/connectfive/Makefile games/connectfive/Makefile
index 884fb78..163f0b4 100644
--- games/connectfive/Makefile
+++ games/connectfive/Makefile
@@ -16,9 +16,9 @@ MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Place five pieces in a row on a 3d board
 
 MAKEFILE=	Makefile.linux
-MAKE_ENV=	LDFLAGS="-L${LOCALBASE}/lib"
+LDFLAGS+=	-L${LOCALBASE}/lib
 ALL_TARGET=	default
-CPPFLAGS=	-I${LOCALBASE}/include
+CPPFLAGS+=	-I${LOCALBASE}/include
 
 USE_SDL=	sdl
 USE_GL=		gl
diff --git games/construo/Makefile games/construo/Makefile
index f074c88..5090d2b 100644
--- games/construo/Makefile
+++ games/construo/Makefile
@@ -19,8 +19,8 @@ GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_XORG=	sm ice x11 xext xxf86vm
 
-CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib" \
-		CPPFLAGS="-I${LOCALBASE}/include"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--bindir=${PREFIX}/bin --datadir=${DATADIR}
 
 OPTIONS=	GLUT "Use glut" on
diff --git games/corewars/Makefile games/corewars/Makefile
index 43c6603..f7a78b8 100644
--- games/corewars/Makefile
+++ games/corewars/Makefile
@@ -19,8 +19,8 @@ BUILD_DEPENDS=	${LOCALBASE}/lib/libargp.a:${PORTSDIR}/devel/argp-standalone
 USE_GNOME=	gtk12
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 MAN6=		corewars.6
 MLINKS=		corewars.6 corewars-cmd.6
diff --git games/cosmosmash/Makefile games/cosmosmash/Makefile
index d01324f..45c9bf3 100644
--- games/cosmosmash/Makefile
+++ games/cosmosmash/Makefile
@@ -26,8 +26,8 @@ USE_XORG=	x11 xau xdmcp
 USE_ICONV=	yes
 USE_GNOME=	desktopfileutils
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include `${SDL_CONFIG} --cflags`" \
-		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS} `${SDL_CONFIG} --libs`"
+CPPFLAGS+=	-I${LOCALBASE}/include `${SDL_CONFIG} --cflags`
+LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS} `${SDL_CONFIG} --libs`
 
 MAN6=	cosmosmash.6
 
diff --git games/crack-attack/Makefile games/crack-attack/Makefile
index f249e57..83b52f4 100644
--- games/crack-attack/Makefile
+++ games/crack-attack/Makefile
@@ -17,7 +17,7 @@ COMMENT=	OpenGL game based on Super Nintendo classic Tetris Attack
 USE_GL=		glut
 USE_GNOME=	gtk20
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" CXXFLAGS="${CFLAGS}"
+CPPFLAGS+=	-I${LOCALBASE}/include
 
 MAN6=		crack-attack.6
 
diff --git games/critterding/Makefile games/critterding/Makefile
index 65a64df..c48985e 100644
--- games/critterding/Makefile
+++ games/critterding/Makefile
@@ -21,8 +21,8 @@ GNU_CONFIGURE=	yes
 USE_AUTOTOOLS=	autoconf:env aclocal:env automake:env libtool
 USE_SDL=	sdl
 USE_GL=		gl
-CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib" \
-		CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/freetype2"
+CPPFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include/freetype2
+LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--disable-system-ftgl
 USE_GCC=	4.2+
 MAKE_JOBS_SAFE=	yes
diff --git games/crossfire-client/Makefile games/crossfire-client/Makefile
index 0fbac50..db1fcc8 100644
--- games/crossfire-client/Makefile
+++ games/crossfire-client/Makefile
@@ -26,8 +26,8 @@ WANT_GNOME=	yes
 USE_GMAKE=	yes
 USE_SDL=	image sdl
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--with-sound-dir=${DATADIR}/sounds
 
 MAN6=		cfclient.6
diff --git games/crossfire-server/Makefile games/crossfire-server/Makefile
index b43c4fa..a28df53 100644
--- games/crossfire-server/Makefile
+++ games/crossfire-server/Makefile
@@ -30,14 +30,13 @@ USE_PERL5=	yes
 USE_PYTHON=	yes
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
-CONFIGURE_ENV=	LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--with-check=no
 
 MAN6=		crossfire-config.6 crossfire-server.6 crossloop.6 \
 		crossloop.web.6
 
-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:
 	@${CHMOD} a+x ${WRKSRC}/utils/install-sh
diff --git games/crrcsim/Makefile games/crrcsim/Makefile
index 53efac0..7974604 100644
--- games/crrcsim/Makefile
+++ games/crrcsim/Makefile
@@ -23,8 +23,8 @@ USE_SDL=	sdl
 USE_GL=		gl glu
 MAKE_JOBS_SAFE=	yes
 
-CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib/portaudio2 -L${LOCALBASE}/lib"\
-		CPPFLAGS="-I${LOCALBASE}/include/portaudio2 -I${LOCALBASE}/include"
+CPPFLAGS+=	-I${LOCALBASE}/include/portaudio2 -I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib/portaudio2 -L${LOCALBASE}/lib
 
 PORTDOCS=	*
 
diff --git games/csmash/Makefile games/csmash/Makefile
index e21a99e..54731ec 100644
--- games/csmash/Makefile
+++ games/csmash/Makefile
@@ -21,8 +21,8 @@ USE_GL=		yes
 USE_GNOME=	gtk20
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/SDL" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include/SDL
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 post-patch:
 	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
diff --git games/d2x-xl/Makefile games/d2x-xl/Makefile
index 34f8f13..a0fd759 100644
--- games/d2x-xl/Makefile
+++ games/d2x-xl/Makefile
@@ -53,7 +53,8 @@ BROKEN=		does not compile
 .if !defined(WITHOUT_OPENGL)
 USE_GL=		gl glu
 CONFIGURE_ARGS+=--with-opengl
-CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib" CPPFLAGS="-I${LOCALBASE}/include"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 .endif
 
 do-extract:
diff --git games/d2x/Makefile games/d2x/Makefile
index 966f0d5..fc0c986 100644
--- games/d2x/Makefile
+++ games/d2x/Makefile
@@ -26,7 +26,8 @@ PLIST_FILES=	bin/d2x
 .ifdef(WITH_OPENGL)
 USE_GL=		glut
 CONFIGURE_ARGS+=--with-opengl
-CONFIGURE_ENV=LDFLAGS=-L${LOCALBASE}/lib CPPFLAGS=-I${LOCALBASE}/include
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 .endif
 
 pre-everything::
diff --git games/daimonin/Makefile games/daimonin/Makefile
index c34a5f6..9293019 100644
--- games/daimonin/Makefile
+++ games/daimonin/Makefile
@@ -22,7 +22,7 @@ FETCH_BEFORE_ARGS=	-o ${DISTDIR}/${DIST_SUBDIR}/${DISTNAME}${EXTRACT_SUFX}
 
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-simplelayout --enable-getaddrinfo
-CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib"
+LDFLAGS+=	-L${LOCALBASE}/lib
 USE_AUTOTOOLS=	automake autoconf
 USE_SDL=	mixer image
 SUB_FILES=	daimonin.sh
diff --git games/diameter/Makefile games/diameter/Makefile
index 4aaf0ad..464e12b 100644
--- games/diameter/Makefile
+++ games/diameter/Makefile
@@ -26,8 +26,8 @@ USE_PYTHON=	yes
 
 WRKSRC=		${WRKDIR}/gamediameter
 
-CONFIGURE_ENV=	CPPFLAGS="`${SDL_CONFIG} --cflags` -I${LOCALBASE}/include" \
-		LDFLAGS="`${SDL_CONFIG} --libs` -L${LOCALBASE}/lib"
+CPPFLAGS+=	`${SDL_CONFIG} --cflags` -I${LOCALBASE}/include
+LDFLAGS+=	`${SDL_CONFIG} --libs` -L${LOCALBASE}/lib
 
 DATADIR=	${PREFIX}/share/gamediameter
 
diff --git games/dopewars/Makefile games/dopewars/Makefile
index c721b0b..bc68f24 100644
--- games/dopewars/Makefile
+++ games/dopewars/Makefile
@@ -20,8 +20,8 @@ GNU_CONFIGURE=	yes
 USE_GNOME=	gtk12
 
 CONFIGURE_ARGS=	--enable-networking --disable-plugins --localstatedir=${DATADIR}
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 PORTDOCS=	ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL LICENCE NEWS README TODO
 MAN6=	dopewars.6
diff --git games/duel/Makefile games/duel/Makefile
index a9e7538..2ed6926 100644
--- games/duel/Makefile
+++ games/duel/Makefile
@@ -24,8 +24,8 @@ USE_BZIP2=	yes
 USE_GL=		gl
 USE_SDL=	sdl
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="`${SDL_CONFIG} --cflags` `freetype-config --cflags` -I${LOCALBASE}/include -I${LOCALBASE}/include/FTGL" \
-		LDFLAGS="`${SDL_CONFIG} --libs` -L${LOCALBASE}/lib"
+CPPFLAGS+=	`${SDL_CONFIG} --cflags` `freetype-config --cflags` -I${LOCALBASE}/include -I${LOCALBASE}/include/FTGL
+LDFLAGS+=	`${SDL_CONFIG} --libs` -L${LOCALBASE}/lib
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 SUB_FILES=	${PORTNAME}-sh
diff --git games/ember/Makefile games/ember/Makefile
index 47db1c7..402c7ba 100644
--- games/ember/Makefile
+++ games/ember/Makefile
@@ -42,7 +42,7 @@ LUA_COMPS=	toluaxx
 USE_OPENAL=	al alut
 USE_GNOME=	gnomehack
 USE_BZIP2=	YES
-CPPFLAGS=	-DBR_NO_MACROS
+CPPFLAGS+=	-DBR_NO_MACROS
 MAKE_JOBS_SAFE=	yes
 
 post-patch:
diff --git games/enigma/Makefile games/enigma/Makefile
index bfdc8f4..12978c9 100644
--- games/enigma/Makefile
+++ games/enigma/Makefile
@@ -26,8 +26,8 @@ USE_SDL=	image mixer sdl ttf
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-cxxlua \
 		--with-libintl-prefix="${LOCALBASE}"
-CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib -L${LUA_LIBDIR}" \
-		CPPFLAGS="-I${LOCALBASE}/include -I${LUA_INCDIR}"
+CPPFLAGS+=	-I${LOCALBASE}/include -I${LUA_INCDIR}
+LDFLAGS+=	-L${LOCALBASE}/lib -L${LUA_LIBDIR}
 MAKE_JOBS_SAFE=	yes
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
diff --git games/exult/Makefile games/exult/Makefile
index 9a7dfff..d2bfdb8 100644
--- games/exult/Makefile
+++ games/exult/Makefile
@@ -21,8 +21,8 @@ USE_SDL=	sdl mixer
 USE_XORG=	x11
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 MAKE_JOBS_UNSAFE=	yes
 
 MAN1=	expack.1 ipack.1 shp2pcx.1 splitshp.1 textpack.1
diff --git games/fillets-ng/Makefile games/fillets-ng/Makefile
index 94f641c..838c8a3 100644
--- games/fillets-ng/Makefile
+++ games/fillets-ng/Makefile
@@ -20,7 +20,8 @@ USE_SDL=	sdl mixer image ttf
 USE_LUA=	5.1
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LUA_INCDIR}" LDFLAGS="-L${LUA_LIBDIR}"
+CPPFLAGS+=	-I${LUA_INCDIR}
+LDFLAGS+=	-L${LUA_LIBDIR}
 CONFIGURE_ARGS=	--datadir="${DATADIR}" --with-lua="${LOCALBASE}"
 MAKE_JOBS_SAFE=	yes
 PORTDOCS=	*
diff --git games/fishsupper/Makefile games/fishsupper/Makefile
index ab35714..1830299 100644
--- games/fishsupper/Makefile
+++ games/fishsupper/Makefile
@@ -21,8 +21,8 @@ USE_SDL=	sdl image mixer
 USE_GL=		gl
 MAKE_JOBS_SAFE=	yes
 
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 PORTDOCS=	README
 
diff --git games/fkiss/Makefile games/fkiss/Makefile
index 1470918..5f05df2 100644
--- games/fkiss/Makefile
+++ games/fkiss/Makefile
@@ -25,7 +25,6 @@ USE_XORG=	x11 xproto
 WANT_GNOME=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	LDFLAGS="${LDFLAGS}"
 MAKE_ARGS=	ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOHEADER="${TRUE}" \
 		AUTOMAKE="${TRUE}"
 
diff --git games/flightgear-atlas/Makefile games/flightgear-atlas/Makefile
index 05eddfe..11d6fb9 100644
--- games/flightgear-atlas/Makefile
+++ games/flightgear-atlas/Makefile
@@ -36,12 +36,11 @@ GNU_CONFIGURE=	yes
 USE_XORG=	ice sm x11 xext xi xt xmu
 USE_GL=		gl glu glut
 
-CPPFLAGS=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS} \
+CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS} \
 		-DSG_GLUT_H='<GL/glut.h>' \
 		-DSG_GL_H='<GL/gl.h>' \
 		-DSTL_STRING='<string>'
-LDFLAGS=	-L${LOCALBASE}/lib
-CONFIGURE_ENV=	LDFLAGS="${LDFLAGS}"
+LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--with-fgbase="${LOCALBASE}/share/flightgear"
 
 post-patch:
diff --git games/flightgear/Makefile games/flightgear/Makefile
index 3ce0088..f40db8e 100644
--- games/flightgear/Makefile
+++ games/flightgear/Makefile
@@ -41,7 +41,6 @@ USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
-CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--datadir=${LOCALBASE}/share
 MAKE_JOBS_UNSAFE=yes
 
diff --git games/flyhard/Makefile games/flyhard/Makefile
index 4747666b..90c9324 100644
--- games/flyhard/Makefile
+++ games/flyhard/Makefile
@@ -22,8 +22,8 @@ GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_SDL=	sdl mixer
 
-CONFIGURE_ENV=	LDFLAGS="${PTHREAD_LIBS} -L${LOCALBASE}/lib" \
-		CPPFLAGS="-I${LOCALBASE}/include"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	${PTHREAD_LIBS} -L${LOCALBASE}/lib
 
 PORTDOCS=	README
 
diff --git games/foobillard/Makefile games/foobillard/Makefile
index 282cae2..9f11148 100644
--- games/foobillard/Makefile
+++ games/foobillard/Makefile
@@ -28,9 +28,8 @@ USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 USE_XORG=	xaw ice
 
-CPPFLAGS=	-I${LOCALBASE}/include
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib -L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 DESKTOP_ENTRIES=	"Foobillard" \
 			"A free OpenGL-billard game" \
diff --git games/freeciv/Makefile games/freeciv/Makefile
index 53a3260..bf22a81 100644
--- games/freeciv/Makefile
+++ games/freeciv/Makefile
@@ -20,8 +20,7 @@ USE_GMAKE=	yes
 USE_BZIP2=	yes
 USE_PYTHON=	yes
 GNU_CONFIGURE=	yes
-LDFLAGS=	-L${LOCALBASE}/lib
-CONFIGURE_ENV=	LDFLAGS="${LDFLAGS}"
+LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--with-libiconv-prefix=${PREFIX} --program-transform-name=
 INSTALLS_ICONS=	yes
 
diff --git games/freesci/Makefile games/freesci/Makefile
index 69d2962..33e9729 100644
--- games/freesci/Makefile
+++ games/freesci/Makefile
@@ -21,7 +21,7 @@ GNU_CONFIGURE=	yes
 WANT_SDL=	yes
 INSTALLS_ICONS=	yes
 
-CONFIGURE_ENV=	CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}"
+CFLAGS+=	${PTHREAD_CFLAGS}
 
 MAN6=	freesci-tools.6 freesci.6
 
diff --git games/garith/Makefile games/garith/Makefile
index 295138d..7aa3643 100644
--- games/garith/Makefile
+++ games/garith/Makefile
@@ -18,7 +18,7 @@ COMMENT=	Arithmetic quiz program for X Window System
 USE_GNOME=	gtk12
 WRKSRC=		${WRKDIR}/garith
 CFLAGS+=	`${GTK_CONFIG} --cflags`
-LDFLAGS=	`${GTK_CONFIG} --libs`
+LDFLAGS+=	`${GTK_CONFIG} --libs`
 PORTDOCS=	BUGS HISTORY README TODO
 PLIST_FILES=	bin/garith
 
diff --git games/gbrainy/Makefile games/gbrainy/Makefile
index ef709a2..12adcdc 100644
--- games/gbrainy/Makefile
+++ games/gbrainy/Makefile
@@ -24,8 +24,8 @@ USE_GNOME=	desktopfileutils gnomehack gtksharp20 gnomesharp20
 USE_GMAKE=	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
 
 MAN6=		gbrainy.6
 INSTALLS_ICONS=	yes
diff --git games/gcompris/Makefile games/gcompris/Makefile
index 7cfefe5..5ac709a 100644
--- games/gcompris/Makefile
+++ games/gcompris/Makefile
@@ -40,9 +40,9 @@ USE_DISPLAY=	yes
 USE_GNOME=	gnomehack intlhack gnomeprefix gtk20 pygtk2 libxml2 librsvg2
 CONFIGURE_ARGS=	--enable-gnet \
 		--enable-dbus
-CPPFLAGS=	"-I${LOCALBASE}/include"
-CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib" \
-		LIBS="${PTHREAD_LIBS} -lm"
+CONFIGURE_ENV=	LIBS="${PTHREAD_LIBS} -lm"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 MAN6=		gcompris.6
 INFO=		gcompris
diff --git games/ggz-client-libs/Makefile games/ggz-client-libs/Makefile
index db0358b..911ab9a 100644
--- games/ggz-client-libs/Makefile
+++ games/ggz-client-libs/Makefile
@@ -18,7 +18,6 @@ LIB_DEPENDS=	expat.6:${PORTSDIR}/textproc/expat2
 
 USE_AUTOTOOLS=	libtool
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--disable-debug --with-libggz-dir="${LOCALBASE}"
 USE_LDCONFIG=	yes
 USE_GGZ=	core
@@ -29,8 +28,8 @@ MAN5=	ggz.modules.5
 MAN6=	ggz.6 ggz-config.6 ggz-wrapper.6
 MAN7=	ggz.7
 
-CPPFLAGS=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
+CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 
 .if defined(WITHOUT_NLS)
 CONFIGURE_ARGS+=	--disable-nls
diff --git games/ggz-gtk-client/Makefile games/ggz-gtk-client/Makefile
index eb8f96c..a25c3ee 100644
--- games/ggz-gtk-client/Makefile
+++ games/ggz-gtk-client/Makefile
@@ -17,14 +17,13 @@ COMMENT=	The GGZ Gaming Zone - GTK+ Frontend
 USE_AUTOTOOLS=	libtool
 USE_GNOME=	gtk20
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--disable-debug
 USE_GGZ=	client
 
 MAN6=	ggz-gtk.6
 
-CPPFLAGS=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
+CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 
 .if defined(WITHOUT_NLS)
 CONFIGURE_ARGS+=	--disable-nls
diff --git games/ggz-gtk-games/Makefile games/ggz-gtk-games/Makefile
index 57863c7..688cb52 100644
--- games/ggz-gtk-games/Makefile
+++ games/ggz-gtk-games/Makefile
@@ -18,12 +18,11 @@ RUN_DEPENDS=	${LOCALBASE}/bin/ggz-gtk:${PORTSDIR}/games/ggz-gtk-client
 
 USE_GNOME=	gtk20
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--disable-debug
 USE_GGZ=	client
 
-CPPFLAGS=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
+CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 
 .if defined(WITHOUT_NLS)
 CONFIGURE_ARGS+=	--disable-nls
diff --git games/ggz-sdl-games/Makefile games/ggz-sdl-games/Makefile
index 8a8e241..3d8b4ab 100644
--- games/ggz-sdl-games/Makefile
+++ games/ggz-sdl-games/Makefile
@@ -17,12 +17,11 @@ COMMENT=	The GGZ Gaming Zone - SDL-based games
 USE_GL=		gl
 USE_SDL=	image mixer sdl ttf
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--disable-debug
 USE_GGZ=	client
 
-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-install:
 	${INSTALL_DATA} ${WRKSRC}/geekgame/module.dsc ${PREFIX}/share/ggz/geekgame.dsc
diff --git games/ggz-txt-client/Makefile games/ggz-txt-client/Makefile
index 9331a5c..1b23202 100644
--- games/ggz-txt-client/Makefile
+++ games/ggz-txt-client/Makefile
@@ -15,14 +15,13 @@ MAINTAINER=	kde@FreeBSD.org
 COMMENT=	The GGZ Gaming Zone - Console (Text) Frontend
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--disable-debug
 USE_GGZ=	client
 
 MAN6=	ggz-txt.6
 
-CPPFLAGS=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
+CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 
 .if defined(WITHOUT_NLS)
 CONFIGURE_ARGS+=	--disable-nls
diff --git games/gl-117/Makefile games/gl-117/Makefile
index 7c1f5e1..ce06650 100644
--- games/gl-117/Makefile
+++ games/gl-117/Makefile
@@ -20,8 +20,8 @@ USE_GL=		glut
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-opengl-dir=${LOCALBASE}
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 
 DESKTOP_ENTRIES=	"GL-117" \
 			"Action flight simulator" \
diff --git games/glest/Makefile games/glest/Makefile
index ab8f183..083f0dd 100644
--- games/glest/Makefile
+++ games/glest/Makefile
@@ -30,8 +30,8 @@ USE_SDL=	yes
 USE_GL=		yes
 GNU_CONFIGURE=	yes
 CONFIGURE_SCRIPT=	mk/linux/configure
-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}
 SUB_FILES=		glest-wrapper pkg-message
 
 JAM_CMD=		${LOCALBASE}/bin/jam -qa
diff --git games/glife/Makefile games/glife/Makefile
index a5b4654..7372a76 100644
--- games/glife/Makefile
+++ games/glife/Makefile
@@ -17,7 +17,8 @@ COMMENT=	Conway's Game of Life for GNOME
 
 GNU_CONFIGURE=	yes
 USE_GNOME=	gnomeprefix gnomehack libglade
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
diff --git games/gltron/Makefile games/gltron/Makefile
index c0dfedf..c4a009f 100644
--- games/gltron/Makefile
+++ games/gltron/Makefile
@@ -21,11 +21,10 @@ USE_GL=		gl
 USE_SDL=	sdl sound
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--disable-warn
 
-CPPFLAGS=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
+CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 
 OPTIONS=	SDL_NET "With network support" off
 
diff --git games/gno3dtet/Makefile games/gno3dtet/Makefile
index c3bf187..1e0fc88 100644
--- games/gno3dtet/Makefile
+++ games/gno3dtet/Makefile
@@ -22,8 +22,8 @@ USE_GMAKE=	yes
 USE_AUTOTOOLS=	autoheader automake aclocal autoconf
 ACLOCAL_ARGS=	-I m4 -I ${ACLOCAL_DIR} -I ${LOCALBASE}/share/aclocal
 AUTOMAKE_ARGS=	-a -c -f
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 INSTALLS_OMF=	yes
 
 run-autotools:: run-autotools-aclocal run-autotools-autoheader \
diff --git games/gnome-games/Makefile games/gnome-games/Makefile
index aaf749c..25341e5 100644
--- games/gnome-games/Makefile
+++ games/gnome-games/Makefile
@@ -34,8 +34,8 @@ USE_GSTREAMER=	vorbis ogg
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-sound=gstreamer \
 		--disable-tests
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 GCONF_SCHEMAS=	aisleriot.schemas glchess.schemas glines.schemas \
 		gnect.schemas gnibbles.schemas gnobots2.schemas \
diff --git games/gnomeattacks/Makefile games/gnomeattacks/Makefile
index 9f92987d..187c2a8 100644
--- games/gnomeattacks/Makefile
+++ games/gnomeattacks/Makefile
@@ -17,7 +17,7 @@ COMMENT=	GNOME 2 game featuring a bizarre flying GNOME logo
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack gnomeprefix gnomevfs2 libgnomeui
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
 
 .include <bsd.port.mk>
diff --git games/gnomebreakout/Makefile games/gnomebreakout/Makefile
index f939f66..2efb84c 100644
--- games/gnomebreakout/Makefile
+++ games/gnomebreakout/Makefile
@@ -17,8 +17,8 @@ COMMENT=	GNOME version of the classic breakout game
 
 USE_GNOME=	gnomehack gnomeprefix libgnomeui
 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 \
diff --git games/gnomechess/Makefile games/gnomechess/Makefile
index e6d0d37..5dd09be 100644
--- games/gnomechess/Makefile
+++ games/gnomechess/Makefile
@@ -23,8 +23,8 @@ USE_GNOME=	gnomecanvas gnomehack gnomeprefix libglade
 USE_GMAKE=	yes
 INSTALLS_OMF=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 MAKE_ARGS=	XML_I18N_UPDATE="${TRUE}" XML_I18N_EXTRACT="${TRUE}"
 
 .include <bsd.port.mk>
diff --git games/gnomekiss/Makefile games/gnomekiss/Makefile
index f6d66be..7747603 100644
--- games/gnomekiss/Makefile
+++ games/gnomekiss/Makefile
@@ -18,8 +18,8 @@ RUN_DEPENDS=	lha:${PORTSDIR}/archivers/lha
 
 USE_GNOME=	gnomeprefix gnomehack libgnomeui
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 MAN1=		gnomekiss.1
 
 .include <bsd.port.mk>
diff --git games/gnomememoryblocks/Makefile games/gnomememoryblocks/Makefile
index 9c804e1..9ec8455 100644
--- games/gnomememoryblocks/Makefile
+++ games/gnomememoryblocks/Makefile
@@ -19,8 +19,8 @@ USE_GETTEXT=	yes
 USE_GNOME=	gnomeprefix gnomehack gnomelibs gdkpixbuf
 USE_AUTOTOOLS=	libtool
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
diff --git games/gnomermind/Makefile games/gnomermind/Makefile
index ff9f999..7ba3702 100644
--- games/gnomermind/Makefile
+++ games/gnomermind/Makefile
@@ -17,8 +17,8 @@ COMMENT=	A puzzle game for Gnome, loosely based on the classic MasterMind game
 USE_BZIP2=	yes
 USE_GNOME=	gdkpixbuf gnomehack gnomelibs gnomeprefix
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 MAKE_ENV=	OLD_PO_FILE_INPUT=1
 
 post-patch:
diff --git games/gnono/Makefile games/gnono/Makefile
index 59539d88..800f3ab 100644
--- games/gnono/Makefile
+++ games/gnono/Makefile
@@ -20,9 +20,8 @@ USE_GMAKE=	yes
 USE_GETTEXT=	yes
 INSTALLS_ICONS=	yes
 GNU_CONFIGURE=	yes
-CPPFLAGS=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 MAN6=	${PORTNAME}.6
 
 post-patch:
diff --git games/gnubg/Makefile games/gnubg/Makefile
index 951cc11..fc446fb 100644
--- games/gnubg/Makefile
+++ games/gnubg/Makefile
@@ -32,8 +32,7 @@ OPTIONS=	ESOUND	"Enable sound support" ON	\
 
 CONFIGURE_ARGS=	--with-board3d
 
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \
-		ac_cv_path_ARTSC_CONFIG=no ac_cv_path_LIBART_CONFIG=no
+CONFIGURE_ENV=	ac_cv_path_ARTSC_CONFIG=no ac_cv_path_LIBART_CONFIG=no
 
 USE_GNOME=	gnomehack libxml2
 USE_GMAKE=	yes
@@ -66,8 +65,8 @@ CONFIGURE_ARGS+=	--disable-sse
 MAN6=	gnubg.6
 INFO=	gnubg
 
-CPPFLAGS=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 post-extract:
 	${GUNZIP_CMD} --stdout ${DISTDIR}/${DIST_SUBDIR}/gnubg_ts0.bd.gz > ${WRKSRC}/gnubg_ts0.bd
diff --git games/gnurobots/Makefile games/gnurobots/Makefile
index b7f15ea..0f6c84a 100644
--- games/gnurobots/Makefile
+++ games/gnurobots/Makefile
@@ -18,10 +18,9 @@ LIB_DEPENDS=	guile.21:${PORTSDIR}/lang/guile
 
 USE_GNOME=	vte
 GNU_CONFIGURE=	yes
-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-patch:
 	@${REINPLACE_CMD} -e 's|^CFLAGS=|#CFLAGS=|g' ${WRKSRC}/configure
diff --git games/gracer/Makefile games/gracer/Makefile
index 583477e..66c54ad 100644
--- games/gracer/Makefile
+++ games/gracer/Makefile
@@ -23,10 +23,9 @@ LIB_DEPENDS=	ungif.5:${PORTSDIR}/graphics/libungif \
 USE_GL=		glut
 USE_PERL5_BUILD=yes
 USE_AUTOTOOLS=	autoconf213
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include \
-			  -I${LOCALBASE}/include/tcl8.4 \
-			  -I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib -L${LOCALBASE}/lib"
+CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include \
+		-I${LOCALBASE}/include/tcl8.4
 USE_GMAKE=	yes
 # for plib (sound):
 CONFIGURE_ARGS+= --with-plib=${LOCALBASE}/plib
diff --git games/greed/Makefile games/greed/Makefile
index cf5e3e0..7f68828 100644
--- games/greed/Makefile
+++ games/greed/Makefile
@@ -18,7 +18,7 @@ MAN6=		greed.6
 PLIST_FILES=	bin/greed
 SCOREFILE?=	/var/games/greed.hs
 CFLAGS+=	-DSCOREFILE=\"${SCOREFILE}\" -DNOTBSD -DRELEASE=\"${PORTVERSION}\"
-LDFLAGS=	-lcurses
+LDFLAGS+=	-lcurses
 
 do-build:
 	@cd ${WRKSRC}&&${CC} ${CFLAGS} -o greed greed.c ${LDFLAGS}
diff --git games/grhino/Makefile games/grhino/Makefile
index dd08b59..c861773 100644
--- games/grhino/Makefile
+++ games/grhino/Makefile
@@ -17,8 +17,8 @@ USE_GETTEXT=	yes
 USE_GNOME=	gnomeprefix libgnomeui
 USE_PERL5_BUILD=yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 INSTALLS_OMF=	yes
 PLIST_SUB+=	VERSION=${PORTVERSION}
 
diff --git games/gtetrinet/Makefile games/gtetrinet/Makefile
index 708be97..6cb47ab 100644
--- games/gtetrinet/Makefile
+++ games/gtetrinet/Makefile
@@ -19,8 +19,8 @@ USE_BZIP2=	yes
 USE_GNOME=	esound gnomehack gnomeprefix libgnomeui
 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=	--bindir=${PREFIX}/bin --enable-ipv6
 
 MAN6=		gtetrinet.6
diff --git games/gtkabale/Makefile games/gtkabale/Makefile
index 8ad4e3a..b6b1630 100644
--- games/gtkabale/Makefile
+++ games/gtkabale/Makefile
@@ -19,8 +19,8 @@ EXPIRATION_DATE=	2011-09-01
 
 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
 
 .if !defined(WITHOUT_NLS)
 USE_GETTEXT=		yes
diff --git games/gtkatlantic/Makefile games/gtkatlantic/Makefile
index f7e34dc..dc5c648 100644
--- games/gtkatlantic/Makefile
+++ games/gtkatlantic/Makefile
@@ -17,8 +17,8 @@ USE_BZIP2=	yes
 USE_GNOME=	gtk20
 USE_GMAKE=	yes
 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 '/-Werror/s|^|#|' ${WRKSRC}/configure
diff --git games/gtkballs/Makefile games/gtkballs/Makefile
index 4669b46..33d1e17 100644
--- games/gtkballs/Makefile
+++ games/gtkballs/Makefile
@@ -18,8 +18,8 @@ USE_GETTEXT=	yes
 USE_GNOME=	gtk20
 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=	--localstatedir=${DATADIR}
 
 MAN6=		gtkballs.6x
diff --git games/gtktetcolor/Makefile games/gtktetcolor/Makefile
index deedbab..d3d0a38 100644
--- games/gtktetcolor/Makefile
+++ games/gtktetcolor/Makefile
@@ -21,11 +21,10 @@ LICENSE_COMB=	dual
 USE_GNOME=	gnomehack gnomeprefix intlhack libgnomeui
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	LDFLAGS="${LDFLAGS}"
 MAKE_JOBS_SAFE=	yes
 
-CPPFLAGS=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 post-patch:
 	@${REINPLACE_CMD} -e \
diff --git games/gturing/Makefile games/gturing/Makefile
index e89cf4c..8c893e8 100644
--- games/gturing/Makefile
+++ games/gturing/Makefile
@@ -18,8 +18,8 @@ USE_GNOME=	gnomeprefix gnomehack libgnomeui
 USE_GMAKE=	yes
 USE_GETTEXT=	yes
 USE_AUTOTOOLS=	libtool
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
 INSTALLS_OMF=	yes
 
 PORTDOCS=	AUTHORS COPYING NEWS ChangeLog TODO README INSTALL
diff --git games/hangman/Makefile games/hangman/Makefile
index 644a2bd..477aabc 100644
--- games/hangman/Makefile
+++ games/hangman/Makefile
@@ -19,9 +19,9 @@ GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_SDL=	sdl mixer image ttf
 
-CONFIGURE_ENV=	LDFLAGS="`${SDL_CONFIG} --libs`" \
-		CPPFLAGS="`${SDL_CONFIG} --cflags`" \
-		SDL_CONFIG="${SDL_CONFIG}"
+CONFIGURE_ENV=	SDL_CONFIG="${SDL_CONFIG}"
+CPPFLAGS+=	`${SDL_CONFIG} --cflags`
+LDFLAGS+=	`${SDL_CONFIG} --libs`
 
 MAN6=		hangman.6
 
diff --git games/heroes/Makefile games/heroes/Makefile
index 9653339..a74d566 100644
--- games/heroes/Makefile
+++ games/heroes/Makefile
@@ -39,8 +39,7 @@ USE_GMAKE=	yes
 USE_ICONV=	yes
 USE_GETTEXT=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	LDFLAGS="${LDFLAGS}" \
-		MAKEINFO="makeinfo --no-split"
+CONFIGURE_ENV=	MAKEINFO="makeinfo --no-split"
 CONFIGURE_ARGS=	--with-sdl_mixer=${LOCALBASE} --without-gii --without-ggi
 MAKE_JOBS_SAFE=	yes
 
@@ -53,8 +52,8 @@ CONFIGURE_ARGS+=--disable-optimizations
 MAN6=		heroes.6 heroeslvl.6
 INFO=		heroes
 
-CPPFLAGS=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS=	-L${LOCALBASE}/lib -lsmpeg ${PTHREAD_LIBS}
+CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS+=	-L${LOCALBASE}/lib -lsmpeg ${PTHREAD_LIBS}
 
 pre-everything::
 .ifndef(WITH_OPTIMIZED_CFLAGS)
diff --git games/hex-a-hop/Makefile games/hex-a-hop/Makefile
index 738b40a..9c32c46 100644
--- games/hex-a-hop/Makefile
+++ games/hex-a-hop/Makefile
@@ -15,7 +15,6 @@ COMMENT=	A puzzle game based on hexagonal tiles
 
 USE_SDL=	sdl
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 CFLAGS+=	-I${LOCALBASE}/include
diff --git games/highmoon/Makefile games/highmoon/Makefile
index 4e09c2a..28a1489 100644
--- games/highmoon/Makefile
+++ games/highmoon/Makefile
@@ -21,7 +21,7 @@ USE_GMAKE=	yes
 MAKE_ARGS=	CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" LIBS="${LDFLAGS}"
 
 CXXFLAGS+=	`${SDL_CONFIG} --cflags`
-LDFLAGS=	`${SDL_CONFIG} --libs` -lSDL_image
+LDFLAGS+=	`${SDL_CONFIG} --libs` -lSDL_image
 
 post-patch:
 	@${FIND} ${WRKSRC}/src -type f | ${XARGS} ${REINPLACE_CMD} -e \
diff --git games/klavaro/Makefile games/klavaro/Makefile
index 24b1e13..6e8a010 100644
--- games/klavaro/Makefile
+++ games/klavaro/Makefile
@@ -25,11 +25,10 @@ USE_LDCONFIG=	yes
 USE_GETTEXT=	yes
 INSTALLS_ICONS=	yes
 
-CPPFLAGS=	-I${LOCALBASE}/include -I${LOCALBASE}/include/gtkdatabox
-LDFLAGS=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include/gtkdatabox
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 
 MAN1=		${PORTNAME}.1
 
diff --git games/koth/Makefile games/koth/Makefile
index acb19c3..7883191 100644
--- games/koth/Makefile
+++ games/koth/Makefile
@@ -24,7 +24,8 @@ PLIST_FILES=	bin/kclever-ai bin/kmoron-ai bin/koth bin/koths
 MAN6=		kclever-ai.6 kmoron-ai.6 koth.6 koths.6
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -DGG_NEED_OLD_INTTYPES" LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include -DGG_NEED_OLD_INTTYPES
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|-lggi|-lggi ${PTHREAD_LIBS}|' ${WRKSRC}/configure
diff --git games/kuklomenos/Makefile games/kuklomenos/Makefile
index 43c127e..e1b4022 100644
--- games/kuklomenos/Makefile
+++ games/kuklomenos/Makefile
@@ -21,10 +21,9 @@ OPTIONS=	VORBIS "Enable Ogg/Vorbis support" on
 
 USE_SDL=	sdl
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 
-CPPFLAGS=	-I${LOCALBASE}/include ${PTHEAD_CFLAGS}
-LDFLAGS=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
+CPPFLAGS+=	-I${LOCALBASE}/include ${PTHEAD_CFLAGS}
+LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 
 .include <bsd.port.pre.mk>
 
diff --git games/lander/Makefile games/lander/Makefile
index d97c57c..9f5ea07 100644
--- games/lander/Makefile
+++ games/lander/Makefile
@@ -24,8 +24,8 @@ USE_GL=		gl glu
 MAKE_JOBS_SAFE=	yes
 USE_GCC=	4.2+
 
-CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib" \
-		CPPFLAGS="-I${LOCALBASE}/include"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--with-boost="${LOCALBASE}" \
 		--with-boost-filesystem=boost_filesystem
 
diff --git games/lbreakout2/Makefile games/lbreakout2/Makefile
index 3957082..421fba0 100644
--- games/lbreakout2/Makefile
+++ games/lbreakout2/Makefile
@@ -19,14 +19,13 @@ LIB_DEPENDS=	png.6:${PORTSDIR}/graphics/png
 USE_SDL=	mixer net sdl
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--enable-sdl-net \
 		--localstatedir=/var/games \
 		--disable-nls
 MAKE_JOBS_SAFE=	yes
 
-CPPFLAGS=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 post-patch:
 	@${REINPLACE_CMD} -e \
diff --git games/lexter/Makefile games/lexter/Makefile
index 22d4d80..fa12242 100644
--- games/lexter/Makefile
+++ games/lexter/Makefile
@@ -16,8 +16,8 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A real-time word puzzle for text terminals
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS='-I${LOCALBASE}/include' \
-		LDFLAGS='-L${LOCALBASE}/lib'
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS+=	--localstatedir=/var/games
 USE_GETTEXT=	yes
 
diff --git games/lgeneral/Makefile games/lgeneral/Makefile
index 0b7afc5..c878182 100644
--- games/lgeneral/Makefile
+++ games/lgeneral/Makefile
@@ -23,14 +23,13 @@ CONFLICTS=	lgeneral-data-[0-9]*
 USE_SDL=	sdl
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	LDFLAGS="${LDFLAGS}"
 MAKE_JOBS_SAFE=	yes
 
 MAN1=		lgc-pg.1
 MAN6=		lgeneral.6
 
-CPPFLAGS=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .if defined(WITHOUT_SOUND)
 CONFIGURE_ARGS+=--disable-sound
diff --git games/lianliankan/Makefile games/lianliankan/Makefile
index 0088275..d6ea73b 100644
--- games/lianliankan/Makefile
+++ games/lianliankan/Makefile
@@ -20,8 +20,8 @@ USE_GNOME=	gtk20 esound
 USE_GETTEXT=	yes
 GNU_CONFIGURE=	yes
 
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .if !defined(NOPORTDOCS)
 INSTALL_TARGET=	install install-llk_linuxdocDATA
diff --git games/libggz/Makefile games/libggz/Makefile
index 032e83b..4045821 100644
--- games/libggz/Makefile
+++ games/libggz/Makefile
@@ -19,14 +19,13 @@ LIB_DEPENDS=	gcrypt.18:${PORTSDIR}/security/libgcrypt
 USE_AUTOTOOLS=	libtool
 USE_GNOME=	gnomehack
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--disable-debug
 USE_LDCONFIG=	yes
 
 MAN3=	ggz.h.3
 
-CPPFLAGS=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
+CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 
 .if defined(WITH_GNUTLS)
 LIB_DEPENDS+=	gnutls.47:${PORTSDIR}/security/gnutls
diff --git games/lincity-ng/Makefile games/lincity-ng/Makefile
index 017ed3b..d9cfa29 100644
--- games/lincity-ng/Makefile
+++ games/lincity-ng/Makefile
@@ -26,8 +26,8 @@ USE_GNOME=	libxml2
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-libphysfs=${PREFIX} \
 		--x-libraries=${LOCALBASE}/lib --x-includes=${LOCALBASE}/include
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 
 post-patch:
 	@${REINPLACE_CMD} -e 's| -O| -I${LOCALBASE}/include&|g' \
diff --git games/lincity/Makefile games/lincity/Makefile
index 477abf3..bd628de 100644
--- games/lincity/Makefile
+++ games/lincity/Makefile
@@ -22,8 +22,8 @@ USE_CSTD=	c89
 
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 MAN6=		lincity.6
 
diff --git games/lordsawar/Makefile games/lordsawar/Makefile
index 5c4de57..d793ffc 100644
--- games/lordsawar/Makefile
+++ games/lordsawar/Makefile
@@ -44,8 +44,8 @@ USE_SDL+=	mixer
 CONFIGURE_ARGS+=--disable-sound
 .endif
 
-CONFIGURE_ENV+=	LDFLAGS="-L${LOCALBASE}/lib" \
-		CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="${PTHREAD_LIBS}"
+CONFIGURE_ENV+=	LIBS="${PTHREAD_LIBS}"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .include <bsd.port.mk>
diff --git games/lpairs/Makefile games/lpairs/Makefile
index 4bdbb15..9b209c6 100644
--- games/lpairs/Makefile
+++ games/lpairs/Makefile
@@ -16,7 +16,8 @@ COMMENT=	Classical memory game
 
 GNU_CONFIGURE=	yes
 USE_SDL=	sdl
-CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib" CPPFLAGS="-I${LOCALBASE}/include"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .if !defined(WITHOUT_NLS)
 PLIST_SUB+=	NLS=""
diff --git games/ltris/Makefile games/ltris/Makefile
index 9a9933e..6c0884c 100644
--- games/ltris/Makefile
+++ games/ltris/Makefile
@@ -17,8 +17,8 @@ COMMENT=	An another tetris clone but a good one with bunch of cool features
 USE_SDL=	mixer sdl
 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=	--localstatedir=${DATADIR}
 
 .include <bsd.port.pre.mk>
diff --git games/macopix/Makefile games/macopix/Makefile
index a511e62..7a4120e 100644
--- games/macopix/Makefile
+++ games/macopix/Makefile
@@ -37,12 +37,11 @@ WANT_GNOME=	yes
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 
 MAN1=		macopix.1
 
-CPPFLAGS=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .if defined(WITH_GNUTLS)
 LIB_DEPENDS+=	gnutls.47:${PORTSDIR}/security/gnutls
diff --git games/madbomber/Makefile games/madbomber/Makefile
index c340910..f92b080 100644
--- games/madbomber/Makefile
+++ games/madbomber/Makefile
@@ -16,8 +16,8 @@ COMMENT=	A clone of Activision's classic Atari 2600 console game "Kaboom!"
 
 USE_SDL=	mixer image sdl
 
-CPPFLAGS=	`${SDL_CONFIG} --cflags` -DDATA_PREFIX=\"${DATADIR}/\"
-LDFLAGS=	`${SDL_CONFIG} --libs`
+CPPFLAGS+=	`${SDL_CONFIG} --cflags` -DDATA_PREFIX=\"${DATADIR}/\"
+LDFLAGS+=	`${SDL_CONFIG} --libs`
 
 do-build:
 	cd ${WRKSRC} && ${CC} ${CFLAGS} ${CPPFLAGS} -o ${PORTNAME} \
diff --git games/mangos/Makefile games/mangos/Makefile
index cde1434..67adfcd 100644
--- games/mangos/Makefile
+++ games/mangos/Makefile
@@ -32,7 +32,6 @@ USE_LDCONFIG=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS= --prefix=${PREFIX} --sysconfdir=${PREFIX}/etc --datadir=${PREFIX}/share
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 
 .include <bsd.port.pre.mk>
 
diff --git games/maxr/Makefile games/maxr/Makefile
index 77428c1..18e2bd6 100644
--- games/maxr/Makefile
+++ games/maxr/Makefile
@@ -18,7 +18,8 @@ COMMENT=	Mechanized Assault and Exploration Reloaded
 GNU_CONFIGURE=	yes
 USE_SDL=	sdl mixer net
 
-CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib" CPPFLAGS="-I${LOCALBASE}/include"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 MAKE_JOBS_SAFE=	yes
 
 DESKTOP_ENTRIES="M.A.X.R." \
diff --git games/monkeybubble/Makefile games/monkeybubble/Makefile
index 60033a3..330cb11 100644
--- games/monkeybubble/Makefile
+++ games/monkeybubble/Makefile
@@ -20,8 +20,8 @@ USE_GNOME=	gnomedocutils gnomehack gnomeprefix intlhack \
 USE_GSTREAMER=	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
 INSTALLS_OMF=	yes
 
 GCONF_SCHEMAS=	monkey-bubble.schemas
diff --git games/monster-masher/Makefile games/monster-masher/Makefile
index b6ec5773..3f8b626 100644
--- games/monster-masher/Makefile
+++ games/monster-masher/Makefile
@@ -23,8 +23,8 @@ USE_BZIP2=	yes
 USE_GNOME=	gnomeprefix gnomehack intlhack libgnome esound
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib -lesd"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib -lesd
 
 GCONF_SCHEMAS=	monster-masher.schemas
 
diff --git games/mudmagic/Makefile games/mudmagic/Makefile
index f6b000b..d9c79a2 100644
--- games/mudmagic/Makefile
+++ games/mudmagic/Makefile
@@ -25,8 +25,8 @@ GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_PYTHON=	24
 USE_LDCONFIG=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 MAN1=		mudmagic.1
 
diff --git games/naev/Makefile games/naev/Makefile
index aef3c85..441c687 100644
--- games/naev/Makefile
+++ games/naev/Makefile
@@ -28,7 +28,8 @@ USE_GNOME=	libxml2
 USE_SDL=	sdl image
 
 CONFIGURE_ARGS=	--with-ndata-path=${DATADIR}/ndata-${PORTVERSION}
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 MAN6=		naev.6
 PLIST_FILES=	bin/${PORTNAME}
diff --git games/nethack33/Makefile games/nethack33/Makefile
index 6bcb10c..e964ef2 100644
--- games/nethack33/Makefile
+++ games/nethack33/Makefile
@@ -20,7 +20,7 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 LATEST_LINK=	nethack33${PKGNAMESUFFIX}
 
 USE_GMAKE=	yes
-MAKE_ENV=	GRAPHICS="${GRAPHICS}" LDFLAGS="${LDFLAGS}"
+MAKE_ENV=	GRAPHICS="${GRAPHICS}"
 PLIST_SUB=	HACKNAME="${HACKNAME}" \
 		HACKEXT="${HACKEXT}"
 MAKE_JOBS_UNSAFE=	yes
@@ -44,7 +44,6 @@ GRAPHICS=	X11_GRAPHICS
 .if ${PKGNAMESUFFIX} == "-gnome"
 CATEGORIES=	games gnome
 USE_GNOME=	gnomelibs
-MAKE_ENV+=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 GRAPHICS=	GNOME_GRAPHICS
 .elif ${PKGNAMESUFFIX} == "-nox11"
 GRAPHICS=	# none
diff --git games/nethack34/Makefile games/nethack34/Makefile
index aa76af0..c5cda41 100644
--- games/nethack34/Makefile
+++ games/nethack34/Makefile
@@ -40,7 +40,6 @@ GRAPHICS=	X11_GRAPHICS
 MAKE_JOBS_UNSAFE=	yes
 CATEGORIES=	games gnome
 USE_GNOME=	gnomelibs
-MAKE_ENV+=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 GRAPHICS=	GNOME_GRAPHICS
 .elif ${PKGNAMESUFFIX} == "-nox11"
 GRAPHICS=	# none
diff --git games/netpanzer-data/Makefile games/netpanzer-data/Makefile
index 417e59c..b4dc5d2 100644
--- games/netpanzer-data/Makefile
+++ games/netpanzer-data/Makefile
@@ -23,8 +23,8 @@ BUILD_DEPENDS=	jam:${PORTSDIR}/devel/jam
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--with-libphysfs=${LOCALBASE} \
 			--datadir=${PREFIX}/share
-CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS} ${PTHREAD_LIBS}" \
-		CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}"
+LDFLAGS+=	${PTHREAD_LIBS}
+CFLAGS+=	${PTHREAD_CFLAGS}
 
 USE_BZIP2=	yes
 USE_SDL=	sdl net mixer image
diff --git games/netpanzer/Makefile games/netpanzer/Makefile
index aced84e..4ebd82f 100644
--- games/netpanzer/Makefile
+++ games/netpanzer/Makefile
@@ -20,8 +20,8 @@ RUN_DEPENDS=	${LOCALBASE}/share/netpanzer/wads/netp.act:${PORTSDIR}/games/netpan
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--with-libphysfs=${LOCALBASE} --without-wx-config
-CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS} ${PTHREAD_LIBS}" \
-		CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}"
+LDFLAGS+=	${PTHREAD_LIBS}
+CFLAGS+=	${PTHREAD_CFLAGS}
 
 USE_BZIP2=	yes
 USE_SDL=	sdl net mixer image ttf
diff --git games/netspades/Makefile games/netspades/Makefile
index 02a2dce..8cc0fcf 100644
--- games/netspades/Makefile
+++ games/netspades/Makefile
@@ -20,8 +20,8 @@ MAKE_JOBS_SAFE=  yes
 
 GNU_CONFIGURE=	yes
 USE_GNOME=	gtk12
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib -ltermcap"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib -ltermcap
 
 MAN6=		gspades.6 slspades.6 spadesd.6
 
diff --git games/nighthawk/Makefile games/nighthawk/Makefile
index e3ceb48..477bb74 100644
--- games/nighthawk/Makefile
+++ games/nighthawk/Makefile
@@ -28,7 +28,7 @@ MAN6=		nighthawk.6
 CFLAGS+=	-DINSTALL_DIR=\\\"\${DATADIR}\\\" \
 		-DSCORES_FILE=\\\"/var/games/nighthawk.scores\\\" \
 		-I${LOCALBASE}/include
-LDFLAGS=	-lm -L${LOCALBASE}/lib -lX11 -lGL -lGLU -lglut
+LDFLAGS+=	-lm -L${LOCALBASE}/lib -lX11 -lGL -lGLU -lglut
 
 post-patch:
 	${FIND} ${WRKSRC} -name "Makefile" | ${XARGS} ${REINPLACE_CMD} -e \
diff --git games/nimuh/Makefile games/nimuh/Makefile
index 61611b0..e44dbd2 100644
--- games/nimuh/Makefile
+++ games/nimuh/Makefile
@@ -22,8 +22,8 @@ USE_GMAKE=	yes
 USE_SDL=	sdl image mixer
 USE_GL=		gl
 
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 DATA_WRKSRC=	${WRKDIR}/${PORTNAME}-data-${PORTVERSION}
 
diff --git games/njam/Makefile games/njam/Makefile
index ab6bda5..3412a8a 100644
--- games/njam/Makefile
+++ games/njam/Makefile
@@ -17,7 +17,7 @@ COMMENT=	Fast paced multiplayer pac-man clone
 
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -D__linux__"
+CPPFLAGS+=	-I${LOCALBASE}/include -D__linux__
 USE_SDL=	mixer image net sdl
 MAKE_JOBS_SAFE=	yes
 PORTDOCS=	*
diff --git games/numptyphysics/Makefile games/numptyphysics/Makefile
index 3f6dfbe..705099a 100644
--- games/numptyphysics/Makefile
+++ games/numptyphysics/Makefile
@@ -21,8 +21,9 @@ GNU_CONFIGURE=	yes
 USE_SDL=	sdl image
 INSTALLS_ICONS=	yes
 
-CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" \
-		CPPFLAGS="-I${LOCALBASE}/include -DINSTALL_BASE_PATH=\"\\\"${DATADIR}\\\"\""
+CONFIGURE_ENV=	AUTOMAKE="${TRUE}" ACLOCAL="${TRUE}" MISSING="${TRUE}"
+LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
+CPPFLAGS+=	-I${LOCALBASE}/include -DINSTALL_BASE_PATH=\"\\\"${DATADIR}\\\"\"
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
diff --git games/openalchemist/Makefile games/openalchemist/Makefile
index 01047d7..76e0682 100644
--- games/openalchemist/Makefile
+++ games/openalchemist/Makefile
@@ -26,8 +26,6 @@ ACLOCAL_ARGS+=	-I ${LOCALBASE}/share/aclocal
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}" \
-		LDFLAGS="${LDFLAGS}"
 USE_GNOME=	pkgconfig pygtk2
 USE_XORG=	xxf86vm xi x11 xmu xext xdamage xfixes xau xdmcp xt sm ice
 USE_GL=		gl glu
diff --git games/openglad/Makefile games/openglad/Makefile
index 02a7337d..d890e1f 100644
--- games/openglad/Makefile
+++ games/openglad/Makefile
@@ -18,7 +18,7 @@ USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 USE_SDL=	sdl mixer
 
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include"
+CPPFLAGS+=	-I${LOCALBASE}/include
 
 NOT_FOR_ARCHS=	sparc64
 
diff --git games/openjazz/Makefile games/openjazz/Makefile
index 77c6484..bb151b4 100644
--- games/openjazz/Makefile
+++ games/openjazz/Makefile
@@ -31,7 +31,6 @@ DOS2UNIX_REGEX=	.*\.(h|cpp)
 CPPFLAGS+=	-I${LOCALBASE}/include `${SDL_CONFIG} --cflags` \
 		-DDATAPATH=\\\"${DATADIR}/\\\" -DHOMEDIR
 LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS} `${SDL_CONFIG} --libs`
-MAKE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 
 SUB_FILES=	pkg-message
 
diff --git games/openmortal/Makefile games/openmortal/Makefile
index f7e11cb..96a5f2b 100644
--- games/openmortal/Makefile
+++ games/openmortal/Makefile
@@ -21,7 +21,7 @@ USE_PERL5=	yes
 USE_SDL=	mixer image sdl net
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
 
 .include <bsd.port.mk>
diff --git games/opensonic/Makefile games/opensonic/Makefile
index bd46422..3aeec8e 100644
--- games/opensonic/Makefile
+++ games/opensonic/Makefile
@@ -26,7 +26,6 @@ USE_CMAKE=	yes
 CMAKE_ENV+=	OPENSNC_ALLEGRO_LIBS="`allegro-config --libs`" OPENSNC_ALLEGRO_VERSION="`allegro-config --version`"
 
 CFLAGS+=	-I${LOCALBASE}/include
-MAKE_ENV+=	CFLAGS="${CFLAGS}"
 
 BUILD_DEPENDS+=	${LOCALBASE}/lib/libaldmb.a:${PORTSDIR}/audio/dumb-allegro \
 		alpng>=1.3:${PORTSDIR}/graphics/alpng
diff --git games/openyahtzee/Makefile games/openyahtzee/Makefile
index e0e7ae6..1a4d90c 100644
--- games/openyahtzee/Makefile
+++ games/openyahtzee/Makefile
@@ -18,9 +18,8 @@ USE_BZIP2=	yes
 USE_WX=		2.8+
 WX_CONF_ARGS=	absolute
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 
-CPPFLAGS=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .include <bsd.port.mk>
diff --git games/orbital_eunuchs_sniper/Makefile games/orbital_eunuchs_sniper/Makefile
index 35acadb..7c03ea3 100644
--- games/orbital_eunuchs_sniper/Makefile
+++ games/orbital_eunuchs_sniper/Makefile
@@ -17,14 +17,13 @@ COMMENT=	An overhead shooting game
 
 USE_SDL=	sdl image mixer
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--with-games-dir=${PREFIX}/share
 MAKE_JOBS_SAFE=	yes
 
 PORTDOCS=	AUTHORS ChangeLog README TODO readme.txt
 
-CPPFLAGS=	`${SDL_CONFIG} --cflags`
-LDFLAGS=	`${SDL_CONFIG} --libs`
+CPPFLAGS+=	`${SDL_CONFIG} --cflags`
+LDFLAGS+=	`${SDL_CONFIG} --libs`
 
 post-install:
 .if !defined(NOPORTDOCS)
diff --git games/pachi/Makefile games/pachi/Makefile
index daf239a..de72e98 100644
--- games/pachi/Makefile
+++ games/pachi/Makefile
@@ -24,8 +24,6 @@ MAKE_JOBS_SAFE=	yes
 LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 CPPFLAGS+=	-I${LOCALBASE}/include
 
-CONFIGURE_ENV=	LDFLAGS="${LDFLAGS}" CPPFLAGS="${CPPFLAGS}"
-
 WRKSRC=		${WRKDIR}/Pachi
 
 SCOREDIR=	/var/games/pachi
diff --git games/pengupop/Makefile games/pengupop/Makefile
index ed3d97d..6f1161f 100644
--- games/pengupop/Makefile
+++ games/pengupop/Makefile
@@ -17,8 +17,8 @@ COMMENT=	Online multiplayer clone of Bust a Move
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_SDL=	sdl
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 
 PLIST_FILES=	bin/pengupop
 
diff --git games/pinball/Makefile games/pinball/Makefile
index 02e79bb..cb5ad15 100644
--- games/pinball/Makefile
+++ games/pinball/Makefile
@@ -33,8 +33,8 @@ CONFIGURE_ARGS=	--prefix=${PREFIX} --without-debug
 CONFIGURE_ARGS+=	--with-allegro
 EXTRA_LIBS=	-lGL -lGLU
 .endif
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include -DRZR_LIBSTATIC" \
-		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib ${EXTRA_LIBS}"
+CPPFLAGS+=	-I${LOCALBASE}/include -DRZR_LIBSTATIC
+LDFLAGS+=	-L${LOCALBASE}/lib ${EXTRA_LIBS}
 MAKE_JOBS_UNSAFE=	yes
 ALLEGRO_CONFIG=	${LOCALBASE}/bin/allegro-config
 
diff --git games/pinedit/Makefile games/pinedit/Makefile
index 08d10bf..11337c6 100644
--- games/pinedit/Makefile
+++ games/pinedit/Makefile
@@ -23,7 +23,7 @@ USE_PERL5_BUILD=	yes
 USE_AUTOTOOLS=	libtool
 
 CONFIGURE_ARGS=	--prefix=${PREFIX} --without-debug
-CONFIGURE_ENV=	LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib -L${LOCALBASE}/lib/pinball"
-CPPFLAGS=	-DRZR_LIBSTATIC
+LDFLAGS+=	-L${LOCALBASE}/lib -L${LOCALBASE}/lib/pinball
+CPPFLAGS+=	-DRZR_LIBSTATIC
 
 .include <bsd.port.mk>
diff --git games/pioneers/Makefile games/pioneers/Makefile
index 2e0769b..cf9f530 100644
--- games/pioneers/Makefile
+++ games/pioneers/Makefile
@@ -21,8 +21,8 @@ USE_GETTEXT=	yes
 USE_GNOME=	gnomehack gnomeprefix gtk20 libgnome
 INSTALLS_OMF=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
 
 MAN6=		pioneers.6 pioneers-server-gtk.6 pioneers-server-console.6 \
 		pioneersai.6 pioneers-meta-server.6 pioneers-editor.6
diff --git games/pipenightdreams/Makefile games/pipenightdreams/Makefile
index 9c6b215..0fcffcb 100644
--- games/pipenightdreams/Makefile
+++ games/pipenightdreams/Makefile
@@ -18,7 +18,7 @@ USE_SDL=	image sdl
 GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include"
+CPPFLAGS+=	-I${LOCALBASE}/include
 
 MAN6=		pipenightdreams.6
 
diff --git games/pipewalker/Makefile games/pipewalker/Makefile
index f7f13bd..92aa4d8 100644
--- games/pipewalker/Makefile
+++ games/pipewalker/Makefile
@@ -19,8 +19,8 @@ USE_SDL=	sdl
 USE_GL=		gl glu
 MAKE_JOBS_SAFE=	yes
 
-CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" \
-		CPPFLAGS="-I${LOCALBASE}/include"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 
 PORTDOCS=	*
 
diff --git games/pongix/Makefile games/pongix/Makefile
index 972de82..7f4c246 100644
--- games/pongix/Makefile
+++ games/pongix/Makefile
@@ -19,7 +19,6 @@ USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD}
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 
 do-install:
 	${MKDIR} ${DATADIR}
diff --git games/prboom/Makefile games/prboom/Makefile
index 4ff47c0..13a72a6 100644
--- games/prboom/Makefile
+++ games/prboom/Makefile
@@ -20,8 +20,8 @@ USE_GMAKE=	yes
 USE_SDL=	mixer net sdl
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 OPTIONS=	GL "Enable OpenGL support" on
 
diff --git games/pushover/Makefile games/pushover/Makefile
index 7af4c6b..6149152 100644
--- games/pushover/Makefile
+++ games/pushover/Makefile
@@ -19,8 +19,8 @@ GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_SDL=	sdl mixer ttf
 USE_LUA=	5.1
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
-		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 USE_GETTEXT=	yes
 MAKE_JOBS_SAFE=	yes
 
diff --git games/qonk/Makefile games/qonk/Makefile
index 5a64b5e..58b7a53 100644
--- games/qonk/Makefile
+++ games/qonk/Makefile
@@ -18,8 +18,8 @@ GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_SDL=	sdl gfx ttf image
 
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|-lSDL |`${SDL_CONFIG} --libs` |' \
diff --git games/quetoo/Makefile games/quetoo/Makefile
index ba382df..7616228 100644
--- games/quetoo/Makefile
+++ games/quetoo/Makefile
@@ -22,10 +22,10 @@ USE_GL=		glut
 USE_DOS2UNIX=	src/vanctf/g_local.h
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib" \
-		OPENGL_CFLAGS="-I${LOCALBASE}/include" \
+CONFIGURE_ENV=	OPENGL_CFLAGS="-I${LOCALBASE}/include" \
 		OPENGL_LIBS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 LIBDIR=		${PREFIX}/lib/${PORTNAME}
 PLIST_SUB+=	LIBDIR="${LIBDIR:S/${PREFIX}\///}"
diff --git games/race/Makefile games/race/Makefile
index 831333b..327c50a 100644
--- games/race/Makefile
+++ games/race/Makefile
@@ -23,7 +23,7 @@ USE_BZIP2=	yes
 USE_GL=		glut
 CFLAGS+=	"-I${LOCALBASE}/include"
 CC+=		${CFLAGS}
-MAKE_ENV=	LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 
 post-patch:
 	@${REINPLACE_CMD} -e "s|^CC|#CC|g" \
diff --git games/ri-li/Makefile games/ri-li/Makefile
index cdcfd97..9e523b5 100644
--- games/ri-li/Makefile
+++ games/ri-li/Makefile
@@ -20,7 +20,7 @@ USE_GMAKE=	yes
 USE_SDL=	sdl mixer
 MAKE_JOBS_SAFE=	yes
 
-CONFIGURE_ENV=	CPPFLAGS="`${SDL_CONFIG} --cflags` -I${LOCALBASE}/include"
+CPPFLAGS+=	`${SDL_CONFIG} --cflags` -I${LOCALBASE}/include
 
 DESKTOP_ENTRIES="Ri-li" \
 		"Drive a toy wood train in many levels - snake-like arcade game" \
diff --git games/rtb/Makefile games/rtb/Makefile
index e66616b..859e4e5 100644
--- games/rtb/Makefile
+++ games/rtb/Makefile
@@ -23,11 +23,10 @@ USE_PERL5=	yes
 USE_PYTHON=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--with-rtb-dir=${PREFIX}/lib/${PORTNAME}
 
-CPPFLAGS=	-I${LOCALBASE}/include -DHAVE_DECL_GETOPT
-LDFLAGS=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include -DHAVE_DECL_GETOPT
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 post-patch:
 .for file in configure
diff --git games/scorched3d/Makefile games/scorched3d/Makefile
index 511e0d1..d0c45ae 100644
--- games/scorched3d/Makefile
+++ games/scorched3d/Makefile
@@ -46,7 +46,6 @@ CONFIGURE_ARGS=		--program-prefix='' \
 .if defined(WITH_MYSQL)
 CONFIGURE_ARGS+=	--with-mysql
 .endif
-CONFIGURE_ENV=		CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 MAKE_ARGS=		ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" \
 			AUTOMAKE="${TRUE}" AUTOHEADER="${TRUE}"
 
diff --git games/scourge/Makefile games/scourge/Makefile
index 600210a..0c0e565 100644
--- games/scourge/Makefile
+++ games/scourge/Makefile
@@ -26,7 +26,6 @@ USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_LIBS}
 LDFLAGS+=	-L${LOCALBASE}/lib
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 
 CONFIGURE_ARGS=	--with-data-dir=${DATADIR}
 
diff --git games/scramble/Makefile games/scramble/Makefile
index 9004437..747945d 100644
--- games/scramble/Makefile
+++ games/scramble/Makefile
@@ -19,9 +19,8 @@ GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_SDL=	sdl mixer image ttf
 
-CONFIGURE_ENV=	LDFLAGS="`${SDL_CONFIG} --libs`" \
-		CPPFLAGS="`${SDL_CONFIG} --cflags`" \
-		SDL_CONFIG="${SDL_CONFIG}"
+CPPFLAGS+=	`${SDL_CONFIG} --cflags`
+LDFLAGS+=	`${SDL_CONFIG} --libs`
 
 MAN6=		scramble.6
 
diff --git games/scummvm-tools/Makefile games/scummvm-tools/Makefile
index 638b41e..5c59685 100644
--- games/scummvm-tools/Makefile
+++ games/scummvm-tools/Makefile
@@ -30,7 +30,7 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION}
 
 MAKE_JOBS_SAFE=	yes
 
-MAKE_ENV=	"LDFLAGS= -L${LOCALBASE}/lib"
+LDFLAGS+=	-L${LOCALBASE}/lib
 CXXFLAGS=	-I${LOCALBASE}/include
 
 OPTIONS=	WX "Build wxWidgets GUI" On
diff --git games/scummvm/Makefile games/scummvm/Makefile
index 4c1fde7..0b97edb 100644
--- games/scummvm/Makefile
+++ games/scummvm/Makefile
@@ -28,8 +28,7 @@ CONFIGURE_ARGS=	--prefix=${PREFIX} \
 		--disable-debug \
 		--disable-nasm \
 		--disable-tremor
-CONFIGURE_ENV=	CXX="${CXX}"
- 		LDFLAGS="${PTHREAD_LIBS}"
+LDFLAGS+=	${PTHREAD_LIBS}
 
 OPTIONS=	VORBIS "Enable Ogg Vorbis support" on \
 		MP3 "Enable MP3 support" on \
diff --git games/sdb/Makefile games/sdb/Makefile
index 8e5bab9..4178b56 100644
--- games/sdb/Makefile
+++ games/sdb/Makefile
@@ -24,7 +24,7 @@ USE_GMAKE=	yes
 BUILD_WRKSRC=	${WRKSRC}/src
 
 CXXFLAGS+=	`${SDL_CONFIG} --cflags`
-LDFLAGS=	`${SDL_CONFIG} --libs` -lSDL_image -lSDL_mixer -lGL -lGLU
+LDFLAGS+=	`${SDL_CONFIG} --libs` -lSDL_image -lSDL_mixer -lGL -lGLU
 MAKE_ARGS=	CPP="${CXX}" CXXFLAGS="${CXXFLAGS}" LIBS="${LDFLAGS}"
 
 PORTDOCS=	*
diff --git games/secretmaryochronicles/Makefile games/secretmaryochronicles/Makefile
index 6fea4b6..76057e6 100644
--- games/secretmaryochronicles/Makefile
+++ games/secretmaryochronicles/Makefile
@@ -29,8 +29,8 @@ USE_GL=		gl glu
 USE_GETTEXT=	yes
 MAKE_JOBS_SAFE=	yes
 
-CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib" \
-		CPPFLAGS="-I${LOCALBASE}/include"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 DATADIR=	${PREFIX}/share/smc
 
diff --git games/shaaft/Makefile games/shaaft/Makefile
index d7e5139..fa0ac47 100644
--- games/shaaft/Makefile
+++ games/shaaft/Makefile
@@ -21,8 +21,8 @@ USE_BZIP2=	yes
 USE_SDL=	mixer image sdl
 USE_GL=		yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--disable-optimize
 DATADIR=	${PREFIX}/share/Shaaft
 
diff --git games/shootingstar/Makefile games/shootingstar/Makefile
index 92e798a..5886671 100644
--- games/shootingstar/Makefile
+++ games/shootingstar/Makefile
@@ -20,8 +20,8 @@ USE_GMAKE=	yes
 USE_GL=		gl
 USE_SDL=	sdl mixer image
 
-CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib" \
-		CPPFLAGS="-I${LOCALBASE}/include" \
-		SDL_CONFIG="${SDL_CONFIG}"
+CONFIGURE_ENV=	SDL_CONFIG="${SDL_CONFIG}"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .include <bsd.port.mk>
diff --git games/sjeng/Makefile games/sjeng/Makefile
index 651fc62..2ef8464 100644
--- games/sjeng/Makefile
+++ games/sjeng/Makefile
@@ -18,8 +18,8 @@ COMMENT=	Chess engine supporting chess variations
 LIB_DEPENDS=	gdbm.4:${PORTSDIR}/databases/gdbm
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib -lgdbm"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib -lgdbm
 
 PLIST_FILES=	bin/sjeng
 
diff --git games/spacejunk/Makefile games/spacejunk/Makefile
index fd5e2e5..a8e9f42 100644
--- games/spacejunk/Makefile
+++ games/spacejunk/Makefile
@@ -20,8 +20,9 @@ AUTOMAKE_ARGS=	-i --add-missing
 GNU_CONFIGURE=	yes
 MAKE_JOBS_SAFE=	yes
 
-CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib" CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="${PTHREAD_LIBS}"
+CONFIGURE_ENV=	LIBS="${PTHREAD_LIBS}"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 SUB_FILES=	spacejunk
 
diff --git games/stepmania-devel/Makefile games/stepmania-devel/Makefile
index 921c0ac..2af0ff2 100644
--- games/stepmania-devel/Makefile
+++ games/stepmania-devel/Makefile
@@ -30,8 +30,8 @@ USE_GL=		gl glu
 USE_XORG=	x11 xtst xrandr xau xdmcp xext xrender
 USE_ICONV=	yes
 USE_GNOME=	gtk20
-CONFIGURE_ENV+=	LDFLAGS="-L${LOCALBASE}/lib" \
-		CFLAGS="-I${LOCALBASE}/include"
+LDFLAGS+=	-L${LOCALBASE}/lib
+CFLAGS+=	-I${LOCALBASE}/include
 
 # Not yet implemented
 #		FFMPEG		"Enable ffmpeg support"			off \
diff --git games/super_methane_brothers/Makefile games/super_methane_brothers/Makefile
index 34b531d..cda2833 100644
--- games/super_methane_brothers/Makefile
+++ games/super_methane_brothers/Makefile
@@ -24,8 +24,8 @@ USE_GMAKE=	yes
 MAKEFILE=	makefile
 BUILD_WRKSRC=	${WRKSRC}/source/linux
 
-CPPFLAGS=	-I${LOCALBASE}/include -I${LOCALBASE}/include/ClanLib-0.8
-LDFLAGS=	-L${LOCALBASE}/lib -L${LOCALBASE}/lib/ClanLib-0.8
+CPPFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include/ClanLib-0.8
+LDFLAGS+=	-L${LOCALBASE}/lib -L${LOCALBASE}/lib/ClanLib-0.8
 
 post-patch:
 	@${REINPLACE_CMD} -e \
diff --git games/supertuxkart/Makefile games/supertuxkart/Makefile
index 403ef2b..703e532 100644
--- games/supertuxkart/Makefile
+++ games/supertuxkart/Makefile
@@ -33,8 +33,8 @@ PORTDOCS=	*
 
 # Using LIBS instead of LDFLAGS, otherwise will break when
 # there's devel/bullet port installed
-CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" \
-		CPPFLAGS="-I${LOCALBASE}/include"
+CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CPPFLAGS+=	-I${LOCALBASE}/include
 CONFIGURE_ARGS=	--with-irrlicht="${LOCALBASE}"
 
 LICENSE=	GPLv3
diff --git games/taxipilot/Makefile games/taxipilot/Makefile
index 62fcfa2..64dac6c 100644
--- games/taxipilot/Makefile
+++ games/taxipilot/Makefile
@@ -21,7 +21,8 @@ USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
 EXTRA_PATCHES= ${.CURDIR}/../../x11/kde3/files/extrapatch-old_configure
-CONFIGURE_ENV=	LDFLAGS="${LDFLAGS} ${PTHREAD_LIBS}" CPPFLAGS="${CPPFLAGS} ${PTHREAD_CFLAGS}"
+CPPFLAGS+=	${PTHREAD_CFLAGS}
+LDFLAGS+=	${PTHREAD_LIBS}
 
 .include <bsd.port.pre.mk>
 
diff --git games/teg/Makefile games/teg/Makefile
index b4b6dcc..8ad932e5 100644
--- games/teg/Makefile
+++ games/teg/Makefile
@@ -17,8 +17,8 @@ COMMENT=	A turn-based strategy game for GNOME
 USE_GNOME=	gnomehack gnomeprefix intlhack libgnomeui
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--disable-ggz
 
 GCONF_SCHEMAS=	teg.schemas
diff --git games/thevalley/Makefile games/thevalley/Makefile
index 5667c2d..4d3b8c3 100644
--- games/thevalley/Makefile
+++ games/thevalley/Makefile
@@ -19,8 +19,8 @@ HAS_CONFIGURE=	yes
 WRKSRC=		${WRKDIR}/${DISTNAME}
 USE_SDL=	sdl
 USE_PERL5_BUILD=yes
-CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" \
-		CXXFLAGS="${PTHREAD_CFLAGS} -I${LOCALBASE}/include"
+LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
+CXXFLAGS+=	${PTHREAD_CFLAGS} -I${LOCALBASE}/include
 
 PLIST_FILES=	bin/valley
 
diff --git games/tinymux/Makefile games/tinymux/Makefile
index abb31b1..a38dae6 100644
--- games/tinymux/Makefile
+++ games/tinymux/Makefile
@@ -21,13 +21,12 @@ WRKSRC=		${WRKDIR}/mux2.6/src
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	LDFLAGS="${LDFLAGS}"
 MAKE_JOBS_SAFE=	yes
 
 PORTDOCS=	*
 
-CPPFLAGS=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 PATCHLEVEL=	32
 
diff --git games/tmw/Makefile games/tmw/Makefile
index 3841a63..83c5a47 100644
--- games/tmw/Makefile
+++ games/tmw/Makefile
@@ -25,7 +25,7 @@ RUN_DEPENDS=	guichan>=0.8.1:${PORTSDIR}/devel/guichan
 GNU_CONFIGURE=	yes
 USE_SDL=	sdl image mixer net ttf
 
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include `${SDL_CONFIG} --cflags` ${PTHREAD_CFLAGS}"
+CPPFLAGS+=	-I${LOCALBASE}/include `${SDL_CONFIG} --cflags` ${PTHREAD_CFLAGS}
 MAN6=		tmw.6
 
 OPTIONS=	MUSIC	"Install additional music" on \
@@ -35,11 +35,11 @@ OPTIONS=	MUSIC	"Install additional music" on \
 
 .if !defined(WITHOUT_NLS)
 USE_GETTEXT=	yes
-CONFIGURE_ENV+=	LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS} -lintl"
+LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS} -lintl
 PLIST_SUB+=	NLS=""
 .else
 PLIST_SUB+=	NLS="@comment "
-CONFIGURE_ENV+=	LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 .endif
 
 .if !defined(WITHOUT_MUSIC)
diff --git games/toppler/Makefile games/toppler/Makefile
index 543ad21..5e4c784 100644
--- games/toppler/Makefile
+++ games/toppler/Makefile
@@ -17,13 +17,12 @@ USE_SDL=	mixer sdl
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share
 
 MAN6=		${PORTNAME}.6
 
-CPPFLAGS=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 post-patch:
 	@${REINPLACE_CMD} -e \
diff --git games/torcs/Makefile games/torcs/Makefile
index faff71d..e159cf3 100644
--- games/torcs/Makefile
+++ games/torcs/Makefile
@@ -28,8 +28,8 @@ USE_GMAKE=	yes
 USE_LDCONFIG=	yes
 REINPLACE_ARGS=	-i ""
 CONFIGURE_ARGS=	--x-includes=${LOCALBASE}/include --x-libraries=${LOCALBASE}/lib
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include -DHAVE_DECL_GETOPT" \
-		LIBS="${PTHREAD_LIBS}" LDFLAGS="${LDFLAGS}"
+CONFIGURE_ENV=	LIBS="${PTHREAD_LIBS}"
+CPPFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include -DHAVE_DECL_GETOPT
 
 ALL_TARGET=	default
 INSTALL_TARGET=	install datainstall
diff --git games/torrent/Makefile games/torrent/Makefile
index a24c273..dffde69 100644
--- games/torrent/Makefile
+++ games/torrent/Makefile
@@ -19,9 +19,8 @@ GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_SDL=	sdl mixer image ttf
 
-CONFIGURE_ENV=	LDFLAGS="`${SDL_CONFIG} --libs`" \
-		CPPFLAGS="`${SDL_CONFIG} --cflags`" \
-		SDL_CONFIG="${SDL_CONFIG}"
+CPPFLAGS+=	`${SDL_CONFIG} --cflags`
+LDFLAGS+=	`${SDL_CONFIG} --libs`
 
 MAN6=		torrent.6
 
diff --git games/toycars/Makefile games/toycars/Makefile
index 6c9f67e..e25a66a 100644
--- games/toycars/Makefile
+++ games/toycars/Makefile
@@ -22,8 +22,8 @@ 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
 
 PORTDOCS=	README
 
diff --git games/trackballs/Makefile games/trackballs/Makefile
index 93b26f6..3b2eccd 100644
--- games/trackballs/Makefile
+++ games/trackballs/Makefile
@@ -26,14 +26,13 @@ USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 USE_GNOME=	desktopfileutils
 INSTALLS_ICONS=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 MAKE_ARGS=	mkinstalldirs="${MKDIR}"
 
 MAN6=	trackballs.6
 MANCOMPRESSED=	no
 
-CPPFLAGS=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib -lintl
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib -lintl
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|install -D|$$(INSTALL)|' \
diff --git games/trigger/Makefile games/trigger/Makefile
index 4caec5f..4cc32ef 100644
--- games/trigger/Makefile
+++ games/trigger/Makefile
@@ -24,8 +24,8 @@ USE_SDL=	sdl image
 USE_GL=		yes
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
-		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 
 WRKSRC=		${WRKDIR}/trigger-${PORTVERSION}-src
 DATASRC=	${WRKDIR}/trigger-${DATAVERSION}-data
diff --git games/trophy/Makefile games/trophy/Makefile
index 756fb15e..f61b7be2 100644
--- games/trophy/Makefile
+++ games/trophy/Makefile
@@ -21,8 +21,8 @@ LIB_DEPENDS=	clanCore-0.8:${PORTSDIR}/devel/clanlib
 HAS_CONFIGURE=	yes
 PORTDOCS=	AUTHORS COPYING ChangeLog README TODO
 
-CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV+=	LIBS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
 CONFIGURE_ARGS=	--prefix="${PREFIX}" --exec-prefix="${PREFIX}"
 
 DESKTOP_ENTRIES="Trophy" "${COMMENT}" "" "trophy" "Application;Game;" false
diff --git games/ttt/Makefile games/ttt/Makefile
index 2fae0d5..41a1bdb 100644
--- games/ttt/Makefile
+++ games/ttt/Makefile
@@ -24,11 +24,10 @@ USE_SDL=	sdl
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	aclocal automake autoheader autoconf
 AUTOMAKE_ARGS=	--add-missing --force
-CONFIGURE_ENV=	LDFLAGS="${LDFLAGS}"
 MAKE_JOBS_SAFE=	yes
 
-CPPFLAGS=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 post-patch:
 	@${REINPLACE_CMD} -e \
diff --git games/tux-aqfh/Makefile games/tux-aqfh/Makefile
index b84788a..8f8fcc5 100644
--- games/tux-aqfh/Makefile
+++ games/tux-aqfh/Makefile
@@ -22,12 +22,11 @@ BUILD_DEPENDS=	${LOCALBASE}/lib/libplibsl.a:${PORTSDIR}/x11-toolkits/plib
 USE_GL=		glut
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--with-plib=${LOCALBASE}
 MAKE_JOBS_SAFE=	yes
 
-CPPFLAGS=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS=	-L${LOCALBASE}/lib -lusbhid ${PTHREAD_LIBS}
+CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS+=	-L${LOCALBASE}/lib -lusbhid ${PTHREAD_LIBS}
 
 .include <bsd.port.pre.mk>
 
diff --git games/tuxkart/Makefile games/tuxkart/Makefile
index 7d79b3a..61ec683 100644
--- games/tuxkart/Makefile
+++ games/tuxkart/Makefile
@@ -19,8 +19,8 @@ BUILD_DEPENDS=	${LOCALBASE}/lib/libplibsl.a:${PORTSDIR}/x11-toolkits/plib
 USE_GL=		gl
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib -lusbhid"
+CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib -lusbhid"
+CPPFLAGS+=	-I${LOCALBASE}/include
 CONFIGURE_ARGS=	--with-plib=${LOCALBASE}
 
 .include <bsd.port.pre.mk>
diff --git games/tuxtype/Makefile games/tuxtype/Makefile
index 0e65cde..257fc7d 100644
--- games/tuxtype/Makefile
+++ games/tuxtype/Makefile
@@ -19,8 +19,9 @@ USE_GMAKE=	yes
 USE_SDL=	image mixer sdl ttf pango
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--program-transform-name=""
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib" LIBS="-pthread"
+CONFIGURE_ENV=	LIBS="${PTHREAD_LIBS}"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 WRKSRC=		${WRKDIR}/${DISTNAME:S/.17/.16/}
 
 post-patch:
diff --git games/ufoai/Makefile games/ufoai/Makefile
index d89c133..d4efa16 100644
--- games/ufoai/Makefile
+++ games/ufoai/Makefile
@@ -34,9 +34,9 @@ USE_GNOME=	pkgconfig
 USE_OPENAL=	soft
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--enable-release=yes
-CONFIGURE_ENV+=		CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
-			CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
-			LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
+CFLAGS+=	-I${LOCALBASE}/include
 
 DATADIR=	share/${PORTNAME}
 SUB_FILES=	pkg-message
diff --git games/ultimatestunts/Makefile games/ultimatestunts/Makefile
index acb8d79..cc80141 100644
--- games/ultimatestunts/Makefile
+++ games/ultimatestunts/Makefile
@@ -23,11 +23,10 @@ USE_SDL=	sdl image
 USE_GETTEXT=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-openal
-CONFIGURE_ENV=	LDFLAGS="${LDFLAGS}"
 MAKE_JOBS_UNSAFE=	yes
 
-CPPFLAGS=	`${SDL_CONFIG} --cflags`
-LDFLAGS=	-L${LOCALBASE}/lib
+CPPFLAGS+=	`${SDL_CONFIG} --cflags`
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 PORT_VERBS=	${PORTNAME} ustunts
 
diff --git games/vamos/Makefile games/vamos/Makefile
index 59bf434..2307ecf 100644
--- games/vamos/Makefile
+++ games/vamos/Makefile
@@ -20,15 +20,14 @@ USE_GL=		glut
 USE_SDL=	sdl
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	ac_cv_header_boost_test_unit_test_hpp=no \
 		ac_cv_lib_freeglut_glutGetModifiers=no
 USE_LDCONFIG=	yes
 
 INFO=		vamos
 
-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:
 	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
diff --git games/vegastrike/Makefile games/vegastrike/Makefile
index 00a86f49..6ccdfa5 100644
--- games/vegastrike/Makefile
+++ games/vegastrike/Makefile
@@ -28,8 +28,8 @@ USE_PYTHON=	yes
 USE_SDL=	sdl
 USE_GL=		gl glu glut
 USE_GNOME=	gtk20
-CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib" \
-		CPPFLAGS="-I${LOCALBASE}/include"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 MAKE_JOBS_SAFE=	yes
 
diff --git games/volleyball/Makefile games/volleyball/Makefile
index ad5b54a..d8bf776 100644
--- games/volleyball/Makefile
+++ games/volleyball/Makefile
@@ -21,7 +21,7 @@ USE_SDL=	sdl image mixer
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 USE_GETTEXT=	yes
-CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib -lintl"
+LDFLAGS+=	-L${LOCALBASE}/lib -lintl
 CONFIGURE_ARGS=	--mandir="${MANPREFIX}/man" --disable-nls # strangeness in nls support
 MAKE_JOBS_SAFE=	yes
 
diff --git games/warmux/Makefile games/warmux/Makefile
index 56731e2..bcc3276 100644
--- games/warmux/Makefile
+++ games/warmux/Makefile
@@ -44,8 +44,8 @@ post-patch:
 .if !defined(WITHOUT_NLS)
 USE_GETTEXT=	yes
 PLIST_SUB+=	NLS=""
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 .else
 CONFIGURE_ARGS+=	--disable-nls
 PLIST_SUB+=	NLS="@comment "
diff --git games/warzone2100/Makefile games/warzone2100/Makefile
index 7298935..b9bf31c 100644
--- games/warzone2100/Makefile
+++ games/warzone2100/Makefile
@@ -34,10 +34,10 @@ USE_GL=		yes
 USE_GMAKE=	yes
 USE_SDL=	net sdl
 CONFIGURE_ARGS=	--program-transform-name="" --with-distributor="FreeBSD ports"
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib" \
-		LIBS="${PTHREAD_LIBS}" \
+CONFIGURE_ENV=	LIBS="${PTHREAD_LIBS}" \
 		PATH="${LOCALBASE}/bin:$$PATH"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 REINPLACE_ARGS=	-i ''
 MAKE_JOBS_SAFE=	yes
 PORTDOCS=	*
diff --git games/wesnoth/Makefile games/wesnoth/Makefile
index 260f00c..71440f2 100644
--- games/wesnoth/Makefile
+++ games/wesnoth/Makefile
@@ -31,8 +31,7 @@ USE_LUA=	5.1
 USE_AUTOTOOLS=	aclocal autoheader automake autoconf
 ACLOCAL_ARGS=	-Im4
 AUTOMAKE_ARGS=	--add-missing --copy
-CONFIGURE_ENV=	PKG_CONFIG="${PKG_CONFIG}" \
-		LDFLAGS="${LDFLAGS}"
+CONFIGURE_ENV=	PKG_CONFIG="${PKG_CONFIG}"
 CONFIGURE_ARGS=	--localstatedir=/var \
 		--with-boost=${LOCALBASE} \
 		--with-icondir=${PREFIX}/share/pixmaps \
diff --git games/wmpuzzle/Makefile games/wmpuzzle/Makefile
index d2fd586..2b5c80b 100644
--- games/wmpuzzle/Makefile
+++ games/wmpuzzle/Makefile
@@ -19,13 +19,12 @@ WRKSRC=		${WRKDIR}/${DISTNAME}/src
 USE_XORG=	xpm
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	LDFLAGS="${LDFLAGS}"
 
 MAN6=		wmpuzzle.6
 PLIST_FILES=	bin/wmpuzzle
 
-CPPFLAGS=	-I${LOCALBASE}/include -DBSD
-LDFLAGS=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include -DBSD
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/wmpuzzle ${PREFIX}/bin
diff --git games/xbl/Makefile games/xbl/Makefile
index 7140782..606a9ee 100644
--- games/xbl/Makefile
+++ games/xbl/Makefile
@@ -15,8 +15,7 @@ COMMENT=	A 3D block-dropping game
 
 USE_XORG=	x11
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \
-		ac_cv_prog_IMAKE="" ac_cv_prog_XMKMF=""
+CONFIGURE_ENV=	ac_cv_prog_IMAKE="" ac_cv_prog_XMKMF=""
 MAKE_ARGS=	USE_SETGID="" \
 		GROUP_GID="" \
 		RESOURCEDIR="${PREFIX}/lib/X11/app-defaults" \
@@ -29,8 +28,8 @@ MAKE_ARGS=	USE_SETGID="" \
 MAN1=		xbl.1
 
 CFLAGS+=	-I${LOCALBASE}/include
-CPPFLAGS=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|@CFLA@ -g|@CFLA@|g' ${WRKSRC}/Makefile.in
diff --git games/xblast/Makefile games/xblast/Makefile
index 4164704..85c6dd6 100644
--- games/xblast/Makefile
+++ games/xblast/Makefile
@@ -43,7 +43,6 @@ WANT_SDL=	yes
 .endif
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--enable-admin
 MAKE_ARGS=	ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOHEADER="${TRUE}" \
 		AUTOMAKE="${TRUE}"
@@ -53,8 +52,8 @@ MAN6=		xblast.6
 
 DATADIR=	${PREFIX}/share/XBlast-TNT
 
-CPPFLAGS=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 FONTSDIR=	${LOCALBASE}/lib/X11/fonts/bitstream-vera
 
diff --git games/xbubble/Makefile games/xbubble/Makefile
index 7c10be5..f1d384c 100644
--- games/xbubble/Makefile
+++ games/xbubble/Makefile
@@ -23,7 +23,7 @@ GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_GETTEXT=	yes
 
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include/libpng" \
-		LDFLAGS="-L${LOCALBASE}/lib -lintl"
+CPPFLAGS+=	-I${LOCALBASE}/include/libpng
+LDFLAGS+=	-L${LOCALBASE}/lib -lintl
 
 .include <bsd.port.mk>
diff --git games/xcowsay/Makefile games/xcowsay/Makefile
index 3a5506a..23c2342 100644
--- games/xcowsay/Makefile
+++ games/xcowsay/Makefile
@@ -20,7 +20,6 @@ USE_GNOME=	gtk20
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 
 MAN6=		xcowsay.6
 PLIST_FILES=	bin/xcowdream \
@@ -34,8 +33,8 @@ PLIST_FILES=	bin/xcowdream \
 		%%DATADIR%%/cow_small.png
 PLIST_DIRS=	%%DATADIR%%
 
-CPPFLAGS=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .include <bsd.port.options.mk>
 
diff --git games/xinvaders/Makefile games/xinvaders/Makefile
index e07c6e6..43c7050 100644
--- games/xinvaders/Makefile
+++ games/xinvaders/Makefile
@@ -23,8 +23,8 @@ USE_GETTEXT=	yes
 USE_XORG=	x11 xmu xaw xt
 USE_AUTOTOOLS=	automake14 autoconf213
 AUTOMAKE_ARGS=	--include-deps
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib -lintl"
+CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib -lintl"
+CPPFLAGS+=	-I${LOCALBASE}/include
 CONFIGURE_ARGS=	--enable-scorefile=${PREFIX}/share/xinvaders/xinvaders.scores
 
 MAN6=		xinvaders.6
diff --git games/xmoto/Makefile games/xmoto/Makefile
index 34dcd61..ebb4fb3 100644
--- games/xmoto/Makefile
+++ games/xmoto/Makefile
@@ -31,9 +31,8 @@ USE_GL=		gl glu
 USE_DOS2UNIX=	src/*.cpp src/*.h
 MAKE_JOBS_SAFE=	yes
 
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
-CPPFLAGS=	-I${LOCALBASE}/include -I${LUA_INCDIR}
-LDFLAGS=	-L${LOCALBASE}/lib -L${LUA_LIBDIR}
+CPPFLAGS+=	-I${LOCALBASE}/include -I${LUA_INCDIR}
+LDFLAGS+=	-L${LOCALBASE}/lib -L${LUA_LIBDIR}
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
diff --git games/xpilot-ng-server/Makefile games/xpilot-ng-server/Makefile
index 5d9c7c9..1c9fa73 100644
--- games/xpilot-ng-server/Makefile
+++ games/xpilot-ng-server/Makefile
@@ -21,10 +21,9 @@ LIB_DEPENDS=	expat:${PORTSDIR}/textproc/expat2
 GNU_CONFIGURE=	yes
 MAKE_JOBS_SAFE=	yes
 
-CPPFLAGS=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--program-prefix=""
 
 UNIQUENAME=	${PORTNAME}${PKGNAMESUFFIX}
diff --git games/xqf/Makefile games/xqf/Makefile
index 577b704..6294d14 100644
--- games/xqf/Makefile
+++ games/xqf/Makefile
@@ -20,12 +20,11 @@ USE_GNOME=	intlhack
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 
 MAN6=		xqf.6
 
-CPPFLAGS=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 OPTIONS=	GTK2 "GTK+ 2.0 support" on \
 		GEOIP "GeoIP support" on \
diff --git games/xrally/Makefile games/xrally/Makefile
index d460252..4850982 100644
--- games/xrally/Makefile
+++ games/xrally/Makefile
@@ -23,9 +23,7 @@ USE_XORG=	x11 xi xpm
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 CFLAGS+=	${PTHREAD_CFLAGS} -I${LOCALBASE}/include
-CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" \
-		CFLAGS="${CFLAGS}"
-MAKE_ENV=	LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" \
-		INCLUDES="-I${LOCALBASE}/include"
+LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
+MAKE_ENV=	INCLUDES="-I${LOCALBASE}/include"
 
 .include <bsd.port.mk>
diff --git games/xsc/Makefile games/xsc/Makefile
index 4c269aa..f586483 100644
--- games/xsc/Makefile
+++ games/xsc/Makefile
@@ -16,8 +16,6 @@ COMMENT=	A vector graphics space shoot'em up game
 
 USE_XORG=	x11
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" \
-		LDFLAGS="${LDFLAGS}"
 PLIST_FILES=	bin/xsc
 
 .include <bsd.port.mk>
diff --git games/xteddy/Makefile games/xteddy/Makefile
index 5e5cf06..6df6f91 100644
--- games/xteddy/Makefile
+++ games/xteddy/Makefile
@@ -17,8 +17,8 @@ COMMENT=	A cuddlesome teddy for the X desktop
 NO_CDROM=	Can only be distributed for free
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 USE_GNOME=	imlib
 
 MAN6=		xteddy.6
diff --git games/zaz/Makefile games/zaz/Makefile
index 3dba066..07352f1 100644
--- games/zaz/Makefile
+++ games/zaz/Makefile
@@ -24,8 +24,8 @@ USE_SDL=	sdl image
 USE_GL=		gl glu
 MAKE_JOBS_SAFE=	yes
 
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include/freetype2 -I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CPPFLAGS+=	-I${LOCALBASE}/include/freetype2 -I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 CONFIGURE_ARGS=	--with-icondir="${PREFIX}/share/pixmaps"
 
 PORTDOCS=	*
diff --git games/zoom/Makefile games/zoom/Makefile
index 67fb99e..2f63df5 100644
--- games/zoom/Makefile
+++ games/zoom/Makefile
@@ -23,8 +23,8 @@ USE_PERL5=	yes
 USE_XORG=	xft
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 PLIST_FILES=	bin/zoom %%DATADIR%%/zoomrc
 PLIST_DIRS=	%%DATADIR%%
diff --git graphics/EZWGL/Makefile graphics/EZWGL/Makefile
index a080819..0925167 100644
--- graphics/EZWGL/Makefile
+++ graphics/EZWGL/Makefile
@@ -21,8 +21,8 @@ LIB_DEPENDS=	tiff.4:${PORTSDIR}/graphics/tiff \
 USE_XORG=	x11 xext
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
 NOPRECIOUSMAKEVARS=	yes # Otherwise 'make readmes' is broken
 
 .include <bsd.port.pre.mk>
diff --git graphics/GraphicsMagick/Makefile graphics/GraphicsMagick/Makefile
index 5f86da0..82145a9 100644
--- graphics/GraphicsMagick/Makefile
+++ graphics/GraphicsMagick/Makefile
@@ -56,8 +56,8 @@ USE_LDCONFIG=	yes
 ALL_TARGET=	-j`${SYSCTL} -n hw.ncpu`
 
 CFLAGS+=	-DPNG_DEPSTRUCT=
-CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include"       \
-	LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 test check:
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} check
diff --git graphics/GraphicsMagick12/Makefile graphics/GraphicsMagick12/Makefile
index 988b725..355ac6e 100644
--- graphics/GraphicsMagick12/Makefile
+++ graphics/GraphicsMagick12/Makefile
@@ -54,9 +54,8 @@ USE_LDCONFIG=	yes
 ALL_TARGET=	-j`${SYSCTL} -n hw.ncpu`
 
 CFLAGS+=	-DPNG_DEPSTRUCT=
-CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include"       \
-	LDFLAGS="${CONFIGURE_LDFLAGS}"
-CONFIGURE_LDFLAGS=-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 test check:
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} check
@@ -100,7 +99,7 @@ CONFIGURE_ARGS+=	--without-dps
 IGNORE=		does not support OpenMP on FreeBSD version ${OSVERSION}
 .endif
 
-CONFIGURE_LDFLAGS+=	${PTHREAD_LIBS}
+LDFLAGS+=		${PTHREAD_LIBS}
 CONFIGURE_ARGS+=	--with-threads --enable-openmp
 .else
 CONFIGURE_ARGS+=	--without-threads --disable-openmp
diff --git graphics/GraphicsMagick13/Makefile graphics/GraphicsMagick13/Makefile
index 7812114..f820a9d 100644
--- graphics/GraphicsMagick13/Makefile
+++ graphics/GraphicsMagick13/Makefile
@@ -55,9 +55,8 @@ USE_LDCONFIG=	yes
 
 ALL_TARGET=	-j`${SYSCTL} -n hw.ncpu`
 
-CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include"       \
-	LDFLAGS="${CONFIGURE_LDFLAGS}"
-CONFIGURE_LDFLAGS=-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 test check:
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} check
@@ -101,7 +100,7 @@ CONFIGURE_ARGS+=	--without-dps
 IGNORE=		does not support OpenMP on FreeBSD version ${OSVERSION}
 .endif
 
-CONFIGURE_LDFLAGS+=	${PTHREAD_LIBS}
+LDFLAGS+=		${PTHREAD_LIBS}
 CONFIGURE_ARGS+=	--with-threads --enable-openmp --disable-openmp-slow
 .else
 CONFIGURE_ARGS+=	--without-threads --disable-openmp
diff --git graphics/ImageMagick/Makefile graphics/ImageMagick/Makefile
index f40b314..d133d35 100644
--- graphics/ImageMagick/Makefile
+++ graphics/ImageMagick/Makefile
@@ -22,7 +22,6 @@ USE_AUTOTOOLS=	libltdl
 # For some reason, using our libtool breaks the build into pieces:
 #USE_AUTOTOOLS+=	libtool
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--enable-shared --without-dps
 USE_GMAKE=	yes
 MAKE_JOBS_SAFE=	yes
@@ -33,8 +32,8 @@ MAN1=		ImageMagick.1 Magick++-config.1 Magick-config.1 Wand-config.1 \
 		MagickCore-config.1 MagickWand-config.1 \
 		identify.1 import.1 mogrify.1 montage.1 stream.1
 
-CPPFLAGS=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 PLIST_SUB=	PORTVERSION=${PORTVERSION:R}
 
diff --git graphics/OpenEXR/Makefile graphics/OpenEXR/Makefile
index 04a1135..7237a60 100644
--- graphics/OpenEXR/Makefile
+++ graphics/OpenEXR/Makefile
@@ -27,7 +27,7 @@ GNU_CONFIGURE=	YES
 CONFIGURE_ARGS+=--enable-imfexamples
 
 # must be explicitely linked with -l{thr|pthread}
-CONFIGURE_ENV=	LDFLAGS="${PTHREAD_LIBS}"
+LDFLAGS+=	${PTHREAD_LIBS}
 PTHREAD_LIBS+= `${CC} -dumpspecs | ${SED} -ne '/%{\!pg: %{pthread:/s/^.*%{\!pg: %{pthread:\([^}]*\)}.*$$/\1/p' || ${TRUE}`
 
 WRKSRC=		${WRKDIR}/${DISTNAME}
diff --git graphics/aaphoto/Makefile graphics/aaphoto/Makefile
index d959824..cde5ed7 100644
--- graphics/aaphoto/Makefile
+++ graphics/aaphoto/Makefile
@@ -22,8 +22,8 @@ LICENSE=	GPLv3
 
 USE_AUTOTOOLS=	autoheader
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
diff --git graphics/agave/Makefile graphics/agave/Makefile
index 84c1f0b..8029678 100644
--- graphics/agave/Makefile
+++ graphics/agave/Makefile
@@ -28,7 +28,8 @@ GCONF_SCHEMAS=	agave.schemas
 INSTALLS_ICONS=	yes
 INSTALLS_OMF=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .include <bsd.port.pre.mk>
 
diff --git graphics/ale/Makefile graphics/ale/Makefile
index f34ab71..3a78353 100644
--- graphics/ale/Makefile
+++ graphics/ale/Makefile
@@ -21,14 +21,13 @@ OPTIONS=	DOUBLE "64bit Data Precision Support" off \
 
 USE_GNOME=	gnomehack
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--disable-assertions
 
 MAN1=		ale.1
 PLIST_FILES=	bin/ale bin/ale-bin
 
-CPPFLAGS=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 # Restrict to stable (even) versions, indicated by the second component.
 PORTSCOUT=	limitw:1,even
diff --git graphics/alpng/Makefile graphics/alpng/Makefile
index 1cc64fb..ea2174c 100644
--- graphics/alpng/Makefile
+++ graphics/alpng/Makefile
@@ -21,7 +21,6 @@ WRKSRC=		${WRKDIR}
 MAKEFILE=	makefile
 USE_GMAKE=	yes
 CFLAGS+=	-I${LOCALBASE}/include
-MAKE_ENV+=	CFLAGS="${CFLAGS}"
 
 PLIST_FILES=	include/alpng.h \
 		lib/libalpng.a
diff --git graphics/animorph/Makefile graphics/animorph/Makefile
index d033bdf..2e6542c 100644
--- graphics/animorph/Makefile
+++ graphics/animorph/Makefile
@@ -18,8 +18,8 @@ USE_GMAKE=	yes
 USE_GNOME=	pkgconfig
 USE_LDCONFIG=	yes
 
-CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib" \
-		CPPFLAGS="-I${LOCALBASE}/include"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .if !defined(NOPORTDOCS)
 PORTDOCS=	*
diff --git graphics/apngasm/Makefile graphics/apngasm/Makefile
index 45fbfc4..ce8d19b 100644
--- graphics/apngasm/Makefile
+++ graphics/apngasm/Makefile
@@ -23,7 +23,7 @@ LICENSE_COMB=	dual
 
 ALL_TARGET=	${PORTNAME}
 MAKEFILE=	/dev/null
-MAKE_ENV+=	LDFLAGS="${LDFLAGS}" LDLIBS="${LDLIBS}"
+MAKE_ENV+=	LDLIBS="${LDLIBS}"
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 LDLIBS+=	-lpng -lm -lz
diff --git graphics/autotrace/Makefile graphics/autotrace/Makefile
index d6a452c..3bbe3be 100644
--- graphics/autotrace/Makefile
+++ graphics/autotrace/Makefile
@@ -20,8 +20,8 @@ LIB_DEPENDS=	png.6:${PORTSDIR}/graphics/png \
 USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" \
-		CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/ming"
+CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CPPFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include/ming
 
 MAN1=		autotrace.1
 
@@ -32,7 +32,7 @@ OPTIONS=	MING "Enable swf interface" off \
 
 .if !defined (WITHOUT_MING)
 LIB_DEPENDS+=	ming.5:${PORTSDIR}/graphics/ming
-CONFIGURE_ENV?=	CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/ming"
+CPPFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include/ming
 .endif
 
 .if !defined (WITHOUT_PSTOEDIT)
diff --git graphics/bugle/Makefile graphics/bugle/Makefile
index ede06f4..12f9b60 100644
--- graphics/bugle/Makefile
+++ graphics/bugle/Makefile
@@ -25,9 +25,9 @@ USE_AUTOTOOLS=	libltdl
 USE_LDCONFIG=	${PREFIX}/lib ${PREFIX}/lib/${PORTNAME}
 
 CONFIGURE_ARGS=--enable-ltdl-install=no
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib" \
+CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib" \
 		GL_LIBS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
 
 MAN1=	gldb.1 gldb-gui.1
 MAN3=	bugle.3
diff --git graphics/cairo-java/Makefile graphics/cairo-java/Makefile
index c1c9e52..b92065c 100644
--- graphics/cairo-java/Makefile
+++ graphics/cairo-java/Makefile
@@ -28,7 +28,7 @@ JAVA_VERSION=	1.5+
 JAVA_OS=	native
 USE_GNOME=	gnomehack
 CONFIGURE_ARGS=	--without-gcj-compile --with-jardir=${JAVAJARDIR}
-CONFIGURE_ENV=	CPPFLAGS="-I${JAVA_HOME}/include -I${JAVA_HOME}/include/freebsd"
+CPPFLAGS+=	-I${JAVA_HOME}/include -I${JAVA_HOME}/include/freebsd
 CAIRO_API_VERSION=	1.0
 GLIB_API_VERSION=	0.4
 PLIST_SUB=		CAIRO_API_VERSION=${CAIRO_API_VERSION} PORTNAME=${PORTNAME}
diff --git graphics/cairo/Makefile graphics/cairo/Makefile
index a0e59fa..cbbf7a9 100644
--- graphics/cairo/Makefile
+++ graphics/cairo/Makefile
@@ -24,8 +24,6 @@ LIB_DEPENDS=	freetype.9:${PORTSDIR}/print/freetype2 \
 		fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig \
 		pixman-1.9:${PORTSDIR}/x11/pixman
 
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" \
-		LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--with-html-dir=${DOCSDIR} \
 		--disable-directfb \
 		--enable-tee \
diff --git graphics/cairomm/Makefile graphics/cairomm/Makefile
index 8066e70..f71a7ca 100644
--- graphics/cairomm/Makefile
+++ graphics/cairomm/Makefile
@@ -23,9 +23,9 @@ USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack ltverhack
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib" \
-		AUTOMAKE="${TRUE}" AUTOCONF="${TRUE}" DOXYGEN="${TRUE}"
+CONFIGURE_ENV=	AUTOMAKE="${TRUE}" AUTOCONF="${TRUE}" DOXYGEN="${TRUE}"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .if defined(NOPORTDOCS)
 CONFIGURE_ARGS+=	--disable-documentation
diff --git graphics/cbrpager/Makefile graphics/cbrpager/Makefile
index 05c797c..9b36392 100644
--- graphics/cbrpager/Makefile
+++ graphics/cbrpager/Makefile
@@ -19,8 +19,8 @@ LICENSE=	GPLv3
 
 USE_GNOME=	libgnomeui
 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
 
 DESKTOP_ENTRIES=	"cbrPager" "Comic book files viewer" "" \
diff --git graphics/cegui/Makefile graphics/cegui/Makefile
index 830a302..39d5d94 100644
--- graphics/cegui/Makefile
+++ graphics/cegui/Makefile
@@ -27,9 +27,9 @@ CONFIGURE_ARGS=	--disable-toluacegui --disable-irrlicht-renderer \
 		--disable-libxml --disable-xerces-c --disable-expat --disable-samples
 
 CONFIGURE_ENV+=	Lua_LIBS="-L${LUA_LIBDIR} -llua -lm" \
-		Lua_CFLAGS="-I${LUA_INCDIR}" \
-		LDFLAGS="-L${LOCALBASE}/lib -L${LUA_LIBDIR}" \
-		CPPFLAGS="-I${LOCALBASE}/include -I${LUA_INCDIR}"
+		Lua_CFLAGS="-I${LUA_INCDIR}"
+CPPFLAGS+=	-I${LOCALBASE}/include -I${LUA_INCDIR}
+LDFLAGS+=	-L${LOCALBASE}/lib -L${LUA_LIBDIR}
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 USE_GL=		yes
diff --git graphics/chbg/Makefile graphics/chbg/Makefile
index a9720cc..3c6fc5d 100644
--- graphics/chbg/Makefile
+++ graphics/chbg/Makefile
@@ -19,8 +19,8 @@ USE_GNOME=	gdkpixbuf
 USE_GMAKE=	yes
 USE_GETTEXT=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CFLAGS="${CFLAGS}" CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
 CONFIGURE_ARGS=	--disable-gnome
 
 .include <bsd.port.pre.mk>
diff --git graphics/cimg/Makefile graphics/cimg/Makefile
index fa1af1c..796e589 100644
--- graphics/cimg/Makefile
+++ graphics/cimg/Makefile
@@ -32,9 +32,9 @@ LICENSE_COMB=	dual
 USE_ZIP=	yes
 WRKSRC=		${WRKDIR}/${DISTNAME:C/_/-/}
 BUILD_WRKSRC=	${WRKSRC}/examples
-MAKE_ENV=	CPPFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}"	\
-		LDFLAGS="${LDFLAGS} ${PTHREAD_LIBS}"	\
-		X11PATH=${LOCALBASE} LOCALBASE=${LOCALBASE}
+MAKE_ENV=	X11PATH=${LOCALBASE} LOCALBASE=${LOCALBASE}
+CPPFLAGS+=	${CFLAGS} ${PTHREAD_CFLAGS}
+LDFLAGS+=	${PTHREAD_LIBS}
 
 .if !defined(NOPORTDOCS)
 USE_GMAKE=	yes
diff --git graphics/cinepaint/Makefile graphics/cinepaint/Makefile
index 340d57e..72fc944 100644
--- graphics/cinepaint/Makefile
+++ graphics/cinepaint/Makefile
@@ -52,7 +52,7 @@ PLIST_SUB+=	OPENEXR:=""
 PLIST_SUB+=	OPENEXR:="@comment "
 .endif
 
-CONFIGURE_ENV+=	CPPFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
+CPPFLAGS+=	${CFLAGS}
 
 post-patch:
 	@${REINPLACE_CMD} -e \
diff --git graphics/clutter-box2d/Makefile graphics/clutter-box2d/Makefile
index a852f26..6d1684f 100644
--- graphics/clutter-box2d/Makefile
+++ graphics/clutter-box2d/Makefile
@@ -22,7 +22,6 @@ USE_GNOME=	gnomehack ltverhack gnomeprefix
 USE_XORG=	xp x11
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--enable-introspection=no
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 
 CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
 LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
diff --git graphics/clutter-gtk/Makefile graphics/clutter-gtk/Makefile
index 0365789..c629bff 100644
--- graphics/clutter-gtk/Makefile
+++ graphics/clutter-gtk/Makefile
@@ -24,7 +24,6 @@ USE_AUTOTOOLS=	libtool
 USE_GNOME=	gnomehack gtk20 ltverhack gnomeprefix
 USE_XORG=	xp x11
 USE_LDCONFIG=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 
 CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
 LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
diff --git graphics/clutter-qt/Makefile graphics/clutter-qt/Makefile
index e2a80ee..25b17fa 100644
--- graphics/clutter-qt/Makefile
+++ graphics/clutter-qt/Makefile
@@ -25,7 +25,6 @@ USE_QT_VER=	4
 QT_COMPONENTS=	corelib gui moc_build
 USE_GNOME=	gnomehack
 USE_LDCONFIG=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 
 CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
 LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
diff --git graphics/clutter/Makefile graphics/clutter/Makefile
index 24777e7..76c7337 100644
--- graphics/clutter/Makefile
+++ graphics/clutter/Makefile
@@ -28,7 +28,6 @@ USE_GL=		gl
 USE_XORG=	glproto x11 xfixes xdamage xcomposite xi
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--with-x --enable-conformance=no
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 
 CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
 LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
diff --git graphics/corona/Makefile graphics/corona/Makefile
index c954a28..8558e9b 100644
--- graphics/corona/Makefile
+++ graphics/corona/Makefile
@@ -22,8 +22,8 @@ USE_GNOME=	lthack
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
-		LIBS="${LIBS} -L${LOCALBASE}/lib"
+CONFIGURE_ENV=	LIBS="${LIBS} -L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
 
 post-patch:
 	@${REINPLACE_CMD} -e \
diff --git graphics/danpei/Makefile graphics/danpei/Makefile
index c8d6e87..8de0379 100644
--- graphics/danpei/Makefile
+++ graphics/danpei/Makefile
@@ -23,7 +23,8 @@ RUN_DEPENDS+=	convert:${PORTSDIR}/graphics/ImageMagick
 USE_GETTEXT=	yes
 USE_GNOME=	gtk12 gdkpixbuf
 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+=	--without-included-gettext
 
 .include <bsd.port.mk>
diff --git graphics/devil/Makefile graphics/devil/Makefile
index 85d0521..b85b769 100644
--- graphics/devil/Makefile
+++ graphics/devil/Makefile
@@ -33,14 +33,13 @@ USE_GNOME=	pkgconfig
 USE_AUTOTOOLS=	aclocal autoheader automake autoconf libtool
 ACLOCAL_ARGS=	-I m4 -I ${LOCALBASE}/share/aclocal
 AUTOMAKE_ARGS=	--add-missing --copy --force-missing
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--enable-ILU \
 		--disable-allegro --disable-directx8 --disable-directx9
 USE_LDCONFIG=	yes
 MAKE_JOBS_SAFE=	yes
 
-CPPFLAGS=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .include <bsd.port.pre.mk>
 
diff --git graphics/dia/Makefile graphics/dia/Makefile
index 71cac39..a941727 100644
--- graphics/dia/Makefile
+++ graphics/dia/Makefile
@@ -28,9 +28,9 @@ WANT_GNOME=	yes
 INSTALLS_ICONS=	yes
 USE_GETTEXT=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib -lintl" \
+CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib -lintl" \
 		LOCALBASE="${LOCALBASE}"
+CPPFLAGS+=	-I${LOCALBASE}/include
 
 MAN1=		dia.1
 MANLANG=	"" fr
diff --git graphics/diacanvas2/Makefile graphics/diacanvas2/Makefile
index 6253623..ce84c84 100644
--- graphics/diacanvas2/Makefile
+++ graphics/diacanvas2/Makefile
@@ -20,8 +20,8 @@ USE_GNOME=	gnomehack pygnome2
 USE_PYTHON=	2.2+
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 USE_LDCONFIG=	yes
 USE_DISPLAY=	yes
 
diff --git graphics/divxcalc/Makefile graphics/divxcalc/Makefile
index ab1fa03..1164c98 100644
--- graphics/divxcalc/Makefile
+++ graphics/divxcalc/Makefile
@@ -21,8 +21,8 @@ USE_QT_VER=	3
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	automake:env autoconf:env
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 PLIST_FILES=	bin/divxcalc
 
diff --git graphics/djview4/Makefile graphics/djview4/Makefile
index 1d2a29e..07a1f24 100644
--- graphics/djview4/Makefile
+++ graphics/djview4/Makefile
@@ -24,10 +24,10 @@ QT_NONSTANDARD=	yes
 CONFIGURE_ARGS=	--x-includes="${X11BASE}/include" \
 		--x-libraries="${X11BASE}/lib"
 CONFIGURE_ENV=	QMAKE="${LOCALBASE}/bin/qmake-qt4" \
-		QMAKESPEC="${QMAKESPEC}" \
-		CFLAGS="-I${LOCALBASE}/include" \
-		CXXFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+		QMAKESPEC="${QMAKESPEC}"
+LDFLAGS+=	-L${LOCALBASE}/lib
+CFLAGS+=	-I${LOCALBASE}/include
+CXXFLAGS+=	-I${LOCALBASE}/include
 MAKE_ENV=	INSTALL_SCRIPT="${INSTALL_SCRIPT}"
 
 .if defined(CXX) && ${CXX:M*icc}
diff --git graphics/dynamechs/Makefile graphics/dynamechs/Makefile
index e1e83b0..c5ec316 100644
--- graphics/dynamechs/Makefile
+++ graphics/dynamechs/Makefile
@@ -23,8 +23,8 @@ USE_GMAKE=	yes
 USE_PERL5_BUILD=yes
 CXXFLAGS+=	${PTHREAD_CFLAGS}
 MAKE_ENV=	OPENGLINCDIR="${LOCALBASE}/include" \
-		OPENGLLIBDIR="${LOCALBASE}/lib" \
-		LDFLAGS="${PTHREAD_LIBS}"
+		OPENGLLIBDIR="${LOCALBASE}/lib"
+LDFLAGS+=	${PTHREAD_LIBS}
 ALL_TARGET=	freebsd
 USE_LDCONFIG=	yes
 
diff --git graphics/electriceyes/Makefile graphics/electriceyes/Makefile
index 63130e1..95b7b12 100644
--- graphics/electriceyes/Makefile
+++ graphics/electriceyes/Makefile
@@ -20,8 +20,8 @@ USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack gnomelibs
 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
 
 post-install:
 	${MV} ${PREFIX}/bin/ee ${PREFIX}/bin/ElectricEyes
diff --git graphics/enblend/Makefile graphics/enblend/Makefile
index 5762d48..f848c9e 100644
--- graphics/enblend/Makefile
+++ graphics/enblend/Makefile
@@ -33,8 +33,8 @@ USE_AUTOTOOLS=	automake:env autoconf:env
 USE_GCC=	4.4+
 USE_GL=		glew glut
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 MAN1=		enblend.1 enfuse.1
 PLIST_FILES=	bin/enblend bin/enfuse
diff --git graphics/enfle/Makefile graphics/enfle/Makefile
index f563f40..7421938 100644
--- graphics/enfle/Makefile
+++ graphics/enfle/Makefile
@@ -34,8 +34,7 @@ USE_GNOME=	esound
 USE_ICONV=	yes
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \
-		ac_cv_header_mpeg_h=no \
+CONFIGURE_ENV=	ac_cv_header_mpeg_h=no \
 		ac_cv_header_libmpeg3_h=no \
 		ac_cv_header_decore_h=no \
 		ac_cv_header_avifile_h=no
@@ -43,8 +42,8 @@ CONFIGURE_ARGS=	--with-ungif
 
 PKGDEINSTALL=	${PKGINSTALL}
 
-CPPFLAGS=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .include <bsd.port.pre.mk>
 
diff --git graphics/eog-plugins/Makefile graphics/eog-plugins/Makefile
index e19c665..6f1b8cd 100644
--- graphics/eog-plugins/Makefile
+++ graphics/eog-plugins/Makefile
@@ -26,8 +26,8 @@ USE_GNOME=	gnomeprefix gnomehack intlhack gtk20
 WANT_GNOME=	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
 
 .include <bsd.port.pre.mk>
 
diff --git graphics/eog/Makefile graphics/eog/Makefile
index 679b0d9..f752f1c 100644
--- graphics/eog/Makefile
+++ graphics/eog/Makefile
@@ -31,8 +31,8 @@ USE_GETTEXT=	yes
 INSTALLS_OMF=	yes
 GNU_CONFIGURE=	yes
 GNOME_DESKTOP_VERSION=2
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 GCONF_SCHEMAS=	eog.schemas
 
diff --git graphics/epdfview/Makefile graphics/epdfview/Makefile
index 3d6d8be..138e3e2 100644
--- graphics/epdfview/Makefile
+++ graphics/epdfview/Makefile
@@ -26,8 +26,8 @@ INSTALLS_ICONS=	yes
 USE_ICONV=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gtk20 intlhack
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 OPTIONS=	CUPS	"Use cups printing system"		off \
 		NLS	"Native language support"		on
@@ -48,7 +48,6 @@ USE_GETTEXT=	yes
 PLIST_SUB+=	NLS=""
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
-CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 .else
 CONFIGURE_ARGS+=--disable-nls
 PLIST_SUB+=	NLS="@comment "
diff --git graphics/epeg/Makefile graphics/epeg/Makefile
index 01e5f99..00cc260 100644
--- graphics/epeg/Makefile
+++ graphics/epeg/Makefile
@@ -22,7 +22,7 @@ GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
 USE_GNOME=	gnomehack
 USE_LDCONFIG=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
 
 .include <bsd.port.mk>
diff --git graphics/evince/Makefile graphics/evince/Makefile
index ec63f92..4d94d7a 100644
--- graphics/evince/Makefile
+++ graphics/evince/Makefile
@@ -30,8 +30,8 @@ USE_GMAKE=	yes
 INSTALLS_OMF=	yes
 USE_GNOME=	gnomehack intlhack gnomeprefix desktopfileutils \
 		gnomedocutils ltasneededhack gconf2
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 GLIB_SCHEMAS=	org.gnome.Evince.gschema.xml
 GCONF_SCHEMAS=	\
diff --git graphics/exiv2/Makefile graphics/exiv2/Makefile
index 0f8cb3e..a0dcaa9 100644
--- graphics/exiv2/Makefile
+++ graphics/exiv2/Makefile
@@ -23,7 +23,7 @@ USE_LDCONFIG=	yes
 MAN1=		exiv2.1
 ALLTARGET=	all
 CPPFLAGS+=	-I${LOCALBASE}/include
-CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib"
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|echo aout|echo elf|' ${WRKSRC}/configure
diff --git graphics/exrtools/Makefile graphics/exrtools/Makefile
index 80d8466..f7de261 100644
--- graphics/exrtools/Makefile
+++ graphics/exrtools/Makefile
@@ -26,8 +26,6 @@ MAKE_JOBS_SAFE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
-
 LICENSE=	GPLv2
 
 PLIST_FILES=	bin/exrblur bin/exrchr bin/exricamtm bin/exrnlm \
diff --git graphics/f-spot/Makefile graphics/f-spot/Makefile
index b32ea2a..2b8f0f0 100644
--- graphics/f-spot/Makefile
+++ graphics/f-spot/Makefile
@@ -39,8 +39,8 @@ INSTALLS_OMF=	yes
 USE_LDCONFIG=	yes
 GCONF_SCHEMAS=	f-spot.schemas
 
-CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 CONFIGURE_ARGS+=--with-vendor-build-id=FreeBSD\ BSD\#\ Project
 
diff --git graphics/feh/Makefile graphics/feh/Makefile
index 9efdcee..f2a959f 100644
--- graphics/feh/Makefile
+++ graphics/feh/Makefile
@@ -27,7 +27,6 @@ MAN1=		feh.1 feh-cam.1 gen-cam-menu.1
 
 CFLAGS+=	-I${LOCALBASE}/include -std=c99
 LDFLAGS+=	-L${LOCALBASE}/lib
-MAKE_ENV+=	LDFLAGS="${LDFLAGS}"
 
 post-patch:
 	@${REINPLACE_CMD} 's#share/man#man#' ${WRKSRC}/config.mk
diff --git graphics/flashplayer/Makefile graphics/flashplayer/Makefile
index f1b9b8c..f63bf65 100644
--- graphics/flashplayer/Makefile
+++ graphics/flashplayer/Makefile
@@ -24,8 +24,8 @@ WRKSRC=		${WRKDIR}/${DISTNAME}/player
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 USE_XORG=	x11 xaw xkbfile
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include"	\
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_WRKSRC=	${WRKDIR}/${DISTNAME}
 PLIST_FILES=	bin/swfplayer
 
diff --git graphics/fnlib/Makefile graphics/fnlib/Makefile
index c7d06aa..ffba0f8 100644
--- graphics/fnlib/Makefile
+++ graphics/fnlib/Makefile
@@ -19,6 +19,6 @@ USE_GMAKE=	yes
 USE_GNOME=	imlib
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
-CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib"
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .include <bsd.port.mk>
diff --git graphics/fotoxx/Makefile graphics/fotoxx/Makefile
index 7936aed..3f3b0da 100644
--- graphics/fotoxx/Makefile
+++ graphics/fotoxx/Makefile
@@ -27,7 +27,7 @@ MAN1=		fotoxx.1
 ALL_TARGET=	fotoxx
 INSTALL_TARGET=	install manpage
 
-MAKE_ENV+=	LDFLAGS="-O3 -g -Wall -rdynamic -lexecinfo"
+LDFLAGS+=	-O3 -g -Wall -rdynamic -lexecinfo
 
 post-patch:
 		@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' \
diff --git graphics/freeglut/Makefile graphics/freeglut/Makefile
index 56240cc..d34f739 100644
--- graphics/freeglut/Makefile
+++ graphics/freeglut/Makefile
@@ -22,7 +22,8 @@ USE_LDCONFIG=	yes
 USE_XORG=	ice xi
 USE_GL=		glu
 CONFIGURE_ARGS=	--disable-warnings
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-lusbhid"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-lusbhid
 USE_LDCONFIG=	yes
 
 DOCS=	download.html freeglut.html freeglut_logo.png		\
diff --git graphics/frontline/Makefile graphics/frontline/Makefile
index 03f5df9..246b1fb 100644
--- graphics/frontline/Makefile
+++ graphics/frontline/Makefile
@@ -21,8 +21,8 @@ USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack gnomelibs imlib libartlgpl2
 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
 
 .include <bsd.port.pre.mk>
 
diff --git graphics/fyre/Makefile graphics/fyre/Makefile
index 85e36a7..080d367 100644
--- graphics/fyre/Makefile
+++ graphics/fyre/Makefile
@@ -24,7 +24,6 @@ USE_BZIP2=	yes
 USE_GNOME=	desktopfileutils libglade2
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-MAKE_ENV=	LDFLAGS="${LDFLAGS}"
 INSTALLS_ICONS=	yes
 MAKE_JOBS_SAFE=	yes
 
diff --git graphics/g2/Makefile graphics/g2/Makefile
index 347ff24..ae194aa 100644
--- graphics/g2/Makefile
+++ graphics/g2/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS=	gd.4:${PORTSDIR}/graphics/gd
 
 USE_XORG=	x11
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=  CFLAGS="${CFLAGS} -I${LOCALBASE}/include"
+CFLAGS+=	-I${LOCALBASE}/include
 
 do-build:
 	cd ${WRKSRC} ; make depend ; make
diff --git graphics/gcolor/Makefile graphics/gcolor/Makefile
index c6b73947..87fd19f 100644
--- graphics/gcolor/Makefile
+++ graphics/gcolor/Makefile
@@ -17,8 +17,8 @@ COMMENT=	GTK-based color picker
 PLIST_FILES=	bin/gcolor
 USE_GNOME=	gtk12
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
 
 pre-patch:
 	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
diff --git graphics/gcolor2/Makefile graphics/gcolor2/Makefile
index e8f8d3b..6a3f4f9 100644
--- graphics/gcolor2/Makefile
+++ graphics/gcolor2/Makefile
@@ -16,8 +16,8 @@ COMMENT=	A simple GTK+ 2.0 color selector
 
 USE_GNOME=	gtk20 gnomeprefix
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 SUB_FILES=	gcolor2.desktop
 
diff --git graphics/gd/Makefile graphics/gd/Makefile
index cacd72c..1f30c86 100644
--- graphics/gd/Makefile
+++ graphics/gd/Makefile
@@ -26,7 +26,7 @@ CONFLICTS=	bazaar-1.*
 
 USE_BZIP2=	yes
 SCRIPTDIR=	${FILESDIR}
-MAKE_ENV=	WRKSRC="${WRKSRC}" CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
+MAKE_ENV=	WRKSRC="${WRKSRC}"
 MAKEFILE=	${FILESDIR}/Makefile.bsd
 CPPFLAGS+=	-DHAVE_ERRNO_H -DHAVE_FT2BUILD_H -DHAVE_LIBFREETYPE -DHAVE_LIBJPEG -DHAVE_LIBPNG \
 		-DHAVE_LIBZ -DHAVE_STDDEF_H -DHAVE_STDINT_H -DHAVE_STDLIB_H
diff --git graphics/gdk-pixbuf/Makefile graphics/gdk-pixbuf/Makefile
index 7747979..5f53898 100644
--- graphics/gdk-pixbuf/Makefile
+++ graphics/gdk-pixbuf/Makefile
@@ -29,9 +29,9 @@ USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-html-dir=${PREFIX}/share/doc \
 		--disable-gtk-doc
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib" \
+CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib" \
 		BUILD_CANVAS="${BUILD_CANVAS}"
+CPPFLAGS+=	-I${LOCALBASE}/include
 
 BUILD_CANVAS?=	no
 
diff --git graphics/gdk-pixbuf2/Makefile graphics/gdk-pixbuf2/Makefile
index 2e3359d..4f98d5f 100644
--- graphics/gdk-pixbuf2/Makefile
+++ graphics/gdk-pixbuf2/Makefile
@@ -30,8 +30,8 @@ USE_AUTOTOOLS=	libtool
 USE_GNOME+=	gnomehack glib20 ltverhack
 USE_LDCONFIG=	yes
 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-introspection=yes --with-libjasper
 
 MAN1=		gdk-pixbuf-csource.1 gdk-pixbuf-query-loaders.1
diff --git graphics/geeqie/Makefile graphics/geeqie/Makefile
index 7c0f710..487549f 100644
--- graphics/geeqie/Makefile
+++ graphics/geeqie/Makefile
@@ -24,7 +24,8 @@ CONFIGURE_ARGS=	--docdir="${DOCSDIR}" \
 		--with-htmldir="${DOCSDIR}/html" \
 		--with-readmedir="${DOCSDIR}"
 CFLAGS+=	-I${LOCALBASE}/include
-CONFIGURE_ENV+=	CPPFLAGS="${CFLAGS}" LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	${CFLAGS}
+LDFLAGS+=	-L${LOCALBASE}/lib
 MAKE_ARGS+=	top_builddir="${WRKSRC}"
 MAKE_JOBS_SAFE=	yes
 
diff --git graphics/gegl/Makefile graphics/gegl/Makefile
index 1ad0a76..9e22e6d 100644
--- graphics/gegl/Makefile
+++ graphics/gegl/Makefile
@@ -43,8 +43,8 @@ USE_RUBY=	yes
 RUBY_NO_RUN_DEPENDS=	yes
 USE_LDCONFIG=	${PREFIX}/lib/gegl-0.1
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib -lexecinfo"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib -lexecinfo
 
 GEGL_MINOR=	105
 PLIST_SUB+=	GEGL_MINOR="${GEGL_MINOR}"
diff --git graphics/gif2png/Makefile graphics/gif2png/Makefile
index 3feb4b7..acfb62f 100644
--- graphics/gif2png/Makefile
+++ graphics/gif2png/Makefile
@@ -17,7 +17,6 @@ LIB_DEPENDS=	png.6:${PORTSDIR}/graphics/png
 
 USE_PYTHON_RUN=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 
 MAN1=		${PORTNAME}.1 web2png.1
 PLIST_FILES=	bin/${PORTNAME} bin/web2png
diff --git graphics/giflib/Makefile graphics/giflib/Makefile
index a48da5a..d2fe829 100644
--- graphics/giflib/Makefile
+++ graphics/giflib/Makefile
@@ -27,7 +27,6 @@ NOX11SUFFIX=	-nox11
 USE_XORG=	sm x11
 PLIST_SUB+=	X11=''
 CPPFLAGS+=	-I${LOCALBASE}/include
-CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}"
 .endif
 
 post-install:
diff --git graphics/gimageview/Makefile graphics/gimageview/Makefile
index e4e7789..820f5f3 100644
--- graphics/gimageview/Makefile
+++ graphics/gimageview/Makefile
@@ -19,8 +19,8 @@ LIB_DEPENDS=	jpeg.11:${PORTSDIR}/graphics/jpeg
 USE_GMAKE=	yes
 WANT_GNOME=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
 MAKE_ARGS=	CFLAGS="${CFLAGS} -I${LOCALBASE}/include"
 
 OPTIONS=	SPLASH "Show splash on startup" on \
diff --git graphics/gimp-app/Makefile graphics/gimp-app/Makefile
index b84dbcc..c0df2d0 100644
--- graphics/gimp-app/Makefile
+++ graphics/gimp-app/Makefile
@@ -53,9 +53,9 @@ CONFIGURE_ARGS?=--with-html-dir=${PREFIX}/share/doc/gimp \
 		--docdir=${PREFIX}/share/doc/gimp \
 		--enable-default-binary \
 		--without-gnomevfs
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib" \
-		GIMP_THREAD_LIBS=${PTHREAD_LIBS}
+CONFIGURE_ENV=	GIMP_THREAD_LIBS=${PTHREAD_LIBS}
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .if !defined(GIMP_SLAVE)
 WANT_GNOME=	yes
diff --git graphics/gimp-focusblur-plugin/Makefile graphics/gimp-focusblur-plugin/Makefile
index ddbe655..ae3a1f3 100644
--- graphics/gimp-focusblur-plugin/Makefile
+++ graphics/gimp-focusblur-plugin/Makefile
@@ -30,8 +30,8 @@ MAKE_JOBS_SAFE=	yes
 PLUGIN_DIR?=	libexec/gimp/2.2/plug-ins
 PLIST_SUB=	PLUGIN_DIR=${PLUGIN_DIR}
 
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .if !defined(WITHOUT_NLS)
 USE_GETTEXT=	yes
diff --git graphics/gimp-gap/Makefile graphics/gimp-gap/Makefile
index 17b0a65..1ca0c83 100644
--- graphics/gimp-gap/Makefile
+++ graphics/gimp-gap/Makefile
@@ -38,7 +38,7 @@ USE_GETTEXT=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_GNOME=	intltool
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/ffmpeg" \
-		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CPPFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include/ffmpeg
+LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 
 .include <bsd.port.mk>
diff --git graphics/gimp-gmic-plugin/Makefile graphics/gimp-gmic-plugin/Makefile
index 4229531..7b0a61e 100644
--- graphics/gimp-gmic-plugin/Makefile
+++ graphics/gimp-gmic-plugin/Makefile
@@ -36,8 +36,8 @@ USE_XORG=	x11 xext xrandr
 PLUGIN_DIR?=	libexec/gimp/2.2/plug-ins
 PLIST_SUB+=	PLUGIN_DIR=${PLUGIN_DIR}
 
-CPPFLAGS=	"-I${LOCALBASE}/include"
-CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 CFLAGS:=	${CFLAGS:N-O*:N-pipe}
 CXXFLAGS:=	${CXXFLAGS:N-O*:N-pipe}
 
diff --git graphics/gimp-lqr-plugin/Makefile graphics/gimp-lqr-plugin/Makefile
index 0edb1b8..411f580 100644
--- graphics/gimp-lqr-plugin/Makefile
+++ graphics/gimp-lqr-plugin/Makefile
@@ -27,8 +27,8 @@ MAKE_JOBS_SAFE=	yes
 PLUGIN_DIR?=	libexec/gimp/2.2/plug-ins
 PLIST_SUB=	PLUGIN_DIR=${PLUGIN_DIR}
 
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|^bindir = .*|bindir = ${PREFIX}/${PLUGIN_DIR}|g' ${WRKSRC}/src/Makefile.in
diff --git graphics/gimpshop/Makefile graphics/gimpshop/Makefile
index 8f55972..1c52edb 100644
--- graphics/gimpshop/Makefile
+++ graphics/gimpshop/Makefile
@@ -44,8 +44,8 @@ CONFIGURE_ARGS=	--disable-perl \
 		--enable-static \
 		--disable-print \
 		--with-desktop-dir=${LOCALBASE}/share
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 WRKSRC=		${WRKDIR}/gimp-${PORTVERSION}
 
diff --git graphics/giram/Makefile graphics/giram/Makefile
index acc9517..4e86714 100644
--- graphics/giram/Makefile
+++ graphics/giram/Makefile
@@ -23,12 +23,12 @@ USE_PERL5_BUILD=yes
 USE_GNOME=	gtk20
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
-CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib" \
-		INTLTOOL_PERL="${PERL}"
+CONFIGURE_ENV=	INTLTOOL_PERL="${PERL}"
+LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--datadir="${PREFIX}/lib" \
 		--with-tutorial-path="${DOCSDIR}" \
 		--with-lib3ds-prefix="${LOCALBASE}"
-CPPFLAGS=	-I${LOCALBASE}/include
+CPPFLAGS+=	-I${LOCALBASE}/include
 
 MAN1=		giram.1
 
diff --git graphics/glitz/Makefile graphics/glitz/Makefile
index 9ef580b..29895d3 100644
--- graphics/glitz/Makefile
+++ graphics/glitz/Makefile
@@ -21,7 +21,7 @@ USE_GNOME=	pkgconfig gnomehack
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 
-CONFIGURE_ENV=	CPPFLAGS="${PTHREAD_CFLAGS}" \
-		LDFLAGS="${PTHREAD_LIBS}"
+CPPFLAGS+=	${PTHREAD_CFLAGS}
+LDFLAGS+=	${PTHREAD_LIBS}
 
 .include <bsd.port.mk>
diff --git graphics/gliv/Makefile graphics/gliv/Makefile
index 076ccd5..d429171 100644
--- graphics/gliv/Makefile
+++ graphics/gliv/Makefile
@@ -23,15 +23,14 @@ USE_GL=		yes
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 MAKE_ARGS=	ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \
 		AUTOHEADER="${TRUE}"
 
 MAN1=		gliv.1
 MANLANG=	"" de fr ru
 
-CPPFLAGS=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 post-install:
 	${MKDIR} ${PREFIX}/share/applications
diff --git graphics/gltt/Makefile graphics/gltt/Makefile
index 86434c3..2455aa5 100644
--- graphics/gltt/Makefile
+++ graphics/gltt/Makefile
@@ -19,8 +19,8 @@ USE_GL=		gl glut
 USE_FREETYPE=	yes
 USE_GMAKE=	yes
 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=	--with-ttf-includes=${LOCALBASE}/include/freetype1 \
 		--with-ttf-libraries=${LOCALBASE}/lib \
 		--with-gl-includes=${LOCALBASE}/include \
diff --git graphics/gnomeiconedit/Makefile graphics/gnomeiconedit/Makefile
index cc47fbf..5aab641 100644
--- graphics/gnomeiconedit/Makefile
+++ graphics/gnomeiconedit/Makefile
@@ -18,8 +18,8 @@ COMMENT=	A small GNOME Icon Editor
 USE_GNOME=	gnomeprefix gnomehack bonobo gnomeprint
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
diff --git graphics/goom/Makefile graphics/goom/Makefile
index 389abd1..7764a4a 100644
--- graphics/goom/Makefile
+++ graphics/goom/Makefile
@@ -19,8 +19,8 @@ USE_AUTOTOOLS=	libtool
 WRKSRC=		${WRKDIR}/${PORTNAME}${PORTVERSION:S|.|-|}
 USE_GNOME=	gnomehack
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--disable-sdltest --enable-static
 USE_LDCONFIG=	yes
 
diff --git graphics/gphoto2/Makefile graphics/gphoto2/Makefile
index aec8b63..30496f8 100644
--- graphics/gphoto2/Makefile
+++ graphics/gphoto2/Makefile
@@ -19,14 +19,13 @@ LIB_DEPENDS=	popt.0:${PORTSDIR}/devel/popt \
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--without-cdk
 MAKE_JOBS_SAFE=	yes
 
 MAN1=		gphoto2.1
 
-CPPFLAGS=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
+CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 
 OPTIONS=	AALIB "Enable command line capture preview (aalib)" on
 
diff --git graphics/gqview-devel/Makefile graphics/gqview-devel/Makefile
index b2e348f..5794915 100644
--- graphics/gqview-devel/Makefile
+++ graphics/gqview-devel/Makefile
@@ -18,8 +18,8 @@ LIB_DEPENDS=	png.6:${PORTSDIR}/graphics/png
 
 USE_GNOME=	gnomehier gtk20
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 
 MAN1=		gqview.1
 
diff --git graphics/gqview/Makefile graphics/gqview/Makefile
index 1a06298..20396ef 100644
--- graphics/gqview/Makefile
+++ graphics/gqview/Makefile
@@ -18,8 +18,8 @@ LIB_DEPENDS=	png.6:${PORTSDIR}/graphics/png
 
 USE_GNOME=	gnomehier gtk20
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 
 MAKE_JOBS_SAFE=	yes
 
diff --git graphics/graphviz/Makefile graphics/graphviz/Makefile
index 7159ba9..3b0ac82 100644
--- graphics/graphviz/Makefile
+++ graphics/graphviz/Makefile
@@ -109,10 +109,7 @@ CONFIGURE_ARGS+=	--program-transform-name="s/x/x/" \
 		--disable-io --disable-ocaml --disable-java \
 		--disable-sharp
 
-CONFIGURE_ENV+=	CFLAGS="${CFLAGS}" \
-		CPPFLAGS="${CPPFLAGS}" \
-		LDFLAGS="${LDFLAGS}" \
-		MISSING=${TRUE}
+CONFIGURE_ENV+=	MISSING=${TRUE}
 
 .if defined(WITH_TK)
 CPPFLAGS+=		-I${TK_INCLUDEDIR}
diff --git graphics/grx/Makefile graphics/grx/Makefile
index c35f739..ddfa662 100644
--- graphics/grx/Makefile
+++ graphics/grx/Makefile
@@ -20,8 +20,8 @@ USE_LDCONFIG=	yes
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	--prefix=${PREFIX} --with-fontpath=${DATADIR}/fonts \
 		--with-x11-base=${LOCALBASE}
-CPPFLAGS=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 ALL_TARGET=	libs
 INSTALL_TARGET=	install install-bin install-fonts install-info
 
diff --git graphics/gscan2pdf/Makefile graphics/gscan2pdf/Makefile
index f352f64..9b3c1d9 100644
--- graphics/gscan2pdf/Makefile
+++ graphics/gscan2pdf/Makefile
@@ -58,7 +58,6 @@ USE_GETTEXT=	yes
 PLIST_SUB+=	NLS=""
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
-CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 .else
 CONFIGURE_ARGS+=--disable-nls
 PLIST_SUB+=	NLS="@comment "
diff --git graphics/gstreamer-plugins-gl/Makefile graphics/gstreamer-plugins-gl/Makefile
index 74686ad..2399724 100644
--- graphics/gstreamer-plugins-gl/Makefile
+++ graphics/gstreamer-plugins-gl/Makefile
@@ -23,8 +23,8 @@ USE_GSTREAMER=	yes
 USE_XORG=	ice x11
 USE_GL=		gl glu glew
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=--disable-examples
 
 PLIST_SUB=	VERSION="0.10"
diff --git graphics/gthumb/Makefile graphics/gthumb/Makefile
index cc15fc1..9da8cc4 100644
--- graphics/gthumb/Makefile
+++ graphics/gthumb/Makefile
@@ -26,8 +26,8 @@ WANT_GSTREAMER=	yes
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 GCONF_SCHEMAS=	gthumb.schemas gthumb-comments.schemas gthumb-image-viewer.schemas \
 		gthumb-importer.schemas gthumb-pixbuf-savers.schemas gthumb-slideshow.schemas \
diff --git graphics/gtk-update-icon-cache/Makefile graphics/gtk-update-icon-cache/Makefile
index 13d1d96..65e829a 100644
--- graphics/gtk-update-icon-cache/Makefile
+++ graphics/gtk-update-icon-cache/Makefile
@@ -43,9 +43,9 @@ USE_XORG=	xext xrender x11 xinerama xi xrandr xcursor xfixes xdamage \
 		xcomposite
 PATCHDIR=	${.CURDIR}/../../x11-toolkits/gtk20/files
 CONFIGURE_ARGS=	--enable-static --with-xinput=yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include/freetype2 \
-			  -I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include/freetype2 \
+		-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 PLIST_FILES=	bin/gtk-update-icon-cache
 
 MAN1=		gtk-update-icon-cache.1
diff --git graphics/gtkam/Makefile graphics/gtkam/Makefile
index a25a041..41319ce 100644
--- graphics/gtkam/Makefile
+++ graphics/gtkam/Makefile
@@ -21,8 +21,8 @@ WANT_GNOME=	yes
 USE_GNOME=	gnomehack gnomehier gtk20
 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=		gtkam.1
 
diff --git graphics/gtkdps/Makefile graphics/gtkdps/Makefile
index 78aa7c8..641db45 100644
--- graphics/gtkdps/Makefile
+++ graphics/gtkdps/Makefile
@@ -25,8 +25,8 @@ USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--with-dps-includes=${LOCALBASE}/include \
 		--with-dps-libraries=${LOCALBASE}/lib
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include"	\
-		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .if !defined(WITHOUT_NLS)
 USE_GETTEXT=	yes
diff --git graphics/gtkgraph/Makefile graphics/gtkgraph/Makefile
index 602ab84..2f422c0 100644
--- graphics/gtkgraph/Makefile
+++ graphics/gtkgraph/Makefile
@@ -20,8 +20,8 @@ USE_GMAKE=	yes
 USE_GNOME=	imlib
 USE_PERL5_BUILD=yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
 
 pre-patch:
 	@${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; s|-O2|${CFLAGS}| ; \
diff --git graphics/gtksee/Makefile graphics/gtksee/Makefile
index f2dced4..d395d39 100644
--- graphics/gtksee/Makefile
+++ graphics/gtksee/Makefile
@@ -23,8 +23,8 @@ LIB_DEPENDS=	jpeg.11:${PORTSDIR}/graphics/jpeg \
 USE_GNOME=	gtk12
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 MAKE_ARGS=	ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \
 		AUTOHEADER="${TRUE}"
 
diff --git graphics/gts/Makefile graphics/gts/Makefile
index 8c15a1a..1b09eb1 100644
--- graphics/gts/Makefile
+++ graphics/gts/Makefile
@@ -17,13 +17,12 @@ COMMENT=	GNU Triangulated Surface Library
 
 USE_GNOME=	glib20 pkgconfig
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 USE_LDCONFIG=	yes
 
 OPTIONS=	NETPBM "Build with libnetpbm support" off
 
-CPPFLAGS=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .include <bsd.port.pre.mk>
 
diff --git graphics/icon-slicer/Makefile graphics/icon-slicer/Makefile
index b4d174e..188ab86 100644
--- graphics/icon-slicer/Makefile
+++ graphics/icon-slicer/Makefile
@@ -18,7 +18,8 @@ LIB_DEPENDS=	popt:${PORTSDIR}/devel/popt
 
 USE_GNOME=	gtk20
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 PLIST_FILES=	bin/icon-slicer
 
diff --git graphics/icoutils/Makefile graphics/icoutils/Makefile
index ba4a96a..0e9801c 100644
--- graphics/icoutils/Makefile
+++ graphics/icoutils/Makefile
@@ -23,7 +23,6 @@ USE_BZIP2=	yes
 USE_PERL5_RUN=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-nls
-CONFIGURE_ENV=	LDFLAGS="${LDFLAGS}"
 MAKE_JOBS_SAFE=	yes
 
 MAN1=		extresso.1 genresscript.1 icotool.1 wrestool.1
@@ -32,8 +31,8 @@ PLIST_FILES=	bin/extresso \
 		bin/icotool \
 		bin/wrestool
 
-CPPFLAGS=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .include <bsd.port.pre.mk>
 
diff --git graphics/imlib/Makefile graphics/imlib/Makefile
index 385c9ec..0f91f7f 100644
--- graphics/imlib/Makefile
+++ graphics/imlib/Makefile
@@ -28,8 +28,8 @@ USE_GNOME=	gtk12 gnomehack
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--sysconfdir=${PREFIX}/etc/imlib --disable-modules
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
 
 MAN1=		imlib-config.1 imlib_config.1
 
diff --git graphics/imlib2/Makefile graphics/imlib2/Makefile
index 58a01fd..1fd0a02 100644
--- graphics/imlib2/Makefile
+++ graphics/imlib2/Makefile
@@ -22,8 +22,8 @@ GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
 USE_GNOME=	gnomehack pkgconfig
 USE_EFL=	libtool_hack
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 USE_LDCONFIG=	yes
 
 OPTIONS=	JPEG	"Enable jpeg image support"	on \
diff --git graphics/inkscape/Makefile graphics/inkscape/Makefile
index 255edce..29ee058 100644
--- graphics/inkscape/Makefile
+++ graphics/inkscape/Makefile
@@ -35,8 +35,8 @@ USE_GETTEXT=	yes
 GNU_CONFIGURE=	yes
 USE_PERL5=	yes
 INSTALLS_ICONS=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
-		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 
 MAN1=		inkscape.1
 MAN1_EN=	inkview.1
diff --git graphics/iulib/Makefile graphics/iulib/Makefile
index 6b40eb4..c3e53be 100644
--- graphics/iulib/Makefile
+++ graphics/iulib/Makefile
@@ -28,7 +28,8 @@ USE_AUTOTOOLS=	libtool aclocal automake autoconf
 ACLOCAL_ARGS=	--acdir=${ACLOCAL_DIR} -I${LOCALBASE}/share/aclocal
 AUTOMAKE_ARGS=	--add-missing
 USE_LDCONFIG=	yes
-CONFIGURE_ENV=	CPPFLAGS=-I${LOCALBASE}/include LDFLAGS=-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .include <bsd.port.pre.mk>
 
diff --git graphics/jasper/Makefile graphics/jasper/Makefile
index 55d3f8e..b5d6c6e 100644
--- graphics/jasper/Makefile
+++ graphics/jasper/Makefile
@@ -25,8 +25,8 @@ USE_ZIP=	yes
 USE_GNOME=	lthack
 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=	--enable-shared --enable-static
 USE_LDCONFIG=	yes
 
diff --git graphics/jpeginfo/Makefile graphics/jpeginfo/Makefile
index 8c139e4..40a1d7c 100644
--- graphics/jpeginfo/Makefile
+++ graphics/jpeginfo/Makefile
@@ -17,8 +17,8 @@ COMMENT=	Generate listing and MD5, check jpegs for error, delete broken ones
 LIB_DEPENDS=	jpeg.11:${PORTSDIR}/graphics/jpeg
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
 MAKE_ARGS=	mandir=${MANPREFIX}/man
 
 MAN1=		jpeginfo.1
diff --git graphics/jpegpixi/Makefile graphics/jpegpixi/Makefile
index 7b4b532..b206379 100644
--- graphics/jpegpixi/Makefile
+++ graphics/jpegpixi/Makefile
@@ -17,8 +17,8 @@ COMMENT=	Useful to correct images from digtal camera with CCD defects
 LIB_DEPENDS=	jpeg.11:${PORTSDIR}/graphics/jpeg
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 MANLANG=	"" de fi fr
 MAN1=		jpeghotp.1 jpegpixi.1
diff --git graphics/k3d/Makefile graphics/k3d/Makefile
index c3d18f6..fb4085e 100644
--- graphics/k3d/Makefile
+++ graphics/k3d/Makefile
@@ -31,8 +31,8 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION}
 USE_GL=		yes
 USE_PYTHON=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	${CXXFLAGS} -I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--without-docbook --without-graphviz \
 		--with-truetype=freetype2 --with-imagemagick --with-jpeg \
 		--with-python=${PYTHONBASE} --with-tiff --with-openexr \
diff --git graphics/kdc2tiff/Makefile graphics/kdc2tiff/Makefile
index 64230e9..54ac173 100644
--- graphics/kdc2tiff/Makefile
+++ graphics/kdc2tiff/Makefile
@@ -19,8 +19,8 @@ LIB_DEPENDS=	jpeg.11:${PORTSDIR}/graphics/jpeg \
 
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 PLIST_FILES=	bin/kdc2jpeg bin/kdc2tiff
 
diff --git graphics/kludge3d/Makefile graphics/kludge3d/Makefile
index ffcbf77..4e70371 100644
--- graphics/kludge3d/Makefile
+++ graphics/kludge3d/Makefile
@@ -23,14 +23,13 @@ USE_GL=		gl
 USE_GNOME=	gtk20
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--with-lib-GL
 
 PLIST_FILES=	bin/kludge3d
 
-CPPFLAGS=	-I${LOCALBASE}/include \
+CPPFLAGS+=	-I${LOCALBASE}/include \
 		-I${PYTHON_INCLUDEDIR} ${PTHREAD_CFLAGS}
-LDFLAGS=	-L${LOCALBASE}/lib \
+LDFLAGS+=	-L${LOCALBASE}/lib \
 		-L${PYTHON_LIBDIR}/config ${PTHREAD_LIBS}
 
 post-patch:
diff --git graphics/kudu/Makefile graphics/kudu/Makefile
index 4d85d76..6529755 100644
--- graphics/kudu/Makefile
+++ graphics/kudu/Makefile
@@ -25,9 +25,7 @@ MAKE_JOBS_SAFE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 CFLAGS+=	${PTHREAD_CFLAGS}
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" \
-		LDFLAGS="${LDFLAGS}" \
-		LIBS="${PTHREAD_LIBS} -lcompat"
+CONFIGURE_ENV=	LIBS="${PTHREAD_LIBS} -lcompat"
 
 DESKTOP_ENTRIES="Kudu" \
 		"Edit 3D models" \
diff --git graphics/lcms-python/Makefile graphics/lcms-python/Makefile
index c0ef45b..592e1d2 100644
--- graphics/lcms-python/Makefile
+++ graphics/lcms-python/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS+=	lcms.1:${PORTSDIR}/graphics/lcms
 USE_PYTHON=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-python
-CONFIGURE_ENV=	LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
+LDFLAGS+=	-L${LOCALBASE}/lib
 WRKSRC=		${WRKDIR}/lcms-1.19
 PLIST_FILES=	${PYTHON_SITELIBDIR:C,${PREFIX}/?,,}/_lcms.so \
 		${PYTHON_SITELIBDIR:C,${PREFIX}/?,,}/lcms.py
diff --git graphics/lcms/Makefile graphics/lcms/Makefile
index a6d4b81..ccc2ec8 100644
--- graphics/lcms/Makefile
+++ graphics/lcms/Makefile
@@ -19,9 +19,9 @@ COMMENT=	Light Color Management System -- a color management library
 
 USE_GNOME=	gnomehack lthack
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
-		CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
-		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
+CFLAGS+=	-I${LOCALBASE}/include
 USE_LDCONFIG=	yes
 WRKSRC=		${WRKDIR}/lcms-1.19
 
diff --git graphics/lcms2/Makefile graphics/lcms2/Makefile
index dc22fd3..7c1425d 100644
--- graphics/lcms2/Makefile
+++ graphics/lcms2/Makefile
@@ -17,9 +17,9 @@ COMMENT=	Light Color Management System -- a color management library
 
 USE_GNOME=	gnomehack lthack
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
-		CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
-		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
+CFLAGS+=	-I${LOCALBASE}/include
 USE_LDCONFIG=	yes
 
 OPTIONS=	TIFFICC "Build color profile applier for TIFF" off \
diff --git graphics/lensfun/Makefile graphics/lensfun/Makefile
index 0e2c7b9..eba6598 100644
--- graphics/lensfun/Makefile
+++ graphics/lensfun/Makefile
@@ -30,7 +30,6 @@ LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 CXXFLAGS+=	-I${LOCALBASE}/include
 
 HAS_CONFIGURE=	yes
-CONFIGURE_ENV=	LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--prefix=${PREFIX} --target=${TARGET} --vectorization=SSE
 
 PLIST_SUB+=	PORTVERSION=${PORTVERSION} LIBVERSION=${LIBVERSION}
diff --git graphics/leptonica/Makefile graphics/leptonica/Makefile
index 7a91cf3..85c3b76 100644
--- graphics/leptonica/Makefile
+++ graphics/leptonica/Makefile
@@ -24,7 +24,8 @@ MAKE_JOBS_SAFE=	yes
 USE_AUTOTOOLS=	libtool aclocal automake autoconf
 ACLOCAL_ARGS=	--acdir=${ACLOCAL_DIR} -I${LOCALBASE}/share/aclocal
 USE_LDCONFIG=	yes
-CONFIGURE_ENV=	CPPFLAGS=-I${LOCALBASE}/include LDFLAGS=-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 post-patch:
 	@${MV} ${WRKSRC}/src/makefile ${WRKSRC}/src/makefile.linux
diff --git graphics/lib3ds/Makefile graphics/lib3ds/Makefile
index 6c412de..31361ef 100644
--- graphics/lib3ds/Makefile
+++ graphics/lib3ds/Makefile
@@ -19,13 +19,12 @@ LICENSE=	LGPL21 # (or later)
 USE_ZIP=	yes
 USE_GL=		glut
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	LDFLAGS="${LDFLAGS}"
 USE_LDCONFIG=	yes
 MAKE_JOBS_SAFE=	yes
 
 MAN1=		3dsdump.1 lib3ds-config.1
 
-CPPFLAGS=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .include <bsd.port.mk>
diff --git graphics/libGL/bsd.mesalib.mk graphics/libGL/bsd.mesalib.mk
index 2814728..8e8bca9 100644
--- graphics/libGL/bsd.mesalib.mk
+++ graphics/libGL/bsd.mesalib.mk
@@ -43,8 +43,8 @@ USE_LDCONFIG=	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-gallium
 
 ALL_TARGET=		default
diff --git graphics/libafterimage/Makefile graphics/libafterimage/Makefile
index 990d002..4f3db53 100644
--- graphics/libafterimage/Makefile
+++ graphics/libafterimage/Makefile
@@ -27,7 +27,6 @@ USE_BZIP2=	yes
 USE_XORG=	xext
 USE_GNOME=	librsvg2
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--disable-staticlibs --enable-sharedlibs \
 		--without-builtin-ungif --without-afterbase \
 		--with-x
@@ -36,8 +35,8 @@ MAKE_JOBS_UNSAFE=	yes
 
 MAN1=		ascompose.1x
 
-CPPFLAGS=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .include <bsd.port.pre.mk>
 
diff --git graphics/libchamplain/Makefile graphics/libchamplain/Makefile
index 2307d97..00b1632 100644
--- graphics/libchamplain/Makefile
+++ graphics/libchamplain/Makefile
@@ -24,8 +24,8 @@ USE_AUTOTOOLS=	libtool
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 PLIST_SUB=	VERSION=0.8
 
diff --git graphics/libexif-gtk/Makefile graphics/libexif-gtk/Makefile
index 98b9e6d..1e94691 100644
--- graphics/libexif-gtk/Makefile
+++ graphics/libexif-gtk/Makefile
@@ -18,8 +18,8 @@ LIB_DEPENDS=	exif.12:${PORTSDIR}/graphics/libexif
 
 USE_GNOME=	gnomehack gtk20
 USE_AUTOTOOLS=	autoconf libtool
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 USE_LDCONFIG=	yes
 
 post-patch:
diff --git graphics/libexif/Makefile graphics/libexif/Makefile
index 704e08e..3c292cb 100644
--- graphics/libexif/Makefile
+++ graphics/libexif/Makefile
@@ -17,8 +17,8 @@ USE_BZIP2=	yes
 USE_GNOME=	gnomehack ltverhack pkgconfig
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--disable-docs
 USE_LDCONFIG=	yes
 
diff --git graphics/libflash/Makefile graphics/libflash/Makefile
index c43f13d..883ee55 100644
--- graphics/libflash/Makefile
+++ graphics/libflash/Makefile
@@ -26,8 +26,8 @@ USE_XORG=	x11 xext xkbfile xt
 WRKSRC=		${WRKDIR}/${DISTNAME}/lib
 USE_AUTOTOOLS=	libtool
 PATCH_WRKSRC=	${WRKDIR}/${DISTNAME}
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include"	\
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_WRKSRC=	${WRKDIR}/${DISTNAME}
 USE_BZIP2=	yes
 USE_LDCONFIG=	yes
diff --git graphics/libgfx/Makefile graphics/libgfx/Makefile
index 770caf3..4b6cf1b 100644
--- graphics/libgfx/Makefile
+++ graphics/libgfx/Makefile
@@ -27,15 +27,14 @@ BUILD_WRKSRC=	${WRKSRC}/src
 USE_GL=		glu
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--enable-gzstream --with-libtiff-lzw --with-x
 ALL_TARGET=	${PORTNAME}.so
 USE_LDCONFIG=	yes
 MAKE_JOBS_SAFE=	yes
 
 CFLAGS+=	-fPIC
-CPPFLAGS=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 post-patch:
 	@${REINPLACE_CMD} -e \
diff --git graphics/libggi/Makefile graphics/libggi/Makefile
index 2648d11..094b880 100644
--- graphics/libggi/Makefile
+++ graphics/libggi/Makefile
@@ -26,7 +26,8 @@ USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
-CONFIGURE_ENV=	CPPFLAGS="${PTHREAD_CFLAGS}" LDFLAGS="${PTHREAD_LIBS}"
+CPPFLAGS+=	${PTHREAD_CFLAGS}
+LDFLAGS+=	${PTHREAD_LIBS}
 
 MAN1=		cube3d.1 ggi-demo.1 ggiteleserver.1 monitest.1
 MAN3=		ggiCheckMode.3 ggiCopyBox.3 ggiCrossBlit.3 \
diff --git graphics/libggigcp/Makefile graphics/libggigcp/Makefile
index 97213bc..7ad7a00 100644
--- graphics/libggigcp/Makefile
+++ graphics/libggigcp/Makefile
@@ -24,7 +24,8 @@ USE_BZIP2=	yes
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 
-CONFIGURE_ENV=	CPPFLAGS="${PTHREAD_CFLAGS}" LDFLAGS="${PTHREAD_LIBS}"
+CPPFLAGS+=	${PTHREAD_CFLAGS}
+LDFLAGS+=	${PTHREAD_LIBS}
 
 MAN3=		gcpBlendColor.3 \
 		gcpGetLuminance.3 \
diff --git graphics/libggimisc/Makefile graphics/libggimisc/Makefile
index d0b8a50..09770f5 100644
--- graphics/libggimisc/Makefile
+++ graphics/libggimisc/Makefile
@@ -24,7 +24,8 @@ USE_BZIP2=	yes
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 
-CONFIGURE_ENV=	CPPFLAGS="${PTHREAD_CFLAGS}" LDFLAGS="${PTHREAD_LIBS}"
+CPPFLAGS+=	${PTHREAD_CFLAGS}
+LDFLAGS+=	${PTHREAD_LIBS}
 
 MAN3=		ggiGetRayPos.3 \
 		ggiSetSplitline.3 \
diff --git graphics/libggiwmh/Makefile graphics/libggiwmh/Makefile
index ecaec47..4b7fe8a 100644
--- graphics/libggiwmh/Makefile
+++ graphics/libggiwmh/Makefile
@@ -24,7 +24,8 @@ USE_BZIP2=	yes
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 
-CONFIGURE_ENV=	CPPFLAGS="${PTHREAD_CFLAGS}" LDFLAGS="${PTHREAD_LIBS}"
+CPPFLAGS+=	${PTHREAD_CFLAGS}
+LDFLAGS+=	${PTHREAD_LIBS}
 
 MAN3=		ggiWmhIconify.3 \
 		ggiWmhInit.3 \
diff --git graphics/libgltext/Makefile graphics/libgltext/Makefile
index 25e672e..3990633 100644
--- graphics/libgltext/Makefile
+++ graphics/libgltext/Makefile
@@ -23,7 +23,6 @@ USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}"
 
 OPTIONS=	EXAMPLES	"Compile examples, need libglut"	off
 
diff --git graphics/libgnomecanvas/Makefile graphics/libgnomecanvas/Makefile
index 3ccfbab..35658ef 100644
--- graphics/libgnomecanvas/Makefile
+++ graphics/libgnomecanvas/Makefile
@@ -28,8 +28,8 @@ USE_GNOME=	gnomehack libglade2 libartlgpl2 ltverhack referencehack
 CONFIGURE_ARGS=	--with-html-dir=${PREFIX}/share/doc \
 		--enable-glade \
 		--disable-gtk-doc
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .include <bsd.port.mk>
 
diff --git graphics/libopenraw/Makefile graphics/libopenraw/Makefile
index 0eec4b7..baaf76a 100644
--- graphics/libopenraw/Makefile
+++ graphics/libopenraw/Makefile
@@ -21,7 +21,8 @@ MAKE_JOBS_SAFE=	yes
 USE_GNOME=	libxml2
 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=${LOCALBASE}/include
 
 OPTIONS=	GNOME "GNOME support (needs gtk20)" on
diff --git graphics/libpano12/Makefile graphics/libpano12/Makefile
index fbf0a07..b1dc587 100644
--- graphics/libpano12/Makefile
+++ graphics/libpano12/Makefile
@@ -26,10 +26,10 @@ USE_GNOME=	gtk20 glib20 pango atk
 USE_AUTOTOOLS=	autoconf:env autoheader:env aclocal:env \
 		automake:env libtool:env
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include/gtk-2.0 \
-			-I${LOCALBASE}/include/glib-2.0 \
-			-I${LOCALBASE}/include/pango-1.0 \
-			-I${LOCALBASE}/include/atk-1.0"
+CPPFLAGS+=	-I${LOCALBASE}/include/gtk-2.0 \
+		-I${LOCALBASE}/include/glib-2.0 \
+		-I${LOCALBASE}/include/pango-1.0 \
+		-I${LOCALBASE}/include/atk-1.0
 CONFIGURE_ARGS=	--with-png=${LOCALBASE} \
 		--with-jpeg=${LOCALBASE} \
 		--with-tiff=${LOCALBASE}
diff --git graphics/libpano13/Makefile graphics/libpano13/Makefile
index 3e36473..49752b8 100644
--- graphics/libpano13/Makefile
+++ graphics/libpano13/Makefile
@@ -23,10 +23,10 @@ USE_GNOME=	gtk20 glib20 pango atk
 USE_AUTOTOOLS=	autoconf:env autoheader:env aclocal:env \
 		automake:env libtool:env
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include/gtk-2.0 \
-			-I${LOCALBASE}/include/glib-2.0 \
-			-I${LOCALBASE}/include/pango-1.0 \
-			-I${LOCALBASE}/include/atk-1.0"
+CPPFLAGS+=	-I${LOCALBASE}/include/gtk-2.0 \
+		-I${LOCALBASE}/include/glib-2.0 \
+		-I${LOCALBASE}/include/pango-1.0 \
+		-I${LOCALBASE}/include/atk-1.0
 CONFIGURE_ARGS=	--with-png=${LOCALBASE} \
 		--with-jpeg=${LOCALBASE} \
 		--with-tiff=${LOCALBASE}
diff --git graphics/libqrencode/Makefile graphics/libqrencode/Makefile
index 4e82ec7..3e75027 100644
--- graphics/libqrencode/Makefile
+++ graphics/libqrencode/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS=	png.6:${PORTSDIR}/graphics/png
 
 USE_GNOME=	gnomehack pkgconfig
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib"
+LDFLAGS+=	-L${LOCALBASE}/lib
 CFLAGS+=	-I${LOCALBASE}/include
 USE_LDCONFIG=	yes
 
diff --git graphics/librsvg/Makefile graphics/librsvg/Makefile
index 9f63c23..440eae3 100644
--- graphics/librsvg/Makefile
+++ graphics/librsvg/Makefile
@@ -23,7 +23,7 @@ USE_GMAKE=	yes
 USE_GNOME=	gnomelibs gdkpixbuf
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
 
 .include <bsd.port.mk>
diff --git graphics/librsvg2/Makefile graphics/librsvg2/Makefile
index 6b64cba..a39befe 100644
--- graphics/librsvg2/Makefile
+++ graphics/librsvg2/Makefile
@@ -28,8 +28,8 @@ USE_GMAKE=	yes
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool
 USE_GNOME=	gnomehack gnomeprefix libgsf ltverhack gtk20
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--with-svgz \
 		--with-croco \
 		--enable-gtk-theme
diff --git graphics/libvisual/Makefile graphics/libvisual/Makefile
index a4dda45..9e30219 100644
--- graphics/libvisual/Makefile
+++ graphics/libvisual/Makefile
@@ -20,8 +20,8 @@ COMMENT=	Abstraction library that sits between apps and visual plugin
 USE_GNOME=	gnomehack pkgconfig
 USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
-CONFIGURE_ENV=	CFLAGS="${CFLAGS} -I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
-		LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
 
 .include <bsd.port.pre.mk>
 
diff --git graphics/libvisual04-plugins/Makefile graphics/libvisual04-plugins/Makefile
index 4cac230..7100614 100644
--- graphics/libvisual04-plugins/Makefile
+++ graphics/libvisual04-plugins/Makefile
@@ -29,8 +29,8 @@ CONFIGURE_ARGS=	--disable-alsa \
 		--disable-gforce \
 		--disable-jess \
 		--prefix=${PREFIX}
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
 
 MAJORMINOR=	${PORTVERSION:C/.[0-9]+$//}
 
diff --git graphics/libvisual04/Makefile graphics/libvisual04/Makefile
index d55cadc..1f051a2 100644
--- graphics/libvisual04/Makefile
+++ graphics/libvisual04/Makefile
@@ -19,9 +19,8 @@ USE_AUTOTOOLS=	libtool
 USE_GNOME=	gnomehack pkgconfig
 USE_GETTEXT=	yes
 GNU_CONFIGURE=	yes
-CPPFLAGS=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
+CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 USE_LDCONFIG=	yes
 VER=		-0.4
 PLIST_SUB=	VER=${VER}
diff --git graphics/makehuman/Makefile graphics/makehuman/Makefile
index 623350e..a5761f0 100644
--- graphics/makehuman/Makefile
+++ graphics/makehuman/Makefile
@@ -22,8 +22,8 @@ USE_GMAKE=	yes
 USE_GNOME=	pkgconfig
 USE_GL=		glut
 
-CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib" \
-		CPPFLAGS="-I${LOCALBASE}/include"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .if !defined(NOPORTDOCS)
 PORTDOCS=	*
diff --git graphics/megapov/Makefile graphics/megapov/Makefile
index ce6db67..efa41f5 100644
--- graphics/megapov/Makefile
+++ graphics/megapov/Makefile
@@ -29,7 +29,6 @@ LDFLAGS+= -L${LOCALBASE}/lib -L${LOCALBASE}/lib
 CFLAGS+= -I${LOCALBASE}/include
 CXXFLAGS+= -I${LOCALBASE}/include
 CPPFLAGS+= -I${LOCALBASE}/include
-CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 
 .include <bsd.port.pre.mk>
 
diff --git graphics/mesa-demos/Makefile graphics/mesa-demos/Makefile
index 216d78a..f950531 100644
--- graphics/mesa-demos/Makefile
+++ graphics/mesa-demos/Makefile
@@ -47,8 +47,8 @@ do-install:
 
 .include "${.CURDIR}/../../graphics/libGL/bsd.mesalib.mk"
 .include <bsd.port.pre.mk>
-CONFIGURE_ENV=	CPPFLAGS="${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \
-		LDFLAGS="${PTHREAD_LIBS} -L${LOCALBASE}/lib"
+CPPFLAGS+=	${PTHREAD_CFLAGS} -I${LOCALBASE}/include
+LDFLAGS+=	${PTHREAD_LIBS} -L${LOCALBASE}/lib
 
 .if defined(WITH_NVIDIA_GL)
 CFLAGS+=	-DWITH_NVIDIA_GL=1
diff --git graphics/meshviewer/Makefile graphics/meshviewer/Makefile
index a79b4a5..6053459 100644
--- graphics/meshviewer/Makefile
+++ graphics/meshviewer/Makefile
@@ -26,9 +26,9 @@ MAKE_ARGS=	QTDIR="${QT_PREFIX}" CC="${CXX}" MOC="${MOC}" \
 PORTDOCS=	*
 PLIST_FILES=	bin/mview
 
-CPPFLAGS=	-I. -Imesh -Imathvector \
+CPPFLAGS+=	-I. -Imesh -Imathvector \
 		`pkg-config --cflags QtOpenGL glu`
-LDFLAGS=	`pkg-config --libs QtOpenGL glu`
+LDFLAGS+=	`pkg-config --libs QtOpenGL glu`
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|make |$$(MAKE) |g' ${WRKSRC}/Makefile
diff --git graphics/metacam/Makefile graphics/metacam/Makefile
index 461f823..9753c97 100644
--- graphics/metacam/Makefile
+++ graphics/metacam/Makefile
@@ -18,7 +18,6 @@ MAKE_JOBS_SAFE=	yes
 
 CFLAGS+=	-I${LOCALBASE}/include
 CXXFLAGS+=	-I${LOCALBASE}/include
-MAKE_ENV+=	LDFLAGS="${LDFLAGS}"
 
 PLIST_FILES=	bin/metacam
 PORTDOCS=	README.canon README.casio
diff --git graphics/metapixel/Makefile graphics/metapixel/Makefile
index 0bbd668..6286be8 100644
--- graphics/metapixel/Makefile
+++ graphics/metapixel/Makefile
@@ -21,7 +21,6 @@ LIB_DEPENDS=	png.6:${PORTSDIR}/graphics/png \
 USE_GMAKE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include -I.
 LDFLAGS+=	-L${LOCALBASE}/lib
-MAKE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 
 PLIST_FILES=	bin/metapixel bin/metapixel-convert bin/metapixel-imagesize \
 		bin/metapixel-prepare bin/metapixel-sizesort \
diff --git graphics/mhgui/Makefile graphics/mhgui/Makefile
index b2f23e9..9b2ed3d 100644
--- graphics/mhgui/Makefile
+++ graphics/mhgui/Makefile
@@ -23,8 +23,8 @@ USE_GNOME=	pkgconfig
 USE_LDCONFIG=	yes
 USE_GL=		glut
 
-CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib" \
-		CPPFLAGS="-I${LOCALBASE}/include"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .if !defined(NOPORTDOCS)
 PORTDOCS=	*
diff --git graphics/ming/Makefile graphics/ming/Makefile
index 9c25c60..3c13b74 100644
--- graphics/ming/Makefile
+++ graphics/ming/Makefile
@@ -24,13 +24,12 @@ USE_GNOME=	gnomehack
 USE_GMAKE=	yes
 USE_BISON=	build
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS+=	--includedir=${PREFIX}/include/ming
 USE_LDCONFIG=	yes
 MAKE_JOBS_UNSAFE=	yes
 
-CPPFLAGS=	-I. -I.. -I${LOCALBASE}/include
-LDFLAGS=	-L. -L.. -L${LOCALBASE}/lib
+CPPFLAGS+=	-I. -I.. -I${LOCALBASE}/include
+LDFLAGS+=	-L. -L.. -L${LOCALBASE}/lib
 CFLAGS+=	${CPPFLAGS}
 
 DOCS=		HISTORY NEWS README TODO
diff --git graphics/morpheus/Makefile graphics/morpheus/Makefile
index bd41bbf..f1c0302 100644
--- graphics/morpheus/Makefile
+++ graphics/morpheus/Makefile
@@ -21,7 +21,7 @@ USE_GL=		glut
 USE_GNOME=	gnomehack gnomelibs gnomeprefix
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .include <bsd.port.mk>
diff --git graphics/multican/Makefile graphics/multican/Makefile
index deceecd..5bd9f2a 100644
--- graphics/multican/Makefile
+++ graphics/multican/Makefile
@@ -27,7 +27,7 @@ PORTDOCS=	ChangeLog README TODO
 .if ${OSVERSION} < 800069
 LIB_DEPENDS=	usb:${PORTSDIR}/devel/libusb
 CFLAGS+=	-I${LOCALBASE}/include		# does not uphold CPPFLAGS
-MAKE_ENV=	LDFLAGS="-L${LOCALBASE}/lib"
+LDFLAGS+=	-L${LOCALBASE}/lib
 .endif
 
 post-patch:
diff --git graphics/ocaml-images/Makefile graphics/ocaml-images/Makefile
index d5f75645..2b82655 100644
--- graphics/ocaml-images/Makefile
+++ graphics/ocaml-images/Makefile
@@ -31,8 +31,8 @@ USE_OCAMLFIND_PLIST=	yes
 USE_OCAML_WASH=	yes
 OCAML_PKGDIRS=	camlimages
 USE_OCAML_LDCONFIG=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${CPPFLAGS}" \
-		LDFLAGS="-L${LOCALBASE}/lib ${LDFLAGS}"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 OPTIONS=	PNG "Enable PNG support" on \
 		JPEG "Enable JPEG support" on \
diff --git graphics/ocropus/Makefile graphics/ocropus/Makefile
index 45715a1..4218511 100644
--- graphics/ocropus/Makefile
+++ graphics/ocropus/Makefile
@@ -30,7 +30,8 @@ USE_PYTHON_BUILD=	yes
 USE_AUTOTOOLS=	aclocal automake autoconf
 USE_GMAKE=	yes
 CONFIGURE_ARGS=	--without-fst --without-tesseract --with-iulib=${LOCALBASE}
-CONFIGURE_ENV=	CPPFLAGS=-I${LOCALBASE}/include LDFLAGS=-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 USE_GCC=	4.2+
 
 .include <bsd.port.pre.mk>
diff --git graphics/opendx/Makefile graphics/opendx/Makefile
index a4f4e9b..3799251 100644
--- graphics/opendx/Makefile
+++ graphics/opendx/Makefile
@@ -26,9 +26,9 @@ USE_GL=		yes
 USE_MOTIF=	yes
 USE_AUTOTOOLS=	libtool
 CFLAGS+=	${PTHREAD_CFLAGS}
-CONFIGURE_ENV=	ARCH="${OPSYS:L}" \
-		CPPFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \
-		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
+CONFIGURE_ENV=	ARCH="${OPSYS:L}"
+CPPFLAGS+=	${CXXFLAGS} -I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 USE_GMAKE=	yes
 NO_MTREE=	yes
 PLIST_SUB=	ARCH=${OPSYS:L}
diff --git graphics/panoglview/Makefile graphics/panoglview/Makefile
index bda011f..82c1c8a 100644
--- graphics/panoglview/Makefile
+++ graphics/panoglview/Makefile
@@ -15,11 +15,11 @@ MAINTAINER=	ii@any.com.ru
 COMMENT=	Panorama viewer using OpenGL
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CFLAGS="${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \
-		CXXFLAGS="${PTHREAD_CFLAGS} -I${LOCALBASE}/include -ftemplate-depth-64" \
-		LDFLAGS="${PTHREAD_LIBS} -L${LOCALBASE}/lib -lwx_gtk2_gl-${WX_VERSION}" \
-		WX_CONFIG_NAME=wxgtk2-${WX_VERSION}-config \
+CONFIGURE_ENV=	WX_CONFIG_NAME=wxgtk2-${WX_VERSION}-config \
 		PATH="$${PATH}:${LOCALBASE}/bin"
+LDFLAGS+=	${PTHREAD_LIBS} -L${LOCALBASE}/lib -lwx_gtk2_gl-${WX_VERSION}
+CFLAGS+=	${PTHREAD_CFLAGS} -I${LOCALBASE}/include
+CXXFLAGS+=	${PTHREAD_CFLAGS} -I${LOCALBASE}/include -ftemplate-depth-64
 USE_XORG=	x11
 USE_GMAKE=	yes
 
diff --git graphics/passepartout/Makefile graphics/passepartout/Makefile
index 62fccce..265c325 100644
--- graphics/passepartout/Makefile
+++ graphics/passepartout/Makefile
@@ -27,8 +27,8 @@ USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CFALGS=-I${LOCALBASE}/include \
-		LDFLAGS=-L${LOCALBASE}/lib
+CFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 MAN1=		xml2ps.1 passepartout.1x
 
diff --git graphics/pecl-qrencode/Makefile graphics/pecl-qrencode/Makefile
index 59e7e3b..a3996b5 100644
--- graphics/pecl-qrencode/Makefile
+++ graphics/pecl-qrencode/Makefile
@@ -23,7 +23,7 @@ USE_PHPEXT=	yes
 USE_BZIP2=	yes
 
 CONFIGURE_ARGS=	--with-qrencode=${LOCALBASE}
-CONFIGURE_ENV=	CFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib ${EXTRA_LIBS}"
+LDFLAGS+=	-L${LOCALBASE}/lib ${EXTRA_LIBS}
+CFLAGS+=	-I${LOCALBASE}/include
 
 .include <bsd.port.mk>
diff --git graphics/pfscalibration/Makefile graphics/pfscalibration/Makefile
index 420eab9..03a21ed 100644
--- graphics/pfscalibration/Makefile
+++ graphics/pfscalibration/Makefile
@@ -17,8 +17,8 @@ PFS_CPPFLAGS=	-I${LOCALBASE}/include
 PFS_LDFLAGS=	-L${LOCALBASE}/lib
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${PFS_CPPFLAGS}" \
-		LDFLAGS="${PFS_LDFLAGS}"
+CPPFLAGS+=	${PFS_CPPFLAGS}
+LDFLAGS+=	${PFS_LDFLAGS}
 USE_GMAKE=	yes
 USE_PERL5=	yes
 
diff --git graphics/pfstmo/Makefile graphics/pfstmo/Makefile
index 2513279..be76d74 100644
--- graphics/pfstmo/Makefile
+++ graphics/pfstmo/Makefile
@@ -19,8 +19,8 @@ PFS_CPPFLAGS=	-I${LOCALBASE}/include
 PFS_LDFLAGS=	-L${LOCALBASE}/lib
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${PFS_CPPFLAGS}" \
-		LDFLAGS="${PFS_LDFLAGS}"
+CPPFLAGS+=	${PFS_CPPFLAGS}
+LDFLAGS+=	${PFS_LDFLAGS}
 USE_GMAKE=	yes
 
 MAN1=		pfstmo_pattanaik00.1 \
diff --git graphics/pfstools/Makefile graphics/pfstools/Makefile
index 5651848..1048d0c 100644
--- graphics/pfstools/Makefile
+++ graphics/pfstools/Makefile
@@ -25,9 +25,9 @@ GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	${PFS_BUILD}
 CONFIGURE_ARGS=	--disable-jpeghdr --disable-matlab \
 		--with-bash=${LOCALBASE}/bin/bash
-CONFIGURE_ENV=	CPPFLAGS="${PFS_CPPFLAGS}" \
-		LDFLAGS="${PFS_LDFLAGS}" \
-		PKG_CONFIG_PATH="${LOCALBASE}/libdata/pkgconfig"
+CONFIGURE_ENV=	PKG_CONFIG_PATH="${LOCALBASE}/libdata/pkgconfig"
+CPPFLAGS+=	${PFS_CPPFLAGS}
+LDFLAGS+=	${PFS_LDFLAGS}
 USE_AUTOTOOLS=	libtool
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
diff --git graphics/php-facedetect/Makefile graphics/php-facedetect/Makefile
index ffd8ee3..bee26b1 100644
--- graphics/php-facedetect/Makefile
+++ graphics/php-facedetect/Makefile
@@ -29,7 +29,6 @@ USE_PHPEXT=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 CONFIGURE_ARGS+=	--with-facedetect
-CONFIGURE_ENV+=		LDFLAGS="${LDFLAGS}"
 
 .include <bsd.port.pre.mk>
 
diff --git graphics/pixie/Makefile graphics/pixie/Makefile
index ba93f0b..566513a 100644
--- graphics/pixie/Makefile
+++ graphics/pixie/Makefile
@@ -29,7 +29,6 @@ USE_GNOME=	gnomehack
 USE_GL=		glu
 USE_BISON=	build
 USE_AUTOTOOLS=	libtool
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--includedir=${PREFIX}/include/pixie \
 		--libdir=${PREFIX}/lib/pixie \
 		--with-docdir=${DOCSDIR} \
@@ -46,8 +45,8 @@ MAN1=		rndr.1 sdrc.1 sdrinfo.1 texmake.1
 PORTDOCS=	*
 
 CFLAGS+=	-fPIC
-CPPFLAGS=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
+CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 
 .include <bsd.port.pre.mk>
 
diff --git graphics/plotutils/Makefile graphics/plotutils/Makefile
index 902bdba..fca4f48 100644
--- graphics/plotutils/Makefile
+++ graphics/plotutils/Makefile
@@ -19,7 +19,6 @@ LIB_DEPENDS=	png.6:${PORTSDIR}/graphics/png
 
 USE_MOTIF=	yes
 USE_AUTOTOOLS=	libtool
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--enable-libplotter --enable-libxmi --with-motif
 USE_LDCONFIG=	yes
 
diff --git graphics/pngnq/Makefile graphics/pngnq/Makefile
index 22d253b..57e05cd 100644
--- graphics/pngnq/Makefile
+++ graphics/pngnq/Makefile
@@ -20,7 +20,8 @@ LIB_DEPENDS=	png.6:${PORTSDIR}/graphics/png
 GNU_CONFIGURE=	yes
 
 CPPFLAGS+=	-I${LOCALBASE}/include
-CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" LIBS=-lpng
+CONFIGURE_ENV+=	LIBS=-lpng
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 USE_GNOME=	pkgconfig
 
diff --git graphics/poppler/Makefile graphics/poppler/Makefile
index f4b72e4..5cde338 100644
--- graphics/poppler/Makefile
+++ graphics/poppler/Makefile
@@ -30,10 +30,8 @@ USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--enable-zlib \
 		--enable-xpdf-headers \
 		--with-html-dir=${DOCSDIR}
-CPPFLAGS=-I${LOCALBASE}/include -I${LOCALBASE}/include/freetype2 ${PTHREAD_CFLAGS}
-LDFLAGS=-L${LOCALBASE}/lib ${PTHREAD_LIBS}
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" \
-		LDFLAGS="${LDFLAGS}"
+CPPFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include/freetype2 ${PTHREAD_CFLAGS}
+LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 
 .if !defined(SLAVEPORT)
 OPTIONS=	CAIRO "Enable cairo output backend" on \
diff --git graphics/pornview/Makefile graphics/pornview/Makefile
index 215af9a..687fab0 100644
--- graphics/pornview/Makefile
+++ graphics/pornview/Makefile
@@ -22,8 +22,8 @@ USE_XORG=	x11 xi xext xinerama
 USE_GNOME=	gtk20
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-gtk2
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .if defined(WITH_LIBXINE)
 LIB_DEPENDS+=	xine.1:${PORTSDIR}/multimedia/libxine
diff --git graphics/ppminfo/Makefile graphics/ppminfo/Makefile
index 60c8a21..b87a9f5 100644
--- graphics/ppminfo/Makefile
+++ graphics/ppminfo/Makefile
@@ -19,8 +19,7 @@ LIB_DEPENDS=	netpbm.1:${PORTSDIR}/graphics/netpbm
 
 PLIST_FILES=	bin/${PORTNAME}
 CFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
-MAKE_ENV+=	LDFLAGS="${LDFLAGS}"
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 post-patch:
 	@${REINPLACE_CMD} 's|min(|MIN(|;s|max(|MAX(|' ${WRKSRC}/pi.c
diff --git graphics/pqiv/Makefile graphics/pqiv/Makefile
index 863a168..d574ed5 100644
--- graphics/pqiv/Makefile
+++ graphics/pqiv/Makefile
@@ -31,8 +31,8 @@ MAN1=		pqiv.1
 PORTDOCS=	README
 PLIST_FILES=	bin/pqiv
 
-CPPFLAGS=	`${pkgconfig_DETECT} --cflags gtk+-2.0 gthread-2.0`
-LDFLAGS=	`${pkgconfig_DETECT} --libs gtk+-2.0 gthread-2.0`
+CPPFLAGS+=	`${pkgconfig_DETECT} --cflags gtk+-2.0 gthread-2.0`
+LDFLAGS+=	`${pkgconfig_DETECT} --libs gtk+-2.0 gthread-2.0`
 
 .include <bsd.port.pre.mk>
 
diff --git graphics/pstoedit/Makefile graphics/pstoedit/Makefile
index b1db6a0..1fa86f6 100644
--- graphics/pstoedit/Makefile
+++ graphics/pstoedit/Makefile
@@ -24,16 +24,15 @@ OPTIONS=	IMAGEMAGICK "Enable magick++ interface" on \
 USE_GNOME=	gnomehack pkgconfig
 USE_GHOSTSCRIPT=	yes
 USE_AUTOTOOLS=	libtool
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 USE_LDCONFIG=	yes
 MAKE_JOBS_UNSAFE=	yes
 
 MAN1=		pstoedit.1
 
 CFLAGS+=	-DHAVE_LIBGD
-CPPFLAGS=	-I${LOCALBASE}/include/ming -I${LOCALBASE}/include \
+CPPFLAGS+=	-I${LOCALBASE}/include/ming -I${LOCALBASE}/include \
 		-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .include <bsd.port.options.mk>
 
diff --git graphics/py-cairo/Makefile graphics/py-cairo/Makefile
index 6767ace..95ea87c 100644
--- graphics/py-cairo/Makefile
+++ graphics/py-cairo/Makefile
@@ -23,8 +23,8 @@ USE_PYTHON=	2.6-2.7
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack
 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|$$(libdir)/pkgconfig|${PREFIX}/libdata/pkgconfig|; \
diff --git graphics/py-clutter-gtk/Makefile graphics/py-clutter-gtk/Makefile
index b31ebf4..a5c215e 100644
--- graphics/py-clutter-gtk/Makefile
+++ graphics/py-clutter-gtk/Makefile
@@ -26,7 +26,6 @@ USE_AUTOTOOLS=	libtool
 USE_GNOME=	gnomehack pygnome2 pygtk2
 USE_PYTHON=	2.5+
 CONFIGURE_ARGS=	--disable-docs
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 
 CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
 LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
diff --git graphics/py-clutter/Makefile graphics/py-clutter/Makefile
index 7542389..99fdd87 100644
--- graphics/py-clutter/Makefile
+++ graphics/py-clutter/Makefile
@@ -28,7 +28,6 @@ USE_AUTOTOOLS=	libtool
 USE_GNOME=	gnomehack pygnome2 pygtk2
 USE_PYTHON=	2.5+
 CONFIGURE_ARGS=	--disable-docs
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 
 CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
 LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
diff --git graphics/py-glewpy/Makefile graphics/py-glewpy/Makefile
index 95ddb67..73672f9 100644
--- graphics/py-glewpy/Makefile
+++ graphics/py-glewpy/Makefile
@@ -27,6 +27,5 @@ USE_PYDISTUTILS=yes
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
-MAKE_ENV+=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 
 .include <bsd.port.mk>
diff --git graphics/py-paint/Makefile graphics/py-paint/Makefile
index e1c9669..c36fd3d 100644
--- graphics/py-paint/Makefile
+++ graphics/py-paint/Makefile
@@ -24,7 +24,7 @@ USE_FREETYPE=	yes
 USE_GNOME=	libartlgpl2
 NO_WRKSUBDIR=	yes
 CFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include/libart-2.0 -I${LOCALBASE}/include/freetype1
-MAKE_ENV=	LDFLAGS="-L${LOCALBASE}/lib"
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 EXAMPLESDIR=	${PREFIX}/share/examples/py-${PORTNAME}
 
diff --git graphics/py-visual/Makefile graphics/py-visual/Makefile
index c65c277..db91fb4 100644
--- graphics/py-visual/Makefile
+++ graphics/py-visual/Makefile
@@ -39,7 +39,7 @@ CONFIGURE_ARGS+=	--disable-docs
 .endif
 CONFIGURE_ENV=	PYTHONPATH=${PYTHON_LIBDIR}
 CFLAGS+=	${PTHREAD_CFLAGS}
-MAKE_ENV=	LDFLAGS="${LDFLAGS} ${PTREAD_LIBS}"
+LDFLAGS+=	${PTREAD_LIBS}
 
 VPYTHON_SCRIPT=	bin/vpython.in
 
diff --git graphics/qslim/Makefile graphics/qslim/Makefile
index b7a2103..88ed4a9 100644
--- graphics/qslim/Makefile
+++ graphics/qslim/Makefile
@@ -28,15 +28,14 @@ USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 USE_GL=		glu
 USE_LDCONFIG=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 ALL_TARGET=	# none
 
-CPPFLAGS=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS} -DHAVE_BOOL
-LDFLAGS=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
+CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS} -DHAVE_BOOL
+LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 
 CFLAGS+=	-DMIX_ANSI_IOSTREAMS -fpermissive -fPIC ${CPPFLAGS}
 MAKE_ARGS+=	CC="${CC}" CXX="${CXX}"
-MAKE_ENV+=	LDFLAGS="${LDFLAGS}" FLTKCONFIG="${LOCALBASE}/bin/fltk-config"
+MAKE_ENV+=	FLTKCONFIG="${LOCALBASE}/bin/fltk-config"
 
 post-extract:
 	@${RM} -rf ${WRKSRC}/libgfx/
diff --git graphics/quat-gui/Makefile graphics/quat-gui/Makefile
index 0cf8091..6b52492 100644
--- graphics/quat-gui/Makefile
+++ graphics/quat-gui/Makefile
@@ -21,8 +21,8 @@ LIB_DEPENDS=	fltk.1:${PORTSDIR}/x11-toolkits/fltk
 USE_XORG=	xext
 USE_GL=		gl glut
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -L${LOCALBASE}/lib" \
-		LIBS="-lXext -lGL" FLUID="${LOCALBASE}/bin/fluid"
+CONFIGURE_ENV=	LIBS="-lXext -lGL" FLUID="${LOCALBASE}/bin/fluid"
+CPPFLAGS+=	-I${LOCALBASE}/include -L${LOCALBASE}/lib
 
 .if defined(WITH_OPTIMIZED_CFLAGS)
 CFLAGS+=	-O3 -ffast-math
diff --git graphics/quesoglc/Makefile graphics/quesoglc/Makefile
index 1e977b9..22dcc61 100644
--- graphics/quesoglc/Makefile
+++ graphics/quesoglc/Makefile
@@ -25,7 +25,8 @@ USE_GNOME=	gnomehack
 USE_GL=		gl glu glut
 USE_LDCONFIG=	yes
 
-CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib" CPPFLAGS="-I${LOCALBASE}/include"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 # needs GLEW MX (multiple rendering contexts), so system glew won't go
 CONFIGURE_ARGS=	--without-glew --with-fribidi
 
diff --git graphics/rawstudio/Makefile graphics/rawstudio/Makefile
index 30b98a6..9288150 100644
--- graphics/rawstudio/Makefile
+++ graphics/rawstudio/Makefile
@@ -26,8 +26,8 @@ LIB_DEPENDS=	jpeg.11:${PORTSDIR}/graphics/jpeg \
 BUILD_DEPENDS=	${LOCALBASE}/include/fftw3.h:${PORTSDIR}/math/fftw3
 
 GNU_CONFIGURE=	yes
-CPPFLAGS=	-I${LOCALBASE}/include
-CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 USE_GMAKE=	yes
 USE_GETTEXT=	yes
 USE_GNOME=	gtk20 libxml2 gconf2 desktopfileutils gnomehack
diff --git graphics/reallyslick/Makefile graphics/reallyslick/Makefile
index 4633484..1597b00 100644
--- graphics/reallyslick/Makefile
+++ graphics/reallyslick/Makefile
@@ -26,7 +26,6 @@ USE_GL=		glut
 USE_GNOME=	gnomehack
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 
 MAN1=		biof.1 busyspheres.1 colorfire.1 cyclone.1 drempels.1 \
 		euphoria.1 feedback.1 fieldlines.1 flocks.1 flux.1 \
@@ -34,8 +33,8 @@ MAN1=		biof.1 busyspheres.1 colorfire.1 cyclone.1 drempels.1 \
 		lorenz.1 matrixview.1 pixelcity.1 plasma.1 skyrocket.1 \
 		solarwinds.1 spirographx.1 sundancer2.1
 
-CPPFLAGS=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .include <bsd.port.pre.mk>
 
diff --git graphics/ruby-rmagick/Makefile graphics/ruby-rmagick/Makefile
index e9225db..d84a3bb 100644
--- graphics/ruby-rmagick/Makefile
+++ graphics/ruby-rmagick/Makefile
@@ -24,10 +24,9 @@ USE_RUBY=	yes
 USE_RUBY_SETUP=	yes
 RUBY_SETUP=	setup.rb
 
-CONFIGURE_ENV=	CFLAGS="${CFLAGS}" \
-		CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib" \
-		RUBY="${RUBY}"
+CONFIGURE_ENV=	RUBY="${RUBY}"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--doc-dir="${RUBY_MODDOCDIR}" --prefix="${PREFIX}" \
 		--allow-example-errors
 .if defined(NOPORTDOCS)
diff --git graphics/sage/Makefile graphics/sage/Makefile
index 1825d64..ce07e41 100644
--- graphics/sage/Makefile
+++ graphics/sage/Makefile
@@ -23,7 +23,7 @@ USE_SDL=	sdl
 
 MAN3=		sage.3 sage_init.3
 
-CONFIGURE_ENV=	"CFLAGS=${CFLAGS} -I${LOCALBASE}/include"
+CFLAGS+=	-I${LOCALBASE}/include
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|sdl-config|${SDL_CONFIG}|g' ${WRKSRC}/configure
diff --git graphics/sane-backends/Makefile graphics/sane-backends/Makefile
index a1fba3c..449a2a8 100644
--- graphics/sane-backends/Makefile
+++ graphics/sane-backends/Makefile
@@ -31,7 +31,6 @@ OPTIONS=	USB "USB support" on \
 
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--with-docdir=${DOCSDIR} \
 		--disable-latex \
 		--disable-locking \
@@ -45,8 +44,8 @@ SUB_FILES+=	pkg-message
 USERS=	saned
 GROUPS=	saned
 
-CPPFLAGS=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .include "Makefile.man"
 .include <bsd.port.pre.mk>
diff --git graphics/sane-frontends/Makefile graphics/sane-frontends/Makefile
index 17fb9dd..283e99d 100644
--- graphics/sane-frontends/Makefile
+++ graphics/sane-frontends/Makefile
@@ -25,8 +25,8 @@ LIB_DEPENDS=	sane.1:${PORTSDIR}/graphics/sane-backends
 USE_GMAKE=	yes
 WANT_GNOME=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 MAN1=		scanadf.1 xcam.1 xscanimage.1
 SUB_FILES=	pkg-message
diff --git graphics/scale2x/Makefile graphics/scale2x/Makefile
index c18aa25..c47d9cd 100644
--- graphics/scale2x/Makefile
+++ graphics/scale2x/Makefile
@@ -17,13 +17,12 @@ COMMENT=	Real-time graphics effect able to increase the size of small bitmaps
 LIB_DEPENDS=	png.6:${PORTSDIR}/graphics/png
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 
 MAN1=		scalex.1 scalerx.1
 PLIST_FILES=	bin/scalex bin/scalerx
 
-CPPFLAGS=	`libpng14-config --I_opts`
-LDFLAGS=	`libpng14-config --L_opts`
+CPPFLAGS+=	`libpng14-config --I_opts`
+LDFLAGS+=	`libpng14-config --L_opts`
 
 post-patch:
 	${REINPLACE_CMD} -e 's|png_set_gray_1_2_4_to_8|png_set_expand_gray_1_2_4_to_8|' \
diff --git graphics/sdl_image/Makefile graphics/sdl_image/Makefile
index 3d00149..9972c1b 100644
--- graphics/sdl_image/Makefile
+++ graphics/sdl_image/Makefile
@@ -24,8 +24,8 @@ USE_SDL=	sdl
 USE_GNOME=	pkgconfig gnomehack
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib -lm"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib -lm
 CONFIGURE_ARGS=	--enable-tif --enable-xcf
 USE_LDCONFIG=	yes
 
diff --git graphics/sdl_ttf/Makefile graphics/sdl_ttf/Makefile
index def82f9..dc6730a 100644
--- graphics/sdl_ttf/Makefile
+++ graphics/sdl_ttf/Makefile
@@ -21,8 +21,8 @@ USE_SDL=	sdl
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack pkgconfig
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 USE_LDCONFIG=	yes
 
 .if !defined(WITHOUT_X11) && !defined(WITHOUT_GL)
diff --git graphics/seejpeg/Makefile graphics/seejpeg/Makefile
index f8d2c7c..65ebf2f 100644
--- graphics/seejpeg/Makefile
+++ graphics/seejpeg/Makefile
@@ -25,8 +25,8 @@ MAN1=		seejpeg.1
 MANCOMPRESSED=	yes
 PLIST_FILES=	bin/seejpeg
 USE_GMAKE=	yes
-MAKE_ENV=	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
-		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 post-extract:
 	${CHMOD} 0644 ${WRKSRC}/Makefile
diff --git graphics/simage/Makefile graphics/simage/Makefile
index 2ce519c..695bff1 100644
--- graphics/simage/Makefile
+++ graphics/simage/Makefile
@@ -22,11 +22,10 @@ LIB_DEPENDS=	sndfile.1:${PORTSDIR}/audio/libsndfile \
 
 USE_GNOME=	gnomehack
 USE_AUTOTOOLS=	libtool
-CONFIGURE_ENV=	LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--with-mpeg2enc
 USE_LDCONFIG=	yes
 
-CPPFLAGS=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .include <bsd.port.mk>
diff --git graphics/sng/Makefile graphics/sng/Makefile
index 89bca57..3b193d2 100644
--- graphics/sng/Makefile
+++ graphics/sng/Makefile
@@ -19,7 +19,7 @@ RUN_DEPENDS=	${LOCALBASE}/lib/X11/rgb.txt:${PORTSDIR}/x11/rgb
 LIB_DEPENDS=	png.6:${PORTSDIR}/graphics/png
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib"
+LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--with-png-inc=${LOCALBASE}/include \
 		--with-rgbtxt=${LOCALBASE}/lib/X11/rgb.txt
 
diff --git graphics/sodipodi/Makefile graphics/sodipodi/Makefile
index c5e6342e..67564cf 100644
--- graphics/sodipodi/Makefile
+++ graphics/sodipodi/Makefile
@@ -22,8 +22,8 @@ USE_GETTEXT=	yes
 USE_AUTOTOOLS=	libtool
 CONFIGURE_ARGS=	--without-gnome-print \
 		--with-popt
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/freetype2" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include/freetype2
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 MAN1=		sodipodi.1
 
diff --git graphics/sswf/Makefile graphics/sswf/Makefile
index 0b57a77..ff4d8e0 100644
--- graphics/sswf/Makefile
+++ graphics/sswf/Makefile
@@ -24,14 +24,13 @@ USE_GNOME=	pkgconfig
 USE_BISON=	build
 USE_ICONV=	yes
 USE_AUTOTOOLS=	libtool
-CONFIGURE_ENV=	LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--with-pkgconfigdir=${PREFIX}/libdata/pkgconfig
 USE_LDCONFIG=	yes
 
 PLIST_SUB=	VERSION="${PORTVERSION}"
 
-CPPFLAGS=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .if !defined(WITH_DEBUG)
 CONFIGURE_ARGS+=	--disable-debug --disable-yydebug
diff --git graphics/stamp/Makefile graphics/stamp/Makefile
index b7a673b..3728806 100644
--- graphics/stamp/Makefile
+++ graphics/stamp/Makefile
@@ -17,9 +17,8 @@ COMMENT=	Adds a graphical, configurable timestamp to a grayscale image
 LIB_DEPENDS=	jpeg.11:${PORTSDIR}/graphics/jpeg
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="${LDFLAGS}" \
-		LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV+=	LIBS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
 .if !defined(WITHOUT_X11)
 USE_GNOME=	gtk12
 .endif
diff --git graphics/swfdec/Makefile graphics/swfdec/Makefile
index 8211a88..24dc668 100644
--- graphics/swfdec/Makefile
+++ graphics/swfdec/Makefile
@@ -22,8 +22,8 @@ USE_LDCONFIG=	yes
 USE_GNOME=	gnomehack gtk20 ltverhack
 USE_GSTREAMER=	core good mp3 ffmpeg
 USE_AUTOTOOLS=	libtool
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-Wl,-Bsymbolic -L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-Wl,-Bsymbolic -L${LOCALBASE}/lib
 
 PLIST_SUB=	VERSION=${PORTVERSION:R}
 
diff --git graphics/swfmill/Makefile graphics/swfmill/Makefile
index 788206a..e1a0fd7 100644
--- graphics/swfmill/Makefile
+++ graphics/swfmill/Makefile
@@ -20,7 +20,7 @@ USE_AUTOTOOLS=	libtool
 USE_GNOME=	pkgconfig libxml2 libxslt
 
 GNU_CONFIGURE=	YES
-CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS}" PKG_CONFIG=${LOCALBASE}/bin/pkg-config
+CONFIGURE_ENV+=	PKG_CONFIG=${LOCALBASE}/bin/pkg-config
 
 USE_LDCONFIG=	YES
 
diff --git graphics/swftools/Makefile graphics/swftools/Makefile
index 71e1a81..a9162fa 100644
--- graphics/swftools/Makefile
+++ graphics/swftools/Makefile
@@ -32,8 +32,7 @@ USE_GNOME=	pkgconfig
 USE_GL=		glut
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \
-		ac_cv_lib_zzip_zzip_file_open=no
+CONFIGURE_ENV=	ac_cv_lib_zzip_zzip_file_open=no
 
 MAKE_JOBS_SAFE=	yes
 
@@ -41,8 +40,8 @@ MAN1=		as3compile.1 font2swf.1 gif2swf.1 jpeg2swf.1 pdf2swf.1 \
 		png2swf.1 swfbbox.1 swfc.1 swfcombine.1 swfdump.1 \
 		swfextract.1 swfrender.1 swfstrings.1 wav2swf.1
 
-CPPFLAGS=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .include <bsd.port.pre.mk>
 
diff --git graphics/synfigstudio/Makefile graphics/synfigstudio/Makefile
index 6637bc8..99814e2 100644
--- graphics/synfigstudio/Makefile
+++ graphics/synfigstudio/Makefile
@@ -22,8 +22,8 @@ USE_GETTEXT=	yes
 USE_GMAKE=	yes
 INSTALLS_ICONS=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 USE_LDCONFIG=	yes
 
 post-patch:
diff --git graphics/telak/Makefile graphics/telak/Makefile
index 4e4bc01..840bb92 100644
--- graphics/telak/Makefile
+++ graphics/telak/Makefile
@@ -24,7 +24,6 @@ USE_EFL=	imlib2
 MAKE_JOBS_SAFE=	yes
 
 ALL_TARGET=	${PORTNAME}
-MAKE_ENV=	LDFLAGS="${LDFLAGS}"
 
 PLIST_FILES=	bin/telak
 MAN1=		telak.1
diff --git graphics/tgif/Makefile graphics/tgif/Makefile
index 26eee78..2bf788b 100644
--- graphics/tgif/Makefile
+++ graphics/tgif/Makefile
@@ -24,8 +24,8 @@ OPTIONS=	NLS "Enable native language support" on \
 USE_IMAKE=	yes
 PORTDOCS=	HISTORY README
 USE_XORG=	x11 xext xt sm ice
-MAKE_ENV=	CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}" \
-		PTHREAD_LIBS="${PTHREAD_LIBS}"
+MAKE_ENV=	PTHREAD_LIBS="${PTHREAD_LIBS}"
+CFLAGS+=	${PTHREAD_CFLAGS}
 
 MAN1=		tgif.1
 
diff --git graphics/tiff2png/Makefile graphics/tiff2png/Makefile
index c5f1c17..56913ae 100644
--- graphics/tiff2png/Makefile
+++ graphics/tiff2png/Makefile
@@ -28,7 +28,7 @@ PLIST_FILES=	bin/tiff2png
 
 CFLAGS+=	-DINVERT_MINISWHITE -DFAXPECT -DDEFAULT_DESTDIR_IS_CURDIR \
 		-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib -lpng -lz -ltiff -ljpeg -lm
+LDFLAGS+=	-L${LOCALBASE}/lib -lpng -lz -ltiff -ljpeg -lm
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/tiff2png ${PREFIX}/bin
diff --git graphics/tkpng/Makefile graphics/tkpng/Makefile
index 4dbf793..28d82ad 100644
--- graphics/tkpng/Makefile
+++ graphics/tkpng/Makefile
@@ -28,8 +28,7 @@ CONFIGURE_ARGS=	--with-tcl=${TCL_LIBDIR} \
 		--with-tclinclude=${TCL_INCLUDEDIR}/generic \
 		--with-tkinclude=${TK_INCLUDEDIR}/generic \
 		--exec-prefix=${PREFIX} --enable-shared
-CPPFLAGS=	-I${TK_INCLUDEDIR}/generic -I${LOCALBASE}/include
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}"
+CPPFLAGS+=	-I${TK_INCLUDEDIR}/generic -I${LOCALBASE}/include
 TKPKG=		${PORTNAME}${PORTVERSION}
 PLIST_SUB=	VER=${PORTVERSION} TKPKG=${TKPKG} TKLIBVER=${TKLIBVER}
 
diff --git graphics/togl/Makefile graphics/togl/Makefile
index e063d2c..9704573 100644
--- graphics/togl/Makefile
+++ graphics/togl/Makefile
@@ -24,8 +24,8 @@ USE_GL=		yes
 USE_XORG=	x11 xt xmu
 MAKE_ENV=	PTHREAD_LIBS="${PTHREAD_LIBS}" \
 		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}"
-CONFIGURE_ENV=	CFLAGS="-I${LOCALBASE}/include/tk8.4" \
-		LDFLAGS="-L${LOCALBASE}/lib/tk8.4"
+LDFLAGS+=	-L${LOCALBASE}/lib/tk8.4
+CFLAGS+=	-I${LOCALBASE}/include/tk8.4
 CONFIGURE_ARGS=	--with-tk=${LOCALBASE}/lib/tk8.4 \
 		--with-tcl=${LOCALBASE}/lib/tcl8.4 \
 		--with-tclinclude=${LOCALBASE}/include/tcl8.4 \
diff --git graphics/truevision/Makefile graphics/truevision/Makefile
index 1da8edc..838ae9e 100644
--- graphics/truevision/Makefile
+++ graphics/truevision/Makefile
@@ -27,13 +27,12 @@ USE_GL=		gl
 USE_PYTHON=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 
 MAN1=		truevision.1
 
-CPPFLAGS=	-I${LOCALBASE}/include \
+CPPFLAGS+=	-I${LOCALBASE}/include \
 		`pkg-config --cflags gtkglext-1.0`
-LDFLAGS=	-L${LOCALBASE}/lib \
+LDFLAGS+=	-L${LOCALBASE}/lib \
 		`pkg-config --libs gtkglext-1.0`
 
 post-patch:
diff --git graphics/ufraw/Makefile graphics/ufraw/Makefile
index 7e0f5f9..bcb324e 100644
--- graphics/ufraw/Makefile
+++ graphics/ufraw/Makefile
@@ -25,9 +25,8 @@ USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gtk20 glib20 gnomehack intltool intlhack libartlgpl2 pkgconfig
 
-LDFLAGS=	-L"${LOCALBASE}/lib" ${PTHREAD_LIBS}
-CPPFLAGS=	-I"${LOCALBASE}/include"
-CONFIGURE_ENV=	LDFLAGS="${LDFLAGS}" CPPFLAGS="${CPPFLAGS}"
+LDFLAGS+=	-L"${LOCALBASE}/lib" ${PTHREAD_LIBS}
+CPPFLAGS+=	-I"${LOCALBASE}/include"
 PC_FALSE+=	cinepaint
 
 OPTIONS=	CONTRAST "Enable contrast setting"		on	\
diff --git graphics/vp/Makefile graphics/vp/Makefile
index 7ab472e..4b66107 100644
--- graphics/vp/Makefile
+++ graphics/vp/Makefile
@@ -16,7 +16,6 @@ COMMENT=	An image viewer for X
 
 USE_SDL=	image
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 
 MAN1=		vp.1
 PLIST_FILES=	bin/vp
diff --git graphics/white_dune/Makefile graphics/white_dune/Makefile
index 8497095..1385474 100644
--- graphics/white_dune/Makefile
+++ graphics/white_dune/Makefile
@@ -28,16 +28,15 @@ USE_MOTIF=	yes
 USE_GL=		gl glu glut
 USE_SDL=	sdl
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \
-		YACC="/usr/bin/byacc"
+CONFIGURE_ENV=	YACC="/usr/bin/byacc"
 CONFIGURE_ARGS=	--with-optimization \
 		--without-devil \
 		--with-helpurl="${DOCSDIR}/index.html" \
 		--with-vrml97am1url="${DOCSDIR}/vrml97Amendment1" \
 		--with-x3ddrafturl="${DOCSDIR}/x3dDraft" \
 		--with-scriptednodesurl="${DOCSDIR}/scriptedNodes"
-CPPFLAGS=	`${SDL_CONFIG} --cflags` -DUSBHID_UCR_DATA -DUSBHID_NEW -D__FREEBSD__
-LDFLAGS=	`${SDL_CONFIG} --libs`
+CPPFLAGS+=	`${SDL_CONFIG} --cflags` -DUSBHID_UCR_DATA -DUSBHID_NEW -D__FREEBSD__
+LDFLAGS+=	`${SDL_CONFIG} --libs`
 ALL_TARGET=	dune
 
 MAN1=		dune.1 illegal2vrml.1
diff --git graphics/wxsvg/Makefile graphics/wxsvg/Makefile
index c24563f..41bdf96 100644
--- graphics/wxsvg/Makefile
+++ graphics/wxsvg/Makefile
@@ -22,8 +22,8 @@ USE_AUTOTOOLS=	automake
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--with-wx-config=${LOCALBASE}/bin/wxgtk2-2.8-config
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 USE_GNOME=	libartlgpl2
 USE_GMAKE=	yes
 USE_WX=		2.8
diff --git graphics/xaos/Makefile graphics/xaos/Makefile
index 098b843..5c2171e 100644
--- graphics/xaos/Makefile
+++ graphics/xaos/Makefile
@@ -24,8 +24,8 @@ OPTIONS=	PTHREAD "Enable SMP support (experimental)" off \
 		GTK2 "GTK+ User Interface (experimental)" off \
 		NLS "Native Language Support" on
 
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--with-aa-driver=no --with-dga-driver=no \
 		--with-ggi-driver=no --with-svga-driver=no \
 		--with-sffe=no
@@ -41,8 +41,8 @@ DESKTOP_ENTRIES=	"XaoS" "Fractal zoomer" "" "xaos" "" false
 
 .if defined(WITH_PTHREAD)
 CONFIGURE_ARGS+=	--with-pthread=yes
-CONFIGURE_ENV+=		LIBS="${PTHREAD_LIBS}" \
-			CFLAGS="${PTHREAD_CFLAGS} ${CFLAGS}"
+CONFIGURE_ENV+=		LIBS="${PTHREAD_LIBS}"
+CFLAGS+=		${PTHREAD_CFLAGS}
 .else
 CONFIGURE_ARGS+=	--with-pthread=no
 .endif
diff --git graphics/xmedcon/Makefile graphics/xmedcon/Makefile
index e8611ef..34a53fc 100644
--- graphics/xmedcon/Makefile
+++ graphics/xmedcon/Makefile
@@ -29,8 +29,8 @@ OPTIONS=	X11 "With X11" on \
 WANT_GNOME=	yes
 USE_SUBMAKE=	yes
 USE_AUTOTOOLS=	libtool
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--includedir=${PREFIX}/include/xmedcon \
 		--enable-llcheck
 USE_LDCONFIG=	yes
diff --git graphics/xmms-blursk/Makefile graphics/xmms-blursk/Makefile
index 4c6ea8e..8f94eff 100644
--- graphics/xmms-blursk/Makefile
+++ graphics/xmms-blursk/Makefile
@@ -25,7 +25,7 @@ USE_XORG=	x11 xv
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS} ${CFLAGS} ${PTHREAD_CFLAGS}"
+CPPFLAGS+=	${CFLAGS} ${PTHREAD_CFLAGS}
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|-O2||' \
diff --git graphics/xmms-nebulus/Makefile graphics/xmms-nebulus/Makefile
index 04ba978..e7f63c2 100644
--- graphics/xmms-nebulus/Makefile
+++ graphics/xmms-nebulus/Makefile
@@ -24,7 +24,7 @@ USE_GNOME=	gtk12
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include"
+CPPFLAGS+=	-I${LOCALBASE}/include
 
 post-patch:
 	@${REINPLACE_CMD} -e \
diff --git graphics/xmms-paranormal/Makefile graphics/xmms-paranormal/Makefile
index c3fad60..faf3aca 100644
--- graphics/xmms-paranormal/Makefile
+++ graphics/xmms-paranormal/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS=	xml2:${PORTSDIR}/textproc/libxml2
 BUILD_DEPENDS=	xmms-config:${PORTSDIR}/multimedia/xmms
 RUN_DEPENDS=	xmms:${PORTSDIR}/multimedia/xmms
 
-CONFIGURE_ENV+=	CFLAGS="-I${LOCALBASE}/include/libxml2/libxml"
+CFLAGS+=	-I${LOCALBASE}/include/libxml2/libxml
 
 USE_GL=		glut
 GNU_CONFIGURE=	yes
diff --git graphics/xmorph/Makefile graphics/xmorph/Makefile
index 8fe5715..e5251f0 100644
--- graphics/xmorph/Makefile
+++ graphics/xmorph/Makefile
@@ -24,8 +24,8 @@ CONFLICTS=	libmorph*
 WANT_GNOME=	yes
 USE_XORG=	xbitmaps x11 xaw xext
 USE_AUTOTOOLS=	libtool
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--without-waili
 USE_LDCONFIG=	yes
 
diff --git graphics/xpdf/Makefile graphics/xpdf/Makefile
index b01fbb8..c30790b 100644
--- graphics/xpdf/Makefile
+++ graphics/xpdf/Makefile
@@ -30,8 +30,8 @@ CONFLICTS=	poppler-utils-0.*
 
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	autoconf
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--enable-opi \
 		--with-t1-library="${LOCALBASE}/lib" \
 		--with-t1-includes="${LOCALBASE}/include" \
diff --git graphics/xsane/Makefile graphics/xsane/Makefile
index c18df99..7c40ba6 100644
--- graphics/xsane/Makefile
+++ graphics/xsane/Makefile
@@ -23,8 +23,8 @@ LIB_DEPENDS=	jpeg.11:${PORTSDIR}/graphics/jpeg \
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 WANT_GNOME=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 MAN1=		xsane.1
 
diff --git graphics/zbar/Makefile graphics/zbar/Makefile
index de7d7e5..4b5ebae 100644
--- graphics/zbar/Makefile
+++ graphics/zbar/Makefile
@@ -93,7 +93,7 @@ CONFIGURE_ARGS+=	--with-qt=no
 PLIST_SUB+=	QT4="@comment "
 .endif
 
-CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib"
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 post-patch:
 	@${REINPLACE_CMD} 's|-lpthread|${PTHREAD_LIBS}|' ${WRKSRC}/configure
diff --git graphics/zphoto/Makefile graphics/zphoto/Makefile
index e9fb2e1..10c03be 100644
--- graphics/zphoto/Makefile
+++ graphics/zphoto/Makefile
@@ -25,9 +25,9 @@ RUN_DEPENDS=	zip:${PORTSDIR}/archivers/zip
 .endif
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" \
-	       	CPPFLAGS="-I${LOCALBASE}/include \
-		${PTHREAD_CFLAGS}"
+CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CPPFLAGS+=	-I${LOCALBASE}/include \
+		${PTHREAD_CFLAGS}
 USE_EFL=	imlib2
 .if defined (WITH_WXGTK2)
 USE_WX=		2.4
diff --git irc/bip/Makefile irc/bip/Makefile
index dea1bec..583c052 100644
--- irc/bip/Makefile
+++ irc/bip/Makefile
@@ -15,7 +15,7 @@ COMMENT=	A simple IRC proxy with SSL support
 
 LICENSE=	GPLv2
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib"
+LDFLAGS+=	-L${LOCALBASE}/lib
 USE_GMAKE=	yes
 INSTALL_TARGET=	SUBDIR=src install-exec
 
diff --git irc/bitchx/Makefile irc/bitchx/Makefile
index c185e18..0d00cbf 100644
--- irc/bitchx/Makefile
+++ irc/bitchx/Makefile
@@ -24,8 +24,8 @@ CONFIGURE_ARGS+=--exec-prefix="${PREFIX}/share" \
 		--bindir="${PREFIX}/bin" \
 		--datadir="${PREFIX}/share" \
 		--libdir="${PREFIX}/share"
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		CFLAGS="${CFLAGS}" LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
 
 MAN1=		BitchX.1
 
diff --git irc/bobot++/Makefile irc/bobot++/Makefile
index 30002e1..9bf6dce 100644
--- irc/bobot++/Makefile
+++ irc/bobot++/Makefile
@@ -20,15 +20,14 @@ LICENSE_COMB=	dual
 OPTIONS=	GUILE "Use Guile scripts" on
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	LDFLAGS="${LDFLAGS}"
 
 INFO=		bobot++
 PORTDOCS=	*
 PORTEXAMPLES=	*
 PLIST_FILES=	bin/${PORTNAME}
 
-CPPFLAGS=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
+CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 
 .include <bsd.port.pre.mk>
 
diff --git irc/ctrlproxy/Makefile irc/ctrlproxy/Makefile
index 0c72b19..0a4efd4 100644
--- irc/ctrlproxy/Makefile
+++ irc/ctrlproxy/Makefile
@@ -22,13 +22,12 @@ USE_GNOME=	glib20
 USE_LDCONFIG=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 
 MAN1=		ctrlproxy.1
 MAN5=		ctrlproxy_config.5
 
-CPPFLAGS=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/doc/ctrlproxy.1 ${MANPREFIX}/man/man1
diff --git irc/dcc/Makefile irc/dcc/Makefile
index e6f7734..5161204 100644
--- irc/dcc/Makefile
+++ irc/dcc/Makefile
@@ -22,9 +22,8 @@ COMMENT=	DCC support program for irchat-pj
 USE_BZIP2=	yes
 PLIST_FILES=	bin/dcc
 ALL_TARGET=	dcc
-LDFLAGS=	${PTHREAD_LIBS}
+LDFLAGS+=	${PTHREAD_LIBS}
 CFLAGS+=	${PTHREAD_CFLAGS} -DUSE_PTHREAD -DENABLE_PTHREAD_ATTR
-MAKE_ENV+=	LDFLAGS="${LDFLAGS}"
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/dcc ${PREFIX}/bin
diff --git irc/lostirc/Makefile irc/lostirc/Makefile
index 4a86b2c..ef3ae74 100644
--- irc/lostirc/Makefile
+++ irc/lostirc/Makefile
@@ -21,14 +21,13 @@ LIB_DEPENDS=	gtkmm-2.4.1:${PORTSDIR}/x11-toolkits/gtkmm24
 
 USE_GNOME=	gnomehack gnomeprefix
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--disable-kde
 MAKE_JOBS_SAFE=	yes
 
 MAN1=		lostirc.1
 
-CPPFLAGS=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 post-install:
 .if !defined(NOPORTDOCS)
diff --git irc/miau/Makefile irc/miau/Makefile
index 530cf40..b775d38 100644
--- irc/miau/Makefile
+++ irc/miau/Makefile
@@ -32,9 +32,8 @@ CONFIGURE_ARGS=		--enable-dccbounce \
 			--enable-empty-awaymsg \
 			--enable-dumpstatus \
 			--disable-dependency-tracking
-CONFIGURE_ENV=		CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
-			LDFLAGS="${LDFLAGS}" \
-			LIBS="${LIBS}"
+CONFIGURE_ENV=		LIBS="${LIBS}"
+CPPFLAGS+=		-I${LOCALBASE}/include
 
 .if defined(WITH_IPV6)
 CONFIGURE_ARGS+=	--enable-ipv6
diff --git irc/netwalker-ircc/Makefile irc/netwalker-ircc/Makefile
index d16fc60..3c4e6f8 100644
--- irc/netwalker-ircc/Makefile
+++ irc/netwalker-ircc/Makefile
@@ -20,7 +20,7 @@ LICENSE=	GPLv2
 
 MAN1=		netwalker.1
 
-LDFLAGS=	-lncurses ${PTHREAD_LIBS}
+LDFLAGS+=	-lncurses ${PTHREAD_LIBS}
 CFLAGS?=	-O2 -Wall
 
 post-patch:
diff --git irc/ngircd/Makefile irc/ngircd/Makefile
index 6195c29..5289318 100644
--- irc/ngircd/Makefile
+++ irc/ngircd/Makefile
@@ -20,8 +20,8 @@ LICENSE=	GPLv2
 
 USE_RC_SUBR=	ngircd
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
 
 MAN5=		ngircd.conf.5
 MAN8=		ngircd.8
diff --git irc/ratbox-services/Makefile irc/ratbox-services/Makefile
index 455ed94..9625a3c 100644
--- irc/ratbox-services/Makefile
+++ irc/ratbox-services/Makefile
@@ -33,8 +33,8 @@ SUB_LIST=	LOGDIR=${LOGDIR} RUNDIR=${RUNDIR} DBDIR=${DBDIR} PERL=${PERL}
 
 USE_PERL5_BUILD=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 LIB_DEPENDS+=	pcre.0:${PORTSDIR}/devel/pcre
 CONFIGURE_ARGS+=--prefix=${PREFIX}		\
 		--sysconfdir=${PREFIX}/etc/	\
diff --git irc/unreal/Makefile irc/unreal/Makefile
index f94b232..41a09da 100644
--- irc/unreal/Makefile
+++ irc/unreal/Makefile
@@ -38,7 +38,6 @@ SUB_LIST+=	RUNDIR=${RUNDIR}
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 CFLAGS+=	${CPPFLAGS}
-CONFIGURE_ENV=	LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--with-listen=5 \
 		--with-dpath=${CONFIGDIR} \
 		--with-spath=${PREFIX}/libexec/ircd \
diff --git irc/xchat-fish/Makefile irc/xchat-fish/Makefile
index 891a9e7..852d554 100644
--- irc/xchat-fish/Makefile
+++ irc/xchat-fish/Makefile
@@ -25,7 +25,6 @@ DOCSDIR=	${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
 CCFLAGS+=	-Wall -O2 -I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 MAKE_ENV+=	CCFLAGS="${CCFLAGS}"
-MAKE_ENV+=	LDFLAGS="${LDFLAGS}"
 
 PLIST_FILES=	lib/xchat/plugins/xfish.so
 PORTDOCS=	FiSH-xchat.txt \
diff --git irc/xchat-gnome/Makefile irc/xchat-gnome/Makefile
index 7bd3af3..f7403a1 100644
--- irc/xchat-gnome/Makefile
+++ irc/xchat-gnome/Makefile
@@ -26,8 +26,8 @@ USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack gnomeprefix libgnomeui gnomedocutils desktopfileutils
 GNU_CONFIGURE=	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}
 CONFIGURE_ARGS=	--disable-tcl
 GCONF_SCHEMAS=	apps_xchat.schemas notification.schemas urlscraper.schemas
 INSTALLS_ICONS=	yes
@@ -70,10 +70,10 @@ PLIST_SUB+=		PYTHON="@comment "
 .if defined(WITH_TCL)
 LIB_DEPENDS+=	tcl83.1:${PORTSDIR}/lang/tcl83
 CONFIGURE_ARGS+=--enable-tcl=${LOCALBASE}/lib/tcl8.3
-CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS} \
-		-I${LOCALBASE}/include/tcl8.3" \
-		LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS} \
+CONFIGURE_ENV+=	LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS} \
 		-L${LOCALBASE}/lib/tcl8.3"
+CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS} \
+		-I${LOCALBASE}/include/tcl8.3
 PLIST_SUB+=	TCL=""
 .else
 CONFIGURE_ARGS+=--enable-tcl=no
diff --git irc/xchat/Makefile irc/xchat/Makefile
index 73b70d1..a1a5f7f 100644
--- irc/xchat/Makefile
+++ irc/xchat/Makefile
@@ -25,8 +25,8 @@ USE_GMAKE=	yes
 USE_GETTEXT=	yes
 USE_GNOME=	gnomehack gtk20
 GNU_CONFIGURE=	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}
 CONFIGURE_ARGS=	--enable-ipv6
 WANT_PERL=	yes
 
@@ -103,10 +103,10 @@ PLIST_SUB+=	PYTHON="@comment "
 USE_TCL=	84+
 .include "${PORTSDIR}/Mk/bsd.tcl.mk"
 CONFIGURE_ARGS+=--enable-tcl=${TCL_LIBDIR}
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS} \
-		-I${TCL_INCLUDEDIR}" \
-		LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS} \
+CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS} \
 		-L${TCL_LIBDIR}"
+CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS} \
+		-I${TCL_INCLUDEDIR}
 PLIST_SUB+=	TCL=""
 .else
 CONFIGURE_ARGS+=--enable-tcl=no
diff --git irc/xchat1/Makefile irc/xchat1/Makefile
index 4af0395..5d2bf6d 100644
--- irc/xchat1/Makefile
+++ irc/xchat1/Makefile
@@ -27,8 +27,8 @@ USE_GNOME=		gtk12
 WANT_GNOME=		yes
 GNU_CONFIGURE=		yes
 # Assign with `+=' for slave ports
-CONFIGURE_ENV+=		CPPFLAGS="-I${LOCALBASE}/include" \
-			LIBS="-L${LOCALBASE}/lib -lintl -liconv"
+CONFIGURE_ENV+=		LIBS="-L${LOCALBASE}/lib -lintl -liconv"
+CPPFLAGS+=		-I${LOCALBASE}/include
 CONFIGURE_ARGS+=	--without-included-gettext \
 			--enable-nls \
 			--enable-ipv6 \
diff --git irc/znc/Makefile irc/znc/Makefile
index bd07c05..f48e499 100644
--- irc/znc/Makefile
+++ irc/znc/Makefile
@@ -94,7 +94,7 @@ PLIST_SUB+=	PYTHON="@comment "
 .if defined(WITH_SASL)
 LIB_DEPENDS+=		sasl2.2:${PORTSDIR}/security/cyrus-sasl2
 CONFIGURE_ARGS+=	--enable-sasl
-CONFIGURE_ENV+=		LDFLAGS="-L${LOCALBASE}/lib"
+LDFLAGS+=		-L${LOCALBASE}/lib
 PLIST_SUB+=		SASL=""
 .else
 PLIST_SUB+=		SASL="@comment "
diff --git japanese/dbskkd-cdb/Makefile japanese/dbskkd-cdb/Makefile
index 1929ea7..31993a2 100644
--- japanese/dbskkd-cdb/Makefile
+++ japanese/dbskkd-cdb/Makefile
@@ -25,7 +25,7 @@ SKKDIR?=	share/skk
 SKKJISYO_TYPE?=	L
 SKKJISYOCDB?=	${LOCALBASE}/${SKKDIR}/SKK-JISYO.${SKKJISYO_TYPE}.cdb
 
-MAKE_ENV+=	LOCALBASE="${LOCALBASE}" CFLAGS="${CFLAGS}"
+MAKE_ENV+=	LOCALBASE="${LOCALBASE}"
 MAKE_ENV+=	SKKJISYOCDB="${SKKJISYOCDB}"
 .if !defined(NOPORTDOCS)
 PORTDOCS=	${PORTDOCS_FILE} ${PORTDOCS_SH}
diff --git japanese/ebview-gtk2/Makefile japanese/ebview-gtk2/Makefile
index a20d50f..862d90c 100644
--- japanese/ebview-gtk2/Makefile
+++ japanese/ebview-gtk2/Makefile
@@ -23,8 +23,8 @@ USE_GNOME=	gtk20
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--with-eb-conf=${LOCALBASE}/etc/eb.conf
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 SUB_FILES=	ebview.desktop
 
diff --git japanese/ebview/Makefile japanese/ebview/Makefile
index ab3fe81..779d28b 100644
--- japanese/ebview/Makefile
+++ japanese/ebview/Makefile
@@ -21,12 +21,11 @@ CONFLICTS=	ja-ebview-gtk2-*
 USE_GNOME=	imlib
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	autoconf
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 MAKE_ARGS=	ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \
 		AUTOHEADER="${TRUE}"
 
-CPPFLAGS=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .include <bsd.port.pre.mk>
 
diff --git japanese/emacs-emcws/Makefile japanese/emacs-emcws/Makefile
index 7eb765d..fa4f58a 100644
--- japanese/emacs-emcws/Makefile
+++ japanese/emacs-emcws/Makefile
@@ -161,7 +161,6 @@ BROKEN=		does not build
 .if ${ARCH} == "ia64"
 BROKEN=		Segfault during build on ia64
 CFLAGS:=	${CFLAGS:C/-O.?/-O0/g}
-CONFIGURE_ENV=	CFLAGS="${CFLAGS}"
 .endif
 
 pre-everything::
diff --git japanese/esecanna-module-wnn6/Makefile japanese/esecanna-module-wnn6/Makefile
index 187a19e..84af295 100644
--- japanese/esecanna-module-wnn6/Makefile
+++ japanese/esecanna-module-wnn6/Makefile
@@ -22,8 +22,8 @@ RUN_DEPENDS=	${LOCALBASE}/sbin/esecannaserver:${PORTSDIR}/japanese/esecanna
 
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-CONFIGURE_ENV=	CFLAGS="${CFLAGS} -I${PREFIX}/include/wnn6" \
-		LDFLAGS="${LDFLAGS} -L${PREFIX}/lib"
+LDFLAGS+=	-L${PREFIX}/lib
+CFLAGS+=	-I${PREFIX}/include/wnn6
 
 DIST_SUBDIR=    esecanna
 
diff --git japanese/gicq/Makefile japanese/gicq/Makefile
index b88ab7a..82131c6 100644
--- japanese/gicq/Makefile
+++ japanese/gicq/Makefile
@@ -27,7 +27,7 @@ LIB_DEPENDS=	icq.0:${PORTSDIR}/japanese/libicq
 USE_GNOME=	gtk12
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--without-gnome --disable-nls
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
 
 .include <bsd.port.mk>
diff --git japanese/gtkicq/Makefile japanese/gtkicq/Makefile
index 406ce1b..9d94c14 100644
--- japanese/gtkicq/Makefile
+++ japanese/gtkicq/Makefile
@@ -24,7 +24,7 @@ USE_GMAKE=	yes
 USE_GNOME=	gtk12
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--without-gnome --datadir=${PREFIX}/share/gtkicq
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
 
 .include <bsd.port.mk>
diff --git japanese/im-ja/Makefile japanese/im-ja/Makefile
index 24d50b7..722adb0 100644
--- japanese/im-ja/Makefile
+++ japanese/im-ja/Makefile
@@ -23,13 +23,12 @@ USE_GNOME=	gconf2 gnomehack gnomeprefix intlhack libglade2
 USE_PERL5_BUILD=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 
 MAN1=		im-ja-conf.1 im-ja-xim-server.1
 GCONF_SCHEMAS=	im-ja.schemas
 
-CPPFLAGS=	-I${LOCALBASE}/include -DNO_MALLOC_H
-LDFLAGS=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include -DNO_MALLOC_H
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .include <bsd.port.pre.mk>
 
diff --git japanese/jmode/Makefile japanese/jmode/Makefile
index e62a793..3ab22b9 100644
--- japanese/jmode/Makefile
+++ japanese/jmode/Makefile
@@ -18,8 +18,8 @@ LIB_DEPENDS?=	anthy.1:${PORTSDIR}/japanese/anthy
 
 USE_GNOME=	gtk12
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .include <bsd.port.pre.mk>
 
diff --git japanese/kasumi/Makefile japanese/kasumi/Makefile
index b2edbc2..6772c4b 100644
--- japanese/kasumi/Makefile
+++ japanese/kasumi/Makefile
@@ -20,10 +20,9 @@ USE_GNOME=	gnomehier gtk20
 LIB_DEPENDS=	anthy.1:${PORTSDIR}/japanese/anthy
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 
-CPPFLAGS=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 MAN1=		kasumi.1
 
diff --git japanese/mecab/Makefile japanese/mecab/Makefile
index de38aa5..4c2183f 100644
--- japanese/mecab/Makefile
+++ japanese/mecab/Makefile
@@ -19,8 +19,8 @@ USE_PERL5_BUILD=	5.8.0+
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 
-CONFIGURE_ENV=	CPPFLAGS="${PTHREAD_CFLAGS} -I ${LOCALBASE}/include" \
-		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
+CPPFLAGS+=	${PTHREAD_CFLAGS} -I ${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 # Default charset (euc-jp/shift_jis/utf-8)
 .if defined(WITH_CHARSET)
diff --git japanese/mutt-devel/Makefile japanese/mutt-devel/Makefile
index 951351e..aedee00 100644
--- japanese/mutt-devel/Makefile
+++ japanese/mutt-devel/Makefile
@@ -66,8 +66,7 @@ USE_AUTOTOOLS=	automake autoconf
 USE_OPENSSL=	yes
 WRKSRC=		${WRKDIR}/mutt-${VERSION}
 LDFLAGS+=	-L${LOCALBASE}/lib
-CONFIGURE_ENV=	CC="${CC} -D_DONT_USE_CTYPE_INLINE_ ${DB_CFLAGS} -I${LOCALBASE}/include -I${LOCALBASE}/include/slang" \
-		LDFLAGS="${LDFLAGS}"
+CONFIGURE_ENV=	CC="${CC} -D_DONT_USE_CTYPE_INLINE_ ${DB_CFLAGS} -I${LOCALBASE}/include -I${LOCALBASE}/include/slang"
 CONFIGURE_ARGS=	--with-slang --enable-locales-fix \
 		--with-libiconv-prefix=${LOCALBASE} \
 		--without-wc-funcs \
diff --git japanese/mutt/Makefile japanese/mutt/Makefile
index 7209d8b..36f9c52 100644
--- japanese/mutt/Makefile
+++ japanese/mutt/Makefile
@@ -38,7 +38,7 @@ USE_AUTOTOOLS=	automake autoconf
 USE_OPENSSL=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}-${VERSION}
 LDFLAGS+=	-L${LOCALBASE}/lib
-CONFIGURE_ENV=	CC="${CC} -D_DONT_USE_CTYPE_INLINE_ -I${LOCALBASE}/include -I${LOCALBASE}/include/slang" LDFLAGS="${LDFLAGS}"
+CONFIGURE_ENV=	CC="${CC} -D_DONT_USE_CTYPE_INLINE_ -I${LOCALBASE}/include -I${LOCALBASE}/include/slang"
 CONFIGURE_ARGS=	--with-slang --enable-locales-fix \
 		--with-libiconv-prefix=${LOCALBASE} \
 		--without-wc-funcs \
diff --git japanese/nethack34/Makefile japanese/nethack34/Makefile
index e1cffb8..3eb1784 100644
--- japanese/nethack34/Makefile
+++ japanese/nethack34/Makefile
@@ -43,7 +43,6 @@ GRAPHICS=	X11_GRAPHICS
 .if ${PKGNAMESUFFIX} == "-gnome"
 CATEGORIES+=	gnome
 USE_GNOME=	gnomelibs
-MAKE_ENV+=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 GRAPHICS=	GNOME_GRAPHICS
 .elif ${PKGNAMESUFFIX} == "-nox11"
 GRAPHICS=	# none
diff --git japanese/php5-mecab/Makefile japanese/php5-mecab/Makefile
index 9113d93..a3bea48 100644
--- japanese/php5-mecab/Makefile
+++ japanese/php5-mecab/Makefile
@@ -22,8 +22,8 @@ USE_PHP=	yes
 DEFAULT_PHP_VER=5
 USE_PHPEXT=	yes
 CONFIGURE_ARGS=	--with-mecab=${LOCALBASE}/bin/mecab-config
-CONFIGURE_ENV=	CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}" \
-		LIBS="${LIBS} ${PTHREAD_LIBS}"
+CONFIGURE_ENV=	LIBS="${LIBS} ${PTHREAD_LIBS}"
+CFLAGS+=	${PTHREAD_CFLAGS}
 
 .include <bsd.port.pre.mk>
 
diff --git japanese/py-zinnia/Makefile japanese/py-zinnia/Makefile
index 266ed63..03bbdc7 100644
--- japanese/py-zinnia/Makefile
+++ japanese/py-zinnia/Makefile
@@ -28,7 +28,7 @@ PYDISTUTILS_PKGVERSION=	0.0.0
 
 .include <bsd.port.pre.mk>
 
-CONFIGURE_ENV=	LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
+LDFLAGS+=	-L${LOCALBASE}/lib
 MAKE_ENV:=	${CONFIGURE_ENV}
 
 post-extract:
diff --git japanese/quit/Makefile japanese/quit/Makefile
index bb7d5ee..f1b6d4e 100644
--- japanese/quit/Makefile
+++ japanese/quit/Makefile
@@ -11,6 +11,6 @@ MAINTAINER=	nork@FreeBSD.org
 
 MASTERDIR=	${.CURDIR}/../../games/quit
 
-CPPFLAGS=	-DJAPANESE
+CPPFLAGS+=	-DJAPANESE
 
 .include "${MASTERDIR}/Makefile"
diff --git japanese/rxvt/Makefile japanese/rxvt/Makefile
index 8b04a40..3d73cd3 100644
--- japanese/rxvt/Makefile
+++ japanese/rxvt/Makefile
@@ -27,8 +27,8 @@ CONFIGURE_ARGS=	--enable-xpm-background --enable-transparency \
 		--enable-utmp --enable-wtmp \
 		--with-xpm --with-xpm-includes=${LOCALBASE}/include/X11 \
 		--with-xpm-library=${LOCALBASE}/lib
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 DOCDIR=		${PREFIX}/share/doc/ja/rxvt
 RXVTLIB=	${PREFIX}/lib/X11/rxvt
diff --git japanese/scim-anthy/Makefile japanese/scim-anthy/Makefile
index d87a05f..8c77887 100644
--- japanese/scim-anthy/Makefile
+++ japanese/scim-anthy/Makefile
@@ -26,9 +26,10 @@ USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 
 CONFIGURE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
-		PTHREAD_LIBS="${PTHREAD_LIBS}" \
-		CPPFLAGS="-I${LOCALBASE}/include -D__STDC_ISO_10646__" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+		PTHREAD_LIBS="${PTHREAD_LIBS}"
+
+CPPFLAGS+=	-I${LOCALBASE}/include -D__STDC_ISO_10646__
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 post-install:
 	@${CAT} ${PKGMESSAGE}
diff --git japanese/scim-canna/Makefile japanese/scim-canna/Makefile
index d6cf170..91d6e60 100644
--- japanese/scim-canna/Makefile
+++ japanese/scim-canna/Makefile
@@ -25,8 +25,8 @@ USE_ICONV=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 
-CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include -D__STDC_ISO_10646__" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include -D__STDC_ISO_10646__
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 post-install:
 	@${CAT} ${PKGMESSAGE}
diff --git japanese/scim-honoka-plugin-romkan/Makefile japanese/scim-honoka-plugin-romkan/Makefile
index 86d5b92..9283246 100644
--- japanese/scim-honoka-plugin-romkan/Makefile
+++ japanese/scim-honoka-plugin-romkan/Makefile
@@ -26,8 +26,9 @@ USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
 
 CONFIGURE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
-		PTHREAD_LIBS="${PTHREAD_LIBS}" \
-		CPPFLAGS="-I${LOCALBASE}/include -D__STDC_ISO_10646__" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+		PTHREAD_LIBS="${PTHREAD_LIBS}"
+
+CPPFLAGS+=	-I${LOCALBASE}/include -D__STDC_ISO_10646__
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .include <bsd.port.mk>
diff --git japanese/scim-honoka-plugin-wnn/Makefile japanese/scim-honoka-plugin-wnn/Makefile
index cb3fb5a..a844646 100644
--- japanese/scim-honoka-plugin-wnn/Makefile
+++ japanese/scim-honoka-plugin-wnn/Makefile
@@ -29,8 +29,9 @@ USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
 
 CONFIGURE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
-		PTHREAD_LIBS="${PTHREAD_LIBS}" \
-		CPPFLAGS="-I${LOCALBASE}/include -D__STDC_ISO_10646__" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+		PTHREAD_LIBS="${PTHREAD_LIBS}"
+
+CPPFLAGS+=	-I${LOCALBASE}/include -D__STDC_ISO_10646__
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .include <bsd.port.mk>
diff --git japanese/scim-honoka/Makefile japanese/scim-honoka/Makefile
index b0682cd..99393e2 100644
--- japanese/scim-honoka/Makefile
+++ japanese/scim-honoka/Makefile
@@ -26,9 +26,10 @@ USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
 
 CONFIGURE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
-		PTHREAD_LIBS="${PTHREAD_LIBS}" \
-		CPPFLAGS="-I${LOCALBASE}/include -D__STDC_ISO_10646__" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+		PTHREAD_LIBS="${PTHREAD_LIBS}"
+
+CPPFLAGS+=	-I${LOCALBASE}/include -D__STDC_ISO_10646__
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 post-install:
 	@${ECHO_CMD}
diff --git japanese/scim-prime/Makefile japanese/scim-prime/Makefile
index 9ee2e33..b31abae 100644
--- japanese/scim-prime/Makefile
+++ japanese/scim-prime/Makefile
@@ -24,8 +24,8 @@ USE_ICONV=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -D__STDC_ISO_10646__" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include -D__STDC_ISO_10646__
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 post-install:
 	@${CAT} ${PKGMESSAGE}
diff --git japanese/scim-skk/Makefile japanese/scim-skk/Makefile
index 307cce7..434fd31 100644
--- japanese/scim-skk/Makefile
+++ japanese/scim-skk/Makefile
@@ -24,9 +24,10 @@ USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 
 CONFIGURE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
-		PTHREAD_LIBS="${PTHREAD_LIBS}" \
-		CPPFLAGS="-I${LOCALBASE}/include -D__STDC_ISO_10646__" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+		PTHREAD_LIBS="${PTHREAD_LIBS}"
+
+CPPFLAGS+=	-I${LOCALBASE}/include -D__STDC_ISO_10646__
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 post-patch:
 	@${REINPLACE_CMD} "s|LOCALBASE|${LOCALBASE}|" ${WRKSRC}/src/scim_skk_prefs.h
diff --git japanese/scim-tables/Makefile japanese/scim-tables/Makefile
index 5100fc3..49de49a 100644
--- japanese/scim-tables/Makefile
+++ japanese/scim-tables/Makefile
@@ -23,9 +23,9 @@ GNU_CONFIGURE=	yes
 
 CPPFLAGS+=	-I${LOCALBASE}/include -D__STDC_ISO_10646__
 
-CONFIGURE_ENV+=	LDFLAGS="-L${LOCALBASE}/lib -lintl" \
-		SCIM_DATADIR=${PREFIX}/share/scim \
+CONFIGURE_ENV+=	SCIM_DATADIR=${PREFIX}/share/scim \
 		SCIM_ICONDIR=${PREFIX}/share/scim/icons
+LDFLAGS+=	-L${LOCALBASE}/lib -lintl
 
 CONFIGURE_ARGS+=	--disable-skim-support
 
diff --git japanese/scim-tomoe/Makefile japanese/scim-tomoe/Makefile
index 95cff36..f4c6d35 100644
--- japanese/scim-tomoe/Makefile
+++ japanese/scim-tomoe/Makefile
@@ -25,9 +25,10 @@ USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 
 CONFIGURE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
-		PTHREAD_LIBS="${PTHREAD_LIBS}" \
-		CPPFLAGS="-I${LOCALBASE}/include -D__STDC_ISO_10646__" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+		PTHREAD_LIBS="${PTHREAD_LIBS}"
+
+CPPFLAGS+=	-I${LOCALBASE}/include -D__STDC_ISO_10646__
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 PLIST_FILES=	bin/scim-tomoe \
 		lib/scim-1.0/1.4.0/Helper/tomoe.a \
diff --git japanese/scim-uim/Makefile japanese/scim-uim/Makefile
index b55ae92..be2aab1 100644
--- japanese/scim-uim/Makefile
+++ japanese/scim-uim/Makefile
@@ -26,9 +26,10 @@ USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 
 CONFIGURE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
-		PTHREAD_LIBS="${PTHREAD_LIBS}" \
-		CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+		PTHREAD_LIBS="${PTHREAD_LIBS}"
+
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 post-install:
 	@${CAT} ${PKGMESSAGE}
diff --git japanese/tcl76/Makefile japanese/tcl76/Makefile
index 56cc63e..fb366b1 100644
--- japanese/tcl76/Makefile
+++ japanese/tcl76/Makefile
@@ -21,7 +21,7 @@ WRKSRC=		${WRKDIR}/${DISTNAME}/unix
 USE_AUTOTOOLS=	autoconf213
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--enable-shared
-CONFIGURE_ENV=  PORTSDIR=${PORTSDIR}
+CONFIGURE_ENV=	PORTSDIR=${PORTSDIR}
 PKGINSTALL=	${PORTSDIR}/lang/tcl82/pkg-install.tclsh
 PKGDEINSTALL=	${PORTSDIR}/lang/tcl82/pkg-deinstall.tclsh
 
diff --git japanese/tk80/Makefile japanese/tk80/Makefile
index 5997d3c..47ebbec 100644
--- japanese/tk80/Makefile
+++ japanese/tk80/Makefile
@@ -36,8 +36,8 @@ USE_AUTOTOOLS=	autoconf213
 USE_XORG=	x11
 CONFIGURE_ARGS=	--enable-shared --with-tcl=${PREFIX}/lib/tcl${VERSION}jp \
 	--enable-xlibHack --enable-onTheSpot
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 RANLIB=		ranlib
 USE_LDCONFIG=	yes
 
diff --git japanese/tomoe/Makefile japanese/tomoe/Makefile
index 4e673be..0c82a74 100644
--- japanese/tomoe/Makefile
+++ japanese/tomoe/Makefile
@@ -106,12 +106,12 @@ CONFIGURE_ARGS+=--disable-unihan
 PLIST_SUB+=	UNIHAN="@comment "
 .endif
 
-CONFIGURE_ENV+=	CFLAGS="${CFLAGS} -I${LOCALBASE}/include \
-		-I${LOCALBASE}/include/ruby-${RUBY_VER} \
-		-I${LOCALBASE}/include/ruby-${RUBY_VER}/${RUBY_ARCH}" \
-		PYTHON_VERSION=${PYTHON_VERSION:S;python;;} \
+CONFIGURE_ENV+=	PYTHON_VERSION=${PYTHON_VERSION:S;python;;} \
 		pyexecdir=${PYTHON_SITELIBDIR} \
 		GMSGFMT="${LOCALBASE}/bin/msgfmt"
+CFLAGS+=	-I${LOCALBASE}/include \
+		-I${LOCALBASE}/include/ruby-${RUBY_VER} \
+		-I${LOCALBASE}/include/ruby-${RUBY_VER}/${RUBY_ARCH}
 
 .if defined(WITH_UNIHAN)
 post-extract:
diff --git japanese/xdvik/Makefile japanese/xdvik/Makefile
index 4dc3dbb..5c3c1c8 100644
--- japanese/xdvik/Makefile
+++ japanese/xdvik/Makefile
@@ -54,8 +54,8 @@ CONFIGURE_ENV=	INSTALL="${INSTALL}" \
 		INSTALL_SCRIPT="${INSTALL_SCRIPT}" \
 		INSTALL_DATA="${INSTALL_DATA}" \
 		INSTALL_MAN="${INSTALL_MAN}" \
-		XDEFS='-DMFMODE=\"${MF_MODE}\"' \
-		CFLAGS="${CFLAGS} -I${LOCALBASE}/include"
+		XDEFS='-DMFMODE=\"${MF_MODE}\"'
+CFLAGS+=	-I${LOCALBASE}/include
 SCRIPTS_ENV=	MV=${MV} SED=${SED}
 PATCH_STRIP=	-p1
 
diff --git java/cacao/Makefile java/cacao/Makefile
index 076b5b9..db6e0bb 100644
--- java/cacao/Makefile
+++ java/cacao/Makefile
@@ -22,8 +22,8 @@ JAVA_VERSION=	1.5+
 GNU_CONFIGURE=	yes
 MAN1=		cacao.1
 CONFIGURE_ARGS+=	--with-classpath-prefix=${LOCALBASE}
-CONFIGURE_ENV=	CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
-		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
+LDFLAGS+=	-L${LOCALBASE}/lib
+CFLAGS+=	-I${LOCALBASE}/include
 
 .include <bsd.port.pre.mk>
 
diff --git java/classpath/Makefile java/classpath/Makefile
index 47dbe75..698d169 100644
--- java/classpath/Makefile
+++ java/classpath/Makefile
@@ -25,7 +25,7 @@ USE_XORG=	x11 ice xtst xaw xproto xext
 WANT_GNOME=	yes
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CXXFLAGS="${CXXFLAGS} -I${LOCALBASE}/include"
+CXXFLAGS+=	-I${LOCALBASE}/include
 CONFIGURE_ARGS=	--enable-jni --disable-alsa --disable-dssi --disable-plugin
 USE_GMAKE=	yes
 
diff --git java/jamvm/Makefile java/jamvm/Makefile
index 4ab2068..020c5ff 100644
--- java/jamvm/Makefile
+++ java/jamvm/Makefile
@@ -27,7 +27,8 @@ OPTIONS=	FFI "use libffi to call native methods" ON \
 .if defined(WITH_FFI)
 LIB_DEPENDS+=		ffi:${PORTSDIR}/devel/libffi
 CONFIGURE_ARGS+=	--enable-ffi
-CONFIGURE_ENV+=		CFLAGS="${CFLAGS} `pkg-config libffi --cflags`" LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
+LDFLAGS+=	-L${LOCALBASE}/lib
+CFLAGS+=	`pkg-config libffi --cflags`
 .endif
 
 .if defined(WITH_ZIP)
diff --git java/jc/Makefile java/jc/Makefile
index 2f12e5e..17e8457 100644
--- java/jc/Makefile
+++ java/jc/Makefile
@@ -27,8 +27,8 @@ JAVA_BUILD=	jre
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-classpath=${LOCALBASE}
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
-		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 INFO=		jc
 ONLY_FOR_ARCHS=	i386
 
diff --git java/sablevm-classpath/Makefile java/sablevm-classpath/Makefile
index 080a0c6..5ff3cec 100644
--- java/sablevm-classpath/Makefile
+++ java/sablevm-classpath/Makefile
@@ -30,7 +30,7 @@ USE_GMAKE=	yes
 USE_LDCONFIG=	${PREFIX}/lib/${PORTNAME}
 
 PLIST_SUB+=	PORTVERSION=${PORTVERSION}
-CONFIGURE_ENV=	CFLAGS="-I${PREFIX}/include -L${PREFIX}/lib -I${LOCALBASE}/include -L${LOCALBASE}/lib"
+CFLAGS+=	-I${PREFIX}/include -L${PREFIX}/lib -I${LOCALBASE}/include -L${LOCALBASE}/lib
 
 .include <bsd.port.pre.mk>
 
diff --git java/sablevm/Makefile java/sablevm/Makefile
index 05cda4d..e5fd805 100644
--- java/sablevm/Makefile
+++ java/sablevm/Makefile
@@ -26,7 +26,8 @@ USE_LDCONFIG=	yes
 
 USE_GNOME=	pkgconfig
 PKG_CONFIG?=	${LOCALBASE}/bin/pkg-config
-CONFIGURE_ENV=	CFLAGS="-I${LOCALBASE}/include `${PKG_CONFIG} libffi --cflags`" LDFLAGS="-L${LOCALBASE}/lib"
+LDFLAGS+=	-L${LOCALBASE}/lib
+CFLAGS+=	-I${LOCALBASE}/include `${PKG_CONFIG} libffi --cflags`
 CONFIGURE_ARGS=	--includedir=${PREFIX}/include/${PORTNAME}
 
 OPTIONS=	SVMCP "Install SableVM classpath" ON \
diff --git korean/ami/Makefile korean/ami/Makefile
index 05f6fd6..f2af6dd 100644
--- korean/ami/Makefile
+++ korean/ami/Makefile
@@ -27,8 +27,8 @@ GNU_CONFIGURE=	yes
 
 .if !defined(WITHOUT_NLS)
 USE_GETTEXT=	yes
-CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib"
-CPPFLAGS+=	"-I${LOCALBASE}/include"
+LDFLAGS+=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
 PLIST_SUB+=	NLS=""
 .else
 CONFIGURE_ARGS+=--disable-nls
diff --git korean/hanterm-xf86/Makefile korean/hanterm-xf86/Makefile
index 5e0222a..f73ae67 100644
--- korean/hanterm-xf86/Makefile
+++ korean/hanterm-xf86/Makefile
@@ -24,8 +24,8 @@ USE_ICONV=	yes
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--enable-boxchar --enable-ansi-color \
 			--enable-256-color --enable-chat --enable-now-chat
-CONFIGURE_ENV+=		LIBS="${LDFLAGS} -L${LOCALBASE}/lib -liconv" \
-			CFLAGS="${CFLAGS} -I${LOCALBASE}/include"
+CONFIGURE_ENV+=		LIBS="${LDFLAGS} -L${LOCALBASE}/lib -liconv"
+CFLAGS+=	-I${LOCALBASE}/include
 MAKE_ENV+=		INSTALL_SCRIPT="${INSTALL_SCRIPT}"
 MAN1=		hanterm.1
 
diff --git korean/ibus-hangul/Makefile korean/ibus-hangul/Makefile
index ea70174..fab7db5 100644
--- korean/ibus-hangul/Makefile
+++ korean/ibus-hangul/Makefile
@@ -28,8 +28,8 @@ USE_PYTHON=	yes
 
 .if !defined(WITHOUT_NLS)
 USE_GETTEXT=	yes
-CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib"
-CPPFLAGS+=	"-I${LOCALBASE}/include"
+LDFLAGS+=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
 PLIST_SUB+=	NLS=""
 .else
 CONFIGURE_ARGS+=--disable-nls
diff --git korean/imhangul/Makefile korean/imhangul/Makefile
index eb85e47..585d5d8 100644
--- korean/imhangul/Makefile
+++ korean/imhangul/Makefile
@@ -25,8 +25,8 @@ GNU_CONFIGURE=	yes
 
 .if !defined(WITHOUT_NLS)
 USE_GETTEXT=	yes
-CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib"
-CPPFLAGS+=	"-I${LOCALBASE}/include"
+LDFLAGS+=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
 PLIST_SUB+=	NLS=""
 .else
 PLIST_SUB+=	NLS="@comment "
diff --git korean/libhangul/Makefile korean/libhangul/Makefile
index d158eaf..5e140a3 100644
--- korean/libhangul/Makefile
+++ korean/libhangul/Makefile
@@ -21,8 +21,8 @@ GNU_CONFIGURE=	yes
 
 .if !defined(WITHOUT_NLS)
 USE_GETTEXT=	yes
-CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib"
-CPPFLAGS+=	"-I${LOCALBASE}/include"
+LDFLAGS+=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
 PLIST_SUB+=	NLS=""
 .else
 CONFIGURE_ARGS+=--disable-nls
diff --git korean/nabi/Makefile korean/nabi/Makefile
index 7ba7980..5a7eeab 100644
--- korean/nabi/Makefile
+++ korean/nabi/Makefile
@@ -23,8 +23,8 @@ GNU_CONFIGURE=	yes
 
 .if !defined(WITHOUT_NLS)
 USE_GETTEXT=	yes
-CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib"
-CPPFLAGS+=	"-I${LOCALBASE}/include"
+LDFLAGS+=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
 PLIST_SUB+=	NLS=""
 .else
 PLIST_SUB+=	NLS="@comment "
diff --git korean/scim-hangul/Makefile korean/scim-hangul/Makefile
index fd3a652..d1beacd 100644
--- korean/scim-hangul/Makefile
+++ korean/scim-hangul/Makefile
@@ -23,8 +23,8 @@ GNU_CONFIGURE=	yes
 
 .if !defined(WITHOUT_NLS)
 USE_GETTEXT=	yes
-CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib"
-CPPFLAGS+=	"-I${LOCALBASE}/include"
+LDFLAGS+=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
 PLIST_SUB+=	NLS=""
 .else
 CONFIGURE_ARGS+=--disable-nls
diff --git lang/clisp/Makefile lang/clisp/Makefile
index a4f7dba..d68db52 100644
--- lang/clisp/Makefile
+++ lang/clisp/Makefile
@@ -29,14 +29,13 @@ HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	--prefix="${PREFIX}" --mandir="${MANPREFIX}/man" \
 		--elispdir="${DATADIR}/emacs" --vimdir="${DATADIR}/vim" \
 		--docdir="${DOCSDIR}"
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_TARGET=	${ARCH:S/amd64/x86_64/}-portbld-freebsd${OSREL}
 # Complaints if the environment changes between build stages.
 MAKE_ENV=	${CONFIGURE_ENV}
 BUILD_WRKSRC=	${WRKSRC}/src
 INSTALL_WRKSRC=	${BUILD_WRKSRC}
-CPPFLAGS=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 MAKE_JOBS_UNSAFE=yes
 
 OPTIONS=	BDB "Build Berkeley Database module" Off \
diff --git lang/ecl/Makefile lang/ecl/Makefile
index 7373e51..6269b08 100644
--- lang/ecl/Makefile
+++ lang/ecl/Makefile
@@ -20,9 +20,8 @@ USE_GMAKE=	yes
 USE_PERL5_BUILD=yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-system-gmp --enable-boehm=system
-CONFIGURE_ENV+=	CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
 CFLAGS=		-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
+LDFLAGS+=	-L${LOCALBASE}/lib
 USE_LDCONFIG=	yes
 
 OPTIONS=	ASDF "Enable ASDF building facility" on \
diff --git lang/elk/Makefile lang/elk/Makefile
index 0d04da6..6463dd5 100644
--- lang/elk/Makefile
+++ lang/elk/Makefile
@@ -20,14 +20,13 @@ LIB_DEPENDS=	gdbm.4:${PORTSDIR}/databases/gdbm \
 USE_BZIP2=	yes
 USE_MOTIF=	yes
 USE_AUTOTOOLS=	libtool
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 USE_LDCONFIG=	yes
 MAKE_JOBS_UNSAFE=	yes
 
 MAN1=		elk.1
 
-CPPFLAGS=	-I${LOCALBASE}/include/libelf -I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include/libelf -I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .include <bsd.port.pre.mk>
 
diff --git lang/erlang/Makefile lang/erlang/Makefile
index d5abaaf..9598d8f 100644
--- lang/erlang/Makefile
+++ lang/erlang/Makefile
@@ -113,7 +113,6 @@ CONFIGURE_ARGS+=--enable-threads --enable-dynamic-ssl-lib --enable-sctp
 
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
-CONFIGURE_ENV+=	CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
 PLIST_SUB+=	ERTS_VSN=${ERTS_VSN} TOOLS_VSN=${TOOLS_VSN}
 
 .if ${ARCH} == i386
diff --git lang/ferite/Makefile lang/ferite/Makefile
index 1e5fd7d..70d055d 100644
--- lang/ferite/Makefile
+++ lang/ferite/Makefile
@@ -20,8 +20,8 @@ LIB_DEPENDS=	pcre.0:${PORTSDIR}/devel/pcre \
 USE_AUTOTOOLS=	libtool
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
-		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 USE_LDCONFIG=	yes
 PLIST_SUB=	MACHINE_ARCH=${MACHINE_ARCH}
 
diff --git lang/gambas2-base/Makefile lang/gambas2-base/Makefile
index 3824226..be861da 100644
--- lang/gambas2-base/Makefile
+++ lang/gambas2-base/Makefile
@@ -25,7 +25,6 @@ GNU_CONFIGURE=		yes
 USE_LDCONFIG=		yes
 CPPFLAGS+=		-I${LOCALBASE}/include ${PTHREAD_LIBS}
 LDFLAGS+=		-L${LOCALBASE}/lib
-CONFIGURE_ENV=		CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=		--disable-debug \
 			--disable-optimization \
 			--disable-preloading \
diff --git lang/gcl/Makefile lang/gcl/Makefile
index 295d223..472b112 100644
--- lang/gcl/Makefile
+++ lang/gcl/Makefile
@@ -35,7 +35,8 @@ CONFIGURE_ARGS=--prefix=${PREFIX} \
 	--disable-statsysbfd \
 	--disable-locbfd \
 	--enable-custreloc
-CONFIGURE_ENV=	CFLAGS="${CFLAGS} -I${LOCALBASE}/include" C_INCLUDE_PATH=${PREFIX}/include LIBRARY_PATH=${PREFIX}/lib
+CONFIGURE_ENV=	C_INCLUDE_PATH=${PREFIX}/include LIBRARY_PATH=${PREFIX}/lib
+CFLAGS+=	-I${LOCALBASE}/include
 MAKEFILE=	makefile
 
 INFO=	gcl-si gcl-tk
diff --git lang/gforth/Makefile lang/gforth/Makefile
index 9017ca3..aaa829c 100644
--- lang/gforth/Makefile
+++ lang/gforth/Makefile
@@ -16,9 +16,9 @@ MAINTAINER=	stas@FreeBSD.org
 COMMENT=	Fast and portable Forth system
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
-		CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
-		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
+CFLAGS+=	-I${LOCALBASE}/include
 USE_GMAKE=	yes
 ALL_TARGET=	all info
 USE_EMACS=	yes
diff --git lang/ghc/Makefile lang/ghc/Makefile
index 0176dda..11069d7 100644
--- lang/ghc/Makefile
+++ lang/ghc/Makefile
@@ -114,7 +114,7 @@ CONFIGURE_ARGS+=	--with-ghc=${BOOT_GHC} --with-gcc=${CC} \
 			--with-iconv-libraries=${LOCALBASE}/lib
 
 # libgmp:
-CONFIGURE_ENV+=	LDFLAGS=-L${LOCALBASE}/lib
+LDFLAGS+=	-L${LOCALBASE}/lib
 CFLAGS+=	-I${LOCALBASE}/include
 
 # override TMPDIR because /tmp often doesn't have enough space
diff --git lang/gjs/Makefile lang/gjs/Makefile
index d5b5db3..8991567 100644
--- lang/gjs/Makefile
+++ lang/gjs/Makefile
@@ -26,8 +26,8 @@ USE_PYTHON=	build
 USE_AUTOTOOLS=	libtool
 USE_GNOME=	gnomeprefix gnomehack intlhack glib20 ltverhack
 USE_LDCONFIG=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .include <bsd.port.pre.mk>
 
diff --git lang/intercal/Makefile lang/intercal/Makefile
index 0ad85d9..3f4ccd3 100644
--- lang/intercal/Makefile
+++ lang/intercal/Makefile
@@ -16,7 +16,7 @@ COMMENT=	The C-INTERCAL compiler, ick, and supporting libraries
 
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-CONFIGURE_ENV=	CFLAGS="${CFLAGS} -D_POSIX_SOURCE"
+CFLAGS+=	-D_POSIX_SOURCE
 
 post-patch:
 #
diff --git lang/klogoturtle/Makefile lang/klogoturtle/Makefile
index 97b71ed..4b42b93 100644
--- lang/klogoturtle/Makefile
+++ lang/klogoturtle/Makefile
@@ -15,7 +15,7 @@ COMMENT=	LOGO Interpreter for the KDE Desktop
 
 USE_KDELIBS_VER=3
 USE_AUTOTOOLS=	libtool
-CONFIGURE_ENV=	LDFLAGS="${PTHREAD_LIBS}"
+LDFLAGS+=	${PTHREAD_LIBS}
 
 post-patch:
 	@${REINPLACE_CMD} -e 's/-O2//g; s/-lpthread/${PTHREAD_LIBS}/g' \
diff --git lang/libhx/Makefile lang/libhx/Makefile
index 520a4de..819548b 100644
--- lang/libhx/Makefile
+++ lang/libhx/Makefile
@@ -13,8 +13,8 @@ MASTER_SITES=	SF/${PORTNAME:L}/${PORTNAME}/${PORTVERSION}
 MAINTAINER=	sylvio@FreeBSD.org
 COMMENT=	Library C with some additional C++ bindings available
 
-CPPFLAGS=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 USE_XZ=		yes
 USE_LDCONFIG=	yes
diff --git lang/librep/Makefile lang/librep/Makefile
index ef0b9c5..0cd9dcd 100644
--- lang/librep/Makefile
+++ lang/librep/Makefile
@@ -26,7 +26,6 @@ USE_GNOME=	gnomehack
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
-CONFIGURE_ENV=	LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--with-aclocaldir=${PREFIX}/share/aclocal \
 		--with-stack-direction=-1
 USE_LDCONFIG=	yes
@@ -35,8 +34,8 @@ MANCOMPRESSED=	yes
 MAN1=		rep.1 rep-remote.1 rep-xgettext.1 repdoc.1
 INFO=		librep
 
-CPPFLAGS=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
+CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 
 .include <bsd.port.pre.mk>
 
diff --git lang/lush/Makefile lang/lush/Makefile
index f5ca70f..3b2732e 100644
--- lang/lush/Makefile
+++ lang/lush/Makefile
@@ -21,8 +21,8 @@ GNU_CONFIGURE=	yes
 
 WRKSRC=		${WRKDIR}/lush
 
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
-		LIBS="${LIBS} ${PTHREAD_LIBS} -lintl -L${LOCALBASE}/lib"
+CONFIGURE_ENV=	LIBS="${LIBS} ${PTHREAD_LIBS} -lintl -L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
 
 CONFIGURE_ARGS=	--without-bfd
 
diff --git lang/maude/Makefile lang/maude/Makefile
index a93d3d3..0ee312a 100644
--- lang/maude/Makefile
+++ lang/maude/Makefile
@@ -21,7 +21,8 @@ LIB_DEPENDS=	bdd:${PORTSDIR}/science/buddy \
 
 USE_BISON=	build
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--datadir=${DATADIR}
 
 post-patch:
diff --git lang/mdk/Makefile lang/mdk/Makefile
index 011bee4..ff6ba2c 100644
--- lang/mdk/Makefile
+++ lang/mdk/Makefile
@@ -22,7 +22,8 @@ LIB_DEPENDS=	guile.21:${PORTSDIR}/lang/guile \
 USE_GNOME=	libglade2
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-nls
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 INFO=		mdk
 
diff --git lang/moscow_ml/Makefile lang/moscow_ml/Makefile
index 6298171..a135e86 100644
--- lang/moscow_ml/Makefile
+++ lang/moscow_ml/Makefile
@@ -25,8 +25,9 @@ ALL_TARGET=	world MOSMLHOME=${MOSMLHOME}
 INSTALL_TARGET=	install MOSMLHOME=${MOSMLHOME}
 WRKSRC=		${WRKDIR}/mosml/src
 USE_PERL5=	yes
-MAKE_ENV+=	LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" DOCSDIR="${DOCSDIR}" \
+MAKE_ENV+=	DOCSDIR="${DOCSDIR}" \
 		LD_RUN_PATH="${PREFIX}/lib/mosml"
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 PKGMESSAGE=	${WRKDIR}/pkgmessage
 
diff --git lang/nickle/Makefile lang/nickle/Makefile
index 8603476..a1555ac 100644
--- lang/nickle/Makefile
+++ lang/nickle/Makefile
@@ -18,7 +18,7 @@ GNU_CONFIGURE=	yes
 
 # Nickle now has bindings which are likely to pull in libraries that need
 # libpthread.  Link to it now, since it wouldn't work at runtime.
-CONFIGURE_ENV=	LDFLAGS="${PTHREAD_LIBS}"
+LDFLAGS+=	${PTHREAD_LIBS}
 
 MAN1=		nickle.1
 
diff --git lang/ofc/Makefile lang/ofc/Makefile
index 288587d..5574813 100644
--- lang/ofc/Makefile
+++ lang/ofc/Makefile
@@ -24,8 +24,8 @@ USE_AUTOTOOLS=	libtool
 USE_GNOME=	gnomehack
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
-		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 
 OPTIONS=	GDBM "Add gdbm support" off \
 		GMP "Add gmp support" off
diff --git lang/oo2c/Makefile lang/oo2c/Makefile
index 9803807..614b53e 100644
--- lang/oo2c/Makefile
+++ lang/oo2c/Makefile
@@ -22,8 +22,8 @@ USE_AUTOTOOLS=	libtool
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -DGC_PTR='void*'" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include -DGC_PTR='void*'
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 MAN1=		oo2c.1 oob.1 ooef.1 oowhereis.1
 
diff --git lang/open-cobol-devel/Makefile lang/open-cobol-devel/Makefile
index 14441dc..50d734f 100644
--- lang/open-cobol-devel/Makefile
+++ lang/open-cobol-devel/Makefile
@@ -21,13 +21,12 @@ LATEST_LINK=	open-cobol-devel
 USE_BDB=	yes
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 USE_LDCONFIG=	yes
 
 INFO=		open-cobol
 
-CPPFLAGS=	-I${BDB_INCLUDE_DIR} -I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${BDB_INCLUDE_DIR} -I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .if defined(WITHOUT_NLS)
 CONFIGURE_ARGS+=	--disable-nls
diff --git lang/open-cobol/Makefile lang/open-cobol/Makefile
index daca134..a06bf6b 100644
--- lang/open-cobol/Makefile
+++ lang/open-cobol/Makefile
@@ -22,13 +22,12 @@ CONFLICTS=	open-cobol-1.[1]*
 USE_BDB=	yes
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 USE_LDCONFIG=	yes
 
 INFO=		open-cobol
 
-CPPFLAGS=	-I${BDB_INCLUDE_DIR} -I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${BDB_INCLUDE_DIR} -I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .if defined(WITHOUT_NLS)
 CONFIGURE_ARGS+=	--disable-nls
diff --git lang/php52/Makefile lang/php52/Makefile
index 8023294..e2144b7 100644
--- lang/php52/Makefile
+++ lang/php52/Makefile
@@ -170,10 +170,8 @@ CONFIGURE_ENV+=	ac_cv_pthreads_lib="" \
 		pthreads_working="yes" \
 		lt_cv_path_SED="sed"
 
-MAKE_ENV+=	LDFLAGS="${LDFLAGS}"
-
 .if defined(WITH_LINKTHR)
-CONFIGURE_ENV+=        LIBS="${LIBS} ${PTHREAD_LIBS}"
+CONFIGURE_ENV+=	LIBS="${LIBS} ${PTHREAD_LIBS}"
 .endif
 
 .if defined(WITH_DEBUG)
diff --git lang/pike76/Makefile lang/pike76/Makefile
index e8f5279..6eb92db 100644
--- lang/pike76/Makefile
+++ lang/pike76/Makefile
@@ -49,7 +49,6 @@ MAN1=		pike.1
 WANT_MESA=	yes
 
 CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-CONFIGURE_ENV=	CPPFLAGS=${CPPFLAGS}
 CONFIGURE_ARGS+=	--without-debug \
 		 --with-thread-library=${PTHREAD_LIBS} \
 		 --with-double-precision \
diff --git lang/pike76/files/patch-Makefile lang/pike76/files/patch-Makefile
new file mode 100644
index 0000000..4b0aae9
--- /dev/null
+++ lang/pike76/files/patch-Makefile
@@ -0,0 +1,11 @@
+--- Makefile.orig	2007-04-18 21:19:27.000000000 +0400
++++ Makefile	2011-09-15 15:14:33.000000000 +0400
+@@ -4,6 +4,8 @@
+ # Meta Makefile
+ #
+ 
++unexport LDFLAGS
++
+ VPATH=.
+ OS=`uname -s -r -m|sed \"s/ /-/g\"|tr \"[A-Z]\" \"[a-z]\"|tr \"/()\" \"___\"`
+ BUILDDIR=build/$(OS)
diff --git lang/python24/Makefile lang/python24/Makefile
index 628d1fd..0406486 100644
--- lang/python24/Makefile
+++ lang/python24/Makefile
@@ -69,12 +69,9 @@ CFLAGS+=		-DTHREAD_STACK_SIZE=0x20000
 .else
 CFLAGS+=		-DTHREAD_STACK_SIZE=0x100000
 .endif # defined(WITHOUT_HUGE_STACK_SIZE)
-CONFIGURE_ENV+=		LDFLAGS="${PTHREAD_LIBS} ${LDFLAGS}"
+LDFLAGS+=		${PTHREAD_LIBS}
 .else
 CONFIGURE_ARGS+=	--without-threads
-.if defined(LDFLAGS)
-CONFIGURE_ENV+=		LDFLAGS="${LDFLAGS}"
-.endif # defined(LDFLAGS)
 .endif # !defined(WITHOUT_THREADS)
 
 .if !defined(WITHOUT_UCS4) && !defined(WITH_UCS2)
diff --git lang/python25/Makefile lang/python25/Makefile
index b8b56a5..d899c23 100644
--- lang/python25/Makefile
+++ lang/python25/Makefile
@@ -73,12 +73,9 @@ CFLAGS+=		-DTHREAD_STACK_SIZE=0x20000
 .else
 CFLAGS+=		-DTHREAD_STACK_SIZE=0x100000
 .endif # defined(WITHOUT_HUGE_STACK_SIZE)
-CONFIGURE_ENV+=		LDFLAGS="${PTHREAD_LIBS} ${LDFLAGS}"
+LDFLAGS+=		${PTHREAD_LIBS}
 .else
 CONFIGURE_ARGS+=	--without-threads
-.if defined(LDFLAGS)
-CONFIGURE_ENV+=		LDFLAGS="${LDFLAGS}"
-.endif # defined(LDFLAGS)
 .endif # !defined(WITHOUT_THREADS)
 
 .if !defined(WITHOUT_UCS4) && !defined(WITH_UCS2)
diff --git lang/python26/Makefile lang/python26/Makefile
index 8f1e32e..8430bd0 100644
--- lang/python26/Makefile
+++ lang/python26/Makefile
@@ -89,12 +89,12 @@ EXTRA_PATCHES+=		${PATCHDIR}/extra-patch-configure-pth
 LIB_DEPENDS+=		pth:${PORTSDIR}/devel/pth
 _PTH_CPPFLAGS=		"-I${LOCALBASE}/include/pth"
 _PTH_LDFLAGS=		"-L${LOCALBASE}/lib/pth"
-CONFIGURE_ENV+=		CPPFLAGS="${_PTH_CPPFLAGS} ${CPPFLAGS}"
-CONFIGURE_ENV+=		LDFLAGS="${_PTH_LDFLAGS} ${LDFLAGS}"
+CPPFLAGS+=		${_PTH_CPPFLAGS}
+LDFLAGS+=		${_PTH_LDFLAGS}
 .else # !defined(WITH_PTH)
 CONFIGURE_ARGS+=	--with-threads
 CFLAGS+=		${PTHREAD_CFLAGS}
-CONFIGURE_ENV+=		LDFLAGS="${PTHREAD_LIBS} ${LDFLAGS}"
+LDFLAGS+=		${PTHREAD_LIBS}
 .endif # defined(WITH_PTH)
 .if defined(WITHOUT_HUGE_STACK_SIZE)
 CFLAGS+=		-DTHREAD_STACK_SIZE=0x20000
@@ -104,9 +104,6 @@ CFLAGS+=		-DTHREAD_STACK_SIZE=0x100000
 .else # defined(WITHOUT_THREADS)
 PLIST_SUB+=	THREADS="@comment "
 CONFIGURE_ARGS+=	--without-threads
-.if defined(LDFLAGS)
-CONFIGURE_ENV+=		LDFLAGS="${LDFLAGS}"
-.endif # defined(LDFLAGS)
 .endif # !defined(WITHOUT_THREADS)
 
 .if !defined(WITHOUT_UCS4) && !defined(WITH_UCS2)
diff --git lang/python27/Makefile lang/python27/Makefile
index d8ee01c..7ad4ba0 100644
--- lang/python27/Makefile
+++ lang/python27/Makefile
@@ -91,12 +91,12 @@ EXTRA_PATCHES+=		${PATCHDIR}/extra-patch-configure-pth
 LIB_DEPENDS+=		pth:${PORTSDIR}/devel/pth
 _PTH_CPPFLAGS=		"-I${LOCALBASE}/include/pth"
 _PTH_LDFLAGS=		"-L${LOCALBASE}/lib/pth"
-CONFIGURE_ENV+=		CPPFLAGS="${_PTH_CPPFLAGS} ${CPPFLAGS}"
-CONFIGURE_ENV+=		LDFLAGS="${_PTH_LDFLAGS} ${LDFLAGS}"
+CPPFLAGS:=		${_PTH_CPPFLAGS} ${CPPFLAGS}
+LDFLAGS+=		${_PTH_LDFLAGS}
 .else # !defined(WITH_PTH)
 CONFIGURE_ARGS+=	--with-threads
 CFLAGS+=		${PTHREAD_CFLAGS}
-CONFIGURE_ENV+=		LDFLAGS="${PTHREAD_LIBS} ${LDFLAGS}"
+LDFLAGS+=		${PTHREAD_LIBS}
 .endif # defined(WITH_PTH)
 .if defined(WITHOUT_HUGE_STACK_SIZE)
 CFLAGS+=		-DTHREAD_STACK_SIZE=0x20000
@@ -106,9 +106,6 @@ CFLAGS+=		-DTHREAD_STACK_SIZE=0x100000
 .else # defined(WITHOUT_THREADS)
 PLIST_SUB+=	THREADS="@comment "
 CONFIGURE_ARGS+=	--without-threads
-.if defined(LDFLAGS)
-CONFIGURE_ENV+=		LDFLAGS="${LDFLAGS}"
-.endif # defined(LDFLAGS)
 .endif # !defined(WITHOUT_THREADS)
 
 .if !defined(WITHOUT_UCS4) && !defined(WITH_UCS2)
@@ -130,7 +127,7 @@ PLIST_SUB+=	32BIT_ONLY="@comment "
 PLIST_SUB+=	32BIT_ONLY=""
 .endif
 .if ${ARCH} == powerpc64
-MAKE_ENV+= UNAME_m="powerpc64"
+MAKE_ENV+=	UNAME_m="powerpc64"
 .endif
 .if ${ARCH} == sparc64
 CFLAGS+=	-DPYTHON_DEFAULT_RECURSION_LIMIT=900
diff --git lang/python31/Makefile lang/python31/Makefile
index 0650170..83f2b8f 100644
--- lang/python31/Makefile
+++ lang/python31/Makefile
@@ -75,13 +75,10 @@ CFLAGS+=		-DTHREAD_STACK_SIZE=0x20000
 .else
 CFLAGS+=		-DTHREAD_STACK_SIZE=0x100000
 .endif # defined(WITHOUT_HUGE_STACK_SIZE)
-CONFIGURE_ENV+=		LDFLAGS="${PTHREAD_LIBS} ${LDFLAGS}"
+LDFLAGS+=		${PTHREAD_LIBS}
 .else # defined(WITHOUT_THREADS)
 PLIST_SUB+=	THREADS="@comment "
 CONFIGURE_ARGS+=	--without-threads
-.if defined(LDFLAGS)
-CONFIGURE_ENV+=		LDFLAGS="${LDFLAGS}"
-.endif # defined(LDFLAGS)
 .endif # !defined(WITHOUT_THREADS)
 
 .if !defined(WITHOUT_UCS4) && !defined(WITH_UCS2)
diff --git lang/python32/Makefile lang/python32/Makefile
index fa283d2..c47336d 100644
--- lang/python32/Makefile
+++ lang/python32/Makefile
@@ -76,13 +76,10 @@ CFLAGS+=		-DTHREAD_STACK_SIZE=0x20000
 .else
 CFLAGS+=		-DTHREAD_STACK_SIZE=0x100000
 .endif # defined(WITHOUT_HUGE_STACK_SIZE)
-CONFIGURE_ENV+=		LDFLAGS="${PTHREAD_LIBS} ${LDFLAGS}"
+LDFLAGS+=		${PTHREAD_LIBS}
 .else # defined(WITHOUT_THREADS)
 PLIST_SUB+=	THREADS="@comment "
 CONFIGURE_ARGS+=	--without-threads
-.if defined(LDFLAGS)
-CONFIGURE_ENV+=		LDFLAGS="${LDFLAGS}"
-.endif # defined(LDFLAGS)
 .endif # !defined(WITHOUT_THREADS)
 
 .if !defined(WITHOUT_UCS4) && !defined(WITH_UCS2)
diff --git lang/racket/Makefile lang/racket/Makefile
index d7dfb22..2444c54 100644
--- lang/racket/Makefile
+++ lang/racket/Makefile
@@ -48,8 +48,6 @@ BUILD_DEPENDS+=	${LOCALBASE}/bin/cjpeg:${PORTSDIR}/graphics/jpeg			\
 		${LOCALBASE}/libdata/pkgconfig/pango.pc:${PORTSDIR}/x11-toolkits/pango
 .endif
 
-CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS}" CPPFLAGS="${CPPFLAGS}"
-
 # Force the "configure" script to look in $LOCALBASE for -lpng and -ljpeg
 LDFLAGS+=	-L${LOCALBASE}/lib
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git lang/rexx-imc/Makefile lang/rexx-imc/Makefile
index 007fc67..f332578 100644
--- lang/rexx-imc/Makefile
+++ lang/rexx-imc/Makefile
@@ -19,8 +19,7 @@ CONFLICTS=	rexx-regina-* oorexx-[0-9]*
 
 HAS_CONFIGURE=		yes
 CONFIGURE_SCRIPT=	Make
-CONFIGURE_ENV=		CFLAGS="${CFLAGS}" \
-			PREFIX="${PREFIX}"
+CONFIGURE_ENV=		PREFIX="${PREFIX}"
 CONFIGURE_ARGS=		o all
 
 # configures and builds in one step
diff --git lang/runawk/Makefile lang/runawk/Makefile
index b556d68..7acce93 100644
--- lang/runawk/Makefile
+++ lang/runawk/Makefile
@@ -15,8 +15,9 @@ COMMENT=	Wrapper for AWK interpreter that implements a modules system
 
 BUILD_DEPENDS=	mk-configure>=0.21.0:${PORTSDIR}/devel/mk-configure
 
-MAKE_ENV+=	LDFLAGS="-L${LOCALBASE}/lib -Wl,-rpath -Wl,${LOCALBASE}/lib" \
-		CPPFLAGS="-I${LOCALBASE}/include" SUBPRJ_DFLT="${SUBPRJ_DFLT}"
+MAKE_ENV+=	SUBPRJ_DFLT="${SUBPRJ_DFLT}"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib -Wl,-rpath -Wl,${LOCALBASE}/lib
 
 MAN1=		${PORTNAME}.1 alt_getopt.1
 
diff --git lang/scsh/Makefile lang/scsh/Makefile
index 9d894f2..832a6f7 100644
--- lang/scsh/Makefile
+++ lang/scsh/Makefile
@@ -16,7 +16,7 @@ COMMENT=	A Unix shell embedded into Scheme, with access to all Posix calls
 
 CONFLICTS=	scheme48-[0-9]*
 
-CONFIGURE_ENV+=	LDFLAGS="-Wl,-E"
+LDFLAGS+=	-Wl,-E
 
 .include <bsd.port.pre.mk>
 
diff --git lang/sdcc-devel/Makefile lang/sdcc-devel/Makefile
index d8b5ed4..0a753be 100644
--- lang/sdcc-devel/Makefile
+++ lang/sdcc-devel/Makefile
@@ -36,7 +36,6 @@ OPTIONS=	MCS51   "Intel 8051 port" on \
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
-CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--docdir=${DOCSDIR}
 
 .include <bsd.port.pre.mk>
diff --git lang/sdcc/Makefile lang/sdcc/Makefile
index 744202e..0eda26a 100644
--- lang/sdcc/Makefile
+++ lang/sdcc/Makefile
@@ -34,7 +34,6 @@ OPTIONS=	MCS51   "Intel 8051 port" on \
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
-CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--docdir=${DOCSDIR}
 
 .include <bsd.port.pre.mk>
diff --git lang/see-devel/Makefile lang/see-devel/Makefile
index 0645153..8b970f6 100644
--- lang/see-devel/Makefile
+++ lang/see-devel/Makefile
@@ -28,8 +28,8 @@ USE_LDCONFIG=	yes
 USE_PERL5_BUILD=yes
 GNU_CONFIGURE=	yes
 
-CONFIGURE_ENV=	LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib ${PTHREAD_LIBS}" \
-		CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include ${PTHREAD_CFLAGS}"
+CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 
 .include <bsd.port.pre.mk>
 
diff --git lang/see/Makefile lang/see/Makefile
index 369941d..bf0a50f 100644
--- lang/see/Makefile
+++ lang/see/Makefile
@@ -29,8 +29,8 @@ USE_LDCONFIG=	yes
 USE_PERL5_BUILD=yes
 GNU_CONFIGURE=	yes
 
-CONFIGURE_ENV=	LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib ${PTHREAD_LIBS}" \
-		CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include ${PTHREAD_CFLAGS}"
+CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 
 .include <bsd.port.pre.mk>
 
diff --git lang/smalltalk/Makefile lang/smalltalk/Makefile
index d047dbe..90bd2ff 100644
--- lang/smalltalk/Makefile
+++ lang/smalltalk/Makefile
@@ -32,8 +32,7 @@ USE_SQLITE=	yes
 USE_GMAKE=	yes
 USE_GL=		gl glut
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	LDFLAGS="${LDFLAGS}" \
-		ac_cv_prog_EMACS=no
+CONFIGURE_ENV=	ac_cv_prog_EMACS=no
 CONFIGURE_ARGS=	--enable-generational-gc=no \
 		--enable-gtk=no \
 		--with-emacs=no \
@@ -51,8 +50,8 @@ MAN1=		gst.1 gst-load.1 gst-package.1 gst-sunit.1 gst-config.1 \
 MLINKS=		gst-load.1 gst-reload.1
 INFO=		gst gst-base gst-libs
 
-CPPFLAGS=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .include <bsd.port.pre.mk>
 
diff --git lang/stklos/Makefile lang/stklos/Makefile
index 09de334..07011c9 100644
--- lang/stklos/Makefile
+++ lang/stklos/Makefile
@@ -22,7 +22,8 @@ LIB_DEPENDS=	gmp.10:${PORTSDIR}/math/gmp \
 ONLY_FOR_ARCHS=	i386 amd64
 
 USE_GMAKE=	yes
-CONFIGURE_ENV=	CPPFLAGS=-I${LOCALBASE}/include LDFLAGS=-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 PLIST_SUB=	VERSION="${PORTVERSION}"
 
 GNU_CONFIGURE=	yes
diff --git lang/swi-pl/Makefile lang/swi-pl/Makefile
index 4a56ccf..f712d9c 100644
--- lang/swi-pl/Makefile
+++ lang/swi-pl/Makefile
@@ -38,7 +38,7 @@ NOPRECIOUSMAKEVARS=	yes
 USE_GMAKE=	yes
 MAKE_JOBS_UNSAFE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	LDFLAGS="${LDFLAGS}" ARCH=${ARCH}-${OPSYS:L}
+CONFIGURE_ENV=	ARCH=${ARCH}-${OPSYS:L}
 CONFIGURE_TARGET=	${ARCH}-${OPSYS:L}
 CONFIGURE_ARGS=	--with-world --without-jpl
 
diff --git lang/tclX/Makefile lang/tclX/Makefile
index 7eff9c5..ba01811 100644
--- lang/tclX/Makefile
+++ lang/tclX/Makefile
@@ -20,8 +20,8 @@ USE_TCL=	83+
 
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV+=	CPPFLAGS="-I${TCL_INCLUDEDIR}/unix\
-		-I${TCL_INCLUDEDIR}/generic"
+CPPFLAGS+=	-I${TCL_INCLUDEDIR}/unix\
+		-I${TCL_INCLUDEDIR}/generic
 CONFIGURE_ARGS=	--enable-shared \
 		--with-help=Help \
 		--with-tcl="${TCL_LIBDIR}"
diff --git lang/vala/Makefile lang/vala/Makefile
index 6c77854..f899439 100644
--- lang/vala/Makefile
+++ lang/vala/Makefile
@@ -20,7 +20,8 @@ USE_XZ=		yes
 USE_GNOME=	gnomehack glib20 gnomeprefix libxslt
 GNU_CONFIGURE=	yes
 USE_GETTEXT=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}" LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}
+LDFLAGS+=	-L${LOCALBASE}/lib
 USE_BISON=	build
 USE_LDCONFIG=	yes
 
diff --git mail/abook/Makefile mail/abook/Makefile
index 58bd9cf..f75c546 100644
--- mail/abook/Makefile
+++ mail/abook/Makefile
@@ -17,7 +17,6 @@ COMMENT=	An addressbook program with mutt mail client support
 GNU_CONFIGURE=	yes
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
-CONFIGURE_ENV+=	CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
 
 .if defined(WITHOUT_NLS)
 CONFIGURE_ARGS+=--disable-nls
diff --git mail/akpop3d/Makefile mail/akpop3d/Makefile
index f3f70e4..3c726d2 100644
--- mail/akpop3d/Makefile
+++ mail/akpop3d/Makefile
@@ -22,7 +22,7 @@ GNU_CONFIGURE=	yes
 .if defined(WITH_SSL)
 USE_OPENSSL=	YES
 CONFIGURE_ARGS+=--with-openssl=${OPENSSLBASE}
-CONFIGURE_ENV=	CPPFLAGS="-I${OPENSSLBASE}/include"
+CPPFLAGS+=	-I${OPENSSLBASE}/include
 LDFLAGS+=	-L${OPENSSLBASE}/lib -lssl -lcrypto
 .endif
 
diff --git mail/anubis/Makefile mail/anubis/Makefile
index b0e4988..b7c806d 100644
--- mail/anubis/Makefile
+++ mail/anubis/Makefile
@@ -27,8 +27,8 @@ MAN1=		anubis.1
 INFO=		anubis
 PORTEXAMPLES=	1anubisrc 2anubisrc
 
-CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib" \
-		CPPFLAGS="-I${LOCALBASE}/include"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 MAKE_JOBS_UNSAFE=	yes
 
 OPTIONS=	NLS "Native language support" on \
diff --git mail/asmail/Makefile mail/asmail/Makefile
index b409a2d..4c34e25 100644
--- mail/asmail/Makefile
+++ mail/asmail/Makefile
@@ -17,7 +17,6 @@ COMMENT=	Biff-type program, designed to match AfterStep
 USE_XORG=	xpm
 USE_OPENSSL=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--enable-shaping \
 		--with-xpm \
 		--with-xpm-includes=${LOCALBASE}/include \
diff --git mail/balsa/Makefile mail/balsa/Makefile
index 85c7739..60f9494 100644
--- mail/balsa/Makefile
+++ mail/balsa/Makefile
@@ -40,8 +40,8 @@ CONFIGURE_ARGS=	--enable-threads \
 		--with-ssl \
 		--without-nm \
 		--with-canberra
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
-		LIBS="-L${LOCALBASE}/lib -liconv ${PTHREAD_LIBS}"
+CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib -liconv ${PTHREAD_LIBS}"
+CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
 
 MAN1=		balsa.1
 
diff --git mail/bmf/Makefile mail/bmf/Makefile
index dd59e98..8b75092 100644
--- mail/bmf/Makefile
+++ mail/bmf/Makefile
@@ -16,15 +16,15 @@ COMMENT=	A fast Bayesian Mail Filter compatible with maildrop and procmail
 
 .if defined(WITH_BDB41)
 LIB_DEPENDS=	db41.1:${PORTSDIR}/databases/db41
-CONFIGURE_ENV+=	LDFLAGS=-L${LOCALBASE}/lib
+LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ENV+=	DB_LIBNAME=-ldb41
 .elif defined(WITH_BDB4)
 LIB_DEPENDS=	db4.0:${PORTSDIR}/databases/db4
-CONFIGURE_ENV+=	LDFLAGS=-L${LOCALBASE}/lib
+LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ENV+=	DB_LIBNAME=-ldb4
 .elif defined(WITH_BDB3)
 LIB_DEPENDS=	db3.3:${PORTSDIR}/databases/db3
-CONFIGURE_ENV+=	LDFLAGS=-L${LOCALBASE}/lib
+LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ENV+=	DB_LIBNAME=-ldb3
 .endif
 
diff --git mail/bogofilter/Makefile mail/bogofilter/Makefile
index 243f009..576c5b5 100644
--- mail/bogofilter/Makefile
+++ mail/bogofilter/Makefile
@@ -51,8 +51,9 @@ LIB_DEPENDS+=		gsl.16:${PORTSDIR}/math/gsl
 CONFIGURE_ARGS+=	--with-included-gsl
 .endif
 CPPFLAGS+=	${BF_CPPFLAGS}
-CONFIGURE_ENV+=	LDFLAGS="-L${LOCALBASE}/lib" LIBS="${BF_LIBS}" \
+CONFIGURE_ENV+=	LIBS="${BF_LIBS}" \
 		PERL="${PERL}"
+LDFLAGS+=	-L${LOCALBASE}/lib
 INSTALL_TARGET=	install-strip prefix=${PREFIX} mandir=${MANPREFIX}/man
 
 MAN1=		bogofilter.1 bogoutil.1 bogoupgrade.1 bogolexer.1 bogotune.1 \
diff --git mail/claws-mail-address_keeper/Makefile mail/claws-mail-address_keeper/Makefile
index 356cdf3..7e25c6d 100644
--- mail/claws-mail-address_keeper/Makefile
+++ mail/claws-mail-address_keeper/Makefile
@@ -25,7 +25,7 @@ USE_ICONV=	yes
 MAKE_JOBS_SAFE=	yes
 
 CPPFLAGS+=	-I${LOCALBASE}/include
-CONFIGURE_ENV+=	LDFLAGS="-L${LOCALBASE}/lib"
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .if defined(WITHOUT_NLS)
 CONFIGURE_ARGS+=--disable-nls
diff --git mail/claws-mail-attach_warner/Makefile mail/claws-mail-attach_warner/Makefile
index d30c15a..2bd1ff5 100644
--- mail/claws-mail-attach_warner/Makefile
+++ mail/claws-mail-attach_warner/Makefile
@@ -26,7 +26,7 @@ USE_AUTOTOOLS=	autoconf
 MAKE_JOBS_SAFE=	yes
 
 CPPFLAGS+=	-I${LOCALBASE}/include
-CONFIGURE_ENV+=	LDFLAGS="-L${LOCALBASE}/lib"
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 CONFIGURE_ARGS=	--with-iconv-prefix=${LOCALBASE} \
 		--with-libintl-prefix=${LOCALBASE}
diff --git mail/claws-mail-bsfilter/Makefile mail/claws-mail-bsfilter/Makefile
index 1a03eb2..0bbb708 100644
--- mail/claws-mail-bsfilter/Makefile
+++ mail/claws-mail-bsfilter/Makefile
@@ -26,7 +26,7 @@ USE_AUTOTOOLS=	autoconf
 MAKE_JOBS_SAFE=	yes
 
 CPPFLAGS+=	-I${LOCALBASE}/include
-CONFIGURE_ENV+=	LDFLAGS="-L${LOCALBASE}/lib"
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .if defined(WITHOUT_NLS)
 CONFIGURE_ARGS+=--disable-nls
diff --git mail/claws-mail-clamd/Makefile mail/claws-mail-clamd/Makefile
index 72aafca..093bc5f 100644
--- mail/claws-mail-clamd/Makefile
+++ mail/claws-mail-clamd/Makefile
@@ -26,7 +26,7 @@ USE_ICONV=	yes
 MAKE_JOBS_SAFE=	yes
 
 CPPFLAGS+=	-I${LOCALBASE}/include
-CONFIGURE_ENV+=	LDFLAGS="-L${LOCALBASE}/lib"
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .if defined(WITHOUT_NLS)
 CONFIGURE_ARGS+=--disable-nls
diff --git mail/claws-mail-fancy/Makefile mail/claws-mail-fancy/Makefile
index 5e26562..684f602 100644
--- mail/claws-mail-fancy/Makefile
+++ mail/claws-mail-fancy/Makefile
@@ -28,7 +28,7 @@ USE_GNOME=	gtk20
 MAKE_JOBS_SAFE=	yes
 
 CPPFLAGS+=	-I${LOCALBASE}/include
-CONFIGURE_ENV+=	LDFLAGS="-L${LOCALBASE}/lib"
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 CONFIGURE_ARGS=	--with-libiconv-prefix=${LOCALBASE} \
 		--with-libintl-prefix=${LOCALBASE}
diff --git mail/claws-mail-gtkhtml2_viewer/Makefile mail/claws-mail-gtkhtml2_viewer/Makefile
index 3577098..0bf9f4d 100644
--- mail/claws-mail-gtkhtml2_viewer/Makefile
+++ mail/claws-mail-gtkhtml2_viewer/Makefile
@@ -27,7 +27,7 @@ USE_ICONV=	yes
 MAKE_JOBS_SAFE=	yes
 
 CPPFLAGS+=	-I${LOCALBASE}/include
-CONFIGURE_ENV+=	LDFLAGS="-L${LOCALBASE}/lib"
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 CONFIGURE_ARGS=	--with-libiconv-prefix=${LOCALBASE} \
 		--with-libintl-prefix=${LOCALBASE}
diff --git mail/claws-mail-notification/Makefile mail/claws-mail-notification/Makefile
index d0b1909..62e9293 100644
--- mail/claws-mail-notification/Makefile
+++ mail/claws-mail-notification/Makefile
@@ -26,7 +26,7 @@ USE_AUTOTOOLS=	autoconf
 MAKE_JOBS_SAFE=	yes
 
 CPPFLAGS+=	-I${LOCALBASE}/include
-CONFIGURE_ENV+=	LDFLAGS="-L${LOCALBASE}/lib"
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 CONFIGURE_ARGS=	--with-libiconv-prefix=${LOCALBASE} \
 		--with-libintl-prefix=${LOCALBASE}
diff --git mail/claws-mail-python/Makefile mail/claws-mail-python/Makefile
index 8db463c..2f9bd6b 100644
--- mail/claws-mail-python/Makefile
+++ mail/claws-mail-python/Makefile
@@ -27,7 +27,7 @@ USE_AUTOTOOLS=	autoconf
 MAKE_JOBS_SAFE=	yes
 
 CPPFLAGS+=	-I${LOCALBASE}/include
-CONFIGURE_ENV+=	LDFLAGS="-L${LOCALBASE}/lib"
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .if defined(WITHOUT_NLS)
 CONFIGURE_ARGS+=--disable-nls
diff --git mail/claws-mail-rssyl/Makefile mail/claws-mail-rssyl/Makefile
index 87b1b21..47ac84d 100644
--- mail/claws-mail-rssyl/Makefile
+++ mail/claws-mail-rssyl/Makefile
@@ -26,7 +26,7 @@ USE_ICONV=	yes
 MAKE_JOBS_SAFE=	yes
 
 CPPFLAGS+=	-I${LOCALBASE}/include
-CONFIGURE_ENV+=	LDFLAGS="-L${LOCALBASE}/lib"
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 CONFIGURE_ARGS=	--with-libiconv-prefix=${LOCALBASE} \
 		--with-libintl-prefix=${LOCALBASE}
diff --git mail/claws-mail-spamreport/Makefile mail/claws-mail-spamreport/Makefile
index af62425..a838eb8 100644
--- mail/claws-mail-spamreport/Makefile
+++ mail/claws-mail-spamreport/Makefile
@@ -27,7 +27,7 @@ USE_AUTOTOOLS=	autoconf
 MAKE_JOBS_SAFE=	yes
 
 CPPFLAGS+=	-I${LOCALBASE}/include
-CONFIGURE_ENV+=	LDFLAGS="-L${LOCALBASE}/lib"
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 CONFIGURE_ARGS=	--with-libiconv-prefix=${LOCALBASE} \
 		--with-libintl-prefix=${LOCALBASE}
diff --git mail/claws-mail-tnef/Makefile mail/claws-mail-tnef/Makefile
index 1a6480a..d828a94 100644
--- mail/claws-mail-tnef/Makefile
+++ mail/claws-mail-tnef/Makefile
@@ -25,8 +25,8 @@ USE_XORG=	x11
 USE_AUTOTOOLS=	autoconf
 MAKE_JOBS_SAFE=	yes
 
-CPPFLAGS=	"-I${LOCALBASE}/include"
-CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 CONFIGURE_ARGS=	--with-libiconv-prefix=${LOCALBASE} \
 		--with-libintl-prefix=${LOCALBASE}
diff --git mail/claws-mail-vcalendar/Makefile mail/claws-mail-vcalendar/Makefile
index a8a344d..c7e2efd 100644
--- mail/claws-mail-vcalendar/Makefile
+++ mail/claws-mail-vcalendar/Makefile
@@ -28,7 +28,7 @@ USE_AUTOTOOLS=	autoconf
 MAKE_JOBS_SAFE=	yes
 
 CPPFLAGS+=	-I${LOCALBASE}/include
-CONFIGURE_ENV+=	LDFLAGS="-L${LOCALBASE}/lib"
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 CONFIGURE_ARGS=	--with-libiconv-prefix=${LOCALBASE} \
 		--with-libintl-prefix=${LOCALBASE}
diff --git mail/claws-mail/Makefile mail/claws-mail/Makefile
index 1bcc18c..feebf7c 100644
--- mail/claws-mail/Makefile
+++ mail/claws-mail/Makefile
@@ -46,8 +46,8 @@ CPPFLAGS+=	-I${LOCALBASE}/include
 
 CONFIGURE_ARGS=	--with-libiconv-prefix=${LOCALBASE}
 
-CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib" \
-		LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 OPTIONS=	ALL		"Enable all options."			off \
 		ENCHANT		"Enable spell checking support."	on \
diff --git mail/contact-lookup-applet/Makefile mail/contact-lookup-applet/Makefile
index ff0b988..27a7d25 100644
--- mail/contact-lookup-applet/Makefile
+++ mail/contact-lookup-applet/Makefile
@@ -22,7 +22,7 @@ USE_GNOME=	evolutiondataserver gnomehack gnomepanel gnomeprefix \
 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
 
 .include <bsd.port.mk>
diff --git mail/courier-imap/Makefile mail/courier-imap/Makefile
index 75f9703..9fb4ac1 100644
--- mail/courier-imap/Makefile
+++ mail/courier-imap/Makefile
@@ -25,13 +25,10 @@ USE_GMAKE=	yes
 USE_RC_SUBR=	courier-imap-imapd courier-imap-imapd-ssl \
 		courier-imap-pop3d courier-imap-pop3d-ssl
 
-
 CPPFLAGS+=	-I${LOCALBASE}/include -I${PREFIX}/include
 LDFLAGS+=	-L${LOCALBASE}/lib -L${PREFIX}/lib
-CONFIGURE_ENV=	REHASH=${SCRIPTDIR}/c_rehash \
-		CPPFLAGS='${CPPFLAGS}' \
-		CXXFLAGS='${CPPFLAGS}' \
-		LDFLAGS='${LDFLAGS}'
+CONFIGURE_ENV=	REHASH=${SCRIPTDIR}/c_rehash
+
 MAKE_ENV:=	${CONFIGURE_ENV}
 
 #
@@ -100,8 +97,7 @@ CONFIGURE_ARGS+=--with-trashquota
 .endif
 
 .if defined(WITH_FAM)
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="${LDFLAGS}"
+CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 USE_FAM=	yes
 .endif
diff --git mail/courier/Makefile mail/courier/Makefile
index 3e4d798..238351d 100644
--- mail/courier/Makefile
+++ mail/courier/Makefile
@@ -73,8 +73,6 @@ USE_RC_SUBR=	courier.sh
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
-CONFIGURE_ENV=	CPPFLAGS='${CPPFLAGS}' \
-		LDFLAGS='${LDFLAGS}'
 MAKE_ENV:=	${CONFIGURE_ENV}
 
 CONFIGURE_ARGS=	--disable-root-check \
diff --git mail/cyrus-imapd23/Makefile mail/cyrus-imapd23/Makefile
index f49e1f4..6fc0db7 100644
--- mail/cyrus-imapd23/Makefile
+++ mail/cyrus-imapd23/Makefile
@@ -38,7 +38,8 @@ CONFIGURE_ARGS=	--sysconfdir=${PREFIX}/etc \
 		--with-com_err \
 		--with-openssl=${OPENSSLBASE} \
 		--with-perl=${PERL5}
-CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include" LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV+=	LIBS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
 MAKE_JOBS_UNSAFE=	yes
 
 OPTIONS=	AUTOCREATE	"Use autocreate INBOX patch (UoA)"	off \
diff --git mail/cyrus-imapd24/Makefile mail/cyrus-imapd24/Makefile
index b618dba..6b60829 100644
--- mail/cyrus-imapd24/Makefile
+++ mail/cyrus-imapd24/Makefile
@@ -38,7 +38,8 @@ CONFIGURE_ARGS=	--sysconfdir=${PREFIX}/etc \
 		--with-com_err \
 		--with-openssl=${OPENSSLBASE} \
 		--with-perl=${PERL5}
-CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include" LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV+=	LIBS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
 MAKE_JOBS_UNSAFE=	yes
 
 OPTIONS=	AUTOCREATE	"Use autocreate INBOX patch (UoA)"	off \
diff --git mail/dbmail/Makefile mail/dbmail/Makefile
index 0494516..63cd45e 100644
--- mail/dbmail/Makefile
+++ mail/dbmail/Makefile
@@ -32,7 +32,7 @@ USE_OPENSSL=	YES
 
 CFLAGS+=	-fPIC -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
 LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
-CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS}" LOCALBASE=${LOCALBASE}
+CONFIGURE_ENV+=	LOCALBASE=${LOCALBASE}
 CONFIGURE_ARGS+=	--with-pkglibdir=${LOCALBASE}/lib/dbmail
 MAKE_ARGS+=	mandir=${MANPREFIX}/man
 
diff --git mail/dbmail20/Makefile mail/dbmail20/Makefile
index f8795f8..58f0239 100644
--- mail/dbmail20/Makefile
+++ mail/dbmail20/Makefile
@@ -43,7 +43,7 @@ CFLAGS+=		-I${LOCALBASE}/include/mysql
 LDFLAGS+=		-L${LOCALBASE}/lib/mysql
 .endif
 
-CONFIGURE_ENV+=		LDFLAGS="${LDFLAGS}" LOCALBASE=${LOCALBASE}
+CONFIGURE_ENV+=		LOCALBASE=${LOCALBASE}
 PORTDOCS=		INSTALL README EXTRAS
 
 MAN1=			dbmail-smtp.1
diff --git mail/dbmail21/Makefile mail/dbmail21/Makefile
index 1494884..40904a7 100644
--- mail/dbmail21/Makefile
+++ mail/dbmail21/Makefile
@@ -35,7 +35,7 @@ USE_OPENSSL=	YES
 
 CFLAGS+=	-fPIC -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
 LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
-CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS}" LOCALBASE=${LOCALBASE}
+CONFIGURE_ENV+=	LOCALBASE=${LOCALBASE}
 
 PORTDOCS=	AUTHORS BUGS COPYING INSTALL NEWS README \
 		README.aliases README.exim README.ldap \
diff --git mail/dbmail23/Makefile mail/dbmail23/Makefile
index 9dc49db..7df3f32 100644
--- mail/dbmail23/Makefile
+++ mail/dbmail23/Makefile
@@ -38,7 +38,7 @@ USE_OPENSSL=	YES
 
 CFLAGS+=	-fPIC -I${LOCALBASE}/include -I${LOCALBASE}/include/zdb ${PTHREAD_CFLAGS}
 LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
-CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS}" LOCALBASE=${LOCALBASE}
+CONFIGURE_ENV+=	LOCALBASE=${LOCALBASE}
 CONFIGURE_ARGS+=--with-pkglibdir=${LOCALBASE}/lib/dbmail \
 		--sysconfdir=${PREFIX}/etc
 MAKE_ARGS+=	mandir=${MANPREFIX}/man
diff --git mail/dcc-dccd/Makefile mail/dcc-dccd/Makefile
index 2b6eb7e..f7c1410 100644
--- mail/dcc-dccd/Makefile
+++ mail/dcc-dccd/Makefile
@@ -113,7 +113,6 @@ MILTERLIB=	${MILTERBASE}/lib
 CPPFLAGS+=	-I${MILTERINC}
 LDFLAGS+=	-L${MILTERLIB}
 
-CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS+=	--with-sendmail=${MILTERBASE}
 
 PLIST_SUB+=	WITH_DCCM=""
diff --git mail/dovecot-sieve/Makefile mail/dovecot-sieve/Makefile
index 0d37e6d..be4876d 100644
--- mail/dovecot-sieve/Makefile
+++ mail/dovecot-sieve/Makefile
@@ -26,7 +26,6 @@ CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--prefix=${PREFIX} \
 		--docdir=${DOCSDIR} \
 		--with-dovecot=`${MAKE} -C ${PORTSDIR}/mail/dovecot -V WRKSRC`
-CONFIGURE_ENV=	LDFLAGS='${LDFLAGS}'
 LDFLAGS+=	-L${LOCALBASE}/lib
 USE_LDCONFIG=	${PREFIX}/lib/dovecot/lda
 
diff --git mail/dovecot/Makefile mail/dovecot/Makefile
index a7a9ad5..3efae3d 100644
--- mail/dovecot/Makefile
+++ mail/dovecot/Makefile
@@ -38,8 +38,8 @@ CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=		--localstatedir=/var \
 			--with-statedir=/var/db/dovecot \
 			--without-shadow
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 USE_LDCONFIG=	${PREFIX}/lib/dovecot \
 		${PREFIX}/lib/dovecot/imap \
 		${PREFIX}/lib/dovecot/pop3 \
diff --git mail/dovecot2-pigeonhole/Makefile mail/dovecot2-pigeonhole/Makefile
index e10d113..4f770b4 100644
--- mail/dovecot2-pigeonhole/Makefile
+++ mail/dovecot2-pigeonhole/Makefile
@@ -25,7 +25,6 @@ CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--prefix=${PREFIX} \
 		--docdir=${DOCSDIR} \
 		--with-dovecot="${LOCALBASE}/lib/dovecot"
-CONFIGURE_ENV=	LDFLAGS='${LDFLAGS}'
 LDFLAGS+=	-L${LOCALBASE}/lib
 USE_LDCONFIG=	${PREFIX}/lib/dovecot
 
diff --git mail/dovecot2/Makefile mail/dovecot2/Makefile
index c5d4c47..ccd6662 100644
--- mail/dovecot2/Makefile
+++ mail/dovecot2/Makefile
@@ -36,8 +36,8 @@ CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--localstatedir=/var \
 		--with-statedir=/var/db/dovecot \
 		--without-shadow
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 USE_LDCONFIG=	${PREFIX}/lib/dovecot
 
 .if defined(NOPORTDOCS)
diff --git mail/dspam/Makefile mail/dspam/Makefile
index 76c335d..8b7d4ab 100644
--- mail/dspam/Makefile
+++ mail/dspam/Makefile
@@ -81,10 +81,10 @@ USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 #CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib"
-CONFIGURE_ENV=	CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}" \
-		CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib" \
-		LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
+CFLAGS+=	${PTHREAD_CFLAGS}
 
 .ifdef(GDBS)
 CFLAGS+=	-g -DDEBUG
diff --git mail/elmo-devel/Makefile mail/elmo-devel/Makefile
index 3a801df..6f850c8 100644
--- mail/elmo-devel/Makefile
+++ mail/elmo-devel/Makefile
@@ -25,10 +25,8 @@ USE_PERL5_RUN=	yes
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-CPPFLAGS=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" \
-		LDFLAGS="${LDFLAGS}"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 MAKE_JOBS_SAFE=	yes
 
 MAN1=		elmo.1 elmoconf.pl.1
diff --git mail/elmo/Makefile mail/elmo/Makefile
index 32b4546..65e0b21 100644
--- mail/elmo/Makefile
+++ mail/elmo/Makefile
@@ -24,10 +24,8 @@ USE_PERL5_RUN=	yes
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-CPPFLAGS=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" \
-		LDFLAGS="${LDFLAGS}"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 MAKE_JOBS_SAFE=	yes
 
 MAN1=		elmo.1 elmoconf.pl.1
diff --git mail/esmtp/Makefile mail/esmtp/Makefile
index 50db0d9..86e56fd 100644
--- mail/esmtp/Makefile
+++ mail/esmtp/Makefile
@@ -21,7 +21,6 @@ USE_BZIP2=	yes
 USE_OPENSSL=	yes
 USE_BISON=	build
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 
 MAN1=		esmtp.1
 MAN5=		esmtprc.5
@@ -30,8 +29,8 @@ PLIST_FILES=	bin/esmtp etc/esmtprc.sample
 
 SUB_FILES=	pkg-message
 
-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:
 .for file in ${PORTNAME}.1
diff --git mail/evolution-exchange/Makefile mail/evolution-exchange/Makefile
index d9459c3..74c5115 100644
--- mail/evolution-exchange/Makefile
+++ mail/evolution-exchange/Makefile
@@ -27,8 +27,8 @@ USE_GMAKE=	yes
 USE_BDB=	41
 USE_OPENLDAP=	yes
 USE_GNOME=	gnomeprefix intlhack gnomehack ltasneededhack
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${BDB_INCLUDE_DIR}" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include -I${BDB_INCLUDE_DIR}
+LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--with-openldap=${LOCALBASE} \
 		--with-static-ldap=no \
 		--with-libdb=${LOCALBASE}
@@ -54,7 +54,7 @@ KRB5_LIB=		`/usr/bin/krb5-config gssapi --libs`
 .endif
 
 .if ${ARCH} == "amd64"
-CONFIGURE_ENV+=	CFLAGS="${CFLAGS} -fPIC"
+CFLAGS+=	-fPIC
 .endif
 
 .if exists(${LOCALBASE}/include/mapi.h)
diff --git mail/evolution-mapi/Makefile mail/evolution-mapi/Makefile
index 896d403..c9d52b5 100644
--- mail/evolution-mapi/Makefile
+++ mail/evolution-mapi/Makefile
@@ -28,8 +28,8 @@ USE_GMAKE=	yes
 USE_GNOME=	evolutiondataserver
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 EVO_VERSION=	2.32
 EDS_VERSION=	1.2
diff --git mail/evolution/Makefile mail/evolution/Makefile
index 6bc63ff..7c18506 100644
--- mail/evolution/Makefile
+++ mail/evolution/Makefile
@@ -38,8 +38,8 @@ CONFIGURE_ARGS=	--enable-nss=yes \
 		--enable-mono=no \
 		--disable-nm \
 		--with-sub-version=" FreeBSD GNOME Team Port"
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 GCONF_SCHEMAS=	apps_evolution_addressbook.schemas \
 		apps-evolution-attachment-reminder.schemas \
diff --git mail/faces/Makefile mail/faces/Makefile
index 370fe74..d247328 100644
--- mail/faces/Makefile
+++ mail/faces/Makefile
@@ -38,8 +38,8 @@ WITH_AUDIO=	# none
 PLIST_SUB+=	X11=""
 USE_GNOME=	gnomehack gtk12
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I../compface -I${LOCALBASE}/include" \
-		LDFLAGS="-L../compface -L${LOCALBASE}/lib"
+CPPFLAGS+=	-I../compface -I${LOCALBASE}/include
+LDFLAGS+=	-L../compface -L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--enable-imap --enable-pop \
 		--enable-name-unknown --with-spooldir=/var/mail \
 		--with-facedir=${DATADIR}
diff --git mail/fetchmail/Makefile mail/fetchmail/Makefile
index 325da4e..2bbfbac 100644
--- mail/fetchmail/Makefile
+++ mail/fetchmail/Makefile
@@ -40,7 +40,7 @@ USE_OPENSSL=	yes
 CONFIGURE_ARGS=	--enable-opie --enable-RPA --enable-SDPS \
 		--with-hesiod=no --enable-fallback=no PYTHON=:
 # bsd.openssl.mk will add the LDFLAGS to CONFIGURE_ENV:
-LDFLAGS=	-L${LOCALBASE}/lib
+LDFLAGS+=	-L${LOCALBASE}/lib
 MAKE_ENV+=	${CONFIGURE_ENV}
 MAN1=		fetchmail.1
 MLINKS=		fetchmail.1 fetchmailconf.1
diff --git mail/filtermail/Makefile mail/filtermail/Makefile
index d556cc5..827f989 100644
--- mail/filtermail/Makefile
+++ mail/filtermail/Makefile
@@ -33,13 +33,12 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 USE_BISON=	build
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 
 MAN1=		filtermail.1
 MAN5=		filtermailex.5 filtermailrc.5
 
-CPPFLAGS=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 PLIST_FILES=	bin/filtermail
 
diff --git mail/gmime/Makefile mail/gmime/Makefile
index 9600b02..e280b42 100644
--- mail/gmime/Makefile
+++ mail/gmime/Makefile
@@ -21,8 +21,8 @@ USE_GNOME=	glib12
 USE_ICONV=	yes
 GNU_CONFIGURE=	yes
 CFLAGS+=	-L${LOCALBASE}/lib # req'd to find iconv
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 MAKE_ARGS=	confexecdir=${PREFIX}/etc
 
 USE_LDCONFIG=	yes
diff --git mail/gmime2/Makefile mail/gmime2/Makefile
index b6b9d92..8ebaec5 100644
--- mail/gmime2/Makefile
+++ mail/gmime2/Makefile
@@ -26,8 +26,8 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS?=	--with-libiconv=${LOCALBASE} \
 			--with-html-dir=${PREFIX}/share/doc \
 			--enable-mono=no
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
-		LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
 
 LATEST_LINK?=	${PORTNAME}2
 
diff --git mail/gmime24/Makefile mail/gmime24/Makefile
index 8f2a205..aed9f3d 100644
--- mail/gmime24/Makefile
+++ mail/gmime24/Makefile
@@ -27,8 +27,8 @@ USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS?=--with-html-dir=${PREFIX}/share/doc \
 		--enable-mono=no
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
-		LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
 
 LATEST_LINK?=	${PORTNAME}24
 
diff --git mail/gnubiff/Makefile mail/gnubiff/Makefile
index 1178602..310363a 100644
--- mail/gnubiff/Makefile
+++ mail/gnubiff/Makefile
@@ -20,8 +20,8 @@ USE_GNOME=	intlhack libglade2 esound
 USE_GMAKE=	yes
 USE_FAM=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 # CXXFLAGS needed to work round issue with gcc and openssl 0.9.8a
 # /usr/local/include/openssl/sha.h:173: error: ISO C++ does not support `long long'
diff --git mail/heirloom-mailx/Makefile mail/heirloom-mailx/Makefile
index 7f03f4a..8d67977 100644
--- mail/heirloom-mailx/Makefile
+++ mail/heirloom-mailx/Makefile
@@ -37,8 +37,8 @@ PLIST_FILES=	bin/${PORTNAME} \
 		"etc/nail.rc.default" \
 		"@exec [ -f %B/nail.rc ] || ${CP} %B/%f %B/nail.rc"
 
-CPPFLAGS=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .include <bsd.port.pre.mk>
 
diff --git mail/imapfilter/Makefile mail/imapfilter/Makefile
index 7d06971..8161083 100644
--- mail/imapfilter/Makefile
+++ mail/imapfilter/Makefile
@@ -19,8 +19,8 @@ USE_LUA=	5.1
 USE_OPENSSL=	yes
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	-d ${PREFIX} -s ${DATADIR}
-CPPFLAGS=	-I${LOCALBASE}/include -I${LUA_INCDIR}
-LDFLAGS=	-L${LOCALBASE}/lib -L${LUA_LIBDIR}
+CPPFLAGS+=	-I${LOCALBASE}/include -I${LUA_INCDIR}
+LDFLAGS+=	-L${LOCALBASE}/lib -L${LUA_LIBDIR}
 
 MAN1=		imapfilter.1
 MAN5=		imapfilter_config.5
diff --git mail/isync/Makefile mail/isync/Makefile
index b3263eb..d88c6a9 100644
--- mail/isync/Makefile
+++ mail/isync/Makefile
@@ -18,16 +18,14 @@ USE_OPENSSL=	yes
 USE_BDB=	42+
 MAKE_JOBS_SAFE=	yes
 
-CONFIGURE_ENV+=		CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
-
 LICENSE=	GPLv2
 
 MAN1=		isync.1 mbsync.1 mdconvert.1
 PORTDOCS=	AUTHORS ChangeLog NEWS README TODO
 PLIST_FILES=	bin/get-cert bin/isync bin/mbsync bin/mdconvert
 
-CPPFLAGS=	-I${BDB_INCLUDE_DIR} -I${OPENSSLINC}
-LDFLAGS=	-L${BDB_LIB_DIR} -L${OPENSSLLIB} -lssl -lcrypto
+CPPFLAGS+=	-I${BDB_INCLUDE_DIR} -I${OPENSSLINC}
+LDFLAGS+=	-L${BDB_LIB_DIR} -L${OPENSSLLIB} -lssl -lcrypto
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|: install-docDATA|:|g' ${WRKSRC}/Makefile.in
diff --git mail/kavmilter/Makefile mail/kavmilter/Makefile
index 41302ee..648ce97 100644
--- mail/kavmilter/Makefile
+++ mail/kavmilter/Makefile
@@ -23,10 +23,8 @@ USE_BZIP2=	yes
 MAN5=		kavmilter.5
 MAN8=		kavmilter.8
 
-CPPFLAGS=	${PTHREAD_CFLAGS}
-LDFLAGS=	${PTHREAD_LIBS}
-MAKE_ENV=	CPPFLAGS="${CPPFLAGS}" \
-		LDFLAGS="${LDFLAGS}"
+CPPFLAGS+=	${PTHREAD_CFLAGS}
+LDFLAGS+=	${PTHREAD_LIBS}
 
 post-install:
 	${STRIP_CMD} ${PREFIX}/libexec/kavmilter
diff --git mail/libesmtp/Makefile mail/libesmtp/Makefile
index a7bdd9b..fdff6ff 100644
--- mail/libesmtp/Makefile
+++ mail/libesmtp/Makefile
@@ -21,10 +21,10 @@ USE_AUTOTOOLS=	libtool
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		PTHREAD_LIBS="${PTHREAD_LIBS}" \
+CONFIGURE_ENV=	PTHREAD_LIBS="${PTHREAD_LIBS}" \
 		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		LIBS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
 
 # require-all-recipients (implied by enable-all) is required for Balsa
 CONFIGURE_ARGS=	--enable-all --disable-isoc
diff --git mail/libetpan/Makefile mail/libetpan/Makefile
index eaa5856..8eb0fd2 100644
--- mail/libetpan/Makefile
+++ mail/libetpan/Makefile
@@ -29,8 +29,6 @@ MAKE_JOBS_SAFE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
 LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 
-CONFIGURE_ENV=	LDFLAGS="${LDFLAGS}"
-
 OPTIONS=	GNUTLS	"Enable gnuTLS support" off \
 		IPV6	"Enable ipv6 support." on
 
diff --git mail/libmapi/Makefile mail/libmapi/Makefile
index 8ebc40c..17f9500 100644
--- mail/libmapi/Makefile
+++ mail/libmapi/Makefile
@@ -32,8 +32,8 @@ USE_GNOME=	pkgconfig
 USE_PYTHON=	yes
 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-samba=${LOCALBASE}
 
 OPTIONS=	BOOST "Enable libmapi++ (needs boost)" yes \
diff --git mail/libvmime/Makefile mail/libvmime/Makefile
index 50af3d0..44de20e 100644
--- mail/libvmime/Makefile
+++ mail/libvmime/Makefile
@@ -32,7 +32,7 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS+=--disable-debug
 .endif
 
-CONFIGURE_ENV+=	EXTRA_CFLAGS="${CFLAGS}" EXTRA_CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}" \
+CONFIGURE_ENV+=	EXTRA_CFLAGS="${CFLAGS}" EXTRA_CXXFLAGS="${CXXFLAGS}" \
 		LIBGNUTLS_CONFIG="${LOCALBASE}/bin/pkg-config" libgnutls_config_args="gnutls"
 
 DOCSDIR=	${PREFIX}/share/doc/vmime
diff --git mail/lmtpd/Makefile mail/lmtpd/Makefile
index d230d03..c87c585 100644
--- mail/lmtpd/Makefile
+++ mail/lmtpd/Makefile
@@ -86,7 +86,7 @@ CONFIGURE_ARGS+=	--without-db3 --without-db4
 .endif
 
 GNU_CONFIGURE=	YES
-CONFIGURE_ENV=	CFLAGS="${CFLAGS} -I${LOCALBASE}/include" LDFLAGS="${LDFLAGS}"
+CFLAGS+=	-I${LOCALBASE}/include
 CONFIGURE_ARGS+=	--without-perl
 
 MAN8=		lmtpd.8
diff --git mail/lurker/Makefile mail/lurker/Makefile
index 3917a47..f51eabe 100644
--- mail/lurker/Makefile
+++ mail/lurker/Makefile
@@ -22,8 +22,8 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 MIMELIB_VERSION=	3.1.1
 USE_ICONV=	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-mimelib-local \
 		--with-default-www-dir=${PREFIX}/www/lurker \
 		--with-cgi-bin-dir=${PREFIX}/www/lurker
diff --git mail/mail-notification/Makefile mail/mail-notification/Makefile
index 40fbef0..68c74b4 100644
--- mail/mail-notification/Makefile
+++ mail/mail-notification/Makefile
@@ -23,8 +23,8 @@ USE_BZIP2=	yes
 USE_GETTEXT=	yes
 USE_LDCONFIG=	yes
 USE_GNOME=	gconf2 gnomeprefix gnomevfs2 libglade2 libgnomeui libxml2
-CPPFLAGS=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 JB_CONF_ARGS=	cc="${CC}" cflags="${CFLAGS}" cppflags="${CPPFLAGS}" ldflags="${LDFLAGS}" prefix="${PREFIX}"
 JB_CONF_ENV=	jb_cppflags="${CPPFLAGS}" jb_ldflags="${LDFLAGS}"
 GCONF_SCHEMAS=	mail-notification.schemas
diff --git mail/maildrop/Makefile mail/maildrop/Makefile
index fc9c0a3..af934623 100644
--- mail/maildrop/Makefile
+++ mail/maildrop/Makefile
@@ -31,7 +31,6 @@ USE_BZIP2=	yes
 USE_PERL5=	yes
 GNU_CONFIGURE=	yes
 MAKE_JOBS_SAFE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--enable-syslog=1 \
 		--enable-use-flock=1 \
 		--with-etcdir="${PREFIX}/etc" \
diff --git mail/mairix/Makefile mail/mairix/Makefile
index ccf1d43..9bbffa3 100644
--- mail/mairix/Makefile
+++ mail/mairix/Makefile
@@ -16,7 +16,6 @@ COMMENT=	Indexing and searching in Maildir, MH or mbox folders
 USE_GMAKE=	yes
 HAS_CONFIGURE=	yes
 USE_BISON=	build
-CONFIGURE_ENV=	CC="${CC}" CFLAGS="${CFLAGS}"
 
 MAN1=	mairix.1
 MAN5=	mairixrc.5
diff --git mail/mboxgrep/Makefile mail/mboxgrep/Makefile
index fe1ac3c..13d460a 100644
--- mail/mboxgrep/Makefile
+++ mail/mboxgrep/Makefile
@@ -19,7 +19,8 @@ LIB_DEPENDS=	pcre.0:${PORTSDIR}/devel/pcre
 .endif
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV+=	CFLAGS="${CFLAGS} -I${LOCALBASE}/include" LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV+=	LIBS="-L${LOCALBASE}/lib"
+CFLAGS+=	-I${LOCALBASE}/include
 USE_OPENSSL=	yes
 
 MAN1=		mboxgrep.1
diff --git mail/milter-greylist/Makefile mail/milter-greylist/Makefile
index eeb0b62..1a58de9 100644
--- mail/milter-greylist/Makefile
+++ mail/milter-greylist/Makefile
@@ -81,7 +81,7 @@ LIBS+=		${PTHREAD_LIBS}
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--with-user=mailnull --with-libmilter=${MILTERBASE} \
 			--enable-dnsrbl --with-thread-safe-resolver
-CONFIGURE_ENV+=	CFLAGS="${CFLAGS}" LIBS="${LIBS} "
+CONFIGURE_ENV+=	LIBS="${LIBS}"
 
 ALL_TARGET=	milter-greylist
 SUB_FILES+=	pkg-message
diff --git mail/mmc/Makefile mail/mmc/Makefile
index 94b9096..fde2d8b 100644
--- mail/mmc/Makefile
+++ mail/mmc/Makefile
@@ -18,8 +18,8 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:S/.1//}
 
 USE_GNOME=	gnomehack gnomelibs gnomeprefix
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 CFLAGS+=	-fpermissive
 
diff --git mail/mmr/Makefile mail/mmr/Makefile
index 40fb7af..0d96f08 100644
--- mail/mmr/Makefile
+++ mail/mmr/Makefile
@@ -30,7 +30,7 @@ CXXFLAGS+=	-DTHREADMAIL \
 		-DMAILPATH=\"/var/mail\" \
 		-DMAILER=\"/usr/sbin/sendmail\ -t\" \
 		-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib -liconv -lcurses -lmd
+LDFLAGS+=	-L${LOCALBASE}/lib -liconv -lcurses -lmd
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|md5/libmd5.a||g' ${WRKSRC}/Makefile
diff --git mail/mutt-devel/Makefile mail/mutt-devel/Makefile
index 7bac1dc..92f0a6f 100644
--- mail/mutt-devel/Makefile
+++ mail/mutt-devel/Makefile
@@ -160,7 +160,7 @@ DOCSDIR?=	${PREFIX}/share/doc/mutt
 EXAMPLESDIR?=	${PREFIX}/share/examples/mutt
 DATADIR?=	${PREFIX}/share/mutt
 LDFLAGS+=	-L${LOCALBASE}/lib
-CONFIGURE_ENV=	CC="${CC} -I${LOCALBASE}/include" LDFLAGS="${LDFLAGS}"
+CONFIGURE_ENV=	CC="${CC} -I${LOCALBASE}/include"
 CONFIGURE_ARGS=	--disable-fcntl --with-ssl=${OPENSSLBASE} \
 		--with-docdir=${DOCSDIR} --sysconfdir=${PREFIX}/etc \
 		--enable-external-dotlock --enable-pop --enable-imap \
diff --git mail/mutt/Makefile mail/mutt/Makefile
index 015c1a5..9cf65bd 100644
--- mail/mutt/Makefile
+++ mail/mutt/Makefile
@@ -96,7 +96,7 @@ WRKSRC=		${WRKDIR}/${DISTNAME:S/i$//}
 GNU_CONFIGURE=	yes
 USE_AUTOTOOLS=	automake autoconf
 LDFLAGS+=	-L${LOCALBASE}/lib
-CONFIGURE_ENV=	CC="${CC} -I${LOCALBASE}/include" LDFLAGS="${LDFLAGS}"
+CONFIGURE_ENV=	CC="${CC} -I${LOCALBASE}/include"
 CONFIGURE_ARGS=	--enable-pop --enable-imap --disable-fcntl \
 		--with-ssl=${OPENSSLBASE} --sysconfdir=${PREFIX}/etc \
 		--with-sharedir=${PREFIX}/share/mutt \
diff --git mail/perdition/Makefile mail/perdition/Makefile
index f1c8933..e0be12b 100644
--- mail/perdition/Makefile
+++ mail/perdition/Makefile
@@ -27,7 +27,8 @@ MANCOMPRESSED=	no
 USE_AUTOTOOLS=	libtool
 USE_GETTEXT=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" BDB_LIB=db3
+CONFIGURE_ENV=	BDB_LIB=db3
+CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 MAKE_ENV+=	DOCSDIR=${DOCSDIR}
 CONFIGURE_ARGS+=--disable-daemon-map --localstatedir=/var
diff --git mail/pfqueue/Makefile mail/pfqueue/Makefile
index 66c6615..f7f9589 100644
--- mail/pfqueue/Makefile
+++ mail/pfqueue/Makefile
@@ -16,7 +16,7 @@ COMMENT=	A console-based tool for handling Postfix 1, Postfix 2 and Exim queues
 USE_AUTOTOOLS=	libtool
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
-CONFIGURE_ENV=	CPPFLAGS="${PTHREAD_CFLAGS}"
+CPPFLAGS+=	${PTHREAD_CFLAGS}
 
 MAN1=		pfqueue.1
 MAN5=		pfqueue.conf.5
diff --git mail/pop3lite/Makefile mail/pop3lite/Makefile
index bc5376c..e70b859 100644
--- mail/pop3lite/Makefile
+++ mail/pop3lite/Makefile
@@ -19,8 +19,8 @@ USE_GNOME=	glib12
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 MAN5=		pop3lite.conf.5
 MAN8=		pop3lite.8
diff --git mail/popular/Makefile mail/popular/Makefile
index 7fd6438..86ba1e7 100644
--- mail/popular/Makefile
+++ mail/popular/Makefile
@@ -24,7 +24,8 @@ USE_PERL5=	yes
 PDM_MODULES=	any master
 CONFIGURE_ARGS=	--without-bdb --disable-docbook --with-confdir=${PREFIX}/etc/popular \
 		--enable-ssl --with-pdm="${PDM_MODULES}"
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
 
 USE_RC_SUBR=	pcheckd.sh pproxy.sh pserv.sh 0ringd.sh
 
diff --git mail/postfix-gps/Makefile mail/postfix-gps/Makefile
index 32ea640..7439092 100644
--- mail/postfix-gps/Makefile
+++ mail/postfix-gps/Makefile
@@ -29,9 +29,9 @@ WRKSRC=		${WRKDIR}/release-${PORTVERSION}
 USE_AUTOTOOLS=	automake autoconf
 AUTOMAKE_ARGS=	--add-missing
 CONFIGURE_ARGS=	--bindir=${PREFIX}/libexec --includedir=${PREFIX}/include
-CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include"	\
-		CXXFLAGS="${CXXFLAGS} -I${LOCALBASE}/include"	\
-		LDFLAGS="${LDFLAGS} ${PTHREAD_LIBS} -L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	${PTHREAD_LIBS} -L${LOCALBASE}/lib
+CXXFLAGS+=	-I${LOCALBASE}/include
 
 pre-configure:
 	@cd ${WRKSRC} && ${ACLOCAL}
diff --git mail/qsf/Makefile mail/qsf/Makefile
index 2319090..8387e0e 100644
--- mail/qsf/Makefile
+++ mail/qsf/Makefile
@@ -20,13 +20,12 @@ OPTIONS=	GDBM "GDBM support" off \
 
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 
 MAN1=		qsf.1
 PLIST_FILES=	bin/qsf
 
-CPPFLAGS=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .include <bsd.port.pre.mk>
 
diff --git mail/rabl_client/Makefile mail/rabl_client/Makefile
index 6a64269..e00b247 100644
--- mail/rabl_client/Makefile
+++ mail/rabl_client/Makefile
@@ -16,7 +16,7 @@ COMMENT=	Reactive Autonomous Blackhole List client
 
 GNU_CONFIGURE=		yes
 USE_LDCONFIG=		yes
-CONFIGURE_ENV=		LDFLAGS="-L${LOCALBASE}/lib"
+LDFLAGS+=		-L${LOCALBASE}/lib
 CONFIGURE_ARGS+=	--prefix=${PREFIX} \
 			--localstatedir=${VAR_DIR}
 
diff --git mail/rabl_server/Makefile mail/rabl_server/Makefile
index dc3dbc0..c4ccd4f 100644
--- mail/rabl_server/Makefile
+++ mail/rabl_server/Makefile
@@ -18,7 +18,7 @@ COMMENT=	Reactive Autonomous Blackhole List server
 
 GNU_CONFIGURE=		yes
 USE_LDCONFIG=		yes
-CONFIGURE_ENV=		LDFLAGS="-L${LOCALBASE}/lib"
+LDFLAGS+=		-L${LOCALBASE}/lib
 
 PORTDOCS=	CHANGE README RELEASE.NOTES
 
diff --git mail/rmilter/Makefile mail/rmilter/Makefile
index 659619b..c7a7a84 100644
--- mail/rmilter/Makefile
+++ mail/rmilter/Makefile
@@ -17,8 +17,8 @@ PLIST_FILES=	sbin/rmilter etc/rc.d/rmilter.sh etc/rmilter.conf.sample
 
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	--prefix=${PREFIX}
-CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib" \
-		CPPFLAGS="-I${LOCALBASE}/include"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 WITH_SENDMAIL_BASE=	yes
 
diff --git mail/sccmilter/Makefile mail/sccmilter/Makefile
index e804d74..35ef959 100644
--- mail/sccmilter/Makefile
+++ mail/sccmilter/Makefile
@@ -25,17 +25,14 @@ USE_AUTOTOOLS=	autoconf
 
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--localstatedir=/var
-CONFIGURE_ENV+=		CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 MAN5=		sccmilter.conf.5 scchosts.5 sccusers.5
 MAN8=		sccmilter.8
 
-CPPFLAGS=	${PTHREAD_CFLAGS} -I${LOCALBASE}/include
-LDFLAGS=	${PTHREAD_LIBS} -L${LOCALBASE}/lib
-MAKE_ENV=	CPPFLAGS="${CPPFLAGS}" \
-		LDFLAGS="${LDFLAGS}"
+CPPFLAGS+=	${PTHREAD_CFLAGS} -I${LOCALBASE}/include
+LDFLAGS+=	${PTHREAD_LIBS} -L${LOCALBASE}/lib
 
 .if defined(WITH_DEBUG)
 CONFIGURE_ARGS+=	--with-debug
diff --git mail/sendmail/bsd.milter.mk mail/sendmail/bsd.milter.mk
index 4e7d3d7..dde60a6 100644
--- mail/sendmail/bsd.milter.mk
+++ mail/sendmail/bsd.milter.mk
@@ -93,14 +93,7 @@ MILTERLIB=	-rpath=${MILTERRPATH}
 .endif
 
 .if !defined(WITHOUT_MILTER_LDFLAGS)
-.if defined(LDFLAGS)
 LDFLAGS+=${MILTERLIB}
-.else
-LDFLAGS=${MILTERLIB}
-.endif
 .endif
 
-CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS}"
-MAKE_ENV+=	LDFLAGS="${LDFLAGS}"
-
 # eof
diff --git mail/smtpmail/Makefile mail/smtpmail/Makefile
index 269a7a3..c8a8d7d 100644
--- mail/smtpmail/Makefile
+++ mail/smtpmail/Makefile
@@ -15,8 +15,8 @@ MAINTAINER=	mnag@FreeBSD.org
 COMMENT=	Tool to send e-mail via a remote smtp server
 
 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/smtpmail
 
diff --git mail/spamass-milter/Makefile mail/spamass-milter/Makefile
index d8bb78d..8ceb16c 100644
--- mail/spamass-milter/Makefile
+++ mail/spamass-milter/Makefile
@@ -68,7 +68,6 @@ PORTDOCS=	AUTHORS ChangeLog NEWS README TODO
 
 USE_RC_SUBR=	spamass-milter
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 
 SUB_FILES=	pkg-message
 
diff --git mail/spamprobe/Makefile mail/spamprobe/Makefile
index 960e7db..616f42c 100644
--- mail/spamprobe/Makefile
+++ mail/spamprobe/Makefile
@@ -22,7 +22,6 @@ MAINTAINER=	stefan@FreeBSD.org
 COMMENT=	Spam detector using Bayesian analysis of word counts
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--enable-default-8bit
 
 MAN1=		spamprobe.1
diff --git mail/sqwebmail/Makefile mail/sqwebmail/Makefile
index 7df3536..0a826fd 100644
--- mail/sqwebmail/Makefile
+++ mail/sqwebmail/Makefile
@@ -14,8 +14,8 @@ MASTER_SITES=	SF/courier/webmail/${PORTVERSION}
 MAINTAINER=	oliver@FreeBSD.org
 COMMENT=	CGI Webmail client for Maildirs
 
-CONFIGURE_ENV=	CFLAGS="-I${LOCALBASE}/include -L${LOCALBASE}/lib ${CFLAGS:S/^[:space:]*//}" \
-		CXXFLAGS="-I${LOCALBASE}/include ${CXXFLAGS:S/^[:space:]*//}"
+CFLAGS:=	-I${LOCALBASE}/include -L${LOCALBASE}/lib ${CFLAGS:S/^[:space:]*//}
+CXXFLAGS:=	-I${LOCALBASE}/include ${CXXFLAGS:S/^[:space:]*//}
 
 BUILD_DEPENDS=	courierauthconfig:${PORTSDIR}/security/courier-authlib-base
 RUN_DEPENDS=	courierauthconfig:${PORTSDIR}/security/courier-authlib-base
diff --git mail/sylpheed/Makefile mail/sylpheed/Makefile
index 9225e94..8928ed7 100644
--- mail/sylpheed/Makefile
+++ mail/sylpheed/Makefile
@@ -26,9 +26,9 @@ GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 
 # Sylpheed needs pthread if GnomeVFS is installed (GtkFileChooser uses it)
-CONFIGURE_ENV=	CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}" \
-		CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CPPFLAGS+=	-I${LOCALBASE}/include
+CFLAGS+=	${PTHREAD_CFLAGS}
 CONFIGURE_ARGS=	--enable-ipv6 \
 		--prefix=${PREFIX} \
 		--with-libintl-prefix=${LOCALBASE} \
diff --git math/GiNaC/Makefile math/GiNaC/Makefile
index d8d1921..c5f6e99 100644
--- math/GiNaC/Makefile
+++ math/GiNaC/Makefile
@@ -22,14 +22,13 @@ USE_BZIP2=	yes
 USE_GNOME=	gnomehack pkgconfig
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
-CONFIGURE_ENV=	LDFLAGS="${LDFLAGS}"
 USE_LDCONFIG=	yes
 
 MAN1=	ginsh.1 viewgar.1
 INFO=	ginac ginac-examples
 
-CPPFLAGS=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .include <bsd.port.pre.mk>
 
diff --git math/algae/Makefile math/algae/Makefile
index bb52f78..6e0750b 100644
--- math/algae/Makefile
+++ math/algae/Makefile
@@ -24,7 +24,7 @@ MAN1=	algae.1
 INFO=	algae
 
 USE_FORTRAN=	yes
-CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS} -L`${CAT} ${WRKSRC}/LIBDIR`/../../.. -L`${CAT} ${WRKSRC}/LIBDIR` -L${LOCALBASE}/lib"
+LDFLAGS+=	-L`${CAT} ${WRKSRC}/LIBDIR`/../../.. -L`${CAT} ${WRKSRC}/LIBDIR` -L${LOCALBASE}/lib
 FORTRANLIBS=	gfortranbegin gfortran
 
 post-patch:
diff --git math/asymptote/Makefile math/asymptote/Makefile
index bdb2648..04b9d01 100644
--- math/asymptote/Makefile
+++ math/asymptote/Makefile
@@ -50,10 +50,10 @@ WRKSRC=	${WRKDIR}/${PORTNAME}-${PORTVERSION}
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--with-latex=${LOCALBASE}/share/texmf/tex/latex \
 		--with-context=${LOCALBASE}/share/texmf/tex/context/third
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include $${CPPFLAGS}" \
-		LFLAGS="-L${LOCALBASE}/lib $${LFLAGS}" \
-		CFLAGS="-I${LOCALBASE}/include $${CFLAGS}" \
-		LDFLAGS="-L${LOCALBASE}/lib $${LDFLAGS}"
+CONFIGURE_ENV=	LFLAGS="-L${LOCALBASE}/lib $${LFLAGS}"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
+CFLAGS+=	-I${LOCALBASE}/include
 MAKE_ENV+=	${CONFIGURE_ENV}
 
 MKTEXLSR=	${LOCALBASE}/bin/mktexlsr
diff --git math/blas/Makefile math/blas/Makefile
index ae585e0..20ac9ee 100644
--- math/blas/Makefile
+++ math/blas/Makefile
@@ -30,7 +30,7 @@ PLIST_FILES=	lib/libblas.a lib/libblas.so lib/libblas.so.${SHLIB_MAJOR}
 LDFLAGS+=	${FFLAGS}
 LDADD ?=	-lgfortran -lm
 SRCCONF=	${NONEXISTENT}
-MAKE_ENV+=	LDADD="${LDADD}" LDFLAGS="${LDFLAGS}" \
+MAKE_ENV+=	LDADD="${LDADD}" \
 		SHLIB_MAJOR="${SHLIB_MAJOR}" SRCCONF="${SRCCONF}"
 .for _u in AR NM RANLIB
 MAKE_ENV+=	${_u}="${LOCALBASE}/bin/${_u:L}"
diff --git math/cgal/Makefile math/cgal/Makefile
index af6d549..85ee5f7 100644
--- math/cgal/Makefile
+++ math/cgal/Makefile
@@ -35,7 +35,7 @@ CMAKE_USE_PTHREAD=	yes
 QT_COMPONENTS=		corelib opengl qmake_build gui moc_build rcc_build
 HAS_CONFIGURE=		yes
 DOCSDIR=		${PREFIX}/share/doc/CGAL-3.4
-CONFIGURE_ENV+=		LDFLAGS="-L${LOCALBASE}/lib"
+LDFLAGS+=		-L${LOCALBASE}/lib
 
 MAN1=			cgal_create_cmake_script.1
 
diff --git math/cln/Makefile math/cln/Makefile
index c377f05..03f223c 100644
--- math/cln/Makefile
+++ math/cln/Makefile
@@ -23,9 +23,7 @@ USE_BZIP2=	yes
 USE_GNOME=	gnomehack pkgconfig
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--with-gmp
-MAKE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 USE_LDCONFIG=	yes
 
 INFO=		cln
@@ -34,8 +32,8 @@ MAN1=		pi.1
 STRIP=		# none
 
 CFLAGS+=	-fPIC
-CPPFLAGS=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .include <bsd.port.pre.mk>
 
diff --git math/dieharder/Makefile math/dieharder/Makefile
index 7918a55..016762a 100644
--- math/dieharder/Makefile
+++ math/dieharder/Makefile
@@ -23,7 +23,6 @@ USE_DOS2UNIX=	yes
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
-CONFIGURE_ENV=	LDFLAGS="${LDFLAGS}"
 USE_LDCONFIG=	yes
 MAN1=		dieharder.1
 MAN3=		libdieharder.3
diff --git math/drgeo/Makefile math/drgeo/Makefile
index a83c823..3895ba2 100644
--- math/drgeo/Makefile
+++ math/drgeo/Makefile
@@ -20,8 +20,8 @@ USE_GETTEXT=	yes
 USE_GNOME=	gnomehack gnomeprefix intlhack libglade2
 USE_GMAKE=	yes
 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|#!/bin/bash|#!/bin/sh|g' \
diff --git math/eispack/Makefile math/eispack/Makefile
index 3998a39..cc1a009 100644
--- math/eispack/Makefile
+++ math/eispack/Makefile
@@ -27,7 +27,7 @@ PLIST_FILES=	lib/libeispack.a lib/libeispack.so lib/libeispack.so.${SHLIB_MAJOR}
 
 LDFLAGS+=	${FFLAGS}
 SRCCONF=	${NONEXISTENT}
-MAKE_ENV+=	LDFLAGS="${LDFLAGS}" SHLIB_MAJOR="${SHLIB_MAJOR}" \
+MAKE_ENV+=	SHLIB_MAJOR="${SHLIB_MAJOR}" \
 		SRCCONF="${SRCCONF}"
 
 OPTIONS=	PROFILE "Build and install a profiling library" Off
diff --git math/fftw3/Makefile math/fftw3/Makefile
index 29cb41f..da05024 100644
--- math/fftw3/Makefile
+++ math/fftw3/Makefile
@@ -27,8 +27,8 @@ USE_PERL5_BUILD=yes
 USE_LDCONFIG=	yes
 
 CONFIGURE_ARGS=	--enable-shared --enable-threads
-CONFIGURE_ENV=	CPPLAGS="${PTHREAD_CFLAGS}" \
-		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CPPFLAGS+=	${PTHREAD_CFLAGS}
+LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 
 .if defined(FFTW3_FLAVOR) && ${FFTW3_FLAVOR}=="default"
 MAN1=	fftw-wisdom-to-conf.1 fftw-wisdom.1
@@ -43,7 +43,7 @@ OPTIONS=	OPTIMIZED_CFLAGS "Enable optimized CFLAGS" off
 .include <bsd.port.pre.mk>
 
 .if defined(WITH_OPTIMIZED_CFLAGS)
-CONFIGURE_ENV+=	CFLAGS="${CFLAGS:N-O:N-O*} -O2 -ffast-math -fomit-frame-pointer"
+CFLAGS:=	${CFLAGS:N-O:N-O*} -O2 -ffast-math -fomit-frame-pointer
 .if ${FFTW3_FLAVOR}=="default" && ${MACHINE_CPU:Msse}
 # !!Detect SSE and not SSE2!!
 CONFIGURE_ARGS+=--enable-sse2
@@ -61,7 +61,7 @@ CFLAGS_3DNOW=	${CFLAGS:N-O:N-O*} -O3 -fomit-frame-pointer -fno-schedule-insns \
 .if ${ARCH} != "amd64"
 CFLAGS_3DNOW+=	-malign-double
 .endif
-CONFIGURE_ENV+=	CFLAGS="${CFLAGS_3DNOW}"
+CFLAGS+=	${CFLAGS_3DNOW}
 .endif
 .endif # end WITH_OPTIMIZED_CFLAGS
 
diff --git math/fityk/Makefile math/fityk/Makefile
index 1b7daf2..888e3a2 100644
--- math/fityk/Makefile
+++ math/fityk/Makefile
@@ -31,7 +31,6 @@ USE_WX=		2.8+
 WX_CONF_ARGS=	absolute
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--without-doc --disable-xyconvert
 USE_LDCONFIG=	yes
 
@@ -39,9 +38,9 @@ MAN1=		fityk.1 xyconv.1
 PORTDOCS=	*
 
 CFLAGS+=	-D_GNU_SOURCE
-CPPFLAGS=	-I${WRKDIR}/${XYLIB_DISTNAME} \
+CPPFLAGS+=	-I${WRKDIR}/${XYLIB_DISTNAME} \
 		-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS=	-L${WRKDIR}/${XYLIB_DISTNAME}/xylib/.libs \
+LDFLAGS+=	-L${WRKDIR}/${XYLIB_DISTNAME}/xylib/.libs \
 		-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 
 XYLIB_DISTNAME=	xylib-0.6
diff --git math/freemat/Makefile math/freemat/Makefile
index 8e3f825..1fd0a78 100644
--- math/freemat/Makefile
+++ math/freemat/Makefile
@@ -39,7 +39,7 @@ USE_QT_VER=		4
 USE_CMAKE=		yes
 QT_COMPONENTS=		gui network opengl moc_build rcc_build uic_build \
 			qmake_build xml svg
-CPPFLAGS=		${CXXFLAGS} -I${LOCALBASE}/include  ${AMDINC}
+CPPFLAGS+=		${CXXFLAGS} -I${LOCALBASE}/include  ${AMDINC}
 
 SLAVEDIRS=	math/freemat-mpi
 
diff --git math/fung-calc/Makefile math/fung-calc/Makefile
index ae62dc8..3e68305 100644
--- math/fung-calc/Makefile
+++ math/fung-calc/Makefile
@@ -18,7 +18,7 @@ USE_GL=		glut
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool
-CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 pre-configure:
 	@${REINPLACE_CMD} -e 's|-O2|-fPIC|g; s|-lpthread|${PTHREAD_LIBS}|g' \
diff --git math/galculator/Makefile math/galculator/Makefile
index fcae29f..06a9b36 100644
--- math/galculator/Makefile
+++ math/galculator/Makefile
@@ -18,8 +18,8 @@ USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_GNOME=	libglade2
 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
 
 MAN1=		galculator.1
diff --git math/gambit/Makefile math/gambit/Makefile
index bcb1c72..75b9bca 100644
--- math/gambit/Makefile
+++ math/gambit/Makefile
@@ -18,12 +18,11 @@ USE_GNOME=	gtk20
 WANT_UNICODE=	yes
 USE_WX=		2.6+
 USE_AUTOTOOLS=	libtool
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS+=--with-wx-config=${WX_CONFIG}
 USE_LDCONFIG=	yes
 
-CPPFLAGS=	${PTHREAD_CFLAGS}
-LDFLAGS=	${PTHREAD_LIBS}
+CPPFLAGS+=	${PTHREAD_CFLAGS}
+LDFLAGS+=	${PTHREAD_LIBS}
 .if !defined(CFLAGS) || ${CFLAGS:M-fno-strict-aliasing*} == ""
 CFLAGS+=	-O2 -fno-strict-aliasing
 .endif
diff --git math/gcalctool/Makefile math/gcalctool/Makefile
index 874fe82..d89083e 100644
--- math/gcalctool/Makefile
+++ math/gcalctool/Makefile
@@ -24,8 +24,8 @@ USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
 USE_GNOME=	gnomeprefix gnomehack intlhack gconf2 gnomedocutils gtk20
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 MAN1=		gcalctool.1
 GLIB_SCHEMAS=	org.gnome.gcalctool.gschema.xml
diff --git math/geg/Makefile math/geg/Makefile
index a48e800..e23e7ad 100644
--- math/geg/Makefile
+++ math/geg/Makefile
@@ -19,8 +19,8 @@ COMMENT=	Visualise multiple 2D-functions of one variable
 USE_GNOME=	gtk12
 USE_AUTOTOOLS=	automake autoconf
 AUTOMAKE_ARGS=	-a -i
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
 
 MAN1=		geg.1
 PLIST_FILES=	bin/geg
diff --git math/gexpr/Makefile math/gexpr/Makefile
index ae2b298..8ef3eb4 100644
--- math/gexpr/Makefile
+++ math/gexpr/Makefile
@@ -16,9 +16,6 @@ MASTER_SITE_SUBDIR=	apps/math/calc
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A shell calculator
 
-MAKE_ENV=	CPPFLAGS="${CPPFLAGS}" \
-		LDFLAGS="${LDFLAGS}"
-
 MAN1=		gexpr.1
 PLIST_FILES=	bin/gexpr
 
diff --git math/giacxcas/Makefile math/giacxcas/Makefile
index 1ac3f37..898f0b6 100644
--- math/giacxcas/Makefile
+++ math/giacxcas/Makefile
@@ -46,8 +46,6 @@ CONFIGURE_ARGS=	--disable-pari
 CXXFLAGS+=	-DSMARTPTR64 -D_I386_ -fPIC
 .endif
 
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
-
 WRKSRC=		${WRKDIR}/giac-${PORTVERSION}
 FLTKDEV-GIAC=	${WRKDIR}/fltk-1.3.x-r6916
 COCOALIB-GIAC=	${WRKDIR}/CoCoALib-0.9937
diff --git math/glpk/Makefile math/glpk/Makefile
index dbddfb4..99e7258 100644
--- math/glpk/Makefile
+++ math/glpk/Makefile
@@ -27,7 +27,6 @@ USE_LDCONFIG=	yes
 CFLAGS+=	-trigraphs
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
-CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS+=	--with-gmp --with-zlib
 
 .include <bsd.port.pre.mk>
diff --git math/gnumeric/Makefile math/gnumeric/Makefile
index 5a314ec..1b0935e 100644
--- math/gnumeric/Makefile
+++ math/gnumeric/Makefile
@@ -39,7 +39,7 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-gnome --disable-silent-rules
 CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib -liconv ${PTHREAD_LIBS}" \
 		python_prog=${PYTHON_VERSION}
-CPPFLAGS=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
 MAKE_JOBS_SAFE=	yes
 
 GLIB_SCHEMAS=	org.gnome.gnumeric.dialogs.gschema.xml \
diff --git math/goblin/Makefile math/goblin/Makefile
index 00aac90..0e90e91 100644
--- math/goblin/Makefile
+++ math/goblin/Makefile
@@ -29,7 +29,7 @@ PLIST_SUB+=	VERSION=${PORTVERSION:R}
 
 CFLAGS+=	-I${LOCALBASE}/include/tcl${TCL_VER} -I${LOCALBASE}/include/ \
 		-I${LOCALBASE}/include/tk${TK_VER} ${PTHREAD_CFLAGS}
-LDFLAGS=	-L${LOCALBASE}/lib -ltcl${USE_TCL} -ltk${USE_TK} ${PTHREAD_LIBS}
+LDFLAGS+=	-L${LOCALBASE}/lib -ltcl${USE_TCL} -ltk${USE_TK} ${PTHREAD_LIBS}
 
 .include <bsd.port.pre.mk>
 
diff --git math/graphthing/Makefile math/graphthing/Makefile
index 4b8138e..5f3ac7f 100644
--- math/graphthing/Makefile
+++ math/graphthing/Makefile
@@ -25,13 +25,12 @@ USE_GMAKE=	yes
 USE_WX=		2.6
 WX_CONF_ARGS=	absolute
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 MAKEFILE=	GNUmakefile
 
 PLIST_FILES=	bin/graphthing bin/gt
 
-CPPFLAGS=	${PTHREAD_CFLAGS}
-LDFLAGS=	${PTHREAD_LIBS}
+CPPFLAGS+=	${PTHREAD_CFLAGS}
+LDFLAGS+=	${PTHREAD_LIBS}
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/graphthing ${PREFIX}/bin
diff --git math/gretl/Makefile math/gretl/Makefile
index ca41c64..d75efd0 100644
--- math/gretl/Makefile
+++ math/gretl/Makefile
@@ -28,8 +28,7 @@ ALL_TARGET=	# empty
 CONFIGURE_ARGS =	--enable-static --enable-shared --with-gmake --without-gnome
 CPPFLAGS+=		-I${LOCALBASE}/include
 LDFLAGS+=		-L${LOCALBASE}/lib
-CONFIGURE_ENV=	LAPACK_LIBS="${LAPACK} ${BLAS}" \
-		LDFLAGS="${LDFLAGS}"
+CONFIGURE_ENV=	LAPACK_LIBS="${LAPACK} ${BLAS}"
 
 MAN1=		gretl.1
 OPTIONS=	ATLAS "Use Atlas for BLAS and LAPACK" off \
diff --git math/guppi/Makefile math/guppi/Makefile
index 585d3f5..f1c9199 100644
--- math/guppi/Makefile
+++ math/guppi/Makefile
@@ -26,9 +26,9 @@ USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-gnumeric --enable-explicit-python-linking
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/libglade-1.0" \
-		LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" \
+CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" \
 		GNUMERIC_IDLDIR="${WRKDIR}/gnumeric"
+CPPFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include/libglade-1.0
 PLIST_SUB=	VERSION="${PORTVERSION}"
 .if !defined(WITHOUT_NLS)
 USE_GETTEXT=	yes
diff --git math/jags/Makefile math/jags/Makefile
index c090fb1..748cf50 100644
--- math/jags/Makefile
+++ math/jags/Makefile
@@ -34,7 +34,6 @@ WRKSRC=		${WRKDIR}/${PKGNAME:S/mcmc-//:U}
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
-CONFIGURE_ENV=	LDFLAGS="${LDFLAGS}"
 USE_FORTRAN=	yes
 USE_LDCONFIG=	yes
 USE_BISON=	build
diff --git math/labplot/Makefile math/labplot/Makefile
index b7fefd1..fee8583 100644
--- math/labplot/Makefile
+++ math/labplot/Makefile
@@ -31,8 +31,8 @@ USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
 INSTALLS_ICONS=	yes
 USE_GETTEXT=	yes
-CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
-		LDFLAGS="${LDFLAGS} ${PTHREAD_LIBS}"
+CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS+=	${PTHREAD_LIBS}
 CONFIGURE_ARGS+=--enable-system-qwtplot3d=yes --enable-system-liborigin=yes \
 		--enable-ocaml=no --enable-fftw=no
 
diff --git math/lapacke/Makefile math/lapacke/Makefile
index 80284cc..acc4f60 100644
--- math/lapacke/Makefile
+++ math/lapacke/Makefile
@@ -52,7 +52,7 @@ LAPACK=		-lpthread -lalapack_r
 
 LDFLAGS+=	-L${LOCALBASE}/lib -lgfortran -lgcc_s
 LDADD?=		-lgfortran -lgcc_s
-MAKE_ENV=	LDADD="${LDADD}" LDFLAGS="${LDFLAGS}"
+MAKE_ENV=	LDADD="${LDADD}"
 .if defined(WITHOUT_LAPACK_LATEST)
 MAKE_ENV+=	WITHOUT_LAPACK_LATEST=yes
 .endif
diff --git math/levmar/Makefile math/levmar/Makefile
index 01c16ba..4d76f8a 100644
--- math/levmar/Makefile
+++ math/levmar/Makefile
@@ -50,7 +50,7 @@ LAPACK=		-lalapack_r
 CFLAGS+=	${PTHREAD_CFLAGS}
 LDFLAGS+=	${PTHREAD_LIBS} -L${LOCALBASE}/lib
 SRCCONF=	${NONEXISTENT}
-MAKE_ENV=	LDADD="${LAPACK} ${BLAS}" LDFLAGS="${LDFLAGS}" \
+MAKE_ENV=	LDADD="${LAPACK} ${BLAS}" \
 		SRCCONF="${SRCCONF}"
 
 .if !defined(NOPORTDOCS)
diff --git math/lrng/Makefile math/lrng/Makefile
index c9dc759..8dc7ad5 100644
--- math/lrng/Makefile
+++ math/lrng/Makefile
@@ -29,7 +29,7 @@ LICENSE=	GPLv3
 CLEANFILES=	${SRCS}
 LIB=	${PORTNAME}
 LIBDIR =	${PREFIX}/lib
-MAKE_ENV+=	CLEANFILES="${CLEANFILES}" LDFLAGS="${LDFLAGS}" \
+MAKE_ENV+=	CLEANFILES="${CLEANFILES}" \
 	LIB="${LIB}" LIBDIR="${LIBDIR}" SHLIB_MAJOR="${SHLIB_MAJOR}" \
 	SRCS="${SRCS}" SRCCONF="${SRCCONF}"
 NO_WRKSUBDIR=	yes
diff --git math/msieve/Makefile math/msieve/Makefile
index 6aee0ef..a608c2f 100644
--- math/msieve/Makefile
+++ math/msieve/Makefile
@@ -22,7 +22,7 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 USE_GMAKE=	yes
 CFLAGS+=	${PTHREAD_CFLAGS} -I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
-MAKE_ENV=	LDFLAGS="${LDFLAGS}" PTHREAD_LIBS="${PTHREAD_LIBS}" ECM=1
+MAKE_ENV=	PTHREAD_LIBS="${PTHREAD_LIBS}" ECM=1
 
 HEADERS=	mp.h msieve.h util.h
 PLIST_FILES=	bin/msieve lib/libmsieve.a ${HEADERS:S|^|include/msieve/|}
diff --git math/mtrxmath/Makefile math/mtrxmath/Makefile
index b354995..00f691c 100644
--- math/mtrxmath/Makefile
+++ math/mtrxmath/Makefile
@@ -13,8 +13,6 @@ MASTER_SITES=	http://www.angelfire.com/linux/linuxjeff/mtrxmath/files/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A small tool for matrix mathemetics
 
-MAKE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
-
 PORTDOCS=	README
 PLIST_FILES=	bin/mtrxmath
 
diff --git math/ndiff/Makefile math/ndiff/Makefile
index 90bc5e4..37c74c0 100644
--- math/ndiff/Makefile
+++ math/ndiff/Makefile
@@ -22,7 +22,6 @@ LIB_DEPENDS=	gmp.10:${PORTSDIR}/math/gmp
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--with-gmp
-CONFIGURE_ENV=	CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
 .else
 .if ${ARCH} == sparc64
 CONFIGURE_ARGS= --with-long-double
diff --git math/octave-devel/Makefile math/octave-devel/Makefile
index fa1b000..35ad62d 100644
--- math/octave-devel/Makefile
+++ math/octave-devel/Makefile
@@ -71,16 +71,15 @@ OCTAVE_VERSION=	${PORTVERSION}
 GNU_HOST=	${ARCH}-portbld-freebsd${OSREL}
 PLIST_SUB=	OCTAVE_VERSION=${OCTAVE_VERSION} GNU_HOST=${GNU_HOST}
 INCLUDES=	-I${LOCALBASE}/include -I${LOCALBASE}/include/metis
-MAKE_ENV+=	CPPFLAGS="${CPPFLAGS} ${INCLUDES}" \
-		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 CFLAGS+=	${INCLUDES}
 CXXFLAGS+=	${INCLUDES}
 CPPFLAGS+=	${INCLUDES}
 CONFIGURE_ENV+=	GPERF="${LOCALBASE}/bin/gperf" \
-		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib ${PTHREAD_LIBS}" \
 		CC="${CC}" \
 		CXX="${CXX}" \
 		TERMIOS_H="termios.h"
+LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 CONFIGURE_ARGS=	--host=${GNU_HOST} \
 		--with-blas="-L${LOCALBASE}/lib ${BLAS}" \
 		--with-lapack="${LAPACK}" \
diff --git math/octave/Makefile math/octave/Makefile
index f498a03..0e05289 100644
--- math/octave/Makefile
+++ math/octave/Makefile
@@ -77,16 +77,15 @@ OCTAVE_VERSION=	${PORTVERSION}
 GNU_HOST=	${ARCH}-portbld-freebsd${OSREL}
 PLIST_SUB=	OCTAVE_VERSION=${OCTAVE_VERSION} GNU_HOST=${GNU_HOST}
 INCLUDES=	-I${LOCALBASE}/include
-MAKE_ENV+=	CPPFLAGS="${CPPFLAGS} ${INCLUDES}" \
-		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 CFLAGS+=	${INCLUDES}
 CXXFLAGS+=	${INCLUDES}
 CPPFLAGS+=	${INCLUDES}
 CONFIGURE_ENV+=	GPERF="${LOCALBASE}/bin/gperf" \
-		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib ${PTHREAD_LIBS}" \
 		CC="${CC}" \
 		CXX="${CXX}" \
 		MAKEINFO=${PREFIX}/bin/makeinfo
+LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 CONFIGURE_ARGS=	--host=${GNU_HOST} \
 		--with-blas="-L${LOCALBASE}/lib ${BLAS}" \
 		--with-lapack="${LAPACK}" \
diff --git math/oleo/Makefile math/oleo/Makefile
index 46036b6..c1c935f 100644
--- math/oleo/Makefile
+++ math/oleo/Makefile
@@ -18,8 +18,8 @@ COMMENT=	The GNU spreadsheet for X11 and terminals
 USE_PERL5_BUILD=	yes
 USE_BISON=	build
 USE_AUTOTOOLS=	autoconf213
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
 CONFIGURE_ARGS=	--with-x --without-xlt --without-SciPlot
 
 INFO=		oleo
diff --git math/orpie/Makefile math/orpie/Makefile
index 92f63f8..fa57043 100644
--- math/orpie/Makefile
+++ math/orpie/Makefile
@@ -19,8 +19,8 @@ LIB_DEPENDS=	gsl.16:${PORTSDIR}/math/gsl
 
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 PLIST_FILES=	bin/orpie bin/orpie-curses-keys etc/orpierc
 
diff --git math/pgcalc/Makefile math/pgcalc/Makefile
index d0cde38f..079eb3d 100644
--- math/pgcalc/Makefile
+++ math/pgcalc/Makefile
@@ -19,8 +19,8 @@ USE_KDELIBS_VER=	3
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
 INSTALLS_ICONS=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 OPTIONS=	ARTS	"Build with aRts support"	on
 
diff --git math/plplot/Makefile math/plplot/Makefile
index 6ce9457..28ddc98 100644
--- math/plplot/Makefile
+++ math/plplot/Makefile
@@ -27,9 +27,9 @@ USE_CMAKE=	yes
 USE_PERL5_BUILD=yes
 USE_GNOME=	pango
 USE_GHOSTSCRIPT=yes
-CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include"	\
-		LDFLAGS="-L${LOCALBASE}/lib"		\
-		WITH_FREETYPE=ON
+CONFIGURE_ENV+=	WITH_FREETYPE=ON
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 CMAKE_ARGS+=	-DENABLE_java:BOOL=OFF -DENABLE_octave:BOOL=OFF	\
 		-DENABLE_ada:BOOL=OFF -DENABLE_d:BOOL=OFF	\
 		-DPLD_plmeta=ON
diff --git math/prng/Makefile math/prng/Makefile
index 4b25239..e2d70b7 100644
--- math/prng/Makefile
+++ math/prng/Makefile
@@ -15,7 +15,6 @@ LICENSE=	GPLv2
 
 CFLAGS+=	-fgnu89-inline
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS}"
 INFO=	prng
 PLIST_FILES=	include/prng.h lib/libprng.a
 PORTDOCS=	prng.dvi prng.pdf prng.ps prng.txt
diff --git math/pspp/Makefile math/pspp/Makefile
index 225ae0a..492661e 100644
--- math/pspp/Makefile
+++ math/pspp/Makefile
@@ -26,12 +26,11 @@ USE_ICONV=	yes
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 
 INFO=		pspp pspp-dev
 
-CPPFLAGS=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .include <bsd.port.pre.mk>
 
diff --git math/py-numpy/Makefile math/py-numpy/Makefile
index c1dccd3..b67560a 100644
--- math/py-numpy/Makefile
+++ math/py-numpy/Makefile
@@ -75,6 +75,8 @@ post-extract:
 post-patch:
 	@${REINPLACE_CMD} -e "s+%%FC%%+${FC}+" ${WRKSRC}/numpy/distutils/fcompiler/gnu.py
 	@${CP} ${FILESDIR}/site.cfg ${WRKSRC}/site.cfg
+# ignore LDFLAGS from env, as it overrides internal flags (e.g. -shared) for some reason
+	@${REINPLACE_CMD} -e "s|'LDFLAGS'|None|" ${WRKSRC}/numpy/distutils/fcompiler/__init__.py
 
 GCCLIBDIR_CMDS=	${FC} -print-file-name=libgfortran.so|${SED} -e s/libgfortran.so//
 pre-configure:
diff --git math/rpy/Makefile math/rpy/Makefile
index 30b2c2c..40da72a 100644
--- math/rpy/Makefile
+++ math/rpy/Makefile
@@ -26,7 +26,6 @@ RUN_DEPENDS=	${PYTHON_SITELIBDIR}/numpy:${PORTSDIR}/math/py-numpy \
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
 LDFLAGS+=	-L${LOCALBASE}/lib/R/modules -L${LOCALBASE}/lib/R/lib
-MAKE_ENV=	LDFLAGS="${LDFLAGS}"
 
 post-patch:
 	@${REINPLACE_CMD} -e 's,^statichere ,,' ${WRKSRC}/src/rpymodule.c
diff --git math/scilab/Makefile math/scilab/Makefile
index 4d7a0f5..8f0f1c8 100644
--- math/scilab/Makefile
+++ math/scilab/Makefile
@@ -34,8 +34,7 @@ CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS =	--with-gfortran
 CONFIGURE_ENV=	ac_cv_search_pthread_join="${PTHREAD_LIBS}" \
-	BLAS_LIBS="${BLAS_LIBS}" LAPACK_LIBS="${LAPACK_LIBS}" \
-	LDFLAGS="${LDFLAGS}"
+	BLAS_LIBS="${BLAS_LIBS}" LAPACK_LIBS="${LAPACK_LIBS}"
 
 OPTIONS=	ATLAS "Use Atlas instead of Blas" OFF \
 		FFTW "Use FFTW" ON \
diff --git math/sdpa-gmp/Makefile math/sdpa-gmp/Makefile
index 80dd0ab..acf7fe4 100644
--- math/sdpa-gmp/Makefile
+++ math/sdpa-gmp/Makefile
@@ -30,7 +30,10 @@ LIB_DEPENDS+=	spooles:${PORTSDIR}/math/spooles \
 		mpfr.4:${PORTSDIR}/math/mpfr
 
 CONFIGURE_ARGS+= --with-system-spooles
-CONFIGURE_ENV+=	CXXFLAGS="${CXXFLAGS} -I${LOCALBASE}/include -I${LOCALBASE}/include/spooles" CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include -I${LOCALBASE}/include/spooles" CFLAGS="${CFLAGS} -I${LOCALBASE}/include -I${LOCALBASE}/include/spooles" LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include/spooles
+LDFLAGS+=	-L${LOCALBASE}/lib
+CFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include/spooles
+CXXFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include/spooles
 
 PLIST_SUB+=	MANUALFILE=${MANUALFILE}
 
diff --git math/surf/Makefile math/surf/Makefile
index 0c59496..435a2d4 100644
--- math/surf/Makefile
+++ math/surf/Makefile
@@ -22,8 +22,8 @@ LIB_DEPENDS=	jpeg.11:${PORTSDIR}/graphics/jpeg \
 USE_XORG=	x11 xmu
 USE_GNOME=	gtk12
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--disable-cups --datadir=${PREFIX}/share
 
 CONFLICTS=	surf-0* # www/surf
diff --git math/tablix/Makefile math/tablix/Makefile
index 060cb3a..869a3a9 100644
--- math/tablix/Makefile
+++ math/tablix/Makefile
@@ -25,9 +25,10 @@ USE_GNOME=	libxml2
 GNU_CONFIGURE=	yes
 USE_GETTEXT=	yes
 
-CONFIGURE_ENV=		CPPFLAGS=-I${PREFIX}/include LIBS=-L${PREFIX}/lib \
-			LDFLAGS=-L${PREFIX}/lib \
-			PVM_ROOT=${PVM_ROOT} PVM_LIB=${PREFIX}/lib
+CONFIGURE_ENV=	LIBS=-L${PREFIX}/lib \
+		PVM_ROOT=${PVM_ROOT} PVM_LIB=${PREFIX}/lib
+CPPFLAGS+=	-I${PREFIX}/include
+LDFLAGS+=	-L${PREFIX}/lib
 
 MAN1=	tablix2.1 tablix2_benchmark.1 tablix2_kernel.1 tablix2_output.1 \
 	tablix2_plot.1 tablix2_test.1
diff --git math/testu01/Makefile math/testu01/Makefile
index b19576f..f20a23f 100644
--- math/testu01/Makefile
+++ math/testu01/Makefile
@@ -26,7 +26,6 @@ USE_GMAKE=	yes
 MAKE_ARGS=	docdir="${DOCSDIR}" exdir="${EXAMPLESDIR}"
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
-CONFIGURE_ENV=	LDFLAGS="${LDFLAGS}"
 USE_LDCONFIG=	yes
 CFLAGS+=	-fPIC
 PLIST_SUB=	PORTNAME="${PORTNAME}"
diff --git math/unuran/Makefile math/unuran/Makefile
index 4bfa389..fa247ad 100644
--- math/unuran/Makefile
+++ math/unuran/Makefile
@@ -23,7 +23,6 @@ CONFIGURE_ARGS=	--enable-shared --with-urng-rngstream --with-urng-default=rngstr
 		--enable-info
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
-CONFIGURE_ENV=	LDFLAGS="${LDFLAGS}"
 MAKE_ENV=	MAKE="${GMAKE}"
 
 USE_LDCONFIG=	yes
diff --git math/xspread/Makefile math/xspread/Makefile
index 2461dd3..cabcd1d 100644
--- math/xspread/Makefile
+++ math/xspread/Makefile
@@ -18,8 +18,8 @@ COMMENT=	A spreadsheet program for X and terminals
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}.orig
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
 
 MAN1=		xspread.1 pxspread.1
 
diff --git misc/cdcollect/Makefile misc/cdcollect/Makefile
index d689757..de118d4 100644
--- misc/cdcollect/Makefile
+++ misc/cdcollect/Makefile
@@ -23,7 +23,8 @@ USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack intlhack libgnome gnomesharp20
 GCONF_SCHEMAS=	cdcollect.schemas
 USE_GETTEXT=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 post-extract:
 	${REINPLACE_CMD} -e 's,SqliteClient,Sqlite,' \
diff --git misc/demoniac/Makefile misc/demoniac/Makefile
index 8d4d7da..72c7fcb 100644
--- misc/demoniac/Makefile
+++ misc/demoniac/Makefile
@@ -20,8 +20,8 @@ LIB_DEPENDS=	gtkgl.5:${PORTSDIR}/x11-toolkits/gtkglarea
 USE_GL=		yes
 USE_GNOME=	gtk12
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${PTHREAD_CFLAGS}" \
-		LDFLAGS="${PTHREAD_LIBS}"
+CPPFLAGS+=	${PTHREAD_CFLAGS}
+LDFLAGS+=	${PTHREAD_LIBS}
 PLIST_FILES=	bin/demoniac share/demoniac/pixmaps/logo.xpm
 PLIST_DIRS=	share/demoniac/pixmaps share/demoniac
 
diff --git misc/display/Makefile misc/display/Makefile
index d8d923d..2ce4709 100644
--- misc/display/Makefile
+++ misc/display/Makefile
@@ -28,7 +28,7 @@ CONFLICTS=	ImageMagick-[0-9]* goblin-*
 .endif
 
 CONFIGURE_ARGS+=	--program-prefix=${DISPLAY_PROGRAM_PREFIX}
-CONFIGURE_ENV+=	LDFLAGS="${STRIP}"
+LDFLAGS+=	${STRIP}
 
 MAN1=		${DISPLAY_PROGRAM_PREFIX}display.1
 PLIST_FILES=	bin/${DISPLAY_PROGRAM_PREFIX}display
diff --git misc/findutils/Makefile misc/findutils/Makefile
index fa0391c..54b833f 100644
--- misc/findutils/Makefile
+++ misc/findutils/Makefile
@@ -19,8 +19,8 @@ COMMENT=	The GNU find utilities
 
 SIG_FILES=	${DISTNAME}${EXTRACT_SUFX}.sig
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
-			LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 USE_GMAKE=	yes
 
diff --git misc/getopt/Makefile misc/getopt/Makefile
index bd4df4b..a97dc61 100644
--- misc/getopt/Makefile
+++ misc/getopt/Makefile
@@ -19,7 +19,7 @@ USE_GMAKE=		yes
 
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib -lintl
-MAKE_ENV=	LIBCGETOPT=0 LDFLAGS="${LDFLAGS}"
+MAKE_ENV=	LIBCGETOPT=0
 
 MAN1=		getopt.1
 DOCS=		Changelog README
diff --git misc/gnome-icon-theme-extras/Makefile misc/gnome-icon-theme-extras/Makefile
index 95e7f63..edce4e7 100644
--- misc/gnome-icon-theme-extras/Makefile
+++ misc/gnome-icon-theme-extras/Makefile
@@ -24,7 +24,7 @@ USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 USE_GNOME=	gnomehack intlhack gtk20
 INSTALLS_ICONS=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .include <bsd.port.mk>
diff --git misc/gnome-icon-theme/Makefile misc/gnome-icon-theme/Makefile
index f300e4f..3933a9d6 100644
--- misc/gnome-icon-theme/Makefile
+++ misc/gnome-icon-theme/Makefile
@@ -25,7 +25,7 @@ USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 USE_GNOME=	gnomehack intlhack gtk20
 INSTALLS_ICONS=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .include <bsd.port.mk>
diff --git misc/gnome-mime-data/Makefile misc/gnome-mime-data/Makefile
index 12d033f..f2ae701 100644
--- misc/gnome-mime-data/Makefile
+++ misc/gnome-mime-data/Makefile
@@ -21,8 +21,8 @@ USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack intlhack pkgconfig
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib -lintl"
+CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib -lintl"
+CPPFLAGS+=	-I${LOCALBASE}/include
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|[(]datadir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g' \
diff --git misc/gnome-osd/Makefile misc/gnome-osd/Makefile
index 9b3b397..35ec178 100644
--- misc/gnome-osd/Makefile
+++ misc/gnome-osd/Makefile
@@ -18,14 +18,13 @@ USE_GNOME=	gnomehack gnomeprefix intlhack pygnome2
 USE_PYTHON=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	LDFLAGS="${LDFLAGS}"
 
 GCONF_SCHEMAS=	gnome-osd.schemas
 
 MAN1=		gnome-osd-client.1
 
-CPPFLAGS=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 post-install:
 .if !defined(NOPORTDOCS)
diff --git misc/gregexp/Makefile misc/gregexp/Makefile
index 54041ed..b28c9eb 100644
--- misc/gregexp/Makefile
+++ misc/gregexp/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS=	pcre.0:${PORTSDIR}/devel/pcre
 
 USE_GNOME=	gnomeprefix libgnomeui
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .include <bsd.port.mk>
diff --git misc/gtktalog/Makefile misc/gtktalog/Makefile
index 1f2e8d8..836d4a4 100644
--- misc/gtktalog/Makefile
+++ misc/gtktalog/Makefile
@@ -21,8 +21,8 @@ RUN_DEPENDS=	plaympeg:${PORTSDIR}/multimedia/smpeg
 USE_BZIP2=	yes
 USE_GNOME=	gnomehack gnomelibs gnomeprefix
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 MAN1=		gtktalog.1
 
diff --git misc/hello/Makefile misc/hello/Makefile
index a3c341f..9ad29c4 100644
--- misc/hello/Makefile
+++ misc/hello/Makefile
@@ -25,8 +25,6 @@ USE_GETTEXT=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" \
-		LDFLAGS="${LDFLAGS}"
 PLIST_SUB+=	NLS=""
 .else
 CONFIGURE_ARGS+=	--disable-nls
diff --git misc/kcd/Makefile misc/kcd/Makefile
index a62fd1c..82dffad 100644
--- misc/kcd/Makefile
+++ misc/kcd/Makefile
@@ -20,8 +20,8 @@ USE_GETTEXT=	yes
 USE_PERL5=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--sysconfdir=${PREFIX}/etc
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib -lintl"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib -lintl
 
 MAN1=		kcd.1
 
diff --git misc/lingoteach/Makefile misc/lingoteach/Makefile
index 50de493..24a9112 100644
--- misc/lingoteach/Makefile
+++ misc/lingoteach/Makefile
@@ -26,7 +26,8 @@ USE_GNOME=	gtk20
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
 
 # sound version
 SOUNDV=			0.3.9
diff --git misc/linm/Makefile misc/linm/Makefile
index 0ff57e4..8214f60 100644
--- misc/linm/Makefile
+++ misc/linm/Makefile
@@ -24,7 +24,7 @@ USE_OPENSSL=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 
-CONFIGURE_ENV=  CPPFLAGS=-I${LOCALBASE}/include
+CPPFLAGS+=	-I${LOCALBASE}/include
 # does not work now
 #.if defined(WITHOUT_NLS)
 #CONFIGURE_ARGS+=--disable-nls
diff --git misc/mc-light/Makefile misc/mc-light/Makefile
index 64aee12..e75c679 100644
--- misc/mc-light/Makefile
+++ misc/mc-light/Makefile
@@ -52,7 +52,7 @@ PLIST_SUB+=	NLS="@comment "
 .endif
 
 .if defined(WITH_MC_IN_MC)
-CONFIGURE_ENV+=	CPPFLAGS=-DMC_IN_MC_ALLOWED
+CPPFLAGS+=	-DMC_IN_MC_ALLOWED
 .endif
 
 post-install:
diff --git misc/mc/Makefile misc/mc/Makefile
index e127e28..24245cf 100644
--- misc/mc/Makefile
+++ misc/mc/Makefile
@@ -61,7 +61,8 @@ PLIST_SUB=	CHARSETS="@comment "
 CONFIGURE_ARGS+=--disable-nls
 PLIST_SUB+=	NLS="@comment "
 .else
-CONFIGURE_ENV+=	CPPFLAGS=-I${LOCALBASE}/include LDFLAGS=-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 USE_GETTEXT=	yes
 PLIST_SUB+=	NLS=""
 _MANLANG=	es hu it pl ru sr
diff --git misc/metalink-tools/Makefile misc/metalink-tools/Makefile
index 68c8936..ff4d28b 100644
--- misc/metalink-tools/Makefile
+++ misc/metalink-tools/Makefile
@@ -25,9 +25,9 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 USE_GNOME=	glib20
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV+=	AWK="${AWK}" \
-		CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
-		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
+CONFIGURE_ENV+=	AWK="${AWK}"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 MAKE_JOBS_SAFE=	yes
 
 # Documents to install
diff --git misc/misterproper/Makefile misc/misterproper/Makefile
index 4d542ca..f63b7f9 100644
--- misc/misterproper/Makefile
+++ misc/misterproper/Makefile
@@ -18,7 +18,7 @@ COMMENT=	A GNOME application designed to manage cyclic tasks
 USE_GNOME=	gnomehack gnomelibs gnomeprefix
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .include <bsd.port.mk>
diff --git misc/pinfo/Makefile misc/pinfo/Makefile
index bf3daee..60f4344 100644
--- misc/pinfo/Makefile
+++ misc/pinfo/Makefile
@@ -15,8 +15,8 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Ncurses based, lynx style info documentation browser
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--with-readline \
 		--with-localedir=${PREFIX}/share/locale
 
diff --git misc/podsleuth/Makefile misc/podsleuth/Makefile
index 20cc622..0178d28 100644
--- misc/podsleuth/Makefile
+++ misc/podsleuth/Makefile
@@ -22,7 +22,7 @@ RUN_DEPENDS=	${LOCALBASE}/bin/mono:${PORTSDIR}/lang/mono \
 		${LOCALBASE}/libdata/pkgconfig/ndesk-dbus-1.0.pc:${PORTSDIR}/devel/ndesk-dbus
 
 CONFIGURE_ARGS+=--with-hal-callouts-dir=${PREFIX}/libexec
-CONFIGURE_ENV+=	LDFLAGS="-L${LOCALBASE}/lib"
+LDFLAGS+=	-L${LOCALBASE}/lib
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack pkgconfig
diff --git misc/quick-lounge-applet/Makefile misc/quick-lounge-applet/Makefile
index 9e5eede..6cdce6b 100644
--- misc/quick-lounge-applet/Makefile
+++ misc/quick-lounge-applet/Makefile
@@ -21,8 +21,8 @@ INSTALLS_ICONS=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack intlhack gnomepanel
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 GCONF_SCHEMAS=	quick-lounge.schemas
 
diff --git misc/shared-mime-info/Makefile misc/shared-mime-info/Makefile
index 33a409b..56944c2 100644
--- misc/shared-mime-info/Makefile
+++ misc/shared-mime-info/Makefile
@@ -20,7 +20,7 @@ USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_GNOME=	glib20 libxml2 intltool gnomehack intlhack
 CPPFLAGS+=	-I${LOCALBASE}/include
-CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib"
+LDFLAGS+=	-L${LOCALBASE}/lib
 MAKE_JOBS_UNSAFE=	yes
 
 MAN1=		update-mime-database.1
diff --git misc/terraform/Makefile misc/terraform/Makefile
index 9b36a16..16dd88b 100644
--- misc/terraform/Makefile
+++ misc/terraform/Makefile
@@ -28,11 +28,10 @@ USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	automake:env
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	LDFLAGS="${LDFLAGS}"
 MAKE_JOBS_SAFE=	yes
 
-CPPFLAGS=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 post-patch:
 	@${REINPLACE_CMD} -e '/^SUBDIRS/s| desktop-links docs | |' \
diff --git misc/toilet/Makefile misc/toilet/Makefile
index 7ee41ba..d2407fb 100644
--- misc/toilet/Makefile
+++ misc/toilet/Makefile
@@ -17,8 +17,8 @@ LIB_DEPENDS=	caca.0:${PORTSDIR}/graphics/libcaca
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--program-transform-name=""
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 CFLAGS+=	-fno-strength-reduce
 MAN1=		${PORTNAME}.1
 PORT_VERBS=	${PORTNAME} caca2tlf share/figlet/*tlf
diff --git misc/uf-view/Makefile misc/uf-view/Makefile
index 837e5c8..3747587 100644
--- misc/uf-view/Makefile
+++ misc/uf-view/Makefile
@@ -17,8 +17,8 @@ COMMENT=	A gTK+ viewer for the User Friendly and several other popular comics
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack gnomehier gnomevfs2 gnomedesktop libgnomeui
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 pre-patch:
 	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
diff --git misc/wmcalendar/Makefile misc/wmcalendar/Makefile
index 9018f80..e012c4b 100644
--- misc/wmcalendar/Makefile
+++ misc/wmcalendar/Makefile
@@ -26,8 +26,8 @@ MAKE_ARGS=	CC="${CC}" \
 		INCDIR="`pkg-config --cflags gtk+-2.0` -I${LOCALBASE}/include" \
 		LIBDIR="" \
 		LIBS="-lical -lXpm"
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 MAN1=		wmCalendar.1
 PLIST_FILES=	bin/wmCalendar
diff --git misc/wmpal/Makefile misc/wmpal/Makefile
index 0a2dcfd..a60b239 100644
--- misc/wmpal/Makefile
+++ misc/wmpal/Makefile
@@ -15,8 +15,8 @@ COMMENT=	A one of the most useless dockapps in the world
 
 USE_XORG=	xpm
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 PORTDOCS=	README
 PLIST_FILES=	bin/wmpal
diff --git misc/wmwork/Makefile misc/wmwork/Makefile
index b4f2183..231d64e 100644
--- misc/wmwork/Makefile
+++ misc/wmwork/Makefile
@@ -21,7 +21,6 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/src
 USE_XORG=	xpm
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 
 MAN1=		wmwork.1
 PLIST_FILES=	bin/wmwork
diff --git misc/xbiso/Makefile misc/xbiso/Makefile
index 03649e5..8405ac3 100644
--- misc/xbiso/Makefile
+++ misc/xbiso/Makefile
@@ -17,8 +17,8 @@ COMMENT=	XBox xdvdfs iso extraction utility
 LIB_DEPENDS=	ftp.3:${PORTSDIR}/ftp/ftplib
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 PLIST_FILES=	bin/xbiso
 
diff --git misc/xsw/Makefile misc/xsw/Makefile
index ce553b4..1d2a4f3 100644
--- misc/xsw/Makefile
+++ misc/xsw/Makefile
@@ -21,8 +21,8 @@ USE_SDL=	sdl ttf image gfx
 
 GNU_CONFIGURE=	yes
 
-CONFIGURE_ENV=	CPPLAGS="${CPPPLAGS} -I${LOCALBASE}/include" \
-		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 
 .if !defined(NO_INSTALL_MANPAGES)
 MAN1=		xsw.1 \
diff --git multimedia/aegisub/Makefile multimedia/aegisub/Makefile
index 041259e..6b2366a 100644
--- multimedia/aegisub/Makefile
+++ multimedia/aegisub/Makefile
@@ -50,8 +50,6 @@ CFLAGS+=	-I${LOCALBASE}/include \
 		-I${LOCALBASE}/include/wx-2.8 \
 		-L${LOCALBASE}/lib
 LDFLAGS+=	-L${LOCALBASE}/lib
-CONFIGURE_ENV+=	CFLAGS="${CFLAGS}" \
-		LDFLAGS="${LDFLAGS}"
 
 INSTALLS_ICONS=	yes
 
diff --git multimedia/audacious-plugins/Makefile multimedia/audacious-plugins/Makefile
index 2f230ac..f1715a5 100644
--- multimedia/audacious-plugins/Makefile
+++ multimedia/audacious-plugins/Makefile
@@ -19,9 +19,8 @@ BUILD_DEPENDS=	audacious:${PORTSDIR}/multimedia/audacious
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
-CONFIGURE_ENV+=	LDFLAGS="-L${LOCALBASE}/lib" \
-		CFLAGS="-I${LOCALBASE}/include" \
-		CPP=${CPP}
+LDFLAGS+=	-L${LOCALBASE}/lib
+CFLAGS+=	-I${LOCALBASE}/include
 CONFIGURE_ARGS=	--disable-evdevplug --disable-alsa \
 		--disable-pulse --disable-projectm-1.0
 WANT_GNOME=	yes
diff --git multimedia/audacious/Makefile multimedia/audacious/Makefile
index c237f57..6fda908 100644
--- multimedia/audacious/Makefile
+++ multimedia/audacious/Makefile
@@ -19,8 +19,8 @@ USE_GMAKE=	yes
 USE_XORG=	x11 sm
 USE_GNOME=	gtk20 libglade2
 USE_LDCONFIG=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 MAN1=		audacious.1 audtool.1
 
diff --git multimedia/audiopreview/Makefile multimedia/audiopreview/Makefile
index 436218c..a4faa8a 100644
--- multimedia/audiopreview/Makefile
+++ multimedia/audiopreview/Makefile
@@ -17,8 +17,8 @@ USE_GMAKE=	yes
 USE_GSTREAMER=	core
 USE_GNOME=	intltool
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+LDFLAGS+=	-L${LOCALBASE}/lib
+CFLAGS+=	-I${LOCALBASE}/include
 
 PLIST_FILES=	bin/audiopreview
 MAN1=		audiopreview.1
diff --git multimedia/avifile/Makefile multimedia/avifile/Makefile
index 28f761e..329ba21 100644
--- multimedia/avifile/Makefile
+++ multimedia/avifile/Makefile
@@ -27,9 +27,9 @@ USE_ICONV=	yes
 USE_LDCONFIG=	yes
 
 LIBTOOLFILES=	configure ffmpeg/configure
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include -L${LOCALBASE}/lib" \
-		CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}" \
-		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CPPFLAGS+=	-I${LOCALBASE}/include -L${LOCALBASE}/lib
+LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
+CFLAGS+=	${PTHREAD_CFLAGS}
 CONFIGURE_ARGS=	--with-gnu-ld --enable-iconv \
 		--disable-v4l \
 		--disable-divx4
diff --git multimedia/beep-media-player/Makefile multimedia/beep-media-player/Makefile
index 405359d..c5fbef9 100644
--- multimedia/beep-media-player/Makefile
+++ multimedia/beep-media-player/Makefile
@@ -23,11 +23,11 @@ USE_AUTOTOOLS=	libtool
 USE_GMAKE=	yes
 USE_GETTEXT=	yes
 USE_LDCONFIG=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib -lstdc++" \
-		INPUT_PLUGINS="${INPUT_PLUGINS}" \
+CONFIGURE_ENV=	INPUT_PLUGINS="${INPUT_PLUGINS}" \
 		OUTPUT_PLUGINS="${OUTPUT_PLUGINS}" \
 		VISUALIZATION_PLUGINS="${VISUALIZATION_PLUGINS}"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib -lstdc++
 MAN1=		beep-media-player.1
 
 INPUT_PLUGINS=	cdaudio,mpg123,wav
diff --git multimedia/bmp-extra-plugins/Makefile multimedia/bmp-extra-plugins/Makefile
index 2a3e553..d5b4f1d 100644
--- multimedia/bmp-extra-plugins/Makefile
+++ multimedia/bmp-extra-plugins/Makefile
@@ -25,8 +25,8 @@ GNU_CONFIGURE=	yes
 
 CONFIGURE_ARGS+=--with-ogg=${LOCALBASE} \
 		--with-vorbis=${LOCALBASE}
-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,${PTHREAD_LIBS},g ; \
diff --git multimedia/camserv/Makefile multimedia/camserv/Makefile
index 1dfc349..f49d2f6 100644
--- multimedia/camserv/Makefile
+++ multimedia/camserv/Makefile
@@ -24,11 +24,11 @@ ONLY_FOR_ARCHS=	i386 alpha
 USE_AUTOTOOLS=	autoconf libtool libltdl
 USE_EFL=	imlib2
 
-CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include \
+CPPFLAGS+=	-I${LOCALBASE}/include \
 		-I${LOCALBASE}/include/gtk12 \
 		-I${LOCALBASE}/include/gdk-pixbuf-1.0 \
-		-I${LOCALBASE}/include/glib12" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+		-I${LOCALBASE}/include/glib12
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .if exists(/usr/include/dev/bktr/ioctl_bt848.h)
 post-patch:
diff --git multimedia/cheese/Makefile multimedia/cheese/Makefile
index 779ce31..56c5064 100644
--- multimedia/cheese/Makefile
+++ multimedia/cheese/Makefile
@@ -31,8 +31,8 @@ INSTALLS_OMF=	yes
 INSTALLS_ICONS=	yes
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 DOCS=		AUTHORS COPYING ChangeLog NEWS README
 GCONF_SCHEMAS=	cheese.schemas
diff --git multimedia/clutter-gst/Makefile multimedia/clutter-gst/Makefile
index e09283b..3b915db 100644
--- multimedia/clutter-gst/Makefile
+++ multimedia/clutter-gst/Makefile
@@ -22,7 +22,6 @@ USE_GNOME=	gnomehack ltverhack gnomeprefix
 USE_GSTREAMER=	yes
 USE_XORG=	xp x11
 USE_LDCONFIG=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 
 CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
 LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
diff --git multimedia/dirac/Makefile multimedia/dirac/Makefile
index fb44046..8f9dab5 100644
--- multimedia/dirac/Makefile
+++ multimedia/dirac/Makefile
@@ -21,8 +21,8 @@ MAKE_JOBS_SAFE=	yes
 USE_GNOME=	pkgconfig gnomehack
 USE_LDCONFIG=	yes
 
-CONFIGURE_ENV?=	CPPFLAGS=-I${LOCALBASE}/include \
-		HAVE_LATEX=${FALSE} HAVE_DVIPDFM=${FALSE} \
+CONFIGURE_ENV?=	HAVE_LATEX=${FALSE} HAVE_DVIPDFM=${FALSE} \
 		HAVE_DOXYGEN=${FALSE} HAVE_DOT=${FALSE}
+CPPFLAGS+=	-I${LOCALBASE}/include
 
 .include <bsd.port.mk>
diff --git multimedia/dvbsnoop/Makefile multimedia/dvbsnoop/Makefile
index cef7d66..8a04e39 100644
--- multimedia/dvbsnoop/Makefile
+++ multimedia/dvbsnoop/Makefile
@@ -16,7 +16,7 @@ COMMENT=	DVB stream analyzer / MPEG analyzer
 DVB_HEADERS=	dmx.h frontend.h
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CFLAGS="${CFLAGS} -I${WRKSRC}"
+CFLAGS+=	-I${WRKSRC}
 USE_GMAKE=	yes
 
 PLIST_FILES=	bin/${PORTNAME}
diff --git multimedia/dvdauthor/Makefile multimedia/dvdauthor/Makefile
index 934c694..62a7f84 100644
--- multimedia/dvdauthor/Makefile
+++ multimedia/dvdauthor/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS=	dvdread.4:${PORTSDIR}/multimedia/libdvdread \
 USE_BISON=	build
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib"
+LDFLAGS+=	-L${LOCALBASE}/lib
 WRKSRC=		${WRKDIR}/dvdauthor
 MAN1=	dvdauthor.1 dvddirdel.1 dvdunauthor.1 mpeg2desc.1 spumux.1 spuunmux.1
 
@@ -42,7 +42,7 @@ LIB_DEPENDS+=	freetype.9:${PORTSDIR}/print/freetype2
 .endif
 .if defined(WITH_ICONV)
 USE_ICONV=	yes
-CONFIGURE_ENV+=	CFLAGS="-DICONV_CONV=yes"
+CFLAGS+=	-DICONV_CONV=yes
 .endif
 .if defined(WITH_IMAGEMAGICK)
 LIB_DEPENDS+=	MagickWand.4:${PORTSDIR}/graphics/ImageMagick
diff --git multimedia/dvdstyler/Makefile multimedia/dvdstyler/Makefile
index 2982b69..fc849b0 100644
--- multimedia/dvdstyler/Makefile
+++ multimedia/dvdstyler/Makefile
@@ -41,7 +41,7 @@ USE_GETTEXT=	yes
 USE_CDRTOOLS=	yes	# dvdstyler needs mkisofs
 GNU_CONFIGURE=	yes
 CPPFLAGS+= 	"-I${LOCALBASE}/include"
-CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 MAN1=		dvdstyler.1
 
 .include <bsd.port.pre.mk>
diff --git multimedia/ffmpegthumbnailer/Makefile multimedia/ffmpegthumbnailer/Makefile
index 06523dd..a4f61e4 100644
--- multimedia/ffmpegthumbnailer/Makefile
+++ multimedia/ffmpegthumbnailer/Makefile
@@ -17,7 +17,7 @@ LIB_DEPENDS=	png:${PORTSDIR}/graphics/png \
 		swscale:${PORTSDIR}/multimedia/ffmpeg \
 		jpeg.11:${PORTSDIR}/graphics/jpeg
 
-CONFIGURE_ENV=	LDFLAGS="${PTHREAD_LIBS} -L${LOCALBASE}/lib"
+LDFLAGS+=	${PTHREAD_LIBS} -L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--with-pkgconfigdir=${PREFIX}/libdata/pkgconfig
 
 GNU_CONFIGURE=	yes
diff --git multimedia/gavl/Makefile multimedia/gavl/Makefile
index ebd501d..d1ee215 100644
--- multimedia/gavl/Makefile
+++ multimedia/gavl/Makefile
@@ -23,8 +23,8 @@ USE_GNOME=	pkgconfig gnomehack
 USE_LDCONFIG=	yes
 MAKE_JOBS_SAFE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--without-cpuflags --without-doxygen
 
 PORTDOCS=	README
diff --git multimedia/gmencoder/Makefile multimedia/gmencoder/Makefile
index 27bafe0..ee664bc 100644
--- multimedia/gmencoder/Makefile
+++ multimedia/gmencoder/Makefile
@@ -19,8 +19,8 @@ BUILD_DEPENDS=	mencoder:${PORTSDIR}/multimedia/mencoder
 RUN_DEPENDS=	mencoder:${PORTSDIR}/multimedia/mencoder
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack gnomeprefix libgnomeui
 
diff --git multimedia/gmerlin-avdecoder/Makefile multimedia/gmerlin-avdecoder/Makefile
index 802ec65..4c47ef7 100644
--- multimedia/gmerlin-avdecoder/Makefile
+++ multimedia/gmerlin-avdecoder/Makefile
@@ -42,12 +42,11 @@ OPTIONS=	GMERLIN	"Enable gmerlin support" on \
 USE_GNOME=	gnomehack pkgconfig
 USE_GETTEXT=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--without-cpuflags --without-doxygen
 USE_LDCONFIG=	yes
 
-CPPFLAGS=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .include <bsd.port.pre.mk>
 
diff --git multimedia/gmerlin/Makefile multimedia/gmerlin/Makefile
index 038ddc9..a23ffa9 100644
--- multimedia/gmerlin/Makefile
+++ multimedia/gmerlin/Makefile
@@ -40,15 +40,14 @@ USE_XORG=	ice x11 xinerama xv
 USE_GL=		gl
 USE_GETTEXT=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--disable-alsa --disable-v4l --disable-v4l2 \
 		--disable-camelot --disable-alsamixer --disable-v4lconvert \
 		--without-doxygen --without-cpuflags 
 USE_LDCONFIG=	yes
 INSTALL_ICONS=	yes
 
-CPPFLAGS=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 INFO=		gmerlin
 MAN1=		gmerlin_play.1
diff --git multimedia/gnome-mplayer/Makefile multimedia/gnome-mplayer/Makefile
index 58c5b63..4b9a9b2 100644
--- multimedia/gnome-mplayer/Makefile
+++ multimedia/gnome-mplayer/Makefile
@@ -31,8 +31,8 @@ GNU_CONFIGURE=	yes
 USE_GETTEXT=	yes
 USE_GNOME=	glib20 gtk20
 INSTALLS_ICONS=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS+=	--without-alsa
 
 MAN1=		${PORTNAME}.1
diff --git multimedia/gnome-subtitles/Makefile multimedia/gnome-subtitles/Makefile
index d1038b0..96a10ec 100644
--- multimedia/gnome-subtitles/Makefile
+++ multimedia/gnome-subtitles/Makefile
@@ -24,8 +24,8 @@ USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gtksharp20 gnomesharp20 gnomedocutils
 USE_GSTREAMER=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 GCONF_SCHEMAS=	gnome-subtitles.schemas
 INSTALLS_OMF=	yes
 INSTALLS_ICONS=	yes
diff --git multimedia/gopchop/Makefile multimedia/gopchop/Makefile
index 9930b08..e2da83e 100644
--- multimedia/gopchop/Makefile
+++ multimedia/gopchop/Makefile
@@ -22,11 +22,10 @@ LIB_DEPENDS=	mpeg2.0:${PORTSDIR}/multimedia/libmpeg2
 
 USE_GNOME=	gtk12 intlhack
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--disable-sdl
 
-CPPFLAGS=	-I${LOCALBASE}/include -DHAVE_DECL_GETOPT
-LDFLAGS=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include -DHAVE_DECL_GETOPT
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .if defined(WITHOUT_NLS)
 CONFIGURE_ARGS+=	--disable-nls
diff --git multimedia/gst123/Makefile multimedia/gst123/Makefile
index 7ef9de2..73d9bcf 100644
--- multimedia/gst123/Makefile
+++ multimedia/gst123/Makefile
@@ -20,7 +20,8 @@ USE_GMAKE=	yes
 USE_BZIP2=	yes
 USE_GNOME=	gtk20
 USE_GSTREAMER=	good
-CONFIGURE_ENV=	NCURSES5_CONFIG=/usr/bin/true LDFLAGS=-lncurses
+CONFIGURE_ENV=	NCURSES5_CONFIG=/usr/bin/true
+LDFLAGS+=	-lncurses
 
 PLIST_FILES=	bin/${PORTNAME}
 MAN1=		${PORTNAME}.1
diff --git multimedia/gstreamer-ffmpeg/Makefile multimedia/gstreamer-ffmpeg/Makefile
index ac0e488..4dc1b30 100644
--- multimedia/gstreamer-ffmpeg/Makefile
+++ multimedia/gstreamer-ffmpeg/Makefile
@@ -26,9 +26,10 @@ USE_LDCONFIG=	yes
 USE_GSTREAMER=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	"--with-ffmpeg-extra-configure=--cc=${CC}"
-CONFIGURE_ENV=	PKG_CONFIG=${PKG_CONFIG} \
-		CFLAGS="${CFLAGS} -fno-force-addr" \
-		LDFLAGS="${LDFLAGS} -Wl,-Bsymbolic"
+CONFIGURE_ENV=	PKG_CONFIG=${PKG_CONFIG}
+
+LDFLAGS+=	-Wl,-Bsymbolic
+CFLAGS+=	-fno-force-addr
 PLIST_SUB=	\
 		VERSION="${GST_VERSION}"
 WITHOUT_CPU_CFLAGS=	yes
diff --git multimedia/gstreamer-plugins/Makefile multimedia/gstreamer-plugins/Makefile
index 7d82d2a..e59aab4 100644
--- multimedia/gstreamer-plugins/Makefile
+++ multimedia/gstreamer-plugins/Makefile
@@ -53,9 +53,9 @@ USE_AUTOTOOLS=	libtool
 GST_PLUGIN?=	base
 
 CONFIGURE_ARGS=	--disable-option-checking
-CPPFLAGS=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-CONFIGURE_ENV=	CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
-		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib ${EXTRA_LIBS} ${PTHREAD_LIBS}"
+CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS+=	-L${LOCALBASE}/lib ${EXTRA_LIBS} ${PTHREAD_LIBS}
+CFLAGS+=	-I${LOCALBASE}/include
 
 DEFAULT_AUDIOSINK?=	osssink
 DEFAULT_AUDIOSRC?=	osssrc
diff --git multimedia/gstreamer/Makefile multimedia/gstreamer/Makefile
index 1d2a0b5..dcac257 100644
--- multimedia/gstreamer/Makefile
+++ multimedia/gstreamer/Makefile
@@ -32,9 +32,9 @@ CONFIGURE_ARGS=	--disable-tests \
 		--disable-examples \
 		--disable-failing-tests \
 		--disable-gtk-doc
-CPPFLAGS=	-I${LOCALBASE}/include
-CONFIGURE_ENV=	LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" \
-		ac_cv_func_register_printf_function="no" \
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
+CONFIGURE_ENV=	ac_cv_func_register_printf_function="no" \
 		FLEX_PATH="${LOCALBASE}/bin/flex"
 PLIST_SUB=	VERSION="${GST_VERSION}"
 USE_LDCONFIG=	yes
diff --git multimedia/gtk-recordmydesktop/Makefile multimedia/gtk-recordmydesktop/Makefile
index 0fb4fdb..9e0c585 100644
--- multimedia/gtk-recordmydesktop/Makefile
+++ multimedia/gtk-recordmydesktop/Makefile
@@ -20,8 +20,8 @@ RUN_DEPENDS=	${LOCALBASE}/bin/recordmydesktop:${PORTSDIR}/multimedia/recordmydes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_GETTEXT=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 USE_PYTHON=	yes
 USE_GNOME=	gtk20 pygtk2 desktopfileutils
 INSTALL_ICONS=	yes
diff --git multimedia/gxmms/Makefile multimedia/gxmms/Makefile
index c7f118f..f6acb25 100644
--- multimedia/gxmms/Makefile
+++ multimedia/gxmms/Makefile
@@ -22,8 +22,8 @@ USE_GMAKE=	yes
 USE_GNOME=	gnomehack gnomepanel gnomeprefix intlhack libgnomeui
 USE_GETTEXT=	yes
 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
 
 .include <bsd.port.mk>
diff --git multimedia/kaffeine-mozilla/Makefile multimedia/kaffeine-mozilla/Makefile
index 2d412c7..009a519 100644
--- multimedia/kaffeine-mozilla/Makefile
+++ multimedia/kaffeine-mozilla/Makefile
@@ -22,7 +22,7 @@ USE_BZIP2=	yes
 USE_WEBPLUGINS=	native
 WEBPLUGINS_FILES=kaffeineplugin.so
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include"
+CPPFLAGS+=	-I${LOCALBASE}/include
 USE_AUTOTOOLS=	libtool
 
 .include <bsd.port.pre.mk>
diff --git multimedia/kino/Makefile multimedia/kino/Makefile
index efaf2e0..ee0c5d7 100644
--- multimedia/kino/Makefile
+++ multimedia/kino/Makefile
@@ -30,11 +30,11 @@ USE_GMAKE=	yes
 USE_GNOME=	gnomehack gnomeprefix libglade2 libxml2
 USE_ICONV=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include/lqt		\
-			-I${LOCALBASE}/include"	\
-		LDFLAGS="-L${LOCALBASE}/lib/libquicktime	\
-			-L${LOCALBASE}/lib"	\
-		PTHREAD_LIBS="${PTHREAD_LIBS}"
+CONFIGURE_ENV=	PTHREAD_LIBS="${PTHREAD_LIBS}"
+CPPFLAGS+=	-I${LOCALBASE}/include/lqt		\
+		-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib/libquicktime	\
+		-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--with-dv1394
 MAN1=	kino.1 kino2raw.1
 
diff --git multimedia/kissdx/Makefile multimedia/kissdx/Makefile
index 9b2165a..6edff84 100644
--- multimedia/kissdx/Makefile
+++ multimedia/kissdx/Makefile
@@ -28,7 +28,7 @@ MAN1=		kissdx.1
 USE_RC_SUBR=	kissdx
 
 # set enviroment variables for port makefile
-MAKE_ENV=	FreeBSD=defined LDFLAGS="${LDFLAGS}"
+MAKE_ENV=	FreeBSD=defined
 
 # Convert CR/LF to LF in source files
 USE_DOS2UNIX=	yes
diff --git multimedia/libdv/Makefile multimedia/libdv/Makefile
index d0077ac..1c1e625 100644
--- multimedia/libdv/Makefile
+++ multimedia/libdv/Makefile
@@ -21,9 +21,9 @@ LIB_DEPENDS=	jpeg.11:${PORTSDIR}/graphics/jpeg \
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--disable-gtk
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
-		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" \
-		PKG_CONFIG_PATH=${PKG_CONFIG_PATH}:${LOCALBASE}/libdata/pkgconfig
+CONFIGURE_ENV=	PKG_CONFIG_PATH=${PKG_CONFIG_PATH}:${LOCALBASE}/libdata/pkgconfig
+CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 USE_LDCONFIG=	yes
 
 MAN1=	dubdv.1 dvconnect.1 encodedv.1
@@ -39,7 +39,7 @@ OPTIONS+=	SDL	"Add SDL support" off
 # Optimizations -O{1,s,2,3} work
 # However, lack of -O{1,s,2,3} or -O0 BREAK the build
 # Therefore, make sure we have AT LEAST -O and avoid -O0
-CONFIGURE_ENV+=	CFLAGS="-O ${CFLAGS:N-O0}"
+CFLAGS:=	-O ${CFLAGS:N-O0}
 
 .if defined(WITH_SDL)
 USE_SDL=	sdl
diff --git multimedia/libdvdplay/Makefile multimedia/libdvdplay/Makefile
index e568eda..bf222b0 100644
--- multimedia/libdvdplay/Makefile
+++ multimedia/libdvdplay/Makefile
@@ -21,7 +21,7 @@ USE_AUTOTOOLS=	libtool
 USE_BZIP2=	yes
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--with-dvdread-tree=${LOCALBASE}/include
-CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib"
+LDFLAGS+=	-L${LOCALBASE}/lib
 MAKE_JOBS_SAFE=	yes
 
 .include <bsd.port.mk>
diff --git multimedia/libmpeg3/Makefile multimedia/libmpeg3/Makefile
index f38f401..c270ffa 100644
--- multimedia/libmpeg3/Makefile
+++ multimedia/libmpeg3/Makefile
@@ -33,8 +33,8 @@ BIN_FILES=	mpeg3cat mpeg3dump mpeg3peek mpeg3toc
 INC_FILES=	libmpeg3.h mpeg3private.h mpeg3protos.h
 LIB_FILES=	libmpeg3.a
 
-CPPFLAGS=	-I. -I${LOCALBASE}/include/a52dec ${PTHREAD_CFLAGS}
-LDFLAGS=	-lm -L${LOCALBASE}/lib -la52 ${PTHREAD_LIBS}
+CPPFLAGS+=	-I. -I${LOCALBASE}/include/a52dec ${PTHREAD_CFLAGS}
+LDFLAGS+=	-lm -L${LOCALBASE}/lib -la52 ${PTHREAD_LIBS}
 
 NASM?=		${LOCALBASE}/bin/nasm
 
diff --git multimedia/libquicktime/Makefile multimedia/libquicktime/Makefile
index 5bda578..0ff585c 100644
--- multimedia/libquicktime/Makefile
+++ multimedia/libquicktime/Makefile
@@ -28,8 +28,8 @@ USE_GETTEXT=	yes
 MAKE_JOBS_SAFE=	yes
 USE_AUTOTOOLS=	autoconf
 
-CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}"
-CONFIGURE_ENV+=	LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS} -lintl"
+CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS} -lintl
 
 CFLAGS+=	-fPIC
 .if !defined(_BUILDING_LIBQUICKTIME_PLUGINS)
diff --git multimedia/libtheora/Makefile multimedia/libtheora/Makefile
index e09d525..0c44633 100644
--- multimedia/libtheora/Makefile
+++ multimedia/libtheora/Makefile
@@ -22,9 +22,9 @@ USE_LDCONFIG=	yes
 MAKE_JOBS_SAFE=	yes
 USE_AUTOTOOLS=	libtool
 USE_GNOME=	ltverhack
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include " \
-		LDFLAGS="-L${LOCALBASE}/lib" \
-		LIBS="${PTHEAD_LIBS}"
+CONFIGURE_ENV=	LIBS="${PTHEAD_LIBS}"
+CPPFLAGS+=	-I${LOCALBASE}/include 
+LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS+=--disable-sdltest \
 		--enable-shared \
 		--disable-examples
diff --git multimedia/libva/Makefile multimedia/libva/Makefile
index f2ba587..b6d738e 100644
--- multimedia/libva/Makefile
+++ multimedia/libva/Makefile
@@ -25,7 +25,6 @@ USE_GL=		gl
 USE_AUTOTOOLS=	aclocal autoheader automake autoconf libtoolize
 ACLOCAL_ARGS=	-I.
 AUTOMAKE_ARGS=	--add-missing
-CONFIGURE_ENV=	LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--program-prefix=va
 USE_LDCONFIG=	yes
 
diff --git multimedia/libxine/Makefile multimedia/libxine/Makefile
index ec36720..3211c2d 100644
--- multimedia/libxine/Makefile
+++ multimedia/libxine/Makefile
@@ -51,12 +51,12 @@ USE_GL=		gl glu
 USE_PERL5_BUILD=yes
 USE_SDL=	sdl
 USE_LDCONFIG=	yes
-CONFIGURE_ENV=	CFLAGS="${CFLAGS} -fno-force-addr -I${LOCALBASE}/include -I${LOCALBASE}/include/dvdread -I${LOCALBASE}/include/ffmeg" \
-		CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/ffmpeg" \
-		LDFLAGS="-L${LOCALBASE}/lib" \
-		THREAD_CFLAGS="${PTHREAD_CFLAGS}" \
+CONFIGURE_ENV=	THREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		THREAD_LIBS="${PTHREAD_LIBS}" \
 		EXTRA_X_LIBS="-lGL -lGLU -lXext -lX11 -lm"
+CPPFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include/ffmpeg
+LDFLAGS+=	-L${LOCALBASE}/lib
+CFLAGS+=	-fno-force-addr -I${LOCALBASE}/include -I${LOCALBASE}/include/dvdread -I${LOCALBASE}/include/ffmeg
 CONFIGURE_ARGS=	--with-w32-path=${LOCALBASE}/lib/win32 \
 		--enable-ipv6 \
 		--with-external-libmad \
diff --git multimedia/lives/Makefile multimedia/lives/Makefile
index 81d9587..dd27151 100644
--- multimedia/lives/Makefile
+++ multimedia/lives/Makefile
@@ -53,11 +53,10 @@ USE_GHOSTSCRIPT_RUN=	yes
 GNU_CONFIGURE=	yes
 MAKE_JOBS_SAFE=	yes
 
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--disable-ldvgrab
 
-CPPFLAGS=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS} -fPIC
-LDFLAGS=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
+CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS} -fPIC
+LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 
 DOC_FILES=	AUTHORS BUGS ChangeLog FEATURES GETTING.STARTED README \
 		OMC/lives-OMC.txt \
diff --git multimedia/lsdvd/Makefile multimedia/lsdvd/Makefile
index b5491b9..39d4c19 100644
--- multimedia/lsdvd/Makefile
+++ multimedia/lsdvd/Makefile
@@ -17,7 +17,8 @@ COMMENT=	Print information about the contents and structure of a DVD
 LIB_DEPENDS=	dvdread.4:${PORTSDIR}/multimedia/libdvdread
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 MAN1=		lsdvd.1
 PLIST_FILES=	bin/lsdvd
diff --git multimedia/lxdvdrip/Makefile multimedia/lxdvdrip/Makefile
index c62ee70..82eba65 100644
--- multimedia/lxdvdrip/Makefile
+++ multimedia/lxdvdrip/Makefile
@@ -44,7 +44,6 @@ LXDVDRIPSRC=	cputest.c \
 		vaporize.c
 CFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
 LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS} -ldvdread -lm
-MAKE_ENV+=	LDFLAGS="${LDFLAGS}"
 
 PORTDOCS=	Changelog.de Changelog.en Changelog.fr \
 		README.de  README.en README.fr \
diff --git multimedia/miro/Makefile multimedia/miro/Makefile
index d0d9c69..3cac9fb 100644
--- multimedia/miro/Makefile
+++ multimedia/miro/Makefile
@@ -46,7 +46,7 @@ INSTALLS_EGGINFO=	yes
 MANCOMPRESSED=	yes
 MAN1=		miro.1 miro.real.1
 
-CPPFLAGS=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
 
 .include <bsd.port.pre.mk>
 
diff --git multimedia/mjpegtools/Makefile multimedia/mjpegtools/Makefile
index b1e1f0e..07adb79 100644
--- multimedia/mjpegtools/Makefile
+++ multimedia/mjpegtools/Makefile
@@ -30,8 +30,7 @@ WANT_GNOME=	yes
 WANT_SDL=	yes
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
-CONFIGURE_ENV=	LDFLAGS="${LDFLAGS}" \
-		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
+CONFIGURE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		PTHREAD_LIBS="${PTHREAD_LIBS}" \
 		ac_cv_lib_Xxf86dga_XF86DGAQueryExtension=no
 CONFIGURE_ARGS=	--without-x
@@ -50,8 +49,8 @@ DOC_FILES=	AUTHORS BUGS CHANGES ChangeLog HINTS NEWS PLANS README \
 		README.DV README.avilib README.glav README.AltiVec \
 		README.lavpipe README.transist TODO
 
-CPPFLAGS=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
+CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 
 .include <bsd.port.pre.mk>
 
diff --git multimedia/mkvtoolnix/Makefile multimedia/mkvtoolnix/Makefile
index 065ccd4..a00d946 100644
--- multimedia/mkvtoolnix/Makefile
+++ multimedia/mkvtoolnix/Makefile
@@ -32,8 +32,7 @@ USE_RAKE=	yes
 USE_RUBY=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
-CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS}" \
-		ac_cv_path_PO4A=no
+CONFIGURE_ENV+=	ac_cv_path_PO4A=no
 CONFIGURE_ARGS=	--enable-lzo --enable-bz2 --disable-qt \
 		--with-boost=${LOCALBASE} \
 		--with-boost-filesystem=boost_filesystem \
diff --git multimedia/moonlight/Makefile multimedia/moonlight/Makefile
index b542f2d..9cd5b34 100644
--- multimedia/moonlight/Makefile
+++ multimedia/moonlight/Makefile
@@ -29,8 +29,8 @@ USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomedesktopsharp20
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--with-cairo=system \
 		--with-debug=yes \
 		--with-ff2=no \
diff --git multimedia/mp4split/Makefile multimedia/mp4split/Makefile
index e1eb273..6b49f0a 100644
--- multimedia/mp4split/Makefile
+++ multimedia/mp4split/Makefile
@@ -17,8 +17,8 @@ LIB_DEPENDS=	expat.6:${PORTSDIR}/textproc/expat2
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--with-expat
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 PLIST_FILES=	bin/mp4split
 
diff --git multimedia/mpeg4ip/Makefile multimedia/mpeg4ip/Makefile
index 01750fe..e449541 100644
--- multimedia/mpeg4ip/Makefile
+++ multimedia/mpeg4ip/Makefile
@@ -36,8 +36,8 @@ USE_GMAKE=	yes
 MAKE_JOBS_SAFE=	yes
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include/SDL -I${LOCALBASE}/include/ffmpeg -I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
-		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CPPFLAGS+=	-I${LOCALBASE}/include/SDL -I${LOCALBASE}/include/ffmpeg -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 CONFIGURE_ARGS=	--enable-ffmpeg=${LOCALBASE} \
 		--enable-mp4live \
 		--disable-static
diff --git multimedia/mythtv-frontend/Makefile multimedia/mythtv-frontend/Makefile
index 497fe84..8ed6380 100644
--- multimedia/mythtv-frontend/Makefile
+++ multimedia/mythtv-frontend/Makefile
@@ -42,7 +42,8 @@ MAKE_ENV=	QTDIR="${QT_PREFIX}" \
 
 CPPFLAGS+=	${QTCPPFLAGS}
 CONFIGURE_ENV+=	QMAKESPEC="${QMAKESPEC}" MOC="${MOC}" \
-		QTDIR="${QT_PREFIX}" LDFLAGS="-L${LOCALBASE}/lib"
+		QTDIR="${QT_PREFIX}"
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 CONFIGURE_ARGS=	--prefix="${PREFIX}" --disable-audio-alsa --disable-firewire --disable-iptv \
 		--disable-hdhomerun \
diff --git multimedia/mythtv/Makefile multimedia/mythtv/Makefile
index ed8ff2d..d504fd5 100644
--- multimedia/mythtv/Makefile
+++ multimedia/mythtv/Makefile
@@ -48,7 +48,8 @@ MAKE_ENV=	QTDIR="${QT_PREFIX}" \
 
 CPPFLAGS+=	${QTCPPFLAGS}
 CONFIGURE_ENV+=	QMAKESPEC="${QMAKESPEC}" MOC="${MOC}" \
-		QTDIR="${QT_PREFIX}" LDFLAGS="-L${LOCALBASE}/lib"
+		QTDIR="${QT_PREFIX}"
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 CONFIGURE_ARGS=	--prefix=${PREFIX} --dvb-path=${LOCALBASE}/include \
 		--extra-cflags=-g --extra-cxxflags=-g --enable-v4l \
diff --git multimedia/oggvideotools/Makefile multimedia/oggvideotools/Makefile
index 2be767e..704ef96 100644
--- multimedia/oggvideotools/Makefile
+++ multimedia/oggvideotools/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS=	gd.4:${PORTSDIR}/graphics/gd \
 
 USE_SDL=	sdl
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS=-I${LOCALBASE}/include
+CPPFLAGS+=	-I${LOCALBASE}/include
 MAKEFILE=	makefile
 
 .for app in oggSplit oggDump oggJoin oggCut oggCat oggLength oggSlideshow oggThumb oggResize oggSilence oggScroll mkThumbs mkSlideshow
diff --git multimedia/ogmrip/Makefile multimedia/ogmrip/Makefile
index ad3b4af..4b442d9 100644
--- multimedia/ogmrip/Makefile
+++ multimedia/ogmrip/Makefile
@@ -40,13 +40,12 @@ USE_GNOME=	glib20 gnomehack intlhack libxml2
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 USE_LDCONFIG=	yes
 
 MAN1=		dvdcpy.1 avibox.1
 
-CPPFLAGS=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .include <bsd.port.pre.mk>
 
diff --git multimedia/pitivi/Makefile multimedia/pitivi/Makefile
index e172e29..c3ed61d 100644
--- multimedia/pitivi/Makefile
+++ multimedia/pitivi/Makefile
@@ -24,8 +24,8 @@ USE_GSTREAMER=	gnonlin python good
 USE_PYTHON=	yes
 INSTALLS_ICONS=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBAES}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBAES}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--localstatedir=/var
 USE_LDCONFIG=	yes
 
diff --git multimedia/py-gstreamer/Makefile multimedia/py-gstreamer/Makefile
index 1570755..6af9c48 100644
--- multimedia/py-gstreamer/Makefile
+++ multimedia/py-gstreamer/Makefile
@@ -28,8 +28,8 @@ USE_GNOME=	pygobject gnomehack pkgconfig
 USE_GSTREAMER=	yes
 GNU_CONFIGURE=	yes
 PLIST_SUB=	VERSION="${GST_VERSION}"
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
-		LDFLAGS="-L${LOCALBASE} ${PTHREAD_LIBS}"
+CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS+=	-L${LOCALBASE} ${PTHREAD_LIBS}
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|DLFCN|dl|g' ${WRKSRC}/gst/__init__.py
diff --git multimedia/py-kaa-metadata/Makefile multimedia/py-kaa-metadata/Makefile
index 55c56bf..8143b9b 100644
--- multimedia/py-kaa-metadata/Makefile
+++ multimedia/py-kaa-metadata/Makefile
@@ -24,6 +24,5 @@ USE_PYDISTUTILS=	yes
 
 CFLAGS+=	-I${PREFIX}/include
 LDFLAGS+=	-L${PREFIX}/lib
-MAKE_ENV+=	LDFLAGS="${LDFLAGS}"	# ${CFLAGS} is already there
 
 .include <bsd.port.mk>
diff --git multimedia/quark/Makefile multimedia/quark/Makefile
index cd53c78..d44963f 100644
--- multimedia/quark/Makefile
+++ multimedia/quark/Makefile
@@ -21,8 +21,8 @@ USE_GNOME=	gnomehack gnomeprefix gnomevfs2
 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
 
 MAKE_JOBS_SAFE=	yes
 
diff --git multimedia/recmpeg/Makefile multimedia/recmpeg/Makefile
index ebd153a..740403b 100644
--- multimedia/recmpeg/Makefile
+++ multimedia/recmpeg/Makefile
@@ -18,13 +18,12 @@ COMMENT=	A simple video encoder
 LIB_DEPENDS=	fame-0.9.1:${PORTSDIR}/multimedia/libfame
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 
 MAN1=		recmpeg.1
 PLIST_FILES=	bin/recmpeg
 
-CPPFLAGS=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .include <bsd.port.pre.mk>
 
diff --git multimedia/rtmpdump/Makefile multimedia/rtmpdump/Makefile
index 1ca4899..989778f 100644
--- multimedia/rtmpdump/Makefile
+++ multimedia/rtmpdump/Makefile
@@ -21,7 +21,8 @@ MAN8=		rtmpgw.8
 USE_GNOME=	pkgconfig
 USE_LDCONFIG=	yes
 USE_OPENSSL=	yes
-MAKE_ENV=	CFLAGS="${PTHREAD_CFLAGS}" THREADLIB="${PTHREAD_LIBS}"
+MAKE_ENV=	THREADLIB="${PTHREAD_LIBS}"
+CFLAGS+=	${PTHREAD_CFLAGS}
 PORTDOCS=	ChangeLog README
 
 .include <bsd.port.pre.mk>
diff --git multimedia/sabbu/Makefile multimedia/sabbu/Makefile
index 8713693..e2f4e75 100644
--- multimedia/sabbu/Makefile
+++ multimedia/sabbu/Makefile
@@ -26,7 +26,6 @@ GNU_CONFIGURE=	yes
 USE_GNOME=	gtk20
 CFLAGS+=	${PTHREAD_CFLAGS} -I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS} -lswscale
-CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS}"
 
 .if defined(WITHOUT_NLS)
 CONFIGURE_ARGS+=	--disable-nls
diff --git multimedia/smpeg/Makefile multimedia/smpeg/Makefile
index b11e6a2..ce813f3 100644
--- multimedia/smpeg/Makefile
+++ multimedia/smpeg/Makefile
@@ -23,8 +23,8 @@ GNU_CONFIGURE=	yes
 USE_SDL=	sdl
 USE_LDCONFIG=	yes
 CONFIGURE_ENV=	GLBASE="${LOCALBASE}" \
-		CPPFLAGS="-I${LOCALBASE}/include" \
 		CC="${CXX}" REAL_CC="${CC}"
+CPPFLAGS+=	-I${LOCALBASE}/include
 
 #If you want to try the opengl player (which doesn't seem to work)
 #comment out the following line.
diff --git multimedia/spook/Makefile multimedia/spook/Makefile
index d526080..d6a8971 100644
--- multimedia/spook/Makefile
+++ multimedia/spook/Makefile
@@ -33,7 +33,8 @@ NOMAN=		defined
 
 SUB_FILES=	pkg-message
 
-CONFIGURE_ENV+=	CFLAGS=-I${LOCALBASE}/include LDFLAGS=-L${LOCALBASE}/lib
+LDFLAGS+=	-L${LOCALBASE}/lib
+CFLAGS+=	-I${LOCALBASE}/include
 
 .include <bsd.port.pre.mk>
 
diff --git multimedia/subtitleeditor/Makefile multimedia/subtitleeditor/Makefile
index 7110746..f61403e 100644
--- multimedia/subtitleeditor/Makefile
+++ multimedia/subtitleeditor/Makefile
@@ -28,9 +28,8 @@ USE_GSTREAMER=	good
 USE_GETTEXT=	yes
 INSTALLS_ICONS=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
-CPPFLAGS=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 PLIST_SUB=	DESKTOPDIR="${DESKTOPDIR:S,^${PREFIX}/,,}"
 MAN1=		subtitleeditor.1
 
diff --git multimedia/swfdec-gnome/Makefile multimedia/swfdec-gnome/Makefile
index 4a90ef9..5d310df 100644
--- multimedia/swfdec-gnome/Makefile
+++ multimedia/swfdec-gnome/Makefile
@@ -23,8 +23,8 @@ INSTALLS_ICONS=	yes
 USE_GMAKE=	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
 
 GCONF_SCHEMAS=	swfdec-thumbnailer.schemas
 
diff --git multimedia/totem-pl-parser/Makefile multimedia/totem-pl-parser/Makefile
index 49eae52..fa13547 100644
--- multimedia/totem-pl-parser/Makefile
+++ multimedia/totem-pl-parser/Makefile
@@ -26,7 +26,7 @@ USE_GNOME=	gnomehack gnomeprefix glib20 libxml2 intlhack ltverhack
 USE_GETTEXT=	yes
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .include <bsd.port.mk>
diff --git multimedia/totem/Makefile multimedia/totem/Makefile
index 3020a8a..b13a5ed 100644
--- multimedia/totem/Makefile
+++ multimedia/totem/Makefile
@@ -38,9 +38,9 @@ USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
 INSTALLS_OMF=	yes
 PKGMESSAGE=	${WRKDIR}/pkg-message
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-	       	LIBS="-L${LOCALBASE}/lib -lXrandr" \
+CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib -lXrandr" \
 		BROWSER_PLUGIN_DIR="${WEBPLUGINS_DIR}"
+CPPFLAGS+=	-I${LOCALBASE}/include
 CONFIGURE_ARGS=	--with-plugins="${TOTEM_PLUGINS}"
 
 MAN1=		totem.1 totem-video-thumbnailer.1
diff --git multimedia/transcode/Makefile multimedia/transcode/Makefile
index 17b5a3e..98cc3ee 100644
--- multimedia/transcode/Makefile
+++ multimedia/transcode/Makefile
@@ -28,8 +28,8 @@ WANT_SDL=	yes
 WANT_GNOME=	yes
 USE_AUTOTOOLS=	libtool
 CPPFLAGS+=	-isystem ${LOCALBASE}/include
-CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib" \
-		SDL_CONFIG="${SDL_CONFIG}"
+CONFIGURE_ENV=	SDL_CONFIG="${SDL_CONFIG}"
+LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS+=	--with-libmpeg2-prefix=${LOCALBASE} \
 			--with-libavcodec-prefix=${LOCALBASE} \
 			--enable-oss
diff --git multimedia/vamps/Makefile multimedia/vamps/Makefile
index d9cbfcd..1c93a37 100644
--- multimedia/vamps/Makefile
+++ multimedia/vamps/Makefile
@@ -17,7 +17,6 @@ COMMENT=	High performance tool to transcode DVD videos to a smaller size
 LIB_DEPENDS=	dvdread.4:${PORTSDIR}/multimedia/libdvdread
 
 USE_GMAKE=	yes
-MAKE_ENV=	LDFLAGS="${LDFLAGS}"
 MAKE_JOBS_SAFE=	yes
 
 CFLAGS+=	-DHAVE_BUILTIN_EXPECT \
diff --git multimedia/vcdimager/Makefile multimedia/vcdimager/Makefile
index ee9c449..4cdb514 100644
--- multimedia/vcdimager/Makefile
+++ multimedia/vcdimager/Makefile
@@ -24,8 +24,8 @@ GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack pkgconfig lthack
-CONFIGURE_ENV=	CPPFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	${CXXFLAGS} -I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 MAN1=		cdxa2mpeg.1 vcdimager.1 vcdxminfo.1 vcdxrip.1 vcdxgen.1 \
 		vcdxbuild.1 vcd-info.1
diff --git multimedia/vdpau-video/Makefile multimedia/vdpau-video/Makefile
index de12ba7..a471b95 100644
--- multimedia/vdpau-video/Makefile
+++ multimedia/vdpau-video/Makefile
@@ -26,7 +26,6 @@ USE_GL=		gl
 
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-isystem${LOCALBASE}/include
-CONFIGURE_ENV=	LDFLAGS="${LDFLAGS}"
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 .include <bsd.port.pre.mk>
diff --git multimedia/vlc/Makefile multimedia/vlc/Makefile
index 85bb802..1ddb320 100644
--- multimedia/vlc/Makefile
+++ multimedia/vlc/Makefile
@@ -109,8 +109,9 @@ GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${FAKEDIR}/include -I${WRKSRC}/include \
 		-I${LOCALBASE}/include -I${LOCALBASE}/ffmpeg \
 		${PTHREAD_CFLAGS}
-CONFIGURE_ENV=	LDFLAGS="${LDFLAGS} -L${FAKEDIR}/lib \
-		-L${LOCALBASE}/lib ${PTHREAD_LIBS} -lc" LIBS="-lc"
+CONFIGURE_ENV=	LIBS="-lc"
+LDFLAGS+=	-L${FAKEDIR}/lib \
+		-L${LOCALBASE}/lib ${PTHREAD_LIBS} -lc
 
 CONFIGURE_ARGS+=	--enable-vlc \
 			--enable-avcodec \
diff --git multimedia/w_scan/Makefile multimedia/w_scan/Makefile
index a8d6522..f668303 100644
--- multimedia/w_scan/Makefile
+++ multimedia/w_scan/Makefile
@@ -25,7 +25,6 @@ PORTDOCS=	COPYING ChangeLog README
 PLIST_FILES=	bin/${PORTNAME}
 MAN1=		w_scan.1
 MAKE_JOBS_SAFE=	yes
-CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS}"
 
 post-patch:
 	${REINPLACE_CMD} -f ${FILESDIR}/types.sed ${WRKSRC}/configure ${WRKSRC}/*.c ${WRKSRC}/*.h
diff --git multimedia/xawtv/Makefile multimedia/xawtv/Makefile
index cb37b88..7c2e4a3 100644
--- multimedia/xawtv/Makefile
+++ multimedia/xawtv/Makefile
@@ -32,8 +32,8 @@ GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_PERL5=	yes
 USE_XORG=	x11 xaw
-CONFIGURE_ENV=	LIBS="-L${PREFIX}/lib -L${LOCALBASE}/lib" \
-		CFLAGS="-I${WRKSRC}/common"
+CONFIGURE_ENV=	LIBS="-L${PREFIX}/lib -L${LOCALBASE}/lib"
+CFLAGS+=	-I${WRKSRC}/common
 MAKE_ENV=	verbose=yes
 USE_LDCONFIG=	yes
 ONLY_FOR_ARCHS=	alpha amd64 i386
diff --git multimedia/xbmc/Makefile multimedia/xbmc/Makefile
index 268191c..2430b7f 100644
--- multimedia/xbmc/Makefile
+++ multimedia/xbmc/Makefile
@@ -99,8 +99,8 @@ DESKTOP_ENTRIES="XBMC" \
 		"AudioVideo;Video;" \
 		true
 
-CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 CONFIGURE_ARGS+=	--enable-external-libraries
 
diff --git multimedia/xfce4-parole/Makefile multimedia/xfce4-parole/Makefile
index 4458a4a..ebf6794 100644
--- multimedia/xfce4-parole/Makefile
+++ multimedia/xfce4-parole/Makefile
@@ -35,9 +35,9 @@ CONFIGURE_ARGS=	--disable-power-manager-plugin \
 		--enable-taglib \
 		--disable-gtk-doc-html \
 		--without-html-dir
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib" \
-		ac_cv_prog_AWK="${AWK}"
+CONFIGURE_ENV=	ac_cv_prog_AWK="${AWK}"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 USE_GNOME=	gnomehack gtk20 glib20 intltool intlhack pkgconfig \
 		desktopfileutils
 USE_XFCE=	configenv libgui libutil
diff --git multimedia/xine/Makefile multimedia/xine/Makefile
index 0c6126c..21aafd2 100644
--- multimedia/xine/Makefile
+++ multimedia/xine/Makefile
@@ -27,10 +27,10 @@ USE_GMAKE=	yes
 INSTALLS_ICONS=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--enable-vdr-keys
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib" \
-		THREAD_CFLAGS="${PTHREAD_CFLAGS}" \
+CONFIGURE_ENV=	THREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		THREAD_LIBS="${PTHREAD_LIBS}"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 MAKE_JOBS_SAFE=	yes
 
 MANLANG=	"" de es fr pl
diff --git multimedia/xmms-status-plugin/Makefile multimedia/xmms-status-plugin/Makefile
index 13a1840..c5f47f6 100644
--- multimedia/xmms-status-plugin/Makefile
+++ multimedia/xmms-status-plugin/Makefile
@@ -19,8 +19,8 @@ USE_XORG=	x11 xpm
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 post-patch:
 	${REINPLACE_CMD} -e 's,-Werror,,' ${WRKSRC}/configure
diff --git multimedia/xmms/Makefile multimedia/xmms/Makefile
index 46ddde4..839a3b0 100644
--- multimedia/xmms/Makefile
+++ multimedia/xmms/Makefile
@@ -26,12 +26,12 @@ USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	automake autoconf libtool
 AUTOTOOLSFILES=	aclocal.m4
 AUTOMAKE_ARGS=	--add-missing
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib" \
+CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib" \
 		PTHREAD_LIBS="${PTHREAD_LIBS}" \
 		INPUT_PLUGINS="${INPUT_PLUGINS}" \
 		OUTPUT_PLUGINS="${OUTPUT_PLUGINS}" \
 		VISUALIZATION_PLUGINS="${VISUALIZATION_PLUGINS}"
+CPPFLAGS+=	-I${LOCALBASE}/include
 CONFIGURE_ARGS=	--enable-static=no
 MAN1=		wmxmms.1 xmms.1
 SUB_FILES=	pkg-message xmms.desktop
diff --git multimedia/xtheater/Makefile multimedia/xtheater/Makefile
index 926c1e8..a2c1243 100644
--- multimedia/xtheater/Makefile
+++ multimedia/xtheater/Makefile
@@ -26,11 +26,10 @@ USE_GNOME=	gtk12
 USE_GL=		yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--enable-gl
 
-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|$${CONFIG_SHELL-/bin/sh} $$ac_aux_dir|$$ac_aux_dir|' \
diff --git net-im/ayttm/Makefile net-im/ayttm/Makefile
index c141efb..d229a56 100644
--- net-im/ayttm/Makefile
+++ net-im/ayttm/Makefile
@@ -31,13 +31,12 @@ USE_GNOME=	gtk20
 USE_OPENSSL=	yes
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libltdl libtool
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--enable-oscar --disable-workwizu --enable-smtp --enable-lj
 
 MAN1=		ayttm.1
 
-CPPFLAGS=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .include <bsd.port.pre.mk>
 
diff --git net-im/centericq/Makefile net-im/centericq/Makefile
index 1dbada7..6f2846a 100644
--- net-im/centericq/Makefile
+++ net-im/centericq/Makefile
@@ -20,8 +20,8 @@ USE_ICONV=	yes
 USE_OPENSSL=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
-		CXXFLAGS="-I${LOCALBASE}/include ${CXXFLAGS}"
+CPPFLAGS+=	-I${LOCALBASE}/include
+CXXFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib -lstdc++
 CONFIGURE_ARGS=	--with-openssl --disable-konst
 
diff --git net-im/centerim/Makefile net-im/centerim/Makefile
index 258d858..8f98573 100644
--- net-im/centerim/Makefile
+++ net-im/centerim/Makefile
@@ -21,8 +21,8 @@ USE_ICONV=	yes
 USE_OPENSSL=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
-		CXXFLAGS="-I${LOCALBASE}/include ${CXXFLAGS}"
+CPPFLAGS+=	-I${LOCALBASE}/include
+CXXFLAGS+=	-I${LOCALBASE}/include
 CONFIGURE_ARGS=	--with-ssl --with-openssl
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 CONFLICTS=	centericq-[0-9]* centerim-devel-[0-9]*
diff --git net-im/cli-msn/Makefile net-im/cli-msn/Makefile
index f5efd28..c032503 100644
--- net-im/cli-msn/Makefile
+++ net-im/cli-msn/Makefile
@@ -21,7 +21,6 @@ USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_LIBS}
 LDFLAGS+=	-L${LOCALBASE}/lib
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 
 WRKSRC=		${WRKDIR}/climsn
 SUB_FILES=	pkg-message
diff --git net-im/climm/Makefile net-im/climm/Makefile
index cfeccae..2a9f216 100644
--- net-im/climm/Makefile
+++ net-im/climm/Makefile
@@ -18,7 +18,6 @@ COMMENT=	CLI-based Multi-Messenger
 
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 MAN1=		climm.1
diff --git net-im/empathy/Makefile net-im/empathy/Makefile
index 614eff0d..64d5163 100644
--- net-im/empathy/Makefile
+++ net-im/empathy/Makefile
@@ -42,8 +42,8 @@ INSTALLS_OMF=	yes
 INSTALLS_ICONS=	yes
 USE_PYTHON=	yes
 MAKE_JOBS_UNSAFE=yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--disable-Werror \
 		--with-ca-file=${LOCALBASE}/share/certs/ca-root-nss.crt
 
diff --git net-im/farsight2/Makefile net-im/farsight2/Makefile
index 015e363..d064f51 100644
--- net-im/farsight2/Makefile
+++ net-im/farsight2/Makefile
@@ -23,8 +23,8 @@ USE_GNOME=	gnomehack pkgconfig glib20 ltverhack \
 		pygtk2
 USE_GSTREAMER=	core good bad python
 USE_AUTOTOOLS=	libtool
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .include <bsd.port.pre.mk>
 
diff --git net-im/folks/Makefile net-im/folks/Makefile
index 1083d01..fec8de1 100644
--- net-im/folks/Makefile
+++ net-im/folks/Makefile
@@ -25,8 +25,8 @@ USE_LDCONFIG=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include " \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include 
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 PLIST_SUB=	VERSION=16
 
diff --git net-im/freetalk/Makefile net-im/freetalk/Makefile
index e211bc3..2dd7fcf 100644
--- net-im/freetalk/Makefile
+++ net-im/freetalk/Makefile
@@ -21,8 +21,8 @@ RUN_DEPENDS=	guile>=1.8.6:${PORTSDIR}/lang/guile
 
 USE_GNOME=	pkgconfig glib20
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 
 MAN1=		freetalk.1
 INFO=		freetalk
diff --git net-im/fugu/Makefile net-im/fugu/Makefile
index 5853b98..0daee57 100644
--- net-im/fugu/Makefile
+++ net-im/fugu/Makefile
@@ -24,7 +24,7 @@ GNU_CONFIGURE=	yes
 CFLAGS+=	-I${LOCALBASE}/include -L${LOCALBASE}/lib
 CPPFLAGS+=	-I${LOCALBASE}/include -L${LOCALBASE}/lib
 LDFLAGS+=	-L${LOCALBASE}/lib
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" INSTALL=""
+CONFIGURE_ENV=	INSTALL=""
 PLIST_SUB+=	PORTVERSION=${PORTVERSION}
 
 .include <bsd.port.mk>
diff --git net-im/gajim-devel/Makefile net-im/gajim-devel/Makefile
index e24e383..b154c93 100644
--- net-im/gajim-devel/Makefile
+++ net-im/gajim-devel/Makefile
@@ -28,8 +28,9 @@ USE_GNOME=	pygtk2
 USE_PYTHON=	2.5+
 USE_XORG=	x11 xext xscrnsaver
 
-CONFIGURE_ENV+=	CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib" PYTHON=${PYTHON_CMD}
+CONFIGURE_ENV+=	PYTHON=${PYTHON_CMD}
+LDFLAGS+=	-L${LOCALBASE}/lib
+CFLAGS+=	-I${LOCALBASE}/include
 
 .if !defined(WITHOUT_NLS)
 USE_GETTEXT=	yes
diff --git net-im/gajim/Makefile net-im/gajim/Makefile
index f08cf8e..ed06f95 100644
--- net-im/gajim/Makefile
+++ net-im/gajim/Makefile
@@ -27,8 +27,9 @@ USE_GNOME=	pygtk2
 USE_PYTHON=	2.5+
 USE_XORG=	x11 xext xscrnsaver
 
-CONFIGURE_ENV+=	CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib" PYTHON=${PYTHON_CMD}
+CONFIGURE_ENV+=	PYTHON=${PYTHON_CMD}
+LDFLAGS+=	-L${LOCALBASE}/lib
+CFLAGS+=	-I${LOCALBASE}/include
 
 OPTIONS=	DBUS "Adds support for D-Bus (Desktop Bus)" On \
 		NLS "Native Language Support via gettext utilities" On
diff --git net-im/gale/Makefile net-im/gale/Makefile
index 4a236c2..18b671d 100644
--- net-im/gale/Makefile
+++ net-im/gale/Makefile
@@ -30,7 +30,6 @@ CFLAGS+=	-I${LOCALBASE}/include -L${LOCALBASE}/lib
 CPPFLAGS+=	-I${LOCALBASE}/include -L${LOCALBASE}/lib \
 		-I${LOCALBASE}/include/w3c-libwww
 LDFLAGS+=	-L${LOCALBASE}/lib
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 
 # cheesy hack - test-oop doesn't build, but we don't care.
 pre-configure:
diff --git net-im/gicq/Makefile net-im/gicq/Makefile
index 8d2ae30..d7513a4 100644
--- net-im/gicq/Makefile
+++ net-im/gicq/Makefile
@@ -22,8 +22,8 @@ USE_GETTEXT=	yes
 GNU_CONFIGURE=	yes
 USE_GNOME=	gtk12 gnomehack gnomeprefix
 WANT_GNOME=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
 
 .include <bsd.port.pre.mk>
 
diff --git net-im/gloox/Makefile net-im/gloox/Makefile
index 22f2149..46e5743 100644
--- net-im/gloox/Makefile
+++ net-im/gloox/Makefile
@@ -21,8 +21,8 @@ USE_AUTOTOOLS=	libtool
 USE_BZIP2=	yes
 USE_GNOME=	gnomehack
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	${CXXFLAGS} -I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 USE_LDCONFIG=	yes
 
 post-patch:
diff --git net-im/gossip/Makefile net-im/gossip/Makefile
index bde5890..707e146 100644
--- net-im/gossip/Makefile
+++ net-im/gossip/Makefile
@@ -35,8 +35,8 @@ USE_GNOME=	gnomeprefix intlhack gnomehack gnomepanel gnomedocutils \
 INSTALLS_OMF=	yes
 INSTALLS_ICONS=	yes
 CONFIGURE_ARGS=	--enable-dbus=yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 GCONF_SCHEMAS=	gossip.schemas
 
diff --git net-im/gyach/Makefile net-im/gyach/Makefile
index 7dd6bb9..2520e76 100644
--- net-im/gyach/Makefile
+++ net-im/gyach/Makefile
@@ -15,8 +15,8 @@ MAINTAINER?=	aaron@snaphat.com
 COMMENT=	Gyach is a GTK+ based Yahoo! Chat client
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}" \
-		LDFLAGS="${LDFLAGS} ${PTHREAD_LIBS}"
+LDFLAGS+=	${PTHREAD_LIBS}
+CFLAGS+=	${PTHREAD_CFLAGS}
 USE_GNOME=	gtk20
 
 .include <bsd.port.pre.mk>
diff --git net-im/ickle/Makefile net-im/ickle/Makefile
index cfc5de1..95bbadc 100644
--- net-im/ickle/Makefile
+++ net-im/ickle/Makefile
@@ -28,7 +28,7 @@ USE_AUTOTOOLS=	libtool
 CONFIGURE_ARGS=	--with-sigc-prefix=${LOCALBASE} \
 		--with-gtkmm-prefix=${LOCALBASE} \
 		--with-gnome=no
-CONFIGURE_ENV=	CPPFLAGS="`${LOCALBASE}/bin/sigc-config --cflags`"
+CPPFLAGS+=	`${LOCALBASE}/bin/sigc-config --cflags`
 
 post-patch:
 	@${REINPLACE_CMD} -E -e 's|(gtkmm_config_args[[:space:]]*=).+$$|\1|' \
diff --git net-im/jabber/Makefile net-im/jabber/Makefile
index 59a9498..ed46c88 100644
--- net-im/jabber/Makefile
+++ net-im/jabber/Makefile
@@ -56,7 +56,6 @@ JABBER_RUNDIR=	"/var/run/jabberd"
 JABBER_SPOOLDIR="/var/spool/jabberd"
 JABBER_LOGDIR=	"/var/log/jabberd"
 
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--localstatedir=/var \
 		--sysconfdir=${JABBER_ETCDIR} \
 		--includedir=${PREFIX}/include/jabber \
diff --git net-im/jggtrans/Makefile net-im/jggtrans/Makefile
index 0bd8ea4..0b1841f 100644
--- net-im/jggtrans/Makefile
+++ net-im/jggtrans/Makefile
@@ -22,10 +22,9 @@ USE_GMAKE=		yes
 GNU_CONFIGURE=		yes
 USE_GETTEXT=		yes
 USE_GNOME=		glib20 pkgconfig
-CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=		-I${LOCALBASE}/include
+LDFLAGS+=		-L${LOCALBASE}/lib
 CFLAGS+=		-I${LOCALBASE}/include
-MAKE_ENV=		CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
-			LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
 
 USE_RC_SUBR=		jggtrans.sh
 
diff --git net-im/kmerlin/Makefile net-im/kmerlin/Makefile
index 11b11b8..274224f 100644
--- net-im/kmerlin/Makefile
+++ net-im/kmerlin/Makefile
@@ -20,7 +20,7 @@ USE_AUTOTOOLS=	libtool
 USE_GMAKE=	yes
 
 CONFIGURE_ARGS+=	--prefix=${LOCALBASE}
-CONFIGURE_ENV=	LDFLAGS="${PTHREAD_LIBS}"
+LDFLAGS+=	${PTHREAD_LIBS}
 
 post-patch:
 .for i in replacepage identityeditdialog identitysetting \
diff --git net-im/komclean/Makefile net-im/komclean/Makefile
index 9cc37bd..7f21ba7 100644
--- net-im/komclean/Makefile
+++ net-im/komclean/Makefile
@@ -26,7 +26,6 @@ MAN1=		komclean
 WRKSRC=		${WRKDIR}/${PKGNAME}
 CXXFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
-MAKE_ENV=	LDFLAGS="${LDFLAGS}"
 
 DESKTOP_ENTRIES="KOMclean" \
 		"${COMMENT}" \
diff --git net-im/libjingle/Makefile net-im/libjingle/Makefile
index 92dd4b5..b0570f0 100644
--- net-im/libjingle/Makefile
+++ net-im/libjingle/Makefile
@@ -13,10 +13,8 @@ MASTER_SITES=	SF
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Google Talk's implementation of Jingle and Jingle-Audio
 
-BUILD_DEPENDS=	\
-		pkg-config:${PORTSDIR}/devel/pkg-config
-LIB_DEPENDS=	\
-		speex.1:${PORTSDIR}/audio/speex \
+BUILD_DEPENDS=	pkg-config:${PORTSDIR}/devel/pkg-config
+LIB_DEPENDS=	speex.1:${PORTSDIR}/audio/speex \
 		ilbc.0:${PORTSDIR}/net/ilbc \
 		ortp.5:${PORTSDIR}/net/ortp \
 		expat.6:${PORTSDIR}/textproc/expat2
@@ -30,12 +28,9 @@ USE_AUTOTOOLS=	libtool
 USE_DOS2UNIX=	README
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	\
-		--with-ilbc=${LOCALBASE} \
+CONFIGURE_ARGS=	--with-ilbc=${LOCALBASE} \
 		--with-speex=${LOCALBASE}
-CONFIGURE_ENV=	\
-		CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include -I${OPENSSLINC} ${PTHREAD_CFLAGS} -g" \
-		PKG_CONFIG="${PKG_CONFIG}" \
+CONFIGURE_ENV=	PKG_CONFIG="${PKG_CONFIG}" \
 		EXPAT_CFLAGS="-I${LOCALBASE}/include" \
 		EXPAT_LIBS="-L${LOCALBASE}/lib -lexpat" \
 		GLIB_CFLAGS="$$(${PKG_CONFIG} --cflags glib-2.0)" \
@@ -44,22 +39,20 @@ CONFIGURE_ENV=	\
 		ILBC_LIBS="-L${LOCALBASE}/lib -lilbc" \
 		SPEEX_CFLAGS="$$(${PKG_CONFIG} --cflags speex)" \
 		SPEEX_LIBS="$$(${PKG_CONFIG} --libs speex)"
+CPPFLAGS+=	-I${LOCALBASE}/include -I${OPENSSLINC} ${PTHREAD_CFLAGS} -g
 MAKE_JOBS_SAFE=	yes
 
-DOC_FILES=	\
-		AUTHORS \
+DOC_FILES=	AUTHORS \
 		ChangeLog \
 		DOCUMENTATION \
 		NEWS \
 		README
 
 .ifndef(NOPORTDOCS)
-PORTDOCS=	\
-		${DOC_FILES}
+PORTDOCS=	${DOC_FILES}
 .endif
 
-PLIST_FILES+=	\
-		bin/login \
+PLIST_FILES+=	bin/login \
 		bin/pcp \
 		bin/relayserver \
 		bin/stunserver \
diff --git net-im/libnice/Makefile net-im/libnice/Makefile
index 2a26207..8be2a43 100644
--- net-im/libnice/Makefile
+++ net-im/libnice/Makefile
@@ -20,8 +20,8 @@ USE_LDCONFIG=	yes
 USE_GNOME=	gnomehack pkgconfig glib20 ltverhack
 USE_GSTREAMER=	yes
 USE_AUTOTOOLS=	libtool
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -DHAVE_GETIFADDRS" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include -DHAVE_GETIFADDRS
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|__BYTE_ORDER|_BYTE_ORDER|g ; \
diff --git net-im/libpurple/Makefile net-im/libpurple/Makefile
index fa1e16b..e2a0716 100644
--- net-im/libpurple/Makefile
+++ net-im/libpurple/Makefile
@@ -25,9 +25,9 @@ CONFIGURE_ARGS?=--disable-gtkui \
 		--with-dynamic_prpls=${PRPL_MODULES:S/,$//} \
 		--enable-static \
 		--disable-nm
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
-		LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" \
+CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" \
 		PTHREAD_LIB="${PTHREAD_LIBS}"
+CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
 
 .if !defined(PIDGIN_SLAVE)
 # Pidgin slave ports that require the following functionality, must explicitly
diff --git net-im/loudmouth/Makefile net-im/loudmouth/Makefile
index 3a797c8..da4cf96 100644
--- net-im/loudmouth/Makefile
+++ net-im/loudmouth/Makefile
@@ -24,8 +24,8 @@ USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
 USE_GNOME=	gnomehack glib20 ltverhack
 CONFIGURE_ARGS=	--disable-gtk-doc
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-Wl,-Bsymbolic -L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-Wl,-Bsymbolic -L${LOCALBASE}/lib
 
 OPTIONS=	GNUTLS "Enable SSL (via GnuTLS) support" on \
 		OPENSSL "Enable SSL (via OpenSSL) support" off
diff --git net-im/mcabber/Makefile net-im/mcabber/Makefile
index 006b64f..3c62060 100644
--- net-im/mcabber/Makefile
+++ net-im/mcabber/Makefile
@@ -21,7 +21,8 @@ LICENSE=	GPLv2
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-sigwinch --libdir=${PREFIX}/lib
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 USE_ICONV=	yes
 USE_GETTEXT=	yes
 USE_LDCONFIG=	yes
diff --git net-im/meanwhile/Makefile net-im/meanwhile/Makefile
index fcdfcad..a612f37 100644
--- net-im/meanwhile/Makefile
+++ net-im/meanwhile/Makefile
@@ -21,8 +21,8 @@ USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-doxygen=no \
 		--with-gmp-prefix=${LOCALBASE}
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}-doc-${PORTVERSION}
 
diff --git net-im/pidgin-birthday-reminder/Makefile net-im/pidgin-birthday-reminder/Makefile
index 5b32521..dccb1be 100644
--- net-im/pidgin-birthday-reminder/Makefile
+++ net-im/pidgin-birthday-reminder/Makefile
@@ -24,7 +24,7 @@ GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_GETTEXT=	yes
 USE_GNOME=	pkgconfig intltool
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .include <bsd.port.mk>
diff --git net-im/pidgin-fetion/Makefile net-im/pidgin-fetion/Makefile
index 731861d..67cc78f 100644
--- net-im/pidgin-fetion/Makefile
+++ net-im/pidgin-fetion/Makefile
@@ -22,8 +22,8 @@ MAKE_JOBS_SAFE=	yes
 
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
diff --git net-im/pidgin-guifications/Makefile net-im/pidgin-guifications/Makefile
index 95d1c5b..429f227 100644
--- net-im/pidgin-guifications/Makefile
+++ net-im/pidgin-guifications/Makefile
@@ -22,7 +22,8 @@ USE_GMAKE=	yes
 USE_GETTEXT=	yes
 USE_GNOME=	gnomeprefix gnomehack gtk20
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	"CPPFLAGS=-I${LOCALBASE}/include" "LIBS=-L${LOCALBASE}/lib"
+CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
 
 .include <bsd.port.pre.mk>
 
diff --git net-im/pidgin-libnotify/Makefile net-im/pidgin-libnotify/Makefile
index 60ca66d..36d1ee5 100644
--- net-im/pidgin-libnotify/Makefile
+++ net-im/pidgin-libnotify/Makefile
@@ -34,8 +34,8 @@ USE_GETTEXT=	yes
 PLIST_SUB+=	NLS=""
 .endif
 
-CONFIGURE_ENV=	CPPFLAGS="${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CPPFLAGS+=	${PTHREAD_CFLAGS} -I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 
 CONFIGURE_ARGS=	--disable-static
 
diff --git net-im/telepathy-farsight/Makefile net-im/telepathy-farsight/Makefile
index 018fd3b..589f7e1 100644
--- net-im/telepathy-farsight/Makefile
+++ net-im/telepathy-farsight/Makefile
@@ -29,7 +29,7 @@ USE_LDCONFIG=	yes
 USE_PYTHON=	yes
 USE_AUTOTOOLS=	libtool
 USE_GNOME=	gnomehack pkgconfig glib20 ltverhack
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 
 .include <bsd.port.mk>
diff --git net-im/telepathy-gabble/Makefile net-im/telepathy-gabble/Makefile
index e927679..d7bd49d 100644
--- net-im/telepathy-gabble/Makefile
+++ net-im/telepathy-gabble/Makefile
@@ -28,7 +28,7 @@ LIB_DEPENDS=	soup-2.4.1:${PORTSDIR}/devel/libsoup \
 RUN_DEPENDS+=	${LIB_PC_DEPENDS:C|^|${LOCALBASE}/libdata/pkgconfig/|g}
 
 GNU_CONFIGURE=	yes
-LDFLAGS=	${PTHREAD_LIBS}
+LDFLAGS+=	${PTHREAD_LIBS}
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack pkgconfig glib20
 USE_OPENSSL=	yes
diff --git net-im/telepathy-haze/Makefile net-im/telepathy-haze/Makefile
index c7cc430..b72ef33 100644
--- net-im/telepathy-haze/Makefile
+++ net-im/telepathy-haze/Makefile
@@ -22,7 +22,7 @@ LIB_DEPENDS=	purple.10:${PORTSDIR}/net-im/libpurple \
 		telepathy-glib.0:${PORTSDIR}/net-im/telepathy-glib
 
 USE_GNOME=	pkgconfig
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include"
+CPPFLAGS+=	-I${LOCALBASE}/include
 WRKSRC=	${WRKDIR}/telepathy-${PORTNAME}-${DISTVERSION}
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
diff --git net-im/telepathy-idle/Makefile net-im/telepathy-idle/Makefile
index edaad77..f3f99ee 100644
--- net-im/telepathy-idle/Makefile
+++ net-im/telepathy-idle/Makefile
@@ -30,7 +30,8 @@ USE_GNOME=	gnomehack pkgconfig glib20
 
 MAN8=		telepathy-idle.8
 
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .include <bsd.port.pre.mk>
 
diff --git net-im/telepathy-mission-control/Makefile net-im/telepathy-mission-control/Makefile
index e39ed74..bbbaa67 100644
--- net-im/telepathy-mission-control/Makefile
+++ net-im/telepathy-mission-control/Makefile
@@ -18,7 +18,8 @@ LIB_DEPENDS=	telepathy.2:${PORTSDIR}/net-im/libtelepathy \
 
 USE_GNOME=	gnomeprefix pkgconfig gconf2 libxslt gnomehack ltverhack
 USE_AUTOTOOLS=	libtool
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
 MAKE_JOBS_UNSAFE=yes
diff --git net-im/telepathy-python/Makefile net-im/telepathy-python/Makefile
index 43fe33b..0e977fd 100644
--- net-im/telepathy-python/Makefile
+++ net-im/telepathy-python/Makefile
@@ -25,8 +25,8 @@ RUN_DEPENDS+=	${LIB_PC_DEPENDS:C|^|${LOCALBASE}/libdata/pkgconfig/|g}
 USE_PYTHON=		2.5+
 USE_GMAKE=		yes
 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
 
 .include <bsd.port.mk>
diff --git net-im/telepathy-salut/Makefile net-im/telepathy-salut/Makefile
index 4308ca1..16a4a6c 100644
--- net-im/telepathy-salut/Makefile
+++ net-im/telepathy-salut/Makefile
@@ -29,8 +29,8 @@ USE_GMAKE=	yes
 USE_GNOME=	gnomehack pkgconfig
 USE_OPENSSL=	yes
 USE_PYTHON_BUILD=	yes
-CONFIGURE_ENV=	CPPFLAGS="${PTHREAD_CFLAGS}" \
-		LIBS="${PTHREAD_LIBS}"
+CONFIGURE_ENV=	LIBS="${PTHREAD_LIBS}"
+CPPFLAGS+=	${PTHREAD_CFLAGS}
 
 MAN8=		telepathy-salut.8
 
diff --git net-im/vqcc-gtk/Makefile net-im/vqcc-gtk/Makefile
index 256d52c..6319783 100644
--- net-im/vqcc-gtk/Makefile
+++ net-im/vqcc-gtk/Makefile
@@ -19,9 +19,8 @@ LIB_DEPENDS=	startup-notification-1.0:${PORTSDIR}/x11/startup-notification
 USE_GNOME=	gnomehack gnomeprefix gtk20
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-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}
 
 .include <bsd.port.mk>
diff --git net-im/ysm/Makefile net-im/ysm/Makefile
index 3ef6972..dd2d52b 100644
--- net-im/ysm/Makefile
+++ net-im/ysm/Makefile
@@ -23,9 +23,8 @@ USE_ICONV=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
-		CFLAGS+="-I${LOCALBASE}/include" \
-		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib -liconv"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib -liconv
 
 MAN1=		ysm.1
 PLIST_FILES=	bin/ysm
diff --git net-im/zephyr/Makefile net-im/zephyr/Makefile
index 3ff59ea..30a9558 100644
--- net-im/zephyr/Makefile
+++ net-im/zephyr/Makefile
@@ -43,6 +43,5 @@ KRB5_DIR?=	${DESTDIR}/usr
 
 # it is an upstream bug that --with-krb5 needs a path
 CONFIGURE_ARGS=	--with-krb5="${KRB5_DIR}"
-CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS}" CPPFLAGS="${CPPFLAGS}"
 
 .include <bsd.port.mk>
diff --git net-mgmt/ap-utils/Makefile net-mgmt/ap-utils/Makefile
index bf7dc18..d3678f8 100644
--- net-mgmt/ap-utils/Makefile
+++ net-mgmt/ap-utils/Makefile
@@ -17,9 +17,9 @@ COMMENT=	A set of utilities to configure and monitor wireless access points
 GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
 USE_ICONV=	yes
-CONFIGURE_ENV=	LDFLAGS="-lintl -L${LOCALBASE}/lib" \
-		CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-lintl -L${LOCALBASE}/lib
 MAN8=		ap-trapd.8 ap-mrtg.8 ap-config.8
 
 .if !defined(WITHOUT_NLS)
diff --git net-mgmt/cacti-spine/Makefile net-mgmt/cacti-spine/Makefile
index 6585d11..0e7efe6 100644
--- net-mgmt/cacti-spine/Makefile
+++ net-mgmt/cacti-spine/Makefile
@@ -24,8 +24,8 @@ LIB_DEPENDS=	netsnmp.30:${PORTSDIR}/net-mgmt/net-snmp
 
 GNU_CONFIGURE=	YES
 CONFIGURE_ARGS+=--with-mysql=${LOCALBASE} --with-snmp=${LOCALBASE}
-CONFIGURE_ENV=	LDFLAGS="`net-snmp-config --libs`" \
-		CPPFLAGS="`net-snmp-config --cflags`"
+CPPFLAGS+=	`net-snmp-config --cflags`
+LDFLAGS+=	`net-snmp-config --libs`
 USE_MYSQL=	YES
 USE_OPENSSL=	YES
 USE_AUTOTOOLS=	libtool
diff --git net-mgmt/collectd/Makefile net-mgmt/collectd/Makefile
index 0907e45..62c7b5b 100644
--- net-mgmt/collectd/Makefile
+++ net-mgmt/collectd/Makefile
@@ -53,9 +53,8 @@ USE_LDCONFIG=	yes
 
 CONFLICTS=	collectd-5.[0-9]*
 
-CPPFLAGS=	-I${LOCALBASE}/include
-
-CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .include <bsd.port.pre.mk>
 
diff --git net-mgmt/collectd5/Makefile net-mgmt/collectd5/Makefile
index 0583772..749a67e 100644
--- net-mgmt/collectd5/Makefile
+++ net-mgmt/collectd5/Makefile
@@ -54,9 +54,8 @@ USE_LDCONFIG=	yes
 
 CONFLICTS=	collectd-4.[0-9]*
 
-CPPFLAGS=	-I${LOCALBASE}/include
-
-CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .include <bsd.port.pre.mk>
 
diff --git net-mgmt/disco/Makefile net-mgmt/disco/Makefile
index fa82850..c08d38e 100644
--- net-mgmt/disco/Makefile
+++ net-mgmt/disco/Makefile
@@ -15,8 +15,8 @@ MAINTAINER=	jadawin@FreeBSD.org
 COMMENT=	IP discovery and fingerprinting utility
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
diff --git net-mgmt/etherape/Makefile net-mgmt/etherape/Makefile
index aa3cfc9..0b314d3 100644
--- net-mgmt/etherape/Makefile
+++ net-mgmt/etherape/Makefile
@@ -18,8 +18,8 @@ USE_GNOME=	libglade2 libgnomeui gnomehack gnomeprefix
 USE_GMAKE=	yes
 INSTALLS_OMF=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 MAN1=		etherape.1
 
diff --git net-mgmt/ettercap/Makefile net-mgmt/ettercap/Makefile
index 282470d..ffc8c26 100644
--- net-mgmt/ettercap/Makefile
+++ net-mgmt/ettercap/Makefile
@@ -43,8 +43,7 @@ LIBNET_CONFIG?=	${LOCALBASE}/bin/libnet11-config
 CFLAGS+=		${PTHREAD_CFLAGS}
 CPPFLAGS+=		-I${LOCALBASE}/include
 LDFLAGS+=		-L${LOCALBASE}/lib
-CONFIGURE_ENV+=		CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \
-			LIBS="${LDFLAGS}"
+CONFIGURE_ENV+=		LIBS="${LDFLAGS}"
 CONFIGURE_ARGS+=	--enable-plugins
 
 .if !defined(WITHOUT_GTK)
diff --git net-mgmt/icinga/Makefile net-mgmt/icinga/Makefile
index c48ed59..c89dcff 100644
--- net-mgmt/icinga/Makefile
+++ net-mgmt/icinga/Makefile
@@ -43,7 +43,7 @@ ICINGACGIURL?=	${ICINGAHTMURL}/cgi-bin
 
 .include <bsd.port.pre.mk>
 
-CPPFLAGS=	-I${LOCALBASE}/include -fPIC
+CPPFLAGS+=	-I${LOCALBASE}/include -fPIC
 CFLAGS+=	${CPPFLAGS}
 
 CONFIGURE_ARGS=	--with-command-user=${ICINGAUSER} \
@@ -62,10 +62,7 @@ CONFIGURE_ARGS=	--with-command-user=${ICINGAUSER} \
 		--with-checkresult-dir=${ICINGADIR}/checkresults \
 		--disable-statuswrl
 
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" \
-		CFLAGS="${CFLAGS}" \
-		LDFLAGS="${LDFLAGS}" \
-		LIBS="-L${LOCALBASE}/lib" \
+CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib" \
 		PERL=${PERL}
 
 MAKE_JOBS_UNSAFE=	yes
diff --git net-mgmt/kismet/Makefile net-mgmt/kismet/Makefile
index 0de4499..9894745 100644
--- net-mgmt/kismet/Makefile
+++ net-mgmt/kismet/Makefile
@@ -22,7 +22,6 @@ GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
-CONFIGURE_ENV=	LDFLAGS="${LDFLAGS}"
 
 MAN1=		kismet.1 kismet_drone.1
 MAN5=		kismet.conf.5 kismet_drone.conf.5
diff --git net-mgmt/mbrowse/Makefile net-mgmt/mbrowse/Makefile
index 4d8f2bb..673bc57 100644
--- net-mgmt/mbrowse/Makefile
+++ net-mgmt/mbrowse/Makefile
@@ -20,7 +20,7 @@ GNU_CONFIGURE=	yes
 PLIST_FILES=	bin/mbrowse
 USE_GNOME=	gtk20
 CONFIGURE_ARGS=	--with-snmp-prefix=${PREFIX} --with-snmp-type=net
-CONFIGURE_ENV=	LDFLAGS="`net-snmp-config --libs`" \
-		CPPFLAGS="`net-snmp-config --cflags`"
+CPPFLAGS+=	`net-snmp-config --cflags`
+LDFLAGS+=	`net-snmp-config --libs`
 
 .include <bsd.port.mk>
diff --git net-mgmt/nagios-devel/Makefile net-mgmt/nagios-devel/Makefile
index e6d7ec6..76aec90 100644
--- net-mgmt/nagios-devel/Makefile
+++ net-mgmt/nagios-devel/Makefile
@@ -50,7 +50,7 @@ NAGIOSCGIURL?=	${NAGIOSHTMURL}/cgi-bin
 
 .include <bsd.port.pre.mk>
 
-CPPFLAGS=	-I${LOCALBASE}/include -fPIC
+CPPFLAGS+=	-I${LOCALBASE}/include -fPIC
 CFLAGS+=	${CPPFLAGS}
 
 CONFIGURE_ARGS=	--with-command-user=${NAGIOSUSER} \
@@ -69,10 +69,7 @@ CONFIGURE_ARGS=	--with-command-user=${NAGIOSUSER} \
 		--with-checkresult-dir=${NAGIOSDIR}/checkresults \
 		--disable-statuswrl
 
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" \
-		CFLAGS="${CFLAGS}" \
-		LDFLAGS="${LDFLAGS}" \
-		LIBS="-L${LOCALBASE}/lib" \
+CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib" \
 		PERL=${PERL}
 
 MAKE_JOBS_UNSAFE=	yes
diff --git net-mgmt/nagios-plugins/Makefile net-mgmt/nagios-plugins/Makefile
index f477e76..3e61ea9 100644
--- net-mgmt/nagios-plugins/Makefile
+++ net-mgmt/nagios-plugins/Makefile
@@ -56,10 +56,10 @@ CONFIGURE_ARGS=	--with-nagios-user=${NAGIOSUSER} \
 		--localstatedir=${NAGIOSDIR} \
 		--prefix=${PREFIX}
 
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
-		CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
-		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" \
-		PERL=${PERL}
+CONFIGURE_ENV=	PERL=${PERL}
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
+CFLAGS+=	-I${LOCALBASE}/include
 
 .if defined(WITH_QSTAT)
 BUILD_DEPENDS+=	qstat:${PORTSDIR}/games/qstat
diff --git net-mgmt/nagios-snmp-plugins/Makefile net-mgmt/nagios-snmp-plugins/Makefile
index 3bc7dae..4710a29 100644
--- net-mgmt/nagios-snmp-plugins/Makefile
+++ net-mgmt/nagios-snmp-plugins/Makefile
@@ -33,7 +33,7 @@ CONFIGURE_ARGS=	--sbindir=${PREFIX}/share/nagios/cgi-bin \
 CONFIGURE_ENV=	LOCALBASE=${LOCALBASE}
 
 # Workaround configure.in lameness.
-CONFIGURE_ENV+=	CPPFLAGS="`net-snmp-config --cflags`"
+CPPFLAGS+=	`net-snmp-config --cflags`
 
 .include <bsd.port.pre.mk>
 
diff --git net-mgmt/nagios/Makefile net-mgmt/nagios/Makefile
index cc6ca86..a942f36 100644
--- net-mgmt/nagios/Makefile
+++ net-mgmt/nagios/Makefile
@@ -48,7 +48,7 @@ GROUPS=		${NAGIOSGROUP}
 
 .include <bsd.port.pre.mk>
 
-CPPFLAGS=	-I${LOCALBASE}/include -fPIC
+CPPFLAGS+=	-I${LOCALBASE}/include -fPIC
 CFLAGS+=	${CPPFLAGS}
 
 CONFIGURE_ARGS=	--with-command-user=${NAGIOSUSER} \
@@ -67,8 +67,7 @@ CONFIGURE_ARGS=	--with-command-user=${NAGIOSUSER} \
 		--with-checkresult-dir=${NAGIOSDIR}/checkresults \
 		--disable-statuswrl
 
-CONFIGURE_ENV=	LDFLAGS="${LDFLAGS}" \
-		LIBS="-L${LOCALBASE}/lib" \
+CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib" \
 		PERL=${PERL}
 
 MAKE_JOBS_UNSAFE=	yes
diff --git net-mgmt/nagios2/Makefile net-mgmt/nagios2/Makefile
index 37fbcd0..9ebda1a 100644
--- net-mgmt/nagios2/Makefile
+++ net-mgmt/nagios2/Makefile
@@ -51,7 +51,7 @@ NAGIOSHOMEURL?=	main.html
 
 .include <bsd.port.pre.mk>
 
-CPPFLAGS=	-I${LOCALBASE}/include -fPIC
+CPPFLAGS+=	-I${LOCALBASE}/include -fPIC
 CFLAGS+=	${CPPFLAGS}
 
 CONFIGURE_ARGS=	--with-command-user=${NAGIOSUSER} \
@@ -67,10 +67,7 @@ CONFIGURE_ARGS=	--with-command-user=${NAGIOSUSER} \
 		--localstatedir=${NAGIOSDIR} \
 		--prefix=${PREFIX}
 
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" \
-		CFLAGS="${CFLAGS}" \
-		LDFLAGS="${LDFLAGS}" \
-		LIBS="-L${LOCALBASE}/lib" \
+CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib" \
 		PERL=${PERL}
 
 MAKE_JOBS_UNSAFE=	yes
diff --git net-mgmt/nbtscan/Makefile net-mgmt/nbtscan/Makefile
index 53fae8c..c157d4d 100644
--- net-mgmt/nbtscan/Makefile
+++ net-mgmt/nbtscan/Makefile
@@ -19,8 +19,8 @@ COMMENT=	NetBIOS name network scanner
 MAKE_JOBS_SAFE=	yes
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}a
 ALL_TARGET=	nbtscan
diff --git net-mgmt/nefu/Makefile net-mgmt/nefu/Makefile
index fc40555..46a6d2c 100644
--- net-mgmt/nefu/Makefile
+++ net-mgmt/nefu/Makefile
@@ -18,11 +18,11 @@ COMMENT=	A network monitoring daemon
 USE_RC_SUBR=	nefu
 GNU_CONFIGURE=		yes
 MAKE_JOBS_UNSAFE=	yes
-CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
-			LIBS="-L${LOCALBASE}/lib" \
+CONFIGURE_ENV=		LIBS="-L${LOCALBASE}/lib" \
 			YACC=${YACC} \
 			OPENSSL_CFLAGS="-I${OPENSSLINC}" \
 			OPENSSL_LIBS="-L${OPENSSLLIB} -lcrypto -lssl"
+CPPFLAGS+=		-I${LOCALBASE}/include
 CONFIGURE_ARGS+=	--with-ssl=${OPENSSLBASE} \
 			--without-sasl \
 			--without-zlib \
diff --git net-mgmt/nettop/Makefile net-mgmt/nettop/Makefile
index 15dbb7d..c83f53a 100644
--- net-mgmt/nettop/Makefile
+++ net-mgmt/nettop/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS=	slang.2:${PORTSDIR}/devel/libslang2
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-slang-libraries=${LOCALBASE}/lib \
 		--with-slang-includes=${LOCALBASE}/include
-CONFIGURE_ENV=	LDFLAGS="-lcurses"
+LDFLAGS+=	-lcurses
 
 PLIST_FILES=	bin/nettop
 PORTDOCS=	README THANKS ChangeLog
diff --git net-mgmt/packit/Makefile net-mgmt/packit/Makefile
index 341a944..293d10c 100644
--- net-mgmt/packit/Makefile
+++ net-mgmt/packit/Makefile
@@ -18,7 +18,7 @@ COMMENT=	Network auditing tool
 BUILD_DEPENDS=	${LIBNET_CONFIG}:${PORTSDIR}/net/libnet
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="`${LIBNET_CONFIG} --defines` `${LIBNET_CONFIG} --cflags`"
+CPPFLAGS+=	`${LIBNET_CONFIG} --defines` `${LIBNET_CONFIG} --cflags`
 
 MAN8=		packit.8
 PLIST_FILES=	sbin/packit
diff --git net-mgmt/pmacct/Makefile net-mgmt/pmacct/Makefile
index 6d35a7a..9ba425b 100644
--- net-mgmt/pmacct/Makefile
+++ net-mgmt/pmacct/Makefile
@@ -20,8 +20,8 @@ LICENSE=	GPLv2
 USE_RC_SUBR=	pmacctd
 SUB_FILES=	pkg-message
 GNU_CONFIGURE=	yes
-CPPFLAGS=	"-I${LOCALBASE}/include"
-LDFLAGS=	"-L${LOCALBASE}/lib"
+CPPFLAGS+=	"-I${LOCALBASE}/include"
+LDFLAGS+=	"-L${LOCALBASE}/lib"
 
 OPTIONS=	MYSQL "Enable MySQL support." Off \
 		PGSQL "Enable PostgreSQL support." Off \
diff --git net-mgmt/py-yapsnmp/Makefile net-mgmt/py-yapsnmp/Makefile
index 7891b95..f7e7bee 100644
--- net-mgmt/py-yapsnmp/Makefile
+++ net-mgmt/py-yapsnmp/Makefile
@@ -23,14 +23,14 @@ USE_AUTOTOOLS=	libtool
 USE_GMAKE=	yes
 USE_PYTHON=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include -I${PYTHON_INCLUDEDIR}"  \
-		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include -I${PYTHON_INCLUDEDIR}
+LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS+=--enable-site-packages-prefix=${PREFIX}
 
 .include <bsd.port.pre.mk>
 
 .if (${OSVERSION} >= 800000) && (${ARCH} == "i386")
-CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS} -fstack-protector -I${LOCALBASE}/include"
+CPPFLAGS+=	-fstack-protector -I${LOCALBASE}/include
 .endif
 
 post-patch:
diff --git net-mgmt/satellite/Makefile net-mgmt/satellite/Makefile
index ff3ef7b..cb73874f 100644
--- net-mgmt/satellite/Makefile
+++ net-mgmt/satellite/Makefile
@@ -5,24 +5,24 @@
 # $FreeBSD$
 #
 
-PORTNAME=       satellite
-PORTVERSION=    1.0.2
+PORTNAME=	satellite
+PORTVERSION=	1.0.2
 PORTREVISION=	1
-CATEGORIES=     net-mgmt
-MASTER_SITES=   ${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR= system/network
+CATEGORIES=	net-mgmt
+MASTER_SITES=	${MASTER_SITE_SUNSITE}
+MASTER_SITE_SUBDIR=system/network
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A system for tracking machines with dynamic IP addresses
 
-LIB_DEPENDS=    gdbm.4:${PORTSDIR}/databases/gdbm
+LIB_DEPENDS=	gdbm.4:${PORTSDIR}/databases/gdbm
 
-GNU_CONFIGURE=  yes
-CONFIGURE_ENV=  CPPFLAGS='-I${LOCALBASE}/include' \
-		LDFLAGS='-L${LOCALBASE}/lib'
+GNU_CONFIGURE=	yes
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS+=	--localstatedir=/var/log
 
-MAN8=           satcfg.8 satellite.8 satellited.8 satwatch.8
+MAN8=		satcfg.8 satellite.8 satellited.8 satwatch.8
 
 pre-install:
 	@${SH} pkg-install ${PKGNAME} PRE-INSTALL
diff --git net-mgmt/sblim-wbemcli/Makefile net-mgmt/sblim-wbemcli/Makefile
index 941ba57..88196a2 100644
--- net-mgmt/sblim-wbemcli/Makefile
+++ net-mgmt/sblim-wbemcli/Makefile
@@ -19,7 +19,8 @@ LIB_DEPENDS=	curl:${PORTSDIR}/ftp/curl
 
 USE_BZIP2=	YES
 GNU_CONFIGURE=	YES
-CONFIGURE_ENV=	CPPFLAGS="-I${PREFIX}/include" LDFLAGS="-L${PREFIX}/lib"
+CPPFLAGS+=	-I${PREFIX}/include
+LDFLAGS+=	-L${PREFIX}/lib
 MAKE_ARGS=	RM="${RM} -f"
 MAN1=		wbemcli.1
 
diff --git net-mgmt/sing/Makefile net-mgmt/sing/Makefile
index c4fcf58..2c190dc 100644
--- net-mgmt/sing/Makefile
+++ net-mgmt/sing/Makefile
@@ -20,8 +20,9 @@ BUILD_DEPENDS=	${LIBNET_CONFIG}:${PORTSDIR}/net/libnet10
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--with-libpcap-prefix=/usr
-CONFIGURE_ENV=	CPPFLAGS="`${LIBNET_CONFIG} --defines` \
-		`${LIBNET_CONFIG} --cflags`" LIBS="`${LIBNET_CONFIG} --libs`"
+CONFIGURE_ENV=	LIBS="`${LIBNET_CONFIG} --libs`"
+CPPFLAGS+=	`${LIBNET_CONFIG} --defines` \
+		`${LIBNET_CONFIG} --cflags`
 MAN8=		sing.8
 PLIST_FILES=	sbin/sing
 
diff --git net-mgmt/snmp4nagios/Makefile net-mgmt/snmp4nagios/Makefile
index f2abe0f..a4893f9 100644
--- net-mgmt/snmp4nagios/Makefile
+++ net-mgmt/snmp4nagios/Makefile
@@ -33,10 +33,8 @@ CONFIGURE_ARGS=	--sbindir=${PREFIX}/${NAGIOSWWWDIR}/cgi-bin \
 		--with-pngdir=${NAGIOSDIR}/snmp4nagios/png \
 		--prefix=${PREFIX}
 
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" \
-		CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
-		LDFLAGS="${LDFLAGS}" \
-		LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib"
+CFLAGS+=	-I${LOCALBASE}/include
 
 .include <bsd.port.pre.mk>
 
diff --git net-mgmt/spectools/Makefile net-mgmt/spectools/Makefile
index 21be857..53737d0 100644
--- net-mgmt/spectools/Makefile
+++ net-mgmt/spectools/Makefile
@@ -18,8 +18,8 @@ COMMENT=	Tools for the Wi-Spy spectrum analyzers from MetaGeek LLC
 
 LICENSE=	GPLv2
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 USE_GMAKE=	yes
 
 PORTDOCS=	README
diff --git net-mgmt/zabbix-server/Makefile net-mgmt/zabbix-server/Makefile
index 54fd18d..1cabcee 100644
--- net-mgmt/zabbix-server/Makefile
+++ net-mgmt/zabbix-server/Makefile
@@ -47,7 +47,8 @@ SUB_LIST=	ZABBIX_BUILD=${ZABBIX_BUILD} ZABBIX_REQUIRE=${ZABBIX_REQUIRE}
 MAKE_ARGS+=	ARCH=freebsd
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--enable-${ZABBIX_BUILD}
-CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .if ${ZABBIX_BUILD} != "agent"
 LIB_DEPENDS=	netsnmp:${PORTSDIR}/net-mgmt/net-snmp \
diff --git net-p2p/amule-devel/Makefile net-p2p/amule-devel/Makefile
index 3129aa2..6733880 100644
--- net-p2p/amule-devel/Makefile
+++ net-p2p/amule-devel/Makefile
@@ -34,8 +34,7 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-denoise-level=0
 
 CONFIGURE_ENV=	LEX="${FLEX}" PKG_CONFIG="${PKG_CONFIG}" \
-		docdir='$${prefix}/${DOCSDIR_REL}' \
-		LDFLAGS="${LDFLAGS}"
+		docdir='$${prefix}/${DOCSDIR_REL}'
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 CFLAGS+=	${PTHREAD_CFLAGS}
diff --git net-p2p/amule/Makefile net-p2p/amule/Makefile
index 5e5ffa9..40610ba 100644
--- net-p2p/amule/Makefile
+++ net-p2p/amule/Makefile
@@ -33,8 +33,7 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-denoise-level=0
 
 CONFIGURE_ENV=	LEX="${FLEX}" PKG_CONFIG="${PKG_CONFIG}" \
-		docdir='$${prefix}/${DOCSDIR_REL}' \
-		CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
+		docdir='$${prefix}/${DOCSDIR_REL}'
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 CFLAGS+=	${PTHREAD_CFLAGS}
diff --git net-p2p/dctc-gui-qt/Makefile net-p2p/dctc-gui-qt/Makefile
index 3fffcd7..e51d54a 100644
--- net-p2p/dctc-gui-qt/Makefile
+++ net-p2p/dctc-gui-qt/Makefile
@@ -20,7 +20,7 @@ RUN_DEPENDS=	dctc:${PORTSDIR}/net-p2p/dctc
 
 USE_QT_VER=	3
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 PLIST_FILES=	bin/dc_qt
 
 OPTIONS=	XINE "Enable support for video preview using libxine" off
diff --git net-p2p/dctc/Makefile net-p2p/dctc/Makefile
index ab1405b..ac9a53f 100644
--- net-p2p/dctc/Makefile
+++ net-p2p/dctc/Makefile
@@ -27,8 +27,6 @@ USE_PERL5_RUN=	yes
 GNU_CONFIGURE=	yes
 LDFLAGS+=	${PTHREAD_LIBS:S/"//g}
 CPPFLAGS+=	${PTHREAD_CFLAGS}
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" \
-		LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--enable-manual-db-detect --with-db=${LOCALBASE}
 MANCOMPRESSED=	no
 
diff --git net-p2p/fidelio/Makefile net-p2p/fidelio/Makefile
index fd4431c..c212022 100644
--- net-p2p/fidelio/Makefile
+++ net-p2p/fidelio/Makefile
@@ -18,8 +18,8 @@ COMMENT=	A GNOME client for Hotline
 USE_GNOME=	gnomehack gnomelibs gnomeprefix
 USE_GMAKE=	yes
 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 \
diff --git net-p2p/gift/Makefile net-p2p/gift/Makefile
index a973453..1826fe9 100644
--- net-p2p/gift/Makefile
+++ net-p2p/gift/Makefile
@@ -27,8 +27,6 @@ USE_GMAKE=	yes
 USE_PERL5=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" \
-		LDFLAGS="${LDFLAGS}"
 USE_LDCONFIG=	yes
 USE_RC_SUBR=	giftd
 
diff --git net-p2p/giftoxic/Makefile net-p2p/giftoxic/Makefile
index d75d842..2f263c7 100644
--- net-p2p/giftoxic/Makefile
+++ net-p2p/giftoxic/Makefile
@@ -23,8 +23,8 @@ USE_GNOME=	gtk20 gnomeprefix gnomehack
 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
 CONFIGURE_ARGS=	--without-included-gettext
 
 MAN1=	giFToxic.1
diff --git net-p2p/gnunet/Makefile net-p2p/gnunet/Makefile
index 03e2217..3146fb5 100644
--- net-p2p/gnunet/Makefile
+++ net-p2p/gnunet/Makefile
@@ -37,7 +37,6 @@ USE_GNOME=	gnomehack libglade2
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libltdl libtool
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--with-dialog=no \
 		--with-cdialog=no \
 		--with-qt=no \
@@ -55,8 +54,8 @@ MAN1=		gnunet-auto-share.1 gnunet-chat.1 gnunet-directory.1 \
 		gnunet-update.1 gnunet-vpn.1 gnunetd.1
 MAN5=		gnunet.conf.5 gnunetd.conf.5
 
-CPPFLAGS=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 DBDIR=		/var/db/${PORTNAME}
 
diff --git net-p2p/gtkhx/Makefile net-p2p/gtkhx/Makefile
index 46d15ac..bb29af3 100644
--- net-p2p/gtkhx/Makefile
+++ net-p2p/gtkhx/Makefile
@@ -17,8 +17,8 @@ COMMENT=	A GTK+ version of Hx, a UNIX Hotline Client
 USE_GNOME=	gdkpixbuf gnomehack
 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=		gtkhx.1
 
diff --git net-p2p/gtorrentviewer/Makefile net-p2p/gtorrentviewer/Makefile
index 1ce034f..8b8c2cf 100644
--- net-p2p/gtorrentviewer/Makefile
+++ net-p2p/gtorrentviewer/Makefile
@@ -21,8 +21,8 @@ LIB_DEPENDS=	curl.6:${PORTSDIR}/ftp/curl
 USE_GNOME=	gtk20 gnomehier intlhack
 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=	--with-pixmapsdir=${PREFIX}/share/pixmaps \
 		--with-desktopdir=${PREFIX}/share/applications
 
diff --git net-p2p/jigdo/Makefile net-p2p/jigdo/Makefile
index c6ca9b3..c9d2b00 100644
--- net-p2p/jigdo/Makefile
+++ net-p2p/jigdo/Makefile
@@ -24,7 +24,7 @@ GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 WITH_BDB_VER?=	43
 
-CONFIGURE_ENV+=	"CPPFLAGS=-I${LOCALBASE}/include"
+CPPFLAGS+=	-I${LOCALBASE}/include
 
 OPTIONS=	GUI "Build the gtk2 gui" off \
 		BDB "Build with Berkeley DB support (for jigdo-file cache)" on \
@@ -44,8 +44,8 @@ PLIST_SUB+=	GUI="@comment "
 .endif
 
 .if !defined(WITHOUT_BDB)
-CONFIGURE_ENV+=	CPPFLAGS=-I${BDB_INCLUDE_DIR} \
-		LIBS=-L${BDB_LIB_DIR}
+CONFIGURE_ENV+=	LIBS=-L${BDB_LIB_DIR}
+CPPFLAGS+=	-I${BDB_INCLUDE_DIR}
 CONFIGURE_ARGS+=--with-libdb=-l${BDB_LIB_CXX_NAME}
 USE_BDB=	${WITH_BDB_VER}
 .else
diff --git net-p2p/libbt/Makefile net-p2p/libbt/Makefile
index a7394d9..5a50da1 100644
--- net-p2p/libbt/Makefile
+++ net-p2p/libbt/Makefile
@@ -18,7 +18,8 @@ LIB_DEPENDS=	curl.6:${PORTSDIR}/ftp/curl
 
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 PORTDOCS=	protocol-ext.txt protocol.txt
 
diff --git net-p2p/libtorrent-rasterbar-14/Makefile net-p2p/libtorrent-rasterbar-14/Makefile
index eac58c9..7fb79a8 100644
--- net-p2p/libtorrent-rasterbar-14/Makefile
+++ net-p2p/libtorrent-rasterbar-14/Makefile
@@ -26,7 +26,6 @@ USE_GNOME=	gnomehack
 USE_OPENSSL=	yes
 USE_AUTOTOOLS=	aclocal automake autoconf libtool
 ACLOCAL_ARGS=	-I m4
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--disable-debug \
 		--disable-python-binding \
 		--disable-examples \
@@ -43,8 +42,8 @@ CONFIGURE_ARGS=	--disable-debug \
 		--with-zlib=system
 USE_LDCONFIG=	yes
 
-CPPFLAGS=	${PTHREAD_CFLAGS}
-LDFLAGS=	${PTHREAD_LIBS}
+CPPFLAGS+=	${PTHREAD_CFLAGS}
+LDFLAGS+=	${PTHREAD_LIBS}
 
 .if !defined(NOPORTDOCS)
 PORTDOCS=	*
diff --git net-p2p/libtorrent-rasterbar-15/Makefile net-p2p/libtorrent-rasterbar-15/Makefile
index 4344e1a..aab260ec 100644
--- net-p2p/libtorrent-rasterbar-15/Makefile
+++ net-p2p/libtorrent-rasterbar-15/Makefile
@@ -28,7 +28,6 @@ USE_GNOME=	gnomehack
 USE_OPENSSL=	yes
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS+=	--disable-debug \
 		--disable-static \
 		--enable-dht \
diff --git net-p2p/lopster/Makefile net-p2p/lopster/Makefile
index 9e55a19..d02be73 100644
--- net-p2p/lopster/Makefile
+++ net-p2p/lopster/Makefile
@@ -19,8 +19,8 @@ GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gtk12
 CONFIGURE_ARGS=	--with-pthread=yes
-CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib"
-CPPFLAGS+=	"-I${LOCALBASE}/include"
+LDFLAGS+=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
 
 OPTIONS=	FLAC	"Include FLAC support"		On	\
 		OGG	"Include OGG support"		On	\
diff --git net-p2p/mldonkey/Makefile net-p2p/mldonkey/Makefile
index 29bb90d..d2f1e7b 100644
--- net-p2p/mldonkey/Makefile
+++ net-p2p/mldonkey/Makefile
@@ -30,15 +30,13 @@ ALL_TARGET=	opt
 MAKE_ENV+=	OCAMLRUNPARAM="l=256M"
 MAKE_JOBS_UNSAFE=	yes
 
-CONFIGURE_ARGS+=\
-		--enable-ocamlver=3 \
+CONFIGURE_ARGS+=--enable-ocamlver=3 \
 		--with-libiconv-prefix=${LOCALBASE}
-CONFIGURE_ENV+=	\
-		NEWCXX="${CXX}" \
-		CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
-		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" \
+CONFIGURE_ENV+=	NEWCXX="${CXX}" \
 		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		PTHREAD_LIBS="${PTHREAD_LIBS}"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 # FreeBSD has reentrant dns code
 PTHREAD_CFLAGS+=	-D_REENTRANT
 
diff --git net-p2p/moodriver/Makefile net-p2p/moodriver/Makefile
index 1eb111f..f048bb4 100644
--- net-p2p/moodriver/Makefile
+++ net-p2p/moodriver/Makefile
@@ -17,8 +17,8 @@ COMMENT=	C++ museekd client library
 LIB_DEPENDS=	sigc-2.0.0:${PORTSDIR}/devel/libsigc++20
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CXXFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \
-		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
+LDFLAGS+=	-L${LOCALBASE}/lib
+CXXFLAGS+=	-I${LOCALBASE}/include
 CONFIGURE_ARGS=	--with-pkgconfig-dir=${PREFIX}/libdata/pkgconfig
 USE_GETTEXT=	yes
 USE_GNOME=	glib20 pkgconfig
diff --git net-p2p/mooseekd/Makefile net-p2p/mooseekd/Makefile
index f25bd29..8ffbd12 100644
--- net-p2p/mooseekd/Makefile
+++ net-p2p/mooseekd/Makefile
@@ -18,8 +18,8 @@ LIB_DEPENDS=	xml\\+\\+-2.6.2:${PORTSDIR}/textproc/libxml++26
 
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CXXFLAGS="${CXXFLAGS} -I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
-		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
+LDFLAGS+=	-L${LOCALBASE}/lib
+CXXFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
 USE_FAM=	yes
 USE_ICONV=	yes
 
diff --git net-p2p/opendchub/Makefile net-p2p/opendchub/Makefile
index a845157..5fcb028 100644
--- net-p2p/opendchub/Makefile
+++ net-p2p/opendchub/Makefile
@@ -17,13 +17,12 @@ USE_PERL5=	yes
 USE_OPENSSL=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}"
 
 PORTDOCS=	README configfiles general scriptdoc
 PLIST_FILES=	bin/${PORTNAME}
 
-CPPFLAGS=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 pre-install:
 	@${CHMOD} a+rx ${WRKSRC}/install-sh
diff --git net-p2p/qtorrent/Makefile net-p2p/qtorrent/Makefile
index 431ae21..7eddcae 100644
--- net-p2p/qtorrent/Makefile
+++ net-p2p/qtorrent/Makefile
@@ -23,9 +23,9 @@ USE_PYTHON=	yes
 USE_PYDISTUTILS=yes
 
 .if defined(PACKAGE_BUILDING)
-TMPDIR?=	/tmp                
-MAKE_ENV+=	TMPDIR="${TMPDIR}"      
-CONFIGURE_ENV+=	TMPDIR="${TMPDIR}" 
+TMPDIR?=	/tmp
+MAKE_ENV+=	TMPDIR="${TMPDIR}"
+CONFIGURE_ENV+=	TMPDIR="${TMPDIR}"
 .endif
 
 pre-everything::
diff --git net-p2p/rtorrent/Makefile net-p2p/rtorrent/Makefile
index 2cd83ef..f39f8ff 100644
--- net-p2p/rtorrent/Makefile
+++ net-p2p/rtorrent/Makefile
@@ -25,7 +25,7 @@ CONFLICTS?=	rtorrent-devel-[0-9]*
 USE_GCC=	4.2+
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV+= LDFLAGS="${LDFLAGS} -pthread"
+LDFLAGS+=	-pthread
 CONFIGURE_ARGS=	--disable-debug
 
 SUB_FILES=	pkg-message
diff --git net-p2p/teknap/Makefile net-p2p/teknap/Makefile
index 2cf6c6c..988a427 100644
--- net-p2p/teknap/Makefile
+++ net-p2p/teknap/Makefile
@@ -32,8 +32,8 @@ WANT_GNOME=	yes
 GNU_CONFIGURE=	yes
 DOCSDIR=	${PREFIX}/share/doc/TekNap
 PORTDOCS=	*
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
 
 .include <bsd.port.pre.mk>
 
diff --git net-p2p/transmission-cli/Makefile net-p2p/transmission-cli/Makefile
index ca2f643..ff7aa8a 100644
--- net-p2p/transmission-cli/Makefile
+++ net-p2p/transmission-cli/Makefile
@@ -28,8 +28,8 @@ USE_GMAKE=	yes
 USE_GNOME?=	pkgconfig
 USE_OPENSSL=	yes
 GNU_CONFIGURE=	yes
-CPPFLAGS=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=--with-zlib=/usr \
 		--disable-libappindicator \
 		--disable-gconf2 \
diff --git net-p2p/valknut/Makefile net-p2p/valknut/Makefile
index f9e32dc..750b6c7 100644
--- net-p2p/valknut/Makefile
+++ net-p2p/valknut/Makefile
@@ -32,7 +32,7 @@ USE_PERL5_BUILD=yes
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
 CFLAGS+=	-I${QT_INCDIR}
-LDFLAGS=	-L${QT_LIBDIR}
+LDFLAGS+=	-L${QT_LIBDIR}
 QTCFGLIBS+=	${PTHREAD_LIBS}
 CONFIGURE_ENV+=	DCLIB_CFLAGS=-I${LOCALBASE}/include
 
diff --git net-p2p/verlihub-plugins-luascript/Makefile net-p2p/verlihub-plugins-luascript/Makefile
index cd3b193..6c0c208 100644
--- net-p2p/verlihub-plugins-luascript/Makefile
+++ net-p2p/verlihub-plugins-luascript/Makefile
@@ -19,9 +19,9 @@ PLUGIN_DESC=	LuaScript
 USE_LUA=	5.1
 
 WRKSRC=		${WRKDIR}/${DISTNAME}
-CONFIGURE_ENV=	CXXFLAGS="${LDFLAGS}" CPPFLAGS="${CPPFLAGS}"
-CPPFLAGS=	-I${LUA_INCDIR}
-LDFLAGS=	-L${LUA_LIBDIR}
+CXXFLAGS+=	${LDFLAGS}
+CPPFLAGS+=	-I${LUA_INCDIR}
+LDFLAGS+=	-L${LUA_LIBDIR}
 
 OPTIONS=	SOCKET "Build with LuaSocket support" Off
 
diff --git net/DarwinStreamingServer/Makefile net/DarwinStreamingServer/Makefile
index 5a585b8..1f5bd09 100644
--- net/DarwinStreamingServer/Makefile
+++ net/DarwinStreamingServer/Makefile
@@ -38,7 +38,7 @@ PKGMESSAGE=	${WRKDIR}/pkg-message
 MAKE_ENV+=	MAKE="${MAKE}"				\
 		DATADIR="${DATADIR}"			\
 		PTHREAD_LIBS="${PTHREAD_LIBS}"		\
-		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}"	\
+		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}"
 
 .include <bsd.port.pre.mk>
 
diff --git net/arping/Makefile net/arping/Makefile
index a59180e..8d96f3b 100644
--- net/arping/Makefile
+++ net/arping/Makefile
@@ -17,10 +17,10 @@ COMMENT=	ARP level "ping" utility
 BUILD_DEPENDS=	${LIBNET_CONFIG}:${PORTSDIR}/net/libnet
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CFLAGS+="`${LIBNET_CONFIG} --defines`" \
-		CPPFLAGS="-I${LOCALBASE}/include `${LIBNET_CONFIG} --cflags`" \
-		LDFLAGS="-L${LOCALBASE}/lib" \
-		LIBS="`${LIBNET_CONFIG} --libs` -lpcap"
+CONFIGURE_ENV=	LIBS="`${LIBNET_CONFIG} --libs` -lpcap"
+CFLAGS+=	`${LIBNET_CONFIG} --defines`
+CPPFLAGS+=	-I${LOCALBASE}/include `${LIBNET_CONFIG} --cflags`
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 LIBNET_CONFIG?=	${LOCALBASE}/bin/libnet11-config
 
diff --git net/asterisk/Makefile net/asterisk/Makefile
index c47b464..0eac20f 100644
--- net/asterisk/Makefile
+++ net/asterisk/Makefile
@@ -23,10 +23,9 @@ RUN_DEPENDS=	mpg123:${PORTSDIR}/audio/mpg123
 ONLY_FOR_ARCHS=	i386 amd64 powerpc sparc64
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--with-gsm=${LOCALBASE}
-LDFLAGS=	-L${LOCALBASE}/lib
-CPPFLAGS=	-I${LOCALBASE}/include -I${LOCALBASE}/include/openh323
+LDFLAGS+=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include/openh323
 USE_GMAKE=	yes
 USE_GNOME=	libxml2
 USE_BISON=	build
diff --git net/asterisk10/Makefile net/asterisk10/Makefile
index dc3e047..449eab1 100644
--- net/asterisk10/Makefile
+++ net/asterisk10/Makefile
@@ -22,10 +22,9 @@ RUN_DEPENDS=	mpg123:${PORTSDIR}/audio/mpg123
 ONLY_FOR_ARCHS=	i386 amd64 powerpc sparc64
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--with-gsm=${LOCALBASE}
-LDFLAGS=	-L${LOCALBASE}/lib
-CPPFLAGS=	-I${LOCALBASE}/include -I${LOCALBASE}/include/openh323
+LDFLAGS+=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include/openh323
 USE_GMAKE=	yes
 USE_GNOME=	libxml2
 USE_BISON=	build
diff --git net/asterisk14/Makefile net/asterisk14/Makefile
index a6b8753..dbfe2fb 100644
--- net/asterisk14/Makefile
+++ net/asterisk14/Makefile
@@ -26,10 +26,10 @@ RUN_DEPENDS=	mpg123:${PORTSDIR}/audio/mpg123
 ONLY_FOR_ARCHS=	i386 sparc64 amd64 powerpc
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/openh323" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include/openh323
+LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--with-gsm=${LOCALBASE}
-CPPFLAGS=	-I${LOCALBASE}/include -I${LOCALBASE}/include/openh323
+CPPFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include/openh323
 USE_GMAKE=	yes
 USE_BISON=	build
 USE_RC_SUBR=	asterisk.sh
diff --git net/asterisk16/Makefile net/asterisk16/Makefile
index 2796641..d7dc91b 100644
--- net/asterisk16/Makefile
+++ net/asterisk16/Makefile
@@ -23,10 +23,9 @@ RUN_DEPENDS=	mpg123:${PORTSDIR}/audio/mpg123
 ONLY_FOR_ARCHS=	i386 amd64 sparc64
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/openh323" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include/openh323
+LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--with-gsm=${LOCALBASE}
-CPPFLAGS=	-I${LOCALBASE}/include -I${LOCALBASE}/include/openh323
 USE_GMAKE=	yes
 USE_GNOME=	libxml2
 USE_BISON=	build
diff --git net/avahi-app/Makefile net/avahi-app/Makefile
index 5ce0a5f..41b2a69 100644
--- net/avahi-app/Makefile
+++ net/avahi-app/Makefile
@@ -37,10 +37,10 @@ CONFIGURE_ARGS?=--with-distro=freebsd \
 		--disable-doxygen-dot \
 		--localstatedir=/var \
 		--enable-compat-howl
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -DHAVE_KQUEUE" \
-		LDFLAGS="-L${LOCALBASE}/lib" \
-		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
+CONFIGURE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		PTHREAD_LIBS="${PTHREAD_LIBS}"
+CPPFLAGS+=	-I${LOCALBASE}/include -DHAVE_KQUEUE
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .if ${AVAHI_SLAVE}=="no"
 CONFLICTS=	howl-[0-9]*
diff --git net/bfilter/Makefile net/bfilter/Makefile
index 0d3ee5d..b4f7ed3 100644
--- net/bfilter/Makefile
+++ net/bfilter/Makefile
@@ -17,8 +17,8 @@ LIB_DEPENDS=	ACE.5:${PORTSDIR}/devel/ace \
 		sigc-2.0.0:${PORTSDIR}/devel/libsigc++20
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 MAN8=		bfilter.8
 USE_RC_SUBR=	bfilter.sh
diff --git net/bmon/Makefile net/bmon/Makefile
index 29b2593..a1e5635 100644
--- net/bmon/Makefile
+++ net/bmon/Makefile
@@ -17,7 +17,8 @@ COMMENT=	Portable bandwidth monitor and rate estimator
 OPTIONS=	RRDTOOL "Enable RRD support" Off \
 		DBI	"Enable DBI support" On
 
-CONFIGURE_ENV+=	"LDFLAGS=-L${LOCALBASE}/lib" "CPPFLAGS=-I${LOCALBASE}/include"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 GNU_CONFIGURE=	YES
 CONFIGURE_ARGS=	--disable-asound
 USE_GMAKE=	YES
diff --git net/boinc-client/Makefile net/boinc-client/Makefile
index 18a462d..f50b3c4 100644
--- net/boinc-client/Makefile
+++ net/boinc-client/Makefile
@@ -36,7 +36,7 @@ CONFIGURE_ARGS=	--disable-server
 CPPFLAGS+=	-I${LOCALBASE}/include
 CXXFLAGS:=	${CXXFLAGS:N-O*:N-f*} -O3
 CFLAGS:=	${CFLAGS:N-O*:N-f*} -O3
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" CXXFLAGSS="${CXXFLAGS}" CFLAGS="${CFLAGS}"
+CONFIGURE_ENV=	CXXFLAGSS="${CXXFLAGS}"
 
 OPTIONS=	X11 "Build Boinc Manager GUI" on \
 		ALT "Accept Linux science applications" off
diff --git net/c3270/Makefile net/c3270/Makefile
index 8038019..f630883 100644
--- net/c3270/Makefile
+++ net/c3270/Makefile
@@ -21,9 +21,9 @@ GNU_CONFIGURE=	yes
 
 USE_ICONV=	yes
 USE_OPENSSL=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I/usr/local/include" \
-		LDFLAGS="-L/usr/local/lib" \
-		LIBS="-L/usr/local/lib"
+CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 MAN1=		c3270.1 \
 		x3270if.1 \
diff --git net/clamz/Makefile net/clamz/Makefile
index b9e76ea..e564b7b 100644
--- net/clamz/Makefile
+++ net/clamz/Makefile
@@ -18,8 +18,8 @@ LIB_DEPENDS=	curl.6:${PORTSDIR}/ftp/curl \
 		expat.6:${PORTSDIR}/textproc/expat2 \
 		gcrypt.18:${PORTSDIR}/security/libgcrypt
 
-CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 GNU_CONFIGURE=	yes
 USE_GNOME=	pkgconfig
diff --git net/csync2/Makefile net/csync2/Makefile
index b4c2a68..f3da46f 100644
--- net/csync2/Makefile
+++ net/csync2/Makefile
@@ -30,9 +30,9 @@ MAN1=		csync2.1
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--sysconfdir=${PREFIX}/etc
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib" \
-		LIBGNUTLS_CONFIG="${LOCALBASE}/bin/pkg-config gnutls"
+CONFIGURE_ENV=	LIBGNUTLS_CONFIG="${LOCALBASE}/bin/pkg-config gnutls"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 USE_RC_SUBR=	csync2
 
diff --git net/ct/Makefile net/ct/Makefile
index b6a39ac..8c966af 100644
--- net/ct/Makefile
+++ net/ct/Makefile
@@ -18,6 +18,6 @@ RUN_DEPENDS=	${LOCALBASE}/v6eval/bin/pktbuf:${PORTSDIR}/net/v6eval
 USE_PERL5=      yes
 NO_BUILD=	yes
 
-MAKE_ENV+=      "NUTTYPE=host"
+MAKE_ENV+=	"NUTTYPE=host"
 
 .include <bsd.port.mk>
diff --git net/dante/Makefile net/dante/Makefile
index b2c6414..dd55397 100644
--- net/dante/Makefile
+++ net/dante/Makefile
@@ -21,8 +21,8 @@ CONFLICTS=	socks5-[0-9]*
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-socks-conf=${PREFIX}/etc/socks.conf \
 		--with-sockd-conf=${PREFIX}/etc/sockd.conf
-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}
 
 USE_LDCONFIG=	yes
 
diff --git net/daq/Makefile net/daq/Makefile
index 01c17b0..ce36fba 100644
--- net/daq/Makefile
+++ net/daq/Makefile
@@ -26,7 +26,6 @@ USE_LDCONFIG=	yes
 USE_BISON=	build
 USE_AUTOTOOLS=	libtool
 
-CONFIGURE_ENV=	LDFLAGS="${LDFLAGS}"
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
diff --git net/dictd/Makefile net/dictd/Makefile
index 385ff06..fe3bf29 100644
--- net/dictd/Makefile
+++ net/dictd/Makefile
@@ -26,8 +26,8 @@ USE_AUTOTOOLS=	libtool
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-etcdir=${PREFIX}/etc --with-cflags="${CFLAGS}" \
 		--without-local-zlib
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 SUB_FILES+=	dictd.conf pkg-message
 SUB_LIST+=	PORTSDIR=${PORTSDIR}
diff --git net/easysoap/Makefile net/easysoap/Makefile
index 18b2cb3..4bf30ac 100644
--- net/easysoap/Makefile
+++ net/easysoap/Makefile
@@ -19,8 +19,8 @@ LIB_DEPENDS=	expat.6:${PORTSDIR}/textproc/expat2
 
 USE_OPENSSL=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
 USE_LDCONFIG=	yes
 
 .include <bsd.port.pre.mk>
diff --git net/ekiga/Makefile net/ekiga/Makefile
index 8fa212f..a676a58 100644
--- net/ekiga/Makefile
+++ net/ekiga/Makefile
@@ -29,9 +29,8 @@ INSTALLS_OMF=	yes
 USE_GNOME=	libgnomeui gnomeprefix gnomehack gnomedocutils \
 		evolutiondataserver intlhack
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" \
-		SDL_CONFIG="${SDL_CONFIG}"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 CONFIGURE_ARGS=	--with-pwlib-dir=${LOCALBASE} \
 		--with-opal-dir=${LOCALBASE}
 MAKE_JOBS_SAFE=	yes
diff --git net/fonulator/Makefile net/fonulator/Makefile
index 985f3ba..a26173a 100644
--- net/fonulator/Makefile
+++ net/fonulator/Makefile
@@ -14,9 +14,8 @@ MAINTAINER=	fjoe@FreeBSD.org
 COMMENT=	A foneBRIDGE configuration utility
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=\
-	CPPFLAGS="-I${LOCALBASE}/include ${LIBNET_CPPFLAGS}"\
-	LDFLAGS="${LIBNET_LIBS:N-l*}"
+CPPFLAGS+=	-I${LOCALBASE}/include ${LIBNET_CPPFLAGS}
+LDFLAGS+=	${LIBNET_LIBS:N-l*}
 CONFIGURE_ARGS=	--disable-shared
 
 BUILD_DEPENDS=	${LIBNET_CONFIG}:${PORTSDIR}/net/libnet\
diff --git net/freerdp/Makefile net/freerdp/Makefile
index 1ce0c3f..cd9f5bf 100644
--- net/freerdp/Makefile
+++ net/freerdp/Makefile
@@ -22,9 +22,8 @@ USE_OPENSSL=	yes
 USE_GNOME=	gnomehack pkgconfig
 USE_LDCONFIG=	yes
 
-LDFLAGS=	-L${LOCALBASE}/lib
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="${LDFLAGS}"
+LDFLAGS+=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
diff --git net/freeswitch-core/Makefile net/freeswitch-core/Makefile
index 6afd8dc..b5dbb15 100644
--- net/freeswitch-core/Makefile
+++ net/freeswitch-core/Makefile
@@ -61,8 +61,8 @@ CONFIGURE_ARGS=	--prefix=${PREFIX} \
 		--with-ogg-libraries=${LOCALBASE}/lib \
 		--with-ogg-includes=${LOCALBASE}/include
 
-CONFIGURE_ENV+=	CPPFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	${CXXFLAGS} -I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 USE_LDCONFIG=	yes
 CPPFLAGS+=	-I${PREFIX}/include
 
diff --git net/freewais-sf/Makefile net/freewais-sf/Makefile
index 46aca3b..c8bee62 100644
--- net/freewais-sf/Makefile
+++ net/freewais-sf/Makefile
@@ -19,7 +19,7 @@ COMMENT=	An enhanced Wide Area Information Server
 HAS_CONFIGURE=	yes
 USE_PERL5_BUILD=yes
 CONFIGURE_SCRIPT=	Configure
-CONFIGURE_ENV=	PREFIX="${PREFIX}" CC="${CC}" CFLAGS="${CFLAGS}"
+CONFIGURE_ENV=	PREFIX="${PREFIX}"
 CONFIGURE_ARGS=	-sde -Dprefix="${PREFIX}" \
 		-Darchname="${MACHINE_ARCH}-freebsd"
 INSTALL_TARGET=	install install.man
diff --git net/g2ipmsg/Makefile net/g2ipmsg/Makefile
index 22054e3..50e3d87 100644
--- net/g2ipmsg/Makefile
+++ net/g2ipmsg/Makefile
@@ -26,7 +26,7 @@ USE_GSTREAMER=	vorbis
 USE_ICONV=	yes
 USE_OPENSSL=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include"
+CPPFLAGS+=	-I${LOCALBASE}/include
 CONFIGURE_ARGS=	--enable-systray --with-ssl=${OPENSSLBASE}
 
 GCONF_SCHEMAS=	g2ipmsg.schemas
diff --git net/gini/Makefile net/gini/Makefile
index 1ac6c1a..392c6fa 100644
--- net/gini/Makefile
+++ net/gini/Makefile
@@ -19,7 +19,8 @@ LIB_DEPENDS=	vorbis.4:${PORTSDIR}/audio/libvorbis
 USE_BZIP2=	yes
 USE_GNOME=	glib12
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 USE_GMAKE=	yes
 USERS=		${PORTNAME}
 GROUPS=		${USERS}
diff --git net/glib-networking/Makefile net/glib-networking/Makefile
index bc38988..05b7be9 100644
--- net/glib-networking/Makefile
+++ net/glib-networking/Makefile
@@ -33,9 +33,9 @@ USE_GMAKE=	yes
 MAKE_JOBS_SAFE=	yes
 CONFIGURE_ARGS=	--with-ca-certificates=${LOCALBASE}/share/certs/ca-root-nss.crt
 CPPFLAGS+=	-I${LOCALBASE}/include
-CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib" \
-		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
+CONFIGURE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		PTHREAD_LIBS="${PTHREAD_LIBS}"
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 post-patch:
 	@${REINPLACE_CMD} -e' s|-Wmissing-include-dirs||g' ${WRKSRC}/configure
diff --git net/gnome-mud/Makefile net/gnome-mud/Makefile
index f6975cd..ff8f6c9 100644
--- net/gnome-mud/Makefile
+++ net/gnome-mud/Makefile
@@ -22,8 +22,8 @@ USE_GSTREAMER=	yes
 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
 INSTALLS_ICONS=	yes
 
 MAN6=		gnome-mud.6
diff --git net/gnome-nettool/Makefile net/gnome-nettool/Makefile
index 54dacf2..de00c16 100644
--- net/gnome-nettool/Makefile
+++ net/gnome-nettool/Makefile
@@ -26,8 +26,8 @@ USE_GETTEXT=	yes
 INSTALLS_OMF=	yes
 INSTALLS_ICONS=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 CFLAGS+=	-DHAVE_SOCKADDR_SA_LEN
 
 post-install:
diff --git net/gnu-dico/Makefile net/gnu-dico/Makefile
index c3ed378..485e8dd 100644
--- net/gnu-dico/Makefile
+++ net/gnu-dico/Makefile
@@ -22,8 +22,8 @@ USE_GMAKE=	yes
 USE_AUTOTOOLS=	libltdl libtool
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--localstatedir=/var
 
 OPTIONS=	PYTHON	"With PYTHON support" on \
diff --git net/gq/Makefile net/gq/Makefile
index 408dd88..4eca54b 100644
--- net/gq/Makefile
+++ net/gq/Makefile
@@ -26,11 +26,10 @@ USE_OPENLDAP=	yes
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--with-ldap-prefix=${LOCALBASE}
 
-CPPFLAGS=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
+CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 
 .include <bsd.port.pre.mk>
 
diff --git net/grdesktop/Makefile net/grdesktop/Makefile
index 611a351..7b7c2c2 100644
--- net/grdesktop/Makefile
+++ net/grdesktop/Makefile
@@ -22,7 +22,8 @@ USE_GMAKE=	yes
 USE_GNOME=	libgnomeui gnomeprefix gnomehack
 GCONF_SCHEMAS=	grdesktop.schemas
 INSTALLS_OMF=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--with-keymap-path=${LOCALBASE}/share/rdesktop/keymaps
 
 MAN1=		grdesktop.1
diff --git net/grsync/Makefile net/grsync/Makefile
index 36a8f91..9cd72e7 100644
--- net/grsync/Makefile
+++ net/grsync/Makefile
@@ -27,7 +27,6 @@ INSTALLS_ICONS=	yes
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
-CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS}"
 
 .if !defined(WITHOUT_NLS)
 USE_GETTEXT=	yes
diff --git net/gtk-vnc/Makefile net/gtk-vnc/Makefile
index 561b689..3ba7738 100644
--- net/gtk-vnc/Makefile
+++ net/gtk-vnc/Makefile
@@ -25,8 +25,8 @@ USE_GETTEXT=	yes
 USE_LDCONFIG=	yes
 USE_PYTHON=	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-gtkglext=yes
 
 .include <bsd.port.mk>
diff --git net/gutenfetch/Makefile net/gutenfetch/Makefile
index 1fdf883..b7ad7af 100644
--- net/gutenfetch/Makefile
+++ net/gutenfetch/Makefile
@@ -16,8 +16,8 @@ COMMENT=	Fetch listings and books from Project Gutenberg
 LIB_DEPENDS=	gutenfetch:${PORTSDIR}/devel/libgutenfetch
 
 GNU_CONFIGURE=	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}
 USE_GMAKE=	yes
 USE_BZIP2=	yes
 
diff --git net/hawknl-devel/Makefile net/hawknl-devel/Makefile
index 7423c56..46d40a4 100644
--- net/hawknl-devel/Makefile
+++ net/hawknl-devel/Makefile
@@ -24,9 +24,8 @@ USE_GMAKE=	yes
 MAKEFILE=	makefile.linux
 USE_LDCONFIG=	yes
 
-LDFLAGS=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
-CPPFLAGS=	-I${LOCALBASE}/include
-MAKE_ENV=	LDFLAGS="${LDFLAGS}" CPPFLAGS="${CPPFLAGS}"
+LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
+CPPFLAGS+=	-I${LOCALBASE}/include
 
 WRKSRC=	${WRKDIR}/HawkNL1.70
 
diff --git net/hawknl/Makefile net/hawknl/Makefile
index 39716c4..8c9970b 100644
--- net/hawknl/Makefile
+++ net/hawknl/Makefile
@@ -20,9 +20,8 @@ USE_GMAKE=	yes
 MAKEFILE=	makefile.linux
 USE_LDCONFIG=	yes
 
-LDFLAGS=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
-CPPFLAGS=	-I${LOCALBASE}/include
-MAKE_ENV=	LDFLAGS="${LDFLAGS}" CPPFLAGS="${CPPFLAGS}"
+LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
+CPPFLAGS+=	-I${LOCALBASE}/include
 
 WRKSRC=	${WRKDIR}/${PORTNAME}${PORTVERSION}
 
diff --git net/howl/Makefile net/howl/Makefile
index f39bd2d..43e015a 100644
--- net/howl/Makefile
+++ net/howl/Makefile
@@ -27,7 +27,6 @@ PLIST_SUB=	VERSION="${PORTVERSION}"
 
 CPPFLAGS+=	${PTHREAD_CFLAGS}
 LDFLAGS+=	${PTHREAD_LIBS}
-CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${PTHREAD_LIBS}"
 
 MAN8=		mDNSResponder.8
 
diff --git net/iaxmodem/Makefile net/iaxmodem/Makefile
index 7b0dc46..bf65608 100644
--- net/iaxmodem/Makefile
+++ net/iaxmodem/Makefile
@@ -18,9 +18,7 @@ LIB_DEPENDS=	tiff.4:${PORTSDIR}/graphics/tiff
 
 MAN1=		iaxmodem.1
 CFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
-MAKE_ENV=	LDFLAGS="${LDFLAGS}"
-CONFIGURE_ENV=	LDFLAGS="${LDFLAGS}"
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 SUB_FILES=	pkg-message
 USE_RC_SUBR=	iaxmodem
diff --git net/iplog/Makefile net/iplog/Makefile
index 9e0bbcd..dad105f 100644
--- net/iplog/Makefile
+++ net/iplog/Makefile
@@ -16,9 +16,8 @@ COMMENT=	TCP/IP traffic logging tool
 
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-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}
 MAN5=		iplog.conf.5
 MAN8=		iplog.8
 
diff --git net/jwhois/Makefile net/jwhois/Makefile
index dc47f93..1f417cc 100644
--- net/jwhois/Makefile
+++ net/jwhois/Makefile
@@ -19,7 +19,8 @@ COMMENT=An improved WHOIS client capable of selecting server to query
 GNU_CONFIGURE=	yes
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${PREFIX}/include" LDFLAGS="-L${PREFIX}/lib"
+CPPFLAGS+=	-I${PREFIX}/include
+LDFLAGS+=	-L${PREFIX}/lib
 CONFIGURE_ARGS=	--localstatedir=${PREFIX}/var/jwhois
 .if defined(WITHOUT_NLS)
 CONFIGURE_ARGS+=	--disable-nls
diff --git net/kdenetwork3/Makefile net/kdenetwork3/Makefile
index 7b911af..7036606 100644
--- net/kdenetwork3/Makefile
+++ net/kdenetwork3/Makefile
@@ -35,7 +35,7 @@ DO_NOT_COMPILE+=kopete lanbrowsing filesharing
 CONFIGURE_ARGS+=--with-ssl-dir=${OPENSSLBASE}
 
 .if defined(DO_NOT_COMPILE)
-CONFIGURE_ENV+=DO_NOT_COMPILE="${DO_NOT_COMPILE}"
+CONFIGURE_ENV+=	DO_NOT_COMPILE="${DO_NOT_COMPILE}"
 .endif # defined(DO_NOT_COMPILE)
 
 .include "${.CURDIR}/../../x11/kde3/Makefile.kde"
diff --git net/keepalived/Makefile net/keepalived/Makefile
index 84edb2e..5dafe92 100644
--- net/keepalived/Makefile
+++ net/keepalived/Makefile
@@ -26,7 +26,6 @@ USE_RC_SUBR=	keepalived.sh
 LDFLAGS+=	-lipvs -L${LOCALBASE}/lib
 
 CONFIGURE_ARGS+=	--with-kernel-dir=${LOCALBASE}
-CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS}"
 
 MAN1=	genhash.1
 MAN5=	keepalived.conf.5
diff --git net/kphone/Makefile net/kphone/Makefile
index 8370904..7727c59 100644
--- net/kphone/Makefile
+++ net/kphone/Makefile
@@ -19,7 +19,7 @@ USE_QT_VER=	3
 USE_OPENSSL=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}"
+CFLAGS+=	${PTHREAD_CFLAGS}
 
 post-patch:
 	@${REINPLACE_CMD} -e "s|-O3||g ; \
diff --git net/krdesktop/Makefile net/krdesktop/Makefile
index 7f827c1..6bda0fb 100644
--- net/krdesktop/Makefile
+++ net/krdesktop/Makefile
@@ -21,7 +21,7 @@ USE_KDELIBS_VER=3
 NO_WRKSUBDIR=   yes
 PLIST_FILES=	bin/krdesktop
 
-MAKE_ENV=       QTDIR=${QT_PREFIX} \
+MAKE_ENV=	QTDIR=${QT_PREFIX} \
 		KDEDIR=${LOCALBASE} \
 		MOC=${MOC}
 
diff --git net/libfb/Makefile net/libfb/Makefile
index 7f182e5..4c7d09e 100644
--- net/libfb/Makefile
+++ net/libfb/Makefile
@@ -16,9 +16,8 @@ COMMENT=	A foneBRIDGE configuration library
 BUILD_DEPENDS=	${LIBNET_CONFIG}:${PORTSDIR}/net/libnet
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=\
-	CPPFLAGS="${LIBNET_CPPFLAGS}"\
-	LDFLAGS="${LIBNET_LIBS:N-l*}"
+CPPFLAGS+=	${LIBNET_CPPFLAGS}
+LDFLAGS+=	${LIBNET_LIBS:N-l*}
 CONFIGURE_ARGS=	--disable-shared
 
 LIBNET_CONFIG=	${LOCALBASE}/bin/libnet11-config
diff --git net/libgnetwork/Makefile net/libgnetwork/Makefile
index d34f159..6eccc52 100644
--- net/libgnetwork/Makefile
+++ net/libgnetwork/Makefile
@@ -22,8 +22,8 @@ USE_GNOME=	gnomeprefix gnomehack intlhack gconf2
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 #.if !defined(WITHOUT_SSL)
 #LIB_DEPENDS+=	gnutls.13:${PORTSDIR}/security/gnutls
diff --git net/libgweather/Makefile net/libgweather/Makefile
index 8019b30..dc41f8a 100644
--- net/libgweather/Makefile
+++ net/libgweather/Makefile
@@ -24,8 +24,8 @@ USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack intlhack gconf2 ltverhack
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 GCONF_SCHEMAS=	gweather.schemas
 
diff --git net/libmms/Makefile net/libmms/Makefile
index 2504175..df92c4a 100644
--- net/libmms/Makefile
+++ net/libmms/Makefile
@@ -18,7 +18,7 @@ USE_GETTEXT=	yes
 USE_ICONV=	yes
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
-CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib"
+LDFLAGS+=	-L${LOCALBASE}/lib
 USE_LDCONFIG=	yes
 
 .include <bsd.port.mk>
diff --git net/libpcap/Makefile net/libpcap/Makefile
index cdead4c..56543f8 100644
--- net/libpcap/Makefile
+++ net/libpcap/Makefile
@@ -118,7 +118,6 @@ CONFIGURE_ARGS+=	--enable-ipv6
 CONFIGURE_ARGS+=	--without-dag
 .else
 LDFLAGS+=	-L${LOCALBASE}/lib
-CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS}"
 .endif
 
 .if defined(LIBPCAP_OVERWRITE_BASE)
diff --git net/librsync/Makefile net/librsync/Makefile
index 1d9bc62..6c56430 100644
--- net/librsync/Makefile
+++ net/librsync/Makefile
@@ -22,7 +22,7 @@ USE_GMAKE=	yes
 USE_CSTD=	gnu89
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
-CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib"
+LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--enable-shared --disable-trace
 USE_LDCONFIG=	yes
 
diff --git net/libtrace/Makefile net/libtrace/Makefile
index 1ca8dd3..2beff7e 100644
--- net/libtrace/Makefile
+++ net/libtrace/Makefile
@@ -25,7 +25,7 @@ MAN1=		traceanon.1 traceconvert.1 tracefilter.1 tracemerge.1  tracepktdump.1 \
 		tracereport.1 tracertstats.1 tracesplit.1 tracesplit_dir.1 tracestats.1 \
 		tracesummary.1
 
-CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib"
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|echo aout|echo elf|g' \
diff --git net/libvncserver/Makefile net/libvncserver/Makefile
index f1e322d..1c9b708 100644
--- net/libvncserver/Makefile
+++ net/libvncserver/Makefile
@@ -22,8 +22,8 @@ LIB_DEPENDS=	jpeg.11:${PORTSDIR}/graphics/jpeg
 USE_GNOME=	gnomehack
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
-CPPFLAGS=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--without-x
 
 OPTIONS= GNUTLS "Adds GnuTLS support" Off \
diff --git net/liferea/Makefile net/liferea/Makefile
index b596d86..920ca02 100644
--- net/liferea/Makefile
+++ net/liferea/Makefile
@@ -20,8 +20,8 @@ USE_GNOME=	gnomeprefix gnomehack libglade2 gconf2
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
 GNU_CONFIGURE=	yes
-CPPFLAGS=	-I${LOCALBASE}/include
-CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--disable-libnotify
 MAKE_JOBS_SAFE=	yes
 
diff --git net/linc/Makefile net/linc/Makefile
index b18c91bc..bd33949 100644
--- net/linc/Makefile
+++ net/linc/Makefile
@@ -25,8 +25,8 @@ USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool
 CONFIGURE_ARGS=	--with-html-dir=${PREFIX}/share/doc \
 		--disable-gtk-doc
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 post-patch:
 	@${REINPLACE_CMD} -e '/^SUBDIRS/ s|docs||' ${WRKSRC}/Makefile.in
diff --git net/link-monitor-applet/Makefile net/link-monitor-applet/Makefile
index c735a8b..660920b 100644
--- net/link-monitor-applet/Makefile
+++ net/link-monitor-applet/Makefile
@@ -20,7 +20,8 @@ LIB_DEPENDS=	GeoIP:${PORTSDIR}/net/GeoIP
 USE_GNOME=	gnomehack gnomeprefix gnomepanel eel2 librsvg2 libgnomeui
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 GCONF_SCHEMAS=	link-monitor-applet.schemas
 INSTALLS_OMF=	yes
diff --git net/linneighborhood/Makefile net/linneighborhood/Makefile
index 5cf2644..dd04466 100644
--- net/linneighborhood/Makefile
+++ net/linneighborhood/Makefile
@@ -22,11 +22,11 @@ GNU_CONFIGURE=	yes
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gtk12
-CONFIGURE_ENV=	CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}"\
-		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib ${PTHREAD_LIBS}"\
-		CC="${CC} -I${LOCALBASE}/include"
+CONFIGURE_ENV=	CC="${CC} -I${LOCALBASE}/include"
 #                             ^
 # this was done intentionaly in order to make `configure' pick up libintl.h
+LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
+CFLAGS+=	${PTHREAD_CFLAGS}
 
 .include <bsd.port.pre.mk>
 
diff --git net/linphone-base/Makefile net/linphone-base/Makefile
index 879d216..9399a80 100644
--- net/linphone-base/Makefile
+++ net/linphone-base/Makefile
@@ -25,15 +25,14 @@ USE_GNOME=	glib20 gnomehack intlhack pkgconfig
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
 LIBTOOLFILES=	configure oRTP/configure mediastreamer2/configure
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--disable-ipv6 --disable-manual --disable-ewarning \
 		--disable-strict --disable-video --disable-external-ortp \
 		--with-osip=${LOCALBASE} --with-gsm=${LOCALBASE}
 MAKE_ENV=	SUBDIRS="${SUBDIRS}"
 USE_LDCONFIG=	yes
 
-CPPFLAGS=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
+CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 
 .include <bsd.port.pre.mk>
 
diff --git net/mediatomb/Makefile net/mediatomb/Makefile
index 4393b3a..89260c1 100644
--- net/mediatomb/Makefile
+++ net/mediatomb/Makefile
@@ -23,9 +23,7 @@ CFLAGS+=	${PTHREAD_CFLAGS}
 CONFIGURE_ARGS=	--with-search="${LOCALBASE}" \
 		--disable-inotify
 CONFIGURE_ENV=	PTHREAD_LIBS="${PTHREAD_LIBS}" \
-		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
-		LDFLAGS="${LDFLAGS}" \
-		CFLAGS="${CFLAGS}"
+		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}"
 USE_RC_SUBR=	mediatomb.sh
 
 # --- configurable variables ---
diff --git net/minisapserver/Makefile net/minisapserver/Makefile
index 7bc99f1..83e4d1c 100644
--- net/minisapserver/Makefile
+++ net/minisapserver/Makefile
@@ -25,7 +25,7 @@ SUB_FILES=	pkg-message
 OPTIONS=	SLP "Enable SLP support via openslp" off
 
 CPPFLAGS+=	-I${LOCALBASE}/include
-CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib"
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .include <bsd.port.options.mk>
 
diff --git net/miredo/Makefile net/miredo/Makefile
index 17492a7..ceef854 100644
--- net/miredo/Makefile
+++ net/miredo/Makefile
@@ -28,7 +28,7 @@ MAN5=			miredo-server.conf.5 miredo.conf.5
 MAN8=			miredo-server.8 miredo.8 miredo-checkconf.8
 USE_RC_SUBR=		miredo_server miredo
 
-CONFIGURE_ENV=		LDFLAGS="-L${LOCALBASE}/lib"
+LDFLAGS+=		-L${LOCALBASE}/lib
 
 .if !defined(WITHOUT_NLS)
 USE_GETTEXT=		yes
diff --git net/mpich2/Makefile net/mpich2/Makefile
index 59dba10..7890c8e 100644
--- net/mpich2/Makefile
+++ net/mpich2/Makefile
@@ -46,9 +46,10 @@ USE_GNOME=	pkgconfig
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-romio --enable-shared	\
 		--docdir=${DOCSDIR}
-CONFIGURE_ENV+=	PTHREAD_LIBS="${PTHREAD_LIBS}" CPPFLAGS="-I${LOCALBASE}/include"	\
-		LDFLAGS="-L${LOCALBASE}/lib -lexecinfo ${PTHREAD_LIBS}"			\
+CONFIGURE_ENV+=	PTHREAD_LIBS="${PTHREAD_LIBS}" 	\
 		PACKAGE=${PORTNAME}
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib -lexecinfo ${PTHREAD_LIBS}
 FFLAGS?=	-O2
 NOCCACHE=	yes
 MAKE_ENV=	CCACHE_DISABLE=yes PACKAGE=${PORTNAME}
diff --git net/nc6/Makefile net/nc6/Makefile
index db172ca..12a079a 100644
--- net/nc6/Makefile
+++ net/nc6/Makefile
@@ -18,8 +18,8 @@ COMMENT=	Netcat clone with IPv6 support
 MAN1=	nc6.1
 USE_ICONV=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .if !defined(WITHOUT_NLS)
 USE_GETTEXT=	yes
diff --git net/net6/Makefile net/net6/Makefile
index b9c8e8b..80bf9b7 100644
--- net/net6/Makefile
+++ net/net6/Makefile
@@ -20,7 +20,6 @@ LIB_DEPENDS=	sigc-2.0.0:${PORTSDIR}/devel/libsigc++20 \
 
 USE_GNOME=	gnomehack pkgconfig
 USE_AUTOTOOLS=	libtool
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 MAKE_JOBS_SAFE=	yes
 USE_LDCONFIG=	yes
 
@@ -30,8 +29,8 @@ PLIST_SUB+=	NLS="@comment "
 .else
 USE_GETTEXT=	yes
 PLIST_SUB+=	NLS=""
-CPPFLAGS=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 .endif
 
 .include <bsd.port.mk>
diff --git net/netboot/Makefile net/netboot/Makefile
index b6c650f..07c0a3e 100644
--- net/netboot/Makefile
+++ net/netboot/Makefile
@@ -23,8 +23,8 @@ USE_LDCONFIG=	yes
 USE_BISON=	build
 CONFIGURE_ARGS+=	--enable-static=no --enable-bootrom=yes
 
-CONFIGURE_ENV+=	CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
-		LIBS="${LIBS} -L${LOCALBASE}/lib"
+CONFIGURE_ENV+=	LIBS="${LIBS} -L${LOCALBASE}/lib"
+CFLAGS+=	-I${LOCALBASE}/include
 
 MAN5=		netboot.5 netboot.config.5 netboot.drivers.5 netboot.db.5
 MAN8=		mknbi-mgl.8 makerom.8 mknbi-dos.8 mknbi-linux.8 nbdbtool.8
diff --git net/netspeed_applet/Makefile net/netspeed_applet/Makefile
index bd606d7..445d15f 100644
--- net/netspeed_applet/Makefile
+++ net/netspeed_applet/Makefile
@@ -21,7 +21,7 @@ USE_GNOME=	gnomehier intlhack gnomeprefix gnomehack gnomepanel
 USE_GETTEXT=	yes
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .include <bsd.port.mk>
diff --git net/nss-pam-ldapd/Makefile net/nss-pam-ldapd/Makefile
index 0e0f81a..b6918fa 100644
--- net/nss-pam-ldapd/Makefile
+++ net/nss-pam-ldapd/Makefile
@@ -41,8 +41,8 @@ IGNORE=			problems with nss/libc TLS
 EXTRA_PATCHES+=		${FILESDIR}/rtld_nss__nslcd.c
 .endif
 
-CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
-			LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=		-I${LOCALBASE}/include
+LDFLAGS+=		-L${LOCALBASE}/lib
 
 CONFIGURE_ARGS+=	--with-nslcd-pidfile=${NSLCD_PIDFILE} \
 			--with-nslcd-socket=${NSLCD_SOCKET} \
diff --git net/nss_ldap/Makefile net/nss_ldap/Makefile
index 716bac5..306c16b 100644
--- net/nss_ldap/Makefile
+++ net/nss_ldap/Makefile
@@ -28,8 +28,8 @@ USE_OPENLDAP=	yes
 
 OPTIONS=	LCLASS "Enable login classes via the loginClass attribute" on
 
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib -Wl,-rpath,${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib -Wl,-rpath,${LOCALBASE}/lib
 
 CONFIGURE_ARGS=	--with-ldap-conf-file=${PREFIX}/etc/nss_ldap.conf \
 		--with-ldap-secret-file=${PREFIX}/etc/nss_ldap.secret \
diff --git net/ntop/Makefile net/ntop/Makefile
index 78298e6..58dfbd7 100644
--- net/ntop/Makefile
+++ net/ntop/Makefile
@@ -80,10 +80,10 @@ CONFIGURE_ARGS+=	--enable-i18n \
 
 .if defined(WITH_XMLDUMP)
 LIB_DEPENDS+=		gdome.8:${PORTSDIR}/textproc/gdome2
-CONFIGURE_ENV+=		CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include/libxml2 \
+CPPFLAGS+=		-I${LOCALBASE}/include/libxml2 \
 			-I${LOCALBASE}/include/libxml2/libxml \
 			-I${LOCALBASE}/include/libgdome \
-			-I${LOCALBASE}/include/glib-2.0"
+			-I${LOCALBASE}/include/glib-2.0
 .endif
 
 .if ${OSVERSION} < 700000
diff --git net/opal/Makefile net/opal/Makefile
index 425de0d..378cf14 100644
--- net/opal/Makefile
+++ net/opal/Makefile
@@ -29,8 +29,8 @@ GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 MAKE_ARGS=	-j`${SYSCTL} -n hw.ncpu`
 
-CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include -I${WRKSRC}/include" \
-		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include -I${WRKSRC}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 PLIST_SUB=	PORTVERSION=${PORTVERSION}
 
 .include <bsd.port.pre.mk>
diff --git net/opal3/Makefile net/opal3/Makefile
index 3ec899c..d57c944 100644
--- net/opal3/Makefile
+++ net/opal3/Makefile
@@ -30,8 +30,8 @@ USE_LDCONFIG=	yes
 #MAKE_JOBS_SAFE=	yes
 
 CXXFLAGS+=	-I${LOCALBASE}/include
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 OPTIONS=	ZRTP	"Enable ZRTP protocol support" off \
 		JAVA	"Enable Java JNI support" off \
diff --git net/openh323/Makefile net/openh323/Makefile
index fa860d1..7add8bf 100644
--- net/openh323/Makefile
+++ net/openh323/Makefile
@@ -28,8 +28,9 @@ GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 
 ALL_TARGET=	optshared
-CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include -I${WRKSRC}/include" \
-		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" BUILDTIME="YES"
+CONFIGURE_ENV+=	BUILDTIME="YES"
+CPPFLAGS+=	-I${LOCALBASE}/include -I${WRKSRC}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 MAKE_ENV=	BUILDTIME="YES"
 
 .include <bsd.port.pre.mk>
diff --git net/openldap23-server/Makefile net/openldap23-server/Makefile
index 6c33321..2df83f3 100644
--- net/openldap23-server/Makefile
+++ net/openldap23-server/Makefile
@@ -379,9 +379,7 @@ CPPFLAGS+=		${PTHREAD_CFLAGS} \
 LDFLAGS+=		-L${LOCALBASE}/lib
 #LIBS+=			${PTHREAD_LIBS}
 
-CONFIGURE_ENV+=		CPPFLAGS="${CPPFLAGS}" \
-			LDFLAGS="${LDFLAGS}" \
-			LIBS="${LIBS}"
+CONFIGURE_ENV+=		LIBS="${LIBS}"
 
 .if defined(CLIENT_ONLY)
 .include "${FILESDIR}/manpages"
diff --git net/openldap24-server/Makefile net/openldap24-server/Makefile
index e8e60fb..c1f63f5 100644
--- net/openldap24-server/Makefile
+++ net/openldap24-server/Makefile
@@ -452,9 +452,7 @@ CPPFLAGS+=		${PTHREAD_CFLAGS} \
 LDFLAGS+=		-L${LOCALBASE}/lib
 #LIBS+=			${PTHREAD_LIBS}
 
-CONFIGURE_ENV+=		CPPFLAGS="${CPPFLAGS}" \
-			LDFLAGS="${LDFLAGS}" \
-			LIBS="${LIBS}"
+CONFIGURE_ENV+=		LIBS="${LIBS}"
 
 .if defined(CLIENT_ONLY)
 .include "${FILESDIR}/manpages"
diff --git net/panoptis/Makefile net/panoptis/Makefile
index 1239cfb..9b47d0a 100644
--- net/panoptis/Makefile
+++ net/panoptis/Makefile
@@ -18,7 +18,6 @@ LIB_DEPENDS=	ccgnu2-1.7.0:${PORTSDIR}/devel/commoncpp
 
 GNU_CONFIGURE=	yes
 USE_PYTHON=	yes
-CONFIGURE_ENV=	CPPFLAGS='${CPPFLAGS}' LDFLAGS='${LDFLAGS}'
 PLIST_FILES=	bin/panoptis bin/mail.py bin/pview.py bin/speed.py
 
 do-install:
diff --git net/pktanon/Makefile net/pktanon/Makefile
index 6a5bc80..a3434f3 100644
--- net/pktanon/Makefile
+++ net/pktanon/Makefile
@@ -18,7 +18,8 @@ LIB_DEPENDS=	boost_regex.4:${PORTSDIR}/devel/boost-libs \
 		xerces-c:${PORTSDIR}/textproc/xerces-c2
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib" CPPFLAGS="-I${LOCALBASE}/include"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 MAKE_JOBS_SAFE=	yes
 
 post-install:
diff --git net/poptop/Makefile net/poptop/Makefile
index 92271dc..952a719 100644
--- net/poptop/Makefile
+++ net/poptop/Makefile
@@ -19,7 +19,6 @@ USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 MAKE_ARGS=	ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \
 		AUTOHEADER="${TRUE}"
-MAKE_ENV+=	CC="${CC}" CXX="${CXX}" CFLAGS="${CFLAGS}"
 
 USE_RC_SUBR=	pptpd.sh
 
diff --git net/proxy-suite/Makefile net/proxy-suite/Makefile
index 397c0ff..68bad07 100644
--- net/proxy-suite/Makefile
+++ net/proxy-suite/Makefile
@@ -23,7 +23,7 @@ USE_BZIP2=	yes
 #
 # basic configure args
 #
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include"
+CPPFLAGS+=	-I${LOCALBASE}/include
 CONFIGURE_ARGS=	--prefix=${PREFIX} --with-libwrap=/usr/lib --with-regex \
 		--localstatedir=/var/run \
 		--enable-warnings --enable-so-linger \
diff --git net/quagga/Makefile net/quagga/Makefile
index e528965..15725ec 100644
--- net/quagga/Makefile
+++ net/quagga/Makefile
@@ -50,9 +50,9 @@ CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-fstack-protector
 .endif
 CONFIGURE_ARGS+=--includedir=${PREFIX}/include --enable-exampledir=${PREFIX}/share/examples/quagga
-CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" \
-		LIBTOOL=${LIBTOOL} LIBTOOLIZE=${LIBTOOLIZE} \
+CONFIGURE_ENV+=	LIBTOOL=${LIBTOOL} LIBTOOLIZE=${LIBTOOLIZE} \
 		LIBTOOL_VERSION=${LIBTOOL_VERSION}
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .if !defined(ENABLE_USER)
 ENABLE_USER=quagga
diff --git net/rabbitmq-c-devel/Makefile net/rabbitmq-c-devel/Makefile
index 2f5219c..3d670cc 100644
--- net/rabbitmq-c-devel/Makefile
+++ net/rabbitmq-c-devel/Makefile
@@ -53,8 +53,6 @@ CONFIGURE_ARGS+=	--enable-64-bit
 LIB_DEPENDS+=	popt.0:${PORTSDIR}/devel/popt
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
-CONFIGURE_ENV+=	CFLAGS="${CFLAGS}" \
-		LDFLAGS="${LDFLAGS}"
 
 PLIST_SUB+=		POPT=''
 CONFIGURE_ARGS+=	--with-popt
diff --git net/rabbitmq-c/Makefile net/rabbitmq-c/Makefile
index a06f274..41d8445 100644
--- net/rabbitmq-c/Makefile
+++ net/rabbitmq-c/Makefile
@@ -52,8 +52,6 @@ CONFIGURE_ARGS+=	--enable-64-bit
 LIB_DEPENDS+=	popt.0:${PORTSDIR}/devel/popt
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
-CONFIGURE_ENV+=	CFLAGS="${CFLAGS}" \
-		LDFLAGS="${LDFLAGS}"
 
 PLIST_SUB+=		POPT=''
 CONFIGURE_ARGS+=	--with-popt
diff --git net/remmina-applet/Makefile net/remmina-applet/Makefile
index 4059c20..7513a3e 100644
--- net/remmina-applet/Makefile
+++ net/remmina-applet/Makefile
@@ -23,8 +23,8 @@ MAKE_JOBS_SAFE=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack glib20 gtk20 gnomepanel
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
diff --git net/remmina-plugins/bsd.plugin.mk net/remmina-plugins/bsd.plugin.mk
index b3bddae..6aa1b7e 100644
--- net/remmina-plugins/bsd.plugin.mk
+++ net/remmina-plugins/bsd.plugin.mk
@@ -14,8 +14,7 @@ USE_GMAKE=	yes
 USE_GNOME=	glib20 gtk20
 INSTALLS_ICONS=	yes
 LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
-		LDFLAGS="${LDFLAGS}"
+CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
 CONFIGURE_ARGS+=--disable-nx --disable-rdp --disable-ssh --disable-telepathy \
 		--disable-vnc --disable-xdmcp --disable-nls
 
diff --git net/remmina/Makefile net/remmina/Makefile
index d3a9399..211fd8c 100644
--- net/remmina/Makefile
+++ net/remmina/Makefile
@@ -25,8 +25,7 @@ USE_GMAKE=	yes
 USE_GNOME=	glib20 gtk20 desktopfileutils
 INSTALLS_ICONS=	yes
 LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS} -Wl,-rpath -Wl,${LOCALBASE}/lib
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
-		LDFLAGS="${LDFLAGS}"
+CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
 SUB_FILES=	pkg-message
 
 LICENSE=	GPLv2
diff --git net/rexx-sock/Makefile net/rexx-sock/Makefile
index 6d5ea8e..aad8c2c 100644
--- net/rexx-sock/Makefile
+++ net/rexx-sock/Makefile
@@ -21,7 +21,8 @@ RUN_DEPENDS=	rexx-regina>=3.3_1:${PORTSDIR}/lang/rexx-regina
 
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${PTHREAD_CFLAGS}" LDFLAGS="${PTHREAD_LIBS}"
+CPPFLAGS+=	${PTHREAD_CFLAGS}
+LDFLAGS+=	${PTHREAD_LIBS}
 CONFIGURE_ARGS=	--with-rexx=regina
 MAKE_ARGS=	INSTALL="${INSTALL}"
 USE_LDCONFIG=	yes
diff --git net/rsync/Makefile net/rsync/Makefile
index 04b22c4..d6f0302 100644
--- net/rsync/Makefile
+++ net/rsync/Makefile
@@ -75,7 +75,7 @@ CFLAGS+=	-I${LOCALBASE}/include
 USE_ICONV=	yes
 CONFIGUREDCFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=		-L${LOCALBASE}/lib
-CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS}" CONFIGUREDCFLAGS="${CONFIGUREDCFLAGS}"
+CONFIGURE_ENV+=	CONFIGUREDCFLAGS="${CONFIGUREDCFLAGS}"
 .else
 CONFIGURE_ARGS+=	--disable-iconv
 CONFIGURE_ENV+=		ac_cv_search_libiconv_open=no
@@ -94,8 +94,8 @@ EXTRA_PATCHES+=	${WRKSRC}/patches/acls.diff
 
 .if defined(WITH_POPT_PORT)
 LIB_DEPENDS+=	popt.0:${PORTSDIR}/devel/popt
-CONFIGURE_ENV+=	CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV+=	LIBS="-L${LOCALBASE}/lib"
+CFLAGS+=	-I${LOCALBASE}/include
 .else
 CONFIGURE_ARGS+=	--with-included-popt
 .endif
diff --git net/rtpproxy/Makefile net/rtpproxy/Makefile
index 8e88a5f..1eff737 100644
--- net/rtpproxy/Makefile
+++ net/rtpproxy/Makefile
@@ -16,8 +16,8 @@ COMMENT=	A high-performance RTP proxy server for the SIP Express Router (SER)
 LIB_DEPENDS=	gsm.1:${PORTSDIR}/audio/gsm
 
 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=	--mandir=${LOCALBASE}/man
 MAN8=		rtpproxy.8
 
diff --git net/samba34/Makefile net/samba34/Makefile
index e1d1915..7cbcfe4 100644
--- net/samba34/Makefile
+++ net/samba34/Makefile
@@ -68,7 +68,6 @@ CONFIGURE_ARGS+=	--exec-prefix="${PREFIX}" \
 
 CPPFLAGS+=		-I${LOCALBASE}/include
 LDFLAGS+=		-L${LOCALBASE}/lib
-CONFIGURE_ENV+=		CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 # pkg-config is used to find talloc
 PKGCONFIGDIR?=		${PREFIX}/libdata/pkgconfig
 PKGCONFIGDIR_REL?=	${PKGCONFIGDIR:S|^${PREFIX}/||}
diff --git net/samba35/Makefile net/samba35/Makefile
index 2c89c9a..cac62b4 100644
--- net/samba35/Makefile
+++ net/samba35/Makefile
@@ -74,8 +74,7 @@ CONFIGURE_ARGS+=	--exec-prefix="${PREFIX}" \
 CPPFLAGS+=		-I${LOCALBASE}/include
 LDFLAGS+=		-L${LOCALBASE}/lib
 
-CONFIGURE_ENV+=		LDFLAGS="${LDFLAGS}" \
-			PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
+CONFIGURE_ENV+=		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 			PTHREAD_LDFLAGS="${PTHREAD_LIBS}"
 # pkg-config is used to find talloc, tevent and tdb
 PKGCONFIGDIR?=		${PREFIX}/libdata/pkgconfig
diff --git net/samba4-devel/Makefile net/samba4-devel/Makefile
index 6ad4722..fc9f98e 100644
--- net/samba4-devel/Makefile
+++ net/samba4-devel/Makefile
@@ -45,7 +45,6 @@ USE_AUTOTOOLS=		autoconf autoheader
 # Flags
 CPPFLAGS+=		-I${LOCALBASE}/include
 LDFLAGS+=		-L${LOCALBASE}/lib
-CONFIGURE_ENV+=		CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 # Directories
 VARDIR=			/var
 SAMBA_LOGDIR=		${VARDIR}/log/${PORTNAME}
diff --git net/ser/Makefile net/ser/Makefile
index d1341c2..1b32bfc 100644
--- net/ser/Makefile
+++ net/ser/Makefile
@@ -21,7 +21,7 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 USE_GMAKE=	yes
 USE_RC_SUBR=	ser
 CFLAGS+=	-I${LOCALBASE}/include
-MAKE_ENV+=	"LDFLAGS=-L${LOCALBASE}/lib"
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 NOPRECIOUSMAKEVARS=	yes
 
diff --git net/serveez/Makefile net/serveez/Makefile
index a572f4f..a3207ee 100644
--- net/serveez/Makefile
+++ net/serveez/Makefile
@@ -22,14 +22,13 @@ GUILE_CONFIG?=	${LOCALBASE}/bin/guile-config
 USE_AUTOTOOLS=	libtool
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 USE_LDCONFIG=	yes
 
 MAN1=	serveez.1 serveez-config.1
 INFO=	serveez serveez-api
 
-CPPFLAGS=	`${GUILE_CONFIG} compile`
-LDFLAGS=	`${GUILE_CONFIG} link`
+CPPFLAGS+=	`${GUILE_CONFIG} compile`
+LDFLAGS+=	`${GUILE_CONFIG} link`
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|-release||g' \
diff --git net/silc-client/Makefile net/silc-client/Makefile
index 1116490..70034ac 100644
--- net/silc-client/Makefile
+++ net/silc-client/Makefile
@@ -115,7 +115,7 @@ CONFIGURE_ARGS+=	--disable-asm
 .endif
 
 .if defined(WITH_PTHREADS)
-CONFIGURE_ENV+=	CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS} ${PTHREAD_LIBS}"
+CFLAGS+=		${PTHREAD_CFLAGS} ${PTHREAD_LIBS}
 .else
 CONFIGURE_ARGS+=	--without-pthreads
 .endif
diff --git net/silc-server/Makefile net/silc-server/Makefile
index f914a9d..bcb5c3f 100644
--- net/silc-server/Makefile
+++ net/silc-server/Makefile
@@ -30,7 +30,7 @@ USE_RC_SUBR=	silcd
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS} ${PTHREAD_LIBS}"
+CFLAGS+=	${PTHREAD_CFLAGS} ${PTHREAD_LIBS}
 CONFIGURE_ARGS=	--with-silcd-config-file=${PREFIX}/etc/${PORTNAME}/silcd.conf \
 		--sysconfdir=${PREFIX}/etc/${PORTNAME} \
 		--with-helpdir=share/${PORTNAME}/help \
diff --git net/sobby/Makefile net/sobby/Makefile
index dd072e1..b9c0401 100644
--- net/sobby/Makefile
+++ net/sobby/Makefile
@@ -21,15 +21,14 @@ LIB_DEPENDS=	sigc-2.0.0:${PORTSDIR}/devel/libsigc++20 \
 		glibmm-2.4.1:${PORTSDIR}/devel/glibmm
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--disable-zeroconf
 MAKE_JOBS_SAFE=	yes
 
 MAN1=		${PORTNAME}.1
 PLIST_FILES=	bin/${PORTNAME}
 
-CPPFLAGS=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
diff --git net/tapidbus/Makefile net/tapidbus/Makefile
index f6b7356..0287e18 100644
--- net/tapidbus/Makefile
+++ net/tapidbus/Makefile
@@ -23,7 +23,6 @@ USE_GNOME=	pkgconfig glib20 gnomehack
 USE_LDCONFIG=	yes
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
-MAKE_ENV+=	LDFLAGS="${LDFLAGS}"
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|\-O2||' ${WRKSRC}/configure
diff --git net/tintin++/Makefile net/tintin++/Makefile
index 7a37b62..8b38f92 100644
--- net/tintin++/Makefile
+++ net/tintin++/Makefile
@@ -23,7 +23,7 @@ OPTIONS=	BIG5 "Big5 support" off
 CONFIGURE_ARGS=	--includedir=${LOCALBASE}/include \
 		--libdir=${LOCALBASE}/lib \
 		--prefix=${PREFIX}
-CONFIGURE_ENV=	LDFLAGS="${LDFLAGS}" ac_cv_file__dev_ptmx=no
+CONFIGURE_ENV=	ac_cv_file__dev_ptmx=no
 GNU_CONFIGURE=	yes
 LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 USE_GMAKE=	yes
diff --git net/trafshow3/Makefile net/trafshow3/Makefile
index 5d45de2..4add1a9 100644
--- net/trafshow3/Makefile
+++ net/trafshow3/Makefile
@@ -27,7 +27,8 @@ LIB_DEPENDS=	slang.2:${PORTSDIR}/devel/libslang2
 .endif
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
 ALL_TARGET=	trafshow
 
 MAN1=		trafshow.1
diff --git net/trickle/Makefile net/trickle/Makefile
index 9febe86..911c88c 100644
--- net/trickle/Makefile
+++ net/trickle/Makefile
@@ -22,8 +22,8 @@ USE_LDCONFIG=	yes
 
 CONFIGURE_ARGS+=--with-libevent=${LOCALBASE} \
 		--sysconfdir=${PREFIX}/etc
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
 
 MAN1=		trickle.1
 MAN5=		trickled.conf.5
diff --git net/tridiavnc/Makefile net/tridiavnc/Makefile
index d97277d..678c889 100644
--- net/tridiavnc/Makefile
+++ net/tridiavnc/Makefile
@@ -29,7 +29,7 @@ CONFLICTS=	tightvnc-[0-9]* vnc-[0-9]*
 
 .ifdef(TRIDIAVNC_BASE)
 PREFIX=${TRIDIAVNC_BASE}
-MAKE_ENV+=      DESTDIR=${TRIDIAVNC_BASE}
+MAKE_ENV+=	DESTDIR=${TRIDIAVNC_BASE}
 .endif
 
 .include <bsd.port.pre.mk>
diff --git net/tsclient/Makefile net/tsclient/Makefile
index 4d18f65..c82696e 100644
--- net/tsclient/Makefile
+++ net/tsclient/Makefile
@@ -21,9 +21,9 @@ USE_GNOME=	gtk20
 USE_GMAKE=	yes
 USE_GETTEXT=	yes
 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
 
 MAN1=		tsclient.1
 PORTDOCS=	COPYING NEWS README
diff --git net/twinkle/Makefile net/twinkle/Makefile
index 22a10a1..c8c048c 100644
--- net/twinkle/Makefile
+++ net/twinkle/Makefile
@@ -35,8 +35,7 @@ USE_QT_VER=	3
 OPTIONS=	KDE	"Compile with kde features"	off
 
 CONFIGURE_ARGS=	--with-qt-dir=${QT_PREFIX} QTDIR=${LOCALBASE} \
-CONFIGURE_ENV=	QMAKESPEC="${QMAKESPEC}" \
-		CFLAGS="${CFLAGS}"
+CONFIGURE_ENV=	QMAKESPEC="${QMAKESPEC}"
 MAKE_ENV=	QTDIR=${QT_PREFIX}
 SUB_FILES=	pkg-message
 
diff --git net/ulxmlrpcpp/Makefile net/ulxmlrpcpp/Makefile
index b43d062..f0c7b5b 100644
--- net/ulxmlrpcpp/Makefile
+++ net/ulxmlrpcpp/Makefile
@@ -24,13 +24,12 @@ USE_GNOME=	gnomehack
 USE_ICONV=	yes
 USE_OPENSSL=	yes
 USE_AUTOTOOLS=	libtool
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" \
-		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
+CONFIGURE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		PTHREAD_LIBS="${PTHREAD_LIBS}"
 USE_LDCONFIG=	yes
 
-CPPFLAGS=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 post-patch:
 	@${REINPLACE_CMD} -e \
diff --git net/uplog/Makefile net/uplog/Makefile
index 0a78331..13ab97b 100644
--- net/uplog/Makefile
+++ net/uplog/Makefile
@@ -14,8 +14,8 @@ MAINTAINER=	jadawin@FreeBSD.org
 COMMENT=	UDP-based ping programm
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
 
 PORTDOCS=	README
 PLIST_FILES=	bin/uplog
diff --git net/ushare/Makefile net/ushare/Makefile
index 6d21053..8ced4ea 100644
--- net/ushare/Makefile
+++ net/ushare/Makefile
@@ -21,7 +21,7 @@ USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_GNOME=	pkgconfig
 USE_GETTEXT=	yes
-CONFIGURE_ENV+=	LDFLAGS="-L${LOCALBASE}/lib -lintl"
+LDFLAGS+=	-L${LOCALBASE}/lib -lintl
 
 CFLAGS+=	-I${LOCALBASE}/include -I${WRKSRC}
 
diff --git net/vde/Makefile net/vde/Makefile
index cff10a1..577442e 100644
--- net/vde/Makefile
+++ net/vde/Makefile
@@ -22,7 +22,6 @@ USE_LDCONFIG=	yes
 .include <bsd.port.pre.mk>
 
 CFLAGS+=	${CPPFLAGS} -fPIC
-MAKE_ENV+=	LDFLAGS="${LDFLAGS}"
 
 MAN1=		dpipe.1 slirpvde.1 vdetaplib.1 vdeq.1 vde_plug.1 vde_switch.1
 
diff --git net/vinagre/Makefile net/vinagre/Makefile
index 8ba7c7c..9b5bcb2 100644
--- net/vinagre/Makefile
+++ net/vinagre/Makefile
@@ -29,8 +29,8 @@ GNU_CONFIGURE=	yes
 INSTALLS_OMF=	yes
 INSTALLS_ICONS=	yes
 CONFIGURE_ARGS=	--enable-avahi --enable-applet -enable-ssh
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 GCONF_SCHEMAS=	vinagre.schemas
 
diff --git net/vino/Makefile net/vino/Makefile
index c4d2501..1c5d008 100644
--- net/vino/Makefile
+++ net/vino/Makefile
@@ -28,8 +28,8 @@ USE_GMAKE=	yes
 GNOME_DESKTOP_VERSION=2
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 GCONF_SCHEMAS=	vino-server.schemas
 
diff --git net/whois/Makefile net/whois/Makefile
index d666632..dde7389 100644
--- net/whois/Makefile
+++ net/whois/Makefile
@@ -23,7 +23,6 @@ USE_PERL5_BUILD=	yes
 
 WRKSRC=	${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
-MAKE_ENV=	LDFLAGS="${LDFLAGS}"
 MAKE_ARGS=	OPTS=""
 
 MAN1=		mwhois.1 mkpasswd.1
diff --git net/wire/Makefile net/wire/Makefile
index 782845f..bdde35a 100644
--- net/wire/Makefile
+++ net/wire/Makefile
@@ -18,9 +18,8 @@ COMMENT=	Wire is a screen-oriented command line Wired client
 
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
-CONFIGURE_ENV=	CPPFLAGS=${CPPFLAGS} LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS=	--libdir="${LOCALBASE}/lib" --includedir="${LOCALBASE}/include"
-MAKE_ENV=	CPPFLAGS=${CPPFLAGS}
 
 USE_GMAKE=	yes
 USE_OPENSSL=	yes
diff --git net/wmwifi/Makefile net/wmwifi/Makefile
index 3c5958a..c33e64b 100644
--- net/wmwifi/Makefile
+++ net/wmwifi/Makefile
@@ -21,7 +21,7 @@ GNU_CONFIGURE=	yes
 USE_XORG=	x11 xpm
 USE_GMAKE=	yes
 
-CONFIGURE_ENV+=	"CPPFLAGS=-I${LOCALBASE}/include"
+CPPFLAGS+=	-I${LOCALBASE}/include
 
 PLIST_FILES=	bin/wmwifi
 
diff --git net/wol/Makefile net/wol/Makefile
index 5c4672d..873810d 100644
--- net/wol/Makefile
+++ net/wol/Makefile
@@ -17,9 +17,8 @@ COMMENT=	Tool to wake up Wake-On-LAN compliant computers
 
 GNU_CONFIGURE=		yes
 USE_PERL5_BUILD=	yes
-CPPFLAGS=		-I${LOCALBASE}/include
-LDFLAGS=		-L${LOCALBASE}/lib
-CONFIGURE_ENV=		CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
+CPPFLAGS+=		-I${LOCALBASE}/include
+LDFLAGS+=		-L${LOCALBASE}/lib
 
 .if defined(WITHOUT_NLS)
 CONFIGURE_ARGS=	--disable-nls
diff --git net/x11vnc/Makefile net/x11vnc/Makefile
index 78cedf8..43ea744 100644
--- net/x11vnc/Makefile
+++ net/x11vnc/Makefile
@@ -31,7 +31,7 @@ USE_ICONV=	yes
 USE_GETTEXT=	yes
 .endif
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include"
+CPPFLAGS+=	-I${LOCALBASE}/include
 
 MAN1=		x11vnc.1
 PORTDOCS=	AUTHORS COPYING ChangeLog NEWS README README.LibVNCServer TODO
diff --git net/xipdump/Makefile net/xipdump/Makefile
index 1e18be7..79e6099 100644
--- net/xipdump/Makefile
+++ net/xipdump/Makefile
@@ -19,7 +19,7 @@ BUILD_DEPENDS=	${LIBNET_CONFIG}:${PORTSDIR}/net/libnet10
 
 USE_XORG=	xt x11 ice xaw xmu
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	LDFLAGS="`${LIBNET_CONFIG} --libs`"
+LDFLAGS+=	`${LIBNET_CONFIG} --libs`
 CFLAGS+=	`${LIBNET_CONFIG} --cflags` `${LIBNET_CONFIG} --defines` \
 		-I/usr/include
 
diff --git net/xmlrpc-epi/Makefile net/xmlrpc-epi/Makefile
index 59f3fdd..8ec3577 100644
--- net/xmlrpc-epi/Makefile
+++ net/xmlrpc-epi/Makefile
@@ -19,8 +19,8 @@ USE_GMAKE=	yes
 USE_ICONV=	yes
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include"		\
-		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib -liconv"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib -liconv
 CONFIGURE_ARGS=	--program-transform="s|^|xre-|"
 
 PORTDOCS=	AUTHORS ChangeLog NEWS README
diff --git net/xrdp/Makefile net/xrdp/Makefile
index e371451..2f49486 100644
--- net/xrdp/Makefile
+++ net/xrdp/Makefile
@@ -25,9 +25,8 @@ GNU_CONFIGURE=	yes
 USE_RC_SUBR=	xrdp
 
 CONFIGURE_ARGS=	--localstatedir=/var
-CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib"
-CPPFLAGS=	-I${LOCALBASE}/include
-LDFLAGS=		-L${LOCALBASE}/lib
+LDFLAGS+=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
 RUN_DEPENDS+=	Xvnc:${PORTSDIR}/net/vnc
 LICENSE=		GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
diff --git net/yate-devel/Makefile net/yate-devel/Makefile
index fae2c8d..495e68b 100644
--- net/yate-devel/Makefile
+++ net/yate-devel/Makefile
@@ -31,8 +31,8 @@ WANT_GNOME=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--without-fdsize \
 		--mandir=${LOCALBASE}/man
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 MAKE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		PTHREAD_LIBS="${PTHREAD_LIBS}" \
 		PWLIBDIR=${LOCALBASE}/share/pwlib \
diff --git net/yate/Makefile net/yate/Makefile
index cdf984f..9bc4fb4 100644
--- net/yate/Makefile
+++ net/yate/Makefile
@@ -30,14 +30,14 @@ WRKSRC=		${WRKDIR}/yate
 CONFIGURE_ARGS=	--without-fdsize \
 		--with-zlib=/usr
 
-CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib"
-CPPFLAGS=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
 
 MAKE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		PTHREAD_LIBS="${PTHREAD_LIBS}" \
 		PWLIBDIR=${LOCALBASE}/share/pwlib \
 		OPENH323DIR=${LOCALBASE}/share/openh323 \
-		OSVERSION=${OSVERSION} \
+		OSVERSION=${OSVERSION}
 
 MAN8=		yate-config.8 yate.8
 
diff --git news/grn/Makefile news/grn/Makefile
index 91c9599..1cd3b1a 100644
--- news/grn/Makefile
+++ news/grn/Makefile
@@ -20,9 +20,10 @@ USE_GNOME=	gnomehack gnomelibs gnomeprefix
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 LIBTOOLFILES=	configure libmutt/configure
-CONFIGURE_ENV=	glibpath="${GLIB_CONFIG}" \
-		CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV=	glibpath="${GLIB_CONFIG}"
+
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|$${CONFIG_SHELL-/bin/sh} $$ac_aux_dir|$$ac_aux_dir|' \
diff --git news/klibido/Makefile news/klibido/Makefile
index 93a4f55..b36a8eb 100644
--- news/klibido/Makefile
+++ news/klibido/Makefile
@@ -23,9 +23,9 @@ USE_AUTOTOOLS=	libtool
 INSTALLS_ICONS=	yes
 USE_GETTEXT=	yes
 
-CONFIGURE_ENV=	CFLAGS="${CFLAGS} -I${LOCALBASE}/include/db44 ${PTHREAD_CFLAGS}" \
-		CXXFLAGS="${CXXFLAGS} -I${LOCALBASE}/include/db44" \
-		LDFLAGS="-L${LOCALBASE}/lib/db44 ${PTHREAD_LIBS}"
+LDFLAGS+=	-L${LOCALBASE}/lib/db44 ${PTHREAD_LIBS}
+CFLAGS+=	-I${LOCALBASE}/include/db44 ${PTHREAD_CFLAGS}
+CXXFLAGS+=	-I${LOCALBASE}/include/db44
 
 post-install:
 .if defined(NOPORTDOCS)
diff --git news/newscache/Makefile news/newscache/Makefile
index e52315b..c8b1b04 100644
--- news/newscache/Makefile
+++ news/newscache/Makefile
@@ -19,8 +19,8 @@ LIB_DEPENDS=	socket[+][+].1:${PORTSDIR}/net/libsocket++
 
 USE_AUTOTOOLS=	automake autoheader autoconf
 AUTOMAKE_ARGS=	--add-missing
-CONFIGURE_ENV=	CPPFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
-		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
+CPPFLAGS+=	${CFLAGS} -I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS+=--sysconfdir=${PREFIX}/etc
 USE_RC_SUBR=	${PORTNAME}.sh
 
diff --git news/newsstar/Makefile news/newsstar/Makefile
index f94781a..cfe52f6 100644
--- news/newsstar/Makefile
+++ news/newsstar/Makefile
@@ -30,8 +30,8 @@ CONFIGURE_ARGS+=--prefix=${PREFIX} \
 		--with-rc-dir=/var/spool/newsstar/lib \
 		--with-incoming-dir=/var/spool/newsstar/incoming
 
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
 
 .if defined(NOPORTDOCS)
 INSTALL_TARGET=	install-am
diff --git news/newsx/Makefile news/newsx/Makefile
index 57bf1fb..c79fe13 100644
--- news/newsx/Makefile
+++ news/newsx/Makefile
@@ -30,7 +30,7 @@ CONFLICTS=	leafnode-1.9.*
 
 .if !defined(WITH_CNEWS)
 .if !defined(WITHOUT_INN_2-X)
-CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/news/include"
+CPPFLAGS+=	-I${LOCALBASE}/news/include
 .endif
 .endif
 
diff --git news/nntpcache/Makefile news/nntpcache/Makefile
index 23f772c..fbb01f6 100644
--- news/nntpcache/Makefile
+++ news/nntpcache/Makefile
@@ -45,7 +45,6 @@ CONFIGURE_ARGS+=	--with-authinfo-ldap
 CPPFLAGS+=	-I${PREFIX}/include -I${LOCALBASE}/include
 LDFLAGS+=	-L${PREFIX}/lib -L${LOCALBASE}/lib
 AUTHINFO_EXT+=	authinfo_ldap.ext
-CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 .endif
 CONFIGURE_ARGS+=	--program-transform-name=''
 
diff --git news/noffle/Makefile news/noffle/Makefile
index 8b624e3..8215935 100644
--- news/noffle/Makefile
+++ news/noffle/Makefile
@@ -20,8 +20,8 @@ GNU_CONFIGURE=	yes
 
 CONFIGURE_ARGS+=--with-configfile=${LOCALBASE}/etc/noffle.conf \
 		--with-usersfile=${LOCALBASE}/etc/noffle.users
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
 
 SPOOL_DIR=	/var/spool/noffle
 PLIST_SUB+=	SPOOL_DIR=${SPOOL_DIR}
diff --git news/nzbget/Makefile news/nzbget/Makefile
index 91ef827..9891cc9 100644
--- news/nzbget/Makefile
+++ news/nzbget/Makefile
@@ -21,9 +21,10 @@ LIB_DEPENDS=	xml2.5:${PORTSDIR}/textproc/libxml2 \
 		sigc-2:${PORTSDIR}/devel/libsigc++20
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
-		CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}" LDFLAGS="${PTHREAD_LIBS}" \
-		LOCALBASE="${LOCALBASE}"
+CONFIGURE_ENV=	LOCALBASE="${LOCALBASE}"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	${PTHREAD_LIBS}
+CFLAGS+=	${PTHREAD_CFLAGS}
 USE_GMAKE=	yes
 
 OPTIONS=	PARCHECK "Enable autopar/parcheck (Requires libpar2)" On
diff --git news/pan/Makefile news/pan/Makefile
index 394e798..514c37d 100644
--- news/pan/Makefile
+++ news/pan/Makefile
@@ -26,7 +26,7 @@ USE_GNOME=	gnomehack intlhack
 USE_GETTEXT=	yes
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
-CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib -lgnuregex"
+LDFLAGS+=	-L${LOCALBASE}/lib -lgnuregex
 
 OPTIONS=	GTKSPELL "Enable spell checking support (gtk+2 only)" on \
 		GTK3 "Build with gtk+3 based UI instead of gtk+2" off
diff --git news/s-news/Makefile news/s-news/Makefile
index 267f868..77833b2 100644
--- news/s-news/Makefile
+++ news/s-news/Makefile
@@ -21,8 +21,8 @@ CONFLICTS=	nntp-[0-9]*
 CONFIGURE_ARGS=	--prefix=${PREFIX} \
 		--with-confdir=${PREFIX}/etc/s-news \
 		--with-spooldir=/var/spool/s-news
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
 
 USE_GMAKE=	yes
 HAS_CONFIGURE=	yes
diff --git news/suck/Makefile news/suck/Makefile
index aa7bf9c..d44085e 100644
--- news/suck/Makefile
+++ news/suck/Makefile
@@ -26,7 +26,6 @@ EX_SCRIPTS=	get.news.generic get.news.inn perl_kill.pl perl_xover.pl \
 		post_filter.pl put.news put.news.pl put.news.sm put.news.sm.pl
 EX_DATA=	suckkillfile.sample sucknewsrc.sample suckothermsgs.sample
 
-CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS}"
 MAKE_ENV+=	CHKHISTORY=chkhistory_db.o
 
 .if defined(NEWSBIN) && !defined(SUCK_WITH_INN)
diff --git news/tin/Makefile news/tin/Makefile
index 348a016..27b20e6 100644
--- news/tin/Makefile
+++ news/tin/Makefile
@@ -65,7 +65,7 @@ CONFIGURE_ARGS+=--with-nntp-default-server=news \
 MAKE_ARGS+=	MAKE=${GMAKE}
 CFLAGS+=	-DNNTP_SERVER_FILE=\\\"${PREFIX}/etc/nntpserver\\\"
 CPPFLAGS+=	-I${LOCALBASE}/include
-CONFIGURE_ENV=	LDFLAGS='${LDFLAGS} -L${LOCALBASE}/lib'
+LDFLAGS+=	-L${LOCALBASE}/lib
 ALL_TARGET=	build
 MAN1=		tin.1 w2r.pl.1 opt-case.pl.1 tinews.pl.1 tinurl_handler.pl.1
 MAN5=		tin.5 tin_mbox.5 tin_mmdf.5
diff --git news/yencode/Makefile news/yencode/Makefile
index 8496462..7e5d2a8 100644
--- news/yencode/Makefile
+++ news/yencode/Makefile
@@ -17,12 +17,11 @@ COMMENT=	A free (GPL) encoder and decoder for the yEnc Usenet file format
 
 USE_GETTEXT=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 
 MAN1=	ydecode.1 yencode.1 ypost.1
 MAN5=	ypostrc.5
 
-CPPFLAGS=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .include <bsd.port.mk>
diff --git palm/gnome-pilot-conduits/Makefile palm/gnome-pilot-conduits/Makefile
index fb66ad3..2d4c0ea 100644
--- palm/gnome-pilot-conduits/Makefile
+++ palm/gnome-pilot-conduits/Makefile
@@ -25,8 +25,8 @@ USE_GNOME=	gnomeprefix gnomehack libgnome
 USE_GETTEXT=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-pisock=${LOCALBASE}
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|<malloc.h>|<stdlib.h>|' \
diff --git palm/gnome-pilot/Makefile palm/gnome-pilot/Makefile
index 7a75eed..8643c2a 100644
--- palm/gnome-pilot/Makefile
+++ palm/gnome-pilot/Makefile
@@ -27,8 +27,8 @@ USE_AUTOTOOLS=	libtool
 INSTALLS_OMF=	yes
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--with-pisock=${LOCALBASE}
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 MAN1=		gpilot-install-file.1
 GCONF_SCHEMAS=	pilot.schemas
diff --git palm/jpilot-picsnvideos/Makefile palm/jpilot-picsnvideos/Makefile
index 6ceb558..93ac515 100644
--- palm/jpilot-picsnvideos/Makefile
+++ palm/jpilot-picsnvideos/Makefile
@@ -22,7 +22,7 @@ LIB_DEPENDS=	gdbm.4:${PORTSDIR}/databases/gdbm
 GNU_CONFIGURE=	yes
 MAKE_JOBS_SAFE=	yes
 
-CONFIGURE_ENV=	LDFLAGS="-L${PREFIX}/lib"
+LDFLAGS+=	-L${PREFIX}/lib
 PORTDOCS=	README AUTHORS
 PLIST_FILES=	lib/jpilot/plugins/libpicsnvideos.la	\
 		lib/jpilot/plugins/libpicsnvideos.so
diff --git palm/jpilot/Makefile palm/jpilot/Makefile
index d58a7ea..7356788 100644
--- palm/jpilot/Makefile
+++ palm/jpilot/Makefile
@@ -21,7 +21,7 @@ USE_GMAKE=	yes
 USE_GNOME=	gnomehier
 GNU_CONFIGURE=	yes
 CFLAGS+=	-I${LOCALBASE}/include
-CONFIGURE_ENV+=	LDFLAGS="-L${LOCALBASE}/lib"
+LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS+=	--with-pilot-prefix=${LOCALBASE}
 
 LICENSE=	GPLv2
diff --git palm/pilot-link/Makefile palm/pilot-link/Makefile
index 7c69748..f3e70de 100644
--- palm/pilot-link/Makefile
+++ palm/pilot-link/Makefile
@@ -23,7 +23,6 @@ USE_GNOME=	gnomehack pkgconfig
 GNU_CONFIGURE=	yes
 CFLAGS+=	-I${WRKSRC}/popt -I${LOCALBASE}/include
 CONFIGURE_ARGS+=--with-libiconv=${LOCALBASE}  --with-included-popt --enable-conduits --enable-xsltproc
-CONFIGURE_ENV+=	CFLAGS="${CFLAGS:S/-Werror//}" # clear -Werror from CFLAGS
 USE_LDCONFIG=	yes
 
 OPTIONS=	PNG "build with png support" off \
@@ -43,7 +42,7 @@ CONFIGURE_ENV+=		PTHREAD_LIBS="${PTHREAD_LIBS}" PTHREAD_CFLAGS="${PTHREAD_CFLAGS
 LIB_DEPENDS+=	usb-0.1.8:${PORTSDIR}/devel/libusb
 . endif
 CONFIGURE_ARGS+=--enable-libusb
-CONFIGURE_ENV+=LDFLAGS="${LDFLAGS} -L${PREFIX}/lib -lusb"
+LDFLAGS+=	-L${PREFIX}/lib -lusb
 
 .if defined(WITHOUT_THREADS)
 IGNORE=		cannot be built: USB support requires THREADS turned on.  Please reconfigure using 'make config'
diff --git palm/pose/Makefile palm/pose/Makefile
index 1dcd554..62dad27 100644
--- palm/pose/Makefile
+++ palm/pose/Makefile
@@ -28,9 +28,9 @@ WRKSRC=		${WRKDIR}/Emulator_Src_${PORTVERSION}/BuildUnix
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-x --with-fltk=${LOCALBASE}
-CONFIGURE_ENV=	CPPFLAGS="${PTHREAD_CFLAGS}" \
-		CFLAGS=-DBROKEN_VIRTUAL_DEFAULT_ARGUMENTS=1 \
-		LIBS="${PTHREAD_LIBS}"
+CONFIGURE_ENV=	LIBS="${PTHREAD_LIBS}"
+CPPFLAGS+=	${PTHREAD_CFLAGS}
+CFLAGS+=	-DBROKEN_VIRTUAL_DEFAULT_ARGUMENTS=1
 MAKE_JOBS_SAFE=	yes
 
 .include <bsd.port.pre.mk>
diff --git palm/ppmtoTbmp/Makefile palm/ppmtoTbmp/Makefile
index 09d0e8b..f33c9bb 100644
--- palm/ppmtoTbmp/Makefile
+++ palm/ppmtoTbmp/Makefile
@@ -16,7 +16,7 @@ COMMENT=	PPM to Pilot bitmap converter
 
 LIB_DEPENDS=	netpbm.1:${PORTSDIR}/graphics/netpbm
 
-MAKE_ENV+=	LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
+LDFLAGS+=	-L${LOCALBASE}/lib
 MAKE_ARGS=	CFLAGS="${CFLAGS} -I${LOCALBASE}/include" LDLIBS=-lnetpbm
 
 post-patch:
diff --git palm/synce-gvfs/Makefile palm/synce-gvfs/Makefile
index a60fe3d..e93977d 100644
--- palm/synce-gvfs/Makefile
+++ palm/synce-gvfs/Makefile
@@ -26,8 +26,6 @@ USE_GNOME=	gnomeprefix gnomehack gvfs
 INSTALLS_ICONS=	yes
 LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 CFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-CONFIGURE_ENV=	CFLAGS="${CFLAGS}" \
-		LDFLAGS="${LDFLAGS}"
 
 GVFS_PORTDIR=	${PORTSDIR}/devel/gvfs
 GVFS_WRKSRC_CMD=cd ${GVFS_PORTDIR} && ${MAKE} -V WRKSRC
diff --git palm/synce-trayicon/Makefile palm/synce-trayicon/Makefile
index 3603230..e381f87 100644
--- palm/synce-trayicon/Makefile
+++ palm/synce-trayicon/Makefile
@@ -31,8 +31,6 @@ INSTALLS_ICONS=	yes
 GCONF_SCHEMAS=	${PORTNAME}.schemas
 LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 CFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-CONFIGURE_ENV=	CFLAGS="${CFLAGS}" \
-		LDFLAGS="${LDFLAGS}"
 SUB_FILES=	pkg-message
 
 MAN1=		${PORTNAME}.1
diff --git polish/ekg/Makefile polish/ekg/Makefile
index 17db3ed..091d273 100644
--- polish/ekg/Makefile
+++ polish/ekg/Makefile
@@ -26,9 +26,9 @@ CONFIGURE_ARGS+=--disable-shared \
 		--without-libungif \
 		--without-libjpeg
 
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
-		CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
-		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib -lexecinfo ${PTHREAD_LIBS}"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib -lexecinfo ${PTHREAD_LIBS}
+CFLAGS+=	-I${LOCALBASE}/include
 
 OPTIONS=	ASPELL "Build with ASPELL support" off \
 		OPENSSL "Build with OPENSSL support" on
diff --git polish/ekg2/Makefile polish/ekg2/Makefile
index ec2c813..c894e56 100644
--- polish/ekg2/Makefile
+++ polish/ekg2/Makefile
@@ -44,7 +44,7 @@ CONFIGURE_ARGS+=	--enable-shared \
 			--without-gif \
 			--without-libjpeg
 
-CONFIGURE_ENV=		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib -lintl ${PTHREAD_LIBS}"
+LDFLAGS+=		-L${LOCALBASE}/lib -lintl ${PTHREAD_LIBS}
 CFLAGS+=		-I${LOCALBASE}/include
 
 .include <bsd.port.pre.mk>
diff --git polish/gnugadu2/Makefile polish/gnugadu2/Makefile
index 2f7eb61..b65697d 100644
--- polish/gnugadu2/Makefile
+++ polish/gnugadu2/Makefile
@@ -46,8 +46,8 @@ CONFIGURE_ARGS=	--disable-esdtest \
 		--without-perl \
 		--without-remote
 
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 OPTIONS=	TLEN	"Enable Tlen.pl network plugin"		off \
 		JABBER	"Enable Jabber loudmouth plugin"	off \
diff --git polish/tleenx2/Makefile polish/tleenx2/Makefile
index f4ac086..4d65ab5 100644
--- polish/tleenx2/Makefile
+++ polish/tleenx2/Makefile
@@ -20,7 +20,8 @@ LIB_DEPENDS=	tlen.1:${PORTSDIR}/polish/libtlen
 USE_GNOME=	gtk20
 GNU_CONFIGURE=	yes
 USE_XORG=	xscrnsaver
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 WRKSRC=		${WRKDIR}/TleenX2-${PORTVERSION}
 
 MAN1=		tleenx2.1
diff --git ports-mgmt/gnome-packagekit/Makefile ports-mgmt/gnome-packagekit/Makefile
index c50afa0..8fe98eb 100644
--- ports-mgmt/gnome-packagekit/Makefile
+++ ports-mgmt/gnome-packagekit/Makefile
@@ -33,8 +33,8 @@ GCONF_SCHEMAS=	gnome-packagekit.schemas
 INSTALLS_ICONS=	yes
 INSTALLS_OMF=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 MAN1=	gpk-application.1 gpk-backend-status.1 gpk-install-local-file.1 \
 	gpk-install-mime-type.1 gpk-install-package-name.1 \
diff --git ports-mgmt/kpackagekit/Makefile ports-mgmt/kpackagekit/Makefile
index 3502723..5c6bd661 100644
--- ports-mgmt/kpackagekit/Makefile
+++ ports-mgmt/kpackagekit/Makefile
@@ -26,7 +26,7 @@ USE_QT_VER=	4
 QT_COMPONENTS=	moc_build qmake_build rcc_build uic_build
 MAKE_JOBS_SAFE=	yes
 USE_CMAKE=	yes
-CONFIGURE_ENV+=	LDFLAGS="-L${LOCALBASE}/lib"
+LDFLAGS+=	-L${LOCALBASE}/lib
 USE_LDCONFIG=	yes
 
 WRKSRC=		${WRKDIR}/${PORTNAME:L}-${PORTVERSION}
diff --git ports-mgmt/packagekit/Makefile ports-mgmt/packagekit/Makefile
index 54a8d60..c0d0792 100644
--- ports-mgmt/packagekit/Makefile
+++ ports-mgmt/packagekit/Makefile
@@ -32,10 +32,8 @@ USE_ICONV=	yes
 USE_LDCONFIG=	yes
 USE_PYTHON_BUILD=	2.5+
 GNU_CONFIGURE=	yes
-CPPFLAGS=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib -lexecinfo
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" \
-		LDFLAGS="${LDFLAGS}"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib -lexecinfo
 CONFIGURE_ARGS+=--with-security-framework=polkit \
 		--localstatedir=/var \
 		--disable-gtk-doc \
diff --git ports-mgmt/portdowngrade/Makefile ports-mgmt/portdowngrade/Makefile
index 59fda3b..bda285a 100644
--- ports-mgmt/portdowngrade/Makefile
+++ ports-mgmt/portdowngrade/Makefile
@@ -18,8 +18,8 @@ LIB_DEPENDS=	popt.0:${PORTSDIR}/devel/popt
 
 POPT_INCLUDE=	`pkg_info -xL ^popt | ${GREP} popt.h | ${SED} -e 's?/popt.h??'`
 POPT_LIB=	`pkg_info -xL ^popt | ${GREP} libpopt.a | ${SED} -e 's?/libpopt.a??'`
-CONFIGURE_ENV=	CPPFLAGS="-I${POPT_INCLUDE}" \
-		LIBS="-lpopt -L${POPT_LIB}"
+CONFIGURE_ENV=	LIBS="-lpopt -L${POPT_LIB}"
+CPPFLAGS+=	-I${POPT_INCLUDE}
 .if defined(DEFAULT_CVS_SERVER)
 CONFIGURE_ARGS+=	--enable-default-server=${DEFAULT_CVS_SERVER}
 .endif
diff --git print/catdvi/Makefile print/catdvi/Makefile
index 1b30f22..ff811dd 100644
--- print/catdvi/Makefile
+++ print/catdvi/Makefile
@@ -19,7 +19,6 @@ BUILD_DEPENDS=	${LOCALBASE}/lib/libkpathsea.a:${PORTSDIR}/print/teTeX
 
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 MAKEFILE=	GNUmakefile
 ALL_TARGET=	# empty
 MAKE_JOBS_UNSAFE=	yes
@@ -27,8 +26,8 @@ MAKE_JOBS_UNSAFE=	yes
 MAN1=		catdvi.1
 PLIST_FILES=	bin/catdvi
 
-CPPFLAGS=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/catdvi ${PREFIX}/bin
diff --git print/cjk-lyx/Makefile print/cjk-lyx/Makefile
index 4f43248..59b42f7 100644
--- print/cjk-lyx/Makefile
+++ print/cjk-lyx/Makefile
@@ -49,8 +49,8 @@ CONFIGURE_ARGS=	--with-extra-lib="${LOCALBASE}/lib" \
 		--with-extra-inc="${LOCALBASE}/include" \
 		--with-frontend=qt \
 		--program-prefix="${PKGNAMEPREFIX}"
-CONFIGURE_ENV+=	LDFLAGS=${PTHREAD_LIBS}
-CFLAGS=		${PTHREAD_CFLAGS}
+LDFLAGS+=	${PTHREAD_LIBS}
+CFLAGS+=	${PTHREAD_CFLAGS}
 MAN1=		${PKGNAMEPREFIX}lyx.1 ${PKGNAMEPREFIX}tex2lyx.1 ${PKGNAMEPREFIX}lyxclient.1
 
 DATADIR=	${PREFIX}/share/${PKGNAMEPREFIX}${PORTNAME}
diff --git print/cups-base/Makefile print/cups-base/Makefile
index cb9c490..64f6944 100644
--- print/cups-base/Makefile
+++ print/cups-base/Makefile
@@ -23,10 +23,10 @@ USE_BZIP2=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CFLAGS+=	${PTHREAD_CFLAGS}
-CPPFLAGS=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 DSOFLAGS=	-Wl,-rpath,${PREFIX}/lib -L${PREFIX}/lib ${LDFLAGS}
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" DSOFLAGS="${DSOFLAGS}"
+CONFIGURE_ENV=	DSOFLAGS="${DSOFLAGS}"
 CONFIGURE_ARGS+=	--localstatedir=/var			\
 			--disable-slp				\
 			--disable-gssapi			\
diff --git print/cups-bjnp/Makefile print/cups-bjnp/Makefile
index 88b2ffb..66ee929 100644
--- print/cups-bjnp/Makefile
+++ print/cups-bjnp/Makefile
@@ -17,6 +17,8 @@ COMMENT=	CUPS backend for Canon USB over IP protocol
 LIB_DEPENDS=	cupsimage.2:${PORTSDIR}/print/cups-base
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CFLAGS+="-I${LOCALBASE}/include" CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib" LIBS="-lcompat"
+CONFIGURE_ENV=	LIBS="-lcompat"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .include <bsd.port.mk>
diff --git print/cups-pk-helper/Makefile print/cups-pk-helper/Makefile
index 2ef974c..03467b2 100644
--- print/cups-pk-helper/Makefile
+++ print/cups-pk-helper/Makefile
@@ -23,6 +23,7 @@ USE_GMAKE=	yes
 USE_GNOME=	intlhack gtk20
 USE_GETTEXT=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/libs"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/libs
 
 .include <bsd.port.mk>
diff --git print/cups-pstoraster/Makefile print/cups-pstoraster/Makefile
index 39493ff..666106b 100644
--- print/cups-pstoraster/Makefile
+++ print/cups-pstoraster/Makefile
@@ -37,8 +37,8 @@ USE_GMAKE=	yes
 # We just need the ghostscript fonts, nothing more
 USE_GHOSTSCRIPT_RUN=	yes
 GNU_CONFIGURE=		yes
-CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
-			LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--without-x --with-gs=espgs
 MAKE_ARGS=	CFLAGS_STANDARD="${CFLAGS} -DUPD_SIGNAL=0" \
 		DEVICE_DEVS="\$$(DD)cups.dev \$$(DD)pxlcolor.dev \$$(DD)pxlmono.dev"
diff --git print/fontforge/Makefile print/fontforge/Makefile
index 6454c46..1120cd9 100644
--- print/fontforge/Makefile
+++ print/fontforge/Makefile
@@ -62,7 +62,8 @@ WITH_FREETYPE_SRC=	--disable-freetype --without-freetype-bytecode \
 
 CONFIGURE_ARGS=	${WITH_MULTILAYER} --enable-devicetables ${WITH_FREETYPE_SRC} \
 		--enable-pasteafter --enable-tilepath
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
diff --git print/foomatic-filters/Makefile print/foomatic-filters/Makefile
index 879f40c..68594dd 100644
--- print/foomatic-filters/Makefile
+++ print/foomatic-filters/Makefile
@@ -27,9 +27,10 @@ CONFIGURE_ENV=	ac_cv_path_A2PS=${LOCALBASE}/bin/a2ps \
 		ac_cv_path_PPR=${LOCALBASE}/lib/ppr \
 		ac_cv_path_PPR_INTERFACES=${LOCALBASE}/lib/ppr/interfaces \
 		ac_cv_path_PPR_LIB=${LOCALBASE}/lib/ppr/lib \
-		ac_cv_path_TEXTTOPS=${LOCALBASE}/libexec/cups/filter/texttops \
-		CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+		ac_cv_path_TEXTTOPS=${LOCALBASE}/libexec/cups/filter/texttops
+
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 OPTIONS=	CUPS_IMAGE	"Install cups image utilities"	on \
 		A2PS_A4	"Install a2ps convertor (A4)"	on \
diff --git print/gfontview/Makefile print/gfontview/Makefile
index a2ce10f..fde93e1 100644
--- print/gfontview/Makefile
+++ print/gfontview/Makefile
@@ -20,10 +20,10 @@ LIB_DEPENDS=	t1.5:${PORTSDIR}/devel/t1lib
 USE_GNOME=	gnomehack gnomelibs gnomeprefix
 USE_FREETYPE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include/freetype1/freetype \
-			  -I${LOCALBASE}/include" \
-		SPOOLER="/usr/bin/lpr" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV=	SPOOLER="/usr/bin/lpr"
+CPPFLAGS+=	-I${LOCALBASE}/include/freetype1/freetype \
+		-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--with-fontdir="${LOCALBASE}/share/ghostscript/fonts" \
 		--with-libungif
 
diff --git print/ggv/Makefile print/ggv/Makefile
index 44aa8a3..04e4457 100644
--- print/ggv/Makefile
+++ print/ggv/Makefile
@@ -23,8 +23,8 @@ USE_GNOME=	gnomeprefix gnomehack intlhack libgnomeui desktopfileutils
 USE_GETTEXT=	yes
 USE_GHOSTSCRIPT=yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 GCONF_SCHEMAS=	ggv.schemas
 
diff --git print/ghostscript7/Makefile print/ghostscript7/Makefile
index 21e6074..4bb4097 100644
--- print/ghostscript7/Makefile
+++ print/ghostscript7/Makefile
@@ -41,9 +41,10 @@ MAKE_ENV=	CFLAGS_STANDARD="${CFLAGS}" \
 		XCFLAGS="${XCFLAGS}" XLDFLAGS="${XLDFLAGS}" \
 		EXTRALIBS="${EXTRALIBS}"
 MAKE_JOBS_UNSAFE=	yes
-CONFIGURE_ENV=	${MAKE_ENV} \
-		CPPFLAGS="-DUPD_SIGNAL=0 -I. -I${WRKSRC}/gimp-print -I${LOCALBASE}/include/libpng -I${LOCALBASE}/include" \
-		LDFLAGS="${XLDFLAGS}"
+CONFIGURE_ENV=	${MAKE_ENV}
+
+CPPFLAGS+=	-DUPD_SIGNAL=0 -I. -I${WRKSRC}/gimp-print -I${LOCALBASE}/include/libpng -I${LOCALBASE}/include
+LDFLAGS+=	${XLDFLAGS}
 CONFIGURE_ARGS=	--disable-compile-inits \
 		--with-ijs
 PLIST_SUB=	GS_VERSION="${PORTVERSION}"
diff --git print/ghostscript8/Makefile print/ghostscript8/Makefile
index 881f974..1db6fd6 100644
--- print/ghostscript8/Makefile
+++ print/ghostscript8/Makefile
@@ -46,15 +46,15 @@ MAKE_ENV=	CFLAGS_STANDARD="${CFLAGS}" \
 		XCFLAGS="${XCFLAGS}" XLDFLAGS="${XLDFLAGS}" \
 		EXTRALIBS="${EXTRALIBS}" \
 		SOC_LOADER="dxmainc.c"
-CONFIGURE_ENV=	${MAKE_ENV} CPPFLAGS="${CPPFLAGS}" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV=	${MAKE_ENV}
+LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--disable-compile-inits \
 		--enable-contrib \
 		--enable-dynamic \
 		--with-ijs \
 		--with-jasper \
 		--with-drivers=""
-CPPFLAGS=	-DUPD_SIGNAL=0 -I. \
+CPPFLAGS+=	-DUPD_SIGNAL=0 -I. \
 		-I${WRKSRC}/jasper/src/libjasper/include \
 		-I${LOCALBASE}/include/libpng \
 		-I${LOCALBASE}/include
diff --git print/ghostscript9/Makefile print/ghostscript9/Makefile
index 1536e16..9f742fe 100644
--- print/ghostscript9/Makefile
+++ print/ghostscript9/Makefile
@@ -50,15 +50,15 @@ MAKE_ENV=	CFLAGS_STANDARD="${CFLAGS} -g" \
 		XCFLAGS="${XCFLAGS}" XLDFLAGS="${XLDFLAGS}" \
 		EXTRALIBS="${EXTRALIBS}" \
 		SOC_LOADER="dxmainc.c"
-CONFIGURE_ENV=	${MAKE_ENV} CPPFLAGS="${CPPFLAGS}" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV=	${MAKE_ENV}
+LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--disable-compile-inits \
 		--enable-contrib \
 		--enable-dynamic \
 		--with-ijs \
 		--with-jasper \
 		--with-drivers=""
-CPPFLAGS=	-DUPD_SIGNAL=0 -I. \
+CPPFLAGS+=	-DUPD_SIGNAL=0 -I. \
 		-I${WRKSRC}/lcms/include \
 		-I${WRKSRC}/jasper/src/libjasper/include \
 		-I${LOCALBASE}/include/libpng \
diff --git print/gnome-cups-manager/Makefile print/gnome-cups-manager/Makefile
index c1c56b8..46ac3ff 100644
--- print/gnome-cups-manager/Makefile
+++ print/gnome-cups-manager/Makefile
@@ -29,8 +29,8 @@ USE_GETTEXT=	yes
 INSTALLS_ICONS=	yes
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 post-patch:
 	@${SED} -e 's|%%PREFIX%%|${PREFIX}|' \
diff --git print/gnome-print/Makefile print/gnome-print/Makefile
index 7fcf70b..ea38c71 100644
--- print/gnome-print/Makefile
+++ print/gnome-print/Makefile
@@ -32,8 +32,8 @@ USE_GNOME=	gnomehack gnomeprefix gnomehier gnomelibs gnomecanvas
 USE_GETTEXT=	yes
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 post-install:
 	@${TOUCH} ${PREFIX}/etc/gnome/fonts/gnome-print-x11.fontmap
diff --git print/gtklp/Makefile print/gtklp/Makefile
index 5a371be..05dbe3f 100644
--- print/gtklp/Makefile
+++ print/gtklp/Makefile
@@ -25,7 +25,6 @@ USE_AUTOTOOLS=	automake:env
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}"
 
 MAN1=		gtklp.1 gtklpq.1
 
diff --git print/gutenprint-base/Makefile print/gutenprint-base/Makefile
index dfa272f..d59d4ad 100644
--- print/gutenprint-base/Makefile
+++ print/gutenprint-base/Makefile
@@ -23,12 +23,11 @@ USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack gtk20
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=--with-gimp=no --with-gimp2=no
 USE_LDCONFIG=	yes
 
-CPPFLAGS=	-I${LOCALBASE}/include -I${PREFIX}/include
-LDFLAGS=	-L${LOCALBASE}/lib -L${PREFIX}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include -I${PREFIX}/include
+LDFLAGS+=	-L${LOCALBASE}/lib -L${PREFIX}/lib
 
 .include <bsd.port.pre.mk>
 
diff --git print/hp2xx/Makefile print/hp2xx/Makefile
index bb5d6a5..bdeca88 100644
--- print/hp2xx/Makefile
+++ print/hp2xx/Makefile
@@ -21,13 +21,13 @@ LIB_DEPENDS=	png.6:${PORTSDIR}/graphics/png \
 WRKSRC=		${WRKDIR}/${DISTNAME}/sources
 
 MAKE_ENV=	DEFINES="${CPPFLAGS}" ALL_LIBS="${LDFLAGS}" \
-		PREVIEWER="${PREVIEWER}" 
+		PREVIEWER="${PREVIEWER}"
 
 MAN1=		hp2xx.1
 INFO=		hp2xx
 
-CPPFLAGS=	-DUNIX -I${LOCALBASE}/include
-LDFLAGS=	-lm -L${LOCALBASE}/lib -ltiff -lpng -lz
+CPPFLAGS+=	-DUNIX -I${LOCALBASE}/include
+LDFLAGS+=	-lm -L${LOCALBASE}/lib -ltiff -lpng -lz
 
 .if defined(WITHOUT_X11)
 PKGNAMESUFFIX=	-nox11
diff --git print/hpijs/Makefile print/hpijs/Makefile
index c99c18f..0b3b301 100644
--- print/hpijs/Makefile
+++ print/hpijs/Makefile
@@ -23,8 +23,8 @@ CONFIGURE_ARGS=		--disable-dependency-tracking
 USE_GHOSTSCRIPT_RUN=	yes
 WANT_PERL=	yes
 
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
-		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 OPTIONS=	CUPS		"install support for cups" on \
 		FOOMATIC	"install foomatic-rip and ppd files" on
diff --git print/hplip/Makefile print/hplip/Makefile
index 80fd442..649a4b1 100644
--- print/hplip/Makefile
+++ print/hplip/Makefile
@@ -42,7 +42,6 @@ CONFIGURE_ARGS=	--enable-foomatic-ppd-install \
 		--with-mimedir=${PREFIX}/etc/cups \
 		--with-docdir=${DOCSDIR} \
 		--with-drvdir=${PREFIX}/libexec/cups/driver
-CONFIGURE_ENV=	LDFLAGS="${LDFLAGS}"
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 
diff --git print/libgnomecups/Makefile print/libgnomecups/Makefile
index 47602ff..ce38fb9 100644
--- print/libgnomecups/Makefile
+++ print/libgnomecups/Makefile
@@ -24,7 +24,7 @@ USE_GNOME=	gnomehack intlhack ltverhack glib20
 USE_GETTEXT=	yes
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=  libtool
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .include <bsd.port.mk>
diff --git print/libgnomeprint/Makefile print/libgnomeprint/Makefile
index 60eea57..17c3774 100644
--- print/libgnomeprint/Makefile
+++ print/libgnomeprint/Makefile
@@ -30,8 +30,8 @@ USE_GNOME=	gnomeprefix intlhack gnomehack gnomehier glib20 pango libxml2 \
 USE_GETTEXT=	yes
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 PLIST_SUB=	VERSION=${PORTVERSION} \
 		LIBVERSION=2.2
diff --git print/libotf/Makefile print/libotf/Makefile
index 9301623..02c048d 100644
--- print/libotf/Makefile
+++ print/libotf/Makefile
@@ -20,7 +20,7 @@ USE_XORG=	x11 xt xaw xmu
 USE_GNOME=	pkgconfig
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
-CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include"
+CPPFLAGS+=	-I${LOCALBASE}/include
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g' \
diff --git print/libspectre/Makefile print/libspectre/Makefile
index 4c9e1d0..adff557 100644
--- print/libspectre/Makefile
+++ print/libspectre/Makefile
@@ -19,6 +19,7 @@ USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
 USE_GNOME=	gnomehack gnomeprefix ltverhack
 USE_GHOSTSCRIPT=yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .include <bsd.port.mk>
diff --git print/lyx/Makefile print/lyx/Makefile
index 159f4df..f0f89f8 100644
--- print/lyx/Makefile
+++ print/lyx/Makefile
@@ -34,8 +34,8 @@ QT_COMPONENTS=	corelib gui moc_build uic_build rcc_build
 USE_PYTHON=	yes
 USE_PERL=	yes
 GNU_CONFIGURE=	yes
-CPPFLAGS=	${PTHREAD_CFLAGS}
-CONFIGURE_ENV=	LDFLAGS="${PTHREAD_LIBS}"
+CPPFLAGS+=	${PTHREAD_CFLAGS}
+LDFLAGS+=	${PTHREAD_LIBS}
 CONFIGURE_ARGS=	--without-included-boost \
 		--without-included-mythes \
 		--with-libiconv-prefix=${LOCALBASE} \
diff --git print/lyx14/Makefile print/lyx14/Makefile
index 2416a97..a4c965c 100644
--- print/lyx14/Makefile
+++ print/lyx14/Makefile
@@ -90,7 +90,7 @@ CONFIGURE_ARGS+=--without-aiksaurus
 LIB_DEPENDS+=	qt-mt:${PORTSDIR}/x11-toolkits/qt33
 CONFIGURE_ARGS+=	--with-frontend=qt
 CFLAGS+=	${PTHREAD_CFLAGS}
-CONFIGURE_ENV+=	LDFLAGS=${PTHREAD_LIBS}
+LDFLAGS+=	${PTHREAD_LIBS}
 RUN_DEPENDS+=	${LOCALBASE}/lib/X11/fonts/texcm-ttf/cmex10.ttf:${PORTSDIR}/x11-fonts/texcm-ttf
 .else
 BROKEN=		Does not work with the latest xforms version
diff --git print/lyx16/Makefile print/lyx16/Makefile
index f316dfb..c093add 100644
--- print/lyx16/Makefile
+++ print/lyx16/Makefile
@@ -35,8 +35,8 @@ QT_COMPONENTS=	gui moc_build uic_build rcc_build
 USE_PYTHON=	yes
 USE_PERL=	yes
 GNU_CONFIGURE=	yes
-CPPFLAGS=	${PTHREAD_CFLAGS}
-CONFIGURE_ENV=	LDFLAGS="${PTHREAD_LIBS}"
+CPPFLAGS+=	${PTHREAD_CFLAGS}
+LDFLAGS+=	${PTHREAD_LIBS}
 CONFIGURE_ARGS=	--with-frontend=qt4 \
 		--without-included-boost \
 		--without-included-gettext \
diff --git print/panda/Makefile print/panda/Makefile
index ee0a1a0..73cbc91 100644
--- print/panda/Makefile
+++ print/panda/Makefile
@@ -28,13 +28,12 @@ USE_GNOME=	gnomehack pkgconfig
 USE_BDB=	yes
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
-CONFIGURE_ENV=	LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--enable-berkeley-db
 USE_LDCONFIG=	yes
 MAKE_JOBS_SAFE=	yes
 
-CPPFLAGS=	-I${BDB_INCLUDE_DIR} -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS=	-L${BDB_LIB_DIR} -L${LOCALBASE}/lib ${PTHREAD_LIBS}
+CPPFLAGS+=	-I${BDB_INCLUDE_DIR} -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS+=	-L${BDB_LIB_DIR} -L${LOCALBASE}/lib ${PTHREAD_LIBS}
 
 .include <bsd.port.pre.mk>
 
diff --git print/pips800/Makefile.pips print/pips800/Makefile.pips
index eb98c48..f749938 100644
--- print/pips800/Makefile.pips
+++ print/pips800/Makefile.pips
@@ -95,8 +95,8 @@ PLIST_SUB=	PRTYPE=${PRTYPE} \
 
 .include <bsd.port.pre.mk>
 
-CPPFLAGS=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 .if ${PIPS_MAJOR} >= 2
 CONFLICTS=	pips*-2.*
 USE_RC_SUBR=	yes
@@ -129,7 +129,6 @@ USE_ICONV=	yes
 LDFLAGS+=	${PTHREAD_LIBS}
 CPPFLAGS+=	${PTHREAD_CFLAGS}
 .endif
-CONFIGURE_ENV+=	CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 MAKE_ENV+=	SED="${SED}"
 
 LIB_FILE=	lib${PRT_MODEL:L}.so
diff --git print/pslib/Makefile print/pslib/Makefile
index bee616f..b7cb991 100644
--- print/pslib/Makefile
+++ print/pslib/Makefile
@@ -22,8 +22,8 @@ USE_GNOME=	gnomehack intlhack pkgconfig
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib -lintl"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib -lintl
 USE_LDCONFIG=	yes
 
 OPTIONS=	EXAMPLES	"Install additional examples" On \
diff --git print/py-cups/Makefile print/py-cups/Makefile
index 335bc54..2d342d4 100644
--- print/py-cups/Makefile
+++ print/py-cups/Makefile
@@ -21,7 +21,6 @@ LIB_DEPENDS=	cups.2:${PORTSDIR}/print/cups-client
 
 CFLAGS+=	-I${LOCALBASE}/include -DVERSION=\\\"${PORTVERSION}\\\"
 LDFLAGS+=	-L${LOCALBASE}/lib -liconv
-MAKE_ENV=	LDFLAGS="${LDFLAGS}"
 USE_BZIP2=	yes
 USE_ICONV=	yes
 USE_PYDISTUTILS=	yes
diff --git print/system-config-printer/Makefile print/system-config-printer/Makefile
index ccc8876..9f07b11 100644
--- print/system-config-printer/Makefile
+++ print/system-config-printer/Makefile
@@ -33,7 +33,8 @@ USE_PYTHON=	2.6+
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_GETTEXT=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 USE_GNOME=	pygtk2
 MAN1=	system-config-printer-applet.1 system-config-printer.1
 PLIST_SUB=	PYTHON_VER=${PYTHON_VERSION:S/python//}
diff --git print/teTeX-base/Makefile print/teTeX-base/Makefile
index f7286f2..426e34a 100644
--- print/teTeX-base/Makefile
+++ print/teTeX-base/Makefile
@@ -49,8 +49,8 @@ CONFIGURE_ARGS=	--disable-multiplatform \
 		--without-xdvik --without-oxdvik
 CONFIGURE_ENV=	INSTALL_SCRIPT="${INSTALL_SCRIPT}" \
 		INSTALL_DATA="${INSTALL_DATA}" \
-		INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
-		CFLAGS="${CFLAGS} -I${LOCALBASE}/include"
+		INSTALL_PROGRAM="${INSTALL_PROGRAM}"
+CFLAGS+=	-I${LOCALBASE}/include
 PKGMESSAGE=	${WRKDIR}/pkg-message
 CONFLICTS=	ja-ptex-base-[0-9]* latex2e-[0-9]* \
 		tex-[0-9]* dvips-[0-9]* xdvi-[0-9]*
diff --git print/texinfo/Makefile print/texinfo/Makefile
index 65a5804..d8d20b1 100644
--- print/texinfo/Makefile
+++ print/texinfo/Makefile
@@ -29,8 +29,8 @@ MAKE_JOBS_SAFE=	yes
 
 MAKE_ARGS=	TEXMF=${PREFIX}/${TEXMF}
 CONFIGURE_ARGS=	--without-included-gettext
-CPPFLAGS=	-I${LOCALBASE}/lib
-LDFLAGS=	-L${LOCALBASE}/lib -lintl
+CPPFLAGS+=	-I${LOCALBASE}/lib
+LDFLAGS+=	-L${LOCALBASE}/lib -lintl
 
 INFO=		${PORTNAME} info-stnd info
 MAN1=		info.1 infokey.1 install-info.1 makeinfo.1 texi2dvi.1 \
diff --git print/trueprint/Makefile print/trueprint/Makefile
index 301b1af..8c205ee 100644
--- print/trueprint/Makefile
+++ print/trueprint/Makefile
@@ -18,7 +18,7 @@ COMMENT=	Print program listings on postscript printer
 USE_GMAKE=	yes
 USE_GETTEXT=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CFLAGS="${CFLAGS}" LDFLAGS="-L${LOCALBASE}/lib -lintl"
+LDFLAGS+=	-L${LOCALBASE}/lib -lintl
 
 MAN1=		trueprint.1
 INFO=		trueprint
diff --git print/ttf2pt1/Makefile print/ttf2pt1/Makefile
index 27d4dcc..0adb416 100644
--- print/ttf2pt1/Makefile
+++ print/ttf2pt1/Makefile
@@ -25,9 +25,9 @@ MAKE_ARGS=	CC="${CC}" CFLAGS="${CFLAGS} ${CPPFLAGS}" LIBS="${LDFLAGS}" \
 
 MAN1=		ttf2pt1.1 ttf2pt1_convert.1 ttf2pt1_x2gs.1
 
-CPPFLAGS=	`pkg-config --cflags freetype2` \
+CPPFLAGS+=	`pkg-config --cflags freetype2` \
 		-I${LOCALBASE}/include -DUSE_FREETYPE
-LDFLAGS=	`pkg-config --libs freetype2` \
+LDFLAGS+=	`pkg-config --libs freetype2` \
 		-L${LOCALBASE}/lib -lm
 
 .include <bsd.port.mk>
diff --git print/ttftot42/Makefile print/ttftot42/Makefile
index edfa3ef..b910c9b 100644
--- print/ttftot42/Makefile
+++ print/ttftot42/Makefile
@@ -16,12 +16,11 @@ COMMENT=	TrueType to Type42 font converter
 
 USE_FREETYPE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 
 PLIST_FILES=	bin/ttftot42
 
-CPPFLAGS=	-I${LOCALBASE}/include/freetype1/freetype \
+CPPFLAGS+=	-I${LOCALBASE}/include/freetype1/freetype \
 		-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .include <bsd.port.mk>
diff --git print/wprint/Makefile print/wprint/Makefile
index fc08d87..3960f2c 100644
--- print/wprint/Makefile
+++ print/wprint/Makefile
@@ -23,13 +23,12 @@ LIB_DEPENDS=	freetype:${PORTSDIR}/print/freetype2
 USE_ICONV=	yes
 USE_PERL5=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	LDFLAGS="${LDFLAGS}"
 MAKE_JOBS_SAFE=	yes
 
 MAN1=		wprint.1
 
-CPPFLAGS=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 post-patch:
 .for file in man/wprint.1.pod src/wprint.c
diff --git print/xdvik/Makefile print/xdvik/Makefile
index b9fdb32..de5a451 100644
--- print/xdvik/Makefile
+++ print/xdvik/Makefile
@@ -33,8 +33,8 @@ CONFIGURE_ARGS=	--with-system-t1lib \
 		--disable-multiplatform
 CONFIGURE_ENV=	INSTALL_SCRIPT="${INSTALL_SCRIPT}" \
 		INSTALL_DATA="${INSTALL_DATA}" \
-		INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
-		CFLAGS="${CFLAGS} -I${LOCALBASE}/include"
+		INSTALL_PROGRAM="${INSTALL_PROGRAM}"
+CFLAGS+=	-I${LOCALBASE}/include
 INSTALL_WRKSRC=	${WRKSRC}/texk/xdvik
 
 PLIST_SUB=	TEXMFDIR=${TEXMFDIR} TEXMFCONFIGDIR=${TEXMFDIR}-config
diff --git russian/apache13-modssl/Makefile russian/apache13-modssl/Makefile
index 21c6ea1..4bd9e85 100644
--- russian/apache13-modssl/Makefile
+++ russian/apache13-modssl/Makefile
@@ -167,8 +167,7 @@ OPTIM+=		-DBUFFERED_LOGS
 CFLAGS+=	-O6 -fomit-frame-pointer
 .endif
 
-CONFIGURE_ENV=	CFLAGS='${CFLAGS}' \
-		OPTIM='${OPTIM}' \
+CONFIGURE_ENV=	OPTIM='${OPTIM}' \
 		SSL_BASE='SYSTEM' \
 		EAPI_MM='SYSTEM' \
 		PATH="${PREFIX}/bin:${PATH}"
diff --git russian/ksocrat/Makefile russian/ksocrat/Makefile
index eb2543c..5d490e3 100644
--- russian/ksocrat/Makefile
+++ russian/ksocrat/Makefile
@@ -24,7 +24,7 @@ USE_GMAKE=	yes
 
 RESTRICTED=	Redistribution not allowed
 
-CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 post-install:
 		${INSTALL_DATA} ${WRKDIR}/usr/share/apps/ksocrat/* \
diff --git science/cdo/Makefile science/cdo/Makefile
index f5d9ff5..ef9db45 100644
--- science/cdo/Makefile
+++ science/cdo/Makefile
@@ -23,7 +23,6 @@ OPTIONS=	HDF5	"HDF5 support"		on \
 CFLAGS+=	${PTHREAD_CFLAGS}
 CPPFLAGS+=	-I${LOCALBASE}/include
 CONFIGURE_ARGS=	--enable-cdi-lib --program-transform-name="" --with-zlib=/usr
-CONFIGURE_ENV=	LDFLAGS="${LDFLAGS}"
 GNU_CONFIGURE=	yes
 LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 USE_GNOME=	gnomehack
diff --git science/chemical-mime-data/Makefile science/chemical-mime-data/Makefile
index 72845a8..e17ba9f 100644
--- science/chemical-mime-data/Makefile
+++ science/chemical-mime-data/Makefile
@@ -22,7 +22,8 @@ USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomemimedata intltool
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib -lintl"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib -lintl
 INSTALLS_ICONS=	yes
 
 post-patch:
diff --git science/chemtool/Makefile science/chemtool/Makefile
index ae12f37..958fac5 100644
--- science/chemtool/Makefile
+++ science/chemtool/Makefile
@@ -19,7 +19,7 @@ USE_GNOME=	gtk20
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CFLAGS+=	-I${LOCALBASE}/include
-CONFIGURE_ENV=	CFLAGS+="${CFLAGS}" CPPFLAGS+="${CFLAGS}" LDFLAGS="-L${LOCALBASE}/lib"
+LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--enable-emf=yes --with-localedir=${PREFIX}
 
 .include <bsd.port.pre.mk>
diff --git science/flounder/Makefile science/flounder/Makefile
index 9405c02..6b71f83 100644
--- science/flounder/Makefile
+++ science/flounder/Makefile
@@ -22,8 +22,8 @@ LIB_DEPENDS=	fltk.1:${PORTSDIR}/x11-toolkits/fltk \
 
 USE_GL=		glut
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS} -lstdc++"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS} -lstdc++
 USE_GMAKE=	yes
 
 .if !defined(WITHOUT_PLOT)
diff --git science/gchemutils/Makefile science/gchemutils/Makefile
index 6a5eac8..238a35e 100644
--- science/gchemutils/Makefile
+++ science/gchemutils/Makefile
@@ -30,7 +30,8 @@ USE_GNOME=	gnomehack intlhack gnomedocutils gtk20 libgsf
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
 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=	--with-omf-dir=${PREFIX}/share/omf
 INSTALLS_ICONS=	yes
 INSTALLS_OMF=	yes
diff --git science/ghemical/Makefile science/ghemical/Makefile
index 056da20..4f59ae4 100644
--- science/ghemical/Makefile
+++ science/ghemical/Makefile
@@ -30,9 +30,9 @@ USE_GMAKE=	yes
 USE_GNOME=	glib20 gtk20 libglade2 pkgconfig
 USE_GL=		glut
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--enable-gamess --enable-mpqc --enable-openbabel --enable-gtk --enable-threads --enable-mopac7 
-PLIST_SUB=      GHEMICAL_VERSION="${PORTVERSION}"
+CONFIGURE_ARGS=	--enable-gamess --enable-mpqc --enable-openbabel --enable-gtk --enable-threads --enable-mopac7
+PLIST_SUB=	GHEMICAL_VERSION="${PORTVERSION}"
 
-MAKE_ENV=       PKG_CONFIG=${LOCALBASE}/pkg-config
+MAKE_ENV=	PKG_CONFIG=${LOCALBASE}/pkg-config
 
 .include <bsd.port.mk>
diff --git science/gnudatalanguage/Makefile science/gnudatalanguage/Makefile
index 9d7f255..e51c33d 100644
--- science/gnudatalanguage/Makefile
+++ science/gnudatalanguage/Makefile
@@ -39,9 +39,9 @@ USE_WX=		2.8
 GNU_CONFIGURE=	yes
 # Disable ncurses and readline from ports
 CONFIGURE_FLAGS=--with_ncursesdir=/usr --with_readlinedir=/usr
-CPPFLAGS=	${CFLAGS} ${PTHREAD_CFLAGS} -I${LOCALBASE}/include -I${LOCALBASE}/include/ImageMagick
-CONFIGURE_ENV=	LDFLAGS="${LDFLAGS} ${PTHREAD_LIBS} -L${LOCALBASE}/lib"	\
-		wxConfig=${WX_CONFIG}
+CONFIGURE_ENV=	wxConfig=${WX_CONFIG}
+CPPFLAGS+=	${CFLAGS} ${PTHREAD_CFLAGS} -I${LOCALBASE}/include -I${LOCALBASE}/include/ImageMagick
+LDFLAGS+=	${PTHREAD_LIBS} -L${LOCALBASE}/lib
 
 SLAVEDIRS=	science/py-gnudatalanguage
 
diff --git science/gromacs/Makefile science/gromacs/Makefile
index 1494be5..5aa7d66 100644
--- science/gromacs/Makefile
+++ science/gromacs/Makefile
@@ -18,7 +18,8 @@ USE_GNOME=	libxml2
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
-CONFIGURE_ENV=	CPPFLAGS=-I${LOCALBASE}/include LDFLAGS=-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--exec-prefix=${PREFIX} --program-suffix="" --enable-shared
 
 PLIST_SUB=	BUILD=${MACHINE_ARCH}-portbld-freebsd${OSREL}
diff --git science/gsmc/Makefile science/gsmc/Makefile
index d757a15..b806048 100644
--- science/gsmc/Makefile
+++ science/gsmc/Makefile
@@ -16,8 +16,8 @@ COMMENT=	Smith chart program for impedance matching
 
 USE_GNOME=	gtk20
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	aclocal automake autoconf
 AUTOMAKE_ARGS=	-i --add-missing --foreign --copy
diff --git science/gwyddion/Makefile science/gwyddion/Makefile
index 4d739fd..1e06deb 100644
--- science/gwyddion/Makefile
+++ science/gwyddion/Makefile
@@ -21,8 +21,8 @@ LIB_DEPENDS=	gtkglext-x11-1.0.0:${PORTSDIR}/x11-toolkits/gtkglext \
 		fftw3.5:${PORTSDIR}/math/fftw3
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--disable-gtk-doc --with-html-dir=${PREFIX}/share/doc \
 		--disable-pascal --disable-pygwy --without-kde4-thumbnailer
 
diff --git science/harminv/Makefile science/harminv/Makefile
index 5fcea58..433048b 100644
--- science/harminv/Makefile
+++ science/harminv/Makefile
@@ -21,7 +21,7 @@ USE_GCC=	4.4+
 CPPFLAGS+=	-I${LOCALBASE}/include
 LD_LIBRARY_PATH=	-L${LOCALBASE}/lib -L/usr/lib
 LDFLAGS+=	-L${LOCALBASE}/lib
-CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}" LD_LIBRARY_PATH="${LD_LIBRARY_PATH}" LDFLAGS="${LDFLAGS}"
+CONFIGURE_ENV+=	LD_LIBRARY_PATH="${LD_LIBRARY_PATH}"
 USE_LDCONFIG=	yes
 
 MAN1=	harminv.1
diff --git science/libkml/Makefile science/libkml/Makefile
index 53ff694..5658412 100644
--- science/libkml/Makefile
+++ science/libkml/Makefile
@@ -22,6 +22,5 @@ USE_LDCONFIG=	yes
 
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
-CONFIGURE_ENV+=	CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
 
 .include <bsd.port.mk>
diff --git science/liboglappth/Makefile science/liboglappth/Makefile
index ed508ab..70c86f1 100644
--- science/liboglappth/Makefile
+++ science/liboglappth/Makefile
@@ -19,9 +19,9 @@ GNU_CONFIGURE=  yes
 USE_GL=		glut
 USE_GNOME=	gnomehack
 
-CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include"       \
-		CXXFLAGS="-I${LOCALBASE}/include"       \
-		CFLAGS="-I${LOCALBASE}/include"         \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
+CFLAGS+=	-I${LOCALBASE}/include
+CXXFLAGS+=	-I${LOCALBASE}/include
 
 .include <bsd.port.mk>
diff --git science/linsmith/Makefile science/linsmith/Makefile
index fb3cbbe..b2d9b0f 100644
--- science/linsmith/Makefile
+++ science/linsmith/Makefile
@@ -21,11 +21,10 @@ USE_GNOME=	libgnomeui libxml2
 USE_ICONV=	yes
 USE_GETTEXT=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	LDFLAGS="${LDFLAGS}"
 MAKE_JOBS_SAFE=	yes
 
-CPPFLAGS=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 post-patch:
 	@${CP} ${FILESDIR}/carg.c  ${WRKSRC}/src
diff --git science/mbdyn/Makefile science/mbdyn/Makefile
index 712926e..d0105fd 100644
--- science/mbdyn/Makefile
+++ science/mbdyn/Makefile
@@ -24,7 +24,6 @@ USE_FORTRAN=	yes
 MAN1=		mbdyn.1
 CPPFLAGS+=	-fpermissive -I${LOCALBASE}/include/suitesparse
 LDFLAGS+=	-L${LOCALBASE}/lib
-CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS+=	--program-prefix=''
 
 OPTIONS=	MPI "Enable mpich-support" off \
diff --git science/meep/Makefile science/meep/Makefile
index 4826e99..643a6e8 100644
--- science/meep/Makefile
+++ science/meep/Makefile
@@ -33,7 +33,7 @@ USE_AUTOTOOLS+=	libltdl
 CPPFLAGS+=	-I${LOCALBASE}/include
 LD_LIBRARY_PATH=	-L${LOCALBASE}/lib -L/usr/lib
 LDFLAGS+=	-L${LOCALBASE}/lib
-CONFIGURE_ENV+=	LD_LIBRARY_PATH="${LD_LIBRARY_PATH}" LDFLAGS="${LDFLAGS}"
+CONFIGURE_ENV+=	LD_LIBRARY_PATH="${LD_LIBRARY_PATH}"
 
 OPTIONS=	OPENMPI "Enable MPI support using openmpi" On
 
diff --git science/minc/Makefile science/minc/Makefile
index 8175f2f..1878fa0 100644
--- science/minc/Makefile
+++ science/minc/Makefile
@@ -30,8 +30,8 @@ LIB_DEPENDS=	netcdf.4:${PORTSDIR}/science/netcdf
 USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--enable-static=yes --enable-shared=yes
 
 CONFLICTS=	minc-2*
diff --git science/minc2/Makefile science/minc2/Makefile
index db51d29..f71cf2f 100644
--- science/minc2/Makefile
+++ science/minc2/Makefile
@@ -30,8 +30,8 @@ LIB_DEPENDS=	netcdf.4:${PORTSDIR}/science/netcdf \
 
 USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS} ${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \
-		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CPPFLAGS+=	${PTHREAD_CFLAGS} -I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 CONFIGURE_ARGS=	--enable-shared=yes --enable-static=yes
 
 CONFLICTS=	minc-1*
diff --git science/mpb/Makefile science/mpb/Makefile
index 09c8b32..adb9151 100644
--- science/mpb/Makefile
+++ science/mpb/Makefile
@@ -25,8 +25,8 @@ USE_FORTRAN=	yes
 
 .include <bsd.port.pre.mk>
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .if exists(${LOCALBASE}/lib/libatlas_r.so) && !defined(WITH_BLAS)
 WITH_ATLAS=	yes
diff --git science/netcdf4/Makefile science/netcdf4/Makefile
index c9bdb6d..b5a0057 100644
--- science/netcdf4/Makefile
+++ science/netcdf4/Makefile
@@ -26,7 +26,6 @@ OPTIONS=	DAP	"Build DAP client and remote testing" off \
 
 CONFIGURE_ARGS=	--enable-cxx --enable-cxx-4 --enable-netcdf-4 --enable-shared \
 		--with-hdf5=${LOCALBASE} --with-zlib=/usr
-CONFIGURE_ENV=	LDFLAGS="${LDFLAGS}"
 CPPFLAGS+=	-I${LOCALBASE}/include -fPIC -DPIC
 GNU_CONFIGURE=	yes
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git science/peekabot/Makefile science/peekabot/Makefile
index 0ed11dd..ddcbe96 100644
--- science/peekabot/Makefile
+++ science/peekabot/Makefile
@@ -20,8 +20,8 @@ LIB_DEPENDS=	boost_regex.4:${PORTSDIR}/devel/boost-libs \
 		gtkglextmm-x11-1.2:${PORTSDIR}/x11-toolkits/gtkglextmm
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	LDFLAGS="`fltk-config --ldflags`" \
-		CPPFLAGS="`fltk-config --cflags`"
+CPPFLAGS+=	`fltk-config --cflags`
+LDFLAGS+=	`fltk-config --ldflags`
 USE_LDCONFIG=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
diff --git science/py-mlpy/Makefile science/py-mlpy/Makefile
index dfed3c9..deba8de 100644
--- science/py-mlpy/Makefile
+++ science/py-mlpy/Makefile
@@ -23,7 +23,6 @@ LIB_DEPENDS=	gsl.16:${PORTSDIR}/math/gsl
 
 CFLAGS+=	-I${LOCALBASE}/include -I${PYTHON_SITELIBDIR}/numpy/core
 LDFLAGS+=	-L${LOCALBASE}/lib
-MAKE_ENV+=	CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
 PYDISTUTILS_PKGNAME=	MLPY
diff --git science/pycdf/Makefile science/pycdf/Makefile
index 97e84ec..4efde10 100644
--- science/pycdf/Makefile
+++ science/pycdf/Makefile
@@ -18,7 +18,7 @@ BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/numpy:${PORTSDIR}/math/py-numpy \
 		${LOCALBASE}/lib/libnetcdf.so:${PORTSDIR}/science/netcdf
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
-LDFLAGS=	"-L${LOCALBASE}/lib"
+LDFLAGS+=	"-L${LOCALBASE}/lib"
 
 USE_PYTHON=	2.5+
 USE_PYDISTUTILS=	yes
diff --git science/silo/Makefile science/silo/Makefile
index 41ced0c..7b8a4ad 100644
--- science/silo/Makefile
+++ science/silo/Makefile
@@ -18,8 +18,8 @@ LIB_DEPENDS=	netcdf.4:${PORTSDIR}/science/netcdf
 
 USE_AUTOTOOLS=	libtool
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}" \
-		LDFLAGS="${LDFLAGS} ${PTHREAD_LIBS}"
+CPPFLAGS+=	${CFLAGS} ${PTHREAD_CFLAGS}
+LDFLAGS+=	${PTHREAD_LIBS}
 
 NO_LATEST_LINK=	yes
 USE_GMAKE=	yes
diff --git science/udunits/Makefile science/udunits/Makefile
index e41e096..7057f37 100644
--- science/udunits/Makefile
+++ science/udunits/Makefile
@@ -16,8 +16,8 @@ COMMENT=	A library for manipulating units of physical quantities
 
 LIB_DEPENDS=	expat.6:${PORTSDIR}/textproc/expat2
 
-CONFIGURE_ENV=	LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" \
-		ac_cv_header_CUnit_CUnit_h=no
+CONFIGURE_ENV=	ac_cv_header_CUnit_CUnit_h=no
+LDFLAGS+=	-L${LOCALBASE}/lib
 CPPFLAGS+=	-I${LOCALBASE}/include
 MAKE_JOBS_SAFE=	yes
 USE_AUTOTOOLS=	libtool
diff --git science/v_sim/Makefile science/v_sim/Makefile
index fba99db..9834a6c 100644
--- science/v_sim/Makefile
+++ science/v_sim/Makefile
@@ -21,8 +21,8 @@ USE_GL=		yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-gtk-doc --with-html-dir=${PREFIX}/share/doc
-CONFIGURE_ENV=	CPPFLAGS="${CFLAGS} -I${LOCALBASE}/include"	\
-		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
+CPPFLAGS+=	${CFLAGS} -I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 USE_LDCONFIG=	yes
 
 .if !defined(NOPORTDOCS)
diff --git science/vis5d+/Makefile science/vis5d+/Makefile
index c1ddc80..25ce837 100644
--- science/vis5d+/Makefile
+++ science/vis5d+/Makefile
@@ -35,13 +35,13 @@ USE_GNOME=	gtk12
 USE_ICONV=	yes
 GNU_CONFIGURE=	yes
 FFLAGS+=	-fno-range-check
-CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" LIBS="-lgfx"
+CONFIGURE_ENV+=	LIBS="-lgfx"
 CONFIGURE_ARGS=	--enable-gtk --enable-threads --with-netcdf \
 		--with-mixkit=${LOCALBASE}/lib/libmix.a --with-x
 USE_LDCONFIG=	yes
 
-CPPFLAGS=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
+CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 
 CFLAGS+=	-DMIX_ANSI_IOSTREAMS -fPIC -fpermissive
 
diff --git security/aide/Makefile security/aide/Makefile
index fac9381..dc82474 100644
--- security/aide/Makefile
+++ security/aide/Makefile
@@ -29,8 +29,8 @@ CONFIGURE_ARGS+=--with-mhash \
 		--mandir=${MANPREFIX}/man \
 		--with-config_file=${PREFIX}/etc/aide.conf
 
-CONFIGURE_ENV+=	CFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
+CFLAGS+=	-I${LOCALBASE}/include
 
 MAN1=		aide.1
 MAN5=		aide.conf.5
diff --git security/authforce/Makefile security/authforce/Makefile
index 04fb305..fe894a1 100644
--- security/authforce/Makefile
+++ security/authforce/Makefile
@@ -15,7 +15,8 @@ COMMENT=	HTTP authentication brute forcer
 
 LIB_DEPENDS=	curl.6:${PORTSDIR}/ftp/curl
 
-CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib" LIBS="-lintl"
+CONFIGURE_ENV=	LIBS="-lintl"
+LDFLAGS+=	-L${LOCALBASE}/lib
 CPPFLAGS+=	-I${LOCALBASE}/include
 GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
diff --git security/barnyard2/Makefile security/barnyard2/Makefile
index 52c01ab..9cc620a 100644
--- security/barnyard2/Makefile
+++ security/barnyard2/Makefile
@@ -24,7 +24,6 @@ OPTIONS+=	TCL "Enable TCL support" off
 
 USE_RC_SUBR=	barnyard2.sh
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	LDFLAGS="${LDFLAGS}"
 SUB_FILES=	pkg-message
 
 PORTDOCS1=	README
diff --git security/bcrypt/Makefile security/bcrypt/Makefile
index 5f3ef73..0fcf401 100644
--- security/bcrypt/Makefile
+++ security/bcrypt/Makefile
@@ -19,7 +19,6 @@ MAKE_JOBS_SAFE=	yes
 ALL_TARGET=	${PORTNAME}
 
 LDFLAGS+=	-lz
-MAKE_ENV+=	LDFLAGS="${LDFLAGS}"
 
 PORTDOCS=	README
 MAN1=		bcrypt.1
diff --git security/bioapi/Makefile security/bioapi/Makefile
index 182f01c..3a24ea7 100644
--- security/bioapi/Makefile
+++ security/bioapi/Makefile
@@ -19,7 +19,7 @@ USE_AUTOTOOLS=	libtool
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 # Problems reported with higher optimization levels
-CONFIGURE_ENV=CFLAGS="${CFLAGS} -O"
+CFLAGS+=	-O
 CONFIGURE_ARGS=	--localstatedir=/var/db/ --with-Qt-dir=no
 
 USE_LDCONFIG=	yes
diff --git security/bro/Makefile security/bro/Makefile
index ad4ecb4..e601208 100644
--- security/bro/Makefile
+++ security/bro/Makefile
@@ -22,8 +22,8 @@ USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--disable-perftools \
 		--disable-broccoli \
 		--disable-broctl
-CONFIGURE_ENV=	CFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+LDFLAGS+=	-L${LOCALBASE}/lib
+CFLAGS+=	-I${LOCALBASE}/include
 
 .include <bsd.port.pre.mk>
 
diff --git security/clamav-devel/Makefile security/clamav-devel/Makefile
index fcdb2d5..e08c9e2 100644
--- security/clamav-devel/Makefile
+++ security/clamav-devel/Makefile
@@ -47,8 +47,6 @@ PLIST_SUB+=	DBDIR=${DBDIR} LOGDIR=${LOGDIR} RUNDIR=${RUNDIR}
 PY_NO_THREAD=	${WRKDIR}/.python-has-no-threads
 USE_AUTOTOOLS=	libltdl
 
-CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}" \
-		LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--libdir=${PREFIX}/lib \
 		--with-dbdir=${DBDIR} \
 		--with-zlib=/usr \
diff --git security/clamav/Makefile security/clamav/Makefile
index 243fce3..cc1e373 100644
--- security/clamav/Makefile
+++ security/clamav/Makefile
@@ -44,8 +44,6 @@ PLIST_SUB+=	DBDIR=${DBDIR} LOGDIR=${LOGDIR} RUNDIR=${RUNDIR}
 PY_NO_THREAD=	${WRKDIR}/.python-has-no-threads
 USE_AUTOTOOLS=	libltdl
 
-CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}" \
-		LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--libdir=${PREFIX}/lib \
 		--with-dbdir=${DBDIR} \
 		--with-zlib=/usr \
diff --git security/courier-authlib/Makefile security/courier-authlib/Makefile
index 6de8aac..0937e8d 100644
--- security/courier-authlib/Makefile
+++ security/courier-authlib/Makefile
@@ -57,8 +57,6 @@ USERDB?=	${PREFIX}/etc/userdb
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
-CONFIGURE_ENV=	CPPFLAGS='${CPPFLAGS}' \
-		LDFLAGS='${LDFLAGS}'
 MAKE_ENV:=	${CONFIGURE_ENV}
 
 CONFIGURE_ARGS=	--enable-unicode \
diff --git security/courierpassd/Makefile security/courierpassd/Makefile
index 1825242..2388bed 100644
--- security/courierpassd/Makefile
+++ security/courierpassd/Makefile
@@ -21,7 +21,6 @@ GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
-CONFIGURE_ENV=	CPPFLAGS='${CPPFLAGS}' LDFLAGS='${LDFLAGS}'
 
 MINUID?=	100
 DELAY?=		3
diff --git security/courierpasswd/Makefile security/courierpasswd/Makefile
index a116d62..5edca04 100644
--- security/courierpasswd/Makefile
+++ security/courierpasswd/Makefile
@@ -19,7 +19,6 @@ GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
-CONFIGURE_ENV=	CPPFLAGS='${CPPFLAGS}' LDFLAGS='${LDFLAGS}'
 
 MINUID?=	100
 
diff --git security/courieruserinfo/Makefile security/courieruserinfo/Makefile
index 44d0b57..1a42162 100644
--- security/courieruserinfo/Makefile
+++ security/courieruserinfo/Makefile
@@ -19,7 +19,6 @@ GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
-CONFIGURE_ENV=	CPPFLAGS='${CPPFLAGS}' LDFLAGS='${LDFLAGS}'
 
 MAN8=		courieruserinfo.8
 
diff --git security/crank/Makefile security/crank/Makefile
index da656f4..d205db4 100644
--- security/crank/Makefile
+++ security/crank/Makefile
@@ -20,8 +20,8 @@ LIB_DEPENDS=	guile:${PORTSDIR}/lang/guile
 USE_GNOME=	gtk12
 GNU_CONFIGURE=	yes
 GUILE_CONFIG=	${LOCALBASE}/bin/guile-config
-CONFIGURE_ENV=	CFLAGS="${CFLAGS} `${GUILE_CONFIG} compile`" \
-		LDFLAGS="`${GUILE_CONFIG} link`"
+LDFLAGS+=	`${GUILE_CONFIG} link`
+CFLAGS+=	`${GUILE_CONFIG} compile`
 USE_GMAKE=	yes
 
 INFO=		crank
diff --git security/cyrus-sasl2/Makefile security/cyrus-sasl2/Makefile
index 81881d0..de20d55 100644
--- security/cyrus-sasl2/Makefile
+++ security/cyrus-sasl2/Makefile
@@ -165,7 +165,6 @@ CONFIGURE_ARGS+=--enable-ntlm
 
 .if ${ARCH} == "amd64"
 CPPFLAGS+=	-fPIC
-CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}"
 .endif
 .if !defined(WITHOUT_GSSAPI) && defined(KRB5_HOME) && exists(${KRB5_HOME}/lib/libgssapi_krb5.so)
 CONFIGURE_ARGS+=--enable-gssapi=${KRB5_HOME} --with-gss_impl=mit
diff --git security/dirmngr/Makefile security/dirmngr/Makefile
index 060f72f..9ad0310 100644
--- security/dirmngr/Makefile
+++ security/dirmngr/Makefile
@@ -32,7 +32,7 @@ INFO=		dirmngr
 MAN1=		dirmngr-client.1 dirmngr.1
 
 CONFIGURE_ARGS+=	--docdir=${DOCSDIR}
-CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 OPTIONS=	NLS "National Language Support" off
 
diff --git security/dropbear/Makefile security/dropbear/Makefile
index 5d515e0..2254a16 100644
--- security/dropbear/Makefile
+++ security/dropbear/Makefile
@@ -24,7 +24,7 @@ USE_RC_SUBR=	${PORTNAME}
 .include <bsd.port.pre.mk>
 
 .if defined(WITH_STATIC)
-CONFIGURE_ENV=	LDFLAGS=-static
+LDFLAGS+=	-static
 .endif
 
 post-patch:
diff --git security/firewalk/Makefile security/firewalk/Makefile
index b94440e..e02d4b6 100644
--- security/firewalk/Makefile
+++ security/firewalk/Makefile
@@ -22,8 +22,8 @@ RUN_DEPENDS=	${BUILD_DEPENDS}
 WRKSRC=		${WRKDIR}/Firewalk
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include `${LIBNET_CONFIG} --cflags`" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include `${LIBNET_CONFIG} --cflags`
+LDFLAGS+=	-L${LOCALBASE}/lib
 MAN8=		firewalk.8
 
 LIBNET_CONFIG?=	${LOCALBASE}/bin/libnet11-config
diff --git security/fpm/Makefile security/fpm/Makefile
index 5f659b3..922adc5 100644
--- security/fpm/Makefile
+++ security/fpm/Makefile
@@ -17,8 +17,8 @@ COMMENT=	Figaro's Password Manager, an app to securely store your passwords
 USE_GNOME=	gnomeprefix gnomehack gnomelibs
 GNU_CONFIGURE=	yes
 #CONFIGURE_ARGS+=	--without-included-gettext
-CONFIGURE_ENV+=	CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+LDFLAGS+=	-L${LOCALBASE}/lib
+CFLAGS+=	-I${LOCALBASE}/include
 
 MAN1=		fpm.1
 PORTDOCS=	AUTHORS ChangeLog README TODO
diff --git security/fprint_demo/Makefile security/fprint_demo/Makefile
index 59b18fe..9920877 100644
--- security/fprint_demo/Makefile
+++ security/fprint_demo/Makefile
@@ -25,8 +25,8 @@ PLIST_FILES+=	bin/fprint_demo
 .include <bsd.port.pre.mk>
 
 CONFIGURE_ENV+=	CRYPTO_CFLAGS=-I${OPENSSLINC} \
-		CRYPTO_LIBS=-lcrypto \
-		CFLAGS="${CFLAGS} -DHAVE_MEMMEM"
+		CRYPTO_LIBS=-lcrypto
+CFLAGS+=	-DHAVE_MEMMEM
 
 post-install:
 	@${ECHO}
diff --git security/fressh/Makefile security/fressh/Makefile
index 0f1a01a..3322302 100644
--- security/fressh/Makefile
+++ security/fressh/Makefile
@@ -29,9 +29,9 @@ post-patch:
 .if !exists(/usr/lib/libssl.a) || !exists(/usr/lib/libcrypto.a)
 .if exists(${LOCALBASE}/lib/libssl.a) && exists(${LOCALBASE}/lib/libcrypto.a)
 LIB_DEPENDS+=	ssl.3:${PORTSDIR}/security/openssl
-MAKE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib" \
-		RSAGLUE="${RSAGLUE}"
+MAKE_ENV=	RSAGLUE="${RSAGLUE}"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 .if exists(${LOCALBASE}/lib/librsaref.a)
 RSAGLUE=	-lrsaref
 .endif
diff --git security/fwbuilder-devel/Makefile security/fwbuilder-devel/Makefile
index 115f059..377bfc0 100644
--- security/fwbuilder-devel/Makefile
+++ security/fwbuilder-devel/Makefile
@@ -50,9 +50,9 @@ USE_GMAKE=	yes
 USE_AUTOTOOLS=	autoconf:268 aclocal:111 libtool:22
 CONFIGURE_SCRIPT=	autogen.sh
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib" \
-		QMAKESPEC=${LOCALBASE}/share/qt/mkspecs/freebsd-g++
+CONFIGURE_ENV=	QMAKESPEC=${LOCALBASE}/share/qt/mkspecs/freebsd-g++
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS+=	--with-docdir=${DOCSDIR} --with-qtdir=${QTDIR}
 MAKE_ARGS+=	QTDIR="${QTDIR}" \
 		QMAKESPEC=${LOCALBASE}/share/qt/mkspecs/freebsd-g++
diff --git security/fwbuilder/Makefile security/fwbuilder/Makefile
index ba75849..b5d041b 100644
--- security/fwbuilder/Makefile
+++ security/fwbuilder/Makefile
@@ -54,9 +54,9 @@ USE_GMAKE=	yes
 USE_AUTOTOOLS=	autoconf aclocal libtool
 CONFIGURE_SCRIPT=	autogen.sh
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib" \
-		QMAKESPEC=${LOCALBASE}/share/qt/mkspecs/freebsd-g++
+CONFIGURE_ENV=	QMAKESPEC=${LOCALBASE}/share/qt/mkspecs/freebsd-g++
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS+=	--with-docdir=${DOCSDIR} --with-qtdir=${QTDIR}
 MAKE_ARGS+=	QTDIR="${QTDIR}" \
 		QMAKESPEC=${LOCALBASE}/share/qt/mkspecs/freebsd-g++
diff --git security/gnome-keyring/Makefile security/gnome-keyring/Makefile
index 4428530..789888c 100644
--- security/gnome-keyring/Makefile
+++ security/gnome-keyring/Makefile
@@ -27,8 +27,8 @@ USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--with-pam-dir="${PREFIX}/lib" \
 		--with-root-certs="${LOCALBASE}/share/certs/ca-root-nss.crt"
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 GLIB_SCHEMAS=	org.gnome.crypto.cache.gschema.xml \
 		org.gnome.crypto.pgp.gschema.xml
 
diff --git security/gnutls-devel/Makefile security/gnutls-devel/Makefile
index bf533c3..f959394 100644
--- security/gnutls-devel/Makefile
+++ security/gnutls-devel/Makefile
@@ -29,7 +29,7 @@ USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS} -fPIC" LDFLAGS="${LDFLAGS}"
+CPPFLAGS+=	-fPIC
 CONFIGURE_ARGS+=	--disable-guile --disable-silent-rules \
 			--disable-hardware-acceleration
 MANCOMPRESSED=	no
diff --git security/gnutls/Makefile security/gnutls/Makefile
index 1077300..3e70272 100644
--- security/gnutls/Makefile
+++ security/gnutls/Makefile
@@ -30,7 +30,7 @@ USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS} -fPIC" LDFLAGS="${LDFLAGS}"
+CPPFLAGS+=	-fPIC
 CONFIGURE_ARGS+=	--disable-guile
 MANCOMPRESSED=	no
 
diff --git security/gpa/Makefile security/gpa/Makefile
index 7e52ef9..30715dc 100644
--- security/gpa/Makefile
+++ security/gpa/Makefile
@@ -23,8 +23,9 @@ USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gtk20
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" LIBS="-L${LOCALBASE}/lib" \
+CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib" \
 		GPGKEYS_LDAP="${LOCALBASE}/libexec/gpg2keys_ldap"
+CPPFLAGS+=	-I${LOCALBASE}/include
 MAKE_JOBS_SAFE=	yes
 
 LICENSE=	GPLv3
diff --git security/gpass/Makefile security/gpass/Makefile
index 2fb665e..df29249 100644
--- security/gpass/Makefile
+++ security/gpass/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS=	mcrypt:${PORTSDIR}/security/mcrypt \
 		mhash:${PORTSDIR}/security/mhash
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib -export-dynamic"
+LDFLAGS+=	-L${LOCALBASE}/lib -export-dynamic
 USE_GMAKE=	yes
 
 MAN1=		gpass.1 gpass.ja.1 gpass-convert.1 gpass-convert.ja.1
diff --git security/gringotts/Makefile security/gringotts/Makefile
index f6c3f59..33cc581 100644
--- security/gringotts/Makefile
+++ security/gringotts/Makefile
@@ -19,10 +19,9 @@ LIB_DEPENDS=	popt.0:${PORTSDIR}/devel/popt \
 
 USE_GNOME=	gtk20
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 
-CPPFLAGS=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 post-patch:
 	@${REINPLACE_CMD} -e \
diff --git security/gsasl/Makefile security/gsasl/Makefile
index c8eef7c..826243e 100644
--- security/gsasl/Makefile
+++ security/gsasl/Makefile
@@ -24,7 +24,6 @@ LIB_DEPENDS=	idn.17:${PORTSDIR}/dns/libidn \
 USE_GNOME=	gnomehack pkgconfig
 USE_PERL5_BUILD=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	LDFLAGS="${LDFLAGS}"
 USE_LDCONFIG=	yes
 
 INFO=	gsasl
@@ -37,8 +36,8 @@ USE_GETTEXT=	yes
 PLIST_SUB+=	NLS=""
 .endif
 
-CPPFLAGS=	-I/usr/include -I${LOCALBASE}/include
-LDFLAGS=	-L/usr/lib -L${LOCALBASE}/lib
+CPPFLAGS+=	-I/usr/include -I${LOCALBASE}/include
+LDFLAGS+=	-L/usr/lib -L${LOCALBASE}/lib
 
 post-patch:
 .for file in \
diff --git security/gss/Makefile security/gss/Makefile
index 348b3f7..ced2416 100644
--- security/gss/Makefile
+++ security/gss/Makefile
@@ -22,15 +22,14 @@ CONFLICTS=	heimdal-[0-9]*
 USE_PERL5_BUILD=	yes
 USE_GNOME=	gnomehack pkgconfig
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--disable-kerberos5
 USE_LDCONFIG=	yes
 
 INFO=		gss
 PORTDOCS=	gss.html gss.ps gss.pdf
 
-CPPFLAGS=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .include "Makefile.man"
 .include <bsd.port.pre.mk>
diff --git security/klamav/Makefile security/klamav/Makefile
index ab1ba6e..28bec1f 100644
--- security/klamav/Makefile
+++ security/klamav/Makefile
@@ -29,7 +29,7 @@ INSTALLS_ICONS=	yes
 
 USE_AUTOTOOLS=	libtool aclocal
 LIBTOOLFILES=	acinclude.m4 configure
-CONFIGURE_ENV=	LDFLAGS="${PTHREAD_LIBS} -lintl -L${PREFIX}/lib"
+LDFLAGS+=	${PTHREAD_LIBS} -lintl -L${PREFIX}/lib
 CONFIGURE_ARGS+=--with-qt-dir=${QT_PREFIX} \
 		--without-included-sqlite
 
diff --git security/krb5-appl/Makefile security/krb5-appl/Makefile
index 025f1b9..eb938f7 100644
--- security/krb5-appl/Makefile
+++ security/krb5-appl/Makefile
@@ -33,8 +33,7 @@ USE_PERL5_BUILD=	yes
 USE_LDCONFIG=		yes
 USE_AUTOTOOLS=		libtool autoheader autoconf
 CONFIGURE_ARGS?=	--enable-shared --with-krb5=${PREFIX}/bin/krb5-config
-CONFIGURE_ENV=		INSTALL="${INSTALL}" YACC=/usr/bin/yacc \
-			CFLAGS="${CFLAGS}"
+CONFIGURE_ENV=		INSTALL="${INSTALL}" YACC=/usr/bin/yacc
 MAKE_ARGS=		INSTALL="${INSTALL}"
 PATCH_DIST_STRIP=	-p1
 
diff --git security/libecc/Makefile security/libecc/Makefile
index b8f3633..4509349 100644
--- security/libecc/Makefile
+++ security/libecc/Makefile
@@ -19,8 +19,8 @@ LIB_DEPENDS=	gmp.10:${PORTSDIR}/math/gmp
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 
-CONFIGURE_ENV+=	LDFLAGS="-L${PREFIX}/lib -L${LOCALBASE}/lib" \
-		CPPFLAGS="-I${PREFIX}/include -I${LOCALBASE}/include"
+CPPFLAGS+=	-I${PREFIX}/include -I${LOCALBASE}/include
+LDFLAGS+=	-L${PREFIX}/lib -L${LOCALBASE}/lib
 
 post-patch:
 	@${REINPLACE_CMD} 's@endian\.h@sys/&@' ${WRKSRC}/include/libecc/bitset.h
diff --git security/libfprint/Makefile security/libfprint/Makefile
index 97c736d..f446efb 100644
--- security/libfprint/Makefile
+++ security/libfprint/Makefile
@@ -23,8 +23,8 @@ USE_OPENSSL=	yes
 USE_GNOME=	glib20 pkgconfig
 
 CONFIGURE_ENV+=	CRYPTO_CFLAGS=-I${OPENSSLINC} \
-		CRYPTO_LIBS=-lcrypto \
-		CFLAGS="${CFLAGS} -DHAVE_MEMMEM"
+		CRYPTO_LIBS=-lcrypto
+CFLAGS+=	-DHAVE_MEMMEM
 
 .include <bsd.port.pre.mk>
 
diff --git security/libfwbuilder-devel/Makefile security/libfwbuilder-devel/Makefile
index fdcf55f..848ae94 100644
--- security/libfwbuilder-devel/Makefile
+++ security/libfwbuilder-devel/Makefile
@@ -53,9 +53,9 @@ USE_GMAKE=	yes
 USE_AUTOTOOLS=	autoconf:268 aclocal:111 libtool:22
 CONFIGURE_SCRIPT=	autogen.sh
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib" \
-		QMAKESPEC=${LOCALBASE}/share/qt/mkspecs/freebsd-g++
+CONFIGURE_ENV=	QMAKESPEC=${LOCALBASE}/share/qt/mkspecs/freebsd-g++
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS+=	--with-docdir=${DOCSDIR}
 MAKE_ARGS+=	QTDIR="${QTDIR}" \
 		QMAKESPEC=${LOCALBASE}/share/qt/mkspecs/freebsd-g++
diff --git security/libgnome-keyring/Makefile security/libgnome-keyring/Makefile
index ccd58fa..f27a917 100644
--- security/libgnome-keyring/Makefile
+++ security/libgnome-keyring/Makefile
@@ -23,7 +23,7 @@ USE_GMAKE=	yes
 USE_GETTEXT=	yes
 USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .include <bsd.port.mk>
diff --git security/libgnomesu/Makefile security/libgnomesu/Makefile
index 6e7a919..ab8bb0c 100644
--- security/libgnomesu/Makefile
+++ security/libgnomesu/Makefile
@@ -18,8 +18,8 @@ USE_AUTOTOOLS=	libtool
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack gnomeprefix libgnomeui
 CONFIGURE_ARGS+=--disable-install-pam
-CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV+=	LIBS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|-DGTK_DISABLE_DEPRECATED||g' \
diff --git security/libgringotts/Makefile security/libgringotts/Makefile
index 87fb8e6..71aa438 100644
--- security/libgringotts/Makefile
+++ security/libgringotts/Makefile
@@ -20,7 +20,8 @@ LIB_DEPENDS=	mcrypt.8:${PORTSDIR}/security/libmcrypt \
 USE_AUTOTOOLS=	libtool
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV+=	LIBS="-L${LOCALBASE}/lib" CPPFLAGS="-I${LOCALBASE}/include"
+CONFIGURE_ENV+=	LIBS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
 CONFIGURE_ARGS+=	--with-pkg-config-files=${PREFIX}/libdata/pkgconfig
 USE_LDCONFIG=	yes
 
diff --git security/lsh/Makefile security/lsh/Makefile
index 400e57c..f601215 100644
--- security/lsh/Makefile
+++ security/lsh/Makefile
@@ -23,10 +23,9 @@ GNU_CONFIGURE=	yes
 USE_XORG=	xau
 USE_GMAKE=	yes
 INSTALL_TARGET=	install
-CONFIGURE_ENV=	PREFIX="${PREFIX}" CC="${CC}" CFLAGS="${CFLAGS}"
+CONFIGURE_ENV=	PREFIX="${PREFIX}"
 CONFIGURE_ARGS+=	--with-include-path=${LOCALBASE}/include
 CONFIGURE_ARGS+=	--with-lib-path=${LOCALBASE}/lib
-CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS}"
 .if defined(KRB5_HOME) && exists(${KRB5_HOME})
 PLIST_SUB+=	KRB=""
 .else
diff --git security/mcrypt/Makefile security/mcrypt/Makefile
index 612c1fe..6643fa5 100644
--- security/mcrypt/Makefile
+++ security/mcrypt/Makefile
@@ -24,8 +24,8 @@ LIB_DEPENDS=	mcrypt.8:${PORTSDIR}/security/libmcrypt \
 
 USE_GETTEXT=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib -lintl"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib -lintl
 CONFIGURE_ARGS=	--enable-static --with-catgets
 
 MAN1=		mcrypt.1
diff --git security/nmap/Makefile security/nmap/Makefile
index a4f9836..42c204b 100644
--- security/nmap/Makefile
+++ security/nmap/Makefile
@@ -45,7 +45,7 @@ MAN1_EN=	ncat.1 nping.1
 .ifndef WITHOUT_SSL
 USE_OPENSSL=	yes
 CONFIGURE_ARGS+=	--with-openssl=${OPENSSLBASE}
-CONFIGURE_ENV+=		CFLAGS="${CFLAGS} -I${OPENSSLINC}"
+CFLAGS+=		-I${OPENSSLINC}
 PLIST_SUB+=		WITHSSL=""
 .else
 PKGNAMESUFFIX=		-nossl
diff --git security/opencryptoki/Makefile security/opencryptoki/Makefile
index b537857..0ebc5f2 100644
--- security/opencryptoki/Makefile
+++ security/opencryptoki/Makefile
@@ -49,7 +49,7 @@ CONFIGURE_ARGS=	--enable-swtok --enable-tpmtok \
 		--localstatedir=${PREFIX}/var \
 		--with-pkcs11user=${USERS} \
 		--with-pkcs11group=${GROUPS}
-CONFIGURE_ENV=	LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .include <bsd.port.pre.mk>
 
diff --git security/openscep/Makefile security/openscep/Makefile
index eca683d..6fdeb38 100644
--- security/openscep/Makefile
+++ security/openscep/Makefile
@@ -31,12 +31,11 @@ PLIST_DIRSTRY=	www/cgi-bin
 .endif
 
 CPPFLAGS+=	-I${LOCALBASE}/include
-CONFIGURE_ENV=	CPPFLAGS=${CPPFLAGS} LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS=	--with-html-install-dir="${PREFIX}/www/openscep" \
 		--with-cgi-install-dir="${PREFIX}/www/cgi-bin/openscep" \
 		--with-openscep-dir="${PREFIX}/etc/openscep" \
 		--with-pkiclientexe="${PREFIX}/www/cgi-bin/pkiclient.exe"
-MAKE_ENV=	CPPFLAGS=${CPPFLAGS}
 
 CONF_DIR=	${PREFIX}/etc/${PORTNAME}
 LOCAL_CONF_FILES=	openscep.cnf openscep.ldif openscep.schema slapd.conf
diff --git security/openssl_tpm_engine/Makefile security/openssl_tpm_engine/Makefile
index cc6e0ea..943e285 100644
--- security/openssl_tpm_engine/Makefile
+++ security/openssl_tpm_engine/Makefile
@@ -21,7 +21,7 @@ USE_GMAKE=	YES
 GNU_CONFIGURE=	YES
 MAKE_JOBS_SAFE=	YES
 USE_AUTOTOOLS=	autoconf libtool
-CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib"
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 SUB_FILES=	pkg-message
 
diff --git security/openvas-libraries/Makefile.common security/openvas-libraries/Makefile.common
index 8741e08..a88c4b9 100644
--- security/openvas-libraries/Makefile.common
+++ security/openvas-libraries/Makefile.common
@@ -5,4 +5,3 @@ CONFIGURE_ARGS+=--includedir=${PREFIX}/include \
 LDFLAGS+=	-L${LOCALBASE}/lib
 CFLAGS+=	-I${PREFIX}/include
 CPPFLAGS+=	-I${LOCALBASE}/include
-CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
diff --git security/openvpn-admin/Makefile security/openvpn-admin/Makefile
index a0173cb..12c10f3 100644
--- security/openvpn-admin/Makefile
+++ security/openvpn-admin/Makefile
@@ -21,8 +21,8 @@ WRKSRC=		${WRKDIR}/${DISTNAME:S/b//}
 USE_GMAKE=	yes
 USE_GNOME=	gtksharp20
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .include <bsd.port.pre.mk>
 
diff --git security/osslsigncode/Makefile security/osslsigncode/Makefile
index 124cdd5..c8131be 100644
--- security/osslsigncode/Makefile
+++ security/osslsigncode/Makefile
@@ -16,9 +16,8 @@ COMMENT=	OpenSSL-based signcode utility
 
 PLIST_FILES=	bin/osslsigncode
 
-CPPFLAGS=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_OPENSSL=	yes
diff --git security/pam_authsrv/Makefile security/pam_authsrv/Makefile
index ecb629a..917d9c4 100644
--- security/pam_authsrv/Makefile
+++ security/pam_authsrv/Makefile
@@ -19,8 +19,8 @@ BUILD_DEPENDS=	${NONEXISTENT}:${PORTSDIR}/security/fwtk:build
 RESTRICTED=	No form of redistribution is allowed, because of linkging against fwtk
 
 USE_AUTOTOOLS=	libtool
-CONFIGURE_ENV=	LDFLAGS="${LDFLAGS} -L${PORTSDIR}/security/fwtk/work/fwtk" \
-		CFLAGS="${CFLAGS} -I${PORTSDIR}/security/fwtk/work/fwtk"
+LDFLAGS+=	-L${PORTSDIR}/security/fwtk/work/fwtk
+CFLAGS+=	-I${PORTSDIR}/security/fwtk/work/fwtk
 CONFIGURE_ARGS=	--disable-encap --disable-epkg-install
 INSTALL_TARGET=	install-real
 
diff --git security/pam_krb5/Makefile security/pam_krb5/Makefile
index c9dbb0d..8081eb8 100644
--- security/pam_krb5/Makefile
+++ security/pam_krb5/Makefile
@@ -38,7 +38,6 @@ IGNORE=			You must define KRB5_IMPL to be \"mit\" or \"heimdal\"
 MANDIR=			${MANPREFIX}/man
 MANDIR=			${PREFIX}/share/man
 KRB5_DIR?=		${LOCALBASE}
-CONFIGURE_ENV=		CFLAGS="${CFLAGS}"
 CONFIGURE_ARGS=		--with-krb5="${KRB5_DIR}"
 
 post-install:
diff --git security/pamtester/Makefile security/pamtester/Makefile
index ca7dfe4..f80ed29 100644
--- security/pamtester/Makefile
+++ security/pamtester/Makefile
@@ -5,20 +5,20 @@
 # $FreeBSD$
 #
 
-PORTNAME=		pamtester
-PORTVERSION=		0.1.2
-CATEGORIES=		security
-MASTER_SITES=		SF
+PORTNAME=	pamtester
+PORTVERSION=	0.1.2
+CATEGORIES=	security
+MASTER_SITES=	SF
 
-MAINTAINER=		ports@FreeBSD.org
-COMMENT=		A command line pam authentication tester
+MAINTAINER=	ports@FreeBSD.org
+COMMENT=	A command line pam authentication tester
 
-MAN1=			pamtester.1
+MAN1=		pamtester.1
 
-GNU_CONFIGURE=		yes
-CONFIGURE_ENV=		CPPFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
-USE_GMAKE=		yes
+GNU_CONFIGURE=	yes
+CPPFLAGS+=	${CFLAGS}
+USE_GMAKE=	yes
 
-PLIST_FILES=		bin/pamtester
+PLIST_FILES=	bin/pamtester
 
 .include <bsd.port.mk>
diff --git security/parano/Makefile security/parano/Makefile
index 640fb54..6c7daa2 100644
--- security/parano/Makefile
+++ security/parano/Makefile
@@ -19,7 +19,7 @@ USE_PYTHON=	yes
 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
 
 .include <bsd.port.mk>
diff --git security/pecl-gnupg/Makefile security/pecl-gnupg/Makefile
index c6f9caa..e69f506 100644
--- security/pecl-gnupg/Makefile
+++ security/pecl-gnupg/Makefile
@@ -25,7 +25,7 @@ PHP_MODNAME=	gnupg
 
 CONFIGURE_ARGS=	--with-gnupg=${LOCALBASE}/include/gpgme
 CFLAGS+=		-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 post-patch:
 	@${REINPLACE_CMD} -e "s|\$$GNUPG_DIR/lib|${LOCALBASE}/lib|" -e "s|-ldl||g" \
diff --git security/pecl-ssh2/Makefile security/pecl-ssh2/Makefile
index b49b682..4f3c4b2 100644
--- security/pecl-ssh2/Makefile
+++ security/pecl-ssh2/Makefile
@@ -21,8 +21,8 @@ LIB_DEPENDS=	ssh2:${PORTSDIR}/security/libssh2
 USE_PHP=	yes
 USE_PHPEXT=	yes
 
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib ${EXTRA_LIBS}"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib ${EXTRA_LIBS}
 
 CONFIGURE_ARGS=	--with-ssh2
 
diff --git security/pidgin-encryption/Makefile security/pidgin-encryption/Makefile
index 1a6dbd0..b83a9b1 100644
--- security/pidgin-encryption/Makefile
+++ security/pidgin-encryption/Makefile
@@ -24,8 +24,8 @@ USE_GMAKE=	yes
 USE_GNOME=	gtk20
 GNU_CONFIGURE=	yes
 
-CONFIGURE_ENV=	CPPFLAGS="${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CPPFLAGS+=	${PTHREAD_CFLAGS} -I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 CONFIGURE_ARGS=	--with-nspr-includes=${LOCALBASE}/include/nspr	\
 		--with-nspr-libs=${LOCALBASE}/lib	\
 		--with-nss-includes=${LOCALBASE}/include/nss/nss \
diff --git security/pidgin-otr/Makefile security/pidgin-otr/Makefile
index 0eb29f5..899baa3 100644
--- security/pidgin-otr/Makefile
+++ security/pidgin-otr/Makefile
@@ -36,8 +36,8 @@ USE_GNOME=	intltool
 USE_GETTEXT=	yes
 GNU_CONFIGURE=	yes
 
-CONFIGURE_ENV=	CPPFLAGS="${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CPPFLAGS+=	${PTHREAD_CFLAGS} -I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 CONFIGURE_ARGS=	--with-libotr-prefix=${LOCALBASE}/lib \
 		--with-libotr-inc-prefix=${LOCALBASE}/include
 
diff --git security/pinentry/Makefile security/pinentry/Makefile
index c993a0a..424e9ab 100644
--- security/pinentry/Makefile
+++ security/pinentry/Makefile
@@ -27,7 +27,6 @@ INFO=		pinentry
 
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
-CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS}"
 
 .if !defined(PINENTRY_SLAVE)
 OPTIONS=	NCURSES "Curses frontend" on \
diff --git security/pks/Makefile security/pks/Makefile
index 718ab25..d546762 100644
--- security/pks/Makefile
+++ security/pks/Makefile
@@ -25,7 +25,8 @@ USE_AUTOTOOLS=	autoconf
 CONFIGURE_ARGS=	--datadir=${PREFIX}/share/pks --localstatedir=/var/pks \
 		--sysconfdir=${EXAMPLESDIR} \
 		--libdir=${LOCALBASE}/lib --with-libwrap
-MAKE_ENV+=	LDFLAGS=-L${LOCALBASE}/lib SUBDIRS=
+MAKE_ENV+=	SUBDIRS=
+LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ENV=	DBLIB="-L${BDB_LIB_DIR} -l${BDB_LIB_NAME}" DBINC=-I${BDB_INCLUDE_DIR} DBHDR=db.h
 
 USE_RC_SUBR=	pksd.sh
diff --git security/prelude-manager/Makefile security/prelude-manager/Makefile
index 1d9f160..afe7a92 100644
--- security/prelude-manager/Makefile
+++ security/prelude-manager/Makefile
@@ -22,8 +22,8 @@ USE_AUTOTOOLS=	autoconf
 USE_RC_SUBR=	prelude-manager.sh
 CONFIGURE_ARGS=		--with-html-dir=${PREFIX}/share/doc \
 			--localstatedir=/var
-CONFIGURE_ENV=	CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
-		LIBS="${LIBS} -L${LOCALBASE}/lib"
+CONFIGURE_ENV=	LIBS="${LIBS} -L${LOCALBASE}/lib"
+CFLAGS+=	-I${LOCALBASE}/include
 
 USERS?=		prelude
 GROUPS?=	prelude
diff --git security/py-bcrypt/Makefile security/py-bcrypt/Makefile
index 03e7d76..b5e9c6a 100644
--- security/py-bcrypt/Makefile
+++ security/py-bcrypt/Makefile
@@ -25,7 +25,7 @@ PYEASYINSTALL_EGG=	${PYDISTUTILS_PKGNAME}-${PORTVERSION}-py${PYTHON_VER}${PYEASY
 PLIST_FILES=	%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%
 
 CFLAGS+=	-I${LOCALBASE}/include
-MAKE_ENV=	"LDFLAGS=-L${LOCALBASE}/lib"
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 PROJECTHOST=	py-bcrypt
 
diff --git security/py-crack/Makefile security/py-crack/Makefile
index 17fd85e..277412f 100644
--- security/py-crack/Makefile
+++ security/py-crack/Makefile
@@ -26,13 +26,10 @@ GNU_CONFIGURE=	yes
 PLIST_FILES:=	${PYTHONPREFIX_SITELIBDIR:S,${PREFIX}/,,}/_crack.so \
 		${PYTHONPREFIX_SITELIBDIR:S,${PREFIX}/,,}/crack.py
 
-CONFIGURE_ENV=	"CPPFLAGS=-I${LOCALBASE}/include" \
-		"LDFLAGS=-L${LOCALBASE}/lib" \
-		"DEFAULT_DICTPATH=${LOCALBASE}/libdata/cracklib/pw_dict"
-
-MAKE_ENV=	"LDFLAGS=-L${LOCALBASE}/lib"
-
-CFLAGS+=	"-I${LOCALBASE}/include"
+CONFIGURE_ENV=	"DEFAULT_DICTPATH=${LOCALBASE}/libdata/cracklib/pw_dict"
+LDFLAGS+=	-L${LOCALBASE}/lib
+CFLAGS+=	-I${LOCALBASE}/include
+CPPFLAGS+=	-I${LOCALBASE}/include
 
 post-patch:
 	${REINPLACE_CMD} -e 's/setup(/setup(name="${PORTNAME}",version="${PORTVERSION}",/' \
diff --git security/py-mhash/Makefile security/py-mhash/Makefile
index 9a29166..722fdb8 100644
--- security/py-mhash/Makefile
+++ security/py-mhash/Makefile
@@ -24,7 +24,7 @@ USE_PYDISTUTILS=yes
 PYDISTUTILS_PKGNAME=	python-mhash
 
 CFLAGS+=	-I${LOCALBASE}/include
-MAKE_ENV=	"LDFLAGS=-L${LOCALBASE}/lib"
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 test: install
 	${PYTHON_CMD} ${WRKSRC}/test.py
diff --git security/revelation/Makefile security/revelation/Makefile
index b7ddaa2..200d71f 100644
--- security/revelation/Makefile
+++ security/revelation/Makefile
@@ -18,7 +18,8 @@ LIB_DEPENDS=	crack:${PORTSDIR}/security/cracklib
 BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/Crypto/__init__.py:${PORTSDIR}/security/py-pycrypto
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/Crypto/__init__.py:${PORTSDIR}/security/py-pycrypto
 
-CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib" CPPFLAGS="-I${LOCALBASE}/include"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
diff --git security/seahorse-plugins/Makefile security/seahorse-plugins/Makefile
index 6b3d5a1..e4ff75c 100644
--- security/seahorse-plugins/Makefile
+++ security/seahorse-plugins/Makefile
@@ -27,8 +27,8 @@ USE_GNOME=	gnomehack intlhack gnomeprefix gconf2 gnomedocutils
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
 INSTALLS_OMF=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 OPTIONS=	NAUTILUS "Enable the Nautilus component" on \
 		GEDIT "Enable GEdit plug-in support" on \
diff --git security/seahorse/Makefile security/seahorse/Makefile
index 6a9dd20..9335cb9 100644
--- security/seahorse/Makefile
+++ security/seahorse/Makefile
@@ -35,8 +35,8 @@ USE_GNOME=	gnomehack intlhack gnomeprefix gconf2 gnomedocutils
 GNU_CONFIGURE=	yes
 INSTALLS_OMF=	yes
 INSTALLS_ICONS=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--enable-introspection=no
 
 GCONF_SCHEMAS=	seahorse.schemas
diff --git security/shishi/Makefile security/shishi/Makefile
index 1be3379..c596a20 100644
--- security/shishi/Makefile
+++ security/shishi/Makefile
@@ -25,8 +25,7 @@ USE_PERL5_BUILD=	yes
 USE_GNOME=	gnomehack pkgconfig
 USE_ICONV=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \
-		MAKEINFO="makeinfo --no-split"
+CONFIGURE_ENV=	MAKEINFO="makeinfo --no-split"
 CONFIGURE_ARGS=	--with-db-dir=/var/shishi
 USE_LDCONFIG=	yes
 
@@ -34,8 +33,8 @@ INFO=		shishi
 
 SUB_FILES=	pkg-message
 
-CPPFLAGS=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .include "Makefile.man"
 .include <bsd.port.pre.mk>
diff --git security/snort/Makefile security/snort/Makefile
index 146bbd6..7980641 100644
--- security/snort/Makefile
+++ security/snort/Makefile
@@ -46,7 +46,6 @@ OPTIONS=	IPV6 "Enable IPv6 support" on \
 USE_RC_SUBR=	snort.sh
 SUB_FILES=	pkg-message
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	LDFLAGS="${LDFLAGS}"
 MAKE_JOBS_UNSAFE=	yes
 
 CONFIG_DIR?=	${PREFIX}/etc/snort
diff --git security/snort_inline/Makefile security/snort_inline/Makefile
index c5599b8..efba74f 100644
--- security/snort_inline/Makefile
+++ security/snort_inline/Makefile
@@ -16,7 +16,6 @@ COMMENT=	An inline IPS system based on snort using ipfw
 LIB_DEPENDS=	pcre.0:${PORTSDIR}/devel/pcre
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS+=	--enable-inline --enable-ipfw
 
 LIB_DEPENDS+=		dnet:${PORTSDIR}/net/libdnet
diff --git security/spass/Makefile security/spass/Makefile
index ae024d7..872f3e1 100644
--- security/spass/Makefile
+++ security/spass/Makefile
@@ -18,7 +18,6 @@ LIB_DEPENDS=	boost_program_options:${PORTSDIR}/devel/boost-libs
 GNU_CONFIGURE=	yes
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
-CONFIGURE_ENV=	LDFLAGS="${LDFLAGS}"
 USE_BZIP2=	yes
 
 PLIST_FILES=	bin/spass
diff --git security/spybye/Makefile security/spybye/Makefile
index f06ca59..9981e03 100644
--- security/spybye/Makefile
+++ security/spybye/Makefile
@@ -20,7 +20,6 @@ OPTIONS=	CLAMAV "Enable CLAMAV support" off
 
 USE_RC_SUBR=	spybye.sh
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	LDFLAGS="${LDFLAGS}"
 
 MAN1=		spybye.1
 
diff --git security/squidclamav/Makefile security/squidclamav/Makefile
index 72e47f5..72e94e5 100644
--- security/squidclamav/Makefile
+++ security/squidclamav/Makefile
@@ -17,7 +17,8 @@ LIB_DEPENDS=	curl:${PORTSDIR}/ftp/curl
 
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 NO_LATEST_LINK=	yes
 SUB_FILES=	pkg-message
 
diff --git security/steghide/Makefile security/steghide/Makefile
index 6122fa0..14079b5 100644
--- security/steghide/Makefile
+++ security/steghide/Makefile
@@ -25,8 +25,8 @@ USE_GETTEXT=	yes
 USE_PERL5=	yes
 USE_AUTOTOOLS=	libtool
 USE_GMAKE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CFLAGS} -I${LOCALBASE}/include -fpermissive" \
-		LIBS="-L${LOCALBASE}/lib -lintl -lmcrypt"
+CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib -lintl -lmcrypt"
+CPPFLAGS+=	${CFLAGS} -I${LOCALBASE}/include -fpermissive
 
 MAN1=		steghide.1
 
diff --git security/stunnel/Makefile security/stunnel/Makefile
index a0cbca8..a798a56 100644
--- security/stunnel/Makefile
+++ security/stunnel/Makefile
@@ -75,13 +75,13 @@ BROKEN=	'The WITH_UCONTEXT, WITH_FORK and WITH_PTHREAD options are mutually excl
 .if defined(WITH_UCONTEXT)
 CONFIGURE_ARGS+=--with-threads=ucontext
 CPPFLAGS+=	${PTHREAD_CFLAGS}
-CONFIGURE_ENV=	LDFLAGS="${LDFLAGS} ${PTHREAD_LIBS}"
+LDFLAGS+=	${PTHREAD_LIBS}
 .elif defined(WITH_FORK)
 CONFIGURE_ARGS+=--with-threads=fork
 .else
 CONFIGURE_ARGS+=--with-threads=pthread
 CPPFLAGS+=	${PTHREAD_CFLAGS}
-CONFIGURE_ENV=	LDFLAGS="${LDFLAGS} ${PTHREAD_LIBS}"
+LDFLAGS+=	${PTHREAD_LIBS}
 .endif
 
 post-patch:
diff --git security/sudo/Makefile security/sudo/Makefile
index b831a27..7cb03a5 100644
--- security/sudo/Makefile
+++ security/sudo/Makefile
@@ -65,8 +65,8 @@ CONFIGURE_ARGS+=	--with-logfac=${LOGFAC}
 
 .if !defined(WITHOUT_NLS)
 USE_GETTEXT=	yes
-CONFIGURE_ENV=	CFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib -lintl"
+LDFLAGS+=	-L${LOCALBASE}/lib -lintl
+CFLAGS+=	-I${LOCALBASE}/include
 PLIST_SUB+=	NLS=""
 .else
 CONFIGURE_ARGS+=	--disable-nls
diff --git security/sudosh/Makefile security/sudosh/Makefile
index ee89ef3..5a38352 100644
--- security/sudosh/Makefile
+++ security/sudosh/Makefile
@@ -26,7 +26,7 @@ CONFIGURE_ARGS+=	--with-logdir="${SUDOSH_LOGDIR}"
 .else
 CONFIGURE_ARGS+=	--with-logdir=/var/log/sudosh
 .endif
-CONFIGURE_ENV=		LDFLAGS="-lutil"
+LDFLAGS+=		-lutil
 
 MAN1=			sudosh.1
 MAN5=			sudosh.conf.5
diff --git security/sudosh2/Makefile security/sudosh2/Makefile
index 08c3983..0aa7d9b 100644
--- security/sudosh2/Makefile
+++ security/sudosh2/Makefile
@@ -29,7 +29,7 @@ CONFIGURE_ARGS+=	--with-logdir="${SUDOSH_LOGDIR}"
 .else
 CONFIGURE_ARGS+=	--with-logdir=/var/log/sudosh
 .endif
-CONFIGURE_ENV=		LDFLAGS="-lutil"
+LDFLAGS+=		-lutil
 
 MAN1=			sudosh.1
 MAN5=			sudosh.conf.5
diff --git security/sudosh3/Makefile security/sudosh3/Makefile
index 68015db..91ef38f 100644
--- security/sudosh3/Makefile
+++ security/sudosh3/Makefile
@@ -27,7 +27,7 @@ CONFIGURE_ARGS+=	--with-logdir="${SUDOSH_LOGDIR}"
 .else
 CONFIGURE_ARGS+=	--with-logdir=/var/log/sudosh
 .endif
-CONFIGURE_ENV=		LDFLAGS="-lutil"
+LDFLAGS+=		-lutil
 
 MAN1=			sudosh.1
 MAN5=			sudosh.conf.5
diff --git security/tinc/Makefile security/tinc/Makefile
index 6294226..59ceaa7 100644
--- security/tinc/Makefile
+++ security/tinc/Makefile
@@ -25,7 +25,6 @@ GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--localstatedir=/var
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}"
 USE_RC_SUBR=	tincd.sh
 
 PLIST_FILES=	sbin/tincd
diff --git security/tor-devel/Makefile security/tor-devel/Makefile
index f662807..14827e6 100644
--- security/tor-devel/Makefile
+++ security/tor-devel/Makefile
@@ -43,8 +43,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-openssl-dir="${OPENSSLBASE}" --disable-asciidoc
-CONFIGURE_ENV=	LDFLAGS="${LDFLAGS}" \
-		TOR_CPPFLAGS_libevent="-I${LOCALBASE}/include/event2 -I${LOCALBASE}/include" \
+CONFIGURE_ENV=	TOR_CPPFLAGS_libevent="-I${LOCALBASE}/include/event2 -I${LOCALBASE}/include" \
 		TOR_LDFLAGS_libevent="-L${LOCALBASE}/lib/event2" \
 		TOR_LIBEVENT_LIBS="${TOR_LIBEVENT_LIBS}"
 
diff --git security/tor/Makefile security/tor/Makefile
index cb8e47c..80df871 100644
--- security/tor/Makefile
+++ security/tor/Makefile
@@ -46,8 +46,7 @@ LIB_DEPENDS=	event-2.0:${PORTSDIR}/devel/libevent2
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-openssl-dir="${OPENSSLBASE}" --disable-asciidoc \
 		--enable-linker-hardening
-CONFIGURE_ENV=	LDFLAGS="${LDFLAGS}" \
-		TOR_CPPFLAGS_libevent="-I${LOCALBASE}/include/event2 -I${LOCALBASE}/include" \
+CONFIGURE_ENV=	TOR_CPPFLAGS_libevent="-I${LOCALBASE}/include/event2 -I${LOCALBASE}/include" \
 		TOR_LDFLAGS_libevent="-L${LOCALBASE}/lib/event2" \
 		TOR_LIBEVENT_LIBS="-levent-2.0"
 
diff --git security/tpm-tools/Makefile security/tpm-tools/Makefile
index 3c107d9..0bdd3fb 100644
--- security/tpm-tools/Makefile
+++ security/tpm-tools/Makefile
@@ -25,7 +25,7 @@ USE_GETTEXT=	YES
 USE_LDCONFIG=	YES
 USE_AUTOTOOLS=	autoconf
 GNU_CONFIGURE=	YES
-CONFIGURE_ENV+=	LDFLAGS="-L${LOCALBASE}/lib -lintl -liconv"
+LDFLAGS+=	-L${LOCALBASE}/lib -lintl -liconv
 MAKE_JOBS_SAFE=	YES
 
 LICENSE=	CPL
diff --git security/tuntun/Makefile security/tuntun/Makefile
index 4adc200..ba65095 100644
--- security/tuntun/Makefile
+++ security/tuntun/Makefile
@@ -17,8 +17,8 @@ COMMENT=	A Gnome applet gui for OpenVPN
 LIB_DEPENDS=	notify.4:${PORTSDIR}/devel/libnotify
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="`pkg-config --cflags libgnomeui-2.0`" \
-		LIBS="`pkg-config --libs libgnomeui-2.0`"
+CONFIGURE_ENV=	LIBS="`pkg-config --libs libgnomeui-2.0`"
+CPPFLAGS+=	`pkg-config --cflags libgnomeui-2.0`
 CONFIGURE_ARGS=	--libdir=${PREFIX}/libdata/servers
 USE_GMAKE=	yes
 
diff --git security/vpnc/Makefile security/vpnc/Makefile
index 0a430de..34e2f41 100644
--- security/vpnc/Makefile
+++ security/vpnc/Makefile
@@ -31,7 +31,7 @@ OPTIONS+=	DECRYPT       "cisco-decypt password decrypt utility"      on
 OPTIONS+=	SSL           "OpenSSL certificate support (hybrid only)"  off
 OPTIONS+=	CISCOVERSION  "Mask linux presentation string"             off
 
-MAKE_ENV+=	LDFLAGS="${LDFLAGS}" BINS="${EXTRABUILDS}"
+MAKE_ENV+=	BINS="${EXTRABUILDS}"
 
 .include <bsd.port.pre.mk>
 
diff --git security/yafic/Makefile security/yafic/Makefile
index f6b9e3e..d9e26a1 100644
--- security/yafic/Makefile
+++ security/yafic/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Yet Another File Integrity Checker, similar to Tripwire
 
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-CONFIGURE_ENV=	LDFLAGS="-static"
+LDFLAGS+=	-static
 
 .if defined(WITHOUT_OPENSSL)
 CONFIGURE_ARGS=	--disable-crypto
diff --git security/yapet/Makefile security/yapet/Makefile
index d10f43a..b1e676e 100644
--- security/yapet/Makefile
+++ security/yapet/Makefile
@@ -56,8 +56,6 @@ CONFIGURE_ARGS+=	--enable-nls
 PLIST_SUB+=		NLS=""
 CPPFLAGS+=		-I${LOCALBASE}/include
 LDFLAGS+=		-L${LOCALBASE}/lib
-CONFIGURE_ENV=		CPPFLAGS="${CPPFLAGS}" \
-			LDFLAGS="${LDFLAGS}"
 .else
 CONFIGURE_ARGS+=	--disable-nls
 PLIST_SUB+=		NLS="@comment "
diff --git security/yara/Makefile security/yara/Makefile
index 92b3b03..1b5c324 100644
--- security/yara/Makefile
+++ security/yara/Makefile
@@ -20,7 +20,6 @@ MAKE_JOBS_SAFE=	yes
 GNU_CONFIGURE=	yes
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
-CONFIGURE_ENV=	CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	"--with-re2"
 USE_LDCONFIG=	yes
 
diff --git security/zebedee/Makefile security/zebedee/Makefile
index 2c27edd..f0e45fd 100644
--- security/zebedee/Makefile
+++ security/zebedee/Makefile
@@ -17,7 +17,7 @@ USE_OPENSSL=	YES
 USE_PERL5_BUILD=YES
 
 MAKE_ENV+=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
-		PTHREAD_LIBS=${PTHREAD_LIBS} \
+		PTHREAD_LIBS=${PTHREAD_LIBS}
 
 MAN1=		zebedee.1 ftpgw.tcl.1
 
diff --git shells/bash/Makefile shells/bash/Makefile
index ba337aa..fe4f3f9 100644
--- shells/bash/Makefile
+++ shells/bash/Makefile
@@ -98,9 +98,7 @@ CPPFLAGS+=		${PTHREAD_CFLAGS} \
 			-I${LOCALBASE}/include
 LDFLAGS+=		-L${LOCALBASE}/lib
 
-CONFIGURE_ENV=		CPPFLAGS="${CPPFLAGS}" \
-			LDFLAGS="${LDFLAGS}" \
-			YACC="bison -y"
+CONFIGURE_ENV=		YACC="bison -y"
 
 post-patch:
 	@${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/doc/bash.1
diff --git shells/fish/Makefile shells/fish/Makefile
index b1b1d22..f6e501e 100644
--- shells/fish/Makefile
+++ shells/fish/Makefile
@@ -22,8 +22,7 @@ GNU_CONFIGURE=	yes
 USE_GETTEXT=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
-CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}" LIBS="${LDFLAGS}" \
-		LDFLAGS="${LDFLAGS}"
+CONFIGURE_ENV+=	LIBS="${LDFLAGS}"
 CONFIGURE_ARGS=	--docdir=${DOCSDIR}
 
 OPTIONS=	XSEL	"Build with xsel"		on \
diff --git shells/flash/Makefile shells/flash/Makefile
index eb9b876..87333e8 100644
--- shells/flash/Makefile
+++ shells/flash/Makefile
@@ -15,8 +15,8 @@ COMMENT=	A ncurses-based restriction shell
 
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CFLAGS="${CFLAGS} -rdynamic" \
-		LDFLAGS="${LDFLAGS} -rdynamic"
+LDFLAGS+=	-rdynamic
+CFLAGS+=	-rdynamic
 SUB_FILES=	pkg-message
 PKGMESSAGE=	${WRKDIR}/pkg-message
 
diff --git shells/zsh/Makefile shells/zsh/Makefile
index f5ec69d..c792796 100644
--- shells/zsh/Makefile
+++ shells/zsh/Makefile
@@ -31,7 +31,7 @@ USE_NCURSES=	yes
 USE_LDCONFIG=	${PREFIX}/lib/${PORTNAME}
 .endif
 
-CONFIGURE_ENV=	LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
+LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--with-term-lib="ncursesw ncurses" --with-tcsetpgrp \
 		--enable-function-subdirs
 
@@ -91,7 +91,7 @@ CONFIGURE_ARGS+=	--enable-maildir-support
 .endif
 
 .if defined(WITH_ZSH_STATIC)
-CONFIGURE_ENV=		LDFLAGS="${LDFLAGS} -static"
+LDFLAGS+=	-static
 CONFIGURE_ARGS+=	--disable-dynamic
 PLIST_SUB+=		SHARED="@comment "
 .else
diff --git sysutils/LPRng/Makefile sysutils/LPRng/Makefile
index 73c29de..f1cc3a1 100644
--- sysutils/LPRng/Makefile
+++ sysutils/LPRng/Makefile
@@ -34,8 +34,8 @@ SUB_LIST=	SYSCONFDIR="${SYSCONFDIR}"
 
 PKGDEINSTALL=	${PKGINSTALL}
 
-CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib" \
-		CPPFLAGS="-I${LOCALBASE}/include"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	\
 		--with-sbindir=${PREFIX}/sbin \
 		--with-filterdir=${PREFIX}/libexec/filters \
diff --git sysutils/afflib/Makefile sysutils/afflib/Makefile
index c5a9a9b..e3730a4 100644
--- sysutils/afflib/Makefile
+++ sysutils/afflib/Makefile
@@ -29,8 +29,8 @@ GNU_CONFIGURE=	yes
 USE_GNOME=	gnomehack
 USE_AUTOTOOLS=	autoconf
 CONFIGURE_ARGS=	--enable-s3=yes --libdir=${PREFIX}
-CONFIGURE_ENV=	CPPFLAGS='-DFUSE_USE_VERSION=26' \
-		LDFLAGS='${PTHREAD_LIBS}'
+CPPFLAGS+=	-DFUSE_USE_VERSION=26
+LDFLAGS+=	${PTHREAD_LIBS}
 CFLAGS+=	${PTHREAD_LIBS}
 MAKE_JOBS_SAFE=	yes
 
diff --git sysutils/apcupsd/Makefile sysutils/apcupsd/Makefile
index 4729e75..fd1a58f 100644
--- sysutils/apcupsd/Makefile
+++ sysutils/apcupsd/Makefile
@@ -33,9 +33,9 @@ CONFIGURE_ARGS=	--sbindir=${PREFIX}/sbin \
 		--sysconfdir=${ETCDIR} \
 		--with-serial-dev=/dev/usv
 
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -L${LOCALBASE}/lib" \
-		CFLAGS="-I${LOCALBASE}/include -L${LOCALBASE}/lib"   \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include -L${LOCALBASE}/lib
+LDFLAGS+=	-L${LOCALBASE}/lib
+CFLAGS+=	-I${LOCALBASE}/include -L${LOCALBASE}/lib
 
 MAN5=		apcupsd.conf.5
 MAN8=		apcaccess.8 apccontrol.8 apctest.8 apcupsd.8
diff --git sysutils/apt/Makefile sysutils/apt/Makefile
index 02c29d7..0beec87 100644
--- sysutils/apt/Makefile
+++ sysutils/apt/Makefile
@@ -30,7 +30,6 @@ USE_LDCONFIG=	yes
 NO_FILTER_SHLIBS=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include/db${BDB_VER} -I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib/db${BDB_VER} -L${LOCALBASE}/lib
-CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 WRKSRC=		${WRKDIR}/apt-${PORTVERSION}
 
 MAN1=		apt-extracttemplates.1 apt-ftparchive.1 apt-sortpkgs.1
diff --git sysutils/ascpu/Makefile sysutils/ascpu/Makefile
index be6da48..5a1649a 100644
--- sysutils/ascpu/Makefile
+++ sysutils/ascpu/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS=	jpeg.11:${PORTSDIR}/graphics/jpeg
 USE_XORG=	xpm
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-xpm-includes=${LOCALBASE}/include --with-xpm-library=${LOCALBASE}/lib
-CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib"
+LDFLAGS+=	-L${LOCALBASE}/lib
 MAKE_ENV=	EXTRA_LIBRARIES="-L${LOCALBASE}/lib"
 
 MAN1=		ascpu.1
diff --git sysutils/avfs/Makefile sysutils/avfs/Makefile
index 11b9c14..f1aabb5 100644
--- sysutils/avfs/Makefile
+++ sysutils/avfs/Makefile
@@ -19,7 +19,7 @@ RUN_DEPENDS=	${LOCALBASE}/modules/fuse.ko:${PORTSDIR}/sysutils/fusefs-kmod
 
 NO_INSTALL_MANPAGES=	yes
 
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -L${LOCALBASE}/lib -liconv"
+CPPFLAGS+=	-I${LOCALBASE}/include -L${LOCALBASE}/lib -liconv
 
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
diff --git sysutils/bacula-server/Makefile sysutils/bacula-server/Makefile
index a54fbb1..80618e0 100644
--- sysutils/bacula-server/Makefile
+++ sysutils/bacula-server/Makefile
@@ -22,9 +22,9 @@ PLIST_SUB+=	MAJOR=${PORTVERSION:R:R}
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 
-CONFIGURE_ENV+=	CPPFLAGS="-I/usr/include/readline -I${LOCALBASE}/include" \
-		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
+CONFIGURE_ENV+=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		PTHREAD_LIBS="${PTHREAD_LIBS}"
+CPPFLAGS+=	-I/usr/include/readline -I${LOCALBASE}/include
 
 .if !defined(WITH_BAT) && !defined(WITH_NAGIOS_CHECK_ONLY)  #Till end of the file
 PKGNAMESUFFIX?=	-server
diff --git sysutils/bacula2-server/Makefile sysutils/bacula2-server/Makefile
index 9c59918..db52dab 100644
--- sysutils/bacula2-server/Makefile
+++ sysutils/bacula2-server/Makefile
@@ -63,10 +63,10 @@ CONFIGURE_ARGS+=--with-dir-user=bacula \
 		--with-sd-group=operator
 .endif
 
-CONFIGURE_ENV+=	CPPFLAGS="-I/usr/include/readline -I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib" \
-		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
+CONFIGURE_ENV+=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		PTHREAD_LIBS="${PTHREAD_LIBS}"
+CPPFLAGS+=	-I/usr/include/readline -I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .for opt in ${ALL_OPTIONS}
 .if defined(WITH_${opt})
diff --git sysutils/battfink/Makefile sysutils/battfink/Makefile
index 870d5e5..b78b495 100644
--- sysutils/battfink/Makefile
+++ sysutils/battfink/Makefile
@@ -22,8 +22,8 @@ USE_GNOME=	gnomehack gnomeprefix libgnomeui
 USE_GMAKE=	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
 
 GCONF_SCHEMAS=	battfink.schemas
 
diff --git sysutils/brasero/Makefile sysutils/brasero/Makefile
index 53bf64e..ff2c542 100644
--- sysutils/brasero/Makefile
+++ sysutils/brasero/Makefile
@@ -35,8 +35,8 @@ INSTALLS_OMF=	yes
 INSTALLS_ICONS=	yes
 CONFIGURE_ARGS=	--disable-inotify --with-html-dir=${PREFIX}/share/doc \
 		--enable-gtk3=no --enable-introspection=yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -DHAVE_CAM_LIB_H=1" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include -DHAVE_CAM_LIB_H=1
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 MAN1=		brasero.1
 GLIB_SCHEMAS=	org.gnome.brasero.gschema.xml
diff --git sysutils/bubblemon2/Makefile sysutils/bubblemon2/Makefile
index 77810f1..93e9931 100644
--- sysutils/bubblemon2/Makefile
+++ sysutils/bubblemon2/Makefile
@@ -20,8 +20,8 @@ LIB_DEPENDS=	gtop-2.0:${PORTSDIR}/devel/libgtop
 USE_GNOME=	gnomehack gnomepanel gnomeprefix intlhack libgnomeui
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include `pkg-config --cflags libgnomeui-2.0`" \
-		LDFLAGS="-L${LOCALBASE}/lib `pkg-config --libs libgnomeui-2.0`"
+CPPFLAGS+=	-I${LOCALBASE}/include `pkg-config --cflags libgnomeui-2.0`
+LDFLAGS+=	-L${LOCALBASE}/lib `pkg-config --libs libgnomeui-2.0`
 
 MAN1=		bubblemon-gnome2.1
 MANLANG=	"" hu sv
diff --git sysutils/cdrkit/Makefile sysutils/cdrkit/Makefile
index ab30348..94b7912 100644
--- sysutils/cdrkit/Makefile
+++ sysutils/cdrkit/Makefile
@@ -17,8 +17,6 @@ COMMENT=	Command-line CD/DVD writing suite
 
 USE_CMAKE=	yes
 USE_ICONV=	yes
-CFLAGS+=	-I${LOCALBASE}/include
-CONFIGURE_ENV+=	LDFLAGS="-L${LOCALBASE}/lib"
 
 MAN1=		cdda2ogg.1 devdump.1 dirsplit.1 genisoimage.1 icedax.1 \
 		isodebug.1 isodump.1 isoinfo.1 isovfy.1 list_audio_tracks.1 \
diff --git sysutils/cog/Makefile sysutils/cog/Makefile
index 765a5c6..bf9878a 100644
--- sysutils/cog/Makefile
+++ sysutils/cog/Makefile
@@ -19,8 +19,8 @@ USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack libgnomeui
 USE_GETTEXT=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 PLIST_SUB=	VERSION=${PORTVERSION}
 
diff --git sysutils/conky/Makefile sysutils/conky/Makefile
index fbb7495..e1bcec0 100644
--- sysutils/conky/Makefile
+++ sysutils/conky/Makefile
@@ -28,8 +28,8 @@ CONFIGURE_ARGS+=	--disable-portmon \
 			--disable-hddtemp \
 			--disable-alsa \
 			--disable-bmpx
-CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
 CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 MAN1=		conky.1
 PLIST_FILES=	bin/conky
diff --git sysutils/consolekit/Makefile sysutils/consolekit/Makefile
index 61d2e9e..ccb0bbf 100644
--- sysutils/consolekit/Makefile
+++ sysutils/consolekit/Makefile
@@ -25,8 +25,8 @@ USE_GNOME=	gnomehack
 USE_GMAKE=	yes
 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=	--with-pid-file=/var/run/${PORTNAME}.pid \
 		--localstatedir=/var
 
diff --git sysutils/cpu/Makefile sysutils/cpu/Makefile
index 0b83aa3..77bec77 100644
--- sysutils/cpu/Makefile
+++ sysutils/cpu/Makefile
@@ -19,7 +19,7 @@ USE_BZIP2=	yes
 USE_OPENLDAP=	yes
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--datadir=${PREFIX}/share/cpu --with-ldap=${LOCALBASE}
-CONFIGURE_ENV=	CPPFLAGS="-DLDAP_DEPRECATED"
+CPPFLAGS+=	-DLDAP_DEPRECATED
 
 MAN5=		cpu.conf.5
 MAN8=		cpu.8 cpu-ldap.8
diff --git sysutils/dar/Makefile sysutils/dar/Makefile
index 218559f..2f07215 100644
--- sysutils/dar/Makefile
+++ sysutils/dar/Makefile
@@ -19,7 +19,7 @@ USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-build-html --datadir=${DATADIR} --disable-upx
 
-CPPFLAGS=	-DHAVE_DECL_GETOPT=0
+CPPFLAGS+=	-DHAVE_DECL_GETOPT=0
 
 MAN1=		dar.1 dar_cp.1 dar_manager.1 dar_slave.1 dar_xform.1
 
@@ -29,7 +29,6 @@ PLIST_SUB+=	NLS=""
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS+=--with-libintl-prefix=${PREFIX}
-CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 .else
 CONFIGURE_ARGS+=--disable-nls
 PLIST_SUB+=	NLS="@comment "
diff --git sysutils/dc3dd/Makefile sysutils/dc3dd/Makefile
index 1c26cb6..c581028 100644
--- sysutils/dc3dd/Makefile
+++ sysutils/dc3dd/Makefile
@@ -18,8 +18,8 @@ USE_GETTEXT=	yes
 USE_ICONV=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
-		LIBS="${LIBS} -L${LOCALBASE}/lib"
+CONFIGURE_ENV=	LIBS="${LIBS} -L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
diff --git sysutils/di/Makefile sysutils/di/Makefile
index 5d46ed3..17a6611 100644
--- sysutils/di/Makefile
+++ sysutils/di/Makefile
@@ -24,7 +24,7 @@ PLIST_SUB=	NLS="@comment "
 MAKE_ENV+=	DI_NO_NLS=T
 .endif
 
-MAKE_ENV+=	LDFLAGS="${LDFLAGS}" prefix="${PREFIX}"
+MAKE_ENV+=	prefix="${PREFIX}"
 
 .include <bsd.port.pre.mk>
 
diff --git sysutils/dircomp/Makefile sysutils/dircomp/Makefile
index 4e2c480..ac777f7 100644
--- sysutils/dircomp/Makefile
+++ sysutils/dircomp/Makefile
@@ -23,7 +23,8 @@ LIB_DEPENDS+=	YGP.0:${PORTSDIR}/devel/libYGP
 
 GNU_CONFIGURE=	yes
 USE_GETTEXT=	yes
-CONFIGURE_ENV+=	CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}" LDFLAGS="${LDFLAGS} ${PTHREAD_LIBS}"
+LDFLAGS+=	${PTHREAD_LIBS}
+CFLAGS+=	${PTHREAD_CFLAGS}
 CONFIGURE_ARGS=	--with-libintl-prefix=${LOCALBASE} --disable-rpath
 PLIST_FILES+=	bin/DirComp \
 		share/locale/de/LC_MESSAGES/DirComp.mo \
diff --git sysutils/dmidecode/Makefile sysutils/dmidecode/Makefile
index 8e531ec..d150caf 100644
--- sysutils/dmidecode/Makefile
+++ sysutils/dmidecode/Makefile
@@ -18,7 +18,7 @@ COMMENT=	A tool for dumping DMI (SMBIOS) contents in human-readable format
 ONLY_FOR_ARCHS=	i386 amd64 ia64
 
 USE_BZIP2=	yes
-MAKE_ENV+=	DOCSDIR="${DOCSDIR}" LDFLAGS="${LDFLAGS}"
+MAKE_ENV+=	DOCSDIR="${DOCSDIR}"
 LICENSE=	GPLv2
 
 .if defined(NOPORTDOCS)
diff --git sysutils/duff/Makefile sysutils/duff/Makefile
index f315b670..34d7437 100644
--- sysutils/duff/Makefile
+++ sysutils/duff/Makefile
@@ -19,7 +19,6 @@ MAKE_JOBS_SAFE=	yes
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
-CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS}"
 
 MAN1=		duff.1
 
diff --git sysutils/dupmerge/Makefile sysutils/dupmerge/Makefile
index db86565..fc04d02 100644
--- sysutils/dupmerge/Makefile
+++ sysutils/dupmerge/Makefile
@@ -18,7 +18,6 @@ USE_ZIP=	yes
 MAKE_FLAGS=
 MAKEFILE=
 LDFLAGS+=	-lroken -lcrypt
-MAKE_ENV+=	LDFLAGS="${LDFLAGS}"
 ALL_TARGET=	dupmerge
 PLIST_FILES=	bin/dupmerge
 PORTDOCS=	readme.txt
diff --git sysutils/dvdbackup/Makefile sysutils/dvdbackup/Makefile
index b90c6ff..7d1d380 100644
--- sysutils/dvdbackup/Makefile
+++ sysutils/dvdbackup/Makefile
@@ -21,7 +21,6 @@ USE_GMAKE=	yes
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
-CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 
 LICENSE=	GPLv3
 
diff --git sysutils/eiciel/Makefile sysutils/eiciel/Makefile
index 05e857b..4c2c839 100644
--- sysutils/eiciel/Makefile
+++ sysutils/eiciel/Makefile
@@ -22,8 +22,8 @@ USE_GNOME=	gnomehack gnomeprefix intlhack nautilus2 libgnomeui
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--with-nautilus-extensions-dir=${PREFIX}/lib/nautilus/extensions-2.0
 MAKE_JOBS_SAFE=	yes
 
diff --git sysutils/fileschanged/Makefile sysutils/fileschanged/Makefile
index a1656a7..10997de 100644
--- sysutils/fileschanged/Makefile
+++ sysutils/fileschanged/Makefile
@@ -20,8 +20,9 @@ BUILD_DEPENDS=	${LOCALBASE}/include/argp.h:${PORTSDIR}/devel/argp-standalone \
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_FAM=	yes
-CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib" \
-		LIBS="-largp"
+CONFIGURE_ENV+=	LIBS="-largp"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--datadir=${PREFIX}/share/doc --disable-nls
 
 INFO=		fileschanged
diff --git sysutils/freeipmi/Makefile sysutils/freeipmi/Makefile
index 50745dd..7df2193 100644
--- sysutils/freeipmi/Makefile
+++ sysutils/freeipmi/Makefile
@@ -30,7 +30,7 @@ CONFIGURE_ARGS=	--disable-init-scripts \
 		--sysconfdir=${CONF_DIR} \
 		--with-ipmi-monitoring-sdr-cache-dir=${CACHE_DIR}/ipmimonitoringsdrcache \
 		--with-pkgconfig-dir=${PREFIX}/libdata/pkgconfig
-CONFIGURE_ENV=	LDFLAGS="${LDFLAGS}" PTHREAD_LIBS=${PTHREAD_LIBS}
+CONFIGURE_ENV=	PTHREAD_LIBS=${PTHREAD_LIBS}
 CPPFLAGS+=	-I${LOCALBASE}/include
 GNU_CONFIGURE=	yes
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git sysutils/fusefs-chironfs/Makefile sysutils/fusefs-chironfs/Makefile
index 7027ab6..e81a51c 100644
--- sysutils/fusefs-chironfs/Makefile
+++ sysutils/fusefs-chironfs/Makefile
@@ -19,7 +19,8 @@ RUN_DEPENDS=	${LOCALBASE}/modules/fuse.ko:${PORTSDIR}/sysutils/fusefs-kmod
 BUILD_DEPENDS=	${LOCALBASE}/include/fuse.h:${PORTSDIR}/sysutils/fusefs-libs
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS=-I${LOCALBASE}/include LDFLAGS=-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 PLIST_FILES=	bin/chironfs bin/chirctl
 PORTDOCS=	*
diff --git sysutils/fusefs-encfs/Makefile sysutils/fusefs-encfs/Makefile
index 8264980..0cd0c94 100644
--- sysutils/fusefs-encfs/Makefile
+++ sysutils/fusefs-encfs/Makefile
@@ -27,7 +27,8 @@ USE_AUTOTOOLS=	libtool
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-boost-serialization=boost_serialization \
 		--with-boost-filesystem=boost_filesystem
-CONFIGURE_ENV=	LDFLAGS=-L${LOCALBASE}/lib CPPFLAGS=-I${LOCALBASE}/include
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
 
diff --git sysutils/fusefs-funionfs/Makefile sysutils/fusefs-funionfs/Makefile
index a873009..66bfe2d 100644
--- sysutils/fusefs-funionfs/Makefile
+++ sysutils/fusefs-funionfs/Makefile
@@ -17,8 +17,8 @@ COMMENT=	Union filesystem for the FUSE driver
 BUILD_DEPENDS=	${LOCALBASE}/include/fuse.h:${PORTSDIR}/sysutils/fusefs-libs
 RUN_DEPENDS=	${LOCALBASE}/modules/fuse.ko:${PORTSDIR}/sysutils/fusefs-kmod
 
-CONFIGURE_ENV=	CFLAGS="${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
+CFLAGS+=	${PTHREAD_CFLAGS} -I${LOCALBASE}/include
 GNU_CONFIGURE=	yes
 
 MAN1=		funionfs.1
diff --git sysutils/fusefs-fur/Makefile sysutils/fusefs-fur/Makefile
index 65a3cca..180fb3c 100644
--- sysutils/fusefs-fur/Makefile
+++ sysutils/fusefs-fur/Makefile
@@ -29,8 +29,6 @@ USE_ICONV=	yes
 USE_GNOME=	pkgconfig
 LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 CFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS} -DFUSE_USE_VERSION=26
-CONFIGURE_ENV=	CFLAGS="${CFLAGS}" \
-		LDFLAGS="${LDFLAGS}"
 
 PLIST_FILES=	bin/${PORTNAME}
 
diff --git sysutils/fusefs-libs/Makefile sysutils/fusefs-libs/Makefile
index b44d980..1bd7508 100644
--- sysutils/fusefs-libs/Makefile
+++ sysutils/fusefs-libs/Makefile
@@ -15,8 +15,8 @@ MAINTAINER=	amistry@am-productions.biz
 COMMENT=	FUSE allows filesystem implementation in userspace
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	MOUNT_FUSE_PATH=${PREFIX}/sbin \
-		CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}"
+CONFIGURE_ENV=	MOUNT_FUSE_PATH=${PREFIX}/sbin
+CFLAGS+=	${PTHREAD_CFLAGS}
 USE_GNOME=	pkgconfig
 USE_LDCONFIG=	yes
 USE_ICONV=	yes
diff --git sysutils/fusefs-ntfs/Makefile sysutils/fusefs-ntfs/Makefile
index d39ac66..21e2179 100644
--- sysutils/fusefs-ntfs/Makefile
+++ sysutils/fusefs-ntfs/Makefile
@@ -27,8 +27,8 @@ USE_AUTOTOOLS=	libtool
 USE_ICONV=	yes
 CONFIGURE_ARGS=	--exec-prefix=${PREFIX} --disable-mount-helper \
 		--disable-mtab --with-fuse=external
-CPPFLAGS=-I${WRKSRC}/include/ntfs-3g/ -I${LOCALBASE}/include
-CONFIGURE_ENV="LDFLAGS=-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${WRKSRC}/include/ntfs-3g/ -I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 OPTIONS=	LOCK "Lock the device when mounting (avoids access)" on \
 		UBLIO "Enable user space cache for improved speed" on
diff --git sysutils/fusefs-smbnetfs/Makefile sysutils/fusefs-smbnetfs/Makefile
index 56306f8..9f2a7c6 100644
--- sysutils/fusefs-smbnetfs/Makefile
+++ sysutils/fusefs-smbnetfs/Makefile
@@ -21,7 +21,7 @@ BUILD_DEPENDS=	fusefs-libs>2.4.1:${PORTSDIR}/sysutils/fusefs-libs
 USE_BZIP2=	yes
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV+=	CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS} -I${LOCALBASE}/include"
+CFLAGS+=	${PTHREAD_CFLAGS} -I${LOCALBASE}/include
 SUB_FILES=	pkg-message
 
 post-install:
diff --git sysutils/fusefs-sshfs/Makefile sysutils/fusefs-sshfs/Makefile
index 0d33896..8c3a349 100644
--- sysutils/fusefs-sshfs/Makefile
+++ sysutils/fusefs-sshfs/Makefile
@@ -21,7 +21,7 @@ RUN_DEPENDS=	${KMODDIR}/fuse.ko:${PORTSDIR}/sysutils/fusefs-kmod
 BUILD_DEPENDS=	fusefs-libs>2.4.1:${PORTSDIR}/sysutils/fusefs-libs
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV+=	CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}"
+CFLAGS+=	${PTHREAD_CFLAGS}
 USE_GNOME=	glib20
 
 MAN1=	sshfs.1
diff --git sysutils/ganglia-monitor-core/Makefile sysutils/ganglia-monitor-core/Makefile
index 6c254fe..fa9a404 100644
--- sysutils/ganglia-monitor-core/Makefile
+++ sysutils/ganglia-monitor-core/Makefile
@@ -33,7 +33,7 @@ LIBTOOLFILES=	configure libmetrics/configure
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-setuid=ganglia --enable-setgid=ganglia
-CONFIGURE_ENV=	GANGLIA_ACK_SYSCONFDIR=1 LDFLAGS="${LDFLAGS}"
+CONFIGURE_ENV=	GANGLIA_ACK_SYSCONFDIR=1
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
diff --git sysutils/gcombust/Makefile sysutils/gcombust/Makefile
index 75fbcf5..a6e8cd3 100644
--- sysutils/gcombust/Makefile
+++ sysutils/gcombust/Makefile
@@ -23,8 +23,8 @@ USE_GNOME=	gtk12 gnomehier
 USE_CDRTOOLS=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--without-included-gettext --datadir=${PREFIX}/share
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
 
 pre-patch:
 	@${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
diff --git sysutils/gconf-editor/Makefile sysutils/gconf-editor/Makefile
index 72a94f5..1e413ab 100644
--- sysutils/gconf-editor/Makefile
+++ sysutils/gconf-editor/Makefile
@@ -23,8 +23,8 @@ INSTALLS_ICONS=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix intlhack gnomehack libgnomeui gnomedocutils
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 MAN1=		gconf-editor.1
 GCONF_SCHEMAS=	gconf-editor.schemas
diff --git sysutils/gkleds2/Makefile sysutils/gkleds2/Makefile
index 130f87a..6b06ab8 100644
--- sysutils/gkleds2/Makefile
+++ sysutils/gkleds2/Makefile
@@ -22,8 +22,8 @@ USE_XORG=	x11 xtst
 USE_GNOME=	gtk20
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 PLIST_FILES=	libexec/gkrellm2/plugins/gkleds.so
 
diff --git sysutils/gksu/Makefile sysutils/gksu/Makefile
index ec7ca2f..c8cc0ca 100644
--- sysutils/gksu/Makefile
+++ sysutils/gksu/Makefile
@@ -20,8 +20,8 @@ LIB_DEPENDS=	gksu2:${PORTSDIR}/sysutils/libgksu \
 USE_GNOME=	gtk20 pkgconfig gnomeprefix gnomehack gconf2 intlhack
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 MAN1=		gksu.1
 
diff --git sysutils/gnome-control-center/Makefile sysutils/gnome-control-center/Makefile
index 8d13d34..73e45bb 100644
--- sysutils/gnome-control-center/Makefile
+++ sysutils/gnome-control-center/Makefile
@@ -36,8 +36,8 @@ GNU_CONFIGURE=	yes
 INSTALLS_OMF=	yes
 INSTALLS_ICONS=	yes
 USE_LDCONFIG=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 GCONF_SCHEMAS=	control-center.schemas fontilus.schemas \
 		gnome-control-center.schemas
diff --git sysutils/gnome-device-manager/Makefile sysutils/gnome-device-manager/Makefile
index b0ad52c..476c223 100644
--- sysutils/gnome-device-manager/Makefile
+++ sysutils/gnome-device-manager/Makefile
@@ -24,7 +24,7 @@ USE_AUTOTOOLS=	libtool
 INSTALLS_ICONS=	yes
 USE_LDCONFIG=	yes
 INSTALLS_OMF=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .include <bsd.port.mk>
diff --git sysutils/gnome-mount/Makefile sysutils/gnome-mount/Makefile
index 603aeaf..203ec2c 100644
--- sysutils/gnome-mount/Makefile
+++ sysutils/gnome-mount/Makefile
@@ -25,8 +25,8 @@ USE_GMAKE=	yes
 USE_GETTEXT=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-nautilus-extension
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 GCONF_SCHEMAS=	gnome-mount.schemas
 MAN1=		gnome-mount.1
diff --git sysutils/gnome-pkgview/Makefile sysutils/gnome-pkgview/Makefile
index de21196..dcdcc6b 100644
--- sysutils/gnome-pkgview/Makefile
+++ sysutils/gnome-pkgview/Makefile
@@ -20,8 +20,8 @@ USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack gnomehier libgnomeui intlhack
 USE_GETTEXT=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 GCONF_SCHEMAS=	gnome-pkgview.schemas
 
diff --git sysutils/gnome-power-manager/Makefile sysutils/gnome-power-manager/Makefile
index 093254d..7fab7ed 100644
--- sysutils/gnome-power-manager/Makefile
+++ sysutils/gnome-power-manager/Makefile
@@ -36,8 +36,8 @@ USE_GNOME=	gnomeprefix gnomehack intlhack libwnck \
 CONFIGURE_ARGS=	--with-doc-dir=${PREFIX}/share/doc \
 		--disable-docbook-docs \
 		--enable-hal
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 GCONF_SCHEMAS=	gnome-power-manager.schemas
 
diff --git sysutils/gnome-settings-daemon/Makefile sysutils/gnome-settings-daemon/Makefile
index 82a7702..fbb0949 100644
--- sysutils/gnome-settings-daemon/Makefile
+++ sysutils/gnome-settings-daemon/Makefile
@@ -32,8 +32,8 @@ USE_GSTREAMER=	good
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 OPTIONS=	PULSEAUDIO "Enable Pulseaudio support" On
 
diff --git sysutils/gnome-system-monitor/Makefile sysutils/gnome-system-monitor/Makefile
index db9bc9a..344e312 100644
--- sysutils/gnome-system-monitor/Makefile
+++ sysutils/gnome-system-monitor/Makefile
@@ -27,8 +27,8 @@ USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix intlhack gnomehack libwnck gnomevfs2 gnomedocutils \
 		librsvg2
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib -lutil"
+CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib -lutil"
+CPPFLAGS+=	-I${LOCALBASE}/include
 
 GCONF_SCHEMAS=	gnome-system-monitor.schemas
 
diff --git sysutils/gnome-system-tools/Makefile sysutils/gnome-system-tools/Makefile
index ad8b695..c23d84d 100644
--- sysutils/gnome-system-tools/Makefile
+++ sysutils/gnome-system-tools/Makefile
@@ -29,8 +29,8 @@ USE_GNOME=	gnomehack gnomeprefix intlhack nautilus2
 USE_AUTOTOOLS=	libtool
 INSTALLS_OMF=	yes
 CONFIGURE_ARGS=	--enable-services
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 GLIB_SCHEMAS=	org.gnome.system-tools.gschema.xml
 
diff --git sysutils/gnomebaker/Makefile sysutils/gnomebaker/Makefile
index 9925f50..67f4350 100644
--- sysutils/gnomebaker/Makefile
+++ sysutils/gnomebaker/Makefile
@@ -25,8 +25,8 @@ INSTALLS_OMF=		yes
 USE_GETTEXT=		yes
 USE_GSTREAMER=		vorbis mp3 flac
 INSTALLS_ICONS=		yes
-CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
-			LDFLAGS="-L${LOCALBASE}/lib -export-dynamic"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib -export-dynamic
 
 ONLY_FOR_ARCHS=	i386
 NOT_FOR_ARCHS_REASON=	Coredump on amd64, see PR: ports/130972 
diff --git sysutils/goaccess/Makefile sysutils/goaccess/Makefile
index 77678d6..a89169c 100644
--- sysutils/goaccess/Makefile
+++ sysutils/goaccess/Makefile
@@ -24,7 +24,7 @@ GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 
 CFLAGS+=	-I${LOCALBASE}/include
-CONFIGURE_ENV=	LDFLAGS=-L${LOCALBASE}/lib
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 PLIST_FILES=	bin/${PORTNAME}
 
diff --git sysutils/graveman/Makefile sysutils/graveman/Makefile
index 2fb21c6..da59723 100644
--- sysutils/graveman/Makefile
+++ sysutils/graveman/Makefile
@@ -23,8 +23,8 @@ USE_GETTEXT=	yes
 GNU_CONFIGURE=	yes
 USE_CDRTOOLS=	yes
 USE_GNOME=	libglade2 intlhack gnomehack gnomeprefix
-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=		graveman.1
 
diff --git sysutils/gtk-imonc/Makefile sysutils/gtk-imonc/Makefile
index e096374..0149082 100644
--- sysutils/gtk-imonc/Makefile
+++ sysutils/gtk-imonc/Makefile
@@ -15,8 +15,8 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A GTK2-based imond-client to control an on(e) disc fli4l router
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 USE_GNOME=	gtk20 gnomehier
 
 post-patch:
diff --git sysutils/gupsc/Makefile sysutils/gupsc/Makefile
index 104402c..894b658 100644
--- sysutils/gupsc/Makefile
+++ sysutils/gupsc/Makefile
@@ -19,8 +19,8 @@ USE_GMAKE=	yes
 USE_GNOME=	gnomelibs gnomehier
 USE_PERL5_BUILD=yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
 
 pre-patch:
 	@${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
diff --git sysutils/hal-info/Makefile sysutils/hal-info/Makefile
index f6434c2..85a3a835 100644
--- sysutils/hal-info/Makefile
+++ sysutils/hal-info/Makefile
@@ -22,7 +22,7 @@ RUN_DEPENDS+=	${LIB_PC_DEPENDS:C|^|${LOCALBASE}/libdata/pkgconfig/|g}
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .include <bsd.port.mk>
diff --git sysutils/hal/Makefile sysutils/hal/Makefile
index f930768..1ebf885 100644
--- sysutils/hal/Makefile
+++ sysutils/hal/Makefile
@@ -44,9 +44,9 @@ CONFIGURE_ARGS=	--disable-gtk-doc \
 		--with-pid-file=/var/run/hald/hald.pid \
 		--with-deprecated-keys \
 		--localstatedir=/var
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib" \
-		GTKDOC="false"
+CONFIGURE_ENV=	GTKDOC="false"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 #HALVERSION=	0.5.10
 #SNAPVERSION=	20080218
diff --git sysutils/heartbeat/Makefile sysutils/heartbeat/Makefile
index b2e0da1..e99f49e 100644
--- sysutils/heartbeat/Makefile
+++ sysutils/heartbeat/Makefile
@@ -37,8 +37,8 @@ USE_PYTHON=	yes
 
 GNU_CONFIGURE=	yes
 
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include -I${LOCALBASE}/include/libnet115" \
-		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib -L${LOCALBASE}/lib/libnet115"
+CPPFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include/libnet115
+LDFLAGS+=	-L${LOCALBASE}/lib -L${LOCALBASE}/lib/libnet115
 
 CONFIGURE_ARGS=	--prefix=${PREFIX} \
 		--localstatedir=/var \
diff --git sysutils/hoz/Makefile sysutils/hoz/Makefile
index eeb320a..edf76ef 100644
--- sysutils/hoz/Makefile
+++ sysutils/hoz/Makefile
@@ -18,8 +18,6 @@ COMMENT=	File splitter, GTK and CLI versions
 USE_GNOME=	#
 USE_GMAKE=	yes
 
-MAKE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
-
 PORTDOCS=	README
 
 OPTIONS=	CLI	"CLI interface" on \
diff --git sysutils/iextract/Makefile sysutils/iextract/Makefile
index 0f47272..4361352 100644
--- sysutils/iextract/Makefile
+++ sysutils/iextract/Makefile
@@ -19,7 +19,8 @@ LIB_DEPENDS=	YGP.0:${PORTSDIR}/devel/libYGP
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 USE_GETTEXT=	yes
-CONFIGURE_ENV+=	CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}" LDFLAGS="${LDFLAGS} ${PTHREAD_LIBS}"
+LDFLAGS+=	${PTHREAD_LIBS}
+CFLAGS+=	${PTHREAD_CFLAGS}
 CONFIGURE_ARGS=	--with-libintl-prefix=${LOCALBASE} --disable-rpath
 
 .include <bsd.port.mk>
diff --git sysutils/ipmitool/Makefile sysutils/ipmitool/Makefile
index 80ee5c4..fac71e7 100644
--- sysutils/ipmitool/Makefile
+++ sysutils/ipmitool/Makefile
@@ -21,7 +21,6 @@ USE_OPENSSL=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--enable-intf-lan --enable-intf-lanplus \
 		--disable-intf-imb --disable-intf-lipmi --disable-intf-bmc
-CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 PLIST_FILES=	bin/ipmitool sbin/ipmievd share/ipmitool/oem_ibm_sel_map
 PLIST_DIRS=	share/ipmitool
 PORTDOCS=	AUTHORS COPYING ChangeLog README
diff --git sysutils/lavaps/Makefile sysutils/lavaps/Makefile
index 1ffda8a..a7830bc 100644
--- sysutils/lavaps/Makefile
+++ sysutils/lavaps/Makefile
@@ -45,6 +45,4 @@ CONFIGURE_ARGS+=	--with-tcltk --disable-nls \
 PLIST_SUB+=	NLS="@comment "
 .endif
 
-CONFIGURE_ENV+=	CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
-
 .include <bsd.port.post.mk>
diff --git sysutils/ldapvi/Makefile sysutils/ldapvi/Makefile
index 66c0013..76444ac 100644
--- sysutils/ldapvi/Makefile
+++ sysutils/ldapvi/Makefile
@@ -26,9 +26,6 @@ MAKEFILE=	GNUmakefile
 CFLAGS+=	-I${LOCALBASE}/include
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
-CONFIGURE_ENV=	CFLAGS="${CFLAGS}" \
-		CPPFLAGS="${CPPFLAGS}" \
-		LDFLAGS="${LDFLAGS}"
 
 MAN1=		ldapvi.1
 PLIST_FILES=	bin/ldapvi \
diff --git sysutils/less/Makefile sysutils/less/Makefile
index 56d0c91..f7792aa 100644
--- sysutils/less/Makefile
+++ sysutils/less/Makefile
@@ -23,7 +23,7 @@ GNU_CONFIGURE=	yes
 MAN1=		less.1 lesskey.1 lessecho.1
 
 .if defined(COLOUR_LESS) || defined(COLOR_LESS)
-MAKE_ENV=	CPPFLAGS="-DCOLOR_LESS"
+CPPFLAGS+=	-DCOLOR_LESS
 
 pre-fetch:
 	@${ECHO_MSG} "Making a color version of less."
diff --git sysutils/libcdio/Makefile sysutils/libcdio/Makefile
index 05d4f20..e0b198f 100644
--- sysutils/libcdio/Makefile
+++ sysutils/libcdio/Makefile
@@ -30,7 +30,8 @@ USE_NCURSES=	yes
 CONFIGURE_ARGS+=	--with-libpopt-prefix=${LOCALBASE} \
 			--with-libiconv-prefix=${LOCALBASE} \
 USE_PERL5_BUILD=yes
-CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib -liconv"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib -liconv
 MAN1=	cd-drive.1 cd-info.1 iso-read.1 iso-info.1 cd-read.1
 
 INFO=		libcdio
diff --git sysutils/libgksu/Makefile sysutils/libgksu/Makefile
index fcfee74..080f516 100644
--- sysutils/libgksu/Makefile
+++ sysutils/libgksu/Makefile
@@ -26,7 +26,7 @@ CONFIGURE_ARGS=	--enable-gtk-doc=no
 GNU_CONFIGURE=	yes
 GCONF_SCHEMAS=	gksu.schemas
 USE_GMAKE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .include <bsd.port.mk>
diff --git sysutils/lineak-defaultplugin/Makefile sysutils/lineak-defaultplugin/Makefile
index ea45af9..e0f93b2 100644
--- sysutils/lineak-defaultplugin/Makefile
+++ sysutils/lineak-defaultplugin/Makefile
@@ -21,8 +21,8 @@ USE_AUTOTOOLS=	libtool
 GNU_CONFIGURE=	yes
 USE_XORG=       x11 xext xt xtst xfixes
 USE_GMAKE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
-		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 CONFIGURE_ARGS+=	--program-prefix=''
 
 MAN1=		lineak_defaultplugin.1
diff --git sysutils/lineak-kdeplugins/Makefile sysutils/lineak-kdeplugins/Makefile
index e44d4bb..2a5a676 100644
--- sysutils/lineak-kdeplugins/Makefile
+++ sysutils/lineak-kdeplugins/Makefile
@@ -20,8 +20,8 @@ LIB_DEPENDS=	lineak.8:${PORTSDIR}/sysutils/lineakd
 USE_KDELIBS_VER=3
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
-		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 CONFIGURE_ARGS+=	--program-prefix=''
 
 MAN1=		lineak_kdeplugins.1
diff --git sysutils/lineak-xosdplugin/Makefile sysutils/lineak-xosdplugin/Makefile
index b00b47c..9e64354 100644
--- sysutils/lineak-xosdplugin/Makefile
+++ sysutils/lineak-xosdplugin/Makefile
@@ -20,8 +20,8 @@ LIB_DEPENDS=	lineak.8:${PORTSDIR}/sysutils/lineakd \
 
 USE_GMAKE=	yes
 USE_XORG=	x11 xext xt
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
-		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 CONFIGURE_ARGS=	--program-prefix=''
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
diff --git sysutils/lineakd/Makefile sysutils/lineakd/Makefile
index 070ca8f..39c78b9 100644
--- sysutils/lineakd/Makefile
+++ sysutils/lineakd/Makefile
@@ -18,8 +18,8 @@ COMMENT=	Lineakd is a daemon which enables special keys on internet keyboards
 USE_GMAKE=	yes
 USE_XORG=	x11 xext xt
 USE_AUTOTOOLS=	libtool
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
-		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 USE_LDCONFIG=	yes
 
 CONFIGURE_ARGS+=--program-prefix=''
diff --git sysutils/logtool/Makefile sysutils/logtool/Makefile
index b35bb12..34a27fd 100644
--- sysutils/logtool/Makefile
+++ sysutils/logtool/Makefile
@@ -16,7 +16,6 @@ COMMENT=	Parse ASCII logfiles into ANSI, CSV, HTML formats
 USE_GMAKE=	yes
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CFLAGS="${CFLAGS}"
 CONFIGURE_ARGS=	--sysconfdir=${PREFIX}/etc/${PORTNAME}
 
 PKGMESSAGE=	${WRKDIR}/pkg-message
diff --git sysutils/lxinput/Makefile sysutils/lxinput/Makefile
index 18975bf..df26e22 100644
--- sysutils/lxinput/Makefile
+++ sysutils/lxinput/Makefile
@@ -26,7 +26,6 @@ USE_GETTEXT=	yes
 PLIST_SUB+=	NLS=""
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
-CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 .else
 CONFIGURE_ARGS+=--disable-nls
 PLIST_SUB+=	NLS="@comment "
diff --git sysutils/lxtask/Makefile sysutils/lxtask/Makefile
index 7f763d6..6298bc1 100644
--- sysutils/lxtask/Makefile
+++ sysutils/lxtask/Makefile
@@ -24,7 +24,6 @@ USE_GETTEXT=	yes
 PLIST_SUB+=	NLS=""
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
-CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 .else
 CONFIGURE_ARGS+=--disable-nls
 PLIST_SUB+=	NLS="@comment "
diff --git sysutils/lxterminal/Makefile sysutils/lxterminal/Makefile
index 406bfb8..8a26ab8 100644
--- sysutils/lxterminal/Makefile
+++ sysutils/lxterminal/Makefile
@@ -28,7 +28,6 @@ USE_GETTEXT=	yes
 PLIST_SUB+=	NLS=""
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
-CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 .else
 CONFIGURE_ARGS+=--disable-nls
 PLIST_SUB+=	NLS="@comment "
diff --git sysutils/memfetch/Makefile sysutils/memfetch/Makefile
index e0517fe..e572a09 100644
--- sysutils/memfetch/Makefile
+++ sysutils/memfetch/Makefile
@@ -19,7 +19,6 @@ WRKSRC=		${WRKDIR}/${PORTNAME}
 USE_PERL5_RUN=	yes
 
 CFLAGS+=	${CPPFLAGS}
-MAKE_ENV+=	LDFLAGS="${LDFLAGS}"
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
diff --git sysutils/metalog/Makefile sysutils/metalog/Makefile
index f419235..96bbbe2 100644
--- sysutils/metalog/Makefile
+++ sysutils/metalog/Makefile
@@ -19,7 +19,6 @@ LIB_DEPENDS=	pcre.0:${PORTSDIR}/devel/pcre
 USE_BZIP2=	yes
 USE_RC_SUBR=	${PORTNAME}
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--sysconfdir=${PREFIX}/etc
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git sysutils/monit/Makefile sysutils/monit/Makefile
index 843c1e0..dbc1284 100644
--- sysutils/monit/Makefile
+++ sysutils/monit/Makefile
@@ -21,7 +21,7 @@ USE_BISON=	build
 USE_GMAKE=	yes
 USE_RC_SUBR=	${PORTNAME}.sh
 
-CONFIGURE_ENV=	LDFLAGS="${LDFLAGS}" CONFIG_SHELL="${SH}" \
+CONFIGURE_ENV=	CONFIG_SHELL="${SH}" \
 		LOCALBASE="${LOCALBASE}"
 
 OPTIONS=	SSL "Enable SSL support" on
diff --git sysutils/mount.app/Makefile sysutils/mount.app/Makefile
index 55ec408..c288627 100644
--- sysutils/mount.app/Makefile
+++ sysutils/mount.app/Makefile
@@ -22,7 +22,5 @@ USE_GNOME=	gtk12 glib12
 GNU_CONFIGURE=	yes
 
 LDFLAGS+=	-L${LOCALBASE}/lib -L${LOCALBASE}/lib -lintl
-MAKE_ENV=	LDFLAGS="${LDFLAGS}"
-CONFIGURE_ENV=	LDFLAGS="${LDFLAGS}"
 
 .include <bsd.port.mk>
diff --git sysutils/nautilus-cd-burner/Makefile sysutils/nautilus-cd-burner/Makefile
index cb7cb74..dba584d 100644
--- sysutils/nautilus-cd-burner/Makefile
+++ sysutils/nautilus-cd-burner/Makefile
@@ -31,8 +31,8 @@ USE_CDRTOOLS=	yes
 INSTALLS_ICONS=	yes
 USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 GCONF_SCHEMAS=	nautilus-cd-burner.schemas
 
diff --git sysutils/ntfsprogs/Makefile sysutils/ntfsprogs/Makefile
index e304e74..f036987 100644
--- sysutils/ntfsprogs/Makefile
+++ sysutils/ntfsprogs/Makefile
@@ -20,7 +20,8 @@ USE_GNOME=	pkgconfig
 USE_BZIP2=	yes
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 OPTIONS=	GNOMEVFS2 "Install GnomeVFS 2.0 libntfs interface" off \
 		LOCK "Lock the device when mounting (avoids access)" on \
diff --git sysutils/openipmi/Makefile sysutils/openipmi/Makefile
index 162eacc..1a31edb 100644
--- sysutils/openipmi/Makefile
+++ sysutils/openipmi/Makefile
@@ -27,7 +27,6 @@ AUTOMAKE_ARGS+=	--add-missing --copy --foreign
 ACLOCAL_ARGS+=	-I ${LOCALBASE}/share/aclocal
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
-CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 
 MAN1=		ipmi_ui.1 openipmicmd.1 openipmigui.1 \
 		openipmish.1 rmcp_ping.1 solterm.1
diff --git sysutils/pefs-kmod/Makefile sysutils/pefs-kmod/Makefile
index f0afdc3..b9d1e87 100644
--- sysutils/pefs-kmod/Makefile
+++ sysutils/pefs-kmod/Makefile
@@ -22,7 +22,7 @@ KMODDIR?=	/boot/modules
 PLIST_SUB=	KMODDIR=${KMODDIR}
 MAKE_ENV=	BINDIR="${PREFIX}/sbin" MANDIR="${MANPREFIX}/man/man" \
 		NO_MANCOMPRESS= \
-		KMODDIR="${KMODDIR}" SYSDIR="${SRC_BASE}/sys" \
+		KMODDIR="${KMODDIR}" SYSDIR="${SRC_BASE}/sys"
 
 MAN8=		pefs.8
 
diff --git sysutils/pessulus/Makefile sysutils/pessulus/Makefile
index 329653d..2afb2c0 100644
--- sysutils/pessulus/Makefile
+++ sysutils/pessulus/Makefile
@@ -23,8 +23,8 @@ WANT_GNOME=	yes
 USE_PYTHON=	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
 
 DOCS=		AUTHORS COPYING ChangeLog HACKING \
 		MAINTAINERS NEWS README TODO
diff --git sysutils/policykit-gnome/Makefile sysutils/policykit-gnome/Makefile
index bfa7270..1b6c7d0 100644
--- sysutils/policykit-gnome/Makefile
+++ sysutils/policykit-gnome/Makefile
@@ -26,8 +26,8 @@ GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--disable-gtk-doc \
 		--localstatedir=/var
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 GCONF_SCHEMAS=	polkit-gnome.schemas
 
diff --git sysutils/policykit/Makefile sysutils/policykit/Makefile
index cc27d10..fe5ca38 100644
--- sysutils/policykit/Makefile
+++ sysutils/policykit/Makefile
@@ -32,9 +32,9 @@ CONFIGURE_ARGS=	--disable-gtk-doc \
 		--localstatedir=/var \
 		--with-polkit-user=polkit \
 		--with-polkit-group=polkit
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib" \
-		GTKDOC="false"
+CONFIGURE_ENV=	GTKDOC="false"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .if defined(NO_INSTALL_MANPAGES)
 CONFIGURE_ARGS+=--disable-man-pages
diff --git sysutils/polkit-gnome/Makefile sysutils/polkit-gnome/Makefile
index 1bea70b..b10e0ea 100644
--- sysutils/polkit-gnome/Makefile
+++ sysutils/polkit-gnome/Makefile
@@ -24,7 +24,7 @@ GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--disable-gtk-doc \
 		--localstatedir=/var
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .include <bsd.port.mk>
diff --git sysutils/polkit/Makefile sysutils/polkit/Makefile
index e1fcbac..3408391 100644
--- sysutils/polkit/Makefile
+++ sysutils/polkit/Makefile
@@ -30,9 +30,9 @@ CONFIGURE_ARGS=	--disable-gtk-doc \
 		--with-os-type=freebsd \
 		--enable-introspection \
 		--localstatedir=/var
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib" \
-		GTKDOC="false"
+CONFIGURE_ENV=	GTKDOC="false"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .if defined(NO_INSTALL_MANPAGES)
 CONFIGURE_ARGS+=--disable-man-pages
diff --git sysutils/powerman/Makefile sysutils/powerman/Makefile
index 9db70a3..cccca94 100644
--- sysutils/powerman/Makefile
+++ sysutils/powerman/Makefile
@@ -19,7 +19,6 @@ LIB_DEPENDS=	curl.6:${PORTSDIR}/ftp/curl
 
 USE_PERL5_BUILD=yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--with-httppower --localstatedir=${DESTDIR}/var \
 		--with-pkgconfig-dir=${PREFIX}/libdata/pkgconfig
 USE_LDCONFIG=	yes
@@ -32,8 +31,8 @@ MAN3=		libpowerman.3
 MAN5=		powerman.conf.5 powerman.dev.5
 MAN8=		httppower.8 plmpower.8 powermand.8 vpcd.8
 
-CPPFLAGS=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 post-patch:
 	@${REINPLACE_CMD} -e \
diff --git sysutils/progsreiserfs/Makefile sysutils/progsreiserfs/Makefile
index 3ecfdf0..6d439ec 100644
--- sysutils/progsreiserfs/Makefile
+++ sysutils/progsreiserfs/Makefile
@@ -26,7 +26,8 @@ EXTRA_PATCHES=	${FILESDIR}/extrapatch-progsreiserfs::libmisc::Makefile.in
 CONFIGURE_ARGS+=--disable-nls
 .else
 USE_GETTEXT=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 .endif
 
 MAN8=		cpfs.reiserfs.8 mkfs.reiserfs.8 reiserfs.8 \
diff --git sysutils/pwgen/Makefile sysutils/pwgen/Makefile
index e6279bb..803c566 100644
--- sysutils/pwgen/Makefile
+++ sysutils/pwgen/Makefile
@@ -16,8 +16,6 @@ MAINTAINER=	oddbjorn@tricknology.org
 COMMENT=	A simple password generator
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-1
-MAKE_ENV=	CPPFLAGS="${CPPFLAGS}" \
-		LDFLAGS="${LDFLAGS}"
 
 MAN1=		pwgen.1
 PLIST_FILES=	bin/pwgen
diff --git sysutils/pyrenamer/Makefile sysutils/pyrenamer/Makefile
index 23eb84a..e551edd 100644
--- sysutils/pyrenamer/Makefile
+++ sysutils/pyrenamer/Makefile
@@ -20,8 +20,8 @@ USE_PYTHON=	yes
 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=		pyrenamer.1
 GCONF_SCHEMAS=	pyrenamer.schemas
diff --git sysutils/quicksynergy/Makefile sysutils/quicksynergy/Makefile
index 5597996..8f7ad78 100644
--- sysutils/quicksynergy/Makefile
+++ sysutils/quicksynergy/Makefile
@@ -21,8 +21,8 @@ USE_ICONV=	yes
 USE_GETTEXT=	yes
 USE_GNOME=	gnomehack gnomeprefix libglade2
 
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 PLIST_FILES=	bin/quicksynergy \
 		share/locale/pt_BR/LC_MESSAGES/quicksynergy.mo
diff --git sysutils/radeontool/Makefile sysutils/radeontool/Makefile
index 4f2d900..6eca275 100644
--- sysutils/radeontool/Makefile
+++ sysutils/radeontool/Makefile
@@ -13,6 +13,4 @@ MASTER_SITES=	http://fdd.com/software/radeon/
 MAINTAINER=	takawata@jp.freebsd.org
 COMMENT=	ATI Radeon video card contoroling tool useful for laptops
 
-MAKE_ENV+=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
-
 .include <bsd.port.mk>
diff --git sysutils/rdup/Makefile sysutils/rdup/Makefile
index 97e34f4..b1a1f23 100644
--- sysutils/rdup/Makefile
+++ sysutils/rdup/Makefile
@@ -24,7 +24,7 @@ USE_BZIP2=	yes
 
 USE_AUTOTOOLS=	autoconf
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV+=	LDFLAGS="-L${LOCALBASE}/lib ${LDFLAGS}"
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 USE_GMAKE=	yes
 MAKEFILE=	GNUmakefile
diff --git sysutils/rsyslog3/bsd.rsyslog.mk sysutils/rsyslog3/bsd.rsyslog.mk
index 919950a..dd78783 100644
--- sysutils/rsyslog3/bsd.rsyslog.mk
+++ sysutils/rsyslog3/bsd.rsyslog.mk
@@ -9,7 +9,6 @@ CONFLICTS=	rsyslog-[!3].[0-9]*
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 USE_GNOME+=	pkgconfig
 
 .ifdef MNAME
diff --git sysutils/rsyslog4-devel/Makefile sysutils/rsyslog4-devel/Makefile
index dc78b9e..6e74ac9 100644
--- sysutils/rsyslog4-devel/Makefile
+++ sysutils/rsyslog4-devel/Makefile
@@ -44,7 +44,6 @@ BROKEN=	does not build on 6.x
 .if ${ARCH} == "i386"
 CPPFLAGS+=-march=i686
 .endif
-CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 
 .ifndef MNAME
 MAN8=	rsyslogd.8
diff --git sysutils/rsyslog4/Makefile sysutils/rsyslog4/Makefile
index 4cee084..6b1f04a7 100644
--- sysutils/rsyslog4/Makefile
+++ sysutils/rsyslog4/Makefile
@@ -44,7 +44,6 @@ BROKEN=	does not build on 6.x
 .if ${ARCH} == "i386"
 CPPFLAGS+=-march=i686
 .endif
-CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 
 .ifndef MNAME
 MAN8=	rsyslogd.8
diff --git sysutils/rsyslog5/Makefile sysutils/rsyslog5/Makefile
index 019012a..5cce292 100644
--- sysutils/rsyslog5/Makefile
+++ sysutils/rsyslog5/Makefile
@@ -50,7 +50,6 @@ CONFIGURE_ARGS+=--enable-rtinst --enable-debug
 .if ${ARCH} == "i386"
 CPPFLAGS+=-march=i686
 .endif
-CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 
 .ifndef MNAME
 MAN8=	rsyslogd.8
diff --git sysutils/rsyslog6-devel/Makefile sysutils/rsyslog6-devel/Makefile
index 1e0af74..31b1e58 100644
--- sysutils/rsyslog6-devel/Makefile
+++ sysutils/rsyslog6-devel/Makefile
@@ -42,7 +42,7 @@ EXTRA_PATCHES+=	${FILESDIR}/extra-patch-sane-hostname
 
 CONFLICTS=	rsyslog-devel-[!6].[0-9]*
 CFLAGS+=	-I${LOCALBASE}/include
-CPPFLAGS=	-I${LOCALBASE}/include
+CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 GNU_CONFIGURE=	yes
 
@@ -56,7 +56,8 @@ CONFIGURE_ARGS+=--enable-rtinst --enable-debug
 CPPFLAGS+=-march=i686
 .endif
 
-CONFIGURE_ENV+=	CFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" LIBESTR_CFLAGS="${CFLAGS}" LIBESTR_LIBS="${LDFLAGS} -lestr"  LIBEE_CFLAGS="${CFLAGS}" LIBEE_LIBS="${LDFLAGS} -lee"
+CONFIGURE_ENV+=	LIBESTR_CFLAGS="${CFLAGS}" LIBESTR_LIBS="${LDFLAGS} -lestr" LIBEE_CFLAGS="${CFLAGS}" LIBEE_LIBS="${LDFLAGS} -lee"
+CFLAGS+=	${CPPFLAGS}
 
 .ifndef MNAME
 MAN8=	rsyslogd.8
diff --git sysutils/scanbuttond/Makefile sysutils/scanbuttond/Makefile
index f434522..5bb62ed 100644
--- sysutils/scanbuttond/Makefile
+++ sysutils/scanbuttond/Makefile
@@ -17,8 +17,8 @@ COMMENT=	A daemon to monitor and configure modern scanner's buttons
 LICENSE=	GPLv2
 
 GNU_CONFIGURE=	yes
-CPPFLAGS=	"-I${LOCALBASE}/include"
-CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 USE_LDCONFIG=	yes
 MAKE_JOBS_SAFE=	yes
 
diff --git sysutils/sensors-applet/Makefile sysutils/sensors-applet/Makefile
index 6f39f03..d96d922 100644
--- sysutils/sensors-applet/Makefile
+++ sysutils/sensors-applet/Makefile
@@ -22,8 +22,8 @@ GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 DEFINES=	-DMBMON_EXECUTABLE=\\\"${LOCALBASE}/bin/mbmon\\\" \
 		-DSMARTCTL_HELPER=\\\"${PREFIX}/libexec/smartctl-helper\\\"
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${DEFINES}" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include ${DEFINES}
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 post-patch:
 	@${CP} -f ${FILESDIR}/mbmon-sensors-interface.* \
diff --git sysutils/slmon/Makefile sysutils/slmon/Makefile
index 7570e52..0328d94 100644
--- sysutils/slmon/Makefile
+++ sysutils/slmon/Makefile
@@ -22,13 +22,12 @@ MAKE_JOBS_SAFE=	yes
 
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 
 MAN1=		slmon.1
 PLIST_FILES=	bin/slmon
 
-CPPFLAGS=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib -lncurses -lm
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib -lncurses -lm
 
 .include <bsd.port.pre.mk>
 
diff --git sysutils/synergy/Makefile sysutils/synergy/Makefile
index ae35334..18e8056 100644
--- sysutils/synergy/Makefile
+++ sysutils/synergy/Makefile
@@ -17,7 +17,7 @@ COMMENT=	Mouse and keyboard sharing utility
 USE_CMAKE=	yes
 USE_XORG=	ice xtst x11 sm
 MAKE_ENV+=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
-		PTHREAD_LIBS="${PTHREAD_LIBS}" \
+		PTHREAD_LIBS="${PTHREAD_LIBS}"
 
 CFLAGS+=	-L${LOCALBASE}/lib -I${LOCALBASE}/include
 
diff --git sysutils/syslog-ng2/Makefile sysutils/syslog-ng2/Makefile
index bd8b786..f52766d 100644
--- sysutils/syslog-ng2/Makefile
+++ sysutils/syslog-ng2/Makefile
@@ -29,8 +29,8 @@ LIBNET_CONFIG?=	${LOCALBASE}/bin/libnet11-config
 
 CONFIGURE_ARGS=	--sysconfdir=${LOCALBASE}/etc --localstatedir=/var/db \
 		--enable-dynamic-linking --with-libnet=${LOCALBASE}/bin
-CONFIGURE_ENV=	CFLAGS="`${LIBNET_CONFIG} --cflags`" \
-		LDFLAGS="`${LIBNET_CONFIG} --libs`"
+LDFLAGS+=	`${LIBNET_CONFIG} --libs`
+CFLAGS+=	`${LIBNET_CONFIG} --cflags`
 
 .include <bsd.port.pre.mk>
 
diff --git sysutils/syslog-ng3-devel/Makefile sysutils/syslog-ng3-devel/Makefile
index 18bab1b..811ff21 100644
--- sysutils/syslog-ng3-devel/Makefile
+++ sysutils/syslog-ng3-devel/Makefile
@@ -45,8 +45,8 @@ SUB_FILES=	pkg-message
 
 CONFIGURE_ARGS=	--sysconfdir=${LOCALBASE}/etc --localstatedir=/var/db \
 		--enable-dynamic-linking --with-libnet=${LOCALBASE}/bin
-CONFIGURE_ENV=	CFLAGS="`${LIBNET_CONFIG} --cflags` -I${LOCALBASE}/include ${CFLAGS}" \
-		LDFLAGS="`${LIBNET_CONFIG} --libs` ${LDFLAGS}"
+CFLAGS+=	`${LIBNET_CONFIG} --cflags` -I${LOCALBASE}/include
+LDFLAGS+=	`${LIBNET_CONFIG} --libs`
 
 .if defined(WITH_SYS_SSL) && defined(WITH_PORTS_SSL)
 BROKEN=		SYS_SSL and PORTS_SSL are mutually exclusive
diff --git sysutils/syslog-ng3/Makefile sysutils/syslog-ng3/Makefile
index 37209252..094889c 100644
--- sysutils/syslog-ng3/Makefile
+++ sysutils/syslog-ng3/Makefile
@@ -42,8 +42,8 @@ SUB_FILES=	pkg-message
 
 CONFIGURE_ARGS=	--sysconfdir=${LOCALBASE}/etc --localstatedir=/var/db \
 		--enable-dynamic-linking --with-libnet=${LOCALBASE}/bin
-CONFIGURE_ENV=	CFLAGS="`${LIBNET_CONFIG} --cflags` -I${LOCALBASE}/include ${CFLAGS}" \
-		LDFLAGS="`${LIBNET_CONFIG} --libs` ${LDFLAGS}"
+CFLAGS+=	`${LIBNET_CONFIG} --cflags` -I${LOCALBASE}/include
+LDFLAGS+=	`${LIBNET_CONFIG} --libs`
 
 .if defined(WITH_SYS_SSL) && defined(WITH_PORTS_SSL)
 BROKEN=		SYS_SSL and PORTS_SSL are mutually exclusive
diff --git sysutils/system-tools-backends/Makefile sysutils/system-tools-backends/Makefile
index ca2ca41..7efa7b0 100644
--- sysutils/system-tools-backends/Makefile
+++ sysutils/system-tools-backends/Makefile
@@ -28,8 +28,8 @@ GNU_CONFIGURE=	yes
 USE_GNOME_SUBR=	yes
 CONFIGURE_ARGS=	--with-stb-group=wheel \
 		--localstatedir=/var
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 post-configure:
 	@${REINPLACE_CMD} -e 's|@GETTEXT_PACKAGE@|system-tools-backends|g' \
diff --git sysutils/testdisk/Makefile sysutils/testdisk/Makefile
index a819792..385b7d6 100644
--- sysutils/testdisk/Makefile
+++ sysutils/testdisk/Makefile
@@ -18,7 +18,8 @@ LIB_DEPENDS=	jpeg.11:${PORTSDIR}/graphics/jpeg
 
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${PREFIX}/include" LDFLAGS="-L${PREFIX}/lib"
+CPPFLAGS+=	-I${PREFIX}/include
+LDFLAGS+=	-L${PREFIX}/lib
 CONFIGURE_ARGS=	--without-ewf
 
 MAN8=		fidentify.8 testdisk.8 photorec.8
diff --git sysutils/tmux/Makefile sysutils/tmux/Makefile
index a30609f..869ca0d 100644
--- sysutils/tmux/Makefile
+++ sysutils/tmux/Makefile
@@ -46,8 +46,6 @@ LESTATIC=	${LOCALBASE}/lib/libevent.a
 . endif
 .endif
 
-CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS}"
-
 .if defined(WITH_BACKSPACE)
 EXTRA_PATCHES=	${PATCHDIR}/extra-patch-tty-keys.c
 .endif
diff --git sysutils/torsmo/Makefile sysutils/torsmo/Makefile
index 50f4d6a..44c0dcc 100644
--- sysutils/torsmo/Makefile
+++ sysutils/torsmo/Makefile
@@ -16,7 +16,7 @@ COMMENT=	System monitor that renders text on desktop
 
 GNU_CONFIGURE=	yes
 USE_XORG=	x11
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include"
+CPPFLAGS+=	-I${LOCALBASE}/include
 MAN1=		torsmo.1
 
 PLIST_FILES=	bin/torsmo \
diff --git sysutils/tracker-client/Makefile sysutils/tracker-client/Makefile
index 6d59314..f870a1a 100644
--- sysutils/tracker-client/Makefile
+++ sysutils/tracker-client/Makefile
@@ -45,8 +45,8 @@ USE_LDCONFIG=	yes
 USE_GSTREAMER=	core
 INSTALLS_ICONS=	yes
 USE_AUTOTOOLS=	libtool
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib -L${LOCALBASE}/lib/tracker ${PTHREAD_LIBS}"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib -L${LOCALBASE}/lib/tracker ${PTHREAD_LIBS}
 CONFIGURE_ARGS=	--enable-video-extractor=gstreamer \
 		--enable-file-monitoring=fam \
 		--with-session-bus-services-dir=${LOCALBASE}/share/dbus-1/services \
diff --git sysutils/tss/Makefile sysutils/tss/Makefile
index d8965dd..93ba50c 100644
--- sysutils/tss/Makefile
+++ sysutils/tss/Makefile
@@ -13,8 +13,6 @@ MASTER_SITES=	http://www.pulia.nu/tss/src/
 MAINTAINER=	peter@pean.org
 COMMENT=	Terminal ScreenSaver that allows you to lock you terminal
 
-MAKE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
-
 post-patch:
 	@ ${REINPLACE_CMD} -e "s|/etc/tss|${PREFIX}/etc/tss|" ${WRKSRC}/src/main.c
 
diff --git sysutils/udfclient/Makefile sysutils/udfclient/Makefile
index f12a5be..59a6d7c 100644
--- sysutils/udfclient/Makefile
+++ sysutils/udfclient/Makefile
@@ -52,7 +52,7 @@ PLIST_FILES+=	bin/${UDFCLIENTFS_NAME}
 .endif
 
 .if defined(WITH_DEBUG)
-CONFIGURE_ENV+=	CFLAGS="-O0 -ggdb3"
+CFLAGS+=	-O0 -ggdb3
 .endif
 
 post-patch:
diff --git sysutils/unieject/Makefile sysutils/unieject/Makefile
index 20a013e..11a79ca 100644
--- sysutils/unieject/Makefile
+++ sysutils/unieject/Makefile
@@ -25,9 +25,9 @@ GNU_CONFIGURE=	yes
 MAN1=	unieject.1
 MAN5=	unieject.conf.5
 
-CPPFLAGS=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib -lcdio -lconfuse
-CONFIGURE_ENV=	PKG_CONFIG="${TRUE}" CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib -lcdio -lconfuse
+CONFIGURE_ENV=	PKG_CONFIG="${TRUE}"
 CONFIGURE_ARGS=	--with-libintl-prefix=${LOCALBASE} \
 		--with-libpopt-prefix=${LOCALBASE}
 
diff --git sysutils/uniutils/Makefile sysutils/uniutils/Makefile
index dcd8ad4..76ae94f 100644
--- sysutils/uniutils/Makefile
+++ sysutils/uniutils/Makefile
@@ -17,9 +17,9 @@ COMMENT=	Unicode Description Utilities
 RUN_DEPENDS=	ascii2binary:${PORTSDIR}/converters/ascii2binary
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CFLAGS} -I${LOCALBASE}/include"	\
-		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"		\
-		LIBS="-lintl"
+CONFIGURE_ENV=	LIBS="-lintl"
+CPPFLAGS+=	${CFLAGS} -I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 USE_GETTEXT=	yes
 
 TESTFILES=	Test1.ann Test1.u Test2.ann Test2.u Test3.ann Test3.u	\
diff --git sysutils/upower/Makefile sysutils/upower/Makefile
index 123babb..df0b57a 100644
--- sysutils/upower/Makefile
+++ sysutils/upower/Makefile
@@ -31,9 +31,9 @@ USE_PYTHON=	yes
 CONFIGURE_ARGS=	--disable-gtk-doc \
 		--with-backend=freebsd \
 		--localstatedir=/var
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib" \
-		GTKDOC="false"
+CONFIGURE_ENV=	GTKDOC="false"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .if defined(NO_INSTALL_MANPAGES)
 CONFIGURE_ARGS+=--disable-man-pages
diff --git sysutils/usbhotkey/Makefile sysutils/usbhotkey/Makefile
index 11388bb..b13605a 100644
--- sysutils/usbhotkey/Makefile
+++ sysutils/usbhotkey/Makefile
@@ -26,13 +26,15 @@ HAS_CONFIGURE=		yes
 .include <bsd.port.pre.mk>
 
 .if !defined(WITHOUT_PTHREADS)
-CONFIGURE_ENV+=		CPPFLAGS="${CPPFLAGS} ${PTHREAD_CFLAGS} -I${LOCALBASE}/include \
-			-I${LOCALBASE}/include/ruby-${RUBY_VER} -I${LOCALBASE}/include/ruby-${RUBY_VER}/${RUBY_ARCH}" \
-			LDFLAGS="${LDFLAGS} ${PTHREAD_LIBS} -L${LOCALBASE}/lib"
+CPPFLAGS+=	${PTHREAD_CFLAGS} -I${LOCALBASE}/include \
+		-I${LOCALBASE}/include/ruby-${RUBY_VER} \
+		-I${LOCALBASE}/include/ruby-${RUBY_VER}/${RUBY_ARCH}
+LDFLAGS+=	${PTHREAD_LIBS} -L${LOCALBASE}/lib
 .else
-CONFIGURE_ENV+=		CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include \
-			-I${LOCALBASE}/include/ruby-${RUBY_VER} -I${LOCALBASE}/include/ruby-${RUBY_VER}/${RUBY_ARCH}" \
-			LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include \
+		-I${LOCALBASE}/include/ruby-${RUBY_VER} \
+		-I${LOCALBASE}/include/ruby-${RUBY_VER}/${RUBY_ARCH}
+LDFLAGS+=	-L${LOCALBASE}/lib
 .endif
 
 .if !defined(WITHOUT_GUI)
diff --git sysutils/usbutils/Makefile sysutils/usbutils/Makefile
index 09e3a03..c455499 100644
--- sysutils/usbutils/Makefile
+++ sysutils/usbutils/Makefile
@@ -15,8 +15,8 @@ COMMENT=	Utility for listing USB devices
 
 LICENSE=	GPLv2
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--datadir=${DATADIR} --enable-zlib
 USE_GMAKE=	yes
 USE_GNOME=	pkgconfig
diff --git sysutils/vstrip/Makefile sysutils/vstrip/Makefile
index 6bc383b..45dc188 100644
--- sysutils/vstrip/Makefile
+++ sysutils/vstrip/Makefile
@@ -21,7 +21,6 @@ LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/license.txt
 
 USE_ZIP=	yes
-MAKE_ENV=	LDFLAGS="${LDFLAGS}"
 WRKSRC=		${WRKDIR}/${PORTNAME}
 MAKE_JOBS_SAFE=	yes
 
diff --git sysutils/wmfire/Makefile sysutils/wmfire/Makefile
index f84efc5..2503071 100644
--- sysutils/wmfire/Makefile
+++ sysutils/wmfire/Makefile
@@ -18,8 +18,8 @@ LIB_DEPENDS=	gtop-2.0.7:${PORTSDIR}/devel/libgtop
 
 USE_GNOME=	gtk20
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 MAKE_ARGS=	ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOHEADER="${TRUE}" \
 		AUTOMAKE="${TRUE}"
 
diff --git sysutils/xfsprogs/Makefile sysutils/xfsprogs/Makefile
index 53637bd..cf424f5 100644
--- sysutils/xfsprogs/Makefile
+++ sysutils/xfsprogs/Makefile
@@ -22,7 +22,6 @@ USE_GETTEXT=	yes
 USE_AUTOTOOLS=	autoconf libtool:env
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV+=		INSTALL="${INSTALL} ${_BINOWNGRP}" \
-			CFLAGS="${CFLAGS}" \
 			LIBTOOL=${LIBTOOL}
 MAKE_ENV+=		INSTALL="${INSTALL} ${_BINOWNGRP}"
 CONFIGURE_ARGS+=	--disable-shared --enable-readline
diff --git sysutils/xlogmaster/Makefile sysutils/xlogmaster/Makefile
index 22d658c..2d5333d 100644
--- sysutils/xlogmaster/Makefile
+++ sysutils/xlogmaster/Makefile
@@ -17,13 +17,12 @@ COMMENT=	Quick & easy monitoring of logfiles and devices
 USE_GNOME=	gtk12
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 
 MAN1=		xlogmaster.1
 INFO=		xlogmaster
 
-CPPFLAGS=	-I${LOCALBASE}/include -DHAVE_DECL_GETOPT
-LDFLAGS=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include -DHAVE_DECL_GETOPT
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 post-patch:
 	@${REINPLACE_CMD} -e \
diff --git sysutils/xsu/Makefile sysutils/xsu/Makefile
index c80dcef..1eaf67d 100644
--- sysutils/xsu/Makefile
+++ sysutils/xsu/Makefile
@@ -17,8 +17,8 @@ COMMENT=	Xsu runs commands as root after prompting for the root password
 GNU_CONFIGURE=	yes
 USE_GNOME=	gnomeprefix gnomehack gnomelibs
 CONFIGURE_ARGS=	--su-pwd-out="Password:"
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
 
 MAN8=	xsu.8
 
diff --git sysutils/xvidcap/Makefile sysutils/xvidcap/Makefile
index 36d3657..2848987 100644
--- sysutils/xvidcap/Makefile
+++ sysutils/xvidcap/Makefile
@@ -25,9 +25,9 @@ RUN_DEPENDS=		animate:${PORTSDIR}/graphics/ImageMagick
 
 GNU_CONFIGURE=		yes
 # Remove MAKE="${GMAKE}" after ffmpeg-devel's upgrade
-CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include"	\
-			LOCALBASE="${LOCALBASE}"		\
+CONFIGURE_ENV=		LOCALBASE="${LOCALBASE}"		\
 			MAKE="${GMAKE}"
+CPPFLAGS+=		-I${LOCALBASE}/include
 CONFIGURE_ARGS=		--with-forced-embedded-ffmpeg	# To be removed after ffmpeg-devel's upgrade
 
 USE_GMAKE=		yes	# To be removed after ffmpeg-devel's upgrade
diff --git textproc/apertium/Makefile textproc/apertium/Makefile
index 7c88f0d..6e5c545 100644
--- textproc/apertium/Makefile
+++ textproc/apertium/Makefile
@@ -26,8 +26,8 @@ APREV=	0
 MAKE_JOBS_UNSAFE=	yes
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 USE_GNOME=	gnomehack pkgconfig
 USE_LDCONFIG=	yes
 
diff --git textproc/artha/Makefile textproc/artha/Makefile
index cdd7107..d9c9f4b 100644
--- textproc/artha/Makefile
+++ textproc/artha/Makefile
@@ -28,8 +28,8 @@ USE_GNOME=	gtk20 intltool pkgconfig
 
 CONFIGURE_ARGS=	--enable-static=no --x-includes=${LOCALBASE}/include \
 		--x-libraries=${LOCALBASE}/lib
-CONFIGURE_ENV=	LDFLAGS=-L${LOCALBASE}/lib
-CPPFLAGS=	-I${LOCALBASE}/include -I${LOCALBASE}/include/WordNet
+LDFLAGS+=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include/WordNet
 
 OPTIONS=	NOTIFY "Popup word definition as notification" On
 
diff --git textproc/aspell/Makefile textproc/aspell/Makefile
index 9155d0a..7aae8fd 100644
--- textproc/aspell/Makefile
+++ textproc/aspell/Makefile
@@ -27,8 +27,8 @@ CONFIGURE_ARGS=		--enable-dict-dir=${DATADIR}	\
 			--enable-static
 PTHREAD_CFLAGS=		# Disable threading
 PTHREAD_LIBS=		# libaspell may be used by unthreaded apps.
-CPPFLAGS=		-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-CONFIGURE_ENV=		LDFLAGS="-L${LOCALBASE}/lib ${LDFLAGS} ${PTHREAD_LIBS}"
+CPPFLAGS+=		-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS+=		-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 USE_GMAKE=		yes
 USE_ICONV=		yes
 USE_PERL5_BUILD=	yes
diff --git textproc/cost/Makefile textproc/cost/Makefile
index 2cd9e05..3bb37bb 100644
--- textproc/cost/Makefile
+++ textproc/cost/Makefile
@@ -20,7 +20,8 @@ WRKSRC=		${WRKDIR}/${DISTNAME}/src
 GNU_CONFIGURE=	YES
 CONFIGURE_ARGS+=--with-tcl=${LOCALBASE}/lib/tcl8.4 \
 		--with-docdir=${PREFIX}/share/doc/cost --with-charmaps
-CONFIGURE_ENV+=	CFLAGS="${CFLAGS} -fPIC" TCL_INCLUDE_SPEC="${LOCALBASE}/include/tcl8.4"
+CONFIGURE_ENV+=	TCL_INCLUDE_SPEC="${LOCALBASE}/include/tcl8.4"
+CFLAGS+=	-fPIC
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|TCL_SRC_DIR%g|TCL_INCLUDE_SPEC%g|' \
diff --git textproc/dict/Makefile textproc/dict/Makefile
index f6c525f..840675e 100644
--- textproc/dict/Makefile
+++ textproc/dict/Makefile
@@ -22,8 +22,8 @@ USE_BISON=	build
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--without-local-zlib --with-cflags="${CFLAGS}" \
 		--with-etcdir=${PREFIX}/etc
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
 ALL_TARGET=	dict
diff --git textproc/dictfmt/Makefile textproc/dictfmt/Makefile
index 4fde88b..e04ec5ac 100644
--- textproc/dictfmt/Makefile
+++ textproc/dictfmt/Makefile
@@ -19,7 +19,6 @@ LIB_DEPENDS=	maa.3:${PORTSDIR}/devel/libmaa
 
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--with-cflags="${CFLAGS}"
 ALL_TARGET=	dictfmt
 INSTALL_TARGET=	install.dictfmt
diff --git textproc/diffmark/Makefile textproc/diffmark/Makefile
index 34730a6..df7ef0c 100644
--- textproc/diffmark/Makefile
+++ textproc/diffmark/Makefile
@@ -21,6 +21,5 @@ CONFIGURE_ARGS=	--with-libxml2-incldir=${LOCALBASE}/include/libxml2
 
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
-CONFIGURE_ENV+=	CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
 
 .include <bsd.port.mk>
diff --git textproc/domc/Makefile textproc/domc/Makefile
index 38fed0f..76eea6e 100644
--- textproc/domc/Makefile
+++ textproc/domc/Makefile
@@ -28,7 +28,7 @@ SHLIB_MAJOR=	0
 USE_GMAKE=	yes
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
-MAKE_ENV+=	SHLIB_MAJOR="${SHLIB_MAJOR}" INSTDIR=${PREFIX} LDFLAGS="${LDFLAGS}"
+MAKE_ENV+=	SHLIB_MAJOR="${SHLIB_MAJOR}" INSTDIR=${PREFIX}
 USE_LDCONFIG=	yes
 
 PLIST_SUB=	SHLIB_MAJOR="${SHLIB_MAJOR}"
diff --git textproc/dwdiff/Makefile textproc/dwdiff/Makefile
index 30e4645..f9a0cc0 100644
--- textproc/dwdiff/Makefile
+++ textproc/dwdiff/Makefile
@@ -24,8 +24,6 @@ HAS_CONFIGURE=	yes
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--mandir=${MANPREFIX}/man
-CONFIGURE_ENV=	CFLAGS="${CFLAGS}" \
-		LDFLAGS="${LDFLAGS}"
 
 MAN1=		${PORTNAME}.1 dwfilter.1
 PORTDOCS=	COPYING Changelog README
diff --git textproc/ekhtml/Makefile textproc/ekhtml/Makefile
index e2f4106..fe95044 100644
--- textproc/ekhtml/Makefile
+++ textproc/ekhtml/Makefile
@@ -16,8 +16,8 @@ COMMENT=	El-Kabong is a speedy, yet forgiving, SAX-style HTML parser
 USE_AUTOTOOLS=	libtool
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 USE_LDCONFIG=	yes
 MAKE_JOBS_UNSAFE=	yes
 
diff --git textproc/enchant/Makefile textproc/enchant/Makefile
index 17651fc..4f76bd1 100644
--- textproc/enchant/Makefile
+++ textproc/enchant/Makefile
@@ -23,8 +23,8 @@ CONFIGURE_ARGS=	--disable-uspell \
 		--disable-voikko
 MAKE_JOBS_SAFE=	yes
 
-CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 MAN1=		enchant.1
 
diff --git textproc/estraier/Makefile textproc/estraier/Makefile
index d9498f5..e43d6cf 100644
--- textproc/estraier/Makefile
+++ textproc/estraier/Makefile
@@ -25,8 +25,8 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-sysqdbm \
 		--enable-dlfilter \
 		--enable-devel
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
-		LDFLAGS="-L${LOCALBASE}/include ${PTHREAD_LIBS}"
+CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS+=	-L${LOCALBASE}/include ${PTHREAD_LIBS}
 
 .include <bsd.port.pre.mk>
 
diff --git textproc/exempi/Makefile textproc/exempi/Makefile
index 784018f..ce459b3 100644
--- textproc/exempi/Makefile
+++ textproc/exempi/Makefile
@@ -19,9 +19,9 @@ LIB_DEPENDS=	expat.6:${PORTSDIR}/textproc/expat2
 USE_AUTOTOOLS=	libtool
 USE_GNOME=	ltverhack gnomehack
 CONFIGURE_ARGS=	--enable-unittest=no
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib" \
-		LIBS="-liconv"
+CONFIGURE_ENV=	LIBS="-liconv"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 USE_ICONV=	yes
 USE_LDCONFIG=	yes
 
diff --git textproc/gdome2/Makefile textproc/gdome2/Makefile
index de78591..d06fa7b 100644
--- textproc/gdome2/Makefile
+++ textproc/gdome2/Makefile
@@ -19,8 +19,8 @@ LIB_DEPENDS=	xml2.5:${PORTSDIR}/textproc/libxml2
 USE_AUTOTOOLS=	libtool
 USE_GNOME=	glib20 gnomehack
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	GLIB_CONFIG="${LOCALBASE}/bin/pkg-config glib-2.0" \
-		CPPFLAGS="-I${LOCALBASE}/include"
+CONFIGURE_ENV=	GLIB_CONFIG="${LOCALBASE}/bin/pkg-config glib-2.0"
+CPPFLAGS+=	-I${LOCALBASE}/include
 PLIST_SUB=	DOCSDIR="share/doc/${DISTNAME}"
 USE_LDCONFIG=	yes
 
diff --git textproc/glimpse/Makefile textproc/glimpse/Makefile
index 6112e91..232e232 100644
--- textproc/glimpse/Makefile
+++ textproc/glimpse/Makefile
@@ -21,7 +21,7 @@ PORTDOCS=	README COPYRIGHT
 
 NO_CDROM=	Restrictive copyright (don not sell for profit)
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CFLAGS="${CFLAGS} -DISO_CHAR_SET=1 -D__STRICT_ANSI__"
+CFLAGS+=	-DISO_CHAR_SET=1 -D__STRICT_ANSI__
 MAN1=		glimpse.1 glimpseindex.1 glimpseserver.1 agrep.1
 
 pre-configure:
diff --git textproc/gmetadom/Makefile textproc/gmetadom/Makefile
index cca48c8..4d7d346 100644
--- textproc/gmetadom/Makefile
+++ textproc/gmetadom/Makefile
@@ -24,8 +24,8 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 USE_GNOME=	glib20 gnomehack libxml2
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 USE_LDCONFIG=	yes
 
 OPTIONS=	OCAML "OCAML language support" off
diff --git textproc/gnome-doc-utils/Makefile textproc/gnome-doc-utils/Makefile
index 4392e74..6c5a9fc 100644
--- textproc/gnome-doc-utils/Makefile
+++ textproc/gnome-doc-utils/Makefile
@@ -31,8 +31,8 @@ USE_PYTHON=	yes
 INSTALLS_OMF=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-omf-dir=${PREFIX}/share/omf
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 MAN1=		xml2po.1
 
diff --git textproc/gnome-spell/Makefile textproc/gnome-spell/Makefile
index 7a717c2..aaa2330 100644
--- textproc/gnome-spell/Makefile
+++ textproc/gnome-spell/Makefile
@@ -24,8 +24,8 @@ USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack intlhack libgnomeui
 USE_GETTEXT=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 PLIST_SUB=	VERSION=${PORTVERSION}
 
 post-patch:
diff --git textproc/gnome-translate/Makefile textproc/gnome-translate/Makefile
index 7dac4b1..9fc0a9c 100644
--- textproc/gnome-translate/Makefile
+++ textproc/gnome-translate/Makefile
@@ -23,8 +23,8 @@ GCONF_SCHEMAS=		gnome-translate.schemas
 USE_GNOME=		gnomehack gnomeprefix eel2 intlhack libgnomeui
 USE_GMAKE=		yes
 GNU_CONFIGURE=		yes
-CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
-			LDFLAGS="-L${LOCALBASE}/lib -Wl,-export-dynamic"
+CPPFLAGS+=		-I${LOCALBASE}/include
+LDFLAGS+=		-L${LOCALBASE}/lib -Wl,-export-dynamic
 
 OPTIONS=		LANGUAGE_DETECTION "language detection" on
 
diff --git textproc/gnugrep/Makefile textproc/gnugrep/Makefile
index bed7d3f..8545da8 100644
--- textproc/gnugrep/Makefile
+++ textproc/gnugrep/Makefile
@@ -33,7 +33,6 @@ OPTIONS=	PCRE	"Compile with Perl-compatible regex support"	off
 
 .if !defined(WITHOUT_NLS)
 USE_GETTEXT=	yes
-CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS}"
 LDFLAGS+=	-lintl -L${LOCALBASE}/lib
 PLIST_SUB+=	NLS=
 .else
diff --git textproc/gtkdiff/Makefile textproc/gtkdiff/Makefile
index a1e4e6e..15110fa 100644
--- textproc/gtkdiff/Makefile
+++ textproc/gtkdiff/Makefile
@@ -16,8 +16,8 @@ COMMENT=	A frontend for diff(1)
 
 USE_GNOME=	gnomehack gnomeprefix gnomelibs
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 MAN1=		gtkdiff.1 gtkdiff-rcs.1
 
diff --git textproc/gtkspell/Makefile textproc/gtkspell/Makefile
index 3ff8760..0029bbb 100644
--- textproc/gtkspell/Makefile
+++ textproc/gtkspell/Makefile
@@ -25,8 +25,8 @@ USE_GNOME=	gnomeprefix gnomehack gtk20 intlhack
 USE_GETTEXT=	yes
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 post-patch:
 	@${REINPLACE_CMD} -e '/^SUBDIRS/ s|docs||' ${WRKSRC}/Makefile.in
diff --git textproc/hyperestraier/Makefile textproc/hyperestraier/Makefile
index ee21a34..52b67a4 100644
--- textproc/hyperestraier/Makefile
+++ textproc/hyperestraier/Makefile
@@ -22,8 +22,8 @@ USE_ICONV=	yes
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-bzip2 --disable-zlib
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 
 OPTIONS=	LZO "Enable lzo support" off \
 		MECAB "Enable mecab support" off
diff --git textproc/ibus-kmfl/Makefile textproc/ibus-kmfl/Makefile
index 4309cec..d1b5b38 100644
--- textproc/ibus-kmfl/Makefile
+++ textproc/ibus-kmfl/Makefile
@@ -27,7 +27,6 @@ USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
-CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS}"
 
 .if !defined(WITHOUT_NLS)
 USE_GETTEXT=	yes
diff --git textproc/ibus/Makefile textproc/ibus/Makefile
index 36146f8..070c35c 100644
--- textproc/ibus/Makefile
+++ textproc/ibus/Makefile
@@ -48,7 +48,7 @@ CONFIGURE_ARGS+=	--disable-iso-codes-check
 USE_GETTEXT=	yes
 PLIST_SUB+=	NLS=""
 .else
-CPPFLAGS=	-I${LOCALBASE}/include
+CPPFLAGS+=	-I${LOCALBASE}/include
 CONFIGURE_ARGS+=	--disable-nls
 PLIST_SUB+=	NLS="@comment "
 .endif
diff --git textproc/iksemel/Makefile textproc/iksemel/Makefile
index 78505c3..49a7e68 100644
--- textproc/iksemel/Makefile
+++ textproc/iksemel/Makefile
@@ -19,8 +19,8 @@ LIB_DEPENDS=	gnutls.47:${PORTSDIR}/security/gnutls
 USE_AUTOTOOLS=	aclocal autoheader automake autoconf libtool
 ACLOCAL_ARGS=	-I ${LOCALBASE}/share/aclocal
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	${CXXFLAGS} -I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 USE_LDCONFIG=	yes
 
 INFO=	iksemel
diff --git textproc/ipdf/Makefile textproc/ipdf/Makefile
index a3a215d..628ce5e 100644
--- textproc/ipdf/Makefile
+++ textproc/ipdf/Makefile
@@ -20,8 +20,8 @@ LIB_DEPENDS=	pdf.8:${PORTSDIR}/print/pdflib \
 		tiff.4:${PORTSDIR}/graphics/tiff
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 MAN1=		ipdf.1
 PLIST_FILES=	bin/ipdf
diff --git textproc/kbedic/Makefile textproc/kbedic/Makefile
index 42a2012..5bd4ed8 100644
--- textproc/kbedic/Makefile
+++ textproc/kbedic/Makefile
@@ -17,7 +17,8 @@ COMMENT=	An English-Bulgarian-English dictionary
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
 CONFIGURE_ARGS+=	--with-kde
-CONFIGURE_ENV=	CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}" LDFLAGS="${LDFLAGS} ${PTHREAD_LIBS}"
+LDFLAGS+=	${PTHREAD_LIBS}
+CFLAGS+=	${PTHREAD_CFLAGS}
 USE_KDELIBS_VER=	3
 
 .include <bsd.port.mk>
diff --git textproc/kmflcomp/Makefile textproc/kmflcomp/Makefile
index c788e8d..56b8618 100644
--- textproc/kmflcomp/Makefile
+++ textproc/kmflcomp/Makefile
@@ -27,7 +27,6 @@ USE_ICONV=	yes
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib -liconv
-CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS}"
 
 DOCSDIR=	${PREFIX}/share/doc/kmfl/${PORTNAME}
 DOCS=		${DISTDIR}/${DIST_SUBDIR}/KMFL-Compiler.sxw \
diff --git textproc/libextractor/Makefile textproc/libextractor/Makefile
index 49884ae..68703b6 100644
--- textproc/libextractor/Makefile
+++ textproc/libextractor/Makefile
@@ -21,8 +21,8 @@ USE_AUTOTOOLS=	libltdl
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	${PREFIX}/lib/libextractor
 CONFIGURE_ARGS=	--disable-ltdl-install
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 MAKE_JOBS_UNSAFE=	yes
 
 EXTRACT_AFTER_ARGS=	| ${TAR} -xf - --exclude libltdl
@@ -113,7 +113,7 @@ PLIST_SUB+=	RPM="@comment "
 # QT can be disabled
 .if !defined(WITHOUT_QT)
 LIB_DEPENDS+=	QtGui:${PORTSDIR}/x11-toolkits/qt4-gui
-CONFIGURE_ENV+=	LDFLAGS="-L${LOCALBASE}/lib -L${LOCALBASE}/lib/qt4"
+LDFLAGS+=	-L${LOCALBASE}/lib -L${LOCALBASE}/lib/qt4
 CONFIGURE_ARGS+=--with-qt=${LOCALBASE}
 PLIST_SUB+=	QT=""
 .else
diff --git textproc/libkmfl/Makefile textproc/libkmfl/Makefile
index e19a000..eb3661d 100644
--- textproc/libkmfl/Makefile
+++ textproc/libkmfl/Makefile
@@ -22,7 +22,6 @@ USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
-CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS}"
 
 DOCSDIR=	${PREFIX}/share/doc/kmfl/${PORTNAME}
 PORTDOCS=	AUTHORS COPYING ChangeLog
diff --git textproc/liblrdf/Makefile textproc/liblrdf/Makefile
index 1b45572..f19d38f 100644
--- textproc/liblrdf/Makefile
+++ textproc/liblrdf/Makefile
@@ -19,10 +19,9 @@ LIB_DEPENDS=	raptor.3:${PORTSDIR}/textproc/raptor
 USE_AUTOTOOLS=	libtool
 USE_GNOME=	gnomehack
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 USE_LDCONFIG=	yes
 
-CPPFLAGS=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
+CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 
 .include <bsd.port.mk>
diff --git textproc/libmrss/Makefile textproc/libmrss/Makefile
index 1c1d36e..18e60ba 100644
--- textproc/libmrss/Makefile
+++ textproc/libmrss/Makefile
@@ -23,7 +23,6 @@ OPTIONS=	PHPMRSS "support to PHP" on
 GNU_CONFIGURE=	yes
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
-CONFIGURE_ENV+=	CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
 
 USE_LDCONFIG=	yes
 WANT_GNOME=	yes
diff --git textproc/libnxml/Makefile textproc/libnxml/Makefile
index a8b270e..61a963f 100644
--- textproc/libnxml/Makefile
+++ textproc/libnxml/Makefile
@@ -18,7 +18,8 @@ COMMENT=	A C library for writing XML 1.0/1.1 files or streams
 LIB_DEPENDS=	curl.6:${PORTSDIR}/ftp/curl
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV+=	CPPFLAGS="-I/${LOCALBASE}/include" LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 USE_LDCONFIG=	yes
 
diff --git textproc/libparsifal/Makefile textproc/libparsifal/Makefile
index 9247765..86b7753 100644
--- textproc/libparsifal/Makefile
+++ textproc/libparsifal/Makefile
@@ -17,8 +17,8 @@ COMMENT=	Lightweight XML Parser
 USE_AUTOTOOLS=	libtool
 USE_ICONV=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 USE_LDCONFIG=	yes
 
 PLIST_SUB=	VERSION=${PORTVERSION}
diff --git textproc/libtranslate/Makefile textproc/libtranslate/Makefile
index 8f9b7ef..9af2035 100644
--- textproc/libtranslate/Makefile
+++ textproc/libtranslate/Makefile
@@ -19,9 +19,8 @@ USE_GNOME=		glib20 gnomehack intlhack
 GNU_CONFIGURE=		yes
 USE_GMAKE=		yes
 USE_LDCONFIG=		yes
-CPPFLAGS=		-I${LOCALBASE}/include
-LDFLAGS=		-L${LOCALBASE}/lib
-CONFIGURE_ENV=		CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
+CPPFLAGS+=		-I${LOCALBASE}/include
+LDFLAGS+=		-L${LOCALBASE}/lib
 CONFIGURE_ARGS=		--with-html-dir=${PREFIX}/share/doc
 
 OPTIONS=		GENERIC "generic module" on \
diff --git textproc/libtre/Makefile textproc/libtre/Makefile
index 350d639..99bf1ef 100644
--- textproc/libtre/Makefile
+++ textproc/libtre/Makefile
@@ -51,10 +51,8 @@ CFLAGS+=	-Wuninitialized -ffast-math -finline-functions \
 .endif
 
 .if defined(WITH_PGO)
-CONFIGURE_ENV+=	CFLAGS="${CFLAGS} -fprofile-generate" \
-		LDFLAGS="${LDFLAGS} -fprofile-generate"
-.else
-CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}"
+LDFLAGS+=	-fprofile-generate
+CFLAGS+=	-fprofile-generate
 .endif
 
 post-patch:
diff --git textproc/libxml2/Makefile textproc/libxml2/Makefile
index 50f3423..bc50b92 100644
--- textproc/libxml2/Makefile
+++ textproc/libxml2/Makefile
@@ -36,8 +36,8 @@ CONFIGURE_ARGS?=--with-iconv=${LOCALBASE} \
 		--with-html-dir=${PREFIX}/share/doc \
 		--with-html-subdir=${PORTNAME} \
 		--without-python
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .if !defined(MASTERDIR)
 MAN1=		xml2-config.1 xmllint.1 xmlcatalog.1
diff --git textproc/libxode/Makefile textproc/libxode/Makefile
index 8ffa459..fc36313 100644
--- textproc/libxode/Makefile
+++ textproc/libxode/Makefile
@@ -19,8 +19,8 @@ LIB_DEPENDS=	expat.6:${PORTSDIR}/textproc/expat2
 
 USE_AUTOTOOLS=	libtool
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 USE_LDCONFIG=	yes
 
 post-patch:
diff --git textproc/libxslt/Makefile textproc/libxslt/Makefile
index 63d3696..6b93f87 100644
--- textproc/libxslt/Makefile
+++ textproc/libxslt/Makefile
@@ -25,8 +25,8 @@ USE_LDCONFIG=	yes
 USE_GNOME?=	gnomehack libxml2
 CONFIGURE_ARGS?=--with-html-dir=${PREFIX}/share/doc \
 		--without-python
-CPPFLAGS=	-I${LOCALBASE}/include
-CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .if defined(MASTERDIR)
 _SLAVE_PORT=	yes
diff --git textproc/link-grammar/Makefile textproc/link-grammar/Makefile
index c5aa296..fe72a71 100644
--- textproc/link-grammar/Makefile
+++ textproc/link-grammar/Makefile
@@ -22,8 +22,8 @@ USE_LDCONFIG=	yes
 USE_DOS2UNIX=	yes
 USE_CSTD=	gnu99
 CFLAGS+=	${PTHREAD_CFLAGS}
-CPPFLAGS=	-I${LOCALBASE}/include
-CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--enable-pthreads \
 		--disable-java-bindings \
 		--disable-hunspell \
diff --git textproc/ltxml/Makefile textproc/ltxml/Makefile
index 872bdba..e28140e 100644
--- textproc/ltxml/Makefile
+++ textproc/ltxml/Makefile
@@ -19,7 +19,6 @@ USE_PERL5=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-zlib=/usr --enable-multi-byte
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 
 MAN1=		ltxml.1 xmlnorm.1 pesis.1 sgcount.1 sggrep.1 sgmlsb.1 \
 		sgmlseg.1 sgmltoken.1 sgmltrans.1 sgrpg.1 textonly.1 \
diff --git textproc/mifluz/Makefile textproc/mifluz/Makefile
index c85b166..4a210ab 100644
--- textproc/mifluz/Makefile
+++ textproc/mifluz/Makefile
@@ -17,7 +17,6 @@ USE_GNOME=	gnomehack
 USE_BISON=	build
 USE_ICONV=	yes
 USE_AUTOTOOLS=	libtool
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--without-unac
 USE_LDCONFIG=	yes
 
@@ -31,8 +30,8 @@ MAN3=		WordContext.3 WordList.3 WordDict.3 WordListOne.3 \
 		WordCursorOne.3 WordMonitor.3 Configuration.3 mifluz.3
 INFO=		mifluz
 
-CPPFLAGS=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|-D_THREAD_SAFE -pthread|${PTHREAD_CFLAGS}|g' \
diff --git textproc/modlogan/Makefile textproc/modlogan/Makefile
index 147a0d3..f2c3246 100644
--- textproc/modlogan/Makefile
+++ textproc/modlogan/Makefile
@@ -39,7 +39,8 @@ CONFIGURE_ARGS+=--enable-ltdl-install=no --with-gd=${LOCALBASE}/include \
 .if defined(WITH_MYSQL)
 CONFIGURE_ARGS+=--with-mysql
 .endif
-CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 MAN1=		modlogan.1
 DOC1=		faq.txt glosar manual.txt translations.txt \
diff --git textproc/msort/Makefile textproc/msort/Makefile
index 044c35e..4139af8 100644
--- textproc/msort/Makefile
+++ textproc/msort/Makefile
@@ -19,8 +19,9 @@ LIB_DEPENDS=	tre:${PORTSDIR}/textproc/libtre \
 		utf8proc:${PORTSDIR}/textproc/utf8proc
 RUN_DEPENDS=	iwidgets>=0:${PORTSDIR}/x11-toolkits/iwidgets
 
-CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib" CPPFLAGS="-I${LOCALBASE}/include" \
-		ac_cv_lib_tre_regwcomp=yes
+CONFIGURE_ENV=	ac_cv_lib_tre_regwcomp=yes
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 MAKE_ENV+=	INCLUDES="-I${LOCALBASE}/include"
 GNU_CONFIGURE=	yes
 USE_TK_RUN=	yes
diff --git textproc/openjade/Makefile textproc/openjade/Makefile
index 955b686..8afe604 100644
--- textproc/openjade/Makefile
+++ textproc/openjade/Makefile
@@ -56,7 +56,6 @@ post-install:
 # Therefore, we'd better remove all machine optimizations and any -O
 # other than -O{0,1,}. Idea taken from palm/prc-tools-gcc.
 CPPFLAGS:=	-O ${CFLAGS:N-O*:N-m*}
-LDFLAGS=	-L${LOCALBASE}/lib
-CONFIGURE_ENV=	LDFLAGS="${LDFLAGS}"
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .include <bsd.port.post.mk>
diff --git textproc/opensp/Makefile textproc/opensp/Makefile
index edcb517..118e906 100644
--- textproc/opensp/Makefile
+++ textproc/opensp/Makefile
@@ -22,8 +22,8 @@ USE_PERL5=	yes
 CONFIGURE_ARGS=	--enable-default-catalog=${PREFIX}/share/sgml/catalog \
 		--datadir=${PREFIX}/share/sgml/openjade \
 		--disable-doc-build
-CONFIGURE_ENV=	CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
-		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
+LDFLAGS+=	-L${LOCALBASE}/lib
+CFLAGS+=	-I${LOCALBASE}/include
 
 .if defined(WITHOUT_NLS)
 CONFIGURE_ARGS+=--disable-nls
diff --git textproc/ots/Makefile textproc/ots/Makefile
index ad476f7..90d9795 100644
--- textproc/ots/Makefile
+++ textproc/ots/Makefile
@@ -23,7 +23,6 @@ USE_AUTOTOOLS=	libtool
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--disable-shared
 MAKE_ARGS=	pkgconfigdir="${PREFIX}/libdata/pkgconfig"
 MAKE_JOBS_UNSAFE=yes
diff --git textproc/p5-XML-Xerces/Makefile textproc/p5-XML-Xerces/Makefile
index a66ef90..3adcb6c 100644
--- textproc/p5-XML-Xerces/Makefile
+++ textproc/p5-XML-Xerces/Makefile
@@ -27,6 +27,6 @@ PERL_CONFIGURE=	YES
 CONFIGURE_ENV+=	XERCES_LIB="${LOCALBASE}/lib" \
 		XERCES_INCLUDE="${LOCALBASE}/include" \
 		XERCES_DEVEL="YES" \
-		CXX="g++" \
+		CXX="g++"
 
 .include <bsd.port.mk>
diff --git textproc/pecl-ctemplate/Makefile textproc/pecl-ctemplate/Makefile
index 85e5745..b4b545d 100644
--- textproc/pecl-ctemplate/Makefile
+++ textproc/pecl-ctemplate/Makefile
@@ -25,8 +25,8 @@ USE_PHPEXT=	yes
 DEFAULT_PHP_VER=	5
 IGNORE_WITH_PHP=	4
 
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib ${EXTRA_LIBS}"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib ${EXTRA_LIBS}
 
 CONFIGURE_ARGS=	--with-cTemplate=${LOCALBASE}
 
diff --git textproc/pecl-xdiff/Makefile textproc/pecl-xdiff/Makefile
index 8f84c93..4418ce6 100644
--- textproc/pecl-xdiff/Makefile
+++ textproc/pecl-xdiff/Makefile
@@ -22,7 +22,6 @@ USE_PHP=	yes
 USE_PHPEXT=	yes
 
 LDFLAGS+=	-L${LOCALBASE}/lib
-CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS}"
 
 post-configure:
 	echo "#define HAVE_XDL_ALLOCATOR_PRIV 1" >>${WRKSRC}/config.h
diff --git textproc/py-enchant/Makefile textproc/py-enchant/Makefile
index 0fa0a25..ddf4f9a 100644
--- textproc/py-enchant/Makefile
+++ textproc/py-enchant/Makefile
@@ -25,6 +25,6 @@ WX_COMPS=	python:run
 
 PYDISTUTILS_PKGNAME=	pyenchant
 
-MAKE_ENV+=	LDFLAGS="-L${LOCALBASE}/lib"
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .include <bsd.port.mk>
diff --git textproc/py-hyperestraier/Makefile textproc/py-hyperestraier/Makefile
index a09e25e..dee3791 100644
--- textproc/py-hyperestraier/Makefile
+++ textproc/py-hyperestraier/Makefile
@@ -27,7 +27,6 @@ PYDISTUTILS_PKGVERSION=	0.01
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
-MAKE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 
 pre-patch:
 	@${REINPLACE_CMD} -e 's|PYTHON = python|PYTHON = ${PYTHON_VERSION}|' \
diff --git textproc/rarian/Makefile textproc/rarian/Makefile
index 223fdef..403f488 100644
--- textproc/rarian/Makefile
+++ textproc/rarian/Makefile
@@ -37,8 +37,8 @@ USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--with-convert-dir=${LOCALBASE}/share/omf \
 		--datadir=${PREFIX}/share \
 		--localstatedir=/var
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/lib/rarian|/db/rarian|' \
diff --git textproc/rasqal/Makefile textproc/rasqal/Makefile
index 008b1a8..00ff3b2 100644
--- textproc/rasqal/Makefile
+++ textproc/rasqal/Makefile
@@ -23,9 +23,8 @@ USE_OPENSSL=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 
-CPPFLAGS=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--with-raptor=system
 
 USE_LDCONFIG=	yes
diff --git textproc/rast/Makefile textproc/rast/Makefile
index f653161..b503a36 100644
--- textproc/rast/Makefile
+++ textproc/rast/Makefile
@@ -31,7 +31,8 @@ CONFIGURE_ARGS=	\
 	--with-ruby=${LOCALBASE}/bin/ruby \
 	--with-default-encoding=${DEFAULT_ENCODING} \
 	--with-filter-moduledir=${PREFIX}/lib/rast/filters
-CONFIGURE_ENV=	CFLAGS="${CFLAGS} -I${LOCALBASE}/include" LDFLAGS="-lz"
+LDFLAGS+=	-lz
+CFLAGS+=	-I${LOCALBASE}/include
 USE_LDCONFIG=	YES
 MAKE_JOBS_UNSAFE=	yes
 
diff --git textproc/redland/Makefile textproc/redland/Makefile
index d6d5a29..faf995f 100644
--- textproc/redland/Makefile
+++ textproc/redland/Makefile
@@ -26,9 +26,8 @@ USE_OPENSSL=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 
-CPPFLAGS=	-I${BDB_INCLUDE_DIR} -I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
+CPPFLAGS+=	-I${BDB_INCLUDE_DIR} -I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--with-raptor=system \
 		--with-threestore=no
 
diff --git textproc/sablotron/Makefile textproc/sablotron/Makefile
index 5df3474..ee9247b 100644
--- textproc/sablotron/Makefile
+++ textproc/sablotron/Makefile
@@ -27,8 +27,9 @@ USE_LDCONFIG=	yes
 SHLIB_MAJOR=	70	# API changes counter
 PLIST_SUB+=	SHLIB_MAJOR="${SHLIB_MAJOR}"
 
-CONFIGURE_ENV=	CPPFLAGS=-I${LOCALBASE}/include LIBTOOL=${LIBTOOL} \
-		LDFLAGS="-L${LOCALBASE}/lib -lexpat -liconv"
+CONFIGURE_ENV=	LIBTOOL=${LIBTOOL}
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib -lexpat -liconv
 USE_AUTOTOOLS=	libtool
 USE_GMAKE=	yes
 USE_ICONV=	yes
diff --git textproc/sagasu/Makefile textproc/sagasu/Makefile
index 281f010..3540030 100644
--- textproc/sagasu/Makefile
+++ textproc/sagasu/Makefile
@@ -17,8 +17,8 @@ USE_GNOME=	gnomehack gnomeprefix libgnomeui
 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=		sagasu.1
 
diff --git textproc/scew/Makefile textproc/scew/Makefile
index 0f499bc..be8b9dc 100644
--- textproc/scew/Makefile
+++ textproc/scew/Makefile
@@ -20,8 +20,8 @@ USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
 USE_GNOME=	gnomehack
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 SCEW_EXAMPLES=	print stream write
 
diff --git textproc/scim-input-pad/Makefile textproc/scim-input-pad/Makefile
index a8309e4..acd00fa 100644
--- textproc/scim-input-pad/Makefile
+++ textproc/scim-input-pad/Makefile
@@ -21,8 +21,8 @@ RUN_DEPENDS=	${BUILD_DEPENDS}
 USE_LDCONFIG=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include -D__STDC_ISO_10646__" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include -D__STDC_ISO_10646__
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 DESKTOP_ENTRIES="SCIM Input Pad" \
 		"${COMMENT}" \
diff --git textproc/scim-kmfl-imengine/Makefile textproc/scim-kmfl-imengine/Makefile
index 75e7b8b..1ff4b45 100644
--- textproc/scim-kmfl-imengine/Makefile
+++ textproc/scim-kmfl-imengine/Makefile
@@ -33,7 +33,6 @@ USE_ICONV=	yes
 USE_LDCONFIG=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
-CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS}"
 
 DOCSDIR=	${PREFIX}/share/doc/kmfl/${PORTNAME}
 PORTDOCS=	AUTHORS COPYING ChangeLog
diff --git textproc/scim-openvanilla/Makefile textproc/scim-openvanilla/Makefile
index 8def822..ec9135a 100644
--- textproc/scim-openvanilla/Makefile
+++ textproc/scim-openvanilla/Makefile
@@ -28,8 +28,8 @@ USE_GNOME=	pkgconfig
 USE_GETTEXT=	yes
 USE_ICONV=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV+=	CPPFLAGS=-I${LOCALBASE}/include	\
-		OV_MODULEDIR=${PREFIX}/lib/openvanilla/
+CONFIGURE_ENV+=	OV_MODULEDIR=${PREFIX}/lib/openvanilla/
+CPPFLAGS+=	-I${LOCALBASE}/include	
 
 PLIST_FILES=	lib/scim-1.0/1.4.0/IMEngine/OVLoader-SCIM.a	\
 		lib/scim-1.0/1.4.0/IMEngine/OVLoader-SCIM.la	\
diff --git textproc/scim-table-imengine/Makefile textproc/scim-table-imengine/Makefile
index 48d330a..cc7d6d3 100644
--- textproc/scim-table-imengine/Makefile
+++ textproc/scim-table-imengine/Makefile
@@ -27,10 +27,10 @@ MAN1=		scim-make-table.1
 
 .include <bsd.port.pre.mk>
 
-CPPFLAGS=	-I${LOCALBASE}/include -D__STDC_ISO_10646__
+CPPFLAGS+=	-I${LOCALBASE}/include -D__STDC_ISO_10646__
 
-CONFIGURE_ENV+=	LDFLAGS="-L${LOCALBASE}/lib -lintl" \
-		PREFIX="${PREFIX}"
+CONFIGURE_ENV+=	PREFIX="${PREFIX}"
+LDFLAGS+=	-L${LOCALBASE}/lib -lintl
 
 PLIST_SUB=	SKIM="@comment "
 
diff --git textproc/scim/Makefile textproc/scim/Makefile
index ca20d92..588b8fe 100644
--- textproc/scim/Makefile
+++ textproc/scim/Makefile
@@ -27,8 +27,8 @@ CONFIGURE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 
 .include <bsd.port.pre.mk>
 
-CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include -D__STDC_ISO_10646__" \
-		LDFLAGS="-L${LOCALBASE}/lib -lintl"
+CPPFLAGS+=	-I${LOCALBASE}/include -D__STDC_ISO_10646__
+LDFLAGS+=	-L${LOCALBASE}/lib -lintl
 
 post-patch:
 	${REINPLACE_CMD} -e '/^libscim@SCIM_EPOCH@_la_LDFLAGS/s|=|= ${PTHREAD_LIBS}|' \
diff --git textproc/scrollkeeper/Makefile textproc/scrollkeeper/Makefile
index 63a7fdb..5fd8b35 100644
--- textproc/scrollkeeper/Makefile
+++ textproc/scrollkeeper/Makefile
@@ -39,9 +39,9 @@ USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--localstatedir=/var --datadir=${PREFIX}/share \
 		--with-omfdirs=${PREFIX}/share/omf \
 		--with-xml-catalog=${LOCALBASE}/share/xml/catalog.ports
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib -lintl" \
+CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib -lintl" \
 		LOCALBASE="${LOCALBASE}"
+CPPFLAGS+=	-I${LOCALBASE}/include
 PLIST_SUB=	LOCALBASE=${LOCALBASE}
 
 MAN1=	scrollkeeper-config.1 scrollkeeper-gen-seriesid.1
diff --git textproc/sdcv/Makefile textproc/sdcv/Makefile
index 701e0ce..18c49bc 100644
--- textproc/sdcv/Makefile
+++ textproc/sdcv/Makefile
@@ -25,7 +25,6 @@ USE_GETTEXT=	yes
 PLIST_SUB+=	NLS=""
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
-CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 .else
 CONFIGURE_ARGS+=--disable-nls
 PLIST_SUB+=	NLS="@comment "
diff --git textproc/senna/Makefile textproc/senna/Makefile
index 7e70623..1183c31 100644
--- textproc/senna/Makefile
+++ textproc/senna/Makefile
@@ -19,7 +19,7 @@ GNU_CONFIGURE=	YES
 USE_GMAKE=	YES
 USE_LDCONFIG=	YES
 CONFIGURE_ARGS=	--with-sennahome=${SENNA_HOME}
-CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 MAKE_ARGS=	CFLAGS="${CFLAGS} -I${LOCALBASE}/include ${PTHREAD_CFLAGS}"
 WRKSRC=		${WRKDIR}/${DISTNAME}
 
diff --git textproc/skim/Makefile textproc/skim/Makefile
index c540a38..4848ab6 100644
--- textproc/skim/Makefile
+++ textproc/skim/Makefile
@@ -26,10 +26,9 @@ PYDISTUTILS_NOEGGINFO=	yes
 
 CONFIGURE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		PTHREAD_LIBS="${PTHREAD_LIBS}" \
-		PREFIX="${PREFIX}" \
-		CXXFLAGS="-I${LOCALBASE}/include -D__STDC_ISO_10646__ ${CFLAGS}" \
-		LDFLAGS="-L${LOCALBASE}/lib -lintl"
-
+		PREFIX="${PREFIX}"
+LDFLAGS+=	-L${LOCALBASE}/lib -lintl
+CXXFLAGS+=	-I${LOCALBASE}/include -D__STDC_ISO_10646__ ${CFLAGS}
 
 .include <bsd.port.pre.mk>
 
diff --git textproc/soothsayer/Makefile textproc/soothsayer/Makefile
index 755935a..1de3aff 100644
--- textproc/soothsayer/Makefile
+++ textproc/soothsayer/Makefile
@@ -18,8 +18,7 @@ BUILD_DEPENDS=	help2man:${PORTSDIR}/misc/help2man
 USE_GNOME=	pkgconfig
 USE_SQLITE=	3
 USE_AUTOTOOLS=	libtool
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \
-		ac_cv_path_CPPUNIT_CONFIG=no \
+CONFIGURE_ENV=	ac_cv_path_CPPUNIT_CONFIG=no \
 		ac_cv_path_PYTHON=no \
 		ac_cv_path_SWIG=no \
 		ac_cv_prog_HAVE_DOT=no \
@@ -30,8 +29,8 @@ USE_LDCONFIG=	yes
 MAN1=		soothsayer_demo.1 soothsayer_demo_text.1 \
 		soothsayer_simulator.1 text2ngram.1
 
-CPPFLAGS=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 PORT_VERBS=	${PORTNAME} text2ngram
 
diff --git textproc/source-highlight/Makefile textproc/source-highlight/Makefile
index 6b69794..2a33015 100644
--- textproc/source-highlight/Makefile
+++ textproc/source-highlight/Makefile
@@ -20,7 +20,6 @@ LIB_DEPENDS=	boost_regex:${PORTSDIR}/devel/boost-libs
 GNU_CONFIGURE=	yes
 LDFLAGS+=	-L${LOCALBASE}/lib
 CPPFLAGS+=	-I${LOCALBASE}/include
-CONFIGURE_ENV=	LDFLAGS="${LDFLAGS}" CPPFLAGS="${CPPFLAGS}"
 
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
diff --git textproc/spellutils/Makefile textproc/spellutils/Makefile
index a572e31..36440b8 100644
--- textproc/spellutils/Makefile
+++ textproc/spellutils/Makefile
@@ -18,9 +18,9 @@ COMMENT=	Programs used to isolate some parts or texts before spell-checking
 GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
 USE_GETTEXT=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include"	\
-		LIBS='-L${LOCALBASE}/lib'		\
-		LDFLAGS=-lintl
+CONFIGURE_ENV=		LIBS='-L${LOCALBASE}/lib'
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-lintl
 
 MAN1=		pospell.1 newsbody.1
 
diff --git textproc/sphinxsearch-devel/Makefile textproc/sphinxsearch-devel/Makefile
index bf3413f..9b8d734 100644
--- textproc/sphinxsearch-devel/Makefile
+++ textproc/sphinxsearch-devel/Makefile
@@ -94,7 +94,7 @@ SPHINX_LOG?=	/var/log/${PORTNAME}
 # don't ask.
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV+=	CC=${CC} CPPFLAGS="${CXXFLAGS}"
+CPPFLAGS+=	${CXXFLAGS}
 CFGFILE=	${PREFIX}/etc/sphinx.conf
 USE_RC_SUBR=	sphinxsearch.sh
 SUB_LIST+=	PORTNAME=${PORTNAME}	 \
diff --git textproc/sphinxsearch/Makefile textproc/sphinxsearch/Makefile
index c270be9..5351de6 100644
--- textproc/sphinxsearch/Makefile
+++ textproc/sphinxsearch/Makefile
@@ -111,7 +111,7 @@ SPHINX_LOG?=	/var/log/${PORTNAME}
 # don't ask.
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV+=		CC=${CC} CPPFLAGS="${CXXFLAGS}"
+CPPFLAGS+=	${CXXFLAGS}
 CFGFILE=	${PREFIX}/etc/sphinx.conf
 USE_RC_SUBR=	sphinxsearch.sh
 SUB_LIST+=	PORTNAME=${PORTNAME}     \
diff --git textproc/stardict2/Makefile textproc/stardict2/Makefile
index 39a84a9..439c5bc 100644
--- textproc/stardict2/Makefile
+++ textproc/stardict2/Makefile
@@ -16,8 +16,8 @@ MAINTAINER=	delphij@FreeBSD.org
 COMMENT=	A cross-platform and international dictionary written in Gtk2
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
 USE_GMAKE=	yes
 USE_BZIP2=	yes
 USE_GNOME=	gnomehack gnomeprefix
diff --git textproc/teckit/Makefile textproc/teckit/Makefile
index 4448e30..17168e7 100644
--- textproc/teckit/Makefile
+++ textproc/teckit/Makefile
@@ -19,8 +19,8 @@ LIB_DEPENDS=	expat.6:${PORTSDIR}/textproc/expat2
 
 USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
-CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 DOCS=		AUTHORS README NEWS docs/*.pdf license/LICENSING.txt
 
diff --git textproc/uim-el/Makefile textproc/uim-el/Makefile
index daa7325..a45d97c 100644
--- textproc/uim-el/Makefile
+++ textproc/uim-el/Makefile
@@ -35,8 +35,9 @@ BUILD_WRKSRC=	${WRKSRC}/emacs
 INSTALL_WRKSRC=	${WRKSRC}/emacs
 
 CONFIGURE_ARGS?=--enable-emacs --with-lispdir=${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}
-CONFIGURE_ENV=	EMACS="${EMACS_CMD}" CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
+CONFIGURE_ENV=	EMACS="${EMACS_CMD}" \
 		LIBS="${LIBS} -L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
 
 DOCSDIR_JA=	${PREFIX}/share/doc/ja/uim-el
 PLIST_SUB+=	DOCSDIR_JA="${DOCSDIR_JA:S,^${PREFIX}/,,}"
diff --git textproc/uim-gnome/Makefile textproc/uim-gnome/Makefile
index 7ab7f3a..d041cdf 100644
--- textproc/uim-gnome/Makefile
+++ textproc/uim-gnome/Makefile
@@ -15,8 +15,8 @@ RUN_DEPENDS=	uim-pref-gtk:${PORTSDIR}/textproc/uim-gtk
 
 MASTERDIR=	${.CURDIR}/../../textproc/uim
 PKGDIR=		${.CURDIR}
-CONFIGURE_ENV=	CPPFLAGS="`pkg-config --cflags libgnomeui-2.0`" \
-		LIBS="`pkg-config --libs libgnomeui-2.0`"
+CONFIGURE_ENV=	LIBS="`pkg-config --libs libgnomeui-2.0`"
+CPPFLAGS+=	`pkg-config --cflags libgnomeui-2.0`
 CONFIGURE_ARGS=	--with-gtk2 --enable-gnome-applet
 
 UIM_SLAVE=	yes
diff --git textproc/uim-kde/Makefile textproc/uim-kde/Makefile
index 9b3e9cc..944b6ff 100644
--- textproc/uim-kde/Makefile
+++ textproc/uim-kde/Makefile
@@ -22,11 +22,10 @@ PKGDIR=		${.CURDIR}
 CONFIGURE_ARGS=	--with-qt --enable-pref --enable-default-toolkit=qt \
 		--enable-kde-applet
 CONFIGURE_ENV=	QTDIR=${LOCALBASE}/lib QTINCDIR=${LOCALBASE}/include \
-		CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
-		CXX="${CXX}" \
-		CXXFLAGS="${CXXFLAGS} ${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \
-		LIBS="${LIBS} ${PTHREAD_LIBS} -L${LOCALBASE}/lib" \
-		LDFLAGS="${LDFLAGS} ${PTHREAD_LIBS} -L${LOCALBASE}/lib"
+		LIBS="${LIBS} ${PTHREAD_LIBS} -L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	${PTHREAD_LIBS} -L${LOCALBASE}/lib
+CXXFLAGS+=	${PTHREAD_CFLAGS} -I${LOCALBASE}/include
 UIM_SLAVE=	yes
 
 EXTRA_PATCHES=	${PATCHDIR}/extra-patch-qt_Makefile.in
diff --git textproc/uim-kde4/Makefile textproc/uim-kde4/Makefile
index 2d452af..8c56fab 100644
--- textproc/uim-kde4/Makefile
+++ textproc/uim-kde4/Makefile
@@ -23,10 +23,10 @@ MASTERDIR=	${.CURDIR}/../../textproc/uim
 PKGDIR=		${.CURDIR}
 CONFIGURE_ARGS=	--with-qt4 --enable-pref --enable-default-toolkit=qt4 \
 		--enable-kde4-applet
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
-	CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
-	LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" \
-	KDE4_CONFIG="${KDE4_PREFIX}/bin/kde4-config"
+CONFIGURE_ENV=	KDE4_CONFIG="${KDE4_PREFIX}/bin/kde4-config"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
+CFLAGS+=	-I${LOCALBASE}/include
 UIM_SLAVE=	yes
 
 EXTRA_PATCHES=	${PATCHDIR}/extra-patch-qt4_toolbar_CMakeLists.txt
diff --git textproc/uim-qt/Makefile textproc/uim-qt/Makefile
index 207f926..002a264 100644
--- textproc/uim-qt/Makefile
+++ textproc/uim-qt/Makefile
@@ -19,10 +19,10 @@ PKGDIR=		${.CURDIR}
 CONFIGURE_ARGS=	--with-qt --enable-pref --enable-default-toolkit=qt \
 		--disable-kde-applet
 CONFIGURE_ENV=	QTDIR=${LOCALBASE}/lib QTINCDIR=${LOCALBASE}/include \
-		CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
-		CXXFLAGS="${CXXFLAGS} ${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \
-		LIBS="${LIBS} ${PTHREAD_LIBS} -L${LOCALBASE}/lib" \
-		LDFLAGS="${LDFLAGS} ${PTHREAD_LIBS} -L${LOCALBASE}/lib"
+		LIBS="${LIBS} ${PTHREAD_LIBS} -L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	${PTHREAD_LIBS} -L${LOCALBASE}/lib
+CXXFLAGS+=	${PTHREAD_CFLAGS} -I${LOCALBASE}/include
 UIM_SLAVE=	yes
 
 EXTRA_PATCHES=	${PATCHDIR}/extra-patch-qt_Makefile.in \
diff --git textproc/uim-qt4/Makefile textproc/uim-qt4/Makefile
index 9be3f42..dac05fa 100644
--- textproc/uim-qt4/Makefile
+++ textproc/uim-qt4/Makefile
@@ -20,10 +20,10 @@ MASTERDIR=	${.CURDIR}/../../textproc/uim
 PKGDIR=		${.CURDIR}
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--with-qt4 --with-qt4-immodule
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
-	CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
-	LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" \
-	DATADIRNAME="share"
+CONFIGURE_ENV=	DATADIRNAME="share"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
+CFLAGS+=	-I${LOCALBASE}/include
 UIM_SLAVE=	yes
 
 .if defined(WITHOUT_X11)
diff --git textproc/uim/Makefile textproc/uim/Makefile
index d1d728b..31cb757 100644
--- textproc/uim/Makefile
+++ textproc/uim/Makefile
@@ -40,9 +40,9 @@ CONFIGURE_ARGS+=	--with-gtk2
 CONFIGURE_ARGS+=	--enable-emacs --with-sj3 --with-canna --with-prime
 .endif
 
-CONFIGURE_ENV?=	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
-		CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
-		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
+CFLAGS+=	-I${LOCALBASE}/include
 
 .if !defined(UIM_SLAVE)
 .if !defined(WITHOUT_X11)
diff --git textproc/unrtf/Makefile textproc/unrtf/Makefile
index 121521c..2f5c2c6 100644
--- textproc/unrtf/Makefile
+++ textproc/unrtf/Makefile
@@ -17,7 +17,6 @@ LICENSE=	GPLv3
 USE_ICONV=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--libdir=${PREFIX}/share
 
 MAN1=		unrtf.1
diff --git textproc/webcpp/Makefile textproc/webcpp/Makefile
index 1eca4fb..83ab133 100644
--- textproc/webcpp/Makefile
+++ textproc/webcpp/Makefile
@@ -17,7 +17,8 @@ COMMENT=	Convert your source code to syntax highlighted HTML
 .include <bsd.port.pre.mk>
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .if defined(WANT_FINAL)
 CONFIGURE_ARGS+=	--enable-final
diff --git textproc/wv/Makefile textproc/wv/Makefile
index 359de7c..b93ee63 100644
--- textproc/wv/Makefile
+++ textproc/wv/Makefile
@@ -20,7 +20,7 @@ USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
-CONFIGURE_ENV=	LDFLAGS="${LDFLAGS}" MKDIR_P="${MKDIR}"
+CONFIGURE_ENV=	MKDIR_P="${MKDIR}"
 CONFIGURE_ARGS=	--with-png=${LOCALBASE} \
 		--with-libwmf=${LOCALBASE}
 MAKEFILE=	GNUmakefile
diff --git textproc/xalan-c/Makefile textproc/xalan-c/Makefile
index 9d31016..fcadeb6 100644
--- textproc/xalan-c/Makefile
+++ textproc/xalan-c/Makefile
@@ -107,8 +107,7 @@ MAKE_ENV+=		ICUROOT=${ICUROOT}
 PLIST_SUB+=		ICUDEP=""
 .else
 USE_ICONV=		yes
-CONFIGURE_ENV+=		LDFLAGS='-L${LOCALBASE}/lib -liconv'
-MAKE_ENV+=		LDFLAGS='-L${LOCALBASE}/lib -liconv'
+LDFLAGS+=		-L${LOCALBASE}/lib -liconv
 PLIST_SUB+=		ICUDEP="@comment "
 .endif
 
diff --git textproc/xls2xml/Makefile textproc/xls2xml/Makefile
index 655cb32..d07adcf 100644
--- textproc/xls2xml/Makefile
+++ textproc/xls2xml/Makefile
@@ -22,8 +22,8 @@ LIB_DEPENDS=	cole.2:${PORTSDIR}/textproc/cole \
 USE_AUTOTOOLS=	libtool
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib -lcole"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib -lcole
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|$${CONFIG_SHELL-/bin/sh} $$ac_aux_dir|$$ac_aux_dir|' \
diff --git textproc/xmlroff/Makefile textproc/xmlroff/Makefile
index 6c99c05..c20e1f1 100644
--- textproc/xmlroff/Makefile
+++ textproc/xmlroff/Makefile
@@ -24,7 +24,7 @@ USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-gtk-doc \
 		--with-html-dir=${PREFIX}/share/doc
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .include <bsd.port.mk>
diff --git textproc/xqilla/Makefile textproc/xqilla/Makefile
index f9dd982..f7cbd43 100644
--- textproc/xqilla/Makefile
+++ textproc/xqilla/Makefile
@@ -21,6 +21,6 @@ USE_GMAKE=	yes
 USE_PERL5=	yes
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include"
+CPPFLAGS+=	-I${LOCALBASE}/include
 
 .include <bsd.port.mk>
diff --git www/apache13+ipv6/Makefile www/apache13+ipv6/Makefile
index 71f1ca2..f673fce 100644
--- www/apache13+ipv6/Makefile
+++ www/apache13+ipv6/Makefile
@@ -140,8 +140,8 @@ CONFIGURE_ENV=	OPTIM='${OPTIM}' LD_SHLIB='${CC}' LIBS='${LIBS}'
 
 .if !defined(WITHOUT_APACHE_EXPAT) && !defined(WITH_APACHE_INTERNAL_EXPAT)
 CONFIGURE_ENV+=	\
-		INCLUDES=-I${LOCALBASE}/include \
-		LDFLAGS=-L${LOCALBASE}/lib
+		INCLUDES=-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 .endif
 
 MAN1=		dbmmanage.1 htdigest.1 htpasswd.1
diff --git www/apache13-modperl/Makefile www/apache13-modperl/Makefile
index 51de570..3e0fef8 100644
--- www/apache13-modperl/Makefile
+++ www/apache13-modperl/Makefile
@@ -122,7 +122,7 @@ OPTIM+=		-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
 CFLAGS=		-I${LOCALBASE}/include
 LIBS+=		-L${LOCALBASE}/lib
 
-CONFIGURE_ENV=	OPTIM='${OPTIM}' LIBS='${LIBS}' \
+CONFIGURE_ENV=	OPTIM='${OPTIM}' LIBS='${LIBS}'
 
 MAN1=	dbmmanage.1 htdigest.1 htpasswd.1
 
diff --git www/apache13-modssl/Makefile www/apache13-modssl/Makefile
index cea4e55..737d451 100644
--- www/apache13-modssl/Makefile
+++ www/apache13-modssl/Makefile
@@ -293,9 +293,7 @@ EXTRA_PATCHES+=	${FILESDIR}/logresolve.c.patch
 EXTRA_PATCHES+=	${FILESDIR}/rotatelogs.c.patch
 .endif
 
-CONFIGURE_ENV=	CFLAGS='${CFLAGS}' \
-		LDFLAGS='${LDFLAGS}' \
-		OPTIM='${OPTIM}' \
+CONFIGURE_ENV=	OPTIM='${OPTIM}' \
 		SSL_BASE='${OPENSSLBASE}' \
 		EAPI_MM='SYSTEM' \
 		PATH="${PREFIX}/bin:${PATH}"
diff --git www/apache13/Makefile www/apache13/Makefile
index 33d0d42..dead6cc 100644
--- www/apache13/Makefile
+++ www/apache13/Makefile
@@ -141,8 +141,8 @@ CONFIGURE_ENV=	OPTIM='${OPTIM}' LD_SHLIB='${CC}' LIBS='${LIBS}'
 
 .if !defined(WITHOUT_APACHE_EXPAT) && !defined(WITH_APACHE_INTERNAL_EXPAT)
 CONFIGURE_ENV+=	\
-		INCLUDES=-I${LOCALBASE}/include \
-		LDFLAGS=-L${LOCALBASE}/lib
+		INCLUDES=-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 .endif
 
 MAN1=		dbmmanage.1 htdigest.1 htpasswd.1
diff --git www/apache20/Makefile www/apache20/Makefile
index 8d91124..19616ae 100644
--- www/apache20/Makefile
+++ www/apache20/Makefile
@@ -84,9 +84,6 @@ CONFIGURE_ARGS=	--prefix=${PREFIX_RELDEST} \
 		--includedir=${PREFIX_RELDEST}/include/apache2
 
 CONFIGURE_ENV=	\
-	CC="${CC}" \
-	CPPFLAGS="${CPPFLAGS}" \
-	LDFLAGS="${LDFLAGS}" \
 	CONFIG_SHELL="${SH}" \
 	LOCALBASE="${LOCALBASE}"
 
diff --git www/apache22/Makefile www/apache22/Makefile
index 379d94b..6fdea35 100644
--- www/apache22/Makefile
+++ www/apache22/Makefile
@@ -82,10 +82,7 @@ CONFIGURE_ARGS=	--prefix=${PREFIX_RELDEST} \
 		--with-apr=${LOCALBASE}/bin/apr-1-config \
 		--with-apr-util=${LOCALBASE}/bin/apu-1-config
 
-CONFIGURE_ENV= \
-		CC="${CC}" \
-		CPPFLAGS="${CPPFLAGS}" \
-		LDFLAGS="${LDFLAGS}" \
+CONFIGURE_ENV=	\
 		CONFIG_SHELL="${SH}" \
 		LOCALBASE="${LOCALBASE}"
 
diff --git www/aria/Makefile www/aria/Makefile
index 92d2106..717857e 100644
--- www/aria/Makefile
+++ www/aria/Makefile
@@ -28,11 +28,10 @@ USE_GNOME=	gtk12
 USE_OPENSSL=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 PORTDOCS=	README README.euc
 
-CPPFLAGS=	-I${LOCALBASE}/include -DHAVE_DECL_GETOPT
-LDFLAGS=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include -DHAVE_DECL_GETOPT
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 post-extract:
 	@${RM} -f ${WRKSRC}/src/getopt*
diff --git www/awffull/Makefile www/awffull/Makefile
index 07330bd..bffe79a 100644
--- www/awffull/Makefile
+++ www/awffull/Makefile
@@ -34,10 +34,9 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--with-font-default=${FONTDEFAULT} \
 		--with-font-label=${FONTLABEL} \
 		--with-etcdir=${PREFIX}/etc
-CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 
-CPPFLAGS=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 MAN1=		awffull.1
 MAN5=		awffull.conf.5
diff --git www/bluefish-devel/Makefile www/bluefish-devel/Makefile
index e28b472a..004320a 100644
--- www/bluefish-devel/Makefile
+++ www/bluefish-devel/Makefile
@@ -37,8 +37,8 @@ USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gtk20 gnomevfs2 gnomemimedata desktopfileutils
 WANT_GNOME=	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-freedesktop_org-menu=${PREFIX}/share/applications \
 		--with-freedesktop_org-mime=${PREFIX}/share/mime \
 		--without-gnome2_4-mime \
diff --git www/bluefish/Makefile www/bluefish/Makefile
index 2a9ff73..19057cf 100644
--- www/bluefish/Makefile
+++ www/bluefish/Makefile
@@ -26,8 +26,8 @@ USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gtk20 gnomevfs2 gnomemimedata desktopfileutils
 WANT_GNOME=	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-freedesktop_org-menu=${PREFIX}/share/applications \
 		--with-freedesktop_org-mime=${PREFIX}/share/mime \
 		--without-gnome2_4-mime \
diff --git www/c-icap/Makefile www/c-icap/Makefile
index 7a01af8..3d68b34 100644
--- www/c-icap/Makefile
+++ www/c-icap/Makefile
@@ -51,8 +51,8 @@ CONFIGURE_ARGS+=	--without-perl
 LIB_DEPENDS+=	clamav.7:${PORTSDIR}/security/clamav
 PLIST_SUB+=	CLAMAV=""
 CONFIGURE_ARGS+=	--with-clamav
-CONFIGURE_ENV=	CFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+LDFLAGS+=	-L${LOCALBASE}/lib
+CFLAGS+=	-I${LOCALBASE}/include
 .else
 PLIST_SUB+=	CLAMAV="@comment "
 CONFIGURE_ARGS+=	--without-clamav
diff --git www/cacheboy15-devel/Makefile www/cacheboy15-devel/Makefile
index 394bcf8..7dd334d 100644
--- www/cacheboy15-devel/Makefile
+++ www/cacheboy15-devel/Makefile
@@ -350,10 +350,6 @@ CONFIGURE_ARGS+=	--enable-err-languages="${SQUID_LANGUAGES}" \
 # Finally, add additional user specified configuration options:
 CONFIGURE_ARGS+=	${SQUID_CONFIGURE_ARGS}
 
-CONFIGURE_ENV+=		CFLAGS="${CFLAGS}" \
-			CPPFLAGS="${CPPFLAGS}"\
-			LDFLAGS="${LDFLAGS}"
-
 PLIST_DIRS=	etc/squid/icons libexec/squid
 PLIST_FILES=	${etc_files:S,^,etc/,} ${icon_files:S,^,etc/squid/icons/,} \
 		${libexec:S,^,libexec/squid/,} ${sbin:S,^,sbin/,}
diff --git www/cacheboy16/Makefile www/cacheboy16/Makefile
index 0707b0e..c36d49f 100644
--- www/cacheboy16/Makefile
+++ www/cacheboy16/Makefile
@@ -353,10 +353,6 @@ CONFIGURE_ARGS+=	--enable-err-languages="${SQUID_LANGUAGES}" \
 # Finally, add additional user specified configuration options:
 CONFIGURE_ARGS+=	${SQUID_CONFIGURE_ARGS}
 
-CONFIGURE_ENV+=		CFLAGS="${CFLAGS}" \
-			CPPFLAGS="${CPPFLAGS}"\
-			LDFLAGS="${LDFLAGS}"
-
 PLIST_DIRS=	etc/squid/icons libexec/squid
 PLIST_FILES=	${etc_files:S,^,etc/,} ${icon_files:S,^,etc/squid/icons/,} \
 		${libexec:S,^,libexec/squid/,} ${sbin:S,^,sbin/,}
diff --git www/cadaver/Makefile www/cadaver/Makefile
index 82a94e2..8ab9836 100644
--- www/cadaver/Makefile
+++ www/cadaver/Makefile
@@ -18,7 +18,6 @@ COMMENT=	Commandline client for DAV
 LIB_DEPENDS=	neon:${PORTSDIR}/www/neon29
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--enable-netrc
 ALL_TARGET=	cadaver
 MAKE_JOBS_SAFE=	yes
@@ -37,8 +36,8 @@ EXTRACT_AFTER_ARGS=	| ${TAR} -xf - \
 		--exclude 'glob.[ch]' --exclude 'mkstemp.[ch]'	\
 		--exclude 'tempname.[ch]' --exclude 'basename.[ch]'
 
-CPPFLAGS=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .if !defined(WITHOUT_OPENSSL)
 USE_OPENSSL=	yes
diff --git www/castget/Makefile www/castget/Makefile
index 8f67dc5..2b380d1 100644
--- www/castget/Makefile
+++ www/castget/Makefile
@@ -21,7 +21,6 @@ USE_LDCONFIG=	yes
 USE_GNOME=	glib20 libxml2
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
-CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--disable-static
 GNU_CONFIGURE=	yes
 
diff --git www/cherokee/Makefile www/cherokee/Makefile
index df8dc7b..0638364 100644
--- www/cherokee/Makefile
+++ www/cherokee/Makefile
@@ -55,9 +55,8 @@ USE_RC_SUBR=	cherokee.sh
 SUB_FILES=	pkg-install pkg-message
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CPPFLAGS=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
+CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 
 CHEROKEE_VARDIR?=	/var
 CHEROKEE_LOGDIR?=	${CHEROKEE_VARDIR}/log
diff --git www/cssed/Makefile www/cssed/Makefile
index 70fa821..3c5b755 100644
--- www/cssed/Makefile
+++ www/cssed/Makefile
@@ -17,8 +17,8 @@ COMMENT=	An application to help CSS style sheets creation and maintenance
 
 USE_GNOME=	gnomehack gtk20 libxml2
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--with-plugin-headers
 
 MAN1=		cssed.1
diff --git www/dillo-i18n/Makefile www/dillo-i18n/Makefile
index 357dece..cb0ab19 100644
--- www/dillo-i18n/Makefile
+++ www/dillo-i18n/Makefile
@@ -39,8 +39,6 @@ USE_ICONV=	yes
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" \
-		LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--enable-cookies --enable-threaded-dns \
 		--libdir=${PREFIX}/libexec
 
diff --git www/dillo/Makefile www/dillo/Makefile
index d40967b..7ae3d16 100644
--- www/dillo/Makefile
+++ www/dillo/Makefile
@@ -28,8 +28,6 @@ USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" \
-		LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--enable-cookies --enable-threaded-dns \
 		--libdir=${PREFIX}/libexec
 .if !defined(WITHOUT_DILLO_IPV6) && !defined(WITHOUT_IPV6)
diff --git www/elinks/Makefile www/elinks/Makefile
index b472c60..4c175ce 100644
--- www/elinks/Makefile
+++ www/elinks/Makefile
@@ -80,7 +80,6 @@ USE_LUA=	5.0
 CONFIGURE_ARGS+=	--with-lua
 CPPFLAGS+=	-I${LUA_INCDIR}
 LDFLAGS+=	-L${LUA_LIBDIR}
-CONFIGURE_ENV+=	"CPPFLAGS=${CPPFLAGS}"
 .else
 CONFIGURE_ARGS+=	--without-lua
 .endif
diff --git www/epiphany-extensions/Makefile www/epiphany-extensions/Makefile
index 76960b1..0a56616 100644
--- www/epiphany-extensions/Makefile
+++ www/epiphany-extensions/Makefile
@@ -27,8 +27,8 @@ USE_GNOME=	gnomeprefix gnomehack intlhack
 INSTALLS_OMF=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	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}
 
 EPHY_EXTENSIONS=really-all
 EPHY_VERSION=	${PORTVERSION:R}
diff --git www/epiphany/Makefile www/epiphany/Makefile
index 82eff47..6893b5b 100644
--- www/epiphany/Makefile
+++ www/epiphany/Makefile
@@ -41,8 +41,8 @@ USE_GMAKE=	yes
 INSTALLS_OMF=	yes
 CONFIGURE_ARGS+=--enable-introspection \
 		--with-ca-file=${LOCALBASE}/share/certs/ca-root-nss.crt
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS} ${EXTRA_CFLAGS}" \
-		LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS} ${EXTRA_LIBS}"
+CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS} ${EXTRA_LIBS}"
+CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS} ${EXTRA_CFLAGS}
 
 GCONF_SCHEMAS=	epiphany-lockdown.schemas epiphany.schemas
 
diff --git www/evolution-webcal/Makefile www/evolution-webcal/Makefile
index 05f7fd3..7cd5dfd 100644
--- www/evolution-webcal/Makefile
+++ www/evolution-webcal/Makefile
@@ -22,8 +22,8 @@ USE_GETTEXT=	yes
 USE_PERL5=	yes
 USE_GNOME=	gnomeprefix gnomehack intlhack evolutiondataserver libgnomeui
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 GCONF_SCHEMAS=	evolution-webcal.schemas
 
diff --git www/ffproxy/Makefile www/ffproxy/Makefile
index a806715..c3a5c92 100644
--- www/ffproxy/Makefile
+++ www/ffproxy/Makefile
@@ -16,8 +16,8 @@ COMMENT=	Filtering HTTP proxy server
 BROKEN=	does not fetch
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
 
 MAN5=	${PORTNAME}.conf.5
 MAN7=	${PORTNAME}.quick.7
diff --git www/flashplugin-mozilla/Makefile www/flashplugin-mozilla/Makefile
index 6214b17..64d7f3a 100644
--- www/flashplugin-mozilla/Makefile
+++ www/flashplugin-mozilla/Makefile
@@ -28,8 +28,8 @@ USE_XORG=	xt x11 xext
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--with-plugin-dir="${WEBPLUGINS_DIR}"
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include"	\
-		LDFLAGS="-L${LOCALBASE}/lib -lXt"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib -lXt
 CONFIGURE_WRKSRC=	${WRKDIR}/${DISTNAME}
 
 USE_WEBPLUGINS=	native
diff --git www/flood/Makefile www/flood/Makefile
index 2edc2cc..9b18c75 100644
--- www/flood/Makefile
+++ www/flood/Makefile
@@ -23,7 +23,7 @@ USE_AUTOTOOLS=	autoconf libtool:env
 CONFIGURE_ARGS=	--disable-shared \
 	--with-apr=${LOCALBASE}/bin/apr-1-config \
 	--with-apr-util=${LOCALBASE}/bin/apu-1-config
-CONFIGURE_ENV=	LDFLAGS="-L${PREFIX}/lib"
+LDFLAGS+=	-L${PREFIX}/lib
 USE_GMAKE=	yes
 USE_ICONV=	yes
 
diff --git www/gecko-mediaplayer/Makefile www/gecko-mediaplayer/Makefile
index b5f6770..23c1762 100644
--- www/gecko-mediaplayer/Makefile
+++ www/gecko-mediaplayer/Makefile
@@ -26,8 +26,8 @@ USE_GECKO=	libxul
 USE_WEBPLUGINS=	native
 WEBPLUGINS_FILES=	${PORTNAME}-dvx.so ${PORTNAME}-qt.so ${PORTNAME}-rm.so \
 				${PORTNAME}-wmp.so ${PORTNAME}.so
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS+=--with-plugin_dir="${WEBPLUGINS_DIR}"
 
 PORTDOCS=	README COPYING AUTHORS ChangeLog INSTALL NEWS javascript.txt
diff --git www/gnome-user-share/Makefile www/gnome-user-share/Makefile
index ebd00c7..8a73017 100644
--- www/gnome-user-share/Makefile
+++ www/gnome-user-share/Makefile
@@ -32,8 +32,8 @@ USE_GNOME=	gnomeprefix gnomehack intlhack gtk20 gconf2 gnomedocutils nautilus2
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
 CONFIGURE_ARGS=	--with-modules-path=${LOCALBASE}/${APACHEMODDIR}
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 GCONF_SCHEMAS=	desktop_gnome_file_sharing.schemas
 
diff --git www/gnome-web-photo/Makefile www/gnome-web-photo/Makefile
index fda516d..97a9f10 100644
--- www/gnome-web-photo/Makefile
+++ www/gnome-web-photo/Makefile
@@ -25,14 +25,13 @@ USE_GNOME=	gconf2 gnomehack gnomeprefix
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--disable-silent-rules \
 		--with-gtk=2.0
 
 GCONF_SCHEMAS=	thumbnailer.schemas
 
-CPPFLAGS=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 post-patch:
 	@${REINPLACE_CMD} -e '/test/s|==|=|g' ${WRKSRC}/configure
diff --git www/gtkhtml3/Makefile www/gtkhtml3/Makefile
index 8bb25d5..4a8c99e 100644
--- www/gtkhtml3/Makefile
+++ www/gtkhtml3/Makefile
@@ -32,8 +32,8 @@ USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack intlhack gconf2 ltverhack
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 PLIST_SUB=	VERSION="3.14"
 
diff --git www/gurlchecker/Makefile www/gurlchecker/Makefile
index 6933971..c9b6d45 100644
--- www/gurlchecker/Makefile
+++ www/gurlchecker/Makefile
@@ -25,8 +25,8 @@ OPTIONS=	CROCO "Use CROCO library for CSS2 validation" off \
 USE_GNOME=	gnomehack gnomeprefix intlhack libgnomeui
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .include <bsd.port.pre.mk>
 
diff --git www/hiawatha/Makefile www/hiawatha/Makefile
index c89746a..d8b71cd 100644
--- www/hiawatha/Makefile
+++ www/hiawatha/Makefile
@@ -27,10 +27,9 @@ WANT_GNOME=	yes
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--localstatedir=/var webrootdir=${WWWDIR}
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 
-CPPFLAGS=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 OPTIONS=	COMMAND "Enable the Hiawatha CommandChannel" Off \
 		CACHE "Internal file caching support" On \
diff --git www/hydra/Makefile www/hydra/Makefile
index cc13b80..713edec 100644
--- www/hydra/Makefile
+++ www/hydra/Makefile
@@ -22,10 +22,9 @@ USE_RC_SUBR=	hydra.sh
 
 NO_LATEST_LINK=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 
-CPPFLAGS=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 LOGDIR?=	/var/log/hydra
 
diff --git www/kannel/Makefile www/kannel/Makefile
index 220c5f3..1d784c3 100644
--- www/kannel/Makefile
+++ www/kannel/Makefile
@@ -36,8 +36,8 @@ OPTIONS=	MYSQL	"Enable MySQL support"		off \
 
 .include <bsd.port.options.mk>
 
-CPPFLAGS=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
+CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 
 .if defined(WITH_MYSQL)
 USE_MYSQL=	yes
diff --git www/kazehakase/Makefile www/kazehakase/Makefile
index fdb7190..c51b11b 100644
--- www/kazehakase/Makefile
+++ www/kazehakase/Makefile
@@ -28,9 +28,9 @@ USE_GECKO=	libxul
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-gecko_engine=${GECKO}
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS} \
-		-I${LOCALBASE}/include/nspr" \
-		LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS} \
+		-I${LOCALBASE}/include/nspr
 MAN1=		kazehakase.1
 OPTIONS=	WEBKIT "Webkit Backend (along with Gecko)" On
 
diff --git www/libepc/Makefile www/libepc/Makefile
index d448981..cb5f18d 100644
--- www/libepc/Makefile
+++ www/libepc/Makefile
@@ -24,8 +24,8 @@ USE_GETTEXT=	yes
 USE_GNOME=	gnomeprefix gnomehack gtk20
 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=	--enable-static
 
 .include <bsd.port.mk>
diff --git www/libgtkhtml/Makefile www/libgtkhtml/Makefile
index 0c619cb..7a48d2e 100644
--- www/libgtkhtml/Makefile
+++ www/libgtkhtml/Makefile
@@ -21,7 +21,7 @@ USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack libxslt gnomevfs2 ltverhack
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=  libtool
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .include <bsd.port.mk>
diff --git www/lighttpd/Makefile www/lighttpd/Makefile
index 0b2fa05..5539ba1 100644
--- www/lighttpd/Makefile
+++ www/lighttpd/Makefile
@@ -37,8 +37,6 @@ CONFIGURE_ARGS+=	--libdir=${PREFIX}/lib/lighttpd --enable-static
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS}"
-
 .if !defined(_BUILDING_LIGHTTPD_MODULE)
 USE_RC_SUBR=	lighttpd.sh
 
diff --git www/links/Makefile www/links/Makefile
index 0aed617..59de9a2 100644
--- www/links/Makefile
+++ www/links/Makefile
@@ -25,7 +25,7 @@ CONFLICTS=	links-0*
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--with-ssl --without-pmshell --without-atheos \
 			--without-gpm --without-fb
-CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include"
+CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 USE_OPENSSL=	yes
diff --git www/lusca-head/Makefile www/lusca-head/Makefile
index 3f30c86..ec3d08a 100644
--- www/lusca-head/Makefile
+++ www/lusca-head/Makefile
@@ -346,10 +346,6 @@ CONFIGURE_ARGS+=	--enable-err-languages="${SQUID_LANGUAGES}" \
 # Finally, add additional user specified configuration options:
 CONFIGURE_ARGS+=	${SQUID_CONFIGURE_ARGS}
 
-CONFIGURE_ENV+=		CFLAGS="${CFLAGS}" \
-			CPPFLAGS="${CPPFLAGS}"\
-			LDFLAGS="${LDFLAGS}"
-
 PLIST_DIRS=	etc/squid/icons libexec/squid
 PLIST_FILES=	${etc_files:S,^,etc/,} ${icon_files:S,^,etc/squid/icons/,} \
 		${libexec:S,^,libexec/squid/,} ${sbin:S,^,sbin/,}
diff --git www/middleman/Makefile www/middleman/Makefile
index c305127..03b88fd 100644
--- www/middleman/Makefile
+++ www/middleman/Makefile
@@ -18,8 +18,8 @@ WRKSRC=		${WRKDIR}/${PORTNAME}
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
-		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 
 MAN8=		mman.8
 
diff --git www/midori/Makefile www/midori/Makefile
index 010dcd4..3dc7903 100644
--- www/midori/Makefile
+++ www/midori/Makefile
@@ -26,8 +26,8 @@ RUN_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_ro
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS+=--enable-libnotify \
 		--enable-addons \
 		--enable-docs \
diff --git www/mod_clamav/Makefile www/mod_clamav/Makefile
index 673d170..d071dd0 100644
--- www/mod_clamav/Makefile
+++ www/mod_clamav/Makefile
@@ -40,8 +40,6 @@ CPPFLAGS+=	-I${LOCALBASE}/include \
 		${PTHREAD_CFLAGS}
 LDFLAGS+=	-L${LOCALBASE}/lib \
 		${PTHREAD_LIBS}
-CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}" \
-		LDFLAGS="${LDFLAGS}"
 
 post-patch:
 	@${REINPLACE_CMD} -e 's,REG_EXTENDED,AP_REG_EXTENDED,' \
diff --git www/mod_dnssd/Makefile www/mod_dnssd/Makefile
index 7181bb1..b0994be 100644
--- www/mod_dnssd/Makefile
+++ www/mod_dnssd/Makefile
@@ -22,10 +22,10 @@ MAKE_JOBS_SAFE=	yes
 USE_GMAKE=	yes
 USE_APACHE=	22+
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib" \
-		APR_CFLAGS="`${LOCALBASE}/bin/apr-1-config --cflags --cppflags --includes`" \
+CONFIGURE_ENV=	APR_CFLAGS="`${LOCALBASE}/bin/apr-1-config --cflags --cppflags --includes`" \
 		APR_LIBS="`${LOCALBASE}/bin/apr-1-config --ldflags`"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--disable-lynx
 
 post-install:
diff --git www/mod_encoding/Makefile www/mod_encoding/Makefile
index 1a6665b..3b2f845 100644
--- www/mod_encoding/Makefile
+++ www/mod_encoding/Makefile
@@ -36,9 +36,9 @@ CONFIGURE_ARGS=	--prefix=${PREFIX} \
 		--includedir=${APACHEINCLUDEDIR} \
 		--with-apxs=${APXS}
 
-CONFIGURE_ENV=	CPPFLAGS='-I${APACHEINCLUDEDIR} -I${LOCALBASE}/include' \
-		LIBS='-L${LOCALBASE}/lib' \
+CONFIGURE_ENV=	LIBS='-L${LOCALBASE}/lib' \
 		PATH="${PREFIX}/bin:${PREFIX}/sbin:${PATH}"
+CPPFLAGS+=	-I${APACHEINCLUDEDIR} -I${LOCALBASE}/include
 
 PLIST_FILES=	${APACHEMODDIR}/mod_encoding.so
 
diff --git www/mod_musicindex/Makefile www/mod_musicindex/Makefile
index f9a2efc..530efe0 100644
--- www/mod_musicindex/Makefile
+++ www/mod_musicindex/Makefile
@@ -31,7 +31,8 @@ MAKE_JOBS_SAFE=	yes
 USE_APACHE=	20+
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS=-I${LOCALBASE}/include LDFLAGS=-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--with-apxs=${APXS} \
 		--disable-libFLACtest --disable-vorbistest
 
diff --git www/mod_ruby/Makefile www/mod_ruby/Makefile
index 4002d00..d75b796 100644
--- www/mod_ruby/Makefile
+++ www/mod_ruby/Makefile
@@ -24,7 +24,6 @@ USE_PERL5_BUILD=	yes
 
 CONFIGURE_ARGS=	--with-apxs="${APXS}"
 CFLAGS+=	-DONIG_ESCAPE_REGEX_T_COLLISION
-CONFIGURE_ENV+=	CFLAGS="${CFLAGS}"
 MAKE_ARGS=	RUBY="${RUBY}"
 INSTALL_TARGET=	site-install
 
diff --git www/nscache/Makefile www/nscache/Makefile
index 7a12a58..d36db55 100644
--- www/nscache/Makefile
+++ www/nscache/Makefile
@@ -22,13 +22,12 @@ USE_GNOME=	gnomehier gtk12
 USE_GMAKE=	yes
 USE_GETTEXT=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--with-gtk-config=${GTK_CONFIG} --disable-gnome
 MAKE_ARGS=	ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \
 		AUTOHEADER="${TRUE}"
 
-CPPFLAGS=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/nscache.desktop \
diff --git www/oops/Makefile www/oops/Makefile
index c4773a5..daf7b94 100644
--- www/oops/Makefile
+++ www/oops/Makefile
@@ -28,10 +28,10 @@ CONFIGURE_ARGS?=--sbindir=${PREFIX}/sbin \
 		--libdir=${PREFIX}/libexec/oops \
 		--enable-oops-user=oops \
 		--enable-large-files
-CONFIGURE_ENV+=	CFLAGS="${CFLAGS} -fPIC" \
-		CXXFLAGS="${CXXFLAGS} -fPIC" \
-		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
+CONFIGURE_ENV+=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		PTHREAD_LIBS="${PTHREAD_LIBS}"
+CFLAGS+=	-fPIC
+CXXFLAGS+=	-fPIC
 
 OOPSVAR=	/var/run/oops
 OOPSLOG=	/var/log/oops
diff --git www/openvrml/Makefile www/openvrml/Makefile
index a0ca7d0..7e9769d 100644
--- www/openvrml/Makefile
+++ www/openvrml/Makefile
@@ -30,10 +30,10 @@ USE_JAVA=	yes
 GNU_CONFIGURE=	yes
 LIBTOOLFILES=	configure
 CONFIGURE_ARGS=	--enable-gecko-rpath
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${JAVA_HOME}/include -I${JAVA_HOME}/include/${OPSYS:L}"	\
-		LDFLAGS="-L${LOCALBASE}/lib -L${JAVA_HOME}/jre/lib/${ARCH}/client ${PTHREAD_LIBS}" \
-		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" PTHREAD_LIBS="${PTHREAD_LIBS}"	\
+CONFIGURE_ENV=		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" PTHREAD_LIBS="${PTHREAD_LIBS}"	\
 		LIBS="-lm" BOOST_LIB_SUFFIX=""
+CPPFLAGS+=	-I${LOCALBASE}/include -I${JAVA_HOME}/include -I${JAVA_HOME}/include/${OPSYS:L}
+LDFLAGS+=	-L${LOCALBASE}/lib -L${JAVA_HOME}/jre/lib/${ARCH}/client ${PTHREAD_LIBS}
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
 USE_GECKO=	libxul
diff --git www/pecl-amfext/Makefile www/pecl-amfext/Makefile
index 07f7201..c8726c1 100644
--- www/pecl-amfext/Makefile
+++ www/pecl-amfext/Makefile
@@ -21,6 +21,6 @@ USE_PHPEXT=	yes
 PHP_MODNAME=	amf
 
 CONFIGURE_ARGS=	--enable-amf
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include/php/ext/standard"
+CPPFLAGS+=	-I${LOCALBASE}/include/php/ext/standard
 
 .include <bsd.port.mk>
diff --git www/privoxy/Makefile www/privoxy/Makefile
index a2dca37..1c00141 100644
--- www/privoxy/Makefile
+++ www/privoxy/Makefile
@@ -32,8 +32,8 @@ CONFLICTS=	privoxy-devel-[0-9]*
 
 MAN1=		privoxy.1
 
-CONFIGURE_ENV=	LDFLAGS=-L${LOCALBASE}/lib \
-		CPPFLAGS=-I${LOCALBASE}/include/
+CPPFLAGS+=	-I${LOCALBASE}/include/
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 OPTIONS=	ACCEPT_FILTER "Enable support for accf_http(9)" Off \
 		DEBUG "Build with debugging symbols" Off \
diff --git www/resin2/Makefile www/resin2/Makefile
index d7960f5..b59fb2d 100644
--- www/resin2/Makefile
+++ www/resin2/Makefile
@@ -63,7 +63,7 @@ CONFIGURE_ARGS+=	--with-java-home=${JAVA_HOME} \
 LDFLAGS+=		-L${OPENSSLLIB} -lcrypto -lssl
 # We need to link with cc instead of ld for the FreeBSD specific options used
 # by threading libraries
-CONFIGURE_ENV=		LD=${CC} PTHREAD_LIBS=${PTHREAD_LIBS} LDFLAGS="${LDFLAGS}"
+CONFIGURE_ENV=		LD=${CC} PTHREAD_LIBS=${PTHREAD_LIBS}
 
 # Install the Apache plugin if needed
 .if defined(WITH_APACHE) && (${WITH_APACHE} == yes || ${WITH_APACHE} == YES)
diff --git www/resin3/Makefile www/resin3/Makefile
index 5292864..1dc86dc 100644
--- www/resin3/Makefile
+++ www/resin3/Makefile
@@ -73,7 +73,7 @@ CONFIGURE_ARGS+=	--with-java-home=${JAVA_HOME} \
 LDFLAGS+=		-L${OPENSSLLIB} -lcrypto -lssl
 # We need to link with cc instead of ld for the FreeBSD specific options used
 # by threading libraries
-CONFIGURE_ENV=		LD=${CC} PTHREAD_LIBS="${PTHREAD_LIBS}" LDFLAGS="${LDFLAGS}" LIBTOOL=${LIBTOOL}
+CONFIGURE_ENV=		LD=${CC} PTHREAD_LIBS="${PTHREAD_LIBS}" LIBTOOL=${LIBTOOL}
 
 # Install the Apache plugin if needed
 .if defined(WITH_APACHE) && (${WITH_APACHE} == yes || ${WITH_APACHE} == YES)
diff --git www/retawq/Makefile www/retawq/Makefile
index 80b31f0..cc8230f 100644
--- www/retawq/Makefile
+++ www/retawq/Makefile
@@ -17,7 +17,6 @@ COMMENT=	An interactive, multi-threaded web browser for text terminals
 
 USE_GETTEXT=	yes
 HAS_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--path-archprefix=${PREFIX} --path-prefix=${PREFIX} \
 		--enable-i18n --enable-local-cgi --enable-ipv6
 
@@ -29,8 +28,8 @@ PLIST_FILES=	bin/retawq \
 		share/locale/pt_BR/LC_MESSAGES/retawq.mo
 PORTDOCS=	*
 
-CPPFLAGS=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
+CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 
 .if defined(WITH_GNUTLS)
 LIB_DEPENDS+=	gnutls.47:${PORTSDIR}/security/gnutls
diff --git www/rsstail/Makefile www/rsstail/Makefile
index 62711d4..6b79f27 100644
--- www/rsstail/Makefile
+++ www/rsstail/Makefile
@@ -18,7 +18,6 @@ LIB_DEPENDS=	mrss.19:${PORTSDIR}/textproc/libmrss
 
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
-MAKE_ENV=	LDFLAGS="${LDFLAGS}"
 PLIST_FILES=	bin/${PORTNAME}
 MAN1=		${PORTNAME}.1
 
diff --git www/sarg/Makefile www/sarg/Makefile
index 7798489..868470c 100644
--- www/sarg/Makefile
+++ www/sarg/Makefile
@@ -23,7 +23,6 @@ GNU_CONFIGURE=	yes
 MAKE_JOBS_SAFE=	yes
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
-CONFIGURE_ENV=	CC="${CC}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--sysconfdir="${PREFIX}/etc/${PORTNAME}" \
 		--enable-sargphp="${PREFIX}/etc/${PORTNAME}" \
 		--enable-fontdir="${PREFIX}/etc/${PORTNAME}/fonts" \
diff --git www/screem/Makefile www/screem/Makefile
index 17ae89a..cb6aff1 100644
--- www/screem/Makefile
+++ www/screem/Makefile
@@ -22,8 +22,8 @@ USE_GNOME=	desktopfileutils gnomehack gnomemenus gnomeprefix \
 USE_XORG=	xpm
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 INSTALLS_OMF=	yes
 
 GCONF_SCHEMAS=	screem.schemas
diff --git www/seamonkey/Makefile www/seamonkey/Makefile
index 56a79a7..4bfd8ac 100644
--- www/seamonkey/Makefile
+++ www/seamonkey/Makefile
@@ -32,7 +32,7 @@ USE_GL=		gl
 MAKE_JOBS_SAFE=	yes
 MOZ_PIS_SCRIPTS=	moz_pis_S50cleanhome
 MAKE_ENV=	LD_LIBRARY_PATH=${WRKSRC}/dist/bin
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include/cairo"
+CPPFLAGS+=	-I${LOCALBASE}/include/cairo
 USE_GCC=	4.2+
 
 CONFIGURE_ENV=	LOCALBASE=${LOCALBASE}
diff --git www/seamonkey2/Makefile www/seamonkey2/Makefile
index 2976814..beff894 100644
--- www/seamonkey2/Makefile
+++ www/seamonkey2/Makefile
@@ -32,8 +32,9 @@ ALL_TARGET=	default
 MAKE_JOBS_SAFE=	yes
 MOZ_PIS_SCRIPTS=	moz_pis_S50cleanhome
 MAKE_ENV=	LD_LIBRARY_PATH=${WRKSRC}/dist/bin
-CONFIGURE_ENV=	LOCALBASE=${LOCALBASE} CPPFLAGS="-I${LOCALBASE}/include/cairo" \
+CONFIGURE_ENV=	LOCALBASE=${LOCALBASE} \
 		ac_cv_func__Unwind_Backtrace=no
+CPPFLAGS+=	-I${LOCALBASE}/include/cairo
 USE_GCC=	4.2+
 
 MOZ_EXTENSIONS=	default
diff --git www/squid/Makefile www/squid/Makefile
index 1cdfdb3..1171e7f 100644
--- www/squid/Makefile
+++ www/squid/Makefile
@@ -384,8 +384,7 @@ CONFIGURE_ARGS+=	--enable-err-languages="${SQUID_LANGUAGES}" \
 # Finally, add additional user specified configuration options:
 CONFIGURE_ARGS+=	${SQUID_CONFIGURE_ARGS}
 
-CONFIGURE_ENV+=		LDFLAGS="${LDFLAGS}" \
-			GREP="${GREP}"
+CONFIGURE_ENV+=		GREP="${GREP}"
 
 PLIST_DIRS=	%%ETCDIR%%/icons libexec/squid
 PLIST_FILES=	${etc_files:S,^,etc/,} ${icon_files:S,^,%%ETCDIR%%/icons/,} \
diff --git www/squid30/Makefile www/squid30/Makefile
index 009371d..ff31ee0 100644
--- www/squid30/Makefile
+++ www/squid30/Makefile
@@ -387,8 +387,6 @@ CONFIGURE_ARGS+=	--enable-err-languages="${SQUID_LANGUAGES}" \
 # Finally, add additional user specified configuration options:
 CONFIGURE_ARGS+=	${SQUID_CONFIGURE_ARGS}
 
-CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS}"
-
 PLIST_DIRS=	%%ETCDIR%%/icons libexec/squid
 PLIST_FILES=	${etc_files:S,^,etc/,} ${icon_files:S,^,%%ETCDIR%%/icons/,} \
 		${libexec:S,^,libexec/squid/,} ${sbin:S,^,sbin/,}
diff --git www/squid31/Makefile www/squid31/Makefile
index c5fdd6a..9df1f85 100644
--- www/squid31/Makefile
+++ www/squid31/Makefile
@@ -415,8 +415,6 @@ WITH_DEBUG?=		yes
 # Finally, add additional user specified configuration options:
 CONFIGURE_ARGS+=	${SQUID_CONFIGURE_ARGS}
 
-CONFIGURE_ENV+=		LDFLAGS="${LDFLAGS}"
-
 PLIST_DIRS=	%%ETCDIR%%/icons libexec/squid
 PLIST_FILES=	${etc_files:S,^,etc/,} ${icon_files:S,^,%%ETCDIR%%/icons/,} \
 		${libexec:S,^,libexec/squid/,} ${sbin:S,^,sbin/,}
diff --git www/srg/Makefile www/srg/Makefile
index e94663b..e6e2ac8 100644
--- www/srg/Makefile
+++ www/srg/Makefile
@@ -19,7 +19,6 @@ USE_GMAKE=	yes
 USE_BISON=	build
 USE_BZIP2=	yes
 NO_INSTALL_MANPAGES=	yes
-MAKE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 
 post-patch:
 	${REINPLACE_CMD} -e 's|-g |${CFLAGS} ${CPPFLAGS} |' ${WRKSRC}/Makefile \
diff --git www/tntnet/Makefile www/tntnet/Makefile
index 5627228..410db24 100644
--- www/tntnet/Makefile
+++ www/tntnet/Makefile
@@ -21,15 +21,15 @@ USE_ICONV=	yes
 USE_CSTD=	gnu89
 PATCH_STRIP=	-p1
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}"
+CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
 CONFIGURE_ARGS+=	--localstatedir=/var
 
 .if defined(WITH_GNUTLS)
-CONFIGURE_ENV+=	LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS} -lgnutls"
+LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS} -lgnutls
 CONFIGURE_ARGS+=	--with-ssl=gnutls
 LIB_DEPENDS+=	gnutls:${PORTSDIR}/security/gnutls
 .else
-CONFIGURE_ENV+=	LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 CONFIGURE_ARGS+=	--with-ssl=openssl
 .endif
 
diff --git www/tokyopromenade/Makefile www/tokyopromenade/Makefile
index 093c839..0d5f747 100644
--- www/tokyopromenade/Makefile
+++ www/tokyopromenade/Makefile
@@ -32,7 +32,7 @@ MAN1=		prommgr.1
 
 .if defined(WITH_LUA)
 CONFIGURE_ARGS+=	--enable-lua
-CONFIGURE_ENV+=	LDFLAGS="-L${LUA_LIBDIR}"
+LDFLAGS+=	-L${LUA_LIBDIR}
 CFLAGS+=	-I${LUA_INCDIR}
 USE_LUA=	yes
 .endif
diff --git www/trafficserver/Makefile www/trafficserver/Makefile
index 12bfce8..cd5e651 100644
--- www/trafficserver/Makefile
+++ www/trafficserver/Makefile
@@ -28,7 +28,7 @@ USE_TCL=	yes
 USE_RC_SUBR=	${PORTNAME}
 USE_LDCONFIG=	yes
 
-LDFLAGS=	-L${LOCALBASE}/lib
+LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--with-expat=${LOCALBASE} \
 		--with-pcre=${LOCALBASE}
 
diff --git www/ump/Makefile www/ump/Makefile
index e6aef9c..5b390b7 100644
--- www/ump/Makefile
+++ www/ump/Makefile
@@ -36,7 +36,7 @@ TIMIDITY_VERSION=	2.13.2
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-ump --with-default-path=${LOCALBASE}/share/timidity
-CONFIGURE_ENV=	LDFLAGS=-export-dynamic
+LDFLAGS+=	-export-dynamic
 USE_GMAKE=	yes
 USE_XORG=	xpm xmu
 WANT_GNOME=	yes
diff --git www/webalizer/Makefile www/webalizer/Makefile
index f44c7f3..3c70d0a 100644
--- www/webalizer/Makefile
+++ www/webalizer/Makefile
@@ -87,7 +87,7 @@ CONFIGURE_ARGS+=	--enable-dns \
 			--with-gdlib=${LOCALBASE}/lib \
 			--with-gd=${LOCALBASE}/include
 
-CONFIGURE_ENV+=	LDFLAGS="-L${PREFIX}/lib"
+LDFLAGS+=	-L${PREFIX}/lib
 CFLAGS+=	-Wall
 MAN1=		${PKGNAMEPREFIX}webalizer.1 ${PKGNAMEPREFIX}wcmgr.1
 DOC1=		CHANGES Copyright INSTALL \
diff --git www/webkit-gtk2/Makefile www/webkit-gtk2/Makefile
index 2a6de9a..e95843b 100644
--- www/webkit-gtk2/Makefile
+++ www/webkit-gtk2/Makefile
@@ -36,10 +36,10 @@ USE_GNOME=	gtk20 libxslt ltverhack
 USE_PERL5=	yes
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib" \
-		ac_cv_path_FLEX="${LOCALBASE}/bin/flex" \
+CONFIGURE_ENV=	ac_cv_path_FLEX="${LOCALBASE}/bin/flex" \
 		ac_cv_path_DOLT_BASH=""
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--enable-icon-database \
 		--with-gtk=2.0 \
 		--enable-svg \
diff --git www/websh/Makefile www/websh/Makefile
index 32b9a7a..3946341 100644
--- www/websh/Makefile
+++ www/websh/Makefile
@@ -85,8 +85,4 @@ post-install:
 	@${APXS} -e -a -n "${SHORTMODNAME}" "${APACHEMODDIR}/mod_${MODULENAME}.so"
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.pre.mk>
-
-CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}"
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git www/webstone-ssl/Makefile www/webstone-ssl/Makefile
index 4fca899..1445847 100644
--- www/webstone-ssl/Makefile
+++ www/webstone-ssl/Makefile
@@ -23,8 +23,8 @@ WRKSRC=		${WRKDIR}/WebStone${PORTVERSION}/src
 ALL_TARGET=	install
 NO_INSTALL_MANPAGES=	yes
 
-CONFIGURE_ENV=	"CFLAGS=${CFLAGS} -I${OPENSSLINC}" \
-		LIBS=-L${OPENSSLLIB}
+CONFIGURE_ENV=	LIBS=-L${OPENSSLLIB}
+CFLAGS+=	-I${OPENSSLINC}
 
 do-install:
 	@${RMDIR} ${WRKSRC}/../bin/runs
diff --git www/wsdlpull/Makefile www/wsdlpull/Makefile
index a93473f..3c67932 100644
--- www/wsdlpull/Makefile
+++ www/wsdlpull/Makefile
@@ -16,9 +16,8 @@ COMMENT=	C++ WSDL Parser
 
 LIB_DEPENDS=	curl:${PORTSDIR}/ftp/curl
 
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
-CPPFLAGS=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 MAKE_JOBS_SAFE=	yes
 USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
diff --git www/xapian-omega/Makefile www/xapian-omega/Makefile
index 699abc1..10b6d45 100644
--- www/xapian-omega/Makefile
+++ www/xapian-omega/Makefile
@@ -21,8 +21,8 @@ GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 USE_PERL5_RUN=	yes
 
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 MAN1=		omindex.1 scriptindex.1
 
diff --git www/ziproxy/Makefile www/ziproxy/Makefile
index c53e9d5..bf2a489 100644
--- www/ziproxy/Makefile
+++ www/ziproxy/Makefile
@@ -24,8 +24,6 @@ LICENSE_FILE=		${WRKSRC}/COPYING
 CFLAGS+=		-I${LOCALBASE}/include
 LDFLAGS+=		-L${LOCALBASE}/lib
 
-CONFIGURE_ENV+=		CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
-
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--with-cfgfile="${PREFIX}/etc/ziproxy/ziproxy.conf"
 
diff --git x11-clocks/cairo-clock/Makefile x11-clocks/cairo-clock/Makefile
index 152c567..f352849 100644
--- x11-clocks/cairo-clock/Makefile
+++ x11-clocks/cairo-clock/Makefile
@@ -26,7 +26,6 @@ USE_GETTEXT=	yes
 PLIST_SUB+=	NLS=""
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
-CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 .else
 CONFIGURE_ARGS+=--disable-nls
 PLIST_SUB+=	NLS="@comment "
diff --git x11-clocks/rclock/Makefile x11-clocks/rclock/Makefile
index 5878584..937dcd3 100644
--- x11-clocks/rclock/Makefile
+++ x11-clocks/rclock/Makefile
@@ -26,7 +26,7 @@ MAN1=		rclock.1
 
 PLIST_FILES=	bin/rclock
 
-CPPFLAGS=	-DMAIL_SPOOL='\"/var/mail/\"'
+CPPFLAGS+=	-DMAIL_SPOOL='\"/var/mail/\"'
 
 post-patch:
 	@${REINPLACE_CMD} \
diff --git x11-clocks/sanduhr/Makefile x11-clocks/sanduhr/Makefile
index 3c2b188..fc7eccb 100644
--- x11-clocks/sanduhr/Makefile
+++ x11-clocks/sanduhr/Makefile
@@ -18,8 +18,8 @@ USE_GNOME=	gnomehack gnomeprefix libgnomeui oaf
 USE_GMAKE=	yes
 INSTALLS_OMF=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 MAN1=		sanduhr.1
 
diff --git x11-fm/FSViewer/Makefile x11-fm/FSViewer/Makefile
index 9435ba2..5c0d0c5 100644
--- x11-fm/FSViewer/Makefile
+++ 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 x11-fm/dfm/Makefile x11-fm/dfm/Makefile
index e1b5f6a..13d291a 100644
--- x11-fm/dfm/Makefile
+++ 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 x11-fm/emelfm2/Makefile x11-fm/emelfm2/Makefile
index 84adae9..f2a0d06 100644
--- x11-fm/emelfm2/Makefile
+++ 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 x11-fm/fsv/Makefile x11-fm/fsv/Makefile
index dfd8a10..66416f8 100644
--- x11-fm/fsv/Makefile
+++ 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 x11-fm/gentoo/Makefile x11-fm/gentoo/Makefile
index f37492f..9ee0782 100644
--- x11-fm/gentoo/Makefile
+++ 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 x11-fm/gnome-commander2/Makefile x11-fm/gnome-commander2/Makefile
index f0c6e8c..12e876e 100644
--- x11-fm/gnome-commander2/Makefile
+++ 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 x11-fm/mtoolsfm/Makefile x11-fm/mtoolsfm/Makefile
index 974e2b2..7fd2244 100644
--- x11-fm/mtoolsfm/Makefile
+++ 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 x11-fm/nautilus/Makefile x11-fm/nautilus/Makefile
index 11f8461..d38f097 100644
--- x11-fm/nautilus/Makefile
+++ 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 x11-fm/pcmanfm/Makefile x11-fm/pcmanfm/Makefile
index 348d267..f0abbf4 100644
--- x11-fm/pcmanfm/Makefile
+++ 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 x11-fm/tdfsb/Makefile x11-fm/tdfsb/Makefile
index 12a9b29..60190c4 100644
--- x11-fm/tdfsb/Makefile
+++ 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 x11-fm/tkdesk/Makefile x11-fm/tkdesk/Makefile
index e726e09..cb7cfe6 100644
--- x11-fm/tkdesk/Makefile
+++ 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 x11-fm/xdiskusage/Makefile x11-fm/xdiskusage/Makefile
index 766dfb7..e677ea0 100644
--- x11-fm/xdiskusage/Makefile
+++ 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 x11-fm/xfe/Makefile x11-fm/xfe/Makefile
index 8be9e46..dfa4bfb 100644
--- x11-fm/xfe/Makefile
+++ 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 x11-fm/xnc/Makefile x11-fm/xnc/Makefile
index 8ed1f5b..6e768b7 100644
--- x11-fm/xnc/Makefile
+++ 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
 
diff --git x11-fonts/ttmkfdir/Makefile x11-fonts/ttmkfdir/Makefile
index 15bdfc5..2ae2fba 100644
--- x11-fonts/ttmkfdir/Makefile
+++ x11-fonts/ttmkfdir/Makefile
@@ -22,8 +22,6 @@ USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_XORG=	x11
 
-MAKE_ENV=	LDFLAGS="${LDFLAGS}"
-
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/ttmkfdir ${PREFIX}/bin
 
diff --git x11-servers/x2vnc/Makefile x11-servers/x2vnc/Makefile
index 826ddc7..8a90211 100644
--- x11-servers/x2vnc/Makefile
+++ x11-servers/x2vnc/Makefile
@@ -16,8 +16,8 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A program to link multiple X and VNC servers together
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 USE_XORG=	x11 xext xrandr xxf86dga ice xinerama xrandr xrender xscrnsaver sm
 MAN1=		x2vnc.1
diff --git x11-themes/clearlooks/Makefile x11-themes/clearlooks/Makefile
index 7329a18..7a1cc92 100644
--- x11-themes/clearlooks/Makefile
+++ x11-themes/clearlooks/Makefile
@@ -20,8 +20,8 @@ GNU_CONFIGURE=	yes
 USE_GNOME=	gtk20
 INSTALLS_ICONS=	yes
 
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .if defined(PORTNAME) && !defined(PKGNAMESUFFIX)
 OPTIONS+=	ANIMATION "Enable experimental animated progressbars" Off \
diff --git x11-themes/emerald-themes/Makefile x11-themes/emerald-themes/Makefile
index 6dbf825..b78d746 100644
--- x11-themes/emerald-themes/Makefile
+++ x11-themes/emerald-themes/Makefile
@@ -21,8 +21,8 @@ GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 post-patch:
 	@${REINPLACE_CMD} 's|/bin/bash|${LOCALBASE}/bin/bash|' \
diff --git x11-themes/gnome-backgrounds/Makefile x11-themes/gnome-backgrounds/Makefile
index 96133ec..1a23d01 100644
--- x11-themes/gnome-backgrounds/Makefile
+++ x11-themes/gnome-backgrounds/Makefile
@@ -20,7 +20,7 @@ USE_GETTEXT=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack intlhack
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-	       	LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .include <bsd.port.mk>
diff --git x11-themes/gnome-themes-extras/Makefile x11-themes/gnome-themes-extras/Makefile
index 87c76b0..03e38ea 100644
--- x11-themes/gnome-themes-extras/Makefile
+++ x11-themes/gnome-themes-extras/Makefile
@@ -26,7 +26,7 @@ USE_AUTOTOOLS=	libtool
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack libgnomeui intlhack
 INSTALLS_ICONS=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .include <bsd.port.mk>
diff --git x11-themes/gnome-themes/Makefile x11-themes/gnome-themes/Makefile
index 517be04..8df5673 100644
--- x11-themes/gnome-themes/Makefile
+++ x11-themes/gnome-themes/Makefile
@@ -27,7 +27,7 @@ USE_AUTOTOOLS=	libtool
 INSTALLS_ICONS=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack gnomeprefix intlhack metacity gtk20
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .include <bsd.port.mk>
diff --git x11-themes/gtk-engines2/Makefile x11-themes/gtk-engines2/Makefile
index f564c14..3da2b0a 100644
--- x11-themes/gtk-engines2/Makefile
+++ x11-themes/gtk-engines2/Makefile
@@ -25,7 +25,8 @@ USE_GNOME=	gnomehack gtk20 intlhack ltasneededhack
 USE_GETTEXT=	yes
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 OPTIONS=	ANIMATION "Enable experimental animated progressbars" off
 
diff --git x11-themes/kde-style-lipstik/Makefile x11-themes/kde-style-lipstik/Makefile
index 6179f54..cd65677 100644
--- x11-themes/kde-style-lipstik/Makefile
+++ x11-themes/kde-style-lipstik/Makefile
@@ -18,7 +18,7 @@ COMMENT=	Modified Plastik KDE style
 
 USE_KDEBASE_VER=3
 USE_AUTOTOOLS=	libtool
-CONFIGURE_ENV+=	LDFLAGS="${PTHREAD_LIBS}"
+LDFLAGS+=	${PTHREAD_LIBS}
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 .include <bsd.port.mk>
diff --git x11-themes/kde-style-tiblit/Makefile x11-themes/kde-style-tiblit/Makefile
index 6a4af31..bb56928 100644
--- x11-themes/kde-style-tiblit/Makefile
+++ x11-themes/kde-style-tiblit/Makefile
@@ -19,7 +19,7 @@ COMMENT=	KDE style focused on customization
 USE_BZIP2=	yes
 USE_KDEBASE_VER=3
 USE_AUTOTOOLS=	libtool
-CONFIGURE_ENV+=	LDFLAGS="${PTHREAD_LIBS}"
+LDFLAGS+=	${PTHREAD_LIBS}
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 .include <bsd.port.mk>
diff --git x11-themes/kde-windeco-knifty/Makefile x11-themes/kde-windeco-knifty/Makefile
index 086c083..7092c48 100644
--- x11-themes/kde-windeco-knifty/Makefile
+++ x11-themes/kde-windeco-knifty/Makefile
@@ -18,7 +18,7 @@ COMMENT=	Lightweight KDE window decoration
 
 USE_BZIP2=	yes
 USE_KDEBASE_VER=3
-CONFIGURE_ENV=	LDFLAGS="${PTHREAD_LIBS}"
+LDFLAGS+=	${PTHREAD_LIBS}
 USE_AUTOTOOLS=	libtool
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
diff --git x11-toolkits/bakery/Makefile x11-toolkits/bakery/Makefile
index 5b9385b..6dce075 100644
--- x11-toolkits/bakery/Makefile
+++ x11-toolkits/bakery/Makefile
@@ -26,8 +26,8 @@ USE_GMAKE=	yes
 USE_GETTEXT=	yes
 USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 PLIST_SUB=	VERSION="2.6" API_VERSION="2.6"
 
diff --git x11-toolkits/eel/Makefile x11-toolkits/eel/Makefile
index 9224011..c46a7a5 100644
--- x11-toolkits/eel/Makefile
+++ x11-toolkits/eel/Makefile
@@ -25,7 +25,7 @@ USE_GNOME=	gnomeprefix gnomehack gnomedesktop ltverhack intlhack
 USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--enable-shared --enable-static
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 
 .include <bsd.port.mk>
diff --git x11-toolkits/efltk/Makefile x11-toolkits/efltk/Makefile
index 823169c..24c12b5 100644
--- x11-toolkits/efltk/Makefile
+++ x11-toolkits/efltk/Makefile
@@ -26,12 +26,12 @@ USE_AUTOTOOLS=	autoconf213
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	LDFLAGS="${LDFLAGS}" DEBUGFLAG="${CFLAGS}"
+CONFIGURE_ENV=	DEBUGFLAG="${CFLAGS}"
 MAKE_ENV=	LD_LIBRARY_PATH="${WRKSRC}/lib"
 USE_LDCONFIG=	yes
 
-CPPFLAGS=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .include <bsd.port.pre.mk>
 
diff --git x11-toolkits/fl_editor/Makefile x11-toolkits/fl_editor/Makefile
index ee6bb45..d163325 100644
--- x11-toolkits/fl_editor/Makefile
+++ x11-toolkits/fl_editor/Makefile
@@ -18,8 +18,8 @@ COMMENT=	Text Editor Widgets for the Fast Light ToolKit
 LIB_DEPENDS=	fltk.1:${PORTSDIR}/x11-toolkits/fltk
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}" \
-		LIBS="${PTHREAD_LIBS}"
+CONFIGURE_ENV=	LIBS="${PTHREAD_LIBS}"
+CFLAGS+=	${PTHREAD_CFLAGS}
 CONFIGURE_ARGS=	--enable-shared --with-fltk=${LOCALBASE}
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
diff --git x11-toolkits/fltk/Makefile x11-toolkits/fltk/Makefile
index 8eb0e85..e72c29e 100644
--- x11-toolkits/fltk/Makefile
+++ x11-toolkits/fltk/Makefile
@@ -29,7 +29,6 @@ CONFIGURE_ARGS+=--enable-threads \
 		--enable-xft
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
-CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS}" CPPFLAGS="${CPPFLAGS}"
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
diff --git x11-toolkits/fltk2/Makefile x11-toolkits/fltk2/Makefile
index 6742124..79fa6cf 100644
--- x11-toolkits/fltk2/Makefile
+++ x11-toolkits/fltk2/Makefile
@@ -59,7 +59,6 @@ CONFIGURE_ARGS+=	--enable-jpeg --enable-png --enable-gl --enable-xft \
 # fltk2 applications should only be linked statically for now to avoid trouble
 # after possibly incompatible updates to fltk2.
 CONFIGURE_ARGS+=	--disable-shared
-CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 
 DOCSDIR=	${PREFIX}/share/doc/fltk2
 PORTDOCS=	*
diff --git x11-toolkits/fox14/Makefile x11-toolkits/fox14/Makefile
index b469a90..cb5f570 100644
--- x11-toolkits/fox14/Makefile
+++ x11-toolkits/fox14/Makefile
@@ -32,14 +32,13 @@ PLIST_SUB+=	MAJORVER=${MAJORVER} SHVER=${SHVER}
 USE_AUTOTOOLS=	libtool
 USE_GL=		yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--with-opengl --with-x --enable-threadsafe
 USE_LDCONFIG=	yes
 
 MAN1=		shutterbug.1 reswrap.1
 
-CPPFLAGS=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 OPTIONS=	OPTIMIZED_CXXFLAGS "Enable additional optimizations" off \
 		CUPS "Enable CUPS support" off \
diff --git x11-toolkits/fox16/Makefile x11-toolkits/fox16/Makefile
index 9f521aa..34465c8 100644
--- x11-toolkits/fox16/Makefile
+++ x11-toolkits/fox16/Makefile
@@ -32,14 +32,13 @@ PLIST_SUB+=	MAJORVER=${MAJORVER} SHVER=${SHVER}
 USE_GNOME=	lthack gnomehack
 USE_GL=		yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--with-opengl --with-x --enable-threadsafe
 USE_LDCONFIG=	yes
 
 MAN1=		shutterbug.1 reswrap.1
 
-CPPFLAGS=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 OPTIONS=	XFT	"Enable Xft support" on \
 		SHM	"Enable Shared Memory support" on \
diff --git x11-toolkits/fox17/Makefile x11-toolkits/fox17/Makefile
index 20488aae..c1e1efe 100644
--- x11-toolkits/fox17/Makefile
+++ x11-toolkits/fox17/Makefile
@@ -32,11 +32,10 @@ USE_GNOME=	gnomehack
 USE_LDCONFIG=	yes
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--with-opengl=yes
 
-CPPFLAGS=	-I${LOCALBASE}/include -I${LOCALBASE}/include/freetype2
-LDFLAGS=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
+CPPFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include/freetype2
+LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 
 MAN1=		reswrap.1 shutterbug.1 adie.1 PathFinder.1 calculator.1 \
 		ControlPanel.1
diff --git x11-toolkits/gai/Makefile x11-toolkits/gai/Makefile
index 8701b3b..692cb3e 100644
--- x11-toolkits/gai/Makefile
+++ x11-toolkits/gai/Makefile
@@ -22,8 +22,8 @@ USE_GL=		gl
 USE_SDL=	sdl
 USE_GNOME=	gnomepanel libgnomeui
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	SDLCONF=${SDL_CONFIG} \
-		CPPFLAGS="`pkg-config --cflags libgnomeui-2.0`"
+CONFIGURE_ENV=	SDLCONF=${SDL_CONFIG}
+CPPFLAGS+=	`pkg-config --cflags libgnomeui-2.0`
 
 PLIST_FILES=	include/gai/gai.h lib/libgai.so.${PORTVERSION} \
 		lib/libgai.so.0 lib/libgai.so libdata/pkgconfig/gai.pc \
diff --git x11-toolkits/gal/Makefile x11-toolkits/gal/Makefile
index aac54f2..9d3b9e1 100644
--- x11-toolkits/gal/Makefile
+++ x11-toolkits/gal/Makefile
@@ -28,8 +28,8 @@ GNOME_HTML_DIR=	${PREFIX}/share/doc/gal
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool
 CONFIGURE_ARGS=	--enable-static --with-libiconv
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
 MAKE_JOBS_UNSAFE=yes
 
 PLIST_SUB=	VERSION=${PORTVERSION}
diff --git x11-toolkits/gal2/Makefile x11-toolkits/gal2/Makefile
index 50832a1..104a821 100644
--- x11-toolkits/gal2/Makefile
+++ x11-toolkits/gal2/Makefile
@@ -31,8 +31,8 @@ USE_XORG=	x11
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=  libtool
 CONFIGURE_ARGS=	--enable-static --with-libiconv
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 PLIST_SUB=	VERSION="2.6" PORTVERSION=${PORTVERSION} \
 		SHLIBVERSION="2.4"
diff --git x11-toolkits/gdl/Makefile x11-toolkits/gdl/Makefile
index a09734c..72a0d8e 100644
--- x11-toolkits/gdl/Makefile
+++ x11-toolkits/gdl/Makefile
@@ -20,7 +20,7 @@ USE_GNOME=	gnomeprefix gnomehack gtk20
 USE_GETTEXT=	yes
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .include <bsd.port.mk>
diff --git x11-toolkits/gnustep-back/Makefile x11-toolkits/gnustep-back/Makefile
index 534ee4d..f518c2c 100644
--- x11-toolkits/gnustep-back/Makefile
+++ x11-toolkits/gnustep-back/Makefile
@@ -34,7 +34,6 @@ CONFIGURE_ARGS+=	--with-tiff-library=${LOCALBASE}/lib
 CONFIGURE_ARGS+=	--with-tiff-include=${LOCALBASE}/include
 CONFIGURE_ARGS+=	--with-jpeg-library=${LOCALBASE}/lib
 CONFIGURE_ARGS+=	--with-jpeg-include=${LOCALBASE}/include
-CONFIGURE_ENV+=		CPPFLAGS="${CPPFLAGS}"
 USE_GNUSTEP=	yes
 USE_GNUSTEP_GUI=	yes
 USE_GNUSTEP_CONFIGURE=	yes
diff --git x11-toolkits/gnustep-gui/Makefile x11-toolkits/gnustep-gui/Makefile
index 3d46e26..e505dc5 100644
--- x11-toolkits/gnustep-gui/Makefile
+++ x11-toolkits/gnustep-gui/Makefile
@@ -51,7 +51,6 @@ USE_GNUSTEP_LDCONFIG=	${GNUSTEP_SYSTEM_LIBRARIES}
 USE_XORG=	x11 xt
 
 EXTRA_PATCHES+=		${FILESDIR}/GNUmakefile.patch
-CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 MAKE_FLAGS+=	OPTFLAG="${CFLAGS}"
 MAKE_ENV+=	GNUSTEP_INSTALLATION_DOMAIN=SYSTEM
 BREAKS_IF_PEDANTIC=	yes
diff --git x11-toolkits/gob/Makefile x11-toolkits/gob/Makefile
index e28969a..1c04a63 100644
--- x11-toolkits/gob/Makefile
+++ x11-toolkits/gob/Makefile
@@ -17,8 +17,8 @@ COMMENT=	A preprocessor for making GTK+ objects with inline C
 USE_GMAKE=	yes
 USE_GNOME=	gtk12
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
 
 MAN1=		gob.1
 
diff --git x11-toolkits/gtk12/Makefile x11-toolkits/gtk12/Makefile
index f4fae95..ed58034 100644
--- x11-toolkits/gtk12/Makefile
+++ x11-toolkits/gtk12/Makefile
@@ -23,9 +23,9 @@ USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool
 CONFIGURE_ARGS=	--includedir=${PREFIX}/include/gtk12 --with-native-locale \
 		--with-xinput=xfree
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		X_CFLAGS="-I${LOCALBASE}/include" \
+CONFIGURE_ENV=	X_CFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
 .if !defined(WITHOUT_NLS)
 USE_GETTEXT=	yes
 PLIST_SUB+=	NLS=""
diff --git x11-toolkits/gtk20/Makefile x11-toolkits/gtk20/Makefile
index a78a774..49f1161 100644
--- x11-toolkits/gtk20/Makefile
+++ x11-toolkits/gtk20/Makefile
@@ -46,9 +46,9 @@ USE_GETTEXT=	yes
 USE_XORG=	xext xrender x11 xinerama xi xrandr xcursor xfixes xdamage \
 		xcomposite
 CONFIGURE_ARGS=	--enable-static --with-xinput=yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include/freetype2 \
-			  -I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include/freetype2 \
+		-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 MAN1=		gtk-query-immodules-2.0.1
 
diff --git x11-toolkits/gtk30/Makefile x11-toolkits/gtk30/Makefile
index 81efc6d..1ac127d 100644
--- x11-toolkits/gtk30/Makefile
+++ x11-toolkits/gtk30/Makefile
@@ -46,10 +46,10 @@ USE_XORG=	xext xrender x11 xinerama xi xrandr xcursor xfixes xdamage \
 		xcomposite
 CONFIGURE_ARGS=	--enable-static --enable-xinput=yes
 CONFIGURE_ARGS+=--enable-gtk2-dependency
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include/freetype2 \
-			  -I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib" \
-		INTROSPECTION_GIRDIR=`pkg-config --variable=girdir gobject-introspection-1.0`
+CONFIGURE_ENV=	INTROSPECTION_GIRDIR=`pkg-config --variable=girdir gobject-introspection-1.0`
+CPPFLAGS+=	-I${LOCALBASE}/include/freetype2 \
+		-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 GLIB_SCHEMAS=	org.gtk.Settings.FileChooser.gschema.xml
 
diff --git x11-toolkits/gtkglarea/Makefile x11-toolkits/gtkglarea/Makefile
index d620669..f8bb75b 100644
--- x11-toolkits/gtkglarea/Makefile
+++ x11-toolkits/gtkglarea/Makefile
@@ -21,8 +21,8 @@ USE_AUTOTOOLS=	libtool
 USE_GL=		yes
 USE_GNOME=	gtk12 lthack
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
-		LDFLAGS="-L${LOCALBASE}/lib -lstdc++ ${PTHREAD_LIBS}"
+CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS+=	-L${LOCALBASE}/lib -lstdc++ ${PTHREAD_LIBS}
 CONFIGURE_ARGS=	--with-lib-GL
 USE_LDCONFIG=	yes
 
diff --git x11-toolkits/gtkmathview/Makefile x11-toolkits/gtkmathview/Makefile
index 61d1c31..df7a91d 100644
--- x11-toolkits/gtkmathview/Makefile
+++ x11-toolkits/gtkmathview/Makefile
@@ -23,12 +23,11 @@ LIB_DEPENDS=	popt.0:${PORTSDIR}/devel/popt \
 USE_GNOME=	gnomehack gtk20 libxml2
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 USE_LDCONFIG=	yes
 
 MAN1=		mathmlviewer.1
 
-CPPFLAGS=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .include <bsd.port.mk>
diff --git x11-toolkits/gtkmm24/Makefile x11-toolkits/gtkmm24/Makefile
index 974cc25..f23528b 100644
--- x11-toolkits/gtkmm24/Makefile
+++ x11-toolkits/gtkmm24/Makefile
@@ -34,8 +34,8 @@ USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool
 USE_GNOME=	gnomehack gtk20 ltverhack:1
 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-documentation \
 		--enable-static=yes
 
diff --git x11-toolkits/gtkmm30/Makefile x11-toolkits/gtkmm30/Makefile
index 622d62a..9faf1e2 100644
--- x11-toolkits/gtkmm30/Makefile
+++ x11-toolkits/gtkmm30/Makefile
@@ -33,8 +33,8 @@ GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool
 USE_GNOME=	gnomehack gtk30 ltverhack
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--disable-documentation \
 		--enable-static=yes
 
diff --git x11-toolkits/gtksourceview/Makefile x11-toolkits/gtksourceview/Makefile
index 67f1d87..a2af7d0 100644
--- x11-toolkits/gtksourceview/Makefile
+++ x11-toolkits/gtksourceview/Makefile
@@ -27,8 +27,8 @@ USE_LDCONFIG=	yes
 USE_GNOME=	gnomeprefix gnomehack libgnome libgnomeprintui intlhack \
 		ltverhack referencehack
 CONFIGURE_ARGS=	--enable-compile-warnings=no
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib -lgnuregex"
+CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib -lgnuregex"
+CPPFLAGS+=	-I${LOCALBASE}/include
 
 .include <bsd.port.mk>
 
diff --git x11-toolkits/gtksourceview2/Makefile x11-toolkits/gtksourceview2/Makefile
index d47a862..ed09a63 100644
--- x11-toolkits/gtksourceview2/Makefile
+++ x11-toolkits/gtksourceview2/Makefile
@@ -29,8 +29,8 @@ USE_LDCONFIG=	yes
 USE_GNOME=	gnomeprefix gnomehack gtk20 gconf2 libxml2 intlhack \
 		ltverhack referencehack
 CONFIGURE_ARGS=	--enable-compile-warnings=no --enable-glade-catalog=no
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
 
 .include <bsd.port.mk>
 
diff --git x11-toolkits/gtkunique/Makefile x11-toolkits/gtkunique/Makefile
index e5a8be0..b6fd4f3 100644
--- x11-toolkits/gtkunique/Makefile
+++ x11-toolkits/gtkunique/Makefile
@@ -21,7 +21,8 @@ USE_GETTEXT=	yes
 USE_GNOME=	gtk20 ltverhack
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 OPTIONS=	DBUS "D-Bus backend" on
 
diff --git x11-toolkits/guile-gtk/Makefile x11-toolkits/guile-gtk/Makefile
index 1366207..4b088ea 100644
--- x11-toolkits/guile-gtk/Makefile
+++ x11-toolkits/guile-gtk/Makefile
@@ -22,8 +22,8 @@ USE_GNOME=	ltverhack gdkpixbuf libglade
 USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--with-gtkgl=no
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 INFO=		guile-gtk
 
diff --git x11-toolkits/libbonoboui/Makefile x11-toolkits/libbonoboui/Makefile
index a0f3624..efe7c69 100644
--- x11-toolkits/libbonoboui/Makefile
+++ x11-toolkits/libbonoboui/Makefile
@@ -26,8 +26,8 @@ GNU_CONFIGURE=	yes
 USE_GNOME=	gnomeprefix gnomehack gnomehier intlhack \
 		libgnomecanvas libgnome referencehack
 USE_LDCONFIG=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 
 .include <bsd.port.mk>
 
diff --git x11-toolkits/libgail-gnome/Makefile x11-toolkits/libgail-gnome/Makefile
index 4f9ff1e..9b048e9 100644
--- x11-toolkits/libgail-gnome/Makefile
+++ x11-toolkits/libgail-gnome/Makefile
@@ -21,8 +21,8 @@ USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 GNOME_DESKTOP_VERSION=2
 USE_GNOME=	gnomeprefix gnomehack gnomepanel libgnomeui atspi
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 PLIST_FILES=	lib/gtk-2.0/modules/libgail-gnome.la \
 		lib/gtk-2.0/modules/libgail-gnome.so \
 		libdata/pkgconfig/libgail-gnome.pc
diff --git x11-toolkits/libgdiplus/Makefile x11-toolkits/libgdiplus/Makefile
index 33e415f..eddc8a7 100644
--- x11-toolkits/libgdiplus/Makefile
+++ x11-toolkits/libgdiplus/Makefile
@@ -23,8 +23,8 @@ USE_GNOME=	gnomehack glib20
 USE_GMAKE=	yes
 USE_XLIB=	yes
 USE_LDCONFIG=	yes
-CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
-		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 PLIST_FILES=	lib/libgdiplus.a \
 		lib/libgdiplus.la \
diff --git x11-toolkits/libgnomeprintui/Makefile x11-toolkits/libgnomeprintui/Makefile
index e7d6239..1d4cc64 100644
--- x11-toolkits/libgnomeprintui/Makefile
+++ x11-toolkits/libgnomeprintui/Makefile
@@ -27,8 +27,8 @@ USE_GETTEXT=	yes
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool
 USE_BISON=	build
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 PLIST_SUB=	VERSION=${PORTVERSION}
 
diff --git x11-toolkits/libgnomeui/Makefile x11-toolkits/libgnomeui/Makefile
index 97d65ff..a6f81b7 100644
--- x11-toolkits/libgnomeui/Makefile
+++ x11-toolkits/libgnomeui/Makefile
@@ -32,8 +32,8 @@ USE_GNOME=	gnomeprefix gnomehack gnomehier libbonoboui ltverhack \
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool
 USE_BISON=	build
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CPPFLAGS+=	-I${LOCALBASE}/include
 
 .include <bsd.port.mk>
 
diff --git x11-toolkits/libgtk-java/Makefile x11-toolkits/libgtk-java/Makefile
index 11ac36e..19c9e4e 100644
--- x11-toolkits/libgtk-java/Makefile
+++ x11-toolkits/libgtk-java/Makefile
@@ -29,7 +29,7 @@ USE_GNOME=	gnomehack gtk20
 CONFIGURE_ARGS=	--without-gcj-compile --with-jardir=${JAVAJARDIR} \
 		--without-javadocs # needs docbook-utils
 NOPORTDOCS=	yes # needs docbook-utils and some parts are broken.
-CONFIGURE_ENV=	CPPFLAGS="-I${JAVA_HOME}/include -I${JAVA_HOME}/include/freebsd"
+CPPFLAGS+=	-I${JAVA_HOME}/include -I${JAVA_HOME}/include/freebsd
 GTK_API_VERSION=	2.10
 CAIRO_API_VERSION=	1.0
 PLIST_SUB=		GTK_API_VERSION=${GTK_API_VERSION} PORTNAME=${PORTNAME}
diff --git x11-toolkits/libgtkeditor/Makefile x11-toolkits/libgtkeditor/Makefile
index 6159afc..365284d 100644
--- x11-toolkits/libgtkeditor/Makefile
+++ x11-toolkits/libgtkeditor/Makefile
@@ -24,8 +24,8 @@ USE_PERL5_BUILD=yes
 USE_LDCONFIG=	yes
 CFLAGS+=	-fPIC
 
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 pre-configure:
 .for file in install-sh mkinstalldirs
diff --git x11-toolkits/libgtksourceviewmm/Makefile x11-toolkits/libgtksourceviewmm/Makefile
index e2b74c3..dde385d 100644
--- x11-toolkits/libgtksourceviewmm/Makefile
+++ x11-toolkits/libgtksourceviewmm/Makefile
@@ -21,8 +21,8 @@ USE_BZIP2=	yes
 USE_GNOME=	gtksourceview2 gnomeprefix gnomehack
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBAS}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBAS}/lib
 CONFIGURE_ARGS=	--disable-docs
 
 .include <bsd.port.mk>
diff --git x11-toolkits/libwnck/Makefile x11-toolkits/libwnck/Makefile
index 7c653ff..7f56c98 100644
--- x11-toolkits/libwnck/Makefile
+++ x11-toolkits/libwnck/Makefile
@@ -32,8 +32,8 @@ USE_BISON=	build
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool
 CONFIGURE_ARGS=	--with-html-dir=${PREFIX}/share/doc
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .include <bsd.port.mk>
 
diff --git x11-toolkits/libzvt/Makefile x11-toolkits/libzvt/Makefile
index 453b85a..1250ed0 100644
--- x11-toolkits/libzvt/Makefile
+++ x11-toolkits/libzvt/Makefile
@@ -22,8 +22,8 @@ USE_BISON=	build
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool
 USE_GNOME=	gnomeprefix gnomehack gtk20 libartlgpl2
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
 
 post-patch:
 	@${FIND} ${WRKSRC} -name "*.[ch]" | ${XARGS} ${REINPLACE_CMD} -e \
diff --git x11-toolkits/mesgui/Makefile x11-toolkits/mesgui/Makefile
index 03ed677..975b672 100644
--- x11-toolkits/mesgui/Makefile
+++ x11-toolkits/mesgui/Makefile
@@ -19,13 +19,13 @@ LIB_DEPENDS=	freetype.9:${PORTSDIR}/print/freetype2
 USE_SDL=	sdl
 USE_GL=		gl
 USE_GMAKE=	yes
-MAKE_ENV=	OPT="${OPT}" LDFLAGS="${LDFLAGS}"
+MAKE_ENV=	OPT="${OPT}"
 USE_LDCONFIG=	yes
 
 OPT=		${CFLAGS} -fPIC -DPIC -Iinclude \
 		`${SDL_CONFIG} --cflags` `freetype-config --cflags` \
 		-I${LOCALBASE}/include
-LDFLAGS=	`${SDL_CONFIG} --libs` `freetype-config --libs` \
+LDFLAGS+=	`${SDL_CONFIG} --libs` `freetype-config --libs` \
 		-L${LOCALBASE}/lib
 
 post-patch:
diff --git x11-toolkits/movingmotif/Makefile x11-toolkits/movingmotif/Makefile
index bb0f0a7..0c4efb8 100644
--- x11-toolkits/movingmotif/Makefile
+++ x11-toolkits/movingmotif/Makefile
@@ -21,7 +21,7 @@ USE_LDCONFIG=	yes
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "sparc64"
-CONFIGURE_ENV+=	CFLAGS="-O0"
+CFLAGS+=	-O0
 .endif
 
 .include <bsd.port.post.mk>
diff --git x11-toolkits/neXtaw/Makefile x11-toolkits/neXtaw/Makefile
index 5b801e8..b00fae4 100644
--- x11-toolkits/neXtaw/Makefile
+++ x11-toolkits/neXtaw/Makefile
@@ -17,8 +17,8 @@ COMMENT=	Athena Widgets with N*XTSTEP appearance
 USE_AUTOTOOLS=	libtool
 USE_XORG=	xmu x11 xext
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 USE_LDCONFIG=	yes
 
 post-patch:
diff --git x11-toolkits/nucleo/Makefile x11-toolkits/nucleo/Makefile
index 9eb3cde..51750f5 100644
--- x11-toolkits/nucleo/Makefile
+++ x11-toolkits/nucleo/Makefile
@@ -24,8 +24,8 @@ USE_GMAKE=	yes
 USE_GL=		glu
 USE_QT_VER=	4
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 USE_LDCONFIG=	yes
 
 OPTIONS=	GNUTLS	"Build with GnuTLS support"	off \
diff --git x11-toolkits/open-motif/Makefile x11-toolkits/open-motif/Makefile
index 83ffa58..fb7cb97 100644
--- x11-toolkits/open-motif/Makefile
+++ x11-toolkits/open-motif/Makefile
@@ -29,7 +29,7 @@ USE_XORG=	xaw xbitmaps xft
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 MAKE_ENV=	LANG=C
-CPPFLAGS=	-DCSRG_BASED -DXUSE_MTSAFE_API -DXNO_MTSAFE_PWDAPI
+CPPFLAGS+=	-DCSRG_BASED -DXUSE_MTSAFE_API -DXNO_MTSAFE_PWDAPI
 USE_CSTD=	gnu89
 
 DEMOS_SRC=	${WRKSRC}/demos/programs
diff --git x11-toolkits/otk/Makefile x11-toolkits/otk/Makefile
index 34d473d..0b64451 100644
--- x11-toolkits/otk/Makefile
+++ x11-toolkits/otk/Makefile
@@ -24,8 +24,8 @@ USE_LDCONFIG=	yes
 PLIST_FILES=	include/gadget_lib.h include/otk_lib.h \
 		lib/libotk.so lib/libotk.so.0
 
-CPPFLAGS=	-I${LOCALBASE}/include -fPIC
-LDFLAGS=	-lGLU -lGL -lXmu -lXext -lX11 -L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include -fPIC
+LDFLAGS+=	-lGLU -lGL -lXmu -lXext -lX11 -L${LOCALBASE}/lib
 
 do-build:
 	cd ${WRKSRC} && ${CC} ${CFLAGS} ${CPPFLAGS} -shared otk_lib.c \
diff --git x11-toolkits/pango/Makefile x11-toolkits/pango/Makefile
index c337ef3..cfc0786 100644
--- x11-toolkits/pango/Makefile
+++ x11-toolkits/pango/Makefile
@@ -50,15 +50,15 @@ MAN1=		pango-view.1 pango-querymodules.1
 
 .if defined(WITHOUT_X11)
 CONFIGURE_ARGS+=	--with-x=no
-CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include/freetype2 \
-				${GLIB2_CFLAGS} -I${LOCALBASE}/include" \
-			LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=		-I${LOCALBASE}/include/freetype2 \
+			${GLIB2_CFLAGS} -I${LOCALBASE}/include
+LDFLAGS+=		-L${LOCALBASE}/lib
 PLIST_SUB+=		X11="@comment "
 .else
 USE_XORG+=		xft xrender
-CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include/freetype2 \
-				${GLIB2_CFLAGS} -I${LOCALBASE}/include" \
-			LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=		-I${LOCALBASE}/include/freetype2 \
+			${GLIB2_CFLAGS} -I${LOCALBASE}/include
+LDFLAGS+=		-L${LOCALBASE}/lib
 PLIST_SUB+=		X11=""
 .endif
 
diff --git x11-toolkits/pangomm/Makefile x11-toolkits/pangomm/Makefile
index dc85610..fbba2a5 100644
--- x11-toolkits/pangomm/Makefile
+++ x11-toolkits/pangomm/Makefile
@@ -28,8 +28,8 @@ USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 USE_GNOME=	gnomehack pango
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--disable-documentation \
 		--enable-static=yes
 
diff --git x11-toolkits/pangoxsl/Makefile x11-toolkits/pangoxsl/Makefile
index f6b3aea..a9a9b38 100644
--- x11-toolkits/pangoxsl/Makefile
+++ x11-toolkits/pangoxsl/Makefile
@@ -20,7 +20,7 @@ USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool
 CONFIGURE_ARGS=	--disable-gtk-doc \
 		--with-html-dir=${PREFIX}/share/doc
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .include <bsd.port.mk>
diff --git x11-toolkits/paragui-devel/Makefile x11-toolkits/paragui-devel/Makefile
index 24ec0678..79f96bf 100644
--- x11-toolkits/paragui-devel/Makefile
+++ x11-toolkits/paragui-devel/Makefile
@@ -26,8 +26,8 @@ CONFLICTS=	paragui-[0-9]*
 USE_AUTOTOOLS=	libtool
 USE_SDL=	sdl image ttf
 LIBTOOLFLAGS=	--disable-ltlibs --release-ignore
-CONFIGURE_ENV=	CPPFLAGS="-I${PREFIX}/include -I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
-		LDFLAGS="-L${PREFIX}/lib -L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CPPFLAGS+=	-I${PREFIX}/include -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS+=	-L${PREFIX}/lib -L${LOCALBASE}/lib ${PTHREAD_LIBS}
 USE_LDCONFIG=	yes
 
 SHLIB_VER=	4
diff --git x11-toolkits/paragui/Makefile x11-toolkits/paragui/Makefile
index b48e608..160dc01 100644
--- x11-toolkits/paragui/Makefile
+++ x11-toolkits/paragui/Makefile
@@ -23,8 +23,8 @@ CONFLICTS=	paragui-devel-[0-9]*
 
 USE_AUTOTOOLS=	libtool
 USE_SDL=	sdl image ttf
-CONFIGURE_ENV=	CPPFLAGS="-I${PREFIX}/include -I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
-		LDFLAGS="-L${PREFIX}/lib -L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CPPFLAGS+=	-I${PREFIX}/include -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS+=	-L${PREFIX}/lib -L${LOCALBASE}/lib ${PTHREAD_LIBS}
 USE_LDCONFIG=	yes
 
 SHLIB_VER=	4
diff --git x11-toolkits/plib/Makefile x11-toolkits/plib/Makefile
index ca8870a..69ff3d8 100644
--- x11-toolkits/plib/Makefile
+++ x11-toolkits/plib/Makefile
@@ -18,11 +18,10 @@ USE_XORG=	xt xi xmu xext x11
 USE_GL=		glu
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 
 CXXFLAGS+=	-fPIC
-CPPFLAGS=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
+CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 
 .include <bsd.port.pre.mk>
 
diff --git x11-toolkits/py-gnome-desktop/Makefile x11-toolkits/py-gnome-desktop/Makefile
index 1dd5802..29a8ff2 100644
--- x11-toolkits/py-gnome-desktop/Makefile
+++ x11-toolkits/py-gnome-desktop/Makefile
@@ -36,8 +36,8 @@ USE_GNOME=	gnomehack libgnomeprintui gnomepanel gnomedesktop \
 		evolutiondataserver
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-metacity --disable-nautilusburn
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 EG_SRC_DIR=	${WRKSRC}/examples
 EG_DST_DIR=	${PREFIX}/share/examples/py-gnome
diff --git x11-toolkits/py-gnome-extras/Makefile x11-toolkits/py-gnome-extras/Makefile
index 46bb03c..f179aae 100644
--- x11-toolkits/py-gnome-extras/Makefile
+++ x11-toolkits/py-gnome-extras/Makefile
@@ -29,8 +29,8 @@ USE_GMAKE=	yes
 USE_PYTHON=	yes
 USE_GNOME=	gnomehack libgtkhtml pygnome2 libgda4
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS+=--disable-gdl
 
 EG_SRC_DIR=	${WRKSRC}/examples
diff --git x11-toolkits/py-gnome2/Makefile x11-toolkits/py-gnome2/Makefile
index bb18d08..22ffd9d 100644
--- x11-toolkits/py-gnome2/Makefile
+++ x11-toolkits/py-gnome2/Makefile
@@ -30,9 +30,9 @@ USE_LDCONFIG=	yes
 USE_GETTEXT=	yes
 USE_GNOME=	gnomehack libgnomeui pygtk2
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib" \
+CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib" \
 		PTHREAD_LIBS="${PTHREAD_LIBS}"
+CPPFLAGS+=	-I${LOCALBASE}/include
 
 EG_SRC_DIR=	${WRKSRC}/examples
 EG_DST_DIR=	${PREFIX}/share/examples/py-gnome
diff --git x11-toolkits/py-gtk2/Makefile x11-toolkits/py-gtk2/Makefile
index b50e25a..53d0708 100644
--- x11-toolkits/py-gtk2/Makefile
+++ x11-toolkits/py-gtk2/Makefile
@@ -28,11 +28,11 @@ USE_GNOME=	gnomehack libglade2 pygobject
 USE_PYTHON=	yes
 USE_GETTEXT=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-lintl" \
+CONFIGURE_ENV=	LIBS="-lintl" \
 		PYTHON="${PYTHON_VERSION}"
-CONFIGURE_ARGS=	--disable-docs
+CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
+CONFIGURE_ARGS=	--disable-docs
 
 DOCSDIR=	${PREFIX}/share/doc/py-gtk
 EG_SRC_DIR=	${WRKSRC}/examples
@@ -59,12 +59,9 @@ CONFIGURE_ARGS+=--disable-numpy
 .if !defined(WITHOUT_THREADS)
 CONFIGURE_ARGS+=	--enable-thread
 CFLAGS+=		${PTHREAD_CFLAGS}
-CONFIGURE_ENV+=		LDFLAGS="${PTHREAD_LIBS} ${LDFLAGS}"
+LDFLAGS+=		${PTHREAD_LIBS}
 .else
 CONFIGURE_ARGS+=	--disable-thread
-.if defined(LDFLAGS)
-CONFIGURE_ENV+=		LDFLAGS="${LDFLAGS}"
-.endif
 .endif
 
 post-install:
diff --git x11-toolkits/rep-gtk2/Makefile x11-toolkits/rep-gtk2/Makefile
index 035e196..1a8f8a8 100644
--- x11-toolkits/rep-gtk2/Makefile
+++ x11-toolkits/rep-gtk2/Makefile
@@ -21,9 +21,8 @@ USE_XZ=		yes
 USE_GNOME=	gnomehack gtk20
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
-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 x11-toolkits/soqt/Makefile x11-toolkits/soqt/Makefile
index 6739dc9..313e62c 100644
--- x11-toolkits/soqt/Makefile
+++ x11-toolkits/soqt/Makefile
@@ -27,9 +27,7 @@ CPPFLAGS+=	-I${QT_INCDIR} -I${QT_INCDIR}/Qt -I${LOCALBASE}/include
 LDFLAGS+=	-L${QT_LIBDIR} -L${LOCALBASE}/lib
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	QTDIR="${QT_PREFIX}" \
-		CPPFLAGS="${CPPFLAGS}" \
-		LDFLAGS="${LDFLAGS}"
+CONFIGURE_ENV=	QTDIR="${QT_PREFIX}"
 
 CONFIGURE_ARGS=	--with-pthread=yes --with-coin=${LOCALBASE} \
 		--with-qt=${QT_LIBDIR}
diff --git x11-toolkits/tkdnd/Makefile x11-toolkits/tkdnd/Makefile
index edc8b79..2ee4ebc 100644
--- x11-toolkits/tkdnd/Makefile
+++ x11-toolkits/tkdnd/Makefile
@@ -22,8 +22,7 @@ USE_XORG=	x11 xext
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-tcl=${TCL_LIBDIR} --with-tk=${TK_LIBDIR} \
 		--with-tclinclude=${TCL_INCLUDEDIR} --with-tkinclude=${TK_INCLUDEDIR} --enable-shared
-CPPFLAGS=	-I${TK_INCLUDEDIR}/generic -I${TCL_INCLUDEDIR}/generic
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}"
+CPPFLAGS+=	-I${TK_INCLUDEDIR}/generic -I${TCL_INCLUDEDIR}/generic
 TKPKG=		${PORTNAME}${PORTVERSION}
 PLIST_SUB=	TKPKG=${TKPKG}
 USE_LDCONFIG=	${PREFIX}/lib/${TKPKG}
diff --git x11-toolkits/tktray/Makefile x11-toolkits/tktray/Makefile
index c099760..b9d6c08 100644
--- x11-toolkits/tktray/Makefile
+++ x11-toolkits/tktray/Makefile
@@ -20,8 +20,7 @@ USE_XORG=	x11 xext
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-tcl=${TCL_LIBDIR} --with-tk=${TK_LIBDIR} \
 		--with-tkinclude=${TK_INCLUDEDIR} --enable-shared
-CPPFLAGS=	-I${TK_INCLUDEDIR}/generic -I${TCL_INCLUDEDIR}/generic
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}"
+CPPFLAGS+=	-I${TK_INCLUDEDIR}/generic -I${TCL_INCLUDEDIR}/generic
 TKPKG=		${PORTNAME}${PORTVERSION}
 PLIST_SUB=	TKPKG=${TKPKG}
 USE_LDCONFIG=	${PREFIX}/lib/${TKPKG}
diff --git x11-toolkits/tktreectrl/Makefile x11-toolkits/tktreectrl/Makefile
index 5f5f1c5..82e2cd8 100644
--- x11-toolkits/tktreectrl/Makefile
+++ x11-toolkits/tktreectrl/Makefile
@@ -18,7 +18,7 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-tcl=${TCL_LIBDIR} \
 		--with-tk=${TK_LIBDIR} \
 		--exec-prefix=${PREFIX} --enable-shared
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS} ${TCL_INCLUDES} ${TK_INCLUDES}"
+CPPFLAGS+=	${TCL_INCLUDES} ${TK_INCLUDES}
 TCL_INCLUDES=	-I${TCL_INCLUDEDIR} -I${TCL_INCLUDEDIR}/generic
 TK_INCLUDES=	-I${TK_INCLUDEDIR} -I${TK_INCLUDEDIR}/generic \
 		-I${TK_INCLUDEDIR}/unix
diff --git x11-toolkits/unique/Makefile x11-toolkits/unique/Makefile
index ae8da4b..09512a4 100644
--- x11-toolkits/unique/Makefile
+++ x11-toolkits/unique/Makefile
@@ -27,8 +27,8 @@ USE_AUTOTOOLS=	libtool
 USE_GNOME=	gtk20 gnomeprefix ltverhack:2
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-maintainer-flags
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|libdir)/pkgconfig|prefix)/libdata/pkgconfig|g' \
diff --git x11-toolkits/vdk/Makefile x11-toolkits/vdk/Makefile
index 8117cf1..38ce5c9 100644
--- x11-toolkits/vdk/Makefile
+++ x11-toolkits/vdk/Makefile
@@ -18,14 +18,13 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 USE_GNOME=	gnomehack gtk20
 USE_AUTOTOOLS=	libtool
-CONFIGURE_ENV=	LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--enable-opt=no --enable-doc-html=no --enable-testvdk=no
 USE_LDCONFIG=	yes
 
 MAN1=		vdk-config-2.1
 
-CPPFLAGS=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS=	-L${LOCALBASE}/lib -lgnuregex ${PTHREAD_LIBS}
+CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS+=	-L${LOCALBASE}/lib -lgnuregex ${PTHREAD_LIBS}
 
 .include <bsd.port.pre.mk>
 
diff --git x11-toolkits/vdkbuilder/Makefile x11-toolkits/vdkbuilder/Makefile
index 7f6e56e..6f9a1d3 100644
--- x11-toolkits/vdkbuilder/Makefile
+++ x11-toolkits/vdkbuilder/Makefile
@@ -21,14 +21,13 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 USE_GNOME=	gtk20
 USE_AUTOTOOLS=	libtool
-CONFIGURE_ENV=	LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--enable-opt=no
 USE_LDCONFIG=	yes
 
 MAN1=		vdkb2.1
 
-CPPFLAGS=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 post-patch:
 	@${REINPLACE_CMD} -e \
diff --git x11-toolkits/vte/Makefile x11-toolkits/vte/Makefile
index 7828f9e..3b1da46 100644
--- x11-toolkits/vte/Makefile
+++ x11-toolkits/vte/Makefile
@@ -26,8 +26,8 @@ USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool
 USE_GETTEXT=	yes
 USE_GNOME?=	gnomeprefix gnomehack gtk20 ltverhack referencehack
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 #		BSD_PTHREAD_LIBS="${PTHREAD_LIBS}"
 CONFIGURE_ARGS?=--disable-python \
 		--disable-Bsymbolic \
diff --git x11-toolkits/wxgtk24/Makefile x11-toolkits/wxgtk24/Makefile
index 7e33091..571d7e2 100644
--- x11-toolkits/wxgtk24/Makefile
+++ x11-toolkits/wxgtk24/Makefile
@@ -35,12 +35,12 @@ CONFIGURE_ARGS=	--with-libpng=sys \
 		--with-opengl\
 		--enable-gtk2 \
 		--includedir=${PREFIX}/include/wx-2.4
-CONFIGURE_ENV=	CPPFLAGS="-I${WRKSRC}/include \
-			  -I${LOCALBASE}/include \
-			  ${PTHREAD_CFLAGS}" \
-		LDFLAGS="-L${LOCALBASE}/lib -liconv \
-			 ${PTHREAD_LIBS}"\
-		X11BASE="${LOCALBASE}"
+CONFIGURE_ENV=	X11BASE="${LOCALBASE}"
+CPPFLAGS+=	-I${WRKSRC}/include \
+		-I${LOCALBASE}/include \
+		${PTHREAD_CFLAGS}
+LDFLAGS+=	-L${LOCALBASE}/lib -liconv \
+		${PTHREAD_LIBS}
 NO_LATEST_LINK=	yes
 PLIST=		${.CURDIR}/pkg-plist
 
diff --git x11-toolkits/wxgtk26/Makefile x11-toolkits/wxgtk26/Makefile
index fdf6ed9..f5eee7e 100644
--- x11-toolkits/wxgtk26/Makefile
+++ x11-toolkits/wxgtk26/Makefile
@@ -38,11 +38,11 @@ CONFIGURE_ARGS=	--with-libpng=sys\
 		--with-mspack\
 		--with-gtk\
 		--disable-backtrace
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib -liconv" \
-		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
+CONFIGURE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		PTHREAD_LIBS="${PTHREAD_LIBS}"\
 		X11BASE="${LOCALBASE}"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib -liconv
 NO_LATEST_LINK=	yes
 PLIST=		${.CURDIR}/pkg-plist
 
diff --git x11-toolkits/wxgtk28/Makefile x11-toolkits/wxgtk28/Makefile
index f1334a4..09c87ab 100644
--- x11-toolkits/wxgtk28/Makefile
+++ x11-toolkits/wxgtk28/Makefile
@@ -39,11 +39,11 @@ CONFIGURE_ARGS=	--with-libpng=sys\
 		--enable-mediactrl\
 		--disable-backtrace\
 		--enable-graphics_ctx
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}"\
-		LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"\
+CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"\
 		WXCONFIG_CPPFLAGS="${PTHREAD_CFLAGS}"\
 		PTHREAD_LIBS="${PTHREAD_LIBS}"\
 		X11BASE="${LOCALBASE}"
+CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
 PLIST=		${.CURDIR}/pkg-plist
 
 WXGTK_FLAVOR?=	gtk2
diff --git x11-toolkits/wxgtk29/Makefile x11-toolkits/wxgtk29/Makefile
index fa0065f..23bab55 100644
--- x11-toolkits/wxgtk29/Makefile
+++ x11-toolkits/wxgtk29/Makefile
@@ -40,10 +40,10 @@ CONFIGURE_ARGS=	--with-libpng=sys\
 		--enable-mediactrl\
 		--disable-backtrace\
 		--enable-graphics_ctx
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}"\
-		LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"\
+CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"\
 		PTHREAD_LIBS="${PTHREAD_LIBS}"\
 		X11BASE="${LOCALBASE}"
+CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
 NO_LATEST_LINK=	yes
 
 OPTIONS=	GSTREAMER "media support" on\
diff --git x11-toolkits/xforms/Makefile x11-toolkits/xforms/Makefile
index b82e53c..ebfee7b 100644
--- x11-toolkits/xforms/Makefile
+++ x11-toolkits/xforms/Makefile
@@ -25,7 +25,6 @@ USE_GL=		gl
 GNU_CONFIGURE=	yes
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
-CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS}"
 USE_LDCONFIG=	yes
 
 MAN1=		fdesign.1 fd2ps.1
diff --git x11-wm/afterstep-stable/Makefile x11-wm/afterstep-stable/Makefile
index 2521402..5f40f9d 100644
--- x11-wm/afterstep-stable/Makefile
+++ 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 x11-wm/amaterus/Makefile x11-wm/amaterus/Makefile
index ed76300..a196f13 100644
--- x11-wm/amaterus/Makefile
+++ 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 x11-wm/bbkeys/Makefile x11-wm/bbkeys/Makefile
index 1f45762..98b7402 100644
--- x11-wm/bbkeys/Makefile
+++ 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 x11-wm/bbpager/Makefile x11-wm/bbpager/Makefile
index c4441d8..060b52e 100644
--- x11-wm/bbpager/Makefile
+++ 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 x11-wm/compiz-plugins-extra/Makefile x11-wm/compiz-plugins-extra/Makefile
index b9390dc..4e964a2 100644
--- x11-wm/compiz-plugins-extra/Makefile
+++ 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 x11-wm/compiz-plugins-main/Makefile x11-wm/compiz-plugins-main/Makefile
index a0a4320..9286144 100644
--- x11-wm/compiz-plugins-main/Makefile
+++ 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 x11-wm/compiz-plugins-unsupported/Makefile x11-wm/compiz-plugins-unsupported/Makefile
index c8828ec..7d97bb8 100644
--- x11-wm/compiz-plugins-unsupported/Makefile
+++ 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 x11-wm/compiz/Makefile x11-wm/compiz/Makefile
index 6bcd369..9b5c1e3 100644
--- x11-wm/compiz/Makefile
+++ 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 x11-wm/devilspie/Makefile x11-wm/devilspie/Makefile
index 07787b5..7ae7b80 100644
--- x11-wm/devilspie/Makefile
+++ 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 x11-wm/ede/Makefile x11-wm/ede/Makefile
index ed74234..abe068e 100644
--- x11-wm/ede/Makefile
+++ 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 x11-wm/emerald/Makefile x11-wm/emerald/Makefile
index 2b4ff88..ee3c8aa 100644
--- x11-wm/emerald/Makefile
+++ 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 x11-wm/epplets/Makefile x11-wm/epplets/Makefile
index b93a7e6..2f7fac9 100644
--- x11-wm/epplets/Makefile
+++ 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 x11-wm/evilwm/Makefile x11-wm/evilwm/Makefile
index 677b0c6..89894d7 100644
--- x11-wm/evilwm/Makefile
+++ x11-wm/evilwm/Makefile
@@ -24,7 +24,7 @@ PLIST_FILES=	bin/evilwm
 CFLAGS+=	-DSOLIDDRAG -DINFOBANNER -DVWM -DSHAPE -DMOUSE -DSNAP \
 		-DSTDIO -DCOLOURMAP -DVERSION=\\\"${PORTVERSION}\\\" \
 		-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib -lX11 -lXext
+LDFLAGS+=	-L${LOCALBASE}/lib -lX11 -lXext
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
diff --git x11-wm/fluxbox/Makefile x11-wm/fluxbox/Makefile
index 4a05528..a749ca2 100644
--- x11-wm/fluxbox/Makefile
+++ 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 x11-wm/icewm/Makefile x11-wm/icewm/Makefile
index 692577f..2f98b69 100644
--- x11-wm/icewm/Makefile
+++ 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 x11-wm/jwm/Makefile x11-wm/jwm/Makefile
index 64ff696..597c492 100644
--- x11-wm/jwm/Makefile
+++ 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 x11-wm/libcompizconfig/Makefile x11-wm/libcompizconfig/Makefile
index fac64a5..be30298 100644
--- x11-wm/libcompizconfig/Makefile
+++ 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 x11-wm/libwraster/Makefile x11-wm/libwraster/Makefile
index cb9e088..2717045 100644
--- x11-wm/libwraster/Makefile
+++ 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 x11-wm/lwm/Makefile x11-wm/lwm/Makefile
index a416565..e1d07fa 100644
--- x11-wm/lwm/Makefile
+++ 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 x11-wm/lxsession/Makefile x11-wm/lxsession/Makefile
index 6201097..050e0ce 100644
--- x11-wm/lxsession/Makefile
+++ 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 x11-wm/matchbox/Makefile x11-wm/matchbox/Makefile
index 38a1f89..4ae1129 100644
--- x11-wm/matchbox/Makefile
+++ 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 x11-wm/metacity/Makefile x11-wm/metacity/Makefile
index 8cab1fe..ca7bf43 100644
--- x11-wm/metacity/Makefile
+++ 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 x11-wm/mutter/Makefile x11-wm/mutter/Makefile
index d69c635..8d26c9b 100644
--- x11-wm/mutter/Makefile
+++ 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 x11-wm/obconf/Makefile x11-wm/obconf/Makefile
index e028aa3..c5f41bc 100644
--- x11-wm/obconf/Makefile
+++ 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 x11-wm/pekwm/Makefile x11-wm/pekwm/Makefile
index 4e77aa2..591878c 100644
--- x11-wm/pekwm/Makefile
+++ 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 x11-wm/phluid/Makefile x11-wm/phluid/Makefile
index b7f2399..80e6187 100644
--- x11-wm/phluid/Makefile
+++ 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 x11-wm/sawfish/Makefile x11-wm/sawfish/Makefile
index 1f1fcf5..761e780 100644
--- x11-wm/sawfish/Makefile
+++ 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 x11-wm/waimea-devel/Makefile x11-wm/waimea-devel/Makefile
index 7cea4a9..b082ba1 100644
--- x11-wm/waimea-devel/Makefile
+++ 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 x11-wm/windowmaker/Makefile x11-wm/windowmaker/Makefile
index c80ee61..cb58b85 100644
--- x11-wm/windowmaker/Makefile
+++ 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 x11-wm/wmanager/files/patch-aa x11-wm/wmanager/files/patch-aa
index b8bc34e..d87c282 100644
--- x11-wm/wmanager/files/patch-aa
+++ 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 x11-wm/xfce/Makefile x11-wm/xfce/Makefile
index b7b9b52..20759a4 100644
--- x11-wm/xfce/Makefile
+++ 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 \
diff --git x11/3ddesktop/Makefile x11/3ddesktop/Makefile
index ddff903..e7c2976 100644
--- x11/3ddesktop/Makefile
+++ 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 x11/alltray/Makefile x11/alltray/Makefile
index 0fff263..6dcb0bb 100644
--- x11/alltray/Makefile
+++ 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 x11/aterm/Makefile x11/aterm/Makefile
index d0f43e2..8f4dbcb 100644
--- x11/aterm/Makefile
+++ 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 x11/avant-window-navigator/Makefile x11/avant-window-navigator/Makefile
index 90168af..440ba98 100644
--- x11/avant-window-navigator/Makefile
+++ 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 x11/bbrun/Makefile x11/bbrun/Makefile
index efe718c..30fef53 100644
--- x11/bbrun/Makefile
+++ 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 x11/brightside/Makefile x11/brightside/Makefile
index 63dd739..d980bf8 100644
--- x11/brightside/Makefile
+++ 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 x11/erun/Makefile x11/erun/Makefile
index b260828..2adffaa 100644
--- x11/erun/Makefile
+++ 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 x11/eterm/Makefile x11/eterm/Makefile
index 027b9c2..31b4648 100644
--- x11/eterm/Makefile
+++ 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 x11/fireflies/Makefile x11/fireflies/Makefile
index bf48e7f..e9c9fb3 100644
--- x11/fireflies/Makefile
+++ 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 x11/florence/Makefile x11/florence/Makefile
index dbcdc03..f7a9a34 100644
--- x11/florence/Makefile
+++ 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 x11/gdkxft/Makefile x11/gdkxft/Makefile
index 27ae7bd..6aa6ebd 100644
--- x11/gdkxft/Makefile
+++ 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 x11/gdm/Makefile x11/gdm/Makefile
index d0d989d..1a62853 100644
--- x11/gdm/Makefile
+++ 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 x11/ggiterm/Makefile x11/ggiterm/Makefile
index 6953e0a..b8cd868 100644
--- x11/ggiterm/Makefile
+++ 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 x11/gmrun/Makefile x11/gmrun/Makefile
index 386dab3..ed25ab2 100644
--- x11/gmrun/Makefile
+++ 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 x11/gnome-applets/Makefile x11/gnome-applets/Makefile
index 0b69289..17d9054 100644
--- x11/gnome-applets/Makefile
+++ 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 x11/gnome-desktop/Makefile x11/gnome-desktop/Makefile
index 5a358b6..1762fcc 100644
--- x11/gnome-desktop/Makefile
+++ 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 x11/gnome-libs/Makefile x11/gnome-libs/Makefile
index c36b739..54a6681 100644
--- x11/gnome-libs/Makefile
+++ 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 x11/gnome-menus/Makefile x11/gnome-menus/Makefile
index 40a2dd7..421bd0f 100644
--- x11/gnome-menus/Makefile
+++ 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 x11/gnome-panel/Makefile x11/gnome-panel/Makefile
index 4887b4c..bc2d84c 100644
--- x11/gnome-panel/Makefile
+++ 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 x11/gnome-screensaver/Makefile x11/gnome-screensaver/Makefile
index 55cb5c7..e231215 100644
--- x11/gnome-screensaver/Makefile
+++ 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 x11/gnome-session/Makefile x11/gnome-session/Makefile
index 6a6783a..73a300a 100644
--- x11/gnome-session/Makefile
+++ 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 x11/gnome-shell/Makefile x11/gnome-shell/Makefile
index 6328c31..6387ac9 100644
--- x11/gnome-shell/Makefile
+++ 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 x11/gnome-swallow/Makefile x11/gnome-swallow/Makefile
index 0d4896a..1fcc595 100644
--- x11/gnome-swallow/Makefile
+++ 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 x11/gnome-terminal/Makefile x11/gnome-terminal/Makefile
index 7cde07c..0bd93b7 100644
--- x11/gnome-terminal/Makefile
+++ 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 x11/gsynaptics/Makefile x11/gsynaptics/Makefile
index 1bf0451..ecaacf1 100644
--- x11/gsynaptics/Makefile
+++ 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 x11/gtkterm2/Makefile x11/gtkterm2/Makefile
index f20ea44..9821c0e 100644
--- x11/gtkterm2/Makefile
+++ 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 x11/libdnd/Makefile x11/libdnd/Makefile
index b80251e..a6d5ee0 100644
--- x11/libdnd/Makefile
+++ 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 x11/libfm/Makefile x11/libfm/Makefile
index 4e89936..f74419f 100644
--- x11/libfm/Makefile
+++ x11/libfm/Makefile
@@ -23,13 +23,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 x11/libgnome-java/Makefile x11/libgnome-java/Makefile
index ba0cebb..07c4f50b 100644
--- x11/libgnome-java/Makefile
+++ 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 x11/libgnome/Makefile x11/libgnome/Makefile
index 82dcda4..12c4878 100644
--- x11/libgnome/Makefile
+++ 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 x11/libgnomekbd/Makefile x11/libgnomekbd/Makefile
index c4d0030..9aac386 100644
--- x11/libgnomekbd/Makefile
+++ 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 x11/libsynaptics/Makefile x11/libsynaptics/Makefile
index c28b8de..3e6ccb1 100644
--- x11/libsynaptics/Makefile
+++ 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 x11/libxklavier/Makefile x11/libxklavier/Makefile
index 4728005..d756764 100644
--- x11/libxklavier/Makefile
+++ 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 x11/menu-cache/Makefile x11/menu-cache/Makefile
index a324875..04054bd 100644
--- x11/menu-cache/Makefile
+++ 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 x11/mgapdesk/Makefile x11/mgapdesk/Makefile
index 7672c72..bb58dc9 100644
--- x11/mgapdesk/Makefile
+++ 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 x11/mlterm/Makefile x11/mlterm/Makefile
index 091d873..bb3d852 100644
--- x11/mlterm/Makefile
+++ 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 x11/mrxvt/Makefile x11/mrxvt/Makefile
index c130458..29e8197 100644
--- x11/mrxvt/Makefile
+++ 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 x11/multi-gnome-terminal/Makefile x11/multi-gnome-terminal/Makefile
index 8821d4f..64f23c5 100644
--- x11/multi-gnome-terminal/Makefile
+++ 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 x11/numlockx/Makefile x11/numlockx/Makefile
index 501f118..0a983d9 100644
--- x11/numlockx/Makefile
+++ 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 x11/powershell/Makefile x11/powershell/Makefile
index d99b4a2..cbaad3d 100644
--- x11/powershell/Makefile
+++ 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 x11/rxvt-unicode/Makefile x11/rxvt-unicode/Makefile
index 66027e7..7a702b3 100644
--- x11/rxvt-unicode/Makefile
+++ 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 x11/sisctrl/Makefile x11/sisctrl/Makefile
index 8628bc3..dad85ff 100644
--- x11/sisctrl/Makefile
+++ 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 x11/startup-notification/Makefile x11/startup-notification/Makefile
index f3c5b93..0e40070 100644
--- x11/startup-notification/Makefile
+++ 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 x11/thinglaunch/Makefile x11/thinglaunch/Makefile
index 8498131..4376463 100644
--- x11/thinglaunch/Makefile
+++ 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 x11/wdm/Makefile x11/wdm/Makefile
index 96a757a3..a18d2b2 100644
--- x11/wdm/Makefile
+++ 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 x11/wmappl/Makefile x11/wmappl/Makefile
index a5d3f1a..8e3392b 100644
--- x11/wmappl/Makefile
+++ 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 x11/workrave/Makefile x11/workrave/Makefile
index 7a2f57a..88309bb 100644
--- x11/workrave/Makefile
+++ 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 x11/wterm/Makefile x11/wterm/Makefile
index 41be016..e6f4771 100644
--- x11/wterm/Makefile
+++ 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 x11/x3270/Makefile x11/x3270/Makefile
index 21ce12c..aa8d03e 100644
--- x11/x3270/Makefile
+++ 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 x11/xautomation/Makefile x11/xautomation/Makefile
index b07012a..685a0ce 100644
--- x11/xautomation/Makefile
+++ 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 x11/xbindkeys/Makefile x11/xbindkeys/Makefile
index 6c28f7d..232f1be 100644
--- x11/xbindkeys/Makefile
+++ 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 x11/xdialog/Makefile x11/xdialog/Makefile
index 44904d5..4d85cac 100644
--- x11/xdialog/Makefile
+++ 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 x11/xfree86_xkb_xml/Makefile x11/xfree86_xkb_xml/Makefile
index 3579aeb..f352fd6 100644
--- x11/xfree86_xkb_xml/Makefile
+++ 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 x11/xkeyboard-config/Makefile x11/xkeyboard-config/Makefile
index 33cb565..caf1b61 100644
--- x11/xkeyboard-config/Makefile
+++ x11/xkeyboard-config/Makefile
@@ -25,7 +25,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 --with-included-gettext
diff --git x11/xloadimage/Makefile x11/xloadimage/Makefile
index b2d71e9..24478cd 100644
--- x11/xloadimage/Makefile
+++ 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 x11/xpyb/Makefile x11/xpyb/Makefile
index 95f10b9..e3d2e0c 100644
--- x11/xpyb/Makefile
+++ 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 x11/xrestop/Makefile x11/xrestop/Makefile
index 14cd6c2..b9f2554 100644
--- x11/xrestop/Makefile
+++ 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 x11/xscreensaver-gnome/Makefile x11/xscreensaver-gnome/Makefile
index 82d40c1..360dd0d 100644
--- x11/xscreensaver-gnome/Makefile
+++ 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 x11/xscreensaver.app/Makefile x11/xscreensaver.app/Makefile
index 3c40f9d..c8390b0 100644
--- x11/xscreensaver.app/Makefile
+++ 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 x11/xsel-conrad/Makefile x11/xsel-conrad/Makefile
index d87a14c..9ff2947 100644
--- x11/xsel-conrad/Makefile
+++ 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 x11/xsel/Makefile x11/xsel/Makefile
index 428c3eb..84f78e0 100644
--- x11/xsel/Makefile
+++ 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 x11/xstroke/Makefile x11/xstroke/Makefile
index 849a061..245e846 100644
--- x11/xstroke/Makefile
+++ 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 x11/xtermcontrol/Makefile x11/xtermcontrol/Makefile
index 05ad51d..6155fa1 100644
--- x11/xtermcontrol/Makefile
+++ 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 x11/xvmcinfo/Makefile x11/xvmcinfo/Makefile
index 3524a28..0c42332 100644
--- x11/xvmcinfo/Makefile
+++ 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 x11/yakuake/Makefile x11/yakuake/Makefile
index 5448f4b..7469b72 100644
--- x11/yakuake/Makefile
+++ 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 x11/yelp/Makefile x11/yelp/Makefile
index df720e9..1cd19df 100644
--- x11/yelp/Makefile
+++ 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 x11/zenity/Makefile x11/zenity/Makefile
index 03ccc5e..1705efb 100644
--- x11/zenity/Makefile
+++ 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