author: Dmitry Marakasov <amdmi3@FreeBSD.org> 2011-09-23 22:26:39 +0000
committer: Dmitry Marakasov <amdmi3@FreeBSD.org> 2011-09-23 22:26:39 +0000
commit: 6f6fbe4bdf9851de1eb6ebef5287e3007846045e (patch)
tree: 3b556699991305af672fba96e0e8b6bb88bcc7da /games
parent: 86f8cde1da39aadc3efbc11e60998d886c86c36e (diff)
download: ports-6f6fbe4bdf9851de1eb6ebef5287e3007846045e.tar.gz
ports-6f6fbe4bdf9851de1eb6ebef5287e3007846045e.zip
199 files changed, 362 insertions, 419 deletions
diff --git a/games/8kingdoms/Makefile b/games/8kingdoms/Makefile
index 613fcbf0505d..37cd62f00aba 100644
--- a/games/8kingdoms/Makefile
+++ b/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 a/games/abuse_sdl/Makefile b/games/abuse_sdl/Makefile
index 1a7854a2cb05..d179a5151f0e 100644
--- a/games/abuse_sdl/Makefile
+++ b/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 a/games/adgali/Makefile b/games/adgali/Makefile
index 92d5c3e9a226..eb7e74156398 100644
--- a/games/adgali/Makefile
+++ b/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 a/games/adonthell/Makefile b/games/adonthell/Makefile
index 2fd1876d0303..7350900bada4 100644
--- a/games/adonthell/Makefile
+++ b/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 a/games/afternoonstalker/Makefile b/games/afternoonstalker/Makefile
index 352fb0c30a37..48161af009c6 100644
--- a/games/afternoonstalker/Makefile
+++ b/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 a/games/alienarena/Makefile b/games/alienarena/Makefile
index 05c4e7a34f31..5ae8a18b0f01 100644
--- a/games/alienarena/Makefile
+++ b/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 a/games/allacrost/Makefile b/games/allacrost/Makefile
index f7f9d3f218f5..b4a96822127f 100644
--- a/games/allacrost/Makefile
+++ b/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 a/games/antrix/Makefile b/games/antrix/Makefile
index 54044cc9a3c9..9f3bb563a205 100644
--- a/games/antrix/Makefile
+++ b/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 a/games/apricots/Makefile b/games/apricots/Makefile
index fbd3bf5d6afd..6f550b8b8a44 100644
--- a/games/apricots/Makefile
+++ b/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 a/games/asc/Makefile b/games/asc/Makefile
index e6b4e66b29c4..0a33bf650768 100644
--- a/games/asc/Makefile
+++ b/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 a/games/atomix/Makefile b/games/atomix/Makefile
index 4380d5117e78..ce0ea20d0165 100644
--- a/games/atomix/Makefile
+++ b/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 a/games/atr3d/Makefile b/games/atr3d/Makefile
index 3f863cd4f266..c1aceb4fd15e 100644
--- a/games/atr3d/Makefile
+++ b/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 a/games/belooted/Makefile b/games/belooted/Makefile
index 63900f5df60f..6a6e6867944b 100644
--- a/games/belooted/Makefile
+++ b/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 a/games/bitefusion/Makefile b/games/bitefusion/Makefile
index 33de52ee1776..459dd102e4b8 100644
--- a/games/bitefusion/Makefile
+++ b/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 a/games/blokish/Makefile b/games/blokish/Makefile
index 91449a9f0545..6c5209df6dc4 100644
--- a/games/blokish/Makefile
+++ b/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 a/games/bomberclone/Makefile b/games/bomberclone/Makefile
index 6ec14cc621ba..5eda26914ccd 100644
--- a/games/bomberclone/Makefile
+++ b/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 a/games/bomberinstinct/Makefile b/games/bomberinstinct/Makefile
index d6ab52a793c5..1ec8ef600aee 100644
--- a/games/bomberinstinct/Makefile
+++ b/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 a/games/bombermaze/Makefile b/games/bombermaze/Makefile
index 9fa6d8ad5205..fd345baebe22 100644
--- a/games/bombermaze/Makefile
+++ b/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 a/games/bomns/Makefile b/games/bomns/Makefile
index 6ae0c09a6068..9aad4d23e410 100644
--- a/games/bomns/Makefile
+++ b/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 a/games/briquolo/Makefile b/games/briquolo/Makefile
index afc69c5afd0c..58aa1be9694b 100644
--- a/games/briquolo/Makefile
+++ b/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 a/games/bumprace/Makefile b/games/bumprace/Makefile
index eeaec6ec0a1e..399f9850492c 100644
--- a/games/bumprace/Makefile
+++ b/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 a/games/burgerspace/Makefile b/games/burgerspace/Makefile
index 243b4fef6316..91f189995b73 100644
--- a/games/burgerspace/Makefile
+++ b/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 a/games/burrtools/Makefile b/games/burrtools/Makefile
index b18b50aeefdc..32b3f51d95a6 100644
--- a/games/burrtools/Makefile
+++ b/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 a/games/bygfoot/Makefile b/games/bygfoot/Makefile
index dba8aa4566bd..8970d67e5a82 100644
--- a/games/bygfoot/Makefile
+++ b/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 a/games/bzflag/Makefile b/games/bzflag/Makefile
index 0b20732c18d2..d3606c2a232e 100644
--- a/games/bzflag/Makefile
+++ b/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 a/games/ceferino/Makefile b/games/ceferino/Makefile
index aaeca9bb7f2a..8fa914670860 100644
--- a/games/ceferino/Makefile
+++ b/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 a/games/chanta/Makefile b/games/chanta/Makefile
index b717e2cb37cd..8820ffdc83ef 100644
--- a/games/chanta/Makefile
+++ b/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 a/games/chroma/Makefile b/games/chroma/Makefile
index 45bdbc437e97..df849a08cf8b 100644
--- a/games/chroma/Makefile
+++ b/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 a/games/chromium-bsu/Makefile b/games/chromium-bsu/Makefile
index c2c08a70cb2e..6105b82ece92 100644
--- a/games/chromium-bsu/Makefile
+++ b/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 a/games/concentration/Makefile b/games/concentration/Makefile
index c3b52c290820..5753a187f876 100644
--- a/games/concentration/Makefile
+++ b/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 a/games/connectfive/Makefile b/games/connectfive/Makefile
index 884fb7866479..163f0b4badaa 100644
--- a/games/connectfive/Makefile
+++ b/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 a/games/construo/Makefile b/games/construo/Makefile
index f074c8819086..5090d2bbb76e 100644
--- a/games/construo/Makefile
+++ b/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 a/games/corewars/Makefile b/games/corewars/Makefile
index 43c66037999d..f7a78b8cf78e 100644
--- a/games/corewars/Makefile
+++ b/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 a/games/cosmosmash/Makefile b/games/cosmosmash/Makefile
index d01324f5ab9b..45c9bf3e92ca 100644
--- a/games/cosmosmash/Makefile
+++ b/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 a/games/crack-attack/Makefile b/games/crack-attack/Makefile
index f249e579b1d5..83b52f43f9f6 100644
--- a/games/crack-attack/Makefile
+++ b/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 a/games/critterding/Makefile b/games/critterding/Makefile
index 65a64dfb2b04..c48985e92941 100644
--- a/games/critterding/Makefile
+++ b/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 a/games/crossfire-client/Makefile b/games/crossfire-client/Makefile
index 0fbac50e5209..db1fcc806524 100644
--- a/games/crossfire-client/Makefile
+++ b/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 a/games/crossfire-server/Makefile b/games/crossfire-server/Makefile
index b43c4fa3f393..a28df53add9c 100644
--- a/games/crossfire-server/Makefile
+++ b/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 a/games/crrcsim/Makefile b/games/crrcsim/Makefile
index 53efac00e12d..7974604a9f49 100644
--- a/games/crrcsim/Makefile
+++ b/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 a/games/csmash/Makefile b/games/csmash/Makefile
index e21a99e17483..54731ec79418 100644
--- a/games/csmash/Makefile
+++ b/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 a/games/d2x-xl/Makefile b/games/d2x-xl/Makefile
index 34f8f13130d3..a0fd75902cdb 100644
--- a/games/d2x-xl/Makefile
+++ b/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 a/games/d2x/Makefile b/games/d2x/Makefile
index 966f0d5db75c..fc0c986e89a8 100644
--- a/games/d2x/Makefile
+++ b/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 a/games/daimonin/Makefile b/games/daimonin/Makefile
index c34a5f64d89d..92930193d4a5 100644
--- a/games/daimonin/Makefile
+++ b/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 a/games/diameter/Makefile b/games/diameter/Makefile
index 4aaf0ad06b16..464e12bfcec2 100644
--- a/games/diameter/Makefile
+++ b/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 a/games/dopewars/Makefile b/games/dopewars/Makefile
index c721b0b049ea..bc68f24e2df9 100644
--- a/games/dopewars/Makefile
+++ b/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 a/games/duel/Makefile b/games/duel/Makefile
index a9e7538fe5b9..2ed692625e64 100644
--- a/games/duel/Makefile
+++ b/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 a/games/ember/Makefile b/games/ember/Makefile
index 47db1c795361..402c7ba71bcc 100644
--- a/games/ember/Makefile
+++ b/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 a/games/enigma/Makefile b/games/enigma/Makefile
index bfdc8f45b5eb..12978c98adee 100644
--- a/games/enigma/Makefile
+++ b/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 a/games/exult/Makefile b/games/exult/Makefile
index 9a7dfff43934..d2bfdb877ca3 100644
--- a/games/exult/Makefile
+++ b/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 a/games/fillets-ng/Makefile b/games/fillets-ng/Makefile
index 94f641c24ab6..838c8a384c49 100644
--- a/games/fillets-ng/Makefile
+++ b/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 a/games/fishsupper/Makefile b/games/fishsupper/Makefile
index ab35714e3390..18302998b2a2 100644
--- a/games/fishsupper/Makefile
+++ b/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 a/games/fkiss/Makefile b/games/fkiss/Makefile
index 1470918cd513..5f05df27bc38 100644
--- a/games/fkiss/Makefile
+++ b/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 a/games/flightgear-atlas/Makefile b/games/flightgear-atlas/Makefile
index 05eddfe5f616..11d6fb90c941 100644
--- a/games/flightgear-atlas/Makefile
+++ b/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 a/games/flightgear/Makefile b/games/flightgear/Makefile
index 3ce008806fb7..f40db8e3352e 100644
--- a/games/flightgear/Makefile
+++ b/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 a/games/flyhard/Makefile b/games/flyhard/Makefile
index 4747666b5fae..90c93240e2b6 100644
--- a/games/flyhard/Makefile
+++ b/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 a/games/foobillard/Makefile b/games/foobillard/Makefile
index 282cae2c91a4..9f11148e79d7 100644
--- a/games/foobillard/Makefile
+++ b/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 a/games/freeciv/Makefile b/games/freeciv/Makefile
index 53a32601d2c9..bf22a8115c5e 100644
--- a/games/freeciv/Makefile
+++ b/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 a/games/freesci/Makefile b/games/freesci/Makefile
index 69d296246821..33e97298d0d0 100644
--- a/games/freesci/Makefile
+++ b/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 a/games/garith/Makefile b/games/garith/Makefile
index 295138dee905..7aa3643736f3 100644
--- a/games/garith/Makefile
+++ b/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 a/games/gbrainy/Makefile b/games/gbrainy/Makefile
index 0e81016b91ef..df052a007c4c 100644
--- a/games/gbrainy/Makefile
+++ b/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 a/games/gcompris/Makefile b/games/gcompris/Makefile
index 7cfefe546f66..5ac709a3cec1 100644
--- a/games/gcompris/Makefile
+++ b/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 a/games/ggz-client-libs/Makefile b/games/ggz-client-libs/Makefile
index db0358b3b7da..911ab9a58a92 100644
--- a/games/ggz-client-libs/Makefile
+++ b/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 a/games/ggz-gtk-client/Makefile b/games/ggz-gtk-client/Makefile
index eb8f96c3f706..a25c3ee545c7 100644
--- a/games/ggz-gtk-client/Makefile
+++ b/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 a/games/ggz-gtk-games/Makefile b/games/ggz-gtk-games/Makefile
index 57863c75ac68..688cb521d2ca 100644
--- a/games/ggz-gtk-games/Makefile
+++ b/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 a/games/ggz-sdl-games/Makefile b/games/ggz-sdl-games/Makefile
index 8a8e241cc1ab..3d8b4abf77c3 100644
--- a/games/ggz-sdl-games/Makefile
+++ b/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 a/games/ggz-txt-client/Makefile b/games/ggz-txt-client/Makefile
index 9331a5c833ee..1b2320231ef4 100644
--- a/games/ggz-txt-client/Makefile
+++ b/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 a/games/gl-117/Makefile b/games/gl-117/Makefile
index 7c1f5e14527e..ce06650928d6 100644
--- a/games/gl-117/Makefile
+++ b/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 a/games/glest/Makefile b/games/glest/Makefile
index ab8f183535e0..083f0ddcb3bb 100644
--- a/games/glest/Makefile
+++ b/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 a/games/glife/Makefile b/games/glife/Makefile
index a5b46545c5a8..7372a7698b3f 100644
--- a/games/glife/Makefile
+++ b/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 a/games/gltron/Makefile b/games/gltron/Makefile
index c0dfedfe0ca4..c4a009f71336 100644
--- a/games/gltron/Makefile
+++ b/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 a/games/gno3dtet/Makefile b/games/gno3dtet/Makefile
index c3bf187cb32f..1e0fc88f31d2 100644
--- a/games/gno3dtet/Makefile
+++ b/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 a/games/gnome-games/Makefile b/games/gnome-games/Makefile
index aaf749c81a00..25341e53f7c8 100644
--- a/games/gnome-games/Makefile
+++ b/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 a/games/gnomeattacks/Makefile b/games/gnomeattacks/Makefile
index 9f92987d1dae..187c2a8776d8 100644
--- a/games/gnomeattacks/Makefile
+++ b/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 a/games/gnomebreakout/Makefile b/games/gnomebreakout/Makefile
index f939f668d716..2efb84cd5b08 100644
--- a/games/gnomebreakout/Makefile
+++ b/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 a/games/gnomechess/Makefile b/games/gnomechess/Makefile
index e6d0d37cf37f..5dd09be34e51 100644
--- a/games/gnomechess/Makefile
+++ b/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 a/games/gnomekiss/Makefile b/games/gnomekiss/Makefile
index f6d66be775c3..7747603a729f 100644
--- a/games/gnomekiss/Makefile
+++ b/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 a/games/gnomememoryblocks/Makefile b/games/gnomememoryblocks/Makefile
index 9c804e12b37b..9ec8455e9009 100644
--- a/games/gnomememoryblocks/Makefile
+++ b/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 a/games/gnomermind/Makefile b/games/gnomermind/Makefile
index ff9f9991ee0c..7ba3702213f4 100644
--- a/games/gnomermind/Makefile
+++ b/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 a/games/gnono/Makefile b/games/gnono/Makefile
index 59539d888784..800f3abe8c5a 100644
--- a/games/gnono/Makefile
+++ b/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 a/games/gnubg/Makefile b/games/gnubg/Makefile
index 951cc1175999..fc446fbbe2d8 100644
--- a/games/gnubg/Makefile
+++ b/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 a/games/gnurobots/Makefile b/games/gnurobots/Makefile
index b7f15eadb739..0f6c84a70ec1 100644
--- a/games/gnurobots/Makefile
+++ b/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 a/games/gracer/Makefile b/games/gracer/Makefile
index 583477ebfafa..66c54ad32725 100644
--- a/games/gracer/Makefile
+++ b/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 a/games/greed/Makefile b/games/greed/Makefile
index cf5e3e09f61d..7f688282329c 100644
--- a/games/greed/Makefile
+++ b/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 a/games/grhino/Makefile b/games/grhino/Makefile
index dd08b59bb57c..c861773e0649 100644
--- a/games/grhino/Makefile
+++ b/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 a/games/gtetrinet/Makefile b/games/gtetrinet/Makefile
index 708be970eb70..6cb47ab2a964 100644
--- a/games/gtetrinet/Makefile
+++ b/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 a/games/gtkabale/Makefile b/games/gtkabale/Makefile
index 8ad4e3ac714b..b6b163013694 100644
--- a/games/gtkabale/Makefile
+++ b/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 a/games/gtkatlantic/Makefile b/games/gtkatlantic/Makefile
index f7e34dccf36d..dc5c64874af5 100644
--- a/games/gtkatlantic/Makefile
+++ b/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 a/games/gtkballs/Makefile b/games/gtkballs/Makefile
index 4669b4610bef..33d1e1760721 100644
--- a/games/gtkballs/Makefile
+++ b/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 a/games/gtktetcolor/Makefile b/games/gtktetcolor/Makefile
index deedbabf828b..d3d0a3808dae 100644
--- a/games/gtktetcolor/Makefile
+++ b/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 a/games/gturing/Makefile b/games/gturing/Makefile
index e89cf4cd8acf..8c893e898c37 100644
--- a/games/gturing/Makefile
+++ b/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 a/games/hangman/Makefile b/games/hangman/Makefile
index 644a2bdbd52b..477aabc14c90 100644
--- a/games/hangman/Makefile
+++ b/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 a/games/heroes/Makefile b/games/heroes/Makefile
index 9653339a2ad2..a74d5666414f 100644
--- a/games/heroes/Makefile
+++ b/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 a/games/hex-a-hop/Makefile b/games/hex-a-hop/Makefile
index 738b40aabcb1..9c32c4693c48 100644
--- a/games/hex-a-hop/Makefile
+++ b/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 a/games/highmoon/Makefile b/games/highmoon/Makefile
index 4e09c2ac836a..28a1489b89fc 100644
--- a/games/highmoon/Makefile
+++ b/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 a/games/klavaro/Makefile b/games/klavaro/Makefile
index 24b1e131013b..6e8a01013922 100644
--- a/games/klavaro/Makefile
+++ b/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 a/games/koth/Makefile b/games/koth/Makefile
index acb19c31d419..788319134804 100644
--- a/games/koth/Makefile
+++ b/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 a/games/kuklomenos/Makefile b/games/kuklomenos/Makefile
index 43c127e373ff..e1b402246b1e 100644
--- a/games/kuklomenos/Makefile
+++ b/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 a/games/lander/Makefile b/games/lander/Makefile
index d97c57c9e07f..9f5ea0765736 100644
--- a/games/lander/Makefile
+++ b/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 a/games/lbreakout2/Makefile b/games/lbreakout2/Makefile
index 3957082b89e2..421fba024ee6 100644
--- a/games/lbreakout2/Makefile
+++ b/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 a/games/lexter/Makefile b/games/lexter/Makefile
index 22d4d807205c..fa12242e4971 100644
--- a/games/lexter/Makefile
+++ b/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 a/games/lgeneral/Makefile b/games/lgeneral/Makefile
index 0b7afc585e01..c8781827930c 100644
--- a/games/lgeneral/Makefile
+++ b/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 a/games/lianliankan/Makefile b/games/lianliankan/Makefile
index 0088275d54f9..d6ea73b7ef8d 100644
--- a/games/lianliankan/Makefile
+++ b/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 a/games/libggz/Makefile b/games/libggz/Makefile
index 032e83b6663e..404582125688 100644
--- a/games/libggz/Makefile
+++ b/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 a/games/lincity-ng/Makefile b/games/lincity-ng/Makefile
index 017ed3bc233c..d9cfa299e7b5 100644
--- a/games/lincity-ng/Makefile
+++ b/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 a/games/lincity/Makefile b/games/lincity/Makefile
index 477abf324ac5..bd628de2237b 100644
--- a/games/lincity/Makefile
+++ b/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 a/games/lordsawar/Makefile b/games/lordsawar/Makefile
index 5c4de574601b..d793ffc80cce 100644
--- a/games/lordsawar/Makefile
+++ b/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 a/games/lpairs/Makefile b/games/lpairs/Makefile
index 4bdbb15e2c95..9b209c6deb17 100644
--- a/games/lpairs/Makefile
+++ b/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 a/games/ltris/Makefile b/games/ltris/Makefile
index 9a9933ec927f..6c0884c2c78a 100644
--- a/games/ltris/Makefile
+++ b/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 a/games/macopix/Makefile b/games/macopix/Makefile
index a511e62e3a9b..7a4120e50177 100644
--- a/games/macopix/Makefile
+++ b/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 a/games/madbomber/Makefile b/games/madbomber/Makefile
index c340910128b2..f92b080c7664 100644
--- a/games/madbomber/Makefile
+++ b/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 a/games/mangos/Makefile b/games/mangos/Makefile
index cde14340f375..67adfcdb44b0 100644
--- a/games/mangos/Makefile
+++ b/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 a/games/maxr/Makefile b/games/maxr/Makefile
index 77428c1e2323..18e2bd6eba2c 100644
--- a/games/maxr/Makefile
+++ b/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 a/games/monkeybubble/Makefile b/games/monkeybubble/Makefile
index 60033a3eb865..330cb11a4540 100644
--- a/games/monkeybubble/Makefile
+++ b/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 a/games/monster-masher/Makefile b/games/monster-masher/Makefile
index b6ec57736385..3f8b626293bc 100644
--- a/games/monster-masher/Makefile
+++ b/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 a/games/mudmagic/Makefile b/games/mudmagic/Makefile
index f6b000b66644..d9c79a28c7bd 100644
--- a/games/mudmagic/Makefile
+++ b/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 a/games/naev/Makefile b/games/naev/Makefile
index aef3c856a1bd..441c6873fa9d 100644
--- a/games/naev/Makefile
+++ b/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 a/games/nethack33/Makefile b/games/nethack33/Makefile
index 6bcb10c25c1e..e964ef26f9a1 100644
--- a/games/nethack33/Makefile
+++ b/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 a/games/nethack34/Makefile b/games/nethack34/Makefile
index aa76af09bfd4..c5cda41b64c3 100644
--- a/games/nethack34/Makefile
+++ b/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 a/games/netpanzer-data/Makefile b/games/netpanzer-data/Makefile
index 417e59cf64ba..b4dc5d2a55bb 100644
--- a/games/netpanzer-data/Makefile
+++ b/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 a/games/netpanzer/Makefile b/games/netpanzer/Makefile
index aced84e1d600..4ebd82fe208d 100644
--- a/games/netpanzer/Makefile
+++ b/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 a/games/netspades/Makefile b/games/netspades/Makefile
index 02a2dce8abae..8cc0fcf6f002 100644
--- a/games/netspades/Makefile
+++ b/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 a/games/nighthawk/Makefile b/games/nighthawk/Makefile
index e3ceb48f8c60..477bb7425bb6 100644
--- a/games/nighthawk/Makefile
+++ b/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 a/games/nimuh/Makefile b/games/nimuh/Makefile
index 61611b0d3c19..e44dbd2fbc92 100644
--- a/games/nimuh/Makefile
+++ b/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 a/games/njam/Makefile b/games/njam/Makefile
index ab6bda58f5bb..3412a8a81aff 100644
--- a/games/njam/Makefile
+++ b/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 a/games/numptyphysics/Makefile b/games/numptyphysics/Makefile
index 3f6dfbe3b34d..705099a974a6 100644
--- a/games/numptyphysics/Makefile
+++ b/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 a/games/openalchemist/Makefile b/games/openalchemist/Makefile
index 01047d75eb29..76e06822f875 100644
--- a/games/openalchemist/Makefile
+++ b/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 a/games/openglad/Makefile b/games/openglad/Makefile
index 02a7337dc631..d890e1f058d4 100644
--- a/games/openglad/Makefile
+++ b/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 a/games/openjazz/Makefile b/games/openjazz/Makefile
index 77c6484c79ea..bb151b421fbe 100644
--- a/games/openjazz/Makefile
+++ b/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 a/games/openmortal/Makefile b/games/openmortal/Makefile
index f7e11cbfda1f..96a5f2bcc0e0 100644
--- a/games/openmortal/Makefile
+++ b/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 a/games/opensonic/Makefile b/games/opensonic/Makefile
index bd46422af74c..3aeec8e55dac 100644
--- a/games/opensonic/Makefile
+++ b/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 a/games/openyahtzee/Makefile b/games/openyahtzee/Makefile
index e0e7ae6612f4..1a4d90c861a8 100644
--- a/games/openyahtzee/Makefile
+++ b/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 a/games/orbital_eunuchs_sniper/Makefile b/games/orbital_eunuchs_sniper/Makefile
index 35acadb38bd2..7c03ea3fb921 100644
--- a/games/orbital_eunuchs_sniper/Makefile
+++ b/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 a/games/pachi/Makefile b/games/pachi/Makefile
index daf239a97ea7..de72e9841620 100644
--- a/games/pachi/Makefile
+++ b/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 a/games/pengupop/Makefile b/games/pengupop/Makefile
index ed3d97d203f9..6f1161fe79f5 100644
--- a/games/pengupop/Makefile
+++ b/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 a/games/pinball/Makefile b/games/pinball/Makefile
index 02e79bb83365..cb5ad15c8380 100644
--- a/games/pinball/Makefile
+++ b/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 a/games/pinedit/Makefile b/games/pinedit/Makefile
index 08d10bf03fed..11337c6a47ec 100644
--- a/games/pinedit/Makefile
+++ b/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 a/games/pioneers/Makefile b/games/pioneers/Makefile
index 2e0769bb65b5..cf9f530a985f 100644
--- a/games/pioneers/Makefile
+++ b/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 a/games/pipenightdreams/Makefile b/games/pipenightdreams/Makefile
index 9c6b215eba4b..0fcffcbc0d31 100644
--- a/games/pipenightdreams/Makefile
+++ b/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 a/games/pipewalker/Makefile b/games/pipewalker/Makefile
index f7f13bd505e0..92aa4d89cc69 100644
--- a/games/pipewalker/Makefile
+++ b/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 a/games/pongix/Makefile b/games/pongix/Makefile
index 972de822de26..7f4c2461e394 100644
--- a/games/pongix/Makefile
+++ b/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 a/games/prboom/Makefile b/games/prboom/Makefile
index 4ff47c0d4fa5..13a72a6b3808 100644
--- a/games/prboom/Makefile
+++ b/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 a/games/pushover/Makefile b/games/pushover/Makefile
index 7af4c6bccb05..614915234dae 100644
--- a/games/pushover/Makefile
+++ b/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 a/games/qonk/Makefile b/games/qonk/Makefile
index 5a64b5e8154d..58b7a530438f 100644
--- a/games/qonk/Makefile
+++ b/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 a/games/quetoo/Makefile b/games/quetoo/Makefile
index ba382dfe9444..7616228192d5 100644
--- a/games/quetoo/Makefile
+++ b/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 a/games/race/Makefile b/games/race/Makefile
index 831333b4d043..327c50a06f07 100644
--- a/games/race/Makefile
+++ b/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 a/games/ri-li/Makefile b/games/ri-li/Makefile
index cdcfd97f4a6a..9e523b5d1c52 100644
--- a/games/ri-li/Makefile
+++ b/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 a/games/rtb/Makefile b/games/rtb/Makefile
index e66616b3e796..859e4e5ea0ce 100644
--- a/games/rtb/Makefile
+++ b/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 a/games/scorched3d/Makefile b/games/scorched3d/Makefile
index 511e0d11b6a3..d0c45aee3332 100644
--- a/games/scorched3d/Makefile
+++ b/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 a/games/scourge/Makefile b/games/scourge/Makefile
index 600210ad32f8..0c0e56551251 100644
--- a/games/scourge/Makefile
+++ b/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 a/games/scramble/Makefile b/games/scramble/Makefile
index 9004437b79ae..747945d473ac 100644
--- a/games/scramble/Makefile
+++ b/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 a/games/scummvm-tools/Makefile b/games/scummvm-tools/Makefile
index 638b41e85afe..5c5968567ade 100644
--- a/games/scummvm-tools/Makefile
+++ b/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 a/games/scummvm/Makefile b/games/scummvm/Makefile
index 4c1fde739a93..0b97edbdb397 100644
--- a/games/scummvm/Makefile
+++ b/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 a/games/sdb/Makefile b/games/sdb/Makefile
index 8e5bab937ca8..4178b569443d 100644
--- a/games/sdb/Makefile
+++ b/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 a/games/secretmaryochronicles/Makefile b/games/secretmaryochronicles/Makefile
index 6fea4b627243..76057e63ffac 100644
--- a/games/secretmaryochronicles/Makefile
+++ b/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 a/games/shaaft/Makefile b/games/shaaft/Makefile
index d7e51397f1d1..fa0ac47c5cf5 100644
--- a/games/shaaft/Makefile
+++ b/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 a/games/shootingstar/Makefile b/games/shootingstar/Makefile
index 92e798a916ac..588667190450 100644
--- a/games/shootingstar/Makefile
+++ b/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 a/games/sjeng/Makefile b/games/sjeng/Makefile
index 651fc62b5325..2ef8464f340c 100644
--- a/games/sjeng/Makefile
+++ b/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 a/games/spacejunk/Makefile b/games/spacejunk/Makefile
index fd5e2e5a530a..a8e9f428a320 100644
--- a/games/spacejunk/Makefile
+++ b/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 a/games/stepmania-devel/Makefile b/games/stepmania-devel/Makefile
index 921c0ac34293..2af0ff260507 100644
--- a/games/stepmania-devel/Makefile
+++ b/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 a/games/super_methane_brothers/Makefile b/games/super_methane_brothers/Makefile
index 34b531d97702..cda28335293c 100644
--- a/games/super_methane_brothers/Makefile
+++ b/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 a/games/supertuxkart/Makefile b/games/supertuxkart/Makefile
index 403ef2b9af56..703e532998a2 100644
--- a/games/supertuxkart/Makefile
+++ b/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 a/games/taxipilot/Makefile b/games/taxipilot/Makefile
index 62fcfa28370a..64dac6c21913 100644
--- a/games/taxipilot/Makefile
+++ b/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 a/games/teg/Makefile b/games/teg/Makefile
index b4b6dccfa32c..8ad932e57207 100644
--- a/games/teg/Makefile
+++ b/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 a/games/thevalley/Makefile b/games/thevalley/Makefile
index 5667c2d68aa3..4d3b8c34767e 100644
--- a/games/thevalley/Makefile
+++ b/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 a/games/tinymux/Makefile b/games/tinymux/Makefile
index abb31b17aecf..a38dae6dcafe 100644
--- a/games/tinymux/Makefile
+++ b/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 a/games/tmw/Makefile b/games/tmw/Makefile
index 3841a6396dab..83c5a47a41c5 100644
--- a/games/tmw/Makefile
+++ b/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 a/games/toppler/Makefile b/games/toppler/Makefile
index 543ad21720a4..5e4c7846bcc1 100644
--- a/games/toppler/Makefile
+++ b/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 a/games/torcs/Makefile b/games/torcs/Makefile
index faff71d2cd10..e159cf3a895b 100644
--- a/games/torcs/Makefile
+++ b/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 a/games/torrent/Makefile b/games/torrent/Makefile
index a24c273868e0..dffde6933bb5 100644
--- a/games/torrent/Makefile
+++ b/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 a/games/toycars/Makefile b/games/toycars/Makefile
index 6c9f67e9d743..e25a66a69713 100644
--- a/games/toycars/Makefile
+++ b/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 a/games/trackballs/Makefile b/games/trackballs/Makefile
index 93b26f63b4ad..3b2eccd52db6 100644
--- a/games/trackballs/Makefile
+++ b/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 a/games/trigger/Makefile b/games/trigger/Makefile
index 4caec5f1f621..4cc32ef3bba7 100644
--- a/games/trigger/Makefile
+++ b/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 a/games/trophy/Makefile b/games/trophy/Makefile
index 756fb15ec349..f61b7be2b7cf 100644
--- a/games/trophy/Makefile
+++ b/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 a/games/ttt/Makefile b/games/ttt/Makefile
index 2fae0d59e21c..41a1bdbe4e6b 100644
--- a/games/ttt/Makefile
+++ b/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 a/games/tux-aqfh/Makefile b/games/tux-aqfh/Makefile
index b84788a8bef3..8f8fcc549250 100644
--- a/games/tux-aqfh/Makefile
+++ b/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 a/games/tuxkart/Makefile b/games/tuxkart/Makefile
index 7d79b3af9b3a..61ec68393cf8 100644
--- a/games/tuxkart/Makefile
+++ b/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 a/games/tuxtype/Makefile b/games/tuxtype/Makefile
index 0e65cde3ccdd..257fc7d8d74a 100644
--- a/games/tuxtype/Makefile
+++ b/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 a/games/ufoai/Makefile b/games/ufoai/Makefile
index d89c133f40a2..d4efa1643189 100644
--- a/games/ufoai/Makefile
+++ b/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 a/games/ultimatestunts/Makefile b/games/ultimatestunts/Makefile
index acb8d79f8f3b..cc8014191de7 100644
--- a/games/ultimatestunts/Makefile
+++ b/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 a/games/vamos/Makefile b/games/vamos/Makefile
index 59bf4341b2c9..2307ecf8f866 100644
--- a/games/vamos/Makefile
+++ b/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 a/games/vegastrike/Makefile b/games/vegastrike/Makefile
index 00a86f49eda7..6ccdfa5320c0 100644
--- a/games/vegastrike/Makefile
+++ b/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 a/games/volleyball/Makefile b/games/volleyball/Makefile
index ad5b54a6a30f..d8bf77625b16 100644
--- a/games/volleyball/Makefile
+++ b/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 a/games/warmux/Makefile b/games/warmux/Makefile
index 56731e2ccc6c..bcc3276895ec 100644
--- a/games/warmux/Makefile
+++ b/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 a/games/warzone2100/Makefile b/games/warzone2100/Makefile
index 7298935692df..b9bf31c572a6 100644
--- a/games/warzone2100/Makefile
+++ b/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 a/games/wesnoth/Makefile b/games/wesnoth/Makefile
index 260f00ce760e..71440f2c11be 100644
--- a/games/wesnoth/Makefile
+++ b/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 a/games/wmpuzzle/Makefile b/games/wmpuzzle/Makefile
index d2fd58648cc6..2b5c80bb3741 100644
--- a/games/wmpuzzle/Makefile
+++ b/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 a/games/xbl/Makefile b/games/xbl/Makefile
index 7140782ccb9a..606a9ee82904 100644
--- a/games/xbl/Makefile
+++ b/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 a/games/xblast/Makefile b/games/xblast/Makefile
index 41647048f04a..85c6dd64feb9 100644
--- a/games/xblast/Makefile
+++ b/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 a/games/xbubble/Makefile b/games/xbubble/Makefile
index 7c10be568c34..f1d384c19261 100644
--- a/games/xbubble/Makefile
+++ b/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 a/games/xcowsay/Makefile b/games/xcowsay/Makefile
index 3a5506aa4dd4..23c2342331d9 100644
--- a/games/xcowsay/Makefile
+++ b/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 a/games/xinvaders/Makefile b/games/xinvaders/Makefile
index e07c6e68f3cc..43c7050adc38 100644
--- a/games/xinvaders/Makefile
+++ b/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 a/games/xmoto/Makefile b/games/xmoto/Makefile
index 34dcd61ac418..ebb4fb346809 100644
--- a/games/xmoto/Makefile
+++ b/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 a/games/xpilot-ng-server/Makefile b/games/xpilot-ng-server/Makefile
index 5d9c7c99a689..1c9fa7356ead 100644
--- a/games/xpilot-ng-server/Makefile
+++ b/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 a/games/xqf/Makefile b/games/xqf/Makefile
index 577b704810d0..6294d143a893 100644
--- a/games/xqf/Makefile
+++ b/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 a/games/xrally/Makefile b/games/xrally/Makefile
index d460252ba6dc..4850982a95e6 100644
--- a/games/xrally/Makefile
+++ b/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 a/games/xsc/Makefile b/games/xsc/Makefile
index 4c269aad595e..f586483d3c5c 100644
--- a/games/xsc/Makefile
+++ b/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 a/games/xteddy/Makefile b/games/xteddy/Makefile
index 5e5cf06acd1e..6df6f91721c3 100644
--- a/games/xteddy/Makefile
+++ b/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 a/games/zaz/Makefile b/games/zaz/Makefile
index 3dba066ef273..07352f1b398c 100644
--- a/games/zaz/Makefile
+++ b/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 a/games/zoom/Makefile b/games/zoom/Makefile
index 67fb99e2fa4d..2f63df5e5429 100644
--- a/games/zoom/Makefile
+++ b/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%%
author	Dmitry Marakasov <amdmi3@FreeBSD.org>	2011-09-23 22:26:39 +0000
committer	Dmitry Marakasov <amdmi3@FreeBSD.org>	2011-09-23 22:26:39 +0000
commit	6f6fbe4bdf9851de1eb6ebef5287e3007846045e (patch)
tree	3b556699991305af672fba96e0e8b6bb88bcc7da /games
parent	86f8cde1da39aadc3efbc11e60998d886c86c36e (diff)
download	ports-6f6fbe4bdf9851de1eb6ebef5287e3007846045e.tar.gz ports-6f6fbe4bdf9851de1eb6ebef5287e3007846045e.zip