Welcome XFCE 4.8 to the portstree!

Special Thanks to:      miwi, Olivier Duchateau <duchateau.olivier@gmail.com>

20 files changed, 299 insertions, 240 deletions

diff --git a/sysutils/thunar-volman-plugin/Makefile b/sysutils/thunar-volman-plugin/Makefile
index 9a52989861b2..9e7da251fd00 100644
--- a/sysutils/thunar-volman-plugin/Makefile
+++ b/sysutils/thunar-volman-plugin/Makefile
@@ -7,9 +7,10 @@
 
 PORTNAME=	thunar-volman
 PORTVERSION=	0.3.80
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	sysutils xfce
-MASTER_SITES=	http://archive.xfce.org/src/apps/${PORTNAME}/${PORTVERSION:R}/
+MASTER_SITES=	${MASTER_SITE_XFCE}
+MASTER_SITE_SUBDIR=/src/apps/${PORTNAME}/${PORTVERSION:R}
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	miwi@FreeBSD.org
@@ -18,6 +19,8 @@ COMMENT=	A Device manager plugin.
 LIB_DEPENDS=	hal.1:${PORTSDIR}/sysutils/hal \
 	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
 
+BROKEN=		Does not work with xfce 4.8
+
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 INSTALLS_ICONS=	yes
diff --git a/sysutils/xfburn/Makefile b/sysutils/xfburn/Makefile
index 97a41e57e117..0411258a6da2 100644
--- a/sysutils/xfburn/Makefile
+++ b/sysutils/xfburn/Makefile
@@ -1,3 +1,4 @@
+
 # New ports collection makefile for:	xfburn
 # Date created:		2008 November 06
 # Whom:			J.R. Oldroyd <fbsd@opal.com>
@@ -6,10 +7,11 @@
 #
 
 PORTNAME=	xfburn
-PORTVERSION=	0.4.1
-PORTREVISION=	8
+PORTVERSION=	0.4.3
 CATEGORIES=	sysutils
-MASTER_SITES=	http://goodies.xfce.org/releases/xfburn/
+MASTER_SITES=	${MASTER_SITE_XFCE}
+MASTER_SITE_SUBDIR=/src/apps/${PORTNAME}/${PORTVERSION:R}
+DIST_SUBDIR=	xfce4
 
 MAINTAINER=	fbsd@opal.com
 COMMENT=	CD/DVD burning tool for Xfce
diff --git a/sysutils/xfburn/distinfo b/sysutils/xfburn/distinfo
index 736939eab116..b1b5e904ed08 100644
--- a/sysutils/xfburn/distinfo
+++ b/sysutils/xfburn/distinfo
@@ -1,3 +1,2 @@
-MD5 (xfburn-0.4.1.tar.bz2) = f5ed76149fd348504d4a75830b4996dc
-SHA256 (xfburn-0.4.1.tar.bz2) = 1967d82539b70935beb4ffff32a79a9478193ccabedc6028c793ee4d78084f42
-SIZE (xfburn-0.4.1.tar.bz2) = 631005
+SHA256 (xfce4/xfburn-0.4.3.tar.bz2) = c9993226f0f4e3dea3326ad320a01c165a7e1a485f07fa4a2583475a4e6eaafe
+SIZE (xfce4/xfburn-0.4.3.tar.bz2) = 652080
diff --git a/sysutils/xfburn/pkg-plist b/sysutils/xfburn/pkg-plist
index e39e864a4135..3a368651fb71 100644
--- a/sysutils/xfburn/pkg-plist
+++ b/sysutils/xfburn/pkg-plist
@@ -63,12 +63,10 @@ share/locale/ja/LC_MESSAGES/xfburn.mo
 share/locale/ko/LC_MESSAGES/xfburn.mo
 share/locale/lt/LC_MESSAGES/xfburn.mo
 share/locale/lv/LC_MESSAGES/xfburn.mo
-share/locale/nb_NO/LC_MESSAGES/xfburn.mo
 share/locale/nl/LC_MESSAGES/xfburn.mo
 share/locale/pa/LC_MESSAGES/xfburn.mo
 share/locale/pl/LC_MESSAGES/xfburn.mo
 share/locale/pt_BR/LC_MESSAGES/xfburn.mo
-share/locale/pt_PT/LC_MESSAGES/xfburn.mo
 share/locale/ru/LC_MESSAGES/xfburn.mo
 share/locale/sq/LC_MESSAGES/xfburn.mo
 share/locale/sv/LC_MESSAGES/xfburn.mo
@@ -77,6 +75,11 @@ share/locale/uk/LC_MESSAGES/xfburn.mo
 share/locale/ur/LC_MESSAGES/xfburn.mo
 share/locale/zh_CN/LC_MESSAGES/xfburn.mo
 share/locale/zh_TW/LC_MESSAGES/xfburn.mo
+share/locale/ast/LC_MESSAGES/xfburn.mo
+share/locale/kk/LC_MESSAGES/xfburn.mo
+share/locale/nb/LC_MESSAGES/xfburn.mo
+share/locale/pt/LC_MESSAGES/xfburn.mo
+share/locale/ur_PK/LC_MESSAGES/xfburn.mo
 @dirrm %%DATADIR%%
 @dirrmtry share/locale/ar/LC_MESSAGES
 @dirrmtry share/locale/ar
@@ -148,6 +151,12 @@ share/locale/zh_TW/LC_MESSAGES/xfburn.mo
 @dirrmtry share/locale/zh_CN
 @dirrmtry share/locale/zh_TW/LC_MESSAGES
 @dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/ast/LC_MESSAGES
+@dirrmtry share/locale/ast
+@dirrmtry share/locale/kk/LC_MESSAGES
+@dirrmtry share/locale/kk
+@dirrmtry share/locale/ur_PK/LC_MESSAGES
+@dirrmtry share/locale/ur_PK
 @dirrmtry share/Thunar/sendto
 @dirrmtry share/Thunar
 @unexec /bin/rm %D/share/icons/hicolor/icon-theme.cache 2>/dev/null || /usr/bin/true
diff --git a/sysutils/xfce4-battery-plugin/Makefile b/sysutils/xfce4-battery-plugin/Makefile
index 6d4a28d2c639..437475bf31ca 100644
--- a/sysutils/xfce4-battery-plugin/Makefile
+++ b/sysutils/xfce4-battery-plugin/Makefile
@@ -7,9 +7,10 @@
 
 PORTNAME=	xfce4-battery-plugin
 PORTVERSION=	0.5.1
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	sysutils xfce
-MASTER_SITES=	http://goodies.xfce.org/releases/${PORTNAME}/
+MASTER_SITES=	${MASTER_SITE_XFCE}
+MASTER_SITE_SUBDIR=/src/panel-plugins/${PORTNAME}/${PORTVERSION:R}
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	miwi@FreeBSD.org
diff --git a/sysutils/xfce4-cpugraph-plugin/Makefile b/sysutils/xfce4-cpugraph-plugin/Makefile
index 08c2b14a33a7..83415009721e 100644
--- a/sysutils/xfce4-cpugraph-plugin/Makefile
+++ b/sysutils/xfce4-cpugraph-plugin/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xfce4-cpugraph-plugin
 PORTVERSION=	1.0.1
+PORTREVISION=	1
 CATEGORIES=	sysutils xfce
 MASTER_SITES=	${MASTER_SITE_XFCE}
 MASTER_SITE_SUBDIR=	src/panel-plugins/${PORTNAME}/${PORTVERSION:R}
diff --git a/sysutils/xfce4-fsguard-plugin/Makefile b/sysutils/xfce4-fsguard-plugin/Makefile
index afb53a210cd7..451c1ca5ba8a 100644
--- a/sysutils/xfce4-fsguard-plugin/Makefile
+++ b/sysutils/xfce4-fsguard-plugin/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xfce4-fsguard-plugin
 PORTVERSION=	1.0.0
+PORTREVISION=	1
 CATEGORIES=	sysutils xfce
 MASTER_SITES=	${MASTER_SITE_XFCE}
 MASTER_SITE_SUBDIR=	src/panel-plugins/${PORTNAME}/${PORTVERSION:R}
diff --git a/sysutils/xfce4-genmon-plugin/Makefile b/sysutils/xfce4-genmon-plugin/Makefile
index 337c5a4b8d8c..76b0107c480f 100644
--- a/sysutils/xfce4-genmon-plugin/Makefile
+++ b/sysutils/xfce4-genmon-plugin/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xfce4-genmon-plugin
 PORTVERSION=	3.2
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	sysutils xfce
 MASTER_SITES=	CRITICAL/xfce4
 DIST_SUBDIR=	xfce4
@@ -20,6 +20,11 @@ USE_BZIP2=	yes
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnometarget gtk20 intltool intlhack pkgconfig
-USE_XFCE=	configenv panel
+USE_XFCE=	configenv libutil libgui panel
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|--libs "libxfce4panel-1.0"|& "libxfcegui4-1.0"|g; \
+		s|--cflags "libxfce4panel-1.0"|& "libxfcegui4-1.0"|g' \
+		${WRKSRC}/configure
 
 .include <bsd.port.mk>
diff --git a/sysutils/xfce4-minicmd-plugin/Makefile b/sysutils/xfce4-minicmd-plugin/Makefile
index 6394ebc8599b..b2a5172f481a 100644
--- a/sysutils/xfce4-minicmd-plugin/Makefile
+++ b/sysutils/xfce4-minicmd-plugin/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xfce4-minicmd-plugin
 PORTVERSION=	0.4
-PORTREVISION=	12
+PORTREVISION=	13
 CATEGORIES=	sysutils xfce
 MASTER_SITES=	ftp://ftp.berlios.de/pub/xfce-goodies/panel-plugins/4.4/
 DIST_SUBDIR=	xfce4
diff --git a/sysutils/xfce4-netload-plugin/Makefile b/sysutils/xfce4-netload-plugin/Makefile
index 3f927f7181fc..732e28cad7b2 100644
--- a/sysutils/xfce4-netload-plugin/Makefile
+++ b/sysutils/xfce4-netload-plugin/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xfce4-netload-plugin
 PORTVERSION=	1.0.0
+PORTREVISION=	1
 CATEGORIES=	sysutils xfce
 MASTER_SITES=	${MASTER_SITE_XFCE}
 MASTER_SITE_SUBDIR=	src/panel-plugins/${PORTNAME}/${PORTVERSION:R}
diff --git a/sysutils/xfce4-places-plugin/Makefile b/sysutils/xfce4-places-plugin/Makefile
index 207c997c3c7c..1ed931091556 100644
--- a/sysutils/xfce4-places-plugin/Makefile
+++ b/sysutils/xfce4-places-plugin/Makefile
@@ -7,20 +7,29 @@
 
 PORTNAME=	xfce4-places-plugin
 PORTVERSION=	1.2.0
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	sysutils xfce
-MASTER_SITES=	http://archive.xfce.org/src/panel-plugins/${PORTNAME}/1.2/
+MASTER_SITES=	${MASTER_SITE_XFCE}
+MASTER_SITE_SUBDIR=/src/panel-plugins/${PORTNAME}/${PORTVERSION:R}
 DIST_SUBDIR=	xfce4
-#DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	A file browser launcher for XFce4 panel plugin
 
+BROKEN=		Does not work with xfce 4.8
+
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnometarget gtk20 intltool intlhack pkgconfig
-USE_XFCE=	configenv panel thunar
+USE_XFCE=	configenv panel thunar thunarvfs
+
+# exo_url_show function is still missing
+#post-patch:
+#	@${REINPLACE_CMD} -e 's|--libs "libxfce4panel-1.0"|& "libxfcegui4-1.0"|g; \
+#		s|--cflags "libxfce4panel-1.0"|& "libxfcegui4-1.0"|g; \
+#		s|exo-0.3|exo-1|g' \
+#		${WRKSRC}/configure
 
 .include <bsd.port.mk>
diff --git a/sysutils/xfce4-power-manager/Makefile b/sysutils/xfce4-power-manager/Makefile
index ded04c017ea2..0ce62daaaf40 100644
--- a/sysutils/xfce4-power-manager/Makefile
+++ b/sysutils/xfce4-power-manager/Makefile
@@ -7,9 +7,10 @@
 
 PORTNAME=	xfce4-power-manager
 PORTVERSION=	0.8.2
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	sysutils xfce
-MASTER_SITES=	http://goodies.xfce.org/releases/${PORTNAME}/
+MASTER_SITES=	${MASTER_SITE_XFCE}
+MASTER_SITE_SUBDIR=/src/apps/${PORTNAME}/${PORTVERSION:R}
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	fbsd@opal.com
@@ -20,8 +21,13 @@ USE_BZIP2=	yes
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnometarget gtk20 intltool intlhack pkgconfig
-USE_XFCE=	configenv panel
+USE_XFCE=	configenv libutil libgui panel
 
 MAN1=		xfce4-power-manager.1 xfce4-power-manager-settings.1
 
+post-patch:
+	@${REINPLACE_CMD} -e 's|--libs "libxfce4panel-1.0"|& "libxfcegui4-1.0"|g; \
+		s|--cflags "libxfce4panel-1.0"|& "libxfcegui4-1.0"|g' \
+		${WRKSRC}/configure
+
 .include <bsd.port.mk>
diff --git a/sysutils/xfce4-settings/Makefile b/sysutils/xfce4-settings/Makefile
index 7997ebf6d9c5..8ebee8442057 100644
--- a/sysutils/xfce4-settings/Makefile
+++ b/sysutils/xfce4-settings/Makefile
@@ -6,16 +6,18 @@
 #
 
 PORTNAME=	xfce4-settings
-PORTVERSION=	4.6.5
+PORTVERSION=	4.8.1
 CATEGORIES=	sysutils xfce
 MASTER_SITES=	${MASTER_SITE_XFCE}
+MASTER_SITE_SUBDIR=	src/xfce/${PORTNAME}/${PORTVERSION:R}
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	oliver@FreeBSD.org
 COMMENT=	XFce 4 settings application
 
-LIB_DEPENDS=	wnck-1.22:${PORTSDIR}/x11-toolkits/libwnck \
-		dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
+CONFLICTS=	xfce4-settings-4.6*
+
+LIB_DEPENDS=	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
 
 OPTIONS=	XKLAVIER	"Keyboard layout settings"		off \
 		XCURSOR		"Enable cursor themes support"		on \
@@ -23,15 +25,16 @@ OPTIONS=	XKLAVIER	"Keyboard layout settings"		off \
 		NOTIFY		"Enable notification support"		on \
 		NLS		"Enable Native Language Support"	on
 
-CONFIGURE_ARGS=	--disable-sound-settings --disable-debug
+CONFIGURE_ARGS=	--disable-sound-settings \
+		--disable-debug
 USE_AUTOTOOLS=	libtool
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnometarget glib20 gtk20 desktopfileutils intltool intlhack \
-		libglade2 pkgconfig
-USE_XFCE=	configenv libexo libgui libutil xfconf
+USE_GNOME=	gnomehack glib20 gtk20 desktopfileutils intltool intlhack \
+		pkgconfig
+USE_XFCE=	configenv libexo libmenu libutil xfconf
 USE_XORG=	x11 xi
 
 .include <bsd.port.pre.mk>
diff --git a/sysutils/xfce4-settings/distinfo b/sysutils/xfce4-settings/distinfo
index 0d28c5a1022d..1b71f8686dbc 100644
--- a/sysutils/xfce4-settings/distinfo
+++ b/sysutils/xfce4-settings/distinfo
@@ -1,3 +1,2 @@
-MD5 (xfce4/xfce4-settings-4.6.5.tar.bz2) = f988cb732913b5fbc115ad7105d2231e
-SHA256 (xfce4/xfce4-settings-4.6.5.tar.bz2) = 1601b8d2cac5d931c39bed7e331c5bd91018d0e56663295e7a083a2c78fe168b
-SIZE (xfce4/xfce4-settings-4.6.5.tar.bz2) = 522389
+SHA256 (xfce4/xfce4-settings-4.8.1.tar.bz2) = 0df5fa505c0a5c0ec0741c0ecb1f18b3fbb59eed39a0b21851ee0379501f1b5a
+SIZE (xfce4/xfce4-settings-4.8.1.tar.bz2) = 660885
diff --git a/sysutils/xfce4-settings/pkg-plist b/sysutils/xfce4-settings/pkg-plist
index b1e1d197ad66..0f77b3c08b26 100644
--- a/sysutils/xfce4-settings/pkg-plist
+++ b/sysutils/xfce4-settings/pkg-plist
@@ -10,37 +10,44 @@ bin/xfsettingsd
 etc/xdg/autostart/xfce4-settings-helper-autostart.desktop
 etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml
 %%XRANDR%%%%NLS%%share/applications/xfce-display-settings.desktop
-%%NLS%%share/applications/xfce-keyboard-settings.desktop
-%%NLS%%share/applications/xfce-mouse-settings.desktop
-%%NLS%%share/applications/xfce-settings-manager.desktop
-%%NLS%%share/applications/xfce-ui-settings.desktop
-%%NLS%%share/applications/xfce4-accessibility-settings.desktop
-%%NLS%%share/applications/xfce4-settings-editor.desktop
-%%NLS%%share/locale/am/LC_MESSAGES/xfce4-settings.mo
+share/applications/xfce-keyboard-settings.desktop
+share/applications/xfce-mouse-settings.desktop
+share/applications/xfce-settings-manager.desktop
+share/applications/xfce-ui-settings.desktop
+share/applications/xfce4-accessibility-settings.desktop
+share/applications/xfce4-settings-editor.desktop
+%%NLS%%share/locale/ar/LC_MESSAGES/xfce4-settings.mo
 %%NLS%%share/locale/ast/LC_MESSAGES/xfce4-settings.mo
+%%NLS%%share/locale/bn/LC_MESSAGES/xfce4-settings.mo
 %%NLS%%share/locale/ca/LC_MESSAGES/xfce4-settings.mo
 %%NLS%%share/locale/cs/LC_MESSAGES/xfce4-settings.mo
 %%NLS%%share/locale/da/LC_MESSAGES/xfce4-settings.mo
 %%NLS%%share/locale/de/LC_MESSAGES/xfce4-settings.mo
 %%NLS%%share/locale/el/LC_MESSAGES/xfce4-settings.mo
+%%NLS%%share/locale/en_GB/LC_MESSAGES/xfce4-settings.mo
 %%NLS%%share/locale/es/LC_MESSAGES/xfce4-settings.mo
 %%NLS%%share/locale/eu/LC_MESSAGES/xfce4-settings.mo
 %%NLS%%share/locale/fi/LC_MESSAGES/xfce4-settings.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/xfce4-settings.mo
 %%NLS%%share/locale/gl/LC_MESSAGES/xfce4-settings.mo
+%%NLS%%share/locale/he/LC_MESSAGES/xfce4-settings.mo
+%%NLS%%share/locale/hr/LC_MESSAGES/xfce4-settings.mo
 %%NLS%%share/locale/hu/LC_MESSAGES/xfce4-settings.mo
 %%NLS%%share/locale/id/LC_MESSAGES/xfce4-settings.mo
+%%NLS%%share/locale/is/LC_MESSAGES/xfce4-settings.mo
 %%NLS%%share/locale/it/LC_MESSAGES/xfce4-settings.mo
 %%NLS%%share/locale/ja/LC_MESSAGES/xfce4-settings.mo
 %%NLS%%share/locale/kk/LC_MESSAGES/xfce4-settings.mo
 %%NLS%%share/locale/lv/LC_MESSAGES/xfce4-settings.mo
 %%NLS%%share/locale/nb/LC_MESSAGES/xfce4-settings.mo
 %%NLS%%share/locale/nl/LC_MESSAGES/xfce4-settings.mo
+%%NLS%%share/locale/pa/LC_MESSAGES/xfce4-settings.mo
 %%NLS%%share/locale/pl/LC_MESSAGES/xfce4-settings.mo
 %%NLS%%share/locale/pt/LC_MESSAGES/xfce4-settings.mo
 %%NLS%%share/locale/pt_BR/LC_MESSAGES/xfce4-settings.mo
 %%NLS%%share/locale/ro/LC_MESSAGES/xfce4-settings.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/xfce4-settings.mo
+%%NLS%%share/locale/si/LC_MESSAGES/xfce4-settings.mo
 %%NLS%%share/locale/sk/LC_MESSAGES/xfce4-settings.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/xfce4-settings.mo
 %%NLS%%share/locale/tr/LC_MESSAGES/xfce4-settings.mo
@@ -49,74 +56,21 @@ etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml
 %%NLS%%share/locale/ur/LC_MESSAGES/xfce4-settings.mo
 %%NLS%%share/locale/ur_PK/LC_MESSAGES/xfce4-settings.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/xfce4-settings.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/xfce4-settings.mo
 @exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
 @unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
-%%NLS%%@dirrmtry share/locale/zh_CN/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/zh_CN
 %%NLS%%@dirrmtry share/locale/ur_PK/LC_MESSAGES
 %%NLS%%@dirrmtry share/locale/ur_PK
 %%NLS%%@dirrmtry share/locale/ur/LC_MESSAGES
 %%NLS%%@dirrmtry share/locale/ur
-%%NLS%%@dirrmtry share/locale/uk/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/uk
 %%NLS%%@dirrmtry share/locale/ug/LC_MESSAGES
 %%NLS%%@dirrmtry share/locale/ug
-%%NLS%%@dirrmtry share/locale/tr/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/tr
-%%NLS%%@dirrmtry share/locale/sv/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/sv
-%%NLS%%@dirrmtry share/locale/sk/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/sk
-%%NLS%%@dirrmtry share/locale/ru/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/ru
-%%NLS%%@dirrmtry share/locale/ro/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/ro
-%%NLS%%@dirrmtry share/locale/pt_BR/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/pt_BR
-%%NLS%%@dirrmtry share/locale/pt/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/pt
-%%NLS%%@dirrmtry share/locale/pl/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/pl
-%%NLS%%@dirrmtry share/locale/nl/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/nl
-%%NLS%%@dirrmtry share/locale/nb/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/nb
-%%NLS%%@dirrmtry share/locale/lv/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/lv
+%%NLS%%@dirrmtry share/locale/si/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/si
 %%NLS%%@dirrmtry share/locale/kk/LC_MESSAGES
 %%NLS%%@dirrmtry share/locale/kk
-%%NLS%%@dirrmtry share/locale/ja/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/ja
-%%NLS%%@dirrmtry share/locale/it/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/it
-%%NLS%%@dirrmtry share/locale/id/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/id
-%%NLS%%@dirrmtry share/locale/hu/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/hu
-%%NLS%%@dirrmtry share/locale/gl/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/gl
-%%NLS%%@dirrmtry share/locale/fr/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/fr
-%%NLS%%@dirrmtry share/locale/fi/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/fi
-%%NLS%%@dirrmtry share/locale/eu/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/eu
-%%NLS%%@dirrmtry share/locale/es/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/es
-%%NLS%%@dirrmtry share/locale/el/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/el
-%%NLS%%@dirrmtry share/locale/de/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/de
-%%NLS%%@dirrmtry share/locale/da/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/da
-%%NLS%%@dirrmtry share/locale/cs/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/cs
-%%NLS%%@dirrmtry share/locale/ca/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/ca
 %%NLS%%@dirrmtry share/locale/ast/LC_MESSAGES
 %%NLS%%@dirrmtry share/locale/ast
-%%NLS%%@dirrmtry share/locale/am/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/am
 @dirrmtry etc/xdg/xfce4/xfconf/xfce-perchannel-xml
 @dirrmtry etc/xdg/xfce4/xfconf
 @dirrmtry etc/xdg/xfce4
diff --git a/sysutils/xfce4-systemload-plugin/Makefile b/sysutils/xfce4-systemload-plugin/Makefile
index 0e3e57b1cfcb..9c3b4048d41c 100644
--- a/sysutils/xfce4-systemload-plugin/Makefile
+++ b/sysutils/xfce4-systemload-plugin/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xfce4-systemload-plugin
 PORTVERSION=	1.0.0
+PORTREVISION=	1
 CATEGORIES=	sysutils xfce
 MASTER_SITES=	${MASTER_SITE_XFCE}
 MASTER_SITE_SUBDIR=	src/panel-plugins/${PORTNAME}/${PORTVERSION:R}
diff --git a/sysutils/xfce4-utils/Makefile b/sysutils/xfce4-utils/Makefile
index b6876446de04..8d2ff24b10cd 100644
--- a/sysutils/xfce4-utils/Makefile
+++ b/sysutils/xfce4-utils/Makefile
@@ -6,25 +6,36 @@
 #
 
 PORTNAME=	xfce4-utils
-PORTVERSION=	4.6.2
+PORTVERSION=	4.8.1
 CATEGORIES=	sysutils xfce
 MASTER_SITES=	${MASTER_SITE_XFCE}
+MASTER_SITE_SUBDIR=	src/xfce/xfce-utils/${PORTVERSION:R}
 DISTNAME=	xfce-utils-${PORTVERSION}
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	oliver@FreeBSD.org
 COMMENT=	XFce 4 essential utilities and scripts
 
-CONFIGURE_ARGS+=--with-xsession-prefix=${PREFIX}
+CONFLICTS=	xfce4-utils-4.6*
+
+BUILD_DEPENDS=	p5-XML-Parser>=2.40:${PORTSDIR}/textproc/p5-XML-Parser
+
+DOCSDIR=	${PREFIX}/share/doc/${PORTNAME:S/4//}
+
+CONFIGURE_ARGS+=--with-xsession-prefix=${PREFIX} \
+		--disable-debug
+USE_AUTOTOOLS=	libtool
 GNU_CONFIGURE=	yes
-INSTALLS_ICONS= yes
+INSTALLS_ICONS=	yes
 USE_BZIP2=	yes
-USE_GETTEXT=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnometarget gtk20 intltool intlhack pkgconfig
-USE_XFCE=	configenv libgui libutil panel
+USE_PERL5=	yes
+USE_GNOME=	gnomehack gtk20 intltool intlhack desktopfileutils pkgconfig
+USE_XFCE=	configenv libgui libmenu libutil xfconf
+USE_XORG=	x11
 
-OPTIONS=	DBUS	"Enable D-BUS support"			on
+OPTIONS=	DBUS	"Enable D-BUS support"			on \
+		NLS "Enable Native Language Support" on
 
 .include <bsd.port.pre.mk>
 
@@ -37,10 +48,22 @@ CONFIGURE_ARGS+=--disable-dbus
 PLIST_SUB+=	WITH_DBUS="@comment "
 .endif
 
+.if !defined(WITHOUT_NLS)
+USE_GETTEXT=	yes
+CONFIGURE_ARGS+=--enable-nls
+PLIST_SUB+=	NLS=""
+.else
+CONFIGURE_ARGS+=--disable-nls
+PLIST_SUB+=	NLS="@comment "
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} 's|/usr/local/share:|${LOCALBASE}/share:|' \
 		${WRKSRC}/scripts/startxfce4.in
 	@${REINPLACE_CMD} 's|/usr/local/share:||' \
 		${WRKSRC}/scripts/startxfce4.in
 
+post-install:
+	@-update-desktop-database
+
 .include <bsd.port.post.mk>
diff --git a/sysutils/xfce4-utils/distinfo b/sysutils/xfce4-utils/distinfo
index c2287eb1bf03..82aea3c80bac 100644
--- a/sysutils/xfce4-utils/distinfo
+++ b/sysutils/xfce4-utils/distinfo
@@ -1,3 +1,2 @@
-MD5 (xfce4/xfce-utils-4.6.2.tar.bz2) = 5d23407700d7e8c9751e17a5bc955109
-SHA256 (xfce4/xfce-utils-4.6.2.tar.bz2) = 54efc2038bfbd5acaadfc91ed91fb3dfd6cec64f9402f364accce7bcafe2ba7a
-SIZE (xfce4/xfce-utils-4.6.2.tar.bz2) = 638094
+SHA256 (xfce4/xfce-utils-4.8.1.tar.bz2) = ed04c66b6b9cc65e434adf04732407673db90d74bc225c3d8952d09a7caf8686
+SIZE (xfce4/xfce-utils-4.8.1.tar.bz2) = 706171
diff --git a/sysutils/xfce4-utils/pkg-plist b/sysutils/xfce4-utils/pkg-plist
index 6f9e1456b8d1..3998cff33c4d 100644
--- a/sysutils/xfce4-utils/pkg-plist
+++ b/sysutils/xfce4-utils/pkg-plist
@@ -9,140 +9,177 @@ bin/xfterm4
 etc/xdg/autostart/xfconf-migration-4.6.desktop
 etc/xdg/xfce4/Xft.xrdb
 etc/xdg/xfce4/xinitrc
-libexec/xfce4/xfconf-migration/xfconf-migration-4.6.pl
+lib/xfce4/xfconf-migration/xfconf-migration-4.6.pl
+share/applications/xfce4-about.desktop
+share/applications/xfhelp4.desktop
+share/applications/xfrun4.desktop
 %%WITH_DBUS%%share/dbus-1/services/org.xfce.RunDialog.service
+%%DOCSDIR%%/html/C/BSD.html
+%%DOCSDIR%%/html/C/GPL.html
+%%DOCSDIR%%/html/C/LGPL.html
+%%DOCSDIR%%/html/C/images/about-dialog.png
+%%DOCSDIR%%/html/C/images/default-session.png
+%%DOCSDIR%%/html/C/images/run-dialog.png
+%%DOCSDIR%%/html/C/images/xfce-mouse.png
+%%DOCSDIR%%/html/C/index.html
+%%DOCSDIR%%/html/C/xfce-user-guide.html
+%%DOCSDIR%%/html/C/xfce-utils.html
+%%DOCSDIR%%/html/da/BSD.html
+%%DOCSDIR%%/html/da/GPL.html
+%%DOCSDIR%%/html/da/LGPL.html
+%%DOCSDIR%%/html/da/images
+%%DOCSDIR%%/html/da/index.html
+%%DOCSDIR%%/html/da/xfce-user-guide.html
+%%DOCSDIR%%/html/da/xfce-utils.html
+%%DOCSDIR%%/html/el/BSD.html
+%%DOCSDIR%%/html/el/GPL.html
+%%DOCSDIR%%/html/el/LGPL.html
+%%DOCSDIR%%/html/el/index.html
+%%DOCSDIR%%/html/el/xfce-user-guide.html
+%%DOCSDIR%%/html/el/xfce-utils.html
+%%DOCSDIR%%/html/el/images
+%%DOCSDIR%%/html/gl/BSD.html
+%%DOCSDIR%%/html/gl/GPL.html
+%%DOCSDIR%%/html/gl/LGPL.html
+%%DOCSDIR%%/html/gl/images
+%%DOCSDIR%%/html/gl/index.html
+%%DOCSDIR%%/html/gl/xfce-user-guide.html
+%%DOCSDIR%%/html/gl/xfce-utils.html
+%%DOCSDIR%%/html/it/BSD.html
+%%DOCSDIR%%/html/it/GPL.html
+%%DOCSDIR%%/html/it/LGPL.html
+%%DOCSDIR%%/html/it/images
+%%DOCSDIR%%/html/it/index.html
+%%DOCSDIR%%/html/it/xfce-user-guide.html
+%%DOCSDIR%%/html/it/xfce-utils.html
+%%DOCSDIR%%/html/ja/BSD.html
+%%DOCSDIR%%/html/ja/GPL.html
+%%DOCSDIR%%/html/ja/LGPL.html
+%%DOCSDIR%%/html/ja/images
+%%DOCSDIR%%/html/ja/index.html
+%%DOCSDIR%%/html/ja/xfce-user-guide.html
+%%DOCSDIR%%/html/ja/xfce-utils.html
+%%DOCSDIR%%/html/sv/BSD.html
+%%DOCSDIR%%/html/sv/GPL.html
+%%DOCSDIR%%/html/sv/LGPL.html
+%%DOCSDIR%%/html/sv/images
+%%DOCSDIR%%/html/sv/index.html
+%%DOCSDIR%%/html/sv/xfce-user-guide.html
+%%DOCSDIR%%/html/sv/xfce-utils.html
+%%DOCSDIR%%/html/ug/BSD.html
+%%DOCSDIR%%/html/ug/GPL.html
+%%DOCSDIR%%/html/ug/LGPL.html
+%%DOCSDIR%%/html/ug/images
+%%DOCSDIR%%/html/ug/index.html
+%%DOCSDIR%%/html/ug/xfce-user-guide.html
+%%DOCSDIR%%/html/ug/xfce-utils.html
+%%DOCSDIR%%/html/xfce-utils.css
 share/icons/hicolor/48x48/apps/xfce4-logo.png
-share/locale/ast/LC_MESSAGES/xfce-utils.mo
-share/locale/kk/LC_MESSAGES/xfce-utils.mo
-share/locale/nn/LC_MESSAGES/xfce-utils.mo
-share/locale/ug/LC_MESSAGES/xfce-utils.mo
-share/locale/ur_PK/LC_MESSAGES/xfce-utils.mo
-share/locale/af/LC_MESSAGES/xfce-utils.mo
-share/locale/am/LC_MESSAGES/xfce-utils.mo
-share/locale/ar/LC_MESSAGES/xfce-utils.mo
-share/locale/az/LC_MESSAGES/xfce-utils.mo
-share/locale/be/LC_MESSAGES/xfce-utils.mo
-share/locale/bg/LC_MESSAGES/xfce-utils.mo
-share/locale/bn_IN/LC_MESSAGES/xfce-utils.mo
-share/locale/ca/LC_MESSAGES/xfce-utils.mo
-share/locale/cs/LC_MESSAGES/xfce-utils.mo
-share/locale/da/LC_MESSAGES/xfce-utils.mo
-share/locale/de/LC_MESSAGES/xfce-utils.mo
-share/locale/dz/LC_MESSAGES/xfce-utils.mo
-share/locale/el/LC_MESSAGES/xfce-utils.mo
-share/locale/en_GB/LC_MESSAGES/xfce-utils.mo
-share/locale/eo/LC_MESSAGES/xfce-utils.mo
-share/locale/es/LC_MESSAGES/xfce-utils.mo
-share/locale/es_MX/LC_MESSAGES/xfce-utils.mo
-share/locale/et/LC_MESSAGES/xfce-utils.mo
-share/locale/eu/LC_MESSAGES/xfce-utils.mo
-share/locale/fa/LC_MESSAGES/xfce-utils.mo
-share/locale/fi/LC_MESSAGES/xfce-utils.mo
-share/locale/fr/LC_MESSAGES/xfce-utils.mo
-share/locale/gl/LC_MESSAGES/xfce-utils.mo
-share/locale/gu/LC_MESSAGES/xfce-utils.mo
-share/locale/he/LC_MESSAGES/xfce-utils.mo
-share/locale/hi/LC_MESSAGES/xfce-utils.mo
-share/locale/hu/LC_MESSAGES/xfce-utils.mo
-share/locale/hy/LC_MESSAGES/xfce-utils.mo
-share/locale/id/LC_MESSAGES/xfce-utils.mo
-share/locale/it/LC_MESSAGES/xfce-utils.mo
-share/locale/ja/LC_MESSAGES/xfce-utils.mo
-share/locale/ka/LC_MESSAGES/xfce-utils.mo
-share/locale/ko/LC_MESSAGES/xfce-utils.mo
-share/locale/ku/LC_MESSAGES/xfce-utils.mo
-share/locale/lt/LC_MESSAGES/xfce-utils.mo
-share/locale/lv/LC_MESSAGES/xfce-utils.mo
-share/locale/mk/LC_MESSAGES/xfce-utils.mo
-share/locale/mr/LC_MESSAGES/xfce-utils.mo
-share/locale/ms/LC_MESSAGES/xfce-utils.mo
-share/locale/nb/LC_MESSAGES/xfce-utils.mo
-share/locale/nl/LC_MESSAGES/xfce-utils.mo
-share/locale/pl/LC_MESSAGES/xfce-utils.mo
-share/locale/pa/LC_MESSAGES/xfce-utils.mo
-share/locale/pt_BR/LC_MESSAGES/xfce-utils.mo
-share/locale/pt/LC_MESSAGES/xfce-utils.mo
-share/locale/ro/LC_MESSAGES/xfce-utils.mo
-share/locale/ru/LC_MESSAGES/xfce-utils.mo
-share/locale/si/LC_MESSAGES/xfce-utils.mo
-share/locale/sk/LC_MESSAGES/xfce-utils.mo
-share/locale/sq/LC_MESSAGES/xfce-utils.mo
-share/locale/sv/LC_MESSAGES/xfce-utils.mo
-share/locale/ta/LC_MESSAGES/xfce-utils.mo
-share/locale/tr/LC_MESSAGES/xfce-utils.mo
-share/locale/uk/LC_MESSAGES/xfce-utils.mo
-share/locale/ur/LC_MESSAGES/xfce-utils.mo
-share/locale/vi/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/COPYING
-share/xfce4/BSD
-share/xfce4/GPL
-share/xfce4/INFO
-share/xfce4/INFO.ca
-share/xfce4/INFO.de
-share/xfce4/INFO.es
-share/xfce4/INFO.fi
-share/xfce4/INFO.fr
-share/xfce4/INFO.it
-share/xfce4/INFO.ja
-share/xfce4/INFO.ru
-share/xfce4/INFO.uk
-share/xfce4/INFO.vi
-share/xfce4/LGPL
-share/xfce4/doc/C/index.html
-share/xfce4/doc/C/images/about-dialog.png
-share/xfce4/doc/C/images/run-dialog.png
-share/xfce4/doc/C/images/default-session.png
-share/xfce4/doc/C/images/link_xfce.jpg
-share/xfce4/doc/C/images/taskbar_settings.png
-share/xfce4/doc/C/BSD.html
-share/xfce4/doc/C/GPL.html
-share/xfce4/doc/C/LGPL.html
-share/xfce4/doc/C/xfce-utils.html
-share/xfce4/doc/C/xfce4-components.html
-share/xfce4/doc/C/xfce4-user-guide.html
-share/xfce4/doc/C/xfce4-intro.html
-share/xfce4/doc/C/xfce4-copyright.html
-share/xfce4/doc/C/xfce4-use.html
-share/xfce4/doc/C/xfce4-install.html
-share/xfce4/doc/fr/index.html
-share/xfce4/doc/it/index.html
-share/xfce4/doc/xfce.css
-share/xfce4/doc/xfce-chunk.css
-share/xfce4/doc/xfce-mouse.png
+%%NLS%%share/locale/af/LC_MESSAGES/xfce-utils.mo
+%%NLS%%share/locale/am/LC_MESSAGES/xfce-utils.mo
+%%NLS%%share/locale/ar/LC_MESSAGES/xfce-utils.mo
+%%NLS%%share/locale/ast/LC_MESSAGES/xfce-utils.mo
+%%NLS%%share/locale/az/LC_MESSAGES/xfce-utils.mo
+%%NLS%%share/locale/be/LC_MESSAGES/xfce-utils.mo
+%%NLS%%share/locale/bg/LC_MESSAGES/xfce-utils.mo
+%%NLS%%share/locale/bn/LC_MESSAGES/xfce-utils.mo
+%%NLS%%share/locale/bn_IN/LC_MESSAGES/xfce-utils.mo
+%%NLS%%share/locale/ca/LC_MESSAGES/xfce-utils.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/xfce-utils.mo
+%%NLS%%share/locale/da/LC_MESSAGES/xfce-utils.mo
+%%NLS%%share/locale/de/LC_MESSAGES/xfce-utils.mo
+%%NLS%%share/locale/dz/LC_MESSAGES/xfce-utils.mo
+%%NLS%%share/locale/el/LC_MESSAGES/xfce-utils.mo
+%%NLS%%share/locale/en_GB/LC_MESSAGES/xfce-utils.mo
+%%NLS%%share/locale/eo/LC_MESSAGES/xfce-utils.mo
+%%NLS%%share/locale/es/LC_MESSAGES/xfce-utils.mo
+%%NLS%%share/locale/es_MX/LC_MESSAGES/xfce-utils.mo
+%%NLS%%share/locale/et/LC_MESSAGES/xfce-utils.mo
+%%NLS%%share/locale/eu/LC_MESSAGES/xfce-utils.mo
+%%NLS%%share/locale/fa/LC_MESSAGES/xfce-utils.mo
+%%NLS%%share/locale/fi/LC_MESSAGES/xfce-utils.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/xfce-utils.mo
+%%NLS%%share/locale/gl/LC_MESSAGES/xfce-utils.mo
+%%NLS%%share/locale/gu/LC_MESSAGES/xfce-utils.mo
+%%NLS%%share/locale/he/LC_MESSAGES/xfce-utils.mo
+%%NLS%%share/locale/hi/LC_MESSAGES/xfce-utils.mo
+%%NLS%%share/locale/hr/LC_MESSAGES/xfce-utils.mo
+%%NLS%%share/locale/hu/LC_MESSAGES/xfce-utils.mo
+%%NLS%%share/locale/hy/LC_MESSAGES/xfce-utils.mo
+%%NLS%%share/locale/id/LC_MESSAGES/xfce-utils.mo
+%%NLS%%share/locale/it/LC_MESSAGES/xfce-utils.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/xfce-utils.mo
+%%NLS%%share/locale/ka/LC_MESSAGES/xfce-utils.mo
+%%NLS%%share/locale/kk/LC_MESSAGES/xfce-utils.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/xfce-utils.mo
+%%NLS%%share/locale/ku/LC_MESSAGES/xfce-utils.mo
+%%NLS%%share/locale/lt/LC_MESSAGES/xfce-utils.mo
+%%NLS%%share/locale/lv/LC_MESSAGES/xfce-utils.mo
+%%NLS%%share/locale/mk/LC_MESSAGES/xfce-utils.mo
+%%NLS%%share/locale/mr/LC_MESSAGES/xfce-utils.mo
+%%NLS%%share/locale/ms/LC_MESSAGES/xfce-utils.mo
+%%NLS%%share/locale/nb/LC_MESSAGES/xfce-utils.mo
+%%NLS%%share/locale/nl/LC_MESSAGES/xfce-utils.mo
+%%NLS%%share/locale/pa/LC_MESSAGES/xfce-utils.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/xfce-utils.mo
+%%NLS%%share/locale/pt/LC_MESSAGES/xfce-utils.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/xfce-utils.mo
+%%NLS%%share/locale/ro/LC_MESSAGES/xfce-utils.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/xfce-utils.mo
+%%NLS%%share/locale/si/LC_MESSAGES/xfce-utils.mo
+%%NLS%%share/locale/sk/LC_MESSAGES/xfce-utils.mo
+%%NLS%%share/locale/sq/LC_MESSAGES/xfce-utils.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/xfce-utils.mo
+%%NLS%%share/locale/ta/LC_MESSAGES/xfce-utils.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/xfce-utils.mo
+%%NLS%%share/locale/ug/LC_MESSAGES/xfce-utils.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/xfce-utils.mo
+%%NLS%%share/locale/ur/LC_MESSAGES/xfce-utils.mo
+%%NLS%%share/locale/ur_PK/LC_MESSAGES/xfce-utils.mo
+%%NLS%%share/locale/vi/LC_MESSAGES/xfce-utils.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/xfce-utils.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/xfce-utils.mo
 share/xsessions/xfce.desktop
-@dirrmtry etc/xdg/autostart
+@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
+@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
+@dirrm share/xsessions
+%%NLS%%@dirrmtry share/locale/ur_PK/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/ur_PK
+%%NLS%%@dirrmtry share/locale/ur/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/ur
+%%NLS%%@dirrmtry share/locale/ug/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/ug
+%%NLS%%@dirrmtry share/locale/si/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/si
+%%NLS%%@dirrmtry share/locale/mr/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/mr
+%%NLS%%@dirrmtry share/locale/ku/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/ku
+%%NLS%%@dirrmtry share/locale/kk/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/kk
+%%NLS%%@dirrmtry share/locale/hy/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/hy
+%%NLS%%@dirrmtry share/locale/dz/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/dz
+%%NLS%%@dirrmtry share/locale/bn_IN/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/bn_IN
+%%NLS%%@dirrmtry share/locale/ast/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/ast
+@dirrm %%DOCSDIR%%/html/ug
+@dirrm %%DOCSDIR%%/html/sv
+@dirrm %%DOCSDIR%%/html/ja
+@dirrm %%DOCSDIR%%/html/it
+@dirrm %%DOCSDIR%%/html/gl
+@dirrm %%DOCSDIR%%/html/el
+@dirrm %%DOCSDIR%%/html/da
+@dirrm %%DOCSDIR%%/html/C/images
+@dirrm %%DOCSDIR%%/html/C
+@dirrm %%DOCSDIR%%/html
+@dirrm %%DOCSDIR%%
+%%WITH_DBUS%%@dirrmtry share/dbus-1/services
+%%WITH_DBUS%%@dirrmtry share/dbus-1
+@dirrm lib/xfce4/xfconf-migration
+@dirrmtry lib/xfce4
 @dirrmtry etc/xdg/xfce4
+@dirrmtry etc/xdg/autostart
 @dirrmtry etc/xdg
-@dirrmtry etc/xfce4
-@dirrm libexec/xfce4/xfconf-migration
-@dirrmtry libexec/xfce4
-@dirrmtry share/applications
-@dirrmtry share/icons/hicolor/48x48/apps
-@dirrmtry share/icons/hicolor/48x48
-@dirrmtry share/icons
-@dirrmtry share/locale/bn_IN/LC_MESSAGES
-@dirrmtry share/locale/bn_IN
-@dirrmtry share/locale/mr/LC_MESSAGES
-@dirrmtry share/locale/mr
-@dirrmtry share/locale/ast/LC_MESSAGES
-@dirrmtry share/locale/ast
-@dirrmtry share/locale/kk/LC_MESSAGES
-@dirrmtry share/locale/kk
-@dirrmtry share/locale/ug/LC_MESSAGES
-@dirrmtry share/locale/ug
-@dirrmtry share/locale/ur_PK/LC_MESSAGES
-@dirrmtry share/locale/ur_PK
-@dirrmtry share/xfce4/doc/C/images
-@dirrmtry share/xfce4/doc/C
-@dirrmtry share/xfce4/doc/fr
-@dirrmtry share/xfce4/doc/it
-@dirrmtry share/xfce4/doc
-@dirrmtry share/xfce4
-@dirrmtry share/icons/hicolor/scalable/apps
-@dirrmtry share/icons/hicolor/scalable
-@dirrmtry share/locale/hy/LC_MESSAGES
-@dirrmtry share/locale/hy
-@dirrmtry share/xsessions
diff --git a/sysutils/xfce4-wavelan-plugin/Makefile b/sysutils/xfce4-wavelan-plugin/Makefile
index bc61d11a8976..525d21a66269 100644
--- a/sysutils/xfce4-wavelan-plugin/Makefile
+++ b/sysutils/xfce4-wavelan-plugin/Makefile
@@ -7,9 +7,10 @@
 
 PORTNAME=	xfce4-wavelan-plugin
 PORTVERSION=	0.5.4
-PORTREVISION=	14
+PORTREVISION=	15
 CATEGORIES=	sysutils xfce
-MASTER_SITES=	http://goodies.xfce.org/releases/${PORTNAME}/
+MASTER_SITES=	${MASTER_SITE_XFCE}
+MASTER_SITE_SUBDIR=/src/panel-plugins/${PORTNAME}/${PORTVERSION:R}
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	miwi@FreeBSD.org
@@ -21,6 +22,11 @@ GNU_CONFIGURE=	yes
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnometarget gtk20 intltool intlhack pkgconfig
-USE_XFCE=	configenv panel
+USE_XFCE=	configenv libutil libgui panel
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|--libs "libxfce4panel-1.0"|& "libxfcegui4-1.0"|g; \
+		s|--cflags "libxfce4panel-1.0"|& "libxfcegui4-1.0"|g' \
+		${WRKSRC}/configure
 
 .include <bsd.port.mk>