17 files changed, 33 insertions, 33 deletions

diff --git a/accessibility/accerciser/Makefile b/accessibility/accerciser/Makefile
index 2e2058756131..258c6ff522ca 100644
--- a/accessibility/accerciser/Makefile
+++ b/accessibility/accerciser/Makefile
@@ -25,8 +25,8 @@ INSTALLS_OMF=	yes
 INSTALLS_ICONS=	yes
 GNU_CONFIGURE=	yes
 USE_DISPLAY=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 GCONF_SCHEMAS=	accerciser.schemas
 MAN1=		accerciser.1
diff --git a/accessibility/at-poke/Makefile b/accessibility/at-poke/Makefile
index df5a67555f41..417a33e9e276 100644
--- a/accessibility/at-poke/Makefile
+++ b/accessibility/at-poke/Makefile
@@ -18,7 +18,7 @@ COMMENT=	Accessibility testing and poking tool
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix libglade2 libgailgnome
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .include <bsd.port.mk>
diff --git a/accessibility/at-spi/Makefile b/accessibility/at-spi/Makefile
index f87f110b2a5d..7b85d1d16399 100644
--- a/accessibility/at-spi/Makefile
+++ b/accessibility/at-spi/Makefile
@@ -28,8 +28,8 @@ USE_PYTHON=	yes
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-static
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 GCONF_SCHEMAS=	at-spi.schemas
 
diff --git a/accessibility/at-spi2-atk/Makefile b/accessibility/at-spi2-atk/Makefile
index af037e1989a8..3a9f37676e0d 100644
--- a/accessibility/at-spi2-atk/Makefile
+++ b/accessibility/at-spi2-atk/Makefile
@@ -26,8 +26,8 @@ USE_GMAKE=	yes
 USE_GNOME=	gnomehack gnomehier intlhack gconf2 libxml2
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-static
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 GCONF_SCHEMAS=	at-spi2.schemas
 
 .include <bsd.port.mk>
diff --git a/accessibility/at-spi2-core/Makefile b/accessibility/at-spi2-core/Makefile
index ff63c8d7d3f5..f3a594bfdf5e 100644
--- a/accessibility/at-spi2-core/Makefile
+++ b/accessibility/at-spi2-core/Makefile
@@ -26,7 +26,7 @@ USE_GNOME=	gnomehack gnomehier intlhack
 USE_XORG=	x11 xi xtst
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-static
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .include <bsd.port.mk>
diff --git a/accessibility/atk/Makefile b/accessibility/atk/Makefile
index ba7b69b834ee..cdc84181c444 100644
--- a/accessibility/atk/Makefile
+++ b/accessibility/atk/Makefile
@@ -30,9 +30,9 @@ USE_GNOME=	gnomehack glib20 ltverhack referencehack
 CONFIGURE_ARGS=	--enable-static \
 		--disable-gtk-doc \
 		--with-html-dir=${PREFIX}/share/doc
-CPPFLAGS=	-I${LOCALBASE}/include
-CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib" \
-		AUTOCONF=${TRUE} AUTOMAKE=${TRUE}
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
+CONFIGURE_ENV=	AUTOCONF=${TRUE} AUTOMAKE=${TRUE}
 
 post-patch:
 	@${REINPLACE_CMD} -e "/^SUBDIRS =/s/tests//" \
diff --git a/accessibility/atkmm/Makefile b/accessibility/atkmm/Makefile
index 0e4d19df9ea6..34a9448cf6f6 100644
--- a/accessibility/atkmm/Makefile
+++ b/accessibility/atkmm/Makefile
@@ -22,8 +22,8 @@ USE_GMAKE=	yes
 MAKE_JOBS_SAFE=	yes
 USE_GNOME=	gnomehack atk
 GNU_CONFIGURE=	yes
-CPPFLAGS=	-I${LOCALBASE}/include
-CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--disable-documentation
 
 .include <bsd.port.mk>
diff --git a/accessibility/dasher/Makefile b/accessibility/dasher/Makefile
index 250808bc024b..8b330013c566 100644
--- a/accessibility/dasher/Makefile
+++ b/accessibility/dasher/Makefile
@@ -29,8 +29,8 @@ WANT_GNOME=	yes
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
 INSTALLS_OMF=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 GCONF_SCHEMAS=	dasher.schemas
 MAN1=		dasher.1
diff --git a/accessibility/eflite/Makefile b/accessibility/eflite/Makefile
index 7ee5eb523e37..59d4aaa03ba8 100644
--- a/accessibility/eflite/Makefile
+++ b/accessibility/eflite/Makefile
@@ -33,7 +33,7 @@ CONFIGURE_ARGS+=	--with-vox=${FL_VOX}
 CONFIGURE_ARGS+=	--with-vox=cmu_us_kal16
 .endif
 
-CONFIGURE_ENV+=		flite_dir=${LOCALBASE}
+CONFIGURE_ENV+=	flite_dir=${LOCALBASE}
 
 PLIST_FILES=	bin/eflite
 PORTDOCS=	AUTHORS CREDITS ChangeLog INSTALL README
diff --git a/accessibility/gnome-mag/Makefile b/accessibility/gnome-mag/Makefile
index 0351c4822859..8277994bfbb4 100644
--- a/accessibility/gnome-mag/Makefile
+++ b/accessibility/gnome-mag/Makefile
@@ -22,8 +22,8 @@ USE_GMAKE=	yes
 USE_GETTEXT=	yes
 USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 DOCSDIR=	${PREFIX}/share/doc/gnome-mag-${PORTVERSION}
 
diff --git a/accessibility/gnome-speech/Makefile b/accessibility/gnome-speech/Makefile
index 47e4195b20c1..70e217980fbf 100644
--- a/accessibility/gnome-speech/Makefile
+++ b/accessibility/gnome-speech/Makefile
@@ -21,8 +21,8 @@ USE_GNOME=	gnomehack gnomeprefix libbonobo
 GNU_CONFIGURE=  yes
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--enable-static
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .include <bsd.port.pre.mk>
 
diff --git a/accessibility/gnopernicus/Makefile b/accessibility/gnopernicus/Makefile
index 26c3e229ee66..ffe04da3b2d7 100644
--- a/accessibility/gnopernicus/Makefile
+++ b/accessibility/gnopernicus/Makefile
@@ -26,8 +26,8 @@ INSTALLS_ICONS=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack intlhack libgnomeui atspi gnomespeech
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include `pkg-config --cflags gtk+-2.0`" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include `pkg-config --cflags gtk+-2.0`
+LDFLAGS+=	-L${LOCALBASE}/lib
 MAKE_ENV=	SED="${SED}"
 
 GCONF_SCHEMAS=	brlmonitor.schemas gnopernicus.schemas remote.schemas
diff --git a/accessibility/gok/Makefile b/accessibility/gok/Makefile
index 63bc6a6b8c3c..926a2bc01d6e 100644
--- a/accessibility/gok/Makefile
+++ b/accessibility/gok/Makefile
@@ -27,8 +27,8 @@ USE_GNOME=	gnomehack gnomeprefix intlhack libgnomeui atspi libwnck \
 USE_GMAKE=	yes
 INSTALLS_ICONS=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 GCONF_SCHEMAS=	gok.schemas
 
diff --git a/accessibility/mousetweaks/Makefile b/accessibility/mousetweaks/Makefile
index 208d4dca6ead..12cd84f75822 100644
--- a/accessibility/mousetweaks/Makefile
+++ b/accessibility/mousetweaks/Makefile
@@ -22,8 +22,8 @@ USE_GMAKE=	yes
 USE_GETTEXT=	yes
 INSTALLS_OMF=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 GCONF_SCHEMAS=	mousetweaks.schemas pointer-capture-applet.schemas
 MAN1=		dwell-click-applet.1 mousetweaks.1 pointer-capture-applet.1
diff --git a/accessibility/orca/Makefile b/accessibility/orca/Makefile
index e7ad1ef28065..e9a9c295b144 100644
--- a/accessibility/orca/Makefile
+++ b/accessibility/orca/Makefile
@@ -34,8 +34,8 @@ USE_GNOME=	gnomeprefix gnomehack libgnomeui gnomespeech pygnome2 \
 		pygnomedesktop
 INSTALLS_ICONS=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 MAN1=		orca.1
 
diff --git a/accessibility/py-atspi/Makefile b/accessibility/py-atspi/Makefile
index f5ae0ee28867..f130466271be 100644
--- a/accessibility/py-atspi/Makefile
+++ b/accessibility/py-atspi/Makefile
@@ -27,7 +27,7 @@ USE_GMAKE=	yes
 USE_GNOME=	gnomehack gnomehier intlhack gtk20 libxml2
 GNU_CONFIGURE=	yes
 USE_PYTHON=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .include <bsd.port.mk>
diff --git a/accessibility/speech-dispatcher/Makefile b/accessibility/speech-dispatcher/Makefile
index 65a4c50ed7a1..f3b647bc0f96 100644
--- a/accessibility/speech-dispatcher/Makefile
+++ b/accessibility/speech-dispatcher/Makefile
@@ -22,9 +22,9 @@ LIB_DEPENDS=	dotconf.0:${PORTSDIR}/devel/dotconf \
 USE_GNOME=	glib20 pkgconfig
 MAKE_JOBS_SAFE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib"
 USE_GMAKE=	yes
 CFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 USE_LDCONFIG=	${PREFIX}/lib ${PREFIX}/lib/${PORTNAME}
 
 CONFFILES=	clients/emacs.conf clients/gnome-speech.conf \