From cc48430bd9a4f68c7e4787228669687a1bb0d45e Mon Sep 17 00:00:00 2001
From: reed <reed>
Date: Tue, 10 Oct 2006 19:34:48 +0000
Subject: Conflict with libXcomposite (currently in pkgsrc-wip).

---
 x11/Xcomposite/Makefile | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'x11/Xcomposite/Makefile')

diff --git a/x11/Xcomposite/Makefile b/x11/Xcomposite/Makefile
index cfad73c231d..6e6bd8a57f2 100644
--- a/x11/Xcomposite/Makefile
+++ b/x11/Xcomposite/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2006/04/18 19:46:17 reed Exp $
+# $NetBSD: Makefile,v 1.12 2006/10/10 19:34:48 reed Exp $
 #
 
 DISTNAME=		libXcomposite-1.0.1
@@ -12,6 +12,8 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://freedesktop.org/
 COMMENT=		Xcomposite extension (library)
 
+CONFLICTS+=		libXcomposite-[0-9]*
+
 USE_TOOLS+=		pkg-config
 USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
-- 
cgit v1.2.3