From b0d87f22e537e070f8a84802b6a09c3eec095604 Mon Sep 17 00:00:00 2001
From: jasper <jasper@openbsd.org>
Date: Wed, 7 Feb 2007 20:05:02 +0000
Subject: [PATCH] restore @conflict markers, noticed by bernd@.

---
 x11/gtk-engines2/Makefile  | 4 ++--
 x11/gtk-engines2/pkg/PLIST | 5 ++++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/x11/gtk-engines2/Makefile b/x11/gtk-engines2/Makefile
index 8f80ce31613..00627d1e336 100644
--- a/x11/gtk-engines2/Makefile
+++ b/x11/gtk-engines2/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.18 2007/01/23 23:30:23 steven Exp $
+# $OpenBSD: Makefile,v 1.19 2007/02/07 20:05:02 jasper Exp $
 
 SHARED_ONLY=		Yes
 
@@ -6,7 +6,7 @@ COMMENT=		"collection of theme engines for GTK+2"
 
 V=			2.8.2
 DISTNAME=		gtk-engines-${V}
-PKGNAME=		gtk-engines2-${V}
+PKGNAME=		gtk-engines2-${V}p0
 CATEGORIES=		x11
 
 HOMEPAGE=		http://www.gnome.org
diff --git a/x11/gtk-engines2/pkg/PLIST b/x11/gtk-engines2/pkg/PLIST
index 79b23ba07b0..0c83a2e4cbc 100644
--- a/x11/gtk-engines2/pkg/PLIST
+++ b/x11/gtk-engines2/pkg/PLIST
@@ -1,4 +1,7 @@
-@comment $OpenBSD: PLIST,v 1.15 2007/01/19 14:53:23 jasper Exp $
+@comment $OpenBSD: PLIST,v 1.16 2007/02/07 20:05:02 jasper Exp $
+@conflict gtk-thinice-engine-*
+@conflict gtk2-clearlooks-engine-*
+@conflict gnome-themes-<2.10
 lib/gtk-2.0/2.4.0/engines/libclearlooks.a
 lib/gtk-2.0/2.4.0/engines/libclearlooks.la
 lib/gtk-2.0/2.4.0/engines/libclearlooks.so