3 files changed, 15 insertions, 9 deletions

diff --git a/x11-themes/clearlooks-metacity/Makefile b/x11-themes/clearlooks-metacity/Makefile
index 5c945b3bc02f..2fe0839f3847 100644
--- a/x11-themes/clearlooks-metacity/Makefile
+++ b/x11-themes/clearlooks-metacity/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	clearlooks-metacity
 PORTVERSION=	0.6
+PORTREVISION=	1
 CATEGORIES=	x11-themes
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	clearlooks
@@ -14,6 +15,8 @@ MASTER_SITE_SUBDIR=	clearlooks
 MAINTAINER=	ahze@FreeBSD.org
 COMMENT=	Clearlooks Metacity theme
 
+CONFLICTS=	clearlooks-[0-9]* clearlooks-themes-[0-9]*
+
 WRKSRC=		${WRKDIR}/Clearlooks/metacity-1/
 USE_GNOME=	metacity gnomeprefix
 USE_X_PREFIX=	yes
diff --git a/x11-themes/clearlooks/Makefile b/x11-themes/clearlooks/Makefile
index 0d3c4b04e01b..9fd0bf2d0894 100644
--- a/x11-themes/clearlooks/Makefile
+++ b/x11-themes/clearlooks/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME?=	clearlooks
 PORTVERSION=	0.6.1
+PORTREVISION=	1
 CATEGORIES=	x11-themes
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	clearlooks
@@ -15,16 +16,17 @@ DISTNAME=	clearlooks-${PORTVERSION}
 MAINTAINER=	ahze@FreeBSD.org
 COMMENT?=	GTK+ 2.x engine based on Bluecurve
 
+CONFLICTS=	clearlooks-metacity-[0-9]*
+
 USE_BZIP2=	yes
 USE_LIBTOOL_VER=15
-USE_GNOME=	gtk20
+USE_GNOME=	gtk20 gnomehier
 USE_X_PREFIX=	yes
 USE_REINPLACE=	yes
 
 CONFIGURE_ENV=	CPPFLAGS="-I${X11BASE}/include" \
 		LDFLAGS="-L${X11BASE}/lib"
 
-OPTIONS=	METACITY "Depend on MetaCity Theme" On
 .if defined(PORTNAME) && ${PORTNAME} == "clearlooks"
 OPTIONS+=	ANIMATION "Enable experimental animated progressbars" Off
 .endif
@@ -32,10 +34,10 @@ OPTIONS+=	ANIMATION "Enable experimental animated progressbars" Off
 .include <bsd.port.pre.mk>
 
 .if ${PORTNAME} == "clearlooks"
-CONFLICTS=	gtk-engines2-[0-9]* clearlooks-themes[0-9]*
+CONFLICTS+=	gtk-engines2-[0-9]* clearlooks-themes[0-9]*
 PLIST_SUB+=	ENGINE=""
 .else
-CONFLICTS=	clearlooks-[0-9]*
+CONFLICTS+=	clearlooks-[0-9]*
 
 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
@@ -46,10 +48,6 @@ INSTALL_WRKSRC=	${WRKSRC}/themes
 PLIST_SUB+=	ENGINE="@comment "
 .endif
 
-.if !defined(WITHOUT_METACITY)
-RUN_DEPENDS+=	${X11BASE}/share/gnome/themes/Clearlooks/metacity-1/metacity-theme-1.xml:${PORTSDIR}/x11-themes/clearlooks-metacity
-.endif
-
 .if defined(WITH_ANIMATION)
 CONFIGURE_ARGS+=	--enable-animation
 .endif
@@ -64,10 +62,12 @@ pre-everything::
 	fi
 .endif
 
-.if ${PORTNAME} != "clearlooks"
 post-patch:
+.if ${PORTNAME} != "clearlooks"
 	@${REINPLACE_CMD} -e 's|gtkrc||' \
 		${WRKSRC}/themes/Clearlooks/gtk-2.0/Makefile.in
 .endif
+	@${REINPLACE_CMD} -e 's|$$(gnome_data)/themes/Clearlooks/metacity-1|${PREFIX}/share/gnome/themes/Clearlooks/metacity-1|' \
+		${WRKSRC}/themes/Clearlooks/metacity-1/Makefile.in
 
 .include <bsd.port.post.mk>
diff --git a/x11-themes/clearlooks/pkg-plist b/x11-themes/clearlooks/pkg-plist
index 1689ca3671b9..2758e366a762 100644
--- a/x11-themes/clearlooks/pkg-plist
+++ b/x11-themes/clearlooks/pkg-plist
@@ -36,6 +36,7 @@ share/themes/Clearlooks-Olive/gtk-2.0/gtkrc
 share/themes/Clearlooks-Quicksilver/gtk-2.0/gtkrc
 %%ENGINE%%share/themes/Clearlooks/gtk-2.0/gtkrc
 share/themes/Clearlooks/index.theme
+share/gnome/themes/Clearlooks/metacity-1/metacity-theme-1.xml
 @dirrm share/themes/Clearlooks/gtk-2.0
 @dirrm share/themes/Clearlooks-Quicksilver/gtk-2.0
 @dirrm share/themes/Clearlooks-Quicksilver
@@ -44,6 +45,8 @@ share/themes/Clearlooks/index.theme
 @dirrm share/themes/Clearlooks-DeepSky/gtk-2.0
 @dirrm share/themes/Clearlooks-DeepSky
 @dirrm share/themes/Clearlooks
+@dirrm share/gnome/themes/Clearlooks/metacity-1
+@dirrm share/gnome/themes/Clearlooks
 @dirrm share/icons/Clearlooks/24x24/gtk
 @dirrm share/icons/Clearlooks/24x24
 @dirrm share/icons/Clearlooks/16x16/gtk