From 5764b83a0b32e9630f5bd0622f4d2d23185eb7a5 Mon Sep 17 00:00:00 2001 From: Jean-Marc Zucconi Date: Thu, 22 Sep 2005 17:03:13 +0000 Subject: [PATCH] set CONFLICTS --- emulators/hfs/Makefile | 2 ++ emulators/hfsutils/Makefile | 2 ++ 2 files changed, 4 insertions(+) diff --git a/emulators/hfs/Makefile b/emulators/hfs/Makefile index adae9b1f2831..8188f4952cda 100644 --- 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 diff --git a/emulators/hfsutils/Makefile b/emulators/hfsutils/Makefile index bd40a509cf81..8e8c23603789 100644 --- 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