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

MOVED

@@ -1379,3 +1379,5 @@ x11/gdm2|x11/gdm|2005-01-25|moved to non-versioned directory
 editors/gedit2|editors/gedit|2005-01-25|moved to non-versioned directory
 print/ggv2|print/ggv|2005-01-25|moved to non-versioned directory
 editors/ghex2|editors/ghex|2005-01-25|moved to non-versioned directory
+x11-fm/xfce4-fm-icons||2005-01-26|got obsolete by xfce 4.2 update
+misc/xfce4-panel-themes||2005-01-26|got obsolete by xfce 4.2 update

UPDATING

@@ -6,6 +6,15 @@ You should get into the habit of checking this file for changes each
 time you update your ports collection, before attempting any port
 upgrades.
 
+20050126:
+  AFFECTS: users of x11-wm/xfce4
+  AUTHOR: oliver@FreeBSD.org
+
+  If you use Xorg 6.8.1: Make shure there is an /tmp/.ICE-unix with propper
+  rights. For further informations about that, please refer to 20041229
+  Please update all your plugins as well when you update from 4.0.6 to 4.2
+  They all need recompiling to link against the new xfce libraries
+
 20050122:
   AFFECTS: users of PostgreSQL
   AUTHOR: seanc@FreeBSD.org

audio/xfce4-mixer/Makefile

@@ -6,11 +6,12 @@
 #
 
 PORTNAME=	xfce4-mixer
-PORTVERSION=	4.0.6
+PORTVERSION=	4.2.0
-PORTREVISION=	1
+PORTREVISION=	0
 CATEGORIES=	audio xfce
-MASTER_SITES=	ftp://ftp.berlios.de/pub/xfce-goodies/${PORTVERSION}/ \
+MASTER_SITES=	http://www.us.xfce.org/archive/xfce-${PORTVERSION}/src/ \
-		http://hannelore.f1.fhtw-berlin.de/mirrors/xfce4/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,7 +19,7 @@ COMMENT=	XFce 4 volume mixer 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
@@ -26,7 +27,7 @@ RUN_DEPENDS=	xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
 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 \

audio/xfce4-mixer/distinfo

@@ -1,2 +1,2 @@
-MD5 (xfce4/xfce4-mixer-4.0.6.tar.gz) = 2261901f5f8cb0e794e8cfd00c25952e
+MD5 (xfce4/xfce4-mixer-4.2.0.tar.gz) = 285d7dcd493533a019637d87eccd8b12
-SIZE(xfce4/xfce4-mixer-4.0.6.tar.gz) = 360031
+SIZE(xfce4/xfce4-mixer-4.2.0.tar.gz) = 544212

audio/xfce4-mixer/pkg-plist

@@ -1,35 +1,46 @@
-lib/xfce4/panel-plugins/libmixer.a
+bin/xfce4-mixer
-lib/xfce4/panel-plugins/libmixer.la
+lib/xfce4/modules/libxfce4mixer.a
+lib/xfce4/modules/libxfce4mixer.so
+lib/xfce4/modules/libxfce4mixer.so.0
+lib/xfce4/mcs-plugins/sound_settings.so
 lib/xfce4/panel-plugins/libmixer.so
+share/applications/xfce-mixer-settings.desktop
+share/icons/hicolor/48x48/apps/xfce4-mixer.png
 share/locale/ar/LC_MESSAGES/xfce4-mixer.mo
 share/locale/az/LC_MESSAGES/xfce4-mixer.mo
+share/locale/be/LC_MESSAGES/xfce4-mixer.mo
 share/locale/bg/LC_MESSAGES/xfce4-mixer.mo
 share/locale/ca/LC_MESSAGES/xfce4-mixer.mo
-share/locale/cs/LC_MESSAGES/xfce4-mixer.mo
 share/locale/de/LC_MESSAGES/xfce4-mixer.mo
+share/locale/en_GB/LC_MESSAGES/xfce4-mixer.mo
 share/locale/es/LC_MESSAGES/xfce4-mixer.mo
+share/locale/es_MX/LC_MESSAGES/xfce4-mixer.mo
 share/locale/et/LC_MESSAGES/xfce4-mixer.mo
 share/locale/eu/LC_MESSAGES/xfce4-mixer.mo
-share/locale/fa_IR/LC_MESSAGES/xfce4-mixer.mo
+share/locale/fa/LC_MESSAGES/xfce4-mixer.mo
+share/locale/fi/LC_MESSAGES/xfce4-mixer.mo
 share/locale/fr/LC_MESSAGES/xfce4-mixer.mo
-share/locale/hi/LC_MESSAGES/xfce4-mixer.mo
+share/locale/gu/LC_MESSAGES/xfce4-mixer.mo
+share/locale/he/LC_MESSAGES/xfce4-mixer.mo
 share/locale/hu/LC_MESSAGES/xfce4-mixer.mo
 share/locale/it/LC_MESSAGES/xfce4-mixer.mo
 share/locale/ja/LC_MESSAGES/xfce4-mixer.mo
 share/locale/ko/LC_MESSAGES/xfce4-mixer.mo
 share/locale/lt/LC_MESSAGES/xfce4-mixer.mo
 share/locale/ms/LC_MESSAGES/xfce4-mixer.mo
+share/locale/nb_NO/LC_MESSAGES/xfce4-mixer.mo
 share/locale/nl/LC_MESSAGES/xfce4-mixer.mo
-share/locale/no/LC_MESSAGES/xfce4-mixer.mo
+share/locale/pa/LC_MESSAGES/xfce4-mixer.mo
-share/locale/pl/LC_MESSAGES/xfce4-mixer.mo
 share/locale/pt_BR/LC_MESSAGES/xfce4-mixer.mo
 share/locale/pt_PT/LC_MESSAGES/xfce4-mixer.mo
+share/locale/ro/LC_MESSAGES/xfce4-mixer.mo
 share/locale/ru/LC_MESSAGES/xfce4-mixer.mo
-share/locale/ta/LC_MESSAGES/xfce4-mixer.mo
+share/locale/sk/LC_MESSAGES/xfce4-mixer.mo
 share/locale/tr/LC_MESSAGES/xfce4-mixer.mo
-share/locale/uk/LC_MESSAGES/xfce4-mixer.mo
 share/locale/vi/LC_MESSAGES/xfce4-mixer.mo
 share/locale/zh_CN/LC_MESSAGES/xfce4-mixer.mo
 share/locale/zh_TW/LC_MESSAGES/xfce4-mixer.mo
+@unexec rmdir %D/lib/xfce4/modules 2>/dev/null || true
+@unexec rmdir %D/lib/xfce4/mcs-plugins 2>/dev/null || true
 @unexec rmdir %D/lib/xfce4/panel-plugins 2>/dev/null || true
 @unexec rmdir %D/lib/xfce4 2>/dev/null || true

deskutils/xfce4-calendar/Makefile

@@ -19,7 +19,7 @@ COMMENT=	A calendar application to manage your time with XFce 4
 
 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 \
 		dbh-1.0.1:${PORTSDIR}/databases/dbh
 
 USE_GNOME=	gtk20 libxml2

deskutils/xfce4-notes-plugin/Makefile

@@ -7,7 +7,7 @@
 
 PORTNAME=	xfce4-notes-plugin
 PORTVERSION=	0.9.7
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	deskutils xfce
 MASTER_SITES=	http://download.berlios.de/xfce-goodies/
 DIST_SUBDIR=	xfce4
@@ -17,7 +17,7 @@ COMMENT=	Sticky notes panel plugin for XFce4
 
 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
 RUN_DEPENDS=	xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
 
 USE_GNOME=	gtk20 libxml2

deskutils/xfce4-taskbar-plugin/Makefile

@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	xfce4-taskbar-plugin
-PORTVERSION=	0.1.0
+PORTVERSION=	0.2.2
-PORTREVISION=	1
 CATEGORIES=	deskutils xfce
 MASTER_SITES=	http://download.berlios.de/xfce-goodies/ \
 		http://matt.nerim.net/xfce-goodies/ \
@@ -20,15 +19,13 @@ COMMENT=	A taskbar plugin 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 \
 		startup-notification-1.0:${PORTSDIR}/x11/startup-notification
 RUN_DEPENDS=	xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
 
 USE_GNOME=	gtk20 libxml2
 USE_X_PREFIX=	yes
-USE_INC_LIBTOOL_VER=13
+USE_LIBTOOL_VER=15
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 
-WRKSRC=		${WRKDIR}/${PORTNAME}
-
 .include <bsd.port.mk>

deskutils/xfce4-taskbar-plugin/distinfo

@@ -1,2 +1,2 @@
-MD5 (xfce4/xfce4-taskbar-plugin-0.1.0.tar.gz) = 02eb7fe6f1b1b944a60643f61b4fdd38
+MD5 (xfce4/xfce4-taskbar-plugin-0.2.2.tar.gz) = 06ad356d728cadd8e78a12ec86235593
-SIZE (xfce4/xfce4-taskbar-plugin-0.1.0.tar.gz) = 300008
+SIZE(xfce4/xfce4-taskbar-plugin-0.2.2.tar.gz) = 304546

deskutils/xfce4-taskbar-plugin/pkg-plist

@@ -1,4 +1,2 @@
 lib/xfce4/panel-plugins/libtaskbar.so
-lib/xfce4/panel-plugins/libtaskbar.la
-lib/xfce4/panel-plugins/libtaskbar.a
 @unexec rmdir %D/lib/xfce4/panel-plugins 2>/dev/null || true

deskutils/xfce4-windowlist-plugin/Makefile

@@ -7,7 +7,7 @@
 
 PORTNAME=	xfce4-windowlist-plugin
 PORTVERSION=	0.1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	deskutils xfce
 MASTER_SITES=	http://download.berlios.de/xfce-goodies/ \
 		http://matt.nerim.net/xfce-goodies/ \
@@ -20,7 +20,7 @@ COMMENT=	A windowlist plugin 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 \
 		startup-notification-1.0:${PORTSDIR}/x11/startup-notification
 RUN_DEPENDS=	xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
 

deskutils/xfce4-xkb-plugin/Makefile

@@ -7,7 +7,7 @@
 
 PORTNAME=	xfce4-xkb-plugin
 PORTVERSION=	0.3.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	deskutils xfce
 MASTER_SITES=	http://download.berlios.de/xfce-goodies/
 DIST_SUBDIR=	xfce4
@@ -17,7 +17,7 @@ COMMENT=	Keyboard layout switching plugin for XFce4
 
 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
 RUN_DEPENDS=	xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
 
 USE_GNOME=	gtk20 libxml2

games/xfce4-toys/Makefile

@@ -6,18 +6,19 @@
 #
 
 PORTNAME=	xfce4-toys
-PORTVERSION=	4.0.6
+PORTVERSION=	4.2.0
-PORTREVISION=	1
+PORTREVISION=	0
 CATEGORIES=	games xfce
-MASTER_SITES=	ftp://ftp.berlios.de/pub/xfce-goodies/${PORTVERSION}/ \
+MASTER_SITES=	http://www.us.xfce.org/archive/xfce-${PORTVERSION}/src/ \
-		http://hannelore.f1.fhtw-berlin.de/mirrors/xfce4/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
 COMMENT=	Toys for the XFce 4 panel
 
 BUILD_DEPENDS=	xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
-LIB_DEPENDS=	xfcegui4.1:${PORTSDIR}/x11-toolkits/libxfce4gui \
+LIB_DEPENDS=	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
@@ -25,7 +26,7 @@ RUN_DEPENDS=	xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
 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 \

games/xfce4-toys/distinfo

@@ -1,2 +1,2 @@
-MD5 (xfce4/xfce4-toys-4.0.6.tar.gz) = ea559319c3c51846cfa6e159ccbd40c1
+MD5 (xfce4/xfce4-toys-4.2.0.tar.gz) = 98d882654c81dcd30c4a7636cb4b282a
-SIZE(xfce4/xfce4-toys-4.0.6.tar.gz) = 391511
+SIZE(xfce4/xfce4-toys-4.2.0.tar.gz) = 403655

games/xfce4-toys/pkg-plist

@@ -1,30 +1,37 @@
 bin/xfce4-tips
-lib/xfce4/panel-plugins/libeyes.a
-lib/xfce4/panel-plugins/libeyes.la
 lib/xfce4/panel-plugins/libeyes.so
 share/locale/ar/LC_MESSAGES/xfce4-toys.mo
 share/locale/az/LC_MESSAGES/xfce4-toys.mo
+share/locale/be/LC_MESSAGES/xfce4-toys.mo
 share/locale/bg/LC_MESSAGES/xfce4-toys.mo
 share/locale/ca/LC_MESSAGES/xfce4-toys.mo
 share/locale/cs/LC_MESSAGES/xfce4-toys.mo
 share/locale/de/LC_MESSAGES/xfce4-toys.mo
+share/locale/en_GB/LC_MESSAGES/xfce4-toys.mo
 share/locale/es/LC_MESSAGES/xfce4-toys.mo
 share/locale/et/LC_MESSAGES/xfce4-toys.mo
 share/locale/eu/LC_MESSAGES/xfce4-toys.mo
-share/locale/fa_IR/LC_MESSAGES/xfce4-toys.mo
+share/locale/fa/LC_MESSAGES/xfce4-toys.mo
+share/locale/fi/LC_MESSAGES/xfce4-toys.mo
 share/locale/fr/LC_MESSAGES/xfce4-toys.mo
+share/locale/gu/LC_MESSAGES/xfce4-toys.mo
+share/locale/he/LC_MESSAGES/xfce4-toys.mo
 share/locale/hi/LC_MESSAGES/xfce4-toys.mo
 share/locale/hu/LC_MESSAGES/xfce4-toys.mo
 share/locale/it/LC_MESSAGES/xfce4-toys.mo
+share/locale/ja/LC_MESSAGES/xfce4-toys.mo
 share/locale/ko/LC_MESSAGES/xfce4-toys.mo
 share/locale/lt/LC_MESSAGES/xfce4-toys.mo
 share/locale/ms/LC_MESSAGES/xfce4-toys.mo
+share/locale/nb_NO/LC_MESSAGES/xfce4-toys.mo
 share/locale/nl/LC_MESSAGES/xfce4-toys.mo
-share/locale/no/LC_MESSAGES/xfce4-toys.mo
+share/locale/pa/LC_MESSAGES/xfce4-toys.mo
 share/locale/pl/LC_MESSAGES/xfce4-toys.mo
 share/locale/pt_BR/LC_MESSAGES/xfce4-toys.mo
 share/locale/pt_PT/LC_MESSAGES/xfce4-toys.mo
+share/locale/ro/LC_MESSAGES/xfce4-toys.mo
 share/locale/ru/LC_MESSAGES/xfce4-toys.mo
+share/locale/sk/LC_MESSAGES/xfce4-toys.mo
 share/locale/sv/LC_MESSAGES/xfce4-toys.mo
 share/locale/ta/LC_MESSAGES/xfce4-toys.mo
 share/locale/tr/LC_MESSAGES/xfce4-toys.mo

misc/Makefile

@@ -443,7 +443,6 @@
     SUBDIR += xfce4-appfinder
     SUBDIR += xfce4-artwork
     SUBDIR += xfce4-iconbox
-    SUBDIR += xfce4-panel-themes
     SUBDIR += xfce4-weather-plugin
     SUBDIR += xfce4-wm-themes
     SUBDIR += xgas

misc/xfce4-iconbox/Makefile

@@ -6,11 +6,12 @@
 #
 
 PORTNAME=	xfce4-iconbox
-PORTVERSION=	4.0.6
+PORTVERSION=	4.2.0
-PORTREVISION=	1
+PORTREVISION=	0
 CATEGORIES=	misc xfce
-MASTER_SITES=	ftp://ftp.berlios.de/pub/xfce-goodies/${PORTVERSION}/ \
+MASTER_SITES=	http://www.us.xfce.org/archive/xfce-${PORTVERSION}/src/ \
-		http://hannelore.f1.fhtw-berlin.de/mirrors/xfce4/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,12 +19,12 @@ COMMENT=	XFce 4 icon box, an alternative taskbar
 
 BUILD_DEPENDS=	xfce-mcs-manager:${PORTSDIR}/sysutils/xfce4-mcs-manager
 LIB_DEPENDS=	xfce4util.1:${PORTSDIR}/x11/libxfce4util \
-		xfcegui4.1:${PORTSDIR}/x11-toolkits/libxfce4gui
+		xfcegui4.3:${PORTSDIR}/x11-toolkits/libxfce4gui
 
 USE_GETTEXT=	yes
 USE_GNOME=	gtk20
 USE_X_PREFIX=	yes
-USE_INC_LIBTOOL_VER=15
+USE_LIBTOOL_VER=15
 INSTALLS_SHLIB=	yes
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CFLAGS=-I${LOCALBASE}/include \

misc/xfce4-iconbox/distinfo

@@ -1,2 +1,2 @@
-MD5 (xfce4/xfce4-iconbox-4.0.6.tar.gz) = 595822848a029d50a5e555e30f28efb2
+MD5 (xfce4/xfce4-iconbox-4.2.0.tar.gz) = f3cb1e936482c1d0b80a761a56186901
-SIZE(xfce4/xfce4-iconbox-4.0.6.tar.gz) = 381664
+SIZE(xfce4/xfce4-iconbox-4.2.0.tar.gz) = 395861

misc/xfce4-iconbox/pkg-plist

@@ -1,29 +1,41 @@
 bin/xfce4-iconbox
-lib/xfce4/mcs-plugins/xfce4-iconbox_settings.a
-lib/xfce4/mcs-plugins/xfce4-iconbox_settings.la
 lib/xfce4/mcs-plugins/xfce4-iconbox_settings.so
+share/applications/xfce-iconbox-settings.desktop
+share/icons/hicolor/48x48/apps/xfce4-iconbox.png
+share/icons/hicolor/scalable/apps/xfce4-iconbox.svg
+share/locale/ar/LC_MESSAGES/xfce4-iconbox.mo
 share/locale/az/LC_MESSAGES/xfce4-iconbox.mo
+share/locale/be/LC_MESSAGES/xfce4-iconbox.mo
+share/locale/bg/LC_MESSAGES/xfce4-iconbox.mo
 share/locale/ca/LC_MESSAGES/xfce4-iconbox.mo
 share/locale/cs/LC_MESSAGES/xfce4-iconbox.mo
 share/locale/de/LC_MESSAGES/xfce4-iconbox.mo
+share/locale/en_GB/LC_MESSAGES/xfce4-iconbox.mo
 share/locale/es/LC_MESSAGES/xfce4-iconbox.mo
 share/locale/es_MX/LC_MESSAGES/xfce4-iconbox.mo
 share/locale/et/LC_MESSAGES/xfce4-iconbox.mo
 share/locale/eu/LC_MESSAGES/xfce4-iconbox.mo
-share/locale/fa_IR/LC_MESSAGES/xfce4-iconbox.mo
+share/locale/fa/LC_MESSAGES/xfce4-iconbox.mo
+share/locale/fi/LC_MESSAGES/xfce4-iconbox.mo
 share/locale/fr/LC_MESSAGES/xfce4-iconbox.mo
+share/locale/gu/LC_MESSAGES/xfce4-iconbox.mo
+share/locale/he/LC_MESSAGES/xfce4-iconbox.mo
 share/locale/hi/LC_MESSAGES/xfce4-iconbox.mo
 share/locale/hu/LC_MESSAGES/xfce4-iconbox.mo
 share/locale/it/LC_MESSAGES/xfce4-iconbox.mo
+share/locale/ja/LC_MESSAGES/xfce4-iconbox.mo
 share/locale/ko/LC_MESSAGES/xfce4-iconbox.mo
 share/locale/lt/LC_MESSAGES/xfce4-iconbox.mo
 share/locale/ms/LC_MESSAGES/xfce4-iconbox.mo
 share/locale/nl/LC_MESSAGES/xfce4-iconbox.mo
-share/locale/no/LC_MESSAGES/xfce4-iconbox.mo
+share/locale/nb_NO/LC_MESSAGES/xfce4-iconbox.mo
+share/locale/pa/LC_MESSAGES/xfce4-iconbox.mo
 share/locale/pl/LC_MESSAGES/xfce4-iconbox.mo
 share/locale/pt_BR/LC_MESSAGES/xfce4-iconbox.mo
 share/locale/pt_PT/LC_MESSAGES/xfce4-iconbox.mo
+share/locale/ro/LC_MESSAGES/xfce4-iconbox.mo
 share/locale/ru/LC_MESSAGES/xfce4-iconbox.mo
+share/locale/sk/LC_MESSAGES/xfce4-iconbox.mo
 share/locale/sv/LC_MESSAGES/xfce4-iconbox.mo
 share/locale/ta/LC_MESSAGES/xfce4-iconbox.mo
 share/locale/tr/LC_MESSAGES/xfce4-iconbox.mo

misc/xfce4-panel-themes/Makefile

@@ -1,31 +0,0 @@
-# New ports collection makefile for:	xfce4-themes
-# Date created:		7 July 2003
-# Whom:			James Earl <jdearl@telus.net>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	xfce4-panel-themes
-PORTVERSION=	4.0.6
-PORTREVISION=	1
-CATEGORIES=	misc xfce
-MASTER_SITES=	ftp://ftp.berlios.de/pub/xfce-goodies/${PORTVERSION}/ \
-		http://hannelore.f1.fhtw-berlin.de/mirrors/xfce4/xfce-${PORTVERSION}/src/
-DISTNAME=	xfce4-themes-${PORTVERSION}
-DIST_SUBDIR=	xfce4
-
-MAINTAINER=	oliver@FreeBSD.org
-COMMENT=	Icon themes for the XFce 4 panel
-
-BUILD_DEPENDS=	xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
-LIB_DEPENDS=	xfce4util.1:${PORTSDIR}/x11/libxfce4util \
-		xfcegui4.1:${PORTSDIR}/x11-toolkits/libxfce4gui
-RUN_DEPENDS=	xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
-
-USE_X_PREFIX=	yes
-GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
-
-NO_BUILD=	yes
-
-.include <bsd.port.mk>

misc/xfce4-panel-themes/distinfo

@@ -1,2 +0,0 @@
-MD5 (xfce4/xfce4-themes-4.0.6.tar.gz) = 5581e4c47ea23e5df396f681c7563f5e
-SIZE(xfce4/xfce4-themes-4.0.6.tar.gz) = 451603

misc/xfce4-panel-themes/pkg-descr

@@ -1,3 +0,0 @@
-Icon themes for the XFce 4 panel.
-
-WWW: http://www.xfce.org

misc/xfce4-panel-themes/pkg-plist

@@ -1,117 +0,0 @@
-share/xfce4/themes/BeOS/LICENSE
-share/xfce4/themes/BeOS/README
-share/xfce4/themes/BeOS/edit.png
-share/xfce4/themes/BeOS/edit.svg
-share/xfce4/themes/BeOS/file1.png
-share/xfce4/themes/BeOS/file1.svg
-share/xfce4/themes/BeOS/file2.png
-share/xfce4/themes/BeOS/file2.svg
-share/xfce4/themes/BeOS/games.png
-share/xfce4/themes/BeOS/games.svg
-share/xfce4/themes/BeOS/man.png
-share/xfce4/themes/BeOS/man.svg
-share/xfce4/themes/BeOS/miniinfo.png
-share/xfce4/themes/BeOS/miniinfo.svg
-share/xfce4/themes/BeOS/minilock.png
-share/xfce4/themes/BeOS/minilock.svg
-share/xfce4/themes/BeOS/minipalet.png
-share/xfce4/themes/BeOS/minipalet.svg
-share/xfce4/themes/BeOS/minipower.png
-share/xfce4/themes/BeOS/minipower.svg
-share/xfce4/themes/BeOS/multimedia.png
-share/xfce4/themes/BeOS/multimedia.svg
-share/xfce4/themes/BeOS/network.png
-share/xfce4/themes/BeOS/network.svg
-share/xfce4/themes/BeOS/newmail.png
-share/xfce4/themes/BeOS/newmail.svg
-share/xfce4/themes/BeOS/nomail.png
-share/xfce4/themes/BeOS/nomail.svg
-share/xfce4/themes/BeOS/oldmail.png
-share/xfce4/themes/BeOS/oldmail.svg
-share/xfce4/themes/BeOS/paint.png
-share/xfce4/themes/BeOS/paint.svg
-share/xfce4/themes/BeOS/print.png
-share/xfce4/themes/BeOS/print.svg
-share/xfce4/themes/BeOS/schedule.png
-share/xfce4/themes/BeOS/schedule.svg
-share/xfce4/themes/BeOS/sound.png
-share/xfce4/themes/BeOS/sound.svg
-share/xfce4/themes/BeOS/terminal.png
-share/xfce4/themes/BeOS/terminal.svg
-share/xfce4/themes/BeOS/trash_empty.png
-share/xfce4/themes/BeOS/trash_empty.svg
-share/xfce4/themes/BeOS/trash_full.png
-share/xfce4/themes/BeOS/trash_full.svg
-share/xfce4/themes/BeOS/unknown.png
-share/xfce4/themes/BeOS/unknown.svg
-share/xfce4/themes/Lush/LICENSE
-share/xfce4/themes/Lush/README
-share/xfce4/themes/Lush/edit.png
-share/xfce4/themes/Lush/edit.svg
-share/xfce4/themes/Lush/file1.png
-share/xfce4/themes/Lush/file1.svg
-share/xfce4/themes/Lush/file2.png
-share/xfce4/themes/Lush/file2.svg
-share/xfce4/themes/Lush/games.png
-share/xfce4/themes/Lush/games.svg
-share/xfce4/themes/Lush/man.png
-share/xfce4/themes/Lush/man.svg
-share/xfce4/themes/Lush/miniinfo.png
-share/xfce4/themes/Lush/miniinfo.svg
-share/xfce4/themes/Lush/minilock.png
-share/xfce4/themes/Lush/minilock.svg
-share/xfce4/themes/Lush/minipalet.png
-share/xfce4/themes/Lush/minipalet.svg
-share/xfce4/themes/Lush/minipower.png
-share/xfce4/themes/Lush/minipower.svg
-share/xfce4/themes/Lush/multimedia.png
-share/xfce4/themes/Lush/multimedia.svg
-share/xfce4/themes/Lush/network.png
-share/xfce4/themes/Lush/network.svg
-share/xfce4/themes/Lush/newmail.png
-share/xfce4/themes/Lush/newmail.svg
-share/xfce4/themes/Lush/nomail.png
-share/xfce4/themes/Lush/nomail.svg
-share/xfce4/themes/Lush/oldmail.png
-share/xfce4/themes/Lush/oldmail.svg
-share/xfce4/themes/Lush/paint.png
-share/xfce4/themes/Lush/paint.svg
-share/xfce4/themes/Lush/print.png
-share/xfce4/themes/Lush/print.svg
-share/xfce4/themes/Lush/schedule.png
-share/xfce4/themes/Lush/schedule.svg
-share/xfce4/themes/Lush/sound.png
-share/xfce4/themes/Lush/sound.svg
-share/xfce4/themes/Lush/terminal.png
-share/xfce4/themes/Lush/terminal.svg
-share/xfce4/themes/Lush/trash_empty.png
-share/xfce4/themes/Lush/trash_empty.svg
-share/xfce4/themes/Lush/trash_full.png
-share/xfce4/themes/Lush/trash_full.svg
-share/xfce4/themes/Lush/unknown.png
-share/xfce4/themes/Lush/unknown.svg
-share/xfce4/themes/Sky/AUTHOR
-share/xfce4/themes/Sky/LICENSE
-share/xfce4/themes/Sky/README
-share/xfce4/themes/Sky/edit.png
-share/xfce4/themes/Sky/file1.png
-share/xfce4/themes/Sky/file2.png
-share/xfce4/themes/Sky/games.png
-share/xfce4/themes/Sky/man.png
-share/xfce4/themes/Sky/miniinfo.png
-share/xfce4/themes/Sky/minilock.png
-share/xfce4/themes/Sky/minipalet.png
-share/xfce4/themes/Sky/minipower.png
-share/xfce4/themes/Sky/multimedia.png
-share/xfce4/themes/Sky/network.png
-share/xfce4/themes/Sky/newmail.png
-share/xfce4/themes/Sky/nomail.png
-share/xfce4/themes/Sky/oldmail.png
-share/xfce4/themes/Sky/paint.png
-share/xfce4/themes/Sky/sound.png
-share/xfce4/themes/Sky/terminal.png
-share/xfce4/themes/Sky/unknown.png
-@dirrm share/xfce4/themes/BeOS
-@dirrm share/xfce4/themes/Lush
-@dirrm share/xfce4/themes/Sky
-@unexec rmdir %D/share/xfce4/themes 2>/dev/null || true

misc/xfce4-weather-plugin/Makefile

@@ -7,7 +7,7 @@
 
 PORTNAME=	xfce4-weather-plugin
 PORTVERSION=	0.3.9.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	misc xfce
 MASTER_SITES=	http://download.berlios.de/xfce-goodies/
 
@@ -16,7 +16,7 @@ COMMENT=	XFce 4 weather 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

misc/xfce4-wm-themes/Makefile

@@ -6,10 +6,11 @@
 #
 
 PORTNAME=	xfce4-wm-themes
-PORTVERSION=	4.0.6
+PORTVERSION=	4.2.0
 CATEGORIES=	misc xfce
-MASTER_SITES=	ftp://ftp.berlios.de/pub/xfce-goodies/${PORTVERSION}/ \
+MASTER_SITES=	http://www.us.xfce.org/archive/xfce-${PORTVERSION}/src/ \
-		http://hannelore.f1.fhtw-berlin.de/mirrors/xfce4/xfce-${PORTVERSION}/src/
+		http://spuriousinterrupt.org/projects/xfce4/files/mirror/xfce-${PORTVERSION}/ \
+		http://public.fh-wolfenbuettel.de/~luedickj/xfce4/xfce-${PORTVERSION}/
 DISTNAME=	xfwm4-themes-${PORTVERSION}
 DIST_SUBDIR=	xfce4
 

misc/xfce4-wm-themes/distinfo

@@ -1,2 +1,2 @@
-MD5 (xfce4/xfwm4-themes-4.0.6.tar.gz) = 63c091efdba452191ea990f92c7302d2
+MD5 (xfce4/xfwm4-themes-4.2.0.tar.gz) = a8d0676fbf9cd3b3514d76a39d4ecbe1
-SIZE(xfce4/xfwm4-themes-4.0.6.tar.gz) = 647172
+SIZE(xfce4/xfwm4-themes-4.2.0.tar.gz) = 779350

multimedia/xfce4-xmms-controller-plugin/Makefile

@@ -7,6 +7,7 @@
 
 PORTNAME=	xfce4-xmms-controller-plugin
 PORTVERSION=	1.4.3
+PORTREVISION=	1
 CATEGORIES=	multimedia audio xfce
 MASTER_SITES=	http://eoin.angrystickman.com/files/
 DIST_SUBDIR=	xfce4
@@ -16,7 +17,7 @@ COMMENT=	XMMS controller plugin for the 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 \
 		xmms.4:${PORTSDIR}/multimedia/xmms
 RUN_DEPENDS=	xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
 

multimedia/xfce4-xmms-plugin/Makefile

@@ -7,7 +7,7 @@
 
 PORTNAME=	xfce4-xmms-plugin
 PORTVERSION=	0.1.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	multimedia audio xfce
 MASTER_SITES=	http://download.berlios.de/xfce-goodies/
 
@@ -17,7 +17,7 @@ COMMENT=	XFce 4 xmms control plugin for xfce4-panel
 BUILD_DEPENDS=	xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel \
 		xmms-config:${PORTSDIR}/multimedia/xmms
 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 \
@@ -26,7 +26,7 @@ RUN_DEPENDS=	xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel \
 USE_BZIP2=	yes
 USE_GNOME=	gtk20
 USE_X_PREFIX=	yes
-USE_INC_LIBTOOL_VER=	15
+USE_LIBTOOL_VER=15
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CFLAGS=-I${LOCALBASE}/include \
 		CPPFLAGS=-I${LOCALBASE}/include \

multimedia/xfce4-xmms-plugin/pkg-plist

@@ -1,10 +1,9 @@
-lib/xfce4/panel-plugins/libxmms_plugin.a
-lib/xfce4/panel-plugins/libxmms_plugin.la
 lib/xfce4/panel-plugins/libxmms_plugin.so
 share/xfce4/xmms-plugin/xmms-plugin-prev.png
 share/xfce4/xmms-plugin/xmms-plugin-play.png
 share/xfce4/xmms-plugin/xmms-plugin-pause.png
 share/xfce4/xmms-plugin/xmms-plugin-stop.png
 share/xfce4/xmms-plugin/xmms-plugin-next.png
-@unexec rmdir %D/share/xfce4/xmms-plugin 2>/dev/null || true
+@dirrm share/xfce4/xmms-plugin
+@unexec rmdir %D/lib/xfce4/panel-plugins 2>/dev/null || true
 @unexec rmdir %D/lib/xfce4 2>/dev/null || true

print/xfce4-print/Makefile

@@ -6,11 +6,12 @@
 #
 
 PORTNAME=	xfce4-print
-PORTVERSION=	4.0.6
+PORTVERSION=	4.2.0
-PORTREVISION=	1
+PORTREVISION=	0
 CATEGORIES=	print xfce
-MASTER_SITES=	ftp://ftp.berlios.de/pub/xfce-goodies/${PORTVERSION}/ \
+MASTER_SITES=	http://www.us.xfce.org/archive/xfce-${PORTVERSION}/src/ \
-		http://hannelore.f1.fhtw-berlin.de/mirrors/xfce4/xfce-${PORTVERSION}/src/
+		http://spuriousinterrupt.org/projects/xfce4/files/mirror/xfce-${PORTVERSION}/ \
+		http://public.fh-wolfenbuettel.de/~luedickj/xfce4/xfce-${PORTVERSION}/
 DISTNAME=	xfprint-${PORTVERSION}
 DIST_SUBDIR=	xfce4
 
@@ -18,16 +19,45 @@ MAINTAINER=	oliver@FreeBSD.org
 COMMENT=	XFce 4 graphical frontend for printing
 
 LIB_DEPENDS=	xfce4util.1:${PORTSDIR}/x11/libxfce4util \
-		xfcegui4.1:${PORTSDIR}/x11-toolkits/libxfce4gui
+		xfcegui4.3:${PORTSDIR}/x11-toolkits/libxfce4gui
 
 USE_GETTEXT=	yes
 USE_GNOME=	gtk20
 USE_X_PREFIX=	yes
-USE_INC_LIBTOOL_VER=15
+USE_LIBTOOL_VER=15
 INSTALLS_SHLIB=	yes
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CFLAGS=-I${LOCALBASE}/include \
 		CPPFLAGS=-I${LOCALBASE}/include \
 		LIBS=-L${LOCALBASE}/lib
+OPTIONS=	LPR	"Use lpr as printing system"	on\
+		CUPS	"Use cups as printing system"	off
+
+.if defined(WITH_CUPS)
+CONFIGURE_ARGS+=--enable-cups
+LIB_DEPENDS+=	cups.2:${PORTSDIR}/print/cups-base
+PLIST_SUB+=	CUPS=""
+.else
+CONFIGURE_ARGS+=--disable-cups
+PLIST_SUB+=	CUPS="@comment "
+.endif
+
+.if defined(WITHOUT_LPR)
+CONFIGURE_ARGS+=--disable-bsdlpr
+PLIST_SUB+=	LPR="@comment "
+.else
+CONFIGURE_ARGS+=--enable-bsdlpr
+PLIST_SUB+=	LPR=""
+.endif
+
+.if defined(WITH_LETTER)
+CONFIGURE_ARGS+=--enable-letter
+BUILD_DEPENDS=	a2ps:${PORTSDIR}/print/a2ps-letter
+RUN_DEPENDS+=	a2ps:${PORTSDIR}/print/a2ps-letter
+.else
+CONFIGURE_ARGS+=--disable-letter
+BUILD_DEPENDS=	a2ps:${PORTSDIR}/print/a2ps-a4
+RUN_DEPENDS+=	a2ps:${PORTSDIR}/print/a2ps-a4
+.endif
 
 .include <bsd.port.mk>

print/xfce4-print/distinfo

@@ -1,2 +1,2 @@
-MD5 (xfce4/xfprint-4.0.6.tar.gz) = 3ab525472bab3eb87146d808d3c17df1
+MD5 (xfce4/xfprint-4.2.0.tar.gz) = dce7378c3961122ca20b2518e939e57c
-SIZE(xfce4/xfprint-4.0.6.tar.gz) = 447407
+SIZE(xfce4/xfprint-4.2.0.tar.gz) = 687610

print/xfce4-print/pkg-plist

@@ -1,33 +1,45 @@
 bin/xfprint-manager
 bin/xfprint4
-lib/libxfprint.a
+lib/xfce4/mcs-plugins/xfprint_plugin.so
-lib/libxfprint.la
+lib/xfce4/xfprint-plugins/file_plugin.so
-lib/libxfprint.so
+%%LPR%%lib/xfce4/xfprint-plugins/bsdlpr_plugin.so
-lib/libxfprint.so.0
+%%CUPS%%lib/xfce4/xfprint-plugins/cups_plugin.so
+share/applications/xfprint.desktop
+share/applications/xfprint-manager.desktop
+share/applications/xfce-xfprint-settings.desktop
+share/icons/hicolor/scalable/apps/xfprint.svg
+share/icons/hicolor/48x48/apps/xfprint.png
 share/locale/ar/LC_MESSAGES/xfprint.mo
 share/locale/az/LC_MESSAGES/xfprint.mo
+share/locale/be/LC_MESSAGES/xfprint.mo
 share/locale/bg/LC_MESSAGES/xfprint.mo
 share/locale/ca/LC_MESSAGES/xfprint.mo
 share/locale/cs/LC_MESSAGES/xfprint.mo
 share/locale/de/LC_MESSAGES/xfprint.mo
+share/locale/en_GB/LC_MESSAGES/xfprint.mo
 share/locale/es/LC_MESSAGES/xfprint.mo
 share/locale/es_MX/LC_MESSAGES/xfprint.mo
 share/locale/et/LC_MESSAGES/xfprint.mo
 share/locale/eu/LC_MESSAGES/xfprint.mo
-share/locale/fa_IR/LC_MESSAGES/xfprint.mo
+share/locale/fa/LC_MESSAGES/xfprint.mo
+share/locale/fi/LC_MESSAGES/xfprint.mo
 share/locale/fr/LC_MESSAGES/xfprint.mo
+share/locale/gu/LC_MESSAGES/xfprint.mo
+share/locale/he/LC_MESSAGES/xfprint.mo
 share/locale/hi/LC_MESSAGES/xfprint.mo
 share/locale/hu/LC_MESSAGES/xfprint.mo
 share/locale/it/LC_MESSAGES/xfprint.mo
 share/locale/ja/LC_MESSAGES/xfprint.mo
+share/locale/ko/LC_MESSAGES/xfprint.mo
 share/locale/lt/LC_MESSAGES/xfprint.mo
 share/locale/ms/LC_MESSAGES/xfprint.mo
 share/locale/nl/LC_MESSAGES/xfprint.mo
-share/locale/no/LC_MESSAGES/xfprint.mo
+share/locale/pa/LC_MESSAGES/xfprint.mo
 share/locale/pl/LC_MESSAGES/xfprint.mo
 share/locale/pt_BR/LC_MESSAGES/xfprint.mo
 share/locale/pt_PT/LC_MESSAGES/xfprint.mo
 share/locale/ru/LC_MESSAGES/xfprint.mo
+share/locale/sk/LC_MESSAGES/xfprint.mo
 share/locale/sv/LC_MESSAGES/xfprint.mo
 share/locale/ta/LC_MESSAGES/xfprint.mo
 share/locale/tr/LC_MESSAGES/xfprint.mo
@@ -35,3 +47,20 @@ share/locale/uk/LC_MESSAGES/xfprint.mo
 share/locale/vi/LC_MESSAGES/xfprint.mo
 share/locale/zh_CN/LC_MESSAGES/xfprint.mo
 share/locale/zh_TW/LC_MESSAGES/xfprint.mo
+share/xfce4/doc/C/images/xfprint_headings.png
+share/xfce4/doc/C/images/xfprint_input.png
+share/xfce4/doc/C/images/xfprint-manager.png
+share/xfce4/doc/C/images/xfprint-manager-queue.png
+share/xfce4/doc/C/images/xfprint_mcs_plugin.png
+share/xfce4/doc/C/images/xfprint_prettyprinting.png
+share/xfce4/doc/C/images/xfprint_sheets.png
+share/xfce4/doc/C/images/xfprint_virtualpages.png
+share/xfce4/doc/C/xfprint.html
+@unexec rmdir %D/lib/xfce4/mcs-plugins 2>/dev/null || true
+@unexec rmdir %D/lib/xfce4/xfprint-plugins 2>/dev/null || true
+@unexec rmdir %D/lib/xfce4 2>/dev/null || true 
+@unexec rmdir %D/share/applications 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

sysutils/xfce4-battery-plugin/Makefile

@@ -7,7 +7,7 @@
 
 PORTNAME=	xfce4-battery-plugin
 PORTVERSION=	0.2.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	sysutils xfce
 MASTER_SITES=	http://download.berlios.de/xfce-goodies/
 DIST_SUBDIR=	xfce4
@@ -18,7 +18,7 @@ COMMENT=	Battery monitor panel plugin for XFce4
 BUILD_DEPENDS=	xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
 LIB_DEPENDS=	xml2.5:${PORTSDIR}/textproc/libxml2 \
 		xfce4util.1:${PORTSDIR}/x11/libxfce4util \
-		xfcegui4.1:${PORTSDIR}/x11-toolkits/libxfce4gui
+		xfcegui4.3:${PORTSDIR}/x11-toolkits/libxfce4gui
 RUN_DEPENDS=	xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
 
 ONLY_FOR_ARCHS=	i386

sysutils/xfce4-cpugraph-plugin/Makefile

@@ -7,7 +7,7 @@
 
 PORTNAME=	xfce4-cpugraph-plugin
 PORTVERSION=	0.2.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils xfce
 MASTER_SITES=	http://download.berlios.de/xfce-goodies/ \
 		http://matt.nerim.net/xfce-goodies/
@@ -18,7 +18,7 @@ COMMENT=	XFce4 systemload plugin with multiple CPU display modes
 
 BUILD_DEPENDS=	xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
 LIB_DEPENDS=	xfce4util.1:${PORTSDIR}/x11/libxfce4util \
-		xfcegui4.1:${PORTSDIR}/x11-toolkits/libxfce4gui \
+		xfcegui4.3:${PORTSDIR}/x11-toolkits/libxfce4gui \
 		startup-notification-1.0:${PORTSDIR}/x11/startup-notification
 RUN_DEPENDS=	xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
 

sysutils/xfce4-fsguard-plugin/Makefile

@@ -7,7 +7,7 @@
 
 PORTNAME=	xfce4-fsguard-plugin
 PORTVERSION=	0.2.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	sysutils xfce
 MASTER_SITES=	http://download.berlios.de/xfce-goodies/ \
 		http://matt.nerim.net/xfce-goodies/ \
@@ -19,7 +19,7 @@ COMMENT=	XFce4 panel plugin to check a mountpoint for free disk space
 
 BUILD_DEPENDS=	xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
 LIB_DEPENDS=	xfce4util.1:${PORTSDIR}/x11/libxfce4util \
-		xfcegui4.1:${PORTSDIR}/x11-toolkits/libxfce4gui \
+		xfcegui4.3:${PORTSDIR}/x11-toolkits/libxfce4gui \
 		xml2.5:${PORTSDIR}/textproc/libxml2 \
 		startup-notification-1.0:${PORTSDIR}/x11/startup-notification
 RUN_DEPENDS=	xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel

sysutils/xfce4-genmon-plugin/Makefile

@@ -7,7 +7,7 @@
 
 PORTNAME=	xfce4-genmon-plugin
 PORTVERSION=	1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils xfce
 MASTER_SITES=	http://download.berlios.de/xfce-goodies/ \
 		http://matt.nerim.net/xfce-goodies/
@@ -18,7 +18,7 @@ COMMENT=	Generic Monitor XFce4 panel plugin
 
 BUILD_DEPENDS=	xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
 LIB_DEPENDS=	xfce4util.1:${PORTSDIR}/x11/libxfce4util \
-		xfcegui4.1:${PORTSDIR}/x11-toolkits/libxfce4gui \
+		xfcegui4.3:${PORTSDIR}/x11-toolkits/libxfce4gui \
 		startup-notification-1.0:${PORTSDIR}/x11/startup-notification
 RUN_DEPENDS=	xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
 

sysutils/xfce4-mcs-manager/Makefile

@@ -6,11 +6,12 @@
 #
 
 PORTNAME=	xfce4-mcs-manager
-PORTVERSION=	4.0.6
+PORTVERSION=	4.2.0
-PORTREVISION=	1
+PORTREVISION=	0
 CATEGORIES=	sysutils xfce
-MASTER_SITES=	ftp://ftp.berlios.de/pub/xfce-goodies/${PORTVERSION}/ \
+MASTER_SITES=	http://www.us.xfce.org/archive/xfce-${PORTVERSION}/src/ \
-		http://hannelore.f1.fhtw-berlin.de/mirrors/xfce4/xfce-${PORTVERSION}/src/
+		http://spuriousinterrupt.org/projects/xfce4/files/mirror/xfce-${PORTVERSION}/ \
+		http://public.fh-wolfenbuettel.de/~luedickj/xfce4/xfce-${PORTVERSION}/
 DISTNAME=	xfce-mcs-manager-${PORTVERSION}
 DIST_SUBDIR=	xfce4
 
@@ -18,8 +19,8 @@ MAINTAINER=	oliver@FreeBSD.org
 COMMENT=	XFce 4 settings manager
 
 LIB_DEPENDS=	xfce4util.1:${PORTSDIR}/x11/libxfce4util \
-		xfcegui4.1:${PORTSDIR}/x11-toolkits/libxfce4gui \
+		xfcegui4.3:${PORTSDIR}/x11-toolkits/libxfce4gui \
-		xfce4mcs-manager.1:${PORTSDIR}/x11/libxfce4mcs
+		xfce4mcs-manager.2:${PORTSDIR}/x11/libxfce4mcs
 
 USE_GETTEXT=	yes
 USE_GNOME=	glib20

sysutils/xfce4-mcs-manager/distinfo

@@ -1,2 +1,2 @@
-MD5 (xfce4/xfce-mcs-manager-4.0.6.tar.gz) = 1a32c4318b5cce3475a5b016fd6703ad
+MD5 (xfce4/xfce-mcs-manager-4.2.0.tar.gz) = 177d98fe247aa10de9a16dcb2fcdec32
-SIZE(xfce4/xfce-mcs-manager-4.0.6.tar.gz) = 538545
+SIZE(xfce4/xfce-mcs-manager-4.2.0.tar.gz) = 503492

sysutils/xfce4-mcs-manager/pkg-plist

@@ -2,19 +2,25 @@ bin/xfce-setting-show
 bin/xfce-mcs-manager
 include/xfce4/xfce-mcs-manager/manager-plugin.h
 libdata/pkgconfig/xfce-mcs-manager.pc
+share/applications/xfce-settings-manager.desktop
+share/icons/hicolor/48x48/apps/xfce4-settings.png
 share/locale/ar/LC_MESSAGES/xfce-mcs-manager.mo
 share/locale/az/LC_MESSAGES/xfce-mcs-manager.mo
+share/locale/be/LC_MESSAGES/xfce-mcs-manager.mo
 share/locale/bg/LC_MESSAGES/xfce-mcs-manager.mo
 share/locale/ca/LC_MESSAGES/xfce-mcs-manager.mo
 share/locale/cs/LC_MESSAGES/xfce-mcs-manager.mo
 share/locale/de/LC_MESSAGES/xfce-mcs-manager.mo
+share/locale/en_GB/LC_MESSAGES/xfce-mcs-manager.mo
 share/locale/es/LC_MESSAGES/xfce-mcs-manager.mo
 share/locale/es_MX/LC_MESSAGES/xfce-mcs-manager.mo
 share/locale/et/LC_MESSAGES/xfce-mcs-manager.mo
 share/locale/eu/LC_MESSAGES/xfce-mcs-manager.mo
-share/locale/fa_IR/LC_MESSAGES/xfce-mcs-manager.mo
+share/locale/fa/LC_MESSAGES/xfce-mcs-manager.mo
 share/locale/fi/LC_MESSAGES/xfce-mcs-manager.mo
 share/locale/fr/LC_MESSAGES/xfce-mcs-manager.mo
+share/locale/gu/LC_MESSAGES/xfce-mcs-manager.mo
+share/locale/he/LC_MESSAGES/xfce-mcs-manager.mo
 share/locale/hi/LC_MESSAGES/xfce-mcs-manager.mo
 share/locale/hu/LC_MESSAGES/xfce-mcs-manager.mo
 share/locale/it/LC_MESSAGES/xfce-mcs-manager.mo
@@ -22,12 +28,15 @@ share/locale/ja/LC_MESSAGES/xfce-mcs-manager.mo
 share/locale/ko/LC_MESSAGES/xfce-mcs-manager.mo
 share/locale/lt/LC_MESSAGES/xfce-mcs-manager.mo
 share/locale/ms/LC_MESSAGES/xfce-mcs-manager.mo
+share/locale/nb_NO/LC_MESSAGES/xfce-mcs-manager.mo
 share/locale/nl/LC_MESSAGES/xfce-mcs-manager.mo
-share/locale/no/LC_MESSAGES/xfce-mcs-manager.mo
+share/locale/pa/LC_MESSAGES/xfce-mcs-manager.mo
 share/locale/pl/LC_MESSAGES/xfce-mcs-manager.mo
 share/locale/pt_BR/LC_MESSAGES/xfce-mcs-manager.mo
 share/locale/pt_PT/LC_MESSAGES/xfce-mcs-manager.mo
+share/locale/ro/LC_MESSAGES/xfce-mcs-manager.mo
 share/locale/ru/LC_MESSAGES/xfce-mcs-manager.mo
+share/locale/sk/LC_MESSAGES/xfce-mcs-manager.mo
 share/locale/sv/LC_MESSAGES/xfce-mcs-manager.mo
 share/locale/ta/LC_MESSAGES/xfce-mcs-manager.mo
 share/locale/tr/LC_MESSAGES/xfce-mcs-manager.mo
@@ -36,21 +45,14 @@ share/locale/vi/LC_MESSAGES/xfce-mcs-manager.mo
 share/locale/zh_CN/LC_MESSAGES/xfce-mcs-manager.mo
 share/locale/zh_TW/LC_MESSAGES/xfce-mcs-manager.mo
 share/xfce4/doc/C/images/settings_manager.png
-share/xfce4/doc/C/images/smgr_from_panel.png
 share/xfce4/doc/C/images/smgr_from_root_menu.png
 share/xfce4/doc/C/images/smgr_from_setup_button.png
 share/xfce4/doc/C/xfce-mcs-manager.html
-share/xfce4/doc/fr/images/settings_manager.png
-share/xfce4/doc/fr/images/smgr_from_panel.png
-share/xfce4/doc/fr/images/smgr_from_root_menu.png
-share/xfce4/doc/fr/images/smgr_from_setup_button.png
-share/xfce4/doc/fr/xfce-mcs-manager.html
 @dirrm include/xfce4/xfce-mcs-manager
 @unexec rmdir %D/include/xfce4 2>/dev/null || true
 @unexec rmdir %D/libdata/pkgconfig 2>/dev/null || true
+@unexec rmdir %D/share/icons/hicolor 2>/dev/null || true
 @unexec rmdir %D/share/xfce4/doc/C/images 2>/dev/null || true
 @unexec rmdir %D/share/xfce4/doc/C 2>/dev/null || true
-@unexec rmdir %D/share/xfce4/doc/fr/images 2>/dev/null || true
-@unexec rmdir %D/share/xfce4/doc/fr 2>/dev/null || true
 @unexec rmdir %D/share/xfce4/doc 2>/dev/null || true
 @unexec rmdir %D/share/xfce4 2>/dev/null || true

sysutils/xfce4-mcs-plugins/Makefile

@@ -6,11 +6,12 @@
 #
 
 PORTNAME=	xfce4-mcs-plugins
-PORTVERSION=	4.0.6
+PORTVERSION=	4.2.0
-PORTREVISION=	1
+PORTREVISION=	0
 CATEGORIES=	sysutils xfce
-MASTER_SITES=	ftp://ftp.berlios.de/pub/xfce-goodies/${PORTVERSION}/ \
+MASTER_SITES=	http://www.us.xfce.org/archive/xfce-${PORTVERSION}/src/ \
-		http://hannelore.f1.fhtw-berlin.de/mirrors/xfce4/xfce-${PORTVERSION}/src/
+		http://spuriousinterrupt.org/projects/xfce4/files/mirror/xfce-${PORTVERSION}/ \
+		http://public.fh-wolfenbuettel.de/~luedickj/xfce4/xfce-${PORTVERSION}/
 DISTNAME=	xfce-mcs-plugins-${PORTVERSION}
 DIST_SUBDIR=	xfce4
 
@@ -19,12 +20,12 @@ COMMENT=	XFce 4 settings manager plugins
 
 BUILD_DEPENDS=	xfce-mcs-manager:${PORTSDIR}/sysutils/xfce4-mcs-manager
 LIB_DEPENDS=	xfce4util.1:${PORTSDIR}/x11/libxfce4util \
-		xfcegui4.1:${PORTSDIR}/x11-toolkits/libxfce4gui
+		xfcegui4.3:${PORTSDIR}/x11-toolkits/libxfce4gui
 
 USE_GETTEXT=	yes
 USE_GNOME=	gtk20
 USE_X_PREFIX=	yes
-USE_INC_LIBTOOL_VER=15
+USE_LIBTOOL_VER=15
 INSTALLS_SHLIB=	yes
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CFLAGS=-I${LOCALBASE}/include \

sysutils/xfce4-mcs-plugins/distinfo

@@ -1,2 +1,2 @@
-MD5 (xfce4/xfce-mcs-plugins-4.0.6.tar.gz) = e197d3570f444daa175a684e472ea396
+MD5 (xfce4/xfce-mcs-plugins-4.2.0.tar.gz) = aa0d7d7c8a60af221bf08f2589a6dc9b
-SIZE(xfce4/xfce-mcs-plugins-4.0.6.tar.gz) = 615696
+SIZE(xfce4/xfce-mcs-plugins-4.2.0.tar.gz) = 661118

sysutils/xfce4-mcs-plugins/pkg-plist

@@ -1,25 +1,37 @@
-lib/xfce4/mcs-plugins/keyboard_plugin.a
+lib/xfce4/mcs-plugins/display_plugin.so
-lib/xfce4/mcs-plugins/keyboard_plugin.la
 lib/xfce4/mcs-plugins/keyboard_plugin.so
-lib/xfce4/mcs-plugins/mouse_plugin.a
-lib/xfce4/mcs-plugins/mouse_plugin.la
 lib/xfce4/mcs-plugins/mouse_plugin.so
-lib/xfce4/mcs-plugins/ui_plugin.a
+lib/xfce4/mcs-plugins/screensaver_plugin.so
-lib/xfce4/mcs-plugins/ui_plugin.la
 lib/xfce4/mcs-plugins/ui_plugin.so
+share/applications/xfce-ui-settings.desktop
+share/applications/xfce-keyboard-settings.desktop
+share/applications/xfce-mouse-settings.desktop
+share/applications/xfce-display-settings.desktop
+share/icons/hicolor/48x48/apps/xfce4-display.png
+share/icons/hicolor/48x48/apps/xfce4-keyboard.png
+share/icons/hicolor/48x48/apps/xfce4-mouse.png
+share/icons/hicolor/48x48/apps/xfce4-ui.png
+share/icons/hicolor/scalable/apps/xfce4-display.svg
+share/icons/hicolor/scalable/apps/xfce4-keyboard.svg
+share/icons/hicolor/scalable/apps/xfce4-mouse.svg
+share/icons/hicolor/scalable/apps/xfce4-ui.svg
 share/locale/ar/LC_MESSAGES/xfce-mcs-plugins.mo
 share/locale/az/LC_MESSAGES/xfce-mcs-plugins.mo
 share/locale/bg/LC_MESSAGES/xfce-mcs-plugins.mo
+share/locale/be/LC_MESSAGES/xfce-mcs-plugins.mo
 share/locale/ca/LC_MESSAGES/xfce-mcs-plugins.mo
 share/locale/cs/LC_MESSAGES/xfce-mcs-plugins.mo
 share/locale/de/LC_MESSAGES/xfce-mcs-plugins.mo
+share/locale/en_GB/LC_MESSAGES/xfce-mcs-plugins.mo
 share/locale/es/LC_MESSAGES/xfce-mcs-plugins.mo
 share/locale/es_MX/LC_MESSAGES/xfce-mcs-plugins.mo
 share/locale/et/LC_MESSAGES/xfce-mcs-plugins.mo
 share/locale/eu/LC_MESSAGES/xfce-mcs-plugins.mo
-share/locale/fa_IR/LC_MESSAGES/xfce-mcs-plugins.mo
+share/locale/fa/LC_MESSAGES/xfce-mcs-plugins.mo
 share/locale/fi/LC_MESSAGES/xfce-mcs-plugins.mo
 share/locale/fr/LC_MESSAGES/xfce-mcs-plugins.mo
+share/locale/gu/LC_MESSAGES/xfce-mcs-plugins.mo
+share/locale/he/LC_MESSAGES/xfce-mcs-plugins.mo
 share/locale/hi/LC_MESSAGES/xfce-mcs-plugins.mo
 share/locale/hu/LC_MESSAGES/xfce-mcs-plugins.mo
 share/locale/it/LC_MESSAGES/xfce-mcs-plugins.mo
@@ -28,11 +40,13 @@ share/locale/ko/LC_MESSAGES/xfce-mcs-plugins.mo
 share/locale/lt/LC_MESSAGES/xfce-mcs-plugins.mo
 share/locale/ms/LC_MESSAGES/xfce-mcs-plugins.mo
 share/locale/nl/LC_MESSAGES/xfce-mcs-plugins.mo
-share/locale/no/LC_MESSAGES/xfce-mcs-plugins.mo
+share/locale/pa/LC_MESSAGES/xfce-mcs-plugins.mo
 share/locale/pl/LC_MESSAGES/xfce-mcs-plugins.mo
 share/locale/pt_BR/LC_MESSAGES/xfce-mcs-plugins.mo
 share/locale/pt_PT/LC_MESSAGES/xfce-mcs-plugins.mo
+share/locale/ro/LC_MESSAGES/xfce-mcs-plugins.mo
 share/locale/ru/LC_MESSAGES/xfce-mcs-plugins.mo
+share/locale/sk/LC_MESSAGES/xfce-mcs-plugins.mo
 share/locale/sv/LC_MESSAGES/xfce-mcs-plugins.mo
 share/locale/ta/LC_MESSAGES/xfce-mcs-plugins.mo
 share/locale/tr/LC_MESSAGES/xfce-mcs-plugins.mo
@@ -40,16 +54,13 @@ share/locale/uk/LC_MESSAGES/xfce-mcs-plugins.mo
 share/locale/vi/LC_MESSAGES/xfce-mcs-plugins.mo
 share/locale/zh_CN/LC_MESSAGES/xfce-mcs-plugins.mo
 share/locale/zh_TW/LC_MESSAGES/xfce-mcs-plugins.mo
+share/xfce4/doc/C/images/display_preferences.png
 share/xfce4/doc/C/images/font_selection.png
 share/xfce4/doc/C/images/keyboard_settings.png
 share/xfce4/doc/C/images/mouse_settings.png
 share/xfce4/doc/C/images/user_interface_settings.png
+share/xfce4/doc/C/images/user_interface_settings_icons.png
 share/xfce4/doc/C/xfce-mcs-plugins.html
-share/xfce4/doc/fr/images/font_selection.png
-share/xfce4/doc/fr/images/keyboard_settings.png
-share/xfce4/doc/fr/images/mouse_settings.png
-share/xfce4/doc/fr/images/user_interface_settings.png
-share/xfce4/doc/fr/xfce-mcs-plugins.html
 @unexec rmdir %D/lib/xfce4/mcs-plugins 2>/dev/null || true
 @unexec rmdir %D/lib/xfce4 2>/dev/null || true
 @unexec rmdir %D/share/xfce4/doc/C/images 2>/dev/null || true

sysutils/xfce4-netload-plugin/Makefile

@@ -7,7 +7,7 @@
 
 PORTNAME=	xfce4-netload-plugin
 PORTVERSION=	0.2.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils xfce
 MASTER_SITES=	http://download.berlios.de/xfce-goodies/ \
 		http://matt.nerim.net/xfce-goodies/ \
@@ -20,7 +20,7 @@ COMMENT=	Network Load plugin for XFce4
 BUILD_DEPENDS=	xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
 LIB_DEPENDS=	xml2.5:${PORTSDIR}/textproc/libxml2 \
 		xfce4util.1:${PORTSDIR}/x11/libxfce4util \
-		xfcegui4.1:${PORTSDIR}/x11-toolkits/libxfce4gui
+		xfcegui4.3:${PORTSDIR}/x11-toolkits/libxfce4gui
 RUN_DEPENDS=	xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
 
 USE_GNOME=	gtk20

sysutils/xfce4-showdesktop-plugin/Makefile

@@ -7,7 +7,7 @@
 
 PORTNAME=	xfce4-showdesktop-plugin
 PORTVERSION=	0.3.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	sysutils xfce
 MASTER_SITES=	http://download.berlios.de/xfce-goodies/
 DIST_SUBDIR=	xfce4
@@ -18,7 +18,7 @@ COMMENT=	Xfce 4 Plugin to minimize/unminimize all windows
 BUILD_DEPENDS=	xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
 LIB_DEPENDS=	xml2.5:${PORTSDIR}/textproc/libxml2 \
 		xfce4util.1:${PORTSDIR}/x11/libxfce4util \
-		xfcegui4.1:${PORTSDIR}/x11-toolkits/libxfce4gui
+		xfcegui4.3:${PORTSDIR}/x11-toolkits/libxfce4gui
 RUN_DEPENDS=	xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
 
 WRKSRC=		${WRKDIR}/${PORTNAME}

sysutils/xfce4-systemload-plugin/Makefile

@@ -7,7 +7,7 @@
 
 PORTNAME=	xfce4-systemload-plugin
 PORTVERSION=	0.3.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils xfce
 MASTER_SITES=	http://download.berlios.de/xfce-goodies/ \
 		http://matt.nerim.net/xfce-goodies/ \
@@ -20,7 +20,7 @@ COMMENT=	System Load plugin for XFce4
 BUILD_DEPENDS=	xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
 LIB_DEPENDS=	xml2.5:${PORTSDIR}/textproc/libxml2 \
 		xfce4util.1:${PORTSDIR}/x11/libxfce4util \
-		xfcegui4.1:${PORTSDIR}/x11-toolkits/libxfce4gui
+		xfcegui4.3:${PORTSDIR}/x11-toolkits/libxfce4gui
 RUN_DEPENDS=	xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
 
 USE_GNOME=	gtk20

sysutils/xfce4-utils/Makefile

@@ -6,25 +6,28 @@
 #
 
 PORTNAME=	xfce4-utils
-PORTVERSION=	4.0.6
+PORTVERSION=	4.2.0
-PORTREVISION=	1
+PORTREVISION=	0
 CATEGORIES=	sysutils xfce
-MASTER_SITES=	ftp://ftp.berlios.de/pub/xfce-goodies/${PORTVERSION}/ \
+MASTER_SITES=	http://www.us.xfce.org/archive/xfce-${PORTVERSION}/src/ \
-		http://hannelore.f1.fhtw-berlin.de/mirrors/xfce4/xfce-${PORTVERSION}/src/
+		http://spuriousinterrupt.org/projects/xfce4/files/mirror/xfce-${PORTVERSION}/ \
+		http://public.fh-wolfenbuettel.de/~luedickj/xfce4/xfce-${PORTVERSION}/
 DISTNAME=	xfce-utils-${PORTVERSION}
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	oliver@FreeBSD.org
 COMMENT=	XFce 4 essential utilities and scripts
 
+BUILD_DEPENDS=	xfce-mcs-manager:${PORTSDIR}/sysutils/xfce4-mcs-manager
 LIB_DEPENDS=	xfce4util.1:${PORTSDIR}/x11/libxfce4util \
-		xfcegui4.1:${PORTSDIR}/x11-toolkits/libxfce4gui \
+		xfcegui4.3:${PORTSDIR}/x11-toolkits/libxfce4gui
-		xfce4mcs-manager.1:${PORTSDIR}/sysutils/xfce4-mcs-manager
+RUN_DEPENDS=	xfce-mcs-manager:${PORTSDIR}/sysutils/xfce4-mcs-manager
 
+GNU_CONFIGURE=	yes
 USE_GETTEXT=	yes
 USE_GNOME=	gtk20
 USE_X_PREFIX=	yes
-USE_INC_LIBTOOL_VER=15
+USE_LIBTOOL_VER=15
 INSTALLS_SHLIB=	yes
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CFLAGS=-I${LOCALBASE}/include \

sysutils/xfce4-utils/distinfo

@@ -1,2 +1,2 @@
-MD5 (xfce4/xfce-utils-4.0.6.tar.gz) = d42a01aa03a9eafb9bc2cc546d988b4b
+MD5 (xfce4/xfce-utils-4.2.0.tar.gz) = 879ef5cfbd9e4cdd87dbd26fce07b6d6
-SIZE(xfce4/xfce-utils-4.0.6.tar.gz) = 974783
+SIZE(xfce4/xfce-utils-4.2.0.tar.gz) = 740252

sysutils/xfce4-utils/pkg-plist

@@ -6,23 +6,29 @@ bin/xfmountdev4
 bin/xfrun4
 bin/xftaskbar4
 bin/xfterm4
-etc/xfce4/xinitrc
+etc/xdg/xfce4/xinitrc
-lib/xfce4/mcs-plugins/xftaskbar_plugin.a
-lib/xfce4/mcs-plugins/xftaskbar_plugin.la
 lib/xfce4/mcs-plugins/xftaskbar_plugin.so
+share/applications/xfce-taskbar-settings.desktop
+share/icons/hicolor/48x48/apps/xfce4-logo.png
+share/icons/hicolor/48x48/apps/xfce4-taskbar.png
+share/icons/hicolor/scalable/apps/xfce4-taskbar.svg
 share/locale/ar/LC_MESSAGES/xfce-utils.mo
 share/locale/az/LC_MESSAGES/xfce-utils.mo
+share/locale/be/LC_MESSAGES/xfce-utils.mo
 share/locale/bg/LC_MESSAGES/xfce-utils.mo
 share/locale/ca/LC_MESSAGES/xfce-utils.mo
 share/locale/cs/LC_MESSAGES/xfce-utils.mo
 share/locale/de/LC_MESSAGES/xfce-utils.mo
+share/locale/en_GB/LC_MESSAGES/xfce-utils.mo
 share/locale/es/LC_MESSAGES/xfce-utils.mo
 share/locale/es_MX/LC_MESSAGES/xfce-utils.mo
 share/locale/et/LC_MESSAGES/xfce-utils.mo
 share/locale/eu/LC_MESSAGES/xfce-utils.mo
-share/locale/fa_IR/LC_MESSAGES/xfce-utils.mo
+share/locale/fa/LC_MESSAGES/xfce-utils.mo
 share/locale/fi/LC_MESSAGES/xfce-utils.mo
 share/locale/fr/LC_MESSAGES/xfce-utils.mo
+share/locale/gu/LC_MESSAGES/xfce-utils.mo
+share/locale/he/LC_MESSAGES/xfce-utils.mo
 share/locale/hi/LC_MESSAGES/xfce-utils.mo
 share/locale/hu/LC_MESSAGES/xfce-utils.mo
 share/locale/it/LC_MESSAGES/xfce-utils.mo
@@ -31,11 +37,13 @@ share/locale/ko/LC_MESSAGES/xfce-utils.mo
 share/locale/lt/LC_MESSAGES/xfce-utils.mo
 share/locale/ms/LC_MESSAGES/xfce-utils.mo
 share/locale/nl/LC_MESSAGES/xfce-utils.mo
-share/locale/no/LC_MESSAGES/xfce-utils.mo
 share/locale/pl/LC_MESSAGES/xfce-utils.mo
+share/locale/pa/LC_MESSAGES/xfce-utils.mo
 share/locale/pt_BR/LC_MESSAGES/xfce-utils.mo
 share/locale/pt_PT/LC_MESSAGES/xfce-utils.mo
+share/locale/ro/LC_MESSAGES/xfce-utils.mo
 share/locale/ru/LC_MESSAGES/xfce-utils.mo
+share/locale/sk/LC_MESSAGES/xfce-utils.mo
 share/locale/sv/LC_MESSAGES/xfce-utils.mo
 share/locale/ta/LC_MESSAGES/xfce-utils.mo
 share/locale/tr/LC_MESSAGES/xfce-utils.mo
@@ -49,6 +57,7 @@ share/xfce4/AUTHORS.ca
 share/xfce4/AUTHORS.de
 share/xfce4/AUTHORS.es
 share/xfce4/AUTHORS.fr
+share/xfce4/AUTHORS.he
 share/xfce4/AUTHORS.html
 share/xfce4/AUTHORS.html.az
 share/xfce4/AUTHORS.html.ca
@@ -56,7 +65,17 @@ share/xfce4/AUTHORS.html.de
 share/xfce4/AUTHORS.html.es
 share/xfce4/AUTHORS.html.fr
 share/xfce4/AUTHORS.html.it
+share/xfce4/AUTHORS.html.lt
+share/xfce4/AUTHORS.html.ro
+share/xfce4/AUTHORS.html.ru
+share/xfce4/AUTHORS.html.sk
+share/xfce4/AUTHORS.html.vi
 share/xfce4/AUTHORS.it
+share/xfce4/AUTHORS.lt
+share/xfce4/AUTHORS.ro
+share/xfce4/AUTHORS.ru
+share/xfce4/AUTHORS.uk
+share/xfce4/AUTHORS.sk
 share/xfce4/AUTHORS.vi
 share/xfce4/COPYING
 share/xfce4/COPYING.html
@@ -75,7 +94,14 @@ share/xfce4/INFO.html.de
 share/xfce4/INFO.html.es
 share/xfce4/INFO.html.fr
 share/xfce4/INFO.html.it
+share/xfce4/INFO.html.lt
+share/xfce4/INFO.html.ro
+share/xfce4/INFO.html.ru
 share/xfce4/INFO.it
+share/xfce4/INFO.lt
+share/xfce4/INFO.ro
+share/xfce4/INFO.ru
+share/xfce4/INFO.uk
 share/xfce4/INFO.vi
 share/xfce4/LGPL
 share/xfce4/LGPL.html
@@ -84,30 +110,19 @@ share/xfce4/doc/C/images/about-dialog.png
 share/xfce4/doc/C/images/run-dialog.png
 share/xfce4/doc/C/images/default-session.png
 share/xfce4/doc/C/images/link_xfce.jpg
+share/xfce4/doc/C/images/taskbar_settings.png
 share/xfce4/doc/C/BSD.html
 share/xfce4/doc/C/GPL.html
 share/xfce4/doc/C/LGPL.html
 share/xfce4/doc/C/xfce-utils.html
+share/xfce4/doc/C/xfce4-components.html
 share/xfce4/doc/C/xfce4-user-guide.html
 share/xfce4/doc/C/xfce4-intro.html
 share/xfce4/doc/C/xfce4-copyright.html
 share/xfce4/doc/C/xfce4-use.html
 share/xfce4/doc/C/xfce4-install.html
-share/xfce4/doc/fr/index.html
-share/xfce4/doc/fr/images/default-session.png
-share/xfce4/doc/fr/images/link_xfce.jpg
-share/xfce4/doc/fr/images/about-dialog.png
-share/xfce4/doc/fr/images/run-dialog.png
-share/xfce4/doc/fr/BSD.html
-share/xfce4/doc/fr/GPL.html
-share/xfce4/doc/fr/LGPL.html
-share/xfce4/doc/fr/xfce4-user-guide.html
-share/xfce4/doc/fr/xfce4-intro.html
-share/xfce4/doc/fr/xfce4-copyright.html
-share/xfce4/doc/fr/xfce4-use.html
-share/xfce4/doc/fr/xfce4-install.html
-share/xfce4/doc/fr/xfce-utils.html
 share/xfce4/doc/xfce.css
+share/xfce4/doc/xfce-mouse.png
 @unexec rmdir %D/etc/xfce4 2>/dev/null || true
 @unexec rmdir %D/lib/xfce4/mcs-plugins 2>/dev/null || true
 @unexec rmdir %D/lib/xfce4 2>/dev/null || true
@@ -115,5 +130,7 @@ share/xfce4/doc/xfce.css
 @unexec rmdir %D/share/xfce4/doc/C 2>/dev/null || true
 @unexec rmdir %D/share/xfce4/doc/fr/images 2>/dev/null || true
 @unexec rmdir %D/share/xfce4/doc/fr 2>/dev/null || true
+@unexec rmdir %D/share/xfce4/doc/it/images 2>/dev/null || true
+@unexec rmdir %D/share/xfce4/doc/it 2>/dev/null || true
 @unexec rmdir %D/share/xfce4/doc 2>/dev/null || true
 @unexec rmdir %D/share/xfce4 2>/dev/null || true

sysutils/xfce4-wavelan-plugin/Makefile

@@ -7,6 +7,7 @@
 
 PORTNAME=	xfce4-wavelan-plugin
 PORTVERSION=	0.4.1
+PORTREVISION=	1
 CATEGORIES=	sysutils xfce
 MASTER_SITES=	http://download.berlios.de/xfce-goodies/ \
 		http://matt.nerim.net/xfce-goodies/ \
@@ -19,7 +20,7 @@ COMMENT=	Displays various information about a WaveLAN device
 BUILD_DEPENDS=	xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
 LIB_DEPENDS=	xml2.5:${PORTSDIR}/textproc/libxml2 \
 		xfce4util.1:${PORTSDIR}/x11/libxfce4util \
-		xfcegui4.1:${PORTSDIR}/x11-toolkits/libxfce4gui
+		xfcegui4.3:${PORTSDIR}/x11-toolkits/libxfce4gui
 RUN_DEPENDS=	xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
 
 USE_GNOME=	gtk20

x11-clocks/xfce4-datetime-plugin/Makefile

@@ -7,7 +7,7 @@
 
 PORTNAME=	xfce4-datetime-plugin
 PORTVERSION=	0.3.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-clocks xfce
 MASTER_SITES=	http://download.berlios.de/xfce-goodies/ \
 		http://matt.nerim.net/xfce-goodies/ \
@@ -19,7 +19,7 @@ COMMENT=	XFce 4 additional clock module which also shows date
 
 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

x11-fm/Makefile

@@ -34,7 +34,6 @@
     SUBDIR += xcruise
     SUBDIR += xdiskusage
     SUBDIR += xfce4-fm
-    SUBDIR += xfce4-fm-icons
     SUBDIR += xfe
     SUBDIR += xfm
     SUBDIR += xnc

x11-fm/xfce4-fm-icons/Makefile

@@ -1,25 +0,0 @@
-# New ports collection makefile for:	xffm-icons
-# Date created:		7 June 2003
-# Whom:			James Earl <jdearl@telus.net>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	xfce4-fm-icons
-PORTVERSION=	4.0.6
-CATEGORIES=	x11-fm xfce
-MASTER_SITES=	ftp://ftp.berlios.de/pub/xfce-goodies/${PORTVERSION}/ \
-		http://hannelore.f1.fhtw-berlin.de/mirrors/xfce4/xfce-${PORTVERSION}/src/
-DISTNAME=	xffm-icons-${PORTVERSION}
-DIST_SUBDIR=	xfce4
-
-MAINTAINER=	oliver@FreeBSD.org
-COMMENT=	XFce 4 icon themes for the xffm file manager
-
-USE_X_PREFIX=	yes
-GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
-
-NO_BUILD=	yes
-
-.include <bsd.port.mk>

x11-fm/xfce4-fm-icons/distinfo

@@ -1,2 +0,0 @@
-MD5 (xfce4/xffm-icons-4.0.6.tar.gz) = c9b42d72844b22bb2c8ad54680b3865b
-SIZE(xfce4/xffm-icons-4.0.6.tar.gz) = 4804978

x11-fm/xfce4-fm-icons/pkg-descr

@@ -1,3 +0,0 @@
-XFce 4 icon themes for the xffm file manager.
-
-WWW: http://www.xfce.org

x11-fm/xfce4-fm/Makefile

@@ -6,11 +6,12 @@
 #
 
 PORTNAME=	xfce4-fm
-PORTVERSION=	4.0.6
+PORTVERSION=	4.2.0
-PORTREVISION=	1
+PORTREVISION=	0
 CATEGORIES=	x11-fm xfce
-MASTER_SITES=	ftp://ftp.berlios.de/pub/xfce-goodies/${PORTVERSION}/ \
+MASTER_SITES=	http://www.us.xfce.org/archive/xfce-${PORTVERSION}/src/ \
-		http://hannelore.f1.fhtw-berlin.de/mirrors/xfce4/xfce-${PORTVERSION}/src/
+		http://spuriousinterrupt.org/projects/xfce4/files/mirror/xfce-${PORTVERSION}/ \
+		http://public.fh-wolfenbuettel.de/~luedickj/xfce4/xfce-${PORTVERSION}/
 DISTNAME=	xffm-${PORTVERSION}
 DIST_SUBDIR=	xfce4
 
@@ -21,14 +22,14 @@ BUILD_DEPENDS=	xfce-mcs-manager:${PORTSDIR}/sysutils/xfce4-mcs-manager
 LIB_DEPENDS=	dbh-1.0.1:${PORTSDIR}/databases/dbh \
 		xml2.5:${PORTSDIR}/textproc/libxml2 \
 		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_XPM=	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 \
@@ -37,6 +38,13 @@ CONFIGURE_ENV=	CFLAGS=-I${LOCALBASE}/include \
 
 MAN1=		fgr.1
 
+.if defined(WITH_LIBRSVG)
+USE_GNOME+=	librsvg2
+CONFIGURE_ARGS+=--enable-librsvg
+.else
+CONFIGURE_ARGS+=--disable-librsvg
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|$$(libdir)/pkgconfig|${PREFIX}/libdata/pkgconfig|g' \
 		${WRKSRC}/src/Makefile.in

x11-fm/xfce4-fm/distinfo

@@ -1,2 +1,2 @@
-MD5 (xfce4/xffm-4.0.6.tar.gz) = 6a48c74f4bc02033299769badb49182a
+MD5 (xfce4/xffm-4.2.0.tar.gz) = 476b50335da473d46b12f43a07a28e83
-SIZE(xfce4/xffm-4.0.6.tar.gz) = 1708703
+SIZE(xfce4/xffm-4.2.0.tar.gz) = 2974372

x11-fm/xfce4-fm/pkg-plist

@@ -1,70 +1,201 @@
 bin/fgr
 bin/scramble
-bin/xfapps
-bin/xfapps4
 bin/xfbook
 bin/xfbook4
 bin/xfdiff4
+bin/xffrequent
+bin/xffrequent4
 bin/xffstab
 bin/xffstab4
 bin/xfglob4
+bin/xfmime-edit
+bin/xfrecent
+bin/xfrecent4
 bin/xfsamba4
 bin/xftrash4
 bin/xftree4
 bin/xffm
-lib/libxffm.la
+lib/libxffm_actions.a
-lib/libxffm.so
-lib/libxffm.so.0
-lib/libxffm_actions.la
 lib/libxffm_actions.so
-lib/libxffm_actions.so.0
+lib/libxffm_actions.so.1
-lib/libxffm_apps.la
+lib/libxffm_basic.a
-lib/libxffm_apps.so
+lib/libxffm_basic.so
-lib/libxffm_apps.so.0
+lib/libxffm_basic.so.1
-lib/libxffm_book.la
+lib/libxffm_calls.a
-lib/libxffm_book.so
-lib/libxffm_book.so.0
-lib/libxffm_calls.la
 lib/libxffm_calls.so
-lib/libxffm_calls.so.0
+lib/libxffm_calls.so.1
-lib/libxffm_fgr.la
+lib/libxffm_cpy.a
-lib/libxffm_fgr.so
+lib/libxffm_cpy.so
-lib/libxffm_fgr.so.0
+lib/libxffm_cpy.so.1
-lib/libxffm_fstab.la
+lib/libxffm_on_demand.a
-lib/libxffm_fstab.so
+lib/libxffm_on_demand.so
-lib/libxffm_fstab.so.0
+lib/libxffm_on_demand.so.1
-lib/libxffm_tubo.la
+lib/libxffm_secondary.a
+lib/libxffm_secondary.so
+lib/libxffm_secondary.so.1
+lib/libxffm_tubo.a
 lib/libxffm_tubo.so
-lib/libxffm_tubo.so.0
+lib/libxffm_tubo.so.1
-lib/libxffmsmb.la
-lib/libxffmsmb.so
-lib/libxffmsmb.so.0
-lib/xfce4/mcs-plugins/libxffmsettings.la
 lib/xfce4/mcs-plugins/libxffmsettings.so
+lib/xfce4/xffm/libxffm_book.a
+lib/xfce4/xffm/libxffm_book.so
+lib/xfce4/xffm/libxffm_book.so.1
+lib/xfce4/xffm/libxffm_fstab.a
+lib/xfce4/xffm/libxffm_fstab.so
+lib/xfce4/xffm/libxffm_fstab.so.1
+lib/xfce4/xffm/libxffm_prop.a
+lib/xfce4/xffm/libxffm_prop.so
+lib/xfce4/xffm/libxffm_prop.so.0
+lib/xfce4/xffm/libxffm_recent.a
+lib/xfce4/xffm/libxffm_recent.so
+lib/xfce4/xffm/libxffm_recent.so.1
+lib/xfce4/xffm/libxffm_find.a
+lib/xfce4/xffm/libxffm_find.so
+lib/xfce4/xffm/libxffm_find.so.1
+lib/xfce4/xffm/libxffm_smb.a
+lib/xfce4/xffm/libxffm_smb.so
+lib/xfce4/xffm/libxffm_smb.so.1
+lib/xfce4/xffm/libxffm_trash.a
+lib/xfce4/xffm/libxffm_trash.so
+lib/xfce4/xffm/libxffm_trash.so.1
 libdata/pkgconfig/xffm-1.0.pc
+share/applications/Xffm.desktop
+share/applications/Xfsamba.desktop
+share/applications/Xftree.desktop
+share/applications/Xfglob.desktop
+share/applications/Xfdiff.desktop
+share/applications/Xfbook.desktop
+share/applications/Xffstab.desktop
+share/applications/Xfmime_edit.desktop
+share/applications/xfce-filemanager-settings.desktop
+share/icons/hicolor/48x48/stock/generic/xfdiff.png
+share/icons/hicolor/48x48/stock/generic/xffm_icon.xpm
+share/icons/hicolor/48x48/stock/generic/ubu_head.jpg
+share/icons/hicolor/48x48/stock/generic/comp1.xpm
+share/icons/hicolor/48x48/stock/generic/new_win.xpm
+share/icons/hicolor/48x48/stock/generic/b-book-open.png
+share/icons/hicolor/48x48/stock/generic/b-book-closed.png
+share/icons/hicolor/48x48/stock/generic/b-home.png
+share/icons/hicolor/48x48/stock/generic/b-find.png
+share/icons/hicolor/48x48/stock/generic/b-frequent.png
+share/icons/hicolor/48x48/stock/generic/b-fstab.png
+share/icons/hicolor/48x48/stock/generic/b-network.png
+share/icons/hicolor/48x48/stock/generic/b-recent.png
+share/icons/hicolor/48x48/stock/generic/b-trash.png
+share/icons/hicolor/48x48/stock/generic/b-xffm_icon.png
+share/icons/hicolor/48x48/stock/generic/c-gid.png
+share/icons/hicolor/48x48/stock/generic/c-mode.png
+share/icons/hicolor/48x48/stock/generic/c-name.png
+share/icons/hicolor/48x48/stock/generic/c-size.png
+share/icons/hicolor/48x48/stock/generic/c-time.png
+share/icons/hicolor/48x48/stock/generic/c-uid.png
+share/icons/hicolor/48x48/stock/generic/d-application.png
+share/icons/hicolor/48x48/stock/generic/d-audio.png
+share/icons/hicolor/48x48/stock/generic/d-bomb.png
+share/icons/hicolor/48x48/stock/generic/d-exec.png
+share/icons/hicolor/48x48/stock/generic/d-file.png
+share/icons/hicolor/48x48/stock/generic/d-help.png
+share/icons/hicolor/48x48/stock/generic/d-image.png
+share/icons/hicolor/48x48/stock/generic/d-message.png
+share/icons/hicolor/48x48/stock/generic/d-model.png
+share/icons/hicolor/48x48/stock/generic/d-multipart.png
+share/icons/hicolor/48x48/stock/generic/d-no-access.png
+share/icons/hicolor/48x48/stock/generic/d-pirate.png
+share/icons/hicolor/48x48/stock/generic/d-symlink-broken.png
+share/icons/hicolor/48x48/stock/generic/d-symlink.png
+share/icons/hicolor/48x48/stock/generic/d-txt.png
+share/icons/hicolor/48x48/stock/generic/d-video.png
+share/icons/hicolor/48x48/stock/generic/d-waste_basket_empty.png
+share/icons/hicolor/48x48/stock/generic/d-waste_basket_full.png
+share/icons/hicolor/48x48/stock/generic/d-xfce.png
+share/icons/hicolor/48x48/stock/generic/dir-open.png
+share/icons/hicolor/48x48/stock/generic/dir-closed.png
+share/icons/hicolor/48x48/stock/generic/f-cdrom.png
+share/icons/hicolor/48x48/stock/generic/f-disk.png
+share/icons/hicolor/48x48/stock/generic/f-dvd.png
+share/icons/hicolor/48x48/stock/generic/f-floppy.png
+share/icons/hicolor/48x48/stock/generic/f-memory.png
+share/icons/hicolor/48x48/stock/generic/f-netdisk.png
+share/icons/hicolor/48x48/stock/generic/go-back.png
+share/icons/hicolor/48x48/stock/generic/go-forward.png
+share/icons/hicolor/48x48/stock/generic/go-home.png
+share/icons/hicolor/48x48/stock/generic/go-jump.png
+share/icons/hicolor/48x48/stock/generic/go-start.png
+share/icons/hicolor/48x48/stock/generic/go-up.png
+share/icons/hicolor/48x48/stock/generic/downarrow.png
+share/icons/hicolor/48x48/stock/generic/t-preferences.png
+share/icons/hicolor/48x48/stock/generic/t-xfmime-edit.png
+share/icons/hicolor/48x48/stock/generic/t-exec.png
+share/icons/hicolor/48x48/stock/generic/t-find.png
+share/icons/hicolor/48x48/stock/generic/t-new-directory.png
+share/icons/hicolor/48x48/stock/generic/t-new-file.png
+share/icons/hicolor/48x48/stock/generic/t-quit.png
+share/icons/hicolor/48x48/stock/generic/t-reload.png
+share/icons/hicolor/48x48/stock/generic/t-terminal.png
+share/icons/hicolor/48x48/stock/generic/t-xfce-setting-show.png
+share/icons/hicolor/48x48/stock/generic/a-apply.png
+share/icons/hicolor/48x48/stock/generic/t-xfdiff.png
+share/icons/hicolor/48x48/stock/generic/t-zoom-in.png
+share/icons/hicolor/48x48/stock/generic/t-zoom-out.png
+share/icons/hicolor/48x48/stock/generic/t-zoom-view.png
+share/icons/hicolor/48x48/stock/generic/a-info.png
+share/icons/hicolor/48x48/stock/generic/a-pause.png
+share/icons/hicolor/48x48/stock/generic/a-question.png
+share/icons/hicolor/48x48/stock/generic/a-stop.png
+share/icons/hicolor/48x48/stock/generic/a-clear.png
+share/icons/hicolor/48x48/stock/generic/a-next.png
+share/icons/hicolor/48x48/stock/generic/a-prev.png
+share/icons/hicolor/48x48/stock/generic/a-quit.png
+share/icons/hicolor/48x48/stock/generic/a-refresh.png
+share/icons/hicolor/48x48/stock/generic/a-open.png
+share/icons/hicolor/48x48/stock/generic/a-convert.png
+share/icons/hicolor/48x48/stock/generic/p-unknown.png
+share/icons/hicolor/48x48/stock/generic/p-edit.png
+share/icons/hicolor/48x48/stock/generic/p-file1.png
+share/icons/hicolor/48x48/stock/generic/p-file2.png
+share/icons/hicolor/48x48/stock/generic/p-games.png
+share/icons/hicolor/48x48/stock/generic/p-man.png
+share/icons/hicolor/48x48/stock/generic/p-multimedia.png
+share/icons/hicolor/48x48/stock/generic/p-network.png
+share/icons/hicolor/48x48/stock/generic/p-paint.png
+share/icons/hicolor/48x48/stock/generic/p-print.png
+share/icons/hicolor/48x48/stock/generic/p-schedule.png
+share/icons/hicolor/48x48/stock/generic/p-sound.png
+share/icons/hicolor/48x48/stock/generic/p-terminal.png
+share/icons/hicolor/48x48/stock/generic/p-newmail.png
+share/icons/hicolor/48x48/stock/generic/p-nomail.png
+share/icons/hicolor/48x48/stock/generic/p-oldmail.png
+share/icons/hicolor/48x48/stock/generic/t-pastelink.png
 share/locale/ar/LC_MESSAGES/xffm.mo
 share/locale/az/LC_MESSAGES/xffm.mo
 share/locale/bg/LC_MESSAGES/xffm.mo
 share/locale/ca/LC_MESSAGES/xffm.mo
 share/locale/cs/LC_MESSAGES/xffm.mo
 share/locale/de/LC_MESSAGES/xffm.mo
+share/locale/en_GB/LC_MESSAGES/xffm.mo
 share/locale/es/LC_MESSAGES/xffm.mo
 share/locale/es_MX/LC_MESSAGES/xffm.mo
 share/locale/et/LC_MESSAGES/xffm.mo
 share/locale/eu/LC_MESSAGES/xffm.mo
-share/locale/fa_IR/LC_MESSAGES/xffm.mo
+share/locale/fa/LC_MESSAGES/xffm.mo
+share/locale/fi/LC_MESSAGES/xffm.mo
 share/locale/fr/LC_MESSAGES/xffm.mo
+share/locale/gu/LC_MESSAGES/xffm.mo
+share/locale/he/LC_MESSAGES/xffm.mo
 share/locale/hi/LC_MESSAGES/xffm.mo
 share/locale/hu/LC_MESSAGES/xffm.mo
 share/locale/it/LC_MESSAGES/xffm.mo
 share/locale/ja/LC_MESSAGES/xffm.mo
+share/locale/ko/LC_MESSAGES/xffm.mo
 share/locale/lt/LC_MESSAGES/xffm.mo
 share/locale/ms/LC_MESSAGES/xffm.mo
+share/locale/nb_NO/LC_MESSAGES/xffm.mo
 share/locale/nl/LC_MESSAGES/xffm.mo
-share/locale/no/LC_MESSAGES/xffm.mo
+share/locale/pa/LC_MESSAGES/xffm.mo
 share/locale/pl/LC_MESSAGES/xffm.mo
 share/locale/pt_BR/LC_MESSAGES/xffm.mo
 share/locale/pt_PT/LC_MESSAGES/xffm.mo
+share/locale/sk/LC_MESSAGES/xffm.mo
 share/locale/sv/LC_MESSAGES/xffm.mo
 share/locale/ta/LC_MESSAGES/xffm.mo
 share/locale/tr/LC_MESSAGES/xffm.mo
@@ -72,114 +203,54 @@ share/locale/uk/LC_MESSAGES/xffm.mo
 share/locale/vi/LC_MESSAGES/xffm.mo
 share/locale/zh_CN/LC_MESSAGES/xffm.mo
 share/locale/zh_TW/LC_MESSAGES/xffm.mo
+share/xfce4/doc/C/images/book_popup.png
+share/xfce4/doc/C/images/column_titles_popup.png
+share/xfce4/doc/C/images/diagnostics_window.png
+share/xfce4/doc/C/images/directory_popup.png
+share/xfce4/doc/C/images/directory_popup_unmount.png
+share/xfce4/doc/C/images/file_popup.png
+share/xfce4/doc/C/images/file_subpopup.png
+share/xfce4/doc/C/images/filter_box.png
+share/xfce4/doc/C/images/frequent_popup.png
+share/xfce4/doc/C/images/fstab_popup_mount.png
+share/xfce4/doc/C/images/fstab_popup_unmount.png
+share/xfce4/doc/C/images/go_menu.png
+share/xfce4/doc/C/images/hide_show_buttons.png
+share/xfce4/doc/C/images/icon_title_smartbutton.png
+share/xfce4/doc/C/images/main_menu.png
+share/xfce4/doc/C/images/mcs-plugin.png
+share/xfce4/doc/C/images/netfile_popup.png
+share/xfce4/doc/C/images/netshare_popup.png
+share/xfce4/doc/C/images/open_menu.png
+share/xfce4/doc/C/images/options_menu.png
+share/xfce4/doc/C/images/preferences_menu.png
+share/xfce4/doc/C/images/recent_popup.png
+share/xfce4/doc/C/images/sidebar_filesubmenu.png
+share/xfce4/doc/C/images/sidebar_go.png
+share/xfce4/doc/C/images/sidebar_multiple_select.png
+share/xfce4/doc/C/images/sidebar_open.png
+share/xfce4/doc/C/images/sidebar_options.png
+share/xfce4/doc/C/images/sidebar_paste.png
+share/xfce4/doc/C/images/sidebar_tools.png
+share/xfce4/doc/C/images/sort_subpopup.png
+share/xfce4/doc/C/images/t_main_menu.png
+share/xfce4/doc/C/images/tools_menu.png
+share/xfce4/doc/C/images/trash_popup.png
+share/xfce4/doc/C/images/xffm_default.png
 share/xfce4/doc/C/xffm.html
-share/xfce4/doc/fr/xffm.html
+share/xfce4/xffm/AUTHORS
-share/xffm/AUTHORS
+share/xfce4/xffm/AUTHORS.vi
-share/xffm/applications.xml
+share/xfce4/xffm/xffm.spec
-share/xffm/pixmaps/comp1.xpm
+share/xfce4/xffm/xffm.spec.in
-share/xffm/pixmaps/empty.xpm
+@dirrm lib/xfce4/xffm
-share/xffm/pixmaps/network-36.png
-share/xffm/pixmaps/network-8.png
-share/xffm/pixmaps/network.png
-share/xffm/pixmaps/new_win.xpm
-share/xffm/pixmaps/terminal-12.png
-share/xffm/pixmaps/terminal-24.png
-share/xffm/pixmaps/terminal.png
-share/xffm/pixmaps/types.xml
-share/xffm/pixmaps/ubu_head.jpg
-share/xffm/pixmaps/waste_basket_empty.png
-share/xffm/pixmaps/waste_basket_full.png
-share/xffm/pixmaps/xfdiff-24.png
-share/xffm/pixmaps/xfdiff.png
-share/xffm/pixmaps/xffm_icon-12.png
-share/xffm/pixmaps/xffm_icon-24.png
-share/xffm/pixmaps/xffm_icon-36.png
-share/xffm/pixmaps/xffm_icon.png
-share/xffm/pixmaps/xffm_icon.xpm
-share/xffm/pixmaps/no_icons/mime.xml
-share/xffm/pixmaps/plain/3floppy_mount.png
-share/xffm/pixmaps/plain/3floppy_unmount.png
-share/xffm/pixmaps/plain/Jrecycle.png
-share/xffm/pixmaps/plain/Jxlock.png
-share/xffm/pixmaps/plain/Monitor.png
-share/xffm/pixmaps/plain/applications_package.png
-share/xffm/pixmaps/plain/arrows2.png
-share/xffm/pixmaps/plain/arrup2.png
-share/xffm/pixmaps/plain/background.png
-share/xffm/pixmaps/plain/binary.png
-share/xffm/pixmaps/plain/blockdevice.png
-share/xffm/pixmaps/plain/bomb.png
-share/xffm/pixmaps/plain/c_src.png
-share/xffm/pixmaps/plain/cdrom_mount.png
-share/xffm/pixmaps/plain/cdrom_unmount.png
-share/xffm/pixmaps/plain/chardevice.png
-share/xffm/pixmaps/plain/clamp.png
-share/xffm/pixmaps/plain/core.png
-share/xffm/pixmaps/plain/document.png
-share/xffm/pixmaps/plain/dvi.png
-share/xffm/pixmaps/plain/eps.png
-share/xffm/pixmaps/plain/exec.png
-share/xffm/pixmaps/plain/f_src.png
-share/xffm/pixmaps/plain/folder.png
-share/xffm/pixmaps/plain/folder_green_open.png
-share/xffm/pixmaps/plain/folder_grey_open.png
-share/xffm/pixmaps/plain/folder_locked.png
-share/xffm/pixmaps/plain/folder_open.png
-share/xffm/pixmaps/plain/folder_red.png
-share/xffm/pixmaps/plain/folder_violet.png
-share/xffm/pixmaps/plain/folder_violet_open.png
-share/xffm/pixmaps/plain/folder_zap.png
-share/xffm/pixmaps/plain/graphs.png
-share/xffm/pixmaps/plain/h_src.png
-share/xffm/pixmaps/plain/harddrive_mount.png
-share/xffm/pixmaps/plain/harddrive_unmount.png
-share/xffm/pixmaps/plain/html.png
-share/xffm/pixmaps/plain/image.png
-share/xffm/pixmaps/plain/info.png
-share/xffm/pixmaps/plain/java_src.png
-share/xffm/pixmaps/plain/karm.png
-share/xffm/pixmaps/plain/kcmpci.png
-share/xffm/pixmaps/plain/kcmprocessor.png
-share/xffm/pixmaps/plain/kcmprocessor_mount.png
-share/xffm/pixmaps/plain/kfm.png
-share/xffm/pixmaps/plain/kfm_fulltrash.png
-share/xffm/pixmaps/plain/kfm_trash.png
-share/xffm/pixmaps/plain/knu.png
-share/xffm/pixmaps/plain/konsole.png
-share/xffm/pixmaps/plain/korn.png
-share/xffm/pixmaps/plain/library.png
-share/xffm/pixmaps/plain/locked_file.png
-share/xffm/pixmaps/plain/mag_glass.png
-share/xffm/pixmaps/plain/make.png
-share/xffm/pixmaps/plain/man.png
-share/xffm/pixmaps/plain/mime.xml
-share/xffm/pixmaps/plain/misc.png
-share/xffm/pixmaps/plain/moc_src.png
-share/xffm/pixmaps/plain/network.png
-share/xffm/pixmaps/plain/o_src.png
-share/xffm/pixmaps/plain/pdf.png
-share/xffm/pixmaps/plain/perl.png
-share/xffm/pixmaps/plain/pipe.png
-share/xffm/pixmaps/plain/postscript.png
-share/xffm/pixmaps/plain/printer.png
-share/xffm/pixmaps/plain/resource.png
-share/xffm/pixmaps/plain/socket.png
-share/xffm/pixmaps/plain/sound.png
-share/xffm/pixmaps/plain/tex.png
-share/xffm/pixmaps/plain/text.png
-share/xffm/pixmaps/plain/unknown.png
-share/xffm/pixmaps/plain/utilities_package.png
-share/xffm/pixmaps/plain/video.png
-share/xffm/pixmaps/plain/xman.png
-share/xffm/pixmaps/plain/xpaint.png
 @unexec rmdir %D/lib/xfce4/mcs-plugins 2>/dev/null || true
 @unexec rmdir %D/lib/xfce4 2>/dev/null || true
 @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 2>/dev/null || true
+@unexec rmdir %D/share/xfce4/doc/it 2>/dev/null || true
 @unexec rmdir %D/share/xfce4/doc 2>/dev/null || true
+@unexec rmdir %D/share/xfce4/mime 2>/dev/null || true
+@dirrm share/xfce4/xffm
 @unexec rmdir %D/share/xfce4 2>/dev/null || true
-@dirrm share/xffm/pixmaps/no_icons
-@dirrm share/xffm/pixmaps/plain
-@unexec rmdir %D/share/xffm/pixmaps 2>/dev/null || true
-@unexec rmdir %D/share/xffm 2>/dev/null || true

x11-themes/gtk-xfce-engine/Makefile

@@ -6,16 +6,16 @@
 #
 
 PORTNAME=	gtk-xfce-engine
-PORTVERSION=	2.1.10
+PORTVERSION=	2.2.5
-PORTREVISION=	1
+PORTREVISION=	0
 CATEGORIES=	x11-themes xfce
-MASTER_SITES=	ftp://ftp.berlios.de/pub/xfce-goodies/4.0.6/ \
+MASTER_SITES=	http://www.us.xfce.org/archive/xfce-4.2.0/src/ \
-		http://hannelore.f1.fhtw-berlin.de/mirrors/xfce4/xfce-4.0.6/src/
+		http://spuriousinterrupt.org/projects/xfce4/files/mirror/xfce-4.2.0/ \
+		http://public.fh-wolfenbuettel.de/~luedickj/xfce4/xfce-4.2.0/
 
 MAINTAINER=	oliver@FreeBSD.org
 COMMENT=	An XFCE engine for GTK 2.0
 
-USE_GMAKE=	yes
 USE_GNOME=	gnomehack gtk20
 USE_LIBTOOL_VER=15
 USE_X_PREFIX=	yes

x11-themes/gtk-xfce-engine/distinfo

@@ -1,2 +1,2 @@
-MD5 (gtk-xfce-engine-2.1.10.tar.gz) = 116f33de9083a2c38b0943e5591baecb
+MD5 (gtk-xfce-engine-2.2.5.tar.gz) = 526cf8de2a2ed32e622add442cb2aefb
-SIZE(gtk-xfce-engine-2.1.10.tar.gz) = 352524
+SIZE(gtk-xfce-engine-2.2.5.tar.gz) = 373900

x11-themes/gtk-xfce-engine/pkg-plist

@@ -1,13 +1,22 @@
 lib/gtk-2.0/2.4.0/engines/libxfce.so
+share/themes/Xfce-4.0/gtk-2.0/gtkrc
+share/themes/Xfce-4.0/ICON.png
+share/themes/Xfce-4.0/README.html
 share/themes/Xfce-b5/ICON.png
 share/themes/Xfce-b5/README.html
 share/themes/Xfce-b5/gtk-2.0/gtkrc
 share/themes/Xfce-basic/ICON.png
 share/themes/Xfce-basic/README.html
 share/themes/Xfce-basic/gtk-2.0/gtkrc
+share/themes/Xfce-cadmium/gtk-2.0/gtkrc
+share/themes/Xfce-cadmium/ICON.png
+share/themes/Xfce-cadmium/README.html
 share/themes/Xfce-curve/ICON.png
 share/themes/Xfce-curve/README.html
 share/themes/Xfce-curve/gtk-2.0/gtkrc
+share/themes/Xfce-dawn/gtk-2.0/gtkrc
+share/themes/Xfce-dawn/ICON.png
+share/themes/Xfce-dawn/README.html
 share/themes/Xfce-kde2/ICON.png
 share/themes/Xfce-kde2/README.html
 share/themes/Xfce-kde2/gtk-2.0/gtkrc
@@ -35,7 +44,14 @@ share/themes/Xfce-winter/README.html
 share/themes/Xfce/ICON.png
 share/themes/Xfce/README.html
 share/themes/Xfce/gtk-2.0/gtkrc
+@dirrm share/themes/Xfce-4.0/gtk-2.0
+@dirrm share/themes/Xfce-4.0
 @dirrm share/themes/Xfce/gtk-2.0
+@unexec rmdir %D/share/themes/Xfce 2>/dev/null || true
+@dirrm share/themes/Xfce-cadmium/gtk-2.0
+@dirrm share/themes/Xfce-cadmium
+@dirrm share/themes/Xfce-dawn/gtk-2.0
+@dirrm share/themes/Xfce-dawn
 @dirrm share/themes/Xfce-winter/gtk-2.0
 @dirrm share/themes/Xfce-winter
 @dirrm share/themes/Xfce-stellar/gtk-2.0
@@ -58,5 +74,4 @@ share/themes/Xfce/gtk-2.0/gtkrc
 @dirrm share/themes/Xfce-basic
 @dirrm share/themes/Xfce-b5/gtk-2.0
 @dirrm share/themes/Xfce-b5
-@dirrm share/themes/Xfce
 @unexec rmdir %D/lib/gtk-2.0/2.4.0/engines 2>/dev/null || true

x11-toolkits/libxfce4gui/Makefile

@@ -6,27 +6,36 @@
 #
 
 PORTNAME=	libxfce4gui
-PORTVERSION=	4.0.6
+PORTVERSION=	4.2.0
-PORTREVISION=	1
+PORTREVISION=	0
 CATEGORIES=	x11-toolkits xfce
-MASTER_SITES=	ftp://ftp.berlios.de/pub/xfce-goodies/${PORTVERSION}/ \
+MASTER_SITES=	http://www.us.xfce.org/archive/xfce-${PORTVERSION}/src/ \
-		http://hannelore.f1.fhtw-berlin.de/mirrors/xfce4/xfce-${PORTVERSION}/src/
+		http://spuriousinterrupt.org/projects/xfce4/files/mirror/xfce-${PORTVERSION}/ \
+		http://public.fh-wolfenbuettel.de/~luedickj/xfce4/xfce-${PORTVERSION}/
 DISTNAME=	libxfcegui4-${PORTVERSION}
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	oliver@FreeBSD.org
 COMMENT=	XFce 4 widget library required by xfce4 and xfwm4
 
-LIB_DEPENDS=	xfce4util.1:${PORTSDIR}/x11/libxfce4util
+LIB_DEPENDS=	dbh-1.0.1:${PORTSDIR}/databases/dbh \
+		xfce4util.1:${PORTSDIR}/x11/libxfce4util
 
 USE_GNOME=	gtk20
 USE_REINPLACE=	yes
 USE_X_PREFIX=	yes
-USE_INC_LIBTOOL_VER=15
+USE_LIBTOOL_VER=15
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--enable-xinerama
 INSTALLS_SHLIB=	yes
 
+.if defined(WITH_GTKDOC)
+BUILD_DEPENDS+=	gtkdocize:${PORTSDIR}/textproc/gtk-doc
+CONFIGURE_ARGS+=--enable-gtk-doc
+.else
+CONFIGURE_ARGS+=--disable-gtk-doc
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|$$(libdir)/pkgconfig|${PREFIX}/libdata/pkgconfig|g' \
 		${WRKSRC}/libxfcegui4/Makefile.in

x11-toolkits/libxfce4gui/distinfo

@@ -1,2 +1,2 @@
-MD5 (xfce4/libxfcegui4-4.0.6.tar.gz) = e6b5ebef17fc990e6f7af0684c70d00d
+MD5 (xfce4/libxfcegui4-4.2.0.tar.gz) = dc81bd65d4df9f99953c63ead67a316e
-SIZE(xfce4/libxfcegui4-4.0.6.tar.gz) = 443253
+SIZE(xfce4/libxfcegui4-4.2.0.tar.gz) = 827660

x11-toolkits/libxfce4gui/pkg-plist

@@ -4,6 +4,7 @@ include/xfce4/libxfcegui4/gtktoxevent.h
 include/xfce4/libxfcegui4/icons.h
 include/xfce4/libxfcegui4/libnetk.h
 include/xfce4/libxfcegui4/libxfcegui4.h
+include/xfce4/libxfcegui4/libxfcegui4-config.h
 include/xfce4/libxfcegui4/netk-application.h
 include/xfce4/libxfcegui4/netk-enum-types.h
 include/xfce4/libxfcegui4/netk-marshal.h
@@ -17,6 +18,7 @@ include/xfce4/libxfcegui4/netk-window.h
 include/xfce4/libxfcegui4/netk-workspace.h
 include/xfce4/libxfcegui4/preview_filesel.h
 include/xfce4/libxfcegui4/session-client.h
+include/xfce4/libxfcegui4/xfce_aboutdialog.h
 include/xfce4/libxfcegui4/xfce_clock.h
 include/xfce4/libxfcegui4/xfce_decorbutton.h
 include/xfce4/libxfcegui4/xfce_decortoggle.h
@@ -28,12 +30,69 @@ include/xfce4/libxfcegui4/xfce_movehandler.h
 include/xfce4/libxfcegui4/xfce_scaled_image.h
 include/xfce4/libxfcegui4/xfce_systemtray.h
 include/xfce4/libxfcegui4/xfce_togglebutton.h
+include/xfce4/libxfcegui4/xfce-appmenuitem.h
+include/xfce4/libxfcegui4/xfce-colorbutton.h
+include/xfce4/libxfcegui4/xfce-exec.h
+include/xfce4/libxfcegui4/xfce-filechooser.h
+include/xfce4/libxfcegui4/xfce-gdk-extensions.h
+include/xfce4/libxfcegui4/xfce-gtk-extensions.h
+include/xfce4/libxfcegui4/xfce-icontheme.h
+include/xfce4/libxfcegui4/netk-class-group.h
+include/xfce4/libxfcegui4/netk-window-action-menu.h
 include/xfce4/libxfcegui4/xinerama.h
+include/xfce4/xfce4-modules/constants.h
+include/xfce4/xfce4-modules/mime_icons.h
+include/xfce4/xfce4-modules/combo.h
+include/xfce4/xfce4-modules/mime.h
 lib/libxfcegui4.a
-lib/libxfcegui4.la
 lib/libxfcegui4.so
-lib/libxfcegui4.so.1
+lib/libxfcegui4.so.3
+lib/xfce4/modules/libxfce4_combo.so.0
+lib/xfce4/modules/libxfce4_combo.so
+lib/xfce4/modules/libxfce4_combo.a
+lib/xfce4/modules/libxfce4_mime.so.0
+lib/xfce4/modules/libxfce4_mime.so
+lib/xfce4/modules/libxfce4_mime_icons.so.0
+lib/xfce4/modules/libxfce4_mime_icons.so
+lib/xfce4/modules/libxfce4_mime_icons.a
 libdata/pkgconfig/libxfcegui4-1.0.pc
+share/xfce4/mime/applications.xml
+share/xfce4/mime/freedesktop.org.xml
+share/xfce4/mime/gnome.mime.xml
+share/xfce4/mime/hicolor.mime.xml
+share/xfce4/mime/types.xml
+share/xfce4/mime/xfce.org.xml
+share/xfce4/xfce-svg-test.svg
+share/gtk-doc/html/libxfcegui4/XfceAboutDialog.html
+share/gtk-doc/html/libxfcegui4/XfceAppMenuItem.html
+share/gtk-doc/html/libxfcegui4/XfceFramebox.html
+share/gtk-doc/html/libxfcegui4/XfceIconTheme.html
+share/gtk-doc/html/libxfcegui4/home.png
+share/gtk-doc/html/libxfcegui4/index.html
+share/gtk-doc/html/libxfcegui4/index.sgml
+share/gtk-doc/html/libxfcegui4/left.png
+share/gtk-doc/html/libxfcegui4/libxfcegui4-Standard-Macros.html
+share/gtk-doc/html/libxfcegui4/libxfcegui4-Xfce-Gdk-extensions.html
+share/gtk-doc/html/libxfcegui4/libxfcegui4-Xfce-Gtk+-extensions.html
+share/gtk-doc/html/libxfcegui4/libxfcegui4-XfceFileChooser.html
+share/gtk-doc/html/libxfcegui4/libxfcegui4-core.html
+share/gtk-doc/html/libxfcegui4/libxfcegui4-dialogs.html
+share/gtk-doc/html/libxfcegui4/libxfcegui4-netk.html
+share/gtk-doc/html/libxfcegui4/libxfcegui4-fundamentals.html
+share/gtk-doc/html/libxfcegui4/libxfcegui4-xfce-exec.html
+share/gtk-doc/html/libxfcegui4/libxfcegui4.devhelp
+share/gtk-doc/html/libxfcegui4/reference.html
+share/gtk-doc/html/libxfcegui4/right.png
+share/gtk-doc/html/libxfcegui4/up.png
+share/xfce4/hicolor-index.theme
 @dirrm include/xfce4/libxfcegui4
+@unexec rmdir %D/include/xfce4/xfce4-modules 2>/dev/null || true
 @unexec rmdir %D/include/xfce4 2>/dev/null || true
+@unexec rmdir %D/lib/xfce4/modules 2>/dev/null || true
+@unexec rmdir %D/lib/xfce4 2>/dev/null || true
 @unexec rmdir %D/libdata/pkgconfig 2>/dev/null || true
+@unexec rmdir %D/share/xfce4/mime 2>/dev/null || true
+@unexec rmdir %D/share/xfce4 2>/dev/null || true
+@dirrm share/gtk-doc/html/libxfcegui4
+@unexec rmdir %D/share/gtk-doc/html 2>/dev/null || true
+@unexec rmdir %D/share/gtk-doc 2>/dev/null || true

x11-wm/xfce4-desktop/Makefile

@@ -6,11 +6,12 @@
 #
 
 PORTNAME=	xfce4-desktop
-PORTVERSION=	4.0.6
+PORTVERSION=	4.2.0
-PORTREVISION=	1
+PORTREVISION=	0
 CATEGORIES=	x11-wm xfce
-MASTER_SITES=	ftp://ftp.berlios.de/pub/xfce-goodies/${PORTVERSION}/ \
+MASTER_SITES=	http://www.us.xfce.org/archive/xfce-${PORTVERSION}/src/ \
-		http://hannelore.f1.fhtw-berlin.de/mirrors/xfce4/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>

x11-wm/xfce4-desktop/distinfo

@@ -1,2 +1,2 @@
-MD5 (xfce4/xfdesktop-4.0.6.tar.gz) = 8f7a87ada82eaa60fb37998553787002
+MD5 (xfce4/xfdesktop-4.2.0.tar.gz) = 1cacd48e0ab475f4fd55d79020d60c55
-SIZE(xfce4/xfdesktop-4.0.6.tar.gz) = 2134301
+SIZE(xfce4/xfdesktop-4.2.0.tar.gz) = 2593021

x11-wm/xfce4-desktop/pkg-plist

@@ -1,36 +1,63 @@
+bin/xfce4-menueditor
 bin/xfdesktop
-etc/xfce4/menu.xml
+etc/xdg/xfce4/desktop/xfce-registered-categories.xml
-etc/xfce4/menu.xml.az
+etc/xdg/xfce4/desktop/xfce-registered-categories.xml.nl
-etc/xfce4/menu.xml.ca
+etc/xdg/xfce4/desktop/xfce-registered-categories.xml.pt_BR
-etc/xfce4/menu.xml.de
+etc/xdg/xfce4/desktop/xfce-registered-categories.xml.ro
-etc/xfce4/menu.xml.fr
+etc/xdg/xfce4/desktop/xfce-registered-categories.xml.ru
-etc/xfce4/menu.xml.hu
+etc/xdg/xfce4/desktop/xfce-registered-categories.xml.zh_TW
-etc/xfce4/menu.xml.it
+etc/xdg/xfce4/desktop/menu.xml
-etc/xfce4/menu.xml.nl
+etc/xdg/xfce4/desktop/menu.xml.az
-etc/xfce4/menu.xml.ta
+etc/xdg/xfce4/desktop/menu.xml.ca
-etc/xfce4/menu.xml.tr
+etc/xdg/xfce4/desktop/menu.xml.de
-etc/xfce4/menu.xml.vi
+etc/xdg/xfce4/desktop/menu.xml.es
-etc/xfce4/menu.xml.zh_CN
+etc/xdg/xfce4/desktop/menu.xml.eu
-etc/xfce4/menu.xml.zh_TW
+etc/xdg/xfce4/desktop/menu.xml.et
-lib/xfce4/mcs-plugins/backdrop_settings.a
+etc/xdg/xfce4/desktop/menu.xml.fa_IR
-lib/xfce4/mcs-plugins/backdrop_settings.la
+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/modules/xfce4_desktop_menu.so
-lib/xfce4/mcs-plugins/workspaces_settings.la
+lib/xfce4/panel-plugins/libdesktopmenu.so
-lib/xfce4/mcs-plugins/workspaces_settings.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

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

x11-wm/xfce4-panel/Makefile

@@ -6,11 +6,12 @@
 #
 
 PORTNAME=	xfce4-panel
-PORTVERSION=	4.0.6
+PORTVERSION=	4.2.0
-PORTREVISION=	1
+PORTREVISION=	0
 CATEGORIES=	x11-wm xfce
-MASTER_SITES=	ftp://ftp.berlios.de/pub/xfce-goodies/${PORTVERSION}/ \
+MASTER_SITES=	http://www.us.xfce.org/archive/xfce-${PORTVERSION}/src/ \
-		http://hannelore.f1.fhtw-berlin.de/mirrors/xfce4/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 \

x11-wm/xfce4-panel/distinfo

@@ -1,2 +1,2 @@
-MD5 (xfce4/xfce4-panel-4.0.6.tar.gz) = c93c010195a8e5fc04bc1295418acbb4
+MD5 (xfce4/xfce4-panel-4.2.0.tar.gz) = 92a3ccf964939034b786917a69cd0ba6
-SIZE(xfce4/xfce4-panel-4.0.6.tar.gz) = 1277648
+SIZE(xfce4/xfce4-panel-4.2.0.tar.gz) = 871179

x11-wm/xfce4-panel/pkg-plist

@@ -1,13 +1,24 @@
 bin/xfce4-panel
-etc/xfce4/xfce4rc
+etc/xdg/xfce4/panel/contents.xml
-etc/xfce4/xfce4rc.ar
+etc/xdg/xfce4/panel/contents.xml.ar
-etc/xfce4/xfce4rc.az
+etc/xdg/xfce4/panel/contents.xml.az
-etc/xfce4/xfce4rc.ca
+etc/xdg/xfce4/panel/contents.xml.ca
-etc/xfce4/xfce4rc.fr
+etc/xdg/xfce4/panel/contents.xml.eu
-etc/xfce4/xfce4rc.hu
+etc/xdg/xfce4/panel/contents.xml.fr
-etc/xfce4/xfce4rc.it
+etc/xdg/xfce4/panel/contents.xml.he
-etc/xfce4/xfce4rc.nl
+etc/xdg/xfce4/panel/contents.xml.hu
-etc/xfce4/xfce4rc.vi
+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

x11-wm/xfce4-session/Makefile

@@ -6,37 +6,27 @@
 #
 
 PORTNAME=	xfce4-session
-PORTVERSION=	0.1.4
+PORTVERSION=	4.2.0
-PORTREVISION=	5
+PORTREVISION=	0
 CATEGORIES=	x11-wm xfce
-MASTER_SITES=	http://echobase.homeunix.net/~bmeurer/tmp/xfce4-session/ \
+MASTER_SITES=	http://www.us.xfce.org/archive/xfce-${PORTVERSION}/src/ \
-		http://matt.nerim.net/xfce-goodies/
+		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
+MAINTAINER=	oliver@FreeBSD.org
-COMMENT=	XFce 4 Session Manager
+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
+GNU_CONFIGURE=	yes
-INSTALLS_SHLIB=	yes
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ENV=	CFLAGS=-I${LOCALBASE}/include \
+USE_LIBTOOL_VER=15
-		CPPFLAGS=-I${LOCALBASE}/include \
+INSTALLS_SHLIB= yes
-		LIBS=-L${LOCALBASE}/lib
 
-MAN1=		xfce4-session.1 xfce4-shutdown.1
+MAN1=		xfce4-session.1 xfce4-session-logout.1
-
-DOCS=		AUTHORS NEWS README TODO
-
-.if !defined(NOPORTDOCS)
-post-install:
-	@${MKDIR} ${DOCSDIR}
-	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}
-.endif
 
 .include <bsd.port.mk>

x11-wm/xfce4-session/distinfo

@@ -1,2 +1,2 @@
-MD5 (xfce4/xfce4-session-0.1.4.tar.gz) = 61996fc8a1388b228417d810ae9cf28e
+MD5 (xfce4/xfce4-session-4.2.0.tar.gz) = a24ed5b766f022a6f9f013a3f468c2ec
-SIZE (xfce4/xfce4-session-0.1.4.tar.gz) = 682321
+SIZE(xfce4/xfce4-session-4.2.0.tar.gz) = 1306201

x11-wm/xfce4-session/files/patch-shutdown.c

@@ -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 */

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://www.xfce4.org/
-WWW:	http://echobase.homeunix.net/~bmeurer/tmp/xfce4-session/

x11-wm/xfce4-session/pkg-plist

@@ -1,36 +1,46 @@
-@comment $FreeBSD$
 bin/xfce4-session
-sbin/xfce4-shutdown
+bin/xfce4-session-logout
-etc/xfce4/default.session
+etc/xdg/xfce4-session/xfce4-session.rc
-etc/xfce4/shutdown.allow
+include/xfce4/xfce4-session-4.2/libxfsm/xfsm-splash-engine.h
-etc/xfce4/xinitrc.xfce4-session
+include/xfce4/xfce4-session-4.2/libxfsm/xfsm-splash-rc.h
-lib/xfce4/mcs-plugins/session_settings.la
+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
+lib/xfce4/mcs-plugins/splash_settings.so
-%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+lib/xfce4/splash/engines/libbalou.so
-%%PORTDOCS%%%%DOCSDIR%%/NEWS
+lib/xfce4/splash/engines/libmice.so
-%%PORTDOCS%%%%DOCSDIR%%/README
+lib/xfce4/splash/engines/libsimple.so
-%%PORTDOCS%%%%DOCSDIR%%/TODO
+lib/pkgconfig/xfce4-session-1.0.pc
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
+libexec/balou-export-theme
-share/locale/az/LC_MESSAGES/xfce4-session.mo
+libexec/balou-install-theme
-share/locale/ca/LC_MESSAGES/xfce4-session.mo
+libexec/xfsm-shutdown-helper
-share/locale/de/LC_MESSAGES/xfce4-session.mo
+share/xfce4/doc/C/images/xfsm-advanced.png
-share/locale/es/LC_MESSAGES/xfce4-session.mo
+share/xfce4/doc/C/images/xfsm-general.png
-share/locale/es_MX/LC_MESSAGES/xfce4-session.mo
+share/xfce4/doc/C/images/xfsm-splash.png
-share/locale/hi/LC_MESSAGES/xfce4-session.mo
+share/xfce4/doc/C/xfce4-session.html
-share/locale/it/LC_MESSAGES/xfce4-session.mo
+share/themes/Default/balou/logo.png
-share/locale/ko/LC_MESSAGES/xfce4-session.mo
+share/themes/Default/balou/themerc
-share/locale/nl/LC_MESSAGES/xfce4-session.mo
+share/icons/hicolor/48x48/apps/xfce4-session.png
-share/locale/sv/LC_MESSAGES/xfce4-session.mo
+share/icons/hicolor/48x48/apps/xfce4-splash.png
-share/locale/ta/LC_MESSAGES/xfce4-session.mo
+share/icons/hicolor/48x48/apps/xfsm-shutdown.png
-share/locale/tr/LC_MESSAGES/xfce4-session.mo
+share/icons/hicolor/64x64/apps/xfsm-gnome-kde-logo.png
-share/locale/zh_CN/LC_MESSAGES/xfce4-session.mo
+share/icons/hicolor/72x72/apps/xfsm-trash-hilight.png
-share/locale/zh_TW/LC_MESSAGES/xfce4-session.mo
+share/icons/hicolor/72x72/apps/xfsm-trash-normal.png
-share/xfce4/splash/Default/splash.theme
+share/icons/hicolor/128x128/apps/xfce4-session.png
-share/xfce4/splash/Default/logo.png
+share/icons/hicolor/scalable/apps/xfce4-session.svg
-share/xfce4/splash/Default/preview.png
+share/icons/hicolor/scalable/apps/xfsm-shutdown.svg
-@unexec rmdir %D/etc/xfce4 2>/dev/null || true
+share/applications/xfce-session-settings.desktop
-@unexec rmdir %D/lib/xfce4/mcs-plugins 2>/dev/null || true
+share/applications/xfce-splash-settings.desktop
-@dirrm share/xfce4/splash/Default
+@dirrm etc/xdg/xfce4-session
-@dirrm share/xfce4/splash
+@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

x11-wm/xfce4-systray/Makefile

@@ -6,11 +6,12 @@
 #
 
 PORTNAME=	xfce4-systray
-PORTVERSION=	4.0.6
+PORTVERSION=	4.2.0
-PORTREVISION=	1
+PORTREVISION=	0
 CATEGORIES=	x11-wm xfce
-MASTER_SITES=	ftp://ftp.berlios.de/pub/xfce-goodies/${PORTVERSION}/ \
+MASTER_SITES=	http://www.us.xfce.org/archive/xfce-${PORTVERSION}/src/ \
-		http://hannelore.f1.fhtw-berlin.de/mirrors/xfce4/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}
 

x11-wm/xfce4-systray/distinfo

@@ -1,2 +1,2 @@
-MD5 (xfce4/xfce4-systray-4.0.6.tar.gz) = c47e746ad38178c6c7f891ca4b39a616
+MD5 (xfce4/xfce4-systray-4.2.0.tar.gz) = e6e5c2948425fd82d62ce66cdcfe9c42
-SIZE(xfce4/xfce4-systray-4.0.6.tar.gz) = 310468
+SIZE(xfce4/xfce4-systray-4.2.0.tar.gz) = 313093

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

x11-wm/xfce4-wm/Makefile

@@ -6,11 +6,12 @@
 #
 
 PORTNAME=	xfce4-wm
-PORTVERSION=	4.0.6
+PORTVERSION=	4.2.0
-PORTREVISION=	1
+PORTREVISION=	0
 CATEGORIES=	x11-wm xfce
-MASTER_SITES=	ftp://ftp.berlios.de/pub/xfce-goodies/${PORTVERSION}/ \
+MASTER_SITES=	http://www.us.xfce.org/archive/xfce-${PORTVERSION}/src/ \
-		http://hannelore.f1.fhtw-berlin.de/mirrors/xfce4/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

x11-wm/xfce4-wm/distinfo

@@ -1,2 +1,2 @@
-MD5 (xfce4/xfwm4-4.0.6.tar.gz) = 911688ba221bc65e66e15bb87993edec
+MD5 (xfce4/xfwm4-4.2.0.tar.gz) = da6d773f31ef91400174c2045f0f1a80
-SIZE(xfce4/xfwm4-4.0.6.tar.gz) = 975194
+SIZE(xfce4/xfwm4-4.2.0.tar.gz) = 1112459

x11-wm/xfce4/Makefile

@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	xfce
-PORTVERSION=	4.0.6
+PORTVERSION=	4.2.0
-PORTREVISION=	1
+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 \
+RUN_DEPENDS+=	${X11BASE}/share/xfce4/mime/Rodent.mime.xml:${PORTSDIR}/x11-themes/xfce4-icon-theme
-		${X11BASE}/share/xffm/pixmaps/xfce/mime.xml:${PORTSDIR}/x11-fm/xfce4-fm-icons \
-		${X11BASE}/share/xfwm4/themes/atlanta2/themerc:${PORTSDIR}/misc/xfce4-wm-themes
 .endif
 
 .if !defined(WITHOUT_PLUGINS)

x11/libxfce4mcs/Makefile

@@ -6,11 +6,12 @@
 #
 
 PORTNAME=	libxfce4mcs
-PORTVERSION=	4.0.6
+PORTVERSION=	4.2.0
 PORTREVISION=	0
 CATEGORIES=	x11 xfce
-MASTER_SITES=	ftp://ftp.berlios.de/pub/xfce-goodies/${PORTVERSION}/ \
+MASTER_SITES=	http://www.us.xfce.org/archive/xfce-${PORTVERSION}/src/ \
-		http://hannelore.f1.fhtw-berlin.de/mirrors/xfce4/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
@@ -25,6 +26,14 @@ GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 INSTALLS_SHLIB=	yes
 NO_FILTER_SHLIBS=	yes
+USE_LIBTOOL_VER=15
+
+.if defined(WITH_GTKDOC)
+BUILD_DEPENDS+=	gtkdocize:${PORTSDIR}/textproc/gtk-doc
+CONFIGURE_ARGS+=--enable-gtk-doc
+.else
+CONFIGURE_ARGS+=--disable-gtk-doc
+.endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|$$(libdir)/pkgconfig|${PREFIX}/libdata/pkgconfig|g' \

x11/libxfce4mcs/distinfo

@@ -1,2 +1,2 @@
-MD5 (xfce4/libxfce4mcs-4.0.6.tar.gz) = ebbe2f4934d79c596d2a48c0cbf6ed33
+MD5 (xfce4/libxfce4mcs-4.2.0.tar.gz) = fa0ca0a182b90c492d1b62e828c800d6
-SIZE(xfce4/libxfce4mcs-4.0.6.tar.gz) = 330016
+SIZE(xfce4/libxfce4mcs-4.2.0.tar.gz) = 369645

x11/libxfce4mcs/pkg-plist

@@ -2,14 +2,26 @@ include/xfce4/libxfce4mcs/mcs-client.h
 include/xfce4/libxfce4mcs/mcs-common.h
 include/xfce4/libxfce4mcs/mcs-manager.h
 lib/libxfce4mcs-client.a
-lib/libxfce4mcs-client.la
 lib/libxfce4mcs-client.so
-lib/libxfce4mcs-client.so.1
+lib/libxfce4mcs-client.so.2
 lib/libxfce4mcs-manager.a
-lib/libxfce4mcs-manager.la
 lib/libxfce4mcs-manager.so
-lib/libxfce4mcs-manager.so.1
+lib/libxfce4mcs-manager.so.2
 libdata/pkgconfig/libxfce4mcs-manager-1.0.pc
 libdata/pkgconfig/libxfce4mcs-client-1.0.pc
+share/gtk-doc/html/libxfce4mcs/ch01.html
+share/gtk-doc/html/libxfce4mcs/home.png
+share/gtk-doc/html/libxfce4mcs/index.html
+share/gtk-doc/html/libxfce4mcs/index.sgml
+share/gtk-doc/html/libxfce4mcs/left.png
+share/gtk-doc/html/libxfce4mcs/libxfce4mcs-mcs-client.html
+share/gtk-doc/html/libxfce4mcs/libxfce4mcs-mcs-common.html
+share/gtk-doc/html/libxfce4mcs/libxfce4mcs-mcs-manager.html
+share/gtk-doc/html/libxfce4mcs/libxfce4mcs.devhelp
+share/gtk-doc/html/libxfce4mcs/right.png
+share/gtk-doc/html/libxfce4mcs/up.png
 @dirrm include/xfce4/libxfce4mcs
+@dirrm share/gtk-doc/html/libxfce4mcs
+@unexec rmdir %D/share/gtk-doc/html 2>/dev/null || true
+@unexec rmdir %D/share/gtk-doc 2>/dev/null || true
 @unexec rmdir %D/include/xfce4 2>/dev/null || true

x11/libxfce4util/Makefile

@@ -6,11 +6,12 @@
 #
 
 PORTNAME=	libxfce4util
-PORTVERSION=	4.0.6
+PORTVERSION=	4.2.0
 PORTREVISION=	0
 CATEGORIES=	x11 xfce
-MASTER_SITES=	ftp://ftp.berlios.de/pub/xfce-goodies/${PORTVERSION}/ \
+MASTER_SITES=	http://www.us.xfce.org/archive/xfce-${PORTVERSION}/src/ \
-		http://hannelore.f1.fhtw-berlin.de/mirrors/xfce4/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
@@ -23,6 +24,14 @@ GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 INSTALLS_SHLIB=	yes
 NO_FILTER_SHLIBS=	yes
+USE_LIBTOOL_VER=15
+
+.if defined(WITH_GTKDOC)
+BUILD_DEPENDS+=	gtkdocize:${PORTSDIR}/textproc/gtk-doc
+CONFIGURE_ARGS+=--enable-gtk-doc
+.else
+CONFIGURE_ARGS+=--disable-gtk-doc
+.endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|$$(libdir)/pkgconfig|${PREFIX}/libdata/pkgconfig|g' \

x11/libxfce4util/distinfo

@@ -1,2 +1,2 @@
-MD5 (xfce4/libxfce4util-4.0.6.tar.gz) = 4945103c0bd36f53d108bc49b4994f80
+MD5 (xfce4/libxfce4util-4.2.0.tar.gz) = b80354f6e68cd63ded05a2026e90c325
-SIZE(xfce4/libxfce4util-4.0.6.tar.gz) = 314842
+SIZE(xfce4/libxfce4util-4.2.0.tar.gz) = 447408

x11/libxfce4util/pkg-plist

@@ -4,18 +4,48 @@ include/xfce4/libxfce4util/libxfce4util.h
 include/xfce4/libxfce4util/libxfce4util-config.h
 include/xfce4/libxfce4util/utf8.h
 include/xfce4/libxfce4util/util.h
+include/xfce4/libxfce4util/xfce-desktopentry.h
+include/xfce4/libxfce4util/xfce-fileutils.h
+include/xfce4/libxfce4util/xfce-generics.h
+include/xfce4/libxfce4util/xfce-kiosk.h
+include/xfce4/libxfce4util/xfce-miscutils.h
+include/xfce4/libxfce4util/xfce-rc.h
+include/xfce4/libxfce4util/xfce-resource.h
 lib/libxfce4util.a
-lib/libxfce4util.la
 lib/libxfce4util.so
 lib/libxfce4util.so.1
 libdata/pkgconfig/libxfce4util-1.0.pc
-share/xfce4/i18n/nls.alias
+sbin/xfce4-kiosk-query
+share/gtk-doc/html/libxfce4util/home.png
+share/gtk-doc/html/libxfce4util/index.html
+share/gtk-doc/html/libxfce4util/index.sgml
+share/gtk-doc/html/libxfce4util/left.png
+share/gtk-doc/html/libxfce4util/libxfce4util-Desktop-entries.html
+share/gtk-doc/html/libxfce4util/libxfce4util-File-Utilities.html
+share/gtk-doc/html/libxfce4util/libxfce4util-Internationalisation.html
+share/gtk-doc/html/libxfce4util/libxfce4util-Miscellaneous-Utilities.html
+share/gtk-doc/html/libxfce4util/libxfce4util-Resource-Config-File-Support.html
+share/gtk-doc/html/libxfce4util/libxfce4util-Resource-lookup-functions.html
+share/gtk-doc/html/libxfce4util/libxfce4util-Standard-Macros.html
+share/gtk-doc/html/libxfce4util/libxfce4util-Unicode-Support-Functions.html
+share/gtk-doc/html/libxfce4util/up.png
+share/gtk-doc/html/libxfce4util/libxfce4util-Xfce-Generics.html
+share/gtk-doc/html/libxfce4util/libxfce4util-Xfce-Kiosk-functions.html
+share/gtk-doc/html/libxfce4util/libxfce4util-core.html
+share/gtk-doc/html/libxfce4util/libxfce4util-datatypes.html
+share/gtk-doc/html/libxfce4util/libxfce4util-fundamentals.html
+share/gtk-doc/html/libxfce4util/libxfce4util-utilities.html
+share/gtk-doc/html/libxfce4util/libxfce4util.devhelp
+share/gtk-doc/html/libxfce4util/reference.html
+share/gtk-doc/html/libxfce4util/right.png
 share/xfce4/m4/X11.m4
 share/xfce4/m4/debug.m4
 share/xfce4/m4/depends.m4
 share/xfce4/m4/i18n.m4
 @dirrm include/xfce4/libxfce4util
 @unexec rmdir %D/include/xfce4 2>/dev/null || true
-@dirrm share/xfce4/i18n
+@dirrm share/gtk-doc/html/libxfce4util
+@unexec rmdir %D/share/gtk-doc/html 2>/dev/null || true
+@unexec rmdir %D/share/gtk-doc 2>/dev/null || true
 @dirrm share/xfce4/m4
 @unexec rmdir %D/share/xfce4 2>/dev/null || true

x11/xfce4-clipman-plugin/Makefile

@@ -7,7 +7,7 @@
 
 PORTNAME=	xfce4-clipman-plugin
 PORTVERSION=	0.4.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11 xfce
 MASTER_SITES=	http://download.berlios.de/xfce-goodies/ \
 		http://matt.nerim.net/xfce-goodies/ \
@@ -19,7 +19,7 @@ COMMENT=	XFce 4 clipboard 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

x11/xfce4-trigger-launcher/Makefile

@@ -6,11 +6,11 @@
 #
 
 PORTNAME=	xfce4-trigger-launcher
-PORTVERSION=	4.0.5
+PORTVERSION=	4.2.0
-PORTREVISION=	1
 CATEGORIES=	x11 xfce
-MASTER_SITES=	ftp://ftp.berlios.de/pub/xfce-goodies/${PORTVERSION}/ \
+MASTER_SITES=	http://www.us.xfce.org/archive/xfce-${PORTVERSION}/src/ \
-		http://hannelore.f1.fhtw-berlin.de/mirrors/xfce4/xfce-${PORTVERSION}/src/
+		http://spuriousinterrupt.org/projects/xfce4/files/mirror/xfce-${PORTVERSION}/ \
+		http://public.fh-wolfenbuettel.de/~luedickj/xfce4/xfce-${PORTVERSION}/
 DISTNAME=	xfce4-trigger-launcher-${PORTVERSION}
 DIST_SUBDIR=	xfce4
 
@@ -19,13 +19,13 @@ COMMENT=	A command trigger plugin 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 \
 		startup-notification-1.0:${PORTSDIR}/x11/startup-notification
 RUN_DEPENDS=	xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
 
 USE_GNOME=	gtk20 libxml2
 USE_X_PREFIX=	yes
-USE_INC_LIBTOOL_VER=	13
+USE_LIBTOOL_VER=15
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 
 .include <bsd.port.mk>

x11/xfce4-trigger-launcher/distinfo

@@ -1,2 +1,2 @@
-MD5 (xfce4/xfce4-trigger-launcher-4.0.5.tar.gz) = 01812b93a4f072eec89f03d8dd2c20f8
+MD5 (xfce4/xfce4-trigger-launcher-4.2.0.tar.gz) = 7162f20d0d43c905731ea15b4c4459dc
-SIZE (xfce4/xfce4-trigger-launcher-4.0.5.tar.gz) = 332304
+SIZE(xfce4/xfce4-trigger-launcher-4.2.0.tar.gz) = 345902

x11/xfce4-trigger-launcher/pkg-plist

@@ -1,4 +1,3 @@
 lib/xfce4/panel-plugins/libtriggerlauncher.so
-lib/xfce4/panel-plugins/libtriggerlauncher.la
-lib/xfce4/panel-plugins/libtriggerlauncher.a
 @unexec rmdir %D/lib/xfce4/panel-plugins 2>/dev/null || true
+@unexec rmdir %D/lib/xfce4 2>/dev/null || true