aboutsummaryrefslogtreecommitdiffstats
path: root/devel
diff options
context:
space:
mode:
authoralepulver <alepulver@FreeBSD.org>2008-02-21 05:17:08 +0800
committeralepulver <alepulver@FreeBSD.org>2008-02-21 05:17:08 +0800
commit636720e0dc060dd63278079e257b57f77b0921a7 (patch)
tree35fb3f697016d4ada50c5dd254953be5d9e2d544 /devel
parentf13eca234ad1dde3aa03358699a531c8fbcfced6 (diff)
downloadfreebsd-ports-gnome-636720e0dc060dd63278079e257b57f77b0921a7.tar.gz
freebsd-ports-gnome-636720e0dc060dd63278079e257b57f77b0921a7.tar.zst
freebsd-ports-gnome-636720e0dc060dd63278079e257b57f77b0921a7.zip
- Add CONFLICTS entry for recently added devel/dev86.
Diffstat (limited to 'devel')
-rw-r--r--devel/bcc/Makefile2
-rw-r--r--devel/bin86/Makefile2
2 files changed, 2 insertions, 2 deletions
diff --git a/devel/bcc/Makefile b/devel/bcc/Makefile
index a9dd25af31de..1c6ea218fd3a 100644
--- a/devel/bcc/Makefile
+++ b/devel/bcc/Makefile
@@ -13,7 +13,7 @@ DISTNAME= ${PORTNAME}
MAINTAINER= joerg@FreeBSD.org
COMMENT= Bruce's C compiler (with as and ld); can do 16-bit code
-CONFLICTS= bin86-*
+CONFLICTS= bin86-[0-9]* dev86-[0-9]*
MAN1= as86.1 bcc.1 bcc-cc1.1 ld86.1
.if !defined(NOMANCOMPRESS)
MANCOMPRESSED= yes
diff --git a/devel/bin86/Makefile b/devel/bin86/Makefile
index 4549273405f1..eaafa7f277ab 100644
--- a/devel/bin86/Makefile
+++ b/devel/bin86/Makefile
@@ -15,7 +15,7 @@ MAINTAINER= shaun@FreeBSD.org
COMMENT= 16-bit assembler and loader (conflicts with devel/bcc)
BINS= as/as86 ld/ld86 ld/objchop ld/catimage ld/objdump86
-CONFLICTS= bcc-[0-9]*
+CONFLICTS= bcc-[0-9]* dev86-[0-9]*
PORTDOCS= ChangeLog README README-0.4
MAN1= as86.1 ld86.1