aboutsummaryrefslogtreecommitdiff
path: root/databases/mariadb106-server
diff options
context:
space:
mode:
authorBernard Spil <brnrd@FreeBSD.org>2023-04-10 11:32:31 +0000
committerBernard Spil <brnrd@FreeBSD.org>2023-04-10 11:40:23 +0000
commitc55765750a896182a2774ced7217145fa746cdba (patch)
treebc12724ed9ee67f991a7c6a00eb5b20fa6699210 /databases/mariadb106-server
parent7885ad4167893e6a7f158f1075b0067514d5ffab (diff)
Diffstat (limited to 'databases/mariadb106-server')
-rw-r--r--databases/mariadb106-server/Makefile1
-rw-r--r--databases/mariadb106-server/files/patch-scripts_mysql__config.sh2
-rw-r--r--databases/mariadb106-server/files/pkg-message.in4
-rw-r--r--databases/mariadb106-server/pkg-plist2
4 files changed, 7 insertions, 2 deletions
diff --git a/databases/mariadb106-server/Makefile b/databases/mariadb106-server/Makefile
index 26def325d2f8..83fffd842974 100644
--- a/databases/mariadb106-server/Makefile
+++ b/databases/mariadb106-server/Makefile
@@ -120,6 +120,7 @@ DATADIR= ${PREFIX}/share/mysql
ETCDIR= ${PREFIX}/etc/mysql
CONFLICTS_INSTALL= mariadb10[0-57-9]-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \
+ mariadb1011-${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 31b54bf148c5..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="-L$embedded_libs -%%LOCALBASE%%/lib "
++embedded_libs="$embedded_libs -%%LOCALBASE%%/lib "
include="-I$pkgincludedir"
if [ "$basedir" != "/usr" ]; then
diff --git a/databases/mariadb106-server/files/pkg-message.in b/databases/mariadb106-server/files/pkg-message.in
index 189a27624f5d..19d0db2a69df 100644
--- a/databases/mariadb106-server/files/pkg-message.in
+++ b/databases/mariadb106-server/files/pkg-message.in
@@ -12,6 +12,10 @@ nor /var/db/mysql for logs and PID-file.
This port does NOT include the mytop perl script, this is included in
the MariaDB tarball but the most recent version can be found in the
databases/mytop port
+
+%%WSREP%%Using wsrep clustering requires adding a configuration file.
+%%WSREP%%Copy %%PREFIX%%/etc/mysql/conf.d/wsrep.conf.sample to
+%%WSREP%%%%PREFIX%%/etc/mysql/conf.d/wsrep.conf and change what you need there.
EOM
}
{ type: upgrade
diff --git a/databases/mariadb106-server/pkg-plist b/databases/mariadb106-server/pkg-plist
index 96f3a8a38b83..9867f566ebf2 100644
--- a/databases/mariadb106-server/pkg-plist
+++ b/databases/mariadb106-server/pkg-plist
@@ -62,7 +62,7 @@ bin/test-connect-t
@comment %%ETCDIR%%/server.cnf
@sample %%ETCDIR%%/conf.d/server.cnf.sample
%%SPIDER%%@sample %%ETCDIR%%/conf.d/spider.cnf.sample
-%%WSREP%%@sample %%ETCDIR%%/conf.d/wsrep.cnf.sample
+%%WSREP%%%%ETCDIR%%/conf.d/wsrep.cnf.sample
@comment %%ETCDIR%%/my.cnf
@sample %%ETCDIR%%/user_map.conf.sample
include/mysql/server/big_endian.h