- 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

89 files changed, 152 insertions, 172 deletions

diff --git a/textproc/apertium/Makefile b/textproc/apertium/Makefile
index 7c88f0d58432..6e5c545b6df6 100644
--- a/textproc/apertium/Makefile
+++ b/textproc/apertium/Makefile
@@ -26,8 +26,8 @@ APREV=	0
 MAKE_JOBS_UNSAFE=	yes
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 USE_GNOME=	gnomehack pkgconfig
 USE_LDCONFIG=	yes
 
diff --git a/textproc/artha/Makefile b/textproc/artha/Makefile
index cdd7107b8c5f..d9c9f4be3224 100644
--- a/textproc/artha/Makefile
+++ b/textproc/artha/Makefile
@@ -28,8 +28,8 @@ USE_GNOME=	gtk20 intltool pkgconfig
 
 CONFIGURE_ARGS=	--enable-static=no --x-includes=${LOCALBASE}/include \
 		--x-libraries=${LOCALBASE}/lib
-CONFIGURE_ENV=	LDFLAGS=-L${LOCALBASE}/lib
-CPPFLAGS=	-I${LOCALBASE}/include -I${LOCALBASE}/include/WordNet
+LDFLAGS+=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include/WordNet
 
 OPTIONS=	NOTIFY "Popup word definition as notification" On
 
diff --git a/textproc/aspell/Makefile b/textproc/aspell/Makefile
index 9155d0a09244..7aae8fd2b923 100644
--- a/textproc/aspell/Makefile
+++ b/textproc/aspell/Makefile
@@ -27,8 +27,8 @@ CONFIGURE_ARGS=		--enable-dict-dir=${DATADIR}	\
 			--enable-static
 PTHREAD_CFLAGS=		# Disable threading
 PTHREAD_LIBS=		# libaspell may be used by unthreaded apps.
-CPPFLAGS=		-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-CONFIGURE_ENV=		LDFLAGS="-L${LOCALBASE}/lib ${LDFLAGS} ${PTHREAD_LIBS}"
+CPPFLAGS+=		-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS+=		-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 USE_GMAKE=		yes
 USE_ICONV=		yes
 USE_PERL5_BUILD=	yes
diff --git a/textproc/cost/Makefile b/textproc/cost/Makefile
index 2cd9e0548bc6..3bb37bb7c4e2 100644
--- a/textproc/cost/Makefile
+++ b/textproc/cost/Makefile
@@ -20,7 +20,8 @@ WRKSRC=		${WRKDIR}/${DISTNAME}/src
 GNU_CONFIGURE=	YES
 CONFIGURE_ARGS+=--with-tcl=${LOCALBASE}/lib/tcl8.4 \
 		--with-docdir=${PREFIX}/share/doc/cost --with-charmaps
-CONFIGURE_ENV+=	CFLAGS="${CFLAGS} -fPIC" TCL_INCLUDE_SPEC="${LOCALBASE}/include/tcl8.4"
+CONFIGURE_ENV+=	TCL_INCLUDE_SPEC="${LOCALBASE}/include/tcl8.4"
+CFLAGS+=	-fPIC
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|TCL_SRC_DIR%g|TCL_INCLUDE_SPEC%g|' \
diff --git a/textproc/dict/Makefile b/textproc/dict/Makefile
index f6c525fc6911..840675e43663 100644
--- a/textproc/dict/Makefile
+++ b/textproc/dict/Makefile
@@ -22,8 +22,8 @@ USE_BISON=	build
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--without-local-zlib --with-cflags="${CFLAGS}" \
 		--with-etcdir=${PREFIX}/etc
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
 ALL_TARGET=	dict
diff --git a/textproc/dictfmt/Makefile b/textproc/dictfmt/Makefile
index 4fde88bf91e6..e04ec5ac3ca6 100644
--- a/textproc/dictfmt/Makefile
+++ b/textproc/dictfmt/Makefile
@@ -19,7 +19,6 @@ LIB_DEPENDS=	maa.3:${PORTSDIR}/devel/libmaa
 
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--with-cflags="${CFLAGS}"
 ALL_TARGET=	dictfmt
 INSTALL_TARGET=	install.dictfmt
diff --git a/textproc/diffmark/Makefile b/textproc/diffmark/Makefile
index 34730a64904e..df7ef0c939e3 100644
--- a/textproc/diffmark/Makefile
+++ b/textproc/diffmark/Makefile
@@ -21,6 +21,5 @@ CONFIGURE_ARGS=	--with-libxml2-incldir=${LOCALBASE}/include/libxml2
 
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
-CONFIGURE_ENV+=	CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
 
 .include <bsd.port.mk>
diff --git a/textproc/domc/Makefile b/textproc/domc/Makefile
index 38fed0fcd134..76eea6e3a8e1 100644
--- a/textproc/domc/Makefile
+++ b/textproc/domc/Makefile
@@ -28,7 +28,7 @@ SHLIB_MAJOR=	0
 USE_GMAKE=	yes
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
-MAKE_ENV+=	SHLIB_MAJOR="${SHLIB_MAJOR}" INSTDIR=${PREFIX} LDFLAGS="${LDFLAGS}"
+MAKE_ENV+=	SHLIB_MAJOR="${SHLIB_MAJOR}" INSTDIR=${PREFIX}
 USE_LDCONFIG=	yes
 
 PLIST_SUB=	SHLIB_MAJOR="${SHLIB_MAJOR}"
diff --git a/textproc/dwdiff/Makefile b/textproc/dwdiff/Makefile
index 30e4645d4bf2..f9a0cc01a283 100644
--- a/textproc/dwdiff/Makefile
+++ b/textproc/dwdiff/Makefile
@@ -24,8 +24,6 @@ HAS_CONFIGURE=	yes
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--mandir=${MANPREFIX}/man
-CONFIGURE_ENV=	CFLAGS="${CFLAGS}" \
-		LDFLAGS="${LDFLAGS}"
 
 MAN1=		${PORTNAME}.1 dwfilter.1
 PORTDOCS=	COPYING Changelog README
diff --git a/textproc/ekhtml/Makefile b/textproc/ekhtml/Makefile
index e2f4106c43da..fe950441b4b4 100644
--- a/textproc/ekhtml/Makefile
+++ b/textproc/ekhtml/Makefile
@@ -16,8 +16,8 @@ COMMENT=	El-Kabong is a speedy, yet forgiving, SAX-style HTML parser
 USE_AUTOTOOLS=	libtool
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 USE_LDCONFIG=	yes
 MAKE_JOBS_UNSAFE=	yes
 
diff --git a/textproc/enchant/Makefile b/textproc/enchant/Makefile
index 17651fcc8d58..4f76bd1db871 100644
--- a/textproc/enchant/Makefile
+++ b/textproc/enchant/Makefile
@@ -23,8 +23,8 @@ CONFIGURE_ARGS=	--disable-uspell \
 		--disable-voikko
 MAKE_JOBS_SAFE=	yes
 
-CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 MAN1=		enchant.1
 
diff --git a/textproc/estraier/Makefile b/textproc/estraier/Makefile
index d9498f515701..e43d6cf3202e 100644
--- a/textproc/estraier/Makefile
+++ b/textproc/estraier/Makefile
@@ -25,8 +25,8 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-sysqdbm \
 		--enable-dlfilter \
 		--enable-devel
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
-		LDFLAGS="-L${LOCALBASE}/include ${PTHREAD_LIBS}"
+CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS+=	-L${LOCALBASE}/include ${PTHREAD_LIBS}
 
 .include <bsd.port.pre.mk>
 
diff --git a/textproc/exempi/Makefile b/textproc/exempi/Makefile
index 784018f3d354..ce459b3806d7 100644
--- a/textproc/exempi/Makefile
+++ b/textproc/exempi/Makefile
@@ -19,9 +19,9 @@ LIB_DEPENDS=	expat.6:${PORTSDIR}/textproc/expat2
 USE_AUTOTOOLS=	libtool
 USE_GNOME=	ltverhack gnomehack
 CONFIGURE_ARGS=	--enable-unittest=no
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib" \
-		LIBS="-liconv"
+CONFIGURE_ENV=	LIBS="-liconv"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 USE_ICONV=	yes
 USE_LDCONFIG=	yes
 
diff --git a/textproc/gdome2/Makefile b/textproc/gdome2/Makefile
index de78591882e8..d06fa7ba4970 100644
--- a/textproc/gdome2/Makefile
+++ b/textproc/gdome2/Makefile
@@ -19,8 +19,8 @@ LIB_DEPENDS=	xml2.5:${PORTSDIR}/textproc/libxml2
 USE_AUTOTOOLS=	libtool
 USE_GNOME=	glib20 gnomehack
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	GLIB_CONFIG="${LOCALBASE}/bin/pkg-config glib-2.0" \
-		CPPFLAGS="-I${LOCALBASE}/include"
+CONFIGURE_ENV=	GLIB_CONFIG="${LOCALBASE}/bin/pkg-config glib-2.0"
+CPPFLAGS+=	-I${LOCALBASE}/include
 PLIST_SUB=	DOCSDIR="share/doc/${DISTNAME}"
 USE_LDCONFIG=	yes
 
diff --git a/textproc/glimpse/Makefile b/textproc/glimpse/Makefile
index 6112e910cd8b..232e2325350a 100644
--- a/textproc/glimpse/Makefile
+++ b/textproc/glimpse/Makefile
@@ -21,7 +21,7 @@ PORTDOCS=	README COPYRIGHT
 
 NO_CDROM=	Restrictive copyright (don not sell for profit)
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CFLAGS="${CFLAGS} -DISO_CHAR_SET=1 -D__STRICT_ANSI__"
+CFLAGS+=	-DISO_CHAR_SET=1 -D__STRICT_ANSI__
 MAN1=		glimpse.1 glimpseindex.1 glimpseserver.1 agrep.1
 
 pre-configure:
diff --git a/textproc/gmetadom/Makefile b/textproc/gmetadom/Makefile
index cca48c8e35e8..4d7d34682296 100644
--- a/textproc/gmetadom/Makefile
+++ b/textproc/gmetadom/Makefile
@@ -24,8 +24,8 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 USE_GNOME=	glib20 gnomehack libxml2
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 USE_LDCONFIG=	yes
 
 OPTIONS=	OCAML "OCAML language support" off
diff --git a/textproc/gnome-doc-utils/Makefile b/textproc/gnome-doc-utils/Makefile
index 4392e74db872..6c5a9fcd9505 100644
--- a/textproc/gnome-doc-utils/Makefile
+++ b/textproc/gnome-doc-utils/Makefile
@@ -31,8 +31,8 @@ USE_PYTHON=	yes
 INSTALLS_OMF=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-omf-dir=${PREFIX}/share/omf
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 MAN1=		xml2po.1
 
diff --git a/textproc/gnome-spell/Makefile b/textproc/gnome-spell/Makefile
index 7a717c2e34fb..aaa233057d32 100644
--- a/textproc/gnome-spell/Makefile
+++ b/textproc/gnome-spell/Makefile
@@ -24,8 +24,8 @@ USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack intlhack libgnomeui
 USE_GETTEXT=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 PLIST_SUB=	VERSION=${PORTVERSION}
 
 post-patch:
diff --git a/textproc/gnome-translate/Makefile b/textproc/gnome-translate/Makefile
index 7dac4b1ecb39..9fc0a9c64161 100644
--- a/textproc/gnome-translate/Makefile
+++ b/textproc/gnome-translate/Makefile
@@ -23,8 +23,8 @@ GCONF_SCHEMAS=		gnome-translate.schemas
 USE_GNOME=		gnomehack gnomeprefix eel2 intlhack libgnomeui
 USE_GMAKE=		yes
 GNU_CONFIGURE=		yes
-CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
-			LDFLAGS="-L${LOCALBASE}/lib -Wl,-export-dynamic"
+CPPFLAGS+=		-I${LOCALBASE}/include
+LDFLAGS+=		-L${LOCALBASE}/lib -Wl,-export-dynamic
 
 OPTIONS=		LANGUAGE_DETECTION "language detection" on
 
diff --git a/textproc/gnugrep/Makefile b/textproc/gnugrep/Makefile
index bed7d3f87be7..8545da8e0a72 100644
--- a/textproc/gnugrep/Makefile
+++ b/textproc/gnugrep/Makefile
@@ -33,7 +33,6 @@ OPTIONS=	PCRE	"Compile with Perl-compatible regex support"	off
 
 .if !defined(WITHOUT_NLS)
 USE_GETTEXT=	yes
-CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS}"
 LDFLAGS+=	-lintl -L${LOCALBASE}/lib
 PLIST_SUB+=	NLS=
 .else
diff --git a/textproc/gtkdiff/Makefile b/textproc/gtkdiff/Makefile
index a1e4e6e7c769..15110fa5557b 100644
--- a/textproc/gtkdiff/Makefile
+++ b/textproc/gtkdiff/Makefile
@@ -16,8 +16,8 @@ COMMENT=	A frontend for diff(1)
 
 USE_GNOME=	gnomehack gnomeprefix gnomelibs
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 MAN1=		gtkdiff.1 gtkdiff-rcs.1
 
diff --git a/textproc/gtkspell/Makefile b/textproc/gtkspell/Makefile
index 3ff8760699ea..0029bbb70717 100644
--- a/textproc/gtkspell/Makefile
+++ b/textproc/gtkspell/Makefile
@@ -25,8 +25,8 @@ USE_GNOME=	gnomeprefix gnomehack gtk20 intlhack
 USE_GETTEXT=	yes
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 post-patch:
 	@${REINPLACE_CMD} -e '/^SUBDIRS/ s|docs||' ${WRKSRC}/Makefile.in
diff --git a/textproc/hyperestraier/Makefile b/textproc/hyperestraier/Makefile
index ee21a34adeda..52b67a494390 100644
--- a/textproc/hyperestraier/Makefile
+++ b/textproc/hyperestraier/Makefile
@@ -22,8 +22,8 @@ USE_ICONV=	yes
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-bzip2 --disable-zlib
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 
 OPTIONS=	LZO "Enable lzo support" off \
 		MECAB "Enable mecab support" off
diff --git a/textproc/ibus-kmfl/Makefile b/textproc/ibus-kmfl/Makefile
index 4309cecfddd8..d1b5b384b95c 100644
--- a/textproc/ibus-kmfl/Makefile
+++ b/textproc/ibus-kmfl/Makefile
@@ -27,7 +27,6 @@ USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
-CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS}"
 
 .if !defined(WITHOUT_NLS)
 USE_GETTEXT=	yes
diff --git a/textproc/ibus/Makefile b/textproc/ibus/Makefile
index 36146f83dc1c..070c35cac50b 100644
--- a/textproc/ibus/Makefile
+++ b/textproc/ibus/Makefile
@@ -48,7 +48,7 @@ CONFIGURE_ARGS+=	--disable-iso-codes-check
 USE_GETTEXT=	yes
 PLIST_SUB+=	NLS=""
 .else
-CPPFLAGS=	-I${LOCALBASE}/include
+CPPFLAGS+=	-I${LOCALBASE}/include
 CONFIGURE_ARGS+=	--disable-nls
 PLIST_SUB+=	NLS="@comment "
 .endif
diff --git a/textproc/iksemel/Makefile b/textproc/iksemel/Makefile
index 78505c3e5f82..49a7e68bf4a6 100644
--- a/textproc/iksemel/Makefile
+++ b/textproc/iksemel/Makefile
@@ -19,8 +19,8 @@ LIB_DEPENDS=	gnutls.47:${PORTSDIR}/security/gnutls
 USE_AUTOTOOLS=	aclocal autoheader automake autoconf libtool
 ACLOCAL_ARGS=	-I ${LOCALBASE}/share/aclocal
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	${CXXFLAGS} -I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 USE_LDCONFIG=	yes
 
 INFO=	iksemel
diff --git a/textproc/ipdf/Makefile b/textproc/ipdf/Makefile
index a3a215dbd702..628ce5ece6cb 100644
--- a/textproc/ipdf/Makefile
+++ b/textproc/ipdf/Makefile
@@ -20,8 +20,8 @@ LIB_DEPENDS=	pdf.8:${PORTSDIR}/print/pdflib \
 		tiff.4:${PORTSDIR}/graphics/tiff
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 MAN1=		ipdf.1
 PLIST_FILES=	bin/ipdf
diff --git a/textproc/kbedic/Makefile b/textproc/kbedic/Makefile
index 42a20128d97b..5bd4ed8184f2 100644
--- a/textproc/kbedic/Makefile
+++ b/textproc/kbedic/Makefile
@@ -17,7 +17,8 @@ COMMENT=	An English-Bulgarian-English dictionary
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
 CONFIGURE_ARGS+=	--with-kde
-CONFIGURE_ENV=	CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}" LDFLAGS="${LDFLAGS} ${PTHREAD_LIBS}"
+LDFLAGS+=	${PTHREAD_LIBS}
+CFLAGS+=	${PTHREAD_CFLAGS}
 USE_KDELIBS_VER=	3
 
 .include <bsd.port.mk>
diff --git a/textproc/kmflcomp/Makefile b/textproc/kmflcomp/Makefile
index c788e8d060ac..56b8618949ac 100644
--- a/textproc/kmflcomp/Makefile
+++ b/textproc/kmflcomp/Makefile
@@ -27,7 +27,6 @@ USE_ICONV=	yes
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib -liconv
-CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS}"
 
 DOCSDIR=	${PREFIX}/share/doc/kmfl/${PORTNAME}
 DOCS=		${DISTDIR}/${DIST_SUBDIR}/KMFL-Compiler.sxw \
diff --git a/textproc/libextractor/Makefile b/textproc/libextractor/Makefile
index 49884aeac5eb..68703b628b68 100644
--- a/textproc/libextractor/Makefile
+++ b/textproc/libextractor/Makefile
@@ -21,8 +21,8 @@ USE_AUTOTOOLS=	libltdl
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	${PREFIX}/lib/libextractor
 CONFIGURE_ARGS=	--disable-ltdl-install
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 MAKE_JOBS_UNSAFE=	yes
 
 EXTRACT_AFTER_ARGS=	| ${TAR} -xf - --exclude libltdl
@@ -113,7 +113,7 @@ PLIST_SUB+=	RPM="@comment "
 # QT can be disabled
 .if !defined(WITHOUT_QT)
 LIB_DEPENDS+=	QtGui:${PORTSDIR}/x11-toolkits/qt4-gui
-CONFIGURE_ENV+=	LDFLAGS="-L${LOCALBASE}/lib -L${LOCALBASE}/lib/qt4"
+LDFLAGS+=	-L${LOCALBASE}/lib -L${LOCALBASE}/lib/qt4
 CONFIGURE_ARGS+=--with-qt=${LOCALBASE}
 PLIST_SUB+=	QT=""
 .else
diff --git a/textproc/libkmfl/Makefile b/textproc/libkmfl/Makefile
index e19a00026ee4..eb3661d8b2e6 100644
--- a/textproc/libkmfl/Makefile
+++ b/textproc/libkmfl/Makefile
@@ -22,7 +22,6 @@ USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
-CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS}"
 
 DOCSDIR=	${PREFIX}/share/doc/kmfl/${PORTNAME}
 PORTDOCS=	AUTHORS COPYING ChangeLog
diff --git a/textproc/liblrdf/Makefile b/textproc/liblrdf/Makefile
index 1b4557212cfd..f19d38f144e6 100644
--- a/textproc/liblrdf/Makefile
+++ b/textproc/liblrdf/Makefile
@@ -19,10 +19,9 @@ LIB_DEPENDS=	raptor.3:${PORTSDIR}/textproc/raptor
 USE_AUTOTOOLS=	libtool
 USE_GNOME=	gnomehack
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 USE_LDCONFIG=	yes
 
-CPPFLAGS=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
+CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 
 .include <bsd.port.mk>
diff --git a/textproc/libmrss/Makefile b/textproc/libmrss/Makefile
index 1c1d36eb5e5b..18e60baab767 100644
--- a/textproc/libmrss/Makefile
+++ b/textproc/libmrss/Makefile
@@ -23,7 +23,6 @@ OPTIONS=	PHPMRSS "support to PHP" on
 GNU_CONFIGURE=	yes
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
-CONFIGURE_ENV+=	CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
 
 USE_LDCONFIG=	yes
 WANT_GNOME=	yes
diff --git a/textproc/libnxml/Makefile b/textproc/libnxml/Makefile
index a8b270e20186..61a963f0e5e2 100644
--- a/textproc/libnxml/Makefile
+++ b/textproc/libnxml/Makefile
@@ -18,7 +18,8 @@ COMMENT=	A C library for writing XML 1.0/1.1 files or streams
 LIB_DEPENDS=	curl.6:${PORTSDIR}/ftp/curl
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV+=	CPPFLAGS="-I/${LOCALBASE}/include" LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 USE_LDCONFIG=	yes
 
diff --git a/textproc/libparsifal/Makefile b/textproc/libparsifal/Makefile
index 9247765d3df0..86b77533a576 100644
--- a/textproc/libparsifal/Makefile
+++ b/textproc/libparsifal/Makefile
@@ -17,8 +17,8 @@ COMMENT=	Lightweight XML Parser
 USE_AUTOTOOLS=	libtool
 USE_ICONV=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 USE_LDCONFIG=	yes
 
 PLIST_SUB=	VERSION=${PORTVERSION}
diff --git a/textproc/libtranslate/Makefile b/textproc/libtranslate/Makefile
index 8f9b7efdc748..9af2035d6510 100644
--- a/textproc/libtranslate/Makefile
+++ b/textproc/libtranslate/Makefile
@@ -19,9 +19,8 @@ USE_GNOME=		glib20 gnomehack intlhack
 GNU_CONFIGURE=		yes
 USE_GMAKE=		yes
 USE_LDCONFIG=		yes
-CPPFLAGS=		-I${LOCALBASE}/include
-LDFLAGS=		-L${LOCALBASE}/lib
-CONFIGURE_ENV=		CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
+CPPFLAGS+=		-I${LOCALBASE}/include
+LDFLAGS+=		-L${LOCALBASE}/lib
 CONFIGURE_ARGS=		--with-html-dir=${PREFIX}/share/doc
 
 OPTIONS=		GENERIC "generic module" on \
diff --git a/textproc/libtre/Makefile b/textproc/libtre/Makefile
index 350d6395d7c8..99bf1ef0fcc4 100644
--- a/textproc/libtre/Makefile
+++ b/textproc/libtre/Makefile
@@ -51,10 +51,8 @@ CFLAGS+=	-Wuninitialized -ffast-math -finline-functions \
 .endif
 
 .if defined(WITH_PGO)
-CONFIGURE_ENV+=	CFLAGS="${CFLAGS} -fprofile-generate" \
-		LDFLAGS="${LDFLAGS} -fprofile-generate"
-.else
-CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}"
+LDFLAGS+=	-fprofile-generate
+CFLAGS+=	-fprofile-generate
 .endif
 
 post-patch:
diff --git a/textproc/libxml2/Makefile b/textproc/libxml2/Makefile
index 50f342349732..bc50b926318a 100644
--- a/textproc/libxml2/Makefile
+++ b/textproc/libxml2/Makefile
@@ -36,8 +36,8 @@ CONFIGURE_ARGS?=--with-iconv=${LOCALBASE} \
 		--with-html-dir=${PREFIX}/share/doc \
 		--with-html-subdir=${PORTNAME} \
 		--without-python
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .if !defined(MASTERDIR)
 MAN1=		xml2-config.1 xmllint.1 xmlcatalog.1
diff --git a/textproc/libxode/Makefile b/textproc/libxode/Makefile
index 8ffa4591eab1..fc36313fd475 100644
--- a/textproc/libxode/Makefile
+++ b/textproc/libxode/Makefile
@@ -19,8 +19,8 @@ LIB_DEPENDS=	expat.6:${PORTSDIR}/textproc/expat2
 
 USE_AUTOTOOLS=	libtool
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 USE_LDCONFIG=	yes
 
 post-patch:
diff --git a/textproc/libxslt/Makefile b/textproc/libxslt/Makefile
index 63d3696b6b0b..6b93f871d1ba 100644
--- a/textproc/libxslt/Makefile
+++ b/textproc/libxslt/Makefile
@@ -25,8 +25,8 @@ USE_LDCONFIG=	yes
 USE_GNOME?=	gnomehack libxml2
 CONFIGURE_ARGS?=--with-html-dir=${PREFIX}/share/doc \
 		--without-python
-CPPFLAGS=	-I${LOCALBASE}/include
-CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .if defined(MASTERDIR)
 _SLAVE_PORT=	yes
diff --git a/textproc/link-grammar/Makefile b/textproc/link-grammar/Makefile
index c5aa296b1c2d..fe72a711bc44 100644
--- a/textproc/link-grammar/Makefile
+++ b/textproc/link-grammar/Makefile
@@ -22,8 +22,8 @@ USE_LDCONFIG=	yes
 USE_DOS2UNIX=	yes
 USE_CSTD=	gnu99
 CFLAGS+=	${PTHREAD_CFLAGS}
-CPPFLAGS=	-I${LOCALBASE}/include
-CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--enable-pthreads \
 		--disable-java-bindings \
 		--disable-hunspell \
diff --git a/textproc/ltxml/Makefile b/textproc/ltxml/Makefile
index 872bdba27886..e28140e4ac50 100644
--- a/textproc/ltxml/Makefile
+++ b/textproc/ltxml/Makefile
@@ -19,7 +19,6 @@ USE_PERL5=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-zlib=/usr --enable-multi-byte
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 
 MAN1=		ltxml.1 xmlnorm.1 pesis.1 sgcount.1 sggrep.1 sgmlsb.1 \
 		sgmlseg.1 sgmltoken.1 sgmltrans.1 sgrpg.1 textonly.1 \
diff --git a/textproc/mifluz/Makefile b/textproc/mifluz/Makefile
index c85b166d45a4..4a210aba97ff 100644
--- a/textproc/mifluz/Makefile
+++ b/textproc/mifluz/Makefile
@@ -17,7 +17,6 @@ USE_GNOME=	gnomehack
 USE_BISON=	build
 USE_ICONV=	yes
 USE_AUTOTOOLS=	libtool
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--without-unac
 USE_LDCONFIG=	yes
 
@@ -31,8 +30,8 @@ MAN3=		WordContext.3 WordList.3 WordDict.3 WordListOne.3 \
 		WordCursorOne.3 WordMonitor.3 Configuration.3 mifluz.3
 INFO=		mifluz
 
-CPPFLAGS=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|-D_THREAD_SAFE -pthread|${PTHREAD_CFLAGS}|g' \
diff --git a/textproc/modlogan/Makefile b/textproc/modlogan/Makefile
index 147a0d3e77b5..f2c32464bd43 100644
--- a/textproc/modlogan/Makefile
+++ b/textproc/modlogan/Makefile
@@ -39,7 +39,8 @@ CONFIGURE_ARGS+=--enable-ltdl-install=no --with-gd=${LOCALBASE}/include \
 .if defined(WITH_MYSQL)
 CONFIGURE_ARGS+=--with-mysql
 .endif
-CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 MAN1=		modlogan.1
 DOC1=		faq.txt glosar manual.txt translations.txt \
diff --git a/textproc/msort/Makefile b/textproc/msort/Makefile
index 044c35e7daff..4139af8aec4c 100644
--- a/textproc/msort/Makefile
+++ b/textproc/msort/Makefile
@@ -19,8 +19,9 @@ LIB_DEPENDS=	tre:${PORTSDIR}/textproc/libtre \
 		utf8proc:${PORTSDIR}/textproc/utf8proc
 RUN_DEPENDS=	iwidgets>=0:${PORTSDIR}/x11-toolkits/iwidgets
 
-CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib" CPPFLAGS="-I${LOCALBASE}/include" \
-		ac_cv_lib_tre_regwcomp=yes
+CONFIGURE_ENV=	ac_cv_lib_tre_regwcomp=yes
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 MAKE_ENV+=	INCLUDES="-I${LOCALBASE}/include"
 GNU_CONFIGURE=	yes
 USE_TK_RUN=	yes
diff --git a/textproc/openjade/Makefile b/textproc/openjade/Makefile
index 955b68657837..8afe6047ca0c 100644
--- a/textproc/openjade/Makefile
+++ b/textproc/openjade/Makefile
@@ -56,7 +56,6 @@ post-install:
 # Therefore, we'd better remove all machine optimizations and any -O
 # other than -O{0,1,}. Idea taken from palm/prc-tools-gcc.
 CPPFLAGS:=	-O ${CFLAGS:N-O*:N-m*}
-LDFLAGS=	-L${LOCALBASE}/lib
-CONFIGURE_ENV=	LDFLAGS="${LDFLAGS}"
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .include <bsd.port.post.mk>
diff --git a/textproc/opensp/Makefile b/textproc/opensp/Makefile
index edcb517b8caf..118e9064595f 100644
--- a/textproc/opensp/Makefile
+++ b/textproc/opensp/Makefile
@@ -22,8 +22,8 @@ USE_PERL5=	yes
 CONFIGURE_ARGS=	--enable-default-catalog=${PREFIX}/share/sgml/catalog \
 		--datadir=${PREFIX}/share/sgml/openjade \
 		--disable-doc-build
-CONFIGURE_ENV=	CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
-		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
+LDFLAGS+=	-L${LOCALBASE}/lib
+CFLAGS+=	-I${LOCALBASE}/include
 
 .if defined(WITHOUT_NLS)
 CONFIGURE_ARGS+=--disable-nls
diff --git a/textproc/ots/Makefile b/textproc/ots/Makefile
index ad476f7eb4c0..90d979570b89 100644
--- a/textproc/ots/Makefile
+++ b/textproc/ots/Makefile
@@ -23,7 +23,6 @@ USE_AUTOTOOLS=	libtool
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--disable-shared
 MAKE_ARGS=	pkgconfigdir="${PREFIX}/libdata/pkgconfig"
 MAKE_JOBS_UNSAFE=yes
diff --git a/textproc/pecl-ctemplate/Makefile b/textproc/pecl-ctemplate/Makefile
index 85e57458cdee..b4b545d3a0bc 100644
--- a/textproc/pecl-ctemplate/Makefile
+++ b/textproc/pecl-ctemplate/Makefile
@@ -25,8 +25,8 @@ USE_PHPEXT=	yes
 DEFAULT_PHP_VER=	5
 IGNORE_WITH_PHP=	4
 
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib ${EXTRA_LIBS}"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib ${EXTRA_LIBS}
 
 CONFIGURE_ARGS=	--with-cTemplate=${LOCALBASE}
 
diff --git a/textproc/pecl-xdiff/Makefile b/textproc/pecl-xdiff/Makefile
index 8f84c9342a8f..4418ce6f330a 100644
--- a/textproc/pecl-xdiff/Makefile
+++ b/textproc/pecl-xdiff/Makefile
@@ -22,7 +22,6 @@ USE_PHP=	yes
 USE_PHPEXT=	yes
 
 LDFLAGS+=	-L${LOCALBASE}/lib
-CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS}"
 
 post-configure:
 	echo "#define HAVE_XDL_ALLOCATOR_PRIV 1" >>${WRKSRC}/config.h
diff --git a/textproc/py-enchant/Makefile b/textproc/py-enchant/Makefile
index 0fa0a258fc8e..ddf4f9adf02f 100644
--- a/textproc/py-enchant/Makefile
+++ b/textproc/py-enchant/Makefile
@@ -25,6 +25,6 @@ WX_COMPS=	python:run
 
 PYDISTUTILS_PKGNAME=	pyenchant
 
-MAKE_ENV+=	LDFLAGS="-L${LOCALBASE}/lib"
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .include <bsd.port.mk>
diff --git a/textproc/py-hyperestraier/Makefile b/textproc/py-hyperestraier/Makefile
index a09e25e90723..dee3791ebcc0 100644
--- a/textproc/py-hyperestraier/Makefile
+++ b/textproc/py-hyperestraier/Makefile
@@ -27,7 +27,6 @@ PYDISTUTILS_PKGVERSION=	0.01
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
-MAKE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 
 pre-patch:
 	@${REINPLACE_CMD} -e 's|PYTHON = python|PYTHON = ${PYTHON_VERSION}|' \
diff --git a/textproc/rarian/Makefile b/textproc/rarian/Makefile
index 223fdef5a722..403f488b9dd0 100644
--- a/textproc/rarian/Makefile
+++ b/textproc/rarian/Makefile
@@ -37,8 +37,8 @@ USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--with-convert-dir=${LOCALBASE}/share/omf \
 		--datadir=${PREFIX}/share \
 		--localstatedir=/var
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/lib/rarian|/db/rarian|' \
diff --git a/textproc/rasqal/Makefile b/textproc/rasqal/Makefile
index 008b1a8515f9..00ff3b2ff49f 100644
--- a/textproc/rasqal/Makefile
+++ b/textproc/rasqal/Makefile
@@ -23,9 +23,8 @@ USE_OPENSSL=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 
-CPPFLAGS=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--with-raptor=system
 
 USE_LDCONFIG=	yes
diff --git a/textproc/rast/Makefile b/textproc/rast/Makefile
index f65316144378..b503a36c5358 100644
--- a/textproc/rast/Makefile
+++ b/textproc/rast/Makefile
@@ -31,7 +31,8 @@ CONFIGURE_ARGS=	\
 	--with-ruby=${LOCALBASE}/bin/ruby \
 	--with-default-encoding=${DEFAULT_ENCODING} \
 	--with-filter-moduledir=${PREFIX}/lib/rast/filters
-CONFIGURE_ENV=	CFLAGS="${CFLAGS} -I${LOCALBASE}/include" LDFLAGS="-lz"
+LDFLAGS+=	-lz
+CFLAGS+=	-I${LOCALBASE}/include
 USE_LDCONFIG=	YES
 MAKE_JOBS_UNSAFE=	yes
 
diff --git a/textproc/redland/Makefile b/textproc/redland/Makefile
index d6d5a29d3f81..faf995f0b2fd 100644
--- a/textproc/redland/Makefile
+++ b/textproc/redland/Makefile
@@ -26,9 +26,8 @@ USE_OPENSSL=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 
-CPPFLAGS=	-I${BDB_INCLUDE_DIR} -I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
+CPPFLAGS+=	-I${BDB_INCLUDE_DIR} -I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--with-raptor=system \
 		--with-threestore=no
 
diff --git a/textproc/sablotron/Makefile b/textproc/sablotron/Makefile
index 5df34748e8fa..ee9247b7707f 100644
--- a/textproc/sablotron/Makefile
+++ b/textproc/sablotron/Makefile
@@ -27,8 +27,9 @@ USE_LDCONFIG=	yes
 SHLIB_MAJOR=	70	# API changes counter
 PLIST_SUB+=	SHLIB_MAJOR="${SHLIB_MAJOR}"
 
-CONFIGURE_ENV=	CPPFLAGS=-I${LOCALBASE}/include LIBTOOL=${LIBTOOL} \
-		LDFLAGS="-L${LOCALBASE}/lib -lexpat -liconv"
+CONFIGURE_ENV=	LIBTOOL=${LIBTOOL}
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib -lexpat -liconv
 USE_AUTOTOOLS=	libtool
 USE_GMAKE=	yes
 USE_ICONV=	yes
diff --git a/textproc/sagasu/Makefile b/textproc/sagasu/Makefile
index 281f0107041c..35400304f3d9 100644
--- a/textproc/sagasu/Makefile
+++ b/textproc/sagasu/Makefile
@@ -17,8 +17,8 @@ USE_GNOME=	gnomehack gnomeprefix libgnomeui
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 MAN1=		sagasu.1
 
diff --git a/textproc/scew/Makefile b/textproc/scew/Makefile
index 0f499bcc57fb..be8b9dc1eba2 100644
--- a/textproc/scew/Makefile
+++ b/textproc/scew/Makefile
@@ -20,8 +20,8 @@ USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
 USE_GNOME=	gnomehack
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 SCEW_EXAMPLES=	print stream write
 
diff --git a/textproc/scim-input-pad/Makefile b/textproc/scim-input-pad/Makefile
index a8309e4fc8c7..acd00fa29f49 100644
--- a/textproc/scim-input-pad/Makefile
+++ b/textproc/scim-input-pad/Makefile
@@ -21,8 +21,8 @@ RUN_DEPENDS=	${BUILD_DEPENDS}
 USE_LDCONFIG=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include -D__STDC_ISO_10646__" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include -D__STDC_ISO_10646__
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 DESKTOP_ENTRIES="SCIM Input Pad" \
 		"${COMMENT}" \
diff --git a/textproc/scim-kmfl-imengine/Makefile b/textproc/scim-kmfl-imengine/Makefile
index 75e7b8bfd429..1ff4b45a9c6c 100644
--- a/textproc/scim-kmfl-imengine/Makefile
+++ b/textproc/scim-kmfl-imengine/Makefile
@@ -33,7 +33,6 @@ USE_ICONV=	yes
 USE_LDCONFIG=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
-CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS}"
 
 DOCSDIR=	${PREFIX}/share/doc/kmfl/${PORTNAME}
 PORTDOCS=	AUTHORS COPYING ChangeLog
diff --git a/textproc/scim-openvanilla/Makefile b/textproc/scim-openvanilla/Makefile
index 8def822922c6..ec9135a12d87 100644
--- a/textproc/scim-openvanilla/Makefile
+++ b/textproc/scim-openvanilla/Makefile
@@ -28,8 +28,8 @@ USE_GNOME=	pkgconfig
 USE_GETTEXT=	yes
 USE_ICONV=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV+=	CPPFLAGS=-I${LOCALBASE}/include	\
-		OV_MODULEDIR=${PREFIX}/lib/openvanilla/
+CONFIGURE_ENV+=	OV_MODULEDIR=${PREFIX}/lib/openvanilla/
+CPPFLAGS+=	-I${LOCALBASE}/include	
 
 PLIST_FILES=	lib/scim-1.0/1.4.0/IMEngine/OVLoader-SCIM.a	\
 		lib/scim-1.0/1.4.0/IMEngine/OVLoader-SCIM.la	\
diff --git a/textproc/scim-table-imengine/Makefile b/textproc/scim-table-imengine/Makefile
index 48d330a2c8ac..cc7d6d361cea 100644
--- a/textproc/scim-table-imengine/Makefile
+++ b/textproc/scim-table-imengine/Makefile
@@ -27,10 +27,10 @@ MAN1=		scim-make-table.1
 
 .include <bsd.port.pre.mk>
 
-CPPFLAGS=	-I${LOCALBASE}/include -D__STDC_ISO_10646__
+CPPFLAGS+=	-I${LOCALBASE}/include -D__STDC_ISO_10646__
 
-CONFIGURE_ENV+=	LDFLAGS="-L${LOCALBASE}/lib -lintl" \
-		PREFIX="${PREFIX}"
+CONFIGURE_ENV+=	PREFIX="${PREFIX}"
+LDFLAGS+=	-L${LOCALBASE}/lib -lintl
 
 PLIST_SUB=	SKIM="@comment "
 
diff --git a/textproc/scim/Makefile b/textproc/scim/Makefile
index ca20d921045f..588b8fea6cfd 100644
--- a/textproc/scim/Makefile
+++ b/textproc/scim/Makefile
@@ -27,8 +27,8 @@ CONFIGURE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 
 .include <bsd.port.pre.mk>
 
-CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include -D__STDC_ISO_10646__" \
-		LDFLAGS="-L${LOCALBASE}/lib -lintl"
+CPPFLAGS+=	-I${LOCALBASE}/include -D__STDC_ISO_10646__
+LDFLAGS+=	-L${LOCALBASE}/lib -lintl
 
 post-patch:
 	${REINPLACE_CMD} -e '/^libscim@SCIM_EPOCH@_la_LDFLAGS/s|=|= ${PTHREAD_LIBS}|' \
diff --git a/textproc/scrollkeeper/Makefile b/textproc/scrollkeeper/Makefile
index 63a7fdb8da5d..5fd8b3537657 100644
--- a/textproc/scrollkeeper/Makefile
+++ b/textproc/scrollkeeper/Makefile
@@ -39,9 +39,9 @@ USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--localstatedir=/var --datadir=${PREFIX}/share \
 		--with-omfdirs=${PREFIX}/share/omf \
 		--with-xml-catalog=${LOCALBASE}/share/xml/catalog.ports
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib -lintl" \
+CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib -lintl" \
 		LOCALBASE="${LOCALBASE}"
+CPPFLAGS+=	-I${LOCALBASE}/include
 PLIST_SUB=	LOCALBASE=${LOCALBASE}
 
 MAN1=	scrollkeeper-config.1 scrollkeeper-gen-seriesid.1
diff --git a/textproc/sdcv/Makefile b/textproc/sdcv/Makefile
index 701e0ce95107..18c49bc80542 100644
--- a/textproc/sdcv/Makefile
+++ b/textproc/sdcv/Makefile
@@ -25,7 +25,6 @@ USE_GETTEXT=	yes
 PLIST_SUB+=	NLS=""
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
-CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 .else
 CONFIGURE_ARGS+=--disable-nls
 PLIST_SUB+=	NLS="@comment "
diff --git a/textproc/senna/Makefile b/textproc/senna/Makefile
index 7e7062360711..1183c312dce2 100644
--- a/textproc/senna/Makefile
+++ b/textproc/senna/Makefile
@@ -19,7 +19,7 @@ GNU_CONFIGURE=	YES
 USE_GMAKE=	YES
 USE_LDCONFIG=	YES
 CONFIGURE_ARGS=	--with-sennahome=${SENNA_HOME}
-CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 MAKE_ARGS=	CFLAGS="${CFLAGS} -I${LOCALBASE}/include ${PTHREAD_CFLAGS}"
 WRKSRC=		${WRKDIR}/${DISTNAME}
 
diff --git a/textproc/skim/Makefile b/textproc/skim/Makefile
index c540a3850fc8..4848ab6a6b6e 100644
--- a/textproc/skim/Makefile
+++ b/textproc/skim/Makefile
@@ -26,10 +26,9 @@ PYDISTUTILS_NOEGGINFO=	yes
 
 CONFIGURE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		PTHREAD_LIBS="${PTHREAD_LIBS}" \
-		PREFIX="${PREFIX}" \
-		CXXFLAGS="-I${LOCALBASE}/include -D__STDC_ISO_10646__ ${CFLAGS}" \
-		LDFLAGS="-L${LOCALBASE}/lib -lintl"
-
+		PREFIX="${PREFIX}"
+LDFLAGS+=	-L${LOCALBASE}/lib -lintl
+CXXFLAGS+=	-I${LOCALBASE}/include -D__STDC_ISO_10646__ ${CFLAGS}
 
 .include <bsd.port.pre.mk>
 
diff --git a/textproc/soothsayer/Makefile b/textproc/soothsayer/Makefile
index 755935af182e..1de3aff716c4 100644
--- a/textproc/soothsayer/Makefile
+++ b/textproc/soothsayer/Makefile
@@ -18,8 +18,7 @@ BUILD_DEPENDS=	help2man:${PORTSDIR}/misc/help2man
 USE_GNOME=	pkgconfig
 USE_SQLITE=	3
 USE_AUTOTOOLS=	libtool
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \
-		ac_cv_path_CPPUNIT_CONFIG=no \
+CONFIGURE_ENV=	ac_cv_path_CPPUNIT_CONFIG=no \
 		ac_cv_path_PYTHON=no \
 		ac_cv_path_SWIG=no \
 		ac_cv_prog_HAVE_DOT=no \
@@ -30,8 +29,8 @@ USE_LDCONFIG=	yes
 MAN1=		soothsayer_demo.1 soothsayer_demo_text.1 \
 		soothsayer_simulator.1 text2ngram.1
 
-CPPFLAGS=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 PORT_VERBS=	${PORTNAME} text2ngram
 
diff --git a/textproc/source-highlight/Makefile b/textproc/source-highlight/Makefile
index 6b6979437d38..2a3301543bd1 100644
--- a/textproc/source-highlight/Makefile
+++ b/textproc/source-highlight/Makefile
@@ -20,7 +20,6 @@ LIB_DEPENDS=	boost_regex:${PORTSDIR}/devel/boost-libs
 GNU_CONFIGURE=	yes
 LDFLAGS+=	-L${LOCALBASE}/lib
 CPPFLAGS+=	-I${LOCALBASE}/include
-CONFIGURE_ENV=	LDFLAGS="${LDFLAGS}" CPPFLAGS="${CPPFLAGS}"
 
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
diff --git a/textproc/spellutils/Makefile b/textproc/spellutils/Makefile
index a572e31bb145..36440b87c5a8 100644
--- a/textproc/spellutils/Makefile
+++ b/textproc/spellutils/Makefile
@@ -18,9 +18,9 @@ COMMENT=	Programs used to isolate some parts or texts before spell-checking
 GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
 USE_GETTEXT=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include"	\
-		LIBS='-L${LOCALBASE}/lib'		\
-		LDFLAGS=-lintl
+CONFIGURE_ENV=		LIBS='-L${LOCALBASE}/lib'
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-lintl
 
 MAN1=		pospell.1 newsbody.1
 
diff --git a/textproc/sphinxsearch-devel/Makefile b/textproc/sphinxsearch-devel/Makefile
index bf3413fd6eda..9b8d7341da1b 100644
--- a/textproc/sphinxsearch-devel/Makefile
+++ b/textproc/sphinxsearch-devel/Makefile
@@ -94,7 +94,7 @@ SPHINX_LOG?=	/var/log/${PORTNAME}
 # don't ask.
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV+=	CC=${CC} CPPFLAGS="${CXXFLAGS}"
+CPPFLAGS+=	${CXXFLAGS}
 CFGFILE=	${PREFIX}/etc/sphinx.conf
 USE_RC_SUBR=	sphinxsearch.sh
 SUB_LIST+=	PORTNAME=${PORTNAME}	 \
diff --git a/textproc/sphinxsearch/Makefile b/textproc/sphinxsearch/Makefile
index c270be966b73..5351de6d68f1 100644
--- a/textproc/sphinxsearch/Makefile
+++ b/textproc/sphinxsearch/Makefile
@@ -111,7 +111,7 @@ SPHINX_LOG?=	/var/log/${PORTNAME}
 # don't ask.
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV+=		CC=${CC} CPPFLAGS="${CXXFLAGS}"
+CPPFLAGS+=	${CXXFLAGS}
 CFGFILE=	${PREFIX}/etc/sphinx.conf
 USE_RC_SUBR=	sphinxsearch.sh
 SUB_LIST+=	PORTNAME=${PORTNAME}     \
diff --git a/textproc/stardict2/Makefile b/textproc/stardict2/Makefile
index 39a84a92ce74..439c5bc9935c 100644
--- a/textproc/stardict2/Makefile
+++ b/textproc/stardict2/Makefile
@@ -16,8 +16,8 @@ MAINTAINER=	delphij@FreeBSD.org
 COMMENT=	A cross-platform and international dictionary written in Gtk2
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
 USE_GMAKE=	yes
 USE_BZIP2=	yes
 USE_GNOME=	gnomehack gnomeprefix
diff --git a/textproc/teckit/Makefile b/textproc/teckit/Makefile
index 4448e309d173..17168e764290 100644
--- a/textproc/teckit/Makefile
+++ b/textproc/teckit/Makefile
@@ -19,8 +19,8 @@ LIB_DEPENDS=	expat.6:${PORTSDIR}/textproc/expat2
 
 USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
-CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 DOCS=		AUTHORS README NEWS docs/*.pdf license/LICENSING.txt
 
diff --git a/textproc/uim-el/Makefile b/textproc/uim-el/Makefile
index daa732591eb9..a45d97c92b25 100644
--- a/textproc/uim-el/Makefile
+++ b/textproc/uim-el/Makefile
@@ -35,8 +35,9 @@ BUILD_WRKSRC=	${WRKSRC}/emacs
 INSTALL_WRKSRC=	${WRKSRC}/emacs
 
 CONFIGURE_ARGS?=--enable-emacs --with-lispdir=${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}
-CONFIGURE_ENV=	EMACS="${EMACS_CMD}" CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
+CONFIGURE_ENV=	EMACS="${EMACS_CMD}" \
 		LIBS="${LIBS} -L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
 
 DOCSDIR_JA=	${PREFIX}/share/doc/ja/uim-el
 PLIST_SUB+=	DOCSDIR_JA="${DOCSDIR_JA:S,^${PREFIX}/,,}"
diff --git a/textproc/uim-gnome/Makefile b/textproc/uim-gnome/Makefile
index 7ab7f3a84bb6..d041cdfdff36 100644
--- a/textproc/uim-gnome/Makefile
+++ b/textproc/uim-gnome/Makefile
@@ -15,8 +15,8 @@ RUN_DEPENDS=	uim-pref-gtk:${PORTSDIR}/textproc/uim-gtk
 
 MASTERDIR=	${.CURDIR}/../../textproc/uim
 PKGDIR=		${.CURDIR}
-CONFIGURE_ENV=	CPPFLAGS="`pkg-config --cflags libgnomeui-2.0`" \
-		LIBS="`pkg-config --libs libgnomeui-2.0`"
+CONFIGURE_ENV=	LIBS="`pkg-config --libs libgnomeui-2.0`"
+CPPFLAGS+=	`pkg-config --cflags libgnomeui-2.0`
 CONFIGURE_ARGS=	--with-gtk2 --enable-gnome-applet
 
 UIM_SLAVE=	yes
diff --git a/textproc/uim-kde/Makefile b/textproc/uim-kde/Makefile
index 9b3e9cca8599..944b6ffbebbf 100644
--- a/textproc/uim-kde/Makefile
+++ b/textproc/uim-kde/Makefile
@@ -22,11 +22,10 @@ PKGDIR=		${.CURDIR}
 CONFIGURE_ARGS=	--with-qt --enable-pref --enable-default-toolkit=qt \
 		--enable-kde-applet
 CONFIGURE_ENV=	QTDIR=${LOCALBASE}/lib QTINCDIR=${LOCALBASE}/include \
-		CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
-		CXX="${CXX}" \
-		CXXFLAGS="${CXXFLAGS} ${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \
-		LIBS="${LIBS} ${PTHREAD_LIBS} -L${LOCALBASE}/lib" \
-		LDFLAGS="${LDFLAGS} ${PTHREAD_LIBS} -L${LOCALBASE}/lib"
+		LIBS="${LIBS} ${PTHREAD_LIBS} -L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	${PTHREAD_LIBS} -L${LOCALBASE}/lib
+CXXFLAGS+=	${PTHREAD_CFLAGS} -I${LOCALBASE}/include
 UIM_SLAVE=	yes
 
 EXTRA_PATCHES=	${PATCHDIR}/extra-patch-qt_Makefile.in
diff --git a/textproc/uim-kde4/Makefile b/textproc/uim-kde4/Makefile
index 2d452af4b907..8c56fab16539 100644
--- a/textproc/uim-kde4/Makefile
+++ b/textproc/uim-kde4/Makefile
@@ -23,10 +23,10 @@ MASTERDIR=	${.CURDIR}/../../textproc/uim
 PKGDIR=		${.CURDIR}
 CONFIGURE_ARGS=	--with-qt4 --enable-pref --enable-default-toolkit=qt4 \
 		--enable-kde4-applet
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
-	CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
-	LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" \
-	KDE4_CONFIG="${KDE4_PREFIX}/bin/kde4-config"
+CONFIGURE_ENV=	KDE4_CONFIG="${KDE4_PREFIX}/bin/kde4-config"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
+CFLAGS+=	-I${LOCALBASE}/include
 UIM_SLAVE=	yes
 
 EXTRA_PATCHES=	${PATCHDIR}/extra-patch-qt4_toolbar_CMakeLists.txt
diff --git a/textproc/uim-qt/Makefile b/textproc/uim-qt/Makefile
index 207f92683bad..002a264c1db4 100644
--- a/textproc/uim-qt/Makefile
+++ b/textproc/uim-qt/Makefile
@@ -19,10 +19,10 @@ PKGDIR=		${.CURDIR}
 CONFIGURE_ARGS=	--with-qt --enable-pref --enable-default-toolkit=qt \
 		--disable-kde-applet
 CONFIGURE_ENV=	QTDIR=${LOCALBASE}/lib QTINCDIR=${LOCALBASE}/include \
-		CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
-		CXXFLAGS="${CXXFLAGS} ${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \
-		LIBS="${LIBS} ${PTHREAD_LIBS} -L${LOCALBASE}/lib" \
-		LDFLAGS="${LDFLAGS} ${PTHREAD_LIBS} -L${LOCALBASE}/lib"
+		LIBS="${LIBS} ${PTHREAD_LIBS} -L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	${PTHREAD_LIBS} -L${LOCALBASE}/lib
+CXXFLAGS+=	${PTHREAD_CFLAGS} -I${LOCALBASE}/include
 UIM_SLAVE=	yes
 
 EXTRA_PATCHES=	${PATCHDIR}/extra-patch-qt_Makefile.in \
diff --git a/textproc/uim-qt4/Makefile b/textproc/uim-qt4/Makefile
index 9be3f428f2ff..dac05fa60292 100644
--- a/textproc/uim-qt4/Makefile
+++ b/textproc/uim-qt4/Makefile
@@ -20,10 +20,10 @@ MASTERDIR=	${.CURDIR}/../../textproc/uim
 PKGDIR=		${.CURDIR}
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--with-qt4 --with-qt4-immodule
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
-	CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
-	LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" \
-	DATADIRNAME="share"
+CONFIGURE_ENV=	DATADIRNAME="share"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
+CFLAGS+=	-I${LOCALBASE}/include
 UIM_SLAVE=	yes
 
 .if defined(WITHOUT_X11)
diff --git a/textproc/uim/Makefile b/textproc/uim/Makefile
index d1d728bf4325..31cb7571dead 100644
--- a/textproc/uim/Makefile
+++ b/textproc/uim/Makefile
@@ -40,9 +40,9 @@ CONFIGURE_ARGS+=	--with-gtk2
 CONFIGURE_ARGS+=	--enable-emacs --with-sj3 --with-canna --with-prime
 .endif
 
-CONFIGURE_ENV?=	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
-		CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
-		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
+CFLAGS+=	-I${LOCALBASE}/include
 
 .if !defined(UIM_SLAVE)
 .if !defined(WITHOUT_X11)
diff --git a/textproc/unrtf/Makefile b/textproc/unrtf/Makefile
index 121521c55ddd..2f5c2c639320 100644
--- a/textproc/unrtf/Makefile
+++ b/textproc/unrtf/Makefile
@@ -17,7 +17,6 @@ LICENSE=	GPLv3
 USE_ICONV=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--libdir=${PREFIX}/share
 
 MAN1=		unrtf.1
diff --git a/textproc/webcpp/Makefile b/textproc/webcpp/Makefile
index 1eca4fb08f72..83ab133bbea5 100644
--- a/textproc/webcpp/Makefile
+++ b/textproc/webcpp/Makefile
@@ -17,7 +17,8 @@ COMMENT=	Convert your source code to syntax highlighted HTML
 .include <bsd.port.pre.mk>
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .if defined(WANT_FINAL)
 CONFIGURE_ARGS+=	--enable-final
diff --git a/textproc/wv/Makefile b/textproc/wv/Makefile
index 359de7cd3a82..b93ee633a6e6 100644
--- a/textproc/wv/Makefile
+++ b/textproc/wv/Makefile
@@ -20,7 +20,7 @@ USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
-CONFIGURE_ENV=	LDFLAGS="${LDFLAGS}" MKDIR_P="${MKDIR}"
+CONFIGURE_ENV=	MKDIR_P="${MKDIR}"
 CONFIGURE_ARGS=	--with-png=${LOCALBASE} \
 		--with-libwmf=${LOCALBASE}
 MAKEFILE=	GNUmakefile
diff --git a/textproc/xalan-c/Makefile b/textproc/xalan-c/Makefile
index 9d310165fb4d..fcadeb66015b 100644
--- a/textproc/xalan-c/Makefile
+++ b/textproc/xalan-c/Makefile
@@ -107,8 +107,7 @@ MAKE_ENV+=		ICUROOT=${ICUROOT}
 PLIST_SUB+=		ICUDEP=""
 .else
 USE_ICONV=		yes
-CONFIGURE_ENV+=		LDFLAGS='-L${LOCALBASE}/lib -liconv'
-MAKE_ENV+=		LDFLAGS='-L${LOCALBASE}/lib -liconv'
+LDFLAGS+=		-L${LOCALBASE}/lib -liconv
 PLIST_SUB+=		ICUDEP="@comment "
 .endif
 
diff --git a/textproc/xls2xml/Makefile b/textproc/xls2xml/Makefile
index 655cb32a0a77..d07adcf46542 100644
--- a/textproc/xls2xml/Makefile
+++ b/textproc/xls2xml/Makefile
@@ -22,8 +22,8 @@ LIB_DEPENDS=	cole.2:${PORTSDIR}/textproc/cole \
 USE_AUTOTOOLS=	libtool
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib -lcole"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib -lcole
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|$${CONFIG_SHELL-/bin/sh} $$ac_aux_dir|$$ac_aux_dir|' \
diff --git a/textproc/xmlroff/Makefile b/textproc/xmlroff/Makefile
index 6c99c050ae6a..c20e1f1e21f6 100644
--- a/textproc/xmlroff/Makefile
+++ b/textproc/xmlroff/Makefile
@@ -24,7 +24,7 @@ USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-gtk-doc \
 		--with-html-dir=${PREFIX}/share/doc
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .include <bsd.port.mk>
diff --git a/textproc/xqilla/Makefile b/textproc/xqilla/Makefile
index f9dd9823d27d..f7cbd4367ca9 100644
--- a/textproc/xqilla/Makefile
+++ b/textproc/xqilla/Makefile
@@ -21,6 +21,6 @@ USE_GMAKE=	yes
 USE_PERL5=	yes
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include"
+CPPFLAGS+=	-I${LOCALBASE}/include
 
 .include <bsd.port.mk>