Update to 0.8.1.

4 files changed, 14 insertions, 44 deletions

diff --git a/x11-themes/gnome-themes-extras/Makefile b/x11-themes/gnome-themes-extras/Makefile
index adb755e..a537be1 100644
--- a/x11-themes/gnome-themes-extras/Makefile
+++ b/x11-themes/gnome-themes-extras/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gnome-themes-extras
-PORTVERSION=	0.8.0
-PORTREVISION=	1
+PORTVERSION=	0.8.1
 CATEGORIES=	x11-themes gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.8
@@ -16,6 +15,9 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	More themes for the GNOME 2 desktop environment
 
+BUILD_DEPENDS=	${X11BASE}/libdata/pkgconfig/gtk-engines-2.pc:${PORTSDIR}/x11-themes/gtk-engines2
+RUN_DEPENDS=	${X11BASE}/libdata/pkgconfig/gtk-engines-2.pc:${PORTSDIR}/x11-themes/gtk-engines2
+
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_REINPLACE=	yes
@@ -25,12 +27,15 @@ USE_GNOME=	gnomehack libgnomeui intlhack
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
-PLIST_SUB=	GTK_VERSION="2.4.0"
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} < 503001
+EXTRACT_DEPENDS+=	gtar:${PORTSDIR}/archivers/gtar
+TAR=			${LOCALBASE}/bin/gtar
+.endif
 
 post-patch:
 	@${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${REINPLACE_CMD} -e \
 		"/^themedir =.*metacity-1$$/s|themes|gnome/themes|"
-	${REINPLACE_CMD} -e 's|Wasp Smooth|Wasp|g' \
-		${WRKSRC}/Makefile.in
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/x11-themes/gnome-themes-extras/distinfo b/x11-themes/gnome-themes-extras/distinfo
index cd9ba6e..9ce130c 100644
--- a/x11-themes/gnome-themes-extras/distinfo
+++ b/x11-themes/gnome-themes-extras/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gnome-themes-extras-0.8.0.tar.bz2) = a2c3eead4dd29bad88b57570d67afd33
-SIZE (gnome2/gnome-themes-extras-0.8.0.tar.bz2) = 3900402
+MD5 (gnome2/gnome-themes-extras-0.8.1.tar.bz2) = 0dce0d3411460d39cd57cb06d0f3012f
+SIZE (gnome2/gnome-themes-extras-0.8.1.tar.bz2) = 3835234
diff --git a/x11-themes/gnome-themes-extras/files/patch-Industrial_industrial_style.c b/x11-themes/gnome-themes-extras/files/patch-Industrial_industrial_style.c
deleted file mode 100644
index a959635..0000000
--- a/x11-themes/gnome-themes-extras/files/patch-Industrial_industrial_style.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- Industrial/industrial_style.c.orig	Tue Mar 16 16:55:11 2004
-+++ Industrial/industrial_style.c	Tue Mar 16 16:58:23 2004
-@@ -1801,6 +1801,7 @@
- 	     gint             width,
- 	     gint             height)
- {
-+	g_return_if_fail (widget != NULL);
- #if DEBUG
-   printf ("draw_shadow: %p %p %s %i %i %i %i\n", widget, window, detail, x, y,
- 	  width, height);
diff --git a/x11-themes/gnome-themes-extras/pkg-plist b/x11-themes/gnome-themes-extras/pkg-plist
index 79643d0..522edee 100644
--- a/x11-themes/gnome-themes-extras/pkg-plist
+++ b/x11-themes/gnome-themes-extras/pkg-plist
@@ -1,4 +1,3 @@
-lib/gtk-2.0/%%GTK_VERSION%%/engines/libindustrial.so
 share/gnome/themes/Amaranth/metacity-1/left-side.png
 share/gnome/themes/Amaranth/metacity-1/metacity-theme-1.xml
 share/gnome/themes/Amaranth/metacity-1/right-side.png
@@ -1070,6 +1069,7 @@ share/locale/pa/LC_MESSAGES/gnome-themes-extras.mo
 share/locale/pl/LC_MESSAGES/gnome-themes-extras.mo
 share/locale/pt/LC_MESSAGES/gnome-themes-extras.mo
 share/locale/pt_BR/LC_MESSAGES/gnome-themes-extras.mo
+share/locale/ru/LC_MESSAGES/gnome-themes-extras.mo
 share/locale/sk/LC_MESSAGES/gnome-themes-extras.mo
 share/locale/sq/LC_MESSAGES/gnome-themes-extras.mo
 share/locale/sr/LC_MESSAGES/gnome-themes-extras.mo
@@ -1085,29 +1085,6 @@ share/themes/Gorilla/gtk-2.0/gtkrc
 share/themes/Gorilla/gtk-2.0/iconrc
 share/themes/Gorilla/gtk/gtkrc
 share/themes/Gorilla/index.theme
-share/themes/Industrial/gtk-2.0/gtkrc
-share/themes/Industrial/gtk-2.0/stock_apply.png
-share/themes/Industrial/gtk-2.0/stock_bottom-16.png
-share/themes/Industrial/gtk-2.0/stock_bottom.png
-share/themes/Industrial/gtk-2.0/stock_cancel-16.png
-share/themes/Industrial/gtk-2.0/stock_cancel.png
-share/themes/Industrial/gtk-2.0/stock_down-16.png
-share/themes/Industrial/gtk-2.0/stock_down.png
-share/themes/Industrial/gtk-2.0/stock_first-16.png
-share/themes/Industrial/gtk-2.0/stock_first.png
-share/themes/Industrial/gtk-2.0/stock_last-16.png
-share/themes/Industrial/gtk-2.0/stock_last.png
-share/themes/Industrial/gtk-2.0/stock_left-16.png
-share/themes/Industrial/gtk-2.0/stock_left.png
-share/themes/Industrial/gtk-2.0/stock_ok.png
-share/themes/Industrial/gtk-2.0/stock_refresh-16.png
-share/themes/Industrial/gtk-2.0/stock_refresh.png
-share/themes/Industrial/gtk-2.0/stock_right-16.png
-share/themes/Industrial/gtk-2.0/stock_right.png
-share/themes/Industrial/gtk-2.0/stock_top-16.png
-share/themes/Industrial/gtk-2.0/stock_top.png
-share/themes/Industrial/gtk-2.0/stock_up-16.png
-share/themes/Industrial/gtk-2.0/stock_up.png
 share/themes/Lush/gtk-2.0/gtkrc
 share/themes/Lush/gtk-2.0/iconrc
 share/themes/Lush/index.theme
@@ -1125,8 +1102,6 @@ share/themes/Wasp/index.theme
 @dirrm share/themes/Nuvola
 @dirrm share/themes/Lush/gtk-2.0
 @dirrm share/themes/Lush
-@dirrm share/themes/Industrial/gtk-2.0
-@dirrm share/themes/Industrial
 @dirrm share/themes/Gorilla/gtk-2.0
 @dirrm share/themes/Gorilla/gtk
 @dirrm share/themes/Gorilla