set CONFLICTS

svn path=/head/; revision=143374
2005-09-22 17:03:13 +00:00 · 2005-09-22 17:03:13 +00:00 · 5764b83a0b · 2021-03-31 03:12:20 +00:00
commit 5764b83a0b
parent f5c5740a06
2 changed files with 4 additions and 0 deletions
--- a/emulators/hfs/Makefile
+++ b/emulators/hfs/Makefile
@ -16,6 +16,8 @@ DISTNAME=	${PORTNAME}${PORTVERSION:S/./_/}
 MAINTAINER=	jmz@FreeBSD.org
 COMMENT=	Read Macintosh HFS floppy disks, hard drives and CDROMs

+CONFLICTS=	hfsutils
+
 USE_GMAKE=	yes
 MAN1=		hfs.1
 PLIST_FILES=	bin/hfs
--- a/emulators/hfsutils/Makefile
+++ b/emulators/hfsutils/Makefile
@ -14,6 +14,8 @@ MASTER_SITES=	ftp://ftp.mars.org/pub/hfs/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Yet Another HFS Utility

+CONFLICTS=	hfs
+
 LIB_DEPENDS=	tk84.1:${PORTSDIR}/x11-toolkits/tk84

 GNU_CONFIGURE=	yes