2 files changed, 23 insertions, 24 deletions

diff --git a/x11-themes/gtk-envy-theme/Makefile b/x11-themes/gtk-envy-theme/Makefile
index 2233370230b2..f0c92e98eec8 100644
--- a/x11-themes/gtk-envy-theme/Makefile
+++ b/x11-themes/gtk-envy-theme/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gtk-envy-theme
 PORTVERSION=	1.0.${SNAPSHOT}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-themes gnome
 MASTER_SITES=	http://www.gnome-look.org/CONTENT/content-files/
 DISTNAME=	35093-Envy
@@ -24,9 +24,9 @@ WRKSRC=		${WRKDIR}/Envy
 
 do-install:
 	${MKDIR} ${PREFIX}/share/themes/Envy/gtk-2.0
-	${MKDIR} ${PREFIX}/share/gnome/themes/Envy/metacity-1
+	${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/gnome/themes/Envy/metacity-1
+	@${CP} -R ${WRKDIR}/Envy/metacity-1/* ${PREFIX}/share/themes/Envy/metacity-1
 
 .include <bsd.port.mk>
diff --git a/x11-themes/gtk-envy-theme/pkg-plist b/x11-themes/gtk-envy-theme/pkg-plist
index f6634e728edc..cbd07ac0c24c 100644
--- a/x11-themes/gtk-envy-theme/pkg-plist
+++ b/x11-themes/gtk-envy-theme/pkg-plist
@@ -1,20 +1,20 @@
-share/gnome/themes/Envy/metacity-1/close-i.png
-share/gnome/themes/Envy/metacity-1/close-inv.png
-share/gnome/themes/Envy/metacity-1/close-pre.png
-share/gnome/themes/Envy/metacity-1/close.png
-share/gnome/themes/Envy/metacity-1/maximize-i.png
-share/gnome/themes/Envy/metacity-1/maximize-inv.png
-share/gnome/themes/Envy/metacity-1/maximize-pre.png
-share/gnome/themes/Envy/metacity-1/maximize.png
-share/gnome/themes/Envy/metacity-1/metacity-theme-1.xml
-share/gnome/themes/Envy/metacity-1/minimize-i.png
-share/gnome/themes/Envy/metacity-1/minimize-inv.png
-share/gnome/themes/Envy/metacity-1/minimize-pre.png
-share/gnome/themes/Envy/metacity-1/minimize.png
-share/gnome/themes/Envy/metacity-1/restore-i.png
-share/gnome/themes/Envy/metacity-1/restore-inv.png
-share/gnome/themes/Envy/metacity-1/restore-pre.png
-share/gnome/themes/Envy/metacity-1/restore.png
+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/gtk-2.0/button-default.png
 share/themes/Envy/gtk-2.0/button-insensitive.png
 share/themes/Envy/gtk-2.0/button-normal.png
@@ -125,7 +125,6 @@ share/themes/Envy/gtk-2.0/trough2.png
 share/themes/Envy/index.theme
 @dirrm share/themes/Envy/gtk-2.0
 @dirrm share/themes/Envy
-@dirrm share/gnome/themes/Envy/metacity-1
-@dirrm share/gnome/themes/Envy
-@dirrmtry share/gnome/themes
-@dirrmtry share/gnome
+@dirrm share/themes/Envy/metacity-1
+@dirrm share/themes/Envy
+@dirrmtry share/themes