aboutsummaryrefslogtreecommitdiff
path: root/sysutils
diff options
context:
space:
mode:
authorAlexander Leidinger <netchild@FreeBSD.org>2003-08-19 16:22:06 +0000
committerAlexander Leidinger <netchild@FreeBSD.org>2003-08-19 16:22:06 +0000
commit6019d07548091611bc7ee7341db5e869c87abe71 (patch)
tree0d4c513fc7f6fab86855b53634d618ab99905cc3 /sysutils
parent16790c2ec79346aa3fb8341e36f48b56fd95a64b (diff)
Notes
Diffstat (limited to 'sysutils')
-rw-r--r--sysutils/cdrtools/Makefile2
-rw-r--r--sysutils/mkisofs/Makefile5
2 files changed, 6 insertions, 1 deletions
diff --git a/sysutils/cdrtools/Makefile b/sysutils/cdrtools/Makefile
index e13ffc537e4b..47fd2e2ee82b 100644
--- a/sysutils/cdrtools/Makefile
+++ b/sysutils/cdrtools/Makefile
@@ -17,6 +17,8 @@ DISTNAME= cdrtools-2.00.3
MAINTAINER= dirk@FreeBSD.org
COMMENT?= Cdrecord, mkisofs and several other programs to record CD-R[W]
+CONFLICTS?= cdrtools-devel-*
+
.if defined(MKISOFS)
MAN8= apple_driver.8 isoinfo.8 mkhybrid.8 mkisofs.8
.else
diff --git a/sysutils/mkisofs/Makefile b/sysutils/mkisofs/Makefile
index 8d54999f70dc..ef07a5cc2e49 100644
--- a/sysutils/mkisofs/Makefile
+++ b/sysutils/mkisofs/Makefile
@@ -10,8 +10,11 @@ PORTVERSION= 2.0.3
PORTREVISION= 0
CATEGORIES= sysutils
-MASTERDIR= ${.CURDIR}/../cdrtools
COMMENT= Create iso9660/Rock Ridge/Joliet filesystems
+
+CONFLICTS= mkisofs-devel-*
+
+MASTERDIR= ${.CURDIR}/../cdrtools
DESCR= ${PKGDIR}/pkg-descr.mkisofs
PLIST= ${PKGDIR}/pkg-plist.mkisofs