- bring xfce4 to 4.2

- remove x11-fm/xfce4-fm-icons misc/xfce4-panel-themes (obsoleted by that update)
- take maintainership of x11-wm/xfce4-session [1]
- bump PORTREVISION of all plugins because they need to be linked against the new xfce4 libs

Approved by:	maintainer [1]

17 files changed, 118 insertions, 82 deletions

diff --git a/sysutils/xfce4-battery-plugin/Makefile b/sysutils/xfce4-battery-plugin/Makefile
index 3de4045f4935..426073fdb332 100644
--- a/sysutils/xfce4-battery-plugin/Makefile
+++ b/sysutils/xfce4-battery-plugin/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xfce4-battery-plugin
 PORTVERSION=	0.2.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	sysutils xfce
 MASTER_SITES=	http://download.berlios.de/xfce-goodies/
 DIST_SUBDIR=	xfce4
@@ -18,7 +18,7 @@ COMMENT=	Battery monitor panel plugin for XFce4
 BUILD_DEPENDS=	xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
 LIB_DEPENDS=	xml2.5:${PORTSDIR}/textproc/libxml2 \
 		xfce4util.1:${PORTSDIR}/x11/libxfce4util \
-		xfcegui4.1:${PORTSDIR}/x11-toolkits/libxfce4gui
+		xfcegui4.3:${PORTSDIR}/x11-toolkits/libxfce4gui
 RUN_DEPENDS=	xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
 
 ONLY_FOR_ARCHS=	i386
diff --git a/sysutils/xfce4-cpugraph-plugin/Makefile b/sysutils/xfce4-cpugraph-plugin/Makefile
index 4475eee610a6..d699b74d8fce 100644
--- a/sysutils/xfce4-cpugraph-plugin/Makefile
+++ b/sysutils/xfce4-cpugraph-plugin/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xfce4-cpugraph-plugin
 PORTVERSION=	0.2.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils xfce
 MASTER_SITES=	http://download.berlios.de/xfce-goodies/ \
 		http://matt.nerim.net/xfce-goodies/
@@ -18,7 +18,7 @@ COMMENT=	XFce4 systemload plugin with multiple CPU display modes
 
 BUILD_DEPENDS=	xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
 LIB_DEPENDS=	xfce4util.1:${PORTSDIR}/x11/libxfce4util \
-		xfcegui4.1:${PORTSDIR}/x11-toolkits/libxfce4gui \
+		xfcegui4.3:${PORTSDIR}/x11-toolkits/libxfce4gui \
 		startup-notification-1.0:${PORTSDIR}/x11/startup-notification
 RUN_DEPENDS=	xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
 
diff --git a/sysutils/xfce4-fsguard-plugin/Makefile b/sysutils/xfce4-fsguard-plugin/Makefile
index 572e43f39be3..0f92957c151f 100644
--- a/sysutils/xfce4-fsguard-plugin/Makefile
+++ b/sysutils/xfce4-fsguard-plugin/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xfce4-fsguard-plugin
 PORTVERSION=	0.2.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	sysutils xfce
 MASTER_SITES=	http://download.berlios.de/xfce-goodies/ \
 		http://matt.nerim.net/xfce-goodies/ \
@@ -19,7 +19,7 @@ COMMENT=	XFce4 panel plugin to check a mountpoint for free disk space
 
 BUILD_DEPENDS=	xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
 LIB_DEPENDS=	xfce4util.1:${PORTSDIR}/x11/libxfce4util \
-		xfcegui4.1:${PORTSDIR}/x11-toolkits/libxfce4gui \
+		xfcegui4.3:${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
diff --git a/sysutils/xfce4-genmon-plugin/Makefile b/sysutils/xfce4-genmon-plugin/Makefile
index 8b624a4b7178..e08c68a560ba 100644
--- a/sysutils/xfce4-genmon-plugin/Makefile
+++ b/sysutils/xfce4-genmon-plugin/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xfce4-genmon-plugin
 PORTVERSION=	1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils xfce
 MASTER_SITES=	http://download.berlios.de/xfce-goodies/ \
 		http://matt.nerim.net/xfce-goodies/
@@ -18,7 +18,7 @@ COMMENT=	Generic Monitor XFce4 panel plugin
 
 BUILD_DEPENDS=	xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
 LIB_DEPENDS=	xfce4util.1:${PORTSDIR}/x11/libxfce4util \
-		xfcegui4.1:${PORTSDIR}/x11-toolkits/libxfce4gui \
+		xfcegui4.3:${PORTSDIR}/x11-toolkits/libxfce4gui \
 		startup-notification-1.0:${PORTSDIR}/x11/startup-notification
 RUN_DEPENDS=	xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
 
diff --git a/sysutils/xfce4-mcs-manager/Makefile b/sysutils/xfce4-mcs-manager/Makefile
index 57e0a35b6574..6d98097918e8 100644
--- a/sysutils/xfce4-mcs-manager/Makefile
+++ b/sysutils/xfce4-mcs-manager/Makefile
@@ -6,11 +6,12 @@
 #
 
 PORTNAME=	xfce4-mcs-manager
-PORTVERSION=	4.0.6
-PORTREVISION=	1
+PORTVERSION=	4.2.0
+PORTREVISION=	0
 CATEGORIES=	sysutils xfce
-MASTER_SITES=	ftp://ftp.berlios.de/pub/xfce-goodies/${PORTVERSION}/ \
-		http://hannelore.f1.fhtw-berlin.de/mirrors/xfce4/xfce-${PORTVERSION}/src/
+MASTER_SITES=	http://www.us.xfce.org/archive/xfce-${PORTVERSION}/src/ \
+		http://spuriousinterrupt.org/projects/xfce4/files/mirror/xfce-${PORTVERSION}/ \
+		http://public.fh-wolfenbuettel.de/~luedickj/xfce4/xfce-${PORTVERSION}/
 DISTNAME=	xfce-mcs-manager-${PORTVERSION}
 DIST_SUBDIR=	xfce4
 
@@ -18,8 +19,8 @@ MAINTAINER=	oliver@FreeBSD.org
 COMMENT=	XFce 4 settings manager
 
 LIB_DEPENDS=	xfce4util.1:${PORTSDIR}/x11/libxfce4util \
-		xfcegui4.1:${PORTSDIR}/x11-toolkits/libxfce4gui \
-		xfce4mcs-manager.1:${PORTSDIR}/x11/libxfce4mcs
+		xfcegui4.3:${PORTSDIR}/x11-toolkits/libxfce4gui \
+		xfce4mcs-manager.2:${PORTSDIR}/x11/libxfce4mcs
 
 USE_GETTEXT=	yes
 USE_GNOME=	glib20
diff --git a/sysutils/xfce4-mcs-manager/distinfo b/sysutils/xfce4-mcs-manager/distinfo
index 87b71558d6e7..6b15aa5e5e81 100644
--- a/sysutils/xfce4-mcs-manager/distinfo
+++ b/sysutils/xfce4-mcs-manager/distinfo
@@ -1,2 +1,2 @@
-MD5 (xfce4/xfce-mcs-manager-4.0.6.tar.gz) = 1a32c4318b5cce3475a5b016fd6703ad
-SIZE(xfce4/xfce-mcs-manager-4.0.6.tar.gz) = 538545
+MD5 (xfce4/xfce-mcs-manager-4.2.0.tar.gz) = 177d98fe247aa10de9a16dcb2fcdec32
+SIZE(xfce4/xfce-mcs-manager-4.2.0.tar.gz) = 503492
diff --git a/sysutils/xfce4-mcs-manager/pkg-plist b/sysutils/xfce4-mcs-manager/pkg-plist
index 7b8c4db2eee0..f511c0318c9f 100644
--- a/sysutils/xfce4-mcs-manager/pkg-plist
+++ b/sysutils/xfce4-mcs-manager/pkg-plist
@@ -2,19 +2,25 @@ bin/xfce-setting-show
 bin/xfce-mcs-manager
 include/xfce4/xfce-mcs-manager/manager-plugin.h
 libdata/pkgconfig/xfce-mcs-manager.pc
+share/applications/xfce-settings-manager.desktop
+share/icons/hicolor/48x48/apps/xfce4-settings.png
 share/locale/ar/LC_MESSAGES/xfce-mcs-manager.mo
 share/locale/az/LC_MESSAGES/xfce-mcs-manager.mo
+share/locale/be/LC_MESSAGES/xfce-mcs-manager.mo
 share/locale/bg/LC_MESSAGES/xfce-mcs-manager.mo
 share/locale/ca/LC_MESSAGES/xfce-mcs-manager.mo
 share/locale/cs/LC_MESSAGES/xfce-mcs-manager.mo
 share/locale/de/LC_MESSAGES/xfce-mcs-manager.mo
+share/locale/en_GB/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/et/LC_MESSAGES/xfce-mcs-manager.mo
 share/locale/eu/LC_MESSAGES/xfce-mcs-manager.mo
-share/locale/fa_IR/LC_MESSAGES/xfce-mcs-manager.mo
+share/locale/fa/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/gu/LC_MESSAGES/xfce-mcs-manager.mo
+share/locale/he/LC_MESSAGES/xfce-mcs-manager.mo
 share/locale/hi/LC_MESSAGES/xfce-mcs-manager.mo
 share/locale/hu/LC_MESSAGES/xfce-mcs-manager.mo
 share/locale/it/LC_MESSAGES/xfce-mcs-manager.mo
@@ -22,12 +28,15 @@ 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/nb_NO/LC_MESSAGES/xfce-mcs-manager.mo
 share/locale/nl/LC_MESSAGES/xfce-mcs-manager.mo
-share/locale/no/LC_MESSAGES/xfce-mcs-manager.mo
+share/locale/pa/LC_MESSAGES/xfce-mcs-manager.mo
 share/locale/pl/LC_MESSAGES/xfce-mcs-manager.mo
 share/locale/pt_BR/LC_MESSAGES/xfce-mcs-manager.mo
 share/locale/pt_PT/LC_MESSAGES/xfce-mcs-manager.mo
+share/locale/ro/LC_MESSAGES/xfce-mcs-manager.mo
 share/locale/ru/LC_MESSAGES/xfce-mcs-manager.mo
+share/locale/sk/LC_MESSAGES/xfce-mcs-manager.mo
 share/locale/sv/LC_MESSAGES/xfce-mcs-manager.mo
 share/locale/ta/LC_MESSAGES/xfce-mcs-manager.mo
 share/locale/tr/LC_MESSAGES/xfce-mcs-manager.mo
@@ -36,21 +45,14 @@ share/locale/vi/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
 share/xfce4/doc/C/images/smgr_from_setup_button.png
 share/xfce4/doc/C/xfce-mcs-manager.html
-share/xfce4/doc/fr/images/settings_manager.png
-share/xfce4/doc/fr/images/smgr_from_panel.png
-share/xfce4/doc/fr/images/smgr_from_root_menu.png
-share/xfce4/doc/fr/images/smgr_from_setup_button.png
-share/xfce4/doc/fr/xfce-mcs-manager.html
 @dirrm include/xfce4/xfce-mcs-manager
 @unexec rmdir %D/include/xfce4 2>/dev/null || true
 @unexec rmdir %D/libdata/pkgconfig 2>/dev/null || true
+@unexec rmdir %D/share/icons/hicolor 2>/dev/null || true
 @unexec rmdir %D/share/xfce4/doc/C/images 2>/dev/null || true
 @unexec rmdir %D/share/xfce4/doc/C 2>/dev/null || true
-@unexec rmdir %D/share/xfce4/doc/fr/images 2>/dev/null || true
-@unexec rmdir %D/share/xfce4/doc/fr 2>/dev/null || true
 @unexec rmdir %D/share/xfce4/doc 2>/dev/null || true
 @unexec rmdir %D/share/xfce4 2>/dev/null || true
diff --git a/sysutils/xfce4-mcs-plugins/Makefile b/sysutils/xfce4-mcs-plugins/Makefile
index 618526fb6ee5..c1d6c686a559 100644
--- a/sysutils/xfce4-mcs-plugins/Makefile
+++ b/sysutils/xfce4-mcs-plugins/Makefile
@@ -6,11 +6,12 @@
 #
 
 PORTNAME=	xfce4-mcs-plugins
-PORTVERSION=	4.0.6
-PORTREVISION=	1
+PORTVERSION=	4.2.0
+PORTREVISION=	0
 CATEGORIES=	sysutils xfce
-MASTER_SITES=	ftp://ftp.berlios.de/pub/xfce-goodies/${PORTVERSION}/ \
-		http://hannelore.f1.fhtw-berlin.de/mirrors/xfce4/xfce-${PORTVERSION}/src/
+MASTER_SITES=	http://www.us.xfce.org/archive/xfce-${PORTVERSION}/src/ \
+		http://spuriousinterrupt.org/projects/xfce4/files/mirror/xfce-${PORTVERSION}/ \
+		http://public.fh-wolfenbuettel.de/~luedickj/xfce4/xfce-${PORTVERSION}/
 DISTNAME=	xfce-mcs-plugins-${PORTVERSION}
 DIST_SUBDIR=	xfce4
 
@@ -19,12 +20,12 @@ COMMENT=	XFce 4 settings manager plugins
 
 BUILD_DEPENDS=	xfce-mcs-manager:${PORTSDIR}/sysutils/xfce4-mcs-manager
 LIB_DEPENDS=	xfce4util.1:${PORTSDIR}/x11/libxfce4util \
-		xfcegui4.1:${PORTSDIR}/x11-toolkits/libxfce4gui
+		xfcegui4.3:${PORTSDIR}/x11-toolkits/libxfce4gui
 
 USE_GETTEXT=	yes
 USE_GNOME=	gtk20
 USE_X_PREFIX=	yes
-USE_INC_LIBTOOL_VER=15
+USE_LIBTOOL_VER=15
 INSTALLS_SHLIB=	yes
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CFLAGS=-I${LOCALBASE}/include \
diff --git a/sysutils/xfce4-mcs-plugins/distinfo b/sysutils/xfce4-mcs-plugins/distinfo
index 4f34fd069cf7..3866a6f51d3b 100644
--- a/sysutils/xfce4-mcs-plugins/distinfo
+++ b/sysutils/xfce4-mcs-plugins/distinfo
@@ -1,2 +1,2 @@
-MD5 (xfce4/xfce-mcs-plugins-4.0.6.tar.gz) = e197d3570f444daa175a684e472ea396
-SIZE(xfce4/xfce-mcs-plugins-4.0.6.tar.gz) = 615696
+MD5 (xfce4/xfce-mcs-plugins-4.2.0.tar.gz) = aa0d7d7c8a60af221bf08f2589a6dc9b
+SIZE(xfce4/xfce-mcs-plugins-4.2.0.tar.gz) = 661118
diff --git a/sysutils/xfce4-mcs-plugins/pkg-plist b/sysutils/xfce4-mcs-plugins/pkg-plist
index 11b306104ec9..3f30b8c6c896 100644
--- a/sysutils/xfce4-mcs-plugins/pkg-plist
+++ b/sysutils/xfce4-mcs-plugins/pkg-plist
@@ -1,25 +1,37 @@
-lib/xfce4/mcs-plugins/keyboard_plugin.a
-lib/xfce4/mcs-plugins/keyboard_plugin.la
+lib/xfce4/mcs-plugins/display_plugin.so
 lib/xfce4/mcs-plugins/keyboard_plugin.so
-lib/xfce4/mcs-plugins/mouse_plugin.a
-lib/xfce4/mcs-plugins/mouse_plugin.la
 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/screensaver_plugin.so
 lib/xfce4/mcs-plugins/ui_plugin.so
+share/applications/xfce-ui-settings.desktop
+share/applications/xfce-keyboard-settings.desktop
+share/applications/xfce-mouse-settings.desktop
+share/applications/xfce-display-settings.desktop
+share/icons/hicolor/48x48/apps/xfce4-display.png
+share/icons/hicolor/48x48/apps/xfce4-keyboard.png
+share/icons/hicolor/48x48/apps/xfce4-mouse.png
+share/icons/hicolor/48x48/apps/xfce4-ui.png
+share/icons/hicolor/scalable/apps/xfce4-display.svg
+share/icons/hicolor/scalable/apps/xfce4-keyboard.svg
+share/icons/hicolor/scalable/apps/xfce4-mouse.svg
+share/icons/hicolor/scalable/apps/xfce4-ui.svg
 share/locale/ar/LC_MESSAGES/xfce-mcs-plugins.mo
 share/locale/az/LC_MESSAGES/xfce-mcs-plugins.mo
 share/locale/bg/LC_MESSAGES/xfce-mcs-plugins.mo
+share/locale/be/LC_MESSAGES/xfce-mcs-plugins.mo
 share/locale/ca/LC_MESSAGES/xfce-mcs-plugins.mo
 share/locale/cs/LC_MESSAGES/xfce-mcs-plugins.mo
 share/locale/de/LC_MESSAGES/xfce-mcs-plugins.mo
+share/locale/en_GB/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/et/LC_MESSAGES/xfce-mcs-plugins.mo
 share/locale/eu/LC_MESSAGES/xfce-mcs-plugins.mo
-share/locale/fa_IR/LC_MESSAGES/xfce-mcs-plugins.mo
+share/locale/fa/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/gu/LC_MESSAGES/xfce-mcs-plugins.mo
+share/locale/he/LC_MESSAGES/xfce-mcs-plugins.mo
 share/locale/hi/LC_MESSAGES/xfce-mcs-plugins.mo
 share/locale/hu/LC_MESSAGES/xfce-mcs-plugins.mo
 share/locale/it/LC_MESSAGES/xfce-mcs-plugins.mo
@@ -28,11 +40,13 @@ 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/no/LC_MESSAGES/xfce-mcs-plugins.mo
+share/locale/pa/LC_MESSAGES/xfce-mcs-plugins.mo
 share/locale/pl/LC_MESSAGES/xfce-mcs-plugins.mo
 share/locale/pt_BR/LC_MESSAGES/xfce-mcs-plugins.mo
 share/locale/pt_PT/LC_MESSAGES/xfce-mcs-plugins.mo
+share/locale/ro/LC_MESSAGES/xfce-mcs-plugins.mo
 share/locale/ru/LC_MESSAGES/xfce-mcs-plugins.mo
+share/locale/sk/LC_MESSAGES/xfce-mcs-plugins.mo
 share/locale/sv/LC_MESSAGES/xfce-mcs-plugins.mo
 share/locale/ta/LC_MESSAGES/xfce-mcs-plugins.mo
 share/locale/tr/LC_MESSAGES/xfce-mcs-plugins.mo
@@ -40,16 +54,13 @@ share/locale/uk/LC_MESSAGES/xfce-mcs-plugins.mo
 share/locale/vi/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/display_preferences.png
 share/xfce4/doc/C/images/font_selection.png
 share/xfce4/doc/C/images/keyboard_settings.png
 share/xfce4/doc/C/images/mouse_settings.png
 share/xfce4/doc/C/images/user_interface_settings.png
+share/xfce4/doc/C/images/user_interface_settings_icons.png
 share/xfce4/doc/C/xfce-mcs-plugins.html
-share/xfce4/doc/fr/images/font_selection.png
-share/xfce4/doc/fr/images/keyboard_settings.png
-share/xfce4/doc/fr/images/mouse_settings.png
-share/xfce4/doc/fr/images/user_interface_settings.png
-share/xfce4/doc/fr/xfce-mcs-plugins.html
 @unexec rmdir %D/lib/xfce4/mcs-plugins 2>/dev/null || true
 @unexec rmdir %D/lib/xfce4 2>/dev/null || true
 @unexec rmdir %D/share/xfce4/doc/C/images 2>/dev/null || true
diff --git a/sysutils/xfce4-netload-plugin/Makefile b/sysutils/xfce4-netload-plugin/Makefile
index 4706041b4399..1277f7f83636 100644
--- a/sysutils/xfce4-netload-plugin/Makefile
+++ b/sysutils/xfce4-netload-plugin/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xfce4-netload-plugin
 PORTVERSION=	0.2.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils xfce
 MASTER_SITES=	http://download.berlios.de/xfce-goodies/ \
 		http://matt.nerim.net/xfce-goodies/ \
@@ -20,7 +20,7 @@ COMMENT=	Network Load plugin for XFce4
 BUILD_DEPENDS=	xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
 LIB_DEPENDS=	xml2.5:${PORTSDIR}/textproc/libxml2 \
 		xfce4util.1:${PORTSDIR}/x11/libxfce4util \
-		xfcegui4.1:${PORTSDIR}/x11-toolkits/libxfce4gui
+		xfcegui4.3:${PORTSDIR}/x11-toolkits/libxfce4gui
 RUN_DEPENDS=	xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
 
 USE_GNOME=	gtk20
diff --git a/sysutils/xfce4-showdesktop-plugin/Makefile b/sysutils/xfce4-showdesktop-plugin/Makefile
index 92f5bc3095e9..a2daf8746011 100644
--- a/sysutils/xfce4-showdesktop-plugin/Makefile
+++ b/sysutils/xfce4-showdesktop-plugin/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xfce4-showdesktop-plugin
 PORTVERSION=	0.3.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	sysutils xfce
 MASTER_SITES=	http://download.berlios.de/xfce-goodies/
 DIST_SUBDIR=	xfce4
@@ -18,7 +18,7 @@ COMMENT=	Xfce 4 Plugin to minimize/unminimize all windows
 BUILD_DEPENDS=	xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
 LIB_DEPENDS=	xml2.5:${PORTSDIR}/textproc/libxml2 \
 		xfce4util.1:${PORTSDIR}/x11/libxfce4util \
-		xfcegui4.1:${PORTSDIR}/x11-toolkits/libxfce4gui
+		xfcegui4.3:${PORTSDIR}/x11-toolkits/libxfce4gui
 RUN_DEPENDS=	xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
diff --git a/sysutils/xfce4-systemload-plugin/Makefile b/sysutils/xfce4-systemload-plugin/Makefile
index f5598d838eb5..735eb69e80fc 100644
--- a/sysutils/xfce4-systemload-plugin/Makefile
+++ b/sysutils/xfce4-systemload-plugin/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xfce4-systemload-plugin
 PORTVERSION=	0.3.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils xfce
 MASTER_SITES=	http://download.berlios.de/xfce-goodies/ \
 		http://matt.nerim.net/xfce-goodies/ \
@@ -20,7 +20,7 @@ COMMENT=	System Load plugin for XFce4
 BUILD_DEPENDS=	xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
 LIB_DEPENDS=	xml2.5:${PORTSDIR}/textproc/libxml2 \
 		xfce4util.1:${PORTSDIR}/x11/libxfce4util \
-		xfcegui4.1:${PORTSDIR}/x11-toolkits/libxfce4gui
+		xfcegui4.3:${PORTSDIR}/x11-toolkits/libxfce4gui
 RUN_DEPENDS=	xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
 
 USE_GNOME=	gtk20
diff --git a/sysutils/xfce4-utils/Makefile b/sysutils/xfce4-utils/Makefile
index 992c157ae36b..12e6fa626645 100644
--- a/sysutils/xfce4-utils/Makefile
+++ b/sysutils/xfce4-utils/Makefile
@@ -6,25 +6,28 @@
 #
 
 PORTNAME=	xfce4-utils
-PORTVERSION=	4.0.6
-PORTREVISION=	1
+PORTVERSION=	4.2.0
+PORTREVISION=	0
 CATEGORIES=	sysutils xfce
-MASTER_SITES=	ftp://ftp.berlios.de/pub/xfce-goodies/${PORTVERSION}/ \
-		http://hannelore.f1.fhtw-berlin.de/mirrors/xfce4/xfce-${PORTVERSION}/src/
+MASTER_SITES=	http://www.us.xfce.org/archive/xfce-${PORTVERSION}/src/ \
+		http://spuriousinterrupt.org/projects/xfce4/files/mirror/xfce-${PORTVERSION}/ \
+		http://public.fh-wolfenbuettel.de/~luedickj/xfce4/xfce-${PORTVERSION}/
 DISTNAME=	xfce-utils-${PORTVERSION}
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	oliver@FreeBSD.org
 COMMENT=	XFce 4 essential utilities and scripts
 
+BUILD_DEPENDS=	xfce-mcs-manager:${PORTSDIR}/sysutils/xfce4-mcs-manager
 LIB_DEPENDS=	xfce4util.1:${PORTSDIR}/x11/libxfce4util \
-		xfcegui4.1:${PORTSDIR}/x11-toolkits/libxfce4gui \
-		xfce4mcs-manager.1:${PORTSDIR}/sysutils/xfce4-mcs-manager
+		xfcegui4.3:${PORTSDIR}/x11-toolkits/libxfce4gui
+RUN_DEPENDS=	xfce-mcs-manager:${PORTSDIR}/sysutils/xfce4-mcs-manager
 
+GNU_CONFIGURE=	yes
 USE_GETTEXT=	yes
 USE_GNOME=	gtk20
 USE_X_PREFIX=	yes
-USE_INC_LIBTOOL_VER=15
+USE_LIBTOOL_VER=15
 INSTALLS_SHLIB=	yes
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CFLAGS=-I${LOCALBASE}/include \
diff --git a/sysutils/xfce4-utils/distinfo b/sysutils/xfce4-utils/distinfo
index d0a53507ca17..86b2049ec772 100644
--- a/sysutils/xfce4-utils/distinfo
+++ b/sysutils/xfce4-utils/distinfo
@@ -1,2 +1,2 @@
-MD5 (xfce4/xfce-utils-4.0.6.tar.gz) = d42a01aa03a9eafb9bc2cc546d988b4b
-SIZE(xfce4/xfce-utils-4.0.6.tar.gz) = 974783
+MD5 (xfce4/xfce-utils-4.2.0.tar.gz) = 879ef5cfbd9e4cdd87dbd26fce07b6d6
+SIZE(xfce4/xfce-utils-4.2.0.tar.gz) = 740252
diff --git a/sysutils/xfce4-utils/pkg-plist b/sysutils/xfce4-utils/pkg-plist
index b59381029032..3f5c1ccf3f41 100644
--- a/sysutils/xfce4-utils/pkg-plist
+++ b/sysutils/xfce4-utils/pkg-plist
@@ -6,23 +6,29 @@ bin/xfmountdev4
 bin/xfrun4
 bin/xftaskbar4
 bin/xfterm4
-etc/xfce4/xinitrc
-lib/xfce4/mcs-plugins/xftaskbar_plugin.a
-lib/xfce4/mcs-plugins/xftaskbar_plugin.la
+etc/xdg/xfce4/xinitrc
 lib/xfce4/mcs-plugins/xftaskbar_plugin.so
+share/applications/xfce-taskbar-settings.desktop
+share/icons/hicolor/48x48/apps/xfce4-logo.png
+share/icons/hicolor/48x48/apps/xfce4-taskbar.png
+share/icons/hicolor/scalable/apps/xfce4-taskbar.svg
 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/ca/LC_MESSAGES/xfce-utils.mo
 share/locale/cs/LC_MESSAGES/xfce-utils.mo
 share/locale/de/LC_MESSAGES/xfce-utils.mo
+share/locale/en_GB/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_IR/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/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/it/LC_MESSAGES/xfce-utils.mo
@@ -31,11 +37,13 @@ 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/no/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_PT/LC_MESSAGES/xfce-utils.mo
+share/locale/ro/LC_MESSAGES/xfce-utils.mo
 share/locale/ru/LC_MESSAGES/xfce-utils.mo
+share/locale/sk/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
@@ -49,6 +57,7 @@ share/xfce4/AUTHORS.ca
 share/xfce4/AUTHORS.de
 share/xfce4/AUTHORS.es
 share/xfce4/AUTHORS.fr
+share/xfce4/AUTHORS.he
 share/xfce4/AUTHORS.html
 share/xfce4/AUTHORS.html.az
 share/xfce4/AUTHORS.html.ca
@@ -56,7 +65,17 @@ share/xfce4/AUTHORS.html.de
 share/xfce4/AUTHORS.html.es
 share/xfce4/AUTHORS.html.fr
 share/xfce4/AUTHORS.html.it
+share/xfce4/AUTHORS.html.lt
+share/xfce4/AUTHORS.html.ro
+share/xfce4/AUTHORS.html.ru
+share/xfce4/AUTHORS.html.sk
+share/xfce4/AUTHORS.html.vi
 share/xfce4/AUTHORS.it
+share/xfce4/AUTHORS.lt
+share/xfce4/AUTHORS.ro
+share/xfce4/AUTHORS.ru
+share/xfce4/AUTHORS.uk
+share/xfce4/AUTHORS.sk
 share/xfce4/AUTHORS.vi
 share/xfce4/COPYING
 share/xfce4/COPYING.html
@@ -75,7 +94,14 @@ share/xfce4/INFO.html.de
 share/xfce4/INFO.html.es
 share/xfce4/INFO.html.fr
 share/xfce4/INFO.html.it
+share/xfce4/INFO.html.lt
+share/xfce4/INFO.html.ro
+share/xfce4/INFO.html.ru
 share/xfce4/INFO.it
+share/xfce4/INFO.lt
+share/xfce4/INFO.ro
+share/xfce4/INFO.ru
+share/xfce4/INFO.uk
 share/xfce4/INFO.vi
 share/xfce4/LGPL
 share/xfce4/LGPL.html
@@ -84,30 +110,19 @@ 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/fr/images/default-session.png
-share/xfce4/doc/fr/images/link_xfce.jpg
-share/xfce4/doc/fr/images/about-dialog.png
-share/xfce4/doc/fr/images/run-dialog.png
-share/xfce4/doc/fr/BSD.html
-share/xfce4/doc/fr/GPL.html
-share/xfce4/doc/fr/LGPL.html
-share/xfce4/doc/fr/xfce4-user-guide.html
-share/xfce4/doc/fr/xfce4-intro.html
-share/xfce4/doc/fr/xfce4-copyright.html
-share/xfce4/doc/fr/xfce4-use.html
-share/xfce4/doc/fr/xfce4-install.html
-share/xfce4/doc/fr/xfce-utils.html
 share/xfce4/doc/xfce.css
+share/xfce4/doc/xfce-mouse.png
 @unexec rmdir %D/etc/xfce4 2>/dev/null || true
 @unexec rmdir %D/lib/xfce4/mcs-plugins 2>/dev/null || true
 @unexec rmdir %D/lib/xfce4 2>/dev/null || true
@@ -115,5 +130,7 @@ share/xfce4/doc/xfce.css
 @unexec rmdir %D/share/xfce4/doc/C 2>/dev/null || true
 @unexec rmdir %D/share/xfce4/doc/fr/images 2>/dev/null || true
 @unexec rmdir %D/share/xfce4/doc/fr 2>/dev/null || true
+@unexec rmdir %D/share/xfce4/doc/it/images 2>/dev/null || true
+@unexec rmdir %D/share/xfce4/doc/it 2>/dev/null || true
 @unexec rmdir %D/share/xfce4/doc 2>/dev/null || true
 @unexec rmdir %D/share/xfce4 2>/dev/null || true
diff --git a/sysutils/xfce4-wavelan-plugin/Makefile b/sysutils/xfce4-wavelan-plugin/Makefile
index 0bc8e98b426b..d22ba8124677 100644
--- a/sysutils/xfce4-wavelan-plugin/Makefile
+++ b/sysutils/xfce4-wavelan-plugin/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xfce4-wavelan-plugin
 PORTVERSION=	0.4.1
+PORTREVISION=	1
 CATEGORIES=	sysutils xfce
 MASTER_SITES=	http://download.berlios.de/xfce-goodies/ \
 		http://matt.nerim.net/xfce-goodies/ \
@@ -19,7 +20,7 @@ COMMENT=	Displays various information about a WaveLAN device
 BUILD_DEPENDS=	xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
 LIB_DEPENDS=	xml2.5:${PORTSDIR}/textproc/libxml2 \
 		xfce4util.1:${PORTSDIR}/x11/libxfce4util \
-		xfcegui4.1:${PORTSDIR}/x11-toolkits/libxfce4gui
+		xfcegui4.3:${PORTSDIR}/x11-toolkits/libxfce4gui
 RUN_DEPENDS=	xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
 
 USE_GNOME=	gtk20