- Welcome XFCE 4.10 to the portstree!

Special Thanks to:      rene, Olivier Duchateau <duchateau.olivier@gmail.com>
Submitted by:	 	Olivier Duchateau <duchateau.olivier@gmail.com>

Tested by:	phw

4 files changed, 29 insertions, 26 deletions

diff --git a/x11-themes/gtk-xfce-engine/Makefile b/x11-themes/gtk-xfce-engine/Makefile
index c40e5cc49e9c..b5582ff4b26d 100644
--- a/x11-themes/gtk-xfce-engine/Makefile
+++ b/x11-themes/gtk-xfce-engine/Makefile
@@ -6,18 +6,21 @@
 #
 
 PORTNAME=	gtk-xfce-engine
-PORTVERSION=	2.9.0
+PORTVERSION=	3.0.0
 CATEGORIES=	x11-themes xfce
 MASTER_SITES=	${MASTER_SITE_XFCE}
-MASTER_SITE_SUBDIR=	src/xfce/${PORTNAME}/${PORTVERSION:R}
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	xfce@FreeBSD.org
-COMMENT=	An Xfce engine for GTK 2.0
+COMMENT=	Xfce gtk theme engine
 
 GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
 USE_GNOME=	glib20 gnomehack gtk20 pkgconfig
 USE_XFCE=	configenv	# to get MASTER_SITE_SUBDIR something has to be defined
 
+CONFIGURE_ARGS+=--disable-glibtest \
+	--enable-gtk2 \
+	--disable-gtk3
+
 .include <bsd.port.mk>
diff --git a/x11-themes/gtk-xfce-engine/distinfo b/x11-themes/gtk-xfce-engine/distinfo
index d3728aa0c82a..7745b4beedc0 100644
--- a/x11-themes/gtk-xfce-engine/distinfo
+++ b/x11-themes/gtk-xfce-engine/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xfce4/gtk-xfce-engine-2.9.0.tar.bz2) = 55604002526c800539f2a8a79e7df3bf23717f45e4bfab31c154c8d01caf3af7
-SIZE (xfce4/gtk-xfce-engine-2.9.0.tar.bz2) = 304832
+SHA256 (xfce4/gtk-xfce-engine-3.0.0.tar.bz2) = 90e08fce8cce452656c4090f94afb7aa35a0a92597412f319526b7899d54838d
+SIZE (xfce4/gtk-xfce-engine-3.0.0.tar.bz2) = 367860
diff --git a/x11-themes/gtk-xfce-engine/pkg-descr b/x11-themes/gtk-xfce-engine/pkg-descr
index e7b7f7c987cc..b450fa1b1cce 100644
--- a/x11-themes/gtk-xfce-engine/pkg-descr
+++ b/x11-themes/gtk-xfce-engine/pkg-descr
@@ -1,3 +1,4 @@
-An Xfce engine for GTK 2.
+This package provides the Xfce Gtk+-2.0 and Gtk+-3.0 engines, which allows
+for homogeneity in applications for both business and personal desktops.
 
-WWW: http://www.xfce4.org/
+WWW: http://www.xfce.org/projects
diff --git a/x11-themes/gtk-xfce-engine/pkg-plist b/x11-themes/gtk-xfce-engine/pkg-plist
index 2fb35c279efc..a231c2d4ce4c 100644
--- a/x11-themes/gtk-xfce-engine/pkg-plist
+++ b/x11-themes/gtk-xfce-engine/pkg-plist
@@ -1,4 +1,3 @@
-lib/gtk-2.0/%%GTK2_VERSION%%/engines/libxfce.a
 lib/gtk-2.0/%%GTK2_VERSION%%/engines/libxfce.la
 lib/gtk-2.0/%%GTK2_VERSION%%/engines/libxfce.so
 share/themes/Xfce-4.0/gtk-2.0/gtkrc
@@ -21,22 +20,7 @@ share/themes/Xfce-smooth/gtk-2.0/gtkrc
 share/themes/Xfce-stellar/gtk-2.0/gtkrc
 share/themes/Xfce-winter/gtk-2.0/gtkrc
 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-4.4/gtk-2.0
-@dirrm share/themes/Xfce-4.4
-@dirrm share/themes/Xfce-4.6/gtk-2.0
-@dirrm share/themes/Xfce-4.6
 @dirrm share/themes/Xfce/gtk-2.0
-@dirrmtry share/themes/Xfce
-@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-dusk/gtk-2.0
-@dirrm share/themes/Xfce-dusk
 @dirrm share/themes/Xfce-winter/gtk-2.0
 @dirrm share/themes/Xfce-winter
 @dirrm share/themes/Xfce-stellar/gtk-2.0
@@ -55,13 +39,28 @@ share/themes/Xfce/gtk-2.0/gtkrc
 @dirrm share/themes/Xfce-kolors
 @dirrm share/themes/Xfce-kde2/gtk-2.0
 @dirrm share/themes/Xfce-kde2
+@dirrm share/themes/Xfce-dusk/gtk-2.0
+@dirrm share/themes/Xfce-dusk
+@dirrm share/themes/Xfce-dawn/gtk-2.0
+@dirrm share/themes/Xfce-dawn
 @dirrm share/themes/Xfce-curve/gtk-2.0
 @dirrm share/themes/Xfce-curve
+@dirrm share/themes/Xfce-cadmium/gtk-2.0
+@dirrm share/themes/Xfce-cadmium
 @dirrm share/themes/Xfce-basic/gtk-2.0
 @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
+@dirrm share/themes/Xfce-4.6/gtk-2.0
+@dirrm share/themes/Xfce-4.6
+@dirrm share/themes/Xfce-4.4/gtk-2.0
+@dirrm share/themes/Xfce-4.4
+@dirrm share/themes/Xfce-4.2/gtk-2.0
+@dirrm share/themes/Xfce-4.2
+@dirrm share/themes/Xfce-4.0/gtk-2.0
+@dirrm share/themes/Xfce-4.0
+@dirrm share/themes/Xfce
 @dirrmtry share/themes
+@dirrmtry lib/gtk-2.0/%%GTK2_VERSION%%/engines
+@dirrmtry lib/gtk-2.0/%%GTK2_VERSION%%
+@dirrmtry lib/gtk-2.0