mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-04 01:48:54 +00:00
Code Issues Releases Activity

databases/mariadb106-server: Fix conflicts

Browse Source 
* and LOCALBASE

Reported by:	VVD <vvd unislabs com>
This commit is contained in:
Bernard Spil 2022-03-07 19:13:17 +00:00
parent 3d89f95e2f
commit 823a87f4bb
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
databases/mariadb106-server/Makefile
View File

@ -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]*-//}-*

2
databases/mariadb106-server/files/patch-scripts_mysql__config.sh
View File

@ -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