diff options
| author | Bernard Spil <brnrd@FreeBSD.org> | 2022-03-07 19:13:17 +0000 |
|---|---|---|
| committer | Bernard Spil <brnrd@FreeBSD.org> | 2022-03-07 19:13:17 +0000 |
| commit | 823a87f4bb14b5bb454e175e250414742988378f (patch) | |
| tree | e016a298bcb36eb7bd9e6cbf20c57f6cfdbf53bb | |
| parent | 3d89f95e2ff861b1e06ad114422b5d116a856970 (diff) | |
| download | ports-823a87f4bb14b5bb454e175e250414742988378f.tar.gz ports-823a87f4bb14b5bb454e175e250414742988378f.zip | |
databases/mariadb106-server: Fix conflicts
* and LOCALBASE
Reported by: VVD <vvd unislabs com>
| -rw-r--r-- | databases/mariadb106-server/Makefile | 2 | ||||
| -rw-r--r-- | 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 |