7 files changed, 86 insertions, 7 deletions

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