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)

26 files changed, 48 insertions, 6 deletions

diff --git a/www/apache24/Makefile b/www/apache24/Makefile
index 64160a1d7b53..f69f13f0d740 100644
--- a/www/apache24/Makefile
+++ b/www/apache24/Makefile
@@ -20,6 +20,8 @@ USE_PERL5=	run
 USE_RC_SUBR=	apache24 htcacheclean
 GNU_CONFIGURE=	yes
 
+CONFLICTS_INSTALL=	py*-circuits # bin/htpasswd
+
 CPE_VENDOR=	apache
 CPE_PRODUCT=	http_server
 
diff --git a/www/carbonapi/Makefile b/www/carbonapi/Makefile
index 4c5873af8bf0..b940e7b19201 100644
--- a/www/carbonapi/Makefile
+++ b/www/carbonapi/Makefile
@@ -21,6 +21,8 @@ GO_BUILDFLAGS=	-v \
 		${CARBON_ARGS} \
 		-ldflags="-X main.BuildVersion=${DISTVERSION}"
 
+CONFLICTS_INSTALL=	carbonzipper # bin/carbonzipper
+
 USERS=		carbon
 GROUPS=		carbon
 
diff --git a/www/clearsilver/Makefile b/www/clearsilver/Makefile
index a3ff3cba8975..17e351082022 100644
--- a/www/clearsilver/Makefile
+++ b/www/clearsilver/Makefile
@@ -14,6 +14,8 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-apache --disable-perl --disable-ruby \
 		--disable-java --disable-csharp --disable-python
 
+CONFLICTS_INSTALL=	csound go-cs # bin/cs
+
 post-patch:
 	@# Remove CFLAGS when building the python module, pydistfile is used
 	@# and will do the right thing.
diff --git a/www/drush/Makefile b/www/drush/Makefile
index 6fdcd42eae5b..87bbb5cf2896 100644
--- a/www/drush/Makefile
+++ b/www/drush/Makefile
@@ -22,6 +22,8 @@ USES=		php:cli,flavors
 # set php requirements same as drupal itself
 USE_PHP=	gd pcre session mbstring ctype json hash simplexml dom pdo filter phar
 
+CONFLICTS_INSTALL=	drush-php* # bin/drush bin/drush.phar
+
 PLIST_FILES=	bin/drush bin/drush.phar
 
 do-extract:
diff --git a/www/geneweb/Makefile b/www/geneweb/Makefile
index 6b07721727f9..99149029cc2d 100644
--- a/www/geneweb/Makefile
+++ b/www/geneweb/Makefile
@@ -19,6 +19,8 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	geneweb
 GH_TAGNAME=	13c850a0cc3973daf7ae3e0772a1621f84052041
 
+CONFLICTS_INSTALL=	coreutils # bin/gwc
+
 HAS_CONFIGURE=	yes
 MAKE_JOBS_UNSAFE=	yes
 
diff --git a/www/gist/Makefile b/www/gist/Makefile
index 3e501f609937..8d96b5950eb2 100644
--- a/www/gist/Makefile
+++ b/www/gist/Makefile
@@ -13,7 +13,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE.MIT
 
 RUN_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss
 
-CONFLICTS=	p5-App-gist
+CONFLICTS=	p5-App-gist py*-python-gist yorick # bin/gist
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	defunkt
diff --git a/www/gohugo/Makefile b/www/gohugo/Makefile
index 984f77a0533c..12b152e90502 100644
--- a/www/gohugo/Makefile
+++ b/www/gohugo/Makefile
@@ -126,6 +126,8 @@ GH_TUPLE=	\
 		yuin:goldmark:v1.4.4:yuin_goldmark/vendor/github.com/yuin/goldmark \
 		sanity-io:litter:v1.5.1:sanity_io_litter/vendor/github.com/sanity-io/litter
 
+CONFLICTS_INSTALL=	hugo # bin/hugo
+
 post-extract:
 	@${RM} -r ${WRKSRC}/vendor/cloud.google.com/go/storage
 	@${RLN} ${WRKSRC_googleapis_google_cloud_go_storage}/storage ${WRKSRC}/vendor/cloud.google.com/go/storage
diff --git a/www/goose/Makefile b/www/goose/Makefile
index 111c29b33bd4..07913b0c9a89 100644
--- a/www/goose/Makefile
+++ b/www/goose/Makefile
@@ -18,6 +18,9 @@ RUN_DEPENDS=	p5-SOAP-Lite>=0:net/p5-SOAP-Lite \
 		urlview:textproc/urlview
 
 USES=		perl5
+
+CONFLICTS_INSTALL=	cfssl # bin/goose
+
 WRKSRC=		${WRKDIR}/${PORTNAME}
 POD2MAN?=	pod2man
 
diff --git a/www/grafana6/Makefile b/www/grafana6/Makefile
index 17e181f0a370..dd2d7c56c6c0 100644
--- a/www/grafana6/Makefile
+++ b/www/grafana6/Makefile
@@ -25,6 +25,8 @@ GO_TARGET=	./pkg/cmd/grafana-server \
 		./pkg/cmd/grafana-cli
 GO_BUILDFLAGS=	-ldflags="-w -X main.version=${PORTVERSION} -X main.commit=${TAG}"
 
+CONFLICTS_INSTALL=	grafana* # bin/grafana-cli bin/grafana-server
+
 GRAFANA_USER?=	grafana
 GRAFANA_GROUP?=	grafana
 
diff --git a/www/grafana7/Makefile b/www/grafana7/Makefile
index aabc14dc5e17..68f17ff331dc 100644
--- a/www/grafana7/Makefile
+++ b/www/grafana7/Makefile
@@ -24,6 +24,8 @@ RUN_DEPENDS=	ca_root_nss>=0:security/ca_root_nss
 
 USES=		cpe go:modules
 
+CONFLICTS_INSTALL=	grafana* # bin/grafana-cli bin/grafana-server
+
 USE_GITHUB=	yes
 GH_TUPLE=	\
 		BurntSushi:toml:v0.3.1:burntsushi_toml/vendor/github.com/BurntSushi/toml \
diff --git a/www/grafana8/Makefile b/www/grafana8/Makefile
index 5b5672775dba..e4948ffe446f 100644
--- a/www/grafana8/Makefile
+++ b/www/grafana8/Makefile
@@ -18,6 +18,8 @@ RUN_DEPENDS=	ca_root_nss>=0:security/ca_root_nss
 
 USES=		cpe go:modules
 
+CONFLICTS_INSTALL=	grafana* # bin/grafana-cli bin/grafana-server
+
 USE_GITHUB=	yes
 
 USE_RC_SUBR=	grafana
diff --git a/www/h2o-devel/Makefile b/www/h2o-devel/Makefile
index 39b7c9126258..8c4b80c1fd1f 100644
--- a/www/h2o-devel/Makefile
+++ b/www/h2o-devel/Makefile
@@ -25,7 +25,7 @@ USE_PERL5=	run
 USE_LDCONFIG=	yes
 GH_TAGNAME=	96bf0ef
 
-CONFLICTS=	h2o-2*
+CONFLICTS=	h2o
 
 SHEBANG_FILES=	share/h2o/start_server
 
diff --git a/www/horde-ansel/Makefile b/www/horde-ansel/Makefile
index 3c10b21cfe0b..102c9f57f26e 100644
--- a/www/horde-ansel/Makefile
+++ b/www/horde-ansel/Makefile
@@ -37,4 +37,6 @@ USE_HORDE_RUN=	Horde_Role \
 		Horde_View \
 		Horde_Vfs
 
+CONFLICTS_INSTALL=	php*-horde-ansel # bin/AnselPublish.scpt bin/ansel bin/ansel-convert-sql-shares-to-sqlng bin/ansel-exif-to-tags bin/ansel-garbage-collection
+
 .include <bsd.port.mk>
diff --git a/www/horde-base/Makefile b/www/horde-base/Makefile
index afcc6cbbc82d..1ead2d6ca5c9 100644
--- a/www/horde-base/Makefile
+++ b/www/horde-base/Makefile
@@ -19,6 +19,8 @@ WEATHER_DESC=	Support weather forecast display
 USES=	horde cpe php
 USE_PHP=	filter gettext hash
 
+CONFLICTS_INSTALL=	php*-horde
+
 USE_HORDE_BUILD=	Horde_Role
 USE_HORDE_RUN=	Horde_Role \
 		Horde_Alarm \
diff --git a/www/htdump/Makefile b/www/htdump/Makefile
index 237d8301b3a2..45fa6a855dca 100644
--- a/www/htdump/Makefile
+++ b/www/htdump/Makefile
@@ -10,6 +10,8 @@ COMMENT=	Tool to retrieve WWW data
 
 LICENSE=	APACHE20
 
+CONFLICTS_INSTALL=	htdig # bin/htdump
+
 OPTIONS_DEFINE=	SSL
 OPTIONS_DEFAULT=SSL
 
diff --git a/www/interchange/Makefile b/www/interchange/Makefile
index 8455056eda12..e39ad36e7a3b 100644
--- a/www/interchange/Makefile
+++ b/www/interchange/Makefile
@@ -29,6 +29,8 @@ SHEBANG_FILES=	dist/src/compile.pl \
 USE_PERL5=	configure
 NO_ARCH=	yes
 
+CONFLICTS_INSTALL=	isc-cron mcron # bin/crontab
+
 OPTIONS_DEFINE=		MYSQL PGSQL
 OPTIONS_DEFAULT=	MYSQL
 MYSQL_RUN_DEPENDS=	p5-DBD-mysql>=0:databases/p5-DBD-mysql
diff --git a/www/mnogosearch/Makefile b/www/mnogosearch/Makefile
index e891e4d46d65..a61c381d1c2d 100644
--- a/www/mnogosearch/Makefile
+++ b/www/mnogosearch/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Full featured SQL-based hypertext search engine
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-CONFLICTS=	dpsearch udmsearch mguesser
+CONFLICTS=	sphinxsearch udmsearch mguesser
 
 OPTIONS_DEFINE=	DOCS EXAMPLES THREADS SSL ASIAN SYSLOG
 
diff --git a/www/p5-App-gist/Makefile b/www/p5-App-gist/Makefile
index e17b8e4fe223..47fe1c5e66c8 100644
--- a/www/p5-App-gist/Makefile
+++ b/www/p5-App-gist/Makefile
@@ -21,7 +21,7 @@ RUN_DEPENDS=	p5-App-Cmd>=0:devel/p5-App-Cmd \
 		p5-Pithub>=0:devel/p5-Pithub \
 		p5-Term-ReadKey>=0:devel/p5-Term-ReadKey
 
-CONFLICTS=	gist
+CONFLICTS=	gist py*-python-gist yorick # bin/gist
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/www/p5-Dancer/Makefile b/www/p5-Dancer/Makefile
index 954799937e98..c441510a9d37 100644
--- a/www/p5-Dancer/Makefile
+++ b/www/p5-Dancer/Makefile
@@ -31,6 +31,8 @@ TEST_DEPENDS=	\
 	p5-Test-TCP>0:devel/p5-Test-TCP \
 	p5-Test-Output>=0:devel/p5-Test-Output
 
+CONFLICTS_INSTALL=	dancer # bin/dancer
+
 OPTIONS_DEFINE=	YAML
 OPTIONS_DEFAULT=	YAML
 
diff --git a/www/p5-HTML-Diff/Makefile b/www/p5-HTML-Diff/Makefile
index 9016fcc0722d..da49ecb80fd2 100644
--- a/www/p5-HTML-Diff/Makefile
+++ b/www/p5-HTML-Diff/Makefile
@@ -16,4 +16,6 @@ RUN_DEPENDS=	p5-Algorithm-Diff>=0:devel/p5-Algorithm-Diff
 USES=		perl5
 USE_PERL5=	configure
 
+CONFLICTS_INSTALL=	rubygem-diff-lcs # bin/htmldiff
+
 .include <bsd.port.mk>
diff --git a/www/pear-Horde_Service_Weather/Makefile b/www/pear-Horde_Service_Weather/Makefile
index 5a77e7e69449..c889ff538d6a 100644
--- a/www/pear-Horde_Service_Weather/Makefile
+++ b/www/pear-Horde_Service_Weather/Makefile
@@ -16,4 +16,6 @@ USE_HORDE_RUN=	Horde_Role \
 		Horde_Translation \
 		Horde_Url
 
+CONFLICTS_INSTALL=	php*-pear-horde-Horde_Service_Weather # bin/horde-service-weather-metar-database
+
 .include <bsd.port.mk>
diff --git a/www/py-cachecontrol/Makefile b/www/py-cachecontrol/Makefile
index 44ccf8d5125b..ac7f300a87b4 100644
--- a/www/py-cachecontrol/Makefile
+++ b/www/py-cachecontrol/Makefile
@@ -19,6 +19,8 @@ USE_PYTHON=	autoplist concurrent distutils
 NO_ARCH=	yes
 REINPLACE_ARGS=	-i ''
 
+CONFLICTS_INSTALL=	py*-cachecontrol # bin/doesitcache
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|msgpack-python|msgpack|' ${WRKSRC}/setup.py ${WRKSRC}/CacheControl.egg-info/requires.txt
 
diff --git a/www/py-django22/Makefile b/www/py-django22/Makefile
index 34e92c840550..a3b1e1898b73 100644
--- a/www/py-django22/Makefile
+++ b/www/py-django22/Makefile
@@ -32,8 +32,7 @@ PORTDOCS=	*
 SHEBANG_FILES=	django/bin/django-admin.py \
 		django/conf/project_template/manage.py-tpl
 
-CONFLICTS_INSTALL=	${PYTHON_PKGNAMEPREFIX}django30 \
-			${PYTHON_PKGNAMEPREFIX}django31 ${PYTHON_PKGNAMEPREFIX}django32
+CONFLICTS_INSTALL=	py*-django* # bin/django-admin
 
 CPE_VENDOR=	djangoproject
 
diff --git a/www/py-python-dotenv/Makefile b/www/py-python-dotenv/Makefile
index e3190b6bd87e..5cdaf2851bfd 100644
--- a/www/py-python-dotenv/Makefile
+++ b/www/py-python-dotenv/Makefile
@@ -15,6 +15,8 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 USES=		python:3.6+
 USE_PYTHON=	autoplist concurrent distutils
 
+CONFLICTS_INSTALL=	rubygem-dotenv # bin/dotenv
+
 NO_ARCH=	yes
 
 OPTIONS_DEFINE=	CLI
diff --git a/www/rubygem-jekyll/Makefile b/www/rubygem-jekyll/Makefile
index 3a81d4ceb3d9..79e957ecaf46 100644
--- a/www/rubygem-jekyll/Makefile
+++ b/www/rubygem-jekyll/Makefile
@@ -29,6 +29,8 @@ RUN_DEPENDS=	rubygem-addressable>=2.4<3:www/rubygem-addressable \
 USES=		cpe gem
 USE_RUBY=	yes
 
+CONFLICTS_INSTALL=	rubygem-jekyll3
+
 NO_ARCH=	yes
 
 CPE_VENDOR=	jekyllrb
diff --git a/www/rubygem-jekyll3/Makefile b/www/rubygem-jekyll3/Makefile
index fdb7cb5d0f0d..53ee3a9faa5e 100644
--- a/www/rubygem-jekyll3/Makefile
+++ b/www/rubygem-jekyll3/Makefile
@@ -28,6 +28,8 @@ RUN_DEPENDS=	rubygem-addressable>=2.4<3:www/rubygem-addressable \
 USES=		cpe gem
 USE_RUBY=	yes
 
+CONFLICTS_INSTALL=	rubygem-jekyll
+
 NO_ARCH=	yes
 
 PLIST_FILES=	bin/jekyll