[pkgsrc/trunk]: pkgsrc/x11/compositeext Conflict with compositeproto.

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/f7bd34a48188
branches:  trunk
changeset: 510612:f7bd34a48188
user:      reed <reed%pkgsrc.org@localhost>
date:      Fri Mar 31 23:43:32 2006 +0000

description:
Conflict with compositeproto.
Bump PKGREVISION.

(This is not maintained. The official version of same headers
is compositeproto to be committed soon.)

diffstat:

 x11/compositeext/Makefile |  6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diffs (23 lines):

diff -r 2f716c9bd599 -r f7bd34a48188 x11/compositeext/Makefile
--- a/x11/compositeext/Makefile Fri Mar 31 23:29:28 2006 +0000
+++ b/x11/compositeext/Makefile Fri Mar 31 23:43:32 2006 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2006/03/04 21:31:08 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2006/03/31 23:43:32 reed Exp $
 #
 
 DISTNAME=              compositeext-2.0
-PKGREVISION=           1
+PKGREVISION=           2
 CATEGORIES=            x11 devel
 MASTER_SITES=          http://xlibs.freedesktop.org/release/
 EXTRACT_SUFX=          .tar.bz2
@@ -11,6 +11,8 @@
 HOMEPAGE=              http://xlibs.freedesktop.org/
 COMMENT=               Headers and specification for X Composite extension
 
+CONFLICTS+=            compositeproto-[0-9]*
+
 PKG_INSTALLATION_TYPES=        overwrite pkgviews
 
 USE_TOOLS+=            pkg-config