[pkgsrc/trunk]: pkgsrc/x11/fixesext Conflict with fixesproto.

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/2f716c9bd599
branches:  trunk
changeset: 510611:2f716c9bd599
user:      reed <reed%pkgsrc.org@localhost>
date:      Fri Mar 31 23:29:28 2006 +0000

description:
Conflict with fixesproto.
Bump PKGREVISION.

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

diffstat:

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

diffs (23 lines):

diff -r c3f356c9ecc8 -r 2f716c9bd599 x11/fixesext/Makefile
--- a/x11/fixesext/Makefile     Fri Mar 31 23:28:41 2006 +0000
+++ b/x11/fixesext/Makefile     Fri Mar 31 23:29:28 2006 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.15 2006/03/04 21:31:08 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2006/03/31 23:29:28 reed Exp $
 #
 
 DISTNAME=              fixesext-2.0.1
-PKGREVISION=           1
+PKGREVISION=           2
 CATEGORIES=            x11 devel
 MASTER_SITES=          http://xlibs.freedesktop.org/release/
 EXTRACT_SUFX=          .tar.bz2
@@ -11,6 +11,8 @@
 HOMEPAGE=              http://www.freedesktop.org/Software/FixesExt
 COMMENT=               X Fixes extension headers and specification
 
+CONFLICTS+=            fixesproto-[0-9]*
+
 PKG_INSTALLATION_TYPES=        overwrite pkgviews
 
 USE_TOOLS+=            pkg-config