- 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, 48 insertions, 28 deletions

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