4 files changed, 69 insertions, 13 deletions

diff --git a/databases/mariadb105-server/Makefile b/databases/mariadb105-server/Makefile
index b3932ff60c2c..ceebfa204d48 100644
--- a/databases/mariadb105-server/Makefile
+++ b/databases/mariadb105-server/Makefile
@@ -20,16 +20,13 @@ COMMENT?=	Multithreaded SQL database (server)
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
-LICENSE_NAME_PerconaFT=	PerconaFT patents license
-LICENSE_FILE_PerconaFT=	${WRKSRC}/storage/tokudb/PerconaFT/PATENTS
-LICENSE_PERMS_PerconaFT=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-BROKEN_i386=	compile error: undeclared identifier 'my_atomic_add32'
+# BROKEN_i386=	compile error: undeclared identifier 'my_atomic_add32'
 
 LIB_DEPENDS+=	libpcre2-8.so:devel/pcre2
 
 # Ugly workaround for MariaDB/CMake library detection
-CFLAGS+=	-L/usr/local/lib 
+CFLAGS+=	-L${LOCALBASE}/lib
 
 USES=		bison:build cmake:insource compiler:c++11-lib cpe iconv:translit libedit ncurses shebangfix ssl
 
@@ -211,12 +208,16 @@ SUB_LIST+=	LEGACY_LIMITS="" MODERN_LIMITS="@comment "
 GSSAPI_BASE_IGNORE=	GSSAPI_BASE is not compatible with OpenSSL from ports. Use other GSSAPI options or OpenSSL from base system
 .endif
 
-.include <bsd.port.pre.mk>
-
 .if ${ARCH} != amd64
 PLIST_SUB+=	WSREP="@comment "
 .endif
 
+.if ${ARCH} == i386
+USE_GCC=	yes
+CFLAGS+=	-DHAVE_GCC_C11_ATOMICS -latomic -DUSE_NEW_READLINE_INTERFACE
+CXXFLAGS+=	-fpermissive
+.endif
+
 post-patch:
 	${MV} ${WRKSRC}/storage/mroonga/version ${WRKSRC}/storage/mroonga/version_txt
 .if ${OPSYS} == DragonFly
@@ -232,7 +233,7 @@ post-configure:
 		${WRKSRC}/scripts/mysql_config.sh
 
 pre-install:
-	${MKDIR} -p ${STAGEDIR}${ETCDIR}/conf.d
+	${MKDIR} ${STAGEDIR}${ETCDIR}/conf.d
 
 .if ${PKGNAMESUFFIX:M*-client}
 post-install:
@@ -273,7 +274,7 @@ post-install-WSREP-on:
 post-install-SPIDER-on:
 	${MV} ${STAGEDIR}${ETCDIR}/conf.d/spider.cnf \
 		${STAGEDIR}${ETCDIR}/conf.d/spider.cnf.sample
-	
+
 .endif # ${PKGNAMESUFFIX:M*-client}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/databases/mariadb105-server/files/mysql-server.in b/databases/mariadb105-server/files/mysql-server.in
index 4d0cafafa06a..4bcedc9ea862 100644
--- a/databases/mariadb105-server/files/mysql-server.in
+++ b/databases/mariadb105-server/files/mysql-server.in
@@ -97,9 +97,9 @@ else
 fi
 
 pidfile=$mysql_pidfile
-mysql_install_db="%%PREFIX%%/bin/mysql_install_db"
+mysql_install_db="%%PREFIX%%/bin/mariadb-install-db"
 mysql_install_db_args="--basedir=%%PREFIX%% --datadir=${mysql_dbdir} --force"
-command_args="-c -f %%PREFIX%%/bin/mysqld_safe --defaults-extra-file=${mysql_optfile} --user=${mysql_user} --datadir=${mysql_dbdir} --pid-file=${pidfile} ${mysql_args}"
+command_args="-c -f %%PREFIX%%/bin/mariadb-safe --defaults-extra-file=${mysql_optfile} --user=${mysql_user} --datadir=${mysql_dbdir} --pid-file=${pidfile} ${mysql_args}"
 
 mysql_create_auth_tables()
 {
diff --git a/databases/mariadb105-server/files/patch-MDEV-15961 b/databases/mariadb105-server/files/patch-MDEV-15961
new file mode 100644
index 000000000000..9a4c6ee874cc
--- /dev/null
+++ b/databases/mariadb105-server/files/patch-MDEV-15961
@@ -0,0 +1,54 @@
+MDEV-15961: Fix stacktraces under FreeBSD
+
+https://jira.mariadb.org/browse/MDEV-15961
+--- mysys/stacktrace.c.orig	2020-06-23 15:10:17 UTC
++++ mysys/stacktrace.c
+@@ -33,13 +33,13 @@
+ #include <execinfo.h>
+ #endif
+ 
++#ifdef __linux__
+ #define PTR_SANE(p) ((p) && (char*)(p) >= heap_start && (char*)(p) <= heap_end)
+-
+ static char *heap_start;
+-
+-#if(defined HAVE_BSS_START) && !(defined __linux__)
+ extern char *__bss_start;
+-#endif
++#else
++#define PTR_SANE(p) (p)
++#endif /* __linux */
+ 
+ /**
+    Default handler for printing stacktrace
+@@ -67,9 +67,9 @@ static sig_handler default_handle_fatal_signal(int sig
+ 
+ void my_init_stacktrace(int setup_handlers)
+ {
+-#if(defined HAVE_BSS_START) && !(defined __linux__)
++#ifdef __linux__
+   heap_start = (char*) &__bss_start;
+-#endif
++#endif /* __linux__ */
+   if (setup_handlers)
+   {
+     struct sigaction sa;
+@@ -186,15 +186,16 @@ static int safe_print_str(const char *addr, size_t max
+ 
+ int my_safe_print_str(const char* val, size_t max_len)
+ {
++#ifdef __linux__
++/* Only needed by the linux version of PTR_SANE */
+   char *heap_end;
+ 
+-#ifdef __linux__
+   // Try and make use of /proc filesystem to safely print memory contents.
+   if (!safe_print_str(val, max_len))
+     return 0;
+-#endif
+ 
+   heap_end= (char*) sbrk(0);
++#endif
+ 
+   if (!PTR_SANE(val))
+   {
diff --git a/databases/mariadb105-server/pkg-plist b/databases/mariadb105-server/pkg-plist
index 822818e61fc0..29a39e4b9da6 100644
--- a/databases/mariadb105-server/pkg-plist
+++ b/databases/mariadb105-server/pkg-plist
@@ -58,7 +58,8 @@ bin/resolveip
 %%ETCDIR%%/conf.d/enable_encryption.preset
 @comment %%ETCDIR%%/conf.d/mysql-clients.cnf
 @sample %%ETCDIR%%/conf.d/server.cnf.sample
-%%SPIDER%%@sample %%ETCDIR%%/conf.d/spider.cnf.sample 
+%%SPIDER%%@sample %%ETCDIR%%/conf.d/spider.cnf.sample
+@comment %%DATADIR%%/wsrep.cnf
 %%WSREP%%%%ETCDIR%%/conf.d/wsrep.cnf.sample
 @sample %%ETCDIR%%/user_map.conf.sample
 @comment data/test/db.opt