Remove expired ports:

2020-04-11 databases/mariadb55-server: Upstream end-of-life 2020-04-11, switch to a newer version 2020-04-11 databases/mariadb55-client: Upstream end-of-life 2020-04-11, switch to a newer version
svn path=/head/; revision=531502
2024-12-22 04:17:44 +00:00 · 2020-04-12 10:23:29 +00:00 · 2020-04-12 10:23:29 +00:00 · 4d21eb6b10 · 2021-03-31 03:12:20 +00:00
commit 4d21eb6b10
parent 09fb8fcc25
46 changed files with 2 additions and 1666 deletions
--- a/2
+++ b/2
@ -14524,3 +14524,5 @@ devel/p5-Glib2|devel/p5-Glib|2020-04-07|Rename to match our p5- port naming
 devel/jucipp|editors/jucipp|2020-04-07|Remove duplicate
 www/py-django_polymorphic|www/py-django-polymorphic|2020-04-11|Match canonical/registered (PyPI/CHEESESHOP) name
 dns/dnsmasq-devel|dns/dnsmasq|2020-04-12|dnsmasq is newer than dnsmasq-devel
+databases/mariadb55-server|databases/mariadb102-server|2020-04-12|Has expired: Upstream end-of-life 2020-04-11, switch to a newer version
+databases/mariadb55-client|databases/mariadb102-client|2020-04-12|Has expired: Upstream end-of-life 2020-04-11, switch to a newer version
--- a/databases/Makefile
+++ b/databases/Makefile
@ -182,8 +182,6 @@
    SUBDIR += mariadb103-server
    SUBDIR += mariadb104-client
    SUBDIR += mariadb104-server
-    SUBDIR += mariadb55-client
-    SUBDIR += mariadb55-server
    SUBDIR += mdbtools
    SUBDIR += mdcached
    SUBDIR += memcached
--- a/databases/mariadb55-client/Makefile
+++ b/databases/mariadb55-client/Makefile
@ -1,30 +0,0 @@
-# $FreeBSD$
-
-PORTNAME=	mariadb
-PKGNAMESUFFIX=	55-client
-
-COMMENT=	Multithreaded SQL database (client)
-
-LICENSE+=	LGPL21
-
-MASTERDIR=	${.CURDIR}/../mariadb55-server
-
-FILESDIR=	${.CURDIR}/files
-PATCHDIR=	${.CURDIR}/files
-PLIST=		${.CURDIR}/pkg-plist
-
-CONFLICTS_INSTALL=	mariadb5[0-46-9]-client-* \
-			mariadb1*-client-* \
-			mysql*-client-* \
-			percona*-client-*
-
-CMAKE_ARGS+=	-DWITHOUT_SERVER=1
-CLIENT_ONLY=	yes
-
-USES=		ncurses readline
-
-post-install:
-	${RM} ${STAGEDIR}${PREFIX}/bin/mysqld_safe_helper
-	${RM} -r ${STAGEDIR}${PREFIX}/include/mysql/private
-
-.include "${MASTERDIR}/Makefile"
--- a/databases/mariadb55-client/files/patch-CMakeLists.txt
+++ b/databases/mariadb55-client/files/patch-CMakeLists.txt
@ -1,55 +0,0 @@
--- CMakeLists.txt.orig	2017-04-30 11:09:29 UTC
-+++ CMakeLists.txt
-@@ -393,28 +393,8 @@ ADD_SUBDIRECTORY(client)
- ADD_SUBDIRECTORY(extra)
- ADD_SUBDIRECTORY(libservices)
- ADD_SUBDIRECTORY(scripts)
-ADD_SUBDIRECTORY(sql/share)
- ADD_SUBDIRECTORY(support-files)
- 
-IF(NOT WITHOUT_SERVER)
-  ADD_SUBDIRECTORY(tests)
-  ADD_SUBDIRECTORY(sql)
-  OPTION (WITH_EMBEDDED_SERVER "Compile MySQL with embedded server" OFF)
-  IF(WITH_EMBEDDED_SERVER) 
-   ADD_SUBDIRECTORY(libmysqld)
-   ADD_SUBDIRECTORY(libmysqld/examples)
-  ENDIF(WITH_EMBEDDED_SERVER)
-
-  ADD_SUBDIRECTORY(mysql-test)
-  ADD_SUBDIRECTORY(mysql-test/lib/My/SafeProcess)
-  ADD_SUBDIRECTORY(sql-bench)
-
-  IF(EXISTS ${CMAKE_SOURCE_DIR}/internal/CMakeLists.txt)
-    ADD_SUBDIRECTORY(internal)
-  ENDIF()
-  ADD_SUBDIRECTORY(packaging/rpm-oel)
-ENDIF()
-
- IF(UNIX)
-   ADD_SUBDIRECTORY(man)
- ENDIF()
-@@ -426,7 +406,6 @@ IF(WIN32)
-   ADD_SUBDIRECTORY(win/upgrade_wizard)
-   ADD_SUBDIRECTORY(win/packaging)
- ENDIF()
-ADD_SUBDIRECTORY(packaging/solaris)
- 
- CONFIGURE_FILE(config.h.cmake   ${CMAKE_BINARY_DIR}/include/my_config.h)
- CONFIGURE_FILE(config.h.cmake   ${CMAKE_BINARY_DIR}/include/config.h)
-@@ -460,6 +439,7 @@ ADD_CUSTOM_TARGET(INFO_BIN ALL
-   WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
- )
- 
-+IF(FALSE)
- INSTALL_DOCUMENTATION(README COPYING EXCEPTIONS-CLIENT COMPONENT Readme)
- 
- # MDEV-6526 these files are not installed anymore
-@@ -469,6 +449,7 @@ INSTALL_DOCUMENTATION(README COPYING EXC
- IF(UNIX)
-   INSTALL_DOCUMENTATION(Docs/INSTALL-BINARY COMPONENT Readme)
- ENDIF()
-+ENDIF()
- 
- INCLUDE(CPack)
- 
--- a/databases/mariadb55-client/files/patch-client_CMakeLists.txt
+++ b/databases/mariadb55-client/files/patch-client_CMakeLists.txt
@ -1,52 +0,0 @@
--- client/CMakeLists.txt.orig	2019-04-26 12:37:01 UTC
-+++ client/CMakeLists.txt
-@@ -35,12 +35,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 regex)
- SET_TARGET_PROPERTIES(mysqltest PROPERTIES ENABLE_EXPORTS TRUE)
-+ENDIF()
- 
-
- MYSQL_ADD_EXECUTABLE(mysqlcheck mysqlcheck.c)
- TARGET_LINK_LIBRARIES(mysqlcheck mysqlclient)
- 
-@@ -51,15 +52,19 @@ 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)
-@@ -76,11 +81,13 @@ 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 (mysqlcheck mysqldump mysqlimport mysqlshow mysqlslap
- PROPERTIES HAS_CXX TRUE)
- 
- ADD_DEFINITIONS(-DHAVE_DLOPEN)
--- a/databases/mariadb55-client/files/patch-cmake_jemalloc.cmake
+++ b/databases/mariadb55-client/files/patch-cmake_jemalloc.cmake
@ -1,16 +0,0 @@
--- cmake/jemalloc.cmake.orig	2017-04-30 11:09:29 UTC
-+++ cmake/jemalloc.cmake
-@@ -22,11 +22,11 @@ MACRO (CHECK_JEMALLOC)
-       SET(libname jemalloc)
-     ENDIF()
- 
-    CHECK_LIBRARY_EXISTS(${libname} malloc_stats_print "" HAVE_JEMALLOC)
-+    CHECK_LIBRARY_EXISTS(c malloc_stats_print "" HAVE_JEMALLOC)
-     SET(CMAKE_REQUIRED_LIBRARIES)
- 
-     IF (HAVE_JEMALLOC)
-      SET(LIBJEMALLOC ${libname})
-+      SET(LIBJEMALLOC c)
-     ELSEIF (NOT WITH_JEMALLOC STREQUAL "auto")
-       MESSAGE(FATAL_ERROR "${libname} is not found")
-     ENDIF()
--- a/databases/mariadb55-client/files/patch-extra_CMakeLists.txt
+++ b/databases/mariadb55-client/files/patch-extra_CMakeLists.txt
@ -1,25 +0,0 @@
--- extra/CMakeLists.txt.orig	2017-04-30 11:09:29 UTC
-+++ extra/CMakeLists.txt
-@@ -54,6 +54,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)
- 
-@@ -74,11 +75,14 @@ ENDIF()
- 
- MYSQL_ADD_EXECUTABLE(replace replace.c COMPONENT Server)
- TARGET_LINK_LIBRARIES(replace mysys)
-+ENDIF()
- IF(UNIX)
-+IF(FALSE)
-   MYSQL_ADD_EXECUTABLE(innochecksum innochecksum.c)
- 
-   MYSQL_ADD_EXECUTABLE(resolve_stack_dump resolve_stack_dump.c)
-   TARGET_LINK_LIBRARIES(resolve_stack_dump mysys)
-+ENDIF()
- 
-   MYSQL_ADD_EXECUTABLE(mysql_waitpid mysql_waitpid.c COMPONENT Client)
-   TARGET_LINK_LIBRARIES(mysql_waitpid mysys)
--- a/databases/mariadb55-client/files/patch-extra_yassl_taocrypt_src_integer.cpp
+++ b/databases/mariadb55-client/files/patch-extra_yassl_taocrypt_src_integer.cpp
@ -1,11 +0,0 @@
--- extra/yassl/taocrypt/src/integer.cpp.orig	2017-04-30 11:09:29 UTC
-+++ extra/yassl/taocrypt/src/integer.cpp
-@@ -74,7 +74,7 @@ template <class T>
- CPP_TYPENAME AlignedAllocator<T>::pointer AlignedAllocator<T>::allocate(
-                                            size_type n, const void *)
- {
-    if (n > this->max_size())
-+    if (n > AlignedAllocator<T>::max_size())
-         return 0;
-     if (n == 0)
-         return 0;
--- a/databases/mariadb55-client/files/patch-include_CMakeLists.txt
+++ b/databases/mariadb55-client/files/patch-include_CMakeLists.txt
@ -1,25 +0,0 @@
--- include/CMakeLists.txt.orig	2017-04-30 11:09:29 UTC
-+++ include/CMakeLists.txt
-@@ -59,16 +59,21 @@ 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()
- 
- INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/. DESTINATION ${INSTALL_INCLUDEDIR}/private COMPONENT Development
-   FILES_MATCHING PATTERN "*.h"
--- a/databases/mariadb55-client/files/patch-include_my__compare.h
+++ b/databases/mariadb55-client/files/patch-include_my__compare.h
@ -1,11 +0,0 @@
--- include/my_compare.h.orig	2017-04-30 11:09: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/mariadb55-client/files/patch-libservices_CMakeLists.txt
+++ b/databases/mariadb55-client/files/patch-libservices_CMakeLists.txt
@ -1,9 +0,0 @@
--- libservices/CMakeLists.txt.orig	2017-04-30 11:09:29 UTC
-+++ libservices/CMakeLists.txt
-@@ -26,4 +26,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/mariadb55-client/files/patch-man_CMakeLists.txt
+++ b/databases/mariadb55-client/files/patch-man_CMakeLists.txt
@ -1,16 +0,0 @@
--- man/CMakeLists.txt.orig	2017-04-30 11:09: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/mariadb55-client/files/patch-mysys_default.c
+++ b/databases/mariadb55-client/files/patch-mysys_default.c
@ -1,58 +0,0 @@
--- mysys/default.c.orig	2017-04-30 11:09:31 UTC
-+++ mysys/default.c
-@@ -89,7 +89,7 @@ static my_bool defaults_already_read= FA
- 
- /* Which directories are searched for options (and in which order) */
- 
-#define MAX_DEFAULT_DIRS 6
-+#define MAX_DEFAULT_DIRS 7
- #define DEFAULT_DIRS_SIZE (MAX_DEFAULT_DIRS + 1)  /* Terminate with NULL */
- static const char **default_directories = NULL;
- 
-@@ -786,7 +786,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
-@@ -804,6 +804,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 %%PREFIX%%%s\n",
-+	      name,name);
-+      goto err;
-+  }
-+
-   while (mysql_file_fgets(buff, sizeof(buff) - 1, fp))
-   {
-     line++;
-@@ -1068,7 +1076,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);
-         }
-       }
-     }
-@@ -1227,10 +1236,8 @@ static const char **init_default_directo
-   errors += add_directory(alloc, "/etc/", dirs);
-   errors += add_directory(alloc, "/etc/mysql/", dirs);
- 
-#if defined(DEFAULT_SYSCONFDIR)
-  if (DEFAULT_SYSCONFDIR[0])
-    errors += add_directory(alloc, DEFAULT_SYSCONFDIR, dirs);
-#endif /* DEFAULT_SYSCONFDIR */
-+  errors += add_directory(alloc, "%%PREFIX%%/etc/", dirs);
-+  errors += add_directory(alloc, "%%PREFIX%%/etc/mysql/", dirs);
- 
- #endif
- 
--- a/databases/mariadb55-client/files/patch-regex_CMakeLists.txt
+++ b/databases/mariadb55-client/files/patch-regex_CMakeLists.txt
@ -1,9 +0,0 @@
--- regex/CMakeLists.txt.orig	2017-04-30 11:09:31 UTC
-+++ regex/CMakeLists.txt
-@@ -18,4 +18,6 @@ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/
- SET(REGEX_SOURCES regcomp.c regerror.c regexec.c regfree.c reginit.c)
- ADD_CONVENIENCE_LIBRARY(regex ${REGEX_SOURCES})
- 
-+IF(FALSE)
- INSTALL(FILES "my_regex.h" DESTINATION ${INSTALL_INCLUDEDIR}/private COMPONENT Development)
-+ENDIF()
--- a/databases/mariadb55-client/files/patch-scripts_CMakeLists.txt
+++ b/databases/mariadb55-client/files/patch-scripts_CMakeLists.txt
@ -1,78 +0,0 @@
--- scripts/CMakeLists.txt.orig	2017-04-30 11:09:31 UTC
-+++ scripts/CMakeLists.txt
-@@ -72,6 +72,7 @@ IF(UNIX)
- )
- ENDIF()
- 
-+IF(FALSE)
- INSTALL(FILES 
-   ${CMAKE_CURRENT_SOURCE_DIR}/mysql_system_tables.sql 
-   ${CMAKE_CURRENT_SOURCE_DIR}/mysql_system_tables_data.sql
-@@ -81,6 +82,7 @@ INSTALL(FILES 
-   ${FIX_PRIVILEGES_SQL}
-   DESTINATION ${INSTALL_MYSQLSHAREDIR} COMPONENT Server
- )
-+ENDIF()
- 
- # TCMalloc hacks
- IF(MALLOC_LIB)
-@@ -133,6 +135,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})
-@@ -173,6 +176,7 @@ INSTALL_SCRIPT(${CMAKE_CURRENT_BINARY_DI
-   DESTINATION ${INSTALL_BINDIR}
-   COMPONENT Server
-   )
-+ENDIF()
- 
- ENDIF(UNIX)
- 
-@@ -197,6 +201,7 @@ ELSE()
-   SET(localstatedir ${MYSQL_DATADIR})
- ENDIF()
- 
-+IF()
- IF(UNIX)
- CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/mysql_install_db.sh
-   ${CMAKE_CURRENT_BINARY_DIR}/mysql_install_db ESCAPE_QUOTES @ONLY)
-@@ -212,6 +217,7 @@ INSTALL_SCRIPT(
-   COMPONENT Server
-   )
- ENDIF()
-+ENDIF()
- 
- SET(prefix "${CMAKE_INSTALL_PREFIX}")
- SET(sysconfdir ${prefix})
-@@ -270,6 +276,8 @@ MACRO(EXTRACT_LINK_LIBRARIES target var)
-             STRING(REGEX REPLACE "^lib" "" lib "${lib}")
-             SET(${var} "${${var}}-l${lib} " ) 
-           ENDIF()
-+        ELSEIF(lib STREQUAL "-pthread")
-+          SET(${var} "${${var}}-pthread " )
-         ELSE()
-           SET(${var} "${${var}}-l${lib} " ) 
-         ENDIF()
-@@ -328,18 +336,8 @@ ELSE()
-   SET(BIN_SCRIPTS
-     msql2mysql
-     mysql_config
-    mysql_fix_extensions
-    mysql_setpermission
-    mysql_secure_installation
-    mysql_zap
-     mysqlaccess
-    mysql_convert_table_format
-     mysql_find_rows
-    mytop
-    mysqlhotcopy
-    mysqldumpslow
-    mysqld_multi
-    mysqld_safe
-   )
-   FOREACH(file ${BIN_SCRIPTS})
-     IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh)
--- a/databases/mariadb55-client/files/patch-scripts_mysql__config.sh
+++ b/databases/mariadb55-client/files/patch-scripts_mysql__config.sh
@ -1,14 +0,0 @@
--- scripts/mysql_config.sh.orig	2017-04-30 11:09:31 UTC
-+++ scripts/mysql_config.sh
-@@ -109,8 +109,11 @@ fi
- # We intentionally add a space to the beginning and end of lib strings, simplifies replace later
- libs=" $ldflags -L$pkglibdir @RPATH_OPTION@ -lmysqlclient @ZLIB_DEPS@ @NON_THREADED_LIBS@"
- libs="$libs @openssl_libs@ @STATIC_NSS_FLAGS@ "
-+libs="$libs -L%%LOCALBASE%%/lib "
- libs_r=" $ldflags -L$pkglibdir  @RPATH_OPTION@ -lmysqlclient_r @ZLIB_DEPS@ @CLIENT_LIBS@ @openssl_libs@ "
-+libs_r="$libs_r -L%%LOCALBASE%%/lib "
- embedded_libs=" $ldflags -L$pkglibdir @RPATH_OPTION@ -lmysqld @LIBDL@ @ZLIB_DEPS@ @LIBS@ @WRAPLIBS@ @openssl_libs@ "
-+embedded_libs="$embedded_libs -L%%LOCALBASE%%/lib "
- 
- if [ -r "$pkglibdir/libmygcc.a" ]; then
-   # When linking against the static library with a different version of GCC
--- a/databases/mariadb55-client/files/patch-support-files_CMakeLists.txt
+++ b/databases/mariadb55-client/files/patch-support-files_CMakeLists.txt
@ -1,40 +0,0 @@
--- support-files/CMakeLists.txt.orig	2017-04-30 11:09:34 UTC
-+++ support-files/CMakeLists.txt
-@@ -41,15 +41,18 @@ ELSE()
-   SET(inst_location ${INSTALL_SUPPORTFILESDIR})
- ENDIF()
- 
-+IF(FALSE)
- FOREACH(inifile my-huge my-innodb-heavy-4G my-large my-medium my-small)
-   CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${inifile}.cnf.sh 
-                  ${CMAKE_CURRENT_BINARY_DIR}/${inifile}.${ini_file_extension} @ONLY)
-   INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${inifile}.${ini_file_extension}
-           DESTINATION ${inst_location} COMPONENT IniFiles)
- ENDFOREACH()
-+ENDIF()
- 
- IF(UNIX)
-   SET(prefix ${CMAKE_INSTALL_PREFIX})
-+  IF(FALSE)
-   FOREACH(script  mysqld_multi.server mysql-log-rotate binary-configure)
-     CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${script}.sh 
-                    ${CMAKE_CURRENT_BINARY_DIR}/${script} @ONLY )
-@@ -69,8 +72,10 @@ IF(UNIX)
-     INSTALL(FILES magic DESTINATION ${inst_location} COMPONENT SupportFiles)
-     ADD_SUBDIRECTORY(SELinux)
-   ENDIF()
-+  ENDIF()
- 
-   INSTALL(FILES mysql.m4 DESTINATION ${INSTALL_SHAREDIR}/aclocal COMPONENT Development)
-+  IF(FALSE)
-   CONFIGURE_FILE(MySQL-shared-compat.spec.sh ${CMAKE_CURRENT_BINARY_DIR}/MySQL-shared-compat.spec @ONLY)
-   CONFIGURE_FILE(mysql.spec.sh ${CMAKE_CURRENT_BINARY_DIR}/mysql.spec @ONLY)
-   
-@@ -94,6 +99,7 @@ IF(UNIX)
-     DESTINATION ${inst_location} COMPONENT SupportFiles
-     PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ 
-     GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
-+  ENDIF()
- 
-   IF (INSTALL_SYSCONFDIR)
-     INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/mysql-log-rotate DESTINATION ${INSTALL_SYSCONFDIR}/logrotate.d
--- a/databases/mariadb55-client/files/pkg-message.in
+++ b/databases/mariadb55-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/mariadb55-client/pkg-plist
+++ b/databases/mariadb55-client/pkg-plist
@ -1,89 +0,0 @@
-bin/msql2mysql
-bin/mysql
-bin/mysql_config
-bin/mysql_find_rows
-bin/mysql_waitpid
-bin/mysqlaccess
-bin/mysqladmin
-bin/mysqlbinlog
-bin/mysqlcheck
-bin/mysqldump
-bin/mysqlimport
-bin/mysqlshow
-bin/mysqlslap
-include/mysql/auth_dialog_client.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/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_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_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_ftparser.h
-include/mysql/psi/mysql_file.h
-include/mysql/psi/mysql_thread.h
-include/mysql/psi/psi.h
-include/mysql/service_debug_sync.h
-include/mysql/service_kill_statement.h
-include/mysql/service_logger.h
-include/mysql/service_my_snprintf.h
-include/mysql/service_progress_report.h
-include/mysql/service_thd_alloc.h
-include/mysql/service_thd_wait.h
-include/mysql/service_thread_scheduler.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
-man/man1/msql2mysql.1.gz
-man/man1/mysql.1.gz
-man/man1/mysql_config.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
-share/aclocal/mysql.m4
--- a/databases/mariadb55-server/Makefile
+++ b/databases/mariadb55-server/Makefile
@ -1,132 +0,0 @@
-# $FreeBSD$
-
-PORTNAME?=	mariadb
-PORTVERSION=	5.5.67
-PORTREVISION?=	0
-CATEGORIES=	databases
-MASTER_SITES=	http://ftp.osuosl.org/pub/mariadb/${PORTNAME}-${PORTVERSION}/source/ \
-		http://mirrors.supportex.net/mariadb/${PORTNAME}-${PORTVERSION}/source/ \
-		http://mirror.aarnet.edu.au/pub/MariaDB/${PORTNAME}-${PORTVERSION}/source/ \
-		http://mirror2.hs-esslingen.de/pub/Mirrors/mariadb/${PORTNAME}-${PORTVERSION}/source/ \
-		http://gd.tuwien.ac.at/db/mariadb/${PORTNAME}-${PORTVERSION}/source/ \
-		http://mirrors.fe.up.pt/pub/mariadb/${PORTNAME}-${PORTVERSION}/source/ \
-		http://mirror.de.gsnw.de:56431/mariadb/${PORTNAME}-${PORTVERSION}/source/ \
-		http://mirror.layerjet.com/mariadb/${PORTNAME}-${PORTVERSION}/source/ \
-		http://mirror.switch.ch/mirror/mariadb/${PORTNAME}-${PORTVERSION}/source/
-PKGNAMESUFFIX?=	55-server
-
-MAINTAINER=	brnrd@FreeBSD.org
-COMMENT?=	Multithreaded SQL database (server)
-
-LICENSE=	GPLv2
-
-DEPRECATED=		Upstream end-of-life 2020-04-11, switch to a newer version
-EXPIRATION_DATE=	2020-04-11
-
-SUB_FILES=	pkg-message
-
-USES+=		cmake:insource,noninja compiler:c++11-lang shebangfix ssl
-USE_LDCONFIG=	${PREFIX}/lib/mysql
-SHEBANG_FILES=	scripts/*.sh sql-bench/[a-km-z]*
-
-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="share/mysql" \
-		-DINSTALL_SUPPORTFILESDIR="share/mysql" \
-		-DWITH_UNIT_TESTS=0 \
-		-DWITH_LIBWRAP=1 \
-		-DWITH_SSL=yes \
-		-DCOMPILATION_COMMENT="FreeBSD Ports"
-
-DATADIR=	${PREFIX}/share/mysql
-
-BROKEN_sparc64=		Does not compile: Unsupported platform
-
-.if defined(USE_MYSQL)
-.error You have 'USE_MYSQL' variable defined either in environment or in make(1) arguments. Please undefine and try again.
-.endif
-
-OPTIONS_DEFINE+=	FASTMTX
-OPTIONS_SUB=		yes
-NO_OPTIONS_SORT=	yes
-
-FASTMTX_DESC=		Replace mutexes with spinlocks
-
-FASTMTX_CMAKE_ON=	-DWITH_FAST_MUTEXES=1
-
-.if !defined(CLIENT_ONLY)
-# MySQL-Server part
-USES+=		mysql:55m
-USE_LDCONFIG+=	${PREFIX}/lib/mysql/plugin
-
-CONFLICTS_INSTALL=	mariadb5[0-46-9]-server-* \
-			mariadb1*-server-* \
-			mysql[0-9]*-server-* \
-			mysqlwsrep* \
-			percona[0-9]*-server-*
-
-USE_RC_SUBR=	mysql-server
-
-USERS=		mysql
-GROUPS=		mysql
-
-CMAKE_ARGS+=	-DREADLINE_INCLUDE_DIR=/usr/include \
-		-DWITH_EMBEDDED_SERVER="ON" \
-		-DWITHOUT_EXAMPLE_STORAGE_ENGINE=1
-
-# MySQL-Server options
-OPTIONS_DEFINE+=	MAXKEY OQGRAPH
-OPTIONS_DEFAULT+=	MAXKEY
-
-MAXKEY_DESC=	Change max key length from 1000 to 4000
-
-OQGRAPH_DESC=	Open Query Graph Computation engine
-
-OQGRAPH_USE=	GCC=yes
-OQGRAPH_LIB_DEPENDS=	libboost_system.so:devel/boost-libs
-OQGRAPH_BROKEN=	OQGraph does not build
-
-MAXKEY_EXTRA_PATCHES=	${FILESDIR}/extra-patch-include_my__compare.h
-.endif
-
-.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
-
-.include <bsd.port.pre.mk>
-
-.if ${OPSYS} == FreeBSD
-CMAKE_ARGS+=	-DWITH_JEMALLOC="system"
-.else
-CMAKE_ARGS+=	-DWITH_JEMALLOC="no"
-.endif
-
-# Server segfaults on i386 when built with clang >= 3.4
-.if ${ARCH} == 'i386'
-USE_GCC=	yes
-.endif
-
-post-extract-OQGRAPH-off:
-	@${RM} -r ${WRKSRC}/storage/oqgraph
-
-post-patch:
-	@${REINPLACE_CMD} 's/*.1/${MAN1}/' ${WRKSRC}/man/CMakeLists.txt
-	@${REINPLACE_CMD} 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/mysys/default.c
-	@${REINPLACE_CMD} 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/scripts/mysql_config.sh
-
-.include <bsd.port.post.mk>
--- a/databases/mariadb55-server/distinfo
+++ b/databases/mariadb55-server/distinfo
@ -1,3 +0,0 @@
-TIMESTAMP = 1580633911
-SHA256 (mariadb-5.5.67.tar.gz) = a622b2db2f02f5fb97dcd4978366c0b49716dfed3698fe4b826dd910fe7b7b85
-SIZE (mariadb-5.5.67.tar.gz) = 45971908
--- a/databases/mariadb55-server/files/extra-patch-include_my__compare.h
+++ b/databases/mariadb55-server/files/extra-patch-include_my__compare.h
@ -1,11 +0,0 @@
--- include/my_compare.h.orig	2017-04-30 11:09: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/mariadb55-server/files/mysql-server.in
+++ b/databases/mariadb55-server/files/mysql-server.in
@ -1,140 +0,0 @@
-#!/bin/sh
-
-# $FreeBSD$
-#
-# 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/mariadb55-server/files/patch-CMakeLists.txt
+++ b/databases/mariadb55-server/files/patch-CMakeLists.txt
@ -1,46 +0,0 @@
--- CMakeLists.txt.orig	2017-04-30 11:09:29 UTC
-+++ CMakeLists.txt
-@@ -397,22 +397,22 @@ ADD_SUBDIRECTORY(sql/share)
- ADD_SUBDIRECTORY(support-files)
- 
- IF(NOT WITHOUT_SERVER)
-  ADD_SUBDIRECTORY(tests)
-+#  ADD_SUBDIRECTORY(tests)
-   ADD_SUBDIRECTORY(sql)
-   OPTION (WITH_EMBEDDED_SERVER "Compile MySQL with embedded server" OFF)
-   IF(WITH_EMBEDDED_SERVER) 
-    ADD_SUBDIRECTORY(libmysqld)
-   ADD_SUBDIRECTORY(libmysqld/examples)
-+#   ADD_SUBDIRECTORY(libmysqld/examples)
-   ENDIF(WITH_EMBEDDED_SERVER)
- 
-   ADD_SUBDIRECTORY(mysql-test)
-   ADD_SUBDIRECTORY(mysql-test/lib/My/SafeProcess)
-  ADD_SUBDIRECTORY(sql-bench)
-+#  ADD_SUBDIRECTORY(sql-bench)
- 
-   IF(EXISTS ${CMAKE_SOURCE_DIR}/internal/CMakeLists.txt)
-     ADD_SUBDIRECTORY(internal)
-   ENDIF()
-  ADD_SUBDIRECTORY(packaging/rpm-oel)
-+#  ADD_SUBDIRECTORY(packaging/rpm-oel)
- ENDIF()
- 
- IF(UNIX)
-@@ -460,14 +460,14 @@ ADD_CUSTOM_TARGET(INFO_BIN ALL
-   WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
- )
- 
-INSTALL_DOCUMENTATION(README COPYING EXCEPTIONS-CLIENT COMPONENT Readme)
-+#INSTALL_DOCUMENTATION(README COPYING EXCEPTIONS-CLIENT COMPONENT Readme)
- 
- # MDEV-6526 these files are not installed anymore
- #INSTALL_DOCUMENTATION(${CMAKE_BINARY_DIR}/Docs/INFO_SRC
- #                      ${CMAKE_BINARY_DIR}/Docs/INFO_BIN)
- 
- IF(UNIX)
-  INSTALL_DOCUMENTATION(Docs/INSTALL-BINARY COMPONENT Readme)
-+#  INSTALL_DOCUMENTATION(Docs/INSTALL-BINARY COMPONENT Readme)
- ENDIF()
- 
- INCLUDE(CPack)
--- a/databases/mariadb55-server/files/patch-client_CMakeLists.txt
+++ b/databases/mariadb55-server/files/patch-client_CMakeLists.txt
@ -1,70 +0,0 @@
--- client/CMakeLists.txt.orig	2019-04-26 12:37:01 UTC
-+++ client/CMakeLists.txt
-@@ -27,6 +27,7 @@ INCLUDE_DIRECTORIES(
- )
- 
- 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)
-@@ -34,6 +35,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")
-@@ -41,6 +43,7 @@ TARGET_LINK_LIBRARIES(mysqltest mysqlclient regex)
- SET_TARGET_PROPERTIES(mysqltest PROPERTIES ENABLE_EXPORTS TRUE)
- 
- 
-+IF(FALSE)
- MYSQL_ADD_EXECUTABLE(mysqlcheck mysqlcheck.c)
- TARGET_LINK_LIBRARIES(mysqlcheck mysqlclient)
- 
-@@ -50,17 +53,21 @@ TARGET_LINK_LIBRARIES(mysqldump mysqlclient)
- 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)
- 
-@@ -70,17 +77,20 @@ TARGET_LINK_LIBRARIES(mysqladmin mysqlclient)
- 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/mariadb55-server/files/patch-cmake_jemalloc.cmake
+++ b/databases/mariadb55-server/files/patch-cmake_jemalloc.cmake
@ -1,16 +0,0 @@
--- cmake/jemalloc.cmake.orig	2017-04-30 11:09:29 UTC
-+++ cmake/jemalloc.cmake
-@@ -22,11 +22,11 @@ MACRO (CHECK_JEMALLOC)
-       SET(libname jemalloc)
-     ENDIF()
- 
-    CHECK_LIBRARY_EXISTS(${libname} malloc_stats_print "" HAVE_JEMALLOC)
-+    CHECK_LIBRARY_EXISTS(c malloc_stats_print "" HAVE_JEMALLOC)
-     SET(CMAKE_REQUIRED_LIBRARIES)
- 
-     IF (HAVE_JEMALLOC)
-      SET(LIBJEMALLOC ${libname})
-+      SET(LIBJEMALLOC c)
-     ELSEIF (NOT WITH_JEMALLOC STREQUAL "auto")
-       MESSAGE(FATAL_ERROR "${libname} is not found")
-     ENDIF()
--- a/databases/mariadb55-server/files/patch-extra_CMakeLists.txt
+++ b/databases/mariadb55-server/files/patch-extra_CMakeLists.txt
@ -1,14 +0,0 @@
--- extra/CMakeLists.txt.orig	2017-04-30 11:09:29 UTC
-+++ extra/CMakeLists.txt
-@@ -80,9 +80,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/mariadb55-server/files/patch-extra_yassl_taocrypt_src_integer.cpp
+++ b/databases/mariadb55-server/files/patch-extra_yassl_taocrypt_src_integer.cpp
@ -1,11 +0,0 @@
--- extra/yassl/taocrypt/src/integer.cpp.orig	2017-04-30 11:09:29 UTC
-+++ extra/yassl/taocrypt/src/integer.cpp
-@@ -74,7 +74,7 @@ template <class T>
- CPP_TYPENAME AlignedAllocator<T>::pointer AlignedAllocator<T>::allocate(
-                                            size_type n, const void *)
- {
-    if (n > this->max_size())
-+    if (n > AlignedAllocator<T>::max_size())
-         return 0;
-     if (n == 0)
-         return 0;
--- a/databases/mariadb55-server/files/patch-include_CMakeLists.txt
+++ b/databases/mariadb55-server/files/patch-include_CMakeLists.txt
@ -1,27 +0,0 @@
--- include/CMakeLists.txt.orig	2017-04-30 11:09:29 UTC
-+++ include/CMakeLists.txt
-@@ -55,20 +55,24 @@ 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()
- 
- INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/. DESTINATION ${INSTALL_INCLUDEDIR}/private COMPONENT Development
-   FILES_MATCHING PATTERN "*.h"
--- a/databases/mariadb55-server/files/patch-libmysql_CMakeLists.txt
+++ b/databases/mariadb55-server/files/patch-libmysql_CMakeLists.txt
@ -1,39 +0,0 @@
--- libmysql/CMakeLists.txt.orig	2017-04-30 11:09:29 UTC
-+++ libmysql/CMakeLists.txt
-@@ -425,7 +425,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)
-@@ -433,6 +433,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}")
-@@ -447,11 +448,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)
-@@ -495,3 +498,4 @@ IF(NOT DISABLE_SHARED)
-     ENDFOREACH()
-   ENDIF()
- ENDIF()
-+ENDIF()
--- a/databases/mariadb55-server/files/patch-libservices_CMakeLists.txt
+++ b/databases/mariadb55-server/files/patch-libservices_CMakeLists.txt
@ -1,9 +0,0 @@
--- libservices/CMakeLists.txt.orig	2017-04-30 11:09:29 UTC
-+++ libservices/CMakeLists.txt
-@@ -26,4 +26,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/mariadb55-server/files/patch-man_CMakeLists.txt
+++ b/databases/mariadb55-server/files/patch-man_CMakeLists.txt
@ -1,12 +0,0 @@
--- man/CMakeLists.txt.orig	2017-04-30 11:09:29 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/mariadb55-server/files/patch-mysys_default.c
+++ b/databases/mariadb55-server/files/patch-mysys_default.c
@ -1,58 +0,0 @@
--- mysys/default.c.orig	2017-04-30 11:09:31 UTC
-+++ mysys/default.c
-@@ -89,7 +89,7 @@ static my_bool defaults_already_read= FA
- 
- /* Which directories are searched for options (and in which order) */
- 
-#define MAX_DEFAULT_DIRS 6
-+#define MAX_DEFAULT_DIRS 7
- #define DEFAULT_DIRS_SIZE (MAX_DEFAULT_DIRS + 1)  /* Terminate with NULL */
- static const char **default_directories = NULL;
- 
-@@ -786,7 +786,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
-@@ -804,6 +804,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 %%PREFIX%%%s\n",
-+	      name,name);
-+      goto err;
-+  }
-+
-   while (mysql_file_fgets(buff, sizeof(buff) - 1, fp))
-   {
-     line++;
-@@ -1068,7 +1076,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);
-         }
-       }
-     }
-@@ -1227,10 +1236,8 @@ static const char **init_default_directo
-   errors += add_directory(alloc, "/etc/", dirs);
-   errors += add_directory(alloc, "/etc/mysql/", dirs);
- 
-#if defined(DEFAULT_SYSCONFDIR)
-  if (DEFAULT_SYSCONFDIR[0])
-    errors += add_directory(alloc, DEFAULT_SYSCONFDIR, dirs);
-#endif /* DEFAULT_SYSCONFDIR */
-+  errors += add_directory(alloc, "%%PREFIX%%/etc/", dirs);
-+  errors += add_directory(alloc, "%%PREFIX%%/etc/mysql/", dirs);
- 
- #endif
- 
--- a/databases/mariadb55-server/files/patch-regex_CMakeLists.txt
+++ b/databases/mariadb55-server/files/patch-regex_CMakeLists.txt
@ -1,9 +0,0 @@
--- regex/CMakeLists.txt.orig	2017-04-30 11:09:31 UTC
-+++ regex/CMakeLists.txt
-@@ -18,4 +18,6 @@ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/
- SET(REGEX_SOURCES regcomp.c regerror.c regexec.c regfree.c reginit.c)
- ADD_CONVENIENCE_LIBRARY(regex ${REGEX_SOURCES})
- 
-+IF(FALSE)
- INSTALL(FILES "my_regex.h" DESTINATION ${INSTALL_INCLUDEDIR}/private COMPONENT Development)
-+ENDIF()
--- a/databases/mariadb55-server/files/patch-scripts_CMakeLists.txt
+++ b/databases/mariadb55-server/files/patch-scripts_CMakeLists.txt
@ -1,28 +0,0 @@
--- scripts/CMakeLists.txt.orig	2017-04-30 11:09:31 UTC
-+++ scripts/CMakeLists.txt
-@@ -270,6 +270,8 @@ MACRO(EXTRACT_LINK_LIBRARIES target var)
-             STRING(REGEX REPLACE "^lib" "" lib "${lib}")
-             SET(${var} "${${var}}-l${lib} " ) 
-           ENDIF()
-+        ELSEIF(lib STREQUAL "-pthread")
-+          SET(${var} "${${var}}-pthread " )
-         ELSE()
-           SET(${var} "${${var}}-l${lib} " ) 
-         ENDIF()
-@@ -326,16 +328,11 @@ ELSE()
-     ${CMAKE_CURRENT_BINARY_DIR}/mysql_config.pl ESCAPE_QUOTES @ONLY)
-   # On Unix, most of the files end up in the bin directory
-   SET(BIN_SCRIPTS
-    msql2mysql
-    mysql_config
-     mysql_fix_extensions
-     mysql_setpermission
-     mysql_secure_installation
-     mysql_zap
-    mysqlaccess
-     mysql_convert_table_format
-    mysql_find_rows
-    mytop
-     mysqlhotcopy
-     mysqldumpslow
-     mysqld_multi
--- a/databases/mariadb55-server/files/patch-scripts_mysql__config.sh
+++ b/databases/mariadb55-server/files/patch-scripts_mysql__config.sh
@ -1,14 +0,0 @@
--- scripts/mysql_config.sh.orig	2017-04-30 11:09:31 UTC
-+++ scripts/mysql_config.sh
-@@ -109,8 +109,11 @@ fi
- # We intentionally add a space to the beginning and end of lib strings, simplifies replace later
- libs=" $ldflags -L$pkglibdir @RPATH_OPTION@ -lmysqlclient @ZLIB_DEPS@ @NON_THREADED_LIBS@"
- libs="$libs @openssl_libs@ @STATIC_NSS_FLAGS@ "
-+libs="$libs -L%%LOCALBASE%%/lib "
- libs_r=" $ldflags -L$pkglibdir  @RPATH_OPTION@ -lmysqlclient_r @ZLIB_DEPS@ @CLIENT_LIBS@ @openssl_libs@ "
-+libs_r="$libs_r -L%%LOCALBASE%%/lib "
- embedded_libs=" $ldflags -L$pkglibdir @RPATH_OPTION@ -lmysqld @LIBDL@ @ZLIB_DEPS@ @LIBS@ @WRAPLIBS@ @openssl_libs@ "
-+embedded_libs="$embedded_libs -L%%LOCALBASE%%/lib "
- 
- if [ -r "$pkglibdir/libmygcc.a" ]; then
-   # When linking against the static library with a different version of GCC
--- a/databases/mariadb55-server/files/patch-scripts_mysqld__safe.sh
+++ b/databases/mariadb55-server/files/patch-scripts_mysqld__safe.sh
@ -1,24 +0,0 @@
--- scripts/mysqld_safe.sh.orig	2017-04-30 11:09:31 UTC
-+++ scripts/mysqld_safe.sh
-@@ -468,10 +468,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"
- 
-@@ -480,7 +480,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/mariadb55-server/files/patch-sql_CMakeLists.txt
+++ b/databases/mariadb55-server/files/patch-sql_CMakeLists.txt
@ -1,29 +0,0 @@
--- sql/CMakeLists.txt.orig	2017-04-30 11:09:31 UTC
-+++ sql/CMakeLists.txt
-@@ -276,6 +276,7 @@ ADD_CUSTOM_TARGET(distclean
-   VERBATIM
-   )
- 
-+IF(FALSE)
- IF(INSTALL_LAYOUT STREQUAL "STANDALONE")
- 
- # Copy db.opt into data/test/
-@@ -319,6 +320,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)
-@@ -361,8 +363,10 @@ 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 examples EXCLUDE
-   PATTERN share EXCLUDE
-   PATTERN CMakeFiles EXCLUDE)
-+ENDIF()
--- a/databases/mariadb55-server/files/patch-sql_item__subselect.cc
+++ b/databases/mariadb55-server/files/patch-sql_item__subselect.cc
@ -1,11 +0,0 @@
--- sql/item_subselect.cc.orig	2017-04-30 11:09:31 UTC
-+++ sql/item_subselect.cc
-@@ -1329,7 +1329,7 @@ Item_exists_subselect::Item_exists_subse
-   Item_subselect()
- {
-   DBUG_ENTER("Item_exists_subselect::Item_exists_subselect");
-  bool val_bool();
-+//  bool val_bool();
-   init(select_lex, new select_exists_subselect(this));
-   max_columns= UINT_MAX;
-   null_value= FALSE; //can't be NULL
--- a/databases/mariadb55-server/files/patch-sql_sql__trigger.cc
+++ b/databases/mariadb55-server/files/patch-sql_sql__trigger.cc
@ -1,50 +0,0 @@
--- sql/sql_trigger.cc.orig	2017-04-30 11:09:31 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/mariadb55-server/files/patch-sql_sql__view.cc
+++ b/databases/mariadb55-server/files/patch-sql_sql__view.cc
@ -1,63 +0,0 @@
--- sql/sql_view.cc.orig	2017-04-30 11:09:31 UTC
-+++ sql/sql_view.cc
-@@ -760,46 +760,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/mariadb55-server/files/patch-sql_sys__vars.cc
+++ b/databases/mariadb55-server/files/patch-sql_sys__vars.cc
@ -1,38 +0,0 @@
--- sql/sys_vars.cc.orig	2017-04-30 11:09:31 UTC
-+++ sql/sys_vars.cc
-@@ -826,7 +826,7 @@ static Sys_var_ulong Sys_interactive_tim
-        "connection before closing it",
-        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",
-@@ -1356,7 +1356,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));
- 
-@@ -1371,7 +1371,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));
- 
-@@ -2480,7 +2480,7 @@ static Sys_var_ulong Sys_net_wait_timeou
-        "The number of seconds the server waits for activity on a "
-        "connection before closing it",
-        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));
- 
- /** propagates changes to the relevant flag of @@optimizer_switch */
--- a/databases/mariadb55-server/files/patch-support-files_CMakeLists.txt
+++ b/databases/mariadb55-server/files/patch-support-files_CMakeLists.txt
@ -1,16 +0,0 @@
--- support-files/CMakeLists.txt.orig	2017-04-11 20:03:17 UTC
-+++ support-files/CMakeLists.txt
-@@ -67,10 +67,12 @@ IF(UNIX)
-   ENDFOREACH()
-   IF(INSTALL_SUPPORTFILESDIR)
-     INSTALL(FILES magic DESTINATION ${inst_location} COMPONENT SupportFiles)
-    ADD_SUBDIRECTORY(SELinux)
-+#    ADD_SUBDIRECTORY(SELinux)
-   ENDIF()
- 
-+IF(FALSE)
-   INSTALL(FILES mysql.m4 DESTINATION ${INSTALL_SHAREDIR}/aclocal COMPONENT Development)
-+ENDIF()
-   CONFIGURE_FILE(MySQL-shared-compat.spec.sh ${CMAKE_CURRENT_BINARY_DIR}/MySQL-shared-compat.spec @ONLY)
-   CONFIGURE_FILE(mysql.spec.sh ${CMAKE_CURRENT_BINARY_DIR}/mysql.spec @ONLY)
-   
--- a/databases/mariadb55-server/files/pkg-message.in
+++ b/databases/mariadb55-server/files/pkg-message.in
@ -1,16 +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
-}
-{ type: upgrade
-  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.
-EOM
-}
-]
--- a/databases/mariadb55-server/pkg-descr
+++ b/databases/mariadb55-server/pkg-descr
@ -1,14 +0,0 @@
-MariaDB is a database server that offers drop-in replacement functionality for
-MySQL1. 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/mariadb55-server/pkg-plist
+++ b/databases/mariadb55-server/pkg-plist
@ -1,217 +0,0 @@
-@stopdaemon mysql-server
-bin/aria_chk
-bin/aria_dump_log
-bin/aria_ftdump
-bin/aria_pack
-bin/aria_read_log
-bin/innochecksum
-bin/my_print_defaults
-bin/myisam_ftdump
-bin/myisamchk
-bin/myisamlog
-bin/myisampack
-bin/mysql_convert_table_format
-bin/mysql_fix_extensions
-bin/mysql_install_db
-bin/mysql_plugin
-bin/mysqld_safe_helper
-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/mysqldumpslow
-bin/mysqlhotcopy
-bin/mysqltest
-bin/perror
-bin/replace
-bin/resolve_stack_dump
-bin/resolveip
-include/mysql/private/atomic/gcc_builtins.h
-include/mysql/private/atomic/generic-msvc.h
-include/mysql/private/atomic/nolock.h
-include/mysql/private/atomic/rwlock.h
-include/mysql/private/atomic/solaris.h
-include/mysql/private/atomic/x86-gcc.h
-include/mysql/private/base64.h
-include/mysql/private/config.h
-include/mysql/private/embedded_priv.h
-include/mysql/private/ft_global.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_aes.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_libwrap.h
-include/mysql/private/my_md5.h
-include/mysql/private/my_nosys.h
-include/mysql/private/my_rdtsc.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/sha1.h
-include/mysql/private/sha2.h
-include/mysql/private/t_ctype.h
-include/mysql/private/thr_alarm.h
-include/mysql/private/thr_lock.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
-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_pam.so
-lib/mysql/plugin/auth_socket.so
-lib/mysql/plugin/auth_test_plugin.so
-lib/mysql/plugin/daemon_example.ini
-lib/mysql/plugin/dialog.so
-lib/mysql/plugin/dialog_examples.so
-lib/mysql/plugin/feedback.so
-lib/mysql/plugin/ha_archive.so
-lib/mysql/plugin/ha_blackhole.so
-lib/mysql/plugin/ha_federated.so
-lib/mysql/plugin/ha_federatedx.so
-lib/mysql/plugin/ha_innodb.so
-%%OQGRAPH%%lib/mysql/plugin/ha_oqgraph.so
-lib/mysql/plugin/ha_sphinx.so
-lib/mysql/plugin/handlersocket.so
-lib/mysql/plugin/libdaemon_example.so
-lib/mysql/plugin/mypluglib.so
-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/semisync_master.so
-lib/mysql/plugin/semisync_slave.so
-lib/mysql/plugin/server_audit.so
-lib/mysql/plugin/sphinx.so
-lib/mysql/plugin/sql_errlog.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/innochecksum.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/mysqldumpslow.1.gz
-man/man1/mysqlhotcopy.1.gz
-man/man1/mysqltest.1.gz
-man/man1/perror.1.gz
-man/man1/replace.1.gz
-man/man1/resolve_stack_dump.1.gz
-man/man1/resolveip.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%%/italian/errmsg.sys
-%%DATADIR%%/japanese/errmsg.sys
-%%DATADIR%%/korean/errmsg.sys
-%%DATADIR%%/magic
-%%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_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