- Get the translations installed (Make configure able to detect

  gettext and add it to LIB_DEPENDS.). [1]
- INSTALLS_SHLIB added to the Makefile (Only in case a library
  get installed by the port.)
- remove NO_FILTER_SHLIB
- Replaced GNU_CONFIGURE with USE_LIBTOOL if INSTALLS_SHLIB was
  set in the Makefile
- bump PORTREVISION

Noted By:	Dinesh Nadarajah <dinesh_list@sbcglobal.net> [1]

24 files changed, 283 insertions, 26 deletions

diff --git a/audio/xfce4-mixer/Makefile b/audio/xfce4-mixer/Makefile
index 1f370e622ec5..3d6dd22fd29b 100644
--- a/audio/xfce4-mixer/Makefile
+++ b/audio/xfce4-mixer/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xfce4-mixer
 PORTVERSION=	4.0.0
+PORTREVISION=	1
 CATEGORIES=	audio xfce
 MASTER_SITES=	http://www.xfce.org/archive/xfce-${PORTVERSION}/src/ \
 		http://linux.imp.mx/xfce4/xfce_${PORTVERSION}/src/
@@ -16,7 +17,8 @@ MAINTAINER=	oliver@FreeBSD.org
 COMMENT=	XFce 4 volume mixer module for xfce4-panel
 
 BUILD_DEPENDS=	xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
-LIB_DEPENDS=	xfce4util.1:${PORTSDIR}/x11/libxfce4util \
+LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext \
+		xfce4util.1:${PORTSDIR}/x11/libxfce4util \
 		xfcegui4.1:${PORTSDIR}/x11-toolkits/libxfce4gui \
 		xml2.5:${PORTSDIR}/textproc/libxml2 \
 		startup-notification-1.0:${PORTSDIR}/x11/startup-notification
@@ -24,7 +26,11 @@ RUN_DEPENDS=	xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
 
 USE_GNOME=	gtk20
 USE_X_PREFIX=	yes
-GNU_CONFIGURE=	yes
+USE_LIBTOOL=	yes
+INSTALLS_SHLIB=	yes
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_ENV=	CFLAGS=-I${LOCALBASE}/include \
+		CPPFLAGS=-I${LOCALBASE}/include \
+		LIBS=-L${LOCALBASE}/lib
 
 .include <bsd.port.mk>
diff --git a/audio/xfce4-mixer/pkg-plist b/audio/xfce4-mixer/pkg-plist
index 486ce45bb196..eac000ebd136 100644
--- a/audio/xfce4-mixer/pkg-plist
+++ b/audio/xfce4-mixer/pkg-plist
@@ -1,5 +1,18 @@
 lib/xfce4/panel-plugins/libmixer.a
 lib/xfce4/panel-plugins/libmixer.la
 lib/xfce4/panel-plugins/libmixer.so
+share/locale/ca/LC_MESSAGES/xfce4-mixer.mo
+share/locale/de/LC_MESSAGES/xfce4-mixer.mo
+share/locale/fr/LC_MESSAGES/xfce4-mixer.mo
+share/locale/hu/LC_MESSAGES/xfce4-mixer.mo
+share/locale/it/LC_MESSAGES/xfce4-mixer.mo
+share/locale/lt/LC_MESSAGES/xfce4-mixer.mo
+share/locale/ms/LC_MESSAGES/xfce4-mixer.mo
+share/locale/nl/LC_MESSAGES/xfce4-mixer.mo
+share/locale/pt_PT/LC_MESSAGES/xfce4-mixer.mo
+share/locale/ru/LC_MESSAGES/xfce4-mixer.mo
+share/locale/tr/LC_MESSAGES/xfce4-mixer.mo
+share/locale/zh_CN/LC_MESSAGES/xfce4-mixer.mo
+share/locale/zh_TW/LC_MESSAGES/xfce4-mixer.mo
 @unexec rmdir %D/lib/xfce4/panel-plugins 2>/dev/null || true
 @unexec rmdir %D/lib/xfce4 2>/dev/null || true
diff --git a/games/xfce4-toys/Makefile b/games/xfce4-toys/Makefile
index b95d71d65bf0..b381a94253f2 100644
--- a/games/xfce4-toys/Makefile
+++ b/games/xfce4-toys/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xfce4-toys
 PORTVERSION=	4.0.0
+PORTREVISION=	1
 CATEGORIES=	games xfce
 MASTER_SITES=	http://www.xfce.org/archive/xfce-${PORTVERSION}/src/ \
 		http://linux.imp.mx/xfce4/xfce_${PORTVERSION}/src/
@@ -16,14 +17,19 @@ MAINTAINER=	oliver@FreeBSD.org
 COMMENT=	Toys for the XFce 4 panel
 
 BUILD_DEPENDS=	xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
-LIB_DEPENDS=	xfcegui4.1:${PORTSDIR}/x11-toolkits/libxfce4gui \
+LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext \
+		xfcegui4.1:${PORTSDIR}/x11-toolkits/libxfce4gui \
 		xml2.5:${PORTSDIR}/textproc/libxml2 \
 		startup-notification-1.0:${PORTSDIR}/x11/startup-notification
 RUN_DEPENDS=	xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
 
 USE_GNOME=	gtk20
 USE_X_PREFIX=	yes
-GNU_CONFIGURE=	yes
+USE_LIBTOOL=	yes
+INSTALLS_SHLIB=	yes
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_ENV=	CFLAGS=-I${LOCALBASE}/include \
+		CPPFLAGS=-I${LOCALBASE}/include \
+		LIBS=-L${LOCALBASE}/lib
 
 .include <bsd.port.mk>
diff --git a/games/xfce4-toys/pkg-plist b/games/xfce4-toys/pkg-plist
index a682acb01ab2..0119d1686a6e 100644
--- a/games/xfce4-toys/pkg-plist
+++ b/games/xfce4-toys/pkg-plist
@@ -2,6 +2,17 @@ bin/xfce4-tips
 lib/xfce4/panel-plugins/libeyes.a
 lib/xfce4/panel-plugins/libeyes.la
 lib/xfce4/panel-plugins/libeyes.so
+share/locale/ca/LC_MESSAGES/xfce4-toys.mo
+share/locale/de/LC_MESSAGES/xfce4-toys.mo
+share/locale/hu/LC_MESSAGES/xfce4-toys.mo
+share/locale/lt/LC_MESSAGES/xfce4-toys.mo
+share/locale/ms/LC_MESSAGES/xfce4-toys.mo
+share/locale/nl/LC_MESSAGES/xfce4-toys.mo
+share/locale/pt_PT/LC_MESSAGES/xfce4-toys.mo
+share/locale/ru/LC_MESSAGES/xfce4-toys.mo
+share/locale/tr/LC_MESSAGES/xfce4-toys.mo
+share/locale/zh_CN/LC_MESSAGES/xfce4-toys.mo
+share/locale/zh_TW/LC_MESSAGES/xfce4-toys.mo
 share/xfce4/eyes/themes/Bizarre/Bizarre-eye.png
 share/xfce4/eyes/themes/Bizarre/Bizarre-pupil.png
 share/xfce4/eyes/themes/Bizarre/config
diff --git a/misc/xfce4-iconbox/Makefile b/misc/xfce4-iconbox/Makefile
index 4600611d34c7..5e321187e820 100644
--- a/misc/xfce4-iconbox/Makefile
+++ b/misc/xfce4-iconbox/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xfce4-iconbox
 PORTVERSION=	4.0.0
+PORTREVISION=	1
 CATEGORIES=	misc xfce
 MASTER_SITES=	http://www.xfce.org/archive/xfce-${PORTVERSION}/src/ \
 		http://linux.imp.mx/xfce4/xfce_${PORTVERSION}/src/
@@ -16,12 +17,17 @@ MAINTAINER=	oliver@FreeBSD.org
 COMMENT=	XFce 4 icon box, an alternative taskbar
 
 BUILD_DEPENDS=	xfce-mcs-manager:${PORTSDIR}/sysutils/xfce4-mcs-manager
-LIB_DEPENDS=	xfce4util.1:${PORTSDIR}/x11/libxfce4util \
+LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext \
+		xfce4util.1:${PORTSDIR}/x11/libxfce4util \
 		xfcegui4.1:${PORTSDIR}/x11-toolkits/libxfce4gui
 
 USE_GNOME=	gtk20
 USE_X_PREFIX=	yes
-GNU_CONFIGURE=	yes
+USE_LIBTOOL=	yes
+INSTALLS_SHLIB=	yes
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_ENV=	CFLAGS=-I${LOCALBASE}/include \
+		CPPFLAGS=-I${LOCALBASE}/include \
+		LIBS=-L${LOCALBASE}/lib
 
 .include <bsd.port.mk>
diff --git a/misc/xfce4-iconbox/pkg-plist b/misc/xfce4-iconbox/pkg-plist
index 0f8a185eaac9..d3606b2cbc9a 100644
--- a/misc/xfce4-iconbox/pkg-plist
+++ b/misc/xfce4-iconbox/pkg-plist
@@ -2,5 +2,20 @@ bin/xfce4-iconbox
 lib/xfce4/mcs-plugins/xfce4-iconbox_settings.a
 lib/xfce4/mcs-plugins/xfce4-iconbox_settings.la
 lib/xfce4/mcs-plugins/xfce4-iconbox_settings.so
+share/locale/ca/LC_MESSAGES/xfce4-iconbox.mo
+share/locale/de/LC_MESSAGES/xfce4-iconbox.mo
+share/locale/es/LC_MESSAGES/xfce4-iconbox.mo
+share/locale/es_MX/LC_MESSAGES/xfce4-iconbox.mo
+share/locale/fr/LC_MESSAGES/xfce4-iconbox.mo
+share/locale/hu/LC_MESSAGES/xfce4-iconbox.mo
+share/locale/it/LC_MESSAGES/xfce4-iconbox.mo
+share/locale/lt/LC_MESSAGES/xfce4-iconbox.mo
+share/locale/ms/LC_MESSAGES/xfce4-iconbox.mo
+share/locale/nl/LC_MESSAGES/xfce4-iconbox.mo
+share/locale/pt_PT/LC_MESSAGES/xfce4-iconbox.mo
+share/locale/ru/LC_MESSAGES/xfce4-iconbox.mo
+share/locale/tr/LC_MESSAGES/xfce4-iconbox.mo
+share/locale/zh_CN/LC_MESSAGES/xfce4-iconbox.mo
+share/locale/zh_TW/LC_MESSAGES/xfce4-iconbox.mo
 @unexec rmdir %D/lib/xfce4/mcs-plugins 2>/dev/null || true
 @unexec rmdir %D/lib/xfce4 2>/dev/null || true
diff --git a/print/xfce4-print/Makefile b/print/xfce4-print/Makefile
index fee279cbe7de..bf7b6f82adda 100644
--- a/print/xfce4-print/Makefile
+++ b/print/xfce4-print/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xfce4-print
 PORTVERSION=	4.0.0
+PORTREVISION=	1
 CATEGORIES=	print xfce
 MASTER_SITES=	http://www.xfce.org/archive/xfce-${PORTVERSION}/src/ \
 		http://linux.imp.mx/xfce4/xfce_${PORTVERSION}/src/
@@ -16,13 +17,17 @@ DIST_SUBDIR=	xfce4
 MAINTAINER=	oliver@FreeBSD.org
 COMMENT=	XFce 4 graphical frontend for printing
 
-LIB_DEPENDS=	xfce4util.1:${PORTSDIR}/x11/libxfce4util \
+LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext \
+		xfce4util.1:${PORTSDIR}/x11/libxfce4util \
 		xfcegui4.1:${PORTSDIR}/x11-toolkits/libxfce4gui
 
 USE_GNOME=	gtk20
 USE_X_PREFIX=	yes
-GNU_CONFIGURE=	yes
+USE_LIBTOOL=	yes
+INSTALLS_SHLIB=	yes
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
-NO_FILTER_SHLIBS=	yes
+CONFIGURE_ENV=	CFLAGS=-I${LOCALBASE}/include \
+		CPPFLAGS=-I${LOCALBASE}/include \
+		LIBS=-L${LOCALBASE}/lib
 
 .include <bsd.port.mk>
diff --git a/print/xfce4-print/pkg-plist b/print/xfce4-print/pkg-plist
index f770c28a7b3f..cfb52148e29d 100644
--- a/print/xfce4-print/pkg-plist
+++ b/print/xfce4-print/pkg-plist
@@ -4,3 +4,21 @@ lib/libxfprint.a
 lib/libxfprint.la
 lib/libxfprint.so
 lib/libxfprint.so.0
+share/locale/ca/LC_MESSAGES/xfprint.mo
+share/locale/de/LC_MESSAGES/xfprint.mo
+share/locale/es/LC_MESSAGES/xfprint.mo
+share/locale/es_MX/LC_MESSAGES/xfprint.mo
+share/locale/fr/LC_MESSAGES/xfprint.mo
+share/locale/hu/LC_MESSAGES/xfprint.mo
+share/locale/ja/LC_MESSAGES/xfprint.mo
+share/locale/lt/LC_MESSAGES/xfprint.mo
+share/locale/ms/LC_MESSAGES/xfprint.mo
+share/locale/nl/LC_MESSAGES/xfprint.mo
+share/locale/pl/LC_MESSAGES/xfprint.mo
+share/locale/pt_PT/LC_MESSAGES/xfprint.mo
+share/locale/ru/LC_MESSAGES/xfprint.mo
+share/locale/ta/LC_MESSAGES/xfprint.mo
+share/locale/tr/LC_MESSAGES/xfprint.mo
+share/locale/zh_CN/LC_MESSAGES/xfprint.mo
+share/locale/zh_TW/LC_MESSAGES/xfprint.mo
+
diff --git a/sysutils/xfce4-mcs-manager/Makefile b/sysutils/xfce4-mcs-manager/Makefile
index 5d9622761a26..935e72ab9494 100644
--- a/sysutils/xfce4-mcs-manager/Makefile
+++ b/sysutils/xfce4-mcs-manager/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xfce4-mcs-manager
 PORTVERSION=	4.0.0
+PORTREVISION=	1
 CATEGORIES=	sysutils xfce
 MASTER_SITES=	http://www.xfce.org/archive/xfce-${PORTVERSION}/src/ \
 		http://linux.imp.mx/xfce4/xfce_${PORTVERSION}/src/
@@ -16,7 +17,8 @@ DIST_SUBDIR=	xfce4
 MAINTAINER=	oliver@FreeBSD.org
 COMMENT=	XFce 4 settings manager
 
-LIB_DEPENDS=	xfce4util.1:${PORTSDIR}/x11/libxfce4util \
+LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext \
+		xfce4util.1:${PORTSDIR}/x11/libxfce4util \
 		xfcegui4.1:${PORTSDIR}/x11-toolkits/libxfce4gui \
 		xfce4mcs-manager.1:${PORTSDIR}/x11/libxfce4mcs
 
@@ -25,6 +27,9 @@ USE_REINPLACE=	yes
 USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_ENV=	CFLAGS=-I${LOCALBASE}/include \
+		CPPFLAGS=-I${LOCALBASE}/include \
+		LIBS=-L${LOCALBASE}/lib
 
 post-patch:
 	${REINPLACE_CMD} -e 's|$$(libdir)/pkgconfig|${PREFIX}/libdata/pkgconfig|g' \
diff --git a/sysutils/xfce4-mcs-manager/pkg-plist b/sysutils/xfce4-mcs-manager/pkg-plist
index 54c4b24e42b4..15705a16f0bf 100644
--- a/sysutils/xfce4-mcs-manager/pkg-plist
+++ b/sysutils/xfce4-mcs-manager/pkg-plist
@@ -2,6 +2,27 @@ bin/xfce-setting-show
 bin/xfce-mcs-manager
 include/xfce4/xfce-mcs-manager/manager-plugin.h
 libdata/pkgconfig/xfce-mcs-manager.pc
+share/locale/ar/LC_MESSAGES/xfce-mcs-manager.mo
+share/locale/ca/LC_MESSAGES/xfce-mcs-manager.mo
+share/locale/de/LC_MESSAGES/xfce-mcs-manager.mo
+share/locale/es/LC_MESSAGES/xfce-mcs-manager.mo
+share/locale/es_MX/LC_MESSAGES/xfce-mcs-manager.mo
+share/locale/fi/LC_MESSAGES/xfce-mcs-manager.mo
+share/locale/fr/LC_MESSAGES/xfce-mcs-manager.mo
+share/locale/hu/LC_MESSAGES/xfce-mcs-manager.mo
+share/locale/it/LC_MESSAGES/xfce-mcs-manager.mo
+share/locale/ja/LC_MESSAGES/xfce-mcs-manager.mo
+share/locale/ko/LC_MESSAGES/xfce-mcs-manager.mo
+share/locale/lt/LC_MESSAGES/xfce-mcs-manager.mo
+share/locale/ms/LC_MESSAGES/xfce-mcs-manager.mo
+share/locale/nl/LC_MESSAGES/xfce-mcs-manager.mo
+share/locale/pl/LC_MESSAGES/xfce-mcs-manager.mo
+share/locale/pt_PT/LC_MESSAGES/xfce-mcs-manager.mo
+share/locale/ru/LC_MESSAGES/xfce-mcs-manager.mo
+share/locale/ta/LC_MESSAGES/xfce-mcs-manager.mo
+share/locale/tr/LC_MESSAGES/xfce-mcs-manager.mo
+share/locale/zh_CN/LC_MESSAGES/xfce-mcs-manager.mo
+share/locale/zh_TW/LC_MESSAGES/xfce-mcs-manager.mo
 share/xfce4/doc/C/images/settings_manager.png
 share/xfce4/doc/C/images/smgr_from_panel.png
 share/xfce4/doc/C/images/smgr_from_root_menu.png
diff --git a/sysutils/xfce4-mcs-plugins/Makefile b/sysutils/xfce4-mcs-plugins/Makefile
index c32e55bfc3f3..ccf237f156e7 100644
--- a/sysutils/xfce4-mcs-plugins/Makefile
+++ b/sysutils/xfce4-mcs-plugins/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xfce4-mcs-plugins
 PORTVERSION=	4.0.0
+PORTREVISION=	1
 CATEGORIES=	sysutils xfce
 MASTER_SITES=	http://www.xfce.org/archive/xfce-${PORTVERSION}/src/ \
 		http://linux.imp.mx/xfce4/xfce_${PORTVERSION}/src/
@@ -17,12 +18,17 @@ MAINTAINER=	oliver@FreeBSD.org
 COMMENT=	XFce 4 settings manager plugins
 
 BUILD_DEPENDS=	xfce-mcs-manager:${PORTSDIR}/sysutils/xfce4-mcs-manager
-LIB_DEPENDS=	xfce4util.1:${PORTSDIR}/x11/libxfce4util \
+LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext \
+		xfce4util.1:${PORTSDIR}/x11/libxfce4util \
 		xfcegui4.1:${PORTSDIR}/x11-toolkits/libxfce4gui
 
 USE_GNOME=	gtk20
 USE_X_PREFIX=	yes
-GNU_CONFIGURE=	yes
+USE_LIBTOOL=	yes
+INSTALLS_SHLIB=	yes
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_ENV=	CFLAGS=-I${LOCALBASE}/include \
+		CPPFLAGS=-I${LOCALBASE}/include \
+		LIBS=-L${LOCALBASE}/lib
 
 .include <bsd.port.mk>
diff --git a/sysutils/xfce4-mcs-plugins/pkg-plist b/sysutils/xfce4-mcs-plugins/pkg-plist
index cfc90d81cdb5..7f8d9bcc93e8 100644
--- a/sysutils/xfce4-mcs-plugins/pkg-plist
+++ b/sysutils/xfce4-mcs-plugins/pkg-plist
@@ -7,6 +7,27 @@ lib/xfce4/mcs-plugins/mouse_plugin.so
 lib/xfce4/mcs-plugins/ui_plugin.a
 lib/xfce4/mcs-plugins/ui_plugin.la
 lib/xfce4/mcs-plugins/ui_plugin.so
+share/locale/ar/LC_MESSAGES/xfce-mcs-plugins.mo
+share/locale/ca/LC_MESSAGES/xfce-mcs-plugins.mo
+share/locale/de/LC_MESSAGES/xfce-mcs-plugins.mo
+share/locale/es/LC_MESSAGES/xfce-mcs-plugins.mo
+share/locale/es_MX/LC_MESSAGES/xfce-mcs-plugins.mo
+share/locale/fi/LC_MESSAGES/xfce-mcs-plugins.mo
+share/locale/fr/LC_MESSAGES/xfce-mcs-plugins.mo
+share/locale/hu/LC_MESSAGES/xfce-mcs-plugins.mo
+share/locale/it/LC_MESSAGES/xfce-mcs-plugins.mo
+share/locale/ja/LC_MESSAGES/xfce-mcs-plugins.mo
+share/locale/ko/LC_MESSAGES/xfce-mcs-plugins.mo
+share/locale/lt/LC_MESSAGES/xfce-mcs-plugins.mo
+share/locale/ms/LC_MESSAGES/xfce-mcs-plugins.mo
+share/locale/nl/LC_MESSAGES/xfce-mcs-plugins.mo
+share/locale/pl/LC_MESSAGES/xfce-mcs-plugins.mo
+share/locale/pt_PT/LC_MESSAGES/xfce-mcs-plugins.mo
+share/locale/ru/LC_MESSAGES/xfce-mcs-plugins.mo
+share/locale/ta/LC_MESSAGES/xfce-mcs-plugins.mo
+share/locale/tr/LC_MESSAGES/xfce-mcs-plugins.mo
+share/locale/zh_CN/LC_MESSAGES/xfce-mcs-plugins.mo
+share/locale/zh_TW/LC_MESSAGES/xfce-mcs-plugins.mo
 share/xfce4/doc/C/images/font_selection.png
 share/xfce4/doc/C/images/keyboard_settings.png
 share/xfce4/doc/C/images/mouse_settings.png
diff --git a/sysutils/xfce4-utils/Makefile b/sysutils/xfce4-utils/Makefile
index 1ba831dfcab7..ad5d372ea938 100644
--- a/sysutils/xfce4-utils/Makefile
+++ b/sysutils/xfce4-utils/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xfce4-utils
 PORTVERSION=	4.0.0
+PORTREVISION=	1
 CATEGORIES=	sysutils xfce
 MASTER_SITES=	http://www.xfce.org/archive/xfce-${PORTVERSION}/src/ \
 		http://linux.imp.mx/xfce4/xfce_${PORTVERSION}/src/
@@ -16,13 +17,18 @@ DIST_SUBDIR=	xfce4
 MAINTAINER=	oliver@FreeBSD.org
 COMMENT=	XFce 4 essential utilities and scripts
 
-LIB_DEPENDS=	xfce4util.1:${PORTSDIR}/x11/libxfce4util \
+LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext \
+		xfce4util.1:${PORTSDIR}/x11/libxfce4util \
 		xfcegui4.1:${PORTSDIR}/x11-toolkits/libxfce4gui \
 		xfce4mcs-manager.1:${PORTSDIR}/sysutils/xfce4-mcs-manager
 
 USE_GNOME=	gtk20
 USE_X_PREFIX=	yes
-GNU_CONFIGURE=	yes
+USE_LIBTOOL=	yes
+INSTALLS_SHLIB=	yes
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_ENV=	CFLAGS=-I${LOCALBASE}/include \
+		CPPFLAGS=-I${LOCALBASE}/include \
+		LIBS=-L${LOCALBASE}/lib
 
 .include <bsd.port.mk>
diff --git a/sysutils/xfce4-utils/pkg-plist b/sysutils/xfce4-utils/pkg-plist
index 70224ef0d883..b0e78e01580c 100644
--- a/sysutils/xfce4-utils/pkg-plist
+++ b/sysutils/xfce4-utils/pkg-plist
@@ -10,6 +10,26 @@ etc/xfce4/xinitrc
 lib/xfce4/mcs-plugins/xftaskbar_plugin.a
 lib/xfce4/mcs-plugins/xftaskbar_plugin.la
 lib/xfce4/mcs-plugins/xftaskbar_plugin.so
+share/locale/ca/LC_MESSAGES/xfce-utils.mo
+share/locale/de/LC_MESSAGES/xfce-utils.mo
+share/locale/es/LC_MESSAGES/xfce-utils.mo
+share/locale/es_MX/LC_MESSAGES/xfce-utils.mo
+share/locale/fi/LC_MESSAGES/xfce-utils.mo
+share/locale/fr/LC_MESSAGES/xfce-utils.mo
+share/locale/hu/LC_MESSAGES/xfce-utils.mo
+share/locale/it/LC_MESSAGES/xfce-utils.mo
+share/locale/ja/LC_MESSAGES/xfce-utils.mo
+share/locale/ko/LC_MESSAGES/xfce-utils.mo
+share/locale/lt/LC_MESSAGES/xfce-utils.mo
+share/locale/ms/LC_MESSAGES/xfce-utils.mo
+share/locale/nl/LC_MESSAGES/xfce-utils.mo
+share/locale/pl/LC_MESSAGES/xfce-utils.mo
+share/locale/pt_PT/LC_MESSAGES/xfce-utils.mo
+share/locale/ru/LC_MESSAGES/xfce-utils.mo
+share/locale/ta/LC_MESSAGES/xfce-utils.mo
+share/locale/tr/LC_MESSAGES/xfce-utils.mo
+share/locale/zh_CN/LC_MESSAGES/xfce-utils.mo
+share/locale/zh_TW/LC_MESSAGES/xfce-utils.mo
 share/xfce4/AUTHORS
 share/xfce4/AUTHORS.ca
 share/xfce4/AUTHORS.de
diff --git a/x11-fm/xfce4-fm/Makefile b/x11-fm/xfce4-fm/Makefile
index 60eb8907f499..c91de679a26f 100644
--- a/x11-fm/xfce4-fm/Makefile
+++ b/x11-fm/xfce4-fm/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xfce4-fm
 PORTVERSION=	4.0.0
+PORTREVISION=	1
 CATEGORIES=	x11-fm xfce
 MASTER_SITES=	http://www.xfce.org/archive/xfce-${PORTVERSION}/src/ \
 		http://linux.imp.mx/xfce4/xfce_${PORTVERSION}/src/
@@ -17,7 +18,8 @@ MAINTAINER=	oliver@FreeBSD.org
 COMMENT=	XFce 4 file manager
 
 BUILD_DEPENDS=	xfce-mcs-manager:${PORTSDIR}/sysutils/xfce4-mcs-manager
-LIB_DEPENDS=	dbh.1:${PORTSDIR}/databases/dbh \
+LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext \
+		dbh.1:${PORTSDIR}/databases/dbh \
 		xml2.5:${PORTSDIR}/textproc/libxml2 \
 		xfce4util.1:${PORTSDIR}/x11/libxfce4util \
 		xfcegui4.1:${PORTSDIR}/x11-toolkits/libxfce4gui
@@ -26,9 +28,12 @@ USE_GNOME=	gtk20
 USE_REINPLACE=	yes
 USE_X_PREFIX=	yes
 USE_XPM=	yes
-GNU_CONFIGURE=	yes
+USE_LIBTOOL=	yes
+INSTALLS_SHLIB=	yes
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
-NO_FILTER_SHLIBS=	yes
+CONFIGURE_ENV=	CFLAGS=-I${LOCALBASE}/include \
+		CPPFLAGS=-I${LOCALBASE}/include \
+		LIBS=-L${LOCALBASE}/lib
 
 MAN1=		fgr.1
 
diff --git a/x11-fm/xfce4-fm/pkg-plist b/x11-fm/xfce4-fm/pkg-plist
index e9aa09e22f5e..a012c83836ad 100644
--- a/x11-fm/xfce4-fm/pkg-plist
+++ b/x11-fm/xfce4-fm/pkg-plist
@@ -42,6 +42,20 @@ lib/libxffmsmb.so.0
 lib/xfce4/mcs-plugins/libxffmsettings.la
 lib/xfce4/mcs-plugins/libxffmsettings.so
 libdata/pkgconfig/xffm-1.0.pc
+share/locale/ca/LC_MESSAGES/xffm.mo
+share/locale/de/LC_MESSAGES/xffm.mo
+share/locale/es/LC_MESSAGES/xffm.mo
+share/locale/es_MX/LC_MESSAGES/xffm.mo
+share/locale/fr/LC_MESSAGES/xffm.mo
+share/locale/hu/LC_MESSAGES/xffm.mo
+share/locale/ja/LC_MESSAGES/xffm.mo
+share/locale/lt/LC_MESSAGES/xffm.mo
+share/locale/ms/LC_MESSAGES/xffm.mo
+share/locale/nl/LC_MESSAGES/xffm.mo
+share/locale/pt_PT/LC_MESSAGES/xffm.mo
+share/locale/tr/LC_MESSAGES/xffm.mo
+share/locale/zh_CN/LC_MESSAGES/xffm.mo
+share/locale/zh_TW/LC_MESSAGES/xffm.mo
 share/xfce4/doc/C/xffm.html
 share/xffm/AUTHORS
 share/xffm/applications.xml
diff --git a/x11-toolkits/libxfce4gui/Makefile b/x11-toolkits/libxfce4gui/Makefile
index af0a79afe2bf..f614a23de2c5 100644
--- a/x11-toolkits/libxfce4gui/Makefile
+++ b/x11-toolkits/libxfce4gui/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	libxfce4gui
 PORTVERSION=	4.0.0
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits xfce
 MASTER_SITES=	http://www.xfce.org/archive/xfce-${PORTVERSION}/src/ \
 		http://linux.imp.mx/xfce4/xfce_${PORTVERSION}/src/
@@ -21,11 +22,10 @@ LIB_DEPENDS=	xfce4util.1:${PORTSDIR}/x11/libxfce4util
 USE_GNOME=	gtk20
 USE_REINPLACE=	yes
 USE_X_PREFIX=	yes
-GNU_CONFIGURE=	yes
+USE_LIBTOOL=	yes
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--enable-xinerama
 INSTALLS_SHLIB=	yes
-NO_FILTER_SHLIBS=	yes
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|$$(libdir)/pkgconfig|${PREFIX}/libdata/pkgconfig|g' \
diff --git a/x11-wm/xfce4-desktop/Makefile b/x11-wm/xfce4-desktop/Makefile
index 4905a0f84050..2bb5374d2a20 100644
--- a/x11-wm/xfce4-desktop/Makefile
+++ b/x11-wm/xfce4-desktop/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xfce4-desktop
 PORTVERSION=	4.0.0
+PORTREVISION=	1
 CATEGORIES=	x11-wm xfce
 MASTER_SITES=	http://www.xfce.org/archive/xfce-${PORTVERSION}/src/ \
 		http://linux.imp.mx/xfce4/xfce_${PORTVERSION}/src/
@@ -17,14 +18,19 @@ MAINTAINER=	oliver@FreeBSD.org
 COMMENT=	XFce 4 desktop background manager and root menu
 
 BUILD_DEPENDS=	xfce-mcs-manager:${PORTSDIR}/sysutils/xfce4-mcs-manager
-LIB_DEPENDS=	xml2.5:${PORTSDIR}/textproc/libxml2 \
+LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext \
+		xml2.5:${PORTSDIR}/textproc/libxml2 \
 		xfce4util.1:${PORTSDIR}/x11/libxfce4util \
 		xfcegui4.1:${PORTSDIR}/x11-toolkits/libxfce4gui
 RUN_DEPENDS=	xfce-mcs-manager:${PORTSDIR}/sysutils/xfce4-mcs-manager
 
 USE_GNOME=	gtk20
 USE_X_PREFIX=	yes
-GNU_CONFIGURE=	yes
+USE_LIBTOOL=	yes
+INSTALLS_SHLIB=	yes
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_ENV=	CFLAGS=-I${LOCALBASE}/include \
+		CPPFLAGS=-I${LOCALBASE}/include \
+		LIBS=-L${LOCALBASE}/lib
 
 .include <bsd.port.mk>
diff --git a/x11-wm/xfce4-desktop/pkg-plist b/x11-wm/xfce4-desktop/pkg-plist
index a1bc58fdb34f..86646fbad9d1 100644
--- a/x11-wm/xfce4-desktop/pkg-plist
+++ b/x11-wm/xfce4-desktop/pkg-plist
@@ -13,6 +13,25 @@ lib/xfce4/mcs-plugins/backdrop_settings.so
 lib/xfce4/mcs-plugins/workspaces_settings.a
 lib/xfce4/mcs-plugins/workspaces_settings.la
 lib/xfce4/mcs-plugins/workspaces_settings.so
+share/locale/ca/LC_MESSAGES/xfdesktop.mo
+share/locale/de/LC_MESSAGES/xfdesktop.mo
+share/locale/es/LC_MESSAGES/xfdesktop.mo
+share/locale/es_MX/LC_MESSAGES/xfdesktop.mo
+share/locale/fi/LC_MESSAGES/xfdesktop.mo
+share/locale/fr/LC_MESSAGES/xfdesktop.mo
+share/locale/hu/LC_MESSAGES/xfdesktop.mo
+share/locale/ja/LC_MESSAGES/xfdesktop.mo
+share/locale/ko/LC_MESSAGES/xfdesktop.mo
+share/locale/lt/LC_MESSAGES/xfdesktop.mo
+share/locale/ms/LC_MESSAGES/xfdesktop.mo
+share/locale/nl/LC_MESSAGES/xfdesktop.mo
+share/locale/pl/LC_MESSAGES/xfdesktop.mo
+share/locale/pt_PT/LC_MESSAGES/xfdesktop.mo
+share/locale/ru/LC_MESSAGES/xfdesktop.mo
+share/locale/ta/LC_MESSAGES/xfdesktop.mo
+share/locale/tr/LC_MESSAGES/xfdesktop.mo
+share/locale/zh_CN/LC_MESSAGES/xfdesktop.mo
+share/locale/zh_TW/LC_MESSAGES/xfdesktop.mo
 share/xfce4/backdrops/flower.png
 share/xfce4/backdrops/xfce4gradientcurve.png
 share/xfce4/backdrops/xfce4logo.png
diff --git a/x11-wm/xfce4-panel/Makefile b/x11-wm/xfce4-panel/Makefile
index 294979d2c42d..dd11a7178a06 100644
--- a/x11-wm/xfce4-panel/Makefile
+++ b/x11-wm/xfce4-panel/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xfce4-panel
 PORTVERSION=	4.0.0
+PORTREVISION=	1
 CATEGORIES=	x11-wm xfce
 MASTER_SITES=	http://www.xfce.org/archive/xfce-${PORTVERSION}/src/ \
 		http://linux.imp.mx/xfce4/xfce_${PORTVERSION}/src/
@@ -16,7 +17,8 @@ MAINTAINER=	oliver@FreeBSD.org
 COMMENT=	XFce 4 panel module
 
 BUILD_DEPENDS=	xfce-mcs-manager:${PORTSDIR}/sysutils/xfce4-mcs-manager
-LIB_DEPENDS=	xml2.5:${PORTSDIR}/textproc/libxml2 \
+LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext \
+		xml2.5:${PORTSDIR}/textproc/libxml2 \
 		startup-notification-1.0:${PORTSDIR}/x11/startup-notification \
 		xfce4util.1:${PORTSDIR}/x11/libxfce4util \
 		xfcegui4.1:${PORTSDIR}/x11-toolkits/libxfce4gui
@@ -24,8 +26,12 @@ LIB_DEPENDS=	xml2.5:${PORTSDIR}/textproc/libxml2 \
 USE_GNOME=	gtk20
 USE_REINPLACE=	yes
 USE_X_PREFIX=	yes
-GNU_CONFIGURE=	yes
+USE_LIBTOOL=	yes
+INSTALLS_SHLIB=	yes
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_ENV=	CFLAGS=-I${LOCALBASE}/include \
+		CPPFLAGS=-I${LOCALBASE}/include \
+		LIBS=-L${LOCALBASE}/lib
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|$$(libdir)/pkgconfig|${PREFIX}/libdata/pkgconfig|g' \
diff --git a/x11-wm/xfce4-panel/pkg-plist b/x11-wm/xfce4-panel/pkg-plist
index 55f7f2fc6834..b5ffeac2d3af 100644
--- a/x11-wm/xfce4-panel/pkg-plist
+++ b/x11-wm/xfce4-panel/pkg-plist
@@ -28,6 +28,26 @@ lib/xfce4/panel-plugins/libswitcher.so
 lib/xfce4/panel-plugins/libsystembuttons.la
 lib/xfce4/panel-plugins/libsystembuttons.so
 libdata/pkgconfig/xfce4-panel-1.0.pc
+share/locale/ca/LC_MESSAGES/xfce4-panel.mo
+share/locale/de/LC_MESSAGES/xfce4-panel.mo
+share/locale/es/LC_MESSAGES/xfce4-panel.mo
+share/locale/es_MX/LC_MESSAGES/xfce4-panel.mo
+share/locale/fi/LC_MESSAGES/xfce4-panel.mo
+share/locale/fr/LC_MESSAGES/xfce4-panel.mo
+share/locale/hi/LC_MESSAGES/xfce4-panel.mo
+share/locale/hu/LC_MESSAGES/xfce4-panel.mo
+share/locale/ja/LC_MESSAGES/xfce4-panel.mo
+share/locale/ko/LC_MESSAGES/xfce4-panel.mo
+share/locale/lt/LC_MESSAGES/xfce4-panel.mo
+share/locale/ms/LC_MESSAGES/xfce4-panel.mo
+share/locale/nl/LC_MESSAGES/xfce4-panel.mo
+share/locale/pl/LC_MESSAGES/xfce4-panel.mo
+share/locale/pt_PT/LC_MESSAGES/xfce4-panel.mo
+share/locale/ru/LC_MESSAGES/xfce4-panel.mo
+share/locale/ta/LC_MESSAGES/xfce4-panel.mo
+share/locale/tr/LC_MESSAGES/xfce4-panel.mo
+share/locale/zh_CN/LC_MESSAGES/xfce4-panel.mo
+share/locale/zh_TW/LC_MESSAGES/xfce4-panel.mo
 share/xfce4/doc/C/images/clock-properties.png
 share/xfce4/doc/C/images/default_panel.png
 share/xfce4/doc/C/images/handle-popup.png
diff --git a/x11-wm/xfce4-systray/Makefile b/x11-wm/xfce4-systray/Makefile
index d8956e168539..dadbad6007e7 100644
--- a/x11-wm/xfce4-systray/Makefile
+++ b/x11-wm/xfce4-systray/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xfce4-systray
 PORTVERSION=	4.0.0
+PORTREVISION=	1
 CATEGORIES=	x11-wm xfce
 MASTER_SITES=	http://www.xfce.org/archive/xfce-${PORTVERSION}/src/ \
 		http://linux.imp.mx/xfce4/xfce_${PORTVERSION}/src/
@@ -24,7 +25,8 @@ RUN_DEPENDS=	xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
 
 USE_GNOME=	gtk20
 USE_X_PREFIX=	yes
-GNU_CONFIGURE=	yes
+USE_LIBTOOL=	yes
+INSTALLS_SHLIB=	yes
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 
 .include <bsd.port.mk>
diff --git a/x11-wm/xfce4-wm/Makefile b/x11-wm/xfce4-wm/Makefile
index 838166356c05..9e05b11fa81d 100644
--- a/x11-wm/xfce4-wm/Makefile
+++ b/x11-wm/xfce4-wm/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xfce4-wm
 PORTVERSION=	4.0.0
+PORTREVISION=	1
 CATEGORIES=	x11-wm xfce
 MASTER_SITES=	http://www.xfce.org/archive/xfce-${PORTVERSION}/src/ \
 		http://linux.imp.mx/xfce4/xfce_${PORTVERSION}/src/
@@ -17,7 +18,8 @@ MAINTAINER=	oliver@FreeBSD.org
 COMMENT=	XFce 4 window manager
 
 BUILD_DEPENDS=	xfce-mcs-manager:${PORTSDIR}/sysutils/xfce4-mcs-manager
-LIB_DEPENDS=	startup-notification-1.0:${PORTSDIR}/x11/startup-notification \
+LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext \
+		startup-notification-1.0:${PORTSDIR}/x11/startup-notification \
 		xfce4util.1:${PORTSDIR}/x11/libxfce4util \
 		xfcegui4.1:${PORTSDIR}/x11-toolkits/libxfce4gui
 RUN_DEPENDS=	xfce-mcs-manager:${PORTSDIR}/sysutils/xfce4-mcs-manager
@@ -25,8 +27,12 @@ RUN_DEPENDS=	xfce-mcs-manager:${PORTSDIR}/sysutils/xfce4-mcs-manager
 USE_GNOME=	gtk20
 USE_X_PREFIX=	yes
 USE_XPM=	yes
-GNU_CONFIGURE=	yes
+USE_LIBTOOL=	yes
+INSTALLS_SHLIB=	yes
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--enable-xinerama
+CONFIGURE_ENV=	CFLAGS=-I${LOCALBASE}/include \
+		CPPFLAGS=-I${LOCALBASE}/include \
+		LIBS=-L${LOCALBASE}/lib
 
 .include <bsd.port.mk>
diff --git a/x11-wm/xfce4-wm/pkg-plist b/x11-wm/xfce4-wm/pkg-plist
index 2b56043d2aa8..7b1233361cc7 100644
--- a/x11-wm/xfce4-wm/pkg-plist
+++ b/x11-wm/xfce4-wm/pkg-plist
@@ -5,6 +5,26 @@ lib/xfce4/mcs-plugins/margins_plugin.so
 lib/xfce4/mcs-plugins/xfwm4_plugin.a
 lib/xfce4/mcs-plugins/xfwm4_plugin.la
 lib/xfce4/mcs-plugins/xfwm4_plugin.so
+share/locale/ar/LC_MESSAGES/xfwm4.mo
+share/locale/ca/LC_MESSAGES/xfwm4.mo
+share/locale/de/LC_MESSAGES/xfwm4.mo
+share/locale/es/LC_MESSAGES/xfwm4.mo
+share/locale/es_MX/LC_MESSAGES/xfwm4.mo
+share/locale/fi/LC_MESSAGES/xfwm4.mo
+share/locale/fr/LC_MESSAGES/xfwm4.mo
+share/locale/hu/LC_MESSAGES/xfwm4.mo
+share/locale/ja/LC_MESSAGES/xfwm4.mo
+share/locale/ko/LC_MESSAGES/xfwm4.mo
+share/locale/lt/LC_MESSAGES/xfwm4.mo
+share/locale/ms/LC_MESSAGES/xfwm4.mo
+share/locale/nl/LC_MESSAGES/xfwm4.mo
+share/locale/pl/LC_MESSAGES/xfwm4.mo
+share/locale/pt_PT/LC_MESSAGES/xfwm4.mo
+share/locale/ru/LC_MESSAGES/xfwm4.mo
+share/locale/ta/LC_MESSAGES/xfwm4.mo
+share/locale/tr/LC_MESSAGES/xfwm4.mo
+share/locale/zh_CN/LC_MESSAGES/xfwm4.mo
+share/locale/zh_TW/LC_MESSAGES/xfwm4.mo
 share/xfce4/doc/C/images/decoration_style.png
 share/xfce4/doc/C/images/keyboard_and_focus.png
 share/xfce4/doc/C/images/misc_wm_prefs.png