Remove expired ports:

2020-07-01 databases/mariadb101-client: Port will be removed when 10.5 is added, please switch to a newer version 2020-07-01 databases/mariadb101-server: Port will be removed when 10.5 is added, please switch to a newer version 2020-07-01 databases/mariadb102-server: Port will be removed when 10.5 is added, please switch to a newer version 2020-07-01 databases/mariadb102-client: Port will be removed when 10.5 is added, please switch to a newer version
svn path=/head/; revision=540951
2020-07-01 11:02:49 +00:00 · 2020-07-01 11:02:49 +00:00 · 9233e8cca5 · 2021-03-31 03:12:20 +00:00
commit 9233e8cca5
parent 9d1fd97a6f
114 changed files with 4 additions and 3977 deletions
--- a/4
+++ b/4
@ -15145,3 +15145,7 @@ www/py-dj22-jsonfield2|www/py-jsonfield2|2020-06-30|Has expired: Obsolete, pleas
 www/py-dj22-swapper|www/py-swapper|2020-06-30|Has expired: Obsolete, please use www/py-swapper instead
 www/rubygem-heroics00|www/rubygem-heroics|2020-06-30|Has expired: Use www/rubygem-heroics instead
 www/typo3-8|www/typo3-9|2020-06-30|Has expired: Upstream support ended in April 2020
+databases/mariadb101-client|databases/mariadb103-client|2020-07-01|Has expired: Port will be removed when 10.5 is added, please switch to a newer version
+databases/mariadb101-server|databases/mariadb103-server|2020-07-01|Has expired: Port will be removed when 10.5 is added, please switch to a newer version
+databases/mariadb102-server|databases/mariadb103-server|2020-07-01|Has expired: Port will be removed when 10.5 is added, please switch to a newer version
+databases/mariadb102-client|databases/mariadb103-client|2020-07-01|Has expired: Port will be removed when 10.5 is added, please switch to a newer version
--- a/databases/Makefile
+++ b/databases/Makefile
@ -174,10 +174,6 @@
    SUBDIR += mantis
    SUBDIR += mariadb-connector-c
    SUBDIR += mariadb-connector-odbc
-    SUBDIR += mariadb101-client
-    SUBDIR += mariadb101-server
-    SUBDIR += mariadb102-client
-    SUBDIR += mariadb102-server
    SUBDIR += mariadb103-client
    SUBDIR += mariadb103-server
    SUBDIR += mariadb104-client
--- a/databases/mariadb101-client/Makefile
+++ b/databases/mariadb101-client/Makefile
@ -1,14 +0,0 @@
-# $FreeBSD$
-
-PORTNAME=	mariadb
-PKGNAMESUFFIX=	101-client
-
-COMMENT=	Multithreaded SQL database (client)
-
-MASTERDIR=	${.CURDIR}/../mariadb101-server
-
-FILESDIR=	${.CURDIR}/files
-PATCHDIR=	${.CURDIR}/files
-PLIST=		${.CURDIR}/pkg-plist
-
-.include "${MASTERDIR}/Makefile"
--- a/databases/mariadb101-client/files/patch-CMakeLists.txt
+++ b/databases/mariadb101-client/files/patch-CMakeLists.txt
@ -1,27 +0,0 @@
--- CMakeLists.txt.orig	2017-05-02 05:13:38 UTC
-+++ CMakeLists.txt
-@@ -385,7 +385,7 @@ ADD_SUBDIRECTORY(libmysql)
- ADD_SUBDIRECTORY(client)
- ADD_SUBDIRECTORY(extra)
- ADD_SUBDIRECTORY(libservices)
-ADD_SUBDIRECTORY(sql/share)
-+#ADD_SUBDIRECTORY(sql/share)
- 
- IF(NOT WITHOUT_SERVER)
-   ADD_SUBDIRECTORY(tests)
-@@ -465,6 +465,7 @@ ADD_CUSTOM_TARGET(INFO_BIN ALL
-   WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
- )
- 
-+IF(FALSE)
- INSTALL_DOCUMENTATION(README CREDITS COPYING COPYING.thirdparty
-                       EXCEPTIONS-CLIENT COMPONENT Readme)
- 
-@@ -476,6 +477,7 @@ IF(UNIX)
-   INSTALL_DOCUMENTATION(Docs/INSTALL-BINARY COMPONENT Readme)
-   INSTALL_DOCUMENTATION(Docs/INSTALL-BINARY Docs/README-wsrep COMPONENT Readme)
- ENDIF()
-+ENDIF()
- 
- INCLUDE(CPack)
- 
--- a/databases/mariadb101-client/files/patch-client_CMakeLists.txt
+++ b/databases/mariadb101-client/files/patch-client_CMakeLists.txt
@ -1,58 +0,0 @@
--- client/CMakeLists.txt.orig	2019-02-04 17:02:08 UTC
-+++ client/CMakeLists.txt
-@@ -39,12 +39,13 @@ IF(UNIX)
-   SET_TARGET_PROPERTIES(mysql PROPERTIES ENABLE_EXPORTS TRUE)
- ENDIF(UNIX)
- 
-+IF(FALSE)
- MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc COMPONENT Test)
- SET_SOURCE_FILES_PROPERTIES(mysqltest.cc PROPERTIES COMPILE_FLAGS "-DTHREADS")
- TARGET_LINK_LIBRARIES(mysqltest mysqlclient pcreposix pcre)
- SET_TARGET_PROPERTIES(mysqltest PROPERTIES ENABLE_EXPORTS TRUE)
-+ENDIF()
- 
-
- MYSQL_ADD_EXECUTABLE(mysqlcheck mysqlcheck.c)
- TARGET_LINK_LIBRARIES(mysqlcheck mysqlclient)
- 
-@@ -55,21 +56,25 @@ MYSQL_ADD_EXECUTABLE(mysqlimport mysqlimport.c)
- SET_SOURCE_FILES_PROPERTIES(mysqlimport.c PROPERTIES COMPILE_FLAGS "-DTHREADS")
- TARGET_LINK_LIBRARIES(mysqlimport mysqlclient)
- 
-+IF(FALSE)
- MYSQL_ADD_EXECUTABLE(mysql_upgrade mysql_upgrade.c COMPONENT Server)
- TARGET_LINK_LIBRARIES(mysql_upgrade mysqlclient)
- ADD_DEPENDENCIES(mysql_upgrade GenFixPrivs)
-+ENDIF()
- 
- MYSQL_ADD_EXECUTABLE(mysqlshow mysqlshow.c)
- TARGET_LINK_LIBRARIES(mysqlshow mysqlclient)
- 
-+IF(FALSE)
- MYSQL_ADD_EXECUTABLE(mysql_plugin mysql_plugin.c)
- TARGET_LINK_LIBRARIES(mysql_plugin mysqlclient)
-+ENDIF()
- 
- MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc)
- TARGET_LINK_LIBRARIES(mysqlbinlog mysqlclient)
- 
- MYSQL_ADD_EXECUTABLE(mysqladmin mysqladmin.cc)
-TARGET_LINK_LIBRARIES(mysqladmin mysqlclient)
-+tARGET_LINK_LIBRARIES(mysqladmin mysqlclient)
- 
- MYSQL_ADD_EXECUTABLE(mysqlslap mysqlslap.c)
- SET_SOURCE_FILES_PROPERTIES(mysqlslap.c PROPERTIES COMPILE_FLAGS "-DTHREADS")
-@@ -81,10 +86,12 @@ IF(WIN32)
- ENDIF(WIN32)
- 
- # async_example is just a code example, do not install it.
-+IF(FALSE)
- ADD_EXECUTABLE(async_example async_example.c)
- TARGET_LINK_LIBRARIES(async_example mysqlclient)
-+ENDIF()
- 
-SET_TARGET_PROPERTIES (mysqlcheck mysqldump mysqlimport mysql_upgrade mysqlshow mysqlslap mysql_plugin async_example
-+SET_TARGET_PROPERTIES (mysqlcheck mysqldump mysqlimport mysqlshow mysqlslap
- PROPERTIES HAS_CXX TRUE)
- 
- ADD_DEFINITIONS(-DHAVE_DLOPEN)
--- a/databases/mariadb101-client/files/patch-cmake_ssl.cmake
+++ b/databases/mariadb101-client/files/patch-cmake_ssl.cmake
@ -1,31 +0,0 @@
-MariaDB prefers static libraries, breaks builds with
-ports' OpenSSL libs
-
--- cmake/ssl.cmake.orig	2016-03-24 09:12:10 UTC
-+++ cmake/ssl.cmake
-@@ -145,9 +145,9 @@ MACRO (MYSQL_CHECK_SSL)
- 
-     # On mac this list is <.dylib;.so;.a>
-     # We prefer static libraries, so we revert it here.
-    IF (WITH_SSL_PATH)
-      LIST(REVERSE CMAKE_FIND_LIBRARY_SUFFIXES)
-    ENDIF()
-+#    IF (WITH_SSL_PATH)
-+#      LIST(REVERSE CMAKE_FIND_LIBRARY_SUFFIXES)
-+#    ENDIF()
-     FIND_LIBRARY(OPENSSL_LIBRARIES
-                  NAMES ssl ssleay32 ssleay32MD
-                  HINTS ${OPENSSL_ROOT_DIR}/lib)
-@@ -156,9 +156,9 @@ MACRO (MYSQL_CHECK_SSL)
-                  HINTS ${OPENSSL_ROOT_DIR}/lib)
-     MARK_AS_ADVANCED(CRYPTO_LIBRARY OPENSSL_LIBRARIES OPENSSL_ROOT_DIR
-       OPENSSL_INCLUDE_DIR)
-    IF (WITH_SSL_PATH)
-      LIST(REVERSE CMAKE_FIND_LIBRARY_SUFFIXES)
-    ENDIF()
-+#    IF (WITH_SSL_PATH)
-+#      LIST(REVERSE CMAKE_FIND_LIBRARY_SUFFIXES)
-+#    ENDIF()
- 
-     INCLUDE(CheckSymbolExists)
-     SET(CMAKE_REQUIRED_INCLUDES ${OPENSSL_INCLUDE_DIR})
--- a/databases/mariadb101-client/files/patch-extra_CMakeLists.txt
+++ b/databases/mariadb101-client/files/patch-extra_CMakeLists.txt
@ -1,34 +0,0 @@
--- extra/CMakeLists.txt.orig	2015-12-23 15:33:29 UTC
-+++ extra/CMakeLists.txt
-@@ -46,6 +46,7 @@ ADD_CUSTOM_TARGET(GenError
-                   DEPENDS 
-                   ${CMAKE_BINARY_DIR}/include/mysqld_error.h.tmp)
- 
-+IF(FALSE)
- MYSQL_ADD_EXECUTABLE(my_print_defaults my_print_defaults.c)
- TARGET_LINK_LIBRARIES(my_print_defaults  mysys)
- 
-@@ -88,18 +89,23 @@ IF(WITH_INNOBASE_STORAGE_ENGINE OR WITH_
-          )
-   ENDIF()
- 
-+IF(FALSE)
-   MYSQL_ADD_EXECUTABLE(innochecksum innochecksum.cc ${INNOBASE_SOURCES})
-   TARGET_LINK_LIBRARIES(innochecksum mysys mysys_ssl)
-   ADD_DEPENDENCIES(innochecksum GenError)
- ENDIF()
-+ENDIF()
- 
- MYSQL_ADD_EXECUTABLE(replace replace.c COMPONENT Server)
- TARGET_LINK_LIBRARIES(replace mysys)
-+ENDIF()
- 
- IF(UNIX)
-+IF(FALSE)
-   MYSQL_ADD_EXECUTABLE(resolve_stack_dump resolve_stack_dump.c)
-   TARGET_LINK_LIBRARIES(resolve_stack_dump mysys)
- 
-   MYSQL_ADD_EXECUTABLE(mysql_waitpid mysql_waitpid.c COMPONENT Client)
-   TARGET_LINK_LIBRARIES(mysql_waitpid mysys)
- ENDIF()
-+ENDIF()
--- a/databases/mariadb101-client/files/patch-include_CMakeLists.txt
+++ b/databases/mariadb101-client/files/patch-include_CMakeLists.txt
@ -1,22 +0,0 @@
--- include/CMakeLists.txt.orig	2015-12-23 15:33:29 UTC
-+++ include/CMakeLists.txt
-@@ -66,13 +66,18 @@ INSTALL(FILES ${HEADERS} DESTINATION ${I
- FOREACH(f ${HEADERS_GEN_CONFIGURE})
-   INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${f} DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development PERMISSIONS OWNER_READ GROUP_READ WORLD_READ)
- ENDFOREACH(f)
-INSTALL(DIRECTORY mysql/ DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development FILES_MATCHING PATTERN "*.h")
-+INSTALL(DIRECTORY mysql/ DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development
-+  FILES_MATCHING PATTERN "*.h"
-+  PATTERN "psi_abi*" EXCLUDE
-+)
- 
- STRING(REPLACE "." "\\." EXCL_RE "${HEADERS};${HEADERS_GEN_CONFIGURE}")
- STRING(REPLACE ";" "|" EXCL_RE "${EXCL_RE}")
- 
-+IF(FALSE)
- INSTALL(DIRECTORY . DESTINATION ${INSTALL_INCLUDEDIR}/private COMPONENT Development
-   FILES_MATCHING PATTERN "*.h"
-   PATTERN CMakeFiles EXCLUDE
-   PATTERN mysql EXCLUDE
-   REGEX "\\./(${EXCL_RE}$)" EXCLUDE)
-+ENDIF()
--- a/databases/mariadb101-client/files/patch-include_my__compare.h
+++ b/databases/mariadb101-client/files/patch-include_my__compare.h
@ -1,11 +0,0 @@
--- include/my_compare.h.orig	2015-12-23 15:33:29 UTC
-+++ include/my_compare.h
-@@ -40,7 +40,7 @@ extern "C" {
-   But beware the dependency of MI_MAX_POSSIBLE_KEY_BUFF and HA_MAX_KEY_LENGTH.
- */
- 
-#define HA_MAX_KEY_LENGTH           1000        /* Max length in bytes */
-+#define HA_MAX_KEY_LENGTH           4000        /* Max length in bytes */
- #define HA_MAX_KEY_SEG              32          /* Max segments for key */
- 
- #define HA_MAX_POSSIBLE_KEY_BUFF    (HA_MAX_KEY_LENGTH + 24+ 6+6)
--- a/databases/mariadb101-client/files/patch-include_mysql_service__encryption.h
+++ b/databases/mariadb101-client/files/patch-include_mysql_service__encryption.h
@ -1,14 +0,0 @@
--- include/mysql/service_encryption.h.orig	2015-12-23 15:33:29 UTC
-+++ include/mysql/service_encryption.h
-@@ -37,9 +37,11 @@ extern "C" {
- #elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
- #include <stdlib.h>
- #else
-+#ifndef __FreeBSD__
- #include <alloca.h>
- #endif
- #endif
-+#endif
- 
- /* returned from encryption_key_get_latest_version() */
- #define ENCRYPTION_KEY_VERSION_INVALID        (~(unsigned int)0)
--- a/databases/mariadb101-client/files/patch-libmysql_CMakeLists.txt
+++ b/databases/mariadb101-client/files/patch-libmysql_CMakeLists.txt
@ -1,11 +0,0 @@
--- libmysql/CMakeLists.txt.orig	2015-12-23 15:33:29 UTC
-+++ libmysql/CMakeLists.txt
-@@ -441,6 +441,8 @@ IF(NOT DISABLE_SHARED)
-     # libtool compatability
-     IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR APPLE)
-       SET(OS_SHARED_LIB_VERSION "${SHARED_LIB_MAJOR_VERSION}")
-+    ELSEIF(CMAKE_SYSTEM_NAME MATCHES "DragonFly")
-+      SET(OS_SHARED_LIB_VERSION "${SHARED_LIB_MAJOR_VERSION}")
-     ELSEIF(CMAKE_SYSTEM_NAME MATCHES "HP-UX")
-       SET(OS_SHARED_LIB_VERSION "${SHARED_LIB_MAJOR_VERSION}.0")
-     ELSE()
--- a/databases/mariadb101-client/files/patch-libservices_CMakeLists.txt
+++ b/databases/mariadb101-client/files/patch-libservices_CMakeLists.txt
@ -1,9 +0,0 @@
--- libservices/CMakeLists.txt.orig	2015-12-23 15:33:29 UTC
-+++ libservices/CMakeLists.txt
-@@ -34,4 +34,6 @@ SET(MYSQLSERVICES_SOURCES
-   logger_service.c)
- 
- ADD_CONVENIENCE_LIBRARY(mysqlservices ${MYSQLSERVICES_SOURCES})
-+IF(FALSE)
- INSTALL(TARGETS mysqlservices DESTINATION ${INSTALL_LIBDIR} COMPONENT Development)
-+ENDIF()
--- a/databases/mariadb101-client/files/patch-man_CMakeLists.txt
+++ b/databases/mariadb101-client/files/patch-man_CMakeLists.txt
@ -1,16 +0,0 @@
--- man/CMakeLists.txt.orig	2015-12-23 15:33:29 UTC
-+++ man/CMakeLists.txt
-@@ -32,9 +32,13 @@ SET(MAN1_DEVEL mysql_config.1)
- SET(MAN1_TEST mysql-stress-test.pl.1 mysql-test-run.pl.1 mysql_client_test.1
-               mysqltest_embedded.1 mysql_client_test_embedded.1)
- 
-+IF(FALSE)
- INSTALL(FILES ${MAN1_SERVER} DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT ManPagesServer)
- INSTALL(FILES ${MAN8_SERVER} DESTINATION ${INSTALL_MANDIR}/man8 COMPONENT ManPagesServer)
-+ENDIF()
- INSTALL(FILES ${MAN1_CLIENT} DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT ManPagesClient)
- INSTALL(FILES ${MAN1_DEVEL} DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT ManPagesDevelopment)
-+IF(FALSE)
- INSTALL(FILES ${MAN1_TEST} DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT ManPagesTest)
-+ENDIF()
- 
--- a/databases/mariadb101-client/files/patch-mysys_my__default.c
+++ b/databases/mariadb101-client/files/patch-mysys_my__default.c
@ -1,60 +0,0 @@
--- mysys/my_default.c.orig	2017-01-17 19:38:25 UTC
-+++ mysys/my_default.c
-@@ -785,7 +785,7 @@ static int search_default_file_with_ext(
-   {
-     MY_STAT stat_info;
-     if (!my_stat(name,&stat_info,MYF(0)))
-      return 1;
-+      return 0;
-     /*
-       Ignore world-writable regular files.
-       This is mainly done to protect us to not read a file created by
-@@ -803,6 +803,22 @@ static int search_default_file_with_ext(
-   if (!(fp= mysql_file_fopen(key_file_cnf, name, O_RDONLY, MYF(0))))
-     return 1;					/* Ignore wrong files */
- 
-+  if (strstr(name, "/etc") == name)
-+  {
-+    fprintf(stderr,
-+             "error: Config file %s in invalid location, please move to or merge with /usr/local%s\n",
-+             name,name);
-+      goto err;
-+  }
-+
-+  if (strstr(name, "/etc") == name)
-+  {
-+    fprintf(stderr,
-+             "error: Config file %s in invalid location, please move to or merge with /usr/local%s\n",
-+             name,name);
-+      goto err;
-+  }
-+
-   while (mysql_file_fgets(buff, sizeof(buff) - 1, fp))
-   {
-     line++;
-@@ -1067,7 +1083,8 @@ void my_print_default_files(const char *
-           if (name[0] == FN_HOMELIB)	/* Add . to filenames in home */
-             *end++= '.';
-           strxmov(end, conf_file, *ext, " ", NullS);
-          fputs(name, stdout);
-+          if (strstr(name, "/etc") != name)
-+              fputs(name, stdout);
-         }
-       }
-     }
-@@ -1228,13 +1245,10 @@ static const char **init_default_directo
- 
- #else
- 
-#if defined(DEFAULT_SYSCONFDIR)
-  if (DEFAULT_SYSCONFDIR[0])
-    errors += add_directory(alloc, DEFAULT_SYSCONFDIR, dirs);
-#else
-   errors += add_directory(alloc, "/etc/", dirs);
-   errors += add_directory(alloc, "/etc/mysql/", dirs);
-#endif /* DEFAULT_SYSCONFDIR */
-+  errors += add_directory(alloc, "/usr/local/etc/", dirs);
-+  errors += add_directory(alloc, "/usr/local/etc/mysql/", dirs);
- 
- #endif
- 
--- a/databases/mariadb101-client/files/patch-pcre_CMakeLists.txt
+++ b/databases/mariadb101-client/files/patch-pcre_CMakeLists.txt
@ -1,11 +0,0 @@
--- pcre/CMakeLists.txt.orig	2015-12-23 15:33:31 UTC
-+++ pcre/CMakeLists.txt
-@@ -508,6 +508,8 @@ IF(PCRE_SHOW_REPORT)
-   MESSAGE(STATUS "")
- ENDIF(PCRE_SHOW_REPORT)
- 
-+IF(FALSE)
- INSTALL(FILES ${CMAKE_BINARY_DIR}/pcre/pcre.h DESTINATION ${INSTALL_INCLUDEDIR}/private COMPONENT Development)
-+ENDIF()
- 
- # end CMakeLists.txt
--- a/databases/mariadb101-client/files/patch-scripts_CMakeLists.txt
+++ b/databases/mariadb101-client/files/patch-scripts_CMakeLists.txt
@ -1,64 +0,0 @@
--- scripts/CMakeLists.txt.orig	2016-07-14 01:10:23 UTC
-+++ scripts/CMakeLists.txt
-@@ -45,6 +45,7 @@ ELSE()
-   MESSAGE(FATAL_ERROR "Cannot concatenate files")
- ENDIF()
- 
-+IF(FALSE)
- # Build mysql_fix_privilege_tables.c
- ADD_CUSTOM_COMMAND(
-   OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/mysql_fix_privilege_tables_sql.c
-@@ -65,6 +66,7 @@ ADD_CUSTOM_TARGET(GenFixPrivs
-   ALL
-   DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/mysql_fix_privilege_tables_sql.c
- )
-+ENDIF()
- 
- IF(UNIX)
-  FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/make_binary_distribution 
-@@ -164,6 +166,7 @@ ENDIF()
- SET(HOSTNAME "hostname")
- SET(MYSQLD_USER "mysql")
- 
-+IF(FALSE)
- # Required for mysqlbug until autotools are deprecated, once done remove these
- # and expand default cmake variables
- SET(CC ${CMAKE_C_COMPILER})
-@@ -198,6 +201,7 @@ INSTALL_SCRIPT(${CMAKE_CURRENT_BINARY_DI
-   DESTINATION ${INSTALL_BINDIR}
-   COMPONENT Server
-   )
-+ENDIF()
- 
- ENDIF(UNIX)
- 
-@@ -228,6 +232,7 @@ SET(mysqld_locations "$basedir/${INSTALL
- SET(errmsg_locations "$basedir/${INSTALL_MYSQLSHAREDIR}/english $basedir/share/english $basedir/share/mysql/english")
- SET(pkgdata_locations "$basedir/${INSTALL_MYSQLSHAREDIR} $basedir/share $basedir/share/mysql")
- 
-+IF()
- IF(UNIX)
- CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/mysql_install_db.sh
-   ${CMAKE_CURRENT_BINARY_DIR}/mysql_install_db ESCAPE_QUOTES @ONLY)
-@@ -241,6 +246,7 @@ INSTALL_SCRIPT(
-   COMPONENT Server
-   )
- ENDIF()
-+ENDIF()
- 
- SET(prefix "${CMAKE_INSTALL_PREFIX}")
- IF(INSTALL_SYSCONFDIR)
-@@ -333,13 +339,8 @@ ELSE()
-   SET(BIN_SCRIPTS
-     msql2mysql
-     mysql_config
-    mysql_setpermission
-    mysql_secure_installation
-     mysqlaccess
-    mysql_convert_table_format
-     mysql_find_rows
-    mytop
-    mysqlhotcopy
-     ${SERVER_SCRIPTS}
-     ${WSREP_SCRIPTS}
-     ${SYSTEMD_SCRIPTS}
--- a/databases/mariadb101-client/files/patch-scripts_mysql__config.sh
+++ b/databases/mariadb101-client/files/patch-scripts_mysql__config.sh
@ -1,12 +0,0 @@
--- scripts/mysql_config.sh.orig	2016-01-14 20:12:38 UTC
-+++ scripts/mysql_config.sh
-@@ -106,7 +106,9 @@ fi
- 
- # Create options 
- libs="-L$pkglibdir @RPATH_OPTION@ @LIBS_FOR_CLIENTS@"
-+libs="$libs -L%%LOCALBASE%%/lib "
- embedded_libs="-L$pkglibdir @RPATH_OPTION@ @EMB_LIBS_FOR_CLIENTS@"
-+embedded_libs="$embedded_libs -L%%LOCALBASE%%/lib "
- 
- include="-I$pkgincludedir"
- if [ "$basedir" != "/usr" ]; then
--- a/databases/mariadb101-client/files/patch-sql_CMakeLists.txt
+++ b/databases/mariadb101-client/files/patch-sql_CMakeLists.txt
@ -1,14 +0,0 @@
--- sql/CMakeLists.txt.orig	2015-12-23 15:33:31 UTC
-+++ sql/CMakeLists.txt
-@@ -275,9 +275,9 @@ RUN_BISON(
- )
- 
- # Gen_lex_hash
-IF(NOT CMAKE_CROSSCOMPILING)
-+
-   ADD_EXECUTABLE(gen_lex_hash gen_lex_hash.cc)
-ENDIF()
-+
- 
- ADD_CUSTOM_COMMAND(
-   OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/lex_hash.h
--- a/databases/mariadb101-client/files/patch-support-files_CMakeLists.txt
+++ b/databases/mariadb101-client/files/patch-support-files_CMakeLists.txt
@ -1,34 +0,0 @@
--- support-files/CMakeLists.txt.orig	2015-12-23 15:33:33 UTC
-+++ support-files/CMakeLists.txt
-@@ -59,6 +59,7 @@ ENDIF()
- 
- IF(UNIX)
-   SET(prefix ${CMAKE_INSTALL_PREFIX})
-+  IF(FALSE)
-   FOREACH(script mysqld_multi.server mysql-log-rotate binary-configure wsrep_notify)
-     CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${script}.sh 
-                    ${CMAKE_CURRENT_BINARY_DIR}/${script} @ONLY )
-@@ -88,12 +89,14 @@ IF(UNIX)
-       ENDFOREACH()
-     ENDIF()
-   ENDIF()
-+  ENDIF()
- 
-   CONFIGURE_FILE(mariadb.pc.in ${CMAKE_CURRENT_BINARY_DIR}/mariadb.pc @ONLY)
-   INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/mariadb.pc DESTINATION ${INSTALL_SHAREDIR}/pkgconfig COMPONENT Development)
- 
-   INSTALL(FILES mysql.m4 DESTINATION ${INSTALL_SHAREDIR}/aclocal COMPONENT Development)
-  
-+
-+IF(FALSE)  
-   SET(bindir ${INSTALL_BINDIRABS})
-   SET(sbindir ${INSTALL_SBINDIRABS})
-   SET(scriptdir ${INSTALL_SCRIPTDIRABS})
-@@ -160,6 +163,7 @@ IF(UNIX)
-     INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/mysql.server
-             DESTINATION  ${INSTALL_SYSCONFDIR}/init.d
-             RENAME mysql COMPONENT SupportFiles)
-+    ENDIF()
- 
-     INSTALL(FILES rpm/my.cnf DESTINATION ${INSTALL_SYSCONFDIR}
-             COMPONENT Common)
--- a/databases/mariadb101-client/files/pkg-message.in
+++ b/databases/mariadb101-client/files/pkg-message.in
@ -1,9 +0,0 @@
-[
-{ type: install
-  message: <<EOM
-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.
-EOM
-}
-]
--- a/databases/mariadb101-client/pkg-plist
+++ b/databases/mariadb101-client/pkg-plist
@ -1,121 +0,0 @@
-bin/msql2mysql
-bin/mysql
-bin/mysql_find_rows
-bin/mysqlaccess
-bin/mysqladmin
-bin/mysqlbinlog
-bin/mysqlcheck
-bin/mysqldump
-bin/mysqlimport
-bin/mysqlshow
-bin/mysqlslap
-bin/mysql_config
-include/mysql/auth_dialog_client.h
-include/mysql/big_endian.h
-include/mysql/byte_order_generic.h
-include/mysql/byte_order_generic_x86.h
-include/mysql/byte_order_generic_x86_64.h
-include/mysql/client_plugin.h
-include/mysql/decimal.h
-include/mysql/errmsg.h
-include/mysql/handler_ername.h
-include/mysql/handler_state.h
-include/mysql/keycache.h
-include/mysql/little_endian.h
-include/mysql/m_ctype.h
-include/mysql/m_string.h
-include/mysql/ma_dyncol.h
-include/mysql/my_alloc.h
-include/mysql/my_attribute.h
-include/mysql/my_byteorder.h
-include/mysql/my_compiler.h
-include/mysql/my_config.h
-include/mysql/my_dbug.h
-include/mysql/my_decimal_limits.h
-include/mysql/my_dir.h
-include/mysql/my_getopt.h
-include/mysql/my_global.h
-include/mysql/my_list.h
-include/mysql/my_net.h
-include/mysql/my_pthread.h
-include/mysql/my_sys.h
-include/mysql/my_valgrind.h
-include/mysql/my_xml.h
-include/mysql/mysql.h
-include/mysql/mysql_com.h
-include/mysql/mysql_com_server.h
-include/mysql/mysql_embed.h
-include/mysql/mysql_time.h
-include/mysql/mysql_version.h
-include/mysql/mysqld_ername.h
-include/mysql/mysqld_error.h
-include/mysql/plugin.h
-include/mysql/plugin_audit.h
-include/mysql/plugin_auth.h
-include/mysql/plugin_auth_common.h
-include/mysql/plugin_encryption.h
-include/mysql/plugin_ftparser.h
-include/mysql/plugin_password_validation.h
-include/mysql/psi/mysql_file.h
-include/mysql/psi/mysql_idle.h
-include/mysql/psi/mysql_socket.h
-include/mysql/psi/mysql_stage.h
-include/mysql/psi/mysql_statement.h
-include/mysql/psi/mysql_table.h
-include/mysql/psi/mysql_thread.h
-include/mysql/psi/psi.h
-include/mysql/service_base64.h
-include/mysql/service_debug_sync.h
-include/mysql/service_encryption.h
-include/mysql/service_encryption_scheme.h
-include/mysql/service_kill_statement.h
-include/mysql/service_logger.h
-include/mysql/service_md5.h
-include/mysql/service_my_crypt.h
-include/mysql/service_my_print_error.h
-include/mysql/service_my_snprintf.h
-include/mysql/service_progress_report.h
-include/mysql/service_sha1.h
-include/mysql/service_sha2.h
-include/mysql/service_thd_alloc.h
-include/mysql/service_thd_autoinc.h
-include/mysql/service_thd_error_context.h
-include/mysql/service_thd_rnd.h
-include/mysql/service_thd_specifics.h
-include/mysql/service_thd_timezone.h
-include/mysql/service_thd_wait.h
-include/mysql/service_wsrep.h
-include/mysql/services.h
-include/mysql/sql_common.h
-include/mysql/sql_state.h
-include/mysql/sslopt-case.h
-include/mysql/sslopt-longopts.h
-include/mysql/sslopt-vars.h
-include/mysql/typelib.h
-lib/mysql/libmysqlclient.a
-lib/mysql/libmysqlclient.so
-lib/mysql/libmysqlclient.so.18
-lib/mysql/libmysqlclient_r.a
-lib/mysql/libmysqlclient_r.so
-lib/mysql/libmysqlclient_r.so.18
-%%NO_GSSAPI_NONE%%lib/mysql/plugin/auth_gssapi_client.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
-man/man1/msql2mysql.1.gz
-man/man1/mysql.1.gz
-man/man1/mysql_config.1.gz
-man/man1/mysql_embedded.1.gz
-man/man1/mysql_find_rows.1.gz
-man/man1/mysql_plugin.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
-man/man1/mysqldump.1.gz
-man/man1/mysqlimport.1.gz
-man/man1/mysqlshow.1.gz
-man/man1/mysqlslap.1.gz
-@comment %%DATADIR%%/wsrep.cnf
--- a/databases/mariadb101-server/Makefile
+++ b/databases/mariadb101-server/Makefile
@ -1,224 +0,0 @@
-# $FreeBSD$
-
-PORTNAME?=	mariadb
-PORTVERSION=	10.1.45
-PORTREVISION=	0
-CATEGORIES=	databases
-MASTER_SITES=	http://ftp.osuosl.org/pub/${SITESDIR}/ \
-		http://mirrors.supportex.net/${SITESDIR}/ \
-		http://mirror2.hs-esslingen.de/pub/Mirrors/${SITESDIR}/ \
-		http://gd.tuwien.ac.at/db/${SITESDIR}/ \
-		http://mirrors.fe.up.pt/pub/${SITESDIR}/ \
-		http://mirror.de.gsnw.de:56431/${SITESDIR}/ \
-		http://mirror.layerjet.com/${SITESDIR}/ \
-		http://mirror.switch.ch/mirror/${SITESDIR}/
-PKGNAMESUFFIX?=	101-server
-
-DEPRECATED=		Port will be removed when 10.5 is added, please\
-			switch to a newer version
-EXPIRATION_DATE=	2020-07-01
-
-MAINTAINER=	brnrd@FreeBSD.org
-COMMENT?=	Multithreaded SQL database (server)
-
-LICENSE=	GPLv2
-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
-
-SUB_FILES=	pkg-message
-
-USES=		bison:build cmake:insource,noninja cpe libedit ncurses \
-		shebangfix ssl
-USE_LDCONFIG=	${PREFIX}/lib/mysql
-SHEBANG_FILES=	scripts/*.sh
-SITESDIR=	mariadb/mariadb-${PORTVERSION}/source
-DOCSDIR=	${PREFIX}/share/doc/mysql
-
-OPTIONS_DEFINE=		FASTMTX
-OPTIONS_SINGLE=		GSSAPI
-OPTIONS_SINGLE_GSSAPI=	GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE
-OPTIONS_DEFAULT=	GSSAPI_BASE
-
-FASTMTX_DESC=		Replace mutexes with spinlocks
-
-.if ${PKGNAMESUFFIX:M*-server}
-# MySQL-Server options
-OPTIONS_DEFINE+=	CONNECT_EXTRA MAXKEY DOCS
-OPTIONS_DEFAULT+=	MAXKEY SPHINX SPIDER
-OPTIONS_GROUP=		COMPRESSION ENGINES GROONGA
-OPTIONS_GROUP_COMPRESSION=	LZ4 LZO SNAPPY
-OPTIONS_GROUP_ENGINES=	INNOBASE MROONGA OQGRAPH SPHINX SPIDER TOKUDB
-OPTIONS_GROUP_GROONGA=	ZMQ MSGPACK
-OPTIONS_EXCLUDE_i386=	TOKUDB
-
-CONNECT_EXTRA_DESC=	Enable ODBC and XML in CONNECT engine
-COMPRESSION_DESC=	Optional page compression
-ENGINES_DESC=	Optional MariaDB storage engines
-GROONGA_DESC=	Optional Mroonga features
-INNOBASE_DESC=	Build InnoDB engine next to XtraDB
-MAXKEY_DESC=	Change max key length from 1000 to 4000
-MROONGA_DESC=	Mroonga Full Text Search engine
-MSGPACK_DESC=	MsgPack support
-OQGRAPH_DESC=	Open Query Graph Computation engine
-SPHINX_DESC=	SphinxSE engine
-SPIDER_DESC=	Partitioning and XA-transactions engine
-TOKUDB_DESC=	Fractal tree index tree data structure engine
-ZMQ_DESC=	ZeroMQ support
-.endif
-
-CMAKE_ARGS+=	-DINSTALL_DOCDIR="share/doc/mysql" \
-		-DINSTALL_DOCREADMEDIR="share/doc/mysql" \
-		-DINSTALL_INCLUDEDIR="include/mysql" \
-		-DINSTALL_INFODIR="info" \
-		-DINSTALL_LIBDIR="lib/mysql" \
-		-DINSTALL_MANDIR="man" \
-		-DINSTALL_MYSQLDATADIR="/var/db/mysql" \
-		-DINSTALL_MYSQLSHAREDIR="share/mysql" \
-		-DINSTALL_MYSQLTESTDIR= \
-		-DINSTALL_PLUGINDIR="lib/mysql/plugin" \
-		-DINSTALL_SBINDIR="libexec" \
-		-DINSTALL_SCRIPTDIR="bin" \
-		-DINSTALL_SHAREDIR="share" \
-		-DINSTALL_SQLBENCHDIR= \
-		-DINSTALL_SUPPORTFILESDIR="share/mysql" \
-		-DWITH_SSL=${OPENSSLBASE} \
-		-DKRB5_CONFIG=${KRB5CONFIG} \
-		-DCOMPILATION_COMMENT="FreeBSD Ports"
-CMAKE_ON+=	WITH_LIBWRAP
-CMAKE_OFF+=	WITH_UNIT_TESTS
-
-DATADIR=	${PREFIX}/share/mysql
-
-.ifdef USE_MYSQL
-.error You have 'USE_MYSQL' variable defined either in environment or in make(1) arguments. This leads to a circular dependency. Please undefine and try again.
-.endif
-
-CONFLICTS_INSTALL=	mariadb5*-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \
-			mariadb10[02-9]-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \
-			mysql[0-9]*-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \
-			mysqlwsrep* \
-			percona[0-9]*-${PKGNAMESUFFIX:C/^[0-9]*-//}-*
-
-FASTMTX_CMAKE_BOOL=	WITH_FAST_MUTEXES
-GSSAPI_BASE_USES=	gssapi
-GSSAPI_HEIMDAL_USES=	gssapi:heimdal
-GSSAPI_MIT_USES=	gssapi:mit
-OPTIONS_SUB=		yes
-
-.if ${PKGNAMESUFFIX:M*-client}
-# MySQL-Client part
-USES+=		readline
-USE_LDCONFIG=	${PREFIX}/lib/mysql
-CMAKE_ON+=	WITHOUT_SERVER
-GSSAPI_NONE_CMAKE_ON=	-DPLUGIN_AUTH_GSSAPI_CLIENT=NO
-.else
-# MySQL-Server part
-USES+=		gnome mysql:101m
-USE_GNOME=	libxml2
-USE_LDCONFIG+=	${PREFIX}/lib/mysql/plugin
-USE_RC_SUBR=	mysql-server
-USERS=		mysql
-GROUPS=		mysql
-CMAKE_ARGS+=	-DPLUGIN_AUTH_GSSAPI_CLIENT=NO
-CMAKE_ON+=	WITH_EMBEDDED_SERVER CMAKE_SKIP_BUILD_RPATH WITHOUT_EXAMPLE_STORAGE_ENGINE
-
-.for ENGINE in ${OPTIONS_GROUP_ENGINES}
-${ENGINE}_CMAKE_OFF=	-DPLUGIN_${ENGINE}=NO
-${ENGINE}_CMAKE_ON=	-DPLUGIN_${ENGINE}=DYNAMIC
-.endfor
-
-CONNECT_EXTRA_LIB_DEPENDS=	libodbc.so:databases/unixODBC
-CONNECT_EXTRA_USES=	gnome
-CONNECT_EXTRA_USE=	gnome=libxml2
-GSSAPI_NONE_CMAKE_ON=	-DPLUGIN_AUTH_GSSAPI=NO
-LZ4_BROKEN=		LZ4 compression broken in 10.1, use a newer release
-LZ4_CMAKE_ON=		-DGRN_WITH_LZ4=ON  -DWITH_INNODB_LZ4=ON
-LZ4_CMAKE_OFF=		-DGRN_WITH_LZ4=OFF -DWITH_INNODB_LZ4=OFF
-LZ4_LIB_DEPENDS=	liblz4.so:archivers/liblz4
-LZO_BROKEN=		LZO compression broken in 10.1, use a newer release
-LZO_CMAKE_ON=		-DWITH_INNODB_LZO=ON
-LZO_CMAKE_OFF=		-DWITH_INNODB_LZO=OFF
-LZO_LIB_DEPENDS=	liblzo2.so:archivers/lzo2
-MAXKEY_EXTRA_PATCHES+=	${FILESDIR}/extra-patch-include_my__compare.h
-MROONGA_LIB_DEPENDS=	liblz4.so:archivers/liblz4
-MROONGA_VARS=		LICENSE+=LGPL20 LICENSE_COMB=multi
-MSGPACK_LIB_DEPENDS=	libmsgpackc.so:devel/msgpack
-OQGRAPH_LIB_DEPENDS=	libboost_system.so:devel/boost-libs \
-			libJudy.so:devel/judy
-SNAPPY_BROKEN=		Snappy compression broken in 10.1, use a newer release
-SNAPPY_CMAKE_ON=	-DWITH_INNODB_SNAPPY=ON
-SNAPPY_CMAKE_OFF=	-DWITH_INNODB_SNAPPY=OFF
-SNAPPY_LIB_DEPENDS=	libsnappy.so:archivers/snappy
-TOKUDB_PORTDOCS=	README.md
-TOKUDB_VARS=		LICENSE+=PerconaFT LICENSE_COMB=multi
-ZMQ_LIB_DEPENDS=	libzmq.so:net/libzmq4
-.endif # ${PKGNAMESUFFIX:M*-client}
-
-.include <bsd.port.options.mk>
-
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200057
-SUB_LIST+=	LEGACY_LIMITS="@comment " MODERN_LIMITS=""
-.else
-SUB_LIST+=	LEGACY_LIMITS="" MODERN_LIMITS="@comment "
-.endif
-
-.if defined(PPC_ABI) && ${PPC_ABI} == ELFv2
-USES+=	compiler:gcc-c++11-lib
-.else
-USES+=	compiler:c++11-lib
-.endif
-
-.include <bsd.port.pre.mk>
-
-.if ${SSL_DEFAULT} != base && ${PORT_OPTIONS:MGSSAPI_BASE}
-IGNORE=		BASE_GSSAPI is not compatible with OpenSSL from ports. Use other GSSAPI options or OpenSSL from base system
-.endif
-
-.if ${OPSYS} == FreeBSD
-CMAKE_ARGS+=	-DWITH_JEMALLOC="system"
-.endif
-
-post-patch:
-	@${REINPLACE_CMD} 's/*.1/${MAN1}/' ${WRKSRC}/man/CMakeLists.txt
-	@${REINPLACE_CMD} 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/mysys/my_default.c
-	@${REINPLACE_CMD} 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/scripts/mysql_config.sh
-	@${MV} ${WRKSRC}/storage/mroonga/version ${WRKSRC}/storage/mroonga/version_txt
-.if ${OPSYS} == DragonFly
-	${CP} ${WRKSRC}/cmake/os/FreeBSD.cmake \
-		${WRKSRC}/cmake/os/DragonFly.cmake
-.endif
-
-
-.if ${PKGNAMESUFFIX:M*-client}
-post-install:
-	${RM} ${STAGEDIR}${PREFIX}/bin/wsrep*
-	${RM} ${STAGEDIR}${PREFIX}/bin/mysqld_safe_helper
-	${RM} ${STAGEDIR}${PREFIX}/share/aclocal/mysql.m4
-	${RM} -r ${STAGEDIR}${PREFIX}/share/pkgconfig
-	${RM} -r ${STAGEDIR}${PREFIX}/include/mysql/private
-.else
-post-install:
-# Remove programs to avoid conflict with mariadb101-client
-# These are "client" components, so there should be a switch that
-# prevents them from being installed but it's unknown right now
-	${RM} ${STAGEDIR}${PREFIX}/bin/msql2mysql \
-		${STAGEDIR}${PREFIX}/bin/mysql_config \
-		${STAGEDIR}${PREFIX}/bin/mysql_find_rows \
-		${STAGEDIR}${PREFIX}/bin/mysqlaccess \
-		${STAGEDIR}${PREFIX}/lib/mysql/plugin/client_ed25519.so \
-		${STAGEDIR}${PREFIX}/share/groonga-normalizer-mysql/lgpl-2.0.txt \
-		${STAGEDIR}${PREFIX}/share/groonga/COPYING \
-		${STAGEDIR}${DATADIR}/mroonga/COPYING
-	${RM} -r ${STAGEDIR}${PREFIX}/share/mysql/policy \
-		${STAGEDIR}${PREFIX}/share/pkgconfig \
-		${STAGEDIR}${PREFIX}/mysql/mysql-test \
-		${STAGEDIR}${PREFIX}/mysql/sql-bench
-
-post-install-MROONGA-on:
-	${MV} ${STAGEDIR}${PREFIX}/share/groonga-normalizer-mysql \
-		${STAGEDIR}${PREFIX}/share/groonga \
-		${STAGEDIR}${PREFIX}/share/mysql
-.endif # ${PKGNAMESUFFIX:M*-client}
-
-.include <bsd.port.post.mk>
--- a/databases/mariadb101-server/distinfo
+++ b/databases/mariadb101-server/distinfo
@ -1,3 +0,0 @@
-TIMESTAMP = 1589725786
-SHA256 (mariadb-10.1.45.tar.gz) = 9d8f0f71f9613b2028ffc5c5be8b98948ec955eb0d89600d18ed7cc04807dad5
-SIZE (mariadb-10.1.45.tar.gz) = 63673824
--- a/databases/mariadb101-server/files/extra-patch-include_my__compare.h
+++ b/databases/mariadb101-server/files/extra-patch-include_my__compare.h
@ -1,11 +0,0 @@
--- include/my_compare.h.orig	2012-11-28 17:49:43.000000000 +0200
-+++ include/my_compare.h	2012-12-23 02:45:51.000000000 +0200
-@@ -40,7 +40,7 @@
-   But beware the dependency of MI_MAX_POSSIBLE_KEY_BUFF and HA_MAX_KEY_LENGTH.
- */
- 
-#define HA_MAX_KEY_LENGTH           1000        /* Max length in bytes */
-+#define HA_MAX_KEY_LENGTH           4000        /* Max length in bytes */
- #define HA_MAX_KEY_SEG              32          /* Max segments for key */
- 
- #define HA_MAX_POSSIBLE_KEY_BUFF    (HA_MAX_KEY_LENGTH + 24+ 6+6)
--- a/databases/mariadb101-server/files/mysql-server.in
+++ b/databases/mariadb101-server/files/mysql-server.in
@ -1,140 +0,0 @@
-#!/bin/sh
-
-# $FreeBSD: head/databases/mariadb55-server/files/mysql-server.in 361647 2014-07-12 22:42:33Z rakuco $
-#
-# PROVIDE: mysql
-# REQUIRE: LOGIN
-# KEYWORD: shutdown
-#
-# Add the following line to /etc/rc.conf to enable mysql:
-# mysql_(instance_)?enable (bool):	Set to "NO" by default.
-#			Set it to "YES" to enable MySQL.
-%%LEGACY_LIMITS%%# mysql_(instance_)?limits (bool):	Set to "NO" by default.
-%%LEGACY_LIMITS%%#			Set it to yes to run `limits -e -U mysql`
-%%LEGACY_LIMITS%%#			just before mysql starts.
-# mysql_(instance_)?dbdir (str):	Default to "/var/db/mysql"
-#			Base database directory.
-# mysql_(instance_)?args (str):	Custom additional arguments to be passed
-#			to mysqld_safe (default empty).
-# mysql_(instance_)?pidfile (str): Custum PID file path and name.
-#			Default to "${mysql_dbdir}/${hostname}.pid".
-# mysql_(instance_)?user (str): User to run mysqld as
-#			Default to "mysql" created by the port
-# mysql_(instance_)?optfile (str): Server-specific option file.
-#			Default to "${mysql_dbdir}/my.cnf".
-# mysql_instances (str): Set to "" by default.
-#			If defined, list of instances to enable
-
-. /etc/rc.subr
-
-name="mysql"
-rcvar=mysql_enable
-
-load_rc_config $name
-
-: ${mysql_enable="NO"}
-%%LEGACY_LIMITS%%: ${mysql_limits="NO"}
-: ${mysql_user="mysql"}
-%%LEGACY_LIMITS%%: ${mysql_limits_args="-e -U $mysql_user"}
-: ${mysql_dbdir="/var/db/mysql"}
-: ${mysql_optfile="${mysql_dbdir}/my.cnf"}
-
-command="/usr/sbin/daemon"
-procname="%%PREFIX%%/libexec/mysqld"
-start_precmd="${name}_prestart"
-start_postcmd="${name}_poststart"
-
-if [ -n "$2" ]; then
-	instance="$2"
-	load_rc_config ${name}_${instance}
-	case "$mysql_instances" in
-	"$2 "*|*" $2 "*|*" $2"|"$2")
-		eval mysql_args="\${mysql_${instance}_args:-\"${mysql_args}\"}"
-		eval mysql_dbdir="\${mysql_${instance}_dbdir:-\"/var/db/mysql_${instance}\"}"
-%%LEGACY_LIMITS%%		eval mysql_limits="\${mysql_${instance}_limits:-\"${mysql_limits}\"}"
-		eval mysql_user="\${mysql_${instance}_user:-\"${mysql_user}\"}"
-%%LEGACY_LIMITS%%		eval mysql_limits_args="\${mysql_${instance}_limits_args:-\"-e -U $mysql_user\"}"
-		eval mysql_optfile="\${mysql_${instance}_optfile:-\"${mysql_dbdir}/my.cnf\"}"
-		eval mysql_pidfile="\${mysql_${instance}_pidfile:-\"${mysql_dbdir}/`/bin/hostname`.pid\"}"
-	;;
-	*)
-		err 1 "$2 not found in mysql_instances" ;;
-	esac
-else
-	if [ -n "${mysql_instances}" -a -n "$1" ]; then
-		for instance in ${mysql_instances}; do
-			eval _enable="\${mysql_${instance}_enable}"
-			case "${_enable:-${mysql_enable}}" in
-			[Nn][Oo]|[Ff][Aa][Ll][Ss][Ee]|[Oo][Ff][Ff]|0)
-				continue
-			;;
-			[Yy][Ee][Ss]|[Tt][Rr][Uu][Ee]|[Oo][Nn]|1)
-			;;
-			*)
-				if [ -z "$_enable" ]; then
-					_var=mysql_enable
-				else
-					_var=mysql_${instance}_enable
-				fi
-				warn "Bad value" \
-					"'${_enable:-${mysql_enable}}'" \
-					"for ${_var}. " \
-					"Instance ${instance} skipped."
-				continue
-			;;
-			esac
-			echo "===> mysql instance: ${instance}"
-			if %%PREFIX%%/etc/rc.d/mysql-server $1 ${instance}; then
-				success="${instance} ${success}"
-			else
-				failed="${instance} (${retcode}) ${failed}"
-			fi
-		done
-		exit 0
-	else
-		mysql_pidfile=${mysql_pidfile:-"${mysql_dbdir}/`/bin/hostname`.pid"}
-	fi
-fi
-
-pidfile=$mysql_pidfile
-mysql_install_db="%%PREFIX%%/bin/mysql_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}"
-
-mysql_create_auth_tables()
-{
-	eval $mysql_install_db $mysql_install_db_args
-        [ $? -eq 0 ] && chown -R ${mysql_user}:$(id -gn $mysql_user) ${mysql_dbdir}
-}
-
-mysql_prestart()
-{
-	local dir
-	for dir in /etc /etc/mysql; do
-		if [ -f "${dir}/my.cnf" ]; then
-			echo "Please move existing my.cnf file from ${dir} to %%PREFIX%%${dir}"
-			return 1
-		fi
-	done
-	if [ ! -d "${mysql_dbdir}/mysql/." ]; then
-		mysql_create_auth_tables || return 1
-	fi
-%%LEGACY_LIMITS%%	if checkyesno mysql_limits; then
-%%LEGACY_LIMITS%%		eval `/usr/bin/limits ${mysql_limits_args:-"-e -U $mysql_user"}` 2>/dev/null
-%%LEGACY_LIMITS%%	else
-%%LEGACY_LIMITS%%		return 0
-%%LEGACY_LIMITS%%	fi
-%%MODERN_LIMITS%%	return 0
-}
-
-mysql_poststart()
-{
-	local timeout=15
-	while [ ! -f "${pidfile}" -a ${timeout} -gt 0 ]; do
-		timeout=$(( timeout - 1 ))
-		sleep 1
-	done
-	return 0
-}
-
-run_rc_command "$1"
--- a/databases/mariadb101-server/files/patch-CMakeLists.txt
+++ b/databases/mariadb101-server/files/patch-CMakeLists.txt
@ -1,26 +0,0 @@
--- CMakeLists.txt.orig	2017-05-02 05:13:38 UTC
-+++ CMakeLists.txt
-@@ -388,7 +388,6 @@ ADD_SUBDIRECTORY(libservices)
- ADD_SUBDIRECTORY(sql/share)
- 
- IF(NOT WITHOUT_SERVER)
-  ADD_SUBDIRECTORY(tests)
-   ADD_SUBDIRECTORY(sql)
-   OPTION (WITH_EMBEDDED_SERVER "Compile MySQL with embedded server" OFF)
-   IF(WITH_EMBEDDED_SERVER) 
-@@ -465,6 +465,7 @@ ADD_CUSTOM_TARGET(INFO_BIN ALL
-   WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
- )
- 
-+IF(FALSE)
- INSTALL_DOCUMENTATION(README CREDITS COPYING COPYING.thirdparty
-                       EXCEPTIONS-CLIENT COMPONENT Readme)
- 
-@@ -476,6 +477,7 @@ IF(UNIX)
-   INSTALL_DOCUMENTATION(Docs/INSTALL-BINARY COMPONENT Readme)
-   INSTALL_DOCUMENTATION(Docs/INSTALL-BINARY Docs/README-wsrep COMPONENT Readme)
- ENDIF()
-+ENDIF()
- 
- INCLUDE(CPack)
- 
--- a/databases/mariadb101-server/files/patch-MDEV-15961
+++ b/databases/mariadb101-server/files/patch-MDEV-15961
@ -1,46 +0,0 @@
--- mysys/stacktrace.c.orig	2018-03-26 14:18:03 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;
-
-#ifdef HAVE_BSS_START
- extern char *__bss_start;
-#endif
-+#else
-+#define PTR_SANE(p) (p)
-+#endif /* __linux */
- 
- void my_init_stacktrace()
- {
-#ifdef HAVE_BSS_START
-+#ifdef __linux__
-   heap_start = (char*) &__bss_start;
-#endif
-+#endif /* __linux__ */
- }
- 
- #ifdef __linux__
-@@ -149,15 +149,15 @@ static int safe_print_str(const char *ad
- 
- int my_safe_print_str(const char* val, int max_len)
- {
-+#ifdef __linux__
-   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))
-   {
--- a/databases/mariadb101-server/files/patch-client_CMakeLists.txt
+++ b/databases/mariadb101-server/files/patch-client_CMakeLists.txt
@ -1,72 +0,0 @@
-Fix up missing WITHOUT_DOCS, WITHOUT_CLIENT options
-
--- client/CMakeLists.txt.orig	2015-10-15 15:43:35 UTC
-+++ client/CMakeLists.txt
-@@ -30,6 +30,7 @@ INCLUDE_DIRECTORIES(
- COPY_OPENSSL_DLLS(copy_openssl_client)
- 
- ADD_DEFINITIONS(${SSL_DEFINES})
-+IF(FALSE)
- MYSQL_ADD_EXECUTABLE(mysql completion_hash.cc mysql.cc readline.cc
-                            ${CMAKE_SOURCE_DIR}/sql/sql_string.cc)
- TARGET_LINK_LIBRARIES(mysql mysqlclient)
-@@ -37,6 +38,7 @@ IF(UNIX)
-   TARGET_LINK_LIBRARIES(mysql ${MY_READLINE_LIBRARY})
-   SET_TARGET_PROPERTIES(mysql PROPERTIES ENABLE_EXPORTS TRUE)
- ENDIF(UNIX)
-+ENDIF()
- 
- MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc COMPONENT Test)
- SET_SOURCE_FILES_PROPERTIES(mysqltest.cc PROPERTIES COMPILE_FLAGS "-DTHREADS")
-@@ -44,6 +46,7 @@ TARGET_LINK_LIBRARIES(mysqltest mysqlcli
- SET_TARGET_PROPERTIES(mysqltest PROPERTIES ENABLE_EXPORTS TRUE)
- 
- 
-+IF(FALSE)
- MYSQL_ADD_EXECUTABLE(mysqlcheck mysqlcheck.c)
- TARGET_LINK_LIBRARIES(mysqlcheck mysqlclient)
- 
-@@ -53,17 +56,21 @@ TARGET_LINK_LIBRARIES(mysqldump mysqlcli
- MYSQL_ADD_EXECUTABLE(mysqlimport mysqlimport.c)
- SET_SOURCE_FILES_PROPERTIES(mysqlimport.c PROPERTIES COMPILE_FLAGS "-DTHREADS")
- TARGET_LINK_LIBRARIES(mysqlimport mysqlclient)
-+ENDIF()
- 
- MYSQL_ADD_EXECUTABLE(mysql_upgrade mysql_upgrade.c COMPONENT Server)
- TARGET_LINK_LIBRARIES(mysql_upgrade mysqlclient)
- ADD_DEPENDENCIES(mysql_upgrade GenFixPrivs)
- 
-+IF(FALSE)
- MYSQL_ADD_EXECUTABLE(mysqlshow mysqlshow.c)
- TARGET_LINK_LIBRARIES(mysqlshow mysqlclient)
-+ENDIF()
- 
- MYSQL_ADD_EXECUTABLE(mysql_plugin mysql_plugin.c)
- TARGET_LINK_LIBRARIES(mysql_plugin mysqlclient)
- 
-+IF(FALSE)
- MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc)
- TARGET_LINK_LIBRARIES(mysqlbinlog mysqlclient)
- 
-@@ -73,17 +80,20 @@ TARGET_LINK_LIBRARIES(mysqladmin mysqlcl
- MYSQL_ADD_EXECUTABLE(mysqlslap mysqlslap.c)
- SET_SOURCE_FILES_PROPERTIES(mysqlslap.c PROPERTIES COMPILE_FLAGS "-DTHREADS")
- TARGET_LINK_LIBRARIES(mysqlslap mysqlclient)
-+ENDIF()
- 
- # "WIN32" also covers 64 bit. "echo" is used in some files below "mysql-test/".
- IF(WIN32)
-   MYSQL_ADD_EXECUTABLE(echo echo.c COMPONENT Junk)
- ENDIF(WIN32)
- 
-+IF(FALSE)
- # async_example is just a code example, do not install it.
- ADD_EXECUTABLE(async_example async_example.c)
- TARGET_LINK_LIBRARIES(async_example mysqlclient)
-+ENDIF()
- 
-SET_TARGET_PROPERTIES (mysqlcheck mysqldump mysqlimport mysql_upgrade mysqlshow mysqlslap mysql_plugin async_example
-+SET_TARGET_PROPERTIES (mysql_upgrade mysql_plugin
- PROPERTIES HAS_CXX TRUE)
- 
- ADD_DEFINITIONS(-DHAVE_DLOPEN)
--- a/databases/mariadb101-server/files/patch-cmake_ssl.cmake
+++ b/databases/mariadb101-server/files/patch-cmake_ssl.cmake
@ -1,31 +0,0 @@
-MariaDB prefers static libraries, breaks builds with
-ports' OpenSSL libs
-
--- cmake/ssl.cmake.orig	2016-03-24 09:12:10 UTC
-+++ cmake/ssl.cmake
-@@ -145,9 +145,9 @@ MACRO (MYSQL_CHECK_SSL)
- 
-     # On mac this list is <.dylib;.so;.a>
-     # We prefer static libraries, so we revert it here.
-    IF (WITH_SSL_PATH)
-      LIST(REVERSE CMAKE_FIND_LIBRARY_SUFFIXES)
-    ENDIF()
-+#    IF (WITH_SSL_PATH)
-+#      LIST(REVERSE CMAKE_FIND_LIBRARY_SUFFIXES)
-+#    ENDIF()
-     FIND_LIBRARY(OPENSSL_LIBRARIES
-                  NAMES ssl ssleay32 ssleay32MD
-                  HINTS ${OPENSSL_ROOT_DIR}/lib)
-@@ -156,9 +156,9 @@ MACRO (MYSQL_CHECK_SSL)
-                  HINTS ${OPENSSL_ROOT_DIR}/lib)
-     MARK_AS_ADVANCED(CRYPTO_LIBRARY OPENSSL_LIBRARIES OPENSSL_ROOT_DIR
-       OPENSSL_INCLUDE_DIR)
-    IF (WITH_SSL_PATH)
-      LIST(REVERSE CMAKE_FIND_LIBRARY_SUFFIXES)
-    ENDIF()
-+#    IF (WITH_SSL_PATH)
-+#      LIST(REVERSE CMAKE_FIND_LIBRARY_SUFFIXES)
-+#    ENDIF()
- 
-     INCLUDE(CheckSymbolExists)
-     SET(CMAKE_REQUIRED_INCLUDES ${OPENSSL_INCLUDE_DIR})
--- a/databases/mariadb101-server/files/patch-extra_CMakeLists.txt
+++ b/databases/mariadb101-server/files/patch-extra_CMakeLists.txt
@ -1,13 +0,0 @@
-Fix up missing WITHOUT_DOCS, WITHOUT_CLIENT options
-
--- extra/CMakeLists.txt.orig	2015-10-15 15:43:36 UTC
-+++ extra/CMakeLists.txt
-@@ -100,6 +100,8 @@ IF(UNIX)
-   MYSQL_ADD_EXECUTABLE(resolve_stack_dump resolve_stack_dump.c)
-   TARGET_LINK_LIBRARIES(resolve_stack_dump mysys)
- 
-+IF(FALSE)
-   MYSQL_ADD_EXECUTABLE(mysql_waitpid mysql_waitpid.c COMPONENT Client)
-   TARGET_LINK_LIBRARIES(mysql_waitpid mysys)
- ENDIF()
-+ENDIF()
--- a/databases/mariadb101-server/files/patch-include_CMakeLists.txt
+++ b/databases/mariadb101-server/files/patch-include_CMakeLists.txt
@ -1,26 +0,0 @@
-Fix up missing WITHOUT_DOCS, WITHOUT_CLIENT options
-
--- include/CMakeLists.txt.orig	2015-10-15 15:43:36 UTC
-+++ include/CMakeLists.txt
-@@ -62,17 +62,21 @@ SET(HEADERS 
-   handler_ername.h
- )
- 
-+IF(FALSE)
- INSTALL(FILES ${HEADERS} DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development)
- FOREACH(f ${HEADERS_GEN_CONFIGURE})
-   INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${f} DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development PERMISSIONS OWNER_READ GROUP_READ WORLD_READ)
- ENDFOREACH(f)
- INSTALL(DIRECTORY mysql/ DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development FILES_MATCHING PATTERN "*.h")
-+ENDIF()
- 
- STRING(REPLACE "." "\\." EXCL_RE "${HEADERS};${HEADERS_GEN_CONFIGURE}")
- STRING(REPLACE ";" "|" EXCL_RE "${EXCL_RE}")
- 
-+IF(FALSE)
- INSTALL(DIRECTORY . DESTINATION ${INSTALL_INCLUDEDIR}/private COMPONENT Development
-   FILES_MATCHING PATTERN "*.h"
-   PATTERN CMakeFiles EXCLUDE
-   PATTERN mysql EXCLUDE
-   REGEX "\\./(${EXCL_RE}$)" EXCLUDE)
-+ENDIF()
--- a/databases/mariadb101-server/files/patch-libmysql_CMakeLists.txt
+++ b/databases/mariadb101-server/files/patch-libmysql_CMakeLists.txt
@ -1,41 +0,0 @@
-Fix up missing WITHOUT_DOCS, WITHOUT_CLIENT options
-
--- libmysql/CMakeLists.txt.orig	2015-10-15 15:43:37 UTC
-+++ libmysql/CMakeLists.txt
-@@ -410,7 +410,7 @@ SET(LIBS clientlib dbug strings vio mysy
- 
- # Merge several convenience libraries into one big mysqlclient
- # and link them together into shared library.
-MERGE_LIBRARIES(mysqlclient STATIC ${LIBS} COMPONENT Development)
-+MERGE_LIBRARIES(mysqlclient STATIC ${LIBS} COMPONENT Development NOINSTALL)
- 
- # Visual Studio users need debug  static library for debug projects
- IF(MSVC)
-@@ -418,6 +418,7 @@ IF(MSVC)
-  INSTALL_DEBUG_TARGET(clientlib DESTINATION ${INSTALL_LIBDIR}/debug)
- ENDIF()
- 
-+IF(FALSE)
- IF(UNIX)
-   MACRO(GET_VERSIONED_LIBNAME LIBNAME EXTENSION VERSION OUTNAME)
-     SET(DOT_VERSION ".${VERSION}")
-@@ -432,11 +433,13 @@ IF(UNIX)
-   ENDMACRO()
-   INSTALL_SYMLINK(${CMAKE_STATIC_LIBRARY_PREFIX}mysqlclient_r.a mysqlclient ${INSTALL_LIBDIR} Development)
- ENDIF()
-+ENDIF()
- 
- IF(NOT DISABLE_SHARED)
-   MERGE_LIBRARIES(libmysql SHARED ${LIBS}
-     EXPORTS ${CLIENT_API_FUNCTIONS} ${CLIENT_API_5_1_EXTRA} ${CLIENT_API_5_5_EXTRA}
-    COMPONENT SharedLibraries)
-+	COMPONENT SharedLibraries NOINSTALL)
-+IF(FALSE)
-   IF(UNIX)
-     # libtool compatability
-     IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR APPLE)
-@@ -484,3 +487,4 @@ IF(NOT DISABLE_SHARED)
-     ENDFOREACH()
-   ENDIF()
- ENDIF()
-+ENDIF()
--- a/databases/mariadb101-server/files/patch-libservices_CMakeLists.txt
+++ b/databases/mariadb101-server/files/patch-libservices_CMakeLists.txt
@ -1,11 +0,0 @@
-Fix up missing WITHOUT_DOCS, WITHOUT_CLIENT options
-
--- libservices/CMakeLists.txt.orig	2015-10-15 15:43:37 UTC
-+++ libservices/CMakeLists.txt
-@@ -34,4 +34,6 @@ SET(MYSQLSERVICES_SOURCES
-   logger_service.c)
- 
- ADD_CONVENIENCE_LIBRARY(mysqlservices ${MYSQLSERVICES_SOURCES})
-+IF(FALSE)
- INSTALL(TARGETS mysqlservices DESTINATION ${INSTALL_LIBDIR} COMPONENT Development)
-+ENDIF()
--- a/databases/mariadb101-server/files/patch-man_CMakeLists.txt
+++ b/databases/mariadb101-server/files/patch-man_CMakeLists.txt
@ -1,14 +0,0 @@
-Fix up missing WITHOUT_DOCS, WITHOUT_CLIENT options
-
--- man/CMakeLists.txt.orig	2015-10-15 15:43:37 UTC
-+++ man/CMakeLists.txt
-@@ -34,7 +34,8 @@ SET(MAN1_TEST mysql-stress-test.pl.1 mys
- 
- INSTALL(FILES ${MAN1_SERVER} DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT ManPagesServer)
- INSTALL(FILES ${MAN8_SERVER} DESTINATION ${INSTALL_MANDIR}/man8 COMPONENT ManPagesServer)
-+IF(FALSE)
- INSTALL(FILES ${MAN1_CLIENT} DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT ManPagesClient)
- INSTALL(FILES ${MAN1_DEVEL} DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT ManPagesDevelopment)
- INSTALL(FILES ${MAN1_TEST} DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT ManPagesTest)
-
-+ENDIF()
--- a/databases/mariadb101-server/files/patch-mysys__ssl_my__crypt.cc
+++ b/databases/mariadb101-server/files/patch-mysys__ssl_my__crypt.cc
@ -1,20 +0,0 @@
--- mysys_ssl/my_crypt.cc.orig	2018-02-04 02:30:31 UTC
-+++ mysys_ssl/my_crypt.cc
-@@ -27,6 +27,7 @@
- #include <openssl/aes.h>
- #include <openssl/err.h>
- #include <openssl/rand.h>
-+#include <openssl/opensslv.h>
- 
- #ifdef HAVE_ERR_remove_thread_state
- #define ERR_remove_state(X) ERR_remove_thread_state(NULL)
-@@ -295,6 +296,9 @@ unsigned int my_aes_ctx_size(enum my_aes
- 
- int my_random_bytes(uchar *buf, int num)
- {
-+#ifdef LIBRESSL_VERSION_NUMBER
-+  arc4random_buf(buf, num);
-+#endif
-   if (RAND_bytes(buf, num) != 1)
-     return MY_AES_OPENSSL_ERROR;
-   return MY_AES_OK;
--- a/databases/mariadb101-server/files/patch-mysys_my__default.c
+++ b/databases/mariadb101-server/files/patch-mysys_my__default.c
@ -1,60 +0,0 @@
--- mysys/my_default.c.orig	2017-01-17 19:38:25 UTC
-+++ mysys/my_default.c
-@@ -785,7 +785,7 @@ static int search_default_file_with_ext(
-   {
-     MY_STAT stat_info;
-     if (!my_stat(name,&stat_info,MYF(0)))
-      return 1;
-+      return 0;
-     /*
-       Ignore world-writable regular files.
-       This is mainly done to protect us to not read a file created by
-@@ -803,6 +803,22 @@ static int search_default_file_with_ext(
-   if (!(fp= mysql_file_fopen(key_file_cnf, name, O_RDONLY, MYF(0))))
-     return 1;					/* Ignore wrong files */
- 
-+  if (strstr(name, "/etc") == name)
-+  {
-+    fprintf(stderr,
-+             "error: Config file %s in invalid location, please move to or merge with /usr/local%s\n",
-+             name,name);
-+      goto err;
-+  }
-+
-+  if (strstr(name, "/etc") == name)
-+  {
-+    fprintf(stderr,
-+             "error: Config file %s in invalid location, please move to or merge with /usr/local%s\n",
-+             name,name);
-+      goto err;
-+  }
-+
-   while (mysql_file_fgets(buff, sizeof(buff) - 1, fp))
-   {
-     line++;
-@@ -1067,7 +1083,8 @@ void my_print_default_files(const char *
-           if (name[0] == FN_HOMELIB)	/* Add . to filenames in home */
-             *end++= '.';
-           strxmov(end, conf_file, *ext, " ", NullS);
-          fputs(name, stdout);
-+          if (strstr(name, "/etc") != name)
-+              fputs(name, stdout);
-         }
-       }
-     }
-@@ -1228,13 +1245,10 @@ static const char **init_default_directo
- 
- #else
- 
-#if defined(DEFAULT_SYSCONFDIR)
-  if (DEFAULT_SYSCONFDIR[0])
-    errors += add_directory(alloc, DEFAULT_SYSCONFDIR, dirs);
-#else
-   errors += add_directory(alloc, "/etc/", dirs);
-   errors += add_directory(alloc, "/etc/mysql/", dirs);
-#endif /* DEFAULT_SYSCONFDIR */
-+  errors += add_directory(alloc, "/usr/local/etc/", dirs);
-+  errors += add_directory(alloc, "/usr/local/etc/mysql/", dirs);
- 
- #endif
- 
--- a/databases/mariadb101-server/files/patch-oqgraph-MDEV-15291
+++ b/databases/mariadb101-server/files/patch-oqgraph-MDEV-15291
@ -1,40 +0,0 @@
--- storage/oqgraph/oqgraph_judy.cc.orig	2018-02-12 15:01:28 UTC
-+++ storage/oqgraph/oqgraph_judy.cc
-@@ -27,7 +27,7 @@
- /*
-   Currently the only active code that can return error is:
-     judy_bitset::reset()/J1U()
-    judy_bitset::setbit()/J1S()
-+    judy_bitset::jsetbit()/J1S()
- 
-   In most cases errors are either about wrong parameters passed to Judy
-   functions or internal structures corruption. These definitely deserve
-@@ -60,7 +60,7 @@ bool open_query::judy_bitset::test(size_
-   return rc == 1;
- }
- 
-open_query::judy_bitset& open_query::judy_bitset::setbit(size_type n)
-+open_query::judy_bitset& open_query::judy_bitset::jsetbit(size_type n)
- {
-   int rc;
-   J1S(rc, array, n);
--- storage/oqgraph/oqgraph_judy.h.orig	2018-02-12 15:01:28 UTC
-+++ storage/oqgraph/oqgraph_judy.h
-@@ -63,7 +63,7 @@ namespace open_query
-       if (!val)
-         return reset(n);
-       else
-        return setbit(n);
-+        return jsetbit(n);
-     }
- 
-     judy_bitset& set(const judy_bitset& src);
-@@ -115,7 +115,7 @@ namespace open_query
-   private:
-     mutable void* array;
- 
-    judy_bitset& setbit(size_type n);
-+    judy_bitset& jsetbit(size_type n);
-   };
- }
- 
--- a/databases/mariadb101-server/files/patch-pcre_CMakeLists.txt
+++ b/databases/mariadb101-server/files/patch-pcre_CMakeLists.txt
@ -1,13 +0,0 @@
-Fix up missing WITHOUT_DOCS, WITHOUT_CLIENT options
-
--- pcre/CMakeLists.txt.orig	2016-03-24 09:12:11 UTC
-+++ pcre/CMakeLists.txt
-@@ -508,6 +508,8 @@ IF(PCRE_SHOW_REPORT)
-   MESSAGE(STATUS "")
- ENDIF(PCRE_SHOW_REPORT)
- 
-+IF(FALSE)
- INSTALL(FILES ${CMAKE_BINARY_DIR}/pcre/pcre.h DESTINATION ${INSTALL_INCLUDEDIR}/private COMPONENT Development)
-+ENDIF()
- 
- # end CMakeLists.txt
--- a/databases/mariadb101-server/files/patch-scripts_mysql__config.sh
+++ b/databases/mariadb101-server/files/patch-scripts_mysql__config.sh
@ -1,12 +0,0 @@
--- scripts/mysql_config.sh.orig	2016-01-14 20:12:38 UTC
-+++ scripts/mysql_config.sh
-@@ -106,7 +106,9 @@ fi
- 
- # Create options 
- libs="-L$pkglibdir @RPATH_OPTION@ @LIBS_FOR_CLIENTS@"
-+libs="$libs -L%%LOCALBASE%%/lib "
- embedded_libs="-L$pkglibdir @RPATH_OPTION@ @EMB_LIBS_FOR_CLIENTS@"
-+embedded_libs="$embedded_libs -L%%LOCALBASE%%/lib "
- 
- include="-I$pkgincludedir"
- if [ "$basedir" != "/usr" ]; then
--- a/databases/mariadb101-server/files/patch-scripts_mysqld__safe.sh
+++ b/databases/mariadb101-server/files/patch-scripts_mysqld__safe.sh
@ -1,24 +0,0 @@
--- scripts/mysqld_safe.sh.orig	2017-01-18 20:11:42 UTC
-+++ scripts/mysqld_safe.sh
-@@ -581,10 +581,10 @@ fi
- 
- if test -z "$MYSQL_HOME"
- then 
-  if test -r "$MY_BASEDIR_VERSION/my.cnf" && test -r "$DATADIR/my.cnf"
-+  if test -r "$MY_BASEDIR_VERSION/etc/my.cnf" && test -r "$DATADIR/my.cnf"
-   then
-     log_error "WARNING: Found two instances of my.cnf -
-$MY_BASEDIR_VERSION/my.cnf and
-+$MY_BASEDIR_VERSION/etc/my.cnf and
- $DATADIR/my.cnf
- IGNORING $DATADIR/my.cnf"
- 
-@@ -593,7 +593,7 @@ IGNORING $DATADIR/my.cnf"
-   then
-     log_error "WARNING: Found $DATADIR/my.cnf
- The data directory is a deprecated location for my.cnf, please move it to
-$MY_BASEDIR_VERSION/my.cnf"
-+$MY_BASEDIR_VERSION/etc/my.cnf"
-     unsafe_my_cnf=1
-     MYSQL_HOME=$DATADIR
-   else
--- a/databases/mariadb101-server/files/patch-scripts_wsrepsstmariabackup.sh
+++ b/databases/mariadb101-server/files/patch-scripts_wsrepsstmariabackup.sh
@ -1,11 +0,0 @@
--- scripts/wsrep_sst_mariabackup.sh.orig	2019-12-11 19:29:57 UTC
-+++ scripts/wsrep_sst_mariabackup.sh
-@@ -605,7 +605,7 @@ recv_joiner()
-     set +e
- 
-     if [[ $tmt -gt 0 ]] && command -v timeout >/dev/null;then
-        if timeout --help | grep -q -- '-k';then 
-+        if timeout --help 2>&1 | grep -q -- '-k';then 
-             ltcmd="timeout -k $(( tmt+10 )) $tmt $tcmd"
-         else 
-             ltcmd="timeout -s9 $tmt $tcmd"
--- a/databases/mariadb101-server/files/patch-sql_CMakeLists.txt
+++ b/databases/mariadb101-server/files/patch-sql_CMakeLists.txt
@ -1,30 +0,0 @@
-Fix up missing WITHOUT_DOCS, WITHOUT_CLIENT options
-
--- sql/CMakeLists.txt.orig	2015-10-15 15:43:45 UTC
-+++ sql/CMakeLists.txt
-@@ -340,6 +340,7 @@ ADD_CUSTOM_TARGET(distclean
-   VERBATIM
-   )
- 
-+IF(FALSE)
- IF(INSTALL_LAYOUT STREQUAL "STANDALONE")
- 
- # Copy db.opt into data/test/
-@@ -383,6 +384,7 @@ ELSE()
-   INSTALL(FILES ${DUMMY_FILE} DESTINATION data/mysql COMPONENT DataFiles)
- ENDIF(WIN32 AND MYSQLD_EXECUTABLE)
- ENDIF(INSTALL_LAYOUT STREQUAL "STANDALONE")
-+ENDIF()
- 
- IF(WIN32)
-   SET(my_bootstrap_sql ${CMAKE_CURRENT_BINARY_DIR}/my_bootstrap.sql)
-@@ -425,7 +427,9 @@ IF(WIN32)
-   TARGET_LINK_LIBRARIES(mysql_upgrade_service mysys winservice)
- ENDIF(WIN32)
- 
-+IF(FALSE)
- INSTALL(DIRECTORY . DESTINATION ${INSTALL_INCLUDEDIR}/private COMPONENT Development
-   FILES_MATCHING PATTERN "*.h"
-   PATTERN share EXCLUDE
-   PATTERN CMakeFiles EXCLUDE)
-+ENDIF()
--- a/databases/mariadb101-server/files/patch-sql_sql__trigger.cc
+++ b/databases/mariadb101-server/files/patch-sql_sql__trigger.cc
@ -1,52 +0,0 @@
-Fix clang build error
-
--- sql/sql_trigger.cc.orig	2015-10-15 15:43:47 UTC
-+++ sql/sql_trigger.cc
-@@ -192,32 +192,32 @@ static File_option triggers_file_paramet
- {
-   {
-     { C_STRING_WITH_LEN("triggers") },
-    my_offsetof(class Table_triggers_list, definitions_list),
-+    static_cast<int>(my_offsetof(class Table_triggers_list, definitions_list)),
-     FILE_OPTIONS_STRLIST
-   },
-   {
-     { C_STRING_WITH_LEN("sql_modes") },
-    my_offsetof(class Table_triggers_list, definition_modes_list),
-+    static_cast<int>(my_offsetof(class Table_triggers_list, definition_modes_list)),
-     FILE_OPTIONS_ULLLIST
-   },
-   {
-     { C_STRING_WITH_LEN("definers") },
-    my_offsetof(class Table_triggers_list, definers_list),
-+    static_cast<int>(my_offsetof(class Table_triggers_list, definers_list)),
-     FILE_OPTIONS_STRLIST
-   },
-   {
-     { C_STRING_WITH_LEN("client_cs_names") },
-    my_offsetof(class Table_triggers_list, client_cs_names),
-+    static_cast<int>(my_offsetof(class Table_triggers_list, client_cs_names)),
-     FILE_OPTIONS_STRLIST
-   },
-   {
-     { C_STRING_WITH_LEN("connection_cl_names") },
-    my_offsetof(class Table_triggers_list, connection_cl_names),
-+    static_cast<int>(my_offsetof(class Table_triggers_list, connection_cl_names)),
-     FILE_OPTIONS_STRLIST
-   },
-   {
-     { C_STRING_WITH_LEN("db_cl_names") },
-    my_offsetof(class Table_triggers_list, db_cl_names),
-+    static_cast<int>(my_offsetof(class Table_triggers_list, db_cl_names)),
-     FILE_OPTIONS_STRLIST
-   },
-   { { 0, 0 }, 0, FILE_OPTIONS_STRING }
-@@ -226,7 +226,7 @@ static File_option triggers_file_paramet
- File_option sql_modes_parameters=
- {
-   { C_STRING_WITH_LEN("sql_modes") },
-  my_offsetof(class Table_triggers_list, definition_modes_list),
-+  static_cast<int>(my_offsetof(class Table_triggers_list, definition_modes_list)),
-   FILE_OPTIONS_ULLLIST
- };
- 
--- a/databases/mariadb101-server/files/patch-sql_sql__view.cc
+++ b/databases/mariadb101-server/files/patch-sql_sql__view.cc
@ -1,65 +0,0 @@
-Fix clang build error
-
--- sql/sql_view.cc.orig	2015-10-15 15:43:47 UTC
-+++ sql/sql_view.cc
-@@ -720,46 +720,46 @@ static const int required_view_parameter
- */
- static File_option view_parameters[]=
- {{{ C_STRING_WITH_LEN("query")},
-  my_offsetof(TABLE_LIST, select_stmt),
-+  static_cast<int>(my_offsetof(TABLE_LIST, select_stmt)),
-   FILE_OPTIONS_ESTRING},
-  {{ C_STRING_WITH_LEN("md5")},
-  my_offsetof(TABLE_LIST, md5),
-+  static_cast<int>(my_offsetof(TABLE_LIST, md5)),
-   FILE_OPTIONS_STRING},
-  {{ C_STRING_WITH_LEN("updatable")},
-  my_offsetof(TABLE_LIST, updatable_view),
-+  static_cast<int>(my_offsetof(TABLE_LIST, updatable_view)),
-   FILE_OPTIONS_ULONGLONG},
-  {{ C_STRING_WITH_LEN("algorithm")},
-  my_offsetof(TABLE_LIST, algorithm),
-+  static_cast<int>(my_offsetof(TABLE_LIST, algorithm)),
-   FILE_OPTIONS_VIEW_ALGO},
-  {{ C_STRING_WITH_LEN("definer_user")},
-  my_offsetof(TABLE_LIST, definer.user),
-+  static_cast<int>(my_offsetof(TABLE_LIST, definer.user)),
-   FILE_OPTIONS_STRING},
-  {{ C_STRING_WITH_LEN("definer_host")},
-  my_offsetof(TABLE_LIST, definer.host),
-+  static_cast<int>(my_offsetof(TABLE_LIST, definer.host)),
-   FILE_OPTIONS_STRING},
-  {{ C_STRING_WITH_LEN("suid")},
-  my_offsetof(TABLE_LIST, view_suid),
-+  static_cast<int>(my_offsetof(TABLE_LIST, view_suid)),
-   FILE_OPTIONS_ULONGLONG},
-  {{ C_STRING_WITH_LEN("with_check_option")},
-  my_offsetof(TABLE_LIST, with_check),
-+  static_cast<int>(my_offsetof(TABLE_LIST, with_check)),
-   FILE_OPTIONS_ULONGLONG},
-  {{ C_STRING_WITH_LEN("timestamp")},
-  my_offsetof(TABLE_LIST, timestamp),
-+  static_cast<int>(my_offsetof(TABLE_LIST, timestamp)),
-   FILE_OPTIONS_TIMESTAMP},
-  {{ C_STRING_WITH_LEN("create-version")},
-  my_offsetof(TABLE_LIST, file_version),
-+  static_cast<int>(my_offsetof(TABLE_LIST, file_version)),
-   FILE_OPTIONS_ULONGLONG},
-  {{ C_STRING_WITH_LEN("source")},
-  my_offsetof(TABLE_LIST, source),
-+  static_cast<int>(my_offsetof(TABLE_LIST, source)),
-   FILE_OPTIONS_ESTRING},
-  {{(char*) STRING_WITH_LEN("client_cs_name")},
-  my_offsetof(TABLE_LIST, view_client_cs_name),
-+  static_cast<int>(my_offsetof(TABLE_LIST, view_client_cs_name)),
-   FILE_OPTIONS_STRING},
-  {{(char*) STRING_WITH_LEN("connection_cl_name")},
-  my_offsetof(TABLE_LIST, view_connection_cl_name),
-+  static_cast<int>(my_offsetof(TABLE_LIST, view_connection_cl_name)),
-   FILE_OPTIONS_STRING},
-  {{(char*) STRING_WITH_LEN("view_body_utf8")},
-  my_offsetof(TABLE_LIST, view_body_utf8),
-+  static_cast<int>(my_offsetof(TABLE_LIST, view_body_utf8)),
-   FILE_OPTIONS_ESTRING},
-  {{ C_STRING_WITH_LEN("mariadb-version")},
-   my_offsetof(TABLE_LIST, mariadb_version),
--- a/databases/mariadb101-server/files/patch-sql_sys__vars.cc
+++ b/databases/mariadb101-server/files/patch-sql_sys__vars.cc
@ -1,40 +0,0 @@
-Fix clang build error
-
--- sql/sys_vars.cc.orig	2016-03-24 09:12:12 UTC
-+++ sql/sys_vars.cc
-@@ -1052,7 +1052,7 @@ static Sys_var_ulong Sys_interactive_tim
-        "connection before closing it",
-        NO_SET_STMT SESSION_VAR(net_interactive_timeout),
-        CMD_LINE(REQUIRED_ARG),
-       VALID_RANGE(1, LONG_TIMEOUT), DEFAULT(NET_WAIT_TIMEOUT), BLOCK_SIZE(1));
-+       VALID_RANGE(1, INT_MAX32/1000), DEFAULT(NET_WAIT_TIMEOUT), BLOCK_SIZE(1));
- 
- static Sys_var_ulonglong Sys_join_buffer_size(
-        "join_buffer_size",
-@@ -2239,7 +2239,7 @@ static Sys_var_ulong Sys_net_read_timeou
-        "Number of seconds to wait for more data from a connection before "
-        "aborting the read",
-        SESSION_VAR(net_read_timeout), CMD_LINE(REQUIRED_ARG),
-       VALID_RANGE(1, LONG_TIMEOUT), DEFAULT(NET_READ_TIMEOUT), BLOCK_SIZE(1),
-+       VALID_RANGE(1, INT_MAX32/1000), DEFAULT(NET_READ_TIMEOUT), BLOCK_SIZE(1),
-        NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0),
-        ON_UPDATE(fix_net_read_timeout));
- 
-@@ -2254,7 +2254,7 @@ static Sys_var_ulong Sys_net_write_timeo
-        "Number of seconds to wait for a block to be written to a connection "
-        "before aborting the write",
-        SESSION_VAR(net_write_timeout), CMD_LINE(REQUIRED_ARG),
-       VALID_RANGE(1, LONG_TIMEOUT), DEFAULT(NET_WRITE_TIMEOUT), BLOCK_SIZE(1),
-+       VALID_RANGE(1, INT_MAX32/1000), DEFAULT(NET_WRITE_TIMEOUT), BLOCK_SIZE(1),
-        NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0),
-        ON_UPDATE(fix_net_write_timeout));
- 
-@@ -3449,7 +3449,7 @@ static Sys_var_ulong Sys_net_wait_timeou
-        "The number of seconds the server waits for activity on a "
-        "connection before closing it",
-        NO_SET_STMT SESSION_VAR(net_wait_timeout), CMD_LINE(REQUIRED_ARG),
-       VALID_RANGE(1, IF_WIN(INT_MAX32/1000, LONG_TIMEOUT)),
-+       VALID_RANGE(1, INT_MAX32/1000),
-        DEFAULT(NET_WAIT_TIMEOUT), BLOCK_SIZE(1));
- 
- static Sys_var_plugin Sys_default_storage_engine(
--- a/databases/mariadb101-server/files/patch-storage_mroonga_CMakeLists.txt
+++ b/databases/mariadb101-server/files/patch-storage_mroonga_CMakeLists.txt
@ -1,11 +0,0 @@
--- storage/mroonga/CMakeLists.txt.orig	2019-11-06 16:01:58 UTC
-+++ storage/mroonga/CMakeLists.txt
-@@ -80,7 +80,7 @@ else()
-   set(MRN_SOURCE_DIR ${CMAKE_SOURCE_DIR})
- endif()
- 
-file(READ ${MRN_SOURCE_DIR}/version        MRN_VERSION)
-+file(READ ${MRN_SOURCE_DIR}/version_txt    MRN_VERSION)
- file(READ ${MRN_SOURCE_DIR}/version_major  MRN_VERSION_MAJOR)
- file(READ ${MRN_SOURCE_DIR}/version_minor  MRN_VERSION_MINOR)
- file(READ ${MRN_SOURCE_DIR}/version_micro  MRN_VERSION_MICRO)
--- a/databases/mariadb101-server/files/patch-storage_mroonga_vendor_groonga_CMakeLists.txt
+++ b/databases/mariadb101-server/files/patch-storage_mroonga_vendor_groonga_CMakeLists.txt
@ -1,15 +0,0 @@
-From https://github.com/openquery/mariadb-server/commit/43bf72e45b9ead6aa0dc4abd6e5719c6381974b5
-
--- storage/mroonga/vendor/groonga/CMakeLists.txt.orig	2015-10-15 15:43:50 UTC
-+++ storage/mroonga/vendor/groonga/CMakeLists.txt
-@@ -167,6 +167,10 @@ if(CMAKE_COMPILER_IS_GNUCXX)
-   MY_CHECK_AND_SET_COMPILER_FLAG("-Wno-clobbered")
- endif()
- 
-+if(CMAKE_COMPILER_IS_CLANGCXX)
-+  MY_CHECK_AND_SET_COMPILER_FLAG("-fexceptions")
-+endif()
-+
- if(NOT DEFINED CMAKE_C_COMPILE_OPTIONS_PIC)
-   # For old CMake
-   if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_COMPILER_IS_CLANGCXX)
--- a/databases/mariadb101-server/files/patch-storage_tokudb_CMakeLists.txt
+++ b/databases/mariadb101-server/files/patch-storage_tokudb_CMakeLists.txt
@ -1,12 +0,0 @@
--- storage/tokudb/CMakeLists.txt.orig	2016-03-26 16:20:50 UTC
-+++ storage/tokudb/CMakeLists.txt
-@@ -103,9 +103,6 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINA
- TARGET_LINK_LIBRARIES(tokudb tokufractaltree_static tokuportability_static
-                       ${ZLIB_LIBRARY} stdc++)
- 
-SET(CMAKE_MODULE_LINKER_FLAGS_RELEASE "${CMAKE_MODULE_LINKER_FLAGS_RELEASE} -flto -fuse-linker-plugin")
-SET(CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO "${CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO} -flto -fuse-linker-plugin")
-
- SET(CPACK_RPM_server_PACKAGE_OBSOLETES
-   "${CPACK_RPM_server_PACKAGE_OBSOLETES} MariaDB-tokudb-engine < 10.0.5" PARENT_SCOPE)
- 
--- a/databases/mariadb101-server/files/patch-storage_tokudb_PerconaFT_CMakeLists.txt
+++ b/databases/mariadb101-server/files/patch-storage_tokudb_PerconaFT_CMakeLists.txt
@ -1,11 +0,0 @@
--- storage/tokudb/PerconaFT/CMakeLists.txt.orig	2016-03-26 18:18:05 UTC
-+++ storage/tokudb/PerconaFT/CMakeLists.txt
-@@ -77,7 +77,7 @@ add_subdirectory(src)
- add_subdirectory(ftcxx)
- add_subdirectory(tools)
- 
-INSTALL_DOCUMENTATION(README.md COPYING.AGPLv3 COPYING.GPLv2 PATENTS
-+INSTALL_DOCUMENTATION(README.md
-   COMPONENT Server)
- 
- ## build tags
--- a/databases/mariadb101-server/files/patch-storage_tokudb_PerconaFT_cmake__modules_TokuThirdParty.cmake
+++ b/databases/mariadb101-server/files/patch-storage_tokudb_PerconaFT_cmake__modules_TokuThirdParty.cmake
@ -1,36 +0,0 @@
--- storage/tokudb/PerconaFT/cmake_modules/TokuThirdParty.cmake.orig	2019-11-06 06:20:37 UTC
-+++ storage/tokudb/PerconaFT/cmake_modules/TokuThirdParty.cmake
-@@ -1,5 +1,12 @@
- include(ExternalProject)
- 
-+IF (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
-+  include_directories("/usr/include")
-+
-+  add_library(lzma SHARED IMPORTED)
-+  set_target_properties(lzma PROPERTIES IMPORTED_LOCATION
-+    "/usr/lib/liblzma.so")
-+ELSE()
- ## add lzma with an external project
- set(xz_configure_opts --with-pic --enable-static)
- if (APPLE)
-@@ -71,8 +78,15 @@ add_library(lzma STATIC IMPORTED)
- set_target_properties(lzma PROPERTIES IMPORTED_LOCATION
-   "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/xz/lib/liblzma.a")
- add_dependencies(lzma build_lzma)
-+ENDIF()
- 
-+IF (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
-+  include_directories("/usr/local/include")
- 
-+  add_library(snappy SHARED IMPORTED)
-+  set_target_properties(snappy PROPERTIES IMPORTED_LOCATION
-+    "/usr/local/lib/libsnappy.so")
-+ELSE()
- ## add snappy with an external project
- set(SNAPPY_SOURCE_DIR "${TokuDB_SOURCE_DIR}/third_party/snappy-1.1.2" CACHE FILEPATH "Where to find sources for snappy.")
- if (NOT EXISTS "${SNAPPY_SOURCE_DIR}/CMakeLists.txt")
-@@ -109,3 +123,4 @@ add_library(snappy STATIC IMPORTED)
- set_target_properties(snappy PROPERTIES IMPORTED_LOCATION
-   "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/snappy/lib/libsnappy.a")
- add_dependencies(snappy build_snappy)
-+ENDIF()
--- a/databases/mariadb101-server/files/patch-storage_tokudb_PerconaFT_portability_memory.cc
+++ b/databases/mariadb101-server/files/patch-storage_tokudb_PerconaFT_portability_memory.cc
@ -1,16 +0,0 @@
-Fix build error
-
--- storage/tokudb/PerconaFT/portability/memory.cc.orig	2015-10-15 15:43:52 UTC
-+++ storage/tokudb/PerconaFT/portability/memory.cc
-@@ -94,11 +94,6 @@ PATENT RIGHTS GRANT:
- #include <string.h>
- #include <stdio.h>
- #include <stdlib.h>
-#if defined(HAVE_MALLOC_H)
-# include <malloc.h>
-#elif defined(HAVE_SYS_MALLOC_H)
-# include <sys/malloc.h>
-#endif
- #include <dlfcn.h>
- #include <toku_race_tools.h>
- #include "memory.h"
--- a/databases/mariadb101-server/files/patch-support-files_CMakeLists.txt
+++ b/databases/mariadb101-server/files/patch-support-files_CMakeLists.txt
@ -1,14 +0,0 @@
-Fix up missing WITHOUT_DOCS, WITHOUT_CLIENT options
-
--- support-files/CMakeLists.txt.orig	2016-03-24 09:12:15 UTC
-+++ support-files/CMakeLists.txt
-@@ -64,7 +64,9 @@ IF(UNIX)
-   CONFIGURE_FILE(mariadb.pc.in ${CMAKE_CURRENT_BINARY_DIR}/mariadb.pc @ONLY)
-   INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/mariadb.pc DESTINATION ${INSTALL_SHAREDIR}/pkgconfig COMPONENT Development)
- 
-+IF(FALSE)
-   INSTALL(FILES mysql.m4 DESTINATION ${INSTALL_SHAREDIR}/aclocal COMPONENT Development)
-+ENDIF()
-   
-   SET(bindir ${INSTALL_BINDIRABS})
-   SET(sbindir ${INSTALL_SBINDIRABS})
--- a/databases/mariadb101-server/files/pkg-message.in
+++ b/databases/mariadb101-server/files/pkg-message.in
@ -1,17 +0,0 @@
-[
-{ type: install
-  message: <<EOM
-Remember to run mysql_upgrade (with the optional --datadir=<dbdir> flag)
-the first time you start the MySQL server after an upgrade from an
-earlier version.
-
-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.
-
-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
-EOM
-}
-]
--- a/databases/mariadb101-server/pkg-descr
+++ b/databases/mariadb101-server/pkg-descr
@ -1,14 +0,0 @@
-MariaDB is a database server that offers drop-in replacement functionality
-for MySQL. MariaDB is built by some of the original authors of MySQL, with
-assistance from the broader community of Free and open source software
-developers. In addition to the core functionality of MySQL, MariaDB offers
-a rich set of feature enhancements including alternate storage engines,
-server optimizations, and patches.
-
-MariaDB is primarily driven by developers at Monty Program, a company
-founded by Michael "Monty" Widenius, the original author of MySQL, but
-this is not the whole story about MariaDB. On the "About MariaDB" page you
-will find more information about all participants in the MariaDB community,
-including storage engines XtraDB and PBXT.
-
-WWW: https://mariadb.org/
--- a/databases/mariadb101-server/pkg-plist
+++ b/databases/mariadb101-server/pkg-plist
@ -1,271 +0,0 @@
-bin/aria_chk
-bin/aria_dump_log
-bin/aria_ftdump
-bin/aria_pack
-bin/aria_read_log
-bin/innochecksum
-bin/mariabackup
-bin/mbstream
-bin/my_print_defaults
-bin/myisam_ftdump
-bin/myisamchk
-bin/myisamlog
-bin/myisampack
-bin/mysql_client_test_embedded
-bin/mysql_convert_table_format
-bin/mysql_embedded
-bin/mysql_fix_extensions
-bin/mysql_install_db
-bin/mysql_plugin
-bin/mysql_secure_installation
-bin/mysql_setpermission
-bin/mysql_tzinfo_to_sql
-bin/mysql_upgrade
-bin/mysql_zap
-bin/mysqlbug
-bin/mysqld_multi
-bin/mysqld_safe
-bin/mysqld_safe_helper
-bin/mysqldumpslow
-bin/mysqlhotcopy
-bin/mysqltest
-bin/mysqltest_embedded
-@comment bin/mytop
-bin/perror
-bin/replace
-bin/resolve_stack_dump
-bin/resolveip
-%%TOKUDB%%bin/tokuft_logprint
-%%TOKUDB%%bin/tokuftdump
-bin/wsrep_sst_common
-bin/wsrep_sst_mariabackup
-bin/wsrep_sst_mysqldump
-bin/wsrep_sst_rsync
-bin/wsrep_sst_rsync_wan
-bin/wsrep_sst_xtrabackup
-bin/wsrep_sst_xtrabackup-v2
-include/mysql/private/atomic/gcc_builtins.h
-include/mysql/private/atomic/generic-msvc.h
-include/mysql/private/atomic/nolock.h
-include/mysql/private/atomic/solaris.h
-include/mysql/private/atomic/x86-gcc.h
-include/mysql/private/config.h
-include/mysql/private/ft_global.h
-include/mysql/private/embedded_priv.h
-include/mysql/private/hash.h
-include/mysql/private/heap.h
-include/mysql/private/lf.h
-include/mysql/private/maria.h
-include/mysql/private/my_alarm.h
-include/mysql/private/my_atomic.h
-include/mysql/private/my_base.h
-include/mysql/private/my_bit.h
-include/mysql/private/my_bitmap.h
-include/mysql/private/my_check_opt.h
-include/mysql/private/my_compare.h
-include/mysql/private/my_context.h
-include/mysql/private/my_cpu.h
-include/mysql/private/my_crypt.h
-include/mysql/private/my_default.h
-include/mysql/private/my_handler_errors.h
-include/mysql/private/my_libwrap.h
-include/mysql/private/my_md5.h
-include/mysql/private/my_nosys.h
-include/mysql/private/my_rdtsc.h
-include/mysql/private/my_rnd.h
-include/mysql/private/my_service_manager.h
-include/mysql/private/my_stacktrace.h
-include/mysql/private/my_time.h
-include/mysql/private/my_tree.h
-include/mysql/private/my_uctype.h
-include/mysql/private/my_user.h
-include/mysql/private/myisam.h
-include/mysql/private/myisamchk.h
-include/mysql/private/myisammrg.h
-include/mysql/private/myisampack.h
-include/mysql/private/mysql_async.h
-include/mysql/private/mysqld_default_groups.h
-include/mysql/private/mysys_err.h
-include/mysql/private/password.h
-include/mysql/private/probes_mysql.h
-include/mysql/private/probes_mysql_nodtrace.h
-include/mysql/private/queues.h
-include/mysql/private/rijndael.h
-include/mysql/private/service_versions.h
-include/mysql/private/t_ctype.h
-include/mysql/private/thr_alarm.h
-include/mysql/private/thr_lock.h
-include/mysql/private/thr_timer.h
-include/mysql/private/thread_pool_priv.h
-include/mysql/private/violite.h
-include/mysql/private/waiting_threads.h
-include/mysql/private/welcome_copyright_notice.h
-include/mysql/private/wqueue.h
-include/mysql/private/wsrep.h
-lib/mysql/libmysqld.a
-lib/mysql/libmysqld.so
-lib/mysql/libmysqld.so.18
-lib/mysql/plugin/adt_null.so
-lib/mysql/plugin/auth_0x0100.so
-lib/mysql/plugin/auth_ed25519.so
-%%NO_GSSAPI_NONE%%lib/mysql/plugin/auth_gssapi.so
-lib/mysql/plugin/auth_pam.so
-lib/mysql/plugin/auth_socket.so
-lib/mysql/plugin/auth_test_plugin.so
-@comment lib/mysql/plugin/daemon_example.ini
-lib/mysql/plugin/debug_key_management.so
-@comment lib/mysql/plugin/dialog.so
-lib/mysql/plugin/dialog_examples.so
-lib/mysql/plugin/example_key_management.so
-lib/mysql/plugin/file_key_management.so
-lib/mysql/plugin/ha_archive.so
-lib/mysql/plugin/ha_blackhole.so
-lib/mysql/plugin/ha_connect.so
-lib/mysql/plugin/ha_federated.so
-lib/mysql/plugin/ha_federatedx.so
-%%INNOBASE%%lib/mysql/plugin/ha_innodb.so
-%%MROONGA%%lib/mysql/plugin/ha_mroonga.so
-%%OQGRAPH%%lib/mysql/plugin/ha_oqgraph.so
-%%SPHINX%%lib/mysql/plugin/ha_sphinx.so
-%%SPIDER%%lib/mysql/plugin/ha_spider.so
-%%TOKUDB%%lib/mysql/plugin/ha_tokudb.so
-lib/mysql/plugin/ha_test_sql_discovery.so
-lib/mysql/plugin/handlersocket.so
-lib/mysql/plugin/libdaemon_example.so
-lib/mysql/plugin/locales.so
-lib/mysql/plugin/metadata_lock_info.so
-lib/mysql/plugin/mypluglib.so
-@comment lib/mysql/plugin/mysql_clear_password.so
-lib/mysql/plugin/qa_auth_client.so
-lib/mysql/plugin/qa_auth_interface.so
-lib/mysql/plugin/qa_auth_server.so
-lib/mysql/plugin/query_cache_info.so
-lib/mysql/plugin/query_response_time.so
-lib/mysql/plugin/semisync_master.so
-lib/mysql/plugin/semisync_slave.so
-lib/mysql/plugin/server_audit.so
-lib/mysql/plugin/simple_password_check.so
-lib/mysql/plugin/sql_errlog.so
-lib/mysql/plugin/wsrep_info.so
-libexec/mysqld
-man/man1/aria_chk.1.gz
-man/man1/aria_dump_log.1.gz
-man/man1/aria_ftdump.1.gz
-man/man1/aria_pack.1.gz
-man/man1/aria_read_log.1.gz
-man/man1/galera_new_cluster.1.gz
-man/man1/galera_recovery.1.gz
-man/man1/innochecksum.1.gz
-man/man1/mariabackup.1.gz
-man/man1/mariadb-service-convert.1.gz
-man/man1/mbstream.1.gz
-man/man1/my_print_defaults.1.gz
-man/man1/myisam_ftdump.1.gz
-man/man1/myisamchk.1.gz
-man/man1/myisamlog.1.gz
-man/man1/myisampack.1.gz
-man/man1/mysql.server.1.gz
-man/man1/mysql_convert_table_format.1.gz
-man/man1/mysql_fix_extensions.1.gz
-man/man1/mysql_install_db.1.gz
-man/man1/mysql_secure_installation.1.gz
-man/man1/mysql_setpermission.1.gz
-man/man1/mysql_tzinfo_to_sql.1.gz
-man/man1/mysql_upgrade.1.gz
-man/man1/mysql_zap.1.gz
-man/man1/mysqlbug.1.gz
-man/man1/mysqld_multi.1.gz
-man/man1/mysqld_safe.1.gz
-man/man1/mysqld_safe_helper.1.gz
-man/man1/mysqldumpslow.1.gz
-man/man1/mysqlhotcopy.1.gz
-man/man1/perror.1.gz
-man/man1/replace.1.gz
-man/man1/resolve_stack_dump.1.gz
-man/man1/resolveip.1.gz
-%%TOKUDB%%man/man1/tokuft_logprint.1.gz
-%%TOKUDB%%man/man1/tokuftdump.1.gz
-man/man1/wsrep_sst_common.1.gz
-man/man1/wsrep_sst_mariabackup.1.gz
-man/man1/wsrep_sst_mysqldump.1.gz
-man/man1/wsrep_sst_rsync.1.gz
-man/man1/wsrep_sst_rsync_wan.1.gz
-man/man1/wsrep_sst_xtrabackup-v2.1.gz
-man/man1/wsrep_sst_xtrabackup.1.gz
-man/man8/mysqld.8.gz
-%%DATADIR%%/binary-configure
-%%DATADIR%%/charsets/Index.xml
-%%DATADIR%%/charsets/README
-%%DATADIR%%/charsets/armscii8.xml
-%%DATADIR%%/charsets/ascii.xml
-%%DATADIR%%/charsets/cp1250.xml
-%%DATADIR%%/charsets/cp1251.xml
-%%DATADIR%%/charsets/cp1256.xml
-%%DATADIR%%/charsets/cp1257.xml
-%%DATADIR%%/charsets/cp850.xml
-%%DATADIR%%/charsets/cp852.xml
-%%DATADIR%%/charsets/cp866.xml
-%%DATADIR%%/charsets/dec8.xml
-%%DATADIR%%/charsets/geostd8.xml
-%%DATADIR%%/charsets/greek.xml
-%%DATADIR%%/charsets/hebrew.xml
-%%DATADIR%%/charsets/hp8.xml
-%%DATADIR%%/charsets/keybcs2.xml
-%%DATADIR%%/charsets/koi8r.xml
-%%DATADIR%%/charsets/koi8u.xml
-%%DATADIR%%/charsets/latin1.xml
-%%DATADIR%%/charsets/latin2.xml
-%%DATADIR%%/charsets/latin5.xml
-%%DATADIR%%/charsets/latin7.xml
-%%DATADIR%%/charsets/macce.xml
-%%DATADIR%%/charsets/macroman.xml
-%%DATADIR%%/charsets/swe7.xml
-%%DATADIR%%/czech/errmsg.sys
-%%DATADIR%%/danish/errmsg.sys
-%%DATADIR%%/dutch/errmsg.sys
-%%DATADIR%%/english/errmsg.sys
-%%DATADIR%%/errmsg-utf8.txt
-%%DATADIR%%/estonian/errmsg.sys
-%%DATADIR%%/fill_help_tables.sql
-%%DATADIR%%/french/errmsg.sys
-%%DATADIR%%/german/errmsg.sys
-%%DATADIR%%/greek/errmsg.sys
-%%DATADIR%%/hungarian/errmsg.sys
-%%DATADIR%%/install_spider.sql
-%%DATADIR%%/italian/errmsg.sys
-%%DATADIR%%/japanese/errmsg.sys
-%%DATADIR%%/korean/errmsg.sys
-%%DATADIR%%/magic
-%%DATADIR%%/maria_add_gis_sp.sql
-%%DATADIR%%/maria_add_gis_sp_bootstrap.sql
-%%MROONGA%%%%DATADIR%%/groonga-normalizer-mysql/README.md
-%%MROONGA%%%%DATADIR%%/groonga/README.md
-%%MROONGA%%%%DATADIR%%/mroonga/AUTHORS
-%%MROONGA%%%%DATADIR%%/mroonga/install.sql
-%%MROONGA%%%%DATADIR%%/mroonga/uninstall.sql
-%%DATADIR%%/my-huge.cnf
-%%DATADIR%%/my-innodb-heavy-4G.cnf
-%%DATADIR%%/my-large.cnf
-%%DATADIR%%/my-medium.cnf
-%%DATADIR%%/my-small.cnf
-%%DATADIR%%/mysql-log-rotate
-%%DATADIR%%/mysql.server
-%%DATADIR%%/mysql_performance_tables.sql
-%%DATADIR%%/mysql_system_tables.sql
-%%DATADIR%%/mysql_system_tables_data.sql
-%%DATADIR%%/mysql_to_mariadb.sql
-%%DATADIR%%/mysql_test_data_timezone.sql
-%%DATADIR%%/mysqld_multi.server
-%%DATADIR%%/norwegian-ny/errmsg.sys
-%%DATADIR%%/norwegian/errmsg.sys
-%%DATADIR%%/polish/errmsg.sys
-%%DATADIR%%/portuguese/errmsg.sys
-%%DATADIR%%/romanian/errmsg.sys
-%%DATADIR%%/russian/errmsg.sys
-%%DATADIR%%/serbian/errmsg.sys
-%%DATADIR%%/slovak/errmsg.sys
-%%DATADIR%%/spanish/errmsg.sys
-%%DATADIR%%/swedish/errmsg.sys
-%%DATADIR%%/ukrainian/errmsg.sys
-%%DATADIR%%/wsrep.cnf
-%%DATADIR%%/wsrep_notify
--- a/databases/mariadb102-client/Makefile
+++ b/databases/mariadb102-client/Makefile
@ -1,14 +0,0 @@
-# $FreeBSD$
-
-PORTNAME=	mariadb
-PKGNAMESUFFIX=	102-client
-
-COMMENT=	Multithreaded SQL database (client)
-
-MASTERDIR=	${.CURDIR}/../mariadb102-server
-
-FILESDIR=	${.CURDIR}/files
-PATCHDIR=	${.CURDIR}/files
-PLIST=		${.CURDIR}/pkg-plist
-
-.include "${MASTERDIR}/Makefile"
--- a/databases/mariadb102-client/files/patch-CMakeLists.txt
+++ b/databases/mariadb102-client/files/patch-CMakeLists.txt
@ -1,27 +0,0 @@
--- CMakeLists.txt.orig	2019-06-14 18:29:40 UTC
-+++ CMakeLists.txt
-@@ -172,6 +172,8 @@ IF(DISABLE_SHARED)
- ENDIF()
- OPTION(ENABLED_PROFILING "Enable profiling" ON)
- OPTION(WITHOUT_SERVER "Build only the client library and clients" OFF)
-+OPTION(WITHOUT_CLIENT "Build only the server components" OFF)
-+OPTION(WITHOUT_DOCS   "Do not install documentation" OFF)
- IF(UNIX)
-   OPTION(WITH_VALGRIND "Valgrind instrumentation" OFF)
- ENDIF()
-@@ -472,6 +474,7 @@ ADD_CUSTOM_TARGET(INFO_BIN ALL
-   WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
- )
- 
-+IF(NOT WITHOUT_DOCS)
- INSTALL_DOCUMENTATION(README.md CREDITS COPYING THIRDPARTY
-                       EXCEPTIONS-CLIENT COMPONENT Readme)
- 
-@@ -481,6 +484,7 @@ INSTALL_DOCUMENTATION(README.md CREDITS COPYING THIRDP
- 
- IF(UNIX)
-   INSTALL_DOCUMENTATION(Docs/INSTALL-BINARY Docs/README-wsrep COMPONENT Readme)
-+ENDIF()
- ENDIF()
- 
- INCLUDE(build_depends)
--- a/databases/mariadb102-client/files/patch-MDEV-20463
+++ b/databases/mariadb102-client/files/patch-MDEV-20463
@ -1,11 +0,0 @@
--- plugin/auth_ed25519/CMakeLists.txt.orig	2019-07-26 21:26:44 UTC
-+++ plugin/auth_ed25519/CMakeLists.txt
-@@ -11,7 +11,7 @@ SET(REF10_SOURCES
-       ref10/ge_sub.c ref10/ge_tobytes.c ref10/keypair.c ref10/open.c
-       ref10/sc_muladd.c ref10/sc_reduce.c ref10/sign.c ref10/verify.c)
- 
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
-+INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR} ../../include)
- 
- ADD_CONVENIENCE_LIBRARY(ref10 ${REF10_SOURCES})
- IF(MSVC)
--- a/databases/mariadb102-client/files/patch-client_CMakeLists.txt
+++ b/databases/mariadb102-client/files/patch-client_CMakeLists.txt
@ -1,62 +0,0 @@
--- client/CMakeLists.txt.orig	2019-02-09 23:24:08 UTC
-+++ client/CMakeLists.txt
-@@ -44,12 +44,13 @@ IF(UNIX)
-   SET_TARGET_PROPERTIES(mysql PROPERTIES ENABLE_EXPORTS TRUE)
- ENDIF(UNIX)
- 
-+IF(NOT WITHOUT_SERVER)
- MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc COMPONENT Test)
- SET_SOURCE_FILES_PROPERTIES(mysqltest.cc PROPERTIES COMPILE_FLAGS "-DTHREADS")
- TARGET_LINK_LIBRARIES(mysqltest  ${CLIENT_LIB} pcreposix pcre)
- SET_TARGET_PROPERTIES(mysqltest PROPERTIES ENABLE_EXPORTS TRUE)
-+ENDIF()
- 
-
- MYSQL_ADD_EXECUTABLE(mysqlcheck mysqlcheck.c)
- TARGET_LINK_LIBRARIES(mysqlcheck ${CLIENT_LIB})
- 
-@@ -61,15 +62,19 @@ MYSQL_ADD_EXECUTABLE(mysqlimport mysqlimport.c)
- SET_SOURCE_FILES_PROPERTIES(mysqlimport.c PROPERTIES COMPILE_FLAGS "-DTHREADS")
- TARGET_LINK_LIBRARIES(mysqlimport ${CLIENT_LIB})
- 
-+IF(NOT WITHOUT_SERVER)
- MYSQL_ADD_EXECUTABLE(mysql_upgrade mysql_upgrade.c COMPONENT Server)
- TARGET_LINK_LIBRARIES(mysql_upgrade ${CLIENT_LIB})
- ADD_DEPENDENCIES(mysql_upgrade GenFixPrivs)
-+ENDIF()
- 
- MYSQL_ADD_EXECUTABLE(mysqlshow mysqlshow.c)
- TARGET_LINK_LIBRARIES(mysqlshow ${CLIENT_LIB})
- 
-+IF(NOT WITHOUT_SERVER)
- MYSQL_ADD_EXECUTABLE(mysql_plugin mysql_plugin.c)
- TARGET_LINK_LIBRARIES(mysql_plugin ${CLIENT_LIB})
-+ENDIF()
- 
- MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc)
- TARGET_LINK_LIBRARIES(mysqlbinlog ${CLIENT_LIB})
-@@ -90,14 +95,21 @@ ENDIF(WIN32)
- ADD_EXECUTABLE(async_example async_example.c)
- TARGET_LINK_LIBRARIES(async_example ${CLIENT_LIB})
- 
-SET_TARGET_PROPERTIES (mysqlcheck mysqldump mysqlimport mysql_upgrade mysqlshow mysqlslap mysql_plugin async_example
-+SET_TARGET_PROPERTIES (mysqlcheck mysqldump mysqlimport mysqlshow mysqlslap async_example
- PROPERTIES HAS_CXX TRUE)
- 
-
-FOREACH(t mysql mysqltest mysqltest mysqlcheck mysqldump mysqlimport mysql_upgrade mysqlshow mysql_plugin mysqlbinlog
-+FOREACH(t mysql  mysqlcheck mysqldump mysqlimport mysqlshow  mysqlbinlog
-   mysqladmin mysqlslap async_example)
-   ADD_DEPENDENCIES(${t} GenError ${CLIENT_LIB})
- ENDFOREACH()
-+
-+IF(NOT WITHOUT_SERVER)
-+SET_TARGET_PROPERTIES (mysql_upgrade mysql_plugin PROPERTIES HAS_CXX TRUE)
-+FOREACH(t mysqltest mysql_upgrade mysql_plugin)
-+  ADD_DEPENDENCIES(${t} GenError ${CLIENT_LIB})
-+ENDFOREACH()
-+ENDIF()
-+
- 
- ADD_DEFINITIONS(-DHAVE_DLOPEN)
- 
--- a/databases/mariadb102-client/files/patch-extra_CMakeLists.txt
+++ b/databases/mariadb102-client/files/patch-extra_CMakeLists.txt
@ -1,35 +0,0 @@
--- extra/CMakeLists.txt.orig	2017-04-04 19:11:33 UTC
-+++ extra/CMakeLists.txt
-@@ -46,6 +46,7 @@ ADD_CUSTOM_TARGET(GenError
-                   DEPENDS 
-                   ${CMAKE_BINARY_DIR}/include/mysqld_error.h.tmp)
- 
-+IF(FALSE)
- MYSQL_ADD_EXECUTABLE(my_print_defaults my_print_defaults.c)
- TARGET_LINK_LIBRARIES(my_print_defaults  mysys)
- 
-@@ -84,15 +85,19 @@ IF(WITH_INNOBASE_STORAGE_ENGINE OR WITH_
-       )
- 
- 
-+IF(NOT WITHOUT_SERVER)
-   MYSQL_ADD_EXECUTABLE(innochecksum innochecksum.cc ${INNOBASE_SOURCES})
-   TARGET_LINK_LIBRARIES(innochecksum mysys mysys_ssl)
-   ADD_DEPENDENCIES(innochecksum GenError)
- ENDIF()
-+ENDIF()
- 
- MYSQL_ADD_EXECUTABLE(replace replace.c COMPONENT Server)
- TARGET_LINK_LIBRARIES(replace mysys)
-+ENDIF()
- 
- IF(UNIX)
-+IF(NOT WITHOUT_SERVER)
-   MYSQL_ADD_EXECUTABLE(resolve_stack_dump resolve_stack_dump.c)
-   TARGET_LINK_LIBRARIES(resolve_stack_dump mysys)
- 
-@@ -102,3 +107,4 @@ IF(UNIX)
-   MYSQL_ADD_EXECUTABLE(mysqld_safe_helper mysqld_safe_helper.c COMPONENT Server)
-   TARGET_LINK_LIBRARIES(mysqld_safe_helper mysys)
- ENDIF()
-+ENDIF()
--- a/databases/mariadb102-client/files/patch-include_CMakeLists.txt
+++ b/databases/mariadb102-client/files/patch-include_CMakeLists.txt
@ -1,17 +0,0 @@
--- include/CMakeLists.txt.orig	2017-08-17 10:05:38 UTC
-+++ include/CMakeLists.txt
-@@ -80,12 +80,14 @@ STRING(REPLACE "." "\\." EXCL_RE "${HEAD
- STRING(REPLACE ";" "|" EXCL_RE "${EXCL_RE}")
- 
- MACRO(INSTALL_PRIVATE DIR)
-+IF(FALSE)
-   INSTALL(DIRECTORY ${DIR}/.
-     DESTINATION ${INSTALL_INCLUDEDIR}/server/private COMPONENT Development
-     FILES_MATCHING PATTERN "*.h"
-     PATTERN CMakeFiles EXCLUDE
-     PATTERN mysql EXCLUDE
-     REGEX "\\./(${EXCL_RE}$)" EXCLUDE)
-+ENDIF()
- ENDMACRO()
- 
- INSTALL_PRIVATE(${CMAKE_CURRENT_BINARY_DIR})
--- a/databases/mariadb102-client/files/patch-include_my__compare.h
+++ b/databases/mariadb102-client/files/patch-include_my__compare.h
@ -1,11 +0,0 @@
--- include/my_compare.h.orig	2017-04-04 19:11:34 UTC
-+++ include/my_compare.h
-@@ -40,7 +40,7 @@ extern "C" {
-   But beware the dependency of MI_MAX_POSSIBLE_KEY_BUFF and HA_MAX_KEY_LENGTH.
- */
- 
-#define HA_MAX_KEY_LENGTH           1000        /* Max length in bytes */
-+#define HA_MAX_KEY_LENGTH           4000        /* Max length in bytes */
- #define HA_MAX_KEY_SEG              32          /* Max segments for key */
- 
- #define HA_MAX_POSSIBLE_KEY_BUFF    (HA_MAX_KEY_LENGTH + 24+ 6+6)
--- a/databases/mariadb102-client/files/patch-include_mysql_service__encryption.h
+++ b/databases/mariadb102-client/files/patch-include_mysql_service__encryption.h
@ -1,14 +0,0 @@
--- include/mysql/service_encryption.h.orig	2017-04-04 19:11:35 UTC
-+++ include/mysql/service_encryption.h
-@@ -37,9 +37,11 @@ extern "C" {
- #elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
- #include <stdlib.h>
- #else
-+#ifndef __FreeBSD__
- #include <alloca.h>
- #endif
- #endif
-+#endif
- 
- /* returned from encryption_key_get_latest_version() */
- #define ENCRYPTION_KEY_VERSION_INVALID        (~(unsigned int)0)
--- a/databases/mariadb102-client/files/patch-man_CMakeLists.txt
+++ b/databases/mariadb102-client/files/patch-man_CMakeLists.txt
@ -1,16 +0,0 @@
--- man/CMakeLists.txt.orig	2017-04-04 19:11:35 UTC
-+++ man/CMakeLists.txt
-@@ -36,9 +36,13 @@ SET(MAN1_DEVEL mysql_config.1)
- SET(MAN1_TEST mysql-stress-test.pl.1 mysql-test-run.pl.1 mysql_client_test.1
-               mysqltest_embedded.1 mysql_client_test_embedded.1)
- 
-+IF(NOT WITHOUT_SERVER)
- INSTALL(FILES ${MAN1_SERVER} DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT ManPagesServer)
- INSTALL(FILES ${MAN8_SERVER} DESTINATION ${INSTALL_MANDIR}/man8 COMPONENT ManPagesServer)
-+ENDIF()
- INSTALL(FILES ${MAN1_CLIENT} DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT ManPagesClient)
- INSTALL(FILES ${MAN1_DEVEL} DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT ManPagesDevelopment)
-+IF(FALSE)
- INSTALL(FILES ${MAN1_TEST} DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT ManPagesTest)
-+ENDIF()
- 
--- a/databases/mariadb102-client/files/patch-mysys_my__default.c
+++ b/databases/mariadb102-client/files/patch-mysys_my__default.c
@ -1,52 +0,0 @@
--- mysys/my_default.c.orig	2017-04-04 19:11:51 UTC
-+++ mysys/my_default.c
-@@ -785,7 +785,7 @@ static int search_default_file_with_ext(
-   {
-     MY_STAT stat_info;
-     if (!my_stat(name,&stat_info,MYF(0)))
-      return 1;
-+      return 0;
-     /*
-       Ignore world-writable regular files.
-       This is mainly done to protect us to not read a file created by
-@@ -803,6 +803,14 @@ static int search_default_file_with_ext(
-   if (!(fp= mysql_file_fopen(key_file_cnf, name, O_RDONLY, MYF(0))))
-     return 1;					/* Ignore wrong files */
- 
-+  if (strstr(name, "/etc") == name)
-+  {
-+    fprintf(stderr,
-+             "error: Config file %s in invalid location, please move to or merge with /usr/local%s\n",
-+             name,name);
-+      goto err;
-+  }
-+
-   while (mysql_file_fgets(buff, sizeof(buff) - 1, fp))
-   {
-     line++;
-@@ -1067,7 +1075,8 @@ void my_print_default_files(const char *
-           if (name[0] == FN_HOMELIB)	/* Add . to filenames in home */
-             *end++= '.';
-           strxmov(end, conf_file, *ext, " ", NullS);
-          fputs(name, stdout);
-+          if (strstr(name, "/etc") != name)
-+            fputs(name, stdout);
-         }
-       }
-     }
-@@ -1192,13 +1201,10 @@ static const char **init_default_directo
- 
- #else
- 
-#if defined(DEFAULT_SYSCONFDIR)
-  if (DEFAULT_SYSCONFDIR[0])
-    errors += add_directory(alloc, DEFAULT_SYSCONFDIR, dirs);
-#else
-   errors += add_directory(alloc, "/etc/", dirs);
-   errors += add_directory(alloc, "/etc/mysql/", dirs);
-#endif /* DEFAULT_SYSCONFDIR */
-+  errors += add_directory(alloc, "/usr/local/etc/", dirs);
-+  errors += add_directory(alloc, "/usr/local/etc/mysql/", dirs);
- 
- #endif
- 
--- a/databases/mariadb102-client/files/patch-scripts_CMakeLists.txt
+++ b/databases/mariadb102-client/files/patch-scripts_CMakeLists.txt
@ -1,49 +0,0 @@
--- scripts/CMakeLists.txt.orig	2017-04-04 19:11:52 UTC
-+++ scripts/CMakeLists.txt
-@@ -21,7 +21,7 @@ IF(NOT CMAKE_CROSSCOMPILING)
-  TARGET_LINK_LIBRARIES(comp_sql)
- ENDIF()
- 
-
-+IF(NOT WITHOUT_SERVER)
- # Build mysql_fix_privilege_tables.sql (concatenate 3 sql scripts)
- IF(NOT WIN32 OR CMAKE_CROSSCOMPILING)
-   FIND_PROGRAM(CAT_EXECUTABLE cat DOC "path to the executable")
-@@ -65,6 +65,7 @@ ADD_CUSTOM_TARGET(GenFixPrivs
-   ALL
-   DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/mysql_fix_privilege_tables_sql.c
- )
-+ENDIF()
- 
- IF(UNIX)
-  FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/make_binary_distribution 
-@@ -126,6 +127,7 @@ ELSE()
-   SET (PERL_PATH "/usr/bin/perl")
- ENDIF()
- 
-+IF(NOT WITHOUT_SERVER)
- IF(UNIX)
-   # FIND_PROC and CHECK_PID are used by mysqld_safe
- IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
-@@ -207,6 +209,7 @@ INSTALL_SCRIPT(
-   COMPONENT Server
-   )
- ENDIF()
-+ENDIF()
- 
- SET(prefix "${CMAKE_INSTALL_PREFIX}")
- IF(INSTALL_SYSCONFDIR)
-@@ -298,13 +301,8 @@ ELSE()
-   SET(BIN_SCRIPTS
-     msql2mysql
-     mysql_config
-    mysql_setpermission
-    mysql_secure_installation
-     mysqlaccess
-    mysql_convert_table_format
-     mysql_find_rows
-    mytop
-    mysqlhotcopy
-     ${SERVER_SCRIPTS}
-     ${WSREP_SCRIPTS}
-     ${SYSTEMD_SCRIPTS}
--- a/databases/mariadb102-client/files/patch-scripts_mysql__config.sh
+++ b/databases/mariadb102-client/files/patch-scripts_mysql__config.sh
@ -1,12 +0,0 @@
--- scripts/mysql_config.sh.orig	2017-05-21 07:34:41 UTC
-+++ scripts/mysql_config.sh
-@@ -106,7 +106,9 @@ fi
- 
- # Create options 
- libs="-L$pkglibdir @RPATH_OPTION@ @LIBS_FOR_CLIENTS@"
-+libs="$libs -L/usr/local/lib "
- embedded_libs="-L$pkglibdir @RPATH_OPTION@ @EMB_LIBS_FOR_CLIENTS@"
-+embedded_libs="$embedded_libs -L/usr/local/lib "
- 
- include="-I$pkgincludedir"
- if [ "$basedir" != "/usr" ]; then
--- a/databases/mariadb102-client/files/patch-support-files_CMakeLists.txt
+++ b/databases/mariadb102-client/files/patch-support-files_CMakeLists.txt
@ -1,33 +0,0 @@
--- support-files/CMakeLists.txt.orig	2020-05-08 11:45:27 UTC
-+++ support-files/CMakeLists.txt
-@@ -59,6 +59,7 @@ ENDIF()
- 
- IF(UNIX)
-   SET(prefix ${CMAKE_INSTALL_PREFIX})
-+  IF(NOT WITHOUT_SERVER)
-   FOREACH(script mysqld_multi.server mysql-log-rotate binary-configure wsrep_notify)
-     CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${script}.sh 
-                    ${CMAKE_CURRENT_BINARY_DIR}/${script} @ONLY )
-@@ -98,12 +99,14 @@ IF(UNIX)
-       ENDIF()
-     ENDIF()
-   ENDIF()
-+  ENDIF()
- 
-   CONFIGURE_FILE(mariadb.pc.in ${CMAKE_CURRENT_BINARY_DIR}/mariadb.pc @ONLY)
-   INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/mariadb.pc DESTINATION ${INSTALL_LIBDIR}/pkgconfig COMPONENT Development)
- 
-   INSTALL(FILES mysql.m4 DESTINATION ${INSTALL_SHAREDIR}/aclocal COMPONENT Development)
-   
-+ IF(NOT WITHOUT_SERVER) 
-   SET(bindir ${INSTALL_BINDIRABS})
-   SET(sbindir ${INSTALL_SBINDIRABS})
-   SET(scriptdir ${INSTALL_SCRIPTDIRABS})
-@@ -175,6 +178,7 @@ IF(UNIX)
-     INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/mysql.server
-             DESTINATION  ${INSTALL_SYSCONFDIR}/init.d
-             RENAME mysql COMPONENT SupportFiles)
-+    ENDIF()
- 
-     INSTALL(FILES rpm/my.cnf DESTINATION ${INSTALL_SYSCONFDIR}
-             COMPONENT Common)
--- a/databases/mariadb102-client/files/pkg-message.in
+++ b/databases/mariadb102-client/files/pkg-message.in
@ -1,9 +0,0 @@
-[
-{ type: install
-  message: <<EOM
-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.
-EOM
-}
-]
--- a/databases/mariadb102-client/pkg-plist
+++ b/databases/mariadb102-client/pkg-plist
@ -1,93 +0,0 @@
-bin/mariadb_config
-bin/msql2mysql
-bin/mysql
-bin/mysql_find_rows
-bin/mysqlaccess
-bin/mysqladmin
-bin/mysqlbinlog
-bin/mysqlcheck
-bin/mysqldump
-bin/mysqlimport
-bin/mysqlshow
-bin/mysqlslap
-bin/mysql_config
-@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/libmysqlservices.a
-lib/mysql/libmysqlclient.a
-lib/mysql/libmysqlclient.so
-lib/mysql/libmysqlclient_r.a
-lib/mysql/libmysqlclient_r.so
-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
-libdata/pkgconfig/mariadb.pc
-%%DATADIR%%/charsets/Index.xml
-%%DATADIR%%/charsets/README
-%%DATADIR%%/charsets/armscii8.xml
-%%DATADIR%%/charsets/ascii.xml
-%%DATADIR%%/charsets/cp1250.xml
-%%DATADIR%%/charsets/cp1251.xml
-%%DATADIR%%/charsets/cp1256.xml
-%%DATADIR%%/charsets/cp1257.xml
-%%DATADIR%%/charsets/cp850.xml
-%%DATADIR%%/charsets/cp852.xml
-%%DATADIR%%/charsets/cp866.xml
-%%DATADIR%%/charsets/dec8.xml
-%%DATADIR%%/charsets/geostd8.xml
-%%DATADIR%%/charsets/greek.xml
-%%DATADIR%%/charsets/hebrew.xml
-%%DATADIR%%/charsets/hp8.xml
-%%DATADIR%%/charsets/keybcs2.xml
-%%DATADIR%%/charsets/koi8r.xml
-%%DATADIR%%/charsets/koi8u.xml
-%%DATADIR%%/charsets/latin1.xml
-%%DATADIR%%/charsets/latin2.xml
-%%DATADIR%%/charsets/latin5.xml
-%%DATADIR%%/charsets/latin7.xml
-%%DATADIR%%/charsets/macce.xml
-%%DATADIR%%/charsets/macroman.xml
-%%DATADIR%%/charsets/swe7.xml
-man/man1/msql2mysql.1.gz
-man/man1/mysql.1.gz
-man/man1/mysql_config.1.gz
-@comment man/man1/mysql_embedded.1.gz
-man/man1/mysql_find_rows.1.gz
-man/man1/mysql_plugin.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
-man/man1/mysqldump.1.gz
-man/man1/mysqlimport.1.gz
-man/man1/mysqlshow.1.gz
-man/man1/mysqlslap.1.gz
--- a/databases/mariadb102-server/Makefile
+++ b/databases/mariadb102-server/Makefile
@ -1,243 +0,0 @@
-# $FreeBSD$
-
-PORTNAME?=	mariadb
-PORTVERSION=	10.2.32
-PORTREVISION?=	0
-CATEGORIES=	databases
-MASTER_SITES=	http://mirrors.supportex.net/${SITESDIR}/ \
-		http://mirror2.hs-esslingen.de/pub/Mirrors/${SITESDIR}/ \
-		http://gd.tuwien.ac.at/db/${SITESDIR}/ \
-		http://mirrors.fe.up.pt/pub/${SITESDIR}/ \
-		http://mirror.de.gsnw.de:56431/${SITESDIR}/ \
-		http://mirror.layerjet.com/${SITESDIR}/ \
-		http://mirror.switch.ch/mirror/${SITESDIR}/ \
-		http://ftp.osuosl.org/pub/${SITESDIR}/
-PKGNAMESUFFIX?=	102-server
-
-MAINTAINER=	brnrd@FreeBSD.org
-COMMENT?=	Multithreaded SQL database (server)
-
-LICENSE=	GPLv2
-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
-
-DEPRECATED=		Port will be removed when 10.5 is added, please\
-			switch to a newer version
-EXPIRATION_DATE=	2020-07-01
-
-SUB_FILES=	pkg-message
-
-USES=		bison:build cmake compiler:c++11-lib cpe iconv:translit libedit ncurses shebangfix ssl
-USE_LDCONFIG=	${PREFIX}/lib/mysql
-SHEBANG_FILES=	scripts/*.sh
-SITESDIR=	mariadb/mariadb-${PORTVERSION}/source
-DOCSDIR=	${PREFIX}/share/doc/mysql
-
-OPTIONS_SINGLE=		GSSAPI
-OPTIONS_SINGLE_GSSAPI=	GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE
-OPTIONS_DEFAULT=	GSSAPI_BASE
-
-.if ${PKGNAMESUFFIX:M*-server}
-# MySQL-Server options
-OPTIONS_DEFAULT+=	CONNECT_EXTRA INNOBASE SPHINX SPIDER
-OPTIONS_GROUP=		COMPRESSION ENGINES GROONGA
-OPTIONS_DEFINE=		CONNECT_EXTRA DOCS
-OPTIONS_GROUP_COMPRESSION=	LZ4 LZO SNAPPY ZSTD
-OPTIONS_GROUP_ENGINES=	INNOBASE MROONGA OQGRAPH ROCKSDB SPHINX SPIDER TOKUDB XTRADB
-OPTIONS_GROUP_GROONGA=	ZMQ MSGPACK
-OPTIONS_EXCLUDE_i386=	TOKUDB
-
-CONNECT_EXTRA_DESC=	Enable ODBC and XML in CONNECT engine
-COMPRESSION_DESC=	Optional page compression
-ENGINES_DESC=	Optional MariaDB storage engines
-GROONGA_DESC=	Optional Mroonga features
-INNOBASE_DESC=	InnoDB default engine
-MROONGA_DESC=	Mroonga Full Text Search engine
-MSGPACK_DESC=	MsgPack support
-OQGRAPH_DESC=	Open Query Graph Computation engine
-ROCKSDB_DESC=	RocksDB LSM engine (Alpha)
-SPHINX_DESC=	SphinxSE engine
-SPIDER_DESC=	Partitioning and XA-transactions engine
-TOKUDB_DESC=	Fractal tree index tree data structure engine
-XTRADB_DESC=	Build XtraDB engine next to InnoDB
-ZMQ_DESC=	ZeroMQ support
-ZSTD_DESC+=	Zstandard compression support (RocksDB only)
-.endif
-
-GSSAPI_BASE_USES=	gssapi
-GSSAPI_HEIMDAL_USES=	gssapi:heimdal
-GSSAPI_MIT_USES=	gssapi:mit
-
-CMAKE_ARGS+=	-DINSTALL_DOCDIR="share/doc/mysql" \
-		-DINSTALL_DOCREADMEDIR="share/doc/mysql" \
-		-DINSTALL_INCLUDEDIR="include/mysql" \
-		-DINSTALL_INFODIR="info" \
-		-DINSTALL_LIBDIR="lib/mysql" \
-		-DINSTALL_MANDIR="man" \
-		-DINSTALL_MYSQLDATADIR="/var/db/mysql" \
-		-DINSTALL_MYSQLSHAREDIR="share/mysql" \
-		-DINSTALL_MYSQLTESTDIR= \
-		-DINSTALL_PLUGINDIR="lib/mysql/plugin" \
-		-DINSTALL_SBINDIR="libexec" \
-		-DINSTALL_SCRIPTDIR="bin" \
-		-DINSTALL_SHAREDIR="share" \
-		-DINSTALL_SQLBENCHDIR= \
-		-DINSTALL_SUPPORTFILESDIR="share/mysql" \
-		-DDEFAULT_SYSCONFDIR="${PREFIX}/etc" \
-		-DWITH_SSL="${OPENSSLBASE}" \
-		-DCURSES_CURSES_LIBRARY="/usr/lib/libcurses.so" \
-		-DCURSES_FORM_LIBRARY="/usr/lib/libform.so" \
-		-DCURSES_CURSES_LIBRARY="/usr/lib/libncurses.so" \
-		-DICONV_LIBRARIES="${ICONV_LIB_PATH}" \
-		-DKRB5_CONFIG="${KRB5CONFIG}" \
-		-DCURSES_NCURSES_LIBRARY="${NCURSESLIB}/libncurses.so" \
-		-DOPENSSL_ROOT_DIR="${OPENSSLBASE}" \
-		-DOPENSSL_CRYPTO_LIBRARY="${OPENSSLBASE}/lib/libcrypto.so" \
-		-DOPENSSL_SSL_LIBRARY="${OPENSSLBASE}/lib/libssl.so" \
-		-DCOMPILATION_COMMENT="FreeBSD Ports" \
-		-DCMAKE_PREFIX_PATH=${PREFIX}
-CMAKE_ON+=	WITH_LIBWRAP WITH_JEMALLOC WITHOUT_DOCS
-CMAKE_OFF+=	WITH_UNIT_TESTS
-
-DATADIR=	${PREFIX}/share/mysql
-
-.ifdef USE_MYSQL
-.error You have `USE_MYSQL' variable defined either in environment or in make(1) arguments. This leads to a circular dependency. Please undefine and try again.
-.endif
-
-CONFLICTS_INSTALL=	mariadb5*-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \
-			mariadb10[013-9]-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \
-			mysql[0-9]*-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \
-			mysqlwsrep* \
-			percona[0-9]*-${PKGNAMESUFFIX:C/^[0-9]*-//}-*
-
-FASTMTX_CMAKE_BOOL=	WITH_FAST_MUTEXES
-GSSAPI_NONE_CMAKE_ON=	-DPLUGIN_AUTH_GSSAPI_CLIENT=NO
-OPTIONS_SUB=		yes
-
-.if ${PKGNAMESUFFIX:M*-client}
-# MySQL-Client part
-USE_LDCONFIG=	${PREFIX}/lib/mysql
-USES+=		readline
-CMAKE_ON+=	WITHOUT_SERVER CONC_WITH_MYSQLCOMPAT
-CMAKE_OFF+=	WITH_WSREP
-.else
-# MySQL-Server part
-USES+=		mysql:102m
-USE_LDCONFIG+=	${PREFIX}/lib/mysql/plugin
-USE_RC_SUBR=	mysql-server
-USERS=		mysql
-GROUPS=		mysql
-CMAKE_ON+=	CMAKE_SKIP_BUILD_RPATH WITH_EMBEDDED_SERVER WITHOUT_EXAMPLE_STORAGE_ENGINE
-
-.for ENGINE in ${OPTIONS_GROUP_ENGINES:NINNOBASE}
-${ENGINE}_CMAKE_OFF=	-DPLUGIN_${ENGINE}=NO \
-			-DWITHOUT_${ENGINE}=1
-${ENGINE}_CMAKE_ON=	-DPLUGIN_${ENGINE}=DYNAMIC
-.endfor
-INNOBASE_CMAKE_OFF=	-DPLUGIN_INNOBASE=NO -DWITHOUT_INNOBASE=1
-
-CONNECT_EXTRA_LIB_DEPENDS=	libodbc.so:databases/unixODBC
-CONNECT_EXTRA_USES=		gnome
-CONNECT_EXTRA_USE=		gnome=libxml2
-GSSAPI_NONE_CMAKE_ON+=	-DPLUGIN_AUTH_GSSAPI=NO
-LZ4_CMAKE_ON=		-DGRN_WITH_LZ4=ON  WITH_INNODB_LZ4=ON  -DWITH_ROCKSDB_LZ4=ON
-LZ4_CMAKE_OFF=		-DGRN_WITH_LZ4=OFF WITH_INNODB_LZ4=OFF -DWITH_ROCKSDB_LZ4=OFF
-LZ4_LIB_DEPENDS=	liblz4.so:archivers/liblz4
-LZO_CMAKE_ON=		-DWITH_INNODB_LZO=ON
-LZO_CMAKE_OFF=		-DWITH_INNODB_LZO=OFF
-LZO_LIB_DEPENDS=	liblzo2.so:archivers/lzo2
-MROONGA_IMPLIES=	LZ4
-MSGPACK_LIB_DEPENDS=	libmsgpackc.so:devel/msgpack
-OQGRAPH_LIB_DEPENDS=	libboost_system.so:devel/boost-libs \
-			libJudy.so:devel/judy
-ROCKSDB_USES=		python
-SNAPPY_CMAKE_ON=	-DWITH_INNODB_SNAPPY=ON  -DWITH_ROCKSDB_snappy=ON
-SNAPPY_CMAKE_OFF=	-DWITH_INNODB_SNAPPY=OFF -DWITH_ROCKSDB_snappy=OFF
-SNAPPY_LIB_DEPENDS=	libsnappy.so:archivers/snappy
-TOKUDB_IMPLIES=		SNAPPY
-TOKUDB_PORTDOCS=	README.md
-TOKUDB_VARS=		LICENSE+=PerconaFT LICENSE_COMB=multi
-ZMQ_LIB_DEPENDS=	libzmq.so:net/libzmq4
-ZSTD_CMAKE_ON=		-DWITH_ROCKSDB_ZSTD=ON
-ZSTD_CMAKE_ON=		-DWITH_ROCKSDB_ZSTD=OFF
-ZSTD_LIB_DEPENDS=	libzstd.so:archivers/zstd
-.endif # ${PKGNAMESUFFIX:M*-client}
-
-.include <bsd.port.options.mk>
-
-.if ${SSL_DEFAULT} != base && ${PORT_OPTIONS:MGSSAPI_BASE}
-IGNORE=	BASE_GSSAPI is not compatible with OpenSSL from ports. Use other GSSAPI options or OpenSSL from base system
-.endif
-
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200057
-SUB_LIST+=	LEGACY_LIMITS="@comment " MODERN_LIMITS=""
-.else
-SUB_LIST+=	LEGACY_LIMITS="" MODERN_LIMITS="@comment "
-.endif
-
-.include <bsd.port.pre.mk>
-
-.if ${OPSYS} == DragonFly
-CMAKE_ARGS+=	-DWITHOUT_TOKUDB
-.endif
-
-post-patch:
-	${REINPLACE_CMD} 's|/usr/bin/env python|${PYTHON_CMD}|' ${WRKSRC}/CMakeLists.txt
-	${REINPLACE_CMD} 's/*.1/${MAN1}/' ${WRKSRC}/man/CMakeLists.txt
-	${REINPLACE_CMD} 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/mysys/my_default.c
-	${REINPLACE_CMD} 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/scripts/mysql_config.sh
-	${MV} ${WRKSRC}/storage/mroonga/version ${WRKSRC}/storage/mroonga/version_txt
-.if ${OPSYS} == DragonFly
-	${CP} ${WRKSRC}/cmake/os/FreeBSD.cmake \
-		${WRKSRC}/cmake/os/DragonFly.cmake
-.endif
-
-post-configure:
-	${REINPLACE_CMD} -Ee 's|(#define INCLUDE.*)"$$|\1 -I${PREFIX}/include"|' \
-		-e 's|(#define LIBS .*)"$$|\1 -L${PREFIX}/lib"|' \
-		${WRKDIR}/.build/libmariadb/mariadb_config/mariadb_config.c
-
-.if ${PKGNAMESUFFIX:M*-client} # targets for -client
-post-install:
-	${RM} ${STAGEDIR}${PREFIX}/share/aclocal/mysql.m4 \
-		${STAGEDIR}${PREFIX}/man/man1/aria* \
-		${STAGEDIR}${PREFIX}/man/man1/myisam*
-	${RM} -r ${STAGEDIR}${DATADIR}/policy \
-		${STAGEDIR}${PREFIX}/include/mysql/server
-	# Fix https://mariadb.atlassian.net/browse/MDEV-9388
-	@${REINPLACE_CMD} 's/-l-pthread/-pthread/' ${STAGEDIR}${PREFIX}/bin/mysql_config
-	${MV} ${STAGEDIR}${PREFIX}/lib/mysql/pkgconfig/mariadb.pc \
-		${STAGEDIR}${PREFIX}/libdata/pkgconfig
-	${RM} -r ${STAGEDIR}${PREFIX}/lib/mysql/pkgconfig
-
-post-install-GSSAPI_NONE-off:
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/mysql/plugin/auth_gssapi_client.so
-
-.else # targets for -server
-
-post-install:
-# Remove programs to avoid conflict with mariadb102-client
-# These are "client" components, so there should be a switch that
-# prevents them from being installed but it's unknown right now
-	${RM} ${STAGEDIR}${PREFIX}/bin/msql2mysql \
-		${STAGEDIR}${PREFIX}/bin/mysql_config \
-		${STAGEDIR}${PREFIX}/bin/mysql_find_rows \
-		${STAGEDIR}${PREFIX}/bin/mysqlaccess
-	${RM} -r ${STAGEDIR}/${PREFIX}/share/mysql/policy \
-		${STAGEDIR}/${PREFIX}/share/pkgconfig \
-		${STAGEDIR}${DATADIR}/charsets
-	${RM} ${STAGEDIR}${LOCALBASE}/lib/mysql/libmysqlclient*
-	${RM} ${STAGEDIR}${LOCALBASE}/share/doc/mysql/COPYING \
-		${STAGEDIR}${LOCALBASE}/share/doc/mysql/COPYING.thirdparty \
-		${STAGEDIR}${LOCALBASE}/share/groonga-normalizer-mysql/lgpl-2.0.txt \
-		${STAGEDIR}${LOCALBASE}/share/groonga/COPYING \
-		${STAGEDIR}${LOCALBASE}/storage/groonga/COPYING \
-		${STAGEDIR}${LOCALBASE}/share/mysql/mroonga/COPYING
-	${RM} ${STAGEDIR}${PREFIX}/include/mysql/*.h
-	${RM} -r ${STAGEDIR}${PREFIX}/lib/mysql/pkgconfig
-
-.endif # targets for -server
-
-.include <bsd.port.post.mk>
--- a/databases/mariadb102-server/distinfo
+++ b/databases/mariadb102-server/distinfo
@ -1,3 +0,0 @@
-TIMESTAMP = 1589719385
-SHA256 (mariadb-10.2.32.tar.gz) = ea4fb28095e1079297eb3ba7ec5e215c641f2dff37964db778f6e9c37e0189b3
-SIZE (mariadb-10.2.32.tar.gz) = 73646729
--- a/databases/mariadb102-server/files/extra-patch-include_my__compare.h
+++ b/databases/mariadb102-server/files/extra-patch-include_my__compare.h
@ -1,11 +0,0 @@
--- include/my_compare.h.orig	2012-11-28 17:49:43.000000000 +0200
-+++ include/my_compare.h	2012-12-23 02:45:51.000000000 +0200
-@@ -40,7 +40,7 @@
-   But beware the dependency of MI_MAX_POSSIBLE_KEY_BUFF and HA_MAX_KEY_LENGTH.
- */
- 
-#define HA_MAX_KEY_LENGTH           1000        /* Max length in bytes */
-+#define HA_MAX_KEY_LENGTH           4000        /* Max length in bytes */
- #define HA_MAX_KEY_SEG              32          /* Max segments for key */
- 
- #define HA_MAX_POSSIBLE_KEY_BUFF    (HA_MAX_KEY_LENGTH + 24+ 6+6)
--- a/databases/mariadb102-server/files/mysql-server.in
+++ b/databases/mariadb102-server/files/mysql-server.in
@ -1,140 +0,0 @@
-#!/bin/sh
-
-# $FreeBSD: head/databases/mariadb55-server/files/mysql-server.in 361647 2014-07-12 22:42:33Z rakuco $
-#
-# PROVIDE: mysql
-# REQUIRE: LOGIN
-# KEYWORD: shutdown
-#
-# Add the following line to /etc/rc.conf to enable mysql:
-# mysql_(instance_)?enable (bool):	Set to "NO" by default.
-#			Set it to "YES" to enable MySQL.
-%%LEGACY_LIMITS%%# mysql_(instance_)?limits (bool):	Set to "NO" by default.
-%%LEGACY_LIMITS%%#			Set it to yes to run `limits -e -U mysql`
-%%LEGACY_LIMITS%%#			just before mysql starts.
-# mysql_(instance_)?dbdir (str):	Default to "/var/db/mysql"
-#			Base database directory.
-# mysql_(instance_)?args (str):	Custom additional arguments to be passed
-#			to mysqld_safe (default empty).
-# mysql_(instance_)?pidfile (str): Custum PID file path and name.
-#			Default to "${mysql_dbdir}/${hostname}.pid".
-# mysql_(instance_)?user (str): User to run mysqld as
-#			Default to "mysql" created by the port
-# mysql_(instance_)?optfile (str): Server-specific option file.
-#			Default to "${mysql_dbdir}/my.cnf".
-# mysql_instances (str): Set to "" by default.
-#			If defined, list of instances to enable
-
-. /etc/rc.subr
-
-name="mysql"
-rcvar=mysql_enable
-
-load_rc_config $name
-
-: ${mysql_enable="NO"}
-%%LEGACY_LIMITS%%: ${mysql_limits="NO"}
-: ${mysql_user="mysql"}
-%%LEGACY_LIMITS%%: ${mysql_limits_args="-e -U $mysql_user"}
-: ${mysql_dbdir="/var/db/mysql"}
-: ${mysql_optfile="${mysql_dbdir}/my.cnf"}
-
-command="/usr/sbin/daemon"
-procname="%%PREFIX%%/libexec/mysqld"
-start_precmd="${name}_prestart"
-start_postcmd="${name}_poststart"
-
-if [ -n "$2" ]; then
-	instance="$2"
-	load_rc_config ${name}_${instance}
-	case "$mysql_instances" in
-	"$2 "*|*" $2 "*|*" $2"|"$2")
-		eval mysql_args="\${mysql_${instance}_args:-\"${mysql_args}\"}"
-		eval mysql_dbdir="\${mysql_${instance}_dbdir:-\"/var/db/mysql_${instance}\"}"
-%%LEGACY_LIMITS%%		eval mysql_limits="\${mysql_${instance}_limits:-\"${mysql_limits}\"}"
-		eval mysql_user="\${mysql_${instance}_user:-\"${mysql_user}\"}"
-%%LEGACY_LIMITS%%		eval mysql_limits_args="\${mysql_${instance}_limits_args:-\"-e -U $mysql_user\"}"
-		eval mysql_optfile="\${mysql_${instance}_optfile:-\"${mysql_dbdir}/my.cnf\"}"
-		eval mysql_pidfile="\${mysql_${instance}_pidfile:-\"${mysql_dbdir}/`/bin/hostname`.pid\"}"
-	;;
-	*)
-		err 1 "$2 not found in mysql_instances" ;;
-	esac
-else
-	if [ -n "${mysql_instances}" -a -n "$1" ]; then
-		for instance in ${mysql_instances}; do
-			eval _enable="\${mysql_${instance}_enable}"
-			case "${_enable:-${mysql_enable}}" in
-			[Nn][Oo]|[Ff][Aa][Ll][Ss][Ee]|[Oo][Ff][Ff]|0)
-				continue
-			;;
-			[Yy][Ee][Ss]|[Tt][Rr][Uu][Ee]|[Oo][Nn]|1)
-			;;
-			*)
-				if [ -z "$_enable" ]; then
-					_var=mysql_enable
-				else
-					_var=mysql_${instance}_enable
-				fi
-				warn "Bad value" \
-					"'${_enable:-${mysql_enable}}'" \
-					"for ${_var}. " \
-					"Instance ${instance} skipped."
-				continue
-			;;
-			esac
-			echo "===> mysql instance: ${instance}"
-			if %%PREFIX%%/etc/rc.d/mysql-server $1 ${instance}; then
-				success="${instance} ${success}"
-			else
-				failed="${instance} (${retcode}) ${failed}"
-			fi
-		done
-		exit 0
-	else
-		mysql_pidfile=${mysql_pidfile:-"${mysql_dbdir}/`/bin/hostname`.pid"}
-	fi
-fi
-
-pidfile=$mysql_pidfile
-mysql_install_db="%%PREFIX%%/bin/mysql_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}"
-
-mysql_create_auth_tables()
-{
-	eval $mysql_install_db $mysql_install_db_args
-        [ $? -eq 0 ] && chown -R ${mysql_user}:$(id -gn $mysql_user) ${mysql_dbdir}
-}
-
-mysql_prestart()
-{
-	local dir
-	for dir in /etc /etc/mysql; do
-		if [ -f "${dir}/my.cnf" ]; then
-			echo "Please move existing my.cnf file from ${dir} to %%PREFIX%%${dir}"
-			return 1
-		fi
-	done
-	if [ ! -d "${mysql_dbdir}/mysql/." ]; then
-		mysql_create_auth_tables || return 1
-	fi
-%%LEGACY_LIMITS%%	if checkyesno mysql_limits; then
-%%LEGACY_LIMITS%%		eval `/usr/bin/limits ${mysql_limits_args:-"-e -U $mysql_user"}` 2>/dev/null
-%%LEGACY_LIMITS%%	else
-%%LEGACY_LIMITS%%		return 0
-%%LEGACY_LIMITS%%	fi
-%%MODERN_LIMITS%%	return 0
-}
-
-mysql_poststart()
-{
-	local timeout=15
-	while [ ! -f "${pidfile}" -a ${timeout} -gt 0 ]; do
-		timeout=$(( timeout - 1 ))
-		sleep 1
-	done
-	return 0
-}
-
-run_rc_command "$1"
--- a/databases/mariadb102-server/files/patch-CMakeLists.txt
+++ b/databases/mariadb102-server/files/patch-CMakeLists.txt
@ -1,27 +0,0 @@
--- CMakeLists.txt.orig	2019-06-14 18:29:40 UTC
-+++ CMakeLists.txt
-@@ -172,6 +172,8 @@ IF(DISABLE_SHARED)
- ENDIF()
- OPTION(ENABLED_PROFILING "Enable profiling" ON)
- OPTION(WITHOUT_SERVER "Build only the client library and clients" OFF)
-+OPTION(WITHOUT_CLIENT "Build only the server components" OFF)
-+OPTION(WITHOUT_DOCS   "Do not install documentation" OFF)
- IF(UNIX)
-   OPTION(WITH_VALGRIND "Valgrind instrumentation" OFF)
- ENDIF()
-@@ -472,6 +474,7 @@ ADD_CUSTOM_TARGET(INFO_BIN ALL
-   WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
- )
- 
-+IF(NOT WITHOUT_DOCS)
- INSTALL_DOCUMENTATION(README.md CREDITS COPYING THIRDPARTY
-                       EXCEPTIONS-CLIENT COMPONENT Readme)
- 
-@@ -481,6 +484,7 @@ INSTALL_DOCUMENTATION(README.md CREDITS COPYING THIRDP
- 
- IF(UNIX)
-   INSTALL_DOCUMENTATION(Docs/INSTALL-BINARY Docs/README-wsrep COMPONENT Readme)
-+ENDIF()
- ENDIF()
- 
- INCLUDE(build_depends)
--- a/databases/mariadb102-server/files/patch-MDEV-15961
+++ b/databases/mariadb102-server/files/patch-MDEV-15961
@ -1,47 +0,0 @@
--- mysys/stacktrace.c.orig	2018-03-26 16:41:18 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, int 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))
-   {
--- a/databases/mariadb102-server/files/patch-MDEV-20248
+++ b/databases/mariadb102-server/files/patch-MDEV-20248
@ -1,13 +0,0 @@
--- storage/rocksdb/rocksdb/port/jemalloc_helper.h.orig	2019-07-30 11:32:15 UTC
-+++ storage/rocksdb/rocksdb/port/jemalloc_helper.h
-@@ -12,6 +12,10 @@
- #include <jemalloc/jemalloc.h>
- #endif
- 
-+#ifdef __FreeBSD__
-+#define JEMALLOC_USABLE_SIZE_CONST const
-+#endif
-+
- #ifndef JEMALLOC_CXX_THROW
- #define JEMALLOC_CXX_THROW
- #endif
--- a/databases/mariadb102-server/files/patch-extra_CMakeLists.txt
+++ b/databases/mariadb102-server/files/patch-extra_CMakeLists.txt
@ -1,16 +0,0 @@
-Fix up missing WITHOUT_DOCS, WITHOUT_CLIENT options
-
--- extra/CMakeLists.txt.orig	2017-05-14 23:13:15 UTC
-+++ extra/CMakeLists.txt
-@@ -96,9 +96,11 @@ IF(UNIX)
-   MYSQL_ADD_EXECUTABLE(resolve_stack_dump resolve_stack_dump.c)
-   TARGET_LINK_LIBRARIES(resolve_stack_dump mysys)
- 
-+IF(FALSE)
-   MYSQL_ADD_EXECUTABLE(mysql_waitpid mysql_waitpid.c COMPONENT Client)
-   TARGET_LINK_LIBRARIES(mysql_waitpid mysys)
- 
-+ENDIF()
-   MYSQL_ADD_EXECUTABLE(mysqld_safe_helper mysqld_safe_helper.c COMPONENT Server)
-   TARGET_LINK_LIBRARIES(mysqld_safe_helper mysys)
- ENDIF()
--- a/databases/mariadb102-server/files/patch-extra_mariabackup_CMakeLists.txt
+++ b/databases/mariadb102-server/files/patch-extra_mariabackup_CMakeLists.txt
@ -1,10 +0,0 @@
--- extra/mariabackup/CMakeLists.txt.orig	2019-12-05 22:22:27 UTC
-+++ extra/mariabackup/CMakeLists.txt
-@@ -114,6 +114,7 @@ MYSQL_ADD_EXECUTABLE(mbstream
- TARGET_LINK_LIBRARIES(mbstream
-   mysys
-   crc
-+  sql
- )
- ADD_DEPENDENCIES(mbstream GenError)
- 
--- a/databases/mariadb102-server/files/patch-include_CMakeLists.txt
+++ b/databases/mariadb102-server/files/patch-include_CMakeLists.txt
@ -1,38 +0,0 @@
--- include/CMakeLists.txt.orig	2017-08-17 10:05:38 UTC
-+++ include/CMakeLists.txt
-@@ -1,5 +1,5 @@
- # Copyright (c) 2006, 2011, Oracle and/or its affiliates. All rights reserved.
-# 
-+#
- # This program is free software; you can redistribute it and/or modify
- # it under the terms of the GNU General Public License as published by
- # the Free Software Foundation; version 2 of the License.
-@@ -68,6 +68,7 @@ SET(HEADERS 
- INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/mysqld_error.h
-   DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development)
- 
-+IF(FALSE)
- INSTALL(FILES ${HEADERS}
-   DESTINATION ${INSTALL_INCLUDEDIR}/server COMPONENT Development)
- FOREACH(f ${HEADERS_GEN_CONFIGURE})
-@@ -75,17 +76,20 @@ FOREACH(f ${HEADERS_GEN_CONFIGURE})
-     DESTINATION ${INSTALL_INCLUDEDIR}/server COMPONENT Development)
- ENDFOREACH(f)
- INSTALL(DIRECTORY mysql/ DESTINATION ${INSTALL_INCLUDEDIR}/server/mysql COMPONENT Development FILES_MATCHING PATTERN "*.h")
-+ENDIF()
- 
- STRING(REPLACE "." "\\." EXCL_RE "${HEADERS};${HEADERS_GEN_CONFIGURE}")
- STRING(REPLACE ";" "|" EXCL_RE "${EXCL_RE}")
- 
- MACRO(INSTALL_PRIVATE DIR)
-+IF(FALSE)
-   INSTALL(DIRECTORY ${DIR}/.
-     DESTINATION ${INSTALL_INCLUDEDIR}/server/private COMPONENT Development
-     FILES_MATCHING PATTERN "*.h"
-     PATTERN CMakeFiles EXCLUDE
-     PATTERN mysql EXCLUDE
-     REGEX "\\./(${EXCL_RE}$)" EXCLUDE)
-+ENDIF()
- ENDMACRO()
- 
- INSTALL_PRIVATE(${CMAKE_CURRENT_BINARY_DIR})
--- a/databases/mariadb102-server/files/patch-libmariadb_CMakeLists.txt
+++ b/databases/mariadb102-server/files/patch-libmariadb_CMakeLists.txt
@ -1,11 +0,0 @@
--- libmariadb/CMakeLists.txt.orig	2018-11-12 16:32:38 UTC
-+++ libmariadb/CMakeLists.txt
-@@ -381,7 +381,7 @@ ENDIF()
- INCLUDE(${CC_SOURCE_DIR}/plugins/CMakeLists.txt)
- ADD_SUBDIRECTORY(include)
- ADD_SUBDIRECTORY(libmariadb)
-IF(NOT WIN32)
-+IF(NOT WIN32 AND NOT WITHOUT_CLIENT)
-   ADD_SUBDIRECTORY(mariadb_config)
- ENDIF()
- 
--- a/databases/mariadb102-server/files/patch-libmariadb_include_CMakeLists.txt
+++ b/databases/mariadb102-server/files/patch-libmariadb_include_CMakeLists.txt
@ -1,15 +0,0 @@
--- libmariadb/include/CMakeLists.txt.orig	2017-05-14 23:13:15 UTC
-+++ libmariadb/include/CMakeLists.txt
-@@ -21,6 +21,7 @@ IF(WIN32)
-   SET(WIX_INCLUDES ${MARIADB_CLIENT_INCLUDES} ${MARIADB_ADDITIONAL_INCLUDES} ${MYSQL_ADDITIONAL_INCLUDES} PARENT_SCOPE)
- ENDIF()
- 
-+IF(NOT WITHOUT_CLIENT)
- INSTALL(FILES
-    ${MARIADB_CLIENT_INCLUDES}
-    DESTINATION ${INSTALL_INCLUDEDIR}
-@@ -33,3 +34,4 @@ INSTALL(FILES
-    ${MARIADB_ADDITIONAL_INCLUDES}
-    DESTINATION ${INSTALL_INCLUDEDIR}/mariadb
-    COMPONENT Development)
-+ENDIF()
--- a/databases/mariadb102-server/files/patch-libmariadb_libmariadb_CMakeLists.txt
+++ b/databases/mariadb102-server/files/patch-libmariadb_libmariadb_CMakeLists.txt
@ -1,14 +0,0 @@
--- libmariadb/libmariadb/CMakeLists.txt.orig	2017-05-14 23:13:15 UTC
-+++ libmariadb/libmariadb/CMakeLists.txt
-@@ -401,9 +401,11 @@ SET_TARGET_PROPERTIES(libmariadb PROPERT
- INSTALL(TARGETS mariadbclient
-           COMPONENT Development
-           DESTINATION ${INSTALL_LIBDIR})
-+IF(NOT WITHOUT_CLIENT)
- INSTALL(TARGETS libmariadb
-           COMPONENT SharedLibraries
-         DESTINATION ${INSTALL_LIBDIR})
-+ENDIF()
- 
- IF(WIN32)
-    # On Windows, install PDB
--- a/databases/mariadb102-server/files/patch-libmariadb_plugins_auth_CMakeLists.txt
+++ b/databases/mariadb102-server/files/patch-libmariadb_plugins_auth_CMakeLists.txt
@ -1,31 +0,0 @@
--- libmariadb/plugins/auth/CMakeLists.txt.orig	2018-11-12 16:32:38 UTC
-+++ libmariadb/plugins/auth/CMakeLists.txt
-@@ -18,6 +18,7 @@ REGISTER_PLUGIN(TARGET dialog
-                 SOURCES ${CC_SOURCE_DIR}/plugins/auth/dialog.c
-                         ${CC_SOURCE_DIR}/libmariadb/get_password.c)
- 
-+IF(NOT WITHOUT_CLIENT)
- #GSSAPI client authentication plugin
- IF(NOT WIN32)
-   INCLUDE(${CC_SOURCE_DIR}/cmake/FindGSSAPI.cmake)
-@@ -51,6 +52,7 @@ IF(${WITH_SSL} STREQUAL "OPENSSL" OR ${W
-                   SOURCES ${AUTH_DIR}/sha256_pw.c
-                   LIBRARIES ${SHA256_LIBS})
- ENDIF()
-+ENDIF()
- 
- # old_password plugin
- REGISTER_PLUGIN(TARGET mysql_old_password
-@@ -60,10 +62,11 @@ REGISTER_PLUGIN(TARGET mysql_old_passwor
-                 SOURCES ${AUTH_DIR}/old_password.c)
- 
- 
-+IF(NOT WITHOUT_CLIENT)
- # Cleartext
- REGISTER_PLUGIN(TARGET mysql_clear_password
-                 TYPE MARIADB_CLIENT_PLUGIN_AUTH
-                 CONFIGURATIONS DYNAMIC STATIC OFF
-                 DEFAULT DYNAMIC
-                 SOURCES ${AUTH_DIR}/mariadb_cleartext.c)
-
-+ENDIF()
--- a/databases/mariadb102-server/files/patch-libservices_CMakeLists.txt
+++ b/databases/mariadb102-server/files/patch-libservices_CMakeLists.txt
@ -1,11 +0,0 @@
-Fix up missing WITHOUT_DOCS, WITHOUT_CLIENT options
-
--- libservices/CMakeLists.txt.orig	2017-05-14 23:13:16 UTC
-+++ libservices/CMakeLists.txt
-@@ -40,4 +40,6 @@ SET(MYSQLSERVICES_SOURCES
-   )
- 
- ADD_CONVENIENCE_LIBRARY(mysqlservices ${MYSQLSERVICES_SOURCES})
-+IF(FALSE)
- INSTALL(TARGETS mysqlservices DESTINATION ${INSTALL_LIBDIR} COMPONENT Development)
-+ENDIF()
--- a/databases/mariadb102-server/files/patch-man_CMakeLists.txt
+++ b/databases/mariadb102-server/files/patch-man_CMakeLists.txt
@ -1,14 +0,0 @@
-Fix up missing WITHOUT_DOCS, WITHOUT_CLIENT options
-
--- man/CMakeLists.txt.orig	2017-05-14 23:13:16 UTC
-+++ man/CMakeLists.txt
-@@ -38,7 +38,8 @@ SET(MAN1_TEST mysql-stress-test.pl.1 mys
- 
- INSTALL(FILES ${MAN1_SERVER} DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT ManPagesServer)
- INSTALL(FILES ${MAN8_SERVER} DESTINATION ${INSTALL_MANDIR}/man8 COMPONENT ManPagesServer)
-+IF(FALSE)
- INSTALL(FILES ${MAN1_CLIENT} DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT ManPagesClient)
- INSTALL(FILES ${MAN1_DEVEL} DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT ManPagesDevelopment)
- INSTALL(FILES ${MAN1_TEST} DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT ManPagesTest)
-
-+ENDIF()
--- a/databases/mariadb102-server/files/patch-mysys_my__default.c
+++ b/databases/mariadb102-server/files/patch-mysys_my__default.c
@ -1,52 +0,0 @@
--- mysys/my_default.c.orig	2017-05-14 23:13:17 UTC
-+++ mysys/my_default.c
-@@ -785,7 +785,7 @@ static int search_default_file_with_ext(
-   {
-     MY_STAT stat_info;
-     if (!my_stat(name,&stat_info,MYF(0)))
-      return 1;
-+      return 0;
-     /*
-       Ignore world-writable regular files.
-       This is mainly done to protect us to not read a file created by
-@@ -803,6 +803,14 @@ static int search_default_file_with_ext(
-   if (!(fp= mysql_file_fopen(key_file_cnf, name, O_RDONLY, MYF(0))))
-     return 1;					/* Ignore wrong files */
- 
-+  if (strstr(name, "/etc") == name)
-+  {
-+    fprintf(stderr,
-+             "error: Config file %s in invalid location, please move to or merge with /usr/local%s\n",
-+             name,name);
-+      goto err;
-+  }
-+
-   while (mysql_file_fgets(buff, sizeof(buff) - 1, fp))
-   {
-     line++;
-@@ -1067,7 +1075,8 @@ void my_print_default_files(const char *
-           if (name[0] == FN_HOMELIB)	/* Add . to filenames in home */
-             *end++= '.';
-           strxmov(end, conf_file, *ext, " ", NullS);
-          fputs(name, stdout);
-+          if (strstr(name, "/etc") != name)
-+            fputs(name, stdout);
-         }
-       }
-     }
-@@ -1192,13 +1201,10 @@ static const char **init_default_directo
- 
- #else
- 
-#if defined(DEFAULT_SYSCONFDIR)
-  if (DEFAULT_SYSCONFDIR[0])
-    errors += add_directory(alloc, DEFAULT_SYSCONFDIR, dirs);
-#else
-   errors += add_directory(alloc, "/etc/", dirs);
-   errors += add_directory(alloc, "/etc/mysql/", dirs);
-#endif /* DEFAULT_SYSCONFDIR */
-+  errors += add_directory(alloc, "/usr/local/etc/", dirs);
-+  errors += add_directory(alloc, "/usr/local/etc/mysql/", dirs);
- 
- #endif
- 
--- a/databases/mariadb102-server/files/patch-oqgraph-MDEV-15291
+++ b/databases/mariadb102-server/files/patch-oqgraph-MDEV-15291
@ -1,40 +0,0 @@
--- storage/oqgraph/oqgraph_judy.cc.orig	2018-02-12 15:01:28 UTC
-+++ storage/oqgraph/oqgraph_judy.cc
-@@ -27,7 +27,7 @@
- /*
-   Currently the only active code that can return error is:
-     judy_bitset::reset()/J1U()
-    judy_bitset::setbit()/J1S()
-+    judy_bitset::jsetbit()/J1S()
- 
-   In most cases errors are either about wrong parameters passed to Judy
-   functions or internal structures corruption. These definitely deserve
-@@ -60,7 +60,7 @@ bool open_query::judy_bitset::test(size_
-   return rc == 1;
- }
- 
-open_query::judy_bitset& open_query::judy_bitset::setbit(size_type n)
-+open_query::judy_bitset& open_query::judy_bitset::jsetbit(size_type n)
- {
-   int rc;
-   J1S(rc, array, n);
--- storage/oqgraph/oqgraph_judy.h.orig	2018-02-12 15:01:28 UTC
-+++ storage/oqgraph/oqgraph_judy.h
-@@ -63,7 +63,7 @@ namespace open_query
-       if (!val)
-         return reset(n);
-       else
-        return setbit(n);
-+        return jsetbit(n);
-     }
- 
-     judy_bitset& set(const judy_bitset& src);
-@@ -115,7 +115,7 @@ namespace open_query
-   private:
-     mutable void* array;
- 
-    judy_bitset& setbit(size_type n);
-+    judy_bitset& jsetbit(size_type n);
-   };
- }
- 
--- a/databases/mariadb102-server/files/patch-pcre_CMakeLists.txt
+++ b/databases/mariadb102-server/files/patch-pcre_CMakeLists.txt
@ -1,11 +0,0 @@
--- pcre/CMakeLists.txt.orig	2017-08-17 10:05:39 UTC
-+++ pcre/CMakeLists.txt
-@@ -510,6 +510,8 @@ IF(PCRE_SHOW_REPORT)
-   MESSAGE(STATUS "")
- ENDIF(PCRE_SHOW_REPORT)
- 
-+IF(FALSE)
- INSTALL(FILES ${CMAKE_BINARY_DIR}/pcre/pcre.h DESTINATION ${INSTALL_INCLUDEDIR}/server/private COMPONENT Development)
-+ENDIF()
- 
- # end CMakeLists.txt
--- a/databases/mariadb102-server/files/patch-scripts_mysql__config.sh
+++ b/databases/mariadb102-server/files/patch-scripts_mysql__config.sh
@ -1,12 +0,0 @@
--- scripts/mysql_config.sh.orig	2017-05-24 09:15:23 UTC
-+++ scripts/mysql_config.sh
-@@ -106,7 +106,9 @@ fi
- 
- # Create options 
- libs="-L$pkglibdir @RPATH_OPTION@ @LIBS_FOR_CLIENTS@"
-+libs="$libs -L/usr/local/lib "
- embedded_libs="-L$pkglibdir @RPATH_OPTION@ @EMB_LIBS_FOR_CLIENTS@"
-+embedded_libs="$embedded_libs -L/usr/local/lib "
- 
- include="-I$pkgincludedir"
- if [ "$basedir" != "/usr" ]; then
--- a/databases/mariadb102-server/files/patch-scripts_mysqld__safe.sh
+++ b/databases/mariadb102-server/files/patch-scripts_mysqld__safe.sh
@ -1,16 +0,0 @@
--- scripts/mysqld_safe.sh.orig	2017-05-24 09:15:23 UTC
-+++ scripts/mysqld_safe.sh
-@@ -568,11 +568,11 @@ fi
- 
- if test -z "$MYSQL_HOME"
- then 
-  if test -r "$DATADIR/my.cnf"
-+  if test -r "$DATADIR/etc/my.cnf"
-   then
-     log_error "WARNING: Found $DATADIR/my.cnf
- The data directory is not a valid location for my.cnf, please move it to
-$MY_BASEDIR_VERSION/my.cnf"
-+$MY_BASEDIR_VERSION/etc/my.cnf"
-   fi
-   MYSQL_HOME=$MY_BASEDIR_VERSION
- fi
--- a/databases/mariadb102-server/files/patch-scripts_wsrepsstmariabackup.sh
+++ b/databases/mariadb102-server/files/patch-scripts_wsrepsstmariabackup.sh
@ -1,11 +0,0 @@
--- scripts/wsrep_sst_mariabackup.sh.orig	2019-12-11 19:29:57 UTC
-+++ scripts/wsrep_sst_mariabackup.sh
-@@ -605,7 +605,7 @@ recv_joiner()
-     set +e
- 
-     if [[ $tmt -gt 0 ]] && command -v timeout >/dev/null;then
-        if timeout --help | grep -q -- '-k';then 
-+        if timeout --help 2>&1 | grep -q -- '-k';then 
-             ltcmd="timeout -k $(( tmt+10 )) $tmt $tcmd"
-         else 
-             ltcmd="timeout -s9 $tmt $tcmd"
--- a/databases/mariadb102-server/files/patch-sql-common_client.c
+++ b/databases/mariadb102-server/files/patch-sql-common_client.c
@ -1,13 +0,0 @@
--- sql-common/client.c.orig	2018-01-03 14:48:29.000000000 +0100
-+++ sql-common/client.c	2018-01-24 00:45:11.194419000 +0100
-@@ -104,6 +104,10 @@
- #define CONNECT_TIMEOUT 0
- #endif
- 
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) || defined(HAVE_YASSL)
-+#define ASN1_STRING_get0_data(X) ASN1_STRING_data(X)
-+#endif
-+
- #include "client_settings.h"
- #include <ssl_compat.h>
- #include <sql_common.h>
--- a/databases/mariadb102-server/files/patch-sql_CMakeLists.txt
+++ b/databases/mariadb102-server/files/patch-sql_CMakeLists.txt
@ -1,28 +0,0 @@
--- sql/CMakeLists.txt.orig	2017-08-17 10:05:40 UTC
-+++ sql/CMakeLists.txt
-@@ -386,6 +386,7 @@ ADD_CUSTOM_TARGET(distclean
-   VERBATIM
-   )
- 
-+IF(FALSE)
- IF(INSTALL_LAYOUT STREQUAL "STANDALONE")
- 
- # Copy db.opt into data/test/
-@@ -429,6 +430,7 @@ ELSE()
-   INSTALL(FILES ${DUMMY_FILE} DESTINATION data/mysql COMPONENT DataFiles)
- ENDIF(WIN32 AND MYSQLD_EXECUTABLE)
- ENDIF(INSTALL_LAYOUT STREQUAL "STANDALONE")
-+ENDIF()
- 
- IF(WIN32)
-   SET(my_bootstrap_sql ${CMAKE_CURRENT_BINARY_DIR}/my_bootstrap.sql)
-@@ -472,7 +474,9 @@ IF(WIN32)
-   TARGET_LINK_LIBRARIES(mysql_upgrade_service mysys winservice)
- ENDIF(WIN32)
- 
-+IF(FALSE)
- INSTALL(DIRECTORY . DESTINATION ${INSTALL_INCLUDEDIR}/server/private COMPONENT Development
-   FILES_MATCHING PATTERN "*.h"
-   PATTERN share EXCLUDE
-   PATTERN CMakeFiles EXCLUDE)
-+ENDIF()
--- a/databases/mariadb102-server/files/patch-sql_mysqld.cc
+++ b/databases/mariadb102-server/files/patch-sql_mysqld.cc
@ -1,13 +0,0 @@
--- sql/mysqld.cc.orig	2017-05-14 23:13:18 UTC
-+++ sql/mysqld.cc
-@@ -4838,8 +4840,9 @@ static void init_ssl()
-       while ((err= ERR_get_error()))
-         sql_print_warning("SSL error: %s", ERR_error_string(err, NULL));
-     }
-    else
-+    else {
-       ERR_remove_state(0);
-+    }
-   }
-   else
-   {
--- a/databases/mariadb102-server/files/patch-sql_share_CMakeLists.txt
+++ b/databases/mariadb102-server/files/patch-sql_share_CMakeLists.txt
@ -1,14 +0,0 @@
--- sql/share/CMakeLists.txt.orig	2018-08-12 11:29:50 UTC
-+++ sql/share/CMakeLists.txt
-@@ -45,9 +45,11 @@ SET(files 
-  errmsg-utf8.txt
- )
- 
-+IF (NOT WITHOUT_CLIENT)
- INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/charsets DESTINATION ${INSTALL_MYSQLSHAREDIR}
-   COMPONENT Common PATTERN "languages.html" EXCLUDE
- )
-+ENDIF()
- 
- IF (NOT WITHOUT_SERVER)
-   FOREACH (dir ${dirs})
--- a/databases/mariadb102-server/files/patch-sql_slave.cc
+++ b/databases/mariadb102-server/files/patch-sql_slave.cc
@ -1,14 +0,0 @@
--- sql/slave.cc.orig	2017-05-14 23:13:18 UTC
-+++ sql/slave.cc
-@@ -14,6 +14,11 @@
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
- 
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+#define ERR_remove_state(X)
-+#elif defined(HAVE_ERR_remove_thread_state)
-+#define ERR_remove_state(X) ERR_remove_thread_state(NULL)
-+#endif
- 
- /**
-   @addtogroup Replication
--- a/databases/mariadb102-server/files/patch-sql_sql__trigger.cc
+++ b/databases/mariadb102-server/files/patch-sql_sql__trigger.cc
@ -1,52 +0,0 @@
-Fix clang build error
-
--- sql/sql_trigger.cc.orig	2017-05-14 23:13:18 UTC
-+++ sql/sql_trigger.cc
-@@ -177,32 +177,32 @@ static File_option triggers_file_paramet
- {
-   {
-     { C_STRING_WITH_LEN("triggers") },
-    my_offsetof(class Table_triggers_list, definitions_list),
-+    static_cast<int>(my_offsetof(class Table_triggers_list, definitions_list)),
-     FILE_OPTIONS_STRLIST
-   },
-   {
-     { C_STRING_WITH_LEN("sql_modes") },
-    my_offsetof(class Table_triggers_list, definition_modes_list),
-+    static_cast<int>(my_offsetof(class Table_triggers_list, definition_modes_list)),
-     FILE_OPTIONS_ULLLIST
-   },
-   {
-     { C_STRING_WITH_LEN("definers") },
-    my_offsetof(class Table_triggers_list, definers_list),
-+    static_cast<int>(my_offsetof(class Table_triggers_list, definers_list)),
-     FILE_OPTIONS_STRLIST
-   },
-   {
-     { C_STRING_WITH_LEN("client_cs_names") },
-    my_offsetof(class Table_triggers_list, client_cs_names),
-+    static_cast<int>(my_offsetof(class Table_triggers_list, client_cs_names)),
-     FILE_OPTIONS_STRLIST
-   },
-   {
-     { C_STRING_WITH_LEN("connection_cl_names") },
-    my_offsetof(class Table_triggers_list, connection_cl_names),
-+    static_cast<int>(my_offsetof(class Table_triggers_list, connection_cl_names)),
-     FILE_OPTIONS_STRLIST
-   },
-   {
-     { C_STRING_WITH_LEN("db_cl_names") },
-    my_offsetof(class Table_triggers_list, db_cl_names),
-+    static_cast<int>(my_offsetof(class Table_triggers_list, db_cl_names)),
-     FILE_OPTIONS_STRLIST
-   },
-   {
-@@ -216,7 +216,7 @@ static File_option triggers_file_paramet
- File_option sql_modes_parameters=
- {
-   { C_STRING_WITH_LEN("sql_modes") },
-  my_offsetof(class Table_triggers_list, definition_modes_list),
-+  static_cast<int>(my_offsetof(class Table_triggers_list, definition_modes_list)),
-   FILE_OPTIONS_ULLLIST
- };
- 
--- a/databases/mariadb102-server/files/patch-sql_sql__view.cc
+++ b/databases/mariadb102-server/files/patch-sql_sql__view.cc
@ -1,65 +0,0 @@
-Fix clang build error
-
--- sql/sql_view.cc.orig	2017-05-14 23:13:18 UTC
-+++ sql/sql_view.cc
-@@ -736,46 +736,46 @@ static const int required_view_parameter
- */
- static File_option view_parameters[]=
- {{{ C_STRING_WITH_LEN("query")},
-  my_offsetof(TABLE_LIST, select_stmt),
-+  static_cast<int>(my_offsetof(TABLE_LIST, select_stmt)),
-   FILE_OPTIONS_ESTRING},
-  {{ C_STRING_WITH_LEN("md5")},
-  my_offsetof(TABLE_LIST, md5),
-+  static_cast<int>(my_offsetof(TABLE_LIST, md5)),
-   FILE_OPTIONS_STRING},
-  {{ C_STRING_WITH_LEN("updatable")},
-  my_offsetof(TABLE_LIST, updatable_view),
-+  static_cast<int>(my_offsetof(TABLE_LIST, updatable_view)),
-   FILE_OPTIONS_ULONGLONG},
-  {{ C_STRING_WITH_LEN("algorithm")},
-  my_offsetof(TABLE_LIST, algorithm),
-+  static_cast<int>(my_offsetof(TABLE_LIST, algorithm)),
-   FILE_OPTIONS_VIEW_ALGO},
-  {{ C_STRING_WITH_LEN("definer_user")},
-  my_offsetof(TABLE_LIST, definer.user),
-+  static_cast<int>(my_offsetof(TABLE_LIST, definer.user)),
-   FILE_OPTIONS_STRING},
-  {{ C_STRING_WITH_LEN("definer_host")},
-  my_offsetof(TABLE_LIST, definer.host),
-+  static_cast<int>(my_offsetof(TABLE_LIST, definer.host)),
-   FILE_OPTIONS_STRING},
-  {{ C_STRING_WITH_LEN("suid")},
-  my_offsetof(TABLE_LIST, view_suid),
-+  static_cast<int>(my_offsetof(TABLE_LIST, view_suid)),
-   FILE_OPTIONS_ULONGLONG},
-  {{ C_STRING_WITH_LEN("with_check_option")},
-  my_offsetof(TABLE_LIST, with_check),
-+  static_cast<int>(my_offsetof(TABLE_LIST, with_check)),
-   FILE_OPTIONS_ULONGLONG},
-  {{ C_STRING_WITH_LEN("timestamp")},
-  my_offsetof(TABLE_LIST, timestamp),
-+  static_cast<int>(my_offsetof(TABLE_LIST, timestamp)),
-   FILE_OPTIONS_TIMESTAMP},
-  {{ C_STRING_WITH_LEN("create-version")},
-  my_offsetof(TABLE_LIST, file_version),
-+  static_cast<int>(my_offsetof(TABLE_LIST, file_version)),
-   FILE_OPTIONS_ULONGLONG},
-  {{ C_STRING_WITH_LEN("source")},
-  my_offsetof(TABLE_LIST, source),
-+  static_cast<int>(my_offsetof(TABLE_LIST, source)),
-   FILE_OPTIONS_ESTRING},
-  {{(char*) STRING_WITH_LEN("client_cs_name")},
-  my_offsetof(TABLE_LIST, view_client_cs_name),
-+  static_cast<int>(my_offsetof(TABLE_LIST, view_client_cs_name)),
-   FILE_OPTIONS_STRING},
-  {{(char*) STRING_WITH_LEN("connection_cl_name")},
-  my_offsetof(TABLE_LIST, view_connection_cl_name),
-+  static_cast<int>(my_offsetof(TABLE_LIST, view_connection_cl_name)),
-   FILE_OPTIONS_STRING},
-  {{(char*) STRING_WITH_LEN("view_body_utf8")},
-  my_offsetof(TABLE_LIST, view_body_utf8),
-+  static_cast<int>(my_offsetof(TABLE_LIST, view_body_utf8)),
-   FILE_OPTIONS_ESTRING},
-  {{ C_STRING_WITH_LEN("mariadb-version")},
-   my_offsetof(TABLE_LIST, mariadb_version),
--- a/databases/mariadb102-server/files/patch-sql_sys__vars.cc
+++ b/databases/mariadb102-server/files/patch-sql_sys__vars.cc
@ -1,40 +0,0 @@
-Fix clang build error
-
--- sql/sys_vars.cc.orig	2017-05-14 23:13:18 UTC
-+++ sql/sys_vars.cc
-@@ -1067,7 +1067,7 @@ static Sys_var_ulong Sys_interactive_tim
-        "connection before closing it",
-        NO_SET_STMT SESSION_VAR(net_interactive_timeout),
-        CMD_LINE(REQUIRED_ARG),
-       VALID_RANGE(1, LONG_TIMEOUT), DEFAULT(NET_WAIT_TIMEOUT), BLOCK_SIZE(1));
-+       VALID_RANGE(1, INT_MAX32/1000), DEFAULT(NET_WAIT_TIMEOUT), BLOCK_SIZE(1));
- 
- static Sys_var_ulonglong Sys_join_buffer_size(
-        "join_buffer_size",
-@@ -2242,7 +2242,7 @@ static Sys_var_ulong Sys_net_read_timeou
-        "Number of seconds to wait for more data from a connection before "
-        "aborting the read",
-        SESSION_VAR(net_read_timeout), CMD_LINE(REQUIRED_ARG),
-       VALID_RANGE(1, LONG_TIMEOUT), DEFAULT(NET_READ_TIMEOUT), BLOCK_SIZE(1),
-+       VALID_RANGE(1, INT_MAX32/1000), DEFAULT(NET_READ_TIMEOUT), BLOCK_SIZE(1),
-        NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0),
-        ON_UPDATE(fix_net_read_timeout));
- 
-@@ -2257,7 +2257,7 @@ static Sys_var_ulong Sys_net_write_timeo
-        "Number of seconds to wait for a block to be written to a connection "
-        "before aborting the write",
-        SESSION_VAR(net_write_timeout), CMD_LINE(REQUIRED_ARG),
-       VALID_RANGE(1, LONG_TIMEOUT), DEFAULT(NET_WRITE_TIMEOUT), BLOCK_SIZE(1),
-+       VALID_RANGE(1, INT_MAX32/1000), DEFAULT(NET_WRITE_TIMEOUT), BLOCK_SIZE(1),
-        NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0),
-        ON_UPDATE(fix_net_write_timeout));
- 
-@@ -3505,7 +3505,7 @@ static Sys_var_ulong Sys_net_wait_timeou
-        "The number of seconds the server waits for activity on a "
-        "connection before closing it",
-        NO_SET_STMT SESSION_VAR(net_wait_timeout), CMD_LINE(REQUIRED_ARG),
-       VALID_RANGE(1, IF_WIN(INT_MAX32/1000, LONG_TIMEOUT)),
-+       VALID_RANGE(1, INT_MAX32/1000),
-        DEFAULT(NET_WAIT_TIMEOUT), BLOCK_SIZE(1));
- 
- static Sys_var_plugin Sys_default_storage_engine(
--- a/Show More
+++ b/Show More