4 files changed, 34 insertions, 32 deletions

diff --git a/x11-themes/gtk-envy-theme/Makefile b/x11-themes/gtk-envy-theme/Makefile
index f52c4203351e..909b4d25fefd 100644
--- a/x11-themes/gtk-envy-theme/Makefile
+++ b/x11-themes/gtk-envy-theme/Makefile
@@ -7,26 +7,28 @@
 
 PORTNAME=	gtk-envy-theme
 PORTVERSION=	1.0.${SNAPSHOT}
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	x11-themes gnome
 MASTER_SITES=	http://www.gnome-look.org/CONTENT/content-files/
-DISTNAME=	35093-Envy
+DISTNAME=	60029-Envy
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Envy theme for GTK+ 2.0
 
 #RUN_DEPENDS=	${LOCALBASE}/share/icons/Tango:${PORTSDIR}/x11-themes/icons-tango
 
-SNAPSHOT=	20060211
+NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
+
 USE_GNOME=	gtk20
-WRKSRC=		${WRKDIR}/Envy
+
+SNAPSHOT=	20060211
 
 do-install:
-	${MKDIR} ${PREFIX}/share/themes/Envy/gtk-2.0
-	${MKDIR} ${PREFIX}/share/themes/Envy/metacity-1
-	@${CP} ${FILESDIR}/index.theme.in ${PREFIX}/share/themes/Envy/index.theme
-	@${CP} -R ${WRKDIR}/Envy/gtk-2.0/* ${PREFIX}/share/themes/Envy/gtk-2.0
-	@${CP} -R ${WRKDIR}/Envy/metacity-1/* ${PREFIX}/share/themes/Envy/metacity-1
+	@${MKDIR} ${PREFIX}/share/themes/Envy
+	${INSTALL_DATA} ${FILESDIR}/index.theme.in \
+		${PREFIX}/share/themes/Envy/index.theme
+	@(cd ${WRKSRC}/Envy \
+		&& ${COPYTREE_SHARE} . ${PREFIX}/share/themes/Envy)
 
 .include <bsd.port.mk>
diff --git a/x11-themes/gtk-envy-theme/distinfo b/x11-themes/gtk-envy-theme/distinfo
index c7b445f827d5..b363964d9797 100644
--- a/x11-themes/gtk-envy-theme/distinfo
+++ b/x11-themes/gtk-envy-theme/distinfo
@@ -1,3 +1,3 @@
-MD5 (35093-Envy.tar.gz) = e439b06d637f6f597056d4296cbffd64
-SHA256 (35093-Envy.tar.gz) = 3d0cf4c1a9ed24d6ef55e6013d88b8970e74d355231856f26c83e15d75cc9400
-SIZE (35093-Envy.tar.gz) = 44257
+MD5 (60029-Envy.tar.gz) = e439b06d637f6f597056d4296cbffd64
+SHA256 (60029-Envy.tar.gz) = 3d0cf4c1a9ed24d6ef55e6013d88b8970e74d355231856f26c83e15d75cc9400
+SIZE (60029-Envy.tar.gz) = 44257
diff --git a/x11-themes/gtk-envy-theme/pkg-descr b/x11-themes/gtk-envy-theme/pkg-descr
index 24d39bdb64ae..4b445f89f4cf 100644
--- a/x11-themes/gtk-envy-theme/pkg-descr
+++ b/x11-themes/gtk-envy-theme/pkg-descr
@@ -1,3 +1,3 @@
 Simple green GTK2 theme
 
-WWW: http://www.gnome-look.org/content/show.php?content=35093
+WWW: http://www.gnome-look.org/content/show.php?content=60029
diff --git a/x11-themes/gtk-envy-theme/pkg-plist b/x11-themes/gtk-envy-theme/pkg-plist
index cbd07ac0c24c..1355f70a924b 100644
--- a/x11-themes/gtk-envy-theme/pkg-plist
+++ b/x11-themes/gtk-envy-theme/pkg-plist
@@ -1,20 +1,4 @@
-share/themes/Envy/metacity-1/close-i.png
-share/themes/Envy/metacity-1/close-inv.png
-share/themes/Envy/metacity-1/close-pre.png
-share/themes/Envy/metacity-1/close.png
-share/themes/Envy/metacity-1/maximize-i.png
-share/themes/Envy/metacity-1/maximize-inv.png
-share/themes/Envy/metacity-1/maximize-pre.png
-share/themes/Envy/metacity-1/maximize.png
-share/themes/Envy/metacity-1/metacity-theme-1.xml
-share/themes/Envy/metacity-1/minimize-i.png
-share/themes/Envy/metacity-1/minimize-inv.png
-share/themes/Envy/metacity-1/minimize-pre.png
-share/themes/Envy/metacity-1/minimize.png
-share/themes/Envy/metacity-1/restore-i.png
-share/themes/Envy/metacity-1/restore-inv.png
-share/themes/Envy/metacity-1/restore-pre.png
-share/themes/Envy/metacity-1/restore.png
+share/themes/Envy/README
 share/themes/Envy/gtk-2.0/button-default.png
 share/themes/Envy/gtk-2.0/button-insensitive.png
 share/themes/Envy/gtk-2.0/button-normal.png
@@ -123,8 +107,24 @@ share/themes/Envy/gtk-2.0/trough.png
 share/themes/Envy/gtk-2.0/trough2-h.png
 share/themes/Envy/gtk-2.0/trough2.png
 share/themes/Envy/index.theme
-@dirrm share/themes/Envy/gtk-2.0
-@dirrm share/themes/Envy
+share/themes/Envy/metacity-1/close-i.png
+share/themes/Envy/metacity-1/close-inv.png
+share/themes/Envy/metacity-1/close-pre.png
+share/themes/Envy/metacity-1/close.png
+share/themes/Envy/metacity-1/maximize-i.png
+share/themes/Envy/metacity-1/maximize-inv.png
+share/themes/Envy/metacity-1/maximize-pre.png
+share/themes/Envy/metacity-1/maximize.png
+share/themes/Envy/metacity-1/metacity-theme-1.xml
+share/themes/Envy/metacity-1/minimize-i.png
+share/themes/Envy/metacity-1/minimize-inv.png
+share/themes/Envy/metacity-1/minimize-pre.png
+share/themes/Envy/metacity-1/minimize.png
+share/themes/Envy/metacity-1/restore-i.png
+share/themes/Envy/metacity-1/restore-inv.png
+share/themes/Envy/metacity-1/restore-pre.png
+share/themes/Envy/metacity-1/restore.png
 @dirrm share/themes/Envy/metacity-1
+@dirrm share/themes/Envy/gtk-2.0
 @dirrm share/themes/Envy
 @dirrmtry share/themes