diff options
| author | Stefan Eßer <se@FreeBSD.org> | 2021-11-25 21:40:11 +0000 |
|---|---|---|
| committer | Stefan Eßer <se@FreeBSD.org> | 2021-11-25 21:40:11 +0000 |
| commit | 04b9da414081a733478d3def4e1e3777908536c6 (patch) | |
| tree | f59ddc1be63ea2f6093a28c78fbd201d491ee49d | |
| parent | 09c1162b8dd0e293c93ff2a2a81b2d54b57729e3 (diff) | |
| download | ports-04b9da414081a733478d3def4e1e3777908536c6.tar.gz ports-04b9da414081a733478d3def4e1e3777908536c6.zip | |
*/*: 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)
188 files changed, 279 insertions, 288 deletions
diff --git a/archivers/arc/Makefile b/archivers/arc/Makefile index a0db1c16cba3..fad2f9cd8521 100644 --- 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 index a01ea4b4ab4d..35a791930cf6 100644 --- 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 index a73e17f0c2fc..8471408982d7 100644 --- 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 index 9525dec5b096..c0134713bf9c 100644 --- 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 index 9613c3dcb033..08da97446559 100644 --- 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 index 25e76848c5d2..1657a923be8f 100644 --- 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 index 5f7eb8480162..b645544668dd 100644 --- 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 index a644a4d11817..2692515068db 100644 --- 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 index c4f2bf60c1f1..f6472b71e480 100644 --- 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 index c2731140b695..cda12f049b19 100644 --- 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 index b917a696629c..53f83569d50e 100644 --- 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 index d6b51b7eb6fa..e53b8b529d92 100644 --- 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 index 5d7b85174e03..45774098c9fa 100644 --- 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 index d6a01630aa2d..640cf9e0e55e 100644 --- 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 index 7d7fd6a2b678..05518b869eac 100644 --- 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 index 661ef7f620fa..8ae086ab6851 100644 --- 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 index b1b25d53a741..eb7cfef65782 100644 --- 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 index ed353ab07d3f..a5e8c48668ad 100644 --- 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 index 19b56a652fd6..accd60e2e6d0 100644 --- 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 index d4e16fe50ae1..71a2242332c2 100644 --- 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 index c1fdd81a470f..516be4ce498a 100644 --- 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 index 60dfbc74278c..d2bf67d6c183 100644 --- 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 index ff2f3527e6dd..ef91646474b7 100644 --- 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 index 39417203cabd..e1c3afe69b57 100644 --- 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 index 1832a940eead..3c1db5d83255 100644 --- 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 index ea791e8ca54a..32d382f0c8f9 100644 --- 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 index 53a99ba306a9..6ef5c4eb467b 100644 --- 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 index 1ca4c5b090c9..fd3b494023f8 100644 --- 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 index b21b68b4ac9f..62c0b59cd7ec 100644 --- 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 index 56272dfc0c7c..e37e6b5c0cd0 100644 --- 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 index b62f436fd76f..4d938cbc1bc9 100644 --- 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 index e2492b832489..a0a2e7177e7a 100644 --- 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 diff --git a/databases/percona57-server/Makefile b/databases/percona57-server/Makefile index c75440293b88..f3b05c1ce540 100644 --- a/databases/percona57-server/Makefile +++ b/databases/percona57-server/Makefile @@ -106,10 +106,10 @@ TOKUDB_EXTRA_PATCHES=${PATCHDIR}/extrapatch-tokudb USES+=mysql:57p -CONFLICTS_INSTALL= mysql*-server-* \ - mysqlwsrep* \ - mariadb*-server-* \ - percona5[0-68-9]-server-* +CONFLICTS_INSTALL= mysql*-server \ + mysqlwsrep*-server \ + mariadb*-server \ + percona5[0-68-9]-server USE_RC_SUBR= mysql-server diff --git a/databases/postgresql11-pgtcl/Makefile b/databases/postgresql11-pgtcl/Makefile index 712386ca9c64..e7a779e69901 100644 --- a/databases/postgresql11-pgtcl/Makefile +++ b/databases/postgresql11-pgtcl/Makefile @@ -1,7 +1,7 @@ PORTREVISION= 0 PKGNAMESUFFIX= -postgresql11 -CONFLICTS= pgtcl pgtcl-postgresql9[0123456] pgtcl-postgresql10-* +CONFLICTS= pgtcl pgtcl-postgresql9[0123456] pgtcl-postgresql10 PGTCL_SLAVE= 11 MASTERDIR= ${.CURDIR}/../pgtcl diff --git a/databases/postgresql12-pgtcl/Makefile b/databases/postgresql12-pgtcl/Makefile index 082e23aa5423..98a77ac548a2 100644 --- a/databases/postgresql12-pgtcl/Makefile +++ b/databases/postgresql12-pgtcl/Makefile @@ -1,7 +1,7 @@ PORTREVISION= 0 PKGNAMESUFFIX= -postgresql12 -CONFLICTS= pgtcl pgtcl-postgresql9[0123456] pgtcl-postgresql1[013-9]-* +CONFLICTS= pgtcl pgtcl-postgresql9[0123456] pgtcl-postgresql1[013-9] PGTCL_SLAVE= 12 MASTERDIR= ${.CURDIR}/../pgtcl diff --git a/databases/postgresql13-pgtcl/Makefile b/databases/postgresql13-pgtcl/Makefile index dc8cf9802d62..85e256b000b7 100644 --- a/databases/postgresql13-pgtcl/Makefile +++ b/databases/postgresql13-pgtcl/Makefile @@ -1,7 +1,7 @@ PORTREVISION= 0 PKGNAMESUFFIX= -postgresql13 -CONFLICTS= pgtcl pgtcl-postgresql9[0123456] pgtcl-postgresql1[012-49]-* +CONFLICTS= pgtcl pgtcl-postgresql9[0123456] pgtcl-postgresql1[012-49] PGTCL_SLAVE= 13 MASTERDIR= ${.CURDIR}/../pgtcl diff --git a/databases/postgresql14-pgtcl/Makefile b/databases/postgresql14-pgtcl/Makefile index 850d0f0057c2..3aac14571fad 100644 --- a/databases/postgresql14-pgtcl/Makefile +++ b/databases/postgresql14-pgtcl/Makefile @@ -1,7 +1,7 @@ PORTREVISION= 0 PKGNAMESUFFIX= -postgresql14 -CONFLICTS= pgtcl pgtcl-postgresql9[0123456] pgtcl-postgresql1[0123-56789]-* +CONFLICTS= pgtcl pgtcl-postgresql9[0123456] pgtcl-postgresql1[0123-56789] PGTCL_SLAVE= 14 MASTERDIR= ${.CURDIR}/../pgtcl diff --git a/databases/puppetdb-terminus6/Makefile b/databases/puppetdb-terminus6/Makefile index c0f97e03d7b6..6f81bf692f99 100644 --- a/databases/puppetdb-terminus6/Makefile +++ b/databases/puppetdb-terminus6/Makefile @@ -12,7 +12,7 @@ LICENSE= APACHE20 BUILD_DEPENDS= puppet6>=0:sysutils/puppet6 -CONFLICTS_INSTALL= puppetdb-terminus5-* puppetdb-terminus7-* +CONFLICTS_INSTALL= puppetdb-terminus5 puppetdb-terminus7 USE_RUBY= yes NO_BUILD= yes USES= gmake diff --git a/databases/puppetdb-terminus7/Makefile b/databases/puppetdb-terminus7/Makefile index ae91920ca503..5eea12fc8440 100644 --- a/databases/puppetdb-terminus7/Makefile +++ b/databases/puppetdb-terminus7/Makefile @@ -12,7 +12,7 @@ LICENSE= APACHE20 BUILD_DEPENDS= puppet7>=0:sysutils/puppet7 -CONFLICTS_INSTALL= puppetdb-terminus5-* puppetdb-terminus6-* +CONFLICTS_INSTALL= puppetdb-terminus5 puppetdb-terminus6 USE_RUBY= yes NO_BUILD= yes USES= gmake diff --git a/databases/puppetdb6/Makefile b/databases/puppetdb6/Makefile index b7b602ecc4c0..9fb5bfe68848 100644 --- a/databases/puppetdb6/Makefile +++ b/databases/puppetdb6/Makefile @@ -13,7 +13,7 @@ RUN_DEPENDS= bash:shells/bash USE_RC_SUBR= puppetdb -CONFLICTS_INSTALL= puppetdb5-* puppetdb7-* +CONFLICTS_INSTALL= puppetdb5 puppetdb7 USES= cpe shebangfix CPE_VENDOR= puppet SHEBANG_FILES= ext/bin/puppetdb \ diff --git a/databases/puppetdb7/Makefile b/databases/puppetdb7/Makefile index 6ab62c8dc2ba..cb0e7e6dd11d 100644 --- a/databases/puppetdb7/Makefile +++ b/databases/puppetdb7/Makefile @@ -13,7 +13,7 @@ RUN_DEPENDS= bash:shells/bash USE_RC_SUBR= puppetdb -CONFLICTS_INSTALL= puppetdb5-* puppetdb6-* +CONFLICTS_INSTALL= puppetdb5 puppetdb6 USES= cpe shebangfix CPE_VENDOR= puppet SHEBANG_FILES= ext/bin/puppetdb \ diff --git a/databases/py-pypuppetdb/Makefile b/databases/py-pypuppetdb/Makefile index dc042df6546b..9369036392e6 100644 --- a/databases/py-pypuppetdb/Makefile +++ b/databases/py-pypuppetdb/Makefile @@ -14,7 +14,7 @@ USES= python:3.6+ USE_GITHUB= yes USE_PYTHON= autoplist distutils -CONFLICTS_INSTALL= pypuppetdb03-* +CONFLICTS_INSTALL= pypuppetdb03 GH_ACCOUNT= voxpupuli diff --git a/databases/rrdtool/Makefile b/databases/rrdtool/Makefile index 45e786b0ac50..f0ba980893dc 100644 --- a/databases/rrdtool/Makefile +++ b/databases/rrdtool/Makefile @@ -12,7 +12,7 @@ COMMENT= Round Robin Database Tools LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE -CONFLICTS= rrdtool12-* +CONFLICTS= rrdtool12 CONFIGURE_ARGS= --disable-tcl CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/freetype2 diff --git a/databases/tdb/Makefile b/databases/tdb/Makefile index c12809f1cc77..5ecf5f7ac97f 100644 --- a/databases/tdb/Makefile +++ b/databases/tdb/Makefile @@ -12,7 +12,7 @@ LICENSE= GPLv3 IGNORE_NONTHREAD_PYTHON=needs port lang/python${PYTHON_SUFFIX} to be build with THREADS support -CONFLICTS_INSTALL= tdb1-* +#CONFLICTS_INSTALL= tdb1 #FLAVORS= default nopython debug #nopython_PKGNAMESUFFIX= -nopython diff --git a/devel/android-tools-adb/Makefile b/devel/android-tools-adb/Makefile index 02e07bb12573..4fe4a3f33cf6 100644 --- a/devel/android-tools-adb/Makefile +++ b/devel/android-tools-adb/Makefile @@ -12,7 +12,7 @@ LICENSE= APACHE20 USE_GITHUB= yes GH_TUPLE= aosp-mirror:platform_system_core:${DISTVERSIONFULL} -CONFLICTS_INSTALL?= ${PORTNAME}-devel-* +CONFLICTS_INSTALL?= ${PORTNAME}-devel USES= compiler:c++17-lang pkgconfig ssl uidfix BUILD_WRKSRC= ${WRKSRC}/adb diff --git a/devel/android-tools-fastboot/Makefile b/devel/android-tools-fastboot/Makefile index d124e4f2e2f0..682fff410030 100644 --- a/devel/android-tools-fastboot/Makefile +++ b/devel/android-tools-fastboot/Makefile @@ -19,7 +19,7 @@ GH_TUPLE= aosp-mirror:platform_system_core:${DISTVERSIONFULL} \ jbeich:platform_system_extras:${DISTVERSIONFULL}:extras/extras \ jbeich:platform_system_tools_mkbootimg:${DISTVERSIONFULL}:mkbootimg/mkbootimg -CONFLICTS_INSTALL?= ${PORTNAME}-devel-* +CONFLICTS_INSTALL?= ${PORTNAME}-devel USES= compiler:c++17-lang pkgconfig ssl uidfix BUILD_WRKSRC= ${WRKSRC}/fastboot diff --git a/devel/cloudabi-toolchain/Makefile b/devel/cloudabi-toolchain/Makefile index 5a3f5aa72e36..893ed63667c9 100644 --- a/devel/cloudabi-toolchain/Makefile +++ b/devel/cloudabi-toolchain/Makefile @@ -16,7 +16,7 @@ RUN_DEPENDS= clang${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT} \ lld${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT} \ pkgconf:devel/pkgconf -CONFLICTS= cloudabi-binutils-* +CONFLICTS= cloudabi-binutils CLOUDABI_ARCHS= aarch64-unknown-cloudabi armv6-unknown-cloudabi-eabihf \ armv7-unknown-cloudabi-eabihf i686-unknown-cloudabi \ diff --git a/devel/cmake/Makefile b/devel/cmake/Makefile index e934e1ff5c9f..02ac470834f0 100644 --- a/devel/cmake/Makefile +++ b/devel/cmake/Makefile @@ -45,8 +45,6 @@ CPACK_LIB_DEPENDS= libpkg.so:${PKG_ORIGIN} CPACK_USES_OFF= libarchive # When CPACK is on, uses base libarchive and won't pass stage-qa -CONFLICTS_INSTALL= cmake-modules-* - CXXFLAGS+= -D__BSD_VISIBLE .include <bsd.port.pre.mk> diff --git a/devel/libedit/Makefile b/devel/libedit/Makefile index ea8b5207e1c8..34842eaf1c39 100644 --- a/devel/libedit/Makefile +++ b/devel/libedit/Makefile @@ -19,7 +19,7 @@ GNU_CONFIGURE= yes USE_LDCONFIG= yes INSTALL_TARGET= install-strip -CONFLICTS_INSTALL= editline-* +CONFLICTS_INSTALL= editline post-install: ${MV} ${STAGEDIR}${PREFIX}/man/man3/history.3 ${STAGEDIR}${PREFIX}/man/man3/el_history.3 diff --git a/devel/llvm-devel/Makefile b/devel/llvm-devel/Makefile index b7c6dff379aa..896b912aa561 100644 --- a/devel/llvm-devel/Makefile +++ b/devel/llvm-devel/Makefile @@ -165,7 +165,7 @@ LLDB_VARS= _USES_PYTHON=python:3.6+ MLIR_DESC= Multi-Level Intermediate Representation OPENMP_DESC= Install libomp, the LLVM OpenMP runtime library OPENMP_PORTDOCS= openmp -OPENMP_CONFLICTS_INSTALL= libiomp5-devel-* +OPENMP_CONFLICTS_INSTALL= libiomp5-devel OPENMP_USES= perl5 OPENMP_USE= PERL5=build STATIC_LIBS_DESC= Install static libraries (does not effect sanitizers) diff --git a/devel/llvm10/Makefile b/devel/llvm10/Makefile index f0a2cfbcb1d8..ae33d17cce6e 100644 --- a/devel/llvm10/Makefile +++ b/devel/llvm10/Makefile @@ -117,7 +117,7 @@ COMPILER_RT_PLIST_FILES=${_COMPILER_RT_LIBS:S|^|${_CRTLIBDIR}/|} \ ${_COMPILER_RT_BLACKLISTS:S|^|${_CRTBLDIR}/|} DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=0,1:textproc/py-sphinx@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}recommonmark>=0.0.20180530:textproc/py-recommonmark@${PY_FLAVOR} -DOCS_CONFLICTS_BUILD= commonmark-cmark-* +DOCS_CONFLICTS_BUILD= commonmark-cmark DOCS_PORTDOCS= llvm DOCS_CMAKE_ON= -DLLVM_ENABLE_SPHINX=ON \ -DSPHINX_EXECUTABLE=${LOCALBASE}/bin/sphinx-build-${PYTHON_VER} \ diff --git a/devel/llvm11/Makefile b/devel/llvm11/Makefile index 48ea9a25d432..8d723d56e8ba 100644 --- a/devel/llvm11/Makefile +++ b/devel/llvm11/Makefile @@ -113,7 +113,7 @@ COMPILER_RT_PLIST_FILES=${_COMPILER_RT_LIBS:S|^|${_CRTLIBDIR}/|} \ ${_COMPILER_RT_BLACKLISTS:S|^|${_CRTBLDIR}/|} DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=0,1:textproc/py-sphinx@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}recommonmark>=0.0.20180530:textproc/py-recommonmark@${PY_FLAVOR} -DOCS_CONFLICTS_BUILD= commonmark-cmark-* +DOCS_CONFLICTS_BUILD= commonmark-cmark DOCS_PORTDOCS= llvm DOCS_CMAKE_ON= -DLLVM_ENABLE_SPHINX=ON \ -DSPHINX_EXECUTABLE=${LOCALBASE}/bin/sphinx-build-${PYTHON_VER} \ diff --git a/devel/llvm12/Makefile b/devel/llvm12/Makefile index cf0c9ac51833..8e273e45beea 100644 --- a/devel/llvm12/Makefile +++ b/devel/llvm12/Makefile @@ -128,7 +128,7 @@ COMPILER_RT_PLIST_FILES=${_COMPILER_RT_LIBS:S|^|${_CRTLIBDIR}/|} \ ${_COMPILER_RT_BLACKLISTS:S|^|${_CRTBLDIR}/|} DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=0,1:textproc/py-sphinx@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}recommonmark>=0.0.20180530:textproc/py-recommonmark@${PY_FLAVOR} -DOCS_CONFLICTS_BUILD= commonmark-cmark-* +DOCS_CONFLICTS_BUILD= commonmark-cmark DOCS_PORTDOCS= llvm DOCS_CMAKE_ON= -DLLVM_ENABLE_SPHINX=ON \ -DSPHINX_EXECUTABLE=${LOCALBASE}/bin/sphinx-build-${PYTHON_VER} \ diff --git a/devel/llvm13/Makefile b/devel/llvm13/Makefile index 90ec23d66318..ca228f947b83 100644 --- a/devel/llvm13/Makefile +++ b/devel/llvm13/Makefile @@ -139,7 +139,7 @@ COMPILER_RT_PLIST_FILES=${_COMPILER_RT_LIBS:S|^|${_CRTLIBDIR}/|} \ ${_COMPILER_RT_BLACKLISTS:S|^|${_CRTBLDIR}/|} DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx-markdown-tables>=0:textproc/py-sphinx-markdown-tables@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}recommonmark>=0.0.20180530:textproc/py-recommonmark@${PY_FLAVOR} -DOCS_CONFLICTS_BUILD= commonmark-cmark-* +DOCS_CONFLICTS_BUILD= commonmark-cmark DOCS_PORTDOCS= llvm DOCS_CMAKE_ON= -DLLVM_ENABLE_SPHINX=ON \ -DSPHINX_EXECUTABLE=${LOCALBASE}/bin/sphinx-build-${PYTHON_VER} \ diff --git a/devel/llvm80/Makefile b/devel/llvm80/Makefile index 399ee8acad7e..82ac6ee4bc6e 100644 --- a/devel/llvm80/Makefile +++ b/devel/llvm80/Makefile @@ -94,7 +94,7 @@ COMPILER_RT_PLIST_FILES=${_COMPILER_RT_LIBS:S|^|${_CRTLIBDIR}/|} \ ${_COMPILER_RT_BLACKLISTS:S|^|${_CRTBLDIR}/|} DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=0,1:textproc/py-sphinx@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}recommonmark>=0.0.20180530:textproc/py-recommonmark@${PY_FLAVOR} -DOCS_CONFLICTS_BUILD= commonmark-cmark-* +DOCS_CONFLICTS_BUILD= commonmark-cmark DOCS_PORTDOCS= llvm DOCS_CMAKE_ON= -DLLVM_ENABLE_SPHINX=ON \ -DSPHINX_EXECUTABLE=${LOCALBASE}/bin/sphinx-build-${PYTHON_VER} \ diff --git a/devel/llvm90/Makefile b/devel/llvm90/Makefile index 553c45035bf9..806ae746991e 100644 --- a/devel/llvm90/Makefile +++ b/devel/llvm90/Makefile @@ -100,7 +100,7 @@ COMPILER_RT_PLIST_FILES=${_COMPILER_RT_LIBS:S|^|${_CRTLIBDIR}/|} \ ${_COMPILER_RT_BLACKLISTS:S|^|${_CRTBLDIR}/|} DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=0,1:textproc/py-sphinx@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}recommonmark>=0.0.20180530:textproc/py-recommonmark@${PY_FLAVOR} -DOCS_CONFLICTS_BUILD= commonmark-cmark-* +DOCS_CONFLICTS_BUILD= commonmark-cmark DOCS_PORTDOCS= llvm DOCS_CMAKE_ON= -DLLVM_ENABLE_SPHINX=ON \ -DSPHINX_EXECUTABLE=${LOCALBASE}/bin/sphinx-build-${PYTHON_VER} \ diff --git a/devel/php-composer/Makefile b/devel/php-composer/Makefile index 2ef7a14e50bc..6573f2d67eb4 100644 --- a/devel/php-composer/Makefile +++ b/devel/php-composer/Makefile @@ -20,7 +20,7 @@ USES= cpe php:flavors CPE_VENDOR= getcomposer USE_PHP= ctype filter intl json mbstring openssl phar -CONFLICTS_INSTALL= php*-composer2-* +CONFLICTS_INSTALL= php*-composer2 NO_ARCH= yes NO_BUILD= yes diff --git a/devel/php-composer2/Makefile b/devel/php-composer2/Makefile index eab6bd2e93b4..f0adef64a0c3 100644 --- a/devel/php-composer2/Makefile +++ b/devel/php-composer2/Makefile @@ -21,7 +21,7 @@ USES= cpe php:flavors CPE_VENDOR= getcomposer USE_PHP= ctype filter intl json mbstring openssl phar -CONFLICTS_INSTALL= php*-composer-* +CONFLICTS_INSTALL= php*-composer NO_ARCH= yes NO_BUILD= yes diff --git a/devel/py-magic/Makefile b/devel/py-magic/Makefile index c7548a65a48d..05e383699f43 100644 --- a/devel/py-magic/Makefile +++ b/devel/py-magic/Makefile @@ -20,7 +20,7 @@ USES= python USE_PYTHON= autoplist distutils # both install module as magic.py -CONFLICTS= ${PYTHON_PKGNAMEPREFIX}python-magic-* +CONFLICTS= ${PYTHON_PKGNAMEPREFIX}python-magic WRKSRC= ${WRKDIR}/file-${PORTVERSION}/python diff --git a/devel/py-python-magic/Makefile b/devel/py-python-magic/Makefile index 6b1406c05ed4..0cf6c1b43bdb 100644 --- a/devel/py-python-magic/Makefile +++ b/devel/py-python-magic/Makefile @@ -18,7 +18,7 @@ USE_PYTHON= autoplist distutils GH_ACCOUNT= ahupp # both install module as magic.py -CONFLICTS= ${PYTHON_PKGNAMEPREFIX}magic-* +CONFLICTS= ${PYTHON_PKGNAMEPREFIX}magic NO_ARCH= yes diff --git a/devel/rubygem-ruby-progressbar/Makefile b/devel/rubygem-ruby-progressbar/Makefile index 6044377e050b..55c6fac91812 100644 --- a/devel/rubygem-ruby-progressbar/Makefile +++ b/devel/rubygem-ruby-progressbar/Makefile @@ -9,7 +9,7 @@ COMMENT= Progressbar library for Ruby LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE.txt -CONFLICTS_INSTALL= ${RUBY_PKGNAMEPREFIX}progressbar-* +CONFLICTS_INSTALL= ${RUBY_PKGNAMEPREFIX}progressbar USES= gem USE_RUBY= yes diff --git a/devel/talloc/Makefile b/devel/talloc/Makefile index 936057ac4509..c2f55ce6acca 100644 --- a/devel/talloc/Makefile +++ b/devel/talloc/Makefile @@ -11,7 +11,7 @@ LICENSE= LGPL3 IGNORE_NONTHREAD_PYTHON=needs port lang/python${PYTHON_SUFFIX} to be built with THREADS support -CONFLICTS_INSTALL= talloc1-* +CONFLICTS_INSTALL= talloc1 #FLAVORS= default nopython #nopython_PKGNAMESUFFIX= -nopython diff --git a/devel/tevent/Makefile b/devel/tevent/Makefile index 9506d5ce8f38..7897c7a480a8 100644 --- a/devel/tevent/Makefile +++ b/devel/tevent/Makefile @@ -15,7 +15,7 @@ IGNORE_NONTHREAD_PYTHON=needs port lang/python${PYTHON_SUFFIX} to be build with BUILD_DEPENDS= talloc>=2.3.1:devel/talloc RUN_DEPENDS= talloc>=2.3.1:devel/talloc -CONFLICTS_INSTALL= tevent1-* +CONFLICTS_INSTALL= tevent1 #FLAVORS= default nopython #nopython_PKGNAMESUFFIX= -nopython diff --git a/dns/dnsmasq/Makefile b/dns/dnsmasq/Makefile index 1d3f4e6264eb..477980deff20 100644 --- a/dns/dnsmasq/Makefile +++ b/dns/dnsmasq/Makefile @@ -30,7 +30,7 @@ CFLAGS+= -Wall -Wno-unused-function -Wno-unused-parameter \ -Wno-unused-value -Wno-unused-variable CPPFLAGS+= -I${LOCALBASE}/include -CONFLICTS_INSTALL= dnsmasq-devel-* +CONFLICTS_INSTALL= dnsmasq-devel PATCH_STRIP= -p1 SUB_FILES= pkg-message diff --git a/editors/lazarus-qt5/Makefile b/editors/lazarus-qt5/Makefile index 25b512033267..938a74a8fea2 100644 --- a/editors/lazarus-qt5/Makefile +++ b/editors/lazarus-qt5/Makefile @@ -2,7 +2,7 @@ PKGNAMESUFFIX?= -qt5 COMMENT= Portable Delphi-like IDE for the FreePascal compiler (QT5) -CONFLICTS= ${PORTNAME}-gtk2-* +CONFLICTS= ${PORTNAME}-gtk2 LIB_DEPENDS= libQt5Pas.so:x11-toolkits/qt5pas diff --git a/editors/lazarus/Makefile b/editors/lazarus/Makefile index 4f2ec8895e5a..f88473a75e7e 100644 --- a/editors/lazarus/Makefile +++ b/editors/lazarus/Makefile @@ -11,7 +11,7 @@ DIST_SUBDIR= freepascal MAINTAINER?= acm@FreeBSD.org COMMENT?= Portable Delphi-like IDE for the FreePascal compiler (GTK2) -CONFLICTS?= ${PORTNAME}-qt5-* +CONFLICTS?= ${PORTNAME}-qt5 BUILD_DEPENDS?= ${LOCALBASE}/bin/as:devel/binutils \ fpcres:lang/fpc-utils diff --git a/editors/openoffice-4/Makefile b/editors/openoffice-4/Makefile index 26e00e99dfa8..dcf6e61ae326 100644 --- a/editors/openoffice-4/Makefile +++ b/editors/openoffice-4/Makefile @@ -122,7 +122,7 @@ USE_PERL5= build USE_XORG= ice sm x11 xau xaw xcomposite xcursor xdamage xext xfixes xi \ xinerama xrandr xrender xt -CONFLICTS_INSTALL= apache-openoffice-devel-* +CONFLICTS_INSTALL= apache-openoffice-devel AOOVERSION1= 4 AOOVERSION2= 1 diff --git a/emulators/mtools/Makefile b/emulators/mtools/Makefile index 53791cf348c2..7ae390da86a1 100644 --- a/emulators/mtools/Makefile +++ b/emulators/mtools/Makefile @@ -11,7 +11,7 @@ COMMENT= Collection of tools for manipulating MS-DOS files LICENSE= GPLv3 -CONFLICTS_INSTALL= multimarkdown-* +CONFLICTS_INSTALL= multimarkdown USES= gmake makeinfo tar:bzip2 GNU_CONFIGURE= yes diff --git a/emulators/virtualbox-ose-kmod-legacy/Makefile b/emulators/virtualbox-ose-kmod-legacy/Makefile index 1d3ee7a98ed5..6e70e1e83651 100644 --- a/emulators/virtualbox-ose-kmod-legacy/Makefile +++ b/emulators/virtualbox-ose-kmod-legacy/Makefile @@ -37,8 +37,8 @@ CONFIGURE_ARGS+= --disable-alsa \ --disable-xpcom CONFIGURE_ARGS+= --nofatal --with-gcc="${CC}" --with-g++="${CXX}" -CONFLICTS_INSTALL= virtualbox-ose-kmod-devel-* \ - virtualbox-ose-kmod-* +CONFLICTS_INSTALL= virtualbox-ose-kmod-devel \ + virtualbox-ose-kmod PORTSCOUT= limit:^5\. diff --git a/emulators/virtualbox-ose-kmod/Makefile b/emulators/virtualbox-ose-kmod/Makefile index a3c10c157c87..b9aa595f0eba 100644 --- a/emulators/virtualbox-ose-kmod/Makefile +++ b/emulators/virtualbox-ose-kmod/Makefile @@ -36,8 +36,8 @@ CONFIGURE_ARGS+= --disable-alsa \ --disable-xpcom CONFIGURE_ARGS+= --nofatal --with-gcc="${CC}" --with-g++="${CXX}" -CONFLICTS_INSTALL= virtualbox-ose-kmod-devel-* \ - virtualbox-ose-kmod-legacy-* +CONFLICTS_INSTALL= virtualbox-ose-kmod-devel \ + virtualbox-ose-kmod-legacy OPTIONS_DEFINE= DEBUG VIMAGE OPTIONS_DEFAULT=VIMAGE diff --git a/games/hangman/Makefile b/games/hangman/Makefile index ba1cf006914f..b93b5c4d9cd0 100644 --- a/games/hangman/Makefile +++ b/games/hangman/Makefile @@ -8,7 +8,7 @@ MASTER_SITES= http://www.shiftygames.com/hangman/ \ MAINTAINER= amdmi3@FreeBSD.org COMMENT= Challenge your spelling skills in the old western style -CONFLICTS= bsdgames-* +CONFLICTS= bsdgames GNU_CONFIGURE= yes USES= gmake sdl diff --git a/games/shaaft/Makefile b/games/shaaft/Makefile index f6f1e62ad77e..42447ff6a719 100644 --- a/games/shaaft/Makefile +++ b/games/shaaft/Makefile @@ -12,7 +12,7 @@ COMMENT= OpenGL 3D falling block game similar to Blockout LIB_DEPENDS= libpng.so:graphics/png -CONFLICTS= criticalmass-* +CONFLICTS= criticalmass USES= gl sdl tar:bzip2 USE_SDL= mixer image sdl diff --git a/games/sol/Makefile b/games/sol/Makefile index 27231a137fda..e150adcd15dd 100644 --- a/games/sol/Makefile +++ b/games/sol/Makefile @@ -16,7 +16,7 @@ LIB_DEPENDS= libXaw.so:x11-toolkits/libXaw \ libshhopt.so:devel/libshhopt \ libxalloc.so:devel/libxalloc -CONFLICTS= gnome-games-* +CONFLICTS= gnome-games USES= gmake xorg USE_XORG= ice sm x11 xext xmu xpm xt diff --git a/graphics/py-pyglet/Makefile b/graphics/py-pyglet/Makefile index d6f37186a3ae..1dafb177a968 100644 --- a/graphics/py-pyglet/Makefile +++ b/graphics/py-pyglet/Makefile @@ -10,7 +10,7 @@ COMMENT= Cross-platform windowing and multimedia library LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -CONFLICTS_INSTALL=${PYTHON_PKGNAMEPREFIX}pyglet150-* +CONFLICTS_INSTALL=${PYTHON_PKGNAMEPREFIX}pyglet150 USES= python:3.6+ zip USE_PYTHON= autoplist distutils diff --git a/graphics/py-pyglet150/Makefile b/graphics/py-pyglet150/Makefile index 204d6862f62a..fc95f1a1ea03 100644 --- a/graphics/py-pyglet150/Makefile +++ b/graphics/py-pyglet150/Makefile @@ -11,7 +11,7 @@ COMMENT= Cross-platform windowing and multimedia library LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -CONFLICTS_INSTALL=${PYTHON_PKGNAMEPREFIX}pyglet-* +CONFLICTS_INSTALL=${PYTHON_PKGNAMEPREFIX}pyglet USES= python:3.5+ zip USE_PYTHON= autoplist distutils diff --git a/graphics/xli/Makefile b/graphics/xli/Makefile index a1ebdb8eb585..cd9606f4eb2e 100644 --- a/graphics/xli/Makefile +++ b/graphics/xli/Makefile @@ -12,7 +12,7 @@ COMMENT= Utilities to display images in X11 LIB_DEPENDS= libpng.so:graphics/png -CONFLICTS_INSTALL= xloadimage-* +CONFLICTS_INSTALL= xloadimage USES= cpe imake jpeg xorg USE_XORG= xi diff --git a/graphics/xpdf3/Makefile b/graphics/xpdf3/Makefile index 17d13fe76b41..9d1a491c3211 100644 --- a/graphics/xpdf3/Makefile +++ b/graphics/xpdf3/Makefile @@ -5,9 +5,9 @@ CATEGORIES= graphics print MASTER_SITES= https://xpdfreader-dl.s3.amazonaws.com/old/ .if !defined(MASTERDIR) PKGNAMESUFFIX= 3 -CONFLICTS_INSTALL= xpdf4-* xpdf-* +CONFLICTS_INSTALL= xpdf4 xpdf .else -CONFLICTS_INSTALL= xpdf4-* xpdf3-* +CONFLICTS_INSTALL= xpdf4 xpdf3 .endif MAINTAINER= cy@FreeBSD.org diff --git a/graphics/xpdf4/Makefile b/graphics/xpdf4/Makefile index d5d69d3bbe71..bd81dd1a16be 100644 --- a/graphics/xpdf4/Makefile +++ b/graphics/xpdf4/Makefile @@ -14,9 +14,9 @@ LICENSE= GPLv2 CONFLICTS_INSTALL= xpdf .if !defined(MASTERDIR) -CONFLICTS_INSTALL+= xpdf3-* xpdf-* +CONFLICTS_INSTALL+= xpdf3 xpdf .else -CONFLICTS_INSTALL+= xpdf3-* xpdf4-* +CONFLICTS_INSTALL+= xpdf3 xpdf4 .endif USES= compiler:c++11-lang cmake cpe localbase:ldflags diff --git a/java/intellij/Makefile b/java/intellij/Makefile index ceac0df9d67f..1b202128d8be 100644 --- a/java/intellij/Makefile +++ b/java/intellij/Makefile @@ -31,7 +31,7 @@ NO_BUILD= yes WRKSRC= ${WRKDIR}/idea-IC-202.7660.26 SUB_FILES= idea idea.desktop pkg-message -CONFLICTS= intellij-ultimate-* +CONFLICTS= intellij-ultimate do-install: # Linux/Windows/OS X only so remove them diff --git a/lang/petite-chez/Makefile b/lang/petite-chez/Makefile index 6dbafef0e0f2..84cd7fb56ce8 100644 --- a/lang/petite-chez/Makefile +++ b/lang/petite-chez/Makefile @@ -12,7 +12,7 @@ MAINTAINER= vmagerya@gmail.com COMMENT= Free interpreter for Chez Scheme system # Both install bin/scheme-script -CONFLICTS= ikarus-* +CONFLICTS= ikarus ONLY_FOR_ARCHS= i386 amd64 diff --git a/lang/php73/Makefile b/lang/php73/Makefile index 99322061fde4..5b89943694ec 100644 --- a/lang/php73/Makefile +++ b/lang/php73/Makefile @@ -59,7 +59,7 @@ MYSQLND_DESC= Build with MySQL Native Driver LINKTHR_DESC= Link thread lib (for threaded extensions) ZTS_DESC= Force Zend Thread Safety (ZTS) build -CONFLICTS= php74-* php80-* +CONFLICTS= php74 php80 DESTDIRNAME= INSTALL_ROOT diff --git a/lang/php74/Makefile b/lang/php74/Makefile index 37e56b15adf3..aad4738fc797 100644 --- a/lang/php74/Makefile +++ b/lang/php74/Makefile @@ -59,7 +59,7 @@ MYSQLND_DESC= Build with MySQL Native Driver LINKTHR_DESC= Link thread lib (for threaded extensions) ZTS_DESC= Force Zend Thread Safety (ZTS) build -CONFLICTS= php73-* php80-* +CONFLICTS= php73 php80 DESTDIRNAME= INSTALL_ROOT diff --git a/lang/php80/Makefile b/lang/php80/Makefile index b76f80480659..00088f9682c7 100644 --- a/lang/php80/Makefile +++ b/lang/php80/Makefile @@ -67,7 +67,7 @@ MYSQL80_CONFIGURE_ENV= OPENSSL_CFLAGS="-I${OPENSSLINC}" \ MYSQL80_LDFLAGS= -L${OPENSSLLIB} -lcrypto -lssl MYSQL80_USES= ssl -CONFLICTS= php72-* php73-* php74-* +CONFLICTS= php73 php74 DESTDIRNAME= INSTALL_ROOT diff --git a/lang/zig-devel/Makefile b/lang/zig-devel/Makefile index 62a19947419a..639a5ad4315e 100644 --- a/lang/zig-devel/Makefile +++ b/lang/zig-devel/Makefile @@ -22,7 +22,7 @@ GH_ACCOUNT= ziglang GH_PROJECT= zig GH_TAGNAME= 9e3ec9893 -CONFLICTS= zig-* +CONFLICTS= zig OPTIONS_DEFINE= STATIC OPTIONS_DEFAULT= STATIC diff --git a/mail/ezmlm/Makefile b/mail/ezmlm/Makefile index a6eea88553ee..7bd587f9a8ab 100644 --- a/mail/ezmlm/Makefile +++ b/mail/ezmlm/Makefile @@ -23,7 +23,7 @@ LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept USES= qmail:run -CONFLICTS= ezmlm-idx-* +CONFLICTS= ezmlm-idx ALL_TARGET= it diff --git a/mail/meta1/Makefile b/mail/meta1/Makefile index c93345962088..b5acbcfaafde 100644 --- a/mail/meta1/Makefile +++ b/mail/meta1/Makefile @@ -12,7 +12,7 @@ LICENSE= BSD4CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE MAKE_JOBS_UNSAFE= yes -CONFLICTS= smx-* +CONFLICTS= smx MANUAL_PACKAGE_BUILD= needs hostname .if !defined(SENDMAIL_WITHOUT_SHMEM) && !defined(BUILDING_INDEX) diff --git a/mail/mmh/Makefile b/mail/mmh/Makefile index a21dee9b2530..227d95cad326 100644 --- a/mail/mmh/Makefile +++ b/mail/mmh/Makefile @@ -40,7 +40,7 @@ LDFLAGS+= -g DEBUG_FLAGS+= -O0 -Wall -Wextra -g .endif -CONFLICTS= ja-mh nmh p5-Dist-Joseki-* +CONFLICTS= ja-mh nmh p5-Dist-Joseki post-install: @${FIND} ${STAGEDIR}${ETCDIR} -type f -exec ${MV} {} {}.sample \; diff --git a/mail/sendmail-devel/Makefile b/mail/sendmail-devel/Makefile index 7675daf68c51..de7842fc0b99 100644 --- a/mail/sendmail-devel/Makefile +++ b/mail/sendmail-devel/Makefile @@ -14,7 +14,7 @@ LICENSE_NAME= Sendmail License LICENSE_FILE= ${WRKSRC}/LICENSE LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept -CONFLICTS?= courier-0.* postfix-1.* postfix-2.* smail-3.* zmailer-2.* opensmtpd-* +CONFLICTS?= courier-0.* postfix-1.* postfix-2.* smail-3.* zmailer-2.* opensmtpd USERS= smmsp GROUPS= smmsp diff --git a/mail/sendmail/Makefile b/mail/sendmail/Makefile index 9b8e1e51b15f..25e0536143f8 100644 --- a/mail/sendmail/Makefile +++ b/mail/sendmail/Makefile @@ -13,7 +13,7 @@ LICENSE_NAME= Sendmail License LICENSE_FILE= ${WRKSRC}/LICENSE LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept -CONFLICTS?= courier-0.* postfix-1.* postfix-2.* smail-3.* zmailer-2.* opensmtpd-* +CONFLICTS?= courier-0.* postfix-1.* postfix-2.* smail-3.* zmailer-2.* opensmtpd USERS= smmsp GROUPS= smmsp diff --git a/math/rankwidth/Makefile b/math/rankwidth/Makefile index 92adc1147b27..393fe6f3cd34 100644 --- a/math/rankwidth/Makefile +++ b/math/rankwidth/Makefile @@ -15,7 +15,7 @@ LIB_DEPENDS= libigraph.so:math/igraph USES= autoreconf libtool localbase pkgconfig -CONFLICTS_INSTALL= rw-* +CONFLICTS_INSTALL= rw OPTIONS_DEFINE= DOCS diff --git a/misc/amanda-server/Makefile b/misc/amanda-server/Makefile index 898445dc5ec9..5077edebf7ff 100644 --- a/misc/amanda-server/Makefile +++ b/misc/amanda-server/Makefile @@ -101,7 +101,7 @@ pre-fetch: @${ECHO} " AMANDA_DATES=path to client amandates file" @${ECHO} "" -CONFLICTS= amanda-server-2.* amanda-server-3.2.* amanda2[56]-server-* +CONFLICTS= amanda-server-2.* amanda-server-3.2.* amanda2[56]-server BUILD_DEPENDS+= ${LOCALBASE}/lib/amanda/libamandad-${PORTVERSION}.so:misc/amanda-client RUN_DEPENDS+= ${LOCALBASE}/lib/amanda/libamandad-${PORTVERSION}.so:misc/amanda-client \ diff --git a/misc/chef/Makefile b/misc/chef/Makefile index 4e2aa0049fbc..a0f513357502 100644 --- a/misc/chef/Makefile +++ b/misc/chef/Makefile @@ -8,7 +8,7 @@ DISTNAME= bork MAINTAINER= brooks@FreeBSD.org COMMENT= Feelter thet cunferts Ingleesh text tu Muck Cheenese-a -CONFLICTS= filters-* talkfilters-* +CONFLICTS= filters talkfilters PLIST_FILES= bin/chef USES= tar:Z diff --git a/misc/dahdi-kmod/Makefile b/misc/dahdi-kmod/Makefile index d70392a25ec7..b0da149c5e67 100644 --- a/misc/dahdi-kmod/Makefile +++ b/misc/dahdi-kmod/Makefile @@ -42,7 +42,7 @@ USE_RC_SUBR= dahdi MAKE_ARGS= ADDITIONAL_DRIVERS="wcb1xxp" NO_FETCH=yes DEPEND_MP= WERROR= GROUPS= dahdi -CONFLICTS= zaptel dahdi-kmod26-* +CONFLICTS= zaptel dahdi-kmod26 USES= kmod uidfix diff --git a/misc/dahdi-kmod26/Makefile b/misc/dahdi-kmod26/Makefile index 63fb01336241..96f94d5d0f13 100644 --- a/misc/dahdi-kmod26/Makefile +++ b/misc/dahdi-kmod26/Makefile @@ -45,7 +45,7 @@ USE_RC_SUBR= dahdi MAKE_ARGS= NO_FETCH=yes WITHOUT_HEADERS=yes WERROR= #ADDITIONAL_DRIVERS="wcb1xxp" GROUPS= dahdi -CONFLICTS= zaptel dahdi-kmod-* +CONFLICTS= zaptel dahdi-kmod KMODDIR= ${PREFIX}/lib/dahdi USES= kmod uidfix diff --git a/misc/kenny/Makefile b/misc/kenny/Makefile index 4cad0d20b893..6b67ae167b6d 100644 --- a/misc/kenny/Makefile +++ b/misc/kenny/Makefile @@ -14,7 +14,7 @@ COMMENT= Translate text both to and from KennySpeak LICENSE= ART10 -CONFLICTS= filters-* +CONFLICTS= filters USES= perl5 shebangfix USE_PERL5= extract build run diff --git a/misc/py-cinder/Makefile b/misc/py-cinder/Makefile index 47b8319df1f9..6168b68f9ba0 100644 --- a/misc/py-cinder/Makefile +++ b/misc/py-cinder/Makefile @@ -87,7 +87,7 @@ GROUPS= cinder SUB_LIST= PYTHON_VER=${PYTHON_VER} -CONFLICTS_INSTALL= py??-cinder-* +CONFLICTS_INSTALL= py??-cinder CPE_VENDOR= openstack diff --git a/misc/py-spdx-tools/Makefile b/misc/py-spdx-tools/Makefile index ddff3a1e71db..8edc501f521a 100644 --- a/misc/py-spdx-tools/Makefile +++ b/misc/py-spdx-tools/Makefile @@ -20,7 +20,7 @@ TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} USES= python:3.6+ USE_PYTHON= autoplist concurrent distutils -CONFLICTS_INSTALL= py??-spdx-* +CONFLICTS_INSTALL= py??-spdx NO_ARCH= yes PORTEXAMPLES= * diff --git a/misc/talkfilters/Makefile b/misc/talkfilters/Makefile index e2381074029c..6cdc0142224b 100644 --- a/misc/talkfilters/Makefile +++ b/misc/talkfilters/Makefile @@ -12,7 +12,7 @@ COMMENT= Set of filters to convert English text to various stereotyped dialects LICENSE= GPLv2 -CONFLICTS= jive* chef* filters-* +CONFLICTS= chef filters USES= libtool pathfix GNU_CONFIGURE= yes diff --git a/multimedia/gstreamer1-qt/Makefile b/multimedia/gstreamer1-qt/Makefile index df63d29010d8..afffa1bad02d 100644 --- a/multimedia/gstreamer1-qt/Makefile +++ b/multimedia/gstreamer1-qt/Makefile @@ -15,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libboost_thread.so:devel/boost-libs \ libgstreamer-1.0.so:multimedia/gstreamer1 -CONFLICTS_INSTALL= gstreamer${PKGNAMESUFFIX}-* +CONFLICTS_INSTALL= gstreamer${PKGNAMESUFFIX} USES= bison cmake compiler:c++11-lang gl gnome pathfix pkgconfig qt:5 tar:xz USE_GSTREAMER1= yes diff --git a/multimedia/makemkv/Makefile b/multimedia/makemkv/Makefile index c133922a9074..9df41c52f8d8 100644 --- a/multimedia/makemkv/Makefile +++ b/multimedia/makemkv/Makefile @@ -47,7 +47,7 @@ BUILD_DEPENDS= nasm>0:devel/nasm \ WRKSRC= ${WRKDIR}/makemkv-oss-${PORTVERSION} -CONFLICTS_BUILD= v4l_compat-* +CONFLICTS_BUILD= v4l_compat SUB_FILES= update-makemkv-drives SUB_LIST= LINUXBASE=${LINUXBASE} diff --git a/multimedia/mplex/Makefile b/multimedia/mplex/Makefile index 9d3672033718..48c8f77cf446 100644 --- a/multimedia/mplex/Makefile +++ b/multimedia/mplex/Makefile @@ -11,7 +11,7 @@ COMMENT= Multiplexes MPEG component streams into system layers LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING -CONFLICTS= mjpegtools-* +CONFLICTS= mjpegtools PLIST_FILES= bin/mplex man/man1/mplex.1.gz diff --git a/net-im/pidgin-skypeweb/Makefile b/net-im/pidgin-skypeweb/Makefile index 857ce27f80fc..4493f03a4069 100644 --- a/net-im/pidgin-skypeweb/Makefile +++ b/net-im/pidgin-skypeweb/Makefile @@ -26,8 +26,6 @@ USE_LDCONFIG= yes DOS2UNIX_FILES= gpl3.txt theme -CONFLICTS_INSTALL= pidgin-skype-* - WRKSRC_SUBDIR= skypeweb .include <bsd.port.mk> diff --git a/net-mgmt/monitoring-plugins/Makefile b/net-mgmt/monitoring-plugins/Makefile index f762b0ce174e..fe4d60050c08 100644 --- a/net-mgmt/monitoring-plugins/Makefile +++ b/net-mgmt/monitoring-plugins/Makefile @@ -39,7 +39,7 @@ CONFIGURE_ARGS+= --with-ping-command="/sbin/ping -n -t %d -c %d %s" \ CPPFLAGS+= -I${LOCALBASE}/include LIBS+= -L${LOCALBASE}/lib -CONFLICTS_INSTALL= nagios-plugins-* +CONFLICTS_INSTALL= nagios-plugins OPTIONS_DEFINE= DBI EXTRAOPTS FPING IPV6 LDAP MYSQL NETSNMP NLS PGSQL \ QSTAT RADIUS SSH_PORTABLE diff --git a/net-mgmt/nagios-plugins/Makefile b/net-mgmt/nagios-plugins/Makefile index 8d44f1019ce6..2846386e3327 100644 --- a/net-mgmt/nagios-plugins/Makefile +++ b/net-mgmt/nagios-plugins/Makefile @@ -43,7 +43,7 @@ CONFIGURE_ARGS+= --with-ping-command="/sbin/ping -n -t %d -c %d %s" \ CPPFLAGS+= -I${LOCALBASE}/include LIBS+= -L${LOCALBASE}/lib -CONFLICTS_INSTALL= monitoring-plugins-* +CONFLICTS_INSTALL= monitoring-plugins OPTIONS_DEFINE= DBI EXTRAOPTS FPING IPV6 LDAP MYSQL NETSNMP NLS PGSQL \ QSTAT RADIUS SSH_PORTABLE diff --git a/net-mgmt/nagios/Makefile b/net-mgmt/nagios/Makefile index 04f4e21e1af4..bcafc8047c79 100644 --- a/net-mgmt/nagios/Makefile +++ b/net-mgmt/nagios/Makefile @@ -20,7 +20,7 @@ USES= cpe perl5 php USE_PERL5= build USE_RC_SUBR= nagios -CONFLICTS= nagios-[12].* nagios-devel-* nagios4-* +CONFLICTS= nagios-[12].* nagios-devel nagios4 GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-command-user=${NAGIOSUSER} \ diff --git a/net-mgmt/nagios4/Makefile b/net-mgmt/nagios4/Makefile index b064b98dc427..cfe45d3caad3 100644 --- a/net-mgmt/nagios4/Makefile +++ b/net-mgmt/nagios4/Makefile @@ -23,7 +23,7 @@ USE_PERL5= build USE_PHP= xml filter USE_RC_SUBR= nagios -CONFLICTS= nagios-[123].* nagios-devel-* +CONFLICTS= nagios-[123].* nagios-devel GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-command-user=${NAGIOSUSER} \ diff --git a/net-mgmt/p5-FusionInventory-Agent/Makefile b/net-mgmt/p5-FusionInventory-Agent/Makefile index f2a81fc6dc76..743b69fd9395 100644 --- a/net-mgmt/p5-FusionInventory-Agent/Makefile +++ b/net-mgmt/p5-FusionInventory-Agent/Makefile @@ -37,8 +37,8 @@ TEST_DEPENDS= p5-File-Copy-Recursive>=0:devel/p5-File-Copy-Recursive \ p5-Test-MockObject>=0:devel/p5-Test-MockObject \ p5-Test-NoWarnings>=0:devel/p5-Test-NoWarnings -CONFLICTS= p5-FusionInventory-Agent-Task-NetDiscovery-* \ - p5-FusionInventory-Agent-Task-SNMPQuery-* +CONFLICTS= p5-FusionInventory-Agent-Task-NetDiscovery \ + p5-FusionInventory-Agent-Task-SNMPQuery OPTIONS_DEFINE= CUPS DAEMON DMIDECODE DEPLOY NETDISC NETINV PCIUTILS \ SSL VMWARE WOL ZLIB diff --git a/net-mgmt/unifi6/Makefile b/net-mgmt/unifi6/Makefile index b2cf57cb9872..0f028efadaac 100644 --- a/net-mgmt/unifi6/Makefile +++ b/net-mgmt/unifi6/Makefile @@ -27,7 +27,7 @@ JAVA_VENDOR= openjdk bsdjava JAVA_RUN= yes USE_RC_SUBR= unifi -CONFLICTS= unifi-devel-* unifi-lts-* unifi5-* +CONFLICTS= unifi-devel unifi-lts unifi5 EXTRACT_CMD= ${AR} EXTRACT_BEFORE_ARGS= -p diff --git a/net-p2p/ed2k/Makefile b/net-p2p/ed2k/Makefile index 0629001a9213..c6eac2d6e15c 100644 --- a/net-p2p/ed2k/Makefile +++ b/net-p2p/ed2k/Makefile @@ -13,7 +13,7 @@ COMMENT= Calculates 'eMule' hashes or producing ed2k:// file links LICENSE= PD BSD3CLAUSE LICENSE_COMB= multi -CONFLICTS= amule-* +CONFLICTS= amule NO_WRKSUBDIR= yes MAKEFILE= /dev/null diff --git a/net/asterisk16/Makefile b/net/asterisk16/Makefile index 2c26caf0037e..e596a9097467 100644 --- a/net/asterisk16/Makefile +++ b/net/asterisk16/Makefile @@ -53,7 +53,7 @@ MAKE_ARGS+= NOISY_BUILD=yes \ ASTDATADIR=${DATADIR} CONFLICTS= ossp-uuid -CONFLICTS_BUILD= linuxthreads-* +CONFLICTS_BUILD= linuxthreads CONFLICTS_INSTALL= asterisk13 asterisk18 OPTIONS_DEFINE= ASTVERSION BACKTRACE CURL EXCHANGE FREETDS G729 LDAP LUA MACRO \ diff --git a/net/asterisk18/Makefile b/net/asterisk18/Makefile index 066d77629b52..df090509601f 100644 --- a/net/asterisk18/Makefile +++ b/net/asterisk18/Makefile @@ -53,7 +53,7 @@ MAKE_ARGS+= NOISY_BUILD=yes \ ASTDATADIR=${DATADIR} CONFLICTS= ossp-uuid -CONFLICTS_BUILD= linuxthreads-* +CONFLICTS_BUILD= linuxthreads CONFLICTS_INSTALL= asterisk13 asterisk16 OPTIONS_DEFINE= ASTVERSION BACKTRACE CURL EXCHANGE FREETDS G729 LDAP LUA MACRO \ diff --git a/net/bmon/Makefile b/net/bmon/Makefile index b2c648923d3c..6df16fe57f97 100644 --- a/net/bmon/Makefile +++ b/net/bmon/Makefile @@ -12,8 +12,6 @@ LICENSE= MIT LIB_DEPENDS= libconfuse.so:devel/libconfuse -CONFLICTS_INSTALL= bmon-* - USE_GITHUB= yes GH_ACCOUNT= tgraf diff --git a/net/cvsup-static/Makefile b/net/cvsup-static/Makefile index b829e9502081..2593a24f0a55 100644 --- a/net/cvsup-static/Makefile +++ b/net/cvsup-static/Makefile @@ -12,7 +12,7 @@ COMMENT= File distribution system optimized for CVS ONLY_FOR_ARCHS= amd64 -CONFLICTS_INSTALL= modula3-* +CONFLICTS_INSTALL= modula3 DISTINFO_FILE= ${.CURDIR}/distinfo.${ARCH} diff --git a/net/freeswitch/Makefile b/net/freeswitch/Makefile index 13ed899de206..247643828692 100644 --- a/net/freeswitch/Makefile +++ b/net/freeswitch/Makefile @@ -43,7 +43,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}.-release SHEBANG_FILES= scripts/fsxs.in -CONFLICTS_BUILD= xmlrpc-c-* +CONFLICTS_BUILD= xmlrpc-c GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-pkgconfigdir=${PREFIX}/libdata/pkgconfig \ diff --git a/net/fspclient/Makefile b/net/fspclient/Makefile index 881aa5c54298..04722889de15 100644 --- a/net/fspclient/Makefile +++ b/net/fspclient/Makefile @@ -8,7 +8,7 @@ MASTER_SITES= SF MAINTAINER= cy@FreeBSD.org COMMENT= Ftp-like client for the FSP service -CONFLICTS_INSTALL= alliance-* +CONFLICTS_INSTALL= alliance USES= tar:bzip2 scons MAKE_ARGS= prefix=${PREFIX} diff --git a/net/openldap24-server/Makefile b/net/openldap24-server/Makefile index 9b6733b0d8ff..c6cea5eddb8a 100644 --- a/net/openldap24-server/Makefile +++ b/net/openldap24-server/Makefile @@ -35,9 +35,9 @@ LICENSE_FILE= ${WRKSRC}/LICENSE LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept .if defined(CLIENT_ONLY) -CONFLICTS_INSTALL= ${PORTNAME}2[0-3][5-9]-client-* ${PORTNAME}-client-* +CONFLICTS_INSTALL= ${PORTNAME}2[0-3][5-9]-client ${PORTNAME}-client .else -CONFLICTS_INSTALL= ${PORTNAME}2[0-3][5-9]-server-* ${PORTNAME}-server-* +CONFLICTS_INSTALL= ${PORTNAME}2[0-3][5-9]-server ${PORTNAME}-server .endif GNU_CONFIGURE= yes diff --git a/net/openldap25-server/Makefile b/net/openldap25-server/Makefile index c554842cf117..e1d209d7cd3f 100644 --- a/net/openldap25-server/Makefile +++ b/net/openldap25-server/Makefile @@ -38,9 +38,9 @@ LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept USES= cpe gmake libtool:keepla localbase ssl tar:tgz .if defined(CLIENT_ONLY) -CONFLICTS_INSTALL= ${PORTNAME}2[0-46-9]-client-* ${PORTNAME}-client-* +CONFLICTS_INSTALL= ${PORTNAME}2[0-46-9]-client ${PORTNAME}-client .else -CONFLICTS_INSTALL= ${PORTNAME}2[0-46-9]-server-* ${PORTNAME}-server-* +CONFLICTS_INSTALL= ${PORTNAME}2[0-46-9]-server ${PORTNAME}-server .endif GNU_CONFIGURE= yes diff --git a/net/openldap26-server/Makefile b/net/openldap26-server/Makefile index f24683804df5..ecbff399d53e 100644 --- a/net/openldap26-server/Makefile +++ b/net/openldap26-server/Makefile @@ -38,9 +38,9 @@ LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept USES= cpe gmake libtool:keepla localbase ssl tar:tgz .if defined(CLIENT_ONLY) -CONFLICTS_INSTALL= ${PORTNAME}2[0-57-9]-client-* ${PORTNAME}-client-* +CONFLICTS_INSTALL= ${PORTNAME}2[0-57-9]-client ${PORTNAME}-client .else -CONFLICTS_INSTALL= ${PORTNAME}2[0-57-9]-server-* ${PORTNAME}-server-* +CONFLICTS_INSTALL= ${PORTNAME}2[0-57-9]-server ${PORTNAME}-server .endif GNU_CONFIGURE= yes diff --git a/net/tightvnc/Makefile b/net/tightvnc/Makefile index b05f266b18bd..23ff2826e489 100644 --- a/net/tightvnc/Makefile +++ b/net/tightvnc/Makefile @@ -23,7 +23,7 @@ USE_XORG= ice sm x11 xaw xext xmu xt xpm CFLAGS+= -fcommon # for build with clang-11, see https://sourceforge.net/p/vnc-tight/bugs/1523/ MAKE_JOBS_UNSAFE= yes -CONFLICTS= tigervnc-* +CONFLICTS= tigervnc WRKSRC= ${WRKDIR}/vnc_unixsrc SHEBANG_FILES= vncserver CFLAGS+= -Wno-return-type diff --git a/ports-mgmt/portupgrade/Makefile b/ports-mgmt/portupgrade/Makefile index 2403238f0911..ab3ad7eee152 100644 --- a/ports-mgmt/portupgrade/Makefile +++ b/ports-mgmt/portupgrade/Makefile @@ -16,7 +16,7 @@ LICENSE= BSD3CLAUSE OPTIONS_DEFINE= DOCS -CONFLICTS_INSTALL= portupgrade-devel-* +CONFLICTS_INSTALL= portupgrade-devel USE_GITHUB= yes GH_ACCOUNT= freebsd diff --git a/science/openbabel/Makefile b/science/openbabel/Makefile index 058ccfc5091f..bc51643fb6bd 100644 --- a/science/openbabel/Makefile +++ b/science/openbabel/Makefile @@ -17,7 +17,7 @@ LIB_DEPENDS= libmaeparser.so:science/maeparser \ libcoordgen.so:science/coordgenlibs \ libboost_thread.so:devel/boost-libs -CONFLICTS_INSTALL= babel-* +CONFLICTS_INSTALL= babel USES= cmake compiler:c++11-lang eigen:3 gnome pkgconfig tar:bz2 USE_CXXSTD= gnu++98 diff --git a/security/easy-rsa/Makefile b/security/easy-rsa/Makefile index bada09fb368f..3127343139bf 100644 --- a/security/easy-rsa/Makefile +++ b/security/easy-rsa/Makefile @@ -13,7 +13,7 @@ LICENSE= GPLv2 USES= tar:tgz -CONFLICTS_INSTALL=easy-rsa2-* +CONFLICTS_INSTALL=easy-rsa2 NO_BUILD= yes NO_ARCH= yes diff --git a/security/fwbuilder/Makefile b/security/fwbuilder/Makefile index 1835dbc32758..89fd74eca3a8 100644 --- a/security/fwbuilder/Makefile +++ b/security/fwbuilder/Makefile @@ -20,8 +20,8 @@ OPTIONS_DEFINE= DOCS CONFLICTS= fwbuilder-[234].* fwbuilder-devel-[234].* \ libfwbuilder-[234].* libfwbuilder-devel-[234].* .else -CONFLICTS= fwbuilder-[234].* fwbuilder-devel-* \ - libfwbuilder-[234].* libfwbuilder-devel-* +CONFLICTS= fwbuilder-[234].* fwbuilder-devel \ + libfwbuilder-[234].* libfwbuilder-devel .endif USES= autoreconf:build gmake libtool qmake:no_configure qt:5 ssl diff --git a/security/keepassx-devel/Makefile b/security/keepassx-devel/Makefile index d6d9722f375d..06877a4f89ca 100644 --- a/security/keepassx-devel/Makefile +++ b/security/keepassx-devel/Makefile @@ -20,7 +20,7 @@ LICENSE_PERMS_NOKIA-LGPL-EXCEPTION= dist-mirror dist-sell pkg-mirror pkg-sell au LIB_DEPENDS= libgcrypt.so:security/libgcrypt -CONFLICTS_INSTALL= keepassx-0.* keepassx2-* keepassxc-* +CONFLICTS_INSTALL= keepassx-0.* keepassx2 keepassxc USES= cmake compiler:c++11-lib cpe desktop-file-utils gnome qt:5 \ shared-mime-info xorg diff --git a/security/keepassxc/Makefile b/security/keepassxc/Makefile index 2bedc4823775..20219ef89f42 100644 --- a/security/keepassxc/Makefile +++ b/security/keepassxc/Makefile @@ -28,7 +28,7 @@ USE_XORG= x11 CMAKE_OFF= WITH_XC_UPDATECHECK -CONFLICTS_INSTALL= keepassx-0.* keepassx2-* keepassx-* +CONFLICTS_INSTALL= keepassx-0.* keepassx2 keepassx OPTIONS_DEFINE= AUTOTYPE BROWSER KEESHARE NETWORKING SSHAGENT YUBIKEY TEST OPTIONS_DEFAULT= AUTOTYPE BROWSER KEESHARE NETWORKING SSHAGENT YUBIKEY diff --git a/security/krb5-117/Makefile b/security/krb5-117/Makefile index cc7c7688b788..b480c012ce50 100644 --- a/security/krb5-117/Makefile +++ b/security/krb5-117/Makefile @@ -20,8 +20,8 @@ EXPIRATION_DATE= 2022-02-01 LICENSE= MIT CONFLICTS= heimdal srp krb5-11[3-6] \ - krb5-1.[0-9]* krb5-devel-* -CONFLICTS_BUILD= boringssl-* + krb5-1.[0-9]* krb5-devel +CONFLICTS_BUILD= boringssl KERBEROSV_URL= http://web.mit.edu/kerberos/ USE_PERL5= build diff --git a/security/krb5-118/Makefile b/security/krb5-118/Makefile index 67cb061f4869..789c17e75af0 100644 --- a/security/krb5-118/Makefile +++ b/security/krb5-118/Makefile @@ -17,8 +17,8 @@ COMMENT= MIT implementation of RFC 4120 network authentication service LICENSE= MIT CONFLICTS= heimdal srp krb5-11[3-6] \ - krb5-1.[0-9]* krb5-devel-* -CONFLICTS_BUILD= boringssl-* + krb5-1.[0-9]* krb5-devel +CONFLICTS_BUILD= boringssl KERBEROSV_URL= http://web.mit.edu/kerberos/ USES= compiler:c++11-lang cpe gmake gettext-runtime \ diff --git a/security/krb5-119/Makefile b/security/krb5-119/Makefile index 5c52729a8744..59da2eed06b3 100644 --- a/security/krb5-119/Makefile +++ b/security/krb5-119/Makefile @@ -17,8 +17,8 @@ COMMENT= MIT implementation of RFC 4120 network authentication service LICENSE= MIT CONFLICTS= heimdal srp krb5-11[3-6] \ - krb5-1.[0-9]* krb5-devel-* -CONFLICTS_BUILD= boringssl-* + krb5-1.[0-9]* krb5-devel +CONFLICTS_BUILD= boringssl KERBEROSV_URL= http://web.mit.edu/kerberos/ USES= compiler:c++11-lang cpe gmake gettext-runtime \ diff --git a/security/krb5-appl/Makefile b/security/krb5-appl/Makefile index e02a54851e93..69c525fe26c9 100644 --- a/security/krb5-appl/Makefile +++ b/security/krb5-appl/Makefile @@ -16,7 +16,7 @@ COMMENT= MIT implementation of RFC 4120 network authentication clients BUILD_DEPENDS= krb5-config:security/krb5 CONFLICTS= krb4 krb5-1.[0-7].* heimdal srp \ - bsdftpd-ssl-* + bsdftpd-ssl KERBEROSV_URL= http://web.mit.edu/kerberos/ USES= autoreconf gmake ncurses perl5 gssapi:mit ssl diff --git a/security/libotr/Makefile b/security/libotr/Makefile index fea007578c66..32b49c7051f0 100644 --- a/security/libotr/Makefile +++ b/security/libotr/Makefile @@ -14,7 +14,7 @@ LICENSE= LGPL21 LIB_DEPENDS= libgpg-error.so:security/libgpg-error \ libgcrypt.so:security/libgcrypt -CONFLICTS= libotr3-* +CONFLICTS= libotr3 GNU_CONFIGURE= yes USES= libtool pathfix cpe diff --git a/security/libotr3/Makefile b/security/libotr3/Makefile index 9e529d5d5428..d7e39a3c930c 100644 --- a/security/libotr3/Makefile +++ b/security/libotr3/Makefile @@ -16,7 +16,7 @@ LICENSE= LGPL21 LIB_DEPENDS= libgpg-error.so:security/libgpg-error \ libgcrypt.so:security/libgcrypt -CONFLICTS= libotr-* +CONFLICTS= libotr GNU_CONFIGURE= yes USES= cpe libtool pathfix diff --git a/security/openssh-portable/Makefile b/security/openssh-portable/Makefile index d2c9b245de3a..b77a243d16cf 100644 --- a/security/openssh-portable/Makefile +++ b/security/openssh-portable/Makefile @@ -16,7 +16,7 @@ LICENSE_NAME= OpenSSH Licenses LICENSE_FILE= ${WRKSRC}/LICENCE LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept -CONFLICTS?= openssh-3.* ssh-1.* ssh2-3.* openssh-portable-devel-* +CONFLICTS?= openssh-3.* ssh-1.* ssh2-3.* openssh-portable-devel USES= alias autoreconf compiler:c11 cpe localbase ncurses \ pkgconfig ssl diff --git a/security/ossec-hids-local-config/Makefile b/security/ossec-hids-local-config/Makefile index 0b06efd284e3..c021e6464248 100644 --- a/security/ossec-hids-local-config/Makefile +++ b/security/ossec-hids-local-config/Makefile @@ -8,17 +8,17 @@ MASTERDIR?= ${.CURDIR} DISTINFO_FILE?= ${MASTERDIR}/../ossec-hids-local/distinfo .if ${OSSEC_TYPE} == local -CONFLICTS_INSTALL= ossec-hids-client-* \ - ossec-hids-agent-* \ - ossec-hids-server-* +CONFLICTS_INSTALL= ossec-hids-client \ + ossec-hids-agent \ + ossec-hids-server .elif ${OSSEC_TYPE} == agent -CONFLICTS_INSTALL= ossec-hids-client-* \ - ossec-hids-local-* \ - ossec-hids-server-* +CONFLICTS_INSTALL= ossec-hids-client \ + ossec-hids-local \ + ossec-hids-server .elif ${OSSEC_TYPE} == server -CONFLICTS_INSTALL= ossec-hids-client-* \ - ossec-hids-agent-* \ - ossec-hids-local-* +CONFLICTS_INSTALL= ossec-hids-client \ + ossec-hids-agent \ + ossec-hids-local .endif .if !defined(MAINTAINER_MODE) diff --git a/security/ossec-hids-local/Makefile b/security/ossec-hids-local/Makefile index c800cea9b28a..0ba703988e48 100644 --- a/security/ossec-hids-local/Makefile +++ b/security/ossec-hids-local/Makefile @@ -12,17 +12,17 @@ BROKEN_riscv64= fails to compile: rootcheck/os_string.c:186:20: use of undeclar USES= compiler gmake ssl .if ${OSSEC_TYPE} == local -CONFLICTS_INSTALL= ossec-hids-client-* \ - ossec-hids-agent-* \ - ossec-hids-server-* +CONFLICTS_INSTALL= ossec-hids-client \ + ossec-hids-agent \ + ossec-hids-server .elif ${OSSEC_TYPE} == agent -CONFLICTS_INSTALL= ossec-hids-client-* \ - ossec-hids-local-* \ - ossec-hids-server-* +CONFLICTS_INSTALL= ossec-hids-client \ + ossec-hids-local \ + ossec-hids-server .elif ${OSSEC_TYPE} == server -CONFLICTS_INSTALL= ossec-hids-client-* \ - ossec-hids-agent-* \ - ossec-hids-local-* +CONFLICTS_INSTALL= ossec-hids-client \ + ossec-hids-agent \ + ossec-hids-local .endif LIB_DEPENDS= libpcre2-8.so:devel/pcre2 libevent.so:devel/libevent diff --git a/security/outguess/Makefile b/security/outguess/Makefile index 49852f5932ce..69047e6dd8fb 100644 --- a/security/outguess/Makefile +++ b/security/outguess/Makefile @@ -18,7 +18,7 @@ LICENSE= BSD4CLAUSE DEPRECATED= Abandonware, dead upstream and last release in 2001 EXPIRATION_DATE=2022-03-31 -CONFLICTS_INSTALL= csound-* +CONFLICTS_INSTALL= csound GNU_CONFIGURE= yes WRKSRC= ${WRKDIR}/outguess diff --git a/security/py-pycrypto/Makefile b/security/py-pycrypto/Makefile index 03bba728b81b..1258a8a65317 100644 --- a/security/py-pycrypto/Makefile +++ b/security/py-pycrypto/Makefile @@ -13,7 +13,7 @@ COMMENT= Python Cryptography Toolkit LICENSE= PD LICENSE_FILE= ${WRKSRC}/COPYRIGHT -CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}pycryptodome-* +CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}pycryptodome USES= cpe python:3.6+ USE_PYTHON= distutils autoplist diff --git a/security/racoon2/Makefile b/security/racoon2/Makefile index 2df54b4b6cfa..062c6fe93250 100644 --- a/security/racoon2/Makefile +++ b/security/racoon2/Makefile @@ -10,7 +10,7 @@ RACOON2_COMMIT_DATE=202000908 MAINTAINER= cy@FreeBSD.org COMMENT= Racoon2 IPsec daemon -CONFLICTS= racoon2-legacy-* +CONFLICTS= racoon2-legacy USE_GITHUB= yes GH_ACCOUNT= zoulasc diff --git a/security/wazuh-agent/Makefile b/security/wazuh-agent/Makefile index f6a809ffb7f5..c3f747f5080a 100644 --- a/security/wazuh-agent/Makefile +++ b/security/wazuh-agent/Makefile @@ -29,7 +29,7 @@ SHEBANG_FILES= ${WRKSRC}/contrib/util.sh \ ${WRKSRC}/wodles/oscap/oscap.py \ ${WRKSRC}/active-response/*.sh -CONFLICTS_INSTALL= ossec-* +CONFLICTS_INSTALL= ossec USERS= ossec ossecm ossecr GROUPS= ossec diff --git a/shells/ast-ksh/Makefile b/shells/ast-ksh/Makefile index 78df1a34c421..2daca7bbd94a 100644 --- a/shells/ast-ksh/Makefile +++ b/shells/ast-ksh/Makefile @@ -32,7 +32,7 @@ GH_TAGNAME= ksh93v # IMPORTANT: Disabling conflicts, i.e. -DDISABLE_CONFLICTS will result in # arcane build failures due to already installed ksh/ksh93 in # $PATH. -CONFLICTS= ksh93-* +CONFLICTS= ksh2020 ksh93 ksh93-devel OPTIONS_DEFINE= EXAMPLES STATIC diff --git a/shells/ksh2020/Makefile b/shells/ksh2020/Makefile index 245b51a4fb4d..c43dbeafefdf 100644 --- a/shells/ksh2020/Makefile +++ b/shells/ksh2020/Makefile @@ -15,8 +15,8 @@ GH_ACCOUNT= att GH_PROJECT= ast GH_TAGNAME= ksh2020 -KSH_CONFLICTS= pdksh-* -KSH93_CONFLICTS= ksh93-* ast-ksh-* +KSH_CONFLICTS= pdksh +KSH93_CONFLICTS= ksh93 ksh93-devel ast-ksh MESON_BUILD_DIR= build diff --git a/shells/ksh93-devel/Makefile b/shells/ksh93-devel/Makefile index 144c898055be..41495c285e2e 100644 --- a/shells/ksh93-devel/Makefile +++ b/shells/ksh93-devel/Makefile @@ -35,8 +35,8 @@ GH_TAGNAME= ${HASH} # IMPORTANT: Disabling conflicts, i.e. -DDISABLE_CONFLICTS will result in # arcane build failures due to already installed ksh/ksh93 in # $PATH. -KSH_CONFLICTS= pdksh-* -KSH93_CONFLICTS= ksh93-2* ast-ksh-* +KSH_CONFLICTS= pdksh +KSH93_CONFLICTS= ksh2020 ksh93 ast-ksh OPTIONS_DEFAULT= KSH93 EXAMPLES OPTIONS_DEFINE= EXAMPLES STATIC diff --git a/shells/ksh93/Makefile b/shells/ksh93/Makefile index b3b8d06a7284..964940deabed 100644 --- a/shells/ksh93/Makefile +++ b/shells/ksh93/Makefile @@ -33,8 +33,8 @@ USE_GITHUB= yes GH_ACCOUNT= att GH_PROJECT= ast -KSH_CONFLICTS= pdksh-* -KSH93_CONFLICTS= ksh93-devel-* ast-ksh-* +KSH_CONFLICTS= pdksh +KSH93_CONFLICTS= ksh2020 ksh93-devel ast-ksh OPTIONS_DEFAULT= KSH93 EXAMPLES OPTIONS_DEFINE= EXAMPLES STATIC diff --git a/sysutils/ansible/Makefile b/sysutils/ansible/Makefile index 6d7c62e312af..9eb1320b5ee9 100644 --- a/sysutils/ansible/Makefile +++ b/sysutils/ansible/Makefile @@ -23,7 +23,7 @@ SHEBANG_FILES= ansible_collections/community/zabbix/roles/zabbix_proxy/files/ins ansible_collections/ovirt/ovirt/roles/disaster_recovery/files/ovirt-dr SHEBANG_GLOB= *.py *.sh -CONFLICTS_INSTALL= ${_ANSIBLE_PACKAGES:N${PKGBASE}-*} +CONFLICTS_INSTALL= ${_ANSIBLE_PACKAGES:N${PKGBASE}} NO_ARCH= yes @@ -31,9 +31,9 @@ DO_MAKE_TEST= ansible -m ping TEST_TARGET= localhost _ANSIBLE_VERSIONS= 1 2 23 24 25 26 27 28 -_ANSIBLE_PACKAGES= ${PYTHON_PKGNAMEPREFIX}ansible-* +_ANSIBLE_PACKAGES= ${PYTHON_PKGNAMEPREFIX}ansible .for version in ${_ANSIBLE_VERSIONS} -_ANSIBLE_PACKAGES+= ${PYTHON_PKGNAMEPREFIX}ansible${version}-* +_ANSIBLE_PACKAGES+= ${PYTHON_PKGNAMEPREFIX}ansible${version} .endfor post-patch: diff --git a/sysutils/ansible2/Makefile b/sysutils/ansible2/Makefile index fb59cd2eb250..6e9c8d870eb0 100644 --- a/sysutils/ansible2/Makefile +++ b/sysutils/ansible2/Makefile @@ -41,7 +41,7 @@ TEST_ARGS= VERSION=${PORTVERSION} \ TEST_ENV= PYTHON_VERSION=${PYTHON_VER} TEST_TARGET= tests -CONFLICTS_INSTALL= ${_ANSIBLE_PACKAGES:N${PKGBASE}-*} +CONFLICTS_INSTALL= ${_ANSIBLE_PACKAGES:N${PKGBASE}} EXTRA_PATCHES?= NO_ARCH= yes @@ -62,9 +62,9 @@ PLIST_FILES?= man/man1/ansible-config.1.gz \ PORTEXAMPLES= ansible.cfg hosts _ANSIBLE_VERSIONS= 1 2 23 24 25 26 27 28 -_ANSIBLE_PACKAGES= ${PYTHON_PKGNAMEPREFIX}ansible-* +_ANSIBLE_PACKAGES= ${PYTHON_PKGNAMEPREFIX}ansible .for version in ${_ANSIBLE_VERSIONS} -_ANSIBLE_PACKAGES+= ${PYTHON_PKGNAMEPREFIX}ansible${version}-* +_ANSIBLE_PACKAGES+= ${PYTHON_PKGNAMEPREFIX}ansible${version} .endfor OPTIONS_DEFINE= DOCS EXAMPLES diff --git a/sysutils/bacula11-docs/Makefile b/sysutils/bacula11-docs/Makefile index 62c006c8f217..c4048392a40a 100644 --- a/sysutils/bacula11-docs/Makefile +++ b/sysutils/bacula11-docs/Makefile @@ -5,7 +5,7 @@ MASTER_SITES= SF PKGNAMESUFFIX= 11-docs DISTNAME= ${PORTNAME}-docs-${PORTVERSION} -CONFLICTS= bacula9-* +CONFLICTS= bacula9 MAINTAINER= dvl@FreeBSD.org COMMENT= Bacula document set diff --git a/sysutils/bacula11-server/Makefile b/sysutils/bacula11-server/Makefile index 2f1aaf0a7a35..d71c4607181c 100644 --- a/sysutils/bacula11-server/Makefile +++ b/sysutils/bacula11-server/Makefile @@ -16,7 +16,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE USES+= cpe libtool readline shebangfix ssl SHEBANG_FILES= src/cats/make_catalog_backup.pl.in scripts/baculabackupreport.in -CONFLICTS?= bacula9-server-* bacula5-server-* bacula-server-* +CONFLICTS?= bacula9-server bacula-server LIB_DEPENDS+= liblzo2.so:archivers/lzo2 diff --git a/sysutils/bacula9-docs/Makefile b/sysutils/bacula9-docs/Makefile index 3e6619834c9b..d44981c786c7 100644 --- a/sysutils/bacula9-docs/Makefile +++ b/sysutils/bacula9-docs/Makefile @@ -8,7 +8,7 @@ MASTER_SITES= SF PKGNAMESUFFIX= 9-docs DISTNAME= ${PORTNAME}-docs-${PORTVERSION} -CONFLICTS= bacula-* bacula5-* bacula11-* +CONFLICTS= bacula bacula11 MAINTAINER= dvl@FreeBSD.org COMMENT= Bacula document set diff --git a/sysutils/bacula9-server/Makefile b/sysutils/bacula9-server/Makefile index e0abc3936084..ec581973e6f3 100644 --- a/sysutils/bacula9-server/Makefile +++ b/sysutils/bacula9-server/Makefile @@ -17,7 +17,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE USES+= cpe libtool readline shebangfix ssl SHEBANG_FILES= src/cats/make_catalog_backup.pl.in -CONFLICTS?= bacula11-server-* bacula5-server-* bacula-server-* +CONFLICTS?= bacula11-server bacula-server LIB_DEPENDS+= liblzo2.so:archivers/lzo2 diff --git a/sysutils/bareos-client/Makefile b/sysutils/bareos-client/Makefile index 21f1d1f9bbf6..c49c27dc3688 100644 --- a/sysutils/bareos-client/Makefile +++ b/sysutils/bareos-client/Makefile @@ -3,7 +3,7 @@ PKGNAMESUFFIX= -client COMMENT= Backup archiving recovery open sourced (client) -CONFLICTS= bareos19-client-* bareos18-client-* bareos17-client-* +CONFLICTS= bareos19-client bareos18-client bareos17-client WITH_CLIENT_ONLY=yes USE_RC_SUBR= bareos-fd diff --git a/sysutils/bareos-server/Makefile b/sysutils/bareos-server/Makefile index 4c979a58bdaf..21133a0d58fb 100644 --- a/sysutils/bareos-server/Makefile +++ b/sysutils/bareos-server/Makefile @@ -12,7 +12,7 @@ COMMENT?= Backup archiving recovery open sourced (server) LICENSE= AGPLv3 LGPL3 LICENSE_COMB= multi -CONFLICTS?= bacula19*-server bacula18*-server-* bareos17-server-* +CONFLICTS?= bareos19-server bareos18-server bareos17-server LIB_DEPENDS+= liblzo2.so:archivers/lzo2 \ libjansson.so:devel/jansson diff --git a/sysutils/bareos-traymonitor/Makefile b/sysutils/bareos-traymonitor/Makefile index 9006ce05bb3e..ad919eb7821c 100644 --- a/sysutils/bareos-traymonitor/Makefile +++ b/sysutils/bareos-traymonitor/Makefile @@ -6,7 +6,7 @@ COMMENT= Backup archiving recovery open sourced (traymonitor) LIB_DEPENDS+= libqwt5-qt5.so:x11-toolkits/qwt5-qt5 \ libbareos.so:sysutils/bareos-client -CONFLICTS= bareos17-traymonitor-* bareos18-traymonitor-* bareos19-traymonitor-* +CONFLICTS= bareos17-traymonitor bareos18-traymonitor bareos19-traymonitor USES= desktop-file-utils gettext-runtime pkgconfig qt:5 USE_QT= buildtools_build qmake_build uitools_build gui core diff --git a/sysutils/bareos17-client-static/Makefile b/sysutils/bareos17-client-static/Makefile index c2628a55f14d..9db2f693a3af 100644 --- a/sysutils/bareos17-client-static/Makefile +++ b/sysutils/bareos17-client-static/Makefile @@ -6,7 +6,7 @@ COMMENT= Backup archiving recovery open sourced (static client) BROKEN_aarch64= Fails to link: missing sbrk BROKEN_riscv64= Fails to link: missing sbrk -CONFLICTS= bareos16-client-static-* +CONFLICTS= bareos16-client-static PLIST= ${.CURDIR}/pkg-plist MASTERDIR= ${.CURDIR}/../../sysutils/bareos17-server diff --git a/sysutils/bareos17-client/Makefile b/sysutils/bareos17-client/Makefile index 3bc4c169df48..dd2433f9c6d9 100644 --- a/sysutils/bareos17-client/Makefile +++ b/sysutils/bareos17-client/Makefile @@ -6,7 +6,7 @@ COMMENT= Backup archiving recovery open sourced (client) BROKEN_aarch64= Fails to link: missing sbrk BROKEN_riscv64= Fails to link: missing sbrk -CONFLICTS= bareos16-client-* bareos-client-* +CONFLICTS= bareos16-client bareos-client WITH_CLIENT_ONLY=yes USE_RC_SUBR= bareos-fd diff --git a/sysutils/bareos17-server/Makefile b/sysutils/bareos17-server/Makefile index 84123919d79e..c797776e282f 100644 --- a/sysutils/bareos17-server/Makefile +++ b/sysutils/bareos17-server/Makefile @@ -15,7 +15,7 @@ LICENSE_COMB= multi DEPRECATED= Deprecated, no new release since 2020 EXPIRATION_DATE=2021-12-05 -CONFLICTS?= bacula*-server-* bareos16-server-* +CONFLICTS?= bacula*-server bareos16-server LIB_DEPENDS+= liblzo2.so:archivers/lzo2 \ libjansson.so:devel/jansson diff --git a/sysutils/bareos18-client/Makefile b/sysutils/bareos18-client/Makefile index 8fbbabb028da..5d7dcdd142a1 100644 --- a/sysutils/bareos18-client/Makefile +++ b/sysutils/bareos18-client/Makefile @@ -6,7 +6,7 @@ COMMENT= Backup archiving recovery open sourced (client) BROKEN_aarch64= Fails to link: missing sbrk BROKEN_riscv64= Fails to link: missing sbrk -CONFLICTS= bareos17-client-* bareos16-client-* bareos-client-* +CONFLICTS= bareos17-client bareos16-client bareos-client WITH_CLIENT_ONLY=yes USE_RC_SUBR= bareos-fd diff --git a/sysutils/bareos18-server/Makefile b/sysutils/bareos18-server/Makefile index 4d45d528cba4..9e57e9c01510 100644 --- a/sysutils/bareos18-server/Makefile +++ b/sysutils/bareos18-server/Makefile @@ -12,7 +12,7 @@ COMMENT?= Backup archiving recovery open sourced (server) LICENSE= AGPLv3 LGPL3 LICENSE_COMB= multi -CONFLICTS?= bacula17*-server-* bareos16-server-* bareos-server-* +CONFLICTS?= bareos17-server bareos16-server bareos-server LIB_DEPENDS+= liblzo2.so:archivers/lzo2 \ libjansson.so:devel/jansson diff --git a/sysutils/bareos18-traymonitor/Makefile b/sysutils/bareos18-traymonitor/Makefile index 2c004728018f..73ac06d95ca9 100644 --- a/sysutils/bareos18-traymonitor/Makefile +++ b/sysutils/bareos18-traymonitor/Makefile @@ -7,7 +7,7 @@ COMMENT= Backup archiving recovery open sourced (traymonitor) LIB_DEPENDS+= libqwt5-qt5.so:x11-toolkits/qwt5-qt5 \ libbareos.so:sysutils/bareos18-client -CONFLICTS= bacula*-bat-* bareos-traymonitor-* +CONFLICTS= bacula*-bat bareos-traymonitor USES= pkgconfig gettext-runtime desktop-file-utils qt:5 USE_QT= buildtools_build qmake_build uitools_build gui core diff --git a/sysutils/bareos19-client/Makefile b/sysutils/bareos19-client/Makefile index 92b246709fc9..c427cd66771d 100644 --- a/sysutils/bareos19-client/Makefile +++ b/sysutils/bareos19-client/Makefile @@ -3,7 +3,7 @@ PKGNAMESUFFIX= 19-client COMMENT= Backup archiving recovery open sourced (client) -CONFLICTS= bareos18-client-* bareos17-client-* bareos-client-* +CONFLICTS= bareos18-client bareos17-client bareos-client WITH_CLIENT_ONLY=yes USE_RC_SUBR= bareos-fd diff --git a/sysutils/bareos19-server/Makefile b/sysutils/bareos19-server/Makefile index 73d8697e5aff..d0e74e571070 100644 --- a/sysutils/bareos19-server/Makefile +++ b/sysutils/bareos19-server/Makefile @@ -12,7 +12,7 @@ COMMENT?= Backup archiving recovery open sourced (server) LICENSE= AGPLv3 LGPL3 LICENSE_COMB= multi -CONFLICTS?= bacula18*-server bacula17*-server-* +CONFLICTS?= bareos18-server bareos17-server LIB_DEPENDS+= liblzo2.so:archivers/lzo2 \ libjansson.so:devel/jansson diff --git a/sysutils/bareos19-traymonitor/Makefile b/sysutils/bareos19-traymonitor/Makefile index 6774426e8efb..ce861d3ba5f8 100644 --- a/sysutils/bareos19-traymonitor/Makefile +++ b/sysutils/bareos19-traymonitor/Makefile @@ -6,7 +6,7 @@ COMMENT= Backup archiving recovery open sourced (traymonitor) LIB_DEPENDS+= libqwt5-qt5.so:x11-toolkits/qwt5-qt5 \ libbareos.so:sysutils/bareos19-client -CONFLICTS= bareos18-traymonitor-* bareos17-traymonitor-* bareos-traymonitor-* +CONFLICTS= bareos18-traymonitor bareos17-traymonitor bareos-traymonitor USES= desktop-file-utils gettext-runtime pkgconfig qt:5 USE_QT= buildtools_build qmake_build uitools_build gui core diff --git a/sysutils/beadm/Makefile b/sysutils/beadm/Makefile index 0047e7c403c0..1df42a46a6e2 100644 --- a/sysutils/beadm/Makefile +++ b/sysutils/beadm/Makefile @@ -15,7 +15,7 @@ GH_ACCOUNT= vermaden NO_BUILD= YES NO_ARCH= YES -CONFLICTS_INSTALL= beadm-devel-* +CONFLICTS_INSTALL= beadm-devel PLIST_FILES= sbin/${PORTNAME} \ man/man8/${PORTNAME}.8.gz diff --git a/sysutils/cfengine-masterfiles316/Makefile b/sysutils/cfengine-masterfiles316/Makefile index c51f83bcd5d5..e569ebbe1c5c 100644 --- a/sysutils/cfengine-masterfiles316/Makefile +++ b/sysutils/cfengine-masterfiles316/Makefile @@ -18,7 +18,7 @@ CPE_PRODUCT= cfengine DEPRECATED= Expire one year after cfengine 3.18.0 released EXPIRATION_DATE= 2022-07-05 -CONFLICTS= cfengine-masterfiles3[0-9]-* cfengine-masterfiles31[013-9]-* +CONFLICTS= cfengine-masterfiles3[0-9] cfengine-masterfiles31[013-9] .if !defined(MASTERDIR) PKGNAMESUFFIX= 316 CONFLICTS+= cfengine-masterfiles-3.* diff --git a/sysutils/cfengine-masterfiles317/Makefile b/sysutils/cfengine-masterfiles317/Makefile index 01590b06d29b..1486970d9aef 100644 --- a/sysutils/cfengine-masterfiles317/Makefile +++ b/sysutils/cfengine-masterfiles317/Makefile @@ -15,7 +15,7 @@ LICENSE= GPLv3 CPE_VENDOR= gnu CPE_PRODUCT= cfengine -CONFLICTS= cfengine-masterfiles3[0-9]-* cfengine-masterfiles31[0-689]-* +CONFLICTS= cfengine-masterfiles3[0-9] cfengine-masterfiles31[0-689] .if !defined(MASTERDIR) PKGNAMESUFFIX= 317 CONFLICTS+= cfengine-masterfiles-3.* diff --git a/sysutils/cfengine-masterfiles318/Makefile b/sysutils/cfengine-masterfiles318/Makefile index a115d1bca5e8..267114872b1a 100644 --- a/sysutils/cfengine-masterfiles318/Makefile +++ b/sysutils/cfengine-masterfiles318/Makefile @@ -15,7 +15,7 @@ LICENSE= GPLv3 CPE_VENDOR= gnu CPE_PRODUCT= cfengine -CONFLICTS= cfengine-masterfiles3[0-9]-* cfengine-masterfiles31[0-79]-* +CONFLICTS= cfengine-masterfiles3[0-9] cfengine-masterfiles31[0-79] .if !defined(MASTERDIR) PKGNAMESUFFIX= 318 CONFLICTS+= cfengine-masterfiles-3.* diff --git a/sysutils/cfengine316/Makefile b/sysutils/cfengine316/Makefile index 263c75c423ac..42aa2296af24 100644 --- a/sysutils/cfengine316/Makefile +++ b/sysutils/cfengine316/Makefile @@ -17,7 +17,7 @@ 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= cfengine3[0-9] cfengine31[0-57-9] .if !defined(MASTERDIR) PKGNAMESUFFIX= 316 CONFLICTS+= cfengine-3.* diff --git a/sysutils/cfengine317/Makefile b/sysutils/cfengine317/Makefile index 6d55c47ee83e..caba4e80a255 100644 --- a/sysutils/cfengine317/Makefile +++ b/sysutils/cfengine317/Makefile @@ -14,7 +14,7 @@ LICENSE= GPLv3 CPE_VENDOR= gnu -CONFLICTS= cfengine3[0-9]-* cfengine31[0-689]-* +CONFLICTS= cfengine3[0-9] cfengine31[0-689] .if !defined(MASTERDIR) PKGNAMESUFFIX= 317 CONFLICTS+= cfengine-3.* diff --git a/sysutils/cfengine318/Makefile b/sysutils/cfengine318/Makefile index 72cb2d0f5954..a8bc088af3a2 100644 --- a/sysutils/cfengine318/Makefile +++ b/sysutils/cfengine318/Makefile @@ -15,7 +15,7 @@ LICENSE= GPLv3 CPE_VENDOR= gnu -CONFLICTS= cfengine3[0-9]-* cfengine31[0-79]-* +CONFLICTS= cfengine3[0-9] cfengine31[0-79] .if !defined(MASTERDIR) PKGNAMESUFFIX= 318 CONFLICTS+= cfengine-3.* diff --git a/sysutils/fusefs-ntfs/Makefile b/sysutils/fusefs-ntfs/Makefile index e04a3ce56842..5338d110ac16 100644 --- a/sysutils/fusefs-ntfs/Makefile +++ b/sysutils/fusefs-ntfs/Makefile @@ -15,9 +15,6 @@ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libuuid.so:misc/e2fsprogs-libuuid -CONFLICTS_BUILD= bonobo-1.* -CONFLICTS_INSTALL= ntfsprogs-* - USES= fuse pkgconfig iconv libtool localbase:ldflags tar:tgz USE_LDCONFIG= yes GNU_CONFIGURE= yes diff --git a/sysutils/iocell/Makefile b/sysutils/iocell/Makefile index 8f8d6ea0b1c5..3241270f6366 100644 --- a/sysutils/iocell/Makefile +++ b/sysutils/iocell/Makefile @@ -17,7 +17,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= uclcmd:devel/uclcmd -CONFLICTS= iocage-* +CONFLICTS= iocage USE_GITHUB= yes GH_ACCOUNT= bartekrutkowski diff --git a/sysutils/moosefs3-master/Makefile b/sysutils/moosefs3-master/Makefile index 244de06d0634..efa35f527ccd 100644 --- a/sysutils/moosefs3-master/Makefile +++ b/sysutils/moosefs3-master/Makefile @@ -32,7 +32,7 @@ CONFIGURE_ARGS+= --localstatedir=${MFS_WORKDIR} \ --with-default-user=${MFS_USER} \ --with-default-group=${MFS_GROUP} -CONFLICTS= moosefs2-${MFS_COMPONENT}-* +CONFLICTS= moosefs2-${MFS_COMPONENT} .if ${MFS_COMPONENT} == cgi MFS_CGIDIR= ${PREFIX}/share/mfscgi diff --git a/sysutils/puppet6/Makefile b/sysutils/puppet6/Makefile index 33d3184896e5..4a95dbfc2c09 100644 --- a/sysutils/puppet6/Makefile +++ b/sysutils/puppet6/Makefile @@ -28,7 +28,7 @@ USES= cpe USE_GITHUB= yes GH_ACCOUNT= puppetlabs -CONFLICTS_INSTALL= puppet5-* puppet7-* +CONFLICTS_INSTALL= puppet7 PLIST_SUB= PORTVERSION="${PORTVERSION}" NO_ARCH= yes NO_BUILD= yes diff --git a/sysutils/puppet7/Makefile b/sysutils/puppet7/Makefile index a4c6c6d50e72..a394237576bf 100644 --- a/sysutils/puppet7/Makefile +++ b/sysutils/puppet7/Makefile @@ -23,7 +23,7 @@ USES= cpe USE_GITHUB= yes GH_ACCOUNT= puppetlabs -CONFLICTS_INSTALL= puppet5-* puppet6-* +CONFLICTS_INSTALL= puppet6 PLIST_SUB= PORTVERSION="${PORTVERSION}" NO_ARCH= yes NO_BUILD= yes diff --git a/sysutils/puppetserver6/Makefile b/sysutils/puppetserver6/Makefile index aa42ec34326d..bfa1b072b8f1 100644 --- a/sysutils/puppetserver6/Makefile +++ b/sysutils/puppetserver6/Makefile @@ -28,7 +28,7 @@ NO_ARCH= yes NO_BUILD= yes JAVA_VERSION= 1.8+ -CONFLICTS_INSTALL= puppetserver5-* puppetserver7-* +CONFLICTS_INSTALL= puppetserver7 SHEBANG_FILES= ext/bin/puppetserver diff --git a/sysutils/puppetserver7/Makefile b/sysutils/puppetserver7/Makefile index 6ab649e8965a..d3c59b531d0d 100644 --- a/sysutils/puppetserver7/Makefile +++ b/sysutils/puppetserver7/Makefile @@ -28,7 +28,7 @@ NO_ARCH= yes NO_BUILD= yes JAVA_VERSION= 1.8+ -CONFLICTS_INSTALL= puppetserver5-* puppetserver6-* +CONFLICTS_INSTALL= puppetserver5 puppetserver6 SHEBANG_FILES= ext/bin/puppetserver diff --git a/sysutils/rw/Makefile b/sysutils/rw/Makefile index a0120751b533..43edd2026e7f 100644 --- a/sysutils/rw/Makefile +++ b/sysutils/rw/Makefile @@ -11,7 +11,7 @@ COMMENT= Simple replacement for dd(1) with standard command-line flags LICENSE= ISCL LICENSE_FILE= ${WRKSRC}/LICENSE -CONFLICTS_INSTALL= rankwidth-* +CONFLICTS_INSTALL= rankwidth PLIST_FILES= bin/rw share/man/man1/rw.1.gz diff --git a/textproc/bsdgrep/Makefile b/textproc/bsdgrep/Makefile index 0d5689455864..b400c5d1a495 100644 --- a/textproc/bsdgrep/Makefile +++ b/textproc/bsdgrep/Makefile @@ -32,7 +32,7 @@ OPTIONS_DEFAULT= GNU_COMPAT OPTIONS_SUB= yes GNU_COMPAT_DESC= Use GNU regex library (recommended) -CONFLICTS= gnugrep-* +CONFLICTS= gnugrep NLS_MAKE_ENV= MK_NLS=yes NLS_MAKE_ENV_OFF= MK_NLS=no diff --git a/textproc/docbook-utils/Makefile b/textproc/docbook-utils/Makefile index 21faf362fe96..05f86094bd1e 100644 --- a/textproc/docbook-utils/Makefile +++ b/textproc/docbook-utils/Makefile @@ -17,7 +17,7 @@ RUN_DEPENDS+= dsssl-docbook-modular>0:textproc/dsssl-docbook-modular \ sgmlspl:textproc/p5-SGMLSpm \ lynx:www/lynx -CONFLICTS= docbook2X-* +CONFLICTS= docbook2X USES= perl5 gmake shebangfix USE_PERL5= run diff --git a/textproc/py-pdfminer.six/Makefile b/textproc/py-pdfminer.six/Makefile index b2f177f7550c..70b62e2e9c42 100644 --- a/textproc/py-pdfminer.six/Makefile +++ b/textproc/py-pdfminer.six/Makefile @@ -19,7 +19,7 @@ USE_GITHUB= yes GH_ACCOUNT= pdfminer USE_PYTHON= distutils concurrent autoplist -CONFLICTS_INSTALL= py??-pdfminer-* py??-pdfminer3k-* +CONFLICTS_INSTALL= py??-pdfminer py??-pdfminer3k NO_ARCH= yes do-test: diff --git a/www/gitlab-ce/Makefile b/www/gitlab-ce/Makefile index 203f32402a53..8db64ab527ec 100644 --- a/www/gitlab-ce/Makefile +++ b/www/gitlab-ce/Makefile @@ -257,11 +257,11 @@ BUILD_DEPENDS= gem:devel/ruby-gems \ RUN_DEPENDS= ${MY_DEPENDS} -CONFLICTS_INSTALL= gitolite-* \ - gitolite2-* \ - gogs-* \ - gitea-* \ - ${PYTHON_PKGNAMEPREFIX}-gitosis-* +CONFLICTS_INSTALL= gitolite \ + gitolite2 \ + gogs \ + gitea \ + ${PYTHON_PKGNAMEPREFIX}-gitosis USES= go:modules shebangfix USE_RUBY= yes diff --git a/www/h2o/Makefile b/www/h2o/Makefile index 243bab755fdb..27885b55a134 100644 --- a/www/h2o/Makefile +++ b/www/h2o/Makefile @@ -24,7 +24,7 @@ USE_LDCONFIG= yes CPE_VENDOR= dena -CONFLICTS= h2o-devel-* +CONFLICTS= h2o-devel SHEBANG_FILES= share/h2o/start_server diff --git a/www/mod_cloudflare/Makefile b/www/mod_cloudflare/Makefile index cb989dd2089a..8f81a224d08a 100644 --- a/www/mod_cloudflare/Makefile +++ b/www/mod_cloudflare/Makefile @@ -9,7 +9,7 @@ COMMENT= Cloudflare fork of mod_remoteip LICENSE= APACHE20 -CONFLICTS_INSTALL= ${PKGNAMEPREFIX}mod_remoteip-* +CONFLICTS_INSTALL= ${PKGNAMEPREFIX}mod_remoteip USE_GITHUB= yes GH_ACCOUNT= cloudflare diff --git a/www/py-puppetboard/Makefile b/www/py-puppetboard/Makefile index 304e470c8f76..9b84ca85d713 100644 --- a/www/py-puppetboard/Makefile +++ b/www/py-puppetboard/Makefile @@ -23,7 +23,7 @@ USES= python:3.6+ USE_GITHUB= yes USE_PYTHON= autoplist distutils -CONFLICTS_INSTALL=puppetboard02-* puppetboard03-* +CONFLICTS_INSTALL=puppetboard02 puppetboard03 GH_ACCOUNT= voxpupuli PLIST_FILES= "@sample etc/puppetboard/settings.py.sample" diff --git a/www/squid/Makefile b/www/squid/Makefile index 8e03dc0792eb..a52d6a418827 100644 --- a/www/squid/Makefile +++ b/www/squid/Makefile @@ -26,7 +26,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING USES= compiler:c++11-lib cpe perl5 shebangfix tar:xz -CONFLICTS= squid3-* squid-devel-* +CONFLICTS= squid3 squid-devel CPE_VENDOR= squid-cache SHEBANG_FILES= scripts/*.pl contrib/*.pl tools/*.pl GNU_CONFIGURE= yes diff --git a/x11-toolkits/gtkada/Makefile b/x11-toolkits/gtkada/Makefile index c0b1a17b66e3..3545fa5514a4 100644 --- a/x11-toolkits/gtkada/Makefile +++ b/x11-toolkits/gtkada/Makefile @@ -23,7 +23,7 @@ PORTEXAMPLES= * MAKE_ENV+= PROCESSORS=${MAKE_JOBS_NUMBER} -CONFLICTS_INSTALL= gtkada3-* +CONFLICTS_INSTALL= gtkada3 PORTSCOUT= ignore:1 diff --git a/x11-toolkits/gtkada3/Makefile b/x11-toolkits/gtkada3/Makefile index 72334f295fe6..9377ae072426 100644 --- a/x11-toolkits/gtkada3/Makefile +++ b/x11-toolkits/gtkada3/Makefile @@ -44,7 +44,7 @@ LDFLAGS+= -L${LOCALBASE}/lib MAKE_ARGS= PROCESSORS=${MAKE_JOBS_NUMBER} -CONFLICTS_INSTALL= gtkada-* +CONFLICTS_INSTALL= gtkada CONFIGURE_ARGS+= --with-GL=auto \ --with-GL-prefix=${PREFIX} \ diff --git a/x11-toolkits/lesstif/Makefile b/x11-toolkits/lesstif/Makefile index e74f3970d69c..b6c046cf6133 100644 --- a/x11-toolkits/lesstif/Makefile +++ b/x11-toolkits/lesstif/Makefile @@ -15,7 +15,7 @@ LICENSE= LGPL20+ LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 -CONFLICTS?= open-motif-* +CONFLICTS?= open-motif USES= cpe tar:bzip2 libtool xorg USE_XORG= sm ice xt x11 xext xorgproto xrender xft diff --git a/x11-wm/fvwm2/Makefile b/x11-wm/fvwm2/Makefile index 783f04013d28..edba125a9aeb 100644 --- a/x11-wm/fvwm2/Makefile +++ b/x11-wm/fvwm2/Makefile @@ -20,7 +20,7 @@ LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 # Other ports this port cannot coexist with -CONFLICTS_INSTALL= fvwm3-* +CONFLICTS_INSTALL= fvwm3 GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-mandoc --without-gnome --disable-gtk \ diff --git a/x11/xloadimage/Makefile b/x11/xloadimage/Makefile index 69e86dfc029c..08faf652010d 100644 --- a/x11/xloadimage/Makefile +++ b/x11/xloadimage/Makefile @@ -16,7 +16,7 @@ LICENSE= MIT LIB_DEPENDS= libpng.so:graphics/png \ libtiff.so:graphics/tiff -CONFLICTS_INSTALL= xli-* +CONFLICTS_INSTALL= xli EXTRA_PATCHES= ${WRKDIR}/debian/patches/*.patch IGNORE_PATCHES= 07_SYSPATHFILE.patch 24_libtiff5.patch \ |