3 files changed, 35 insertions, 19 deletions

diff --git a/x11-themes/gtk-engines2/Makefile b/x11-themes/gtk-engines2/Makefile
index 1cf3c1915fd9..9868e20839a8 100644
--- a/x11-themes/gtk-engines2/Makefile
+++ b/x11-themes/gtk-engines2/Makefile
@@ -3,14 +3,14 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/x11-themes/gtk-engines2/Makefile,v 1.29 2006/10/03 01:32:23 ahze Exp $
+#   $MCom: ports/x11-themes/gtk-engines2/Makefile,v 1.37 2007/03/13 12:52:05 ahze Exp $
 #
 
 PORTNAME=	gtk-engines2
-PORTVERSION=	2.8.2
+PORTVERSION=	2.10.0
 CATEGORIES=	x11-themes
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/2.8
+MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
 DISTNAME=	${PORTNAME:S/2$//}-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
@@ -19,21 +19,24 @@ COMMENT=	Theme engine for the gtk+-2.0 toolkit
 
 CONFLICTS=	gtk-smooth-engine-[0-9]* clearlooks-[0-9]*
 
+USE_GMAKE=	yes
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 USE_GNOME=	gnomehack gtk20
+USE_LDCONFIG=	yes
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
 
 .if defined(WITH_ANIMATION)
 CONFIGURE_ARGS+=	--enable-animation
 .endif
 
-pre-everything:: 	 
-.if !defined(WITH_ANIMATION) 	 
-	@${ECHO_MSG} "" 	 
-	@${ECHO_MSG} " You can enable experimental animated progressbars" 	 
-	@${ECHO_MSG} " with the clearlooks engine by defining" 	 
-	@${ECHO_MSG} " WITH_ANIMATION" 	 
-	@${ECHO_MSG} "" 	 
+pre-everything::
+.if !defined(WITH_ANIMATION)
+	@${ECHO_MSG} ""
+	@${ECHO_MSG} " You can enable experimental animated progressbars"
+	@${ECHO_MSG} " with the clearlooks engine by defining"
+	@${ECHO_MSG} " WITH_ANIMATION"
+	@${ECHO_MSG} ""
 .endif
 
 # Disable the gtk1 theme.
diff --git a/x11-themes/gtk-engines2/distinfo b/x11-themes/gtk-engines2/distinfo
index 636989d069e4..4a9b213d729a 100644
--- a/x11-themes/gtk-engines2/distinfo
+++ b/x11-themes/gtk-engines2/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gtk-engines-2.8.2.tar.bz2) = 0c5b0254b57910b1ebcda47ac6a3b1ba
-SHA256 (gnome2/gtk-engines-2.8.2.tar.bz2) = c789ceb35f9972cdc41655d663e579150bfb3703a917a8be254f227c57730734
-SIZE (gnome2/gtk-engines-2.8.2.tar.bz2) = 461623
+MD5 (gnome2/gtk-engines-2.10.0.tar.bz2) = 245d0939025f8f9856c2309071cf075e
+SHA256 (gnome2/gtk-engines-2.10.0.tar.bz2) = 6b605a71d1509f89fae7607ca25849e0d5fceab1af83cc27d521bd2ae2c83abc
+SIZE (gnome2/gtk-engines-2.10.0.tar.bz2) = 641141
diff --git a/x11-themes/gtk-engines2/pkg-plist b/x11-themes/gtk-engines2/pkg-plist
index 0d123b434980..e4df8056d792 100644
--- a/x11-themes/gtk-engines2/pkg-plist
+++ b/x11-themes/gtk-engines2/pkg-plist
@@ -17,6 +17,18 @@ lib/gtk-2.0/%%GTK2_VERSION%%/engines/libsmooth.so
 lib/gtk-2.0/%%GTK2_VERSION%%/engines/libthinice.la
 lib/gtk-2.0/%%GTK2_VERSION%%/engines/libthinice.so
 libdata/pkgconfig/gtk-engines-2.pc
+share/gtk-engines/clearlooks.xml
+share/gtk-engines/crux.xml
+share/gtk-engines/glide.xml
+share/gtk-engines/hc.xml
+share/gtk-engines/industrial.xml
+share/gtk-engines/mist.xml
+share/gtk-engines/redmond.xml
+share/gtk-engines/smooth.xml
+share/gtk-engines/thinice.xml
+share/locale/de/LC_MESSAGES/gtk-engines.mo
+share/locale/en_GB/LC_MESSAGES/gtk-engines.mo
+share/locale/nl/LC_MESSAGES/gtk-engines.mo
 share/themes/Clearlooks/gtk-2.0/gtkrc
 share/themes/Crux/gtk-2.0/gtkrc
 share/themes/Industrial/gtk-2.0/gtkrc
@@ -24,14 +36,15 @@ share/themes/Mist/gtk-2.0/gtkrc
 share/themes/Redmond/gtk-2.0/gtkrc
 share/themes/ThinIce/gtk-2.0/gtkrc
 @dirrm share/themes/ThinIce/gtk-2.0
+@dirrmtry share/themes/ThinIce
 @dirrm share/themes/Redmond/gtk-2.0
+@dirrmtry share/themes/Redmond
 @dirrm share/themes/Mist/gtk-2.0
+@dirrmtry share/themes/Mist
 @dirrm share/themes/Industrial/gtk-2.0
+@dirrmtry share/themes/Industrial
 @dirrm share/themes/Crux/gtk-2.0
+@dirrmtry share/themes/Crux
 @dirrm share/themes/Clearlooks/gtk-2.0
-@unexec /bin/rmdir %D/share/themes/ThinIce 2>/dev/null || true
-@unexec /bin/rmdir %D/share/themes/Redmond 2>/dev/null || true
-@unexec /bin/rmdir %D/share/themes/Mist 2>/dev/null || true
-@unexec /bin/rmdir %D/share/themes/Industrial 2>/dev/null || true
-@unexec /bin/rmdir %D/share/themes/Crux 2>/dev/null || true
-@unexec /bin/rmdir %D/share/themes/Clearlooks 2>/dev/null || true
+@dirrmtry share/themes/Clearlooks
+@dirrm share/gtk-engines