git: 04b9da414081 - main - */*: Remove redundant '-*' from CONFLICTS definitions
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 25 Nov 2021 21:42:53 UTC
The branch main has been updated by se:
URL: https://cgit.FreeBSD.org/ports/commit/?id=04b9da414081a733478d3def4e1e3777908536c6
commit 04b9da414081a733478d3def4e1e3777908536c6
Author: Stefan Eßer <se@FreeBSD.org>
AuthorDate: 2021-11-25 21:40:11 +0000
Commit: Stefan Eßer <se@FreeBSD.org>
CommitDate: 2021-11-25 21:40:11 +0000
*/*: 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)
---
archivers/arc/Makefile | 2 +-
archivers/rpm2cpio/Makefile | 2 +-
audio/festvox-kal16/Makefile | 2 +-
audio/festvox-kal8/Makefile | 2 +-
audio/festvox-ked16/Makefile | 2 +-
audio/festvox-ked8/Makefile | 2 +-
audio/mixxx22/Makefile | 2 +-
biology/babel/Makefile | 2 +-
cad/alliance/Makefile | 2 +-
chinese/fireflyttf/Makefile | 2 +-
comms/wsjtz/Makefile | 2 +-
converters/p5-JSON/Makefile | 2 +-
databases/firebird30-server/Makefile | 2 +-
databases/firebird40-server/Makefile | 2 +-
databases/mariadb-connector-c/Makefile | 8 ++++----
databases/mariadb103-server/Makefile | 8 ++++----
databases/mariadb104-server/Makefile | 8 ++++----
databases/mariadb105-server/Makefile | 8 ++++----
databases/mysql-connector-java/Makefile | 2 +-
databases/mysql55-client/Makefile | 6 +++---
databases/mysql55-server/Makefile | 8 ++++----
databases/mysql56-client/Makefile | 8 ++++----
databases/mysql56-server/Makefile | 10 +++++-----
databases/mysql57-client/Makefile | 8 ++++----
databases/mysql57-server/Makefile | 10 +++++-----
databases/mysql80-client/Makefile | 8 ++++----
databases/mysql80-server/Makefile | 10 +++++-----
databases/mysqlwsrep56-server/Makefile | 10 +++++-----
databases/mysqlwsrep57-server/Makefile | 10 +++++-----
databases/percona56-client/Makefile | 6 +++---
databases/percona56-server/Makefile | 8 ++++----
databases/percona57-client/Makefile | 6 +++---
databases/percona57-server/Makefile | 8 ++++----
databases/postgresql11-pgtcl/Makefile | 2 +-
databases/postgresql12-pgtcl/Makefile | 2 +-
databases/postgresql13-pgtcl/Makefile | 2 +-
databases/postgresql14-pgtcl/Makefile | 2 +-
databases/puppetdb-terminus6/Makefile | 2 +-
databases/puppetdb-terminus7/Makefile | 2 +-
databases/puppetdb6/Makefile | 2 +-
databases/puppetdb7/Makefile | 2 +-
databases/py-pypuppetdb/Makefile | 2 +-
databases/rrdtool/Makefile | 2 +-
databases/tdb/Makefile | 2 +-
devel/android-tools-adb/Makefile | 2 +-
devel/android-tools-fastboot/Makefile | 2 +-
devel/cloudabi-toolchain/Makefile | 2 +-
devel/cmake/Makefile | 2 --
devel/libedit/Makefile | 2 +-
devel/llvm-devel/Makefile | 2 +-
devel/llvm10/Makefile | 2 +-
devel/llvm11/Makefile | 2 +-
devel/llvm12/Makefile | 2 +-
devel/llvm13/Makefile | 2 +-
devel/llvm80/Makefile | 2 +-
devel/llvm90/Makefile | 2 +-
devel/php-composer/Makefile | 2 +-
devel/php-composer2/Makefile | 2 +-
devel/py-magic/Makefile | 2 +-
devel/py-python-magic/Makefile | 2 +-
devel/rubygem-ruby-progressbar/Makefile | 2 +-
devel/talloc/Makefile | 2 +-
devel/tevent/Makefile | 2 +-
dns/dnsmasq/Makefile | 2 +-
editors/lazarus-qt5/Makefile | 2 +-
editors/lazarus/Makefile | 2 +-
editors/openoffice-4/Makefile | 2 +-
emulators/mtools/Makefile | 2 +-
emulators/virtualbox-ose-kmod-legacy/Makefile | 4 ++--
emulators/virtualbox-ose-kmod/Makefile | 4 ++--
games/hangman/Makefile | 2 +-
games/shaaft/Makefile | 2 +-
games/sol/Makefile | 2 +-
graphics/py-pyglet/Makefile | 2 +-
graphics/py-pyglet150/Makefile | 2 +-
graphics/xli/Makefile | 2 +-
graphics/xpdf3/Makefile | 4 ++--
graphics/xpdf4/Makefile | 4 ++--
java/intellij/Makefile | 2 +-
lang/petite-chez/Makefile | 2 +-
lang/php73/Makefile | 2 +-
lang/php74/Makefile | 2 +-
lang/php80/Makefile | 2 +-
lang/zig-devel/Makefile | 2 +-
mail/ezmlm/Makefile | 2 +-
mail/meta1/Makefile | 2 +-
mail/mmh/Makefile | 2 +-
mail/sendmail-devel/Makefile | 2 +-
mail/sendmail/Makefile | 2 +-
math/rankwidth/Makefile | 2 +-
misc/amanda-server/Makefile | 2 +-
misc/chef/Makefile | 2 +-
misc/dahdi-kmod/Makefile | 2 +-
misc/dahdi-kmod26/Makefile | 2 +-
misc/kenny/Makefile | 2 +-
misc/py-cinder/Makefile | 2 +-
misc/py-spdx-tools/Makefile | 2 +-
misc/talkfilters/Makefile | 2 +-
multimedia/gstreamer1-qt/Makefile | 2 +-
multimedia/makemkv/Makefile | 2 +-
multimedia/mplex/Makefile | 2 +-
net-im/pidgin-skypeweb/Makefile | 2 --
net-mgmt/monitoring-plugins/Makefile | 2 +-
net-mgmt/nagios-plugins/Makefile | 2 +-
net-mgmt/nagios/Makefile | 2 +-
net-mgmt/nagios4/Makefile | 2 +-
net-mgmt/p5-FusionInventory-Agent/Makefile | 4 ++--
net-mgmt/unifi6/Makefile | 2 +-
net-p2p/ed2k/Makefile | 2 +-
net/asterisk16/Makefile | 2 +-
net/asterisk18/Makefile | 2 +-
net/bmon/Makefile | 2 --
net/cvsup-static/Makefile | 2 +-
net/freeswitch/Makefile | 2 +-
net/fspclient/Makefile | 2 +-
net/openldap24-server/Makefile | 4 ++--
net/openldap25-server/Makefile | 4 ++--
net/openldap26-server/Makefile | 4 ++--
net/tightvnc/Makefile | 2 +-
ports-mgmt/portupgrade/Makefile | 2 +-
science/openbabel/Makefile | 2 +-
security/easy-rsa/Makefile | 2 +-
security/fwbuilder/Makefile | 4 ++--
security/keepassx-devel/Makefile | 2 +-
security/keepassxc/Makefile | 2 +-
security/krb5-117/Makefile | 4 ++--
security/krb5-118/Makefile | 4 ++--
security/krb5-119/Makefile | 4 ++--
security/krb5-appl/Makefile | 2 +-
security/libotr/Makefile | 2 +-
security/libotr3/Makefile | 2 +-
security/openssh-portable/Makefile | 2 +-
security/ossec-hids-local-config/Makefile | 18 +++++++++---------
security/ossec-hids-local/Makefile | 18 +++++++++---------
security/outguess/Makefile | 2 +-
security/py-pycrypto/Makefile | 2 +-
security/racoon2/Makefile | 2 +-
security/wazuh-agent/Makefile | 2 +-
shells/ast-ksh/Makefile | 2 +-
shells/ksh2020/Makefile | 4 ++--
shells/ksh93-devel/Makefile | 4 ++--
shells/ksh93/Makefile | 4 ++--
sysutils/ansible/Makefile | 6 +++---
sysutils/ansible2/Makefile | 6 +++---
sysutils/bacula11-docs/Makefile | 2 +-
sysutils/bacula11-server/Makefile | 2 +-
sysutils/bacula9-docs/Makefile | 2 +-
sysutils/bacula9-server/Makefile | 2 +-
sysutils/bareos-client/Makefile | 2 +-
sysutils/bareos-server/Makefile | 2 +-
sysutils/bareos-traymonitor/Makefile | 2 +-
sysutils/bareos17-client-static/Makefile | 2 +-
sysutils/bareos17-client/Makefile | 2 +-
sysutils/bareos17-server/Makefile | 2 +-
sysutils/bareos18-client/Makefile | 2 +-
sysutils/bareos18-server/Makefile | 2 +-
sysutils/bareos18-traymonitor/Makefile | 2 +-
sysutils/bareos19-client/Makefile | 2 +-
sysutils/bareos19-server/Makefile | 2 +-
sysutils/bareos19-traymonitor/Makefile | 2 +-
sysutils/beadm/Makefile | 2 +-
sysutils/cfengine-masterfiles316/Makefile | 2 +-
sysutils/cfengine-masterfiles317/Makefile | 2 +-
sysutils/cfengine-masterfiles318/Makefile | 2 +-
sysutils/cfengine316/Makefile | 2 +-
sysutils/cfengine317/Makefile | 2 +-
sysutils/cfengine318/Makefile | 2 +-
sysutils/fusefs-ntfs/Makefile | 3 ---
sysutils/iocell/Makefile | 2 +-
sysutils/moosefs3-master/Makefile | 2 +-
sysutils/puppet6/Makefile | 2 +-
sysutils/puppet7/Makefile | 2 +-
sysutils/puppetserver6/Makefile | 2 +-
sysutils/puppetserver7/Makefile | 2 +-
sysutils/rw/Makefile | 2 +-
textproc/bsdgrep/Makefile | 2 +-
textproc/docbook-utils/Makefile | 2 +-
textproc/py-pdfminer.six/Makefile | 2 +-
www/gitlab-ce/Makefile | 10 +++++-----
www/h2o/Makefile | 2 +-
www/mod_cloudflare/Makefile | 2 +-
www/py-puppetboard/Makefile | 2 +-
www/squid/Makefile | 2 +-
x11-toolkits/gtkada/Makefile | 2 +-
x11-toolkits/gtkada3/Makefile | 2 +-
x11-toolkits/lesstif/Makefile | 2 +-
x11-wm/fvwm2/Makefile | 2 +-
x11/xloadimage/Makefile | 2 +-
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
*** 1882 LINES SKIPPED ***