pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/devel bcc, bin86 and dev86 conflict with each other.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/c4f6f436f87f
branches:  trunk
changeset: 539541:c4f6f436f87f
user:      reed <reed%pkgsrc.org@localhost>
date:      Sat Mar 08 00:13:42 2008 +0000

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

diffstat:

 devel/bcc/Makefile   |  6 +++++-
 devel/dev86/Makefile |  6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diffs (44 lines):

diff -r 9fbd3481e70a -r c4f6f436f87f devel/bcc/Makefile
--- a/devel/bcc/Makefile        Sat Mar 08 00:08:42 2008 +0000
+++ b/devel/bcc/Makefile        Sat Mar 08 00:13:42 2008 +0000
@@ -1,12 +1,16 @@
-# $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@localhost
 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>
 
diff -r 9fbd3481e70a -r c4f6f436f87f devel/dev86/Makefile
--- a/devel/dev86/Makefile      Sat Mar 08 00:08:42 2008 +0000
+++ b/devel/dev86/Makefile      Sat Mar 08 00:13:42 2008 +0000
@@ -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
@@ -10,6 +11,9 @@
 HOMEPAGE=      http://www.swissgeeks.com/
 COMMENT=       Linux 8086 development environment
 
+CONFLICTS=     bcc-[0-9]*
+CONFLICTS+=    bin86-[0-9]*
+
 MAKE_FLAGS+=   MANDIR=${PREFIX}/${PKGMANDIR}
 
 .include "../../mk/bsd.pkg.mk"



Home | Main Index | Thread Index | Old Index