2 files changed, 41 insertions, 40 deletions

diff --git a/x11-themes/gtk-digital-harmony-theme/Makefile b/x11-themes/gtk-digital-harmony-theme/Makefile
index d6b052846eb0..514f86a188a3 100644
--- a/x11-themes/gtk-digital-harmony-theme/Makefile
+++ b/x11-themes/gtk-digital-harmony-theme/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	digital-harmony
 PORTVERSION=	1.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-themes gnome
 MASTER_SITES=	http://www.users.monornet.hu/linux/gtk2/oldies/
 PKGNAMEPREFIX=	${TYPE}-
@@ -28,7 +28,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-harmony-theme/pkg-plist b/x11-themes/gtk-digital-harmony-theme/pkg-plist
index b79e87fbb120..8bcbfd162e46 100644
--- a/x11-themes/gtk-digital-harmony-theme/pkg-plist
+++ b/x11-themes/gtk-digital-harmony-theme/pkg-plist
@@ -176,41 +176,42 @@
 %%GTK20%%@dirrm share/themes/Digital-Harmony/gtk-2.0
 %%GTK20%%share/themes/Digital-Harmony/index.theme
 %%GTK20%%@dirrm share/themes/Digital-Harmony
-%%METACITY%%share/gnome/themes/Digital-Harmony/metacity-1/button-close-focused.png
-%%METACITY%%share/gnome/themes/Digital-Harmony/metacity-1/button-close-pressed.png
-%%METACITY%%share/gnome/themes/Digital-Harmony/metacity-1/button-close-unfocused.png
-%%METACITY%%share/gnome/themes/Digital-Harmony/metacity-1/button-maximize-focused.png
-%%METACITY%%share/gnome/themes/Digital-Harmony/metacity-1/button-maximize-pressed.png
-%%METACITY%%share/gnome/themes/Digital-Harmony/metacity-1/button-maximize-unfocused.png
-%%METACITY%%share/gnome/themes/Digital-Harmony/metacity-1/button-menu-focused.png
-%%METACITY%%share/gnome/themes/Digital-Harmony/metacity-1/button-menu-pressed.png
-%%METACITY%%share/gnome/themes/Digital-Harmony/metacity-1/button-menu-unfocused.png
-%%METACITY%%share/gnome/themes/Digital-Harmony/metacity-1/button-minimize-focused.png
-%%METACITY%%share/gnome/themes/Digital-Harmony/metacity-1/button-minimize-pressed.png
-%%METACITY%%share/gnome/themes/Digital-Harmony/metacity-1/button-minimize-unfocused.png
-%%METACITY%%share/gnome/themes/Digital-Harmony/metacity-1/frame-bottom-left-focused.png
-%%METACITY%%share/gnome/themes/Digital-Harmony/metacity-1/frame-bottom-left-unfocused.png
-%%METACITY%%share/gnome/themes/Digital-Harmony/metacity-1/frame-bottom-mid-focused.png
-%%METACITY%%share/gnome/themes/Digital-Harmony/metacity-1/frame-bottom-mid-unfocused.png
-%%METACITY%%share/gnome/themes/Digital-Harmony/metacity-1/frame-bottom-right-focused.png
-%%METACITY%%share/gnome/themes/Digital-Harmony/metacity-1/frame-bottom-right-unfocused.png
-%%METACITY%%share/gnome/themes/Digital-Harmony/metacity-1/frame-left-focused.png
-%%METACITY%%share/gnome/themes/Digital-Harmony/metacity-1/frame-left-unfocused.png
-%%METACITY%%share/gnome/themes/Digital-Harmony/metacity-1/frame-right-focused.png
-%%METACITY%%share/gnome/themes/Digital-Harmony/metacity-1/frame-right-unfocused.png
-%%METACITY%%share/gnome/themes/Digital-Harmony/metacity-1/metacity-theme-1.xml
-%%METACITY%%share/gnome/themes/Digital-Harmony/metacity-1/titlebar-left-focused.png
-%%METACITY%%share/gnome/themes/Digital-Harmony/metacity-1/titlebar-left-shaded-focused.png
-%%METACITY%%share/gnome/themes/Digital-Harmony/metacity-1/titlebar-left-shaded-unfocused.png
-%%METACITY%%share/gnome/themes/Digital-Harmony/metacity-1/titlebar-left-unfocused.png
-%%METACITY%%share/gnome/themes/Digital-Harmony/metacity-1/titlebar-mid-focused.png
-%%METACITY%%share/gnome/themes/Digital-Harmony/metacity-1/titlebar-mid-shaded-focused.png
-%%METACITY%%share/gnome/themes/Digital-Harmony/metacity-1/titlebar-mid-shaded-unfocused.png
-%%METACITY%%share/gnome/themes/Digital-Harmony/metacity-1/titlebar-mid-unfocused.png
-%%METACITY%%share/gnome/themes/Digital-Harmony/metacity-1/titlebar-right-focused.png
-%%METACITY%%share/gnome/themes/Digital-Harmony/metacity-1/titlebar-right-shaded-focused.png
-%%METACITY%%share/gnome/themes/Digital-Harmony/metacity-1/titlebar-right-shaded-unfocused.png
-%%METACITY%%share/gnome/themes/Digital-Harmony/metacity-1/titlebar-right-unfocused.png
-%%METACITY%%@dirrm share/gnome/themes/Digital-Harmony/metacity-1
-%%METACITY%%share/gnome/themes/Digital-Harmony/index.theme
-%%METACITY%%@dirrm share/gnome/themes/Digital-Harmony
+%%METACITY%%share/themes/Digital-Harmony/metacity-1/button-close-focused.png
+%%METACITY%%share/themes/Digital-Harmony/metacity-1/button-close-pressed.png
+%%METACITY%%share/themes/Digital-Harmony/metacity-1/button-close-unfocused.png
+%%METACITY%%share/themes/Digital-Harmony/metacity-1/button-maximize-focused.png
+%%METACITY%%share/themes/Digital-Harmony/metacity-1/button-maximize-pressed.png
+%%METACITY%%share/themes/Digital-Harmony/metacity-1/button-maximize-unfocused.png
+%%METACITY%%share/themes/Digital-Harmony/metacity-1/button-menu-focused.png
+%%METACITY%%share/themes/Digital-Harmony/metacity-1/button-menu-pressed.png
+%%METACITY%%share/themes/Digital-Harmony/metacity-1/button-menu-unfocused.png
+%%METACITY%%share/themes/Digital-Harmony/metacity-1/button-minimize-focused.png
+%%METACITY%%share/themes/Digital-Harmony/metacity-1/button-minimize-pressed.png
+%%METACITY%%share/themes/Digital-Harmony/metacity-1/button-minimize-unfocused.png
+%%METACITY%%share/themes/Digital-Harmony/metacity-1/frame-bottom-left-focused.png
+%%METACITY%%share/themes/Digital-Harmony/metacity-1/frame-bottom-left-unfocused.png
+%%METACITY%%share/themes/Digital-Harmony/metacity-1/frame-bottom-mid-focused.png
+%%METACITY%%share/themes/Digital-Harmony/metacity-1/frame-bottom-mid-unfocused.png
+%%METACITY%%share/themes/Digital-Harmony/metacity-1/frame-bottom-right-focused.png
+%%METACITY%%share/themes/Digital-Harmony/metacity-1/frame-bottom-right-unfocused.png
+%%METACITY%%share/themes/Digital-Harmony/metacity-1/frame-left-focused.png
+%%METACITY%%share/themes/Digital-Harmony/metacity-1/frame-left-unfocused.png
+%%METACITY%%share/themes/Digital-Harmony/metacity-1/frame-right-focused.png
+%%METACITY%%share/themes/Digital-Harmony/metacity-1/frame-right-unfocused.png
+%%METACITY%%share/themes/Digital-Harmony/metacity-1/metacity-theme-1.xml
+%%METACITY%%share/themes/Digital-Harmony/metacity-1/titlebar-left-focused.png
+%%METACITY%%share/themes/Digital-Harmony/metacity-1/titlebar-left-shaded-focused.png
+%%METACITY%%share/themes/Digital-Harmony/metacity-1/titlebar-left-shaded-unfocused.png
+%%METACITY%%share/themes/Digital-Harmony/metacity-1/titlebar-left-unfocused.png
+%%METACITY%%share/themes/Digital-Harmony/metacity-1/titlebar-mid-focused.png
+%%METACITY%%share/themes/Digital-Harmony/metacity-1/titlebar-mid-shaded-focused.png
+%%METACITY%%share/themes/Digital-Harmony/metacity-1/titlebar-mid-shaded-unfocused.png
+%%METACITY%%share/themes/Digital-Harmony/metacity-1/titlebar-mid-unfocused.png
+%%METACITY%%share/themes/Digital-Harmony/metacity-1/titlebar-right-focused.png
+%%METACITY%%share/themes/Digital-Harmony/metacity-1/titlebar-right-shaded-focused.png
+%%METACITY%%share/themes/Digital-Harmony/metacity-1/titlebar-right-shaded-unfocused.png
+%%METACITY%%share/themes/Digital-Harmony/metacity-1/titlebar-right-unfocused.png
+%%METACITY%%@dirrm share/themes/Digital-Harmony/metacity-1
+%%METACITY%%share/themes/Digital-Harmony/index.theme
+%%METACITY%%@dirrm share/themes/Digital-Harmony
+@dirrmtry share/themes