- 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]

3 files changed, 21 insertions, 18 deletions

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