From 39b4bb375bc6dcf26f50485a370bdabdf01edb9a Mon Sep 17 00:00:00 2001
From: ajacoutot <ajacoutot@openbsd.org>
Date: Sun, 17 Apr 2011 15:11:56 +0000
Subject: [PATCH] Depends on x11/gtk-engines2 instead of gtk2-clearlook,
 because that's where the clearlook engine is.

---
 graphics/rawstudio/Makefile |  6 +++---
 x11/gnome/themes/Makefile   | 15 +++++----------
 x11/gnome/themes/pkg/PLIST  |  5 +++--
 3 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/graphics/rawstudio/Makefile b/graphics/rawstudio/Makefile
index 4b6f63d675f..bbe1779d062 100644
--- a/graphics/rawstudio/Makefile
+++ b/graphics/rawstudio/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.12 2010/11/17 08:05:16 espie Exp $
+# $OpenBSD: Makefile,v 1.13 2011/04/17 15:11:57 ajacoutot Exp $
 
 COMMENT =	tool for working with RAW images
 
 DISTNAME =	rawstudio-1.2
-REVISION =	3
+REVISION =	4
 
 CATEGORIES =	graphics
 
@@ -43,7 +43,7 @@ LIB_DEPENDS +=	x11/dbus \
 		textproc/libxml
 
 RUN_DEPENDS =	devel/desktop-file-utils \
-		x11/gtk2-clearlooks-engine
+		x11/gtk-engines2
 
 NO_REGRESS =	Yes
 
diff --git a/x11/gnome/themes/Makefile b/x11/gnome/themes/Makefile
index 75b87c7c6e4..3b79cbe801d 100644
--- a/x11/gnome/themes/Makefile
+++ b/x11/gnome/themes/Makefile
@@ -1,10 +1,12 @@
-# $OpenBSD: Makefile,v 1.49 2010/11/22 08:36:58 espie Exp $
+# $OpenBSD: Makefile,v 1.50 2011/04/17 15:11:56 ajacoutot Exp $
 
 COMMENT=		themes collection for GNOME
 
 GNOME_PROJECT=		gnome-themes
 GNOME_VERSION=		2.32.1
 
+REVISION=		0
+
 CATEGORIES=		x11
 
 # LGPLv2.1
@@ -17,17 +19,10 @@ MODULES=		x11/gnome
 
 BUILD_DEPENDS=		${RUN_DEPENDS} \
 			x11/icon-naming-utils>=0.8.90
-RUN_DEPENDS=		devel/gettext
-
-# we get the Clearlooks index.theme file from gtk2-clearlooks-engine;
-# this way, both packages can be installed alongside.
-RUN_DEPENDS+=		 x11/gtk2-clearlooks-engine>=0.6.2p8
+RUN_DEPENDS=		devel/gettext \
+			x11/gtk-engines2
 
 CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
 			LDFLAGS="-L${LOCALBASE}/lib"
 
-# remove file already provided by gtk2-clearlooks-engine
-post-install:
-	rm -f ${PREFIX}/share/themes/Clearlooks/index.theme
-
 .include <bsd.port.mk>
diff --git a/x11/gnome/themes/pkg/PLIST b/x11/gnome/themes/pkg/PLIST
index b27e229b90e..66f0de84749 100644
--- a/x11/gnome/themes/pkg/PLIST
+++ b/x11/gnome/themes/pkg/PLIST
@@ -1,5 +1,5 @@
-@comment $OpenBSD: PLIST,v 1.36 2010/11/15 17:41:03 ajacoutot Exp $
-@conflict gtk2-clearlooks-engine-<0.6.2p7
+@comment $OpenBSD: PLIST,v 1.37 2011/04/17 15:11:57 ajacoutot Exp $
+@conflict gtk2-clearlooks-engine-*
 share/icons/Crux/
 share/icons/Crux/16x16/
 share/icons/Crux/16x16/actions/
@@ -2747,6 +2747,7 @@ share/locale/zh_CN/LC_MESSAGES/gnome-themes.mo
 share/locale/zh_HK/LC_MESSAGES/gnome-themes.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-themes.mo
 share/themes/
+share/themes/Clearlooks/index.theme
 share/themes/Clearlooks/metacity-1/
 share/themes/Clearlooks/metacity-1/metacity-theme-1.xml
 share/themes/ClearlooksClassic/