*/*: Remove redundant '-*' from CONFLICTS definitions

The conflict checks compare the patterns first against the package names without version (as reported by "pkg query "%n"), then - if there was no match - agsinst the full package names including the version (as reported by "pkg query "%n-%v"). Approved by: portmgr (blanket)
freebsd · Nov 25, 2021 · 04b9da4 · 04b9da4
1 parent 09c1162
commit 04b9da4
Show file tree

Hide file tree

Showing 188 changed files with 279 additions and 288 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=	php5-arcanist
 
 OPTIONS_DEFINE=	DOCS
 

diff --git a/archivers/rpm2cpio/Makefile b/archivers/rpm2cpio/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Convert .rpm files to cpio format
 
 LICENSE=	BSD2CLAUSE
 
-CONFLICTS_INSTALL=	rpm4-*
+CONFLICTS_INSTALL=	rpm4
 
 NO_BUILD=	yes
 NO_ARCH=	yes

diff --git a/audio/festvox-kal16/Makefile b/audio/festvox-kal16/Makefile
@@ -15,7 +15,7 @@ RUN_DEPENDS=	\
 ${LOCALBASE}/share/festival/lib/dicts/wsj.wp39.poslexR:audio/festlex-poslex \
 ${LOCALBASE}/share/festival/lib/dicts/cmu/cmulex.scm:audio/festlex-cmu
 
-CONFLICTS=	festvox-kal8-*
+CONFLICTS=	festvox-kal8
 
 NO_BUILD=	yes
 

diff --git a/audio/festvox-kal8/Makefile b/audio/festvox-kal8/Makefile
@@ -17,7 +17,7 @@ ${LOCALBASE}/share/festival/lib/dicts/cmu/cmulex.scm:audio/festlex-cmu
 
 WRKSRC=		${WRKDIR}/festival
 
-CONFLICTS=	festvox-kal16-*
+CONFLICTS=	festvox-kal16
 
 NO_BUILD=	yes
 

diff --git a/audio/festvox-ked16/Makefile b/audio/festvox-ked16/Makefile
@@ -17,7 +17,7 @@ ${LOCALBASE}/share/festival/lib/dicts/cmu/cmulex.scm:audio/festlex-cmu
 
 WRKSRC=		${WRKDIR}/festival
 
-CONFLICTS=	festvox-ked8-*
+CONFLICTS=	festvox-ked8
 
 NO_BUILD=	yes
 

diff --git a/audio/festvox-ked8/Makefile b/audio/festvox-ked8/Makefile
@@ -17,7 +17,7 @@ ${LOCALBASE}/share/festival/lib/dicts/cmu/cmulex.scm:audio/festlex-cmu
 
 WRKSRC=		${WRKDIR}/festival
 
-CONFLICTS=	festvox-ked16-*
+CONFLICTS=	festvox-ked16
 
 NO_BUILD=	yes
 

diff --git a/audio/mixxx22/Makefile b/audio/mixxx22/Makefile
@@ -42,7 +42,7 @@ USE_QT=		buildtools concurrent core dbus gui network opengl script scripttools \
 		sql sql-sqlite3 svg testlib xml xmlpatterns linguisttools_build \
 		qmake_build widgets
 
-CONFLICTS=	mixxx-*
+CONFLICTS=	mixxx
 
 MAKE_ARGS=	qtdir="${PREFIX}" install_root="${PREFIX}" \
 		build=release optimize=portable ${GUI} battery=0 vamp=1 modplug=1 mad=1

diff --git a/biology/babel/Makefile b/biology/babel/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://smog.com/chem/babel/files/ \
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Converts among various molecular file formats
 
-CONFLICTS_INSTALL=	openbabel-*
+CONFLICTS_INSTALL=	openbabel
 
 USES=		tar:Z
 MAKE_ARGS=	CC="${CC}" CFLAGS="${CFLAGS}"

diff --git a/cad/alliance/Makefile b/cad/alliance/Makefile
@@ -35,7 +35,7 @@ MAKE_JOBS_UNSAFE=	yes
 INSTALL_TARGET=	install-strip
 CFLAGS+=	-fcommon
 
-CONFLICTS_INSTALL=	fspclient-*
+CONFLICTS_INSTALL=	fspclient
 
 SUB_FILES=	pkg-message
 WRKSRC=		${WRKDIR}/alliance/src

diff --git a/chinese/fireflyttf/Makefile b/chinese/fireflyttf/Makefile
@@ -10,7 +10,7 @@ DISTNAME?=	fireflysung-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Combination of two Arphic Sung fonts
 
-CONFLICTS=	zh-opendesktop-fonts-*
+CONFLICTS=	zh-opendesktop-fonts
 
 NO_BUILD=	yes
 WRKSRC=		${WRKDIR}/${DISTNAME}

diff --git a/comms/wsjtz/Makefile b/comms/wsjtz/Makefile
@@ -6,7 +6,7 @@ MASTER_SITES=	SF/wsjt-z/Source
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	Clone of WSJT-X software with additional features
 
-CONFLICTS=	wsjtx-*
+CONFLICTS=	wsjtx
 
 LICENSE=	GPLv3
 

diff --git a/converters/p5-JSON/Makefile b/converters/p5-JSON/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Perl extension to convert to JSON (JavaScript Object Notation)
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
 
-CONFLICTS=	p5-JSON-1.* p5-JSON1-*
+CONFLICTS=	p5-JSON-1.* p5-JSON1
 NO_ARCH=	yes
 USES=		perl5
 USE_PERL5=	configure

diff --git a/databases/firebird30-server/Makefile b/databases/firebird30-server/Makefile
@@ -22,7 +22,7 @@ LICENSE_PERMS_IPL=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 LIB_DEPENDS=	libicuuc.so:devel/icu \
 		libtommath.so:math/libtommath
 
-CONFLICTS_INSTALL=	firebird25-* firebird40-*
+CONFLICTS_INSTALL=	firebird25 firebird40
 
 USES=		cpe gmake pkgconfig localbase:ldflags libedit tar:bzip2
 USE_CXXSTD=	gnu++03

diff --git a/databases/firebird40-server/Makefile b/databases/firebird40-server/Makefile
@@ -23,7 +23,7 @@ LIB_DEPENDS=	libicuuc.so:devel/icu \
 		libtommath.so:math/libtommath \
 		libtomcrypt.so:security/libtomcrypt
 
-CONFLICTS_INSTALL=	firebird25-* firebird30-*
+CONFLICTS_INSTALL=	firebird25 firebird30
 
 USES=		cpe gmake pkgconfig localbase:ldflags libedit tar:xz
 USE_CXXSTD=	c++11

diff --git a/databases/mariadb-connector-c/Makefile b/databases/mariadb-connector-c/Makefile
@@ -19,10 +19,10 @@ LICENSE_FILE=	${WRKSRC}/COPYING.LIB
 
 LIB_DEPENDS=	libcurl.so:ftp/curl
 
-CONFLICTS_INSTALL=	mariadb[0-9]*-client-* \
-			mariadb102-server-* \
-			mysql[0-9]*-client-* \
-			percona[0-9]*-client-*
+CONFLICTS_INSTALL=	mariadb[0-9]*-client \
+			mariadb102-server \
+			mysql[0-9]*-client \
+			percona[0-9]*-client
 
 USES=		cmake:insource compiler:c++11-lib iconv:translit ssl
 USE_LDCONFIG=	${PREFIX}/lib/mariadb

diff --git a/databases/mariadb103-server/Makefile b/databases/mariadb103-server/Makefile
@@ -92,10 +92,10 @@ DISABLED_PLUGINS+=	DAEMON_EXAMPLE DIALOG_EXAMPLES EXAMPLE \
 
 DATADIR=	${PREFIX}/share/mysql
 
-CONFLICTS_INSTALL=	mariadb10[0-24-9]-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \
-			mysql[0-9]*-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \
-			mysqlwsrep* \
-			percona[0-9]*-${PKGNAMESUFFIX:C/^[0-9]*-//}-*
+CONFLICTS_INSTALL=	mariadb10[0-24-9]-${PKGNAMESUFFIX:C/^[0-9]*-//} \
+			mysql[0-9]*-${PKGNAMESUFFIX:C/^[0-9]*-//} \
+			mysqlwsrep*-server \
+			percona[0-9]*-${PKGNAMESUFFIX:C/^[0-9]*-//}
 
 FASTMTX_CMAKE_BOOL=	WITH_FAST_MUTEXES
 GSSAPI_BASE_USES=	gssapi

diff --git a/databases/mariadb104-server/Makefile b/databases/mariadb104-server/Makefile
@@ -105,10 +105,10 @@ DISABLED_PLUGINS+=	AUTH_TEST_PLUGIN DAEMON_EXAMPLE DIALOG_EXAMPLES \
 DATADIR=	${PREFIX}/share/mysql
 ETCDIR=		${PREFIX}/etc/mysql
 
-CONFLICTS_INSTALL=	mariadb10[0-24-9]-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \
-			mysql[0-9]*-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \
-			mysqlwsrep* \
-			percona[0-9]*-${PKGNAMESUFFIX:C/^[0-9]*-//}-*
+CONFLICTS_INSTALL=	mariadb10[0-24-9]-${PKGNAMESUFFIX:C/^[0-9]*-//} \
+			mysql[0-9]*-${PKGNAMESUFFIX:C/^[0-9]*-//} \
+			mysqlwsrep*-server \
+			percona[0-9]*-${PKGNAMESUFFIX:C/^[0-9]*-//}
 
 FASTMTX_CMAKE_BOOL=	WITH_FAST_MUTEXES
 GSSAPI_BASE_USES=	gssapi

diff --git a/databases/mariadb105-server/Makefile b/databases/mariadb105-server/Makefile
@@ -112,10 +112,10 @@ DISABLED_PLUGINS+=	AUTH_TEST_PLUGIN DAEMON_EXAMPLE DIALOG_EXAMPLES \
 DATADIR=	${PREFIX}/share/mysql
 ETCDIR=		${PREFIX}/etc/mysql
 
-CONFLICTS_INSTALL=	mariadb10[0-46-9]-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \
-			mysql[0-9]*-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \
-			mysqlwsrep* \
-			percona[0-9]*-${PKGNAMESUFFIX:C/^[0-9]*-//}-*
+CONFLICTS_INSTALL=	mariadb10[0-46-9]-${PKGNAMESUFFIX:C/^[0-9]*-//} \
+			mysql[0-9]*-${PKGNAMESUFFIX:C/^[0-9]*-//} \
+			mysqlwsrep*-server \
+			percona[0-9]*-${PKGNAMESUFFIX:C/^[0-9]*-//}
 
 FASTMTX_CMAKE_BOOL=	WITH_FAST_MUTEXES
 GSSAPI_BASE_USES=	gssapi

diff --git a/databases/mysql-connector-java/Makefile b/databases/mysql-connector-java/Makefile
@@ -24,7 +24,7 @@ CPE_PRODUCT=	mysql_connector_j
 NO_ARCH=	yes
 NO_BUILD=	yes
 
-CONFLICTS_INSTALL=	mysql-connector-java51-*
+CONFLICTS_INSTALL=	mysql-connector-java51
 
 JAVA_VERSION=	1.8+
 EXTRADOCS=	CHANGES

diff --git a/databases/mysql55-client/Makefile b/databases/mysql55-client/Makefile
@@ -11,9 +11,9 @@ PKGMESSAGE=	${.CURDIR}/pkg-message
 PATCHDIR=	${.CURDIR}/files
 PLIST=		${.CURDIR}/pkg-plist
 
-CONFLICTS_INSTALL=	mysql5[0-46-9]-client-* \
-			mariadb*-client-* \
-			percona*-client-*
+CONFLICTS_INSTALL=	mysql5[0-46-9]-client \
+			mariadb*-client \
+			percona*-client
 
 CMAKE_ARGS+=	-DWITHOUT_SERVER=1
 

diff --git a/databases/mysql55-server/Makefile b/databases/mysql55-server/Makefile
@@ -70,10 +70,10 @@ CMAKE_ARGS+=	-DWITH_FAST_MUTEXES=1
 .if !defined(CLIENT_ONLY)
 USES+=		mysql:55
 
-CONFLICTS_INSTALL=	mysql5[0-46-9]-server-* \
-			mysqlwsrep* \
-			mariadb*-server-* \
-			percona*-server-*
+CONFLICTS_INSTALL=	mysql5[0-46-9]-server \
+			mysqlwsrep*-server \
+			mariadb*-server \
+			percona*-server
 
 USE_RC_SUBR=	mysql-server
 

diff --git a/databases/mysql56-client/Makefile b/databases/mysql56-client/Makefile
@@ -16,10 +16,10 @@ PKGMESSAGE=	${.CURDIR}/pkg-message
 PATCHDIR=	${.CURDIR}/files
 PLIST=		${.CURDIR}/pkg-plist
 
-CONFLICTS_INSTALL=	mysql5[0-57-9]-client-* \
-			mysql[0-46-9][0-9]-client-* \
-			mariadb[0-9][0-9]-client-* \
-			percona[0-9][0-9]-client-*
+CONFLICTS_INSTALL=	mysql5[0-57-9]-client \
+			mysql[0-46-9][0-9]-client \
+			mariadb[0-9][0-9]-client \
+			percona[0-9][0-9]-client
 
 CMAKE_ARGS+=	-DWITHOUT_SERVER=1
 

diff --git a/databases/mysql56-server/Makefile b/databases/mysql56-server/Makefile
@@ -80,11 +80,11 @@ PLIST_SUB=	MY_DBDIR=${MY_DBDIR} \
 .if !defined(CLIENT_ONLY)
 USES+=		mysql:56
 
-CONFLICTS_INSTALL=	mysql5[0-57-9]-server-* \
-			mysql[0-46-9][0-9]-server-* \
-			mysqlwsrep* \
-			mariadb[0-9][0-9]-server-* \
-			percona[0-9][0-9]-server-*
+CONFLICTS_INSTALL=	mysql5[0-57-9]-server \
+			mysql[0-46-9][0-9]-server \
+			mysqlwsrep*-server \
+			mariadb[0-9][0-9]-server \
+			percona[0-9][0-9]-server
 
 USE_RC_SUBR=	mysql-server
 

diff --git a/databases/mysql57-client/Makefile b/databases/mysql57-client/Makefile
@@ -14,10 +14,10 @@ PKGMESSAGE=	${.CURDIR}/pkg-message
 PATCHDIR=	${.CURDIR}/files
 PLIST=		${.CURDIR}/pkg-plist
 
-CONFLICTS_INSTALL=	mysql5[0-68-9]-client-* \
-			mysql[0-46-9][0-9]-client-* \
-			mariadb[0-9][0-9]-client-* \
-			percona[0-9][0-9]-client-*
+CONFLICTS_INSTALL=	mysql5[0-68-9]-client \
+			mysql[0-46-9][0-9]-client \
+			mariadb[0-9][0-9]-client \
+			percona[0-9][0-9]-client
 
 CMAKE_ARGS+=	-DWITHOUT_SERVER=1 \
 		-DWITH_NDBCLUSTER=1

diff --git a/databases/mysql57-server/Makefile b/databases/mysql57-server/Makefile
@@ -87,11 +87,11 @@ OPTIONS_SUB=		YES
 .if !defined(CLIENT_ONLY)
 USES+=		mysql:57
 
-CONFLICTS_INSTALL=	mysql5[0-68-9]-server-* \
-			mysql[0-46-9][0-9]-server-* \
-			mysqlwsrep* \
-			mariadb[0-9][0-9]-server-* \
-			percona[0-9][0-9]-server-*
+CONFLICTS_INSTALL=	mysql5[0-68-9]-server \
+			mysql[0-46-9][0-9]-server \
+			mysqlwsrep*-server \
+			mariadb[0-9][0-9]-server \
+			percona[0-9][0-9]-server
 
 USE_RC_SUBR=	mysql-server
 

diff --git a/databases/mysql80-client/Makefile b/databases/mysql80-client/Makefile
@@ -14,10 +14,10 @@ PKGMESSAGE=	${.CURDIR}/pkg-message
 PATCHDIR=	${MASTERDIR}/files
 PLIST=		${.CURDIR}/pkg-plist
 
-CONFLICTS_INSTALL=	mysql8[1-9]-client-* \
-			mysql[0-79][0-9]-client-* \
-			mariadb[0-9][0-9]-client-* \
-			percona[0-9][0-9]-client-*
+CONFLICTS_INSTALL=	mysql8[1-9]-client \
+			mysql[0-79][0-9]-client \
+			mariadb[0-9][0-9]-client \
+			percona[0-9][0-9]-client
 
 CMAKE_ARGS+=	-DWITHOUT_SERVER=1 -DINSTALL_SUPPORTFILESDIR=0 -DWITH_AUTHENTICATION_FIDO=ON
 

diff --git a/databases/mysql80-server/Makefile b/databases/mysql80-server/Makefile
@@ -115,11 +115,11 @@ PLIST_SUB=	MY_DBDIR=${MY_DBDIR} \
 .if !defined(CLIENT_ONLY)
 USES+=		mysql:80
 
-CONFLICTS_INSTALL=	mysql8[1-9]-server-* \
-			mysql[0-79][0-9]-server-* \
-			mysqlwsrep* \
-			mariadb[0-9][0-9]-server-* \
-			percona[0-9][0-9]-server-*
+CONFLICTS_INSTALL=	mysql8[1-9]-server \
+			mysql[0-79][0-9]-server \
+			mysqlwsrep*-server \
+			mariadb[0-9][0-9]-server \
+			percona[0-9][0-9]-server
 
 USE_RC_SUBR=	mysql-server
 

diff --git a/databases/mysqlwsrep56-server/Makefile b/databases/mysqlwsrep56-server/Makefile
@@ -92,11 +92,11 @@ PLIST_SUB=	MY_DBDIR=${MY_DBDIR} \
 		MY_SECDIR=${MY_SECDIR} \
 		MY_TMPDIR=${MY_TMPDIR}
 
-CONFLICTS_INSTALL=	mariadb*-server-* \
-			mysql[0-9]*-server-* \
-			mysqlwsrep57*-server-* \
-			mysqlwsrep[1-489]*-server-* \
-			percona*-server-*
+CONFLICTS_INSTALL=	mariadb*-server \
+			mysql[0-9]*-server \
+			mysqlwsrep57*-server \
+			mysqlwsrep[1-489]*-server \
+			percona*-server
 
 USE_RC_SUBR=	mysql-server
 

diff --git a/databases/mysqlwsrep57-server/Makefile b/databases/mysqlwsrep57-server/Makefile
@@ -84,11 +84,11 @@ PLIST_SUB=	MY_DBDIR=${MY_DBDIR} \
 		MY_SECDIR=${MY_SECDIR} \
 		MY_TMPDIR=${MY_TMPDIR}
 
-CONFLICTS_INSTALL=	mariadb*-server-* \
-			mysql[0-9]*-server-* \
-			mysqlwsrep56*-server-* \
-			mysqlwsrep[1-489]*-server-* \
-			percona*-server-*
+CONFLICTS_INSTALL=	mariadb*-server \
+			mysql[0-9]*-server \
+			mysqlwsrep56*-server \
+			mysqlwsrep[1-489]*-server \
+			percona*-server
 
 USE_RC_SUBR=	mysql-server
 

diff --git a/databases/percona56-client/Makefile b/databases/percona56-client/Makefile
@@ -13,9 +13,9 @@ PKGMESSAGE=	${.CURDIR}/pkg-message
 PATCHDIR=	${.CURDIR}/files
 PLIST=		${.CURDIR}/pkg-plist
 
-CONFLICTS_INSTALL=	mysql*-client-* \
-			mariadb*-client-* \
-			percona5[0-57-9]-client-*
+CONFLICTS_INSTALL=	mysql*-client \
+			mariadb*-client \
+			percona5[0-57-9]-client
 
 CMAKE_ARGS+=	-DWITHOUT_SERVER=1
 

diff --git a/databases/percona56-server/Makefile b/databases/percona56-server/Makefile
@@ -71,10 +71,10 @@ USES+=		libedit
 # MySQL-Server part
 USES+=mysql:56p
 
-CONFLICTS_INSTALL=	mysql*-server-* \
-			mysqlwsrep* \
-			mariadb*-server-* \
-			percona5[0-57-9]-server-*
+CONFLICTS_INSTALL=	mysql*-server \
+			mysqlwsrep*-server \
+			mariadb*-server \
+			percona5[0-57-9]-server
 
 USE_RC_SUBR=	mysql-server
 

diff --git a/databases/percona57-client/Makefile b/databases/percona57-client/Makefile
@@ -16,9 +16,9 @@ PKGMESSAGE=	${.CURDIR}/pkg-message
 PATCHDIR=	${.CURDIR}/files
 PLIST=		${.CURDIR}/pkg-plist
 
-CONFLICTS_INSTALL=	mysql*-client-* \
-			mariadb*-client-* \
-			percona5[0-68-9]-client-*
+CONFLICTS_INSTALL=	mysql*-client \
+			mariadb*-client \
+			percona5[0-68-9]-client
 
 CMAKE_ARGS+=	-DWITHOUT_SERVER=1