aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Eßer <se@FreeBSD.org>2022-06-29 15:57:40 +0000
committerStefan Eßer <se@FreeBSD.org>2022-06-29 15:57:40 +0000
commitda00957fbe1f79c12851e0958ee7e4c8276a5527 (patch)
treed14676e2663fab07af84c52d41d9b5c21e828774
parent8cb12b6dc94b21d30c093920ab5f3c55c80c50ee (diff)
Fix CONFLICTS_INSTALL in the databases category
Approved by: portmgr (implicit)
-rw-r--r--databases/adodb5/Makefile2
-rw-r--r--databases/bbdb/Makefile3
-rw-r--r--databases/closql/Makefile2
-rw-r--r--databases/courier-authlib-userdb/Makefile2
-rw-r--r--databases/courier-authlib-usergdbm/Makefile2
-rw-r--r--databases/freetds-devel/Makefile2
-rw-r--r--databases/ldb15/Makefile2
-rw-r--r--databases/ldb20/Makefile2
-rw-r--r--databases/ldb21/Makefile2
-rw-r--r--databases/ldb22/Makefile2
-rw-r--r--databases/libdrizzle-redux/Makefile2
-rw-r--r--databases/libdrizzle/Makefile2
-rw-r--r--databases/libmemcached/Makefile2
-rw-r--r--databases/mongodb36/Makefile2
-rw-r--r--databases/mongodb40/Makefile2
-rw-r--r--databases/mongodb42/Makefile2
-rw-r--r--databases/mongodb44/Makefile2
-rw-r--r--databases/mongodb50/Makefile2
-rw-r--r--databases/mysql-connector-java/Makefile2
-rw-r--r--databases/mysql-connector-java51/Makefile2
-rw-r--r--databases/p5-Search-Xapian/Makefile2
-rw-r--r--databases/p5-Search-Xapian12/Makefile2
-rw-r--r--databases/pear-DB_Sqlite_Tools/Makefile3
-rw-r--r--databases/percona-toolkit/Makefile2
-rw-r--r--databases/pg.el/Makefile2
-rw-r--r--databases/pgpool-II-36/Makefile2
-rw-r--r--databases/pgpool-II-37/Makefile2
-rw-r--r--databases/pgpool-II-40/Makefile2
-rw-r--r--databases/pgpool-II-41/Makefile2
-rw-r--r--databases/pgpool-II-42/Makefile2
-rw-r--r--databases/pgpool-II-43/Makefile2
-rw-r--r--databases/pgtcl/Makefile2
-rw-r--r--databases/phpmyadmin/Makefile2
-rw-r--r--databases/phpmyadmin5/Makefile2
-rw-r--r--databases/postgis30/Makefile2
-rw-r--r--databases/postgis31/Makefile2
-rw-r--r--databases/postgis32/Makefile2
-rw-r--r--databases/puppetdb6/Makefile2
-rw-r--r--databases/puppetdb7/Makefile2
-rw-r--r--databases/py-alembic/Makefile2
-rw-r--r--databases/py-alembic14/Makefile2
-rw-r--r--databases/py-alembic16/Makefile2
-rw-r--r--databases/py-pg8000-112/Makefile2
-rw-r--r--databases/py-pg8000/Makefile2
-rw-r--r--databases/py-sqlalchemy10/Makefile2
-rw-r--r--databases/py-sqlalchemy11/Makefile2
-rw-r--r--databases/py-sqlalchemy12/Makefile2
-rw-r--r--databases/py-sqlalchemy13/Makefile2
-rw-r--r--databases/py-sqlalchemy14/Makefile2
-rw-r--r--databases/redis-devel/Makefile2
-rw-r--r--databases/redis/Makefile1
-rw-r--r--databases/redis6/Makefile2
-rw-r--r--databases/rrdtool12/Makefile2
-rw-r--r--databases/sqlite3/Makefile4
-rw-r--r--databases/tarantool-c/Makefile2
-rw-r--r--databases/tinycdb/Makefile2
-rw-r--r--databases/xapian-core/Makefile2
-rw-r--r--databases/xapian-core12/Makefile2
58 files changed, 80 insertions, 39 deletions
diff --git a/databases/adodb5/Makefile b/databases/adodb5/Makefile
index 14ebc1916625..b1657ca04859 100644
--- a/databases/adodb5/Makefile
+++ b/databases/adodb5/Makefile
@@ -19,7 +19,7 @@ USE_PHP= pcre
USE_GITHUB= yes
GH_PROJECT= ADOdb
-CONFLICTS= adodb-4.*
+CONFLICTS_INSTALL= adodb5-php[0-9][0-9] # share/adodb/adodb-active-record.inc.php
NO_BUILD= yes
NO_ARCH= yes
diff --git a/databases/bbdb/Makefile b/databases/bbdb/Makefile
index 5b6b17e1c053..533c2676706a 100644
--- a/databases/bbdb/Makefile
+++ b/databases/bbdb/Makefile
@@ -21,6 +21,9 @@ GH_TAGNAME= a50c89a
BBDB_LISPDIR= ${EMACS_SITE_LISPDIR}/${PORTNAME}
GNU_CONFIGURE= yes
+
+CONFLICTS_INSTALL= bbdb bbdb-emacs_* # share/doc/bbdb/bbdb.pdf
+
# Do not install the info file. Upstream has yet to add any real content to it.
#INFO= bbdb
PORTDOCS= bbdb.pdf
diff --git a/databases/closql/Makefile b/databases/closql/Makefile
index 04d247e00d05..ff5435a9364c 100644
--- a/databases/closql/Makefile
+++ b/databases/closql/Makefile
@@ -18,6 +18,8 @@ USES= emacs
USE_GITHUB= yes
GH_ACCOUNT= emacscollective
+CONFLICTS_INSTALL= closql closql-emacs_* # share/doc/closql/README.md
+
NO_ARCH= yes
PLIST_FILES= ${EMACS_VERSION_SITE_LISPDIR}/closql.el \
diff --git a/databases/courier-authlib-userdb/Makefile b/databases/courier-authlib-userdb/Makefile
index 470b067a8e77..62a07ec3e8b8 100644
--- a/databases/courier-authlib-userdb/Makefile
+++ b/databases/courier-authlib-userdb/Makefile
@@ -6,6 +6,8 @@ PKGNAMESUFFIX= -userdb
COMMENT= Userdb support for the Courier authentication library
CATEGORIES= databases mail
+CONFLICTS_INSTALL= courier-authlib-usergdbm # lib/courier-authlib/libauthuserdb.so
+
MASTERDIR= ${.CURDIR}/../../security/courier-authlib
.include "${MASTERDIR}/Makefile"
diff --git a/databases/courier-authlib-usergdbm/Makefile b/databases/courier-authlib-usergdbm/Makefile
index bec00406355f..b55558a2b51e 100644
--- a/databases/courier-authlib-usergdbm/Makefile
+++ b/databases/courier-authlib-usergdbm/Makefile
@@ -6,6 +6,8 @@ PKGNAMESUFFIX= -usergdbm
COMMENT= Userdb support for the Courier authentication library
CATEGORIES= databases mail
+CONFLICTS_INSTALL= courier-authlib-userdb # lib/courier-authlib/libauthuserdb.so
+
MASTERDIR= ${.CURDIR}/../../security/courier-authlib
.include "${MASTERDIR}/Makefile"
diff --git a/databases/freetds-devel/Makefile b/databases/freetds-devel/Makefile
index 173f5a33c518..8f99bf5b8989 100644
--- a/databases/freetds-devel/Makefile
+++ b/databases/freetds-devel/Makefile
@@ -30,6 +30,8 @@ INSTALL_TARGET= install-strip
CPPFLAGS+= "-I${LOCALBASE}/include"
LDFLAGS+= -L${LOCALBASE}/lib
+CONFLICTS_INSTALL= freetds # etc/freetds/freetds.conf.sample
+
PORTSCOUT= limit:^\d+\.\d+\.\d{3}$
SUB_FILES= pkg-message
WRKSRC= ${WRKDIR}/${PORTNAME}-dev.${PORTVERSION}
diff --git a/databases/ldb15/Makefile b/databases/ldb15/Makefile
index c5e4515decc8..dc5e667c84a8 100644
--- a/databases/ldb15/Makefile
+++ b/databases/ldb15/Makefile
@@ -23,7 +23,7 @@ LDB_DEPENDS= talloc>=2.2.0:devel/talloc \
cmocka>=1.1.3:sysutils/cmocka \
popt>=0:devel/popt
-CONFLICTS_INSTALL= ldb-1.1.* ldb1[2-46]-1.*
+CONFLICTS_INSTALL= ldb[0-9][0-9] samba4[0-9][0-9] # include/ldb.h lib/python3.8/site-packages/_ldb_text.py
#FLAVORS= default nopython
#nopython_PKGNAMESUFFIX= -nopython
diff --git a/databases/ldb20/Makefile b/databases/ldb20/Makefile
index d34231929acb..3554bf94c969 100644
--- a/databases/ldb20/Makefile
+++ b/databases/ldb20/Makefile
@@ -23,7 +23,7 @@ LDB_DEPENDS= talloc>=2.2.0:devel/talloc \
cmocka>=1.1.3:sysutils/cmocka \
popt>=0:devel/popt
-CONFLICTS_INSTALL= ldb-1.1.* ldb1[2-9]-1.* ldb2[1-9]-2.*
+CONFLICTS_INSTALL= ldb[0-9][0-9] # include/ldb.h
USES= compiler pkgconfig waf
USE_LDCONFIG= yes
diff --git a/databases/ldb21/Makefile b/databases/ldb21/Makefile
index c5044bda873a..8759d122823b 100644
--- a/databases/ldb21/Makefile
+++ b/databases/ldb21/Makefile
@@ -24,7 +24,7 @@ LDB_DEPENDS= talloc>=2.2.0:devel/talloc \
USES= compiler pkgconfig waf
-CONFLICTS_INSTALL= ldb-1.1.* ldb1[2-9]-1.* ldb2[02-9]-2.*
+CONFLICTS_INSTALL= ldb[0-9][0-9] # include/ldb.h
USE_LDCONFIG= yes
WAF_CMD= ${BUILD_WRKSRC}/buildtools/bin/waf
diff --git a/databases/ldb22/Makefile b/databases/ldb22/Makefile
index d5847542daa0..0ee921ebd199 100644
--- a/databases/ldb22/Makefile
+++ b/databases/ldb22/Makefile
@@ -26,7 +26,7 @@ RUN_DEPENDS= ${LDB_DEPENDS}
USES= compiler pkgconfig waf
-CONFLICTS_INSTALL= ldb-1.1.* ldb1[2-9]-1.* ldb2[013-9]-2.*
+CONFLICTS_INSTALL= ldb[0-9][0-9] # include/ldb.h
USE_LDCONFIG= yes
WAF_CMD= ${BUILD_WRKSRC}/buildtools/bin/waf
diff --git a/databases/libdrizzle-redux/Makefile b/databases/libdrizzle-redux/Makefile
index 625c8bf34896..c4dd122353f6 100644
--- a/databases/libdrizzle-redux/Makefile
+++ b/databases/libdrizzle-redux/Makefile
@@ -18,7 +18,7 @@ GNU_CONFIGURE= yes
USES= gmake libtool ssl
USE_LDCONFIG= yes
-CONFLICTS= libdrizzle
+CONFLICTS_INSTALL= libdrizzle # lib/libdrizzle.so
OPTIONS_DEFINE= DOCS
diff --git a/databases/libdrizzle/Makefile b/databases/libdrizzle/Makefile
index 44467faf6415..e5b08fc86ca0 100644
--- a/databases/libdrizzle/Makefile
+++ b/databases/libdrizzle/Makefile
@@ -23,6 +23,8 @@ CONFIGURE_ARGS+=--enable-libsqlite3
USE_LDCONFIG= yes
INSTALL_TARGET= install-strip
+CONFLICTS_INSTALL= libdrizzle-redux # lib/libdrizzle.so
+
SAMPLE_PROGS= client pipe_query proxy server simple \
simple_multi sqlite_server
diff --git a/databases/libmemcached/Makefile b/databases/libmemcached/Makefile
index 58acf1ac03fa..344420dea463 100644
--- a/databases/libmemcached/Makefile
+++ b/databases/libmemcached/Makefile
@@ -25,6 +25,8 @@ PATHFIX_MAKEFILEIN= include.am
TEST_TARGET= check
USE_LDCONFIG= yes
+CONFLICTS_INSTALL= memdump # man/man1/memdump.1.gz
+
OPTIONS_DEFINE= DEBUG MEMASLAP SASL
OPTIONS_GROUP= HASH
OPTIONS_GROUP_HASH= FNV64 HSIEH MURMUR
diff --git a/databases/mongodb36/Makefile b/databases/mongodb36/Makefile
index 1d48fa876482..5db29e3a9a84 100644
--- a/databases/mongodb36/Makefile
+++ b/databases/mongodb36/Makefile
@@ -29,7 +29,7 @@ LIB_DEPENDS= libpcre.so:devel/pcre \
USES= compiler:c++14-lang cpe python:3.7+,build scons shebangfix
USE_RC_SUBR= mongod
-CONFLICTS_INSTALL= mongodb4[024]
+CONFLICTS_INSTALL= mongodb[0-9][0-9] # etc/mongodb.conf.sample
SHEBANG_FILES= src/mongo/installer/compass/install_compass.in
python_OLD_CMD= @python_interpreter@
diff --git a/databases/mongodb40/Makefile b/databases/mongodb40/Makefile
index 4617de24ca20..293e5376a686 100644
--- a/databases/mongodb40/Makefile
+++ b/databases/mongodb40/Makefile
@@ -30,7 +30,7 @@ LIB_DEPENDS= libpcre.so:devel/pcre \
USES= compiler:c++14-lang cpe python:3.7+,build scons shebangfix
USE_RC_SUBR= mongod
-CONFLICTS_INSTALL= mongodb36 mongodb4[24] mongodb50
+CONFLICTS_INSTALL= mongodb[0-9][0-9] # etc/mongodb.conf.sample
SHEBANG_FILES= src/mongo/installer/compass/install_compass
python_OLD_CMD= @python_interpreter@
diff --git a/databases/mongodb42/Makefile b/databases/mongodb42/Makefile
index 78e0c2bb1e88..e14ecbb14932 100644
--- a/databases/mongodb42/Makefile
+++ b/databases/mongodb42/Makefile
@@ -35,7 +35,7 @@ LIB_DEPENDS= libpcre.so:devel/pcre \
USES= compiler:c++17-lang cpe python:3.5+,build scons shebangfix
USE_RC_SUBR= mongod
-CONFLICTS_INSTALL= mongodb[0-9][0-9]
+CONFLICTS_INSTALL= mongodb[0-9][0-9] # etc/mongodb.conf.sample
OPTIONS_DEFINE= LTO SASL SSL
OPTIONS_DEFAULT=LTO SASL SSL
diff --git a/databases/mongodb44/Makefile b/databases/mongodb44/Makefile
index d23081b14f15..6223eda6883b 100644
--- a/databases/mongodb44/Makefile
+++ b/databases/mongodb44/Makefile
@@ -32,7 +32,7 @@ USE_RC_SUBR= mongod
PORTSCOUT= limit:^4\.4\.
-CONFLICTS_INSTALL= mongodb[0-9][0-9]
+CONFLICTS_INSTALL= mongodb[0-9][0-9] # etc/mongodb.conf.sample
OPTIONS_DEFINE= LTO SASL SSL
OPTIONS_DEFAULT=LTO SASL SSL
diff --git a/databases/mongodb50/Makefile b/databases/mongodb50/Makefile
index 349b57e1864f..b49ce5c5e633 100644
--- a/databases/mongodb50/Makefile
+++ b/databases/mongodb50/Makefile
@@ -44,7 +44,7 @@ MAKE_ARGS= --cxx-std=17 \
AR=${PREFIX}/bin/ar \
VERBOSE=on
-CONFLICTS_INSTALL= mongodb36 mongodb4[024]
+CONFLICTS_INSTALL= mongodb[0-9][0-9] # etc/mongodb.conf.sample
USERS= mongodb
GROUPS= mongodb
diff --git a/databases/mysql-connector-java/Makefile b/databases/mysql-connector-java/Makefile
index a25f0f2af3e3..3e016c78666e 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 # share/java/classes/mysql-connector-java.jar
JAVA_VERSION= 1.8+
EXTRADOCS= CHANGES
diff --git a/databases/mysql-connector-java51/Makefile b/databases/mysql-connector-java51/Makefile
index ede3b6b97681..3157a4766a2d 100644
--- a/databases/mysql-connector-java51/Makefile
+++ b/databases/mysql-connector-java51/Makefile
@@ -20,7 +20,7 @@ USES= cpe
CPE_VENDOR= oracle
CPE_PRODUCT= mysql_connector_j
-CONFLICTS_INSTALL= mysql-connector-java-8*
+CONFLICTS_INSTALL= mysql-connector-java # share/java/classes/mysql-connector-java.jar
NO_ARCH= yes
USE_JAVA= yes
diff --git a/databases/p5-Search-Xapian/Makefile b/databases/p5-Search-Xapian/Makefile
index 208d9c37f0e8..8f8a1abdb355 100644
--- a/databases/p5-Search-Xapian/Makefile
+++ b/databases/p5-Search-Xapian/Makefile
@@ -25,6 +25,8 @@ USE_PERL5= configure
CC= ${CXX}
CONFIGURE_ARGS= XAPIAN_CONFIG=${LOCALBASE}/bin/xapian-config
+CONFLICTS_INSTALL= p5-Search-Xapian12 # lib/perl5/site_perl/mach/5.32/Search/Xapian.pm
+
post-patch:
@${REINPLACE_CMD} -e 's|^if (defined $$builddir) {|if (0) {|' ${WRKSRC}/Makefile.PL
diff --git a/databases/p5-Search-Xapian12/Makefile b/databases/p5-Search-Xapian12/Makefile
index a2fec91b721f..dd9569daede6 100644
--- a/databases/p5-Search-Xapian12/Makefile
+++ b/databases/p5-Search-Xapian12/Makefile
@@ -26,6 +26,8 @@ USE_PERL5= configure
CC= ${CXX}
CONFIGURE_ARGS= XAPIAN_CONFIG=${LOCALBASE}/bin/xapian-config
+CONFLICTS_INSTALL= p5-Search-Xapian # lib/perl5/site_perl/mach/5.32/Search/Xapian.pm
+
# later version does not support xapian-core 1.2.x
PORTSCOUT= ignore:1
diff --git a/databases/pear-DB_Sqlite_Tools/Makefile b/databases/pear-DB_Sqlite_Tools/Makefile
index a66d0a585aea..8609881a11cc 100644
--- a/databases/pear-DB_Sqlite_Tools/Makefile
+++ b/databases/pear-DB_Sqlite_Tools/Makefile
@@ -16,4 +16,7 @@ RUN_DEPENDS= ${PEARDIR}/DB.php:databases/pear-DB@${PHP_FLAVOR} \
USES= pear
+CONFLICTS_INSTALL= php[0-9][0-9]-pear-Crypt_HMAC2 \
+ php[0-9][0-9]-pear-DB_Sqlite_Tools # share/pear/DB/Sqlite/Tools.php share/pear/generate_package_xml.php
+
.include <bsd.port.mk>
diff --git a/databases/percona-toolkit/Makefile b/databases/percona-toolkit/Makefile
index 232f032f6ac9..a336793cbdf5 100644
--- a/databases/percona-toolkit/Makefile
+++ b/databases/percona-toolkit/Makefile
@@ -18,6 +18,8 @@ RUN_DEPENDS= bash:shells/bash \
USES= perl5
USE_PERL5= configure
+CONFLICTS_INSTALL= p5-Pipeline # lib/perl5/site_perl/Pipeline.pm
+
NO_ARCH= yes
.include <bsd.port.mk>
diff --git a/databases/pg.el/Makefile b/databases/pg.el/Makefile
index 75522ba612e3..e4c13f8a0972 100644
--- a/databases/pg.el/Makefile
+++ b/databases/pg.el/Makefile
@@ -15,6 +15,8 @@ USE_GITHUB= yes
GH_ACCOUNT= cbbrowne
GH_TAGNAME= 4f6516e
+CONFLICTS_INSTALL= pg.el pg.el-emacs_* # share/doc/pg.el/README
+
NO_ARCH= yes
PLIST_FILES= ${EMACS_VERSION_SITE_LISPDIR}/pg.el \
diff --git a/databases/pgpool-II-36/Makefile b/databases/pgpool-II-36/Makefile
index 516509e119e2..1c86f54545ed 100644
--- a/databases/pgpool-II-36/Makefile
+++ b/databases/pgpool-II-36/Makefile
@@ -19,7 +19,7 @@ USE_RC_SUBR= pgpool
GNU_CONFIGURE= yes
-CONFLICTS= pgpool-II
+CONFLICTS_INSTALL= pgpool-II-[0-9][0-9] pgpool-II[0-9][0-9] # etc/pcp.conf.sample
PORTSCOUT= limit:^3.6.[0-9]*
diff --git a/databases/pgpool-II-37/Makefile b/databases/pgpool-II-37/Makefile
index b6615edad111..7e01cff7faa7 100644
--- a/databases/pgpool-II-37/Makefile
+++ b/databases/pgpool-II-37/Makefile
@@ -19,7 +19,7 @@ USE_RC_SUBR= pgpool
GNU_CONFIGURE= yes
-CONFLICTS= pgpool-II
+CONFLICTS_INSTALL= pgpool-II-[0-9][0-9] pgpool-II[0-9][0-9] # etc/pcp.conf.sample
PORTSCOUT= limit:^3.7.[0-9]*
diff --git a/databases/pgpool-II-40/Makefile b/databases/pgpool-II-40/Makefile
index 39ba3aebfbd5..54388a1c71b3 100644
--- a/databases/pgpool-II-40/Makefile
+++ b/databases/pgpool-II-40/Makefile
@@ -16,7 +16,7 @@ USE_RC_SUBR= pgpool
GNU_CONFIGURE= yes
-CONFLICTS= pgpool-II
+CONFLICTS_INSTALL= pgpool-II-[0-9][0-9] pgpool-II[0-9][0-9] # etc/pcp.conf.sample
PORTSCOUT= limit:^4.0.[0-9]*
diff --git a/databases/pgpool-II-41/Makefile b/databases/pgpool-II-41/Makefile
index 7a9bd1efcbb9..ce8563cfe82a 100644
--- a/databases/pgpool-II-41/Makefile
+++ b/databases/pgpool-II-41/Makefile
@@ -16,7 +16,7 @@ USE_RC_SUBR= pgpool
GNU_CONFIGURE= yes
-CONFLICTS= pgpool-II
+CONFLICTS_INSTALL= pgpool-II-[0-9][0-9] pgpool-II[0-9][0-9] # etc/failover.sh.sample etc/pcp.conf.sample
PORTSCOUT= limit:^4.1.[0-9]*
diff --git a/databases/pgpool-II-42/Makefile b/databases/pgpool-II-42/Makefile
index a89611c68d26..f3ff00d845e6 100644
--- a/databases/pgpool-II-42/Makefile
+++ b/databases/pgpool-II-42/Makefile
@@ -18,7 +18,7 @@ USE_RC_SUBR= pgpool
GNU_CONFIGURE= yes
-CONFLICTS= pgpool-II
+CONFLICTS_INSTALL= pgpool-II-[0-9][0-9] pgpool-II[0-9][0-9] # etc/escalation.sh.sample etc/failover.sh.sample etc/pcp.conf.sample
PORTDOCS= *
diff --git a/databases/pgpool-II-43/Makefile b/databases/pgpool-II-43/Makefile
index 4628f7488314..48c7d11af9a4 100644
--- a/databases/pgpool-II-43/Makefile
+++ b/databases/pgpool-II-43/Makefile
@@ -16,7 +16,7 @@ USE_RC_SUBR= pgpool
GNU_CONFIGURE= yes
-CONFLICTS= pgpool-II
+CONFLICTS_INSTALL= pgpool-II-[0-9][0-9] pgpool-II[0-9][0-9] # etc/escalation.sh.sample etc/failover.sh.sample etc/pcp.conf.sample
PORTSCOUT= limit:^4.3.[0-9]*
diff --git a/databases/pgtcl/Makefile b/databases/pgtcl/Makefile
index 3c124720dfe5..63576d8d8e38 100644
--- a/databases/pgtcl/Makefile
+++ b/databases/pgtcl/Makefile
@@ -27,6 +27,8 @@ USE_LDCONFIG= ${LIBDIR}
PLIST_SUB+= PORTVERSION=${PORTVERSION}
MANUALREL= 20171113
+CONFLICTS_INSTALL?= pgtcl pgtcl-postgresql[0-9][0-9] # lib/pgtcl/libpgtcl2.1.1.so
+
PLIST_FILES= lib/pgtcl/libpgtcl${PORTVERSION}.so \
lib/pgtcl/pkgIndex.tcl
PORTDOCS= *
diff --git a/databases/phpmyadmin/Makefile b/databases/phpmyadmin/Makefile
index 9d3cdbe7c05f..e67c347c6393 100644
--- a/databases/phpmyadmin/Makefile
+++ b/databases/phpmyadmin/Makefile
@@ -13,7 +13,7 @@ COMMENT= Set of PHP-scripts to manage MySQL over the web
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/LICENSE
-CONFLICTS_INSTALL= phpmyadmin5
+CONFLICTS_INSTALL= phpMyAdmin-php[0-9][0-9] phpMyAdmin[0-9]-php[0-9][0-9] # www/phpMyAdmin/CONTRIBUTING.md
USES= cpe php:web,flavors tar:xz
CPE_PRODUCT= ${PORTNAME:tl}
diff --git a/databases/phpmyadmin5/Makefile b/databases/phpmyadmin5/Makefile
index 5a7299e12dbb..cb0a6f4485a3 100644
--- a/databases/phpmyadmin5/Makefile
+++ b/databases/phpmyadmin5/Makefile
@@ -11,7 +11,7 @@ COMMENT= Set of PHP-scripts to manage MySQL over the web
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/LICENSE
-CONFLICTS_INSTALL= phpmyadmin
+CONFLICTS_INSTALL= phpMyAdmin-php[0-9][0-9] phpMyAdmin[0-9]-php[0-9][0-9] # www/phpMyAdmin/CONTRIBUTING.md
USES= cpe php:web,flavors tar:xz
CPE_PRODUCT= ${PORTNAME:tl}
diff --git a/databases/postgis30/Makefile b/databases/postgis30/Makefile
index 4fb59898d212..d831c1984f39 100644
--- a/databases/postgis30/Makefile
+++ b/databases/postgis30/Makefile
@@ -59,7 +59,7 @@ SFCGAL_LIB_DEPENDS= libSFCGAL.so:databases/sfcgal
TOPOLOGY_CONFIGURE_WITH= topology
WAGYU_CONFIGURE_WITH= wagyu
-CONFLICTS_INSTALL= postgis20 postgis21 postgis22 postgis23 postgis24 postgis25 postgis31 postgis32
+CONFLICTS_INSTALL= postgis[0-9][0-9] # lib/postgresql/address_standardizer-3.so
VER= ${PORTVERSION:R}
diff --git a/databases/postgis31/Makefile b/databases/postgis31/Makefile
index 0204b9ec3d0b..3db30702d4f3 100644
--- a/databases/postgis31/Makefile
+++ b/databases/postgis31/Makefile
@@ -57,7 +57,7 @@ SFCGAL_LIB_DEPENDS= libSFCGAL.so:databases/sfcgal
TOPOLOGY_CONFIGURE_WITH= topology
WAGYU_CONFIGURE_WITH= wagyu
-CONFLICTS_INSTALL= postgis20 postgis21 postgis22 postgis23 postgis24 postgis25 postgis30 postgis32
+CONFLICTS_INSTALL= postgis[0-9][0-9] # lib/postgresql/address_standardizer-3.so
VER= ${PORTVERSION:R}
diff --git a/databases/postgis32/Makefile b/databases/postgis32/Makefile
index b10517d5883a..5564587bbfc9 100644
--- a/databases/postgis32/Makefile
+++ b/databases/postgis32/Makefile
@@ -58,7 +58,7 @@ SFCGAL_LIB_DEPENDS= libSFCGAL.so:databases/sfcgal
TOPOLOGY_CONFIGURE_WITH= topology
WAGYU_CONFIGURE_WITH= wagyu
-CONFLICTS_INSTALL= postgis24 postgis25 postgis30 postgis31
+CONFLICTS_INSTALL= postgis[0-9][0-9] # lib/postgresql/address_standardizer-3.so
VER= ${PORTVERSION:R}
diff --git a/databases/puppetdb6/Makefile b/databases/puppetdb6/Makefile
index 3f4c869667d7..7228e1ab8411 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= puppetdb[0-9] # etc/puppetdb/bootstrap.cfg.sample
USES= cpe shebangfix
CPE_VENDOR= puppet
SHEBANG_FILES= ext/bin/puppetdb \
diff --git a/databases/puppetdb7/Makefile b/databases/puppetdb7/Makefile
index c7a8836d3a81..57081c1fc3b1 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= puppetdb[0-9] # etc/puppetdb/bootstrap.cfg.sample
USES= cpe shebangfix
CPE_VENDOR= puppet
SHEBANG_FILES= ext/bin/puppetdb \
diff --git a/databases/py-alembic/Makefile b/databases/py-alembic/Makefile
index 1d43507318a2..6557c1237909 100644
--- a/databases/py-alembic/Makefile
+++ b/databases/py-alembic/Makefile
@@ -22,7 +22,7 @@ TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \
USES= python:3.7+
USE_PYTHON= autoplist concurrent distutils
-CONFLICTS_INSTALL= py*-alembic14
+CONFLICTS_INSTALL= py*-alembic* # lib/python3.8/site-packages/alembic/__init__.py'
NO_ARCH= yes
diff --git a/databases/py-alembic14/Makefile b/databases/py-alembic14/Makefile
index 49bf2be4bdda..31f4596e5fea 100644
--- a/databases/py-alembic14/Makefile
+++ b/databases/py-alembic14/Makefile
@@ -22,7 +22,7 @@ TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \
USES= python
USE_PYTHON= autoplist concurrent distutils
-CONFLICTS_INSTALL= py*-alembic
+CONFLICTS_INSTALL= py*-alembic* # lib/python3.8/site-packages/alembic/__init__.py'
NO_ARCH= yes
PORTSCOUT= limit:^1\.4\.
diff --git a/databases/py-alembic16/Makefile b/databases/py-alembic16/Makefile
index 0d22b4aa966d..a6c0ed9efd74 100644
--- a/databases/py-alembic16/Makefile
+++ b/databases/py-alembic16/Makefile
@@ -23,7 +23,7 @@ TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \
USES= python:3.6+
USE_PYTHON= autoplist concurrent distutils
-CONFLICTS_INSTALL= py*-alembic14
+CONFLICTS_INSTALL= py*-alembic* # lib/python3.8/site-packages/alembic/__init__.py'
NO_ARCH= yes
diff --git a/databases/py-pg8000-112/Makefile b/databases/py-pg8000-112/Makefile
index 825fc4e02efc..fec0962f7bcf 100644
--- a/databases/py-pg8000-112/Makefile
+++ b/databases/py-pg8000-112/Makefile
@@ -17,6 +17,8 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${PY_FLAVOR}
USES= python:3.6+
USE_PYTHON= autoplist distutils
+CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}pg8000 # lib/python3.8/site-packages/pg8000/__init__.py
+
NO_ARCH= yes
.include <bsd.port.mk>
diff --git a/databases/py-pg8000/Makefile b/databases/py-pg8000/Makefile
index a70d87d8253b..e9edaf99849f 100644
--- a/databases/py-pg8000/Makefile
+++ b/databases/py-pg8000/Makefile
@@ -17,6 +17,8 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}passlib>=0:security/py-passlib@${PY_FLAVOR}
USES= python:3.7+
USE_PYTHON= autoplist distutils
+CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}pg8000-112 # lib/python3.8/site-packages/pg8000/__init__.py
+
NO_ARCH= yes
.include <bsd.port.mk>
diff --git a/databases/py-sqlalchemy10/Makefile b/databases/py-sqlalchemy10/Makefile
index 9f27a35a29ec..1fcf0a95ec12 100644
--- a/databases/py-sqlalchemy10/Makefile
+++ b/databases/py-sqlalchemy10/Makefile
@@ -23,7 +23,7 @@ PY2TO3_CMD= ${LOCALBASE}/bin/2to3-${PYTHON_VER}
PY2TO3_ARGS= --no-diffs --nobackups --verbose --write
TEST_TARGET= do-test
-CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}sqlalchemy0[6789]* ${PYTHON_PKGNAMEPREFIX}sqlalchemy1[12]
+CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}sqlalchemy[0-9][0-9] # lib/python3.8/site-packages/sqlalchemy/__init__.py
OPTIONS_DEFINE= DOCS EXAMPLES
OPTIONS_MULTI= BACKEND
diff --git a/databases/py-sqlalchemy11/Makefile b/databases/py-sqlalchemy11/Makefile
index 17aa4e92d9c4..33fc7a30db77 100644
--- a/databases/py-sqlalchemy11/Makefile
+++ b/databases/py-sqlalchemy11/Makefile
@@ -19,7 +19,7 @@ TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock@${PY_FLAVOR} \
USES= cpe python:3.6+
USE_PYTHON= autoplist concurrent distutils
-CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}sqlalchemy1[0234]
+CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}sqlalchemy[0-9][0-9] # lib/python3.8/site-packages/sqlalchemy/__init__.py
OPTIONS_DEFINE= DOCS EXAMPLES
OPTIONS_MULTI= BACKEND
diff --git a/databases/py-sqlalchemy12/Makefile b/databases/py-sqlalchemy12/Makefile
index ff9946da9cda..94367793cb88 100644
--- a/databases/py-sqlalchemy12/Makefile
+++ b/databases/py-sqlalchemy12/Makefile
@@ -19,7 +19,7 @@ TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock@${PY_FLAVOR} \
USES= cpe python:3.6+
USE_PYTHON= autoplist concurrent distutils
-CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}sqlalchemy1[0134]
+CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}sqlalchemy[0-9][0-9] # lib/python3.8/site-packages/sqlalchemy/__init__.py
OPTIONS_DEFINE= DOCS EXAMPLES
OPTIONS_MULTI= BACKEND
diff --git a/databases/py-sqlalchemy13/Makefile b/databases/py-sqlalchemy13/Makefile
index d32c8293a1c3..8135b8c99b63 100644
--- a/databases/py-sqlalchemy13/Makefile
+++ b/databases/py-sqlalchemy13/Makefile
@@ -19,7 +19,7 @@ TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock@${PY_FLAVOR} \
USES= cpe python:3.6+
USE_PYTHON= autoplist concurrent distutils
-CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}sqlalchemy1[0124]
+CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}sqlalchemy[0-9][0-9] # lib/python3.8/site-packages/sqlalchemy/__init__.py
OPTIONS_DEFINE= DOCS EXAMPLES
OPTIONS_MULTI= BACKEND
diff --git a/databases/py-sqlalchemy14/Makefile b/databases/py-sqlalchemy14/Makefile
index 1760b65f69fd..409affae17c9 100644
--- a/databases/py-sqlalchemy14/Makefile
+++ b/databases/py-sqlalchemy14/Makefile
@@ -20,7 +20,7 @@ TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock@${PY_FLAVOR} \
USES= cpe python:3.6+
USE_PYTHON= autoplist concurrent distutils
-CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}sqlalchemy1[0123]
+CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}sqlalchemy[0-9][0-9] # lib/python3.8/site-packages/sqlalchemy/__init__.py
OPTIONS_DEFINE= DOCS EXAMPLES
OPTIONS_MULTI= BACKEND
diff --git a/databases/redis-devel/Makefile b/databases/redis-devel/Makefile
index a5bdc20b59b8..ddfebe9b6d80 100644
--- a/databases/redis-devel/Makefile
+++ b/databases/redis-devel/Makefile
@@ -19,6 +19,8 @@ GH_TUPLE= redis:redis:42fbf06
MAKE_ENV= OPTIMIZATION= \
V=yo
+CONFLICTS_INSTALL= redis redis6 # etc/rc.d/redis
+
OPTIONS_DEFINE= JEMALLOC TESTS TLS TRIB
OPTIONS_DEFAULT= TLS
OPTIONS_RADIO= EXTLUA
diff --git a/databases/redis/Makefile b/databases/redis/Makefile
index bf760f82430b..e930313b227b 100644
--- a/databases/redis/Makefile
+++ b/databases/redis/Makefile
@@ -16,6 +16,7 @@ CPE_VENDOR= redislabs
MAKE_ENV= OPTIMIZATION= \
V=yo
+CONFLICTS_INSTALL= redis-devel redis6 # etc/rc.d/redis
OPTIONS_DEFINE= JEMALLOC TESTS TLS TRIB
OPTIONS_RADIO= EXTLUA
diff --git a/databases/redis6/Makefile b/databases/redis6/Makefile
index f0287638f492..fd66b7e824b9 100644
--- a/databases/redis6/Makefile
+++ b/databases/redis6/Makefile
@@ -30,6 +30,8 @@ TRIB_DESC= Install redis-trib.rb (lang/ruby req.)
MAKE_ENV= V=yo OPTIMIZATION=
+CONFLICTS_INSTALL= redis redis-devel # etc/rc.d/redis
+
JEMALLOC_MAKE_ENV= USE_JEMALLOC=yes
LUA_USES= lua:51
diff --git a/databases/rrdtool12/Makefile b/databases/rrdtool12/Makefile
index 67684910dace..11594f815ce7 100644
--- a/databases/rrdtool12/Makefile
+++ b/databases/rrdtool12/Makefile
@@ -14,7 +14,7 @@ LIB_DEPENDS= libfreetype.so:print/freetype2 \
libart_lgpl_2.so:graphics/libart_lgpl \
libpng.so:graphics/png
-CONFLICTS= rrdtool-1.*
+CONFLICTS_INSTALL= rrdtool # include/rrd.h
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
diff --git a/databases/sqlite3/Makefile b/databases/sqlite3/Makefile
index c1ad67b737ea..25e3cf073334 100644
--- a/databases/sqlite3/Makefile
+++ b/databases/sqlite3/Makefile
@@ -28,9 +28,7 @@ LICENSE= PD
FLAVORS= default icu tcl
FLAVOR?= ${FLAVORS:[1]}
icu_PKGNAMESUFFIX= -${FLAVOR} # databases/p5-DBD-SQLite with ICU support
-icu_CONFLICTS_INSTALL= ${PORTNAME} ${PORTNAME}-tcl
tcl_PKGNAMESUFFIX= -${FLAVOR} # lang/tcl* support
-tcl_CONFLICTS_INSTALL= ${PORTNAME} ${PORTNAME}-icu
.endif
USES= libtool pathfix zip
@@ -45,6 +43,8 @@ INSTALL_TARGET= tcl_install
.endif
TEST_TARGET= test
+CONFLICTS_INSTALL= sqlite3 sqlite3-icu sqlite3-tcl tcl-sqlite3 # include/sqlite3.h share/examples/sqlite3/example.tcl
+
# The default numeric file permissions for newly created database files under unix.
# If not specified, the default is 0644 which means that the files is globally
# readable but only writable by the creator.
diff --git a/databases/tarantool-c/Makefile b/databases/tarantool-c/Makefile
index f017404088e5..f88409a457c7 100644
--- a/databases/tarantool-c/Makefile
+++ b/databases/tarantool-c/Makefile
@@ -19,4 +19,6 @@ USE_GITHUB= yes
GH_ACCOUNT= tarantool
GH_TAGNAME= 2aa7937
+CONFLICTS_INSTALL= nosqlbench # include/tarantool/tarantool.h
+
.include <bsd.port.mk>
diff --git a/databases/tinycdb/Makefile b/databases/tinycdb/Makefile
index b0e5b6a4ce0b..1d085929e78b 100644
--- a/databases/tinycdb/Makefile
+++ b/databases/tinycdb/Makefile
@@ -18,6 +18,8 @@ INSTALL_TARGET= install install-sharedlib
MAKE_ARGS= CC="${CC}" CFLAGS="${CFLAGS}" prefix="${PREFIX}"
USE_LDCONFIG= yes
+CONFLICTS_INSTALL= libcdb # lib/libcdb.a
+
post-install:
${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/cdb ${STAGEDIR}${PREFIX}/lib/libcdb.so
diff --git a/databases/xapian-core/Makefile b/databases/xapian-core/Makefile
index f67c106a4c6c..ddcedccf2a6b 100644
--- a/databases/xapian-core/Makefile
+++ b/databases/xapian-core/Makefile
@@ -21,7 +21,7 @@ INSTALL_TARGET= install-strip
USE_CXXSTD= c++11
USE_LDCONFIG= yes
-CONFLICTS_INSTALL= xapian-core10 xapian-core12
+CONFLICTS_INSTALL= xapian-core12 # include/xapian.h
PORTSCOUT= limitw:1,even
diff --git a/databases/xapian-core12/Makefile b/databases/xapian-core12/Makefile
index 25078db93c17..daf0f53b2b3d 100644
--- a/databases/xapian-core12/Makefile
+++ b/databases/xapian-core12/Makefile
@@ -22,7 +22,7 @@ USE_LDCONFIG= yes
PORTDOCS= *
-CONFLICTS_INSTALL= xapian-core xapian-core10
+CONFLICTS_INSTALL= xapian-core # include/xapian.h
PORTSCOUT= limitw:1,even