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

19 files changed, 863 insertions, 898 deletions

diff --git a/x11-wm/xfce4-desktop/Makefile b/x11-wm/xfce4-desktop/Makefile
index ee6eac4..eae10c2 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 7fef33b..74f2f59 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 8eeb1ad..6469967 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
diff --git a/x11-wm/xfce4-menueditor/Makefile b/x11-wm/xfce4-menueditor/Makefile
index b3b8823..03d2053 100644
--- a/x11-wm/xfce4-menueditor/Makefile
+++ b/x11-wm/xfce4-menueditor/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xfce4-menueditor
 PORTVERSION=	1.05
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-wm xfce
 MASTER_SITES=	http://users.skynet.be/p0llux/files/ \
 		http://matt.nerim.net/xfce-goodies/
@@ -17,7 +17,7 @@ MAINTAINER=	matt@bsdfly.org
 COMMENT=	Menu Editor for the XFce desktop environment
 
 LIB_DEPENDS=	xfce4util.1:${PORTSDIR}/x11/libxfce4util \
-		xfcegui4.1:${PORTSDIR}/x11-toolkits/libxfce4gui
+		xfcegui4.3:${PORTSDIR}/x11-toolkits/libxfce4gui
 
 USE_GNOME=	gtk20 libxml2
 USE_BZIP2=	yes
diff --git a/x11-wm/xfce4-panel/Makefile b/x11-wm/xfce4-panel/Makefile
index 92c0d26..eaa0805 100644
--- a/x11-wm/xfce4-panel/Makefile
+++ b/x11-wm/xfce4-panel/Makefile
@@ -6,11 +6,12 @@
 #
 
 PORTNAME=	xfce4-panel
-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}/
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	oliver@FreeBSD.org
@@ -20,13 +21,13 @@ BUILD_DEPENDS=	xfce-mcs-manager:${PORTSDIR}/sysutils/xfce4-mcs-manager
 LIB_DEPENDS=	xml2.5:${PORTSDIR}/textproc/libxml2 \
 		startup-notification-1.0:${PORTSDIR}/x11/startup-notification \
 		xfce4util.1:${PORTSDIR}/x11/libxfce4util \
-		xfcegui4.1:${PORTSDIR}/x11-toolkits/libxfce4gui
+		xfcegui4.3:${PORTSDIR}/x11-toolkits/libxfce4gui
 
 USE_GETTEXT=	yes
 USE_GNOME=	gtk20
 USE_REINPLACE=	yes
 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/x11-wm/xfce4-panel/distinfo b/x11-wm/xfce4-panel/distinfo
index c84a142..041193b 100644
--- a/x11-wm/xfce4-panel/distinfo
+++ b/x11-wm/xfce4-panel/distinfo
@@ -1,2 +1,2 @@
-MD5 (xfce4/xfce4-panel-4.0.6.tar.gz) = c93c010195a8e5fc04bc1295418acbb4
-SIZE(xfce4/xfce4-panel-4.0.6.tar.gz) = 1277648
+MD5 (xfce4/xfce4-panel-4.2.0.tar.gz) = 92a3ccf964939034b786917a69cd0ba6
+SIZE(xfce4/xfce4-panel-4.2.0.tar.gz) = 871179
diff --git a/x11-wm/xfce4-panel/pkg-plist b/x11-wm/xfce4-panel/pkg-plist
index 207a6ec..862e234 100644
--- a/x11-wm/xfce4-panel/pkg-plist
+++ b/x11-wm/xfce4-panel/pkg-plist
@@ -1,13 +1,24 @@
 bin/xfce4-panel
-etc/xfce4/xfce4rc
-etc/xfce4/xfce4rc.ar
-etc/xfce4/xfce4rc.az
-etc/xfce4/xfce4rc.ca
-etc/xfce4/xfce4rc.fr
-etc/xfce4/xfce4rc.hu
-etc/xfce4/xfce4rc.it
-etc/xfce4/xfce4rc.nl
-etc/xfce4/xfce4rc.vi
+etc/xdg/xfce4/panel/contents.xml
+etc/xdg/xfce4/panel/contents.xml.ar
+etc/xdg/xfce4/panel/contents.xml.az
+etc/xdg/xfce4/panel/contents.xml.ca
+etc/xdg/xfce4/panel/contents.xml.eu
+etc/xdg/xfce4/panel/contents.xml.fr
+etc/xdg/xfce4/panel/contents.xml.he
+etc/xdg/xfce4/panel/contents.xml.hu
+etc/xdg/xfce4/panel/contents.xml.it
+etc/xdg/xfce4/panel/contents.xml.ko
+etc/xdg/xfce4/panel/contents.xml.lt
+etc/xdg/xfce4/panel/contents.xml.ms
+etc/xdg/xfce4/panel/contents.xml.nl
+etc/xdg/xfce4/panel/contents.xml.ro
+etc/xdg/xfce4/panel/contents.xml.ru
+etc/xdg/xfce4/panel/contents.xml.sk
+etc/xdg/xfce4/panel/contents.xml.tr
+etc/xdg/xfce4/panel/contents.xml.vi
+etc/xdg/xfce4/panel/contents.xml.zh_TW
+include/xfce4/panel/add-control-dialog.h
 include/xfce4/panel/controls.h
 include/xfce4/panel/global.h
 include/xfce4/panel/icons.h
@@ -18,34 +29,51 @@ include/xfce4/panel/item_dialog.h
 include/xfce4/panel/plugins.h
 include/xfce4/panel/xfce_support.h
 include/xfce4/panel/xfce.h
-lib/xfce4/mcs-plugins/libxfce4settings.la
 lib/xfce4/mcs-plugins/libxfce4settings.so
-lib/xfce4/panel-plugins/libclock.la
 lib/xfce4/panel-plugins/libclock.so
-lib/xfce4/panel-plugins/libmailcheck.la
 lib/xfce4/panel-plugins/libmailcheck.so
-lib/xfce4/panel-plugins/libpager.la
 lib/xfce4/panel-plugins/libpager.so
-lib/xfce4/panel-plugins/libseparator.la
 lib/xfce4/panel-plugins/libseparator.so
-lib/xfce4/panel-plugins/libswitcher.la
 lib/xfce4/panel-plugins/libswitcher.so
-lib/xfce4/panel-plugins/libsystembuttons.la
 lib/xfce4/panel-plugins/libsystembuttons.so
 libdata/pkgconfig/xfce4-panel-1.0.pc
+share/icons/hicolor/16x16/apps/xfce-system-exit.png
+share/icons/hicolor/16x16/apps/xfce-system-info.png
+share/icons/hicolor/16x16/apps/xfce-system-lock.png
+share/icons/hicolor/16x16/apps/xfce-system-settings.png
+share/icons/hicolor/48x48/apps/xfce4-panel.png
+share/icons/hicolor/48x48/apps/xfce-edit.png
+share/icons/hicolor/48x48/apps/xfce-filemanager.png
+share/icons/hicolor/48x48/apps/xfce-games.png
+share/icons/hicolor/48x48/apps/xfce-graphics.png
+share/icons/hicolor/48x48/apps/xfce-internet.png
+share/icons/hicolor/48x48/apps/xfce-mail.png
+share/icons/hicolor/48x48/apps/xfce-man.png
+share/icons/hicolor/48x48/apps/xfce-multimedia.png
+share/icons/hicolor/48x48/apps/xfce-printer.png
+share/icons/hicolor/48x48/apps/xfce-schedule.png
+share/icons/hicolor/48x48/apps/xfce-sound.png
+share/icons/hicolor/48x48/apps/xfce-terminal.png
+share/icons/hicolor/48x48/apps/xfce-unknown.png
+share/icons/hicolor/48x48/apps/xfce-utils.png
+share/applications/xfce-panel-settings.desktop
 share/locale/ar/LC_MESSAGES/xfce4-panel.mo
 share/locale/az/LC_MESSAGES/xfce4-panel.mo
+share/locale/be/LC_MESSAGES/xfce4-panel.mo
 share/locale/bg/LC_MESSAGES/xfce4-panel.mo
 share/locale/ca/LC_MESSAGES/xfce4-panel.mo
 share/locale/cs/LC_MESSAGES/xfce4-panel.mo
 share/locale/de/LC_MESSAGES/xfce4-panel.mo
+share/locale/en_GB/LC_MESSAGES/xfce4-panel.mo
 share/locale/es/LC_MESSAGES/xfce4-panel.mo
 share/locale/es_MX/LC_MESSAGES/xfce4-panel.mo
 share/locale/et/LC_MESSAGES/xfce4-panel.mo
 share/locale/eu/LC_MESSAGES/xfce4-panel.mo
-share/locale/fa_IR/LC_MESSAGES/xfce4-panel.mo
+share/locale/fa/LC_MESSAGES/xfce4-panel.mo
 share/locale/fi/LC_MESSAGES/xfce4-panel.mo
 share/locale/fr/LC_MESSAGES/xfce4-panel.mo
+share/locale/gu/LC_MESSAGES/xfce4-panel.mo
+share/locale/he/LC_MESSAGES/xfce4-panel.mo
 share/locale/hi/LC_MESSAGES/xfce4-panel.mo
 share/locale/hu/LC_MESSAGES/xfce4-panel.mo
 share/locale/it/LC_MESSAGES/xfce4-panel.mo
@@ -53,19 +81,22 @@ share/locale/ja/LC_MESSAGES/xfce4-panel.mo
 share/locale/ko/LC_MESSAGES/xfce4-panel.mo
 share/locale/lt/LC_MESSAGES/xfce4-panel.mo
 share/locale/ms/LC_MESSAGES/xfce4-panel.mo
+share/locale/nb_NO/LC_MESSAGES/xfce4-panel.mo
 share/locale/nl/LC_MESSAGES/xfce4-panel.mo
-share/locale/no/LC_MESSAGES/xfce4-panel.mo
+share/locale/pa/LC_MESSAGES/xfce4-panel.mo
 share/locale/pl/LC_MESSAGES/xfce4-panel.mo
 share/locale/pt_BR/LC_MESSAGES/xfce4-panel.mo
 share/locale/pt_PT/LC_MESSAGES/xfce4-panel.mo
+share/locale/ro/LC_MESSAGES/xfce4-panel.mo
 share/locale/ru/LC_MESSAGES/xfce4-panel.mo
+share/locale/sk/LC_MESSAGES/xfce4-panel.mo
 share/locale/sv/LC_MESSAGES/xfce4-panel.mo
 share/locale/ta/LC_MESSAGES/xfce4-panel.mo
 share/locale/tr/LC_MESSAGES/xfce4-panel.mo
-share/locale/uk/LC_MESSAGES/xfce4-panel.mo
 share/locale/vi/LC_MESSAGES/xfce4-panel.mo
 share/locale/zh_CN/LC_MESSAGES/xfce4-panel.mo
 share/locale/zh_TW/LC_MESSAGES/xfce4-panel.mo
+share/xfce4/doc/C/images/add-item-dialog.png
 share/xfce4/doc/C/images/clock-properties.png
 share/xfce4/doc/C/images/default_panel.png
 share/xfce4/doc/C/images/handle-popup.png
@@ -74,151 +105,10 @@ share/xfce4/doc/C/images/launcher-properties.png
 share/xfce4/doc/C/images/mailcheck-properties.png
 share/xfce4/doc/C/images/menuitem-properties.png
 share/xfce4/doc/C/images/nooptions-properties.png
+share/xfce4/doc/C/images/pager-properties.png
 share/xfce4/doc/C/images/panel-settings.png
 share/xfce4/doc/C/images/systembuttons-properties.png
 share/xfce4/doc/C/xfce4-panel.html
-share/xfce4/doc/fr/images/clock-properties.png
-share/xfce4/doc/fr/images/default_panel.png
-share/xfce4/doc/fr/images/handle-popup.png
-share/xfce4/doc/fr/images/item-popup.png
-share/xfce4/doc/fr/images/launcher-properties.png
-share/xfce4/doc/fr/images/mailcheck-properties.png
-share/xfce4/doc/fr/images/menuitem-properties.png
-share/xfce4/doc/fr/images/nooptions-properties.png
-share/xfce4/doc/fr/images/panel-settings.png
-share/xfce4/doc/fr/images/systembuttons-properties.png
-share/xfce4/doc/fr/xfce4-panel.html
-share/xfce4/themes/Crystal/README
-share/xfce4/themes/Crystal/edit.png
-share/xfce4/themes/Crystal/file1.png
-share/xfce4/themes/Crystal/file2.png
-share/xfce4/themes/Crystal/games.png
-share/xfce4/themes/Crystal/man.png
-share/xfce4/themes/Crystal/miniinfo.png
-share/xfce4/themes/Crystal/minilock.png
-share/xfce4/themes/Crystal/minipalet.png
-share/xfce4/themes/Crystal/minipower.png
-share/xfce4/themes/Crystal/multimedia.png
-share/xfce4/themes/Crystal/network.png
-share/xfce4/themes/Crystal/newmail.png
-share/xfce4/themes/Crystal/nomail.png
-share/xfce4/themes/Crystal/oldmail.png
-share/xfce4/themes/Crystal/paint.png
-share/xfce4/themes/Crystal/print.png
-share/xfce4/themes/Crystal/schedule.png
-share/xfce4/themes/Crystal/sound.png
-share/xfce4/themes/Crystal/terminal.png
-share/xfce4/themes/Crystal/trash_empty.png
-share/xfce4/themes/Crystal/trash_full.png
-share/xfce4/themes/Crystal/unknown.png
-share/xfce4/themes/Curve/README
-share/xfce4/themes/Curve/edit.png
-share/xfce4/themes/Curve/file1.png
-share/xfce4/themes/Curve/file2.png
-share/xfce4/themes/Curve/games.png
-share/xfce4/themes/Curve/man.png
-share/xfce4/themes/Curve/miniinfo.png
-share/xfce4/themes/Curve/minilock.png
-share/xfce4/themes/Curve/minipalet.png
-share/xfce4/themes/Curve/minipower.png
-share/xfce4/themes/Curve/multimedia.png
-share/xfce4/themes/Curve/network.png
-share/xfce4/themes/Curve/newmail.png
-share/xfce4/themes/Curve/nomail.png
-share/xfce4/themes/Curve/oldmail.png
-share/xfce4/themes/Curve/paint.png
-share/xfce4/themes/Curve/print.png
-share/xfce4/themes/Curve/schedule.png
-share/xfce4/themes/Curve/sound.png
-share/xfce4/themes/Curve/terminal.png
-share/xfce4/themes/Curve/trash_empty.png
-share/xfce4/themes/Curve/trash_full.png
-share/xfce4/themes/Curve/unknown.png
-share/xfce4/themes/FreeIcons/README
-share/xfce4/themes/FreeIcons/edit.png
-share/xfce4/themes/FreeIcons/file1.png
-share/xfce4/themes/FreeIcons/file2.png
-share/xfce4/themes/FreeIcons/games.png
-share/xfce4/themes/FreeIcons/man.png
-share/xfce4/themes/FreeIcons/miniinfo.png
-share/xfce4/themes/FreeIcons/minilock.png
-share/xfce4/themes/FreeIcons/minipalet.png
-share/xfce4/themes/FreeIcons/minipower.png
-share/xfce4/themes/FreeIcons/multimedia.png
-share/xfce4/themes/FreeIcons/network.png
-share/xfce4/themes/FreeIcons/newmail.png
-share/xfce4/themes/FreeIcons/nomail.png
-share/xfce4/themes/FreeIcons/oldmail.png
-share/xfce4/themes/FreeIcons/paint.png
-share/xfce4/themes/FreeIcons/print.png
-share/xfce4/themes/FreeIcons/schedule.png
-share/xfce4/themes/FreeIcons/sound.png
-share/xfce4/themes/FreeIcons/terminal.png
-share/xfce4/themes/FreeIcons/unknown.png
-share/xfce4/themes/Gnome/edit.png
-share/xfce4/themes/Gnome/file1.png
-share/xfce4/themes/Gnome/file2.png
-share/xfce4/themes/Gnome/games.png
-share/xfce4/themes/Gnome/man.png
-share/xfce4/themes/Gnome/miniinfo.png
-share/xfce4/themes/Gnome/minilock.png
-share/xfce4/themes/Gnome/minipalet.png
-share/xfce4/themes/Gnome/minipower.png
-share/xfce4/themes/Gnome/multimedia.png
-share/xfce4/themes/Gnome/network.png
-share/xfce4/themes/Gnome/paint.png
-share/xfce4/themes/Gnome/print.png
-share/xfce4/themes/Gnome/schedule.png
-share/xfce4/themes/Gnome/sound.png
-share/xfce4/themes/Gnome/terminal.png
-share/xfce4/themes/Gnome/trash_empty.png
-share/xfce4/themes/Gnome/trash_full.png
-share/xfce4/themes/Gnome/unknown.png
-share/xfce4/themes/Noia/README
-share/xfce4/themes/Noia/edit.png
-share/xfce4/themes/Noia/file1.png
-share/xfce4/themes/Noia/file2.png
-share/xfce4/themes/Noia/games.png
-share/xfce4/themes/Noia/man.png
-share/xfce4/themes/Noia/miniinfo.png
-share/xfce4/themes/Noia/minilock.png
-share/xfce4/themes/Noia/minipalet.png
-share/xfce4/themes/Noia/minipower.png
-share/xfce4/themes/Noia/multimedia.png
-share/xfce4/themes/Noia/network.png
-share/xfce4/themes/Noia/newmail.png
-share/xfce4/themes/Noia/nomail.png
-share/xfce4/themes/Noia/oldmail.png
-share/xfce4/themes/Noia/paint.png
-share/xfce4/themes/Noia/print.png
-share/xfce4/themes/Noia/schedule.png
-share/xfce4/themes/Noia/sound.png
-share/xfce4/themes/Noia/terminal.png
-share/xfce4/themes/Noia/trash_empty.png
-share/xfce4/themes/Noia/trash_full.png
-share/xfce4/themes/Noia/unknown.png
-share/xfce4/themes/XFce/edit.xpm
-share/xfce4/themes/XFce/file1.xpm
-share/xfce4/themes/XFce/file2.xpm
-share/xfce4/themes/XFce/games.xpm
-share/xfce4/themes/XFce/man.xpm
-share/xfce4/themes/XFce/miniinfo.xpm
-share/xfce4/themes/XFce/minilock.xpm
-share/xfce4/themes/XFce/minipalet.xpm
-share/xfce4/themes/XFce/minipower.xpm
-share/xfce4/themes/XFce/multimedia.xpm
-share/xfce4/themes/XFce/network.xpm
-share/xfce4/themes/XFce/newmail.xpm
-share/xfce4/themes/XFce/nomail.xpm
-share/xfce4/themes/XFce/oldmail.xpm
-share/xfce4/themes/XFce/paint.xpm
-share/xfce4/themes/XFce/print.xpm
-share/xfce4/themes/XFce/schedule.xpm
-share/xfce4/themes/XFce/sound.xpm
-share/xfce4/themes/XFce/terminal.xpm
-share/xfce4/themes/XFce/trash_empty.xpm
-share/xfce4/themes/XFce/trash_full.xpm
-share/xfce4/themes/XFce/unknown.xpm
 @unexec rmdir %D/etc/xfce4 2>/dev/null || true
 @dirrm include/xfce4/panel
 @unexec rmdir %D/include/xfce4 2>/dev/null || true
@@ -228,14 +118,5 @@ share/xfce4/themes/XFce/unknown.xpm
 @unexec rmdir %D/libdata/pkgconfig 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
-@dirrm share/xfce4/themes/Crystal
-@dirrm share/xfce4/themes/Curve
-@dirrm share/xfce4/themes/FreeIcons
-@dirrm share/xfce4/themes/Noia
-@dirrm share/xfce4/themes/Gnome
-@dirrm share/xfce4/themes/XFce
-@unexec rmdir %D/share/xfce4/themes 2>/dev/null || true
 @unexec rmdir %D/share/xfce4 2>/dev/null || true
diff --git a/x11-wm/xfce4-session/Makefile b/x11-wm/xfce4-session/Makefile
index 07e5832..d3902f6 100644
--- a/x11-wm/xfce4-session/Makefile
+++ b/x11-wm/xfce4-session/Makefile
@@ -6,37 +6,27 @@
 #
 
 PORTNAME=	xfce4-session
-PORTVERSION=	0.1.4
-PORTREVISION=	5
+PORTVERSION=	4.2.0
+PORTREVISION=	0
 CATEGORIES=	x11-wm xfce
-MASTER_SITES=	http://echobase.homeunix.net/~bmeurer/tmp/xfce4-session/ \
-		http://matt.nerim.net/xfce-goodies/
+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}/
 DIST_SUBDIR=	xfce4
 
-MAINTAINER=	matt@bsdfly.org
-COMMENT=	XFce 4 Session Manager
+MAINTAINER=	oliver@FreeBSD.org
+COMMENT=	Session manager for the Xfce 4 desktop environment
 
 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_GNOME=	gtk20
 USE_X_PREFIX=	yes
-USE_INC_LIBTOOL_VER=13
-INSTALLS_SHLIB=	yes
+GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ENV=	CFLAGS=-I${LOCALBASE}/include \
-		CPPFLAGS=-I${LOCALBASE}/include \
-		LIBS=-L${LOCALBASE}/lib
+USE_LIBTOOL_VER=15
+INSTALLS_SHLIB= yes
 
-MAN1=		xfce4-session.1 xfce4-shutdown.1
-
-DOCS=		AUTHORS NEWS README TODO
-
-.if !defined(NOPORTDOCS)
-post-install:
-	@${MKDIR} ${DOCSDIR}
-	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}
-.endif
+MAN1=		xfce4-session.1 xfce4-session-logout.1
 
 .include <bsd.port.mk>
diff --git a/x11-wm/xfce4-session/distinfo b/x11-wm/xfce4-session/distinfo
index 193d97a..f1acade 100644
--- a/x11-wm/xfce4-session/distinfo
+++ b/x11-wm/xfce4-session/distinfo
@@ -1,2 +1,2 @@
-MD5 (xfce4/xfce4-session-0.1.4.tar.gz) = 61996fc8a1388b228417d810ae9cf28e
-SIZE (xfce4/xfce4-session-0.1.4.tar.gz) = 682321
+MD5 (xfce4/xfce4-session-4.2.0.tar.gz) = a24ed5b766f022a6f9f013a3f468c2ec
+SIZE(xfce4/xfce4-session-4.2.0.tar.gz) = 1306201
diff --git a/x11-wm/xfce4-session/files/patch-shutdown.c b/x11-wm/xfce4-session/files/patch-shutdown.c
deleted file mode 100644
index 7f4e5ff..0000000
--- a/x11-wm/xfce4-session/files/patch-shutdown.c
+++ /dev/null
@@ -1,57 +0,0 @@
---- xfce4-session/shutdown.c.orig	Sun Apr 18 10:41:07 2004
-+++ xfce4-session/shutdown.c	Sun Apr 18 10:49:51 2004
-@@ -170,7 +170,8 @@
- 
- 	/* Try to grab Input on a hidden window first */
- 	hidden = gtk_invisible_new();
--	gtk_widget_show(hidden);
-+	gtk_widget_show_now(hidden);
-+	gdk_flush();
- 
- 	for (;;) {
- 		if (gdk_pointer_grab(hidden->window, FALSE, 0, NULL, NULL,
-@@ -201,16 +202,23 @@
- 
- 	/* this window *should* not be handled by the window manager */
- 	g_object_set(G_OBJECT(dialog), "type", GTK_WINDOW_POPUP, NULL);
-+	if ((gtk_major_version >=2) && (gtk_minor_version >= 3)) {
-+		g_object_set (G_OBJECT (dialog), "type_hint",
-+			      GDK_WINDOW_TYPE_HINT_UTILITY, NULL);
-+	}
-+	g_object_set (G_OBJECT (dialog), "decorated", FALSE, NULL);
- 
- 	/*
- 	 * Grabbing the Xserver when accessibility is enabled will cause a
- 	 * hang. Found in gnome-session (see #93103 for details).
- 	 */
- 	accessibility = GTK_IS_ACCESSIBLE(gtk_widget_get_accessible(dialog));
--	if (!accessibility) {
--		gdk_x11_grab_server();
--		drawBackground();
--		gdk_flush();
-+	if ((gtk_major_version >=2) && (gtk_minor_version < 3)) {
-+		if (!accessibility) {
-+			gdk_x11_grab_server();
-+			drawBackground();
-+			gdk_flush();
-+		}
- 	}
- 
- 	dbox = GTK_DIALOG(dialog)->vbox;
-@@ -300,10 +308,12 @@
- 
- 	gtk_widget_destroy(dialog);
- 
--	/* ungrab the Xserver */
--	if (!accessibility) {
--		gdk_x11_ungrab_server();
--		refreshBackground();
-+	if ((gtk_major_version >=2) && (gtk_minor_version < 3)) {
-+		/* ungrab the Xserver */
-+		if (!accessibility) {
-+			gdk_x11_ungrab_server();
-+			refreshBackground();
-+		}
- 	}
- 
- 	/* Release Keyboard/Mouse pointer grab */
diff --git a/x11-wm/xfce4-session/pkg-descr b/x11-wm/xfce4-session/pkg-descr
index 3932667..667d071 100644
--- a/x11-wm/xfce4-session/pkg-descr
+++ b/x11-wm/xfce4-session/pkg-descr
@@ -1,4 +1,3 @@
-Session manager for the XFce desktop environment.
+Session manager for the Xfce desktop environment.
 
-Author:	Benedikt Meurer <benedikt.meurer@unix-ag.uni-siegen.de>
-WWW:	http://echobase.homeunix.net/~bmeurer/tmp/xfce4-session/
+WWW: http://www.xfce4.org/
diff --git a/x11-wm/xfce4-session/pkg-plist b/x11-wm/xfce4-session/pkg-plist
index 6c8dca4..301384b 100644
--- a/x11-wm/xfce4-session/pkg-plist
+++ b/x11-wm/xfce4-session/pkg-plist
@@ -1,36 +1,46 @@
-@comment $FreeBSD$
 bin/xfce4-session
-sbin/xfce4-shutdown
-etc/xfce4/default.session
-etc/xfce4/shutdown.allow
-etc/xfce4/xinitrc.xfce4-session
-lib/xfce4/mcs-plugins/session_settings.la
+bin/xfce4-session-logout
+etc/xdg/xfce4-session/xfce4-session.rc
+include/xfce4/xfce4-session-4.2/libxfsm/xfsm-splash-engine.h
+include/xfce4/xfce4-session-4.2/libxfsm/xfsm-splash-rc.h
+lib/libxfsm-4.2.so.0
+lib/libxfsm-4.2.so
+lib/libxfsm-4.2.a
 lib/xfce4/mcs-plugins/session_settings.so
-lib/xfce4/mcs-plugins/session_settings.a
-%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
-%%PORTDOCS%%%%DOCSDIR%%/NEWS
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/TODO
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-share/locale/az/LC_MESSAGES/xfce4-session.mo
-share/locale/ca/LC_MESSAGES/xfce4-session.mo
-share/locale/de/LC_MESSAGES/xfce4-session.mo
-share/locale/es/LC_MESSAGES/xfce4-session.mo
-share/locale/es_MX/LC_MESSAGES/xfce4-session.mo
-share/locale/hi/LC_MESSAGES/xfce4-session.mo
-share/locale/it/LC_MESSAGES/xfce4-session.mo
-share/locale/ko/LC_MESSAGES/xfce4-session.mo
-share/locale/nl/LC_MESSAGES/xfce4-session.mo
-share/locale/sv/LC_MESSAGES/xfce4-session.mo
-share/locale/ta/LC_MESSAGES/xfce4-session.mo
-share/locale/tr/LC_MESSAGES/xfce4-session.mo
-share/locale/zh_CN/LC_MESSAGES/xfce4-session.mo
-share/locale/zh_TW/LC_MESSAGES/xfce4-session.mo
-share/xfce4/splash/Default/splash.theme
-share/xfce4/splash/Default/logo.png
-share/xfce4/splash/Default/preview.png
-@unexec rmdir %D/etc/xfce4 2>/dev/null || true
-@unexec rmdir %D/lib/xfce4/mcs-plugins 2>/dev/null || true
-@dirrm share/xfce4/splash/Default
-@dirrm share/xfce4/splash
+lib/xfce4/mcs-plugins/splash_settings.so
+lib/xfce4/splash/engines/libbalou.so
+lib/xfce4/splash/engines/libmice.so
+lib/xfce4/splash/engines/libsimple.so
+lib/pkgconfig/xfce4-session-1.0.pc
+libexec/balou-export-theme
+libexec/balou-install-theme
+libexec/xfsm-shutdown-helper
+share/xfce4/doc/C/images/xfsm-advanced.png
+share/xfce4/doc/C/images/xfsm-general.png
+share/xfce4/doc/C/images/xfsm-splash.png
+share/xfce4/doc/C/xfce4-session.html
+share/themes/Default/balou/logo.png
+share/themes/Default/balou/themerc
+share/icons/hicolor/48x48/apps/xfce4-session.png
+share/icons/hicolor/48x48/apps/xfce4-splash.png
+share/icons/hicolor/48x48/apps/xfsm-shutdown.png
+share/icons/hicolor/64x64/apps/xfsm-gnome-kde-logo.png
+share/icons/hicolor/72x72/apps/xfsm-trash-hilight.png
+share/icons/hicolor/72x72/apps/xfsm-trash-normal.png
+share/icons/hicolor/128x128/apps/xfce4-session.png
+share/icons/hicolor/scalable/apps/xfce4-session.svg
+share/icons/hicolor/scalable/apps/xfsm-shutdown.svg
+share/applications/xfce-session-settings.desktop
+share/applications/xfce-splash-settings.desktop
+@dirrm etc/xdg/xfce4-session
+@dirrm include/xfce4/xfce4-session-4.2/libxfsm
+@dirrm include/xfce4/xfce4-session-4.2
+@unexec rmdir %D/include/xfce4 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 2>/dev/null || true
 @unexec rmdir %D/share/xfce4 2>/dev/null || true
+@unexec rmdir %D/lib/xfce4/splash/engines 2>/dev/null || true
+@unexec rmdir %D/lib/xfce4/splash 2>/dev/null || true
+@unexec rmdir %D/lib/xfce4/mcs-plugins 2>/dev/null || true
+@unexec rmdir %D/lib/xfce4 2>/dev/null || true
diff --git a/x11-wm/xfce4-systray/Makefile b/x11-wm/xfce4-systray/Makefile
index 482ab1f..49d2a65 100644
--- a/x11-wm/xfce4-systray/Makefile
+++ b/x11-wm/xfce4-systray/Makefile
@@ -6,11 +6,12 @@
 #
 
 PORTNAME=	xfce4-systray
-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}/
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	oliver@FreeBSD.org
@@ -18,14 +19,14 @@ COMMENT=	XFce 4 system tray module for xfce4-panel
 
 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
 
 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}
 
diff --git a/x11-wm/xfce4-systray/distinfo b/x11-wm/xfce4-systray/distinfo
index 5d154d9..46557aa 100644
--- a/x11-wm/xfce4-systray/distinfo
+++ b/x11-wm/xfce4-systray/distinfo
@@ -1,2 +1,2 @@
-MD5 (xfce4/xfce4-systray-4.0.6.tar.gz) = c47e746ad38178c6c7f891ca4b39a616
-SIZE(xfce4/xfce4-systray-4.0.6.tar.gz) = 310468
+MD5 (xfce4/xfce4-systray-4.2.0.tar.gz) = e6e5c2948425fd82d62ce66cdcfe9c42
+SIZE(xfce4/xfce4-systray-4.2.0.tar.gz) = 313093
diff --git a/x11-wm/xfce4-systray/pkg-plist b/x11-wm/xfce4-systray/pkg-plist
index 5888185..81178f0 100644
--- a/x11-wm/xfce4-systray/pkg-plist
+++ b/x11-wm/xfce4-systray/pkg-plist
@@ -1,4 +1,3 @@
-lib/xfce4/panel-plugins/libsystray.a
-lib/xfce4/panel-plugins/libsystray.la
 lib/xfce4/panel-plugins/libsystray.so
 @unexec rmdir %D/lib/xfce4/panel-plugins 2>/dev/null || true
+@unexec rmdir %D/lib/xfce4 2>/dev/null || true
diff --git a/x11-wm/xfce4-wm/Makefile b/x11-wm/xfce4-wm/Makefile
index d41c5dc..25a6859 100644
--- a/x11-wm/xfce4-wm/Makefile
+++ b/x11-wm/xfce4-wm/Makefile
@@ -6,11 +6,12 @@
 #
 
 PORTNAME=	xfce4-wm
-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=	xfwm4-${PORTVERSION}
 DIST_SUBDIR=	xfce4
 
@@ -20,14 +21,14 @@ COMMENT=	XFce 4 window manager
 BUILD_DEPENDS=	xfce-mcs-manager:${PORTSDIR}/sysutils/xfce4-mcs-manager
 LIB_DEPENDS=	startup-notification-1.0:${PORTSDIR}/x11/startup-notification \
 		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_XPM=	yes
-USE_INC_LIBTOOL_VER=15
+USE_LIBTOOL_VER=15
 INSTALLS_SHLIB=	yes
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--enable-xinerama
diff --git a/x11-wm/xfce4-wm/distinfo b/x11-wm/xfce4-wm/distinfo
index 6782d4c..2c31117 100644
--- a/x11-wm/xfce4-wm/distinfo
+++ b/x11-wm/xfce4-wm/distinfo
@@ -1,2 +1,2 @@
-MD5 (xfce4/xfwm4-4.0.6.tar.gz) = 911688ba221bc65e66e15bb87993edec
-SIZE(xfce4/xfwm4-4.0.6.tar.gz) = 975194
+MD5 (xfce4/xfwm4-4.2.0.tar.gz) = da6d773f31ef91400174c2045f0f1a80
+SIZE(xfce4/xfwm4-4.2.0.tar.gz) = 1112459
diff --git a/x11-wm/xfce4-wm/pkg-plist b/x11-wm/xfce4-wm/pkg-plist
index 86a46a2..f2752b2 100644
--- a/x11-wm/xfce4-wm/pkg-plist
+++ b/x11-wm/xfce4-wm/pkg-plist
@@ -1,23 +1,30 @@
 bin/xfwm4
-lib/xfce4/mcs-plugins/margins_plugin.a
-lib/xfce4/mcs-plugins/margins_plugin.la
-lib/xfce4/mcs-plugins/margins_plugin.so
-lib/xfce4/mcs-plugins/xfwm4_plugin.a
-lib/xfce4/mcs-plugins/xfwm4_plugin.la
+lib/xfce4/mcs-plugins/workspaces_plugin.so
 lib/xfce4/mcs-plugins/xfwm4_plugin.so
+share/applications/xfce-wm-settings.desktop
+share/applications/xfce-workspaces-settings.desktop
+share/icons/hicolor/48x48/apps/xfce4-keys.png
+share/icons/hicolor/48x48/apps/xfce4-workspaces.png
+share/icons/hicolor/48x48/apps/xfwm4.png
+share/icons/hicolor/scalable/apps/xfce4-workspaces.svg
+share/icons/hicolor/scalable/apps/xfwm4.svg
 share/locale/az/LC_MESSAGES/xfwm4.mo
 share/locale/ar/LC_MESSAGES/xfwm4.mo
+share/locale/be/LC_MESSAGES/xfwm4.mo
 share/locale/bg/LC_MESSAGES/xfwm4.mo
 share/locale/ca/LC_MESSAGES/xfwm4.mo
 share/locale/cs/LC_MESSAGES/xfwm4.mo
 share/locale/de/LC_MESSAGES/xfwm4.mo
+share/locale/en_GB/LC_MESSAGES/xfwm4.mo
 share/locale/es/LC_MESSAGES/xfwm4.mo
 share/locale/es_MX/LC_MESSAGES/xfwm4.mo
 share/locale/et/LC_MESSAGES/xfwm4.mo
 share/locale/eu/LC_MESSAGES/xfwm4.mo
-share/locale/fa_IR/LC_MESSAGES/xfwm4.mo
+share/locale/fa/LC_MESSAGES/xfwm4.mo
 share/locale/fi/LC_MESSAGES/xfwm4.mo
 share/locale/fr/LC_MESSAGES/xfwm4.mo
+share/locale/gu/LC_MESSAGES/xfwm4.mo
+share/locale/he/LC_MESSAGES/xfwm4.mo
 share/locale/hi/LC_MESSAGES/xfwm4.mo
 share/locale/hu/LC_MESSAGES/xfwm4.mo
 share/locale/it/LC_MESSAGES/xfwm4.mo
@@ -25,12 +32,15 @@ share/locale/ja/LC_MESSAGES/xfwm4.mo
 share/locale/ko/LC_MESSAGES/xfwm4.mo
 share/locale/lt/LC_MESSAGES/xfwm4.mo
 share/locale/ms/LC_MESSAGES/xfwm4.mo
+share/locale/nb_NO/LC_MESSAGES/xfwm4.mo
 share/locale/nl/LC_MESSAGES/xfwm4.mo
-share/locale/no/LC_MESSAGES/xfwm4.mo
+share/locale/pa/LC_MESSAGES/xfwm4.mo
 share/locale/pl/LC_MESSAGES/xfwm4.mo
 share/locale/pt_BR/LC_MESSAGES/xfwm4.mo
 share/locale/pt_PT/LC_MESSAGES/xfwm4.mo
+share/locale/ro/LC_MESSAGES/xfwm4.mo
 share/locale/ru/LC_MESSAGES/xfwm4.mo
+share/locale/sk/LC_MESSAGES/xfwm4.mo
 share/locale/sv/LC_MESSAGES/xfwm4.mo
 share/locale/ta/LC_MESSAGES/xfwm4.mo
 share/locale/tr/LC_MESSAGES/xfwm4.mo
@@ -38,550 +48,647 @@ share/locale/uk/LC_MESSAGES/xfwm4.mo
 share/locale/vi/LC_MESSAGES/xfwm4.mo
 share/locale/zh_CN/LC_MESSAGES/xfwm4.mo
 share/locale/zh_TW/LC_MESSAGES/xfwm4.mo
+share/themes/Default/xfwm4/README
+share/themes/Default/xfwm4/themerc
+share/themes/Default/xfwm4/bottom-active.png
+share/themes/Default/xfwm4/bottom-active.xpm
+share/themes/Default/xfwm4/bottom-inactive.png
+share/themes/Default/xfwm4/bottom-inactive.xpm
+share/themes/Default/xfwm4/bottom-left-active.png
+share/themes/Default/xfwm4/bottom-left-active.xpm
+share/themes/Default/xfwm4/bottom-left-inactive.png
+share/themes/Default/xfwm4/bottom-left-inactive.xpm
+share/themes/Default/xfwm4/bottom-right-active.png
+share/themes/Default/xfwm4/bottom-right-active.xpm
+share/themes/Default/xfwm4/bottom-right-inactive.png
+share/themes/Default/xfwm4/bottom-right-inactive.xpm
+share/themes/Default/xfwm4/close-active.xpm
+share/themes/Default/xfwm4/close-inactive.xpm
+share/themes/Default/xfwm4/close-pressed.png
+share/themes/Default/xfwm4/close-pressed.xpm
+share/themes/Default/xfwm4/hide-active.xpm
+share/themes/Default/xfwm4/hide-inactive.xpm
+share/themes/Default/xfwm4/hide-pressed.png
+share/themes/Default/xfwm4/hide-pressed.xpm
+share/themes/Default/xfwm4/left-active.png
+share/themes/Default/xfwm4/left-active.xpm
+share/themes/Default/xfwm4/left-inactive.png
+share/themes/Default/xfwm4/left-inactive.xpm
+share/themes/Default/xfwm4/maximize-active.xpm
+share/themes/Default/xfwm4/maximize-inactive.xpm
+share/themes/Default/xfwm4/maximize-pressed.png
+share/themes/Default/xfwm4/maximize-pressed.xpm
+share/themes/Default/xfwm4/maximize-toggled-active.xpm
+share/themes/Default/xfwm4/maximize-toggled-inactive.xpm
+share/themes/Default/xfwm4/maximize-toggled-pressed.png
+share/themes/Default/xfwm4/maximize-toggled-pressed.xpm
+share/themes/Default/xfwm4/menu-active.xpm
+share/themes/Default/xfwm4/menu-inactive.xpm
+share/themes/Default/xfwm4/menu-pressed.png
+share/themes/Default/xfwm4/menu-pressed.xpm
+share/themes/Default/xfwm4/right-active.png
+share/themes/Default/xfwm4/right-active.xpm
+share/themes/Default/xfwm4/right-inactive.png
+share/themes/Default/xfwm4/right-inactive.xpm
+share/themes/Default/xfwm4/shade-active.xpm
+share/themes/Default/xfwm4/shade-inactive.xpm
+share/themes/Default/xfwm4/shade-pressed.png
+share/themes/Default/xfwm4/shade-pressed.xpm
+share/themes/Default/xfwm4/shade-toggled-active.xpm
+share/themes/Default/xfwm4/shade-toggled-inactive.xpm
+share/themes/Default/xfwm4/shade-toggled-pressed.png
+share/themes/Default/xfwm4/shade-toggled-pressed.xpm
+share/themes/Default/xfwm4/stick-active.xpm
+share/themes/Default/xfwm4/stick-inactive.xpm
+share/themes/Default/xfwm4/stick-pressed.png
+share/themes/Default/xfwm4/stick-pressed.xpm
+share/themes/Default/xfwm4/stick-toggled-active.xpm
+share/themes/Default/xfwm4/stick-toggled-inactive.xpm
+share/themes/Default/xfwm4/stick-toggled-pressed.png
+share/themes/Default/xfwm4/stick-toggled-pressed.xpm
+share/themes/Default/xfwm4/title-1-active.png
+share/themes/Default/xfwm4/title-1-active.xpm
+share/themes/Default/xfwm4/title-1-inactive.png
+share/themes/Default/xfwm4/title-1-inactive.xpm
+share/themes/Default/xfwm4/title-2-active.png
+share/themes/Default/xfwm4/title-2-active.xpm
+share/themes/Default/xfwm4/title-2-inactive.png
+share/themes/Default/xfwm4/title-2-inactive.xpm
+share/themes/Default/xfwm4/title-3-active.png
+share/themes/Default/xfwm4/title-3-active.xpm
+share/themes/Default/xfwm4/title-3-inactive.png
+share/themes/Default/xfwm4/title-3-inactive.xpm
+share/themes/Default/xfwm4/title-4-active.png
+share/themes/Default/xfwm4/title-4-active.xpm
+share/themes/Default/xfwm4/title-4-inactive.png
+share/themes/Default/xfwm4/title-4-inactive.xpm
+share/themes/Default/xfwm4/title-5-active.png
+share/themes/Default/xfwm4/title-5-active.xpm
+share/themes/Default/xfwm4/title-5-inactive.png
+share/themes/Default/xfwm4/title-5-inactive.xpm
+share/themes/Default/xfwm4/top-left-active.png
+share/themes/Default/xfwm4/top-left-active.xpm
+share/themes/Default/xfwm4/top-left-inactive.png
+share/themes/Default/xfwm4/top-left-inactive.xpm
+share/themes/Default/xfwm4/top-right-active.png
+share/themes/Default/xfwm4/top-right-active.xpm
+share/themes/Default/xfwm4/top-right-inactive.png
+share/themes/Default/xfwm4/top-right-inactive.xpm
+share/themes/Default/xfwm4/keythemerc
+share/themes/Default-4.0/xfwm4/README
+share/themes/Default-4.0/xfwm4/themerc
+share/themes/Default-4.0/xfwm4/bottom-active.xpm
+share/themes/Default-4.0/xfwm4/bottom-inactive.xpm
+share/themes/Default-4.0/xfwm4/bottom-left-active.xpm
+share/themes/Default-4.0/xfwm4/bottom-left-inactive.xpm
+share/themes/Default-4.0/xfwm4/bottom-right-active.xpm
+share/themes/Default-4.0/xfwm4/bottom-right-inactive.xpm
+share/themes/Default-4.0/xfwm4/close-active.xpm
+share/themes/Default-4.0/xfwm4/close-inactive.xpm
+share/themes/Default-4.0/xfwm4/close-pressed.xpm
+share/themes/Default-4.0/xfwm4/hide-active.xpm
+share/themes/Default-4.0/xfwm4/hide-inactive.xpm
+share/themes/Default-4.0/xfwm4/hide-pressed.xpm
+share/themes/Default-4.0/xfwm4/left-active.xpm
+share/themes/Default-4.0/xfwm4/left-inactive.xpm
+share/themes/Default-4.0/xfwm4/maximize-active.xpm
+share/themes/Default-4.0/xfwm4/maximize-inactive.xpm
+share/themes/Default-4.0/xfwm4/maximize-pressed.xpm
+share/themes/Default-4.0/xfwm4/maximize-toggled-active.xpm
+share/themes/Default-4.0/xfwm4/maximize-toggled-inactive.xpm
+share/themes/Default-4.0/xfwm4/maximize-toggled-pressed.xpm
+share/themes/Default-4.0/xfwm4/menu-active.xpm
+share/themes/Default-4.0/xfwm4/menu-inactive.xpm
+share/themes/Default-4.0/xfwm4/menu-pressed.xpm
+share/themes/Default-4.0/xfwm4/right-active.xpm
+share/themes/Default-4.0/xfwm4/right-inactive.xpm
+share/themes/Default-4.0/xfwm4/shade-active.xpm
+share/themes/Default-4.0/xfwm4/shade-inactive.xpm
+share/themes/Default-4.0/xfwm4/shade-pressed.xpm
+share/themes/Default-4.0/xfwm4/shade-toggled-active.xpm
+share/themes/Default-4.0/xfwm4/shade-toggled-inactive.xpm
+share/themes/Default-4.0/xfwm4/shade-toggled-pressed.xpm
+share/themes/Default-4.0/xfwm4/stick-active.xpm
+share/themes/Default-4.0/xfwm4/stick-inactive.xpm
+share/themes/Default-4.0/xfwm4/stick-pressed.xpm
+share/themes/Default-4.0/xfwm4/stick-toggled-active.xpm
+share/themes/Default-4.0/xfwm4/stick-toggled-inactive.xpm
+share/themes/Default-4.0/xfwm4/stick-toggled-pressed.xpm
+share/themes/Default-4.0/xfwm4/title-1-active.xpm
+share/themes/Default-4.0/xfwm4/title-1-inactive.xpm
+share/themes/Default-4.0/xfwm4/title-2-active.xpm
+share/themes/Default-4.0/xfwm4/title-2-inactive.xpm
+share/themes/Default-4.0/xfwm4/title-3-active.xpm
+share/themes/Default-4.0/xfwm4/title-3-inactive.xpm
+share/themes/Default-4.0/xfwm4/title-4-active.xpm
+share/themes/Default-4.0/xfwm4/title-4-inactive.xpm
+share/themes/Default-4.0/xfwm4/title-5-active.xpm
+share/themes/Default-4.0/xfwm4/title-5-inactive.xpm
+share/themes/Default-4.0/xfwm4/top-left-active.xpm
+share/themes/Default-4.0/xfwm4/top-left-inactive.xpm
+share/themes/Default-4.0/xfwm4/top-right-active.xpm
+share/themes/Default-4.0/xfwm4/top-right-inactive.xpm
+share/themes/Opta/xfwm4/README
+share/themes/Opta/xfwm4/themerc
+share/themes/Opta/xfwm4/bottom-active.xpm
+share/themes/Opta/xfwm4/bottom-inactive.xpm
+share/themes/Opta/xfwm4/bottom-left-active.xpm
+share/themes/Opta/xfwm4/bottom-left-inactive.xpm
+share/themes/Opta/xfwm4/bottom-right-active.xpm
+share/themes/Opta/xfwm4/bottom-right-inactive.xpm
+share/themes/Opta/xfwm4/close-active.xpm
+share/themes/Opta/xfwm4/close-inactive.xpm
+share/themes/Opta/xfwm4/close-pressed.xpm
+share/themes/Opta/xfwm4/hide-active.xpm
+share/themes/Opta/xfwm4/hide-inactive.xpm
+share/themes/Opta/xfwm4/hide-pressed.xpm
+share/themes/Opta/xfwm4/left-active.xpm
+share/themes/Opta/xfwm4/left-inactive.xpm
+share/themes/Opta/xfwm4/maximize-active.xpm
+share/themes/Opta/xfwm4/maximize-inactive.xpm
+share/themes/Opta/xfwm4/maximize-pressed.xpm
+share/themes/Opta/xfwm4/maximize-toggled-active.xpm
+share/themes/Opta/xfwm4/maximize-toggled-inactive.xpm
+share/themes/Opta/xfwm4/maximize-toggled-pressed.xpm
+share/themes/Opta/xfwm4/menu-active.xpm
+share/themes/Opta/xfwm4/menu-inactive.xpm
+share/themes/Opta/xfwm4/menu-pressed.xpm
+share/themes/Opta/xfwm4/right-active.xpm
+share/themes/Opta/xfwm4/right-inactive.xpm
+share/themes/Opta/xfwm4/shade-active.xpm
+share/themes/Opta/xfwm4/shade-inactive.xpm
+share/themes/Opta/xfwm4/shade-pressed.xpm
+share/themes/Opta/xfwm4/shade-toggled-active.xpm
+share/themes/Opta/xfwm4/shade-toggled-inactive.xpm
+share/themes/Opta/xfwm4/shade-toggled-pressed.xpm
+share/themes/Opta/xfwm4/stick-active.xpm
+share/themes/Opta/xfwm4/stick-inactive.xpm
+share/themes/Opta/xfwm4/stick-pressed.xpm
+share/themes/Opta/xfwm4/stick-toggled-active.xpm
+share/themes/Opta/xfwm4/stick-toggled-inactive.xpm
+share/themes/Opta/xfwm4/stick-toggled-pressed.xpm
+share/themes/Opta/xfwm4/title-1-active.xpm
+share/themes/Opta/xfwm4/title-1-inactive.xpm
+share/themes/Opta/xfwm4/title-2-active.xpm
+share/themes/Opta/xfwm4/title-2-active.png
+share/themes/Opta/xfwm4/title-2-inactive.xpm
+share/themes/Opta/xfwm4/title-2-inactive.png
+share/themes/Opta/xfwm4/title-3-active.xpm
+share/themes/Opta/xfwm4/title-3-active.png
+share/themes/Opta/xfwm4/title-3-inactive.xpm
+share/themes/Opta/xfwm4/title-3-inactive.png
+share/themes/Opta/xfwm4/title-4-active.xpm
+share/themes/Opta/xfwm4/title-4-active.png
+share/themes/Opta/xfwm4/title-4-inactive.xpm
+share/themes/Opta/xfwm4/title-4-inactive.png
+share/themes/Opta/xfwm4/title-5-active.xpm
+share/themes/Opta/xfwm4/title-5-inactive.xpm
+share/themes/Opta/xfwm4/top-left-active.xpm
+share/themes/Opta/xfwm4/top-left-inactive.xpm
+share/themes/Opta/xfwm4/top-right-active.xpm
+share/themes/Opta/xfwm4/top-right-inactive.xpm
+share/themes/Symphony/xfwm4/README
+share/themes/Symphony/xfwm4/themerc
+share/themes/Symphony/xfwm4/bottom-active.png
+share/themes/Symphony/xfwm4/bottom-active.xpm
+share/themes/Symphony/xfwm4/bottom-inactive.png
+share/themes/Symphony/xfwm4/bottom-inactive.xpm
+share/themes/Symphony/xfwm4/bottom-left-active.png
+share/themes/Symphony/xfwm4/bottom-left-active.xpm
+share/themes/Symphony/xfwm4/bottom-left-inactive.png
+share/themes/Symphony/xfwm4/bottom-left-inactive.xpm
+share/themes/Symphony/xfwm4/bottom-right-active.png
+share/themes/Symphony/xfwm4/bottom-right-active.xpm
+share/themes/Symphony/xfwm4/bottom-right-inactive.png
+share/themes/Symphony/xfwm4/bottom-right-inactive.xpm
+share/themes/Symphony/xfwm4/close-active.xpm
+share/themes/Symphony/xfwm4/close-inactive.xpm
+share/themes/Symphony/xfwm4/close-pressed.xpm
+share/themes/Symphony/xfwm4/hide-active.xpm
+share/themes/Symphony/xfwm4/hide-inactive.xpm
+share/themes/Symphony/xfwm4/hide-pressed.xpm
+share/themes/Symphony/xfwm4/left-active.png
+share/themes/Symphony/xfwm4/left-active.xpm
+share/themes/Symphony/xfwm4/left-inactive.png
+share/themes/Symphony/xfwm4/left-inactive.xpm
+share/themes/Symphony/xfwm4/maximize-active.xpm
+share/themes/Symphony/xfwm4/maximize-inactive.xpm
+share/themes/Symphony/xfwm4/maximize-pressed.xpm
+share/themes/Symphony/xfwm4/maximize-toggled-active.xpm
+share/themes/Symphony/xfwm4/maximize-toggled-inactive.xpm
+share/themes/Symphony/xfwm4/maximize-toggled-pressed.xpm
+share/themes/Symphony/xfwm4/menu-active.xpm
+share/themes/Symphony/xfwm4/menu-inactive.xpm
+share/themes/Symphony/xfwm4/menu-pressed.xpm
+share/themes/Symphony/xfwm4/right-active.png
+share/themes/Symphony/xfwm4/right-active.xpm
+share/themes/Symphony/xfwm4/right-inactive.png
+share/themes/Symphony/xfwm4/right-inactive.xpm
+share/themes/Symphony/xfwm4/shade-active.xpm
+share/themes/Symphony/xfwm4/shade-inactive.xpm
+share/themes/Symphony/xfwm4/shade-pressed.xpm
+share/themes/Symphony/xfwm4/shade-toggled-active.xpm
+share/themes/Symphony/xfwm4/shade-toggled-inactive.xpm
+share/themes/Symphony/xfwm4/shade-toggled-pressed.xpm
+share/themes/Symphony/xfwm4/stick-active.xpm
+share/themes/Symphony/xfwm4/stick-inactive.xpm
+share/themes/Symphony/xfwm4/stick-pressed.xpm
+share/themes/Symphony/xfwm4/stick-toggled-active.xpm
+share/themes/Symphony/xfwm4/stick-toggled-inactive.xpm
+share/themes/Symphony/xfwm4/stick-toggled-pressed.xpm
+share/themes/Symphony/xfwm4/title-1-active.png
+share/themes/Symphony/xfwm4/title-1-active.xpm
+share/themes/Symphony/xfwm4/title-1-inactive.png
+share/themes/Symphony/xfwm4/title-1-inactive.xpm
+share/themes/Symphony/xfwm4/title-2-active.png
+share/themes/Symphony/xfwm4/title-2-active.xpm
+share/themes/Symphony/xfwm4/title-2-inactive.png
+share/themes/Symphony/xfwm4/title-2-inactive.xpm
+share/themes/Symphony/xfwm4/title-3-active.png
+share/themes/Symphony/xfwm4/title-3-active.xpm
+share/themes/Symphony/xfwm4/title-3-inactive.png
+share/themes/Symphony/xfwm4/title-3-inactive.xpm
+share/themes/Symphony/xfwm4/title-4-active.png
+share/themes/Symphony/xfwm4/title-4-active.xpm
+share/themes/Symphony/xfwm4/title-4-inactive.png
+share/themes/Symphony/xfwm4/title-4-inactive.xpm
+share/themes/Symphony/xfwm4/title-5-active.png
+share/themes/Symphony/xfwm4/title-5-active.xpm
+share/themes/Symphony/xfwm4/title-5-inactive.png
+share/themes/Symphony/xfwm4/title-5-inactive.xpm
+share/themes/Symphony/xfwm4/top-left-active.png
+share/themes/Symphony/xfwm4/top-left-active.xpm
+share/themes/Symphony/xfwm4/top-left-inactive.png
+share/themes/Symphony/xfwm4/top-left-inactive.xpm
+share/themes/Symphony/xfwm4/top-right-active.png
+share/themes/Symphony/xfwm4/top-right-active.xpm
+share/themes/Symphony/xfwm4/top-right-inactive.png
+share/themes/Symphony/xfwm4/top-right-inactive.xpm
+share/themes/Therapy/xfwm4/README
+share/themes/Therapy/xfwm4/bottom-active.png
+share/themes/Therapy/xfwm4/bottom-active.xpm
+share/themes/Therapy/xfwm4/bottom-inactive.png
+share/themes/Therapy/xfwm4/bottom-inactive.xpm
+share/themes/Therapy/xfwm4/bottom-left-active.png
+share/themes/Therapy/xfwm4/bottom-left-active.xpm
+share/themes/Therapy/xfwm4/bottom-left-inactive.png
+share/themes/Therapy/xfwm4/bottom-left-inactive.xpm
+share/themes/Therapy/xfwm4/bottom-right-active.png
+share/themes/Therapy/xfwm4/bottom-right-active.xpm
+share/themes/Therapy/xfwm4/bottom-right-inactive.png
+share/themes/Therapy/xfwm4/bottom-right-inactive.xpm
+share/themes/Therapy/xfwm4/close-active.xpm
+share/themes/Therapy/xfwm4/close-inactive.xpm
+share/themes/Therapy/xfwm4/close-pressed.png
+share/themes/Therapy/xfwm4/close-pressed.xpm
+share/themes/Therapy/xfwm4/hide-active.xpm
+share/themes/Therapy/xfwm4/hide-inactive.xpm
+share/themes/Therapy/xfwm4/hide-pressed.png
+share/themes/Therapy/xfwm4/hide-pressed.xpm
+share/themes/Therapy/xfwm4/left-active.png
+share/themes/Therapy/xfwm4/left-active.xpm
+share/themes/Therapy/xfwm4/left-inactive.png
+share/themes/Therapy/xfwm4/left-inactive.xpm
+share/themes/Therapy/xfwm4/maximize-active.xpm
+share/themes/Therapy/xfwm4/maximize-inactive.xpm
+share/themes/Therapy/xfwm4/maximize-pressed.png
+share/themes/Therapy/xfwm4/maximize-pressed.xpm
+share/themes/Therapy/xfwm4/maximize-toggled-active.xpm
+share/themes/Therapy/xfwm4/maximize-toggled-inactive.xpm
+share/themes/Therapy/xfwm4/maximize-toggled-pressed.png
+share/themes/Therapy/xfwm4/menu-active.xpm
+share/themes/Therapy/xfwm4/maximize-toggled-pressed.xpm
+share/themes/Therapy/xfwm4/menu-inactive.xpm
+share/themes/Therapy/xfwm4/menu-pressed.png
+share/themes/Therapy/xfwm4/menu-pressed.xpm
+share/themes/Therapy/xfwm4/right-active.png
+share/themes/Therapy/xfwm4/right-active.xpm
+share/themes/Therapy/xfwm4/right-inactive.png
+share/themes/Therapy/xfwm4/right-inactive.xpm
+share/themes/Therapy/xfwm4/shade-active.xpm
+share/themes/Therapy/xfwm4/shade-inactive.xpm
+share/themes/Therapy/xfwm4/shade-pressed.png
+share/themes/Therapy/xfwm4/shade-pressed.xpm
+share/themes/Therapy/xfwm4/shade-toggled-active.xpm
+share/themes/Therapy/xfwm4/shade-toggled-inactive.xpm
+share/themes/Therapy/xfwm4/shade-toggled-pressed.png
+share/themes/Therapy/xfwm4/shade-toggled-pressed.xpm
+share/themes/Therapy/xfwm4/themerc
+share/themes/Therapy/xfwm4/stick-active.xpm
+share/themes/Therapy/xfwm4/stick-inactive.xpm
+share/themes/Therapy/xfwm4/stick-pressed.png
+share/themes/Therapy/xfwm4/stick-pressed.xpm
+share/themes/Therapy/xfwm4/stick-toggled-active.xpm
+share/themes/Therapy/xfwm4/stick-toggled-inactive.xpm
+share/themes/Therapy/xfwm4/stick-toggled-pressed.png
+share/themes/Therapy/xfwm4/stick-toggled-pressed.xpm
+share/themes/Therapy/xfwm4/title-1-active.png
+share/themes/Therapy/xfwm4/title-1-active.xpm
+share/themes/Therapy/xfwm4/title-1-inactive.png
+share/themes/Therapy/xfwm4/title-1-inactive.xpm
+share/themes/Therapy/xfwm4/title-2-active.png
+share/themes/Therapy/xfwm4/title-2-active.xpm
+share/themes/Therapy/xfwm4/title-2-inactive.png
+share/themes/Therapy/xfwm4/title-2-inactive.xpm
+share/themes/Therapy/xfwm4/title-3-active.png
+share/themes/Therapy/xfwm4/title-3-active.xpm
+share/themes/Therapy/xfwm4/title-3-inactive.png
+share/themes/Therapy/xfwm4/title-3-inactive.xpm
+share/themes/Therapy/xfwm4/title-4-active.png
+share/themes/Therapy/xfwm4/title-4-active.xpm
+share/themes/Therapy/xfwm4/title-4-inactive.png
+share/themes/Therapy/xfwm4/title-4-inactive.xpm
+share/themes/Therapy/xfwm4/title-5-active.png
+share/themes/Therapy/xfwm4/title-5-active.xpm
+share/themes/Therapy/xfwm4/title-5-inactive.png
+share/themes/Therapy/xfwm4/title-5-inactive.xpm
+share/themes/Therapy/xfwm4/top-left-active.png
+share/themes/Therapy/xfwm4/top-left-active.xpm
+share/themes/Therapy/xfwm4/top-left-inactive.png
+share/themes/Therapy/xfwm4/top-left-inactive.xpm
+share/themes/Therapy/xfwm4/top-right-active.png
+share/themes/Therapy/xfwm4/top-right-active.xpm
+share/themes/Therapy/xfwm4/top-right-inactive.png
+share/themes/Therapy/xfwm4/top-right-inactive.xpm
+share/themes/Tyrex/xfwm4/README
+share/themes/Tyrex/xfwm4/themerc
+share/themes/Tyrex/xfwm4/bottom-active.png
+share/themes/Tyrex/xfwm4/bottom-active.xpm
+share/themes/Tyrex/xfwm4/bottom-inactive.png
+share/themes/Tyrex/xfwm4/bottom-inactive.xpm
+share/themes/Tyrex/xfwm4/bottom-left-active.png
+share/themes/Tyrex/xfwm4/bottom-left-active.xpm
+share/themes/Tyrex/xfwm4/bottom-left-inactive.png
+share/themes/Tyrex/xfwm4/bottom-left-inactive.xpm
+share/themes/Tyrex/xfwm4/bottom-right-active.png
+share/themes/Tyrex/xfwm4/bottom-right-active.xpm
+share/themes/Tyrex/xfwm4/bottom-right-inactive.png
+share/themes/Tyrex/xfwm4/bottom-right-inactive.xpm
+share/themes/Tyrex/xfwm4/close-active.xpm
+share/themes/Tyrex/xfwm4/close-inactive.xpm
+share/themes/Tyrex/xfwm4/close-pressed.xpm
+share/themes/Tyrex/xfwm4/hide-active.xpm
+share/themes/Tyrex/xfwm4/hide-inactive.xpm
+share/themes/Tyrex/xfwm4/hide-pressed.xpm
+share/themes/Tyrex/xfwm4/left-active.png
+share/themes/Tyrex/xfwm4/left-active.xpm
+share/themes/Tyrex/xfwm4/left-inactive.png
+share/themes/Tyrex/xfwm4/left-inactive.xpm
+share/themes/Tyrex/xfwm4/maximize-active.xpm
+share/themes/Tyrex/xfwm4/maximize-inactive.xpm
+share/themes/Tyrex/xfwm4/maximize-pressed.xpm
+share/themes/Tyrex/xfwm4/maximize-toggled-active.xpm
+share/themes/Tyrex/xfwm4/maximize-toggled-inactive.xpm
+share/themes/Tyrex/xfwm4/maximize-toggled-pressed.xpm
+share/themes/Tyrex/xfwm4/menu-active.xpm
+share/themes/Tyrex/xfwm4/menu-inactive.xpm
+share/themes/Tyrex/xfwm4/menu-pressed.xpm
+share/themes/Tyrex/xfwm4/right-active.png
+share/themes/Tyrex/xfwm4/right-active.xpm
+share/themes/Tyrex/xfwm4/right-inactive.png
+share/themes/Tyrex/xfwm4/right-inactive.xpm
+share/themes/Tyrex/xfwm4/shade-active.xpm
+share/themes/Tyrex/xfwm4/shade-inactive.xpm
+share/themes/Tyrex/xfwm4/shade-pressed.xpm
+share/themes/Tyrex/xfwm4/shade-toggled-active.xpm
+share/themes/Tyrex/xfwm4/shade-toggled-inactive.xpm
+share/themes/Tyrex/xfwm4/shade-toggled-pressed.xpm
+share/themes/Tyrex/xfwm4/stick-active.xpm
+share/themes/Tyrex/xfwm4/stick-inactive.xpm
+share/themes/Tyrex/xfwm4/stick-pressed.xpm
+share/themes/Tyrex/xfwm4/stick-toggled-active.xpm
+share/themes/Tyrex/xfwm4/stick-toggled-inactive.xpm
+share/themes/Tyrex/xfwm4/stick-toggled-pressed.xpm
+share/themes/Tyrex/xfwm4/title-1-active.png
+share/themes/Tyrex/xfwm4/title-1-active.xpm
+share/themes/Tyrex/xfwm4/title-1-inactive.png
+share/themes/Tyrex/xfwm4/title-1-inactive.xpm
+share/themes/Tyrex/xfwm4/title-2-active.png
+share/themes/Tyrex/xfwm4/title-2-active.xpm
+share/themes/Tyrex/xfwm4/title-2-inactive.png
+share/themes/Tyrex/xfwm4/title-2-inactive.xpm
+share/themes/Tyrex/xfwm4/title-3-active.png
+share/themes/Tyrex/xfwm4/title-3-active.xpm
+share/themes/Tyrex/xfwm4/title-3-inactive.png
+share/themes/Tyrex/xfwm4/title-3-inactive.xpm
+share/themes/Tyrex/xfwm4/title-4-active.png
+share/themes/Tyrex/xfwm4/title-4-active.xpm
+share/themes/Tyrex/xfwm4/title-4-inactive.png
+share/themes/Tyrex/xfwm4/title-4-inactive.xpm
+share/themes/Tyrex/xfwm4/title-5-active.png
+share/themes/Tyrex/xfwm4/title-5-active.xpm
+share/themes/Tyrex/xfwm4/title-5-inactive.png
+share/themes/Tyrex/xfwm4/title-5-inactive.xpm
+share/themes/Tyrex/xfwm4/top-left-active.png
+share/themes/Tyrex/xfwm4/top-left-active.xpm
+share/themes/Tyrex/xfwm4/top-left-inactive.png
+share/themes/Tyrex/xfwm4/top-left-inactive.xpm
+share/themes/Tyrex/xfwm4/top-right-active.png
+share/themes/Tyrex/xfwm4/top-right-active.xpm
+share/themes/Tyrex/xfwm4/top-right-inactive.png
+share/themes/Tyrex/xfwm4/top-right-inactive.xpm
+share/themes/Waza/xfwm4/README
+share/themes/Waza/xfwm4/themerc
+share/themes/Waza/xfwm4/bottom-active.xpm
+share/themes/Waza/xfwm4/bottom-inactive.xpm
+share/themes/Waza/xfwm4/bottom-left-active.xpm
+share/themes/Waza/xfwm4/bottom-left-inactive.xpm
+share/themes/Waza/xfwm4/bottom-right-active.xpm
+share/themes/Waza/xfwm4/bottom-right-inactive.xpm
+share/themes/Waza/xfwm4/close-active.png
+share/themes/Waza/xfwm4/close-active.xpm
+share/themes/Waza/xfwm4/close-inactive.png
+share/themes/Waza/xfwm4/close-inactive.xpm
+share/themes/Waza/xfwm4/close-pressed.png
+share/themes/Waza/xfwm4/close-pressed.xpm
+share/themes/Waza/xfwm4/hide-active.png
+share/themes/Waza/xfwm4/hide-active.xpm
+share/themes/Waza/xfwm4/hide-inactive.png
+share/themes/Waza/xfwm4/hide-inactive.xpm
+share/themes/Waza/xfwm4/hide-pressed.png
+share/themes/Waza/xfwm4/hide-pressed.xpm
+share/themes/Waza/xfwm4/left-active.xpm
+share/themes/Waza/xfwm4/left-inactive.xpm
+share/themes/Waza/xfwm4/maximize-active.png
+share/themes/Waza/xfwm4/maximize-active.xpm
+share/themes/Waza/xfwm4/maximize-inactive.png
+share/themes/Waza/xfwm4/maximize-inactive.xpm
+share/themes/Waza/xfwm4/maximize-pressed.png
+share/themes/Waza/xfwm4/maximize-pressed.xpm
+share/themes/Waza/xfwm4/maximize-toggled-active.png
+share/themes/Waza/xfwm4/maximize-toggled-active.xpm
+share/themes/Waza/xfwm4/maximize-toggled-inactive.png
+share/themes/Waza/xfwm4/maximize-toggled-inactive.xpm
+share/themes/Waza/xfwm4/maximize-toggled-pressed.png
+share/themes/Waza/xfwm4/maximize-toggled-pressed.xpm
+share/themes/Waza/xfwm4/menu-active.png
+share/themes/Waza/xfwm4/menu-active.xpm
+share/themes/Waza/xfwm4/menu-inactive.png
+share/themes/Waza/xfwm4/menu-inactive.xpm
+share/themes/Waza/xfwm4/menu-pressed.png
+share/themes/Waza/xfwm4/menu-pressed.xpm
+share/themes/Waza/xfwm4/right-active.xpm
+share/themes/Waza/xfwm4/right-inactive.xpm
+share/themes/Waza/xfwm4/shade-active.png
+share/themes/Waza/xfwm4/shade-active.xpm
+share/themes/Waza/xfwm4/shade-inactive.png
+share/themes/Waza/xfwm4/shade-inactive.xpm
+share/themes/Waza/xfwm4/shade-pressed.png
+share/themes/Waza/xfwm4/shade-pressed.xpm
+share/themes/Waza/xfwm4/shade-toggled-active.png
+share/themes/Waza/xfwm4/shade-toggled-active.xpm
+share/themes/Waza/xfwm4/shade-toggled-inactive.png
+share/themes/Waza/xfwm4/shade-toggled-inactive.xpm
+share/themes/Waza/xfwm4/shade-toggled-pressed.png
+share/themes/Waza/xfwm4/shade-toggled-pressed.xpm
+share/themes/Waza/xfwm4/stick-active.png
+share/themes/Waza/xfwm4/stick-active.xpm
+share/themes/Waza/xfwm4/stick-inactive.png
+share/themes/Waza/xfwm4/stick-inactive.xpm
+share/themes/Waza/xfwm4/stick-pressed.png
+share/themes/Waza/xfwm4/stick-pressed.xpm
+share/themes/Waza/xfwm4/stick-toggled-active.png
+share/themes/Waza/xfwm4/stick-toggled-active.xpm
+share/themes/Waza/xfwm4/stick-toggled-inactive.png
+share/themes/Waza/xfwm4/stick-toggled-inactive.xpm
+share/themes/Waza/xfwm4/stick-toggled-pressed.png
+share/themes/Waza/xfwm4/stick-toggled-pressed.xpm
+share/themes/Waza/xfwm4/title-1-active.png
+share/themes/Waza/xfwm4/title-1-active.xpm
+share/themes/Waza/xfwm4/title-1-inactive.png
+share/themes/Waza/xfwm4/title-1-inactive.xpm
+share/themes/Waza/xfwm4/title-2-active.png
+share/themes/Waza/xfwm4/title-2-active.xpm
+share/themes/Waza/xfwm4/title-2-inactive.png
+share/themes/Waza/xfwm4/title-2-inactive.xpm
+share/themes/Waza/xfwm4/title-3-active.png
+share/themes/Waza/xfwm4/title-3-active.xpm
+share/themes/Waza/xfwm4/title-3-inactive.png
+share/themes/Waza/xfwm4/title-3-inactive.xpm
+share/themes/Waza/xfwm4/title-4-active.png
+share/themes/Waza/xfwm4/title-4-active.xpm
+share/themes/Waza/xfwm4/title-4-inactive.png
+share/themes/Waza/xfwm4/title-5-active.png
+share/themes/Waza/xfwm4/title-4-inactive.xpm
+share/themes/Waza/xfwm4/title-5-active.xpm
+share/themes/Waza/xfwm4/title-5-inactive.png
+share/themes/Waza/xfwm4/title-5-inactive.xpm
+share/themes/Waza/xfwm4/top-left-active.png
+share/themes/Waza/xfwm4/top-left-active.xpm
+share/themes/Waza/xfwm4/top-left-inactive.png
+share/themes/Waza/xfwm4/top-left-inactive.xpm
+share/themes/Waza/xfwm4/top-right-active.png
+share/themes/Waza/xfwm4/top-right-active.xpm
+share/themes/Waza/xfwm4/top-right-inactive.png
+share/themes/Waza/xfwm4/top-right-inactive.xpm
+share/themes/Wildbush/xfwm4/README
+share/themes/Wildbush/xfwm4/themerc
+share/themes/Wildbush/xfwm4/bottom-active.png
+share/themes/Wildbush/xfwm4/bottom-active.xpm
+share/themes/Wildbush/xfwm4/bottom-inactive.png
+share/themes/Wildbush/xfwm4/bottom-inactive.xpm
+share/themes/Wildbush/xfwm4/bottom-left-active.png
+share/themes/Wildbush/xfwm4/bottom-left-active.xpm
+share/themes/Wildbush/xfwm4/bottom-left-inactive.png
+share/themes/Wildbush/xfwm4/bottom-left-inactive.xpm
+share/themes/Wildbush/xfwm4/bottom-right-active.png
+share/themes/Wildbush/xfwm4/bottom-right-active.xpm
+share/themes/Wildbush/xfwm4/bottom-right-inactive.png
+share/themes/Wildbush/xfwm4/bottom-right-inactive.xpm
+share/themes/Wildbush/xfwm4/close-active.xpm
+share/themes/Wildbush/xfwm4/close-inactive.xpm
+share/themes/Wildbush/xfwm4/close-pressed.xpm
+share/themes/Wildbush/xfwm4/hide-active.xpm
+share/themes/Wildbush/xfwm4/hide-inactive.xpm
+share/themes/Wildbush/xfwm4/hide-pressed.xpm
+share/themes/Wildbush/xfwm4/left-active.png
+share/themes/Wildbush/xfwm4/left-active.xpm
+share/themes/Wildbush/xfwm4/left-inactive.png
+share/themes/Wildbush/xfwm4/left-inactive.xpm
+share/themes/Wildbush/xfwm4/maximize-active.xpm
+share/themes/Wildbush/xfwm4/maximize-inactive.xpm
+share/themes/Wildbush/xfwm4/maximize-pressed.xpm
+share/themes/Wildbush/xfwm4/maximize-toggled-active.xpm
+share/themes/Wildbush/xfwm4/maximize-toggled-inactive.xpm
+share/themes/Wildbush/xfwm4/maximize-toggled-pressed.xpm
+share/themes/Wildbush/xfwm4/menu-active.xpm
+share/themes/Wildbush/xfwm4/menu-inactive.xpm
+share/themes/Wildbush/xfwm4/menu-pressed.xpm
+share/themes/Wildbush/xfwm4/right-active.png
+share/themes/Wildbush/xfwm4/right-active.xpm
+share/themes/Wildbush/xfwm4/right-inactive.png
+share/themes/Wildbush/xfwm4/right-inactive.xpm
+share/themes/Wildbush/xfwm4/shade-active.xpm
+share/themes/Wildbush/xfwm4/shade-inactive.xpm
+share/themes/Wildbush/xfwm4/shade-pressed.xpm
+share/themes/Wildbush/xfwm4/shade-toggled-active.xpm
+share/themes/Wildbush/xfwm4/shade-toggled-inactive.xpm
+share/themes/Wildbush/xfwm4/shade-toggled-pressed.xpm
+share/themes/Wildbush/xfwm4/stick-active.xpm
+share/themes/Wildbush/xfwm4/stick-inactive.xpm
+share/themes/Wildbush/xfwm4/stick-pressed.xpm
+share/themes/Wildbush/xfwm4/stick-toggled-active.xpm
+share/themes/Wildbush/xfwm4/stick-toggled-inactive.xpm
+share/themes/Wildbush/xfwm4/stick-toggled-pressed.xpm
+share/themes/Wildbush/xfwm4/title-1-active.png
+share/themes/Wildbush/xfwm4/title-1-active.xpm
+share/themes/Wildbush/xfwm4/title-1-inactive.png
+share/themes/Wildbush/xfwm4/title-1-inactive.xpm
+share/themes/Wildbush/xfwm4/title-2-active.png
+share/themes/Wildbush/xfwm4/title-2-active.xpm
+share/themes/Wildbush/xfwm4/title-2-inactive.png
+share/themes/Wildbush/xfwm4/title-2-inactive.xpm
+share/themes/Wildbush/xfwm4/title-3-active.png
+share/themes/Wildbush/xfwm4/title-3-active.xpm
+share/themes/Wildbush/xfwm4/title-3-inactive.png
+share/themes/Wildbush/xfwm4/title-3-inactive.xpm
+share/themes/Wildbush/xfwm4/title-4-active.png
+share/themes/Wildbush/xfwm4/title-4-active.xpm
+share/themes/Wildbush/xfwm4/title-4-inactive.png
+share/themes/Wildbush/xfwm4/title-4-inactive.xpm
+share/themes/Wildbush/xfwm4/title-5-active.png
+share/themes/Wildbush/xfwm4/title-5-active.xpm
+share/themes/Wildbush/xfwm4/title-5-inactive.png
+share/themes/Wildbush/xfwm4/title-5-inactive.xpm
+share/themes/Wildbush/xfwm4/top-left-active.png
+share/themes/Wildbush/xfwm4/top-left-active.xpm
+share/themes/Wildbush/xfwm4/top-left-inactive.png
+share/themes/Wildbush/xfwm4/top-left-inactive.xpm
+share/themes/Wildbush/xfwm4/top-right-active.png
+share/themes/Wildbush/xfwm4/top-right-active.xpm
+share/themes/Wildbush/xfwm4/top-right-inactive.png
+share/themes/Wildbush/xfwm4/top-right-inactive.xpm
+share/xfce4/doc/C/images/compose_shortcut.png
 share/xfce4/doc/C/images/decoration_style.png
-share/xfce4/doc/C/images/keyboard_and_focus.png
+share/xfce4/doc/C/images/focus.png
+share/xfce4/doc/C/images/keyboard_shortcuts.png
 share/xfce4/doc/C/images/misc_wm_prefs.png
 share/xfce4/doc/C/images/titlebar.png
 share/xfce4/doc/C/images/workspace_margins.png
+share/xfce4/doc/C/images/xfwm_workspaces.png
 share/xfce4/doc/C/xfwm4.html
-share/xfce4/doc/fr/images/decoration_style.png
-share/xfce4/doc/fr/images/keyboard_and_focus.png
-share/xfce4/doc/fr/images/misc_wm_prefs.png
-share/xfce4/doc/fr/images/titlebar.png
-share/xfce4/doc/fr/images/workspace_margins.png
-share/xfce4/doc/fr/xfwm4.html
 share/xfwm4/defaults
-share/xfwm4/themes/bbs/README
-share/xfwm4/themes/bbs/bottom-active.xpm
-share/xfwm4/themes/bbs/bottom-inactive.xpm
-share/xfwm4/themes/bbs/bottom-left-active.xpm
-share/xfwm4/themes/bbs/bottom-left-inactive.xpm
-share/xfwm4/themes/bbs/bottom-right-active.xpm
-share/xfwm4/themes/bbs/bottom-right-inactive.xpm
-share/xfwm4/themes/bbs/close-active.xpm
-share/xfwm4/themes/bbs/close-inactive.xpm
-share/xfwm4/themes/bbs/close-pressed.xpm
-share/xfwm4/themes/bbs/hide-active.xpm
-share/xfwm4/themes/bbs/hide-inactive.xpm
-share/xfwm4/themes/bbs/hide-pressed.xpm
-share/xfwm4/themes/bbs/left-active.xpm
-share/xfwm4/themes/bbs/left-inactive.xpm
-share/xfwm4/themes/bbs/maximize-active.xpm
-share/xfwm4/themes/bbs/maximize-inactive.xpm
-share/xfwm4/themes/bbs/maximize-pressed.xpm
-share/xfwm4/themes/bbs/menu-active.xpm
-share/xfwm4/themes/bbs/menu-inactive.xpm
-share/xfwm4/themes/bbs/menu-pressed.xpm
-share/xfwm4/themes/bbs/right-active.xpm
-share/xfwm4/themes/bbs/right-inactive.xpm
-share/xfwm4/themes/bbs/shade-active.xpm
-share/xfwm4/themes/bbs/shade-inactive.xpm
-share/xfwm4/themes/bbs/shade-pressed.xpm
-share/xfwm4/themes/bbs/stick-active.xpm
-share/xfwm4/themes/bbs/stick-inactive.xpm
-share/xfwm4/themes/bbs/stick-pressed.xpm
-share/xfwm4/themes/bbs/themerc
-share/xfwm4/themes/bbs/title-1-active.xpm
-share/xfwm4/themes/bbs/title-1-inactive.xpm
-share/xfwm4/themes/bbs/title-2-active.xpm
-share/xfwm4/themes/bbs/title-2-inactive.xpm
-share/xfwm4/themes/bbs/title-3-active.xpm
-share/xfwm4/themes/bbs/title-3-inactive.xpm
-share/xfwm4/themes/bbs/title-4-active.xpm
-share/xfwm4/themes/bbs/title-4-inactive.xpm
-share/xfwm4/themes/bbs/title-5-active.xpm
-share/xfwm4/themes/bbs/title-5-inactive.xpm
-share/xfwm4/themes/bbs/top-left-active.xpm
-share/xfwm4/themes/bbs/top-left-inactive.xpm
-share/xfwm4/themes/bbs/top-right-active.xpm
-share/xfwm4/themes/bbs/top-right-inactive.xpm
-share/xfwm4/themes/curve/README
-share/xfwm4/themes/curve/bottom-active.xpm
-share/xfwm4/themes/curve/bottom-inactive.xpm
-share/xfwm4/themes/curve/bottom-left-active.xpm
-share/xfwm4/themes/curve/bottom-left-inactive.xpm
-share/xfwm4/themes/curve/bottom-right-active.xpm
-share/xfwm4/themes/curve/bottom-right-inactive.xpm
-share/xfwm4/themes/curve/close-active.xpm
-share/xfwm4/themes/curve/close-inactive.xpm
-share/xfwm4/themes/curve/close-pressed.xpm
-share/xfwm4/themes/curve/hide-active.xpm
-share/xfwm4/themes/curve/hide-inactive.xpm
-share/xfwm4/themes/curve/hide-pressed.xpm
-share/xfwm4/themes/curve/left-active.xpm
-share/xfwm4/themes/curve/left-inactive.xpm
-share/xfwm4/themes/curve/maximize-active.xpm
-share/xfwm4/themes/curve/maximize-inactive.xpm
-share/xfwm4/themes/curve/maximize-pressed.xpm
-share/xfwm4/themes/curve/menu-active.xpm
-share/xfwm4/themes/curve/menu-inactive.xpm
-share/xfwm4/themes/curve/menu-pressed.xpm
-share/xfwm4/themes/curve/right-active.xpm
-share/xfwm4/themes/curve/right-inactive.xpm
-share/xfwm4/themes/curve/shade-active.xpm
-share/xfwm4/themes/curve/shade-inactive.xpm
-share/xfwm4/themes/curve/shade-pressed.xpm
-share/xfwm4/themes/curve/stick-active.xpm
-share/xfwm4/themes/curve/stick-inactive.xpm
-share/xfwm4/themes/curve/stick-pressed.xpm
-share/xfwm4/themes/curve/themerc
-share/xfwm4/themes/curve/title-1-active.xpm
-share/xfwm4/themes/curve/title-1-inactive.xpm
-share/xfwm4/themes/curve/title-2-active.xpm
-share/xfwm4/themes/curve/title-2-inactive.xpm
-share/xfwm4/themes/curve/title-3-active.xpm
-share/xfwm4/themes/curve/title-3-inactive.xpm
-share/xfwm4/themes/curve/title-4-active.xpm
-share/xfwm4/themes/curve/title-4-inactive.xpm
-share/xfwm4/themes/curve/title-5-active.xpm
-share/xfwm4/themes/curve/title-5-inactive.xpm
-share/xfwm4/themes/curve/top-left-active.xpm
-share/xfwm4/themes/curve/top-left-inactive.xpm
-share/xfwm4/themes/curve/top-right-active.xpm
-share/xfwm4/themes/curve/top-right-inactive.xpm
-share/xfwm4/themes/default/README
-share/xfwm4/themes/default/bottom-active.xpm
-share/xfwm4/themes/default/bottom-inactive.xpm
-share/xfwm4/themes/default/bottom-left-active.xpm
-share/xfwm4/themes/default/bottom-left-inactive.xpm
-share/xfwm4/themes/default/bottom-right-active.xpm
-share/xfwm4/themes/default/bottom-right-inactive.xpm
-share/xfwm4/themes/default/close-active.xpm
-share/xfwm4/themes/default/close-inactive.xpm
-share/xfwm4/themes/default/close-pressed.xpm
-share/xfwm4/themes/default/hide-active.xpm
-share/xfwm4/themes/default/hide-inactive.xpm
-share/xfwm4/themes/default/hide-pressed.xpm
-share/xfwm4/themes/default/left-active.xpm
-share/xfwm4/themes/default/left-inactive.xpm
-share/xfwm4/themes/default/maximize-active.xpm
-share/xfwm4/themes/default/maximize-inactive.xpm
-share/xfwm4/themes/default/maximize-pressed.xpm
-share/xfwm4/themes/default/maximize-toggled-active.xpm
-share/xfwm4/themes/default/maximize-toggled-inactive.xpm
-share/xfwm4/themes/default/maximize-toggled-pressed.xpm
-share/xfwm4/themes/default/menu-active.xpm
-share/xfwm4/themes/default/menu-inactive.xpm
-share/xfwm4/themes/default/menu-pressed.xpm
-share/xfwm4/themes/default/right-active.xpm
-share/xfwm4/themes/default/right-inactive.xpm
-share/xfwm4/themes/default/shade-active.xpm
-share/xfwm4/themes/default/shade-inactive.xpm
-share/xfwm4/themes/default/shade-pressed.xpm
-share/xfwm4/themes/default/shade-toggled-active.xpm
-share/xfwm4/themes/default/shade-toggled-inactive.xpm
-share/xfwm4/themes/default/shade-toggled-pressed.xpm
-share/xfwm4/themes/default/stick-active.xpm
-share/xfwm4/themes/default/stick-inactive.xpm
-share/xfwm4/themes/default/stick-pressed.xpm
-share/xfwm4/themes/default/stick-toggled-active.xpm
-share/xfwm4/themes/default/stick-toggled-inactive.xpm
-share/xfwm4/themes/default/stick-toggled-pressed.xpm
-share/xfwm4/themes/default/themerc
-share/xfwm4/themes/default/title-1-active.xpm
-share/xfwm4/themes/default/title-1-inactive.xpm
-share/xfwm4/themes/default/title-2-active.xpm
-share/xfwm4/themes/default/title-2-inactive.xpm
-share/xfwm4/themes/default/title-3-active.xpm
-share/xfwm4/themes/default/title-3-inactive.xpm
-share/xfwm4/themes/default/title-4-active.xpm
-share/xfwm4/themes/default/title-4-inactive.xpm
-share/xfwm4/themes/default/title-5-active.xpm
-share/xfwm4/themes/default/title-5-inactive.xpm
-share/xfwm4/themes/default/top-left-active.xpm
-share/xfwm4/themes/default/top-left-inactive.xpm
-share/xfwm4/themes/default/top-right-active.xpm
-share/xfwm4/themes/default/top-right-inactive.xpm
-share/xfwm4/themes/default.keys/keythemerc
-share/xfwm4/themes/exocet/README
-share/xfwm4/themes/exocet/bottom-active.xpm
-share/xfwm4/themes/exocet/bottom-inactive.xpm
-share/xfwm4/themes/exocet/bottom-left-active.xpm
-share/xfwm4/themes/exocet/bottom-left-inactive.xpm
-share/xfwm4/themes/exocet/bottom-right-active.xpm
-share/xfwm4/themes/exocet/bottom-right-inactive.xpm
-share/xfwm4/themes/exocet/close-active.xpm
-share/xfwm4/themes/exocet/close-inactive.xpm
-share/xfwm4/themes/exocet/close-pressed.xpm
-share/xfwm4/themes/exocet/hide-active.xpm
-share/xfwm4/themes/exocet/hide-inactive.xpm
-share/xfwm4/themes/exocet/hide-pressed.xpm
-share/xfwm4/themes/exocet/left-active.xpm
-share/xfwm4/themes/exocet/left-inactive.xpm
-share/xfwm4/themes/exocet/maximize-active.xpm
-share/xfwm4/themes/exocet/maximize-inactive.xpm
-share/xfwm4/themes/exocet/maximize-pressed.xpm
-share/xfwm4/themes/exocet/menu-active.xpm
-share/xfwm4/themes/exocet/menu-inactive.xpm
-share/xfwm4/themes/exocet/menu-pressed.xpm
-share/xfwm4/themes/exocet/right-active.xpm
-share/xfwm4/themes/exocet/right-inactive.xpm
-share/xfwm4/themes/exocet/shade-active.xpm
-share/xfwm4/themes/exocet/shade-inactive.xpm
-share/xfwm4/themes/exocet/shade-pressed.xpm
-share/xfwm4/themes/exocet/stick-active.xpm
-share/xfwm4/themes/exocet/stick-inactive.xpm
-share/xfwm4/themes/exocet/stick-pressed.xpm
-share/xfwm4/themes/exocet/themerc
-share/xfwm4/themes/exocet/title-1-active.xpm
-share/xfwm4/themes/exocet/title-1-inactive.xpm
-share/xfwm4/themes/exocet/title-2-active.xpm
-share/xfwm4/themes/exocet/title-2-inactive.xpm
-share/xfwm4/themes/exocet/title-3-active.xpm
-share/xfwm4/themes/exocet/title-3-inactive.xpm
-share/xfwm4/themes/exocet/title-4-active.xpm
-share/xfwm4/themes/exocet/title-4-inactive.xpm
-share/xfwm4/themes/exocet/title-5-active.xpm
-share/xfwm4/themes/exocet/title-5-inactive.xpm
-share/xfwm4/themes/exocet/top-left-active.xpm
-share/xfwm4/themes/exocet/top-left-inactive.xpm
-share/xfwm4/themes/exocet/top-right-active.xpm
-share/xfwm4/themes/exocet/top-right-inactive.xpm
-share/xfwm4/themes/meenee/README
-share/xfwm4/themes/meenee/bottom-active.xpm
-share/xfwm4/themes/meenee/bottom-inactive.xpm
-share/xfwm4/themes/meenee/bottom-left-active.xpm
-share/xfwm4/themes/meenee/bottom-left-inactive.xpm
-share/xfwm4/themes/meenee/bottom-right-active.xpm
-share/xfwm4/themes/meenee/bottom-right-inactive.xpm
-share/xfwm4/themes/meenee/close-active.xpm
-share/xfwm4/themes/meenee/close-inactive.xpm
-share/xfwm4/themes/meenee/close-pressed.xpm
-share/xfwm4/themes/meenee/hide-active.xpm
-share/xfwm4/themes/meenee/hide-inactive.xpm
-share/xfwm4/themes/meenee/hide-pressed.xpm
-share/xfwm4/themes/meenee/left-active.xpm
-share/xfwm4/themes/meenee/left-inactive.xpm
-share/xfwm4/themes/meenee/maximize-active.xpm
-share/xfwm4/themes/meenee/maximize-inactive.xpm
-share/xfwm4/themes/meenee/maximize-pressed.xpm
-share/xfwm4/themes/meenee/menu-active.xpm
-share/xfwm4/themes/meenee/menu-inactive.xpm
-share/xfwm4/themes/meenee/menu-pressed.xpm
-share/xfwm4/themes/meenee/right-active.xpm
-share/xfwm4/themes/meenee/right-inactive.xpm
-share/xfwm4/themes/meenee/shade-active.xpm
-share/xfwm4/themes/meenee/shade-inactive.xpm
-share/xfwm4/themes/meenee/shade-pressed.xpm
-share/xfwm4/themes/meenee/stick-active.xpm
-share/xfwm4/themes/meenee/stick-inactive.xpm
-share/xfwm4/themes/meenee/stick-pressed.xpm
-share/xfwm4/themes/meenee/themerc
-share/xfwm4/themes/meenee/title-1-active.xpm
-share/xfwm4/themes/meenee/title-1-inactive.xpm
-share/xfwm4/themes/meenee/title-2-active.xpm
-share/xfwm4/themes/meenee/title-2-inactive.xpm
-share/xfwm4/themes/meenee/title-3-active.xpm
-share/xfwm4/themes/meenee/title-3-inactive.xpm
-share/xfwm4/themes/meenee/title-4-active.xpm
-share/xfwm4/themes/meenee/title-4-inactive.xpm
-share/xfwm4/themes/meenee/title-5-active.xpm
-share/xfwm4/themes/meenee/title-5-inactive.xpm
-share/xfwm4/themes/meenee/top-left-active.xpm
-share/xfwm4/themes/meenee/top-left-inactive.xpm
-share/xfwm4/themes/meenee/top-right-active.xpm
-share/xfwm4/themes/meenee/top-right-inactive.xpm
-share/xfwm4/themes/microcurve/README
-share/xfwm4/themes/microcurve/bottom-active.xpm
-share/xfwm4/themes/microcurve/bottom-inactive.xpm
-share/xfwm4/themes/microcurve/bottom-left-active.xpm
-share/xfwm4/themes/microcurve/bottom-left-inactive.xpm
-share/xfwm4/themes/microcurve/bottom-right-active.xpm
-share/xfwm4/themes/microcurve/bottom-right-inactive.xpm
-share/xfwm4/themes/microcurve/close-active.xpm
-share/xfwm4/themes/microcurve/close-inactive.xpm
-share/xfwm4/themes/microcurve/close-pressed.xpm
-share/xfwm4/themes/microcurve/hide-active.xpm
-share/xfwm4/themes/microcurve/hide-inactive.xpm
-share/xfwm4/themes/microcurve/hide-pressed.xpm
-share/xfwm4/themes/microcurve/left-active.xpm
-share/xfwm4/themes/microcurve/left-inactive.xpm
-share/xfwm4/themes/microcurve/maximize-active.xpm
-share/xfwm4/themes/microcurve/maximize-inactive.xpm
-share/xfwm4/themes/microcurve/maximize-pressed.xpm
-share/xfwm4/themes/microcurve/menu-active.xpm
-share/xfwm4/themes/microcurve/menu-inactive.xpm
-share/xfwm4/themes/microcurve/menu-pressed.xpm
-share/xfwm4/themes/microcurve/right-active.xpm
-share/xfwm4/themes/microcurve/right-inactive.xpm
-share/xfwm4/themes/microcurve/shade-active.xpm
-share/xfwm4/themes/microcurve/shade-inactive.xpm
-share/xfwm4/themes/microcurve/shade-pressed.xpm
-share/xfwm4/themes/microcurve/stick-active.xpm
-share/xfwm4/themes/microcurve/stick-inactive.xpm
-share/xfwm4/themes/microcurve/stick-pressed.xpm
-share/xfwm4/themes/microcurve/themerc
-share/xfwm4/themes/microcurve/title-1-active.xpm
-share/xfwm4/themes/microcurve/title-1-inactive.xpm
-share/xfwm4/themes/microcurve/title-2-active.xpm
-share/xfwm4/themes/microcurve/title-2-inactive.xpm
-share/xfwm4/themes/microcurve/title-3-active.xpm
-share/xfwm4/themes/microcurve/title-3-inactive.xpm
-share/xfwm4/themes/microcurve/title-4-active.xpm
-share/xfwm4/themes/microcurve/title-4-inactive.xpm
-share/xfwm4/themes/microcurve/title-5-active.xpm
-share/xfwm4/themes/microcurve/title-5-inactive.xpm
-share/xfwm4/themes/microcurve/top-left-active.xpm
-share/xfwm4/themes/microcurve/top-left-inactive.xpm
-share/xfwm4/themes/microcurve/top-right-active.xpm
-share/xfwm4/themes/microcurve/top-right-inactive.xpm
-share/xfwm4/themes/microdeck/README
-share/xfwm4/themes/microdeck/bottom-active.xpm
-share/xfwm4/themes/microdeck/bottom-inactive.xpm
-share/xfwm4/themes/microdeck/bottom-left-active.xpm
-share/xfwm4/themes/microdeck/bottom-left-inactive.xpm
-share/xfwm4/themes/microdeck/bottom-right-active.xpm
-share/xfwm4/themes/microdeck/bottom-right-inactive.xpm
-share/xfwm4/themes/microdeck/close-active.xpm
-share/xfwm4/themes/microdeck/close-inactive.xpm
-share/xfwm4/themes/microdeck/close-pressed.xpm
-share/xfwm4/themes/microdeck/hide-active.xpm
-share/xfwm4/themes/microdeck/hide-inactive.xpm
-share/xfwm4/themes/microdeck/hide-pressed.xpm
-share/xfwm4/themes/microdeck/left-active.xpm
-share/xfwm4/themes/microdeck/left-inactive.xpm
-share/xfwm4/themes/microdeck/maximize-active.xpm
-share/xfwm4/themes/microdeck/maximize-inactive.xpm
-share/xfwm4/themes/microdeck/maximize-pressed.xpm
-share/xfwm4/themes/microdeck/maximize-toggled-active.xpm
-share/xfwm4/themes/microdeck/maximize-toggled-inactive.xpm
-share/xfwm4/themes/microdeck/maximize-toggled-pressed.xpm
-share/xfwm4/themes/microdeck/menu-active.xpm
-share/xfwm4/themes/microdeck/menu-inactive.xpm
-share/xfwm4/themes/microdeck/menu-pressed.xpm
-share/xfwm4/themes/microdeck/right-active.xpm
-share/xfwm4/themes/microdeck/right-inactive.xpm
-share/xfwm4/themes/microdeck/shade-active.xpm
-share/xfwm4/themes/microdeck/shade-inactive.xpm
-share/xfwm4/themes/microdeck/shade-pressed.xpm
-share/xfwm4/themes/microdeck/shade-toggled-active.xpm
-share/xfwm4/themes/microdeck/shade-toggled-inactive.xpm
-share/xfwm4/themes/microdeck/shade-toggled-pressed.xpm
-share/xfwm4/themes/microdeck/stick-active.xpm
-share/xfwm4/themes/microdeck/stick-inactive.xpm
-share/xfwm4/themes/microdeck/stick-pressed.xpm
-share/xfwm4/themes/microdeck/stick-toggled-active.xpm
-share/xfwm4/themes/microdeck/stick-toggled-inactive.xpm
-share/xfwm4/themes/microdeck/stick-toggled-pressed.xpm
-share/xfwm4/themes/microdeck/themerc
-share/xfwm4/themes/microdeck/title-1-active.xpm
-share/xfwm4/themes/microdeck/title-1-inactive.xpm
-share/xfwm4/themes/microdeck/title-2-active.xpm
-share/xfwm4/themes/microdeck/title-2-inactive.xpm
-share/xfwm4/themes/microdeck/title-3-active.xpm
-share/xfwm4/themes/microdeck/title-3-inactive.xpm
-share/xfwm4/themes/microdeck/title-4-active.xpm
-share/xfwm4/themes/microdeck/title-4-inactive.xpm
-share/xfwm4/themes/microdeck/title-5-active.xpm
-share/xfwm4/themes/microdeck/title-5-inactive.xpm
-share/xfwm4/themes/microdeck/top-left-active.xpm
-share/xfwm4/themes/microdeck/top-left-inactive.xpm
-share/xfwm4/themes/microdeck/top-right-active.xpm
-share/xfwm4/themes/microdeck/top-right-inactive.xpm
-share/xfwm4/themes/microdeck2/README
-share/xfwm4/themes/microdeck2/bottom-active.xpm
-share/xfwm4/themes/microdeck2/bottom-inactive.xpm
-share/xfwm4/themes/microdeck2/bottom-left-active.xpm
-share/xfwm4/themes/microdeck2/bottom-left-inactive.xpm
-share/xfwm4/themes/microdeck2/bottom-right-active.xpm
-share/xfwm4/themes/microdeck2/bottom-right-inactive.xpm
-share/xfwm4/themes/microdeck2/close-active.xpm
-share/xfwm4/themes/microdeck2/close-inactive.xpm
-share/xfwm4/themes/microdeck2/close-pressed.xpm
-share/xfwm4/themes/microdeck2/hide-active.xpm
-share/xfwm4/themes/microdeck2/hide-inactive.xpm
-share/xfwm4/themes/microdeck2/hide-pressed.xpm
-share/xfwm4/themes/microdeck2/left-active.xpm
-share/xfwm4/themes/microdeck2/left-inactive.xpm
-share/xfwm4/themes/microdeck2/maximize-active.xpm
-share/xfwm4/themes/microdeck2/maximize-inactive.xpm
-share/xfwm4/themes/microdeck2/maximize-pressed.xpm
-share/xfwm4/themes/microdeck2/menu-active.xpm
-share/xfwm4/themes/microdeck2/menu-inactive.xpm
-share/xfwm4/themes/microdeck2/menu-pressed.xpm
-share/xfwm4/themes/microdeck2/right-active.xpm
-share/xfwm4/themes/microdeck2/right-inactive.xpm
-share/xfwm4/themes/microdeck2/shade-active.xpm
-share/xfwm4/themes/microdeck2/shade-inactive.xpm
-share/xfwm4/themes/microdeck2/shade-pressed.xpm
-share/xfwm4/themes/microdeck2/stick-active.xpm
-share/xfwm4/themes/microdeck2/stick-inactive.xpm
-share/xfwm4/themes/microdeck2/stick-pressed.xpm
-share/xfwm4/themes/microdeck2/themerc
-share/xfwm4/themes/microdeck2/title-1-active.xpm
-share/xfwm4/themes/microdeck2/title-1-inactive.xpm
-share/xfwm4/themes/microdeck2/title-2-active.xpm
-share/xfwm4/themes/microdeck2/title-2-inactive.xpm
-share/xfwm4/themes/microdeck2/title-3-active.xpm
-share/xfwm4/themes/microdeck2/title-3-inactive.xpm
-share/xfwm4/themes/microdeck2/title-4-active.xpm
-share/xfwm4/themes/microdeck2/title-4-inactive.xpm
-share/xfwm4/themes/microdeck2/title-5-active.xpm
-share/xfwm4/themes/microdeck2/title-5-inactive.xpm
-share/xfwm4/themes/microdeck2/top-left-active.xpm
-share/xfwm4/themes/microdeck2/top-left-inactive.xpm
-share/xfwm4/themes/microdeck2/top-right-active.xpm
-share/xfwm4/themes/microdeck2/top-right-inactive.xpm
-share/xfwm4/themes/microdeck3/README
-share/xfwm4/themes/microdeck3/bottom-active.xpm
-share/xfwm4/themes/microdeck3/bottom-inactive.xpm
-share/xfwm4/themes/microdeck3/bottom-left-active.xpm
-share/xfwm4/themes/microdeck3/bottom-left-inactive.xpm
-share/xfwm4/themes/microdeck3/bottom-right-active.xpm
-share/xfwm4/themes/microdeck3/bottom-right-inactive.xpm
-share/xfwm4/themes/microdeck3/close-active.xpm
-share/xfwm4/themes/microdeck3/close-inactive.xpm
-share/xfwm4/themes/microdeck3/close-pressed.xpm
-share/xfwm4/themes/microdeck3/hide-active.xpm
-share/xfwm4/themes/microdeck3/hide-inactive.xpm
-share/xfwm4/themes/microdeck3/hide-pressed.xpm
-share/xfwm4/themes/microdeck3/left-active.xpm
-share/xfwm4/themes/microdeck3/left-inactive.xpm
-share/xfwm4/themes/microdeck3/maximize-active.xpm
-share/xfwm4/themes/microdeck3/maximize-inactive.xpm
-share/xfwm4/themes/microdeck3/maximize-pressed.xpm
-share/xfwm4/themes/microdeck3/menu-active.xpm
-share/xfwm4/themes/microdeck3/menu-inactive.xpm
-share/xfwm4/themes/microdeck3/menu-pressed.xpm
-share/xfwm4/themes/microdeck3/right-active.xpm
-share/xfwm4/themes/microdeck3/right-inactive.xpm
-share/xfwm4/themes/microdeck3/shade-active.xpm
-share/xfwm4/themes/microdeck3/shade-inactive.xpm
-share/xfwm4/themes/microdeck3/shade-pressed.xpm
-share/xfwm4/themes/microdeck3/stick-active.xpm
-share/xfwm4/themes/microdeck3/stick-inactive.xpm
-share/xfwm4/themes/microdeck3/stick-pressed.xpm
-share/xfwm4/themes/microdeck3/themerc
-share/xfwm4/themes/microdeck3/title-1-active.xpm
-share/xfwm4/themes/microdeck3/title-1-inactive.xpm
-share/xfwm4/themes/microdeck3/title-2-active.xpm
-share/xfwm4/themes/microdeck3/title-2-inactive.xpm
-share/xfwm4/themes/microdeck3/title-3-active.xpm
-share/xfwm4/themes/microdeck3/title-3-inactive.xpm
-share/xfwm4/themes/microdeck3/title-4-active.xpm
-share/xfwm4/themes/microdeck3/title-4-inactive.xpm
-share/xfwm4/themes/microdeck3/title-5-active.xpm
-share/xfwm4/themes/microdeck3/title-5-inactive.xpm
-share/xfwm4/themes/microdeck3/top-left-active.xpm
-share/xfwm4/themes/microdeck3/top-left-inactive.xpm
-share/xfwm4/themes/microdeck3/top-right-active.xpm
-share/xfwm4/themes/microdeck3/top-right-inactive.xpm
-share/xfwm4/themes/tgc/README
-share/xfwm4/themes/tgc/bottom-active.xpm
-share/xfwm4/themes/tgc/bottom-inactive.xpm
-share/xfwm4/themes/tgc/bottom-left-active.xpm
-share/xfwm4/themes/tgc/bottom-left-inactive.xpm
-share/xfwm4/themes/tgc/bottom-right-active.xpm
-share/xfwm4/themes/tgc/bottom-right-inactive.xpm
-share/xfwm4/themes/tgc/close-active.xpm
-share/xfwm4/themes/tgc/close-inactive.xpm
-share/xfwm4/themes/tgc/close-pressed.xpm
-share/xfwm4/themes/tgc/hide-active.xpm
-share/xfwm4/themes/tgc/hide-inactive.xpm
-share/xfwm4/themes/tgc/hide-pressed.xpm
-share/xfwm4/themes/tgc/left-active.xpm
-share/xfwm4/themes/tgc/left-inactive.xpm
-share/xfwm4/themes/tgc/maximize-active.xpm
-share/xfwm4/themes/tgc/maximize-inactive.xpm
-share/xfwm4/themes/tgc/maximize-pressed.xpm
-share/xfwm4/themes/tgc/menu-active.xpm
-share/xfwm4/themes/tgc/menu-inactive.xpm
-share/xfwm4/themes/tgc/menu-pressed.xpm
-share/xfwm4/themes/tgc/right-active.xpm
-share/xfwm4/themes/tgc/right-inactive.xpm
-share/xfwm4/themes/tgc/shade-active.xpm
-share/xfwm4/themes/tgc/shade-inactive.xpm
-share/xfwm4/themes/tgc/shade-pressed.xpm
-share/xfwm4/themes/tgc/stick-active.xpm
-share/xfwm4/themes/tgc/stick-inactive.xpm
-share/xfwm4/themes/tgc/stick-pressed.xpm
-share/xfwm4/themes/tgc/themerc
-share/xfwm4/themes/tgc/title-1-active.xpm
-share/xfwm4/themes/tgc/title-1-inactive.xpm
-share/xfwm4/themes/tgc/title-2-active.xpm
-share/xfwm4/themes/tgc/title-2-inactive.xpm
-share/xfwm4/themes/tgc/title-3-active.xpm
-share/xfwm4/themes/tgc/title-3-inactive.xpm
-share/xfwm4/themes/tgc/title-4-active.xpm
-share/xfwm4/themes/tgc/title-4-inactive.xpm
-share/xfwm4/themes/tgc/title-5-active.xpm
-share/xfwm4/themes/tgc/title-5-inactive.xpm
-share/xfwm4/themes/tgc/top-left-active.xpm
-share/xfwm4/themes/tgc/top-left-inactive.xpm
-share/xfwm4/themes/tgc/top-right-active.xpm
-share/xfwm4/themes/tgc/top-right-inactive.xpm
-share/xfwm4/themes/tgc-large/README
-share/xfwm4/themes/tgc-large/bottom-active.xpm
-share/xfwm4/themes/tgc-large/bottom-inactive.xpm
-share/xfwm4/themes/tgc-large/bottom-left-active.xpm
-share/xfwm4/themes/tgc-large/bottom-left-inactive.xpm
-share/xfwm4/themes/tgc-large/bottom-right-active.xpm
-share/xfwm4/themes/tgc-large/bottom-right-inactive.xpm
-share/xfwm4/themes/tgc-large/close-active.xpm
-share/xfwm4/themes/tgc-large/close-inactive.xpm
-share/xfwm4/themes/tgc-large/close-pressed.xpm
-share/xfwm4/themes/tgc-large/hide-active.xpm
-share/xfwm4/themes/tgc-large/hide-inactive.xpm
-share/xfwm4/themes/tgc-large/hide-pressed.xpm
-share/xfwm4/themes/tgc-large/left-active.xpm
-share/xfwm4/themes/tgc-large/left-inactive.xpm
-share/xfwm4/themes/tgc-large/maximize-active.xpm
-share/xfwm4/themes/tgc-large/maximize-inactive.xpm
-share/xfwm4/themes/tgc-large/maximize-pressed.xpm
-share/xfwm4/themes/tgc-large/maximize-toggled-active.xpm
-share/xfwm4/themes/tgc-large/maximize-toggled-inactive.xpm
-share/xfwm4/themes/tgc-large/maximize-toggled-pressed.xpm
-share/xfwm4/themes/tgc-large/menu-active.xpm
-share/xfwm4/themes/tgc-large/menu-inactive.xpm
-share/xfwm4/themes/tgc-large/menu-pressed.xpm
-share/xfwm4/themes/tgc-large/right-active.xpm
-share/xfwm4/themes/tgc-large/right-inactive.xpm
-share/xfwm4/themes/tgc-large/shade-active.xpm
-share/xfwm4/themes/tgc-large/shade-inactive.xpm
-share/xfwm4/themes/tgc-large/shade-pressed.xpm
-share/xfwm4/themes/tgc-large/shade-toggled-active.xpm
-share/xfwm4/themes/tgc-large/shade-toggled-inactive.xpm
-share/xfwm4/themes/tgc-large/shade-toggled-pressed.xpm
-share/xfwm4/themes/tgc-large/stick-active.xpm
-share/xfwm4/themes/tgc-large/stick-inactive.xpm
-share/xfwm4/themes/tgc-large/stick-pressed.xpm
-share/xfwm4/themes/tgc-large/stick-toggled-active.xpm
-share/xfwm4/themes/tgc-large/stick-toggled-inactive.xpm
-share/xfwm4/themes/tgc-large/stick-toggled-pressed.xpm
-share/xfwm4/themes/tgc-large/themerc
-share/xfwm4/themes/tgc-large/title-1-active.xpm
-share/xfwm4/themes/tgc-large/title-1-inactive.xpm
-share/xfwm4/themes/tgc-large/title-2-active.xpm
-share/xfwm4/themes/tgc-large/title-2-inactive.xpm
-share/xfwm4/themes/tgc-large/title-3-active.xpm
-share/xfwm4/themes/tgc-large/title-3-inactive.xpm
-share/xfwm4/themes/tgc-large/title-4-active.xpm
-share/xfwm4/themes/tgc-large/title-4-inactive.xpm
-share/xfwm4/themes/tgc-large/title-5-active.xpm
-share/xfwm4/themes/tgc-large/title-5-inactive.xpm
-share/xfwm4/themes/tgc-large/top-left-active.xpm
-share/xfwm4/themes/tgc-large/top-left-inactive.xpm
-share/xfwm4/themes/tgc-large/top-right-active.xpm
-share/xfwm4/themes/tgc-large/top-right-inactive.xpm
 @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
 @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
-@dirrm share/xfwm4/themes/bbs
-@dirrm share/xfwm4/themes/curve
-@dirrm share/xfwm4/themes/default
-@dirrm share/xfwm4/themes/default.keys
-@dirrm share/xfwm4/themes/exocet
-@dirrm share/xfwm4/themes/meenee
-@dirrm share/xfwm4/themes/microcurve
-@dirrm share/xfwm4/themes/microdeck
-@dirrm share/xfwm4/themes/microdeck2
-@dirrm share/xfwm4/themes/microdeck3
-@dirrm share/xfwm4/themes/tgc
-@dirrm share/xfwm4/themes/tgc-large
+@dirrm share/themes/Default/xfwm4
+@unexec rmdir %D/share/themes/Default 2>/dev/null || true
+@dirrm share/themes/Default-4.0/xfwm4
+@unexec rmdir %D/share/themes/Default-4.0 2>/dev/null || true
+@dirrm share/themes/Opta/xfwm4
+@unexec rmdir %D/share/themes/Opta 2>/dev/null || true
+@dirrm share/themes/Symphony/xfwm4
+@unexec rmdir %D/share/themes/Symphony 2>/dev/null || true
+@dirrm share/themes/Therapy/xfwm4
+@unexec rmdir %D/share/themes/Therapy 2>/dev/null || true
+@dirrm share/themes/Tyrex/xfwm4
+@unexec rmdir %D/share/themes/Tyrex 2>/dev/null || true
+@dirrm share/themes/Waza/xfwm4
+@unexec rmdir %D/share/themes/Waza 2>/dev/null || true
+@dirrm share/themes/Wildbush/xfwm4
+@unexec rmdir %D/share/themes/Wildbush 2>/dev/null || true
 @unexec rmdir %D/share/xfwm4/themes 2>/dev/null || true
 @unexec rmdir %D/share/xfwm4 2>/dev/null || true
diff --git a/x11-wm/xfce4/Makefile b/x11-wm/xfce4/Makefile
index aa0de29..22d8f7a 100644
--- a/x11-wm/xfce4/Makefile
+++ b/x11-wm/xfce4/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	xfce
-PORTVERSION=	4.0.6
-PORTREVISION=	1
+PORTVERSION=	4.2.0
+PORTREVISION=	0
 CATEGORIES=	x11-wm xfce
 MASTER_SITES=	# empty
 DISTFILES=	# empty
@@ -18,7 +18,10 @@ COMMENT=	The "meta-port" for the XFce 4 desktop environment
 
 RUN_DEPENDS=	${X11BASE}/lib/xfce4/mcs-plugins/ui_plugin.so:${PORTSDIR}/sysutils/xfce4-mcs-plugins \
 		xfwm4:${PORTSDIR}/x11-wm/xfce4-wm \
+		xfce4-appfinder:${PORTSDIR}/misc/xfce4-appfinder \
+		xfce4-session:${PORTSDIR}/x11-wm/xfce4-session \
 		xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel \
+		${X11BASE}/lib/xfce4/panel-plugins/libtriggerlauncher.so:${PORTSDIR}/x11/xfce4-trigger-launcher \
 		xfdesktop:${PORTSDIR}/x11-wm/xfce4-desktop \
 		startxfce4:${PORTSDIR}/sysutils/xfce4-utils \
 		xffm:${PORTSDIR}/x11-fm/xfce4-fm \
@@ -39,9 +42,7 @@ PLIST_SUB+=	GDM="@comment "
 
 .if !defined(WITHOUT_EXTRAS)
 .if !defined(WITHOUT_THEMES)
-RUN_DEPENDS+=	${X11BASE}/share/xfce4/themes/BeOS/terminal.png:${PORTSDIR}/misc/xfce4-panel-themes \
-		${X11BASE}/share/xffm/pixmaps/xfce/mime.xml:${PORTSDIR}/x11-fm/xfce4-fm-icons \
-		${X11BASE}/share/xfwm4/themes/atlanta2/themerc:${PORTSDIR}/misc/xfce4-wm-themes
+RUN_DEPENDS+=	${X11BASE}/share/xfce4/mime/Rodent.mime.xml:${PORTSDIR}/x11-themes/xfce4-icon-theme
 .endif
 
 .if !defined(WITHOUT_PLUGINS)