4 files changed, 30 insertions, 12 deletions

diff --git a/x11-themes/gtk-xfce-engine/Makefile b/x11-themes/gtk-xfce-engine/Makefile
index dd2aca3509d7..a4797576d4aa 100644
--- a/x11-themes/gtk-xfce-engine/Makefile
+++ b/x11-themes/gtk-xfce-engine/Makefile
@@ -6,17 +6,20 @@
 #
 
 PORTNAME=	gtk-xfce-engine
-PORTVERSION=	2.2.8
-PORTREVISION=	2
+PORTVERSION=	2.4.0
 CATEGORIES=	x11-themes xfce
-MASTER_SITES=	http://www.us.xfce.org/archive/xfce-4.2.3.2/src/ \
-		http://www.ca-us.xfce.org/archive/xfce-4.2.3.2/src/ \
-		http://www.p0llux.be/xfce/xfce-4.2.3.2/src/
+MASTER_SITES=	${MASTER_SITES_XFCE}
+DIST_SUBDIR=	xfce4
 
 MAINTAINER=	oliver@FreeBSD.org
 COMMENT=	An XFCE engine for GTK 2.0
 
-USE_GNOME=	gnomehack gtk20
 GNU_CONFIGURE=	yes
+USE_BZIP2=	yes
+USE_GNOME=	glib20 gnomehack gtk20 pkgconfig
+USE_XLIB=	yes
 
-.include <bsd.port.mk>
+
+.include <bsd.port.pre.mk>
+.include "${PORTSDIR}/x11-wm/xfce4/bsd.xfce.mk"
+.include <bsd.port.post.mk>
diff --git a/x11-themes/gtk-xfce-engine/distinfo b/x11-themes/gtk-xfce-engine/distinfo
index f3fcf318f392..796f3fe29a57 100644
--- a/x11-themes/gtk-xfce-engine/distinfo
+++ b/x11-themes/gtk-xfce-engine/distinfo
@@ -1,3 +1,3 @@
-MD5 (gtk-xfce-engine-2.2.8.tar.gz) = 430251478bc15ca6f4b71bdaf16cce5e
-SHA256 (gtk-xfce-engine-2.2.8.tar.gz) = 31a2d0b8b426683cf2611bab653e5fd0ca72661a6c8a6461e61a321e6a3dc420
-SIZE (gtk-xfce-engine-2.2.8.tar.gz) = 391386
+MD5 (xfce4/gtk-xfce-engine-2.4.0.tar.bz2) = 54676606e99cbec638f7f22ddea2872a
+SHA256 (xfce4/gtk-xfce-engine-2.4.0.tar.bz2) = 6841ec9efb29675c0134dc5c273a779b14f2daebb117b2078be547db4effaafb
+SIZE (xfce4/gtk-xfce-engine-2.4.0.tar.bz2) = 245746
diff --git a/x11-themes/gtk-xfce-engine/pkg-descr b/x11-themes/gtk-xfce-engine/pkg-descr
index 06863f74433c..1fc2e16620fd 100644
--- a/x11-themes/gtk-xfce-engine/pkg-descr
+++ b/x11-themes/gtk-xfce-engine/pkg-descr
@@ -1,3 +1,3 @@
-An XFCE engine for GTK 2.0.
+An XFCE engine for GTK 2.
 
-WWW: http://sourceforge.net/projects/xfce/
+WWW: http://www.xfce4.org/
diff --git a/x11-themes/gtk-xfce-engine/pkg-plist b/x11-themes/gtk-xfce-engine/pkg-plist
index e95c286d757d..de504497af05 100644
--- a/x11-themes/gtk-xfce-engine/pkg-plist
+++ b/x11-themes/gtk-xfce-engine/pkg-plist
@@ -3,6 +3,9 @@ lib/gtk-2.0/%%GTK2_VERSION%%/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-4.2/gtk-2.0/gtkrc
+share/themes/Xfce-4.2/ICON.png
+share/themes/Xfce-4.2/README.html
 share/themes/Xfce-b5/ICON.png
 share/themes/Xfce-b5/README.html
 share/themes/Xfce-b5/gtk-2.0/gtkrc
@@ -30,6 +33,9 @@ share/themes/Xfce-kolors/gtk-2.0/gtkrc
 share/themes/Xfce-light/ICON.png
 share/themes/Xfce-light/README.html
 share/themes/Xfce-light/gtk-2.0/gtkrc
+share/themes/Xfce-orange/ICON.png
+share/themes/Xfce-orange/README.html
+share/themes/Xfce-orange/gtk-2.0/gtkrc
 share/themes/Xfce-redmondxp/ICON.png
 share/themes/Xfce-redmondxp/README.html
 share/themes/Xfce-redmondxp/gtk-2.0/gtkrc
@@ -50,6 +56,8 @@ 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-4.2/gtk-2.0
+@dirrm share/themes/Xfce-4.2
 @dirrm share/themes/Xfce/gtk-2.0
 @dirrmtry share/themes/Xfce
 @dirrm share/themes/Xfce-cadmium/gtk-2.0
@@ -68,6 +76,8 @@ share/themes/Xfce/gtk-2.0/gtkrc
 @dirrm share/themes/Xfce-saltlake
 @dirrm share/themes/Xfce-redmondxp/gtk-2.0
 @dirrm share/themes/Xfce-redmondxp
+@dirrm share/themes/Xfce-orange/gtk-2.0
+@dirrm share/themes/Xfce-orange
 @dirrm share/themes/Xfce-light/gtk-2.0
 @dirrm share/themes/Xfce-light
 @dirrm share/themes/Xfce-kolors/gtk-2.0
@@ -80,3 +90,8 @@ 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
+@dirrmtry lib/gtk-2.0/2.4.0/engines
+@dirrmtry lib/gtk-2.0/2.4.0
+@dirrmtry lib/gtk-2.0
+@dirrmtry share/themes
+