- bring xfce4 to 4.2

- remove x11-fm/xfce4-fm-icons misc/xfce4-panel-themes (obsoleted by that update)
- take maintainership of x11-wm/xfce4-session [1]
- bump PORTREVISION of all plugins because they need to be linked against the new xfce4 libs

Approved by:	maintainer [1]

3 files changed, 23 insertions, 8 deletions

diff --git a/x11-themes/gtk-xfce-engine/Makefile b/x11-themes/gtk-xfce-engine/Makefile
index 113b56269d06..eed5759d1ddc 100644
--- a/x11-themes/gtk-xfce-engine/Makefile
+++ b/x11-themes/gtk-xfce-engine/Makefile
@@ -6,16 +6,16 @@
 #
 
 PORTNAME=	gtk-xfce-engine
-PORTVERSION=	2.1.10
-PORTREVISION=	1
+PORTVERSION=	2.2.5
+PORTREVISION=	0
 CATEGORIES=	x11-themes xfce
-MASTER_SITES=	ftp://ftp.berlios.de/pub/xfce-goodies/4.0.6/ \
-		http://hannelore.f1.fhtw-berlin.de/mirrors/xfce4/xfce-4.0.6/src/
+MASTER_SITES=	http://www.us.xfce.org/archive/xfce-4.2.0/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
diff --git a/x11-themes/gtk-xfce-engine/distinfo b/x11-themes/gtk-xfce-engine/distinfo
index 968dbdee7245..47866080ef4c 100644
--- a/x11-themes/gtk-xfce-engine/distinfo
+++ b/x11-themes/gtk-xfce-engine/distinfo
@@ -1,2 +1,2 @@
-MD5 (gtk-xfce-engine-2.1.10.tar.gz) = 116f33de9083a2c38b0943e5591baecb
-SIZE(gtk-xfce-engine-2.1.10.tar.gz) = 352524
+MD5 (gtk-xfce-engine-2.2.5.tar.gz) = 526cf8de2a2ed32e622add442cb2aefb
+SIZE(gtk-xfce-engine-2.2.5.tar.gz) = 373900
diff --git a/x11-themes/gtk-xfce-engine/pkg-plist b/x11-themes/gtk-xfce-engine/pkg-plist
index 783d50b5d677..da3c19a4627b 100644
--- a/x11-themes/gtk-xfce-engine/pkg-plist
+++ b/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