Date: Mon, 7 Mar 2022 19:14:26 GMT From: Bernard Spil <brnrd@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 823a87f4bb14 - main - databases/mariadb106-server: Fix conflicts Message-ID: <202203071914.227JEQpO057417@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by brnrd: URL: https://cgit.FreeBSD.org/ports/commit/?id=823a87f4bb14b5bb454e175e250414742988378f commit 823a87f4bb14b5bb454e175e250414742988378f Author: Bernard Spil <brnrd@FreeBSD.org> AuthorDate: 2022-03-07 19:13:17 +0000 Commit: Bernard Spil <brnrd@FreeBSD.org> CommitDate: 2022-03-07 19:13:17 +0000 databases/mariadb106-server: Fix conflicts * and LOCALBASE Reported by: VVD <vvd unislabs com> --- databases/mariadb106-server/Makefile | 2 +- databases/mariadb106-server/files/patch-scripts_mysql__config.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/databases/mariadb106-server/Makefile b/databases/mariadb106-server/Makefile index f2b465bcfbfe..5adaf88e4655 100644 --- a/databases/mariadb106-server/Makefile +++ b/databases/mariadb106-server/Makefile @@ -115,7 +115,7 @@ 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]*-//}-* \ +CONFLICTS_INSTALL= mariadb10[0-57-9]-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \ mysql[0-9]*-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \ mysqlwsrep* \ percona[0-9]*-${PKGNAMESUFFIX:C/^[0-9]*-//}-* diff --git a/databases/mariadb106-server/files/patch-scripts_mysql__config.sh b/databases/mariadb106-server/files/patch-scripts_mysql__config.sh index 334353a99b4c..f8321be63ecc 100644 --- a/databases/mariadb106-server/files/patch-scripts_mysql__config.sh +++ b/databases/mariadb106-server/files/patch-scripts_mysql__config.sh @@ -4,7 +4,7 @@ # Create options libs="-L$pkglibdir @RPATH_OPTION@ @LIBS_FOR_CLIENTS@" embedded_libs="-L$pkglibdir @RPATH_OPTION@ @EMB_LIBS_FOR_CLIENTS@" -+embedded_libs="$embedded_libs -L/usr/local/lib " ++embedded_libs="$embedded_libs -%%LOCALBASE%%/lib " include="-I$pkgincludedir" if [ "$basedir" != "/usr" ]; then
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202203071914.227JEQpO057417>