2 files changed, 34 insertions, 33 deletions

diff --git a/x11-themes/gtk-digital-cream-theme/Makefile b/x11-themes/gtk-digital-cream-theme/Makefile
index a92fa830094a..d277b93b1a68 100644
--- a/x11-themes/gtk-digital-cream-theme/Makefile
+++ b/x11-themes/gtk-digital-cream-theme/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	digital-cream
 PORTVERSION=	1.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-themes gnome
 MASTER_SITES=	http://www.users.monornet.hu/linux/gtk2/oldies/
 PKGNAMEPREFIX=	${TYPE}-
@@ -29,7 +29,7 @@ THEME_DIR=	${PREFIX}/share/themes/${THEME_NAME}
 PLIST_SUB+=	GTK20="" METACITY="@comment "
 USE_GNOME=	gtk20
 .else	# metacity
-THEME_DIR=	${PREFIX}/share/gnome/themes/${THEME_NAME}
+THEME_DIR=	${PREFIX}/share/themes/${THEME_NAME}
 PLIST_SUB+=	GTK20="@comment " METACITY=""
 USE_GNOME=	gnomehier
 .endif
diff --git a/x11-themes/gtk-digital-cream-theme/pkg-plist b/x11-themes/gtk-digital-cream-theme/pkg-plist
index 091cf19fa928..018bfb18f965 100644
--- a/x11-themes/gtk-digital-cream-theme/pkg-plist
+++ b/x11-themes/gtk-digital-cream-theme/pkg-plist
@@ -232,34 +232,35 @@
 %%GTK20%%@dirrm share/themes/Digital-Cream/gtk-2.0
 %%GTK20%%share/themes/Digital-Cream/index.theme
 %%GTK20%%@dirrm share/themes/Digital-Cream
-%%METACITY%%share/gnome/themes/Digital-Cream/metacity-1/button-close-focus.png
-%%METACITY%%share/gnome/themes/Digital-Cream/metacity-1/button-close-push.png
-%%METACITY%%share/gnome/themes/Digital-Cream/metacity-1/button-close.png
-%%METACITY%%share/gnome/themes/Digital-Cream/metacity-1/button-inactive.png
-%%METACITY%%share/gnome/themes/Digital-Cream/metacity-1/button-max-focus.png
-%%METACITY%%share/gnome/themes/Digital-Cream/metacity-1/button-max-push.png
-%%METACITY%%share/gnome/themes/Digital-Cream/metacity-1/button-max.png
-%%METACITY%%share/gnome/themes/Digital-Cream/metacity-1/button-min-focus.png
-%%METACITY%%share/gnome/themes/Digital-Cream/metacity-1/button-min-push.png
-%%METACITY%%share/gnome/themes/Digital-Cream/metacity-1/button-min.png
-%%METACITY%%share/gnome/themes/Digital-Cream/metacity-1/close-button-inactive.png
-%%METACITY%%share/gnome/themes/Digital-Cream/metacity-1/close_normal.png
-%%METACITY%%share/gnome/themes/Digital-Cream/metacity-1/close_normal.svg
-%%METACITY%%share/gnome/themes/Digital-Cream/metacity-1/close_prelight.png
-%%METACITY%%share/gnome/themes/Digital-Cream/metacity-1/left-side-inactive.png
-%%METACITY%%share/gnome/themes/Digital-Cream/metacity-1/left-side.png
-%%METACITY%%share/gnome/themes/Digital-Cream/metacity-1/maximize_normal.png
-%%METACITY%%share/gnome/themes/Digital-Cream/metacity-1/maximize_prelight.png
-%%METACITY%%share/gnome/themes/Digital-Cream/metacity-1/menu-button-inactive.png
-%%METACITY%%share/gnome/themes/Digital-Cream/metacity-1/menu-button-push.png
-%%METACITY%%share/gnome/themes/Digital-Cream/metacity-1/menu-button.png
-%%METACITY%%share/gnome/themes/Digital-Cream/metacity-1/metacity-theme-1.xml
-%%METACITY%%share/gnome/themes/Digital-Cream/metacity-1/minimize_normal.png
-%%METACITY%%share/gnome/themes/Digital-Cream/metacity-1/minimize_prelight.png
-%%METACITY%%share/gnome/themes/Digital-Cream/metacity-1/right-side-inactive.png
-%%METACITY%%share/gnome/themes/Digital-Cream/metacity-1/right-side.png
-%%METACITY%%share/gnome/themes/Digital-Cream/metacity-1/title-bar-inactive.png
-%%METACITY%%share/gnome/themes/Digital-Cream/metacity-1/title-bar.png
-%%METACITY%%@dirrm share/gnome/themes/Digital-Cream/metacity-1
-%%METACITY%%share/gnome/themes/Digital-Cream/index.theme
-%%METACITY%%@dirrm share/gnome/themes/Digital-Cream
+%%METACITY%%share/themes/Digital-Cream/metacity-1/button-close-focus.png
+%%METACITY%%share/themes/Digital-Cream/metacity-1/button-close-push.png
+%%METACITY%%share/themes/Digital-Cream/metacity-1/button-close.png
+%%METACITY%%share/themes/Digital-Cream/metacity-1/button-inactive.png
+%%METACITY%%share/themes/Digital-Cream/metacity-1/button-max-focus.png
+%%METACITY%%share/themes/Digital-Cream/metacity-1/button-max-push.png
+%%METACITY%%share/themes/Digital-Cream/metacity-1/button-max.png
+%%METACITY%%share/themes/Digital-Cream/metacity-1/button-min-focus.png
+%%METACITY%%share/themes/Digital-Cream/metacity-1/button-min-push.png
+%%METACITY%%share/themes/Digital-Cream/metacity-1/button-min.png
+%%METACITY%%share/themes/Digital-Cream/metacity-1/close-button-inactive.png
+%%METACITY%%share/themes/Digital-Cream/metacity-1/close_normal.png
+%%METACITY%%share/themes/Digital-Cream/metacity-1/close_normal.svg
+%%METACITY%%share/themes/Digital-Cream/metacity-1/close_prelight.png
+%%METACITY%%share/themes/Digital-Cream/metacity-1/left-side-inactive.png
+%%METACITY%%share/themes/Digital-Cream/metacity-1/left-side.png
+%%METACITY%%share/themes/Digital-Cream/metacity-1/maximize_normal.png
+%%METACITY%%share/themes/Digital-Cream/metacity-1/maximize_prelight.png
+%%METACITY%%share/themes/Digital-Cream/metacity-1/menu-button-inactive.png
+%%METACITY%%share/themes/Digital-Cream/metacity-1/menu-button-push.png
+%%METACITY%%share/themes/Digital-Cream/metacity-1/menu-button.png
+%%METACITY%%share/themes/Digital-Cream/metacity-1/metacity-theme-1.xml
+%%METACITY%%share/themes/Digital-Cream/metacity-1/minimize_normal.png
+%%METACITY%%share/themes/Digital-Cream/metacity-1/minimize_prelight.png
+%%METACITY%%share/themes/Digital-Cream/metacity-1/right-side-inactive.png
+%%METACITY%%share/themes/Digital-Cream/metacity-1/right-side.png
+%%METACITY%%share/themes/Digital-Cream/metacity-1/title-bar-inactive.png
+%%METACITY%%share/themes/Digital-Cream/metacity-1/title-bar.png
+%%METACITY%%@dirrm share/themes/Digital-Cream/metacity-1
+%%METACITY%%share/themes/Digital-Cream/index.theme
+%%METACITY%%@dirrm share/themes/Digital-Cream
+@dirrmtry share/themes