Index: head/emulators/hfs/Makefile
===================================================================
--- head/emulators/hfs/Makefile	(revision 143373)
+++ head/emulators/hfs/Makefile	(revision 143374)
@@ -1,27 +1,29 @@
 # New ports collection makefile for:    hfs
 # Date created:         17 November 1994
 # Whom:                 jmz
 #
 # $FreeBSD$
 #
 
 PORTNAME=	hfs
 PORTVERSION=	0.37
 PORTREVISION=	1
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	jmz
 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
 
 pre-install:
 	@${MKDIR} ${PREFIX}/bin
 	@${MKDIR} ${PREFIX}/man/man1
 
 .include <bsd.port.mk>

Property changes on: head/emulators/hfs/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.16
\ No newline at end of property
+1.17
\ No newline at end of property
Index: head/emulators/hfsutils/Makefile
===================================================================
--- head/emulators/hfsutils/Makefile	(revision 143373)
+++ head/emulators/hfsutils/Makefile	(revision 143374)
@@ -1,44 +1,46 @@
 # New ports collection makefile for:	hfsutils
 # Date Created:		7 Sep 1997
 # Whom:			Vanilla I. Shu <vanilla@MinJe.com.TW>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	hfsutils
 PORTVERSION=	3.2.6
 PORTREVISION=	1
 CATEGORIES=	emulators tk84
 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
 CONFIGURE_ARGS=	--with-tcl --with-tk
 
 MAN1=		hattrib.1 \
 		hcd.1 \
 		hcopy.1 \
 		hdel.1 \
 		hdir.1 \
 		hformat.1 \
 		hfs.1 \
 		hfssh.1 \
 		hfsutils.1 \
 		hls.1 \
 		hmkdir.1 \
 		hmount.1 \
 		hpwd.1 \
 		hrename.1 \
 		hrmdir.1 \
 		humount.1 \
 		hvol.1 \
 		xhfs.1
 
 post-install:
 		${CHMOD} 755 ${PREFIX}/bin/hfs
 
 .include <bsd.port.mk>

Property changes on: head/emulators/hfsutils/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.24
\ No newline at end of property
+1.25
\ No newline at end of property