diff --git a/audio/rhythmbox/Makefile b/audio/rhythmbox/Makefile
index 532978bdc73..7c2770dfdfe 100644
--- a/audio/rhythmbox/Makefile
+++ b/audio/rhythmbox/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.84 2011/09/25 13:40:42 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.85 2011/09/28 09:51:35 jasper Exp $
 
 COMMENT=		integrated music management application for GNOME
 
@@ -99,6 +99,7 @@ post-install:
 	find ${PREFIX} -type d -name rbzeitgeist | xargs -r rm -rf
 
 ### XXX remove this chunk when updating to a 'real' release ############
+### Also convert to new gnome.port.mk CONFIGURE_ARGS ############
 # Sat Sep 17 15:51:41 CEST 2011
 MASTER_SITES=		http://distfiles.bsdfrog.org/
 
diff --git a/comms/gmfsk/Makefile b/comms/gmfsk/Makefile
index 652d1bbc21c..1b1403d9044 100644
--- a/comms/gmfsk/Makefile
+++ b/comms/gmfsk/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.25 2011/09/20 20:51:51 jasper Exp $
+# $OpenBSD: Makefile,v 1.26 2011/09/28 09:51:35 jasper Exp $
 
 COMMENT=	GNOME multimode HF terminal
 
@@ -45,8 +45,6 @@ LIB_DEPENDS=		comms/hamlib \
 
 CONFIGURE_STYLE=	gnu
 CONFIGURE_ARGS=		--enable-hamlib
-CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
-			LDFLAGS="-L${LOCALBASE}/lib" \
-			LIBS="-lsndio"
+CONFIGURE_ENV=		LIBS="-lsndio"
 
 .include <bsd.port.mk>
diff --git a/databases/evolution-data-server/Makefile b/databases/evolution-data-server/Makefile
index 95d994e4ada..ea01ebfec0f 100644
--- a/databases/evolution-data-server/Makefile
+++ b/databases/evolution-data-server/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.99 2011/09/27 07:30:06 jasper Exp $
+# $OpenBSD: Makefile,v 1.100 2011/09/28 09:51:35 jasper Exp $
 
 SHARED_ONLY=		Yes
 
@@ -83,7 +83,7 @@ CONFIGURE_ARGS=		--enable-ssl \
 			--with-krb5-includes=/usr/include/kerberosV \
 			--with-libdb=${LOCALBASE} \
 			--with-openldap=${LOCALBASE}
-CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/db4" \
-			LDFLAGS="-L${LOCALBASE}/lib -pthread"
+MODGNOME_CPPFLAGS=	-I${LOCALBASE}/include/db4
+MODGNOME_LDFLAGS=	-pthread
 
 .include <bsd.port.mk>
diff --git a/devel/ORBit2/Makefile b/devel/ORBit2/Makefile
index f50d93f9cba..1aa0941d86d 100644
--- a/devel/ORBit2/Makefile
+++ b/devel/ORBit2/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.47 2011/09/20 21:04:24 jasper Exp $
+# $OpenBSD: Makefile,v 1.48 2011/09/28 09:51:35 jasper Exp $
 
 COMMENT=		high-performance CORBA Object Request Broker
 
@@ -35,7 +35,5 @@ REGRESS_DEPENDS =	${FULLPKGNAME}:${BUILD_PKGPATH}
 
 CONFIGURE_STYLE=	autoconf
 AUTOCONF_VERSION=	2.67
-CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
-			LDFLAGS="-L${LOCALBASE}/lib"
 
 .include <bsd.port.mk>
diff --git a/devel/atk/Makefile b/devel/atk/Makefile
index cf18d286bfb..95ea20d75c3 100644
--- a/devel/atk/Makefile
+++ b/devel/atk/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.44 2011/09/27 06:35:36 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.45 2011/09/28 09:51:35 jasper Exp $
 
 COMMENT=	accessibility toolkit used by gtk+
 
@@ -33,7 +33,5 @@ USE_GMAKE=	Yes
 USE_LIBTOOL=	Yes
 
 CONFIGURE_STYLE= gnu
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
 
 .include <bsd.port.mk>
diff --git a/devel/atk2mm/Makefile b/devel/atk2mm/Makefile
index e4bfc24c9c0..b1cc989bb6b 100644
--- a/devel/atk2mm/Makefile
+++ b/devel/atk2mm/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.11 2011/09/12 12:07:25 jasper Exp $
+# $OpenBSD: Makefile,v 1.12 2011/09/28 09:51:35 jasper Exp $
 
 COMMENT=	C++ binding for the ATK library
 
@@ -33,8 +33,7 @@ LIB_DEPENDS=	devel/glib2mm \
 USE_GMAKE=	Yes
 
 CONFIGURE_STYLE=gnu
-CONFIGURE_ARGS=	${CONFIGURE_SHARED} \
-		--enable-static \
+CONFIGURE_ARGS=	--enable-static \
 		--disable-dependency-tracking
 
 .include <bsd.port.mk>
diff --git a/devel/bakery/Makefile b/devel/bakery/Makefile
index d866e35f01d..1a9937b92dd 100644
--- a/devel/bakery/Makefile
+++ b/devel/bakery/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.7 2011/09/12 12:07:25 jasper Exp $
+# $OpenBSD: Makefile,v 1.8 2011/09/28 09:51:35 jasper Exp $
 
 COMMENT=		C++ Application Framework for use with Gtkmm
 
@@ -38,9 +38,6 @@ LIB_DEPENDS =		devel/gconfmm \
 			textproc/libxml++
 
 CONFIGURE_STYLE=	gnu
-CONFIGURE_ARGS+= 	${CONFIGURE_SHARED}
-CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
-			LDFLAGS="-L${LOCALBASE}/lib"
 
 SUBST_VARS+=		API_VERSION
 
diff --git a/devel/dconf/Makefile b/devel/dconf/Makefile
index f62c10be2b2..e8166a1b158 100755
--- a/devel/dconf/Makefile
+++ b/devel/dconf/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.30 2011/09/27 15:01:54 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.31 2011/09/28 09:51:35 jasper Exp $
 
 SHARED_ONLY=	Yes
 
@@ -64,8 +64,7 @@ LIB_DEPENDS-editor=	${MODGETTEXT_LIB_DEPENDS} \
 			x11/gtk+3
 
 CONFIGURE_STYLE=gnu
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib -pthread"
+MODGNOME_LDFLAGS=	-pthread
 
 FAKE_FLAGS=	completiondir=${PREFIX}/share/examples/dconf/bash_completion.d
 
diff --git a/devel/gconf-editor/Makefile b/devel/gconf-editor/Makefile
index 98ec73ca123..5354370192d 100644
--- a/devel/gconf-editor/Makefile
+++ b/devel/gconf-editor/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.59 2011/09/21 10:16:42 jasper Exp $
+# $OpenBSD: Makefile,v 1.60 2011/09/28 09:51:35 jasper Exp $
 
 COMMENT=	editor for the GConf configuration system
 
@@ -44,8 +44,6 @@ MODGNOME_TOOLS= Yes
 MODGCONF2_SCHEMAS_DIR=	gconf-editor
 
 CONFIGURE_STYLE=gnu
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
 
 # the devel/gconf2 MODULE overrides the path to gconftool-2
 CONFIGURE_ARGS += --with-gconf-defaults-source="xml:merged:/var/db/gconf/gconf.xml.defaults" \
diff --git a/devel/gconf2/Makefile b/devel/gconf2/Makefile
index a1d2f0ac0c3..e9ca5663538 100644
--- a/devel/gconf2/Makefile
+++ b/devel/gconf2/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.67 2011/09/27 09:24:53 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.68 2011/09/28 09:51:35 jasper Exp $
 
 COMMENT-main=	configuration database system for GNOME
 COMMENT-polkit=	PolicyKit integration for GConf2
@@ -65,8 +65,6 @@ LIB_DEPENDS-polkit= ${LIB_DEPENDS} \
 MODGNOME_TOOLS=	goi
 
 CONFIGURE_STYLE=gnu
-CONFIGURE_ENV= 	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS=	--without-openldap \
 		--enable-defaults-service \
 		--disable-gtk
diff --git a/devel/gconfmm/Makefile b/devel/gconfmm/Makefile
index 0b842cd464e..75c9cee5180 100644
--- a/devel/gconfmm/Makefile
+++ b/devel/gconfmm/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.18 2011/09/16 09:24:49 espie Exp $
+# $OpenBSD: Makefile,v 1.19 2011/09/28 09:51:35 jasper Exp $
 
 COMMENT=		C++ interface to GConf
 
@@ -36,13 +36,10 @@ WANTLIB +=		ORBit-2 gconf-2>=5 sigc-2.0 glibmm-2.4
 
 
 CONFIGURE_STYLE=	gnu
-CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
-			LDFLAGS="-L${LOCALBASE}/lib" \
-			ac_cv_path_DOT= \
+CONFIGURE_ENV=		ac_cv_path_DOT= \
 			ac_cv_path_XSLTPROC= \
 			ac_cv_path_DOXYGEN=
-CONFIGURE_ARGS=		${CONFIGURE_SHARED} \
-			--enable-documentation
+CONFIGURE_ARGS=		--enable-documentation
 
 # XXX when updating, check that this is still needed
 CONFIGURE_ENV+=		MMDOCTOOLDIR=`pkg-config --variable=doctooldir mm-common-util`
diff --git a/devel/glade/Makefile b/devel/glade/Makefile
index 1aa31cd2bd7..b44b105c31f 100644
--- a/devel/glade/Makefile
+++ b/devel/glade/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.38 2011/09/22 16:45:17 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.39 2011/09/28 09:51:35 jasper Exp $
 
 COMMENT=	user interface builder for the gtk+3 toolkit
 
@@ -49,7 +49,7 @@ MODGNOME_DESKTOP_FILE= 	Yes
 MODGNOME_TOOLS= goi yelp
 
 CONFIGURE_STYLE=	gnu
-CONFIGURE_ENV=	CPPFLAGS="-pthread -I${LOCALBASE}/include"      \
-		LDFLAGS="-pthread -lutil -L${LOCALBASE}/lib"
+MODGNOME_CPPFLAGS=	-pthread
+MODGNOME_LDFLAGS=	-pthread -lutil
 
 .include <bsd.port.mk>
diff --git a/devel/gobject-introspection/Makefile b/devel/gobject-introspection/Makefile
index 89e8e661af6..3cf4cdcefa0 100644
--- a/devel/gobject-introspection/Makefile
+++ b/devel/gobject-introspection/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.50 2011/09/21 14:03:50 jasper Exp $
+# $OpenBSD: Makefile,v 1.51 2011/09/28 09:51:35 jasper Exp $
 
 COMMENT=		GObject Introspection
 
@@ -40,8 +40,6 @@ USE_GROFF =		Yes
 YACC=			bison
 
 CONFIGURE_STYLE=	gnu
-CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
-			LDFLAGS="-L${LOCALBASE}/lib"
 
 CFLAGS+=		-pthread
 
diff --git a/devel/goffice/Makefile b/devel/goffice/Makefile
index 846d33056fa..b925c7ac960 100644
--- a/devel/goffice/Makefile
+++ b/devel/goffice/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.41 2011/09/20 21:04:24 jasper Exp $
+# $OpenBSD: Makefile,v 1.42 2011/09/28 09:51:35 jasper Exp $
 
 # XXX on goffice version change,
 # update API_VERSION in math/gnumeric, bump PKGNAME then change the
@@ -40,8 +40,7 @@ LIB_DEPENDS=		devel/libgsf \
 			x11/gtk+2
 
 CONFIGURE_STYLE=	gnu
-CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
-			LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
+MODGNOME_LDFLAGS=	-L${X11BASE}/lib
 
 # XXX move to gsettings
 CONFIGURE_ARGS +=	--with-config-backend=gconf
diff --git a/devel/libIDL/Makefile b/devel/libIDL/Makefile
index 505fcd8fcde..156437fd865 100644
--- a/devel/libIDL/Makefile
+++ b/devel/libIDL/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.35 2011/09/16 09:24:51 espie Exp $
+# $OpenBSD: Makefile,v 1.36 2011/09/28 09:51:35 jasper Exp $
 
 COMMENT=		IDL parsing library
 
@@ -31,9 +31,6 @@ LIB_DEPENDS=		devel/glib2
 
 
 CONFIGURE_STYLE=	gnu
-CONFIGURE_ARGS+=	${CONFIGURE_SHARED}
-CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
-			LDFLAGS="-L${LOCALBASE}/lib"
 
 pre-build:
 # Info files shipped in the official distfile aren't correctly 
diff --git a/devel/libglade2/Makefile b/devel/libglade2/Makefile
index 35612443d22..ce2ea6c98c4 100644
--- a/devel/libglade2/Makefile
+++ b/devel/libglade2/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.46 2011/09/16 14:28:07 jasper Exp $
+# $OpenBSD: Makefile,v 1.47 2011/09/28 09:51:35 jasper Exp $
 
 COMMENT=		library for loading GLADE interface files at runtime
 
@@ -35,9 +35,6 @@ LIB_DEPENDS=		x11/gtk+2 \
 			textproc/libxml>=2.6.16p6
 
 CONFIGURE_STYLE= 	gnu
-CONFIGURE_ARGS+= 	${CONFIGURE_SHARED}
-CONFIGURE_ENV=          CPPFLAGS="-I${LOCALBASE}/include" \
-                        LDFLAGS="-L${LOCALBASE}/lib"
 
 REGRESS_IS_INTERACTIVE= x11
 
diff --git a/devel/libglademm/Makefile b/devel/libglademm/Makefile
index eda7333838f..9b72f3d5312 100755
--- a/devel/libglademm/Makefile
+++ b/devel/libglademm/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.23 2011/09/12 12:07:25 jasper Exp $
+# $OpenBSD: Makefile,v 1.24 2011/09/28 09:51:35 jasper Exp $
 
 COMMENT=	C++ bindings for libglade
 
@@ -37,7 +37,6 @@ LIB_DEPENDS=	x11/gtk2mm \
 		devel/libglade2
 
 CONFIGURE_STYLE=gnu
-CONFIGURE_ARGS=	${CONFIGURE_SHARED} \
-		--enable-static
+CONFIGURE_ARGS=	--enable-static
 
 .include <bsd.port.mk>
diff --git a/devel/libgsf/Makefile b/devel/libgsf/Makefile
index 224d53ddb4b..65696ab8c38 100644
--- a/devel/libgsf/Makefile
+++ b/devel/libgsf/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.65 2011/09/20 21:04:24 jasper Exp $
+# $OpenBSD: Makefile,v 1.66 2011/09/28 09:51:35 jasper Exp $
 
 COMMENT=		GNOME Structured File library
 
@@ -45,8 +45,6 @@ CONFIGURE_ARGS=		--without-bonobo \
 			--without-python \
 			--with-bz2 \
 			--with-gio
-CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
-			LDFLAGS="-L${LOCALBASE}/lib"
 
 USE_GROFF=		Yes
 
diff --git a/devel/libgtop2/Makefile b/devel/libgtop2/Makefile
index ae137d9c418..e3f1c16ab32 100644
--- a/devel/libgtop2/Makefile
+++ b/devel/libgtop2/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.90 2011/09/26 11:04:06 jasper Exp $
+# $OpenBSD: Makefile,v 1.91 2011/09/28 09:51:35 jasper Exp $
 
 COMMENT=		portable library for obtaining system information
 
@@ -31,9 +31,7 @@ MODGNOME_TOOLS= 	goi
 
 CONFIGURE_STYLE=	gnu
 CONFIGURE_ARGS+= 	--without-libgtop-smp
-CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
-			LDFLAGS="-L${LOCALBASE}/lib" \
-			GMSGFMT="${LOCALBASE}/bin/msgfmt" \
+CONFIGURE_ENV=		GMSGFMT="${LOCALBASE}/bin/msgfmt" \
 			ac_cv_header_sys_mount_h=yes
 
 .ifdef DEBUG
diff --git a/devel/libnotify/Makefile b/devel/libnotify/Makefile
index 41aef536788..7baf4f94a2c 100644
--- a/devel/libnotify/Makefile
+++ b/devel/libnotify/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.21 2011/09/22 10:23:33 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.22 2011/09/28 09:51:35 jasper Exp $
 
 COMMENT=		send desktop notifications to a notification daemon
 
@@ -33,7 +33,5 @@ LIB_DEPENDS=		graphics/gdk-pixbuf2
 MODGNOME_TOOLS= 	goi
 
 CONFIGURE_STYLE=	gnu
-CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
-			LDFLAGS="-L${LOCALBASE}/lib"
 
 .include <bsd.port.mk>
diff --git a/devel/libsoup/Makefile b/devel/libsoup/Makefile
index 1089b023156..cae13a552e6 100644
--- a/devel/libsoup/Makefile
+++ b/devel/libsoup/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.66 2011/09/27 07:58:54 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.67 2011/09/28 09:51:35 jasper Exp $
 
 COMMENT-main =		SOAP implementation in C
 COMMENT-gnome =		GNOME specific libsoup parts
@@ -58,8 +58,6 @@ CONFIGURE_ARGS +=	--disable-more-warnings \
 # checking Apache version... 1.3.29 (Unix) (ignoring)
 # But this prevents needing apache2 for certain regress tests.
 CONFIGURE_ARGS+=	--with-apache-httpd="/usr/sbin/httpd"
-CONFIGURE_ENV =		CPPFLAGS="-I${LOCALBASE}/include" \
-			LDFLAGS="-L${LOCALBASE}/lib"
 
 SUBST_VARS =		API_VERSION
 
diff --git a/devel/libunique/Makefile b/devel/libunique/Makefile
index 8d7e24fe5e4..e304b38d03d 100644
--- a/devel/libunique/Makefile
+++ b/devel/libunique/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.18 2011/09/20 21:17:26 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.19 2011/09/28 09:51:36 jasper Exp $
 
 # XXX fix building with glib2 >= 2.29 (G_CONST_RETURN is deprecated)
 CFLAGS +=	"-DG_CONST_RETURN=const"
@@ -33,8 +33,6 @@ WANTLIB += xcb-shm z ffi
 MODGNOME_TOOLS= 	goi
 
 CONFIGURE_STYLE =	gnu
-CONFIGURE_ENV =		CPPFLAGS="-I${LOCALBASE}/include" \
-			LDFLAGS="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS =	--with-x
 
 MODULES =	devel/gettext \
diff --git a/devel/libunique3/Makefile b/devel/libunique3/Makefile
index f0c5b2b0449..b08138c3688 100644
--- a/devel/libunique3/Makefile
+++ b/devel/libunique3/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.7 2011/09/25 08:32:00 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.8 2011/09/28 09:51:36 jasper Exp $
 
 COMMENT =	library for writing single instance GTK+3 applications
 
@@ -36,8 +36,6 @@ LIB_DEPENDS =		x11/dbus-glib \
 			x11/gtk+3
 
 CONFIGURE_STYLE =	gnu
-CONFIGURE_ENV =		CPPFLAGS="-I${LOCALBASE}/include" \
-			LDFLAGS="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS =	--enable-bacon \
 			--with-x
 
diff --git a/devel/libwnck/Makefile b/devel/libwnck/Makefile
index 2fae30c8780..3af6da0c965 100644
--- a/devel/libwnck/Makefile
+++ b/devel/libwnck/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.50 2011/09/20 21:04:24 jasper Exp $
+# $OpenBSD: Makefile,v 1.51 2011/09/28 09:51:36 jasper Exp $
 
 COMMENT=		window navigator construction kit
 
@@ -38,7 +38,5 @@ LIB_DEPENDS=		x11/gtk+2 \
 			devel/startup-notification
 
 CONFIGURE_STYLE= 	gnu
-CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
-			LDFLAGS="-L${LOCALBASE}/lib"
 
 .include <bsd.port.mk>
diff --git a/devel/libwnck3/Makefile b/devel/libwnck3/Makefile
index 7639148ea5c..9328c2c6108 100644
--- a/devel/libwnck3/Makefile
+++ b/devel/libwnck3/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.7 2011/09/26 09:21:58 jasper Exp $
+# $OpenBSD: Makefile,v 1.8 2011/09/28 09:51:36 jasper Exp $
 
 COMMENT=		window navigator construction kit
 
@@ -38,7 +38,5 @@ LIB_DEPENDS=		x11/gtk+3 \
 CONFIGURE_STYLE= 	gnu
 CONFIGURE_ARGS+= 	--enable-startup-notification \
 			--program-suffix=3
-CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
-			LDFLAGS="-L${LOCALBASE}/lib"
 
 .include <bsd.port.mk>
diff --git a/devel/pangomm/Makefile b/devel/pangomm/Makefile
index c32ad3294b4..ce8ce50da0b 100644
--- a/devel/pangomm/Makefile
+++ b/devel/pangomm/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.17 2011/09/27 12:26:20 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.18 2011/09/28 09:51:36 jasper Exp $
 
 COMMENT =		C++ interface for pango
 
@@ -32,6 +32,6 @@ LIB_DEPENDS =		devel/pango \
 			graphics/cairomm
 
 CONFIGURE_STYLE=	gnu
-CONFIGURE_ENV=		CPPFLAGS="-I${X11BASE}/include"
+MODGNOME_CPPFLAGS=	-I${X11BASE}/include
 
 .include <bsd.port.mk>
diff --git a/devel/py-orbit/Makefile b/devel/py-orbit/Makefile
index c2870fa95a5..56231e1977d 100644
--- a/devel/py-orbit/Makefile
+++ b/devel/py-orbit/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.26 2011/09/16 09:24:55 espie Exp $
+# $OpenBSD: Makefile,v 1.27 2011/09/28 09:51:36 jasper Exp $
 
 COMMENT=	ORBit2 Python bindings
 
@@ -34,8 +34,7 @@ LIBTOOL_FLAGS+=	--tag=disable-static
 
 CONFIGURE_STYLE=gnu
 CONFIGURE_ENV=	LIBS="-pthread -lm -lutil"
-CONFIGURE_ARGS=	${CONFIGURE_SHARED} \
-		--disable-static
+CONFIGURE_ARGS=	--disable-static
 
 pre-configure:
 	@find ${WRKDIST} -name \*.py | \
diff --git a/devel/vte/Makefile b/devel/vte/Makefile
index 4791ba585ee..0af032670b4 100644
--- a/devel/vte/Makefile
+++ b/devel/vte/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.91 2011/09/26 14:25:09 jasper Exp $
+# $OpenBSD: Makefile,v 1.92 2011/09/28 09:51:36 jasper Exp $
 
 # Don't pull in x11/py-gtk2 on these archs; build fails with binutils 2.15
 NOT_FOR_ARCHS-python=	mips64 mips64el
@@ -67,7 +67,5 @@ CONFIGURE_STYLE=	gnu
 CONFIGURE_ARGS+=	--disable-Bsymbolic \
 			--with-gtk=2.0 \
 			--program-suffix=2
-CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
-			LDFLAGS="-L${LOCALBASE}/lib"
 
 .include <bsd.port.mk>
diff --git a/devel/vte3/Makefile b/devel/vte3/Makefile
index 3cf53065660..dfa38c79a95 100644
--- a/devel/vte3/Makefile
+++ b/devel/vte3/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 2011/09/26 15:17:25 jasper Exp $
+# $OpenBSD: Makefile,v 1.5 2011/09/28 09:51:36 jasper Exp $
 
 COMMENT=		terminal emulation library
 
@@ -40,7 +40,5 @@ MODGNOME_TOOLS= 	goi
 
 CONFIGURE_STYLE=	gnu
 CONFIGURE_ARGS+=	--disable-Bsymbolic \
-CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
-			LDFLAGS="-L${LOCALBASE}/lib"
 
 .include <bsd.port.mk>
diff --git a/games/gbrainy/Makefile b/games/gbrainy/Makefile
index ac05756a486..692e139e6bb 100644
--- a/games/gbrainy/Makefile
+++ b/games/gbrainy/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.20 2011/09/20 21:04:24 jasper Exp $
+# $OpenBSD: Makefile,v 1.21 2011/09/28 09:51:36 jasper Exp $
 
 COMMENT=	brain teaser game
 
@@ -33,8 +33,6 @@ MODGNOME_DESKTOP_FILE=	Yes
 MODGNOME_TOOLS= 	yelp
 
 CONFIGURE_STYLE=gnu
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS=	--disable-tests
 
 DLLMAP_FILES=	src/Clients/Classical/gbrainy.exe.config.in \
diff --git a/games/gnome-mastermind/Makefile b/games/gnome-mastermind/Makefile
index f56e50f2d3f..1f90daa1f41 100644
--- a/games/gnome-mastermind/Makefile
+++ b/games/gnome-mastermind/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.13 2011/09/20 21:04:24 jasper Exp $
+# $OpenBSD: Makefile,v 1.14 2011/09/28 09:51:36 jasper Exp $
 
 COMMENT =	Mastermind clone reflexion game
 
@@ -29,8 +29,6 @@ RUN_DEPENDS +=	x11/gnome/librsvg
 
 MODGNOME_TOOLS= 	yelp
 CONFIGURE_STYLE =	gnu
-CONFIGURE_ENV +=	CPPFLAGS="-I${LOCALBASE}/include" \
-			LDFLAGS="-L${LOCALBASE}/lib"
 
 WANTLIB += ORBit-2 X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext
 WANTLIB += Xfixes Xi Xinerama Xrandr Xrender atk-1.0 c cairo dbus-1
diff --git a/games/pioneers/Makefile b/games/pioneers/Makefile
index da468ea93db..2fb01a66242 100644
--- a/games/pioneers/Makefile
+++ b/games/pioneers/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.26 2011/09/20 21:04:24 jasper Exp $
+# $OpenBSD: Makefile,v 1.27 2011/09/28 09:51:36 jasper Exp $
 
 COMMENT=	Settlers of Catan for GNOME/Gtk
 
@@ -43,9 +43,7 @@ MODGNOME_TOOLS= 	yelp
 
 CONFIGURE_STYLE=gnu
 USE_GROFF =	Yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib" \
-		ac_cv_path_pngtopnm=""
+CONFIGURE_ENV=	ac_cv_path_pngtopnm=""
 CONFIGURE_ARGS=	--enable-protocol=IPv4
 
 pre-configure:
diff --git a/geo/emerillon/Makefile b/geo/emerillon/Makefile
index 70d0ef8d316..f035ccd6e0d 100644
--- a/geo/emerillon/Makefile
+++ b/geo/emerillon/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.14 2011/09/25 18:54:28 jasper Exp $
+# $OpenBSD: Makefile,v 1.15 2011/09/28 09:51:36 jasper Exp $
 
 # XXX fix building with glib2 >= 2.29 (G_CONST_RETURN is deprecated)
 CFLAGS +=		"-DG_CONST_RETURN=const"
@@ -32,7 +32,6 @@ MODULES=	devel/gettext \
 AUTOCONF_VERSION=	2.65
 CONFIGURE_STYLE=	autoconf
 MODGCONF2_SCHEMAS_DIR=	emerillon
-CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
 
 MODGNOME_TOOLS= 	goi vala yelp
 
diff --git a/geo/viking/Makefile b/geo/viking/Makefile
index 4fd248c592c..695603d8e03 100644
--- a/geo/viking/Makefile
+++ b/geo/viking/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.10 2011/09/20 20:51:51 jasper Exp $
+# $OpenBSD: Makefile,v 1.11 2011/09/28 09:51:36 jasper Exp $
 
 COMMENT =	GPS track manager
 
@@ -26,8 +26,7 @@ CONFIGURE_STYLE =	gnu
 MODGNOME_DESKTOP_FILE =		Yes
 MODGNOME_TOOLS= 	yelp
 
-CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib -pthread"
+MODGNOME_LDFLAGS=-pthread
 
 LIB_DEPENDS =	misc/gpsd \
 		net/curl \
diff --git a/graphics/dia/Makefile b/graphics/dia/Makefile
index 5b827e61171..e17d87199de 100644
--- a/graphics/dia/Makefile
+++ b/graphics/dia/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.81 2011/09/20 21:04:24 jasper Exp $
+# $OpenBSD: Makefile,v 1.82 2011/09/28 09:51:36 jasper Exp $
 
 COMMENT=	technical diagrams drawing tool
 
@@ -40,9 +40,7 @@ MODULES=	devel/gettext \
 MODGNOME_DESKTOP_FILE=	Yes
 
 CONFIGURE_STYLE=gnu
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include/libpng \
-		-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+MODGNOME_CPPFLAGS=-I${LOCALBASE}/include/libpng
 CONFIGURE_ARGS=	--with-cairo \
 		--enable-db2html=no \
 		--with-hardbooks=no
diff --git a/graphics/evince/Makefile b/graphics/evince/Makefile
index 1903faa62e6..40461f852f9 100644
--- a/graphics/evince/Makefile
+++ b/graphics/evince/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.71 2011/09/27 13:14:00 jasper Exp $
+# $OpenBSD: Makefile,v 1.72 2011/09/28 09:51:36 jasper Exp $
 
 SHARED_ONLY=	Yes
 
@@ -108,9 +108,8 @@ CONFIGURE_ARGS+= --disable-static \
 		--enable-djvu \
 		--enable-dvi
 
-CONFIGURE_ENV=	CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
-		CXXFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+MODGNOME_CPPFLAGS=${CFLAGS}
+CONFIGURE_ENV=	CXXFLAGS="${CXXFLAGS} -I${LOCALBASE}/include"
 
 MULTI_PACKAGES=	-main
 PSEUDO_FLAVORS=	light
diff --git a/graphics/goocanvas/Makefile b/graphics/goocanvas/Makefile
index 94ee7a3d80e..348df4f4f52 100644
--- a/graphics/goocanvas/Makefile
+++ b/graphics/goocanvas/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.11 2011/09/16 10:02:37 espie Exp $
+# $OpenBSD: Makefile,v 1.12 2011/09/28 09:51:36 jasper Exp $
 
 COMMENT=		canvas widget for GTK+ based on Cairo
 
@@ -32,7 +32,5 @@ BUILD_DEPENDS=		x11/gnome/doc-utils
 LIB_DEPENDS=		x11/gtk+2
 
 CONFIGURE_STYLE=	gnu
-CONFIGURE_ENV+= 	LDFLAGS="-L${LOCALBASE}/lib" \
-			CPPFLAGS="-I${LOCALBASE}/include"
 
 .include <bsd.port.mk>
diff --git a/graphics/goocanvas2/Makefile b/graphics/goocanvas2/Makefile
index 56fe596d072..e3d44a89048 100644
--- a/graphics/goocanvas2/Makefile
+++ b/graphics/goocanvas2/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 2011/09/20 21:04:24 jasper Exp $
+# $OpenBSD: Makefile,v 1.5 2011/09/28 09:51:36 jasper Exp $
 
 COMMENT=		canvas widget for GTK+ based on Cairo
 
@@ -33,7 +33,5 @@ MODULES=		devel/gettext \
 LIB_DEPENDS=		x11/gtk+3
 
 CONFIGURE_STYLE=	gnu
-CONFIGURE_ENV=	 	LDFLAGS="-L${LOCALBASE}/lib" \
-			CPPFLAGS="-I${LOCALBASE}/include"
 
 .include <bsd.port.mk>
diff --git a/graphics/gthumb/Makefile b/graphics/gthumb/Makefile
index c8692e4e2b7..9c7e282906b 100644
--- a/graphics/gthumb/Makefile
+++ b/graphics/gthumb/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.46 2011/09/20 21:04:24 jasper Exp $
+# $OpenBSD: Makefile,v 1.47 2011/09/28 09:51:36 jasper Exp $
 
 COMMENT=	image viewer and browser for GNOME
 
@@ -51,8 +51,8 @@ MODGNOME_DESKTOP_FILE=		Yes
 MODGCONF2_SCHEMAS_DIR=	gthumb
 
 CONFIGURE_STYLE=gnu
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
+MODGNOME_CPPFLAGS=	-I${X11BASE}/include
+MODGNOME_LDFLAGS=	-L${X11BASE}/lib
 CONFIGURE_ARGS=	--disable-libopenraw \
 		--disable-libbrasero \
 		--enable-libsoup \
diff --git a/graphics/libart/Makefile b/graphics/libart/Makefile
index 8a33ab1f3ec..75f15e8dc9b 100644
--- a/graphics/libart/Makefile
+++ b/graphics/libart/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.26 2011/09/12 12:07:25 jasper Exp $
+# $OpenBSD: Makefile,v 1.27 2011/09/28 09:51:36 jasper Exp $
 
 COMMENT=		high-performance 2D graphics library
 
@@ -25,6 +25,5 @@ WANTLIB=		m
 MODULES=		x11/gnome
 
 CONFIGURE_STYLE= 	gnu
-CONFIGURE_ARGS+= 	${CONFIGURE_SHARED}
 
 .include <bsd.port.mk>
diff --git a/graphics/pdfmod/Makefile b/graphics/pdfmod/Makefile
index 7f417ad849b..29561f8c97a 100755
--- a/graphics/pdfmod/Makefile
+++ b/graphics/pdfmod/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.6 2011/09/20 20:51:52 jasper Exp $
+# $OpenBSD: Makefile,v 1.7 2011/09/28 09:51:36 jasper Exp $
 
 COMMENT=	simple application for modifying PDF documents
 
@@ -30,8 +30,6 @@ MODGNOME_TOOLS= 	yelp
 MODGNOME_DESKTOP_FILE=	Yes
 
 CONFIGURE_STYLE=gnu
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS=	--enable-release \
 		--disable-external-poppler-sharp
 
diff --git a/graphics/simple-scan/Makefile b/graphics/simple-scan/Makefile
index 6316f3769cb..11fe16ad50a 100644
--- a/graphics/simple-scan/Makefile
+++ b/graphics/simple-scan/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.16 2011/09/27 08:05:31 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.17 2011/09/28 09:51:36 jasper Exp $
 
 COMMENT=	simple scanning utility
 
@@ -37,7 +37,5 @@ MODGNOME_TOOLS= 	yelp
 USE_GMAKE=	Yes
 
 CONFIGURE_STYLE=gnu
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
 
 .include <bsd.port.mk>
diff --git a/lang/vala/Makefile b/lang/vala/Makefile
index bc7f17656f8..97e47ec0405 100644
--- a/lang/vala/Makefile
+++ b/lang/vala/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.42 2011/09/17 17:21:16 jasper Exp $
+# $OpenBSD: Makefile,v 1.43 2011/09/28 09:51:36 jasper Exp $
 
 COMMENT=		compiler for the GObject type system
 
@@ -39,8 +39,6 @@ SUBST_VARS+=		API_V
 CONFIGURE_STYLE=	gnu
 CONFIGURE_ARGS+=	${CONFIGURE_SHARED} \
 			--enable-vapigen
-CONFIGURE_ENV+= 	LDFLAGS="-L${LOCALBASE}/lib" \
-			CPPFLAGS="-I${LOCALBASE}/include"
 
 pre-configure:
 	perl -pi -e 's,/bin/bash,${LOCALBASE}/bin/bash,g' \
diff --git a/mail/evolution-exchange/Makefile b/mail/evolution-exchange/Makefile
index 9299fd56055..e14dbce18fc 100644
--- a/mail/evolution-exchange/Makefile
+++ b/mail/evolution-exchange/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.26 2011/09/26 09:45:10 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.27 2011/09/28 09:51:36 jasper Exp $
 
 # No NTLM support in OpenLDAP; Plaintext password authentication will be
 # used when connecting to the Global Catalog server. Consider installing
@@ -85,8 +85,7 @@ CONFIGURE_ARGS=	--disable-static \
 		--with-static-ldap=no \
 		--with-openldap=${LOCALBASE} \
 		--with-libdb=${LOCALBASE}
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/db4" \
-		LDFLAGS="-L${LOCALBASE}/lib \
-			-Wl,-rpath,${TRUEPREFIX}/lib/evolution-exchange/${EVO_VERSION}:${TRUEPREFIX}/lib"
+MODGNOME_CPPFLAGS=-I${LOCALBASE}/include/db4
+MODGNOME_LDFLAGS=-Wl,-rpath,${TRUEPREFIX}/lib/evolution-exchange/${EVO_VERSION}:${TRUEPREFIX}/lib
 
 .include <bsd.port.mk>
diff --git a/mail/evolution-rss/Makefile b/mail/evolution-rss/Makefile
index 4f0fd9b7575..4ceb7247d1e 100644
--- a/mail/evolution-rss/Makefile
+++ b/mail/evolution-rss/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.8 2011/09/26 10:05:40 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.9 2011/09/28 09:51:36 jasper Exp $
 
 SHARED_ONLY=		Yes
 
@@ -58,8 +58,6 @@ CONFIGURE_STYLE=	gnu
 CONFIGURE_ARGS=		--disable-gecko \
 			--disable-webkit \
 			--with-primary-render=gtkhtml
-CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
-			LDFLAGS="-L${LOCALBASE}/lib"
 
 ### XXX remove this chunk when updating to a 'real' release ############
 MASTER_SITES=		http://distfiles.bsdfrog.org/
diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile
index fdffe502755..a20eeb74c4c 100644
--- a/mail/evolution/Makefile
+++ b/mail/evolution/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.138 2011/09/26 17:05:04 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.139 2011/09/28 09:51:36 jasper Exp $
 
 COMMENT-main=		integrated email and PIM software for GNOME
 COMMENT-plugins=	additionnal plugins for evolution
@@ -125,11 +125,9 @@ YACC=			bison
 AUTOCONF_VERSION=	2.68
 AUTOMAKE_VERSION=	1.9
 CONFIGURE_STYLE=	autoconf
-CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include \
-				-DBOGOFILTER_BINARY="\\\"${LOCALBASE}/bin/bogofilter\\\""" \
-			LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}lib \
-				-Wl,-rpath,${TRUEPREFIX}/lib/evolution/${R}:${TRUEPREFIX}/lib \
-				-Wl,--as-needed"
+MODGNOME_CPPFLAGS=	-I${X11BASE}/include -DBOGOFILTER_BINARY="\\\"${LOCALBASE}/bin/bogofilter\\\""
+MODGNOME_LDFLAGS=	-L${X11BASE}/lib -Wl,-rpath,${TRUEPREFIX}/lib/evolution/${R}:${TRUEPREFIX}/lib \
+				-Wl,--as-needed
 
 CONFIGURE_ARGS=		--enable-plugins=all \
 			--disable-nm \
diff --git a/math/gnumeric/Makefile b/math/gnumeric/Makefile
index f80f96502c2..bdd072b7b5a 100644
--- a/math/gnumeric/Makefile
+++ b/math/gnumeric/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.70 2011/09/20 20:51:52 jasper Exp $
+# $OpenBSD: Makefile,v 1.71 2011/09/28 09:51:36 jasper Exp $
 
 COMMENT=		spreadsheet application for GNOME
 
@@ -51,8 +51,6 @@ CONFIGURE_ARGS=		--without-gnome \
 			--without-paradox \
 			--without-long-double \
 			--without-python
-CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
-			LDFLAGS="-L${LOCALBASE}/lib"
 
 SUBST_VARS=		VERSION API_VERSION
 
diff --git a/misc/contacts/Makefile b/misc/contacts/Makefile
index 1167353b2f3..9ff4939050a 100644
--- a/misc/contacts/Makefile
+++ b/misc/contacts/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.22 2011/09/16 10:31:23 espie Exp $
+# $OpenBSD: Makefile,v 1.23 2011/09/28 09:51:36 jasper Exp $
 
 COMMENT=		lightweight addressbook
 
@@ -42,11 +42,8 @@ LIB_DEPENDS=		databases/evolution-data-server
 RUN_DEPENDS=		devel/desktop-file-utils
 
 CONFIGURE_STYLE=	gnu
-CONFIGURE_ARGS+=	${CONFIGURE_SHARED} \
-			--disable-gnome-vfs \
+CONFIGURE_ARGS+=	--disable-gnome-vfs \
 			--enable-gconf \
 			--enable-dbus
-CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
-			LDFLAGS="-L${LOCALBASE}/lib"
 
 .include <bsd.port.mk>
diff --git a/net/glib2-networking/Makefile b/net/glib2-networking/Makefile
index febe4341169..c95f8e441c5 100644
--- a/net/glib2-networking/Makefile
+++ b/net/glib2-networking/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.9 2011/09/27 06:31:53 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.10 2011/09/28 09:51:36 jasper Exp $
 
 SHARED_ONLY=	Yes
 
@@ -39,8 +39,6 @@ LIB_DEPENDS=	net/libproxy>=0.4.6 \
 LIBTOOL_FLAGS=	--tag=disable-static
 
 CONFIGURE_STYLE=gnu
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS=	--disable-static \
 		--with-ca-certificates=/etc/ssl/cert.pem
 
diff --git a/net/telepathy/folks/Makefile b/net/telepathy/folks/Makefile
index 4608dbeeea8..835cc76d155 100644
--- a/net/telepathy/folks/Makefile
+++ b/net/telepathy/folks/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.18 2011/09/27 06:28:37 jasper Exp $
+# $OpenBSD: Makefile,v 1.19 2011/09/28 09:51:36 jasper Exp $
 
 SHARED_ONLY=		Yes
 
@@ -35,7 +35,4 @@ CONFIGURE_ARGS+=	--enable-libsocialweb-backend=no
 # Not yet until e-d-s' vala bindings are stable
 CONFIGURE_ARGS+=	--disable-eds-backend
 
-CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
-			LDFLAGS="-L${LOCALBASE}/lib"
-
 .include <bsd.port.mk>
diff --git a/net/twitux/Makefile b/net/twitux/Makefile
index 96181c9433b..63e3c4408df 100644
--- a/net/twitux/Makefile
+++ b/net/twitux/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.21 2011/09/20 21:04:25 jasper Exp $
+# $OpenBSD: Makefile,v 1.22 2011/09/28 09:51:36 jasper Exp $
 
 COMMENT=		Gtk-based GUI client for Twitter
 
@@ -52,8 +52,6 @@ CONFIGURE_STYLE= gnu
 CONFIGURE_ARGS=	--enable-dbus=yes \
 		--enable-gnome-keyring=yes \
 		--enable-spell=yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
 
 MODGNOME_DESKTOP_FILE=	Yes
 
diff --git a/productivity/glabels/Makefile b/productivity/glabels/Makefile
index d29cd99bae0..12f562c391c 100644
--- a/productivity/glabels/Makefile
+++ b/productivity/glabels/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.20 2011/09/20 21:04:25 jasper Exp $
+# $OpenBSD: Makefile,v 1.21 2011/09/28 09:51:36 jasper Exp $
 
 COMMENT =	labels and business card designer
 
@@ -49,8 +49,6 @@ MODGNOME_TOOLS= 	yelp
 MODGNOME_DESKTOP_FILE =		Yes
 
 CONFIGURE_STYLE =	gnu
-CONFIGURE_ENV =		LDFLAGS="-L${LOCALBASE}/lib" \
-			CPPFLAGS="-I${LOCALBASE}/include"
 
 USE_GROFF =		Yes
 
diff --git a/productivity/gnucash/Makefile b/productivity/gnucash/Makefile
index 3042340afd5..341607c9b70 100644
--- a/productivity/gnucash/Makefile
+++ b/productivity/gnucash/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.42 2011/09/20 21:04:25 jasper Exp $
+# $OpenBSD: Makefile,v 1.43 2011/09/28 09:51:36 jasper Exp $
 
 SHARED_ONLY =	Yes
 
@@ -70,8 +70,7 @@ CONFIGURE_STYLE =	gnu
 # --disable-ofx until libofx/libsp is fixed to work with .so
 CONFIGURE_ARGS +=	--disable-doxygen \
 			--disable-ofx
-CONFIGURE_ENV =		CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
-			LDFLAGS="-L${LOCALBASE}/lib"
+MODGNOME_CPPFLAGS=	-I${X11BASE}/include
 USE_GROFF =		Yes
 
 # Steps to build the docs.
diff --git a/sysutils/gamin/Makefile b/sysutils/gamin/Makefile
index 7b6261296ce..fb347a1dab0 100755
--- a/sysutils/gamin/Makefile
+++ b/sysutils/gamin/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.28 2011/09/27 08:15:24 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.29 2011/09/28 09:51:36 jasper Exp $
 
 # XXX fix building with glib2 >= 2.29 (G_CONST_RETURN is deprecated)	
 CFLAGS +=	"-DG_CONST_RETURN=const"
@@ -73,9 +73,9 @@ MODPY_RUNDEP=	No
 
 USE_LIBTOOL=	Yes
 
-CONFIGURE_STYLE= gnu 
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -pthread" \
-		LDFLAGS="-L${LOCALBASE}/lib -pthread"
+CONFIGURE_STYLE= gnu
+MODGNOME_CPPFLAGS=	-pthread
+MODGNOME_LDFLAGS=	-pthread
 CONFIGURE_ARGS+= --disable-docs \
 		--disable-inotify \
 		--disable-dnotify \
diff --git a/sysutils/notification-daemon/Makefile b/sysutils/notification-daemon/Makefile
index 8c1f8b4e519..ac8d783d2ec 100644
--- a/sysutils/notification-daemon/Makefile
+++ b/sysutils/notification-daemon/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.22 2011/09/17 14:21:48 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.23 2011/09/28 09:51:36 jasper Exp $
 
 COMMENT=		send small notifications to your desktop
 
@@ -33,9 +33,6 @@ LIB_DEPENDS=		devel/libnotify>=0.7.2 \
 RUN_DEPENDS=		devel/desktop-file-utils
 
 CONFIGURE_STYLE=	gnu
-CONFIGURE_ARGS+=	${CONFIGURE_SHARED} \
-			--with-dbus-sys="${SYSCONFDIR}/dbus-1/system.d"
-CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
-			LDFLAGS="-L${LOCALBASE}/lib"
+CONFIGURE_ARGS+=	--with-dbus-sys="${SYSCONFDIR}/dbus-1/system.d"
 
 .include <bsd.port.mk>
diff --git a/textproc/gtranslator/Makefile b/textproc/gtranslator/Makefile
index caf129ee2fb..59ec2d4af9e 100644
--- a/textproc/gtranslator/Makefile
+++ b/textproc/gtranslator/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.20 2011/09/20 21:04:25 jasper Exp $
+# $OpenBSD: Makefile,v 1.21 2011/09/28 09:51:36 jasper Exp $
 
 BROKEN=		does not compile with new libgda
 
@@ -56,10 +56,8 @@ MODGNOME_TOOLS= 	yelp
 CONFIGURE_STYLE=gnu
 CONFIGURE_ARGS=	--with-gtkspell \
 		--with-dictionary
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include \
-			-I${LOCALBASE}/include/db4" \
-		LDFLAGS="-L${LOCALBASE}/lib" \
-		LIBS="-liconv -lintl"
+MODGNOME_CPPFLAGS=-I${LOCALBASE}/include/db4
+CONFIGURE_ENV=	LIBS="-liconv -lintl"
 USE_GROFF =	Yes
 
 .include <bsd.port.mk>
diff --git a/textproc/rarian/Makefile b/textproc/rarian/Makefile
index b792c91d1b3..a74a9d76b75 100755
--- a/textproc/rarian/Makefile
+++ b/textproc/rarian/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.16 2011/09/16 11:41:41 espie Exp $
+# $OpenBSD: Makefile,v 1.17 2011/09/28 09:51:36 jasper Exp $
 
 COMMENT=		documentation metadata library
 
@@ -29,15 +29,12 @@ RUN_DEPENDS=		shells/bash \
 BUILD_DEPENDS=		${RUN_DEPENDS}
 
 CONFIGURE_STYLE=	gnu
-CONFIGURE_ARGS+=	${CONFIGURE_SHARED} \
-			--localstatedir=/var \
+CONFIGURE_ARGS+=	--localstatedir=/var \
 			--with-convert-dir=${PREFIX}/share/omf \
 			--enable-installed \
 			--enable-scrollkeeper-compat \
 			--enable-omf-read \
 			--disable-skdb-update
-CONFIGURE_ENV=   	CPPFLAGS="-I${LOCALBASE}/include" \
-			LDFLAGS="-L${LOCALBASE}/lib"
 
 # The .in files in ${WRKSRC}/util/ don't have a newline at the end
 # of the file, which causes diff(1) to puke.
diff --git a/www/epiphany-extensions/Makefile b/www/epiphany-extensions/Makefile
index 0d083091552..e0908c113e7 100644
--- a/www/epiphany-extensions/Makefile
+++ b/www/epiphany-extensions/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.37 2011/09/20 21:04:25 jasper Exp $
+# $OpenBSD: Makefile,v 1.38 2011/09/28 09:51:36 jasper Exp $
 
 COMMENT=		collection of extensions for Epiphany
 
@@ -49,8 +49,6 @@ LIBTOOL_FLAGS=	--tag=disable-static
 MODGNOME_TOOLS= yelp
 
 CONFIGURE_STYLE=gnu
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS=	--disable-static \
 		--enable-opensp=no
 
diff --git a/www/epiphany/Makefile b/www/epiphany/Makefile
index 76df385e425..eda0fe52914 100644
--- a/www/epiphany/Makefile
+++ b/www/epiphany/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.69 2011/09/20 21:04:25 jasper Exp $
+# $OpenBSD: Makefile,v 1.70 2011/09/28 09:51:36 jasper Exp $
 
 SHARED_ONLY=	Yes
 
@@ -69,8 +69,7 @@ CONFIGURE_ARGS=	--disable-static \
 		--enable-seed \
 		--disable-nss
 
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib" \
-		HOME=/tmp
+MODGNOME_CPPFLAGS=	-I${X11BASE}/include
+CONFIGURE_ENV=		HOME=/tmp
 
 .include <bsd.port.mk>
diff --git a/www/gtkhtml3/Makefile b/www/gtkhtml3/Makefile
index f5d873f5d9a..ad7ba93f18b 100644
--- a/www/gtkhtml3/Makefile
+++ b/www/gtkhtml3/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.51 2011/09/21 08:08:56 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.52 2011/09/28 09:51:36 jasper Exp $
 
 # XXX fix building with glib2 >= 2.29 (G_CONST_RETURN is deprecated)
 CFLAGS +=	"-DG_CONST_RETURN=const"
@@ -54,9 +54,6 @@ RUN_DEPENDS=		devel/iso-codes \
 			x11/gnome/icon-theme
 
 CONFIGURE_STYLE=	gnu
-CONFIGURE_ARGS+=        ${CONFIGURE_SHARED}
-CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
-			LDFLAGS="-L${LOCALBASE}/lib"
 
 SUBST_VARS=		API_VERSION
 
diff --git a/www/gtkhtml4/Makefile b/www/gtkhtml4/Makefile
index 364973ee1b6..a3f86220b87 100644
--- a/www/gtkhtml4/Makefile
+++ b/www/gtkhtml4/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.9 2011/09/25 17:45:38 jasper Exp $
+# $OpenBSD: Makefile,v 1.10 2011/09/28 09:51:36 jasper Exp $
 
 SHARED_ONLY=		Yes
 
@@ -48,8 +48,7 @@ RUN_DEPENDS=		devel/gsettings-desktop-schemas \
 			x11/gnome/icon-theme
 
 CONFIGURE_STYLE=	gnu
-CONFIGURE_ARGS+=        ${CONFIGURE_SHARED}
-CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
-			LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
+MODGNOME_CPPFLAGS=	-I${X11BASE}/include
+MODGNOME_LDFLAGS=	-L${X11BASE}/lib
 
 .include <bsd.port.mk>
diff --git a/www/libcroco/Makefile b/www/libcroco/Makefile
index 9076f6767c3..4cbd1ac0ad0 100644
--- a/www/libcroco/Makefile
+++ b/www/libcroco/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.12 2011/09/16 12:00:06 espie Exp $
+# $OpenBSD: Makefile,v 1.13 2011/09/28 09:51:36 jasper Exp $
 
 COMMENT=		generic CSS parsing library for GNOME project
 
@@ -27,7 +27,5 @@ LIB_DEPENDS=		devel/glib2 \
 			textproc/libxml
 
 CONFIGURE_STYLE= 	gnu
-CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
-			LDFLAGS="-L${LOCALBASE}/lib"
 
 .include <bsd.port.mk>
diff --git a/x11/gnome/anjuta-extras/Makefile b/x11/gnome/anjuta-extras/Makefile
index c4fb0400962..0a7c92361bc 100644
--- a/x11/gnome/anjuta-extras/Makefile
+++ b/x11/gnome/anjuta-extras/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.17 2011/09/26 20:53:46 jasper Exp $
+# $OpenBSD: Makefile,v 1.18 2011/09/28 09:47:46 jasper Exp $
 
 SHARED_ONLY=	Yes
 
@@ -38,7 +38,5 @@ LIB_DEPENDS=	x11/gnome/anjuta>=3.2.0
 LIBTOOL_FLAGS=	--tag=disable-static
 
 CONFIGURE_ARGS=	--disable-static
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
 
 .include <bsd.port.mk>
diff --git a/x11/gnome/anjuta/Makefile b/x11/gnome/anjuta/Makefile
index b9bb8c8193c..5731e188600 100644
--- a/x11/gnome/anjuta/Makefile
+++ b/x11/gnome/anjuta/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.43 2011/09/26 14:34:52 jasper Exp $
+# $OpenBSD: Makefile,v 1.44 2011/09/28 09:47:46 jasper Exp $
 
 SHARED_ONLY=		Yes
 
@@ -75,9 +75,6 @@ CONFIGURE_ARGS+=	--enable-plugin-subversion
 # adds dependency on libgnomeui
 CONFIGURE_ARGS+=	--disable-graphviz
 
-CONFIGURE_ENV+=		CPPFLAGS="-I${LOCALBASE}/include" \
-			LDFLAGS="-L${LOCALBASE}/lib"
-
 # The Symbol Browser plugin isn't built on OpenBSD due to the lack of an
 # shm_open() implementation. So remove the "Symbol Browser" as a requirement
 # from these templates. It's just a really-nice-to-have, instead of a must-have.
diff --git a/x11/gnome/at-spi2-atk/Makefile b/x11/gnome/at-spi2-atk/Makefile
index 40f9a45c7b9..6916bd532b0 100644
--- a/x11/gnome/at-spi2-atk/Makefile
+++ b/x11/gnome/at-spi2-atk/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.8 2011/09/27 06:07:51 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.9 2011/09/28 09:47:46 jasper Exp $
 
 SHARED_ONLY=	Yes
 
@@ -25,8 +25,7 @@ MODULES=	devel/gettext \
 LIB_DEPENDS=	x11/gnome/at-spi2-core>=2.2.0 \
 		devel/atk
 
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+MODGNOME_CPPFLAGS=-I${X11BASE}/include
 CONFIGURE_ARGS= --enable-p2p
 
 # connects to DBus
diff --git a/x11/gnome/at-spi2-core/Makefile b/x11/gnome/at-spi2-core/Makefile
index c8f2677fe85..7bec5f2fe1e 100644
--- a/x11/gnome/at-spi2-core/Makefile
+++ b/x11/gnome/at-spi2-core/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.7 2011/09/27 06:01:27 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.8 2011/09/28 09:47:46 jasper Exp $
 
 COMMENT=	service interface for assistive technologies
 
@@ -27,8 +27,6 @@ LIB_DEPENDS=	x11/dbus \
 
 MODGNOME_TOOLS= goi
 
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS= --disable-xevie
 
 # connects to DBus
diff --git a/x11/gnome/backgrounds/Makefile b/x11/gnome/backgrounds/Makefile
index 89aea79f294..f6a03f11f9c 100644
--- a/x11/gnome/backgrounds/Makefile
+++ b/x11/gnome/backgrounds/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.19 2011/09/26 11:37:00 jasper Exp $
+# $OpenBSD: Makefile,v 1.20 2011/09/28 09:47:46 jasper Exp $
 
 COMMENT=		wallpapers for GNOME
 
@@ -16,7 +16,5 @@ MODULES=		x11/gnome
 BUILD_DEPENDS=		devel/gettext
 
 USE_LIBTOOL=		No
-CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
-                        LDFLAGS="-L${LOCALBASE}/lib"
 
 .include <bsd.port.mk>
diff --git a/x11/gnome/baker/Makefile b/x11/gnome/baker/Makefile
index bb9aa68f0ee..3f34209a52c 100644
--- a/x11/gnome/baker/Makefile
+++ b/x11/gnome/baker/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.29 2011/09/20 20:52:45 jasper Exp $
+# $OpenBSD: Makefile,v 1.30 2011/09/28 09:47:46 jasper Exp $
 
 COMMENT=		CD/DVD authoring application for GNOME
 
@@ -45,8 +45,6 @@ MODGNOME_DESKTOP_FILE=		Yes
 MODGNOME_TOOLS= 	yelp
 
 CONFIGURE_ARGS+=	--disable-libnotify
-CONFIGURE_ENV+= 	LDFLAGS="-L${LOCALBASE}/lib" \
-			CPPFLAGS="-I${LOCALBASE}/include"
 
 .if ${MACHINE_ARCH:Mamd64}
 # XXX: See FreeBSD ports/130972
diff --git a/x11/gnome/byzanz/Makefile b/x11/gnome/byzanz/Makefile
index fb90fe79970..a7baafe83da 100644
--- a/x11/gnome/byzanz/Makefile
+++ b/x11/gnome/byzanz/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.13 2011/09/28 08:39:50 jasper Exp $
+# $OpenBSD: Makefile,v 1.14 2011/09/28 09:47:46 jasper Exp $
 
 COMMENT=		simple desktop recording tool
 
@@ -35,9 +35,6 @@ LIB_DEPENDS=		x11/gnome/panel>=3.0.0 \
 
 MODGCONF2_SCHEMAS_DIR=	byzanz
 
-CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
-			LDFLAGS="-L${LOCALBASE}/lib"
-
 #
 # Remove this and patch-configure_ac when updating to
 # a real release:
diff --git a/x11/gnome/controlcenter/Makefile b/x11/gnome/controlcenter/Makefile
index 6a4953a385f..f1d52bcd9cb 100644
--- a/x11/gnome/controlcenter/Makefile
+++ b/x11/gnome/controlcenter/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.38 2011/09/27 17:17:37 jasper Exp $
+# $OpenBSD: Makefile,v 1.39 2011/09/28 09:47:46 jasper Exp $
 
 SHARED_ONLY=		Yes
 
@@ -91,8 +91,8 @@ CONFIGURE_ARGS=	--disable-static \
 # Disable libsocialweb support until Flickr integration is fixed upstream.
 CONFIGURE_ARGS+=--without-libsocialweb
 
-CONFIGURE_ENV= 	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
+MODGNOME_CPPFLAGS=	-I${X11BASE}/include
+MODGNOME_LDFLAGS=	-L${X11BASE}/lib
 
 FAKE_FLAGS=	sysconfdir=${PREFIX}/share/examples/gnome-control-center \
 		pkgconfigdir=${PREFIX}/lib/pkgconfig/
diff --git a/x11/gnome/desktop/Makefile b/x11/gnome/desktop/Makefile
index aa4b59c944b..0a63301d688 100644
--- a/x11/gnome/desktop/Makefile
+++ b/x11/gnome/desktop/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.79 2011/09/26 09:31:21 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.80 2011/09/28 09:47:46 jasper Exp $
 
 SHARED_ONLY=		Yes
 
@@ -35,7 +35,4 @@ MODGNOME_TOOLS= 	goi yelp
 
 CONFIGURE_ARGS=		--with-gnome-distributor="OpenBSD Ports"
 
-CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
-			LDFLAGS="-L${LOCALBASE}/lib"
-
 .include <bsd.port.mk>
diff --git a/x11/gnome/devhelp/Makefile b/x11/gnome/devhelp/Makefile
index 64cba20caf5..7f145363c5b 100644
--- a/x11/gnome/devhelp/Makefile
+++ b/x11/gnome/devhelp/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.54 2011/09/28 06:38:14 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.55 2011/09/28 09:47:46 jasper Exp $
 
 COMMENT=	API documentation browser for GNOME
 
@@ -40,7 +40,4 @@ LIB_DEPENDS=	www/webkit,gtk3
 MODGNOME_DESKTOP_FILE=	Yes
 MODGCONF2_SCHEMAS_DIR=	devhelp
 
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
-
 .include <bsd.port.mk>
diff --git a/x11/gnome/doc-utils/Makefile b/x11/gnome/doc-utils/Makefile
index 255bf177a50..fc488871f92 100644
--- a/x11/gnome/doc-utils/Makefile
+++ b/x11/gnome/doc-utils/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.50 2011/09/20 20:52:46 jasper Exp $
+# $OpenBSD: Makefile,v 1.51 2011/09/28 09:47:46 jasper Exp $
 
 # This port does set MODGNOME_TOOLS=yelp on purpose: it would create a
 # dependency on itself. We do not enforce dependency on x11/gnome/yelp
@@ -35,8 +35,7 @@ RUN_DEPENDS=	devel/gettext \
 
 USE_LIBTOOL=	No
 USE_GROFF=	Yes
-CONFIGURE_ENV=	CPPFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+MODGNOME_CPPFLAGS=${CFLAGS}
 
 FAKE_FLAGS+=	pkgconfigdir="${PREFIX}/lib/pkgconfig/"
 
diff --git a/x11/gnome/ekiga/Makefile b/x11/gnome/ekiga/Makefile
index 00386316cdc..94e3fab43f0 100644
--- a/x11/gnome/ekiga/Makefile
+++ b/x11/gnome/ekiga/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.46 2011/09/20 21:10:00 jasper Exp $
+# $OpenBSD: Makefile,v 1.47 2011/09/28 09:47:46 jasper Exp $
 
 BROKEN=		needs an update (GNOME3)
 
@@ -50,8 +50,7 @@ MODGNOME_TOOLS= yelp
 MODGCONF2_SCHEMAS_DIR= ekiga
 USE_GROFF =	Yes
 
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib -pthread"
+MODGNOME_LDFLAGS=-L${X11BASE}/lib -pthread
 CONFIGURE_ARGS=	--enable-avahi \
 		--disable-gnome \
 		--with-ldap-dir=${LOCALBASE} \
diff --git a/x11/gnome/empathy/Makefile b/x11/gnome/empathy/Makefile
index 38a7ab93fb1..e5ca4889f64 100644
--- a/x11/gnome/empathy/Makefile
+++ b/x11/gnome/empathy/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.76 2011/09/20 21:10:00 jasper Exp $
+# $OpenBSD: Makefile,v 1.77 2011/09/28 09:47:46 jasper Exp $
 
 BROKEN=			needs an update (GNOME3)
 
@@ -88,8 +88,6 @@ CONFIGURE_ARGS+=	--enable-spell=Yes \
 # revisit when telepathy-yell is moved out from empathy(?)
 CONFIGURE_ARGS+=	--disable-nautilus-sendto \
 
-CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
-			LDFLAGS="-L${LOCALBASE}/lib"
 USE_GROFF =		Yes
 
 FAKE_FLAGS+=		pkgdatadir=${PREFIX}/share/
diff --git a/x11/gnome/eog-plugins/Makefile b/x11/gnome/eog-plugins/Makefile
index efa73864a4d..4155b9a43cd 100644
--- a/x11/gnome/eog-plugins/Makefile
+++ b/x11/gnome/eog-plugins/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.26 2011/09/27 07:56:18 jasper Exp $
+# $OpenBSD: Makefile,v 1.27 2011/09/28 09:47:46 jasper Exp $
 
 COMMENT=		plugins for EOG
 
@@ -45,7 +45,5 @@ AUTOCONF_VERSION=	2.68
 CONFIGURE_STYLE= 	autoconf
 CONFIGURE_ARGS+=	--enable-python \
 			--with-plugins=${PLUGINS}
-CONFIGURE_ENV+=		CPPFLAGS="-I${LOCALBASE}/include" \
-			LDFLAGS="-L${LOCALBASE}/lib"
 
 .include <bsd.port.mk>
diff --git a/x11/gnome/eog/Makefile b/x11/gnome/eog/Makefile
index d59fa186fd1..8e0d90b0385 100644
--- a/x11/gnome/eog/Makefile
+++ b/x11/gnome/eog/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.71 2011/09/27 07:37:12 jasper Exp $
+# $OpenBSD: Makefile,v 1.72 2011/09/28 09:47:46 jasper Exp $
 
 # Don't forget to check eog-plugins when updating this port!
 
@@ -43,8 +43,6 @@ RUN_DEPENDS=		devel/gsettings-desktop-schemas \
 MODGNOME_TOOLS= 	goi yelp
 MODGNOME_DESKTOP_FILE=	Yes
 
-CONFIGURE_ENV+=		CPPFLAGS="-I${LOCALBASE}/include" \
-			LDFLAGS="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS+=	--with-xmp \
 			--with-libexif
 
diff --git a/x11/gnome/f-spot/Makefile b/x11/gnome/f-spot/Makefile
index 6825cd69bfa..a0fab9f09b3 100644
--- a/x11/gnome/f-spot/Makefile
+++ b/x11/gnome/f-spot/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.50 2011/09/20 21:10:00 jasper Exp $
+# $OpenBSD: Makefile,v 1.51 2011/09/28 09:47:46 jasper Exp $
 
 SHARED_ONLY=		Yes
 
@@ -60,8 +60,6 @@ LIBTOOL_FLAGS=		--tag=disable-static
 
 CONFIGURE_ARGS+=	--enable-shave=no \
 			--disable-static
-CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
-			LDFLAGS="-L${LOCALBASE}/lib"
 
 DLLMAP_FILES=		lib/unique-sharp/unique/unique-sharp.dll.config \
 			lib/gtk-sharp-beans/gtk-sharp-beans.dll.config \
diff --git a/x11/gnome/file-roller/Makefile b/x11/gnome/file-roller/Makefile
index ad90101a5b8..32abe2b1e71 100644
--- a/x11/gnome/file-roller/Makefile
+++ b/x11/gnome/file-roller/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.59 2011/09/26 20:14:45 jasper Exp $
+# $OpenBSD: Makefile,v 1.60 2011/09/28 09:47:46 jasper Exp $
 
 SHARED_ONLY=		Yes
 
@@ -53,7 +53,5 @@ MODGNOME_TOOLS= 	yelp
 MODGNOME_DESKTOP_FILE=		Yes
 
 CONFIGURE_ARGS=		--disable-packagekit
-CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
-			LDFLAGS="-L${LOCALBASE}/lib"
 
 .include <bsd.port.mk>
diff --git a/x11/gnome/games/Makefile b/x11/gnome/games/Makefile
index f1aed66feab..d2402fd35e5 100755
--- a/x11/gnome/games/Makefile
+++ b/x11/gnome/games/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.54 2011/09/20 21:10:00 jasper Exp $
+# $OpenBSD: Makefile,v 1.55 2011/09/28 09:47:46 jasper Exp $
 
 BROKEN= 		update needs fixed clutter/Mesa
 
@@ -64,8 +64,6 @@ CONFIGURE_ARGS+= 	--localstatedir="/var" \
 # lightsoff and swell-foop need seed
 CONFIGURE_ARGS+=	--enable-omitgames=lightsoff,swell-foop
 
-CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
-			LDFLAGS="-L${LOCALBASE}/lib"
 USE_GROFF =		Yes
 
 REGRESS_IS_INTERACTIVE= x11
diff --git a/x11/gnome/gcalctool/Makefile b/x11/gnome/gcalctool/Makefile
index dde72303d3e..9ff3f9eca89 100644
--- a/x11/gnome/gcalctool/Makefile
+++ b/x11/gnome/gcalctool/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.53 2011/09/27 06:28:14 jasper Exp $
+# $OpenBSD: Makefile,v 1.54 2011/09/28 09:47:46 jasper Exp $
 
 COMMENT=		GTK desktop calculator
 
@@ -32,7 +32,4 @@ RUN_DEPENDS=		x11/gnome/gvfs
 MODGNOME_TOOLS= 	yelp
 MODGNOME_DESKTOP_FILE=	Yes
 
-CONFIGURE_ENV+=		CPPFLAGS="-I${LOCALBASE}/include" \
-			LDFLAGS="-L${LOCALBASE}/lib"
-
 .include <bsd.port.mk>
diff --git a/x11/gnome/gdl/Makefile b/x11/gnome/gdl/Makefile
index cbb713c8115..6e6b14773de 100644
--- a/x11/gnome/gdl/Makefile
+++ b/x11/gnome/gdl/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.26 2011/09/20 21:10:00 jasper Exp $
+# $OpenBSD: Makefile,v 1.27 2011/09/28 09:47:46 jasper Exp $
 
 COMMENT=		GNOME Docking Library
 
@@ -32,7 +32,4 @@ LIB_DEPENDS=	textproc/libxml \
 
 MODGNOME_TOOLS= goi
 
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
-
 .include <bsd.port.mk>
diff --git a/x11/gnome/gdl1/Makefile b/x11/gnome/gdl1/Makefile
index a10c40f4a2f..79da27bccb7 100644
--- a/x11/gnome/gdl1/Makefile
+++ b/x11/gnome/gdl1/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 2011/09/16 12:29:13 espie Exp $
+# $OpenBSD: Makefile,v 1.3 2011/09/28 09:47:46 jasper Exp $
 
 COMMENT=	GNOME 2 Docking Library
 
@@ -32,7 +32,4 @@ MODULES=	devel/gettext \
 LIB_DEPENDS=	textproc/libxml \
 		x11/gtk+2
 
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
-
 .include <bsd.port.mk>
diff --git a/x11/gnome/gdm/Makefile b/x11/gnome/gdm/Makefile
index b97aa0813ea..26b00d34a57 100644
--- a/x11/gnome/gdm/Makefile
+++ b/x11/gnome/gdm/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.108 2011/09/20 21:10:00 jasper Exp $
+# $OpenBSD: Makefile,v 1.109 2011/09/28 09:47:46 jasper Exp $
 
 BROKEN=			greeter doesn't start; port to bsd_auth(3)
 
@@ -51,8 +51,8 @@ MODGCONF2_SCHEMAS_DIR=	gdm
 USE_LIBTOOL=		Yes
 MODGNOME_TOOLS= 	yelp
 
-CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include -DHAS_SA_LEN" \
-			LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
+MODGNOME_CPPFLAGS=	-I${X11BASE}/include -DHAS_SA_LEN
+MODGNOME_LDFLAGS=	-L${X11BASE}/lib
 
 CONFIGURE_ARGS=		--localstatedir=/var \
 			--mandir=${PREFIX}/man \
diff --git a/x11/gnome/gedit-plugins/Makefile b/x11/gnome/gedit-plugins/Makefile
index 1cfee8e198a..e86c18ea2cd 100644
--- a/x11/gnome/gedit-plugins/Makefile
+++ b/x11/gnome/gedit-plugins/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.43 2011/09/26 20:37:55 jasper Exp $
+# $OpenBSD: Makefile,v 1.44 2011/09/28 09:47:46 jasper Exp $
 
 COMMENT=		plugins for Gedit
 
@@ -40,7 +40,5 @@ RUN_DEPENDS=		devel/gsettings-desktop-schemas \
 LIBTOOL_FLAGS=		--tag=disable-static
 
 CONFIGURE_ARGS+=	--with-plugins=all
-CONFIGURE_ENV+=		CPPFLAGS="-I${LOCALBASE}/include" \
-			LDFLAGS="-L${LOCALBASE}/lib"
 
 .include <bsd.port.mk>
diff --git a/x11/gnome/gedit/Makefile b/x11/gnome/gedit/Makefile
index 7ce2d78c591..34f9da6e54a 100644
--- a/x11/gnome/gedit/Makefile
+++ b/x11/gnome/gedit/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.71 2011/09/26 20:37:48 jasper Exp $
+# $OpenBSD: Makefile,v 1.72 2011/09/28 09:47:46 jasper Exp $
 
 SHARED_ONLY=		Yes
 
@@ -47,8 +47,6 @@ LIBTOOL_FLAGS=		--tag=disable-static
 CONFIGURE_ARGS=		--enable-python \
 			--disable-updater \
 			--enable-gvfs-metadata
-CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
-			LDFLAGS="-L${LOCALBASE}/lib"
 USE_GROFF =		Yes
 
 .include <bsd.port.mk>
diff --git a/x11/gnome/genius/Makefile b/x11/gnome/genius/Makefile
index 328ba93d602..287b6d22b00 100644
--- a/x11/gnome/genius/Makefile
+++ b/x11/gnome/genius/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.30 2011/09/26 14:34:52 jasper Exp $
+# $OpenBSD: Makefile,v 1.31 2011/09/28 09:47:46 jasper Exp $
 
 SHARED_ONLY=	Yes
 
@@ -42,8 +42,7 @@ LIB_DEPENDS=	x11/gtksourceview \
 MODGNOME_TOOLS= yelp
 MODGNOME_DESKTOP_FILE=	Yes
 
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib -lgmp"
+MODGNOME_LDFLAGS=	-L${X11BASE}/lib -lgmp
 CONFIGURE_ARGS=	--disable-update-mimedb \
 		--disable-extra-gcc-optimization
 
diff --git a/x11/gnome/ghex/Makefile b/x11/gnome/ghex/Makefile
index d29c69c8ca0..ef4521c19c2 100644
--- a/x11/gnome/ghex/Makefile
+++ b/x11/gnome/ghex/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.34 2011/09/26 18:09:43 jasper Exp $
+# $OpenBSD: Makefile,v 1.35 2011/09/28 09:47:46 jasper Exp $
 
 SHARED_ONLY=		Yes
 
@@ -34,7 +34,4 @@ LIB_DEPENDS=		x11/gtk+3
 MODGNOME_TOOLS= 	yelp
 MODGNOME_DESKTOP_FILE=		Yes
 
-CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
-			LDFLAGS="-L${LOCALBASE}/lib"
-
 .include <bsd.port.mk>
diff --git a/x11/gnome/gjs/Makefile b/x11/gnome/gjs/Makefile
index 887034e528f..626c18822e1 100644
--- a/x11/gnome/gjs/Makefile
+++ b/x11/gnome/gjs/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.7 2011/09/27 17:39:28 jasper Exp $
+# $OpenBSD: Makefile,v 1.8 2011/09/28 09:47:47 jasper Exp $
 
 COMMENT=		Javascript bindings for GNOME
 
@@ -45,8 +45,6 @@ LIB_DEPENDS=		devel/gobject-introspection>=1.30.0 \
 REGRESS_DEPENDS=	sysutils/e2fsprogs
 
 CONFIGURE_ARGS+=	--with-js-package="mozilla-js"
-CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
-			LDFLAGS="-L${LOCALBASE}/lib"
 
 pre-configure:
 	@perl -pi -e 's,%%LOCALBASE%%,${LOCALBASE},' ${WRKSRC}/configure
diff --git a/x11/gnome/gnote/Makefile b/x11/gnome/gnote/Makefile
index d6cda119c8c..cbf839056e8 100644
--- a/x11/gnome/gnote/Makefile
+++ b/x11/gnome/gnote/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.16 2011/09/25 21:15:20 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.17 2011/09/28 09:47:47 jasper Exp $
 
 SHARED_ONLY=		Yes
 
@@ -44,7 +44,5 @@ MODGNOME_DESKTOP_FILE=	Yes
 LIBTOOL_FLAGS+= 	--tag=disable-static
 
 CONFIGURE_ARGS+=	--disable-static
-CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
-			LDFLAGS="-L${LOCALBASE}/lib"
 
 .include <bsd.port.mk>
diff --git a/x11/gnome/gucharmap/Makefile b/x11/gnome/gucharmap/Makefile
index 0da902fcdd5..86e56a04c60 100644
--- a/x11/gnome/gucharmap/Makefile
+++ b/x11/gnome/gucharmap/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.55 2011/09/26 13:37:17 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.56 2011/09/28 09:47:47 jasper Exp $
 
 SHARED_ONLY=		Yes
 
@@ -39,7 +39,6 @@ MODGCONF2_SCHEMAS_DIR=	gucharmap
 
 LIB_DEPENDS+=		x11/gtk+3,-main
 
-CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
-			LDFLAGS="-L${LOCALBASE}/lib"
+MODGNOME_CPPFLAGS=	-I${X11BASE}/include
 
 .include <bsd.port.mk>
diff --git a/x11/gnome/gvfs/Makefile b/x11/gnome/gvfs/Makefile
index 9ca0e327210..daa7883c407 100644
--- a/x11/gnome/gvfs/Makefile
+++ b/x11/gnome/gvfs/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.59 2011/09/26 14:32:35 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.60 2011/09/28 09:47:47 jasper Exp $
 
 COMMENT-main=	GNOME virtual file system
 COMMENT-smb=	samba module for GVFS
@@ -67,8 +67,6 @@ CONFIGURE_ARGS=	--disable-cdda \
 		--enable-http \
 		--enable-keyring \
 		--with-bash-completion-dir="${PREFIX}/share/gvfs"
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
 
 MULTI_PACKAGES=		-main
 PSEUDO_FLAVORS=		no_smb
diff --git a/x11/gnome/icon-theme/Makefile b/x11/gnome/icon-theme/Makefile
index 4e19efc8791..b0f0825c16d 100644
--- a/x11/gnome/icon-theme/Makefile
+++ b/x11/gnome/icon-theme/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.43 2011/09/27 13:02:00 jasper Exp $
+# $OpenBSD: Makefile,v 1.44 2011/09/28 09:47:47 jasper Exp $
 
 COMMENT=	base icon theme for GNOME
 
@@ -30,8 +30,6 @@ RUN_DEPENDS +=	x11/gtk+2 \
 PKG_ARCH=	*
 
 USE_LIBTOOL=	No
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS=	--enable-icon-mapping \
 		--disable-nls
 
diff --git a/x11/gnome/js-common/Makefile b/x11/gnome/js-common/Makefile
index 028f4bfd0f1..94c7d802770 100644
--- a/x11/gnome/js-common/Makefile
+++ b/x11/gnome/js-common/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 2011/09/12 12:04:17 jasper Exp $
+# $OpenBSD: Makefile,v 1.3 2011/09/28 09:47:47 jasper Exp $
 
 COMMENT=		shared JavaScript files for GNOME
 
@@ -16,9 +16,6 @@ EXTRACT_SUFX=		.tar.bz2
 MODULES=		devel/gettext \
 			x11/gnome
 
-CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
-			LDFLAGS="-L${LOCALBASE}/lib"
-
 FAKE_FLAGS+=		gnome_js_commondoc_DATA=""
 
 .include <bsd.port.mk>
diff --git a/x11/gnome/keyring/Makefile b/x11/gnome/keyring/Makefile
index bd0577ad196..6daba45f81e 100644
--- a/x11/gnome/keyring/Makefile
+++ b/x11/gnome/keyring/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.64 2011/09/26 06:25:20 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.65 2011/09/28 09:47:47 jasper Exp $
 
 COMMENT=	password agent for the GNOME project
 
@@ -43,8 +43,6 @@ CONFIGURE_ARGS=	--with-root-certs=/etc/ssl \
 		--disable-selinux \
 		--disable-tests \
 		--without-libcap-ng
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
 
 FAKE_FLAGS=	configdir=${PREFIX}/share/examples/gnome-keyring/pkcs11/modules
 
diff --git a/x11/gnome/krb5-auth-dialog/Makefile b/x11/gnome/krb5-auth-dialog/Makefile
index 913a261f4b1..8168966e479 100644
--- a/x11/gnome/krb5-auth-dialog/Makefile
+++ b/x11/gnome/krb5-auth-dialog/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.24 2011/09/28 06:39:07 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.25 2011/09/28 09:47:47 jasper Exp $
 
 SHARED_ONLY=	Yes
 
@@ -41,9 +41,7 @@ MODGNOME_DESKTOP_FILE=	Yes
 FAKE_FLAGS=	autostartdir=${PREFIX}/share/examples/krb5-auth-dialog/xdg/autostart \
 		smallicondir=${PREFIX}/share/icons/hicolor/22x22/apps
 
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib" \
-		KRB5_CFLAGS="-I/usr/include/kerberosV" \
+CONFIGURE_ENV=	KRB5_CFLAGS="-I/usr/include/kerberosV" \
 		KRB5_LIBS="-lgssapi -lkrb5 -lasn1 -lcrypto"
 CONFIGURE_ARGS=	--disable-static \
 		--with-gtk=3.0 \
diff --git a/x11/gnome/libbonobo/Makefile b/x11/gnome/libbonobo/Makefile
index a90a3ada3b5..c1ea241b466 100644
--- a/x11/gnome/libbonobo/Makefile
+++ b/x11/gnome/libbonobo/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.52 2011/09/20 21:10:00 jasper Exp $
+# $OpenBSD: Makefile,v 1.53 2011/09/28 09:47:47 jasper Exp $
 
 COMMENT=	GNOME component and compound document system
 
@@ -37,9 +37,6 @@ USE_GROFF =	Yes
 # from some libbonobo header and might still be used inside libbonobo
 RUN_DEPENDS=   devel/popt
 
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
-
 FAKE_FLAGS=	sysconfdir=${PREFIX}/share/examples/libbonobo
 
 pre-configure:
diff --git a/x11/gnome/libbonoboui/Makefile b/x11/gnome/libbonoboui/Makefile
index a21c8dac070..4665eb14e7f 100644
--- a/x11/gnome/libbonoboui/Makefile
+++ b/x11/gnome/libbonoboui/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.53 2011/09/20 22:54:25 jasper Exp $
+# $OpenBSD: Makefile,v 1.54 2011/09/28 09:47:47 jasper Exp $
 
 COMMENT=	user interface components for bonobo
 
@@ -34,8 +34,6 @@ LIB_DEPENDS=	devel/popt \
 		x11/gnome/libgnomecanvas
 
 MODGNOME_DESKTOP_FILE=	Yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
 
 REGRESS_IS_INTERACTIVE= x11
 
diff --git a/x11/gnome/libcryptui/Makefile b/x11/gnome/libcryptui/Makefile
index ba6453a115a..a98c3ded656 100644
--- a/x11/gnome/libcryptui/Makefile
+++ b/x11/gnome/libcryptui/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.5 2011/09/24 11:42:20 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.6 2011/09/28 09:47:47 jasper Exp $
 
 COMMENT=	interface components for OpenPGP
 
@@ -38,9 +38,6 @@ MODULES=	devel/gettext \
 
 MODGNOME_TOOLS=goi
 
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
-
 CONFIGURE_ARGS=	--disable-update-mime-database
 
 .include <bsd.port.mk>
diff --git a/x11/gnome/libgda/Makefile b/x11/gnome/libgda/Makefile
index 0ba23fabaa7..8fad07f8205 100644
--- a/x11/gnome/libgda/Makefile
+++ b/x11/gnome/libgda/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.48 2011/09/20 21:10:00 jasper Exp $
+# $OpenBSD: Makefile,v 1.49 2011/09/28 09:47:47 jasper Exp $
 
 SHARED_ONLY=		Yes
 
@@ -82,9 +82,9 @@ CONFIGURE_ARGS+=	--disable-static \
 			--without-oracle \
 			--without-mdb \
 			--with-java=no
-CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/db4/" \
-			LDFLAGS="-L${LOCALBASE}/lib -lm" \
-			LIBCRYPTO_CFLAGS="-I/usr/include/ssl" \
+MODGNOME_CPPFLAGS=	-I${LOCALBASE}/include/db4/
+MODGNOME_LDFLAGS=	-lm
+CONFIGURE_ENV=		LIBCRYPTO_CFLAGS="-I/usr/include/ssl" \
 			LIBCRYPTO_LIBS="-lcrypto" \
 			MYSQL_CONFIG="${LOCALBASE}/bin/mysql_config"
 
diff --git a/x11/gnome/libgdamm/Makefile b/x11/gnome/libgdamm/Makefile
index 812485acb0e..3328eff91c5 100644
--- a/x11/gnome/libgdamm/Makefile
+++ b/x11/gnome/libgdamm/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.17 2011/09/20 22:54:25 jasper Exp $
+# $OpenBSD: Makefile,v 1.18 2011/09/28 09:47:47 jasper Exp $
 
 SHARED_ONLY=		Yes
 
@@ -39,9 +39,7 @@ BUILD_DEPENDS=		archivers/gtar \
 LIB_DEPENDS=		devel/glib2mm \
 			x11/gnome/libgda>=4.99.4
 
-CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
-			LDFLAGS="-L${LOCALBASE}/lib" \
-			ac_cv_path_DOT= \
+CONFIGURE_ENV=		ac_cv_path_DOT= \
 			ac_cv_path_XSLTPROC= \
 			ac_cv_path_DOXYGEN=
 
diff --git a/x11/gnome/libgnome-keyring/Makefile b/x11/gnome/libgnome-keyring/Makefile
index e6e8f902261..b0304027793 100644
--- a/x11/gnome/libgnome-keyring/Makefile
+++ b/x11/gnome/libgnome-keyring/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.14 2011/09/25 17:32:49 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.15 2011/09/28 09:47:47 jasper Exp $
 
 COMMENT=	library for gnome keyring integration
 
@@ -22,7 +22,4 @@ LIB_DEPENDS=	security/libgcrypt \
 		x11/dbus \
 		devel/glib2
 
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
-
 .include <bsd.port.mk>
diff --git a/x11/gnome/libgnome-media-profiles/Makefile b/x11/gnome/libgnome-media-profiles/Makefile
index de45a9006df..46e7724dfbc 100644
--- a/x11/gnome/libgnome-media-profiles/Makefile
+++ b/x11/gnome/libgnome-media-profiles/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.6 2011/09/20 21:10:00 jasper Exp $
+# $OpenBSD: Makefile,v 1.7 2011/09/28 09:47:47 jasper Exp $
 
 COMMENT=	media profiles management library
 
@@ -37,7 +37,4 @@ MODGNOME_TOOLS= yelp
 LIB_DEPENDS=	x11/gtk+3 \
 		multimedia/gstreamer-0.10/core
 
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
-
 .include <bsd.port.mk>
diff --git a/x11/gnome/libgnome/Makefile b/x11/gnome/libgnome/Makefile
index a98a9565020..fe272e928ab 100644
--- a/x11/gnome/libgnome/Makefile
+++ b/x11/gnome/libgnome/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.49 2011/09/20 21:10:00 jasper Exp $
+# $OpenBSD: Makefile,v 1.50 2011/09/28 09:47:47 jasper Exp $
 
 COMMENT=	libraries for the GNOME project
 
@@ -36,8 +36,6 @@ USE_GROFF =	Yes
 MODGCONF2_SCHEMAS_DIR= libgnome
 
 CONFIGURE_ARGS+= --disable-esd
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
 
 FAKE_FLAGS=	sysconfdir=${PREFIX}/share/examples/libgnome/
 
diff --git a/x11/gnome/libgnomecanvas/Makefile b/x11/gnome/libgnomecanvas/Makefile
index 9fc9c128af3..9f1ca4cb48f 100644
--- a/x11/gnome/libgnomecanvas/Makefile
+++ b/x11/gnome/libgnomecanvas/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.50 2011/09/20 21:10:00 jasper Exp $
+# $OpenBSD: Makefile,v 1.51 2011/09/28 09:47:47 jasper Exp $
 
 SHARED_ONLY=	Yes
 
@@ -34,8 +34,7 @@ LIB_DEPENDS=	devel/libglade2 \
 		graphics/libart
 
 CONFIGURE_ARGS=	--enable-glade
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
+MODGNOME_LDFLAGS=-L${X11BASE}/lib
 
 REGRESS_IS_INTERACTIVE= x11
 
diff --git a/x11/gnome/libgnomekbd/Makefile b/x11/gnome/libgnomekbd/Makefile
index 1fd29d8e635..54471e1425d 100644
--- a/x11/gnome/libgnomekbd/Makefile
+++ b/x11/gnome/libgnomekbd/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.40 2011/09/27 23:24:56 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.41 2011/09/28 09:47:47 jasper Exp $
 
 SHARED_ONLY=	Yes
 
@@ -37,7 +37,6 @@ LIB_DEPENDS=	x11/gnome/libxklavier \
 
 MODGNOME_DESKTOP_FILE=	Yes
 
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+MODGNOME_CPPFLAGS=	-I${X11BASE}/include
 
 .include <bsd.port.mk>
diff --git a/x11/gnome/libgnomeui/Makefile b/x11/gnome/libgnomeui/Makefile
index 4213cbcd9e8..10fa487ebe2 100644
--- a/x11/gnome/libgnomeui/Makefile
+++ b/x11/gnome/libgnomeui/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.53 2011/09/20 21:10:00 jasper Exp $
+# $OpenBSD: Makefile,v 1.54 2011/09/28 09:47:47 jasper Exp $
 
 COMMENT=		user interface components for GNOME
 
@@ -36,7 +36,6 @@ LIB_DEPENDS=	x11/gnome/libgnome-keyring \
 		x11/gnome/libgnomecanvas \
 		x11/gnome/libbonoboui
 
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
+MODGNOME_LDFLAGS=	-L${X11BASE}/lib
 
 .include <bsd.port.mk>
diff --git a/x11/gnome/libgweather/Makefile b/x11/gnome/libgweather/Makefile
index 43b9c20287e..e7bf29ccf78 100755
--- a/x11/gnome/libgweather/Makefile
+++ b/x11/gnome/libgweather/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.28 2011/09/26 10:52:31 jasper Exp $
+# $OpenBSD: Makefile,v 1.29 2011/09/28 09:47:47 jasper Exp $
 
 SHARED_ONLY=		Yes
 
@@ -38,7 +38,5 @@ WANTLIB += sqlite3 xcb xcb-render xcb-shm xml2 z
 MODGCONF2_SCHEMAS_DIR=	libgweather
 
 CONFIGURE_ARGS+=	--with-zoneinfo-dir="/usr/share/zoneinfo"
-CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
-			LDFLAGS="-L${LOCALBASE}/lib"
 
 .include <bsd.port.mk>
diff --git a/x11/gnome/librsvg/Makefile b/x11/gnome/librsvg/Makefile
index 40132b1f495..c5a96ca43c4 100644
--- a/x11/gnome/librsvg/Makefile
+++ b/x11/gnome/librsvg/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.69 2011/09/20 21:10:00 jasper Exp $
+# $OpenBSD: Makefile,v 1.70 2011/09/28 09:47:47 jasper Exp $
 
 COMMENT=	SAX-based render library for SVG files
 
@@ -29,8 +29,6 @@ LIB_DEPENDS=	graphics/gdk-pixbuf2 \
 		devel/pango \
 		www/libcroco
 
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS=	--disable-gtk-theme \
 		--with-svgz \
 		--with-croco
diff --git a/x11/gnome/libxklavier/Makefile b/x11/gnome/libxklavier/Makefile
index c8044292386..f0d80e2e3bb 100644
--- a/x11/gnome/libxklavier/Makefile
+++ b/x11/gnome/libxklavier/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.35 2011/09/20 21:10:00 jasper Exp $
+# $OpenBSD: Makefile,v 1.36 2011/09/28 09:47:47 jasper Exp $
 
 COMMENT=		utility library for XKB
 
@@ -33,7 +33,6 @@ LIB_DEPENDS=		devel/glib2 \
 CONFIGURE_ARGS+=	--with-xkb-base="${X11BASE}/share/X11/xkb/" \
 			--with-xkb-bin-base="${X11BASE}/bin/" \
 			--with-xmodmap-base="/usr/share/xmodmap"
-CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
-			LDFLAGS="-L${LOCALBASE}/lib"
+MODGNOME_CPPFLAGS=	-I${X11BASE}/include
 
 .include <bsd.port.mk>
diff --git a/x11/gnome/media/Makefile b/x11/gnome/media/Makefile
index ea3d2cb7411..ab4ae2a02f1 100644
--- a/x11/gnome/media/Makefile
+++ b/x11/gnome/media/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.54 2011/09/25 12:42:46 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.55 2011/09/28 09:47:47 jasper Exp $
 
 # gnome-volume-control needs pulseaudio.
 
@@ -39,9 +39,6 @@ LIB_DEPENDS=	multimedia/gstreamer-0.10/plugins-base \
 MODGNOME_TOOLS= yelp
 MODGNOME_DESKTOP_FILE=		Yes
 
-CONFIGURE_ENV=  CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
-
 # XXX recording doesn't work and "Device" appears as "Unsupported" in
 # `gstreamer-properties' (needs pulseaudio); when this is fixed,
 # libgnome-media-profiles should be a LIB_DEPENDS
diff --git a/x11/gnome/menus/Makefile b/x11/gnome/menus/Makefile
index 5ecf9cf64ad..1c09047c88a 100644
--- a/x11/gnome/menus/Makefile
+++ b/x11/gnome/menus/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.54 2011/09/28 08:21:01 jasper Exp $
+# $OpenBSD: Makefile,v 1.55 2011/09/28 09:47:47 jasper Exp $
 
 SHARED_ONLY=		Yes
 
@@ -28,8 +28,6 @@ RUN_DEPENDS=		devel/gobject-introspection
 LIB_DEPENDS=		devel/glib2
 
 MODGNOME_TOOLS= 	goi
-CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
-			LDFLAGS="-L${LOCALBASE}/lib"
 
 pre-configure:
 	${SUBST_CMD} ${WRKSRC}/layout/applications.menu
diff --git a/x11/gnome/metacity/Makefile b/x11/gnome/metacity/Makefile
index bae5499070b..dfd3bb0370f 100644
--- a/x11/gnome/metacity/Makefile
+++ b/x11/gnome/metacity/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.70 2011/09/20 22:54:25 jasper Exp $
+# $OpenBSD: Makefile,v 1.71 2011/09/28 09:47:47 jasper Exp $
 
 SHARED_ONLY=	Yes
 
@@ -45,8 +45,7 @@ SEPARATE_BUILD=	concurrent
 MODGNOME_DESKTOP_FILE=	Yes
 MODGCONF2_SCHEMAS_DIR= metacity
 
-CONFIGURE_ENV=  CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
+MODGNOME_CPPFLAGS=	-I${X11BASE}/include
 USE_GROFF =	Yes
 
 post-install:
diff --git a/x11/gnome/mime-data/Makefile b/x11/gnome/mime-data/Makefile
index 29d2e96b664..f158589e42e 100644
--- a/x11/gnome/mime-data/Makefile
+++ b/x11/gnome/mime-data/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.29 2011/09/12 12:04:17 jasper Exp $
+# $OpenBSD: Makefile,v 1.30 2011/09/28 09:47:47 jasper Exp $
 
 COMMENT=		MIME and application database for GNOME
 
@@ -19,8 +19,6 @@ MODULES=		x11/gnome
 
 USE_LIBTOOL=		No
 CONFIGURE_STYLE= 	gnu old
-CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
-			LDFLAGS="-L${LOCALBASE}/lib"
 
 FAKE_FLAGS=		pkgconfigdir=${PREFIX}/lib/pkgconfig/ \
 			sysconfdir=${PREFIX}/share/examples/gnome-mime-data/
diff --git a/x11/gnome/moserial/Makefile b/x11/gnome/moserial/Makefile
index 591ecd3446b..83cc31c574f 100644
--- a/x11/gnome/moserial/Makefile
+++ b/x11/gnome/moserial/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.7 2011/09/20 20:52:46 jasper Exp $
+# $OpenBSD: Makefile,v 1.8 2011/09/28 09:47:47 jasper Exp $
 
 COMMENT=		serial terminal for GNOME
 
@@ -30,7 +30,4 @@ LIB_DEPENDS=		x11/gtk+3
 MODGNOME_DESKTOP_FILE=		Yes
 MODGNOME_TOOLS= 	yelp
 
-CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include " \
-			LDFLAGS="-L${LOCALBASE}/lib"
-
 .include <bsd.port.mk>
diff --git a/x11/gnome/mousetweaks/Makefile b/x11/gnome/mousetweaks/Makefile
index b3e22588651..69198298f1c 100644
--- a/x11/gnome/mousetweaks/Makefile
+++ b/x11/gnome/mousetweaks/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.37 2011/09/26 16:23:37 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.38 2011/09/28 09:47:47 jasper Exp $
 
 COMMENT=	mouse accessibility enhancements for GNOME
 
@@ -32,7 +32,4 @@ LIB_DEPENDS=	x11/gtk+3
 
 MODGNOME_TOOLS= yelp
 
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
-
 .include <bsd.port.mk>
diff --git a/x11/gnome/nautilus-open-terminal/Makefile b/x11/gnome/nautilus-open-terminal/Makefile
index 65a518fb69f..dc20f493b7e 100644
--- a/x11/gnome/nautilus-open-terminal/Makefile
+++ b/x11/gnome/nautilus-open-terminal/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.21 2011/09/26 08:06:35 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.22 2011/09/28 09:47:47 jasper Exp $
 
 # dlopen() module
 SHARED_ONLY=	Yes
@@ -38,7 +38,5 @@ MODGCONF2_SCHEMAS_DIR= nautilus-open-terminal
 LIBTOOL_FLAGS=	--tag=disable-static
 
 CONFIGURE_ARGS=	--disable-static
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
 
 .include <bsd.port.mk>
diff --git a/x11/gnome/nautilus-sendto/Makefile b/x11/gnome/nautilus-sendto/Makefile
index 639e81d2cc6..3d50faf6d70 100644
--- a/x11/gnome/nautilus-sendto/Makefile
+++ b/x11/gnome/nautilus-sendto/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.35 2011/09/26 10:57:47 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.36 2011/09/28 09:47:47 jasper Exp $
 
 SHARED_ONLY=	Yes
 
@@ -46,9 +46,6 @@ LIBTOOL_FLAGS=	--tag=disable-static
 # allowed_plugins="evolution gajim nautilus-burn pidgin removable-devices upnp"
 CONFIGURE_ARGS+= --with-plugins="evolution gajim pidgin removable-devices upnp"
 
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
-
 FAKE_FLAGS=	schemadir=${PREFIX}/share/schemas/nautilus-sendto
 
 # Remove these files as they are provided by nautilus itself now.
diff --git a/x11/gnome/nautilus/Makefile b/x11/gnome/nautilus/Makefile
index 8adf4d6af6d..d27212bbd3e 100644
--- a/x11/gnome/nautilus/Makefile
+++ b/x11/gnome/nautilus/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.96 2011/09/26 14:46:36 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.97 2011/09/28 09:47:47 jasper Exp $
 
 COMMENT=		GNOME file manager
 
@@ -72,8 +72,8 @@ CONFIGURE_ARGS+= 	--disable-update-mimedb \
 # results from paths not indexed by tracker
 CONFIGURE_ARGS +=	--disable-tracker
 
-CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
-			LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
+MODGNOME_CPPFLAGS=	-I${X11BASE}/include
+MODGNOME_LDFLAGS=	-L${X11BASE}/lib
 
 FAKE_FLAGS=		sysconfdir=${PREFIX}/share/examples/nautilus
 
diff --git a/x11/gnome/nettool/Makefile b/x11/gnome/nettool/Makefile
index 955135af83c..238aa1e1724 100644
--- a/x11/gnome/nettool/Makefile
+++ b/x11/gnome/nettool/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.16 2011/09/20 21:10:01 jasper Exp $
+# $OpenBSD: Makefile,v 1.17 2011/09/28 09:47:47 jasper Exp $
 
 COMMENT=	GNOME interface for various networking tools
 
@@ -36,7 +36,4 @@ RUN_DEPENDS=	devel/gsettings-desktop-schemas
 MODGNOME_TOOLS= yelp
 MODGNOME_DESKTOP_FILE=		Yes
 
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
-
 .include <bsd.port.mk>
diff --git a/x11/gnome/online-accounts/Makefile b/x11/gnome/online-accounts/Makefile
index 3d69cecac5c..cb9a768cb9d 100644
--- a/x11/gnome/online-accounts/Makefile
+++ b/x11/gnome/online-accounts/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.7 2011/09/28 06:17:41 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.8 2011/09/28 09:47:47 jasper Exp $
 
 COMMENT=		interfaces for interacting with online accounts
 
@@ -43,7 +43,5 @@ MODGNOME_TOOLS= 	goi
 USE_LIBTOOL=		gnu
 
 CONFIGURE_ARGS=		--localstatedir=/var
-CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
-			LDFLAGS="-L${LOCALBASE}/lib"
 
 .include <bsd.port.mk>
diff --git a/x11/gnome/orca/Makefile b/x11/gnome/orca/Makefile
index c3ba04f5447..fc938f94b05 100644
--- a/x11/gnome/orca/Makefile
+++ b/x11/gnome/orca/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.34 2011/09/27 16:03:56 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.35 2011/09/28 09:47:47 jasper Exp $
 
 COMMENT=		assistive screen reader
 
@@ -25,9 +25,7 @@ RUN_DEPENDS=		x11/gnome/py-atspi>=2.2.0 \
 MODGNOME_DESKTOP_FILE=	Yes
 MODGNOME_TOOLS= 	yelp
 
-CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
-			LDFLAGS="-L${LOCALBASE}/lib" \
-			DATADIRNAME=share
+CONFIGURE_ENV=		DATADIRNAME=share
 
 FAKE_FLAGS=		sysconfdir=${PREFIX}/share/examples/orca/
 
diff --git a/x11/gnome/panel/Makefile b/x11/gnome/panel/Makefile
index 9d27446e69f..869aa01b8fb 100644
--- a/x11/gnome/panel/Makefile
+++ b/x11/gnome/panel/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.101 2011/09/26 11:14:36 jasper Exp $
+# $OpenBSD: Makefile,v 1.102 2011/09/28 09:47:47 jasper Exp $
 
 SHARED_ONLY=	Yes
 
@@ -68,8 +68,7 @@ FAKE_FLAGS=	dbus_confdir=${PREFIX}/share/examples/gnome-panel/dbus-1/system.d
 CONFIGURE_ARGS=	--disable-network-manager \
 		--enable-eds \
 		--enable-telepathy-glib
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/libpng" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+MODGNOME_CPPFLAGS=	-I${LOCALBASE}/include/libpng
 
 USE_GROFF =	Yes
 
diff --git a/x11/gnome/planner/Makefile b/x11/gnome/planner/Makefile
index 7d5d8ce6ce1..216b43bab83 100755
--- a/x11/gnome/planner/Makefile
+++ b/x11/gnome/planner/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.46 2011/09/20 21:10:01 jasper Exp $
+# $OpenBSD: Makefile,v 1.47 2011/09/28 09:47:47 jasper Exp $
 
 COMMENT=		project management application
 
@@ -55,8 +55,6 @@ CONFIGURE_ARGS+= 	--disable-update-mimedb \
 			--enable-eds-backend=no \
 			--with-database=no
 
-CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
-			LDFLAGS="-L${LOCALBASE}/lib" \
-			UPDATE_DESKTOP_DATABASE="/usr/bin/false"
+CONFIGURE_ENV=		UPDATE_DESKTOP_DATABASE="/usr/bin/false"
 
 .include <bsd.port.mk>
diff --git a/x11/gnome/power-manager/Makefile b/x11/gnome/power-manager/Makefile
index c3b8de0132c..47f4a47d0df 100644
--- a/x11/gnome/power-manager/Makefile
+++ b/x11/gnome/power-manager/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.11 2011/09/26 16:57:06 jasper Exp $
+# $OpenBSD: Makefile,v 1.12 2011/09/28 09:47:47 jasper Exp $
 
 COMMENT=		GNOME power manager
 
@@ -30,9 +30,9 @@ WANTLIB += stdc++ upower-glib xcb xcb-render xcb-shm z
 LIB_DEPENDS=	sysutils/upower \
 		x11/gtk+3
 
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \
-		ac_cv_path_DOCBOOK2MAN=no \
+MODGNOME_CPPFLAGS=	-I${X11BASE}/include
+MODGNOME_LDFLAGS=	-L${X11BASE}/lib
+CONFIGURE_ENV=	ac_cv_path_DOCBOOK2MAN=no \
 		ac_cv_path_XMLTO=no
 
 .include <bsd.port.mk>
diff --git a/x11/gnome/py-gnome/Makefile b/x11/gnome/py-gnome/Makefile
index ecc03c7a66f..5110d2ead19 100644
--- a/x11/gnome/py-gnome/Makefile
+++ b/x11/gnome/py-gnome/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.39 2011/09/24 07:11:36 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.40 2011/09/28 09:47:47 jasper Exp $
 
 COMMENT=	GNOME Python bindings
 
@@ -44,9 +44,6 @@ RUN_DEPENDS=	x11/py-gtk2>=2.10.3 \
 
 LIBTOOL_FLAGS+=	--tag=disable-static
 
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
-
 pre-configure:
 	@find ${WRKDIST} -name \*.py | \
 		xargs perl -pi -e 's,/usr/bin/env python,${MODPY_BIN},g'
diff --git a/x11/gnome/rygel/Makefile b/x11/gnome/rygel/Makefile
index 85608cc7b92..2e61f1061f7 100644
--- a/x11/gnome/rygel/Makefile
+++ b/x11/gnome/rygel/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 2011/09/27 12:57:07 jasper Exp $
+# $OpenBSD: Makefile,v 1.5 2011/09/28 09:47:47 jasper Exp $
 
 COMMENT=		home media solution that allows easy media sharing
 
@@ -45,8 +45,6 @@ CONFIGURE_ARGS+=	--enable-mpris-plugin \
 			--enable-external-plugin \
 			--disable-mediathek-plugin \
 			--disable-tracker-plugin
-CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
-			LDFLAGS="-L${LOCALBASE}/lib"
 
 FAKE_FLAGS+=		sysconfdir=${PREFIX}/share/examples/rygel/
 
diff --git a/x11/gnome/screensaver/Makefile b/x11/gnome/screensaver/Makefile
index 98e9c22b114..f8ee1a0ec02 100644
--- a/x11/gnome/screensaver/Makefile
+++ b/x11/gnome/screensaver/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.37 2011/09/28 09:30:56 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.38 2011/09/28 09:47:47 jasper Exp $
 
 COMMENT=	screen saver and locker for GNOME
 
@@ -39,8 +39,6 @@ AUTOCONF_VERSION= 2.68
 AUTOMAKE_VERSION= 1.11
 
 CONFIGURE_STYLE= autoconf
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS=	--localstatedir=/var \
 		--enable-docbook-docs \
 		--enable-locking \
diff --git a/x11/gnome/seahorse-plugins/Makefile b/x11/gnome/seahorse-plugins/Makefile
index 2e04657079f..bc119eecd49 100644
--- a/x11/gnome/seahorse-plugins/Makefile
+++ b/x11/gnome/seahorse-plugins/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.34 2011/09/26 08:05:46 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.35 2011/09/28 09:47:47 jasper Exp $
 
 SHARED_ONLY=	Yes
 
@@ -56,8 +56,6 @@ CONFIGURE_ARGS=	--disable-static \
 		--disable-cpp-rtti \
 		--disable-applet \
 		--with-gtk=3.0
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
 
 # the plugin needs a gecko epiphany, ours uses webkit
 CONFIGURE_ARGS+= --disable-epiphany
diff --git a/x11/gnome/seahorse-sharing/Makefile b/x11/gnome/seahorse-sharing/Makefile
index b3299d4402d..d5bd95ea19d 100644
--- a/x11/gnome/seahorse-sharing/Makefile
+++ b/x11/gnome/seahorse-sharing/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2011/09/26 09:39:31 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.2 2011/09/28 09:47:47 jasper Exp $
 
 COMMENT=	PGP public keys sharing via DNS-SD and HKP
 
@@ -36,9 +36,6 @@ RUN_DEPENDS +=	x11/gnome/seahorse
 MODULES=	devel/gettext \
 		x11/gnome
 
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
-
 FAKE_FLAGS=	sysconfdir=${PREFIX}/share/examples/seahorse-sharing
 
 # XXX check if still needed on next update
diff --git a/x11/gnome/seahorse/Makefile b/x11/gnome/seahorse/Makefile
index 223ac97948e..ba8aab352f2 100644
--- a/x11/gnome/seahorse/Makefile
+++ b/x11/gnome/seahorse/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.61 2011/09/26 07:15:47 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.62 2011/09/28 09:47:47 jasper Exp $
 
 COMMENT=		GNOME encryption interface
 
@@ -41,9 +41,6 @@ MODULES=		devel/gettext \
 MODGNOME_TOOLS= 	yelp
 MODGNOME_DESKTOP_FILE=	Yes
 
-CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
-			LDFLAGS="-L${LOCALBASE}/lib"
-
 CONFIGURE_ARGS=		--enable-hkp \
 			--enable-ldap \
 			--enable-pkcs11 \
diff --git a/x11/gnome/seed/Makefile b/x11/gnome/seed/Makefile
index 8fa09d705ac..6a789445f53 100644
--- a/x11/gnome/seed/Makefile
+++ b/x11/gnome/seed/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.11 2011/09/22 08:03:12 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.12 2011/09/28 09:47:47 jasper Exp $
 
 COMMENT=		GObject JavaScriptCore bridge
 
@@ -50,8 +50,6 @@ CONFIGURE_ARGS+=	--enable-readline-module \
 			--enable-cairo-module \
 			--enable-gettext-module \
 			--enable-mpfr-module
-CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
-			LDFLAGS="-L${LOCALBASE}/lib"
 
 REGRESS_IS_INTERACTIVE= x11
 REGRESS_DEPENDS=	${BASE_PKGPATH}
diff --git a/x11/gnome/session/Makefile b/x11/gnome/session/Makefile
index 478d0e3c27f..0b1ab5ac782 100644
--- a/x11/gnome/session/Makefile
+++ b/x11/gnome/session/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.186 2011/09/27 10:27:46 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.187 2011/09/28 09:47:47 jasper Exp $
 
 COMMENT=		GNOME session
 
@@ -75,7 +75,5 @@ MODGNOME_DESKTOP_FILE=		Yes
 
 CONFIGURE_ARGS=	--disable-rebuilds \
 		--enable-docbook-docs
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
 
 .include <bsd.port.mk>
diff --git a/x11/gnome/settings-daemon/Makefile b/x11/gnome/settings-daemon/Makefile
index b8698efa248..22cc2309a21 100755
--- a/x11/gnome/settings-daemon/Makefile
+++ b/x11/gnome/settings-daemon/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.56 2011/09/28 08:39:50 jasper Exp $
+# $OpenBSD: Makefile,v 1.57 2011/09/28 09:47:48 jasper Exp $
 
 SHARED_ONLY=	Yes
 
@@ -50,8 +50,8 @@ MODGNOME_DESKTOP_FILE=	Yes
 
 LIBTOOL_FLAGS=	--tag=disable-static
 
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
+MODGNOME_CPPFLAGS=	-I${X11BASE}/include
+MODGNOME_LDFLAGS=	-L${X11BASE}/lib
 CONFIGURE_ARGS=	--disable-static \
 		--disable-packagekit \
 		--disable-gudev \
diff --git a/x11/gnome/system-monitor/Makefile b/x11/gnome/system-monitor/Makefile
index fa0f18e4fbb..f6175229c58 100644
--- a/x11/gnome/system-monitor/Makefile
+++ b/x11/gnome/system-monitor/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.23 2011/09/26 11:04:24 jasper Exp $
+# $OpenBSD: Makefile,v 1.24 2011/09/28 09:47:48 jasper Exp $
 
 COMMENT=	sytem monitor for GNOME
 
@@ -38,8 +38,4 @@ LIB_DEPENDS=	devel/libgtop2>=2.28.3p23 \
 MODGNOME_DESKTOP_FILE=	Yes
 MODGNOME_TOOLS= yelp
 
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
-CONFIGURE_ARGS=	${CONFIGURED_SHARED}
-
 .include <bsd.port.mk>
diff --git a/x11/gnome/terminal/Makefile b/x11/gnome/terminal/Makefile
index f343b4a6b82..0732dd62f4f 100644
--- a/x11/gnome/terminal/Makefile
+++ b/x11/gnome/terminal/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.75 2011/09/26 14:59:44 jasper Exp $
+# $OpenBSD: Makefile,v 1.76 2011/09/28 09:47:48 jasper Exp $
 
 COMMENT=	GNOME terminal
 
@@ -31,7 +31,4 @@ MODGNOME_TOOLS= 	yelp
 MODGNOME_DESKTOP_FILE=	Yes
 MODGCONF2_SCHEMAS_DIR=	gnome-terminal
 
-CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
-			LDFLAGS="-L${LOCALBASE}/lib"
-
 .include <bsd.port.mk>
diff --git a/x11/gnome/themes-standard/Makefile b/x11/gnome/themes-standard/Makefile
index a68c945b44a..12d9fa8ab27 100644
--- a/x11/gnome/themes-standard/Makefile
+++ b/x11/gnome/themes-standard/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.14 2011/09/28 06:15:44 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.15 2011/09/28 09:47:48 jasper Exp $
 
 SHARED_ONLY=		Yes
 
@@ -35,7 +35,5 @@ RUN_DEPENDS+=		x11/gtk-engines2
 LIBTOOL_FLAGS=		--tag=disable-static
 
 CONFIGURE_ARGS+=	--disable-static
-CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
-			LDFLAGS="-L${LOCALBASE}/lib"
 
 .include <bsd.port.mk>
diff --git a/x11/gnome/totem-pl-parser/Makefile b/x11/gnome/totem-pl-parser/Makefile
index 6ce018674e2..1994b702834 100644
--- a/x11/gnome/totem-pl-parser/Makefile
+++ b/x11/gnome/totem-pl-parser/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.39 2011/09/20 21:10:01 jasper Exp $
+# $OpenBSD: Makefile,v 1.40 2011/09/28 09:47:48 jasper Exp $
 
 SHARED_ONLY=	Yes
 
@@ -37,8 +37,6 @@ LIB_DEPENDS=	mail/gmime>=2.6.0 \
 
 MODGNOME_TOOLS= goi
 
-CONFIGURE_ENV= 	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS=	--disable-quvi \
 		--enable-libarchive
 
diff --git a/x11/gnome/totem/Makefile b/x11/gnome/totem/Makefile
index 6a8b7d2fc11..9ca9dad2980 100644
--- a/x11/gnome/totem/Makefile
+++ b/x11/gnome/totem/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.71 2011/09/22 11:56:51 jasper Exp $
+# $OpenBSD: Makefile,v 1.72 2011/09/28 09:47:48 jasper Exp $
 
 COMMENT-main=		official media player for GNOME
 COMMENT-nautilus=	totem properties plugin for nautilus
@@ -90,9 +90,9 @@ TOTEM_PLUGINS=	"media-player-keys ontop properties \
 		screensaver skipto thumbnail \
 		opensubtitles jamendo screenshot dbus-service"
 
-CONFIGURE_ENV= 	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib" \
-		CFLAGS="${CFLAGS} -I${LOCALBASE}/include " \
+MODGNOME_CPPFLAGS=	-I${X11BASE}/include
+MODGNOME_LDFLAGS=	-L${X11BASE}/lib
+CONFIGURE_ENV= 	CFLAGS="${CFLAGS} -I${LOCALBASE}/include " \
 		GST_REGISTRY=${WRKDIR}/registry.${MACHINE_ARCH}.bin
 CONFIGURE_ARGS=	--with-plugins=${TOTEM_PLUGINS} \
 		--with-dbus \
diff --git a/x11/gnome/tracker/Makefile b/x11/gnome/tracker/Makefile
index 176bb871289..41f24fb91a9 100644
--- a/x11/gnome/tracker/Makefile
+++ b/x11/gnome/tracker/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.79 2011/09/26 12:31:40 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.80 2011/09/28 09:47:48 jasper Exp $
 
 # XXX Binary files patch-src_tracker-control_tracker-control-general_c
 # and patch-src_tracker-control_tracker-control-general_c.new differ
@@ -131,9 +131,7 @@ CONFIGURE_ARGS += --disable-miner-rss
 # needs libiptcdata
 CONFIGURE_ARGS += --disable-libiptcdata
 
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib \
-			-Wl,-rpath,${TRUEPREFIX}/lib/tracker-${MAJ_V}"
+MODGNOME_LDFLAGS=	-Wl,-rpath,${TRUEPREFIX}/lib/tracker-${MAJ_V}
 
 FAKE_FLAGS=	sysconfdir=${PREFIX}/share/examples/meta-tracker/
 
diff --git a/x11/gnome/utils/Makefile b/x11/gnome/utils/Makefile
index 26ed8513857..13a1f7dc1ef 100644
--- a/x11/gnome/utils/Makefile
+++ b/x11/gnome/utils/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.70 2011/09/26 15:50:51 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.71 2011/09/28 09:47:48 jasper Exp $
 
 SHARED_ONLY=		Yes
 
@@ -43,8 +43,7 @@ MODGCONF2_SCHEMAS_DIR=	gnome-utils
 
 CONFIGURE_ARGS+=	--with-grep="/usr/bin/grep" \
 			--enable-ipv6
-CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
-			LDFLAGS="-L${LOCALBASE}/lib"
+MODGNOME_CPPFLAGS=	-I${X11BASE}/include
 USE_GROFF =		Yes
 
 .include <bsd.port.mk>
diff --git a/x11/gnome/vfs2/Makefile b/x11/gnome/vfs2/Makefile
index 1c5b941afa0..7458d9c49c0 100644
--- a/x11/gnome/vfs2/Makefile
+++ b/x11/gnome/vfs2/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.68 2011/09/20 21:10:01 jasper Exp $
+# $OpenBSD: Makefile,v 1.69 2011/09/28 09:47:48 jasper Exp $
 
 SHARED_ONLY=		Yes
 
@@ -41,9 +41,8 @@ CONFIGURE_ARGS+= 	--disable-cdda \
 			--disable-avahi \
 			--disable-howl \
 			--disable-samba
-CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
-			LDFLAGS="-L${LOCALBASE}/lib -pthread" \
-			ac_cv_header_sys_mount_h=yes
+MODGNOME_LDFLAGS=	-pthread
+CONFIGURE_ENV=		ac_cv_header_sys_mount_h=yes
 
 FAKE_FLAGS=		sysconfdir=${PREFIX}/share/examples/gnome-vfs2
 
diff --git a/x11/gnome/video-arcade/Makefile b/x11/gnome/video-arcade/Makefile
index ea192ee2ddf..e42f97ee53c 100644
--- a/x11/gnome/video-arcade/Makefile
+++ b/x11/gnome/video-arcade/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.30 2011/09/26 13:25:55 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.31 2011/09/28 09:47:48 jasper Exp $
 
 COMMENT=	MAME front-end for GNOME
 
@@ -44,8 +44,6 @@ LIB_DEPENDS=	databases/sqlite3 \
 MODGNOME_DESKTOP_FILE=		Yes
 MODGNOME_TOOLS= yelp
 
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS=	--with-glade-catalog \
 		--with-wnck \
 		--with-history-file="${LOCALBASE}/share/sdlmame/history.dat"
diff --git a/x11/gnome/vinagre/Makefile b/x11/gnome/vinagre/Makefile
index da4143ca817..829ad4bb14a 100644
--- a/x11/gnome/vinagre/Makefile
+++ b/x11/gnome/vinagre/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.46 2011/09/26 17:32:12 jasper Exp $
+# $OpenBSD: Makefile,v 1.47 2011/09/28 09:47:48 jasper Exp $
 
 SHARED_ONLY=	Yes
 
@@ -52,7 +52,4 @@ CONFIGURE_ARGS=	--with-avahi \
 # XXX console does not spawn (needs grantpt, ptsname...)
 CONFIGURE_ARGS+= --enable-ssh=no
 
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
-
 .include <bsd.port.mk>
diff --git a/x11/gnome/vino/Makefile b/x11/gnome/vino/Makefile
index 15efb40c330..a6de9ee245c 100644
--- a/x11/gnome/vino/Makefile
+++ b/x11/gnome/vino/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.35 2011/09/28 07:07:11 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.36 2011/09/28 09:47:48 jasper Exp $
 
 COMMENT=	GNOME desktop sharing server
 
@@ -46,8 +46,8 @@ CONFIGURE_ARGS=	--with-gnome-keyring \
 		--with-telepathy \
 		--disable-ipv6
 
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+
+MODGNOME_CPPFLAGS=	-I${X11BASE}/include
 
 FAKE_FLAGS=	sysconfdir=${PREFIX}/share/examples/vino
 
diff --git a/x11/gnome/yelp/Makefile b/x11/gnome/yelp/Makefile
index d8cec7a0b97..fc3ff52b8b8 100644
--- a/x11/gnome/yelp/Makefile
+++ b/x11/gnome/yelp/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.73 2011/09/27 07:39:06 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.74 2011/09/28 09:47:48 jasper Exp $
 
 COMMENT=		GNOME help browser
 
@@ -38,7 +38,5 @@ MODGNOME_DESKTOP_FILE=	Yes
 
 CONFIGURE_ARGS+= 	--enable-lzma \
 			--enable-bz2
-CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
-			LDFLAGS="-L${LOCALBASE}/lib"
 
 .include <bsd.port.mk>
diff --git a/x11/gnome/zenity/Makefile b/x11/gnome/zenity/Makefile
index aa37b6ed91e..971cbcb316b 100644
--- a/x11/gnome/zenity/Makefile
+++ b/x11/gnome/zenity/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.49 2011/09/27 10:26:02 jasper Exp $
+# $OpenBSD: Makefile,v 1.50 2011/09/28 09:47:48 jasper Exp $
 
 COMMENT=		dialogs for GNOME
 
@@ -28,7 +28,5 @@ LIB_DEPENDS=		devel/libnotify>=0.7.2 \
 MODGNOME_TOOLS= 	yelp
 USE_LIBTOOL=		No
 CONFIGURE_ARGS= 	--enable-libnotify
-CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
-			LDFLAGS="-L${LOCALBASE}/lib"
 
 .include <bsd.port.mk>
diff --git a/x11/gpointing-device-settings/Makefile b/x11/gpointing-device-settings/Makefile
index 835a9465150..16384ac15a1 100644
--- a/x11/gpointing-device-settings/Makefile
+++ b/x11/gpointing-device-settings/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.5 2011/09/19 07:44:59 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.6 2011/09/28 09:51:36 jasper Exp $
 
 SHARED_ONLY =		Yes
 
@@ -44,7 +44,5 @@ BUILD_DEPENDS =		archivers/gtar \
 
 LIBTOOL_FLAGS =		--tag=disable-static
 CONFIGURE_STYLE =	gnu
-CONFIGURE_ENV =		CPPFLAGS="-I${LOCALBASE}/include" \
-			LDFLAGS="-L${LOCALBASE}/lib"
 
 .include <bsd.port.mk>
diff --git a/x11/gtk-engines2/Makefile b/x11/gtk-engines2/Makefile
index dfe0c0f46f3..6579822a2e3 100644
--- a/x11/gtk-engines2/Makefile
+++ b/x11/gtk-engines2/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.50 2011/09/16 12:29:15 espie Exp $
+# $OpenBSD: Makefile,v 1.51 2011/09/28 09:51:36 jasper Exp $
 
 SHARED_ONLY=		Yes
 
@@ -39,12 +39,9 @@ MODULES=		devel/gettext \
 LIBTOOL_FLAGS=		--tag=disable-static
 
 CONFIGURE_STYLE= 	gnu
-CONFIGURE_ARGS= 	${CONFIGURE_SHARED} \
-			--disable-static \
+CONFIGURE_ARGS= 	--disable-static \
 			--disable-lua \
 			--enable-animation
-CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
-			LDFLAGS="-L${LOCALBASE}/lib"
 
 # nm: unknown option -- D
 NO_REGRESS=	       Yes
diff --git a/x11/gtk-vnc/Makefile b/x11/gtk-vnc/Makefile
index ffd013003d5..262bf438952 100644
--- a/x11/gtk-vnc/Makefile
+++ b/x11/gtk-vnc/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.35 2011/09/20 21:10:01 jasper Exp $
+# $OpenBSD: Makefile,v 1.36 2011/09/28 09:51:36 jasper Exp $
 
 COMMENT=		VNC viewer widget for GTK
 
@@ -55,7 +55,4 @@ CONFIGURE_ARGS=		--without-examples \
 CONFIGURE_ARGS +=	--disable-plugin \
 			--without-python
 
-CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
-			LDFLAGS="-L${LOCALBASE}/lib"
-
 .include <bsd.port.mk>
diff --git a/x11/gtk3-engines/Makefile b/x11/gtk3-engines/Makefile
index 3b07b08359e..fba58a8ccd7 100644
--- a/x11/gtk3-engines/Makefile
+++ b/x11/gtk3-engines/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 2011/09/16 12:29:15 espie Exp $
+# $OpenBSD: Makefile,v 1.4 2011/09/28 09:51:36 jasper Exp $
 
 SHARED_ONLY=		Yes
 
@@ -39,11 +39,8 @@ MODULES=		devel/gettext \
 LIBTOOL_FLAGS=		--tag=disable-static
 
 CONFIGURE_STYLE= 	gnu
-CONFIGURE_ARGS= 	${CONFIGURE_SHARED} \
-			--disable-static \
+CONFIGURE_ARGS= 	--disable-static \
 			--enable-animation
-CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
-			LDFLAGS="-L${LOCALBASE}/lib"
 
 # nm: unknown option -- D
 NO_REGRESS=		Yes
diff --git a/x11/gtkglarea/Makefile b/x11/gtkglarea/Makefile
index d45f2b95a7b..63b3116a616 100644
--- a/x11/gtkglarea/Makefile
+++ b/x11/gtkglarea/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.38 2011/09/16 12:29:15 espie Exp $
+# $OpenBSD: Makefile,v 1.39 2011/09/28 09:51:36 jasper Exp $
 
 COMMENT=		OpenGL widget for GTK+2 GUI toolkit
 
@@ -32,8 +32,7 @@ LIB_DEPENDS=		x11/gtk+2
 
 SEPARATE_BUILD= 	simple
 CONFIGURE_STYLE=	gnu
-CONFIGURE_ARGS+=	${CONFIGURE_SHARED} \
-			--with-lib-GL
+CONFIGURE_ARGS+=	--with-lib-GL
 
 DOC_DIR=		${PREFIX}/share/doc/gtkglarea2
 
diff --git a/x11/gtksourceview/Makefile b/x11/gtksourceview/Makefile
index b17b10fefce..370e0844948 100644
--- a/x11/gtksourceview/Makefile
+++ b/x11/gtksourceview/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.52 2011/09/20 21:10:01 jasper Exp $
+# $OpenBSD: Makefile,v 1.53 2011/09/28 09:51:37 jasper Exp $
 
 COMMENT=		text widget that extends GTK2's GtkTextView widget
 
@@ -40,8 +40,6 @@ LIB_DEPENDS=		textproc/libxml \
 
 USE_GMAKE=		Yes
 CONFIGURE_STYLE=	gnu
-CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
-			LDFLAGS="-L${LOCALBASE}/lib"
 
 REGRESS_IS_INTERACTIVE=	x11
 
diff --git a/x11/gtksourceview3/Makefile b/x11/gtksourceview3/Makefile
index e8b1b245e93..a215827d782 100644
--- a/x11/gtksourceview3/Makefile
+++ b/x11/gtksourceview3/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.12 2011/09/26 19:56:28 jasper Exp $
+# $OpenBSD: Makefile,v 1.13 2011/09/28 09:51:37 jasper Exp $
 
 COMMENT=		text widget that extends GTK3's GtkTextView widget
 
@@ -41,8 +41,6 @@ LIB_DEPENDS=		textproc/libxml \
 MODGNOME_TOOLS= 	goi
 
 CONFIGURE_STYLE=	gnu
-CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
-			LDFLAGS="-L${LOCALBASE}/lib"
 
 REGRESS_IS_INTERACTIVE=	x11
 
diff --git a/x11/gtksourceviewmm3/Makefile b/x11/gtksourceviewmm3/Makefile
index 5b49275bdb0..2060fd10a88 100644
--- a/x11/gtksourceviewmm3/Makefile
+++ b/x11/gtksourceviewmm3/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 2011/09/12 12:07:26 jasper Exp $
+# $OpenBSD: Makefile,v 1.4 2011/09/28 09:51:37 jasper Exp $
 
 COMMENT=	C++ wrapper for gtksourceview3
 
@@ -41,6 +41,5 @@ LIB_DEPENDS=	x11/gtksourceview3 \
 		x11/gtk3mm
 
 CONFIGURE_STYLE=gnu
-CONFIGURE_ARGS=	${CONFIGURE_SHARED}
 
 .include <bsd.port.mk>
diff --git a/x11/polkit-gnome/Makefile b/x11/polkit-gnome/Makefile
index 2c15df71f1b..9f469dfe06e 100644
--- a/x11/polkit-gnome/Makefile
+++ b/x11/polkit-gnome/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.16 2011/09/20 21:20:21 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.17 2011/09/28 09:51:37 jasper Exp $
 
 COMMENT=	PolicyKit authentication agent for GNOME/GTK+
 
@@ -34,10 +34,7 @@ LIB_DEPENDS=	sysutils/polkit>=0.102 \
 		x11/gtk+3
 
 CONFIGURE_STYLE=gnu
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
-CONFIGURE_ARGS=	${CONFIGURE_SHARED} \
-		--localstatedir=/var \
+CONFIGURE_ARGS=	--localstatedir=/var \
 		--disable-gtk-doc
 
 # XXX no introspection support anymore, but configure still has a check for it
diff --git a/x11/py-gtk2/Makefile b/x11/py-gtk2/Makefile
index 2179685fa65..cc7792e7d67 100644
--- a/x11/py-gtk2/Makefile
+++ b/x11/py-gtk2/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.52 2011/09/16 12:29:17 espie Exp $
+# $OpenBSD: Makefile,v 1.53 2011/09/28 09:51:37 jasper Exp $
 
 SHARED_ONLY=	Yes
 
@@ -45,7 +45,7 @@ LIBTOOL_FLAGS+=	--tag=disable-static
 CONFIGURE_STYLE=gnu
 
 # pick bind_textdomain_codeset
-CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib -lintl -liconv"
+MODGNOME_LDFLAGS=-lintl -liconv
 
 REGRESS_IS_INTERACTIVE= x11
 
diff --git a/x11/xdg-user-dirs-gtk/Makefile b/x11/xdg-user-dirs-gtk/Makefile
index a1ab435af1b..721ca8a34ce 100755
--- a/x11/xdg-user-dirs-gtk/Makefile
+++ b/x11/xdg-user-dirs-gtk/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.13 2011/09/16 12:29:17 espie Exp $
+# $OpenBSD: Makefile,v 1.14 2011/09/28 09:51:37 jasper Exp $
 
 COMMENT=	integration of xdg-user-dirs into GNOME/gtk+
 
@@ -33,8 +33,7 @@ RUN_DEPENDS=	devel/xdg-user-dirs>=0.13p0
 LIB_DEPENDS=	x11/gtk+2
 
 CONFIGURE_STYLE=gnu
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib -pthread"
+MODGNOME_LDFLAGS=-pthread
 
 CFLAGS+=	-pthread