databases/mariadb104-server: Add MariaDB 10.4 port

5 files changed, 295 insertions, 0 deletions

diff --git a/databases/mariadb104-client/Makefile b/databases/mariadb104-client/Makefile
new file mode 100644
index 000000000000..e0020ebcafe7
--- /dev/null
+++ b/databases/mariadb104-client/Makefile
@@ -0,0 +1,17 @@
+# Created by: Bernard Spil <brnrd@FreeBSD.org>
+# $FreeBSD$
+
+PORTNAME=	mariadb
+PKGNAMESUFFIX=	104-client
+
+COMMENT=	Multithreaded SQL database (client)
+
+MASTERDIR=	${.CURDIR}/../${PORTNAME}${PKGNAMESUFFIX:C/-client/-server/}
+
+FILESDIR=	${.CURDIR}/files
+PATCHDIR=	${.CURDIR}/files
+PLIST=		${.CURDIR}/pkg-plist
+
+CONFLICTS_INSTALL=	databases/mytop
+
+.include "${MASTERDIR}/Makefile"
diff --git a/databases/mariadb104-client/files/patch-MDEV-11790 b/databases/mariadb104-client/files/patch-MDEV-11790
new file mode 100644
index 000000000000..1794bcf44da7
--- /dev/null
+++ b/databases/mariadb104-client/files/patch-MDEV-11790
@@ -0,0 +1,46 @@
+WITHOUT_SERVER installs server-only files
+
+https://jira.mariadb.org/browse/MDEV-11790
+--- extra/CMakeLists.txt.orig	2018-10-02 09:45:40 UTC
++++ extra/CMakeLists.txt
+@@ -99,7 +99,7 @@ IF(WITH_INNOBASE_STORAGE_ENGINE)
+   ADD_DEPENDENCIES(innochecksum GenError)
+ ENDIF()
+ 
+-MYSQL_ADD_EXECUTABLE(replace replace.c COMPONENT Server)
++MYSQL_ADD_EXECUTABLE(replace replace.c COMPONENT Client)
+ TARGET_LINK_LIBRARIES(replace mysys)
+ 
+ IF(UNIX)
+--- scripts/CMakeLists.txt.orig	2018-10-02 09:45:42 UTC
++++ scripts/CMakeLists.txt
+@@ -241,7 +241,10 @@ ENDIF()
+ SET(mysql_config_COMPONENT COMPONENT Development)
+ SET(msql2mysql_COMPONENT COMPONENT Client)
+ SET(mysqlaccess_COMPONENT COMPONENT Client)
++SET(mysqlhotcopy_COMPONENT COMPONENT Client)
++SET(mysql_convert_table_format_COMPONENT COMPONENT Client)
+ SET(mysql_find_rows_COMPONENT COMPONENT Client)
++SET(mysql_setpermission_COMPONENT COMPONENT Client)
+ SET(mytop_COMPONENT Mytop)
+ 
+ IF(WIN32)
+@@ -298,14 +301,14 @@ ELSE()
+   # On Unix, most of the files end up in the bin directory
+   SET(BIN_SCRIPTS
+     msql2mysql
+-    mysql_config
+-    mysql_setpermission
+-    mysql_secure_installation
+     mysqlaccess
++    mysqlhotcopy
++    mysql_config
+     mysql_convert_table_format
+     mysql_find_rows
++    mysql_secure_installation
++    mysql_setpermission
+     mytop
+-    mysqlhotcopy
+     ${SERVER_SCRIPTS}
+     ${WSREP_SCRIPTS}
+     ${SYSTEMD_SCRIPTS}
diff --git a/databases/mariadb104-client/files/patch-MDEV-15961 b/databases/mariadb104-client/files/patch-MDEV-15961
new file mode 100644
index 000000000000..65fb24a2f46d
--- /dev/null
+++ b/databases/mariadb104-client/files/patch-MDEV-15961
@@ -0,0 +1,50 @@
+MDEV-15961: Fix stacktraces under FreeBSD
+
+https://jira.mariadb.org/browse/MDEV-15961
+--- mysys/stacktrace.c.orig	2018-07-02 07:34:11 UTC
++++ mysys/stacktrace.c
+@@ -34,19 +34,19 @@
+ #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 */
+ 
+ void my_init_stacktrace()
+ {
+-#if(defined HAVE_BSS_START) && !(defined __linux__)
++#ifdef __linux__
+   heap_start = (char*) &__bss_start;
+-#endif
++#endif /* __linux__ */
+ }
+ 
+ #ifdef __linux__
+@@ -149,15 +149,16 @@ static int safe_print_str(const char *ad
+ 
+ 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/mariadb104-client/files/pkg-message.in b/databases/mariadb104-client/files/pkg-message.in
new file mode 100644
index 000000000000..8bea32f83491
--- /dev/null
+++ b/databases/mariadb104-client/files/pkg-message.in
@@ -0,0 +1,7 @@
+************************************************************************
+
+MariaDB respects hier(7) and doesn't check /etc and /etc/mysql for
+my.cnf. Please move existing my.cnf files from those paths to
+%%PREFIX%%/etc and %%PREFIX%%/etc/mysql.
+
+************************************************************************
diff --git a/databases/mariadb104-client/pkg-plist b/databases/mariadb104-client/pkg-plist
new file mode 100644
index 000000000000..c6cb2cfe842a
--- /dev/null
+++ b/databases/mariadb104-client/pkg-plist
@@ -0,0 +1,175 @@
+bin/mariadb
+bin/mariadb-access
+bin/mariadb-admin
+bin/mariadb-binlog
+bin/mariadb-check
+bin/mariadb-convert-table-format
+bin/mariadb-dump
+bin/mariadb-find-rows
+bin/mariadb-hotcopy
+bin/mariadb-import
+bin/mariadb-plugin
+bin/mariadb-setpermission
+bin/mariadb-show
+bin/mariadb-slap
+@comment bin/mariadb-test
+@comment bin/mariadb-waitpid
+bin/mariadb_config
+bin/msql2mysql
+bin/mysql
+bin/mysql_config
+bin/mysql_convert_table_format
+bin/mysql_find_rows
+bin/mysql_setpermission
+@comment bin/mysql_plugin
+@comment bin/mysql_waitpid
+bin/mysqlaccess
+bin/mysqladmin
+bin/mysqlbinlog
+bin/mysqlcheck
+bin/mysqldump
+bin/mysqlhotcopy
+bin/mysqlimport
+bin/mysqlshow
+bin/mysqlslap
+@comment bin/mysqltest
+bin/mytop
+bin/replace
+@comment bin/wsrep_sst_rsync_wan
+include/mysql/errmsg.h
+include/mysql/ma_list.h
+include/mysql/ma_pvio.h
+include/mysql/ma_tls.h
+include/mysql/mariadb/ma_io.h
+include/mysql/mariadb_com.h
+include/mysql/mariadb_ctype.h
+include/mysql/mariadb_dyncol.h
+include/mysql/mariadb_rpl.h
+include/mysql/mariadb_stmt.h
+include/mysql/mariadb_version.h
+include/mysql/my_config.h
+include/mysql/my_global.h
+include/mysql/my_sys.h
+include/mysql/mysql.h
+include/mysql/mysql_com.h
+include/mysql/mysql_version.h
+include/mysql/mysql/client_plugin.h
+include/mysql/mysql/plugin_auth.h
+include/mysql/mysql/plugin_auth_common.h
+include/mysql/mysqld_error.h
+%%NO_GSSAPI_NONE%%lib/mysql/plugin/auth_gssapi_client.so
+lib/mysql/libmariadb.so
+lib/mysql/libmariadb.so.3
+lib/mysql/libmariadbclient.a
+lib/mysql/libmysqlclient.a
+lib/mysql/libmysqlclient.so
+lib/mysql/libmysqlclient_r.a
+lib/mysql/libmysqlclient_r.so
+lib/mysql/libmysqlservices.a
+@comment lib/mysql/plugin/caching_sha2_password.so
+lib/mysql/plugin/client_ed25519.so
+lib/mysql/plugin/daemon_example.ini
+lib/mysql/plugin/dialog.so
+lib/mysql/plugin/mysql_clear_password.so
+lib/mysql/plugin/sha256_password.so
+libdata/pkgconfig/libmariadb.pc
+@comment man/man1/aria_chk.1.gz
+@comment man/man1/aria_dump_log.1.gz
+@comment man/man1/aria_ftdump.1.gz
+@comment man/man1/aria_pack.1.gz
+@comment man/man1/aria_read_log.1.gz
+@comment man/man1/galera_new_cluster.1.gz
+@comment man/man1/galera_recovery.1.gz
+@comment man/man1/innochecksum.1.gz
+@comment man/man1/mariabackup.1.gz
+man/man1/mariadb.1.gz
+man/man1/mariadb-access.1.gz
+man/man1/mariadb-admin.1.gz
+@comment man/man1/mariadb-backup.1.gz
+man/man1/mariadb-binlog.1.gz
+man/man1/mariadb-check.1.gz
+@comment man/man1/mariadb-client-test-embedded.1.gz
+@comment man/man1/mariadb-client-test.1.gz
+man/man1/mariadb-convert-table-format.1.gz
+man/man1/mariadb-dump.1.gz
+@comment man/man1/mariadb-dumpslow.1.gz
+@comment man/man1/mariadb-embedded.1.gz
+man/man1/mariadb-find-rows.1.gz
+@comment man/man1/mariadb-fix-extensions.1.gz
+man/man1/mariadb-hotcopy.1.gz
+man/man1/mariadb-import.1.gz
+@comment man/man1/mariadb-install-db.1.gz
+@comment man/man1/mariadb-ldb.1.gz
+man/man1/mariadb-plugin.1.gz
+@comment man/man1/mariadb-secure-installation.1.gz
+@comment man/man1/mariadb-service-convert.1.gz
+man/man1/mariadb-setpermission.1.gz
+man/man1/mariadb-show.1.gz
+man/man1/mariadb-slap.1.gz
+@comment man/man1/mariadb-test-embedded.1.gz
+@comment man/man1/mariadb-test.1.gz
+@comment man/man1/mariadb-tzinfo-to-sql.1.gz
+@comment man/man1/mariadb-upgrade.1.gz
+@comment man/man1/mariadb-waitpid.1.gz
+@comment man/man1/mariadbd-multi.1.gz
+@comment man/man1/mariadbd-safe-helper.1.gz
+@comment man/man1/mariadbd-safe.1.gz
+@comment man/man8/mariadbd.8.gz
+man/man1/msql2mysql.1.gz
+@comment man/man1/mbstream.1.gz
+@comment man/man1/my_print_defaults.1.gz
+man/man1/my_safe_process.1.gz
+@comment man/man1/myisam_ftdump.1.gz
+@comment man/man1/myisamchk.1.gz
+@comment man/man1/myisamlog.1.gz
+@comment man/man1/myisampack.1.gz
+man/man1/mysql-stress-test.pl.1.gz
+man/man1/mysql-test-run.pl.1.gz
+man/man1/mysql.1.gz
+@comment man/man1/mysql.server.1.gz
+@comment man/man1/mysql_client_test.1.gz
+@comment man/man1/mysql_client_test_embedded.1.gz
+man/man1/mysql_config.1.gz
+man/man1/mysql_convert_table_format.1.gz
+@comment man/man1/mysql_embedded.1.gz
+man/man1/mysql_find_rows.1.gz
+@comment man/man1/mysql_fix_extensions.1.gz
+@comment man/man1/mysql_install_db.1.gz
+@comment man/man1/mysql_ldb.1.gz
+man/man1/mysql_plugin.1.gz
+@comment man/man1/mysql_secure_installation.1.gz
+man/man1/mysql_setpermission.1.gz
+@comment man/man1/mysql_tzinfo_to_sql.1.gz
+@comment man/man1/mysql_upgrade.1.gz
+man/man1/mysql_waitpid.1.gz
+man/man1/mysqlaccess.1.gz
+man/man1/mysqladmin.1.gz
+man/man1/mysqlbinlog.1.gz
+man/man1/mysqlcheck.1.gz
+@comment man/man1/mysqld_multi.1.gz
+@comment man/man1/mysqld_safe.1.gz
+@comment man/man1/mysqld_safe_helper.1.gz
+man/man1/mysqldump.1.gz
+@comment man/man1/mysqldumpslow.1.gz
+man/man1/mysqlhotcopy.1.gz
+man/man1/mysqlimport.1.gz
+man/man1/mysqlshow.1.gz
+man/man1/mysqlslap.1.gz
+@comment man/man1/mysqltest.1.gz
+@comment man/man1/mysqltest_embedded.1.gz
+@comment man/man1/perror.1.gz
+man/man1/replace.1.gz
+@comment man/man1/resolve_stack_dump.1.gz
+@comment man/man1/resolveip.1.gz
+@comment man/man1/tokuft_logprint.1.gz
+@comment man/man1/tokuftdump.1.gz
+@comment man/man1/wsrep_sst_common.1.gz
+@comment man/man1/wsrep_sst_mariabackup.1.gz
+@comment man/man1/wsrep_sst_mysqldump.1.gz
+@comment man/man1/wsrep_sst_rsync.1.gz
+@comment man/man1/wsrep_sst_rsync_wan.1.gz
+@comment man/man1/wsrep_sst_xtrabackup-v2.1.gz
+@comment man/man1/wsrep_sst_xtrabackup.1.gz
+@comment man/man8/mysqld.8.gz
+@comment share/aclocal/mysql.m4
+share/pkgconfig/mariadb.pc