56 files changed, 168 insertions, 141 deletions

diff --git a/Mk/Uses/pathfix.mk b/Mk/Uses/pathfix.mk
index f8762a2ceaf3..1a675d6eebc1 100644
--- a/Mk/Uses/pathfix.mk
+++ b/Mk/Uses/pathfix.mk
@@ -28,9 +28,6 @@ pathfix:
 		s|[(]datadir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g ; \
 		s|[(]prefix[)]/lib/pkgconfig|(prefix)/libdata/pkgconfig|g ; \
 		s|[$$][(]localstatedir[)]/scrollkeeper|${SCROLLKEEPER_DIR}|g ; \
-			s|[(]libdir[)]/bonobo/servers|(prefix)/libdata/bonobo/servers|g' ; \
-	${FIND} ${WRKSRC} -name "configure" -type f | ${XARGS} ${REINPLACE_CMD} -e \
-		's|DATADIRNAME=lib|DATADIRNAME=share|g ; \
-		s|{libdir}/locale|{prefix}/share/locale|g'
+		s|[(]libdir[)]/bonobo/servers|(prefix)/libdata/bonobo/servers|g'
 
 .endif
diff --git a/Mk/bsd.gnome.mk b/Mk/bsd.gnome.mk
index a371357b6b4a..53474900fff0 100644
--- a/Mk/bsd.gnome.mk
+++ b/Mk/bsd.gnome.mk
@@ -477,11 +477,13 @@ pygnome2_USE_GNOME_IMPL=libgnomeui pygtk2
 intltool_DETECT=	${LOCALBASE}/bin/intltool-extract
 intltool_BUILD_DEPENDS=	${intltool_DETECT}:${PORTSDIR}/textproc/intltool
 
-intlhack_PRE_PATCH=		${FIND} ${WRKSRC} -name "intltool-merge.in" | ${XARGS} ${REINPLACE_CMD} -e \
-				's|mkdir $$lang or|mkdir $$lang, 0777 or| ; \
-				 s|^push @INC, "/.*|push @INC, "${LOCALBASE}/share/intltool";| ; \
-				 s|/usr/bin/iconv|${ICONV_CMD}|g ; \
-				 s|unpack *[(]'"'"'U\*'"'"'|unpack ('"'"'C*'"'"'|'
+intlhack_PRE_PATCH=	${FIND} ${WRKSRC} -name "intltool-merge.in" | ${XARGS} ${REINPLACE_CMD} \
+			's|mkdir $$lang or|mkdir $$lang, 0777 or| ; \
+			 s|^push @INC, "/.*|push @INC, "${LOCALBASE}/share/intltool";| ; \
+			 s|/usr/bin/iconv|${ICONV_CMD}|g ; \
+			 s|unpack *[(]'"'"'U\*'"'"'|unpack ('"'"'C*'"'"'|' ; \
+			${FIND} ${WRKSRC} -name configure | ${XARGS} ${REINPLACE_CMD} \
+			's/DATADIRNAME=lib/DATADIRNAME=share/'
 intlhack_USE_GNOME_IMPL=intltool
 
 gtkhtml3_LIB_DEPENDS=	libgtkhtml-3.14.so:${PORTSDIR}/www/gtkhtml3
diff --git a/accessibility/at-spi2-core/Makefile b/accessibility/at-spi2-core/Makefile
index ff1e2d1d7cc2..8ea5a62beb02 100644
--- a/accessibility/at-spi2-core/Makefile
+++ b/accessibility/at-spi2-core/Makefile
@@ -25,7 +25,7 @@ USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-xevie
 CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
+LIBS+=		-L${LOCALBASE}/lib
 INSTALL_TARGET=	install-strip
 
 .include <bsd.port.mk>
diff --git a/audio/ario/Makefile b/audio/ario/Makefile
index c764d3e4b50e..08e4b989e8f7 100644
--- a/audio/ario/Makefile
+++ b/audio/ario/Makefile
@@ -22,8 +22,10 @@ LIB_DEPENDS=	libgnutls.so:${PORTSDIR}/security/gnutls \
 		libunique-1.0.so:${PORTSDIR}/x11-toolkits/unique \
 		libmpdclient.so:${PORTSDIR}/audio/libmpdclient
 
-USES=		gmake libtool pathfix pkgconfig
 GNU_CONFIGURE=	yes
+CPPFLAGS+=	-I${LOCALBASE}/include
+LIBS+=		-L${LOCALBASE}/lib
+USES=		gmake libtool pkgconfig
 USE_LDCONFIG=	yes
 USE_GNOME=	gtk20
 INSTALLS_ICONS=	yes
diff --git a/audio/easytag/Makefile b/audio/easytag/Makefile
index ba88962f2f87..6b9afa81a621 100644
--- a/audio/easytag/Makefile
+++ b/audio/easytag/Makefile
@@ -21,12 +21,12 @@ LIB_DEPENDS=	libid3.so:${PORTSDIR}/audio/id3lib \
 		libFLAC.so:${PORTSDIR}/audio/flac \
 		libtag.so:${PORTSDIR}/audio/taglib
 
-USES=		gmake pkgconfig pathfix desktop-file-utils tar:xz
+USES=		desktop-file-utils gmake pkgconfig tar:xz
 USE_GNOME=	glib20 intltool intlhack libxslt
 INSTALLS_ICONS=	yes
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include -DHAVE_GTK
-LDFLAGS+=	-L${LOCALBASE}/lib
+LIBS+=		-L${LOCALBASE}/lib
 
 CONFIGURE_ARGS=	--disable-appdata-validate \
 	--without-help-dir \
diff --git a/audio/gmpc-alarm/Makefile b/audio/gmpc-alarm/Makefile
index b09977a6bc22..7e47db455eb0 100644
--- a/audio/gmpc-alarm/Makefile
+++ b/audio/gmpc-alarm/Makefile
@@ -15,7 +15,9 @@ BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gmpc.pc:${PORTSDIR}/audio/gmpc
 RUN_DEPENDS=	gmpc:${PORTSDIR}/audio/gmpc
 
 GNU_CONFIGURE=	yes
+CPPFLAGS+=	-I${LOCALBASE}/include
+LIBS+=		-L${LOCALBASE}/lib
+USES=		gmake gettext libtool pkgconfig
 USE_GNOME=	glib20 gtk20 intltool
-USES=		gmake gettext libtool pathfix pkgconfig
 
 .include <bsd.port.mk>
diff --git a/audio/gmpc-discogs/Makefile b/audio/gmpc-discogs/Makefile
index 11a2add99047..ed6bfa991bef 100644
--- a/audio/gmpc-discogs/Makefile
+++ b/audio/gmpc-discogs/Makefile
@@ -16,7 +16,9 @@ BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gmpc.pc:${PORTSDIR}/audio/gmpc
 RUN_DEPENDS=	gmpc:${PORTSDIR}/audio/gmpc
 
 GNU_CONFIGURE=	yes
+CPPFLAGS+=	-I${LOCALBASE}/include
+LIBS+=		-L${LOCALBASE}/lib
+USES=		gettext gmake libtool pkgconfig
 USE_GNOME=	glib20 gtk20 intltool libxml2
-USES=		gettext gmake libtool pathfix pkgconfig
 
 .include <bsd.port.mk>
diff --git a/audio/gmpc-lastfm/Makefile b/audio/gmpc-lastfm/Makefile
index 79817adb40ef..959c246b0e78 100644
--- a/audio/gmpc-lastfm/Makefile
+++ b/audio/gmpc-lastfm/Makefile
@@ -17,7 +17,9 @@ BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gmpc.pc:${PORTSDIR}/audio/gmpc
 RUN_DEPENDS=	gmpc:${PORTSDIR}/audio/gmpc
 
 GNU_CONFIGURE=	yes
+CPPFLAGS+=	-I${LOCALBASE}/include
+LIBS+=		-L${LOCALBASE}/lib
+USES=		gettext gmake libtool pkgconfig
 USE_GNOME=	glib20 gtk20 intltool libxml2
-USES=		gettext gmake libtool pathfix pkgconfig
 
 .include <bsd.port.mk>
diff --git a/audio/gmpc-lyricwiki/Makefile b/audio/gmpc-lyricwiki/Makefile
index dc496672b358..e64574933f8b 100644
--- a/audio/gmpc-lyricwiki/Makefile
+++ b/audio/gmpc-lyricwiki/Makefile
@@ -15,7 +15,9 @@ BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gmpc.pc:${PORTSDIR}/audio/gmpc
 RUN_DEPENDS=	gmpc:${PORTSDIR}/audio/gmpc
 
 GNU_CONFIGURE=	yes
+CPPFLAGS+=	-I${LOCALBASE}/include
+LIBS+=		-L${LOCALBASE}/lib
+USES=		gettext gmake libtool pkgconfig
 USE_GNOME=	intltool glib20 gtk20 libxml2
-USES=		gettext gmake libtool pathfix pkgconfig
 
 .include <bsd.port.mk>
diff --git a/audio/gmpc-mdcover/Makefile b/audio/gmpc-mdcover/Makefile
index a0a282a05835..db49a0b6d9b7 100644
--- a/audio/gmpc-mdcover/Makefile
+++ b/audio/gmpc-mdcover/Makefile
@@ -16,7 +16,9 @@ BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gmpc.pc:${PORTSDIR}/audio/gmpc
 RUN_DEPENDS=	gmpc:${PORTSDIR}/audio/gmpc
 
 GNU_CONFIGURE=	yes
+CPPFLAGS+=	-I${LOCALBASE}/include
+LIBS+=		-L${LOCALBASE}/lib
+USES=		gettext gmake libtool pkgconfig
 USE_GNOME=	intltool glib20 gtk20 libxml2
-USES=		gettext gmake libtool pathfix pkgconfig
 
 .include <bsd.port.mk>
diff --git a/audio/gmpc-shout/Makefile b/audio/gmpc-shout/Makefile
index 470550490aec..6a514cf5ae52 100644
--- a/audio/gmpc-shout/Makefile
+++ b/audio/gmpc-shout/Makefile
@@ -18,7 +18,9 @@ RUN_DEPENDS=	gmpc:${PORTSDIR}/audio/gmpc \
 		ogg123:${PORTSDIR}/audio/vorbis-tools
 
 GNU_CONFIGURE=	yes
+CPPFLAGS+=	-I${LOCALBASE}/include
+LIBS+=		-L${LOCALBASE}/lib
+USES=		gettext gmake libtool pkgconfig
 USE_GNOME=	intltool glib20 gtk20 libxml2
-USES=		gettext gmake libtool pathfix pkgconfig
 
 .include <bsd.port.mk>
diff --git a/audio/gvolwheel/Makefile b/audio/gvolwheel/Makefile
index b1b86b2475e4..89d3ff756485 100644
--- a/audio/gvolwheel/Makefile
+++ b/audio/gvolwheel/Makefile
@@ -12,11 +12,11 @@ COMMENT=	Volume mixer
 
 LICENSE=	GPLv3
 
-BUILD_DEPENDS=	intltoolize:${PORTSDIR}/textproc/intltool
-
 CONFIGURE_ARGS+=--enable-oss
 GNU_CONFIGURE=	yes
-USES=		gmake iconv pathfix pkgconfig
+CPPFLAGS+=	-I${LOCALBASE}/include
+LIBS+=		-L${LOCALBASE}/lib
+USES=		gmake iconv pkgconfig
 USE_GNOME=	gtk30
 
 PORTDOCS=	AUTHORS ChangeLog README
diff --git a/audio/paprefs/Makefile b/audio/paprefs/Makefile
index b1593a3a58e3..5fcf58849e5b 100644
--- a/audio/paprefs/Makefile
+++ b/audio/paprefs/Makefile
@@ -11,12 +11,13 @@ MAINTAINER=	romain@FreeBSD.org
 COMMENT=	GTK configuration dialog for PulseAudio
 
 LIB_DEPENDS=	libglademm-2.4.so:${PORTSDIR}/devel/libglademm24 \
-		libgconfmm-2.6.so:${PORTSDIR}/devel/gconfmm26 \
 		libpulse.so:${PORTSDIR}/audio/pulseaudio
 
 GNU_CONFIGURE=	yes
-USES=		gmake pathfix pkgconfig
-USE_GNOME=	gnomeprefix intltool
+CPPFLAGS+=	-I${LOCALBASE}/include
+LIBS+=		-L${LOCALBASE}/lib
+USES=		gmake pkgconfig
+USE_GNOME=	gconfmm26 gnomeprefix
 
 CONFIGURE_ARGS=	--disable-lynx
 
diff --git a/comms/gpredict/Makefile b/comms/gpredict/Makefile
index 8fb4a529bef1..4abf8c8a59eb 100644
--- a/comms/gpredict/Makefile
+++ b/comms/gpredict/Makefile
@@ -15,9 +15,11 @@ LIB_DEPENDS=	libhamlib.so:${PORTSDIR}/comms/hamlib \
 		libcurl.so:${PORTSDIR}/ftp/curl \
 		libgoocanvas.so:${PORTSDIR}/graphics/goocanvas
 
-USES=		gettext pathfix gmake pkgconfig
-USE_GNOME=	gtk20
 GNU_CONFIGURE=	yes
+CPPFLAGS+=	-I${LOCALBASE}/include
+LIBS+=		-L${LOCALBASE}/lib
+USES=		gettext gmake pkgconfig
+USE_GNOME=	gtk20
 
 post-patch:
 	@${REINPLACE_CMD} -e \
diff --git a/deskutils/babytrans/Makefile b/deskutils/babytrans/Makefile
index 31ed9b641ec4..60ecee7e19e9 100644
--- a/deskutils/babytrans/Makefile
+++ b/deskutils/babytrans/Makefile
@@ -10,11 +10,14 @@ MASTER_SITES=	http://fjolliton.free.fr/babytrans/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	GTK+/GNOME front-end for Babylon Translator .dic files
 
-USES=		gmake gettext pathfix
+DEPRECATED=	Abandonware, dictionaries unavailable
+EXPIRATION_DATE=2014-10-31
+
+USES=		gmake gettext
 USE_GNOME=	gtk12 gnomeprefix
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	${CXXFLAGS} -I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
+LIBS+=		-L${LOCALBASE}/lib -lintl
 PKGMESSAGE=	${WRKDIR}/pkg-message
 SUB_FILES=	pkg-message
 
diff --git a/deskutils/glipper/Makefile b/deskutils/glipper/Makefile
index 57846ec91903..1a8cb287620a 100644
--- a/deskutils/glipper/Makefile
+++ b/deskutils/glipper/Makefile
@@ -16,6 +16,8 @@ USE_PYTHON=	yes
 INSTALLS_ICONS=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--libdir=${PREFIX}/libexec --disable-schemas-install
+CPPFLAGS+=	-I${LOCALBASE}/include
+LIBS+=		-L${LOCALBASE}/lib
 
 GCONF_SCHEMAS=	glipper.schemas
 
diff --git a/devel/geany-plugins-l10n/Makefile b/devel/geany-plugins-l10n/Makefile
index 48cad1a590c5..aaca8d6cd092 100644
--- a/devel/geany-plugins-l10n/Makefile
+++ b/devel/geany-plugins-l10n/Makefile
@@ -7,7 +7,5 @@ CATEGORIES=	devel
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	Localization messages for Geany plugins
 
-USES=		pathfix
-
 .include "${.CURDIR}/../geany-plugins/files/Makefile.common"
 .include <bsd.port.mk>
diff --git a/devel/geany-plugins/files/Makefile.common b/devel/geany-plugins/files/Makefile.common
index 50b99d750eee..4253bf0bc851 100644
--- a/devel/geany-plugins/files/Makefile.common
+++ b/devel/geany-plugins/files/Makefile.common
@@ -22,6 +22,8 @@ USE_GNOME+=	gtk20
 GEANY_PLUGIN=	NLS
 NLS_DIR=	po
 NLS_SWITCH=	--enable-nls
+CPPFLAGS+=	-I${LOCALBASE}/include
+LIBS+=		-L${LOCALBASE}/lib
 .endif
 
 GEANY_PLUGIN?=			${PORTNAME:S,geany-plugin-,,}
diff --git a/devel/gitg/Makefile b/devel/gitg/Makefile
index 1ddd867d1ab4..420590d7b466 100644
--- a/devel/gitg/Makefile
+++ b/devel/gitg/Makefile
@@ -24,13 +24,14 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-silent-rules \
 		--disable-maintainer-mode \
 		--enable-compile-warnings=no
-USE_GNOME=	glib20 gtk30 gtksourceview3
+USE_GNOME=	glib20 gtk30 gtksourceview3 intlhack
 INSTALL_TARGET=	install-strip
 
 INSTALLS_ICONS=	yes
 GLIB_SCHEMAS=	org.gnome.gitg.gschema.xml
 
-LDFLAGS+=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+LIBS+=		-L${LOCALBASE}/lib
 
 OPTIONS_DEFINE=	NLS
 OPTIONS_SUB=	yes
diff --git a/devel/gitg0/Makefile b/devel/gitg0/Makefile
index dcced7b39d7c..a2d7c3ac6038 100644
--- a/devel/gitg0/Makefile
+++ b/devel/gitg0/Makefile
@@ -19,7 +19,7 @@ CONFLICTS=	gitg-[0-9]*
 
 USES=		tar:bzip2 gmake pkgconfig pathfix libtool
 GNU_CONFIGURE=	yes
-USE_GNOME=	gconf2 gtk20 gtksourceview2
+USE_GNOME=	gconf2 gtk20 gtksourceview2 intlhack
 INSTALL_TARGET=	install-strip
 
 INSTALLS_ICONS=	yes
@@ -33,6 +33,6 @@ OPTIONS_SUB=	yes
 NLS_USES=	gettext
 NLS_CONFIGURE_ENABLE=nls
 NLS_CPPFLAGS=	-I${LOCALBASE}/include
-NLS_LDFLAGS=	-L${LOCALBASE}/lib
+NLS_LIBS=	-L${LOCALBASE}/lib
 
 .include <bsd.port.mk>
diff --git a/devel/gsettings-desktop-schemas/Makefile b/devel/gsettings-desktop-schemas/Makefile
index 50f2b3fcde2a..5f1845d9aa43 100644
--- a/devel/gsettings-desktop-schemas/Makefile
+++ b/devel/gsettings-desktop-schemas/Makefile
@@ -20,6 +20,8 @@ USES=		gettext gmake pathfix perl5 pkgconfig tar:xz
 USE_PERL5=	build
 USE_GNOME=	intltool glib20 gnomehier introspection:build
 GNU_CONFIGURE=	yes
+CPPFLAGS+=	-I${LOCALBASE}/include
+LIBS+=		-L${LOCALBASE}/lib
 
 GLIB_SCHEMAS=	org.gnome.desktop.a11y.applications.gschema.xml \
 		org.gnome.desktop.a11y.keyboard.gschema.xml \
diff --git a/devel/libosinfo/Makefile b/devel/libosinfo/Makefile
index 514d57fb5ca0..2d726790fcd2 100644
--- a/devel/libosinfo/Makefile
+++ b/devel/libosinfo/Makefile
@@ -12,11 +12,13 @@ COMMENT=	Library for managing OS information for virtualization
 LIB_DEPENDS=	libsoup-gnome-2.4.so:${PORTSDIR}/devel/libsoup-gnome
 
 USES=		gmake libtool pathfix pkgconfig
-USE_GNOME=	gnomehier glib20 libxml2 libxslt introspection:build intltool
+USE_GNOME=	gnomehier glib20 libxml2 libxslt introspection:build intlhack
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 
-CONFIGURE_ARGS+=	--disable-tests --disable-vala
+CONFIGURE_ARGS=	--disable-tests --disable-vala
+CPPFLAGS+=	-I${LOCALBASE}/include
+LIBS+=		-L${LOCALBASE}/lib
 
 OPTIONS_DEFINE=	NLS
 OPTIONS_SUB=yes
diff --git a/devel/libpeas/Makefile b/devel/libpeas/Makefile
index f73a58f9a5d0..8e903b299425 100644
--- a/devel/libpeas/Makefile
+++ b/devel/libpeas/Makefile
@@ -17,11 +17,11 @@ BUILD_DEPENDS=	valac:${PORTSDIR}/lang/vala
 USE_PYTHON=	2
 USE_LDCONFIG=	yes
 USES=		gettext gmake libtool:keepla pathfix pkgconfig tar:xz
-USE_GNOME=	gtk30 introspection:build
+USE_GNOME=	gtk30 intlhack introspection:build
 INSTALLS_ICONS=	yes
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
+LIBS+=		-L${LOCALBASE}/lib
 INSTALL_TARGET=	install-strip
 CONFIGURE_ARGS+=--disable-glade-catalog
 
diff --git a/devel/libvirt-glib/Makefile b/devel/libvirt-glib/Makefile
index 95f0e38b2984..722d1c0f362f 100644
--- a/devel/libvirt-glib/Makefile
+++ b/devel/libvirt-glib/Makefile
@@ -13,13 +13,14 @@ COMMENT=	Glib bindings for Libvirt virtualization API
 LIB_DEPENDS=	libvirt.so:${PORTSDIR}/devel/libvirt
 
 GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--enable-introspection
 USES=		gmake libtool pathfix pkgconfig
 USE_LDCONFIG=	yes
-USE_GNOME=	intltool introspection
+USE_GNOME=	intlhack introspection
 USE_PYTHON=	2
 CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib -fstack-protector
-CONFIGURE_ARGS+=	--enable-introspection
+LDFLAGS+=	-fstack-protector
+LIBS+=		-L${LOCALBASE}/lib
 INSTALL_TARGET=	install-strip
 
 SHLIB_VER=	1.0
diff --git a/games/gnome-chess/Makefile b/games/gnome-chess/Makefile
index c0d36085f74f..b099c6d78f11 100644
--- a/games/gnome-chess/Makefile
+++ b/games/gnome-chess/Makefile
@@ -16,14 +16,14 @@ BUILD_DEPENDS=	crafty:${PORTSDIR}/games/crafty \
 		xmllint:${PORTSDIR}/textproc/libxml2 \
 		p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser
 
-USES=		gmake pathfix pkgconfig desktop-file-utils shared-mime-info tar:xz
+USES=		gmake pkgconfig desktop-file-utils shared-mime-info tar:xz
 USE_GL=		gl glu
-USE_GNOME=	gtk30 librsvg2
+USE_GNOME=	gtk30 intlhack librsvg2
 INSTALLS_OMF=	yes
 INSTALLS_ICONS=	yes
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
+LIBS+=		-L${LOCALBASE}/lib
 MAKE_ARGS=	XML_I18N_UPDATE="${TRUE}" XML_I18N_EXTRACT="${TRUE}"
 DATADIR=	${PREFIX}/share/gnome-chess
 
diff --git a/games/klavaro/Makefile b/games/klavaro/Makefile
index e4b8a12add49..dd667b5a3196 100644
--- a/games/klavaro/Makefile
+++ b/games/klavaro/Makefile
@@ -12,25 +12,16 @@ COMMENT=	Touchtyping trainer
 
 LICENSE=	GPLv3
 
-LIB_DEPENDS=	libpthread-stubs.so:${PORTSDIR}/devel/libpthread-stubs \
-		libpcre.so:${PORTSDIR}/devel/pcre \
-		libcurl.so:${PORTSDIR}/ftp/curl \
-		libcairo.so:${PORTSDIR}/graphics/cairo \
-		libpng15.so:${PORTSDIR}/graphics/png \
-		libfreetype.so:${PORTSDIR}/print/freetype2 \
-		libexpat.so:${PORTSDIR}/textproc/expat2 \
-		libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig \
+LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl \
 		libgtkdatabox.so:${PORTSDIR}/x11-toolkits/gtkdatabox
 
-USES=		pkgconfig gettext gmake iconv pathfix tar:bzip2
-USE_XORG=	pixman x11 xau xcb xcomposite xcursor xdamage xdmcp xext \
-		xfixes xi xinerama xrandr xrender
-USE_GNOME=	gtk20
+USES=		pkgconfig gettext gmake iconv tar:bzip2
+USE_GNOME=	gtk20 intlhack
 USE_LDCONFIG=	yes
 INSTALLS_ICONS=	yes
 
 CPPFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include/gtkdatabox
-LDFLAGS+=	-L${LOCALBASE}/lib -rdynamic
+LIBS+=		-L${LOCALBASE}/lib
 
 GNU_CONFIGURE=	yes
 
diff --git a/graphics/gimp-save-for-web/Makefile b/graphics/gimp-save-for-web/Makefile
index a945e42d3eef..b9aad25c362e 100644
--- a/graphics/gimp-save-for-web/Makefile
+++ b/graphics/gimp-save-for-web/Makefile
@@ -13,12 +13,11 @@ COMMENT=	GIMP Save For Web plugin
 LIB_DEPENDS=	libgimp-2.0.so:${PORTSDIR}/graphics/gimp-app
 BUILD_DEPENDS=	p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser
 
-USES=		gettext gmake pkgconfig pathfix perl5 tar:bzip2
-USE_PERL5=	build
 GNU_CONFIGURE=	yes
+CPPFLAGS+=	-I${LOCALBASE}/include
+LIBS+=		-L${LOCALBASE}/lib
+USES=		gettext gmake perl5 pkgconfig tar:bzip2
+USE_PERL5=	build
 USE_GNOME=	intltool
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|GMSGFMT = @GMSGFMT@|GMSGFMT = @MSGFMT@|g' ${WRKSRC}/po/Makefile.in.in
-
 .include <bsd.port.mk>
diff --git a/graphics/ocrfeeder/Makefile b/graphics/ocrfeeder/Makefile
index 71609c471434..f804183256be 100644
--- a/graphics/ocrfeeder/Makefile
+++ b/graphics/ocrfeeder/Makefile
@@ -23,12 +23,14 @@ RUN_DEPENDS:=	${PYTHON_PKGNAMEPREFIX}lxml>0:${PORTSDIR}/devel/py-lxml \
 		gtkspell3>0:${PORTSDIR}/textproc/gtkspell3 \
 		${BUILD_DEPENDS}
 
-USES=		desktop-file-utils gettext gmake pathfix pkgconfig tar:xz
+USES=		desktop-file-utils gettext gmake pkgconfig tar:xz
 USE_GNOME=	gnomedocutils gnomehier gtk30 librsvg2 pygobject3
 USE_GHOSTSCRIPT=yes
 USE_PYTHON=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-silent-rules
+CPPFLAGS+=	-I${LOCALBASE}/include
+LIBS+=		-L${LOCALBASE}/lib
 
 post-patch:
 	@${REINPLACE_CMD} -e \
diff --git a/japanese/libskk/Makefile b/japanese/libskk/Makefile
index 3bfdc1e10ad6..9008e9bc3f21 100644
--- a/japanese/libskk/Makefile
+++ b/japanese/libskk/Makefile
@@ -17,12 +17,14 @@ BUILD_DEPENDS=	valac:${PORTSDIR}/lang/vala \
 LIB_DEPENDS=	libgee.so:${PORTSDIR}/devel/libgee06 \
 		libjson-glib-1.0.so:${PORTSDIR}/devel/json-glib
 
-USES=		gmake libtool pathfix pkgconfig
-USE_GNOME=	intltool introspection:build
 GNU_CONFIGURE=	yes
+INSTALL_TARGET=	install-strip
+USES=		gmake libtool pathfix pkgconfig
+USE_GNOME=	intlhack introspection:build
 USE_LDCONFIG=	yes
 
 CPPFLAGS+=	-I${LOCALBASE}/include
+LIBS+=		-L${LOCALBASE}/lib
 
 PORTDOCS=	ChangeLog NEWS README
 
@@ -33,8 +35,6 @@ NLS_CONFIGURE_ENABLE=	nls
 NLS_USES=	gettext
 
 post-install:
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libskk.so.0
-
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
diff --git a/korean/ibus-hangul/Makefile b/korean/ibus-hangul/Makefile
index 38e3956a7125..c6298d0c1b1b 100644
--- a/korean/ibus-hangul/Makefile
+++ b/korean/ibus-hangul/Makefile
@@ -17,10 +17,12 @@ LIB_DEPENDS=	libhangul.so:${PORTSDIR}/korean/libhangul \
 PROJECTHOST=	ibus
 
 GNU_CONFIGURE=	yes
+CPPFLAGS+=	-I${LOCALBASE}/include
+LIBS+=		-L${LOCALBASE}/lib
 INSTALLS_ICONS=	yes
-USE_GNOME=	intltool pygobject3
+USES=		gmake libtool pkgconfig
+USE_GNOME=	intlhack pygobject3
 USE_PYTHON=	yes
-USES=		gmake libtool pathfix pkgconfig
 
 OPTIONS_DEFINE=	NLS
 OPTIONS_SUB=	NLS
diff --git a/math/gcalctool/Makefile b/math/gcalctool/Makefile
index c6899179ebdd..b275878a1d7c 100644
--- a/math/gcalctool/Makefile
+++ b/math/gcalctool/Makefile
@@ -15,11 +15,11 @@ COMMENT=	GNOME 2 calculator tool based on the old calctool for OpenWindows
 
 CONFLICTS=	gcalctool-2.31.*
 
-USES=		bison gettext gmake libtool pathfix pkgconfig tar:bzip2
+USES=		bison gettext gmake libtool pkgconfig tar:bzip2
 GNU_CONFIGURE=	yes
 USE_GNOME=	gnomeprefix intlhack gconf2 gnomedocutils gtk20
 CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
+LIBS+=		-L${LOCALBASE}/lib
 
 GLIB_SCHEMAS=	org.gnome.gcalctool.gschema.xml
 
diff --git a/math/libqalculate/Makefile b/math/libqalculate/Makefile
index 4a5b588abcac..574c706897d1 100644
--- a/math/libqalculate/Makefile
+++ b/math/libqalculate/Makefile
@@ -13,15 +13,17 @@ COMMENT=	Multi-purpose desktop calculator (backend library)
 LIB_DEPENDS=	libcln.so:${PORTSDIR}/math/cln
 
 USES=		pkgconfig pathfix gmake libtool
-USE_GNOME=	glib20 intlhack libxml2
+USE_GNOME=	glib20 intltool libxml2
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
+CPPFLAGS+=	-I${LOCALBASE}/include
+LIBS+=		-L${LOCALBASE}/lib
+INSTALL_TARGET=	install-strip
 
 OPTIONS_DEFINE=	NLS
 OPTIONS_SUB=	yes
 
-NLS_USES=		gettext
-NLS_CONFIGURE_ENV=	GMSGFMT="${LOCALBASE}/bin/msgfmt"
+NLS_USES=	gettext
 
 .include <bsd.port.options.mk>
 
@@ -30,11 +32,5 @@ post-patch:
 	@${REINPLACE_CMD} -e '/^SUBDIRS =/s|po ||g' ${WRKSRC}/Makefile.in
 .endif
 	@${REINPLACE_CMD} -e '/^SUBDIRS =/s|docs||g' ${WRKSRC}/Makefile.in
-	@${REINPLACE_CMD} -e 's/-lpthread/${PTHREAD_LIBS}/g' \
-		${WRKSRC}/${CONFIGURE_SCRIPT} \
-		${WRKSRC}/libqalculate.pc.in
-
-post-install:
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libqalculate.so*
 
 .include <bsd.port.mk>
diff --git a/math/mate-calc/Makefile b/math/mate-calc/Makefile
index 9dafb21d9a8c..d0583e49e136 100644
--- a/math/mate-calc/Makefile
+++ b/math/mate-calc/Makefile
@@ -14,12 +14,12 @@ BUILD_DEPENDS=	itstool:${PORTSDIR}/textproc/itstool
 
 PORTSCOUT=	limitw:1,even
 
-USES=		gettext gmake pathfix pkgconfig tar:xz
+USES=		gettext gmake pkgconfig tar:xz
 USE_GNOME=	glib20 gnomehier gtk20 intlhack libxml2
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-gtk=2.0
 CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
+LIBS+=		-L${LOCALBASE}/lib
 
 GLIB_SCHEMAS=	org.mate.calc.gschema.xml
 
diff --git a/math/qalculate/Makefile b/math/qalculate/Makefile
index 5dbe214b1ddc..83414ce4fac0 100644
--- a/math/qalculate/Makefile
+++ b/math/qalculate/Makefile
@@ -17,9 +17,11 @@ LIB_DEPENDS=	libqalculate.so:${PORTSDIR}/math/libqalculate
 RUN_DEPENDS=	gnuplot:${PORTSDIR}/math/gnuplot \
 		wget:${PORTSDIR}/ftp/wget
 
+USES=		gettext gmake
 USE_GNOME=	gnomehier libglade2 libgnome
-USES=		gettext gmake pathfix
 GNU_CONFIGURE=	yes
+CPPFLAGS+=	-I${LOCALBASE}/include
+LIBS+=		-L${LOCALBASE}/lib
 INSTALLS_OMF=	yes
 
 post-patch:
diff --git a/multimedia/banshee/Makefile b/multimedia/banshee/Makefile
index c06c9d2e9af2..114fedc4dcb5 100644
--- a/multimedia/banshee/Makefile
+++ b/multimedia/banshee/Makefile
@@ -45,6 +45,8 @@ INSTALLS_ICONS=	yes
 INSTALL_TARGET=	install-strip
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--with-vendor-build-id=FreeBSD\ BSD\#\ Project --disable-gio-hardware --disable-boo
+CPPFLAGS+=	-I${LOCALBASE}/include
+LIBS+=		-L${LOCALBASE}/lib
 
 .include <bsd.port.options.mk>
 
diff --git a/multimedia/freetuxtv/Makefile b/multimedia/freetuxtv/Makefile
index 0f451b0b40fb..789d3d1bc780 100644
--- a/multimedia/freetuxtv/Makefile
+++ b/multimedia/freetuxtv/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	freetuxtv
 PORTVERSION=	0.6.5
-PORTREVISION=	15
+PORTREVISION=	16
 CATEGORIES=	multimedia
 MASTER_SITES=	GOOGLE_CODE
 
@@ -12,26 +12,19 @@ COMMENT=	WebTV player based on GTK2+ and LibVLC
 
 LICENSE=	GPLv3
 
-BUILD_DEPENDS=	p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser
 LIB_DEPENDS=	libvlc.so:${PORTSDIR}/multimedia/vlc \
 		libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \
 		libsqlite3.so:${PORTSDIR}/databases/sqlite3 \
 		libcurl.so:${PORTSDIR}/ftp/curl \
 		libnotify.so:${PORTSDIR}/devel/libnotify \
-		libpthread-stubs.so:${PORTSDIR}/devel/libpthread-stubs \
-		libpcre.so:${PORTSDIR}/devel/pcre \
-		libpng15.so:${PORTSDIR}/graphics/png \
-		libfreetype.so:${PORTSDIR}/print/freetype2 \
-		libexpat.so:${PORTSDIR}/textproc/expat2 \
-		libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig
 
-USES=		gmake iconv libtool pathfix pkgconfig
-USE_GNOME=	gtk20 cairo
-USE_XORG=	pixman x11 xau xcb xcomposite xcursor xdamage xdmcp xext xfixes \
-		xi xinerama xrandr xrender
+USES=		gmake iconv libtool pkgconfig
+USE_GNOME=	gtk20
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=--with-gtk=2.0
+CONFIGURE_ARGS=	--with-gtk=2.0
 CFLAGS+=	-Wno-return-type -w
+CPPFLAGS+=	-I${LOCALBASE}/include
+LIBS+=		-L${LOCALBASE}/lib
 INSTALLS_ICONS=	yes
 
 PORTDOCS=	AUTHORS ChangeLog README
@@ -48,7 +41,7 @@ SUB_FILES=	pkg-message
 PORTSCOUT=	ignore:1
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|$${pkgdatadir}/doc|$${PREFIX}/share/doc/${PORTNAME}|' \
+	@${REINPLACE_CMD} -e 's|$${pkgdatadir}/doc|$${pkgdocdir}|' \
 		-e 's|install-data-am: install-freetuxtvdocDATA|install-data-am: |' \
 		${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} -e 's/libvlc_media_new_path/libvlc_media_new_location/' \
diff --git a/multimedia/imagination/Makefile b/multimedia/imagination/Makefile
index b876bcfd2dfc..49d5aa5e0bc6 100644
--- a/multimedia/imagination/Makefile
+++ b/multimedia/imagination/Makefile
@@ -14,8 +14,10 @@ LIB_DEPENDS=	libsox.so:${PORTSDIR}/audio/sox \
 		libavcodec.so:${PORTSDIR}/multimedia/ffmpeg
 
 GNU_CONFIGURE=	yes
-USES=		gmake pkgconfig pathfix libtool
-USE_GNOME=	gtk20 intltool intlhack libxslt
+CPPFLAGS+=	-I${LOCALBASE}/include
+LIBS+=		-L${LOCALBASE}/lib
+USES=		gmake pkgconfig libtool
+USE_GNOME=	gtk20 intltool libxslt
 INSTALLS_ICONS=	yes
 INSTALL_TARGET=	install-strip
 
diff --git a/net-im/ekiga/Makefile b/net-im/ekiga/Makefile
index 4b3181c18dc8..926c4e50b814 100644
--- a/net-im/ekiga/Makefile
+++ b/net-im/ekiga/Makefile
@@ -21,14 +21,14 @@ LIB_DEPENDS=	libboost_signals.so:${PORTSDIR}/devel/boost-libs \
 RUN_DEPENDS=	gnome-icon-theme>=3.0.0:${PORTSDIR}/misc/gnome-icon-theme
 
 GNU_CONFIGURE=	yes
-USES=		gettext gmake libtool pathfix perl5 pkgconfig tar:xz
+USES=		gettext gmake libtool perl5 pkgconfig tar:xz
 USE_XORG=	xv
 USE_GNOME=	gtk20 intltool libxml2
 INSTALLS_OMF=	yes
 INSTALLS_ICONS=	yes
 
 CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-I${LOCALBASE}/lib
+LIBS+=		-L${LOCALBASE}/lib
 
 OPTIONS_DEFINE=	LDAP NOTIFY EVOLUTION GCONF DBUS AVAHI GNOMEHELP
 OPTIONS_DEFAULT=NOTIFY DBUS GCONF AVAHI
diff --git a/net-im/folks04/Makefile b/net-im/folks04/Makefile
index f3d716f51cc9..01a59a43fc20 100644
--- a/net-im/folks04/Makefile
+++ b/net-im/folks04/Makefile
@@ -23,7 +23,7 @@ USE_LDCONFIG=	yes
 USE_GNOME=	intlhack gnomehier introspection:build
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
+LIBS+=		-L${LOCALBASE}/lib
 INSTALL_TARGET=	install-strip
 
 PLIST_SUB=	VERSION=22
diff --git a/net/mediastreamer/Makefile b/net/mediastreamer/Makefile
index 23a43c6f7b82..4cdbd67b8750 100644
--- a/net/mediastreamer/Makefile
+++ b/net/mediastreamer/Makefile
@@ -25,7 +25,7 @@ CPPFLAGS+=	-I${LOCALBASE}/include
 LIBS+=		-L${LOCALBASE}/lib
 INSTALL_TARGET=	install-strip
 USES=		gmake libtool pathfix pkgconfig
-USE_GNOME=	gnomehier intltool
+USE_GNOME=	gnomehier intlhack
 USE_LDCONFIG=	yes
 
 OPTIONS_DEFINE=		IPV6 NLS UPNP VIDEO
diff --git a/print/cups-pk-helper/Makefile b/print/cups-pk-helper/Makefile
index 1296d2b54985..08e5292ebaaf 100644
--- a/print/cups-pk-helper/Makefile
+++ b/print/cups-pk-helper/Makefile
@@ -13,11 +13,11 @@ COMMENT=	Helper that makes system-config-printer use PolicyKit
 LIB_DEPENDS=	libcups.so:${PORTSDIR}/print/cups-client \
 		libpolkit-gobject-1.so:${PORTSDIR}/sysutils/polkit
 
-USE_GNOME=	glib20 intlhack
-USES=		gettext gmake pathfix pkgconfig tar:xz
+USE_GNOME=	glib20 intltool
+USES=		gettext gmake pkgconfig tar:xz
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/libs
+LIBS+=		-L${LOCALBASE}/lib
 INSTALL_TARGET=	install-strip
 
 .include <bsd.port.mk>
diff --git a/print/gribouy/Makefile b/print/gribouy/Makefile
index fd2b6b97f447..fd44659776ba 100644
--- a/print/gribouy/Makefile
+++ b/print/gribouy/Makefile
@@ -10,9 +10,11 @@ MASTER_SITES=	LOCAL/bland
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Gribouy is a Type1 font editor
 
-USES=		gmake pkgconfig pathfix gettext
-USE_GNOME=	gnomeprefix libglade2 libgnomeui
 GNU_CONFIGURE=	yes
+CPPFLAGS+=	-I${LOCALBASE}/include
+LIBS+=		-L${LOCALBASE}/lib
+USES=		gettext gmake pkgconfig
+USE_GNOME=	gnomeprefix libglade2 libgnomeui
 
 USE_GCC=	any
 
diff --git a/science/gramps/Makefile b/science/gramps/Makefile
index 6ad151b0ab99..ad775b27781a 100644
--- a/science/gramps/Makefile
+++ b/science/gramps/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	gramps
 PORTVERSION=	3.4.8
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	science gnome python
 MASTER_SITES=	SF/${PORTNAME}/Stable/${PORTVERSION}
 
@@ -19,12 +19,14 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}bsddb>0:${PORTSDIR}/databases/py-bsddb \
 
 USE_BDB=	5+
 USE_PYTHON=	yes
-USES=		desktop-file-utils gettext pathfix shared-mime-info gmake
+USES=		desktop-file-utils gettext shared-mime-info gmake
 USE_GNOME=	pygtk2
 GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--disable-mime-install
+CPPFLAGS+=	-I${LOCALBASE}/include
+LIBS+=		-L${LOCALBASE}/lib
 INSTALLS_OMF=	yes
 INSTALLS_ICONS=	yes
-CONFIGURE_ENV+=	GMSGFMT="${LOCALBASE}/bin/msgfmt"
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 OPTIONS_DEFINE=	ENCHANT PYWEBKITGTK GNOME GRAPHVIZ EXIV
diff --git a/science/gramps/pkg-plist b/science/gramps/pkg-plist
index 67a4e954ab17..a9da716ef77a 100644
--- a/science/gramps/pkg-plist
+++ b/science/gramps/pkg-plist
@@ -3149,23 +3149,7 @@ share/locale/vi/LC_MESSAGES/gramps.mo
 share/locale/zh_CN/LC_MESSAGES/gramps.mo
 share/mime-info/gramps.keys
 share/mime-info/gramps.mime
-share/mime/XMLnamespaces
-share/mime/aliases
-share/mime/application/x-geneweb.xml
-share/mime/application/x-gramps-package.xml
-share/mime/application/x-gramps-xml.xml
-share/mime/application/x-gramps.xml
-share/mime/generic-icons
-share/mime/globs
-share/mime/globs2
-share/mime/icons
-share/mime/magic
-share/mime/mime.cache
 share/mime/packages/gramps.xml
-share/mime/subclasses
-share/mime/treemagic
-share/mime/types
-share/mime/version
 share/pixmaps/gramps.png
 @dirrmtry man/cs/man1
 @dirrmtry man/cs
@@ -3255,4 +3239,3 @@ share/pixmaps/gramps.png
 @dirrmtry share/icons/gnome/scalable/mimetypes
 @dirrmtry share/icons/gnome/scalable
 @dirrmtry share/icons/gnome
-@dirrmtry share/mime/application
diff --git a/security/fpm2/Makefile b/security/fpm2/Makefile
index c03bec91852c..159593ef522e 100644
--- a/security/fpm2/Makefile
+++ b/security/fpm2/Makefile
@@ -13,10 +13,12 @@ LICENSE=	GPLv2
 
 BUILD_DEPENDS=	p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser
 
-USES=		gmake pathfix pkgconfig tar:bzip2
+USES=		gmake pkgconfig tar:bzip2
 USE_GNOME=	gtk20
 INSTALLS_OMF=	yes
 GNU_CONFIGURE=	yes
+CPPFLAGS+=	-I${LOCALBASE}/include
+LIBS+=		-L${LOCALBASE}/lib
 
 PORTDOCS=	AUTHORS ChangeLog README
 
diff --git a/security/libsecret/Makefile b/security/libsecret/Makefile
index a568f1d84060..1a9afec44407 100644
--- a/security/libsecret/Makefile
+++ b/security/libsecret/Makefile
@@ -19,6 +19,8 @@ USES=		gettext gmake libtool:keepla pathfix pkgconfig tar:xz
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--enable-introspection --disable-vala
+CPPFLAGS+=	-I${LOCALBASE}/include
+LIBS+=		-L${LOCALBASE}/lib
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libsecret-1.so.0
diff --git a/sysutils/gnome-schedule/Makefile b/sysutils/gnome-schedule/Makefile
index 43f79c02d8d4..361ff6a59ff2 100644
--- a/sysutils/gnome-schedule/Makefile
+++ b/sysutils/gnome-schedule/Makefile
@@ -25,6 +25,8 @@ USE_PYTHON=	yes
 USE_GNOME=	gnomeprefix pygnome2
 INSTALLS_OMF=	yes
 GNU_CONFIGURE=	yes
+CPPFLAGS+=	-I${LOCALBASE}/include
+LIBS+=		-L${LOCALBASE}/lib
 INSTALL_TARGET=	install-strip
 
 APPLET_CONFIGURE_ENABLE=	applet
diff --git a/textproc/lasem/Makefile b/textproc/lasem/Makefile
index 4d907677aeab..d16df16dd794 100644
--- a/textproc/lasem/Makefile
+++ b/textproc/lasem/Makefile
@@ -16,6 +16,8 @@ LICENSE=	GPLv2
 RUN_DEPENDS=	${LOCALBASE}/lib/X11/fonts/stix:${PORTSDIR}/x11-fonts/stix-fonts
 
 GNU_CONFIGURE=	yes
+CPPFLAGS+=	-I${LOCALBASE}/include
+LIBS+=		-L${LOCALBASE}/lib
 USES=		gettext gmake libtool pathfix pkgconfig tar:xz
 USE_GNOME=	glib20 pango intltool gdkpixbuf2 libxml2 introspection:build
 
diff --git a/x11-themes/lxappearance/Makefile b/x11-themes/lxappearance/Makefile
index b5970b11971e..5ca19f2ce609 100644
--- a/x11-themes/lxappearance/Makefile
+++ b/x11-themes/lxappearance/Makefile
@@ -15,8 +15,10 @@ LIB_DEPENDS=	libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib
 
 USES=		gmake pathfix pkgconfig tar:xz
 GNU_CONFIGURE=	yes
-USE_GNOME=	gtk20 intlhack
+USE_GNOME=	gtk20
 CONFIGURE_ARGS=	--enable-dbus
+CPPFLAGS+=	-I${LOCALBASE}/include
+LIBS+=		-L${LOCALBASE}/lib
 
 PORTDOCS=	AUTHORS README
 
diff --git a/x11-wm/compiz/Makefile b/x11-wm/compiz/Makefile
index a3675f5bbf33..bf2e4f03da1d 100644
--- a/x11-wm/compiz/Makefile
+++ b/x11-wm/compiz/Makefile
@@ -60,7 +60,8 @@ GCONF_SCHEMAS=	gwd.schemas \
 		compiz-zoom.schemas
 
 CONFIGURE_ARGS=	--disable-kde4 --disable-kde
-LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
+CPPFLAGS+=	-I${LOCALBASE}/include
+LIBS+=		-L${LOCALBASE}/lib
 
 OPTIONS_DEFINE=	SVG GTK2 METACITY GNOME DBUS FUSE
 OPTIONS_DEFAULT=	SVG GTK2 METACITY GNOME DBUS
diff --git a/x11-wm/plank/Makefile b/x11-wm/plank/Makefile
index e451ab6e67f0..e9fee96f38be 100644
--- a/x11-wm/plank/Makefile
+++ b/x11-wm/plank/Makefile
@@ -15,11 +15,13 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	vapigen:${PORTSDIR}/lang/vala-vapigen
 LIB_DEPENDS=	libbamf3.so:${PORTSDIR}/sysutils/bamf \
-	libgee-0.8.so:${PORTSDIR}/devel/libgee
+		libgee-0.8.so:${PORTSDIR}/devel/libgee
 
-USES=	tar:xz pkgconfig gmake pathfix libtool
+USES=		tar:xz pkgconfig gmake pathfix libtool
 GNU_CONFIGURE=	yes
-USE_GNOME=	glib20 gtk30 gdkpixbuf2 libxml2 libwnck3
+CPPFLAGS+=	-I${LOCALBASE}/include
+LIBS+=		-L${LOCALBASE}/lib
+USE_GNOME=	glib20 gtk30 gdkpixbuf2 intlhack libxml2 libwnck3
 USE_XORG=	x11
 INSTALLS_ICONS=	yes
 OPTIONS_SUB=	yes
diff --git a/x11/avant-window-navigator/Makefile b/x11/avant-window-navigator/Makefile
index fe51b3256d0c..11f7872613e3 100644
--- a/x11/avant-window-navigator/Makefile
+++ b/x11/avant-window-navigator/Makefile
@@ -24,7 +24,7 @@ USE_LDCONFIG=	yes
 INSTALLS_ICONS=	yes
 USE_XORG=	x11 xproto xcomposite xrender
 CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
+LIBS+=		-L${LOCALBASE}/lib
 
 AWN_DESKTOP?=	agnostic
 
diff --git a/x11/avant-window-navigator/files/patch-configure b/x11/avant-window-navigator/files/patch-configure
new file mode 100644
index 000000000000..664411230ee7
--- /dev/null
+++ b/x11/avant-window-navigator/files/patch-configure
@@ -0,0 +1,11 @@
+--- configure.orig	2009-05-02 19:05:57 UTC
++++ configure
+@@ -21567,6 +21567,8 @@
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ 
+         # save current global flags
++        ac_save_LIBS="$LIBS"
++        ac_save_CPPFLAGS="$CPPFLAGS"
+         LIBS="$ac_save_LIBS $PYTHON_LDFLAGS"
+         CPPFLAGS="$ac_save_CPPFLAGS $PYTHON_CPPFLAGS"
+         cat >conftest.$ac_ext <<_ACEOF
diff --git a/x11/mate-dialogs/Makefile b/x11/mate-dialogs/Makefile
index cd4760c9833b..8bf7f52e816c 100644
--- a/x11/mate-dialogs/Makefile
+++ b/x11/mate-dialogs/Makefile
@@ -14,12 +14,12 @@ BUILD_DEPENDS=	itstool:${PORTSDIR}/textproc/itstool
 
 PORTSCOUT=	limitw:1,even
 
-USES=		gettext gmake pathfix pkgconfig tar:xz
-USE_GNOME=	gnomehier gtk20 intlhack
+USES=		gettext gmake pkgconfig tar:xz
+USE_GNOME=	gnomehier gtk20
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-gtk=2.0
 CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-I${LOCALBASE}/lib
+LIBS+=		-L${LOCALBASE}/lib
 
 OPTIONS_DEFINE=	NOTIFY
 OPTIONS_DEFAULT=NOTIFY
diff --git a/x11/workrave/Makefile b/x11/workrave/Makefile
index 8b4ae36c812d..b03f83be924f 100644
--- a/x11/workrave/Makefile
+++ b/x11/workrave/Makefile
@@ -25,7 +25,7 @@ CONFIGURE_ARGS=	--disable-silent-rules --enable-gconf --disable-gnome3 \
 INSTALLS_ICONS=	yes
 
 CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
+LIBS+=		-L${LOCALBASE}/lib
 
 OPTIONS_DEFINE=		GNOME GSTREAMER PULSEAUDIO
 OPTIONS_DEFAULT=	GSTREAMER
diff --git a/x11/xkeyboard-config/Makefile b/x11/xkeyboard-config/Makefile
index 469fa64f66bb..119c6f097ea6 100644
--- a/x11/xkeyboard-config/Makefile
+++ b/x11/xkeyboard-config/Makefile
@@ -22,7 +22,7 @@ INSTALL_TARGET=	install-strip
 CONFIGURE_ARGS=	--with-xkb-base=${PREFIX}/share/X11/xkb \
 		--with-xkb-rules-symlink=xorg
 CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
+LIBS+=		-L${LOCALBASE}/lib
 
 OPTIONS_DEFINE=	ETERSOFT
 ETERSOFT_DESC=	Add pre-1918 Russian letters to typographic layout