aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpav <pav@FreeBSD.org>2008-03-15 00:13:06 +0800
committerpav <pav@FreeBSD.org>2008-03-15 00:13:06 +0800
commit3d40da91f2e3ab7f0bf07ee5b545263eed4d77de (patch)
tree6cfabb1e0418ae148b871274722f36061e7fe9f6
parentd0ea7aaf46bf3053c745104fdc7a8165edb3ab39 (diff)
downloadfreebsd-ports-gnome-3d40da91f2e3ab7f0bf07ee5b545263eed4d77de.tar.gz
freebsd-ports-gnome-3d40da91f2e3ab7f0bf07ee5b545263eed4d77de.tar.zst
freebsd-ports-gnome-3d40da91f2e3ab7f0bf07ee5b545263eed4d77de.zip
- Fix CONFLICTS syntax so they are effective
PR: ports/121179 Reported by: Momchil <slogster@gmail.com>
-rw-r--r--emulators/hfs/Makefile2
-rw-r--r--emulators/hfsutils/Makefile2
2 files changed, 2 insertions, 2 deletions
diff --git a/emulators/hfs/Makefile b/emulators/hfs/Makefile
index 9d05bfad7d98..7042a1b5717e 100644
--- a/emulators/hfs/Makefile
+++ b/emulators/hfs/Makefile
@@ -16,7 +16,7 @@ DISTNAME= ${PORTNAME}${PORTVERSION:S/./_/}
MAINTAINER= jmz@FreeBSD.org
COMMENT= Read Macintosh HFS floppy disks, hard drives and CDROMs
-CONFLICTS= hfsutils
+CONFLICTS= hfsutils-[0-9]*
USE_GMAKE= yes
MAN1= hfs.1
diff --git a/emulators/hfsutils/Makefile b/emulators/hfsutils/Makefile
index 73904602cc96..6220057566ab 100644
--- a/emulators/hfsutils/Makefile
+++ b/emulators/hfsutils/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= ftp://ftp.mars.org/pub/hfs/
MAINTAINER= ports@FreeBSD.org
COMMENT= Yet Another HFS Utility
-CONFLICTS= hfs
+CONFLICTS= hfs-[0-9]*
LIB_DEPENDS= tk84.1:${PORTSDIR}/x11-toolkits/tk84