Sat Mar 8 00:13:43 2008 UTC ()

bcc, bin86 and dev86 conflict with each other.
Bump PKGREVISION.


(reed)

diff -r1.20 -r1.21 pkgsrc/devel/bcc/Makefile
diff -r1.2 -r1.3 pkgsrc/devel/dev86/Makefile

--- pkgsrc/devel/bcc/Makefile 2008/02/07 13:24:36 1.20
+++ pkgsrc/devel/bcc/Makefile 2008/03/08 00:13:43 1.21

@@ -1,11 +1,15 @@
-# $NetBSD: Makefile,v 1.20 2008/02/07 13:24:36 tnn Exp $
+# $NetBSD: Makefile,v 1.21 2008/03/08 00:13:43 reed Exp $
 
 DISTNAME=		bcc
+PKGREVISION=		1
 PKGNAME=		bcc-95.3.12
 CATEGORIES=		devel lang
 
 MAINTAINER=		tsarna@NetBSD.org
 COMMENT=		Bruce Evans' C compiler (with as and ld); can do 16-bit code
+
+CONFLICTS=		bin86-[0-9]*
+CONFLICTS+=		dev86-[0-9]*
 
 NOT_FOR_PLATFORM=	*-*-alpha *-*-x86_64	# Severe LP64 problems
 NOT_FOR_PLATFORM+=	Interix-*-*		# no <a.out.h>

--- pkgsrc/devel/dev86/Makefile 2006/11/05 20:44:04 1.2
+++ pkgsrc/devel/dev86/Makefile 2008/03/08 00:13:42 1.3

@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2006/11/05 20:44:04 rillig Exp $
+# $NetBSD: Makefile,v 1.3 2008/03/08 00:13:42 reed Exp $
 #
 
 DISTNAME=	dev86-0.16.17
+PKGREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://homepage.ntlworld.com/robert.debath/dev86/
 DISTFILES=	Dev86src-0.16.17.tar.gz
@@ -9,6 +10,9 @@
 MAINTAINER=	pierrick@bs-network.net
 HOMEPAGE=	http://www.swissgeeks.com/
 COMMENT=	Linux 8086 development environment
+
+CONFLICTS=	bcc-[0-9]*
+CONFLICTS+=	bin86-[0-9]*
 
 MAKE_FLAGS+=	MANDIR=${PREFIX}/${PKGMANDIR}