diff options
| author | Stefan Eßer <se@FreeBSD.org> | 2022-01-10 15:20:12 +0100 |
|---|---|---|
| committer | Stefan Eßer <se@FreeBSD.org> | 2022-01-10 16:15:39 +0100 |
| commit | bcaf25a8c8046b094f6b5ab5bc258333bc326ee1 (patch) | |
| tree | 3930596b8cbea97540270b3d78ffb64373c89593 /databases | |
| parent | databases/sqlite3: Update to 3.37.2 (diff) | |
Fix CONFLICTS entries of multiple ports
There have been lots of missing CONFLICTS_INSTALL entries, either
because conflicting ports were added without updating existing ports,
due to name changes of generated packages, due to mis-understanding
the format and semantics of the conflicts entries, or just due to
typoes in package names.
This patch is the result of a comparison of all files contained in
the official packages with each other. This comparison was based on
packages built with default options and may therefore have missed
further conflicts with optionally installed files.
Where possible, version numbers in conflicts entries have been
generalized, some times taking advantage of the fact that a port
cannot conflict with itself (due to logic in bsd.port.mk that
supresses the pattern match result in that case).
A few ports that set the conflicts variables depending on complex
conditions (e.g. port options), have been left unmodified, despite
probably containing outdated package names.
These changes should only affect the installation of locally built
ports, not the package building with poudriere. They should give an
early indication of the install conflict in cases where currently
the pkg command aborts an installation when it detects that an
existing file would be overwritten,
Approved by: portmgr (implicit)
Diffstat (limited to 'databases')
25 files changed, 50 insertions, 24 deletions
diff --git a/databases/dbf/Makefile b/databases/dbf/Makefile index 90d9171f415a..f20e06c0eb78 100644 --- a/databases/dbf/Makefile +++ b/databases/dbf/Makefile @@ -22,6 +22,8 @@ GNU_CONFIGURE= yes CONFIGURE_ENV= ac_cv_prog_DOC_TO_MAN="" USE_LDCONFIG= yes +CONFLICTS_INSTALL= rubygem-dbf + .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MNLS} diff --git a/databases/emacsql/Makefile b/databases/emacsql/Makefile index 53399e81cb54..719dff984279 100644 --- a/databases/emacsql/Makefile +++ b/databases/emacsql/Makefile @@ -20,6 +20,9 @@ USE_GITHUB= yes GH_ACCOUNT= skeeto MAKE_ENV+= LOAD_PATH="-L ${PREFIX}/${EMACS_SITE_LISPDIR} -L ${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}" + +CONFLICTS_INSTALL= emacsql emacsql-emacs_* + ALL_TARGET= binary compile TEST_TARGET= check diff --git a/databases/foundationdb-devel/Makefile b/databases/foundationdb-devel/Makefile index 62b1898a1ae4..dbc3d4697f33 100644 --- a/databases/foundationdb-devel/Makefile +++ b/databases/foundationdb-devel/Makefile @@ -29,6 +29,8 @@ GH_PROJECT= foundationdb USE_LDCONFIG= yes USE_RC_SUBR= foundationdb +CONFLICTS_INSTALL= foundationdb + SHEBANG_FILES= bindings/c/generate_asm.py CMAKE_ARGS= -DOPENSSL_ROOT_DIR=${OPENSSLLIB} diff --git a/databases/foundationdb/Makefile b/databases/foundationdb/Makefile index efefec0100b9..fa05400cc7d0 100644 --- a/databases/foundationdb/Makefile +++ b/databases/foundationdb/Makefile @@ -27,6 +27,8 @@ GH_PROJECT= foundationdb USE_LDCONFIG= yes USE_RC_SUBR= foundationdb +CONFLICTS_INSTALL= foundationdb-devel + SHEBANG_FILES= bindings/c/generate_asm.py CMAKE_ARGS= -DOPENSSL_ROOT_DIR=${OPENSSLLIB} diff --git a/databases/freetds-devel/Makefile b/databases/freetds-devel/Makefile index aa5c127917cd..a6ce0bda1563 100644 --- a/databases/freetds-devel/Makefile +++ b/databases/freetds-devel/Makefile @@ -49,7 +49,7 @@ UNIXODBC_LIB_DEPENDS= libodbc.so:databases/unixODBC PORTDOCS= * -CONFLICTS= freetds-1.* +INSTALL= freetds PORTSCOUT= limit:^\d+\.\d+\.\d{3}$ diff --git a/databases/freetds/Makefile b/databases/freetds/Makefile index 0f78c4bf78dc..4113f575baf5 100644 --- a/databases/freetds/Makefile +++ b/databases/freetds/Makefile @@ -27,6 +27,8 @@ CONFIGURE_ARGS= --with-tdsver=${TDS_VER} --sysconfdir=${ETCDIR} \ USE_LDCONFIG= yes INSTALL_TARGET= install-strip +CONFLICTS= freetds-devel + PORTDOCS= * OPTIONS_DEFINE= DOCS MARS diff --git a/databases/galera/Makefile b/databases/galera/Makefile index 7b7892c24806..5dd55d7e942c 100644 --- a/databases/galera/Makefile +++ b/databases/galera/Makefile @@ -42,6 +42,8 @@ GH_TUPLE?= codership:galera:${DISTVERSIONPREFIX}${PORTVERSION}${DISTVERSIONSUFFI CMAKE_ARGS+= -DGALERA_REVISION=${GH_TAGNAME} +CONFLICTS_INSTALL= galera26 + USE_RC_SUBR= garb.sh PLIST_FILES= bin/garbd \ diff --git a/databases/galera26/Makefile b/databases/galera26/Makefile index 38454313c17c..81acb5587e14 100644 --- a/databases/galera26/Makefile +++ b/databases/galera26/Makefile @@ -39,6 +39,8 @@ CMAKE_ARGS+= -DGALERA_REVISION=${GH_TAGNAME} USE_LDCONFIG= yes USE_RC_SUBR= garb.sh +CONFLICTS_INSTALL= galera + PLIST_FILES= bin/garbd \ lib/libgalera.so \ lib/libgalera_smm.so diff --git a/databases/libcouchbase/Makefile b/databases/libcouchbase/Makefile index 04a4773b638d..8f14988f8392 100644 --- a/databases/libcouchbase/Makefile +++ b/databases/libcouchbase/Makefile @@ -20,6 +20,8 @@ USE_PERL5= build run CMAKE_ARGS= -DLCB_NO_TESTS=1 +CONFLICTS_INSTALL= coin-or-cbc + .include <bsd.port.pre.mk> .if ${ARCH} == aarch64 || ${ARCH:Marmv*} || ${ARCH} == riscv64 diff --git a/databases/mariadb104-server/Makefile b/databases/mariadb104-server/Makefile index eb7cfef65782..004d0f72f5bd 100644 --- a/databases/mariadb104-server/Makefile +++ b/databases/mariadb104-server/Makefile @@ -105,7 +105,7 @@ 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]*-//} \ +CONFLICTS_INSTALL= mariadb10[0-35-9]-${PKGNAMESUFFIX:C/^[0-9]*-//} \ mysql[0-9]*-${PKGNAMESUFFIX:C/^[0-9]*-//} \ mysqlwsrep*-server \ percona[0-9]*-${PKGNAMESUFFIX:C/^[0-9]*-//} diff --git a/databases/mysql55-server/Makefile b/databases/mysql55-server/Makefile index 516be4ce498a..16a1f6908e1b 100644 --- a/databases/mysql55-server/Makefile +++ b/databases/mysql55-server/Makefile @@ -70,7 +70,7 @@ CMAKE_ARGS+= -DWITH_FAST_MUTEXES=1 .if !defined(CLIENT_ONLY) USES+= mysql:55 -CONFLICTS_INSTALL= mysql5[0-46-9]-server \ +CONFLICTS_INSTALL= mysql*-server \ mysqlwsrep*-server \ mariadb*-server \ percona*-server @@ -96,7 +96,7 @@ post-patch: post-install: # Empty directory, but check-plist complains @${RMDIR} ${STAGEDIR}${PREFIX}/info || ${TRUE} - + .include <bsd.port.pre.mk> .if ${ARCH} == armv6 || ${ARCH} == armv7 diff --git a/databases/mysql56-server/Makefile b/databases/mysql56-server/Makefile index ef91646474b7..6bbd818e189a 100644 --- a/databases/mysql56-server/Makefile +++ b/databases/mysql56-server/Makefile @@ -80,11 +80,10 @@ 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 \ +CONFLICTS_INSTALL= mysql*-server \ mysqlwsrep*-server \ - mariadb[0-9][0-9]-server \ - percona[0-9][0-9]-server + mariadb*-server \ + percona*-server USE_RC_SUBR= mysql-server diff --git a/databases/mysql57-server/Makefile b/databases/mysql57-server/Makefile index 3c1db5d83255..5479342078d0 100644 --- a/databases/mysql57-server/Makefile +++ b/databases/mysql57-server/Makefile @@ -87,11 +87,10 @@ OPTIONS_SUB= YES .if !defined(CLIENT_ONLY) USES+= mysql:57 -CONFLICTS_INSTALL= mysql5[0-68-9]-server \ - mysql[0-46-9][0-9]-server \ +CONFLICTS_INSTALL= mysql*-server \ mysqlwsrep*-server \ - mariadb[0-9][0-9]-server \ - percona[0-9][0-9]-server + mariadb*-server \ + percona*-server USE_RC_SUBR= mysql-server diff --git a/databases/mysql80-server/Makefile b/databases/mysql80-server/Makefile index 6ef5c4eb467b..13db1af59e53 100644 --- a/databases/mysql80-server/Makefile +++ b/databases/mysql80-server/Makefile @@ -115,11 +115,10 @@ 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 \ +CONFLICTS_INSTALL= mysql*-server \ mysqlwsrep*-server \ - mariadb[0-9][0-9]-server \ - percona[0-9][0-9]-server + mariadb*-server \ + percona*-server USE_RC_SUBR= mysql-server diff --git a/databases/mysqlwsrep56-server/Makefile b/databases/mysqlwsrep56-server/Makefile index fd3b494023f8..0daeffb8db36 100644 --- a/databases/mysqlwsrep56-server/Makefile +++ b/databases/mysqlwsrep56-server/Makefile @@ -93,9 +93,8 @@ PLIST_SUB= MY_DBDIR=${MY_DBDIR} \ MY_TMPDIR=${MY_TMPDIR} CONFLICTS_INSTALL= mariadb*-server \ - mysql[0-9]*-server \ - mysqlwsrep57*-server \ - mysqlwsrep[1-489]*-server \ + mysql*-server \ + mysqlwsrep*-server \ percona*-server USE_RC_SUBR= mysql-server diff --git a/databases/mysqlwsrep57-server/Makefile b/databases/mysqlwsrep57-server/Makefile index 62c0b59cd7ec..27efceab34a4 100644 --- a/databases/mysqlwsrep57-server/Makefile +++ b/databases/mysqlwsrep57-server/Makefile @@ -85,9 +85,8 @@ PLIST_SUB= MY_DBDIR=${MY_DBDIR} \ MY_TMPDIR=${MY_TMPDIR} CONFLICTS_INSTALL= mariadb*-server \ - mysql[0-9]*-server \ - mysqlwsrep56*-server \ - mysqlwsrep[1-489]*-server \ + mysql*-server \ + mysqlwsrep*-server \ percona*-server USE_RC_SUBR= mysql-server diff --git a/databases/p5-DBD-XBase/Makefile b/databases/p5-DBD-XBase/Makefile index 32e184e78fe3..0cb912eebb09 100644 --- a/databases/p5-DBD-XBase/Makefile +++ b/databases/p5-DBD-XBase/Makefile @@ -15,6 +15,8 @@ RUN_DEPENDS= p5-DBI>=0:databases/p5-DBI USES= perl5 USE_PERL5= configure +CONFLICTS_INSTALL= shapelib + NO_ARCH= yes .include <bsd.port.mk> diff --git a/databases/pear-DB_DataObject/Makefile b/databases/pear-DB_DataObject/Makefile index c3e3ecb0bb34..79cd34585054 100644 --- a/databases/pear-DB_DataObject/Makefile +++ b/databases/pear-DB_DataObject/Makefile @@ -15,6 +15,8 @@ RUN_DEPENDS= ${PEAR_PKGNAMEPREFIX}Date>=1.4.3:devel/pear-Date@${PHP_FLAVOR} USES= pear +CONFLICTS_INSTALL= php*-pear-DB_DataObject + NO_ARCH= yes OPTIONS_DEFINE= DB MDB2 VALIDATE diff --git a/databases/pear-DoctrineDBAL/Makefile b/databases/pear-DoctrineDBAL/Makefile index 6eed2b6c6592..f112d0e14fa4 100644 --- a/databases/pear-DoctrineDBAL/Makefile +++ b/databases/pear-DoctrineDBAL/Makefile @@ -14,6 +14,8 @@ LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= ${PEARDIR}/Doctrine/Common/Version.php:databases/pear-DoctrineCommon@${PHP_FLAVOR} \ ${PEARDIR}/Symfony/Component/Console/Application.php:devel/pear-Symfony_Component_Console@${PHP_FLAVOR} +CONFLICTS_INSTALL= php*-pear-doctrine-DoctrineDBAL + OPTIONS_DEFINE= DBLIB MYSQL ODBC PGSQL SQLITE OPTIONS_DEFAULT=MYSQL diff --git a/databases/pear-Horde_Db/Makefile b/databases/pear-Horde_Db/Makefile index 570e9341ffec..54da12811f3e 100644 --- a/databases/pear-Horde_Db/Makefile +++ b/databases/pear-Horde_Db/Makefile @@ -20,4 +20,6 @@ MYSQLI_USE= PHP=mysqli PDO_USES= php PDO_USE= PHP=pdo +CONFLICTS_INSTALL= php*-pear-horde-Horde_Db + .include <bsd.port.mk> diff --git a/databases/percona56-server/Makefile b/databases/percona56-server/Makefile index 4d938cbc1bc9..c72e826ad9ab 100644 --- a/databases/percona56-server/Makefile +++ b/databases/percona56-server/Makefile @@ -74,7 +74,7 @@ USES+=mysql:56p CONFLICTS_INSTALL= mysql*-server \ mysqlwsrep*-server \ mariadb*-server \ - percona5[0-57-9]-server + percona*-server USE_RC_SUBR= mysql-server diff --git a/databases/percona57-server/Makefile b/databases/percona57-server/Makefile index f3b05c1ce540..03953f4ce4a6 100644 --- a/databases/percona57-server/Makefile +++ b/databases/percona57-server/Makefile @@ -109,7 +109,7 @@ USES+=mysql:57p CONFLICTS_INSTALL= mysql*-server \ mysqlwsrep*-server \ mariadb*-server \ - percona5[0-68-9]-server + percona*-server USE_RC_SUBR= mysql-server diff --git a/databases/py-alembic/Makefile b/databases/py-alembic/Makefile index 343e0bde4d5a..2633767c8eef 100644 --- a/databases/py-alembic/Makefile +++ b/databases/py-alembic/Makefile @@ -22,6 +22,8 @@ TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \ USES= python:3.6+ USE_PYTHON= autoplist concurrent distutils +CONFLICTS_INSTALL= py*-alembic14 + NO_ARCH= yes do-test: diff --git a/databases/py-alembic14/Makefile b/databases/py-alembic14/Makefile index 71958b89c1a8..49bf2be4bdda 100644 --- a/databases/py-alembic14/Makefile +++ b/databases/py-alembic14/Makefile @@ -22,6 +22,8 @@ TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \ USES= python USE_PYTHON= autoplist concurrent distutils +CONFLICTS_INSTALL= py*-alembic + NO_ARCH= yes PORTSCOUT= limit:^1\.4\. diff --git a/databases/rubygem-dbf/Makefile b/databases/rubygem-dbf/Makefile index c375acad7e98..c22f2b09aa4c 100644 --- a/databases/rubygem-dbf/Makefile +++ b/databases/rubygem-dbf/Makefile @@ -14,6 +14,8 @@ LICENSE_FILE= ${WRKSRC}/LICENSE USES= gem USE_RUBY= yes +CONFLICTS_INSTALL= dbf + NO_ARCH= yes PLIST_FILES= bin/dbf |