[pkgsrc/trunk]: pkgsrc/x11/Xcomposite Conflict with libXcomposite (currently ...

[reed <reed%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/acb05e2a6c25
branches:  trunk
changeset: 519824:acb05e2a6c25
user:      reed <reed%pkgsrc.org@localhost>
date:      Tue Oct 10 19:34:48 2006 +0000

description:
Conflict with libXcomposite (currently in pkgsrc-wip).

diffstat:

 x11/Xcomposite/Makefile |  4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diffs (18 lines):

diff -r 332c4fc513fb -r acb05e2a6c25 x11/Xcomposite/Makefile
--- a/x11/Xcomposite/Makefile   Tue Oct 10 19:05:42 2006 +0000
+++ b/x11/Xcomposite/Makefile   Tue Oct 10 19:34:48 2006 +0000
@@ -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 @@
 HOMEPAGE=              http://freedesktop.org/
 COMMENT=               Xcomposite extension (library)
 
+CONFLICTS+=            libXcomposite-[0-9]*
+
 USE_TOOLS+=            pkg-config
 USE_LIBTOOL=           yes
 GNU_CONFIGURE=         yes