- Add LDFLAGS to CONFIGURE_ENV and MAKE_ENV (as it was done with LDFLAGS)

- Fix all ports that add {CPP,LD}FLAGS to *_ENV to modify flags instead

PR:		157936
Submitted by:	myself
Exp-runs by:	pav
Approved by:	pav

39 files changed, 80 insertions, 81 deletions

diff --git a/print/catdvi/Makefile b/print/catdvi/Makefile
index 1b30f222902d..ff811ddac30c 100644
--- a/print/catdvi/Makefile
+++ b/print/catdvi/Makefile
@@ -19,7 +19,6 @@ BUILD_DEPENDS=	${LOCALBASE}/lib/libkpathsea.a:${PORTSDIR}/print/teTeX
 
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 MAKEFILE=	GNUmakefile
 ALL_TARGET=	# empty
 MAKE_JOBS_UNSAFE=	yes
@@ -27,8 +26,8 @@ MAKE_JOBS_UNSAFE=	yes
 MAN1=		catdvi.1
 PLIST_FILES=	bin/catdvi
 
-CPPFLAGS=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/catdvi ${PREFIX}/bin
diff --git a/print/cjk-lyx/Makefile b/print/cjk-lyx/Makefile
index 4f43248d7ec1..59b42f7279ad 100644
--- a/print/cjk-lyx/Makefile
+++ b/print/cjk-lyx/Makefile
@@ -49,8 +49,8 @@ CONFIGURE_ARGS=	--with-extra-lib="${LOCALBASE}/lib" \
 		--with-extra-inc="${LOCALBASE}/include" \
 		--with-frontend=qt \
 		--program-prefix="${PKGNAMEPREFIX}"
-CONFIGURE_ENV+=	LDFLAGS=${PTHREAD_LIBS}
-CFLAGS=		${PTHREAD_CFLAGS}
+LDFLAGS+=	${PTHREAD_LIBS}
+CFLAGS+=	${PTHREAD_CFLAGS}
 MAN1=		${PKGNAMEPREFIX}lyx.1 ${PKGNAMEPREFIX}tex2lyx.1 ${PKGNAMEPREFIX}lyxclient.1
 
 DATADIR=	${PREFIX}/share/${PKGNAMEPREFIX}${PORTNAME}
diff --git a/print/cups-base/Makefile b/print/cups-base/Makefile
index cb9c4905a4ad..64f6944b49c3 100644
--- a/print/cups-base/Makefile
+++ b/print/cups-base/Makefile
@@ -23,10 +23,10 @@ USE_BZIP2=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CFLAGS+=	${PTHREAD_CFLAGS}
-CPPFLAGS=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 DSOFLAGS=	-Wl,-rpath,${PREFIX}/lib -L${PREFIX}/lib ${LDFLAGS}
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" DSOFLAGS="${DSOFLAGS}"
+CONFIGURE_ENV=	DSOFLAGS="${DSOFLAGS}"
 CONFIGURE_ARGS+=	--localstatedir=/var			\
 			--disable-slp				\
 			--disable-gssapi			\
diff --git a/print/cups-bjnp/Makefile b/print/cups-bjnp/Makefile
index 88b2ffb34e9f..66ee929cb9f1 100644
--- a/print/cups-bjnp/Makefile
+++ b/print/cups-bjnp/Makefile
@@ -17,6 +17,8 @@ COMMENT=	CUPS backend for Canon USB over IP protocol
 LIB_DEPENDS=	cupsimage.2:${PORTSDIR}/print/cups-base
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CFLAGS+="-I${LOCALBASE}/include" CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib" LIBS="-lcompat"
+CONFIGURE_ENV=	LIBS="-lcompat"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .include <bsd.port.mk>
diff --git a/print/cups-pk-helper/Makefile b/print/cups-pk-helper/Makefile
index 2ef974c8e2ec..03467b2f783b 100644
--- a/print/cups-pk-helper/Makefile
+++ b/print/cups-pk-helper/Makefile
@@ -23,6 +23,7 @@ USE_GMAKE=	yes
 USE_GNOME=	intlhack gtk20
 USE_GETTEXT=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/libs"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/libs
 
 .include <bsd.port.mk>
diff --git a/print/cups-pstoraster/Makefile b/print/cups-pstoraster/Makefile
index 39493ff6734a..666106ba4140 100644
--- a/print/cups-pstoraster/Makefile
+++ b/print/cups-pstoraster/Makefile
@@ -37,8 +37,8 @@ USE_GMAKE=	yes
 # We just need the ghostscript fonts, nothing more
 USE_GHOSTSCRIPT_RUN=	yes
 GNU_CONFIGURE=		yes
-CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
-			LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--without-x --with-gs=espgs
 MAKE_ARGS=	CFLAGS_STANDARD="${CFLAGS} -DUPD_SIGNAL=0" \
 		DEVICE_DEVS="\$$(DD)cups.dev \$$(DD)pxlcolor.dev \$$(DD)pxlmono.dev"
diff --git a/print/fontforge/Makefile b/print/fontforge/Makefile
index 6454c467648e..1120cd9af5b8 100644
--- a/print/fontforge/Makefile
+++ b/print/fontforge/Makefile
@@ -62,7 +62,8 @@ WITH_FREETYPE_SRC=	--disable-freetype --without-freetype-bytecode \
 
 CONFIGURE_ARGS=	${WITH_MULTILAYER} --enable-devicetables ${WITH_FREETYPE_SRC} \
 		--enable-pasteafter --enable-tilepath
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
diff --git a/print/foomatic-filters/Makefile b/print/foomatic-filters/Makefile
index 879f40cc184f..68594dd42ffb 100644
--- a/print/foomatic-filters/Makefile
+++ b/print/foomatic-filters/Makefile
@@ -27,9 +27,10 @@ CONFIGURE_ENV=	ac_cv_path_A2PS=${LOCALBASE}/bin/a2ps \
 		ac_cv_path_PPR=${LOCALBASE}/lib/ppr \
 		ac_cv_path_PPR_INTERFACES=${LOCALBASE}/lib/ppr/interfaces \
 		ac_cv_path_PPR_LIB=${LOCALBASE}/lib/ppr/lib \
-		ac_cv_path_TEXTTOPS=${LOCALBASE}/libexec/cups/filter/texttops \
-		CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+		ac_cv_path_TEXTTOPS=${LOCALBASE}/libexec/cups/filter/texttops
+
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 OPTIONS=	CUPS_IMAGE	"Install cups image utilities"	on \
 		A2PS_A4	"Install a2ps convertor (A4)"	on \
diff --git a/print/gfontview/Makefile b/print/gfontview/Makefile
index a2ce10fe7896..fde93e169aa2 100644
--- a/print/gfontview/Makefile
+++ b/print/gfontview/Makefile
@@ -20,10 +20,10 @@ LIB_DEPENDS=	t1.5:${PORTSDIR}/devel/t1lib
 USE_GNOME=	gnomehack gnomelibs gnomeprefix
 USE_FREETYPE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include/freetype1/freetype \
-			  -I${LOCALBASE}/include" \
-		SPOOLER="/usr/bin/lpr" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV=	SPOOLER="/usr/bin/lpr"
+CPPFLAGS+=	-I${LOCALBASE}/include/freetype1/freetype \
+		-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--with-fontdir="${LOCALBASE}/share/ghostscript/fonts" \
 		--with-libungif
 
diff --git a/print/ggv/Makefile b/print/ggv/Makefile
index 44aa8a3cdcbd..04e4457011b2 100644
--- a/print/ggv/Makefile
+++ b/print/ggv/Makefile
@@ -23,8 +23,8 @@ USE_GNOME=	gnomeprefix gnomehack intlhack libgnomeui desktopfileutils
 USE_GETTEXT=	yes
 USE_GHOSTSCRIPT=yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 GCONF_SCHEMAS=	ggv.schemas
 
diff --git a/print/ghostscript7/Makefile b/print/ghostscript7/Makefile
index 21e6074409cc..4bb40979b45f 100644
--- a/print/ghostscript7/Makefile
+++ b/print/ghostscript7/Makefile
@@ -41,9 +41,10 @@ MAKE_ENV=	CFLAGS_STANDARD="${CFLAGS}" \
 		XCFLAGS="${XCFLAGS}" XLDFLAGS="${XLDFLAGS}" \
 		EXTRALIBS="${EXTRALIBS}"
 MAKE_JOBS_UNSAFE=	yes
-CONFIGURE_ENV=	${MAKE_ENV} \
-		CPPFLAGS="-DUPD_SIGNAL=0 -I. -I${WRKSRC}/gimp-print -I${LOCALBASE}/include/libpng -I${LOCALBASE}/include" \
-		LDFLAGS="${XLDFLAGS}"
+CONFIGURE_ENV=	${MAKE_ENV}
+
+CPPFLAGS+=	-DUPD_SIGNAL=0 -I. -I${WRKSRC}/gimp-print -I${LOCALBASE}/include/libpng -I${LOCALBASE}/include
+LDFLAGS+=	${XLDFLAGS}
 CONFIGURE_ARGS=	--disable-compile-inits \
 		--with-ijs
 PLIST_SUB=	GS_VERSION="${PORTVERSION}"
diff --git a/print/ghostscript8/Makefile b/print/ghostscript8/Makefile
index 881f974adfe3..1db6fd6d4d03 100644
--- a/print/ghostscript8/Makefile
+++ b/print/ghostscript8/Makefile
@@ -46,15 +46,15 @@ MAKE_ENV=	CFLAGS_STANDARD="${CFLAGS}" \
 		XCFLAGS="${XCFLAGS}" XLDFLAGS="${XLDFLAGS}" \
 		EXTRALIBS="${EXTRALIBS}" \
 		SOC_LOADER="dxmainc.c"
-CONFIGURE_ENV=	${MAKE_ENV} CPPFLAGS="${CPPFLAGS}" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV=	${MAKE_ENV}
+LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--disable-compile-inits \
 		--enable-contrib \
 		--enable-dynamic \
 		--with-ijs \
 		--with-jasper \
 		--with-drivers=""
-CPPFLAGS=	-DUPD_SIGNAL=0 -I. \
+CPPFLAGS+=	-DUPD_SIGNAL=0 -I. \
 		-I${WRKSRC}/jasper/src/libjasper/include \
 		-I${LOCALBASE}/include/libpng \
 		-I${LOCALBASE}/include
diff --git a/print/ghostscript9/Makefile b/print/ghostscript9/Makefile
index 1536e1666c90..9f742fe2922a 100644
--- a/print/ghostscript9/Makefile
+++ b/print/ghostscript9/Makefile
@@ -50,15 +50,15 @@ MAKE_ENV=	CFLAGS_STANDARD="${CFLAGS} -g" \
 		XCFLAGS="${XCFLAGS}" XLDFLAGS="${XLDFLAGS}" \
 		EXTRALIBS="${EXTRALIBS}" \
 		SOC_LOADER="dxmainc.c"
-CONFIGURE_ENV=	${MAKE_ENV} CPPFLAGS="${CPPFLAGS}" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV=	${MAKE_ENV}
+LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--disable-compile-inits \
 		--enable-contrib \
 		--enable-dynamic \
 		--with-ijs \
 		--with-jasper \
 		--with-drivers=""
-CPPFLAGS=	-DUPD_SIGNAL=0 -I. \
+CPPFLAGS+=	-DUPD_SIGNAL=0 -I. \
 		-I${WRKSRC}/lcms/include \
 		-I${WRKSRC}/jasper/src/libjasper/include \
 		-I${LOCALBASE}/include/libpng \
diff --git a/print/gnome-cups-manager/Makefile b/print/gnome-cups-manager/Makefile
index c1c56b8ecbe4..46ac3ff33a5a 100644
--- a/print/gnome-cups-manager/Makefile
+++ b/print/gnome-cups-manager/Makefile
@@ -29,8 +29,8 @@ USE_GETTEXT=	yes
 INSTALLS_ICONS=	yes
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 post-patch:
 	@${SED} -e 's|%%PREFIX%%|${PREFIX}|' \
diff --git a/print/gnome-print/Makefile b/print/gnome-print/Makefile
index 7fcf70bb59ab..ea38c712029d 100644
--- a/print/gnome-print/Makefile
+++ b/print/gnome-print/Makefile
@@ -32,8 +32,8 @@ USE_GNOME=	gnomehack gnomeprefix gnomehier gnomelibs gnomecanvas
 USE_GETTEXT=	yes
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 post-install:
 	@${TOUCH} ${PREFIX}/etc/gnome/fonts/gnome-print-x11.fontmap
diff --git a/print/gtklp/Makefile b/print/gtklp/Makefile
index 5a371bedae6c..05dbe3fc0cf5 100644
--- a/print/gtklp/Makefile
+++ b/print/gtklp/Makefile
@@ -25,7 +25,6 @@ USE_AUTOTOOLS=	automake:env
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}"
 
 MAN1=		gtklp.1 gtklpq.1
 
diff --git a/print/gutenprint-base/Makefile b/print/gutenprint-base/Makefile
index dfa272ff1a62..d59d4ad8e72e 100644
--- a/print/gutenprint-base/Makefile
+++ b/print/gutenprint-base/Makefile
@@ -23,12 +23,11 @@ USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack gtk20
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=--with-gimp=no --with-gimp2=no
 USE_LDCONFIG=	yes
 
-CPPFLAGS=	-I${LOCALBASE}/include -I${PREFIX}/include
-LDFLAGS=	-L${LOCALBASE}/lib -L${PREFIX}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include -I${PREFIX}/include
+LDFLAGS+=	-L${LOCALBASE}/lib -L${PREFIX}/lib
 
 .include <bsd.port.pre.mk>
 
diff --git a/print/hp2xx/Makefile b/print/hp2xx/Makefile
index bb5d6a505c7b..bdeca88d63c3 100644
--- a/print/hp2xx/Makefile
+++ b/print/hp2xx/Makefile
@@ -21,13 +21,13 @@ LIB_DEPENDS=	png.6:${PORTSDIR}/graphics/png \
 WRKSRC=		${WRKDIR}/${DISTNAME}/sources
 
 MAKE_ENV=	DEFINES="${CPPFLAGS}" ALL_LIBS="${LDFLAGS}" \
-		PREVIEWER="${PREVIEWER}" 
+		PREVIEWER="${PREVIEWER}"
 
 MAN1=		hp2xx.1
 INFO=		hp2xx
 
-CPPFLAGS=	-DUNIX -I${LOCALBASE}/include
-LDFLAGS=	-lm -L${LOCALBASE}/lib -ltiff -lpng -lz
+CPPFLAGS+=	-DUNIX -I${LOCALBASE}/include
+LDFLAGS+=	-lm -L${LOCALBASE}/lib -ltiff -lpng -lz
 
 .if defined(WITHOUT_X11)
 PKGNAMESUFFIX=	-nox11
diff --git a/print/hpijs/Makefile b/print/hpijs/Makefile
index c99c18fc6482..0b3b301aa01c 100644
--- a/print/hpijs/Makefile
+++ b/print/hpijs/Makefile
@@ -23,8 +23,8 @@ CONFIGURE_ARGS=		--disable-dependency-tracking
 USE_GHOSTSCRIPT_RUN=	yes
 WANT_PERL=	yes
 
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
-		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 OPTIONS=	CUPS		"install support for cups" on \
 		FOOMATIC	"install foomatic-rip and ppd files" on
diff --git a/print/hplip/Makefile b/print/hplip/Makefile
index 80fd4429498d..649a4b14a5bc 100644
--- a/print/hplip/Makefile
+++ b/print/hplip/Makefile
@@ -42,7 +42,6 @@ CONFIGURE_ARGS=	--enable-foomatic-ppd-install \
 		--with-mimedir=${PREFIX}/etc/cups \
 		--with-docdir=${DOCSDIR} \
 		--with-drvdir=${PREFIX}/libexec/cups/driver
-CONFIGURE_ENV=	LDFLAGS="${LDFLAGS}"
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 
diff --git a/print/libgnomecups/Makefile b/print/libgnomecups/Makefile
index 47602ff4d319..ce38fb9caf07 100644
--- a/print/libgnomecups/Makefile
+++ b/print/libgnomecups/Makefile
@@ -24,7 +24,7 @@ USE_GNOME=	gnomehack intlhack ltverhack glib20
 USE_GETTEXT=	yes
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=  libtool
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .include <bsd.port.mk>
diff --git a/print/libgnomeprint/Makefile b/print/libgnomeprint/Makefile
index 60eea57b7ee1..17c37748b5e7 100644
--- a/print/libgnomeprint/Makefile
+++ b/print/libgnomeprint/Makefile
@@ -30,8 +30,8 @@ USE_GNOME=	gnomeprefix intlhack gnomehack gnomehier glib20 pango libxml2 \
 USE_GETTEXT=	yes
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 PLIST_SUB=	VERSION=${PORTVERSION} \
 		LIBVERSION=2.2
diff --git a/print/libotf/Makefile b/print/libotf/Makefile
index 93016235bbc6..02c048da6bca 100644
--- a/print/libotf/Makefile
+++ b/print/libotf/Makefile
@@ -20,7 +20,7 @@ USE_XORG=	x11 xt xaw xmu
 USE_GNOME=	pkgconfig
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
-CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include"
+CPPFLAGS+=	-I${LOCALBASE}/include
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g' \
diff --git a/print/libspectre/Makefile b/print/libspectre/Makefile
index 4c9e1d04520a..adff55787987 100644
--- a/print/libspectre/Makefile
+++ b/print/libspectre/Makefile
@@ -19,6 +19,7 @@ USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
 USE_GNOME=	gnomehack gnomeprefix ltverhack
 USE_GHOSTSCRIPT=yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .include <bsd.port.mk>
diff --git a/print/lyx/Makefile b/print/lyx/Makefile
index 159f4df4118e..f0f89f8b894f 100644
--- a/print/lyx/Makefile
+++ b/print/lyx/Makefile
@@ -34,8 +34,8 @@ QT_COMPONENTS=	corelib gui moc_build uic_build rcc_build
 USE_PYTHON=	yes
 USE_PERL=	yes
 GNU_CONFIGURE=	yes
-CPPFLAGS=	${PTHREAD_CFLAGS}
-CONFIGURE_ENV=	LDFLAGS="${PTHREAD_LIBS}"
+CPPFLAGS+=	${PTHREAD_CFLAGS}
+LDFLAGS+=	${PTHREAD_LIBS}
 CONFIGURE_ARGS=	--without-included-boost \
 		--without-included-mythes \
 		--with-libiconv-prefix=${LOCALBASE} \
diff --git a/print/lyx14/Makefile b/print/lyx14/Makefile
index 2416a97127b9..a4c965c3ea80 100644
--- a/print/lyx14/Makefile
+++ b/print/lyx14/Makefile
@@ -90,7 +90,7 @@ CONFIGURE_ARGS+=--without-aiksaurus
 LIB_DEPENDS+=	qt-mt:${PORTSDIR}/x11-toolkits/qt33
 CONFIGURE_ARGS+=	--with-frontend=qt
 CFLAGS+=	${PTHREAD_CFLAGS}
-CONFIGURE_ENV+=	LDFLAGS=${PTHREAD_LIBS}
+LDFLAGS+=	${PTHREAD_LIBS}
 RUN_DEPENDS+=	${LOCALBASE}/lib/X11/fonts/texcm-ttf/cmex10.ttf:${PORTSDIR}/x11-fonts/texcm-ttf
 .else
 BROKEN=		Does not work with the latest xforms version
diff --git a/print/lyx16/Makefile b/print/lyx16/Makefile
index f316dfb3ffc8..c093add8e3a3 100644
--- a/print/lyx16/Makefile
+++ b/print/lyx16/Makefile
@@ -35,8 +35,8 @@ QT_COMPONENTS=	gui moc_build uic_build rcc_build
 USE_PYTHON=	yes
 USE_PERL=	yes
 GNU_CONFIGURE=	yes
-CPPFLAGS=	${PTHREAD_CFLAGS}
-CONFIGURE_ENV=	LDFLAGS="${PTHREAD_LIBS}"
+CPPFLAGS+=	${PTHREAD_CFLAGS}
+LDFLAGS+=	${PTHREAD_LIBS}
 CONFIGURE_ARGS=	--with-frontend=qt4 \
 		--without-included-boost \
 		--without-included-gettext \
diff --git a/print/panda/Makefile b/print/panda/Makefile
index ee0a1a0c1a8c..73cbc9159c23 100644
--- a/print/panda/Makefile
+++ b/print/panda/Makefile
@@ -28,13 +28,12 @@ USE_GNOME=	gnomehack pkgconfig
 USE_BDB=	yes
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
-CONFIGURE_ENV=	LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--enable-berkeley-db
 USE_LDCONFIG=	yes
 MAKE_JOBS_SAFE=	yes
 
-CPPFLAGS=	-I${BDB_INCLUDE_DIR} -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS=	-L${BDB_LIB_DIR} -L${LOCALBASE}/lib ${PTHREAD_LIBS}
+CPPFLAGS+=	-I${BDB_INCLUDE_DIR} -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS+=	-L${BDB_LIB_DIR} -L${LOCALBASE}/lib ${PTHREAD_LIBS}
 
 .include <bsd.port.pre.mk>
 
diff --git a/print/pips800/Makefile.pips b/print/pips800/Makefile.pips
index cb2553104140..43fa66ed5784 100644
--- a/print/pips800/Makefile.pips
+++ b/print/pips800/Makefile.pips
@@ -95,8 +95,8 @@ PLIST_SUB=	PRTYPE=${PRTYPE} \
 
 .include <bsd.port.pre.mk>
 
-CPPFLAGS=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 .if ${PIPS_MAJOR} >= 2
 CONFLICTS=	pips*-2.*
 USE_RC_SUBR=	yes
@@ -129,7 +129,6 @@ USE_ICONV=	yes
 LDFLAGS+=	${PTHREAD_LIBS}
 CPPFLAGS+=	${PTHREAD_CFLAGS}
 .endif
-CONFIGURE_ENV+=	CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 MAKE_ENV+=	SED="${SED}"
 
 LIB_FILE=	lib${PRT_MODEL:L}.so
diff --git a/print/pslib/Makefile b/print/pslib/Makefile
index bee616fa51e1..b7cb9910d558 100644
--- a/print/pslib/Makefile
+++ b/print/pslib/Makefile
@@ -22,8 +22,8 @@ USE_GNOME=	gnomehack intlhack pkgconfig
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib -lintl"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib -lintl
 USE_LDCONFIG=	yes
 
 OPTIONS=	EXAMPLES	"Install additional examples" On \
diff --git a/print/py-cups/Makefile b/print/py-cups/Makefile
index 335bc54ba73b..2d342d464ae4 100644
--- a/print/py-cups/Makefile
+++ b/print/py-cups/Makefile
@@ -21,7 +21,6 @@ LIB_DEPENDS=	cups.2:${PORTSDIR}/print/cups-client
 
 CFLAGS+=	-I${LOCALBASE}/include -DVERSION=\\\"${PORTVERSION}\\\"
 LDFLAGS+=	-L${LOCALBASE}/lib -liconv
-MAKE_ENV=	LDFLAGS="${LDFLAGS}"
 USE_BZIP2=	yes
 USE_ICONV=	yes
 USE_PYDISTUTILS=	yes
diff --git a/print/system-config-printer/Makefile b/print/system-config-printer/Makefile
index ccc887672962..9f07b114a8f8 100644
--- a/print/system-config-printer/Makefile
+++ b/print/system-config-printer/Makefile
@@ -33,7 +33,8 @@ USE_PYTHON=	2.6+
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_GETTEXT=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 USE_GNOME=	pygtk2
 MAN1=	system-config-printer-applet.1 system-config-printer.1
 PLIST_SUB=	PYTHON_VER=${PYTHON_VERSION:S/python//}
diff --git a/print/teTeX-base/Makefile b/print/teTeX-base/Makefile
index f7286f281567..426e34aaa2a4 100644
--- a/print/teTeX-base/Makefile
+++ b/print/teTeX-base/Makefile
@@ -49,8 +49,8 @@ CONFIGURE_ARGS=	--disable-multiplatform \
 		--without-xdvik --without-oxdvik
 CONFIGURE_ENV=	INSTALL_SCRIPT="${INSTALL_SCRIPT}" \
 		INSTALL_DATA="${INSTALL_DATA}" \
-		INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
-		CFLAGS="${CFLAGS} -I${LOCALBASE}/include"
+		INSTALL_PROGRAM="${INSTALL_PROGRAM}"
+CFLAGS+=	-I${LOCALBASE}/include
 PKGMESSAGE=	${WRKDIR}/pkg-message
 CONFLICTS=	ja-ptex-base-[0-9]* latex2e-[0-9]* \
 		tex-[0-9]* dvips-[0-9]* xdvi-[0-9]*
diff --git a/print/texinfo/Makefile b/print/texinfo/Makefile
index 65a5804a3e59..d8d20b182030 100644
--- a/print/texinfo/Makefile
+++ b/print/texinfo/Makefile
@@ -29,8 +29,8 @@ MAKE_JOBS_SAFE=	yes
 
 MAKE_ARGS=	TEXMF=${PREFIX}/${TEXMF}
 CONFIGURE_ARGS=	--without-included-gettext
-CPPFLAGS=	-I${LOCALBASE}/lib
-LDFLAGS=	-L${LOCALBASE}/lib -lintl
+CPPFLAGS+=	-I${LOCALBASE}/lib
+LDFLAGS+=	-L${LOCALBASE}/lib -lintl
 
 INFO=		${PORTNAME} info-stnd info
 MAN1=		info.1 infokey.1 install-info.1 makeinfo.1 texi2dvi.1 \
diff --git a/print/trueprint/Makefile b/print/trueprint/Makefile
index 301b1af3aacd..8c205ee35a6b 100644
--- a/print/trueprint/Makefile
+++ b/print/trueprint/Makefile
@@ -18,7 +18,7 @@ COMMENT=	Print program listings on postscript printer
 USE_GMAKE=	yes
 USE_GETTEXT=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CFLAGS="${CFLAGS}" LDFLAGS="-L${LOCALBASE}/lib -lintl"
+LDFLAGS+=	-L${LOCALBASE}/lib -lintl
 
 MAN1=		trueprint.1
 INFO=		trueprint
diff --git a/print/ttf2pt1/Makefile b/print/ttf2pt1/Makefile
index 27d4dcc832ea..0adb4163a0e9 100644
--- a/print/ttf2pt1/Makefile
+++ b/print/ttf2pt1/Makefile
@@ -25,9 +25,9 @@ MAKE_ARGS=	CC="${CC}" CFLAGS="${CFLAGS} ${CPPFLAGS}" LIBS="${LDFLAGS}" \
 
 MAN1=		ttf2pt1.1 ttf2pt1_convert.1 ttf2pt1_x2gs.1
 
-CPPFLAGS=	`pkg-config --cflags freetype2` \
+CPPFLAGS+=	`pkg-config --cflags freetype2` \
 		-I${LOCALBASE}/include -DUSE_FREETYPE
-LDFLAGS=	`pkg-config --libs freetype2` \
+LDFLAGS+=	`pkg-config --libs freetype2` \
 		-L${LOCALBASE}/lib -lm
 
 .include <bsd.port.mk>
diff --git a/print/ttftot42/Makefile b/print/ttftot42/Makefile
index edfa3efb0b1a..b910c9b4e05e 100644
--- a/print/ttftot42/Makefile
+++ b/print/ttftot42/Makefile
@@ -16,12 +16,11 @@ COMMENT=	TrueType to Type42 font converter
 
 USE_FREETYPE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 
 PLIST_FILES=	bin/ttftot42
 
-CPPFLAGS=	-I${LOCALBASE}/include/freetype1/freetype \
+CPPFLAGS+=	-I${LOCALBASE}/include/freetype1/freetype \
 		-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .include <bsd.port.mk>
diff --git a/print/wprint/Makefile b/print/wprint/Makefile
index fc08d8784019..3960f2c568e2 100644
--- a/print/wprint/Makefile
+++ b/print/wprint/Makefile
@@ -23,13 +23,12 @@ LIB_DEPENDS=	freetype:${PORTSDIR}/print/freetype2
 USE_ICONV=	yes
 USE_PERL5=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	LDFLAGS="${LDFLAGS}"
 MAKE_JOBS_SAFE=	yes
 
 MAN1=		wprint.1
 
-CPPFLAGS=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 post-patch:
 .for file in man/wprint.1.pod src/wprint.c
diff --git a/print/xdvik/Makefile b/print/xdvik/Makefile
index b9fdb3248133..de5a4514ec0e 100644
--- a/print/xdvik/Makefile
+++ b/print/xdvik/Makefile
@@ -33,8 +33,8 @@ CONFIGURE_ARGS=	--with-system-t1lib \
 		--disable-multiplatform
 CONFIGURE_ENV=	INSTALL_SCRIPT="${INSTALL_SCRIPT}" \
 		INSTALL_DATA="${INSTALL_DATA}" \
-		INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
-		CFLAGS="${CFLAGS} -I${LOCALBASE}/include"
+		INSTALL_PROGRAM="${INSTALL_PROGRAM}"
+CFLAGS+=	-I${LOCALBASE}/include
 INSTALL_WRKSRC=	${WRKSRC}/texk/xdvik
 
 PLIST_SUB=	TEXMFDIR=${TEXMFDIR} TEXMFCONFIGDIR=${TEXMFDIR}-config