Sync with ports.

https://lists.freebsd.org/pipermail/svn-ports-head/2014-September/073739.html
ports commit r369260


git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@19910 df743ca5-7f9a-e211-a948-0013205c9059

8 files changed, 19 insertions, 14 deletions

diff --git a/Mk/bsd.gnome.mk b/Mk/bsd.gnome.mk
index 2641e20cc..8b122c160 100644
--- a/Mk/bsd.gnome.mk
+++ b/Mk/bsd.gnome.mk
@@ -479,11 +479,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 353493bb5..150204a3c 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/devel/gsettings-desktop-schemas/Makefile b/devel/gsettings-desktop-schemas/Makefile
index 7efed5f4e..94560f5e0 100644
--- a/devel/gsettings-desktop-schemas/Makefile
+++ b/devel/gsettings-desktop-schemas/Makefile
@@ -19,6 +19,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.gschema.xml \
diff --git a/devel/libpeas/Makefile b/devel/libpeas/Makefile
index 4d145731d..7e8a16016 100644
--- a/devel/libpeas/Makefile
+++ b/devel/libpeas/Makefile
@@ -16,12 +16,12 @@ BUILD_DEPENDS=	valac:${PORTSDIR}/lang/vala
 
 USES=		gettext gmake libtool pathfix pkgconfig \
 		python:3 tar:xz
-USE_GNOME=	gtk30 introspection:build
+USE_GNOME=	gtk30 intlhack introspection:build
 USE_LDCONFIG=	yes
 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 \
 		--disable-python2
diff --git a/games/gnome-chess/Makefile b/games/gnome-chess/Makefile
index c446e036b..fc4b83af4 100644
--- a/games/gnome-chess/Makefile
+++ b/games/gnome-chess/Makefile
@@ -14,15 +14,14 @@ COMMENT=	Gnome chess
 BUILD_DEPENDS=	vala:${PORTSDIR}/lang/vala \
 		itstool:${PORTSDIR}/textproc/itstool
 
-USES=		desktop-file-utils gettext gmake pathfix \
-		pkgconfig tar:xz
+USES=		desktop-file-utils gettext gmake pkgconfig tar:xz
 USE_GNOME=	gtk30 intlhack librsvg2 libxml2:build
 INSTALLS_ICONS=	yes
 USE_XORG=	x11
 USE_GL=		gl glu
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
+LIBS+=		-L${LOCALBASE}/lib
 
 GLIB_SCHEMAS=	org.gnome.gnome-chess.gschema.xml
 
diff --git a/math/gnome-calculator/Makefile b/math/gnome-calculator/Makefile
index 40ec2f4fd..be441f3c5 100644
--- a/math/gnome-calculator/Makefile
+++ b/math/gnome-calculator/Makefile
@@ -13,11 +13,11 @@ COMMENT=	GNOME 3 calculator tool
 
 BUILD_DEPENDS=	itstool:${PORTSDIR}/textproc/itstool
 
-USES=		gettext gmake pathfix pkgconfig tar:xz
+USES=		gettext gmake pkgconfig tar:xz
 USE_GNOME=	gnomeprefix gtksourceview3 gtk30 intlhack libxml2
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
+LIBS+=		-L${LOCALBASE}/lib
 GLIB_SCHEMAS=	org.gnome.calculator.gschema.xml
 
 .include <bsd.port.mk>
diff --git a/net-im/folks/Makefile b/net-im/folks/Makefile
index b96eea8eb..8b90e0684 100644
--- a/net-im/folks/Makefile
+++ b/net-im/folks/Makefile
@@ -25,7 +25,7 @@ USE_GNOME=	evolutiondataserver3 gnomehier intlhack \
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-bluez-backend
 CPPFLAGS+=	-I${LOCALBASE}/include -Wno-error=deprecated-declarations
-LDFLAGS+=	-L${LOCALBASE}/lib
+LIBS+=		-L${LOCALBASE}/lib
 INSTALL_TARGET=	install-strip
 
 GLIB_SCHEMAS=	org.freedesktop.folks.gschema.xml
diff --git a/security/libsecret/Makefile b/security/libsecret/Makefile
index d48f3c525..4417c8b57 100644
--- a/security/libsecret/Makefile
+++ b/security/libsecret/Makefile
@@ -21,5 +21,7 @@ USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--enable-introspection
 INSTALL_TARGET=	install-strip
+CPPFLAGS+=	-I${LOCALBASE}/include
+LIBS+=		-L${LOCALBASE}/lib
 
 .include <bsd.port.mk>