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)
ass-a2s · Jan 10, 2022 · bcaf25a · bcaf25a
1 parent f1661bd
commit bcaf25a
Show file tree

Hide file tree

Showing 491 changed files with 868 additions and 220 deletions.
diff --git a/archivers/arc/Makefile b/archivers/arc/Makefile
@@ -10,7 +10,7 @@ COMMENT=	Create & extract files from DOS .ARC files
 
 LICENSE=	GPLv2
 
-CONFLICTS=	php5-arcanist
+CONFLICTS_INSTALL= arcanist-php73 arcanist-php74 arcanist-php80
 
 OPTIONS_DEFINE=	DOCS
 

diff --git a/archivers/deco/Makefile b/archivers/deco/Makefile
@@ -28,6 +28,8 @@ RUN_DEPENDS=	arc:archivers/arc \
 		zoo:archivers/zoo \
 		flac:audio/flac
 
+CONFLICTS=	deco-misc # bin/deco
+
 DARCHIVE_VER=	1.7
 DARCHIVE=	deco-archive-${DARCHIVE_VER}
 

diff --git a/astro/jday/Makefile b/astro/jday/Makefile
@@ -12,6 +12,8 @@ GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 INSTALL_TARGET=	install-strip
 
+CONFLICTS_INSTALL= netatalk3
+
 PLIST_FILES=	bin/dbd bin/j2d bin/jday \
 		include/jday.h lib/libjday.a \
 		lib/libjday.so lib/libjday.so.2 \

diff --git a/audio/csound/Makefile b/audio/csound/Makefile
@@ -23,6 +23,8 @@ USE_LDCONFIG=	yes
 
 CPE_VENDOR=	csounds
 
+CONFLICTS_INSTALL= clearsilver go-cs libextractor outguess
+
 CFLAGS_powerpc=	-maltivec
 CFLAGS_powerpcspe=	-DPFFFT_SIMD_DISABLE
 CFLAGS_powerpc64=	-maltivec

diff --git a/audio/grip/Makefile b/audio/grip/Makefile
@@ -24,6 +24,8 @@ USE_XORG=	ice sm x11 xext
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--disable-werror
 
+CONFLICTS_INSTALL=	py*-grip
+
 OPTIONS_DEFINE=		CDDA2WAV CDPARANOIA FAAC FLAC LAME NLS VORBIS
 OPTIONS_DEFAULT=	CDPARANOIA FLAC VORBIS
 

diff --git a/audio/icecast-kh/Makefile b/audio/icecast-kh/Makefile
@@ -23,7 +23,7 @@ GH_PROJECT=	icecast-kh
 USE_GNOME=	libxml2 libxslt
 USE_RC_SUBR=	icecast
 
-CONFLICTS_INSTALL=	icecast icecast2
+CONFLICTS_INSTALL=	icecast
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	OGG_PREFIX=${LOCALBASE}

diff --git a/audio/icecast/Makefile b/audio/icecast/Makefile
@@ -31,6 +31,8 @@ USE_GNOME=	libxml2 libxslt
 GNU_CONFIGURE=	yes
 USE_RC_SUBR=	icecast
 
+CONFLICTS_INSTALL=	icecast-kh
+
 SUB_FILES=	pkg-message
 
 CPE_VENDOR=	xiph

diff --git a/audio/julius/Makefile b/audio/julius/Makefile
@@ -16,6 +16,8 @@ GNU_CONFIGURE=	yes
 USES=		iconv perl5 shebangfix
 SHEBANG_FILES=	jclient-perl/jclient.pl
 
+INSTALL_CONFLICTS=	generate julius-caesariii php*-pear-Text_Highlighter
+
 CONFIGURE_ENV=	ac_cv_path_PERL=${PERL}
 CPPFLAGS+=	-I${LOCALBASE}/include
 CFLAGS+=	-Wno-return-type

diff --git a/benchmarks/ali/Makefile b/benchmarks/ali/Makefile
@@ -38,6 +38,8 @@ GH_TUPLE=	davecgh:go-spew:v1.1.1:davecgh_go_spew/vendor/github.com/davecgh/go-sp
 		uber-go:atomic:v1.9.0:uber_go_atomic/vendor/go.uber.org/atomic \
 		uber-go:goleak:v1.1.12:uber_go_goleak/vendor/go.uber.org/goleak
 
+CONFLICTS_INSTALL=	ja-mh mmh nmh
+
 PLIST_FILES=	bin/ali
 
 .include <bsd.port.mk>
diff --git a/benchmarks/fio/Makefile b/benchmarks/fio/Makefile
@@ -21,6 +21,8 @@ GNUPLOT_DESC=	Support for plotting graphs
 
 GNUPLOT_BUILD_DEPENDS=	${LOCALBASE}/bin/gnuplot:math/gnuplot
 
+CONFLICTS_INSTALL=	py*-Fiona
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/fio ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_SCRIPT} ${WRKSRC}/tools/fio_generate_plots ${STAGEDIR}${PREFIX}/bin

diff --git a/benchmarks/flamegraph/Makefile b/benchmarks/flamegraph/Makefile
@@ -22,6 +22,8 @@ GH_TAGNAME=	810687f
 
 NO_BUILD=	yes
 
+CONFLICTS_INSTALL=	p5-Devel-NYTProf
+
 SHEBANG_FILES=	*.php *.pl *.py *.sh
 
 SOURCE_FILES=	aix-perf.pl \

diff --git a/benchmarks/iozone/Makefile b/benchmarks/iozone/Makefile
@@ -19,6 +19,8 @@ MAKE_ARGS=	${MAKE_ENV}
 ALL_TARGET=	freebsd
 MAKE_JOBS_UNSAFE=	yes
 
+CONFLICTS_INSTALL=	iozone21
+
 PLIST_FILES=	bin/iozone man/man1/iozone.1.gz
 
 OPTIONS_DEFINE=	SSH THREADS

diff --git a/benchmarks/iozone21/Makefile b/benchmarks/iozone21/Makefile
@@ -10,7 +10,7 @@ PKGNAMESUFFIX=	21
 MAINTAINER=	[email protected]
 COMMENT=	Performance Test of Sequential File I/O (older version)
 
-CONFLICTS=	iozone-3.*
+CONFLICTS_INSTALL=	iozone
 
 PLIST_FILES=	bin/iozone \
 		man/man1/iozone.1.gz

diff --git a/benchmarks/rubygem-derailed_benchmarks/Makefile b/benchmarks/rubygem-derailed_benchmarks/Makefile
@@ -24,6 +24,8 @@ RUN_DEPENDS=	rubygem-benchmark-ips>=2.0.0:benchmarks/rubygem-benchmark-ips \
 USES=		gem
 USE_RUBY=	yes
 
+CONFLICTS_INSTALL=	rubygem-gitlab-derailed_benchmarks
+
 NO_ARCH=	yes
 
 PLIST_FILES=	bin/derailed

diff --git a/benchmarks/rubygem-gitlab-derailed_benchmarks/Makefile b/benchmarks/rubygem-gitlab-derailed_benchmarks/Makefile
@@ -22,6 +22,8 @@ RUN_DEPENDS=	rubygem-benchmark-ips>=2.0.0:benchmarks/rubygem-benchmark-ips \
 USES=		gem
 USE_RUBY=	yes
 
+CONFLICTS_INSTALL=	rubygem-derailed_benchmarks
+
 NO_ARCH=	yes
 
 PLIST_FILES=	bin/derailed

diff --git a/biology/bamutil/Makefile b/biology/bamutil/Makefile
@@ -21,6 +21,8 @@ GH_TUPLE=	statgen:libStatGen:v${DISTVERSION}:statgen/libStatGen
 MAKE_ENV=	LIB_PATH_GENERAL=${WRKSRC}/libStatGen
 MAKE_ENV+=	INSTALLDIR=${STAGEDIR}${PREFIX}/bin
 
+CONFLICTS_INSTALL=	bam
+
 PLIST_FILES=	bin/bam
 
 .include <bsd.port.mk>
diff --git a/biology/cufflinks/Makefile b/biology/cufflinks/Makefile
@@ -26,6 +26,8 @@ GH_ACCOUNT=	cole-trapnell-lab
 CXXFLAGS+=	-I${LOCALBASE}/include/eigen3
 CFLAGS+=	-I${LOCALBASE}/include/eigen3 # https://github.com/cole-trapnell-lab/cufflinks/issues/113
 
+CONFLICTS_INSTALL=	gffread
+
 PLIST_FILES=	bin/compress_gtf \
 		bin/cuffcompare \
 		bin/cuffdiff \

diff --git a/biology/fasta/Makefile b/biology/fasta/Makefile
@@ -16,6 +16,8 @@ LICENSE_NAME=	fasta
 LICENSE_TEXT=	May not be sold or incorporated into a commercial product
 LICENSE_PERMS=	dist-mirror pkg-mirror auto-accept
 
+CONFLICTS_INSTALL=	align
+
 WRKSRC=		${WRKDIR}/fasta
 SUB_FILES=	pkg-message
 

diff --git a/biology/gffread/Makefile b/biology/gffread/Makefile
@@ -17,6 +17,8 @@ GH_TUPLE=	gpertea:gclib:v${DISTVERSION}:gpertea/gclib
 
 INSTALL_TARGET=	install-strip
 
+CONFLICTS_INSTALL=	cufflinks
+
 PLIST_FILES=	bin/gffread
 
 .include <bsd.port.mk>
diff --git a/biology/gmap/Makefile b/biology/gmap/Makefile
@@ -20,6 +20,8 @@ ONLY_FOR_ARCHS_REASON=	upstream supports only x86 and possibly POWER8
 USES=		gmake perl5
 GNU_CONFIGURE=	yes
 
+CONFLICTS_INSTALL=	cpuid
+
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:C|\.|-|g}
 CFLAGS+=	-fcommon
 

diff --git a/biology/mummer/Makefile b/biology/mummer/Makefile
@@ -22,6 +22,8 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	${PORTNAME}4
 USE_LDCONFIG=	yes
 
+CONFLICTS_INSTALL=	??-libgd libgd
+
 SHEBANG_FILES=	scripts/*.pl
 perl_OLD_CMD=	__PERL_PATH
 _SHEBANG_REINPLACE_ARGS+=	-e "s|__BIN_DIR|${PREFIX}/bin|g;s|__AUX_BIN_DIR|${PREFIX}/libexec/mummer|g;s|__SCRIPT_DIR|${PREFIX}/libexec/mummer|g"

diff --git a/biology/ncbi-blast+/Makefile b/biology/ncbi-blast+/Makefile
@@ -48,6 +48,8 @@ GNU_CONFIGURE=	yes
 # a postinstall mv.
 CONFIGURE_ARGS=	AR="ar cr" --without-boost --libdir=${PREFIX}/lib/ncbi-tools++
 
+CONFLICTS_INSTALL=	ncbi-cxx-toolkit
+
 WRKSRC_SUBDIR=	c++
 
 .include <bsd.port.pre.mk>

diff --git a/biology/ncbi-cxx-toolkit/Makefile b/biology/ncbi-cxx-toolkit/Makefile
@@ -25,6 +25,8 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--without-debug --with-dll --without-static \
 		--without-vdb
 
+CONFLICTS_INSTALL=	ncbi-blast+
+
 post-install:
 	# strip
 	@${FIND} ${STAGEDIR}${PREFIX}/bin -type f | ${GREP} -v -E '\.(sh|py|pl)$$' | ${XARGS} ${STRIP_CMD}

diff --git a/biology/ncbi-entrez-direct/Makefile b/biology/ncbi-entrez-direct/Makefile
@@ -20,6 +20,8 @@ RUN_DEPENDS=	p5-libwww>=0:www/p5-libwww \
 USES=		go:modules perl5 shebangfix
 USE_GITHUB=	nodefault
 
+CONFLICTS_INSTALL=	ebook-tools
+
 # Dependency versions:
 #	make clean extract
 # 	cd ${WRKSRC}/cmd

diff --git a/biology/ruby-bio/Makefile b/biology/ruby-bio/Makefile
@@ -28,6 +28,8 @@ BDB4_RUN_DEPENDS=	${RUBY_SITEARCHLIBDIR}/bdb.so:databases/ruby-bdb
 MYSQL_RUN_DEPENDS=	rubygem-dbd-mysql>=0:databases/rubygem-dbd-mysql
 PGSQL_RUN_DEPENDS=	rubygem-dbd-pg>=0:databases/rubygem-dbd-pg
 
+CONFLICTS_INSTALL=	rubygem-bio-shell
+
 post-patch:
 	${RUBY} -i -pe 'gsub(%r"(/etc/bioinformatics/)") { "${PREFIX}" + $$1 }' \
 		${WRKSRC}/doc/Tutorial.rd \

diff --git a/biology/rubygem-bio-shell/Makefile b/biology/rubygem-bio-shell/Makefile
@@ -20,6 +20,8 @@ USE_RUBY=	yes
 
 NO_ARCH=	yes
 
+CONFLICTS_INSTALL=	ruby??-bio
+
 PLIST_FILES=	bin/bioruby
 
 .include <bsd.port.mk>
diff --git a/biology/sra-tools/Makefile b/biology/sra-tools/Makefile
@@ -45,6 +45,8 @@ FREEBSD_RELEASE=	uname -r | cut -d - -f 1
 CFLAGS+=	-I${WRKSRC}/interfaces/os/sun
 CXXFLAGS+=	-I${WRKSRC}/interfaces/os/sun
 
+CONFLICTS_INSTALL=	kget
+
 BINARY_ALIAS=	gcc=${CC} g++=${CXX}
 
 # for port developers, building with these options may fail

diff --git a/cad/cascade-compiler/Makefile b/cad/cascade-compiler/Makefile
@@ -23,6 +23,8 @@ MAKE_ENV=	FREEBSD_WRKSRC=${WRKSRC} FREEBSD_LOCALBASE=${LOCALBASE}
 
 CMAKE_OFF=	BUILD_TESTING
 
+CONFLICTS_INSTALL=	cascade
+
 BINARY_ALIAS=	flex=${FILESDIR}/flex flex.real=${LOCALBASE}/bin/flex bison=${LOCALBASE}/bin/bison
 
 post-patch:

diff --git a/cad/cascade/Makefile b/cad/cascade/Makefile
@@ -14,6 +14,8 @@ PORTDOCS=	ex1.gif index.html
 PORTEXAMPLES=	README.examples ex1.cas ex1.gif ex1.out cascade-mode.el
 PLIST_FILES=	bin/cascade man/man1/cascade.1.gz
 
+CONFLICTS_INSTALL=	cascade-compiler
+
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
 do-install:

diff --git a/cad/dinotrace/Makefile b/cad/dinotrace/Makefile
@@ -19,6 +19,8 @@ USE_PERL5=	build
 
 GNU_CONFIGURE=	yes
 
+CONFLICTS_INSTALL=	dinotrace dinotrace-emacs_*
+
 INFO=		dinotrace
 PLIST_FILES=	bin/dinotrace
 

diff --git a/cad/fasm/Makefile b/cad/fasm/Makefile
@@ -19,4 +19,6 @@ USE_PYTHON=	distutils concurrent noflavors autoplist
 
 NO_ARCH=	yes
 
+CONFLICTS_INSTALL=	fasm SASM
+
 .include <bsd.port.mk>
diff --git a/chinese/aterm/Makefile b/chinese/aterm/Makefile
@@ -14,6 +14,8 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-xim --enable-big5
 MAKE_JOBS_UNSAFE=	yes
 
+CONFLICTS_INSTALL=	aterm
+
 PLIST_FILES=	"@(,,4711) bin/aterm" \
 		man/man1/aterm.1.gz
 

diff --git a/chinese/bitchx/Makefile b/chinese/bitchx/Makefile
@@ -11,6 +11,8 @@ EXTRA_PATCHES=	${.CURDIR}/files/patch-source__input.c \
 		${.CURDIR}/files/patch-include__config.h \
 		${.CURDIR}/files/patch-source__screen.c
 
+CONFLICTS_INSTALL=	bitchx
+
 OPTIONS_SLAVE=	LATIN
 
 .include "${MASTERDIR}/Makefile"
diff --git a/chinese/enscript/Makefile b/chinese/enscript/Makefile
@@ -16,6 +16,8 @@ PKGMESSAGE=	${.CURDIR}/pkg-message
 
 USES+=		ghostscript:run
 
+CONFLICTS_INSTALL=	enscript-a4 enscript-letter enscript-letterdj
+
 post-patch:
 	@${ECHO_CMD} "share/enscript/README.BIG5" > ${WRKDIR}/pkg-plist
 	@${CAT} ${MASTERDIR}/pkg-plist >> ${WRKDIR}/pkg-plist

diff --git a/chinese/eterm/Makefile b/chinese/eterm/Makefile
@@ -14,6 +14,8 @@ CONFIGURE_ARGS=	--enable-trans --enable-utmp \
 		--with-backspace=bs --without-terminfo \
 		--enable-multi-charset=big5
 
+CONFLICTS_INSTALL=	eterm ja-eterm
+
 PKGDIR=		${.CURDIR}
 PLIST=		${MASTERDIR}/pkg-plist
 

diff --git a/chinese/fcitx/Makefile b/chinese/fcitx/Makefile
@@ -37,7 +37,7 @@ RUN_DEPENDS=	xdg-open:devel/xdg-utils \
 SUB_FILES=	pkg-message
 SUB_LIST+=	PORTSDIR=${PORTSDIR}
 
-CONFLICTS=	zh-scim-fcitx-3.* fcitx5
+CONFLICTS=	zh-scim-fcitx
 
 USE_GNOME=	pango intltool libxml2 introspection
 USE_KDE=	ecm

diff --git a/chinese/hc/Makefile b/chinese/hc/Makefile
@@ -9,6 +9,8 @@ DISTFILES=	hc-30.tar.gz hc-supp.tab
 MAINTAINER=	[email protected]
 COMMENT=	Hanzi Converter -- converts between GB and BIG-5 codes
 
+CONFLICTS_INSTALL=	rubygem-hieracles
+
 WRKSRC=		${WRKDIR}/hc3
 EXTRACT_ONLY=	hc-30.tar.gz
 ALL_TARGET=	hc b2g g2b

diff --git a/chinese/scim-fcitx/Makefile b/chinese/scim-fcitx/Makefile
@@ -23,6 +23,8 @@ GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
 MAKE_JOBS_UNSAFE=	yes
 
+CONFIGURE_INSTALL=	zh-fcitx
+
 WRKSRC=		${WRKDIR}/fcitx
 
 CONFIGURE_ENV+=	SCIM_DATADIR=${PREFIX}/share/scim \

diff --git a/comms/hylafax/Makefile b/comms/hylafax/Makefile
@@ -35,6 +35,8 @@ CONFIGURE_ENV=	ENVOPTS="${CFLAGS}"
 MAKE_ENV+=	ROOT=${STAGEDIR}
 MAKE_ARGS+=	OPTIMIZER="" -DOPTIMIZER
 
+CONFLICTS_INSTALL=	mgetty
+
 PORTDOCS=	RELEASENOTES-4.3.txt RELEASENOTES-4.4.txt RELEASENOTES-6.0.txt
 SUB_FILES=	pkg-message
 

diff --git a/comms/mgetty+sendfax/Makefile b/comms/mgetty+sendfax/Makefile
@@ -31,6 +31,8 @@ ALL_TARGET=	noident all
 INFO=		mgetty
 CFLAGS+=	-DAUTO_PPP
 
+CONFLICTS_INSTALL=	hylafax
+
 MAKE_JOBS_UNSAFE=	yes
 
 OPTIONS_DEFINE=	FIDO

diff --git a/comms/unixcw/Makefile b/comms/unixcw/Makefile
@@ -38,6 +38,8 @@ OPTIONS_DEFINE=	NLS
 NLS_USES=	gettext
 NLS_CONFIGURE_ENABLE=	nls
 
+CONFLICTS_INSTALL=	cw
+
 .ifndef XCWCP
 OPTIONS_DEFINE+=	ALSA PULSEAUDIO
 OPTIONS_DEFAULT+=	ALSA PULSEAUDIO

diff --git a/comms/wsjtx/Makefile b/comms/wsjtx/Makefile
@@ -27,6 +27,8 @@ USE_QT=		core gui network widgets \
 		multimedia concurrent printsupport serialport sql sql-sqlite3 \
 		buildtools_build linguisttools_build qmake_build testlib
 
+CONFLICTS_INSTALL=	wsjtz
+
 # for detailed debugging uncomment the next line
 #CMAKE_ARGS+=   --debug-output --trace
 PLIST_SUB+=	PORTVERSION="${PORTVERSION}"

diff --git a/databases/dbf/Makefile b/databases/dbf/Makefile
@@ -22,6 +22,8 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	ac_cv_prog_DOC_TO_MAN=""
 USE_LDCONFIG=	yes
 
+CONFLICTS_INSTALL=	rubygem-dbf
+
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNLS}

diff --git a/databases/emacsql/Makefile b/databases/emacsql/Makefile
@@ -20,6 +20,9 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	skeeto
 
 MAKE_ENV+=	LOAD_PATH="-L ${PREFIX}/${EMACS_SITE_LISPDIR} -L ${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}"
+
+CONFLICTS_INSTALL=	 emacsql emacsql-emacs_*
+
 ALL_TARGET=	binary compile
 TEST_TARGET=	check
Original file line number	Diff line number	Diff line change
Expand Up		@@ -19,4 +19,6 @@ USE_PYTHON= distutils concurrent noflavors autoplist

		NO_ARCH= yes

		CONFLICTS_INSTALL= fasm SASM

		.include <bsd.port.mk>