3 files changed, 70 insertions, 38 deletions

diff --git a/x11-wm/xfce4-desktop/Makefile b/x11-wm/xfce4-desktop/Makefile
index ee6eac4fca6a..eae10c2d6d91 100644
--- a/x11-wm/xfce4-desktop/Makefile
+++ b/x11-wm/xfce4-desktop/Makefile
@@ -6,11 +6,12 @@
 #
 
 PORTNAME=	xfce4-desktop
-PORTVERSION=	4.0.6
-PORTREVISION=	1
+PORTVERSION=	4.2.0
+PORTREVISION=	0
 CATEGORIES=	x11-wm 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=	xfdesktop-${PORTVERSION}
 DIST_SUBDIR=	xfce4
 
@@ -20,17 +21,19 @@ 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 \
 		xfce4util.1:${PORTSDIR}/x11/libxfce4util \
-		xfcegui4.1:${PORTSDIR}/x11-toolkits/libxfce4gui
+		xfcegui4.3:${PORTSDIR}/x11-toolkits/libxfce4gui
 RUN_DEPENDS=	xfce-mcs-manager:${PORTSDIR}/sysutils/xfce4-mcs-manager
 
 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 \
 		CPPFLAGS=-I${LOCALBASE}/include \
 		LIBS=-L${LOCALBASE}/lib
 
+MAN1=		xfdesktop.1
+
 .include <bsd.port.mk>
diff --git a/x11-wm/xfce4-desktop/distinfo b/x11-wm/xfce4-desktop/distinfo
index 7fef33b3b52e..74f2f59a3cad 100644
--- a/x11-wm/xfce4-desktop/distinfo
+++ b/x11-wm/xfce4-desktop/distinfo
@@ -1,2 +1,2 @@
-MD5 (xfce4/xfdesktop-4.0.6.tar.gz) = 8f7a87ada82eaa60fb37998553787002
-SIZE(xfce4/xfdesktop-4.0.6.tar.gz) = 2134301
+MD5 (xfce4/xfdesktop-4.2.0.tar.gz) = 1cacd48e0ab475f4fd55d79020d60c55
+SIZE(xfce4/xfdesktop-4.2.0.tar.gz) = 2593021
diff --git a/x11-wm/xfce4-desktop/pkg-plist b/x11-wm/xfce4-desktop/pkg-plist
index 8eeb1adc4a7b..646996785494 100644
--- a/x11-wm/xfce4-desktop/pkg-plist
+++ b/x11-wm/xfce4-desktop/pkg-plist
@@ -1,36 +1,63 @@
+bin/xfce4-menueditor
 bin/xfdesktop
-etc/xfce4/menu.xml
-etc/xfce4/menu.xml.az
-etc/xfce4/menu.xml.ca
-etc/xfce4/menu.xml.de
-etc/xfce4/menu.xml.fr
-etc/xfce4/menu.xml.hu
-etc/xfce4/menu.xml.it
-etc/xfce4/menu.xml.nl
-etc/xfce4/menu.xml.ta
-etc/xfce4/menu.xml.tr
-etc/xfce4/menu.xml.vi
-etc/xfce4/menu.xml.zh_CN
-etc/xfce4/menu.xml.zh_TW
-lib/xfce4/mcs-plugins/backdrop_settings.a
-lib/xfce4/mcs-plugins/backdrop_settings.la
+etc/xdg/xfce4/desktop/xfce-registered-categories.xml
+etc/xdg/xfce4/desktop/xfce-registered-categories.xml.nl
+etc/xdg/xfce4/desktop/xfce-registered-categories.xml.pt_BR
+etc/xdg/xfce4/desktop/xfce-registered-categories.xml.ro
+etc/xdg/xfce4/desktop/xfce-registered-categories.xml.ru
+etc/xdg/xfce4/desktop/xfce-registered-categories.xml.zh_TW
+etc/xdg/xfce4/desktop/menu.xml
+etc/xdg/xfce4/desktop/menu.xml.az
+etc/xdg/xfce4/desktop/menu.xml.ca
+etc/xdg/xfce4/desktop/menu.xml.de
+etc/xdg/xfce4/desktop/menu.xml.es
+etc/xdg/xfce4/desktop/menu.xml.eu
+etc/xdg/xfce4/desktop/menu.xml.et
+etc/xdg/xfce4/desktop/menu.xml.fa_IR
+etc/xdg/xfce4/desktop/menu.xml.fr
+etc/xdg/xfce4/desktop/menu.xml.he
+etc/xdg/xfce4/desktop/menu.xml.hu
+etc/xdg/xfce4/desktop/menu.xml.ko
+etc/xdg/xfce4/desktop/menu.xml.ms
+etc/xdg/xfce4/desktop/menu.xml.nl
+etc/xdg/xfce4/desktop/menu.xml.pt_BR
+etc/xdg/xfce4/desktop/menu.xml.ro
+etc/xdg/xfce4/desktop/menu.xml.ru
+etc/xdg/xfce4/desktop/menu.xml.sk
+etc/xdg/xfce4/desktop/menu.xml.ta
+etc/xdg/xfce4/desktop/menu.xml.tr
+etc/xdg/xfce4/desktop/menu.xml.uk
+etc/xdg/xfce4/desktop/menu.xml.vi
+etc/xdg/xfce4/desktop/menu.xml.zh_CN
+etc/xdg/xfce4/desktop/menu.xml.zh_TW
 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
+lib/xfce4/modules/xfce4_desktop_menu.so
+lib/xfce4/panel-plugins/libdesktopmenu.so
+share/applications/xfce-backdrop-settings.desktop
+share/applications/xfce-menueditor.desktop
+share/icons/hicolor/32x32/apps/xfce4-backdrop.png
+share/icons/hicolor/32x32/apps/xfce4-menueditor.png
+share/icons/hicolor/48x48/apps/xfce4-backdrop.png
+share/icons/hicolor/48x48/apps/xfce4-menueditor.png
+share/icons/hicolor/scalable/apps/xfce4-backdrop.svg
+share/icons/hicolor/scalable/apps/xfce4-menueditor.svg
 share/locale/ar/LC_MESSAGES/xfdesktop.mo
 share/locale/az/LC_MESSAGES/xfdesktop.mo
+share/locale/be/LC_MESSAGES/xfdesktop.mo
 share/locale/bg/LC_MESSAGES/xfdesktop.mo
 share/locale/ca/LC_MESSAGES/xfdesktop.mo
 share/locale/cs/LC_MESSAGES/xfdesktop.mo
 share/locale/de/LC_MESSAGES/xfdesktop.mo
+share/locale/en_GB/LC_MESSAGES/xfdesktop.mo
 share/locale/es/LC_MESSAGES/xfdesktop.mo
 share/locale/es_MX/LC_MESSAGES/xfdesktop.mo
 share/locale/et/LC_MESSAGES/xfdesktop.mo
 share/locale/eu/LC_MESSAGES/xfdesktop.mo
-share/locale/fa_IR/LC_MESSAGES/xfdesktop.mo
+share/locale/fa/LC_MESSAGES/xfdesktop.mo
 share/locale/fi/LC_MESSAGES/xfdesktop.mo
 share/locale/fr/LC_MESSAGES/xfdesktop.mo
+share/locale/gu/LC_MESSAGES/xfdesktop.mo
+share/locale/he/LC_MESSAGES/xfdesktop.mo
 share/locale/hi/LC_MESSAGES/xfdesktop.mo
 share/locale/hu/LC_MESSAGES/xfdesktop.mo
 share/locale/it/LC_MESSAGES/xfdesktop.mo
@@ -38,12 +65,15 @@ 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/nb_NO/LC_MESSAGES/xfdesktop.mo
 share/locale/nl/LC_MESSAGES/xfdesktop.mo
-share/locale/no/LC_MESSAGES/xfdesktop.mo
+share/locale/pa/LC_MESSAGES/xfdesktop.mo
 share/locale/pl/LC_MESSAGES/xfdesktop.mo
 share/locale/pt_BR/LC_MESSAGES/xfdesktop.mo
 share/locale/pt_PT/LC_MESSAGES/xfdesktop.mo
+share/locale/ro/LC_MESSAGES/xfdesktop.mo
 share/locale/ru/LC_MESSAGES/xfdesktop.mo
+share/locale/sk/LC_MESSAGES/xfdesktop.mo
 share/locale/sv/LC_MESSAGES/xfdesktop.mo
 share/locale/ta/LC_MESSAGES/xfdesktop.mo
 share/locale/tr/LC_MESSAGES/xfdesktop.mo
@@ -51,34 +81,33 @@ share/locale/uk/LC_MESSAGES/xfdesktop.mo
 share/locale/vi/LC_MESSAGES/xfdesktop.mo
 share/locale/zh_CN/LC_MESSAGES/xfdesktop.mo
 share/locale/zh_TW/LC_MESSAGES/xfdesktop.mo
+share/pixmaps/xfce4_xicon.png
+share/pixmaps/xfce4_xicon1.png
+share/pixmaps/xfce4_xicon2.png
+share/pixmaps/xfce4_xicon3.png
+share/pixmaps/xfce4_xicon4.png
 share/xfce4/backdrops/flower.png
 share/xfce4/backdrops/xfce4gradientcurve.png
 share/xfce4/backdrops/xfce4logo.png
+share/xfce4/backdrops/xfce-in-a-grid.png
 share/xfce4/backdrops/xfce-in-the-moon.png
+share/xfce4/backdrops/xfce-smoke.png
 share/xfce4/backdrops/xfce-stripes.png
 share/xfce4/backdrops/xfce-stellar-tile.png
 share/xfce4/backdrops/xfce-turbulence.png
 share/xfce4/doc/C/images/root_menu.png
 share/xfce4/doc/C/images/root_menu2.png
 share/xfce4/doc/C/images/select_bg_color.png
+share/xfce4/doc/C/images/xfdesktop-editor.png
 share/xfce4/doc/C/images/xfdesktop-background.png
-share/xfce4/doc/C/images/xfdesktop-workspace.png
 share/xfce4/doc/C/images/xfdesktop-list.png
+share/xfce4/doc/C/images/xfdesktop-menu-tab.png
 share/xfce4/doc/C/xfdesktop.html
-share/xfce4/doc/fr/images/root_menu2.png
-share/xfce4/doc/fr/images/root_menu.png
-share/xfce4/doc/fr/images/select_bg_color.png
-share/xfce4/doc/fr/images/xfdesktop-background.png
-share/xfce4/doc/fr/images/xfdesktop-workspace.png
-share/xfce4/doc/fr/images/xfdesktop-list.png
-share/xfce4/doc/fr/xfdesktop.html
 @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
 @dirrm share/xfce4/backdrops
 @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