- 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

41 files changed, 70 insertions, 76 deletions

diff --git a/editors/abiword/Makefile b/editors/abiword/Makefile
index ccd869d43c35..bc6164976eca 100644
--- a/editors/abiword/Makefile
+++ b/editors/abiword/Makefile
@@ -32,8 +32,8 @@ USE_GETTEXT=	yes
 USE_GNOME=	gnomehack libxml2 gtk20 desktopfileutils librsvg2
 WANT_GNOME=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--without-gnomevfs --disable-collab-backend-xmpp \
 		--disable-collab-backend-sugar
 USE_LDCONFIG=	yes
diff --git a/editors/conglomerate/Makefile b/editors/conglomerate/Makefile
index f2e2fed355a6..ea68c7b80f07 100644
--- a/editors/conglomerate/Makefile
+++ b/editors/conglomerate/Makefile
@@ -17,8 +17,8 @@ INSTALLS_OMF=	yes
 USE_GMAKE=	yes
 USE_GNOME=	libgnomeui gtksourceview gnomeprefix gnomehack intlhack
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .include <bsd.port.pre.mk>
 
diff --git a/editors/cooledit/Makefile b/editors/cooledit/Makefile
index f3642ee8962d..dd0cce34cbcb 100644
--- a/editors/cooledit/Makefile
+++ b/editors/cooledit/Makefile
@@ -21,13 +21,12 @@ USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 USE_XORG=	x11 xt
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 USE_LDCONFIG=	yes
 
 MAN1=		cooledit.1 coolman.1 smalledit.1
 
-CPPFLAGS=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
+CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 CFLAGS+=	-DHAVE_MBRTOWC
 
 .if defined(WITH_NEXT_LOOK)
diff --git a/editors/elvis/Makefile b/editors/elvis/Makefile
index e4196fccc453..830bbc3a794d 100644
--- a/editors/elvis/Makefile
+++ b/editors/elvis/Makefile
@@ -40,7 +40,7 @@ CONFIGURE_ARGS+=	--without-xft
 USE_XORG=	xft xt
 CONFIGURE_ARGS+=	--libs="${LDFLAGS}"
 CFLAGS+=	`freetype-config --cflags`
-LDFLAGS=	`freetype-config --libs`
+LDFLAGS+=	`freetype-config --libs`
 .endif
 .endif
 
diff --git a/editors/emacs-devel/Makefile b/editors/emacs-devel/Makefile
index a5a9b7b30d0e..4601b89b1d0a 100644
--- a/editors/emacs-devel/Makefile
+++ b/editors/emacs-devel/Makefile
@@ -33,7 +33,6 @@ USE_GMAKE=	yes
 USE_XZ=		yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
-CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--localstatedir=/var
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 USE_AUTOTOOLS=	autoconf:env automake:env aclocal:env autoheader:env
diff --git a/editors/emacs.app/Makefile b/editors/emacs.app/Makefile
index 851ac14d8634..69d1e76bb008 100644
--- a/editors/emacs.app/Makefile
+++ b/editors/emacs.app/Makefile
@@ -28,7 +28,7 @@ WRKSRC=		${WRKDIR}/${DISTNAME}
 CPPFLAGS+=	-I${GNUSTEP_SYSTEM_ROOT}/Library/Headers
 CFLAGS+=	-I${GNUSTEP_SYSTEM_ROOT}/Library/Headers
 LDFLAGS+=	-L${GNUSTEP_SYSTEM_ROOT}/Library/Libraries
-CONFIGURE_ENV+=	CC=${CC} CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" MAKE="${GMAKE}"
+CONFIGURE_ENV+=	MAKE="${GMAKE}"
 CONFIGURE_ENV+=	GNUSTEP_SYSTEM_HEADERS="${GNUSTEP_SYSTEM_ROOT}/Library/Headers"
 BASEDIR=	${WRKSRC}/nextstep/build/Emacs.app
 CONFIGURE_ARGS+=	--without-gcc --with-ns --without-x --with-pop \
diff --git a/editors/emacs/Makefile b/editors/emacs/Makefile
index a8a52a5b0071..701fc0d5f283 100644
--- a/editors/emacs/Makefile
+++ b/editors/emacs/Makefile
@@ -31,8 +31,8 @@ EMACS_VER=	23.3
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_BZIP2=	yes
-CPPFLAGS=	"-I${LOCALBASE}/include"
-CONFIGURE_ENV+=	LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--localstatedir=/var
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
diff --git a/editors/emacs21/Makefile b/editors/emacs21/Makefile
index dbd151fbe609..f5910efc6aa7 100644
--- a/editors/emacs21/Makefile
+++ b/editors/emacs21/Makefile
@@ -62,7 +62,6 @@ LATEST_LINK=	emacs21
 
 .if ${ARCH} == "ia64"
 CFLAGS:=	${CFLAGS:C/-O.?/-O0/g}
-CONFIGURE_ENV=	CFLAGS="${CFLAGS}"
 .endif
 
 pre-everything::
diff --git a/editors/emacs23/Makefile b/editors/emacs23/Makefile
index a8a52a5b0071..701fc0d5f283 100644
--- a/editors/emacs23/Makefile
+++ b/editors/emacs23/Makefile
@@ -31,8 +31,8 @@ EMACS_VER=	23.3
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_BZIP2=	yes
-CPPFLAGS=	"-I${LOCALBASE}/include"
-CONFIGURE_ENV+=	LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--localstatedir=/var
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
diff --git a/editors/fxite/Makefile b/editors/fxite/Makefile
index 1a7569489ec7..406b43785f0a 100644
--- a/editors/fxite/Makefile
+++ b/editors/fxite/Makefile
@@ -22,7 +22,6 @@ USE_PKGCONFIG=	yes
 GNU_CONFIGURE=	yes
 CXXFLAGS+=	-g -O0 -fPIC
 LDFLAGS+=	-L${LOCALBASE}/lib -lintl
-CONFIGURE_ENV=	LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS+=--with-system-lua \
 		--with-lua-pkg=lua-${LUA_VER}
 
diff --git a/editors/gedit-plugins/Makefile b/editors/gedit-plugins/Makefile
index 80124e3652a9..7ddfd62da9bc 100644
--- a/editors/gedit-plugins/Makefile
+++ b/editors/gedit-plugins/Makefile
@@ -28,8 +28,8 @@ USE_GETTEXT=	yes
 USE_AUTOTOOLS=	libtool
 USE_GNOME=	gnomehack gnomeprefix intlhack gnomevfs2
 WANT_GNOME=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 GCONF_SCHEMAS=	gedit-show-tabbar-plugin.schemas \
 		gedit-drawspaces.schemas
diff --git a/editors/gedit/Makefile b/editors/gedit/Makefile
index 3758401e6d7d..bd31ad794ce0 100644
--- a/editors/gedit/Makefile
+++ b/editors/gedit/Makefile
@@ -32,8 +32,8 @@ USE_GNOME=	gnomeprefix gnomehack intlhack gconf2 gtksourceview2 \
 		desktopfileutils gnomedocutils ltasneededhack
 GNOME_DESKTOP_VERSION=2
 WANT_GNOME=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 PLIST_SUB=	VERSION="2.20"
 
 MAN1=		gedit.1
diff --git a/editors/ghex/Makefile b/editors/ghex/Makefile
index 0771110625e0..0a5222437baf 100644
--- a/editors/ghex/Makefile
+++ b/editors/ghex/Makefile
@@ -24,8 +24,8 @@ USE_GETTEXT=	yes
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
 USE_LDCONFIG=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 GCONF_SCHEMAS=	ghex2.schemas
 
diff --git a/editors/glimmer/Makefile b/editors/glimmer/Makefile
index db5db41ca255..26c379b90e5f 100644
--- a/editors/glimmer/Makefile
+++ b/editors/glimmer/Makefile
@@ -26,8 +26,8 @@ USE_GNOME=	gnomeprefix gnomehack gnomelibs gnomeprint gnomevfs \
 USE_GETTEXT=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-regex
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I/usr/include/gnu" \
-		LIBS="-L${LOCALBASE}/lib -lgnuregex"
+CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib -lgnuregex"
+CPPFLAGS+=	-I${LOCALBASE}/include -I/usr/include/gnu
 
 .if exists(/usr/lib/libcrypto.a)
 PYTHON_LIBS=	-lssl -lcrypto
diff --git a/editors/gmanedit/Makefile b/editors/gmanedit/Makefile
index 4c359acfe8b8..6226c977bb34 100644
--- a/editors/gmanedit/Makefile
+++ b/editors/gmanedit/Makefile
@@ -18,8 +18,8 @@ USE_GNOME=	gnomehack gtk20
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 MAN1=		gmanedit.1
 
diff --git a/editors/gnotepad+/Makefile b/editors/gnotepad+/Makefile
index d4849b3c2e62..932d07cff14c 100644
--- a/editors/gnotepad+/Makefile
+++ b/editors/gnotepad+/Makefile
@@ -27,13 +27,12 @@ WANT_GNOME=	yes
 USE_GNOME=	gnomeprefix gtk12
 USE_GETTEXT=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	LDFLAGS="${LDFLAGS}"
 MAKE_JOBS_SAFE=	yes
 
 MAN1=		gnp.1
 
-CPPFLAGS=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 DOCVERSION=	1.2.0
 
diff --git a/editors/gobby/Makefile b/editors/gobby/Makefile
index 76e00dce175c..2e0e574fdb52 100644
--- a/editors/gobby/Makefile
+++ b/editors/gobby/Makefile
@@ -40,8 +40,8 @@ CONFIGURE_ARGS+=--without-gtkspell
 .endif
 
 .if !defined(WITHOUT_NLS)
-CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib -lintl"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib -lintl
 CONFIGURE_ARGS+=	--enable-nls
 USE_GETTEXT=	yes
 PLIST_SUB+=	NLS=""
diff --git a/editors/gphpedit/Makefile b/editors/gphpedit/Makefile
index f2327c143c6a..b9b204b8b43d 100644
--- a/editors/gphpedit/Makefile
+++ b/editors/gphpedit/Makefile
@@ -19,8 +19,8 @@ COMMENT=	PHP, HTML and CSS development environment for GNOME 2.x
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack libgnomeui libgtkhtml
 USE_AUTOTOOLS=	libtool
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 MAKE_JOBS_UNSAFE=	yes
 
 .if !defined(WITHOUT_PHP)
diff --git a/editors/hte/Makefile b/editors/hte/Makefile
index eda55f447b9f..aaeeabd6cce5 100644
--- a/editors/hte/Makefile
+++ b/editors/hte/Makefile
@@ -39,7 +39,8 @@ PKGNAMESUFFIX=	-nox11
 CONFIGURE_ARGS+=--disable-x11-textmode
 .else
 USE_XORG=	x11
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 .endif
 
 .if !defined(NOPORTDOCS)
diff --git a/editors/joe/Makefile b/editors/joe/Makefile
index 599c3268cb4f..071b35aeb98e 100644
--- a/editors/joe/Makefile
+++ b/editors/joe/Makefile
@@ -25,8 +25,8 @@ USE_GMAKE=	yes
 USE_ICONV=	yes
 USE_NCURSES=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib -liconv"
+CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib -liconv"
+CPPFLAGS+=	-I${LOCALBASE}/include
 
 ALL_TARGET=	${PORTNAME}
 MAN1=		${PORTNAME}.1
diff --git a/editors/joe2/Makefile b/editors/joe2/Makefile
index f2655395e469..4036229d9f69 100644
--- a/editors/joe2/Makefile
+++ b/editors/joe2/Makefile
@@ -21,8 +21,8 @@ CONFLICTS=	joe-3*
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_ICONV=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib -liconv"
+CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib -liconv"
+CPPFLAGS+=	-I${LOCALBASE}/include
 
 ALL_TARGET=	${PORTNAME}
 MAN1=		${PORTNAME}.1
diff --git a/editors/leafpad/Makefile b/editors/leafpad/Makefile
index 09d5028f9ac1..8a292f3e64c8 100644
--- a/editors/leafpad/Makefile
+++ b/editors/leafpad/Makefile
@@ -18,11 +18,10 @@ USE_GNOME=	gtk20 desktopfileutils intlhack
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--enable-chooser
 INSTALLS_ICONS=	yes
-CPPFLAGS=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
+CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 
 PORTDOCS=	AUTHORS COPYING ChangeLog INSTALL README
 
diff --git a/editors/libreoffice/Makefile b/editors/libreoffice/Makefile
index 35794337bcc0..ae59ed24b2d1 100644
--- a/editors/libreoffice/Makefile
+++ b/editors/libreoffice/Makefile
@@ -222,8 +222,7 @@ MANCOMPRESSED=	yes
 
 .include <bsd.port.options.mk>
 
-LDFLAGS=
-MAKE_ENV+= 	USE_GMAKE=1 DESTDIR=${LODESTDIR}
+MAKE_ENV+=	USE_GMAKE=1 DESTDIR=${LODESTDIR}
 
 CPPFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include/db${BDB_VER} -L${LOCALBASE}/lib
 
diff --git a/editors/mlview/Makefile b/editors/mlview/Makefile
index ab88d84b1b4b..356782fbd62c 100644
--- a/editors/mlview/Makefile
+++ b/editors/mlview/Makefile
@@ -20,7 +20,8 @@ USE_AUTOTOOLS=	autoconf libtool
 USE_GNOME=	eel2 gnomehack gnomeprefix gtksourceview libgnomeui
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include `pkg-config --cflags gnome-vfs-2.0 libgnomeui-2.0`" LIBS="-L${LOCALBASE}/lib `pkg-config --libs gnome-vfs-2.0 libgnomeui-2.0`"
+CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib `pkg-config --libs gnome-vfs-2.0 libgnomeui-2.0`"
+CPPFLAGS+=	-I${LOCALBASE}/include `pkg-config --cflags gnome-vfs-2.0 libgnomeui-2.0`
 
 GCONF_SCHEMAS=	mlview.schemas
 
diff --git a/editors/morla/Makefile b/editors/morla/Makefile
index ff0ea9138100..f8a3d6732a90 100644
--- a/editors/morla/Makefile
+++ b/editors/morla/Makefile
@@ -24,7 +24,8 @@ RUN_DEPENDS=	dot:${PORTSDIR}/graphics/graphviz
 OPTIONS=	XULRUNNER	"Install xulrunner as JavaScript engine" off
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I/${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--with-gconf=auto
 USE_GETTEXT=	yes
 USE_GNOME=	gconf2 libgtkhtml libxslt
diff --git a/editors/nano/Makefile b/editors/nano/Makefile
index 943f1006b3d9..a1ce02532409 100644
--- a/editors/nano/Makefile
+++ b/editors/nano/Makefile
@@ -17,8 +17,8 @@ COMMENT=	Nano's ANOther editor, an enhanced free Pico clone
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--docdir=${DOCSDIR}
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 MAKE_JOBS_SAFE=	yes
 
 LICENSE=	GPLv3
diff --git a/editors/nvi-devel/Makefile b/editors/nvi-devel/Makefile
index 653081c344e7..432ac5ecc8f7 100644
--- a/editors/nvi-devel/Makefile
+++ b/editors/nvi-devel/Makefile
@@ -36,7 +36,7 @@ CONFIGURE_ARGS+=	--enable-widechar
 .endif
 
 CPPFLAGS+=		-I${BDB_INCLUDE_DIR} -I${LOCALBASE}/include
-CONFIGURE_ENV+=		LDFLAGS="-L${BDB_LIB_DIR} -L${LOCALBASE}/lib"
+LDFLAGS+=		-L${BDB_LIB_DIR} -L${LOCALBASE}/lib
 
 # configure is 555, so you can't do a "make configure" as non-root.
 post-patch:
diff --git a/editors/openoffice-3-devel/Makefile b/editors/openoffice-3-devel/Makefile
index 4243cd2344cc..de7a5c74c6db 100644
--- a/editors/openoffice-3-devel/Makefile
+++ b/editors/openoffice-3-devel/Makefile
@@ -115,9 +115,9 @@ OOOCC=		${CC}
 OOOCXX=		${CXX}
 .endif
 CONFIGURE_ENV+=	CC="${OOOCC}" CXX="${OOOCXX}"		\
-		CPPFLAGS="-I${LOCALBASE}/include"	\
-		LDFLAGS="-L${LOCALBASE}/lib" \
 		PATH=${WRKSRC}/solenv/bin:$$PATH
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 BUILD_DEPENDS+=	zip:${PORTSDIR}/archivers/zip \
 		${LOCALBASE}/bin/unzip:${PORTSDIR}/archivers/unzip \
diff --git a/editors/openoffice-3/Makefile b/editors/openoffice-3/Makefile
index 9f2521b5df64..e1d38d4c7df1 100644
--- a/editors/openoffice-3/Makefile
+++ b/editors/openoffice-3/Makefile
@@ -105,9 +105,9 @@ OOOCC=		${CC}
 OOOCXX=		${CXX}
 .endif
 CONFIGURE_ENV+=	CC="${OOOCC}" CXX="${OOOCXX}"		\
-		CPPFLAGS="-I${LOCALBASE}/include"	\
-		LDFLAGS="-L${LOCALBASE}/lib" \
 		PATH=${WRKSRC}/solenv/bin:$$PATH
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 BUILD_DEPENDS+=	zip:${PORTSDIR}/archivers/zip \
 		${LOCALBASE}/bin/unzip:${PORTSDIR}/archivers/unzip \
diff --git a/editors/openoffice.org-3-RC/Makefile b/editors/openoffice.org-3-RC/Makefile
index f216db1c825c..bd9fb93de80b 100644
--- a/editors/openoffice.org-3-RC/Makefile
+++ b/editors/openoffice.org-3-RC/Makefile
@@ -106,9 +106,9 @@ OOOCC=		${CC}
 OOOCXX=		${CXX}
 .endif
 CONFIGURE_ENV+=	CC="${OOOCC}" CXX="${OOOCXX}"		\
-		CPPFLAGS="-I${LOCALBASE}/include"	\
-		LDFLAGS="-L${LOCALBASE}/lib" \
 		PATH=${WRKSRC}/solenv/bin:$$PATH
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 BUILD_DEPENDS+=	zip:${PORTSDIR}/archivers/zip \
 		${LOCALBASE}/bin/unzip:${PORTSDIR}/archivers/unzip \
diff --git a/editors/openoffice.org-3-devel/Makefile b/editors/openoffice.org-3-devel/Makefile
index 4243cd2344cc..de7a5c74c6db 100644
--- a/editors/openoffice.org-3-devel/Makefile
+++ b/editors/openoffice.org-3-devel/Makefile
@@ -115,9 +115,9 @@ OOOCC=		${CC}
 OOOCXX=		${CXX}
 .endif
 CONFIGURE_ENV+=	CC="${OOOCC}" CXX="${OOOCXX}"		\
-		CPPFLAGS="-I${LOCALBASE}/include"	\
-		LDFLAGS="-L${LOCALBASE}/lib" \
 		PATH=${WRKSRC}/solenv/bin:$$PATH
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 BUILD_DEPENDS+=	zip:${PORTSDIR}/archivers/zip \
 		${LOCALBASE}/bin/unzip:${PORTSDIR}/archivers/unzip \
diff --git a/editors/openoffice.org-3/Makefile b/editors/openoffice.org-3/Makefile
index 9f2521b5df64..e1d38d4c7df1 100644
--- a/editors/openoffice.org-3/Makefile
+++ b/editors/openoffice.org-3/Makefile
@@ -105,9 +105,9 @@ OOOCC=		${CC}
 OOOCXX=		${CXX}
 .endif
 CONFIGURE_ENV+=	CC="${OOOCC}" CXX="${OOOCXX}"		\
-		CPPFLAGS="-I${LOCALBASE}/include"	\
-		LDFLAGS="-L${LOCALBASE}/lib" \
 		PATH=${WRKSRC}/solenv/bin:$$PATH
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 BUILD_DEPENDS+=	zip:${PORTSDIR}/archivers/zip \
 		${LOCALBASE}/bin/unzip:${PORTSDIR}/archivers/unzip \
diff --git a/editors/openoffice.org-vcltesttool/Makefile b/editors/openoffice.org-vcltesttool/Makefile
index 6490b5bfc893..fa46a0d5edc6 100644
--- a/editors/openoffice.org-vcltesttool/Makefile
+++ b/editors/openoffice.org-vcltesttool/Makefile
@@ -70,9 +70,9 @@ OOOCXX=		${CXX}
 .endif
 
 CONFIGURE_ENV+=	CC="${OOOCC}" CXX="${OOOCXX}"		\
-		CPPFLAGS="-I${LOCALBASE}/include"	\
-		LDFLAGS="-L${LOCALBASE}/lib" \
 		PATH=${WRKSRC}/solenv/bin:$$PATH
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 BUILD_DEPENDS+=	zip:${PORTSDIR}/archivers/zip \
 		${LOCALBASE}/bin/unzip:${PORTSDIR}/archivers/unzip \
diff --git a/editors/poedit/Makefile b/editors/poedit/Makefile
index 9c360c86e361..6f442353ff84 100644
--- a/editors/poedit/Makefile
+++ b/editors/poedit/Makefile
@@ -28,14 +28,13 @@ WITH_BDB_HIGHEST=	yes
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \
-		WXRC="${WXRC_CMD}"
+CONFIGURE_ENV=	WXRC="${WXRC_CMD}"
 INSTALLS_ICONS=	yes
 
 MAN1=		poedit.1
 
-CPPFLAGS=	-I${BDB_INCLUDE_DIR} -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS=	-L${BDB_LIB_DIR} -L${LOCALBASE}/lib ${PTHREAD_LIBS}
+CPPFLAGS+=	-I${BDB_INCLUDE_DIR} -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS+=	-L${BDB_LIB_DIR} -L${LOCALBASE}/lib ${PTHREAD_LIBS}
 
 .include <bsd.port.pre.mk>
 
diff --git a/editors/rospell/Makefile b/editors/rospell/Makefile
index 08476e4ddb82..758a08593b7d 100644
--- a/editors/rospell/Makefile
+++ b/editors/rospell/Makefile
@@ -23,7 +23,7 @@ USE_XORG=	x11 xext
 USE_QT_VER=	3
 
 MAKE_ENV+=	PTHREAD_CFLAGS=${PTHREAD_CFLAGS} PTHREAD_LIBS=${PTHREAD_LIBS}
-CONFIGURE_ENV=	LDFLAGS="${LDFLAGS} ${PTHREAD_LIBS}"
+LDFLAGS+=	${PTHREAD_LIBS}
 
 MAKEFILE=	BSDmakefile
 
diff --git a/editors/scribes/Makefile b/editors/scribes/Makefile
index 305dfcd50bdb..c670718aa200 100644
--- a/editors/scribes/Makefile
+++ b/editors/scribes/Makefile
@@ -22,8 +22,8 @@ USE_GMAKE=	yes
 USE_GNOME=	pygnomedesktop pygnomeextras gnomeprefix
 USE_PYTHON=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 GCONF_SCHEMAS=	scribes.schemas
 INSTALLS_ICONS=	yes
diff --git a/editors/texmacs/Makefile b/editors/texmacs/Makefile
index cfbf7881cc7a..6fcd447f4d56 100644
--- a/editors/texmacs/Makefile
+++ b/editors/texmacs/Makefile
@@ -28,8 +28,8 @@ USE_ICONV=	yes
 USE_GMAKE=	yes
 USE_GHOSTSCRIPT=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--enable-optimize="${CXXFLAGS}" \
 		--with-iconv="${LOCALBASE}"
 
diff --git a/editors/vigor/Makefile b/editors/vigor/Makefile
index 02d4738d287f..2c30466ca39f 100644
--- a/editors/vigor/Makefile
+++ b/editors/vigor/Makefile
@@ -21,7 +21,7 @@ USE_TK_BUILD=	yes
 USE_XORG=	x11
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--program-transform-name="s,0,1,"
-CONFIGURE_ENV+=	LDFLAGS="-L${LOCALBASE}/lib"
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/build
 CFLAGS+=	-I${LOCALBASE}/include/tcl${TCL_VER} -I${LOCALBASE}/include/tk${TK_VER}
diff --git a/editors/xmlcopyeditor/Makefile b/editors/xmlcopyeditor/Makefile
index 05f7577cbecc..b8aff2a6d9b9 100644
--- a/editors/xmlcopyeditor/Makefile
+++ b/editors/xmlcopyeditor/Makefile
@@ -40,8 +40,8 @@ LIB_DEPENDS+=	xerces-c.27:${PORTSDIR}/textproc/xerces-c2 \
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 USE_AUTOTOOLS=	libtool
-CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include \
-			-I${LOCALBASE}/include/libxml2 ${PTHREAD_CFLAGS}" \
-		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CPPFLAGS+=	-I${LOCALBASE}/include \
+		-I${LOCALBASE}/include/libxml2 ${PTHREAD_CFLAGS}
+LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 
 .include <bsd.port.mk>
diff --git a/editors/xmleditor/Makefile b/editors/xmleditor/Makefile
index 8361f6e2c5f7..125b9e4f0ed5 100644
--- a/editors/xmleditor/Makefile
+++ b/editors/xmleditor/Makefile
@@ -21,8 +21,8 @@ USE_BISON=	build
 USE_GNOME=	gnomehack libglade
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 MAKE_ARGS=	ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \
 		AUTOHEADER="${TRUE}"
 USE_LDCONFIG=	yes
diff --git a/editors/zile/Makefile b/editors/zile/Makefile
index 1553914cd125..a5ddf19269ec 100644
--- a/editors/zile/Makefile
+++ b/editors/zile/Makefile
@@ -18,7 +18,6 @@ LIB_DEPENDS=	gc:${PORTSDIR}/devel/boehm-gc
 USE_GMAKE=	yes
 USE_PERL5_BUILD=yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--without-included-regex
 
 MAN1=		${PORTNAME}.1