Fix CONFLICTS entries of multiple ports

There have been lots of missing CONFLICTS_INSTALL entries, either
because conflicting ports were added without updating existing ports,
due to name changes of generated packages, due to mis-understanding
the format and semantics of the conflicts entries, or just due to
typoes in package names.

This patch is the result of a comparison of all files contained in
the official packages with each other. This comparison was based on
packages built with default options and may therefore have missed
further conflicts with optionally installed files.

Where possible, version numbers in conflicts entries have been
generalized, some times taking advantage of the fact that a port
cannot conflict with itself (due to logic in bsd.port.mk that
supresses the pattern match result in that case).

A few ports that set the conflicts variables depending on complex
conditions (e.g. port options), have been left unmodified, despite
probably containing outdated package names.

These changes should only affect the installation of locally built
ports, not the package building with poudriere. They should give an
early indication of the install conflict in cases where currently
the pkg command aborts an installation when it detects that an
existing file would be overwritten,

Approved by:	portmgr (implicit)

40 files changed, 67 insertions, 23 deletions

diff --git a/sysutils/LPRng/Makefile b/sysutils/LPRng/Makefile
index aedb1850b774..47ab9ad984e5 100644
--- a/sysutils/LPRng/Makefile
+++ b/sysutils/LPRng/Makefile
@@ -38,7 +38,7 @@ CFLAGS+=	-fcommon
 
 SUB_FILES=	pkg-message
 
-CONFLICTS=	cups-base-1.[2-9]*
+CONFLICTS=	cups
 
 OPTIONS_DEFINE=		LIBWRAP NLS
 OPTIONS_DEFAULT=	LIBWRAP
diff --git a/sysutils/barrier/Makefile b/sysutils/barrier/Makefile
index bd125e695a60..9888725815c5 100644
--- a/sysutils/barrier/Makefile
+++ b/sysutils/barrier/Makefile
@@ -17,6 +17,8 @@ CPE_VENDOR=	barrier_project
 
 CMAKE_ARGS=	-DBARRIER_BUILD_DATE=00000000
 
+CONFLICTS_INSTALL=	clusterit # bin/barrier
+
 MAKE_JOBS_UNSAFE=	yes
 
 OPTIONS_DEFINE=		EXAMPLES GUI
diff --git a/sysutils/cdrkit/Makefile b/sysutils/cdrkit/Makefile
index c424c46c2b48..d868b298ce03 100644
--- a/sysutils/cdrkit/Makefile
+++ b/sysutils/cdrkit/Makefile
@@ -21,7 +21,7 @@ SHEBANG_FILES=	3rd-party/dirsplit/dirsplit
 # Fix build with clang11
 CFLAGS+=	-fcommon
 
-CONFLICTS?=	cdrtools cjk-cdrtools cdrtools-devel
+CONFLICTS?=	cdrtools
 
 PLIST_SUB?=	CDRKIT="" GENISOIMAGE="@comment "
 
diff --git a/sysutils/cdrtools/Makefile b/sysutils/cdrtools/Makefile
index c34a523297c1..16510d4c491e 100644
--- a/sysutils/cdrtools/Makefile
+++ b/sysutils/cdrtools/Makefile
@@ -19,7 +19,7 @@ SETUID_DESC=	Install cdrecord, cdda2wav, and readcd as setuid root
 SETUID_PLIST_SUB=	SUID="@(root,,4711) "
 SETUID_PLIST_SUB_OFF=	SUID="@(,,755) "
 
-CONFLICTS_INSTALL=	cdrkit-* cdrtools-devel cdrtools-rscsi-devel
+CONFLICTS_INSTALL=	cdrkit
 
 MASTERDIR=	${.CURDIR}/../../devel/schilybase
 COMPONENTS=	cdda2wav \
diff --git a/sysutils/cfengine-devel/Makefile b/sysutils/cfengine-devel/Makefile
index cee9aa679ddd..ea60a23b8802 100644
--- a/sysutils/cfengine-devel/Makefile
+++ b/sysutils/cfengine-devel/Makefile
@@ -22,9 +22,7 @@ GH_TUPLE=	cfengine:core:${CFENGINE_HASH} \
 		cfengine:libntech:${LIBNTECH_HASH}:libntech/libntech
 CPE_VENDOR=	gnu
 
-CONFLICTS=	cfengine-2* cfengine3[0-9]-* cfengine31[02-9]-* cfengine-3.*
-
-CONFLICTS=	cfengine-[12-9]*
+CONFLICTS=	cfengine cfengine3[0-9] cfengine3[0-9][0-9]
 
 USE_RC_SUBR=	cf-execd cf-serverd cf-monitord
 
diff --git a/sysutils/cfengine316/Makefile b/sysutils/cfengine316/Makefile
index 42aa2296af24..d328ef92397f 100644
--- a/sysutils/cfengine316/Makefile
+++ b/sysutils/cfengine316/Makefile
@@ -17,10 +17,9 @@ CPE_VENDOR=	gnu
 DEPRECATED=		Expire one year after cfengine 3.18.0 released
 EXPIRATION_DATE=	2022-07-05
 
-CONFLICTS=	cfengine3[0-9] cfengine31[0-57-9]
+CONFLICTS=	cfengine cfengine3[0-9] cfengine3[0-9][0-9]
 .if !defined(MASTERDIR)
 PKGNAMESUFFIX=	316
-CONFLICTS+=	cfengine-3.*
 .endif
 
 FETCH_BEFORE_ARGS=	-o ${DISTDIR}/${DISTFILES}
diff --git a/sysutils/cfengine317/Makefile b/sysutils/cfengine317/Makefile
index 3908d42e4a4a..5c1b0307ecbe 100644
--- a/sysutils/cfengine317/Makefile
+++ b/sysutils/cfengine317/Makefile
@@ -17,10 +17,9 @@ CPE_VENDOR=	gnu
 DEPRECATED=		Expire one year after cfengine 3.19.0 released
 EXPIRATION_DATE=	2022-12-10
 
-CONFLICTS=	cfengine3[0-9] cfengine31[0-689]
+CONFLICTS=	cfengine cfengine3[0-9] cfengine3[0-9][0-9]
 .if !defined(MASTERDIR)
 PKGNAMESUFFIX=	317
-CONFLICTS+=	cfengine-3.*
 .endif
 
 FETCH_BEFORE_ARGS=	-o ${DISTDIR}/${DISTFILES}
diff --git a/sysutils/cfengine318/Makefile b/sysutils/cfengine318/Makefile
index eee4a9228219..d864ae4badee 100644
--- a/sysutils/cfengine318/Makefile
+++ b/sysutils/cfengine318/Makefile
@@ -14,10 +14,9 @@ LICENSE=	GPLv3
 
 CPE_VENDOR=	gnu
 
-CONFLICTS=	cfengine3[0-9] cfengine31[0-79]
+CONFLICTS=	cfengine cfengine3[0-9] cfengine3[0-9][0-9]
 .if !defined(MASTERDIR)
 PKGNAMESUFFIX=	318
-CONFLICTS+=	cfengine-3.*
 .endif
 
 FETCH_BEFORE_ARGS=	-o ${DISTDIR}/${DISTFILES}
diff --git a/sysutils/cfengine319/Makefile b/sysutils/cfengine319/Makefile
index e433248064f0..be199418df31 100644
--- a/sysutils/cfengine319/Makefile
+++ b/sysutils/cfengine319/Makefile
@@ -14,10 +14,9 @@ LICENSE=	GPLv3
 
 CPE_VENDOR=	gnu
 
-CONFLICTS=	cfengine3[0-9] cfengine31[0-79]
+CONFLICTS=	cfengine cfengine3[0-9] cfengine3[0-9][0-9]
 .if !defined(MASTERDIR)
 PKGNAMESUFFIX=	319
-CONFLICTS+=	cfengine-3.*
 .endif
 
 FETCH_BEFORE_ARGS=	-o ${DISTDIR}/${DISTFILES}
diff --git a/sysutils/coreutils/Makefile b/sysutils/coreutils/Makefile
index e4dc0b77b2f5..349322d8f82f 100644
--- a/sysutils/coreutils/Makefile
+++ b/sysutils/coreutils/Makefile
@@ -22,6 +22,8 @@ CONFIGURE_ARGS=	--program-prefix=g	\
 		--program-transform-name=s/stat/nustat/
 CONFIGURE_ENV=	FORCE_UNSAFE_CONFIGURE=1
 
+CONFLICTS_INSTALL=	gdu geneweb gexpr rubygem-god # bin/gdu bin/gexpr bin/god bin/gwc
+
 INFO=		coreutils
 
 OPTIONS_DEFINE=	GMP NLS
diff --git a/sysutils/cw/Makefile b/sysutils/cw/Makefile
index c119abbec206..f5d90ef694fa 100644
--- a/sysutils/cw/Makefile
+++ b/sysutils/cw/Makefile
@@ -15,6 +15,8 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		shebangfix
 
+CONFLICTS_INSTALL=	unixcw # bin/cw
+
 SHEBANG_FILES=	def/*
 SHEBANG_LANG=	cw
 cw_OLD_CMD=	/cw
diff --git a/sysutils/daemontools/Makefile b/sysutils/daemontools/Makefile
index 8035b5aee264..ef6b4cbb80fb 100644
--- a/sysutils/daemontools/Makefile
+++ b/sysutils/daemontools/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Service monitoring and logging utilities by djb
 
 LICENSE=	PD
 
-CONFLICTS=	freedt serialmail
+CONFLICTS=	daemontools-encore freedt serialmail
 
 OPTIONS_DEFINE=	MAN SIGQ12 TESTS
 OPTIONS_SUB=	yes
diff --git a/sysutils/dateutils/Makefile b/sysutils/dateutils/Makefile
index fc8dfdc6ca54..a25601ed2b7e 100644
--- a/sysutils/dateutils/Makefile
+++ b/sysutils/dateutils/Makefile
@@ -15,6 +15,8 @@ BUILD_DEPENDS=	help2man:misc/help2man
 USES=		tar:xz
 GNU_CONFIGURE=	yes
 
+CONFLICTS_INSTALL=	py*-dateutils
+
 INFO=		dateutils
 
 OPTIONS_DEFINE=	DOCS
diff --git a/sysutils/docker/Makefile b/sysutils/docker/Makefile
index b8f8d6eec18c..a0d3510df5bc 100644
--- a/sysutils/docker/Makefile
+++ b/sysutils/docker/Makefile
@@ -20,6 +20,8 @@ GH_PROJECT=		docker-ce
 
 USES=	cpe go
 
+CONFLICTS_INSTALL=	docker-tray # bin/docker
+
 GO_PKGNAME=	github.com/${PORTNAME}
 GO_TARGET=	${GO_PKGNAME}/cli/cmd/docker
 
diff --git a/sysutils/e2fsprogs/Makefile b/sysutils/e2fsprogs/Makefile
index 65d21a34dc78..d484531df454 100644
--- a/sysutils/e2fsprogs/Makefile
+++ b/sysutils/e2fsprogs/Makefile
@@ -56,6 +56,8 @@ CPPFLAGS+=	-I${WRKSRC}/lib -I${LOCALBASE}/include # -D_EXT2_USE_C_VERSIONS
 MAKE_ARGS+=	pkgconfigdir='${PREFIX}/libdata/pkgconfig'
 MAKE_ENV+=	CHECK_CMD=@true
 
+CONFLICTS_INSTALL=	e2fsprogs e2fsprogs-nobootfsck e2fsprogs-roothardlinks
+
 PORTSCOUT=	ignore:1	# cannot handle the version in the directory
 
 .if !defined(MASTERDIR)
diff --git a/sysutils/facter/Makefile b/sysutils/facter/Makefile
index a972a72a8de1..a96ccab071e1 100644
--- a/sysutils/facter/Makefile
+++ b/sysutils/facter/Makefile
@@ -17,7 +17,7 @@ LIB_DEPENDS=	libboost_system.so:devel/boost-libs \
 		liblibcpp-hocon.so:devel/cpp-hocon \
 		libyaml-cpp.so:devel/yaml-cpp
 
-CONFLICTS_INSTALL=	rubygem-facter-2*
+CONFLICTS_INSTALL=	rubygem-facter
 
 PLIST_SUB=	PORTVERSION="${PORTVERSION}"
 
diff --git a/sysutils/freedt/Makefile b/sysutils/freedt/Makefile
index f875fdff02e4..10e001fea7d7 100644
--- a/sysutils/freedt/Makefile
+++ b/sysutils/freedt/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	http://offog.org/files/ \
 MAINTAINER=	tdb@FreeBSD.org
 COMMENT=	Experimental reimplementation of Dan Bernstein's daemontools
 
-CONFLICTS=	daemontools
+CONFLICTS=	daemontools daemontools-encore ucspi-tcp # bin/argv0 bin/envdir bin/envuidgid
 
 GNU_CONFIGURE=	yes
 
diff --git a/sysutils/hared/Makefile b/sysutils/hared/Makefile
index da2bdfa94137..9b1a078714bb 100644
--- a/sysutils/hared/Makefile
+++ b/sysutils/hared/Makefile
@@ -23,7 +23,7 @@ GH_TUPLE=	go-gcfg:gcfg:f02745a:gcfg/vendor/gopkg.in/gcfg.v1 \
 
 GO_TARGET=	./daemon:${PORTNAME}
 
-CONFLICTS_INSTALL=	py-${PORTNAME}
+CONFLICTS_INSTALL=	py*-${PORTNAME} # bin/hared
 
 OPTIONS_DEFINE=	DOCS
 
diff --git a/sysutils/hextools/Makefile b/sysutils/hextools/Makefile
index 1f51ec90fed1..e1703738473c 100644
--- a/sysutils/hextools/Makefile
+++ b/sysutils/hextools/Makefile
@@ -11,6 +11,8 @@ LICENSE_NAME=	License of hextools
 LICENSE_FILE=	${WRKDIR}/LICENSE
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
+CONFLICTS_INSTALL=	z80pack # bin/bin2hex
+
 NO_WRKSUBDIR=	yes
 
 PLIST_FILES=	bin/hex2bin bin/bin2hex man/man1/bin2hex.1.gz man/man1/hex2bin.1.gz
diff --git a/sysutils/iocage-devel/Makefile b/sysutils/iocage-devel/Makefile
index c5d4c7a8bf3a..a588aff51a40 100644
--- a/sysutils/iocage-devel/Makefile
+++ b/sysutils/iocage-devel/Makefile
@@ -32,7 +32,7 @@ GH_TAGNAME=	e94863d4c54f02523fb09e62e48be7db9ac92eda
 
 USE_PYTHON=	autoplist distutils
 
-CONFLICTS=	py[0-9]*-iocage
+CONFLICTS=	py*-iocage py*-iocage-devel
 NO_ARCH=	yes
 
 _IOCAGE_LIB_VERSION=	1.2
diff --git a/sysutils/iocage/Makefile b/sysutils/iocage/Makefile
index bb37e6976c6f..c0bb15ee98ba 100644
--- a/sysutils/iocage/Makefile
+++ b/sysutils/iocage/Makefile
@@ -37,7 +37,7 @@ USES=		python:3.6+
 USE_GITHUB=	yes
 USE_PYTHON=	autoplist distutils
 
-CONFLICTS=	py*-iocage
+CONFLICTS=	py*-iocage py*-iocage-devel
 NO_ARCH=	yes
 
 PLIST_FILES=	${PYTHONPREFIX_SITELIBDIR}/${PORTNAME}_lib-${PORTVERSION}-py${PYTHON_VER}.egg-info/PKG-INFO \
diff --git a/sysutils/isc-cron/Makefile b/sysutils/isc-cron/Makefile
index 44427decd0a7..156cb331c1cf 100644
--- a/sysutils/isc-cron/Makefile
+++ b/sysutils/isc-cron/Makefile
@@ -13,6 +13,8 @@ COMMENT=	ISC Cron, former Vixie Cron
 
 LICENSE=	ISCL
 
+CONFLICTS_INSTALL=	interchange mcron # bin/crontab
+
 NO_WRKSUBDIR=	yes
 SUB_FILES=	pkg-message
 PLIST_FILES=	sbin/cron \
diff --git a/sysutils/lbl-cf/Makefile b/sysutils/lbl-cf/Makefile
index 25bc6d0640b0..83d3f103aafd 100644
--- a/sysutils/lbl-cf/Makefile
+++ b/sysutils/lbl-cf/Makefile
@@ -18,6 +18,8 @@ PLIST_FILES=	bin/cf \
 
 GNU_CONFIGURE=	yes
 
+CONFLICTS_INSTALL=	cf # bin/cf
+
 pre-install:
 	@${STRIP_CMD} ${WRKSRC}/cf
 
diff --git a/sysutils/mcron/Makefile b/sysutils/mcron/Makefile
index d6a25e13852e..e6ffc71370ee 100644
--- a/sysutils/mcron/Makefile
+++ b/sysutils/mcron/Makefile
@@ -16,6 +16,9 @@ LIB_DEPENDS=	libguile-2.2.so:lang/guile2
 
 USES=		gmake pkgconfig
 GNU_CONFIGURE=	yes
+
+CONFLICTS_INSTALL=	interchange isc-cron # bin/crontab
+
 TEST_TARGET=	check
 
 INFO=		mcron
diff --git a/sysutils/nq/Makefile b/sysutils/nq/Makefile
index 9c53cce309bc..f054a23d68f0 100644
--- a/sysutils/nq/Makefile
+++ b/sysutils/nq/Makefile
@@ -16,6 +16,9 @@ USE_PERL5=	test
 
 MAKE_ARGS=	CFLAGS="${CFLAGS}" \
 		PREFIX="${PREFIX}"
+
+CONFLICTS_INSTALL=	fq # bin/fq
+
 TEST_TARGET=	check
 
 post-install:
diff --git a/sysutils/p5-Giovanni/Makefile b/sysutils/p5-Giovanni/Makefile
index 6600985d7b94..b83ef84a3c66 100644
--- a/sysutils/p5-Giovanni/Makefile
+++ b/sysutils/p5-Giovanni/Makefile
@@ -25,4 +25,6 @@ NO_ARCH=	yes
 USES=		perl5
 USE_PERL5=	configure
 
+CONFLICTS_INSTALL=	glib # bin/gio
+
 .include <bsd.port.mk>
diff --git a/sysutils/pdsh/Makefile b/sysutils/pdsh/Makefile
index d3afc071d4b0..ba2f7a65a5af 100644
--- a/sysutils/pdsh/Makefile
+++ b/sysutils/pdsh/Makefile
@@ -17,6 +17,9 @@ USES=		autoreconf gmake libtool:keepla perl5 shebangfix
 USE_GITHUB=	yes
 GH_ACCOUNT=	chaos
 USE_PERL5=	run
+
+CONFLICTS_INSTALL=	clusterit # bin/dshbak
+
 SHEBANG_FILES=	scripts/dshbak
 INSTALL_TARGET=	install-strip
 TEST_TARGET=	check
diff --git a/sysutils/pear-Horde_Vfs/Makefile b/sysutils/pear-Horde_Vfs/Makefile
index 1731da15a10f..457317e216e3 100644
--- a/sysutils/pear-Horde_Vfs/Makefile
+++ b/sysutils/pear-Horde_Vfs/Makefile
@@ -18,4 +18,6 @@ USES=	horde
 FTP_USES=	php
 FTP_USE=	PHP=ftp
 
+CONFLICTS_INSTALL=	php*-pear-Horde_Vfs # bin/horde-vfs
+
 .include <bsd.port.mk>
diff --git a/sysutils/py-ansible-base/Makefile b/sysutils/py-ansible-base/Makefile
index c7919eb4f6b6..c8a921d2548f 100644
--- a/sysutils/py-ansible-base/Makefile
+++ b/sysutils/py-ansible-base/Makefile
@@ -42,7 +42,7 @@ TEST_ENV=	PYTHON_VERSION=${PYTHON_VER} \
 		TEST_FLAGS=-vv
 TEST_TARGET=	tests
 
-CONFLICTS=	py*-ansible-core
+CONFLICTS=	py*-ansible-core py*-ansible2
 
 NO_ARCH=	yes
 
diff --git a/sysutils/py-ansible-core/Makefile b/sysutils/py-ansible-core/Makefile
index 71bce8f2ccbd..585a801c8ec5 100644
--- a/sysutils/py-ansible-core/Makefile
+++ b/sysutils/py-ansible-core/Makefile
@@ -39,7 +39,7 @@ TEST_ARGS=	VERSION=${DISTVERSION} \
 TEST_ENV=	PYTHON_VERSION=${PYTHON_VER}
 TEST_TARGET=	tests
 
-CONFLICTS=	py*-ansible-base
+CONFLICTS=	py*-ansible-base py*-ansible2
 
 NO_ARCH=	yes
 
diff --git a/sysutils/radmind/Makefile b/sysutils/radmind/Makefile
index c440700dae6c..cc025e4f7b37 100644
--- a/sysutils/radmind/Makefile
+++ b/sysutils/radmind/Makefile
@@ -20,6 +20,8 @@ USE_RC_SUBR=	radmind
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-radminddir=${RADMIND_BASE_DIR}
 
+CONFLICTS_INSTALL=	schilyutils # bin/fsdiff
+
 MAKE_JOBS_UNSAFE=	yes
 
 SUB_FILES+=	pkg-install pkg-message
diff --git a/sysutils/renameutils/Makefile b/sysutils/renameutils/Makefile
index ee0da48286e9..25700f6feb00 100644
--- a/sysutils/renameutils/Makefile
+++ b/sysutils/renameutils/Makefile
@@ -16,6 +16,8 @@ RUN_DEPENDS=	gls:sysutils/coreutils
 GNU_CONFIGURE=	yes
 USES=		readline charsetfix
 
+CONFLICTS_INSTALL=	imv # bin/imv
+
 OPTIONS_DEFINE=	NLS
 OPTIONS_SUB=	yes
 
diff --git a/sysutils/rubygem-bundler/Makefile b/sysutils/rubygem-bundler/Makefile
index 34cb7635ea0c..cabc6135d8a1 100644
--- a/sysutils/rubygem-bundler/Makefile
+++ b/sysutils/rubygem-bundler/Makefile
@@ -15,6 +15,8 @@ LICENSE_FILE=	${WRKSRC}/LICENSE.md
 USES=		cpe gem
 USE_RUBY=	yes
 
+CONFLICTS_INSTALL=	 go-tools # bin/bundle
+
 NO_ARCH=	yes
 
 PLIST_FILES=	bin/bundle bin/bundler
diff --git a/sysutils/rubygem-facter/Makefile b/sysutils/rubygem-facter/Makefile
index 96b9e49047ca..dedf7d109045 100644
--- a/sysutils/rubygem-facter/Makefile
+++ b/sysutils/rubygem-facter/Makefile
@@ -19,6 +19,8 @@ USES=		cpe gem
 CPE_VENDOR=	puppet
 USE_RUBY=	yes
 
+CONFLICTS_INSTALL=	facter # bin/facter
+
 NO_ARCH=	yes
 
 PLIST_FILES=	bin/facter ${GEMS_DIR}/facter
diff --git a/sysutils/rubygem-god/Makefile b/sysutils/rubygem-god/Makefile
index 831237263374..b35df199f8ad 100644
--- a/sysutils/rubygem-god/Makefile
+++ b/sysutils/rubygem-god/Makefile
@@ -14,6 +14,8 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 USE_RUBY=	yes
 USES=		gem
 
+CONFLICTS_INSTALL=	coreutils # bin/god
+
 PLIST_FILES=	bin/god
 
 .include <bsd.port.mk>
diff --git a/sysutils/rubygem-hieracles/Makefile b/sysutils/rubygem-hieracles/Makefile
index db285b9c4e90..8f5f92b5c23b 100644
--- a/sysutils/rubygem-hieracles/Makefile
+++ b/sysutils/rubygem-hieracles/Makefile
@@ -16,6 +16,9 @@ RUN_DEPENDS=	rubygem-deep_merge>=1.0.1:devel/rubygem-deep_merge \
 NO_ARCH=	yes
 USE_RUBY=	yes
 USES=		gem
+
+CONFLICTS_INSTALL=	zh-hc # bin/hc
+
 PLIST_FILES=	bin/hc man/man1/hc.1.gz \
 		bin/ppdb man/man1/ppdb.1.gz \
 		bin/hieracles
diff --git a/sysutils/sanoid-devel/Makefile b/sysutils/sanoid-devel/Makefile
index 514d90486fa5..ab3f5b8383b1 100644
--- a/sysutils/sanoid-devel/Makefile
+++ b/sysutils/sanoid-devel/Makefile
@@ -25,6 +25,8 @@ GH_TAGNAME=	45d0898
 USE_PERL5=	run
 SHEBANG_FILES=	findoid sanoid sleepymutex syncoid
 
+CONFLICTS_INSTALL=	sanoid # bin/findoid
+
 NO_BUILD=	yes
 NO_ARCH=	yes
 
diff --git a/sysutils/sanoid/Makefile b/sysutils/sanoid/Makefile
index fd1118833732..d319dae5f591 100644
--- a/sysutils/sanoid/Makefile
+++ b/sysutils/sanoid/Makefile
@@ -24,6 +24,8 @@ GH_ACCOUNT=	jimsalterjrs
 USE_PERL5=	run
 SHEBANG_FILES=	findoid sanoid sleepymutex syncoid
 
+CONFLICTS_INSTALL=	sanoid-devel # bin/findoid
+
 NO_BUILD=	yes
 NO_ARCH=	yes
 
diff --git a/sysutils/schilyutils/Makefile b/sysutils/schilyutils/Makefile
index c2627bffd0ad..ab902a99f8fe 100644
--- a/sysutils/schilyutils/Makefile
+++ b/sysutils/schilyutils/Makefile
@@ -7,7 +7,7 @@ USES+=		perl5 shebangfix
 USE_PERL5=	run
 SHEBANG_FILES=	man2html/man2html cstyle/cstyle.pl
 
-CONFLICTS_INSTALL=	bsh
+CONFLICTS_INSTALL=	bosh-cli bsh calc clusterit deforaos-browser heirloom-sh latte-integrale p5-Math-SigFigs radmind # bin/bosh bin/bsh bin/calc bin/copy bin/count bin/fsdiff bin/jsh
 
 MASTERDIR=	${.CURDIR}/../../devel/schilybase
 COMPONENTS=	bsh \
diff --git a/sysutils/ucspi-tcp/Makefile b/sysutils/ucspi-tcp/Makefile
index 55d6eb39350a..577d7aaa46ff 100644
--- a/sysutils/ucspi-tcp/Makefile
+++ b/sysutils/ucspi-tcp/Makefile
@@ -12,6 +12,8 @@ PATCH_DIST_STRIP=	-p1
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Command-line tools for building TCP client-server applications
 
+CONFLICTS_INSTALL=	freedt # bin/argv0
+
 OPTIONS_DEFINE=	RSS_DIFF RBL2SMTPD IPV6 SSL LIMITS
 
 RSS_DIFF_DESC=	Patch rblsmtpd for qmail users