94 files changed, 0 insertions, 3176 deletions

diff --git a/databases/Makefile b/databases/Makefile
index e07b3bcb9445..d355f483afe6 100644
--- a/databases/Makefile
+++ b/databases/Makefile
@@ -204,8 +204,6 @@
     SUBDIR += mysql-q4m
     SUBDIR += mysql-udf
     SUBDIR += mysql2pgsql
-    SUBDIR += mysql55-client
-    SUBDIR += mysql55-server
     SUBDIR += mysql56-client
     SUBDIR += mysql56-server
     SUBDIR += mysql57-client
@@ -550,8 +548,6 @@
     SUBDIR += pecl-rrd
     SUBDIR += percona-pam-for-mysql
     SUBDIR += percona-toolkit
-    SUBDIR += percona56-client
-    SUBDIR += percona56-server
     SUBDIR += percona57-client
     SUBDIR += percona57-pam-for-mysql
     SUBDIR += percona57-server
diff --git a/databases/mysql55-client/Makefile b/databases/mysql55-client/Makefile
deleted file mode 100644
index 71a2242332c2..000000000000
--- a/databases/mysql55-client/Makefile
+++ /dev/null
@@ -1,28 +0,0 @@
-# Created by: Alex Dupre <ale@FreeBSD.org>
-
-PORTNAME=	mysql
-PKGNAMESUFFIX=	55-client
-
-COMMENT=	Multithreaded SQL database (client)
-
-MASTERDIR=	${.CURDIR}/../mysql55-server
-
-PKGMESSAGE=	${.CURDIR}/pkg-message
-PATCHDIR=	${.CURDIR}/files
-PLIST=		${.CURDIR}/pkg-plist
-
-CONFLICTS_INSTALL=	mysql5[0-46-9]-client \
-			mariadb*-client \
-			percona*-client
-
-CMAKE_ARGS+=	-DWITHOUT_SERVER=1
-
-USE_LDCONFIG=	${PREFIX}/lib/mysql
-
-MMAN1=		comp_err.1 msql2mysql.1 mysql.1 mysql_config.1 mysql_find_rows.1 \
-		mysql_waitpid.1 mysqlaccess.1 mysqladmin.1 mysqlbinlog.1 \
-		mysqlcheck.1 mysqldump.1 mysqlimport.1 mysqlshow.1 mysqlslap.1
-
-CLIENT_ONLY=	yes
-
-.include "${MASTERDIR}/Makefile"
diff --git a/databases/mysql55-client/files/patch-CMakeLists.txt b/databases/mysql55-client/files/patch-CMakeLists.txt
deleted file mode 100644
index 3b289cf4f0a6..000000000000
--- a/databases/mysql55-client/files/patch-CMakeLists.txt
+++ /dev/null
@@ -1,72 +0,0 @@
---- CMakeLists.txt.orig	2015-06-25 13:44:36.000000000 +0000
-+++ CMakeLists.txt	2015-09-19 07:48:14.145882685 +0000
-@@ -390,33 +390,11 @@
- ENDIF()
- 
- ADD_SUBDIRECTORY(extra)
--IF(NOT WITHOUT_SERVER)
--  ADD_SUBDIRECTORY(tests)
--  ADD_SUBDIRECTORY(client)
--  ADD_SUBDIRECTORY(sql)
--  ADD_SUBDIRECTORY(sql/share)
--  ADD_SUBDIRECTORY(libservices)
--  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(support-files)
--  ADD_SUBDIRECTORY(scripts)
--  ADD_SUBDIRECTORY(sql-bench)
--  IF(UNIX)
--    ADD_SUBDIRECTORY(man)
--  ENDIF()
--  IF(EXISTS ${CMAKE_SOURCE_DIR}/internal/CMakeLists.txt)
--    ADD_SUBDIRECTORY(internal)
--  ENDIF()
--  ADD_SUBDIRECTORY(packaging/rpm-oel)
--  ADD_SUBDIRECTORY(packaging/rpm-sles)
--  ADD_SUBDIRECTORY(packaging/rpm-docker)
--ENDIF()
-+ADD_SUBDIRECTORY(client)
-+ADD_SUBDIRECTORY(libservices)
-+ADD_SUBDIRECTORY(support-files)
-+ADD_SUBDIRECTORY(scripts)
-+ADD_SUBDIRECTORY(man)
- 
- INCLUDE(cmake/abi_check.cmake)
- INCLUDE(cmake/tags.cmake)
-@@ -453,19 +431,21 @@
- ELSE()
-   SET(CPACK_GENERATOR "TGZ")
- ENDIF() 
-+IF(FALSE)
- ADD_SUBDIRECTORY(packaging/WiX)
- ADD_SUBDIRECTORY(packaging/solaris)
-+ENDIF() 
- 
- # Create a single package with "make package"
- # (see http://public.kitware.com/Bug/view.php?id=11452)
- SET(CPACK_MONOLITHIC_INSTALL 1 CACHE INTERNAL "")
- 
- IF(UNIX)
--  INSTALL(FILES Docs/mysql.info DESTINATION ${INSTALL_INFODIR} OPTIONAL COMPONENT Info)
- ENDIF()
- #
- # RPM installs documentation directly from the source tree
- #
-+IF(FALSE)
- IF(NOT INSTALL_LAYOUT MATCHES "RPM")
-   INSTALL(FILES COPYING LICENSE.mysql 
-   DESTINATION ${INSTALL_DOCREADMEDIR} 
-@@ -491,6 +471,7 @@
-     PATTERN "sp-imp-spec.txt" EXCLUDE
-   )
- ENDIF()
-+ENDIF()
- 
- INCLUDE(CPack)
- 
diff --git a/databases/mysql55-client/files/patch-client_CMakeLists.txt b/databases/mysql55-client/files/patch-client_CMakeLists.txt
deleted file mode 100644
index 74f289fce78c..000000000000
--- a/databases/mysql55-client/files/patch-client_CMakeLists.txt
+++ /dev/null
@@ -1,47 +0,0 @@
---- client/CMakeLists.txt.orig	2014-11-04 07:49:50.000000000 +0000
-+++ client/CMakeLists.txt	2014-12-03 09:22:09.860599069 +0000
-@@ -33,6 +33,7 @@
-   TARGET_LINK_LIBRARIES(mysql ${READLINE_LIBRARY})
- ENDIF(UNIX)
- 
-+IF(FALSE)
- MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc COMPONENT Test)
- SET_SOURCE_FILES_PROPERTIES(mysqltest.cc PROPERTIES COMPILE_FLAGS "-DTHREADS")
- # mysqltest has unused result errors, so we skip Werror
-@@ -42,6 +43,7 @@
-   ADD_COMPILE_FLAGS(mysqltest.cc COMPILE_FLAGS "-Wno-error")
- ENDIF()
- TARGET_LINK_LIBRARIES(mysqltest mysqlclient regex)
-+ENDIF()
- 
- 
- MYSQL_ADD_EXECUTABLE(mysqlcheck mysqlcheck.c)
-@@ -53,15 +55,19 @@
- MYSQL_ADD_EXECUTABLE(mysqlimport mysqlimport.c)
- TARGET_LINK_LIBRARIES(mysqlimport mysqlclient)
- 
-+IF(FALSE)
- MYSQL_ADD_EXECUTABLE(mysql_upgrade mysql_upgrade.c)
- 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)
-@@ -78,7 +84,7 @@
-   MYSQL_ADD_EXECUTABLE(echo echo.c)
- ENDIF(WIN32)
- 
--SET_TARGET_PROPERTIES (mysqlcheck mysqldump mysqlimport mysql_upgrade mysqlshow mysqlslap mysql_plugin 
-+SET_TARGET_PROPERTIES (mysqlcheck mysqldump mysqlimport mysqlshow mysqlslap
- PROPERTIES HAS_CXX TRUE)
- 
- ADD_DEFINITIONS(-DHAVE_DLOPEN)
diff --git a/databases/mysql55-client/files/patch-extra_CMakeLists.txt b/databases/mysql55-client/files/patch-extra_CMakeLists.txt
deleted file mode 100644
index 78a301146b95..000000000000
--- a/databases/mysql55-client/files/patch-extra_CMakeLists.txt
+++ /dev/null
@@ -1,25 +0,0 @@
---- extra/CMakeLists.txt.orig	2010-12-03 18:58:24.000000000 +0100
-+++ extra/CMakeLists.txt	2010-12-23 14:45:36.000000000 +0100
-@@ -50,6 +50,7 @@
-                   ${PROJECT_BINARY_DIR}/sql/share/english/errmsg.sys 
-                   ${PROJECT_SOURCE_DIR}/sql/share/errmsg-utf8.txt)
- 
-+IF(FALSE)
- MYSQL_ADD_EXECUTABLE(my_print_defaults my_print_defaults.c)
- TARGET_LINK_LIBRARIES(my_print_defaults  mysys)
- 
-@@ -69,11 +70,14 @@
- 
- MYSQL_ADD_EXECUTABLE(replace replace.c)
- 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)
-   TARGET_LINK_LIBRARIES(mysql_waitpid mysys)
diff --git a/databases/mysql55-client/files/patch-include_CMakeLists.txt b/databases/mysql55-client/files/patch-include_CMakeLists.txt
deleted file mode 100644
index 02ae2db9f708..000000000000
--- a/databases/mysql55-client/files/patch-include_CMakeLists.txt
+++ /dev/null
@@ -1,12 +0,0 @@
---- include/CMakeLists.txt.orig	2011-01-19 23:37:08.000000000 +0100
-+++ include/CMakeLists.txt	2011-02-07 22:42:05.129894470 +0100
-@@ -27,9 +27,6 @@
-   my_list.h
-   my_alloc.h
-   typelib.h 
--  mysql/plugin.h
--  mysql/plugin_audit.h
--  mysql/plugin_ftparser.h
- )
- 
- SET(HEADERS 
diff --git a/databases/mysql55-client/files/patch-include_my_compare.h b/databases/mysql55-client/files/patch-include_my_compare.h
deleted file mode 100644
index 093c8ae37789..000000000000
--- a/databases/mysql55-client/files/patch-include_my_compare.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- include/my_compare.h.orig	2011-05-10 09:46:46.000000000 +0200
-+++ include/my_compare.h	2011-05-10 09:47:01.000000000 +0200
-@@ -39,7 +39,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              16          /* Max segments for key */
- 
- #define HA_MAX_POSSIBLE_KEY_BUFF    (HA_MAX_KEY_LENGTH + 24+ 6+6)
diff --git a/databases/mysql55-client/files/patch-include_myisam.h b/databases/mysql55-client/files/patch-include_myisam.h
deleted file mode 100644
index 450645400dd5..000000000000
--- a/databases/mysql55-client/files/patch-include_myisam.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- include/myisam.h.orig	2009-02-16 23:04:54.000000000 +0100
-+++ include/myisam.h	2009-02-16 23:10:08.000000000 +0100
-@@ -48,7 +48,7 @@
-   The following defines can be increased if necessary.
-   But beware the dependency of MI_MAX_POSSIBLE_KEY_BUFF and MI_MAX_KEY_LENGTH.
- */
--#define MI_MAX_KEY_LENGTH           1000            /* Max length in bytes */
-+#define MI_MAX_KEY_LENGTH           4000            /* Max length in bytes */
- #define MI_MAX_KEY_SEG              16              /* Max segments for key */
- 
- #define MI_MAX_KEY_BUFF  (MI_MAX_KEY_LENGTH+MI_MAX_KEY_SEG*6+8+8)
diff --git a/databases/mysql55-client/files/patch-man_CMakeLists.txt b/databases/mysql55-client/files/patch-man_CMakeLists.txt
deleted file mode 100644
index 0f79f3e2403d..000000000000
--- a/databases/mysql55-client/files/patch-man_CMakeLists.txt
+++ /dev/null
@@ -1,13 +0,0 @@
---- man/CMakeLists.txt.orig	2011-10-22 14:08:32.000000000 +0200
-+++ man/CMakeLists.txt	2011-10-22 14:22:42.000000000 +0200
-@@ -15,10 +15,6 @@
- 
- # Copy man pages
- FILE(GLOB MAN1_FILES *.1)
--FILE(GLOB MAN1_EXCLUDE make_win_bin_dist.1)
--FILE(GLOB MAN1_NDB ndb*.1)
--FILE(GLOB MAN8_FILES *.8)
--FILE(GLOB MAN8_NDB ndb*.8)
- IF(MAN1_FILES)
-   IF(MAN1_EXCLUDE)
-     LIST(REMOVE_ITEM MAN1_FILES ${MAN1_EXCLUDE})
diff --git a/databases/mysql55-client/files/patch-mysys_default.c b/databases/mysql55-client/files/patch-mysys_default.c
deleted file mode 100644
index 816105371bdf..000000000000
--- a/databases/mysql55-client/files/patch-mysys_default.c
+++ /dev/null
@@ -1,31 +0,0 @@
---- mysys/default.c.orig	2010-11-02 23:01:13.000000000 +0100
-+++ mysys/default.c	2010-11-10 16:39:51.000000000 +0100
-@@ -70,7 +70,7 @@
- 
- /* 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;
- 
-@@ -711,7 +711,7 @@
-   {
-     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
-@@ -1153,7 +1153,10 @@
- 
- #if defined(DEFAULT_SYSCONFDIR)
-   if (DEFAULT_SYSCONFDIR[0])
-+  {
-     errors += add_directory(alloc, DEFAULT_SYSCONFDIR, dirs);
-+    errors += add_directory(alloc, DEFAULT_SYSCONFDIR "/mysql", dirs);
-+  }
- #endif /* DEFAULT_SYSCONFDIR */
- 
- #endif
diff --git a/databases/mysql55-client/files/patch-scripts_CMakeLists.txt b/databases/mysql55-client/files/patch-scripts_CMakeLists.txt
deleted file mode 100644
index 4dd4080c4f5f..000000000000
--- a/databases/mysql55-client/files/patch-scripts_CMakeLists.txt
+++ /dev/null
@@ -1,78 +0,0 @@
---- scripts/CMakeLists.txt.orig	2010-12-03 18:58:26.000000000 +0100
-+++ scripts/CMakeLists.txt	2011-01-11 20:18:07.000000000 +0100
-@@ -71,6 +71,7 @@
- )
- ENDIF()
- 
-+IF(FALSE)
- INSTALL(FILES 
-   ${CMAKE_CURRENT_SOURCE_DIR}/mysql_system_tables.sql 
-   ${CMAKE_CURRENT_SOURCE_DIR}/mysql_system_tables_data.sql
-@@ -79,6 +80,7 @@
-   ${FIX_PRIVILEGES_SQL}
-   DESTINATION ${INSTALL_MYSQLSHAREDIR} COMPONENT Server
- )
-+ENDIF()
- 
- # TCMalloc hacks
- IF(MALLOC_LIB)
-@@ -138,6 +140,7 @@
- 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})
-@@ -174,6 +177,7 @@
-   DESTINATION ${INSTALL_BINDIR}
-   COMPONENT Server
-   )
-+ENDIF()
- 
- ENDIF(UNIX)
- 
-@@ -198,6 +202,7 @@
-   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)
-@@ -215,6 +220,7 @@
-   DESTINATION ${DEST}
-   COMPONENT Server
-   )
-+ENDIF()
- 
- 
- SET(prefix "${CMAKE_INSTALL_PREFIX}")
-@@ -266,6 +272,8 @@
-           GET_FILENAME_COMPONENT(lib "${lib}" NAME_WE)
-           STRING(REGEX REPLACE "^lib" "" lib "${lib}")
-           SET(${var} "${${var}}-l${lib} " ) 
-+        ELSEIF(lib STREQUAL "-pthread")
-+          SET(${var} "${${var}}-pthread " ) 
-         ELSE()
-           SET(${var} "${${var}}-l${lib} " ) 
-         ENDIF()
-@@ -318,18 +326,9 @@
-   SET(BIN_SCRIPTS
-     msql2mysql
-     mysql_config
--    mysql_fix_extensions
--    mysql_setpermission
--    mysql_secure_installation
--    mysql_zap
-     mysqlaccess
-     mysqlaccess.conf
--    mysql_convert_table_format
-     mysql_find_rows
--    mysqlhotcopy
--    mysqldumpslow
--    mysqld_multi
--    mysqld_safe
-   )
-   FOREACH(file ${BIN_SCRIPTS})
-     IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh)
diff --git a/databases/mysql55-client/files/patch-sql_common_client_plugin.c b/databases/mysql55-client/files/patch-sql_common_client_plugin.c
deleted file mode 100644
index 069eaef76e11..000000000000
--- a/databases/mysql55-client/files/patch-sql_common_client_plugin.c
+++ /dev/null
@@ -1,47 +0,0 @@
---- sql-common/client_plugin.c.orig	2014-09-22 09:23:23 UTC
-+++ sql-common/client_plugin.c
-@@ -233,11 +233,13 @@
- {
-   MYSQL mysql;
-   struct st_mysql_client_plugin **builtin;
-+  va_list unused;
- 
-   if (initialized)
-     return 0;
- 
-   bzero(&mysql, sizeof(mysql)); /* dummy mysql for set_mysql_extended_error */
-+  bzero(&unused, sizeof(unused)); /* suppress uninitialized-value warnings */
- 
-   pthread_mutex_init(&LOCK_load_client_plugin, MY_MUTEX_INIT_SLOW);
-   init_alloc_root(&mem_root, 128, 128);
-@@ -249,7 +251,7 @@
-   pthread_mutex_lock(&LOCK_load_client_plugin);
- 
-   for (builtin= mysql_client_builtins; *builtin; builtin++)
--    add_plugin(&mysql, *builtin, 0, 0, 0);
-+    add_plugin(&mysql, *builtin, 0, 0, unused);
- 
-   pthread_mutex_unlock(&LOCK_load_client_plugin);
- 
-@@ -293,9 +295,12 @@
- mysql_client_register_plugin(MYSQL *mysql,
-                              struct st_mysql_client_plugin *plugin)
- {
-+  va_list unused;
-   if (is_not_initialized(mysql, plugin->name))
-     return NULL;
- 
-+  bzero(&unused, sizeof(unused)); /* suppress uninitialized-value warnings */
-+
-   pthread_mutex_lock(&LOCK_load_client_plugin);
- 
-   /* make sure the plugin wasn't loaded meanwhile */
-@@ -307,7 +312,7 @@
-     plugin= NULL;
-   }
-   else
--    plugin= add_plugin(mysql, plugin, 0, 0, 0);
-+    plugin= add_plugin(mysql, plugin, 0, 0, unused);
- 
-   pthread_mutex_unlock(&LOCK_load_client_plugin);
-   return plugin;
diff --git a/databases/mysql55-client/files/patch-support-files_CMakeLists.txt b/databases/mysql55-client/files/patch-support-files_CMakeLists.txt
deleted file mode 100644
index e9d1405d119f..000000000000
--- a/databases/mysql55-client/files/patch-support-files_CMakeLists.txt
+++ /dev/null
@@ -1,41 +0,0 @@
---- support-files/CMakeLists.txt.orig	2017-03-18 05:41:10.000000000 +0100
-+++ support-files/CMakeLists.txt	2017-04-12 19:03:14.636331000 +0200
-@@ -40,12 +40,14 @@
-   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)
-   IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
-@@ -54,6 +56,7 @@
-     SET (PIDOF "pgrep -d' ' -f")
-   ENDIF()
-   SET(prefix ${CMAKE_INSTALL_PREFIX})
-+IF(FALSE)
-   FOREACH(script  mysqld_multi.server mysql-log-rotate binary-configure
-     config.medium.ini config.small.ini config.huge.ini ndb-config-2-node.ini)
-     CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${script}.sh 
-@@ -73,8 +76,10 @@
-   IF(INSTALL_SUPPORTFILESDIR)
-     INSTALL(FILES magic DESTINATION ${inst_location} COMPONENT SupportFiles)
-   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)
-   
-@@ -99,3 +104,4 @@
-     PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ 
-     GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
- ENDIF()
-+ENDIF()
diff --git a/databases/mysql55-client/pkg-message b/databases/mysql55-client/pkg-message
deleted file mode 100644
index 0d8d7d73c6c0..000000000000
--- a/databases/mysql55-client/pkg-message
+++ /dev/null
@@ -1,17 +0,0 @@
-[
-{ type: install
-  message: <<EOM
-Please be aware the database client is vulnerable
-to CVE-2015-3152 - SSL Downgrade aka "BACKRONYM".
-You may find more information at the following URL:
-
-http://www.vuxml.org/freebsd/36bd352d-299b-11e5-86ff-14dae9d210b8.html
-
-Although this database client is not listed as
-"affected", it is vulnerable and will not be
-receiving a patch. Please take note of this when
-deploying this software.
-
-EOM
-}
-]
diff --git a/databases/mysql55-client/pkg-plist b/databases/mysql55-client/pkg-plist
deleted file mode 100644
index 105917920c35..000000000000
--- a/databases/mysql55-client/pkg-plist
+++ /dev/null
@@ -1,85 +0,0 @@
-bin/msql2mysql
-bin/mysql
-bin/mysql_config
-bin/mysql_find_rows
-bin/mysql_waitpid
-bin/mysqlaccess
-bin/mysqlaccess.conf
-bin/mysqladmin
-bin/mysqlbinlog
-bin/mysqlcheck
-bin/mysqldump
-bin/mysqlimport
-bin/mysqlshow
-bin/mysqlslap
-include/mysql/decimal.h
-include/mysql/errmsg.h
-include/mysql/keycache.h
-include/mysql/m_ctype.h
-include/mysql/m_string.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_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_xml.h
-include/mysql/mysql/client_plugin.h
-include/mysql/mysql/innodb_priv.h
-include/mysql/mysql/plugin.h
-include/mysql/mysql/plugin_audit.h
-include/mysql/mysql/plugin_auth.h
-include/mysql/mysql/plugin_auth_common.h
-include/mysql/mysql/plugin_ftparser.h
-include/mysql/mysql/psi/mysql_file.h
-include/mysql/mysql/psi/mysql_thread.h
-include/mysql/mysql/psi/psi.h
-include/mysql/mysql/psi/psi_abi_v1.h
-include/mysql/mysql/psi/psi_abi_v2.h
-include/mysql/mysql/service_my_snprintf.h
-include/mysql/mysql/service_thd_alloc.h
-include/mysql/mysql/service_thd_wait.h
-include/mysql/mysql/service_thread_scheduler.h
-include/mysql/mysql/services.h
-include/mysql/mysql/thread_pool_priv.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/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
-lib/mysql/libmysqlservices.a
-share/man/man1/comp_err.1.gz
-share/man/man1/msql2mysql.1.gz
-share/man/man1/mysql.1.gz
-share/man/man1/mysql_config.1.gz
-share/man/man1/mysql_find_rows.1.gz
-share/man/man1/mysql_waitpid.1.gz
-share/man/man1/mysqlaccess.1.gz
-share/man/man1/mysqladmin.1.gz
-share/man/man1/mysqlbinlog.1.gz
-share/man/man1/mysqlcheck.1.gz
-share/man/man1/mysqldump.1.gz
-share/man/man1/mysqlimport.1.gz
-share/man/man1/mysqlshow.1.gz
-share/man/man1/mysqlslap.1.gz
-share/aclocal/mysql.m4
diff --git a/databases/mysql55-server/Makefile b/databases/mysql55-server/Makefile
deleted file mode 100644
index 0d9b0a98af19..000000000000
--- a/databases/mysql55-server/Makefile
+++ /dev/null
@@ -1,101 +0,0 @@
-# Created by: Alex Dupre <ale@FreeBSD.org>
-
-PORTNAME?=	mysql
-PORTVERSION=	5.5.62
-PORTREVISION?=	3
-CATEGORIES=	databases
-MASTER_SITES=	MYSQL/MySQL-5.5
-PKGNAMESUFFIX?=	55-server
-
-MAINTAINER=	ale@FreeBSD.org
-COMMENT?=	Multithreaded SQL database (server)
-
-LICENSE=	GPLv2
-
-DEPRECATED=	Upstream support ended on December 2018
-EXPIRATION_DATE=	2022-06-30
-
-SLAVEDIRS=	databases/mysql55-client
-USES=		cmake:insource,noninja compiler:c++11-lang cpe readline shebangfix
-CXXFLAGS+=	${CPPFLAGS}
-NO_OPTIONS_SORT=yes
-
-CPE_VENDOR=	oracle
-
-OPTIONS_DEFINE=	SSL FASTMTX
-OPTIONS_DEFAULT=SSL
-
-FASTMTX_DESC=	Replace mutexes with spinlocks
-
-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="share/man" \
-		-DINSTALL_MYSQLDATADIR="/var/db/mysql" \
-		-DINSTALL_MYSQLSHAREDIR="share/mysql" \
-		-DINSTALL_MYSQLTESTDIR="share/mysql/tests" \
-		-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_LIBEDIT=0 \
-		-DWITH_LIBWRAP=1
-
-SHEBANG_FILES=	scripts/*.pl* scripts/*.sh
-
-.ifdef USE_MYSQL
-.error You have `USE_MYSQL' variable defined either in environment or in make(1) arguments. Please undefine and try again.
-.endif
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MSSL}
-CMAKE_ARGS+=	-DWITH_SSL=bundled
-.endif
-.if ${PORT_OPTIONS:MFASTMTX}
-CMAKE_ARGS+=	-DWITH_FAST_MUTEXES=1
-.endif
-
-# MySQL-Server part
-.if !defined(CLIENT_ONLY)
-USES+=		mysql:55
-
-CONFLICTS_INSTALL=	mysql*-server \
-			mysqlwsrep*-server \
-			mariadb*-server \
-			percona*-server
-
-USE_RC_SUBR=	mysql-server
-
-USERS=		mysql
-GROUPS=		mysql
-
-MMAN1=		my_print_defaults.1 myisam_ftdump.1 myisamchk.1 myisamlog.1 myisampack.1 \
-		mysql.server.1 mysql_convert_table_format.1 mysql_fix_extensions.1 \
-		mysql_install_db.1 mysql_plugin.1 mysql_secure_installation.1 mysql_setpermission.1 \
-		mysql_tzinfo_to_sql.1 mysql_upgrade.1 mysql_zap.1 mysqlbug.1 \
-		mysqld_multi.1 mysqld_safe.1 mysqldumpslow.1 mysqlhotcopy.1 mysqlman.1 \
-		perror.1 replace.1 resolve_stack_dump.1 resolveip.1
-
-CMAKE_ARGS+=	-DWITH_EMBEDDED_SERVER="ON"
-.endif
-
-post-patch:
-	@${REINPLACE_CMD} 's/*.1/${MMAN1}/' ${WRKSRC}/man/CMakeLists.txt
-
-post-install:
-	# Empty directory, but check-plist complains
-	@${RMDIR} ${STAGEDIR}${PREFIX}/info || ${TRUE}
-
-.include <bsd.port.pre.mk>
-
-.if ${ARCH} == armv6 || ${ARCH} == armv7
-EXTRA_PATCHES+=		${FILESDIR}/extra-patch-config.h.cmake
-.endif
-
-.include <bsd.port.post.mk>
diff --git a/databases/mysql55-server/distinfo b/databases/mysql55-server/distinfo
deleted file mode 100644
index 052db61350b5..000000000000
--- a/databases/mysql55-server/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1540551076
-SHA256 (mysql-5.5.62.tar.gz) = b1e7853bc1f04aabf6771e0ad947f35ac8d237f4b35d0706d1095c9526ff99d7
-SIZE (mysql-5.5.62.tar.gz) = 21111902
diff --git a/databases/mysql55-server/files/extra-patch-config.h.cmake b/databases/mysql55-server/files/extra-patch-config.h.cmake
deleted file mode 100644
index 3ac1add1b9ce..000000000000
--- a/databases/mysql55-server/files/extra-patch-config.h.cmake
+++ /dev/null
@@ -1,12 +0,0 @@
---- config.h.cmake.orig	2014-12-05 16:24:02 UTC
-+++ config.h.cmake
-@@ -151,7 +151,8 @@
- #cmakedefine HAVE_FESETROUND 1
- #cmakedefine HAVE_FINITE 1
- #cmakedefine HAVE_FP_EXCEPT 1
--#cmakedefine HAVE_FPSETMASK 1
-+#cmakedefine HAVE_FPSETMASK 0
-+#cmakedefine HAVE_FEDISABLEEXCEPT 1
- #cmakedefine HAVE_FSEEKO 1
- #cmakedefine HAVE_FSYNC 1
- #cmakedefine HAVE_FTIME 1
diff --git a/databases/mysql55-server/files/mysql-server.in b/databases/mysql55-server/files/mysql-server.in
deleted file mode 100644
index 5bd18d2d68c8..000000000000
--- a/databases/mysql55-server/files/mysql-server.in
+++ /dev/null
@@ -1,67 +0,0 @@
-#!/bin/sh
-
-# PROVIDE: mysql
-# REQUIRE: LOGIN
-# KEYWORD: shutdown
-
-#
-# Add the following line to /etc/rc.conf to enable mysql:
-# mysql_enable (bool):	Set to "NO" by default.
-#			Set it to "YES" to enable MySQL.
-# mysql_dbdir (str):	Default to "/var/db/mysql"
-#			Base database directory.
-# mysql_optfile (str):	Server-specific option file.
-#			Default to "${mysql_dbdir}/my.cnf".
-# mysql_pidfile (str):	Custum PID file path and name.
-#			Default to "${mysql_dbdir}/${hostname}.pid".
-# mysql_args (str):	Custom additional arguments to be passed
-#			to mysqld_safe (default empty).
-#
-
-. /etc/rc.subr
-
-name="mysql"
-rcvar=mysql_enable
-
-load_rc_config $name
-
-: ${mysql_enable="NO"}
-: ${mysql_dbdir="/var/db/mysql"}
-: ${mysql_optfile="${mysql_dbdir}/my.cnf"}
-
-mysql_user="mysql"
-: ${hostname:=`/bin/hostname`}
-pidfile=${mysql_pidfile:-"${mysql_dbdir}/${hostname}.pid"}
-command="/usr/sbin/daemon"
-command_args="-c -f %%PREFIX%%/bin/mysqld_safe --defaults-extra-file=${mysql_optfile} --user=${mysql_user} --datadir=${mysql_dbdir} --pid-file=${pidfile} ${mysql_args}"
-procname="%%PREFIX%%/libexec/mysqld"
-start_precmd="${name}_prestart"
-start_postcmd="${name}_poststart"
-mysql_install_db="%%PREFIX%%/bin/mysql_install_db"
-mysql_install_db_args="--basedir=%%PREFIX%% --defaults-extra-file=${mysql_optfile} --datadir=${mysql_dbdir} --force"
-
-mysql_create_auth_tables()
-{
-	eval $mysql_install_db $mysql_install_db_args >/dev/null 2>/dev/null
-        [ $? -eq 0 ] && chown -R ${mysql_user}:${mysql_user} ${mysql_dbdir}
-}
-
-mysql_prestart()
-{
-	if [ ! -d "${mysql_dbdir}/mysql/." ]; then
-		mysql_create_auth_tables || return 1
-	fi
-	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"
diff --git a/databases/mysql55-server/files/patch-CMakeLists.txt b/databases/mysql55-server/files/patch-CMakeLists.txt
deleted file mode 100644
index 59e1a4126599..000000000000
--- a/databases/mysql55-server/files/patch-CMakeLists.txt
+++ /dev/null
@@ -1,49 +0,0 @@
---- CMakeLists.txt.orig	2013-05-16 17:47:15.000000000 +0200
-+++ CMakeLists.txt	2013-06-12 09:41:06.000000000 +0200
-@@ -306,7 +306,6 @@
- 
- ADD_SUBDIRECTORY(extra)
- IF(NOT WITHOUT_SERVER)
--  ADD_SUBDIRECTORY(tests)
-   ADD_SUBDIRECTORY(client)
-   ADD_SUBDIRECTORY(sql)
-   ADD_SUBDIRECTORY(sql/share)
-@@ -314,14 +313,10 @@
-   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(support-files)
-   ADD_SUBDIRECTORY(scripts)
--  ADD_SUBDIRECTORY(sql-bench)
-   IF(UNIX)
-     ADD_SUBDIRECTORY(man)
-   ENDIF()
-@@ -365,8 +360,10 @@
- ELSE()
-   SET(CPACK_GENERATOR "TGZ")
- ENDIF() 
-+IF(FALSE)
- ADD_SUBDIRECTORY(packaging/WiX)
- ADD_SUBDIRECTORY(packaging/solaris)
-+ENDIF() 
- 
- # Create a single package with "make package"
- # (see http://public.kitware.com/Bug/view.php?id=11452)
-@@ -379,6 +376,7 @@
- #
- # RPM installs documentation directly from the source tree
- #
-+IF(FALSE)
- IF(NOT INSTALL_LAYOUT MATCHES "RPM")
-   INSTALL(FILES COPYING LICENSE.mysql 
-   DESTINATION ${INSTALL_DOCREADMEDIR} 
-@@ -404,3 +402,4 @@
-     PATTERN "sp-imp-spec.txt" EXCLUDE
-   )
- ENDIF()
-+ENDIF()
diff --git a/databases/mysql55-server/files/patch-client_CMakeLists.txt b/databases/mysql55-server/files/patch-client_CMakeLists.txt
deleted file mode 100644
index fc496933828e..000000000000
--- a/databases/mysql55-server/files/patch-client_CMakeLists.txt
+++ /dev/null
@@ -1,62 +0,0 @@
---- client/CMakeLists.txt.orig	2014-11-04 07:49:50.000000000 +0000
-+++ client/CMakeLists.txt	2014-12-03 09:23:56.610710083 +0000
-@@ -27,11 +27,13 @@
- 
- ADD_DEFINITIONS(${READLINE_DEFINES})
- ADD_DEFINITIONS(${SSL_DEFINES})
-+IF(FALSE)
- MYSQL_ADD_EXECUTABLE(mysql completion_hash.cc mysql.cc readline.cc sql_string.cc)
- TARGET_LINK_LIBRARIES(mysql mysqlclient)
- IF(UNIX)
-   TARGET_LINK_LIBRARIES(mysql ${READLINE_LIBRARY})
- 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 mysqlclient regex)
- 
- 
-+IF(FALSE)
- MYSQL_ADD_EXECUTABLE(mysqlcheck mysqlcheck.c)
- TARGET_LINK_LIBRARIES(mysqlcheck mysqlclient)
- 
-@@ -52,17 +55,21 @@
- 
- MYSQL_ADD_EXECUTABLE(mysqlimport mysqlimport.c)
- TARGET_LINK_LIBRARIES(mysqlimport mysqlclient)
-+ENDIF()
- 
- MYSQL_ADD_EXECUTABLE(mysql_upgrade mysql_upgrade.c)
- 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)
- 
-@@ -72,13 +79,14 @@
- 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)
- ENDIF(WIN32)
- 
--SET_TARGET_PROPERTIES (mysqlcheck mysqldump mysqlimport mysql_upgrade mysqlshow mysqlslap mysql_plugin 
-+SET_TARGET_PROPERTIES (mysql_upgrade mysql_plugin
- PROPERTIES HAS_CXX TRUE)
- 
- ADD_DEFINITIONS(-DHAVE_DLOPEN)
diff --git a/databases/mysql55-server/files/patch-client_mysql.cc b/databases/mysql55-server/files/patch-client_mysql.cc
deleted file mode 100644
index 5a03f22b249f..000000000000
--- a/databases/mysql55-server/files/patch-client_mysql.cc
+++ /dev/null
@@ -1,25 +0,0 @@
---- client/mysql.cc.orig	2016-09-30 11:41:40 UTC
-+++ client/mysql.cc
-@@ -2738,9 +2738,11 @@ static void initialize_readline (char *n
- #ifdef HAVE_LOCALE_H
-   setlocale(LC_ALL,""); /* so as libedit use isprint */
- #endif
--  rl_attempted_completion_function= (CPPFunction*)&new_mysql_completion;
--  rl_completion_entry_function= &no_completion;
-+  rl_attempted_completion_function= (rl_completion_func_t*)&new_mysql_completion;
-+  rl_completion_entry_function= (rl_compentry_func_t*)&no_completion;
-+  /*
-   rl_add_defun("magic-space", (Function*)&fake_magic_space, -1);
-+  */
- #else
-   rl_attempted_completion_function= (CPPFunction*)&new_mysql_completion;
-   rl_completion_entry_function= &no_completion;
-@@ -2759,7 +2761,7 @@ static char **new_mysql_completion(const
-                                    int end MY_ATTRIBUTE((unused)))
- {
-   if (!status.batch && !quick)
--#if defined(USE_NEW_READLINE_INTERFACE)
-+#if defined(USE_NEW_READLINE_INTERFACE) || defined(USE_LIBEDIT_INTERFACE)
-     return rl_completion_matches(text, new_command_generator);
- #else
-     return completion_matches((char *)text, (CPFunction *)new_command_generator);
diff --git a/databases/mysql55-server/files/patch-cmake_plugin.cmake b/databases/mysql55-server/files/patch-cmake_plugin.cmake
deleted file mode 100644
index c151ea35f4ee..000000000000
--- a/databases/mysql55-server/files/patch-cmake_plugin.cmake
+++ /dev/null
@@ -1,10 +0,0 @@
---- cmake/plugin.cmake.orig	2011-09-09 17:56:39.000000000 +0200
-+++ cmake/plugin.cmake	2011-10-07 10:56:37.000000000 +0200
-@@ -195,7 +195,6 @@
-       OUTPUT_NAME "${ARG_MODULE_OUTPUT_NAME}")  
-     # Install dynamic library
-     MYSQL_INSTALL_TARGETS(${target} DESTINATION ${INSTALL_PLUGINDIR} COMPONENT Server)
--    INSTALL_DEBUG_TARGET(${target} DESTINATION ${INSTALL_PLUGINDIR}/debug)
-     # Add installed files to list for RPMs
-     FILE(APPEND ${CMAKE_BINARY_DIR}/support-files/plugins.files
-             "%attr(755, root, root) %{_prefix}/${INSTALL_PLUGINDIR}/${ARG_MODULE_OUTPUT_NAME}.so\n"
diff --git a/databases/mysql55-server/files/patch-extra_CMakeLists.txt b/databases/mysql55-server/files/patch-extra_CMakeLists.txt
deleted file mode 100644
index f8f555f5e0e8..000000000000
--- a/databases/mysql55-server/files/patch-extra_CMakeLists.txt
+++ /dev/null
@@ -1,12 +0,0 @@
---- extra/CMakeLists.txt.orig	2010-12-23 17:38:06.000000000 +0100
-+++ extra/CMakeLists.txt	2010-12-23 17:38:51.000000000 +0100
-@@ -75,7 +75,9 @@
-   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)
-   TARGET_LINK_LIBRARIES(mysql_waitpid mysys)
- ENDIF()
-+ENDIF()
- 
diff --git a/databases/mysql55-server/files/patch-include_CMakeLists.txt b/databases/mysql55-server/files/patch-include_CMakeLists.txt
deleted file mode 100644
index 2478ae5fa6e3..000000000000
--- a/databases/mysql55-server/files/patch-include_CMakeLists.txt
+++ /dev/null
@@ -1,10 +0,0 @@
---- include/CMakeLists.txt.orig	2011-01-19 23:37:08.000000000 +0100
-+++ include/CMakeLists.txt	2011-02-07 22:40:32.698758463 +0100
-@@ -57,5 +57,7 @@
-   ${HEADERS_GEN_CONFIGURE}
- )
- 
-+IF(FALSE)
- INSTALL(FILES ${HEADERS} DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development)
- INSTALL(DIRECTORY mysql/ DESTINATION ${INSTALL_INCLUDEDIR}/mysql COMPONENT Development FILES_MATCHING PATTERN "*.h")
-+ENDIF()
diff --git a/databases/mysql55-server/files/patch-include_my_compare.h b/databases/mysql55-server/files/patch-include_my_compare.h
deleted file mode 100644
index 093c8ae37789..000000000000
--- a/databases/mysql55-server/files/patch-include_my_compare.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- include/my_compare.h.orig	2011-05-10 09:46:46.000000000 +0200
-+++ include/my_compare.h	2011-05-10 09:47:01.000000000 +0200
-@@ -39,7 +39,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              16          /* Max segments for key */
- 
- #define HA_MAX_POSSIBLE_KEY_BUFF    (HA_MAX_KEY_LENGTH + 24+ 6+6)
diff --git a/databases/mysql55-server/files/patch-include_myisam.h b/databases/mysql55-server/files/patch-include_myisam.h
deleted file mode 100644
index 450645400dd5..000000000000
--- a/databases/mysql55-server/files/patch-include_myisam.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- include/myisam.h.orig	2009-02-16 23:04:54.000000000 +0100
-+++ include/myisam.h	2009-02-16 23:10:08.000000000 +0100
-@@ -48,7 +48,7 @@
-   The following defines can be increased if necessary.
-   But beware the dependency of MI_MAX_POSSIBLE_KEY_BUFF and MI_MAX_KEY_LENGTH.
- */
--#define MI_MAX_KEY_LENGTH           1000            /* Max length in bytes */
-+#define MI_MAX_KEY_LENGTH           4000            /* Max length in bytes */
- #define MI_MAX_KEY_SEG              16              /* Max segments for key */
- 
- #define MI_MAX_KEY_BUFF  (MI_MAX_KEY_LENGTH+MI_MAX_KEY_SEG*6+8+8)
diff --git a/databases/mysql55-server/files/patch-libmysql_CMakeLists.txt b/databases/mysql55-server/files/patch-libmysql_CMakeLists.txt
deleted file mode 100644
index 9d7dfc81fbaa..000000000000
--- a/databases/mysql55-server/files/patch-libmysql_CMakeLists.txt
+++ /dev/null
@@ -1,39 +0,0 @@
---- libmysql/CMakeLists.txt.orig	2014-03-14 18:58:32.000000000 +0000
-+++ libmysql/CMakeLists.txt	2014-03-31 12:19:56.265410574 +0000
-@@ -165,7 +165,7 @@
- 
- # 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
- INSTALL_DEBUG_SYMBOLS(clientlib)
-@@ -180,6 +180,7 @@
-   SET(${out_name} ${name})
- ENDMACRO()
- 
-+IF(FALSE)
- IF(UNIX)
-   MACRO(GET_VERSIONED_LIBNAME LIBNAME EXTENSION VERSION OUTNAME)
-     SET(DOT_VERSION ".${VERSION}")
-@@ -200,11 +201,13 @@
-     ${lib_name} ${CMAKE_STATIC_LIBRARY_PREFIX}mysqlclient_r.a
-     ${INSTALL_LIBDIR} Development)
- ENDIF()
-+ENDIF()
- 
- IF(NOT DISABLE_SHARED)
-   MERGE_LIBRARIES(libmysql SHARED ${LIBS}
-     EXPORTS ${CLIENT_API_FUNCTIONS}
--    COMPONENT SharedLibraries)
-+    COMPONENT SharedLibraries NOINSTALL)
-+IF(FALSE)
-   IF(UNIX)
-     # libtool compatability
-     IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR APPLE)
-@@ -261,3 +264,4 @@
-     ENDFOREACH()
-   ENDIF()
- ENDIF()
-+ENDIF()
diff --git a/databases/mysql55-server/files/patch-libservices_CMakeLists.txt b/databases/mysql55-server/files/patch-libservices_CMakeLists.txt
deleted file mode 100644
index fcbcea7aed21..000000000000
--- a/databases/mysql55-server/files/patch-libservices_CMakeLists.txt
+++ /dev/null
@@ -1,9 +0,0 @@
---- libservices/CMakeLists.txt.orig	2010-12-23 17:13:03.000000000 +0100
-+++ libservices/CMakeLists.txt	2010-12-23 17:13:17.000000000 +0100
-@@ -22,4 +22,6 @@
-   my_thread_scheduler_service.c)
- 
- ADD_LIBRARY(mysqlservices ${MYSQLSERVICES_SOURCES})
-+IF(FALSE)
- INSTALL(TARGETS mysqlservices DESTINATION ${INSTALL_LIBDIR} COMPONENT Development)
-+ENDIF()
diff --git a/databases/mysql55-server/files/patch-man_CMakeLists.txt b/databases/mysql55-server/files/patch-man_CMakeLists.txt
deleted file mode 100644
index 7849c77af111..000000000000
--- a/databases/mysql55-server/files/patch-man_CMakeLists.txt
+++ /dev/null
@@ -1,11 +0,0 @@
---- man/CMakeLists.txt.orig	2011-10-22 14:36:06.000000000 +0200
-+++ man/CMakeLists.txt	2011-10-22 14:36:23.000000000 +0200
-@@ -15,8 +15,6 @@
- 
- # Copy man pages
- FILE(GLOB MAN1_FILES *.1)
--FILE(GLOB MAN1_EXCLUDE make_win_bin_dist.1)
--FILE(GLOB MAN1_NDB ndb*.1)
- FILE(GLOB MAN8_FILES *.8)
- FILE(GLOB MAN8_NDB ndb*.8)
- IF(MAN1_FILES)
diff --git a/databases/mysql55-server/files/patch-mysys_default.c b/databases/mysql55-server/files/patch-mysys_default.c
deleted file mode 100644
index 816105371bdf..000000000000
--- a/databases/mysql55-server/files/patch-mysys_default.c
+++ /dev/null
@@ -1,31 +0,0 @@
---- mysys/default.c.orig	2010-11-02 23:01:13.000000000 +0100
-+++ mysys/default.c	2010-11-10 16:39:51.000000000 +0100
-@@ -70,7 +70,7 @@
- 
- /* 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;
- 
-@@ -711,7 +711,7 @@
-   {
-     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
-@@ -1153,7 +1153,10 @@
- 
- #if defined(DEFAULT_SYSCONFDIR)
-   if (DEFAULT_SYSCONFDIR[0])
-+  {
-     errors += add_directory(alloc, DEFAULT_SYSCONFDIR, dirs);
-+    errors += add_directory(alloc, DEFAULT_SYSCONFDIR "/mysql", dirs);
-+  }
- #endif /* DEFAULT_SYSCONFDIR */
- 
- #endif
diff --git a/databases/mysql55-server/files/patch-scripts_CMakeLists.txt b/databases/mysql55-server/files/patch-scripts_CMakeLists.txt
deleted file mode 100644
index de410a1d3549..000000000000
--- a/databases/mysql55-server/files/patch-scripts_CMakeLists.txt
+++ /dev/null
@@ -1,37 +0,0 @@
---- scripts/CMakeLists.txt.orig	2011-07-13 21:09:03.000000000 +0200
-+++ scripts/CMakeLists.txt	2011-09-01 09:48:22.000000000 +0200
-@@ -266,6 +266,8 @@
-           GET_FILENAME_COMPONENT(lib "${lib}" NAME_WE)
-           STRING(REGEX REPLACE "^lib" "" lib "${lib}")
-           SET(${var} "${${var}}-l${lib} " ) 
-+        ELSEIF(lib STREQUAL "-pthread")
-+          SET(${var} "${${var}}-pthread " ) 
-         ELSE()
-           SET(${var} "${${var}}-l${lib} " ) 
-         ENDIF()
-@@ -316,16 +318,11 @@
-   # On Unix, most of the files end up in the bin directory
-   SET(mysql_config_COMPONENT COMPONENT Development)
-   SET(BIN_SCRIPTS
--    msql2mysql
--    mysql_config
-     mysql_fix_extensions
-     mysql_setpermission
-     mysql_secure_installation
-     mysql_zap
--    mysqlaccess
--    mysqlaccess.conf
-     mysql_convert_table_format
--    mysql_find_rows
-     mysqlhotcopy
-     mysqldumpslow
-     mysqld_multi
-@@ -334,7 +331,7 @@
-   FOREACH(file ${BIN_SCRIPTS})
-     IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh)
-       CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh
--        ${CMAKE_CURRENT_BINARY_DIR}/${file} ESCAPE_QUOTES @ONLY)
-+        ${CMAKE_CURRENT_BINARY_DIR}/${file} @ONLY)
-     ELSEIF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${file})
-       CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${file}
-          ${CMAKE_CURRENT_BINARY_DIR}/${file} COPYONLY)
diff --git a/databases/mysql55-server/files/patch-scripts_mysqld_safe.sh b/databases/mysql55-server/files/patch-scripts_mysqld_safe.sh
deleted file mode 100644
index 2a30469922f0..000000000000
--- a/databases/mysql55-server/files/patch-scripts_mysqld_safe.sh
+++ /dev/null
@@ -1,24 +0,0 @@
---- scripts/mysqld_safe.sh.orig	2007-10-08 10:39:23.000000000 +0200
-+++ scripts/mysqld_safe.sh	2007-10-08 10:40:52.000000000 +0200
-@@ -242,10 +242,10 @@
- 
- 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"
- 
-@@ -254,7 +254,7 @@
-   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"
-     MYSQL_HOME=$DATADIR
-   else
-     MYSQL_HOME=$MY_BASEDIR_VERSION
diff --git a/databases/mysql55-server/files/patch-sql_CMakeLists.txt b/databases/mysql55-server/files/patch-sql_CMakeLists.txt
deleted file mode 100644
index 41d8905bd519..000000000000
--- a/databases/mysql55-server/files/patch-sql_CMakeLists.txt
+++ /dev/null
@@ -1,18 +0,0 @@
---- sql/CMakeLists.txt.orig	2013-03-25 14:14:58.000000000 +0100
-+++ sql/CMakeLists.txt	2013-04-19 14:57:41.000000000 +0200
-@@ -261,6 +261,7 @@ ADD_CUSTOM_TARGET(distclean
- 
- IF(INSTALL_LAYOUT STREQUAL "STANDALONE")
- 
-+IF(FALSE)
- # Copy db.opt into data/test/
- SET(DBOPT_FILE ${CMAKE_CURRENT_SOURCE_DIR}/db.opt ) 
- INSTALL(FILES ${DBOPT_FILE} DESTINATION data/test COMPONENT DataFiles)
-@@ -301,6 +302,7 @@ ELSE()
-   INSTALL(FILES ${DUMMY_FILE} DESTINATION data/mysql COMPONENT DataFiles)
- ENDIF()
- ENDIF()
-+ENDIF()
- 
- ADD_CUSTOM_TARGET(show-dist-name
-   COMMAND ${CMAKE_COMMAND} -E echo "${CPACK_PACKAGE_FILE_NAME}"
diff --git a/databases/mysql55-server/files/patch-sql_common_client_plugin.c b/databases/mysql55-server/files/patch-sql_common_client_plugin.c
deleted file mode 100644
index 069eaef76e11..000000000000
--- a/databases/mysql55-server/files/patch-sql_common_client_plugin.c
+++ /dev/null
@@ -1,47 +0,0 @@
---- sql-common/client_plugin.c.orig	2014-09-22 09:23:23 UTC
-+++ sql-common/client_plugin.c
-@@ -233,11 +233,13 @@
- {
-   MYSQL mysql;
-   struct st_mysql_client_plugin **builtin;
-+  va_list unused;
- 
-   if (initialized)
-     return 0;
- 
-   bzero(&mysql, sizeof(mysql)); /* dummy mysql for set_mysql_extended_error */
-+  bzero(&unused, sizeof(unused)); /* suppress uninitialized-value warnings */
- 
-   pthread_mutex_init(&LOCK_load_client_plugin, MY_MUTEX_INIT_SLOW);
-   init_alloc_root(&mem_root, 128, 128);
-@@ -249,7 +251,7 @@
-   pthread_mutex_lock(&LOCK_load_client_plugin);
- 
-   for (builtin= mysql_client_builtins; *builtin; builtin++)
--    add_plugin(&mysql, *builtin, 0, 0, 0);
-+    add_plugin(&mysql, *builtin, 0, 0, unused);
- 
-   pthread_mutex_unlock(&LOCK_load_client_plugin);
- 
-@@ -293,9 +295,12 @@
- mysql_client_register_plugin(MYSQL *mysql,
-                              struct st_mysql_client_plugin *plugin)
- {
-+  va_list unused;
-   if (is_not_initialized(mysql, plugin->name))
-     return NULL;
- 
-+  bzero(&unused, sizeof(unused)); /* suppress uninitialized-value warnings */
-+
-   pthread_mutex_lock(&LOCK_load_client_plugin);
- 
-   /* make sure the plugin wasn't loaded meanwhile */
-@@ -307,7 +312,7 @@
-     plugin= NULL;
-   }
-   else
--    plugin= add_plugin(mysql, plugin, 0, 0, 0);
-+    plugin= add_plugin(mysql, plugin, 0, 0, unused);
- 
-   pthread_mutex_unlock(&LOCK_load_client_plugin);
-   return plugin;
diff --git a/databases/mysql55-server/files/patch-sql_sql_partition.cc b/databases/mysql55-server/files/patch-sql_sql_partition.cc
deleted file mode 100644
index 11c62230ac6c..000000000000
--- a/databases/mysql55-server/files/patch-sql_sql_partition.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- sql/sql_partition.cc.orig	2018-05-14 15:35:48.089983000 +0200
-+++ sql/sql_partition.cc	2018-05-14 15:36:03.185749000 +0200
-@@ -283,7 +283,7 @@
-     }
-   }
-   part_info->set_up_defaults_for_partitioning(table->file,
--                                              (ulonglong)0, (uint)0);
-+                                              NULL, 0U);
-   DBUG_RETURN(FALSE);
- }
- 
diff --git a/databases/mysql55-server/files/patch-sql_sql_trigger.cc b/databases/mysql55-server/files/patch-sql_sql_trigger.cc
deleted file mode 100644
index 7e308976b3ec..000000000000
--- a/databases/mysql55-server/files/patch-sql_sql_trigger.cc
+++ /dev/null
@@ -1,50 +0,0 @@
---- sql/sql_trigger.cc.orig	2012-08-02 00:01:13.000000000 +0200
-+++ sql/sql_trigger.cc	2012-09-11 17:01:13.000000000 +0200
-@@ -192,32 +192,32 @@ static File_option triggers_file_parameters[]=
- {
-   {
-     { 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_parameters[]=
- 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
- };
- 
diff --git a/databases/mysql55-server/files/patch-sql_sql_view.cc b/databases/mysql55-server/files/patch-sql_sql_view.cc
deleted file mode 100644
index 5f4d92d7eebf..000000000000
--- a/databases/mysql55-server/files/patch-sql_sql_view.cc
+++ /dev/null
@@ -1,63 +0,0 @@
---- sql/sql_view.cc.orig	2012-08-02 00:01:13.000000000 +0200
-+++ sql/sql_view.cc	2012-09-11 17:01:13.000000000 +0200
-@@ -730,46 +730,46 @@ static const int required_view_parameters= 14;
- */
- 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_ULONGLONG},
-  {{ 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},
-  {{NullS, 0},			0,
-   FILE_OPTIONS_STRING}
diff --git a/databases/mysql55-server/files/patch-sql_sys_vars.cc b/databases/mysql55-server/files/patch-sql_sys_vars.cc
deleted file mode 100644
index e8f0caff4aff..000000000000
--- a/databases/mysql55-server/files/patch-sql_sys_vars.cc
+++ /dev/null
@@ -1,38 +0,0 @@
---- sql/sys_vars.cc.orig	2012-06-15 17:03:32.000000000 +0200
-+++ sql/sys_vars.cc	2012-06-15 17:16:23.000000000 +0200
-@@ -900,7 +900,7 @@
-        "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_ulong Sys_join_buffer_size(
-        "join_buffer_size",
-@@ -1401,7 +1401,7 @@
-        "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));
- 
-@@ -1416,7 +1416,7 @@
-        "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));
- 
-@@ -2257,7 +2257,7 @@
-        "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 */
diff --git a/databases/mysql55-server/files/patch-support-files_CMakeLists.txt b/databases/mysql55-server/files/patch-support-files_CMakeLists.txt
deleted file mode 100644
index 159e1fa71ba2..000000000000
--- a/databases/mysql55-server/files/patch-support-files_CMakeLists.txt
+++ /dev/null
@@ -1,12 +0,0 @@
---- support-files/CMakeLists.txt.orig	2010-12-23 17:38:19.000000000 +0100
-+++ support-files/CMakeLists.txt	2010-12-23 17:41:11.000000000 +0100
-@@ -74,7 +74,9 @@
-     INSTALL(FILES magic DESTINATION ${inst_location} COMPONENT SupportFiles)
-   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)
-   CONFIGURE_FILE(mysql.spec.sh ${CMAKE_CURRENT_BINARY_DIR}/mysql.${VERSION}.spec @ONLY)
diff --git a/databases/mysql55-server/pkg-descr b/databases/mysql55-server/pkg-descr
deleted file mode 100644
index 028ce03b0da2..000000000000
--- a/databases/mysql55-server/pkg-descr
+++ /dev/null
@@ -1,4 +0,0 @@
-MySQL is a very fast, multi-threaded, multi-user and robust SQL
-(Structured Query Language) database server.
-
-WWW: https://www.mysql.com/
diff --git a/databases/mysql55-server/pkg-message b/databases/mysql55-server/pkg-message
deleted file mode 100644
index e619c93e68e7..000000000000
--- a/databases/mysql55-server/pkg-message
+++ /dev/null
@@ -1,8 +0,0 @@
-[
-{ type: upgrade
-  message: <<EOM
-Remember to run mysql_upgrade the first time you start the MySQL server
-after an upgrade from an earlier version.
-EOM
-}
-]
diff --git a/databases/mysql55-server/pkg-plist b/databases/mysql55-server/pkg-plist
deleted file mode 100644
index f7e84e1e317c..000000000000
--- a/databases/mysql55-server/pkg-plist
+++ /dev/null
@@ -1,136 +0,0 @@
-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/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
-lib/mysql/libmysqld.a
-lib/mysql/plugin/adt_null.so
-lib/mysql/plugin/auth.so
-lib/mysql/plugin/auth_test_plugin.so
-lib/mysql/plugin/daemon_example.ini
-lib/mysql/plugin/ha_archive.so
-lib/mysql/plugin/ha_blackhole.so
-lib/mysql/plugin/ha_example.so
-lib/mysql/plugin/ha_federated.so
-lib/mysql/plugin/libdaemon_example.so
-lib/mysql/plugin/mypluglib.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/semisync_master.so
-lib/mysql/plugin/semisync_slave.so
-libexec/mysqld
-share/man/man1/my_print_defaults.1.gz
-share/man/man1/myisam_ftdump.1.gz
-share/man/man1/myisamchk.1.gz
-share/man/man1/myisamlog.1.gz
-share/man/man1/myisampack.1.gz
-share/man/man1/mysql.server.1.gz
-share/man/man1/mysql_convert_table_format.1.gz
-share/man/man1/mysql_fix_extensions.1.gz
-share/man/man1/mysql_install_db.1.gz
-share/man/man1/mysql_plugin.1.gz
-share/man/man1/mysql_secure_installation.1.gz
-share/man/man1/mysql_setpermission.1.gz
-share/man/man1/mysql_tzinfo_to_sql.1.gz
-share/man/man1/mysql_upgrade.1.gz
-share/man/man1/mysql_zap.1.gz
-share/man/man1/mysqlbug.1.gz
-share/man/man1/mysqld_multi.1.gz
-share/man/man1/mysqld_safe.1.gz
-share/man/man1/mysqldumpslow.1.gz
-share/man/man1/mysqlhotcopy.1.gz
-share/man/man1/mysqlman.1.gz
-share/man/man1/perror.1.gz
-share/man/man1/replace.1.gz
-share/man/man1/resolve_stack_dump.1.gz
-share/man/man1/resolveip.1.gz
-share/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%%/config.huge.ini
-%%DATADIR%%/config.medium.ini
-%%DATADIR%%/config.small.ini
-%%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_system_tables.sql
-%%DATADIR%%/mysql_system_tables_data.sql
-%%DATADIR%%/mysql_test_data_timezone.sql
-%%DATADIR%%/mysqld_multi.server
-%%DATADIR%%/ndb-config-2-node.ini
-%%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
diff --git a/databases/percona56-client/Makefile b/databases/percona56-client/Makefile
deleted file mode 100644
index e37e6b5c0cd0..000000000000
--- a/databases/percona56-client/Makefile
+++ /dev/null
@@ -1,38 +0,0 @@
-# Created by: Alex Dupre <ale@FreeBSD.org>
-
-PORTNAME=	percona
-PKGNAMESUFFIX=	56-client
-
-COMMENT=	Multithreaded SQL database (client)
-
-MASTERDIR=	${.CURDIR}/../percona56-server
-
-OPTIONS_EXCLUDE=TOKUDB
-
-PKGMESSAGE=	${.CURDIR}/pkg-message
-PATCHDIR=	${.CURDIR}/files
-PLIST=		${.CURDIR}/pkg-plist
-
-CONFLICTS_INSTALL=	mysql*-client \
-			mariadb*-client \
-			percona5[0-57-9]-client
-
-CMAKE_ARGS+=	-DWITHOUT_SERVER=1
-
-USE_LDCONFIG=	${PREFIX}/lib/mysql
-
-MANPAGES=	comp_err.1 msql2mysql.1 mysql.1 mysql_config.1 mysql_find_rows.1 \
-		mysql_waitpid.1 mysqlaccess.1 mysqladmin.1 mysqlbinlog.1 \
-		mysqlcheck.1 mysqldump.1 mysqlimport.1 mysqlshow.1 mysqlslap.1
-
-CLIENT_ONLY=	yes
-
-# Percona renamed the libraries, until we decide how to deal with it create some symlinks
-# to prevent breaking installed ports.
-post-install:
-	${LN} -s libperconaserverclient.so ${STAGEDIR}${PREFIX}/lib/mysql/libmysqlclient.so
-	${LN} -s libperconaserverclient.so.18 ${STAGEDIR}${PREFIX}/lib/mysql/libmysqlclient.so.18
-	${LN} -s libperconaserverclient_r.so ${STAGEDIR}${PREFIX}/lib/mysql/libmysqlclient_r.so
-	${LN} -s libperconaserverclient_r.so.18 ${STAGEDIR}${PREFIX}/lib/mysql/libmysqlclient_r.so.18
-
-.include "${MASTERDIR}/Makefile"
diff --git a/databases/percona56-client/files/patch-CMakeLists.txt b/databases/percona56-client/files/patch-CMakeLists.txt
deleted file mode 100644
index b090d7519b10..000000000000
--- a/databases/percona56-client/files/patch-CMakeLists.txt
+++ /dev/null
@@ -1,74 +0,0 @@
---- CMakeLists.txt.orig	2017-05-29 12:44:32.006353000 +0200
-+++ CMakeLists.txt	2017-05-29 12:46:55.502845000 +0200
-@@ -486,42 +486,17 @@
- 
- ADD_SUBDIRECTORY(extra)
- ADD_SUBDIRECTORY(client)
--ADD_SUBDIRECTORY(sql/share)
- ADD_SUBDIRECTORY(libservices)
-+ADD_SUBDIRECTORY(support-files)
- 
- IF(UNIX)
-   ADD_SUBDIRECTORY(man)
- ENDIF()
- 
--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)
--ENDIF()
--
- # scripts/mysql_config depends on client and server targets loaded above.
- # It is referenced by some of the directories below, so we insert it here.
- ADD_SUBDIRECTORY(scripts)
- 
--IF(NOT WITHOUT_SERVER)
--  ADD_SUBDIRECTORY(mysql-test)
--  ADD_SUBDIRECTORY(mysql-test/lib/My/SafeProcess)
--  ADD_SUBDIRECTORY(support-files)
--  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-fedora)
--  ADD_SUBDIRECTORY(packaging/rpm-sles)
--  ADD_SUBDIRECTORY(packaging/rpm-docker)
--  ADD_SUBDIRECTORY(packaging/deb-in)
--ENDIF()
--
- INCLUDE(cmake/abi_check.cmake)
- INCLUDE(cmake/tags.cmake)
- 
-@@ -558,18 +533,17 @@
-   SET(CPACK_GENERATOR "TGZ")
- ENDIF() 
- ADD_SUBDIRECTORY(packaging/WiX)
--ADD_SUBDIRECTORY(packaging/solaris)
- 
- # Create a single package with "make package"
- # (see http://public.kitware.com/Bug/view.php?id=11452)
- SET(CPACK_MONOLITHIC_INSTALL 1 CACHE INTERNAL "")
- 
- IF(UNIX)
--  INSTALL(FILES Docs/mysql.info DESTINATION ${INSTALL_INFODIR} OPTIONAL COMPONENT Info)
- ENDIF()
- #
- # RPM installs documentation directly from the source tree
- #
-+IF(FALSE)
- IF(NOT INSTALL_LAYOUT MATCHES "RPM")
-   INSTALL(FILES COPYING LICENSE.mysql 
-   DESTINATION ${INSTALL_DOCREADMEDIR} 
-@@ -591,6 +565,7 @@
-     PATTERN "sp-imp-spec.txt" EXCLUDE
-   )
- ENDIF()
-+ENDIF()
- 
- INCLUDE(CPack)
- 
diff --git a/databases/percona56-client/files/patch-client_CMakeLists.txt b/databases/percona56-client/files/patch-client_CMakeLists.txt
deleted file mode 100644
index ef337915f997..000000000000
--- a/databases/percona56-client/files/patch-client_CMakeLists.txt
+++ /dev/null
@@ -1,44 +0,0 @@
---- client/CMakeLists.txt	2018-02-01 14:51:01.000000000 +0100
-+++ client/CMakeLists.txt.new	2018-02-20 15:53:56.534072000 +0100
-@@ -37,10 +37,12 @@
-   TARGET_LINK_LIBRARIES(mysql ${MY_READLINE_LIBRARY})
- 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 perconaserverclient regex)
- ADD_DEPENDENCIES(mysqltest GenError)
-+ENDIF()
- 
- MYSQL_ADD_EXECUTABLE(mysqlcheck mysqlcheck.c)
- TARGET_LINK_LIBRARIES(mysqlcheck perconaserverclient)
-@@ -52,15 +54,19 @@
- TARGET_LINK_LIBRARIES(mysqlimport perconaserverclient)
- SET_SOURCE_FILES_PROPERTIES(mysqlimport.c PROPERTIES COMPILE_FLAGS "-DTHREADS")
- 
-+IF(FALSE)
- MYSQL_ADD_EXECUTABLE(mysql_upgrade mysql_upgrade.c)
- TARGET_LINK_LIBRARIES(mysql_upgrade perconaserverclient)
- ADD_DEPENDENCIES(mysql_upgrade GenFixPrivs)
-+ENDIF()
- 
- MYSQL_ADD_EXECUTABLE(mysqlshow mysqlshow.c)
- TARGET_LINK_LIBRARIES(mysqlshow perconaserverclient)
- 
-+IF(FALSE)
- MYSQL_ADD_EXECUTABLE(mysql_plugin mysql_plugin.c)
- TARGET_LINK_LIBRARIES(mysql_plugin perconaserverclient)
-+ENDIF()
- 
- MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc sql_string.cc
-                      ../sql/rpl_filter.cc ../sql/sql_list.cc)
-@@ -82,8 +88,6 @@
- ENDIF(WIN32)
- 
- SET_TARGET_PROPERTIES (
--  mysql_plugin 
--  mysql_upgrade
-   mysqlcheck
-   mysqldump
-   mysqlimport
diff --git a/databases/percona56-client/files/patch-client__mysql.cc b/databases/percona56-client/files/patch-client__mysql.cc
deleted file mode 100644
index b73e1052d30d..000000000000
--- a/databases/percona56-client/files/patch-client__mysql.cc
+++ /dev/null
@@ -1,16 +0,0 @@
---- client/mysql.cc.orig	2012-02-27 19:15:22.271243107 +0000
-+++ client/mysql.cc	2012-02-27 19:16:16.645241508 +0000
-@@ -1601,11 +1601,11 @@
- #endif
- 
- #ifdef HAVE_READLINE
--  printf("%s  Ver %s Distrib %s, for %s (%s) using %s %s\n",
-+  printf("%s  Ver %s Distrib %s Percona, for %s (%s) using %s %s\n",
- 	 my_progname, VER, MYSQL_SERVER_VERSION, SYSTEM_TYPE, MACHINE_TYPE,
-          readline, rl_library_version);
- #else
--  printf("%s  Ver %s Distrib %s, for %s (%s)\n", my_progname, VER,
-+  printf("%s  Ver %s Distrib %s Percona, for %s (%s)\n", my_progname, VER,
- 	MYSQL_SERVER_VERSION, SYSTEM_TYPE, MACHINE_TYPE);
- #endif
- 
diff --git a/databases/percona56-client/files/patch-client_mysql.cc b/databases/percona56-client/files/patch-client_mysql.cc
deleted file mode 100644
index 9d5bf7c18d88..000000000000
--- a/databases/percona56-client/files/patch-client_mysql.cc
+++ /dev/null
@@ -1,25 +0,0 @@
---- client/mysql.cc.orig	2017-05-29 12:49:44.423885000 +0200
-+++ client/mysql.cc	2017-05-29 12:55:13.604765000 +0200
-@@ -2784,9 +2784,11 @@
- #ifdef HAVE_LOCALE_H
-   setlocale(LC_ALL,""); /* so as libedit use isprint */
- #endif
--  rl_attempted_completion_function= (CPPFunction*)&new_mysql_completion;
--  rl_completion_entry_function= &no_completion;
-+  rl_attempted_completion_function= (rl_completion_func_t*)&new_mysql_completion;
-+  rl_completion_entry_function= (rl_compentry_func_t*)&no_completion;
-+  /*
-   rl_add_defun("magic-space", (Function*)&fake_magic_space, -1);
-+  */
- #else
-   rl_attempted_completion_function= (CPPFunction*)&new_mysql_completion;
-   rl_completion_entry_function= &no_completion;
-@@ -2805,7 +2807,7 @@
-                                    int end MY_ATTRIBUTE((unused)))
- {
-   if (!status.batch && !quick)
--#if defined(USE_NEW_XLINE_INTERFACE)
-+#if defined(USE_NEW_READLINE_INTERFACE) || defined(USE_LIBEDIT_INTERFACE)
-     return rl_completion_matches(text, new_command_generator);
- #else
-     return completion_matches((char *)text, (CPFunction *)new_command_generator);
diff --git a/databases/percona56-client/files/patch-cmake_readline.cmake b/databases/percona56-client/files/patch-cmake_readline.cmake
deleted file mode 100644
index 4c251b15fc56..000000000000
--- a/databases/percona56-client/files/patch-cmake_readline.cmake
+++ /dev/null
@@ -1,17 +0,0 @@
---- cmake/readline.cmake.orig	2016-09-30 11:41:40 UTC
-+++ cmake/readline.cmake
-@@ -173,11 +173,11 @@ MACRO (FIND_SYSTEM_EDITLINE)
-     #include <readline.h>
-     int main(int argc, char **argv)
-     {
--      typedef int MYFunction(const char*, int);
-+      typedef char *MYFunction(const char*, int);
-       MYFunction* myf= rl_completion_entry_function;
--      int res= (myf)(NULL, 0);
-+      char *res= (myf)(NULL, 0);
-       completion_matches(0,0);
--      return res;
-+      return (res != NULL);
-     }"
-     EDITLINE_HAVE_COMPLETION)
- 
diff --git a/databases/percona56-client/files/patch-extra_CMakeLists.txt b/databases/percona56-client/files/patch-extra_CMakeLists.txt
deleted file mode 100644
index 5235c53fe569..000000000000
--- a/databases/percona56-client/files/patch-extra_CMakeLists.txt
+++ /dev/null
@@ -1,24 +0,0 @@
---- extra/CMakeLists.txt.orig	2020-07-21 12:31:43.000000000 +0200
-+++ extra/CMakeLists.txt	2020-09-17 22:40:42.442794000 +0200
-@@ -58,6 +58,7 @@
-                   ${PROJECT_BINARY_DIR}/sql/share/english/errmsg.sys 
-                   ${PROJECT_SOURCE_DIR}/sql/share/errmsg-utf8.txt)
- 
-+IF(FALSE)
- MYSQL_ADD_EXECUTABLE(my_print_defaults my_print_defaults.c)
- TARGET_LINK_LIBRARIES(my_print_defaults mysys mysys_ssl)
- SET_TARGET_PROPERTIES(my_print_defaults PROPERTIES LINKER_LANGUAGE CXX)
-@@ -97,10 +98,13 @@
-   TARGET_LINK_LIBRARIES(innochecksum mysys mysys_ssl)
-   ADD_DEPENDENCIES(innochecksum GenError)
- ENDIF()
-+ENDIF()
- 
- IF(UNIX)
-+IF(FALSE)
-   MYSQL_ADD_EXECUTABLE(resolve_stack_dump resolve_stack_dump.cc)
-   TARGET_LINK_LIBRARIES(resolve_stack_dump mysys mysys_ssl)
-+ENDIF()
- 
-   MYSQL_ADD_EXECUTABLE(mysql_waitpid mysql_waitpid.c)
-   TARGET_LINK_LIBRARIES(mysql_waitpid mysys mysys_ssl)
diff --git a/databases/percona56-client/files/patch-include_my_compare.h b/databases/percona56-client/files/patch-include_my_compare.h
deleted file mode 100644
index 093c8ae37789..000000000000
--- a/databases/percona56-client/files/patch-include_my_compare.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- include/my_compare.h.orig	2011-05-10 09:46:46.000000000 +0200
-+++ include/my_compare.h	2011-05-10 09:47:01.000000000 +0200
-@@ -39,7 +39,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              16          /* Max segments for key */
- 
- #define HA_MAX_POSSIBLE_KEY_BUFF    (HA_MAX_KEY_LENGTH + 24+ 6+6)
diff --git a/databases/percona56-client/files/patch-include_myisam.h b/databases/percona56-client/files/patch-include_myisam.h
deleted file mode 100644
index 450645400dd5..000000000000
--- a/databases/percona56-client/files/patch-include_myisam.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- include/myisam.h.orig	2009-02-16 23:04:54.000000000 +0100
-+++ include/myisam.h	2009-02-16 23:10:08.000000000 +0100
-@@ -48,7 +48,7 @@
-   The following defines can be increased if necessary.
-   But beware the dependency of MI_MAX_POSSIBLE_KEY_BUFF and MI_MAX_KEY_LENGTH.
- */
--#define MI_MAX_KEY_LENGTH           1000            /* Max length in bytes */
-+#define MI_MAX_KEY_LENGTH           4000            /* Max length in bytes */
- #define MI_MAX_KEY_SEG              16              /* Max segments for key */
- 
- #define MI_MAX_KEY_BUFF  (MI_MAX_KEY_LENGTH+MI_MAX_KEY_SEG*6+8+8)
diff --git a/databases/percona56-client/files/patch-man_CMakeLists.txt b/databases/percona56-client/files/patch-man_CMakeLists.txt
deleted file mode 100644
index 0f79f3e2403d..000000000000
--- a/databases/percona56-client/files/patch-man_CMakeLists.txt
+++ /dev/null
@@ -1,13 +0,0 @@
---- man/CMakeLists.txt.orig	2011-10-22 14:08:32.000000000 +0200
-+++ man/CMakeLists.txt	2011-10-22 14:22:42.000000000 +0200
-@@ -15,10 +15,6 @@
- 
- # Copy man pages
- FILE(GLOB MAN1_FILES *.1)
--FILE(GLOB MAN1_EXCLUDE make_win_bin_dist.1)
--FILE(GLOB MAN1_NDB ndb*.1)
--FILE(GLOB MAN8_FILES *.8)
--FILE(GLOB MAN8_NDB ndb*.8)
- IF(MAN1_FILES)
-   IF(MAN1_EXCLUDE)
-     LIST(REMOVE_ITEM MAN1_FILES ${MAN1_EXCLUDE})
diff --git a/databases/percona56-client/files/patch-mysys__posix_timers.c b/databases/percona56-client/files/patch-mysys__posix_timers.c
deleted file mode 100644
index 52000de41a35..000000000000
--- a/databases/percona56-client/files/patch-mysys__posix_timers.c
+++ /dev/null
@@ -1,32 +0,0 @@
---- mysys/posix_timers.c.orig	2013-10-07 12:25:25.000000000 +0200
-+++ mysys/posix_timers.c	2013-10-07 21:04:37.090622581 +0200
-@@ -22,6 +22,10 @@
- #define sigev_notify_thread_id   _sigev_un._tid
- #endif
- 
-+#ifdef __FreeBSD__
-+typedef union sigval sigval_t;
-+#endif /* __FreeBSD__ */
-+
- #define MY_TIMER_EVENT_SIGNO  (SIGRTMIN)
- #define MY_TIMER_KILL_SIGNO   (SIGRTMIN+1)
- 
-@@ -68,7 +72,18 @@
-   sigaddset(&set, MY_TIMER_KILL_SIGNO);
- 
-   /* Get the thread ID of the current thread. */
-+
-+#ifdef __FreeBSD__
-+# if __FreeBSD__version > 900030
-+  thread_id= pthread_getthreadid_np();
-+# else
-+  long tid;
-+  syscall(SYS_thr_self, &tid);
-+  thread_id= (pid_t) tid;
-+# endif
-+#else
-   thread_id= (pid_t) syscall(SYS_gettid);
-+#endif
- 
-   /* Wake up parent thread, thread_id is available. */
-   pthread_barrier_wait(barrier);
diff --git a/databases/percona56-client/files/patch-mysys_ssl_my_default.cc b/databases/percona56-client/files/patch-mysys_ssl_my_default.cc
deleted file mode 100644
index f6f38decb8ec..000000000000
--- a/databases/percona56-client/files/patch-mysys_ssl_my_default.cc
+++ /dev/null
@@ -1,31 +0,0 @@
---- mysys_ssl/my_default.cc.orig	2013-01-22 17:54:49.000000000 +0100
-+++ mysys_ssl/my_default.cc	2013-02-13 11:08:15.000000000 +0100
-@@ -119,7 +119,7 @@
- 
- /* 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;
- 
-@@ -1395,7 +1395,10 @@
- 
- #if defined(DEFAULT_SYSCONFDIR)
-   if (DEFAULT_SYSCONFDIR[0])
-+  {
-     errors += add_directory(alloc, DEFAULT_SYSCONFDIR, dirs);
-+    errors += add_directory(alloc, DEFAULT_SYSCONFDIR "/mysql", dirs);
-+  }
- #endif /* DEFAULT_SYSCONFDIR */
- 
- #endif
-@@ -1466,7 +1469,7 @@
-   MY_STAT stat_info;
- 
-   if (!my_stat(file_name,&stat_info,MYF(0)))
--    return 1;
-+    return 0;
-   /*
-     Ignore .mylogin.cnf file if not exclusively readable/writable
-     by current user.
diff --git a/databases/percona56-client/files/patch-scripts_CMakeLists.txt b/databases/percona56-client/files/patch-scripts_CMakeLists.txt
deleted file mode 100644
index 34c0ce2ac758..000000000000
--- a/databases/percona56-client/files/patch-scripts_CMakeLists.txt
+++ /dev/null
@@ -1,93 +0,0 @@
---- scripts/CMakeLists.txt.orig	2015-02-05 14:28:58.000000000 +0100
-+++ scripts/CMakeLists.txt	2015-02-12 23:27:08.364991000 +0100
-@@ -71,6 +71,7 @@
- )
- ENDIF()
- 
-+IF(FALSE)
- INSTALL(FILES 
-   ${CMAKE_CURRENT_SOURCE_DIR}/mysql_system_tables.sql 
-   ${CMAKE_CURRENT_SOURCE_DIR}/mysql_system_tables_data.sql
-@@ -80,6 +81,7 @@
-   ${FIX_PRIVILEGES_SQL}
-   DESTINATION ${INSTALL_MYSQLSHAREDIR} COMPONENT Server
- )
-+ENDIF()
- 
- # TCMalloc hacks
- IF(MALLOC_LIB)
-@@ -143,6 +145,7 @@
- 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})
-@@ -179,6 +182,7 @@
-   DESTINATION ${INSTALL_BINDIR}
-   COMPONENT Server
-   )
-+ENDIF()
- 
- ENDIF(UNIX)
- 
-@@ -203,6 +207,7 @@
-   SET(localstatedir ${MYSQL_DATADIR})
- ENDIF()
- 
-+IF(FALSE)
- IF(UNIX)
-   SET(EXT)
- ELSE()
-@@ -217,6 +222,7 @@
-   DESTINATION ${DEST}
-   COMPONENT Server
-   )
-+ENDIF()
- 
- SET(prefix "${CMAKE_INSTALL_PREFIX}")
- SET(sysconfdir ${prefix})
-@@ -273,6 +279,8 @@
-           GET_FILENAME_COMPONENT(lib "${lib}" NAME_WE)
-           STRING(REGEX REPLACE "^lib" "" lib "${lib}")
-           SET(${var} "${${var}}-l${lib} " ) 
-+        ELSEIF(lib STREQUAL "-pthread")
-+          SET(${var} "${${var}}-pthread " ) 
-         ELSE()
-           SET(${var} "${${var}}-l${lib} " ) 
-         ENDIF()
-@@ -328,17 +336,9 @@
-   SET(BIN_SCRIPTS
-     msql2mysql
-     mysql_config
--    mysql_fix_extensions
--    mysql_setpermission
--    mysql_zap
-     mysqlaccess
-     mysqlaccess.conf
--    mysql_convert_table_format
-     mysql_find_rows
--    mysqlhotcopy
--    mysqldumpslow
--    mysqld_multi
--    mysqld_safe
-     ps_tokudb_admin
-   )
-   FOREACH(file ${BIN_SCRIPTS})
-@@ -363,6 +363,7 @@
-      )
-   ENDFOREACH()
- 
-+IF(FALSE)
-   # Input files with pl.in extension - drop the extension completely
-   SET(PLIN_FILES mysql_secure_installation)
-   FOREACH(file ${PLIN_FILES})
-@@ -375,6 +376,7 @@
-     INSTALL_SCRIPT(${CMAKE_CURRENT_BINARY_DIR}/${file} COMPONENT ${${file}_COMPONENT})
-   ENDFOREACH()
- ENDIF()
-+ENDIF()
- 
- # Install libgcc as  mylibgcc.a
- IF(CMAKE_COMPILER_IS_GNUCXX AND CMAKE_CXX_FLAGS MATCHES "-static")
diff --git a/databases/percona56-client/files/patch-sql-common_client.c b/databases/percona56-client/files/patch-sql-common_client.c
deleted file mode 100644
index 2a6f3fe1a37f..000000000000
--- a/databases/percona56-client/files/patch-sql-common_client.c
+++ /dev/null
@@ -1,38 +0,0 @@
---- sql-common/client.c.orig	2018-01-17 11:39:51.315029000 +0000
-+++ sql-common/client.c	2018-01-17 11:44:53.493273000 +0000
-@@ -1884,7 +1884,7 @@
-     *errptr= "Failed to get DNS name from SAN list item";
-     DBUG_RETURN(1);
-   }
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-   cn= (const char *)ASN1_STRING_data(dns_name);
- #else
-   cn= (const char *)ASN1_STRING_get0_data(dns_name);
-@@ -1946,7 +1946,7 @@
-     *errptr= "Invalid IP address embedded in the certificate SAN IP address";
-     DBUG_RETURN(1);
-   }
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-   ip= ASN1_STRING_data(ip_address);
- #else
-   ip= ASN1_STRING_get0_data(ip_address);
-@@ -2111,7 +2111,7 @@
-   if(server_ip_address != NULL)
-   {
-     iplen= ASN1_STRING_length(server_ip_address);
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-     ipout= (const unsigned char *) ASN1_STRING_data(server_ip_address);
- #else
-     ipout= (const unsigned char *) ASN1_STRING_get0_data(server_ip_address);
-@@ -2163,7 +2163,7 @@
-       goto error;
-     }
- 
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-     cn= (const char *) ASN1_STRING_data(cn_asn1);
- #else
-     cn= (const char *) ASN1_STRING_get0_data(cn_asn1);
diff --git a/databases/percona56-client/files/patch-support-files_CMakeLists.txt b/databases/percona56-client/files/patch-support-files_CMakeLists.txt
deleted file mode 100644
index d11572f4c5f0..000000000000
--- a/databases/percona56-client/files/patch-support-files_CMakeLists.txt
+++ /dev/null
@@ -1,40 +0,0 @@
---- support-files/CMakeLists.txt.orig	2017-05-09 08:31:39.000000000 +0200
-+++ support-files/CMakeLists.txt	2017-05-29 13:10:29.832994000 +0200
-@@ -44,11 +44,13 @@
-   SET(inst_location ${INSTALL_SUPPORTFILESDIR})
- ENDIF()
- 
-+IF(FALSE)
- SET(inifile my-default)
- 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)
-+ENDIF()
- 
- IF(UNIX)
-   IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
-@@ -57,6 +59,7 @@
-     SET (PIDOF "pgrep -d' ' -f")
-   ENDIF()
-   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 )
-@@ -73,8 +76,10 @@
-   IF(INSTALL_SUPPORTFILESDIR)
-     INSTALL(FILES magic DESTINATION ${inst_location} COMPONENT SupportFiles)
-   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)
-   
-@@ -99,3 +104,4 @@
-     PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ 
-     GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
- ENDIF()
-+ENDIF()
diff --git a/databases/percona56-client/files/patch-vio_viosocket.c b/databases/percona56-client/files/patch-vio_viosocket.c
deleted file mode 100644
index dee21830f520..000000000000
--- a/databases/percona56-client/files/patch-vio_viosocket.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- vio/viosocket.c.orig	2015-07-08 07:38:39 UTC
-+++ vio/viosocket.c
-@@ -33,6 +33,10 @@
- static void (*before_io_wait)(void)= 0;
- static void (*after_io_wait)(void)= 0;
- 
-+#ifdef __FreeBSD__
-+#define s6_addr32 __u6_addr.__u6_addr32
-+#endif
-+
- /* Wait callback macros (both performance schema and threadpool */
- #define START_SOCKET_WAIT(locker, state_ptr, sock, which, timeout) \
- do                                                                 \
diff --git a/databases/percona56-client/files/patch-vio_viosslfactories.c b/databases/percona56-client/files/patch-vio_viosslfactories.c
deleted file mode 100644
index 42a28cd67cdd..000000000000
--- a/databases/percona56-client/files/patch-vio_viosslfactories.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- vio/viosslfactories.c.orig	2020-07-21 12:31:43.000000000 +0200
-+++ vio/viosslfactories.c	2020-09-17 22:38:47.837385000 +0200
-@@ -128,7 +128,7 @@
-     BIGNUM *p= BN_bin2bn(dh2048_p, sizeof(dh2048_p), NULL);
-     BIGNUM *g= BN_bin2bn(dh2048_g, sizeof(dh2048_g), NULL);
-     if (!p || !g
--#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L || defined( LIBRESSL_VERSION_NUMBER )
-         || !DH_set0_pqg(dh, p, NULL, g)
- #endif /* OPENSSL_VERSION_NUMBER >= 0x10100000L */
-     ) {
-@@ -136,7 +136,7 @@
-       DH_free(dh);
-       return NULL;
-     }
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined( LIBRESSL_VERSION_NUMBER )
-     dh->p= p;
-     dh->g= g;
- #endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
diff --git a/databases/percona56-client/pkg-message b/databases/percona56-client/pkg-message
deleted file mode 100644
index a71ac478bbf5..000000000000
--- a/databases/percona56-client/pkg-message
+++ /dev/null
@@ -1,16 +0,0 @@
-[
-{ type: install
-  message: <<EOM
-Please be aware the database client is vulnerable
-to CVE-2015-3152 - SSL Downgrade aka "BACKRONYM".
-You may find more information at the following URL:
-
-http://www.vuxml.org/freebsd/36bd352d-299b-11e5-86ff-14dae9d210b8.html
-
-Although this database client is not listed as
-"affected", it is vulnerable and will not be
-receiving a patch. Please take note of this when
-deploying this software.
-EOM
-}
-]
diff --git a/databases/percona56-client/pkg-plist b/databases/percona56-client/pkg-plist
deleted file mode 100644
index 4ac51f57ed99..000000000000
--- a/databases/percona56-client/pkg-plist
+++ /dev/null
@@ -1,114 +0,0 @@
-bin/msql2mysql
-bin/mysql
-bin/mysql_config
-bin/mysql_config_editor
-bin/mysql_find_rows
-bin/mysql_waitpid
-bin/mysqlaccess
-bin/mysqlaccess.conf
-bin/mysqladmin
-bin/mysqlbinlog
-bin/mysqlcheck
-bin/mysqldump
-bin/mysqlimport
-bin/mysqlshow
-bin/mysqlslap
-bin/ps_tokudb_admin
-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/decimal.h
-include/mysql/errmsg.h
-include/mysql/keycache.h
-include/mysql/little_endian.h
-include/mysql/m_ctype.h
-include/mysql/m_string.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_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_xml.h
-include/mysql/mysql.h
-include/mysql/mysql/client_authentication.h
-include/mysql/mysql/client_plugin.h
-include/mysql/mysql/client_plugin.h.pp
-include/mysql/mysql/get_password.h
-include/mysql/mysql/innodb_priv.h
-include/mysql/mysql/plugin.h
-include/mysql/mysql/plugin_audit.h
-include/mysql/mysql/plugin_audit.h.pp
-include/mysql/mysql/plugin_auth.h
-include/mysql/mysql/plugin_auth.h.pp
-include/mysql/mysql/plugin_auth_common.h
-include/mysql/mysql/plugin_ftparser.h
-include/mysql/mysql/plugin_ftparser.h.pp
-include/mysql/mysql/plugin_validate_password.h
-include/mysql/mysql/psi/mysql_file.h
-include/mysql/mysql/psi/mysql_idle.h
-include/mysql/mysql/psi/mysql_socket.h
-include/mysql/mysql/psi/mysql_stage.h
-include/mysql/mysql/psi/mysql_statement.h
-include/mysql/mysql/psi/mysql_table.h
-include/mysql/mysql/psi/mysql_thread.h
-include/mysql/mysql/psi/psi.h
-include/mysql/mysql/service_my_plugin_log.h
-include/mysql/mysql/service_my_snprintf.h
-include/mysql/mysql/service_mysql_string.h
-include/mysql/mysql/service_thd_alloc.h
-include/mysql/mysql/service_thd_wait.h
-include/mysql/mysql/service_thread_scheduler.h
-include/mysql/mysql/services.h
-include/mysql/mysql/thread_pool_priv.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_ftparser.h
-include/mysql/plugin_validate_password.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.so
-lib/mysql/libmysqlclient.so.18
-lib/mysql/libmysqlclient_r.so
-lib/mysql/libmysqlclient_r.so.18
-lib/mysql/libperconaserverclient.a
-lib/mysql/libperconaserverclient.so
-lib/mysql/libperconaserverclient.so.18
-lib/mysql/libperconaserverclient_r.a
-lib/mysql/libperconaserverclient_r.so
-lib/mysql/libperconaserverclient_r.so.18
-lib/mysql/libmysqlservices.a
-share/man/man1/comp_err.1.gz
-share/man/man1/msql2mysql.1.gz
-share/man/man1/mysql.1.gz
-share/man/man1/mysql_config.1.gz
-share/man/man1/mysql_find_rows.1.gz
-share/man/man1/mysql_waitpid.1.gz
-share/man/man1/mysqlaccess.1.gz
-share/man/man1/mysqladmin.1.gz
-share/man/man1/mysqlbinlog.1.gz
-share/man/man1/mysqlcheck.1.gz
-share/man/man1/mysqldump.1.gz
-share/man/man1/mysqlimport.1.gz
-share/man/man1/mysqlshow.1.gz
-share/man/man1/mysqlslap.1.gz
-share/aclocal/mysql.m4
diff --git a/databases/percona56-server/Makefile b/databases/percona56-server/Makefile
deleted file mode 100644
index 08c412218ec5..000000000000
--- a/databases/percona56-server/Makefile
+++ /dev/null
@@ -1,118 +0,0 @@
-# Created by: Alex Dupre <ale@FreeBSD.org>
-
-PORTNAME?=	percona
-DISTVERSION=	5.6.51-91.0
-PORTREVISION?=	0
-CATEGORIES=	databases
-MASTER_SITES=	http://www.percona.com/downloads/Percona-Server-5.6/Percona-Server-${DISTVERSION}/source/tarball/
-PKGNAMESUFFIX?=	56-server
-DISTNAME=	percona-server-${DISTVERSION}
-
-MAINTAINER=	flo@FreeBSD.org
-COMMENT?=	Multithreaded SQL database (server)
-
-LICENSE?=	GPLv2+
-
-DEPRECATED=	EOL since February 2021
-EXPIRATION_DATE=	2022-06-30
-
-BROKEN_armv6=		fails to compile: sql/mysqld.cc:198:19: error: cannot combine with previous 'type-name' declaration specifier
-BROKEN_armv7=		fails to compile: sql/mysqld.cc:198:19: error: cannot combine with previous 'type-name' declaration specifier
-
-SLAVEDIRS=	databases/percona56-client \
-		databases/percona-pam-for-mysql
-USES=		bison compiler:c++11-lang cmake:insource,noninja perl5 shebangfix
-
-OPTIONS_DEFINE=	OPENSSL FASTMTX INNODBMEMCACHED TOKUDB
-OPTIONS_DEFAULT=	OPENSSL INNODBMEMCACHED
-OPTIONS_SUB=	yes
-
-FASTMTX_DESC=	Replace mutexes with spinlocks
-FASTMTX_CMAKE_ON=	-DWITH_FAST_MUTEXES=1
-INNODBMEMCACHED_DESC=	InnoDB Memcached plugin
-INNODBMEMCACHED_CMAKE_ON=	-DWITH_INNODB_MEMCACHED=1
-OPENSSL_CMAKE_ON=	-DWITH_SSL=system
-OPENSSL_USES=	ssl
-TOKUDB_DESC=	TokuDB Engine (experimental)
-TOKUDB_CMAKE_ON=	-DUSE_CTAGS=0
-TOKUDB_EXTRA_PATCHES=${PATCHDIR}/extrapatch-tokudb
-
-DATADIR=	${PREFIX}/share/mysql
-
-CMAKE_ARGS+=	-DINSTALL_DOCDIR="share/doc/mysql" \
-		-DINSTALL_DOCREADMEDIR="share/doc/mysql" \
-		-DINSTALL_INCLUDEDIR="include/mysql" \
-		-DINSTALL_INFODIR="${INFO_PATH}" \
-		-DINSTALL_LIBDIR="lib/mysql" \
-		-DINSTALL_MANDIR="share/man" \
-		-DINSTALL_MYSQLDATADIR="/var/db/mysql" \
-		-DINSTALL_MYSQLSHAREDIR="share/mysql" \
-		-DINSTALL_MYSQLTESTDIR="share/mysql/tests" \
-		-DINSTALL_PLUGINDIR="lib/mysql/plugin" \
-		-DINSTALL_SBINDIR="libexec" \
-		-DINSTALL_SCRIPTDIR="bin" \
-		-DINSTALL_SHAREDIR="share" \
-		-DINSTALL_SQLBENCHDIR="share/mysql" \
-		-DINSTALL_SUPPORTFILESDIR="share/mysql" \
-		-DWITH_EDITLINE=system \
-		-DWITH_LIBWRAP=1
-
-SHEBANG_FILES=	scripts/*.pl* scripts/*.sh
-
-.ifdef USE_MYSQL
-.error You have `USE_MYSQL' variable defined either in environment or in make(1) arguments. Please undefine and try again.
-.endif
-
-.ifdef CLIENT_ONLY
-# Client part
-USES+=		libedit
-.elifdef PLUGIN_ONLY
-# For building plugins (percona-pam-for-mysql, etc)
-# Currently do nothing special
-USES+=		libedit
-.else
-# MySQL-Server part
-USES+=mysql:56p
-
-CONFLICTS_INSTALL=	mysql*-server \
-			mysqlwsrep*-server \
-			mariadb*-server \
-			percona*-server
-
-USE_RC_SUBR=	mysql-server
-
-USERS=		mysql
-GROUPS=		mysql
-
-INFO=		mysql
-
-MANPAGES=	my_print_defaults.1 myisam_ftdump.1 myisamchk.1 myisamlog.1 myisampack.1 \
-		mysql.server.1 mysql_convert_table_format.1 mysql_fix_extensions.1 \
-		mysql_install_db.1 mysql_plugin.1 mysql_secure_installation.1 mysql_setpermission.1 \
-		mysql_tzinfo_to_sql.1 mysql_upgrade.1 mysql_zap.1 mysqlbug.1 \
-		mysqld_multi.1 mysqld_safe.1 mysqldumpslow.1 mysqlhotcopy.1 mysqlman.1 \
-		mysqltest.1 perror.1 replace.1 resolve_stack_dump.1 resolveip.1
-
-CMAKE_ARGS+=	-DWITH_EMBEDDED_SERVER="ON"
-
-.include <bsd.port.options.mk>
-
-# Workaround to clang11/gcc10 with -fno-common by default
-CFLAGS+=        -fcommon
-
-post-install:
-	@${MKDIR} ${STAGEDIR}/var/db/mysql
-.endif
-
-post-patch:
-	@${REINPLACE_CMD} 's/*.1/${MANPAGES}/' ${WRKSRC}/man/CMakeLists.txt
-
-.include <bsd.port.pre.mk>
-
-.if ${PORT_OPTIONS:MTOKUDB}
-NOT_FOR_ARCHS=	i386
-NOT_FOR_ARCHS_REASON=	TokuDB not supported on 32-bit platforms, see \
-			https://github.com/percona/PerconaFT/blob/master/README.md
-.endif
-
-.include <bsd.port.post.mk>
diff --git a/databases/percona56-server/distinfo b/databases/percona56-server/distinfo
deleted file mode 100644
index 6177029e19b4..000000000000
--- a/databases/percona56-server/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1618138467
-SHA256 (percona-server-5.6.51-91.0.tar.gz) = 4482c1d124ebb9561c64cf8cb54817ab355f58a4baa4d6427df6623def97dd2f
-SIZE (percona-server-5.6.51-91.0.tar.gz) = 53065258
diff --git a/databases/percona56-server/files/extra-patch-config.h.cmake b/databases/percona56-server/files/extra-patch-config.h.cmake
deleted file mode 100644
index 4ea465832fb4..000000000000
--- a/databases/percona56-server/files/extra-patch-config.h.cmake
+++ /dev/null
@@ -1,29 +0,0 @@
---- Makefile
-+++ Makefile
-@@ -95,8 +95,8 @@ post-patch:
- 
- .include <bsd.port.pre.mk>
- 
--.if ${ARCH} == "arm"
--BROKEN=		Does not compile on arm
-+.if ${ARCH} == "armv6"   
-+EXTRA_PATCHES+=	${FILESDIR}/extra-patch-config.h.cmake
- .endif
- 
- .include <bsd.port.post.mk>
-
---- /dev/null
-+++ files/extra-patch-config.h.cmake
-@@ -0,0 +1,12 @@
-+--- config.h.cmake.orig	2014-12-05 16:24:02 UTC
-++++ config.h.cmake
-+@@ -151,7 +151,8 @@
-+ #cmakedefine HAVE_FESETROUND 1
-+ #cmakedefine HAVE_FINITE 1
-+ #cmakedefine HAVE_FP_EXCEPT 1
-+-#cmakedefine HAVE_FPSETMASK 1
-++#cmakedefine HAVE_FPSETMASK 0
-++#cmakedefine HAVE_FEDISABLEEXCEPT 1
-+ #cmakedefine HAVE_FSEEKO 1
-+ #cmakedefine HAVE_FSYNC 1
-+ #cmakedefine HAVE_FTIME 1
diff --git a/databases/percona56-server/files/extrapatch-tokudb b/databases/percona56-server/files/extrapatch-tokudb
deleted file mode 100644
index 87ea439282e8..000000000000
--- a/databases/percona56-server/files/extrapatch-tokudb
+++ /dev/null
@@ -1,92 +0,0 @@
---- storage/tokudb/CMakeLists.txt.orig	2016-03-03 15:32:33.000000000 +0200
-+++ storage/tokudb/CMakeLists.txt	2016-03-08 10:13:58.000000000 +0200
-@@ -1,6 +1,6 @@
- SET(TOKUDB_VERSION 5.6.29-76.2)
- # PerconaFT only supports x86-64 and cmake-2.8.9+
--IF(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND
-+IF(CMAKE_SYSTEM_PROCESSOR STREQUAL "amd64" AND
-     NOT CMAKE_VERSION VERSION_LESS "2.8.9")
- CHECK_CXX_SOURCE_COMPILES(
- "
-@@ -118,5 +118,5 @@
-     tokudb_thread.cc)
- MYSQL_ADD_PLUGIN(tokudb ${TOKUDB_SOURCES} STORAGE_ENGINE MODULE_ONLY
-     LINK_LIBRARIES 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(CMAKE_MODULE_LINKER_FLAGS_RELEASE "${CMAKE_MODULE_LINKER_FLAGS_RELEASE} ")
-+SET(CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO "${CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO} ")
---- plugin/tokudb-backup-plugin/Percona-TokuBackup/backup/CMakeLists.txt.orig	2016-03-03 15:31:53.000000000 +0200
-+++ plugin/tokudb-backup-plugin/Percona-TokuBackup/backup/CMakeLists.txt	2016-03-10 11:13:23.772664272 +0200
-@@ -69,7 +69,7 @@
-   endif ()
- endfunction(add_space_separated_property)
- 
--set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O3 -flto -UNDEBUG")
-+set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O3 -UNDEBUG")
- if (NOT CMAKE_CXX_COMPILER_ID MATCHES Clang)
-   set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -s")
- endif ()
---- plugin/tokudb-backup-plugin/Percona-TokuBackup/backup/backup.cc.orig	2016-03-03 15:31:53.000000000 +0200
-+++ plugin/tokudb-backup-plugin/Percona-TokuBackup/backup/backup.cc	2016-03-08 10:40:07.000000000 +0200
-@@ -85,7 +85,7 @@
-     if (oflag & O_CREAT) {
-         va_list ap;
-         va_start(ap, oflag);
--        mode_t mode = va_arg(ap, mode_t);
-+        mode_t mode = va_arg(ap, int);
-         va_end(ap);
-         the_manager.lock_file_op();
-         fd = call_real_open(file, oflag, mode);
---- plugin/tokudb-backup-plugin/Percona-TokuBackup/backup/file_hash_table.cc.orig	2016-03-03 15:31:53.000000000 +0200
-+++ plugin/tokudb-backup-plugin/Percona-TokuBackup/backup/file_hash_table.cc	2016-03-08 10:37:19.000000000 +0200
-@@ -36,7 +36,7 @@
- 
- #include <string.h>
- #include <pthread.h>
--#include <malloc.h>
-+#include <stdlib.h>
- #include <stdio.h>
- 
- #include "source_file.h"
---- plugin/tokudb-backup-plugin/Percona-TokuBackup/backup/real_syscalls.cc.orig	2016-03-03 15:31:53.000000000 +0200
-+++ plugin/tokudb-backup-plugin/Percona-TokuBackup/backup/real_syscalls.cc	2016-03-08 10:38:58.000000000 +0200
-@@ -104,7 +104,7 @@
-     if (oflag & O_CREAT) {
-         va_list op;
-         va_start(op, oflag);
--        mode_t mode = va_arg(op, mode_t);
-+        mode_t mode = va_arg(op, int);
-         va_end(op);
-         return real_open(file, oflag, mode);
-     } else {
---- storage/tokudb/PerconaFT/CMakeLists.txt.orig	2016-06-30 13:35:08.000000000 +0200
-+++ storage/tokudb/PerconaFT/CMakeLists.txt	2016-07-29 23:07:37.871068000 +0200
-@@ -82,7 +82,7 @@
- 
- install(
-   FILES README.md COPYING.AGPLv3 COPYING.GPLv2 PATENTS
--  DESTINATION .
-+  DESTINATION ${INSTALL_DOCDIR}
-   COMPONENT tokukv_misc
-   )
- 
---- storage/tokudb/PerconaFT/buildheader/CMakeLists.txt.orig	2016-07-29 23:30:26.557847000 +0200
-+++ storage/tokudb/PerconaFT/buildheader/CMakeLists.txt	2016-07-29 23:30:32.695950000 +0200
-@@ -1,6 +1,6 @@
- set_directory_properties(PROPERTIES INCLUDE_DIRECTORIES "")
- 
--file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/runcat.sh" "#!/bin/bash
-+file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/runcat.sh" "#!/bin/sh
- out=$1; shift
- exec \"$@\" >$out")
- 
-@@ -8,7 +8,7 @@
- set_property(TARGET make_tdb APPEND PROPERTY COMPILE_DEFINITIONS _GNU_SOURCE)
- add_custom_command(
-   OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/db.h"
--  COMMAND bash runcat.sh "${CMAKE_CURRENT_BINARY_DIR}/db.h" $<TARGET_FILE:make_tdb>
-+  COMMAND sh runcat.sh "${CMAKE_CURRENT_BINARY_DIR}/db.h" $<TARGET_FILE:make_tdb>
-   DEPENDS make_tdb)
- add_custom_target(install_tdb_h DEPENDS
-   "${CMAKE_CURRENT_BINARY_DIR}/db.h")
diff --git a/databases/percona56-server/files/mysql-server.in b/databases/percona56-server/files/mysql-server.in
deleted file mode 100644
index aecef7080107..000000000000
--- a/databases/percona56-server/files/mysql-server.in
+++ /dev/null
@@ -1,67 +0,0 @@
-#!/bin/sh
-
-# PROVIDE: mysql
-# REQUIRE: LOGIN
-# KEYWORD: shutdown
-
-#
-# Add the following line to /etc/rc.conf to enable mysql:
-# mysql_enable (bool):	Set to "NO" by default.
-#			Set it to "YES" to enable MySQL.
-# mysql_dbdir (str):	Default to "/var/db/mysql"
-#			Base database directory.
-# mysql_optfile (str):	Server-specific option file.
-#			Default to "${mysql_dbdir}/my.cnf".
-# mysql_pidfile (str):	Custum PID file path and name.
-#			Default to "${mysql_dbdir}/${hostname}.pid".
-# mysql_args (str):	Custom additional arguments to be passed
-#			to mysqld_safe (default empty).
-#
-
-. /etc/rc.subr
-
-name="mysql"
-rcvar=mysql_enable
-
-load_rc_config $name
-
-: ${mysql_enable="NO"}
-: ${mysql_dbdir="/var/db/mysql"}
-: ${mysql_optfile="${mysql_dbdir}/my.cnf"}
-
-mysql_user="mysql"
-: ${hostname:=`/bin/hostname`}
-pidfile=${mysql_pidfile:-"${mysql_dbdir}/${hostname}.pid"}
-command="/usr/sbin/daemon"
-command_args="-c -f %%PREFIX%%/bin/mysqld_safe --defaults-extra-file=${mysql_optfile} --user=${mysql_user} --datadir=${mysql_dbdir} --pid-file=${pidfile} ${mysql_args}"
-procname="%%PREFIX%%/libexec/mysqld"
-start_precmd="${name}_prestart"
-start_postcmd="${name}_poststart"
-mysql_install_db="%%PREFIX%%/bin/mysql_install_db"
-mysql_install_db_args="--basedir=%%PREFIX%% --datadir=${mysql_dbdir} --defaults-extra-file=${mysql_optfile} --force"
-
-mysql_create_auth_tables()
-{
-	eval $mysql_install_db $mysql_install_db_args >/dev/null 2>/dev/null
-        [ $? -eq 0 ] && chown -R ${mysql_user}:${mysql_user} ${mysql_dbdir}
-}
-
-mysql_prestart()
-{
-	if [ ! -d "${mysql_dbdir}/mysql/." ]; then
-		mysql_create_auth_tables || return 1
-	fi
-	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"
diff --git a/databases/percona56-server/files/patch-CMakeLists.txt b/databases/percona56-server/files/patch-CMakeLists.txt
deleted file mode 100644
index 0ee4f37e358a..000000000000
--- a/databases/percona56-server/files/patch-CMakeLists.txt
+++ /dev/null
@@ -1,49 +0,0 @@
---- CMakeLists.txt.orig	2014-10-06 18:06:02.000000000 +0200
-+++ CMakeLists.txt	2014-10-18 18:37:40.964417855 +0200
-@@ -508,12 +508,10 @@
- ENDIF()
- 
- 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)
- ENDIF()
- 
-@@ -522,10 +520,7 @@
- ADD_SUBDIRECTORY(scripts)
- 
- IF(NOT WITHOUT_SERVER)
--  ADD_SUBDIRECTORY(mysql-test)
--  ADD_SUBDIRECTORY(mysql-test/lib/My/SafeProcess)
-   ADD_SUBDIRECTORY(support-files)
--  ADD_SUBDIRECTORY(sql-bench)
-   IF(EXISTS ${CMAKE_SOURCE_DIR}/internal/CMakeLists.txt)
-     ADD_SUBDIRECTORY(internal)
-   ENDIF()
-@@ -568,7 +563,6 @@
-   SET(CPACK_GENERATOR "TGZ")
- ENDIF() 
- ADD_SUBDIRECTORY(packaging/WiX)
--ADD_SUBDIRECTORY(packaging/solaris)
- 
- # Create a single package with "make package"
- # (see http://public.kitware.com/Bug/view.php?id=11452)
-@@ -580,6 +574,7 @@
- #
- # RPM installs documentation directly from the source tree
- #
-+IF(FALSE)
- IF(NOT INSTALL_LAYOUT MATCHES "RPM")
-   INSTALL(FILES COPYING LICENSE.mysql 
-   DESTINATION ${INSTALL_DOCREADMEDIR} 
-@@ -605,5 +600,6 @@
-     PATTERN "sp-imp-spec.txt" EXCLUDE
-   )
- ENDIF()
-+ENDIF()
- 
- INCLUDE(CPack)
diff --git a/databases/percona56-server/files/patch-client_CMakeLists.txt b/databases/percona56-server/files/patch-client_CMakeLists.txt
deleted file mode 100644
index 7d6e8486b988..000000000000
--- a/databases/percona56-server/files/patch-client_CMakeLists.txt
+++ /dev/null
@@ -1,65 +0,0 @@
---- client/CMakeLists.txt	2018-02-01 14:51:01.000000000 +0100
-+++ client/CMakeLists.txt.new	2018-02-20 13:41:20.066976000 +0100
-@@ -31,17 +31,20 @@
- COPY_OPENSSL_DLLS(copy_openssl_client)
- 
- ADD_DEFINITIONS(${SSL_DEFINES})
-+IF(FALSE)
- MYSQL_ADD_EXECUTABLE(mysql completion_hash.cc mysql.cc readline.cc sql_string.cc)
- TARGET_LINK_LIBRARIES(mysql perconaserverclient)
- IF(UNIX)
-   TARGET_LINK_LIBRARIES(mysql ${MY_READLINE_LIBRARY})
- ENDIF(UNIX)
-+ENDIF()
- 
- MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc COMPONENT Test)
- SET_SOURCE_FILES_PROPERTIES(mysqltest.cc PROPERTIES COMPILE_FLAGS "-DTHREADS")
- TARGET_LINK_LIBRARIES(mysqltest perconaserverclient regex)
- ADD_DEPENDENCIES(mysqltest GenError)
- 
-+IF(FALSE)
- MYSQL_ADD_EXECUTABLE(mysqlcheck mysqlcheck.c)
- TARGET_LINK_LIBRARIES(mysqlcheck perconaserverclient)
- 
-@@ -51,17 +54,21 @@
- MYSQL_ADD_EXECUTABLE(mysqlimport mysqlimport.c)
- TARGET_LINK_LIBRARIES(mysqlimport perconaserverclient)
- SET_SOURCE_FILES_PROPERTIES(mysqlimport.c PROPERTIES COMPILE_FLAGS "-DTHREADS")
-+ENDIF()
- 
- MYSQL_ADD_EXECUTABLE(mysql_upgrade mysql_upgrade.c)
- TARGET_LINK_LIBRARIES(mysql_upgrade perconaserverclient)
- ADD_DEPENDENCIES(mysql_upgrade GenFixPrivs)
- 
-+IF(FALSE)
- MYSQL_ADD_EXECUTABLE(mysqlshow mysqlshow.c)
- TARGET_LINK_LIBRARIES(mysqlshow perconaserverclient)
-+ENDIF()
- 
- MYSQL_ADD_EXECUTABLE(mysql_plugin mysql_plugin.c)
- TARGET_LINK_LIBRARIES(mysql_plugin perconaserverclient)
- 
-+IF(FALSE)
- MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc sql_string.cc
-                      ../sql/rpl_filter.cc ../sql/sql_list.cc)
- TARGET_LINK_LIBRARIES(mysqlbinlog perconaserverclient)
-@@ -75,6 +82,7 @@
- 
- MYSQL_ADD_EXECUTABLE(mysql_config_editor mysql_config_editor.cc)
- TARGET_LINK_LIBRARIES(mysql_config_editor perconaserverclient)
-+ENDIF()
- 
- # "WIN32" also covers 64 bit. "echo" is used in some files below "mysql-test/".
- IF(WIN32)
-@@ -84,11 +92,6 @@
- SET_TARGET_PROPERTIES (
-   mysql_plugin 
-   mysql_upgrade
--  mysqlcheck
--  mysqldump
--  mysqlimport
--  mysqlshow
--  mysqlslap
- PROPERTIES HAS_CXX TRUE)
- 
- ADD_DEFINITIONS(-DHAVE_DLOPEN)
diff --git a/databases/percona56-server/files/patch-client_mysql.cc b/databases/percona56-server/files/patch-client_mysql.cc
deleted file mode 100644
index bf9ac389e7d3..000000000000
--- a/databases/percona56-server/files/patch-client_mysql.cc
+++ /dev/null
@@ -1,25 +0,0 @@
---- client/mysql.cc.orig	2017-05-09 08:31:39.000000000 +0200
-+++ client/mysql.cc	2017-05-29 13:24:38.665722000 +0200
-@@ -2784,9 +2784,11 @@
- #ifdef HAVE_LOCALE_H
-   setlocale(LC_ALL,""); /* so as libedit use isprint */
- #endif
--  rl_attempted_completion_function= (CPPFunction*)&new_mysql_completion;
--  rl_completion_entry_function= &no_completion;
-+  rl_attempted_completion_function= (rl_completion_func_t*)&new_mysql_completion;
-+  rl_completion_entry_function= (rl_compentry_func_t*)&no_completion;
-+  /*
-   rl_add_defun("magic-space", (Function*)&fake_magic_space, -1);
-+  */
- #else
-   rl_attempted_completion_function= (CPPFunction*)&new_mysql_completion;
-   rl_completion_entry_function= &no_completion;
-@@ -2805,7 +2807,7 @@
-                                    int end MY_ATTRIBUTE((unused)))
- {
-   if (!status.batch && !quick)
--#if defined(USE_NEW_XLINE_INTERFACE)
-+#if defined(USE_NEW_READLINE_INTERFACE) || defined(USE_LIBEDIT_INTERFACE)
-     return rl_completion_matches(text, new_command_generator);
- #else
-     return completion_matches((char *)text, (CPFunction *)new_command_generator);
diff --git a/databases/percona56-server/files/patch-cmake_plugin.cmake b/databases/percona56-server/files/patch-cmake_plugin.cmake
deleted file mode 100644
index da6476534102..000000000000
--- a/databases/percona56-server/files/patch-cmake_plugin.cmake
+++ /dev/null
@@ -1,12 +0,0 @@
---- cmake/plugin.cmake.orig	2019-07-20 08:37:32 UTC
-+++ cmake/plugin.cmake
-@@ -224,9 +224,6 @@ MACRO(MYSQL_ADD_PLUGIN)
-       MYSQL_INSTALL_TARGETS(${target}
-         DESTINATION ${INSTALL_PLUGINDIR}
-         COMPONENT ${INSTALL_COMPONENT})
--      INSTALL_DEBUG_TARGET(${target}
--        DESTINATION ${INSTALL_PLUGINDIR}/debug
--        COMPONENT ${INSTALL_COMPONENT})
-       # Add installed files to list for RPMs
-       FILE(APPEND ${CMAKE_BINARY_DIR}/support-files/plugins.files
-               "%attr(755, root, root) %{_prefix}/${INSTALL_PLUGINDIR}/${ARG_MODULE_OUTPUT_NAME}.so\n"
diff --git a/databases/percona56-server/files/patch-cmake_readline.cmake b/databases/percona56-server/files/patch-cmake_readline.cmake
deleted file mode 100644
index 4c251b15fc56..000000000000
--- a/databases/percona56-server/files/patch-cmake_readline.cmake
+++ /dev/null
@@ -1,17 +0,0 @@
---- cmake/readline.cmake.orig	2016-09-30 11:41:40 UTC
-+++ cmake/readline.cmake
-@@ -173,11 +173,11 @@ MACRO (FIND_SYSTEM_EDITLINE)
-     #include <readline.h>
-     int main(int argc, char **argv)
-     {
--      typedef int MYFunction(const char*, int);
-+      typedef char *MYFunction(const char*, int);
-       MYFunction* myf= rl_completion_entry_function;
--      int res= (myf)(NULL, 0);
-+      char *res= (myf)(NULL, 0);
-       completion_matches(0,0);
--      return res;
-+      return (res != NULL);
-     }"
-     EDITLINE_HAVE_COMPLETION)
- 
diff --git a/databases/percona56-server/files/patch-extra_CMakeLists.txt b/databases/percona56-server/files/patch-extra_CMakeLists.txt
deleted file mode 100644
index 6bd2fd069171..000000000000
--- a/databases/percona56-server/files/patch-extra_CMakeLists.txt
+++ /dev/null
@@ -1,13 +0,0 @@
---- extra/CMakeLists.txt.orig	2013-01-22 17:54:50.000000000 +0100
-+++ extra/CMakeLists.txt	2013-02-13 14:35:11.000000000 +0100
-@@ -102,8 +102,10 @@
-   TARGET_LINK_LIBRARIES(resolve_stack_dump mysys mysys_ssl)
-   SET_TARGET_PROPERTIES(resolve_stack_dump PROPERTIES LINKER_LANGUAGE CXX)
- 
-+IF(FALSE)
-   MYSQL_ADD_EXECUTABLE(mysql_waitpid mysql_waitpid.c)
-   TARGET_LINK_LIBRARIES(mysql_waitpid mysys mysys_ssl)
-   SET_TARGET_PROPERTIES(mysql_waitpid PROPERTIES LINKER_LANGUAGE CXX)
- ENDIF()
-+ENDIF()
- 
diff --git a/databases/percona56-server/files/patch-include_CMakeLists.txt b/databases/percona56-server/files/patch-include_CMakeLists.txt
deleted file mode 100644
index 5d5e96a0f1d7..000000000000
--- a/databases/percona56-server/files/patch-include_CMakeLists.txt
+++ /dev/null
@@ -1,15 +0,0 @@
---- include/CMakeLists.txt.orig	2013-01-22 17:54:49.000000000 +0100
-+++ include/CMakeLists.txt	2013-02-13 14:53:40.000000000 +0100
-@@ -65,10 +65,12 @@
-   ${HEADERS_GEN_CONFIGURE}
- )
- 
-+IF(FALSE)
- INSTALL(FILES ${HEADERS} DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development)
- INSTALL(DIRECTORY mysql/ DESTINATION ${INSTALL_INCLUDEDIR}/mysql COMPONENT Development 
-  PATTERN "*.h"
-  PATTERN "psi_abi*" EXCLUDE
- )
-+ENDIF()
- 
- 
diff --git a/databases/percona56-server/files/patch-include_my_compare.h b/databases/percona56-server/files/patch-include_my_compare.h
deleted file mode 100644
index 093c8ae37789..000000000000
--- a/databases/percona56-server/files/patch-include_my_compare.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- include/my_compare.h.orig	2011-05-10 09:46:46.000000000 +0200
-+++ include/my_compare.h	2011-05-10 09:47:01.000000000 +0200
-@@ -39,7 +39,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              16          /* Max segments for key */
- 
- #define HA_MAX_POSSIBLE_KEY_BUFF    (HA_MAX_KEY_LENGTH + 24+ 6+6)
diff --git a/databases/percona56-server/files/patch-include_myisam.h b/databases/percona56-server/files/patch-include_myisam.h
deleted file mode 100644
index 450645400dd5..000000000000
--- a/databases/percona56-server/files/patch-include_myisam.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- include/myisam.h.orig	2009-02-16 23:04:54.000000000 +0100
-+++ include/myisam.h	2009-02-16 23:10:08.000000000 +0100
-@@ -48,7 +48,7 @@
-   The following defines can be increased if necessary.
-   But beware the dependency of MI_MAX_POSSIBLE_KEY_BUFF and MI_MAX_KEY_LENGTH.
- */
--#define MI_MAX_KEY_LENGTH           1000            /* Max length in bytes */
-+#define MI_MAX_KEY_LENGTH           4000            /* Max length in bytes */
- #define MI_MAX_KEY_SEG              16              /* Max segments for key */
- 
- #define MI_MAX_KEY_BUFF  (MI_MAX_KEY_LENGTH+MI_MAX_KEY_SEG*6+8+8)
diff --git a/databases/percona56-server/files/patch-libmysql_CMakeLists.txt b/databases/percona56-server/files/patch-libmysql_CMakeLists.txt
deleted file mode 100644
index 07bcdd4863bf..000000000000
--- a/databases/percona56-server/files/patch-libmysql_CMakeLists.txt
+++ /dev/null
@@ -1,43 +0,0 @@
---- libmysql/CMakeLists.txt.orig
-+++ libmysql/CMakeLists.txt
-@@ -205,7 +205,7 @@
- ENDIF()
- 
- # Merge several convenience libraries into one big perconaserverclient
--MERGE_LIBRARIES(perconaserverclient STATIC ${LIBS_TO_MERGE} COMPONENT Development)
-+MERGE_LIBRARIES(perconaserverclient STATIC ${LIBS_TO_MERGE} COMPONENT Development NOINSTALL)
- TARGET_LINK_LIBRARIES(perconaserverclient ${LIBS_TO_LINK})
- 
- # Visual Studio users need debug  static library for debug projects
-@@ -220,6 +220,7 @@
-   SET(${out_name} ${name})
- ENDMACRO()
- 
-+IF(FALSE)
- IF(UNIX)
-   MACRO(GET_VERSIONED_LIBNAME LIBNAME EXTENSION VERSION OUTNAME)
-     SET(DOT_VERSION ".${VERSION}")
-@@ -240,14 +241,16 @@
-     ${lib_name} ${CMAKE_STATIC_LIBRARY_PREFIX}perconaserverclient_r.a
-     ${INSTALL_LIBDIR} Development)
- ENDIF()
-+ENDIF()
- 
- IF(NOT DISABLE_SHARED)
-   # Merge several convenience libraries into one big perconaserverclient
-   # and link them together into shared library.
-   MERGE_LIBRARIES(libmysql SHARED ${LIBS_TO_MERGE}
-     EXPORTS ${CLIENT_API_FUNCTIONS}
--    COMPONENT SharedLibraries)
-+    COMPONENT SharedLibraries NOINSTALL)
-   TARGET_LINK_LIBRARIES(libmysql ${LIBS_TO_LINK})
-+IF(FALSE)
-   IF(UNIX)
-     # libtool compatability
-     IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR APPLE)
-@@ -316,4 +319,5 @@
-         ${INSTALL_LIBDIR} SharedLibraries)
-     ENDFOREACH()
-   ENDIF()
-+ENDIF()
- ENDIF()
diff --git a/databases/percona56-server/files/patch-libservices_CMakeLists.txt b/databases/percona56-server/files/patch-libservices_CMakeLists.txt
deleted file mode 100644
index fcbcea7aed21..000000000000
--- a/databases/percona56-server/files/patch-libservices_CMakeLists.txt
+++ /dev/null
@@ -1,9 +0,0 @@
---- libservices/CMakeLists.txt.orig	2010-12-23 17:13:03.000000000 +0100
-+++ libservices/CMakeLists.txt	2010-12-23 17:13:17.000000000 +0100
-@@ -22,4 +22,6 @@
-   my_thread_scheduler_service.c)
- 
- ADD_LIBRARY(mysqlservices ${MYSQLSERVICES_SOURCES})
-+IF(FALSE)
- INSTALL(TARGETS mysqlservices DESTINATION ${INSTALL_LIBDIR} COMPONENT Development)
-+ENDIF()
diff --git a/databases/percona56-server/files/patch-man_CMakeLists.txt b/databases/percona56-server/files/patch-man_CMakeLists.txt
deleted file mode 100644
index 7849c77af111..000000000000
--- a/databases/percona56-server/files/patch-man_CMakeLists.txt
+++ /dev/null
@@ -1,11 +0,0 @@
---- man/CMakeLists.txt.orig	2011-10-22 14:36:06.000000000 +0200
-+++ man/CMakeLists.txt	2011-10-22 14:36:23.000000000 +0200
-@@ -15,8 +15,6 @@
- 
- # Copy man pages
- FILE(GLOB MAN1_FILES *.1)
--FILE(GLOB MAN1_EXCLUDE make_win_bin_dist.1)
--FILE(GLOB MAN1_NDB ndb*.1)
- FILE(GLOB MAN8_FILES *.8)
- FILE(GLOB MAN8_NDB ndb*.8)
- IF(MAN1_FILES)
diff --git a/databases/percona56-server/files/patch-mysys__posix_timers.c b/databases/percona56-server/files/patch-mysys__posix_timers.c
deleted file mode 100644
index 52000de41a35..000000000000
--- a/databases/percona56-server/files/patch-mysys__posix_timers.c
+++ /dev/null
@@ -1,32 +0,0 @@
---- mysys/posix_timers.c.orig	2013-10-07 12:25:25.000000000 +0200
-+++ mysys/posix_timers.c	2013-10-07 21:04:37.090622581 +0200
-@@ -22,6 +22,10 @@
- #define sigev_notify_thread_id   _sigev_un._tid
- #endif
- 
-+#ifdef __FreeBSD__
-+typedef union sigval sigval_t;
-+#endif /* __FreeBSD__ */
-+
- #define MY_TIMER_EVENT_SIGNO  (SIGRTMIN)
- #define MY_TIMER_KILL_SIGNO   (SIGRTMIN+1)
- 
-@@ -68,7 +72,18 @@
-   sigaddset(&set, MY_TIMER_KILL_SIGNO);
- 
-   /* Get the thread ID of the current thread. */
-+
-+#ifdef __FreeBSD__
-+# if __FreeBSD__version > 900030
-+  thread_id= pthread_getthreadid_np();
-+# else
-+  long tid;
-+  syscall(SYS_thr_self, &tid);
-+  thread_id= (pid_t) tid;
-+# endif
-+#else
-   thread_id= (pid_t) syscall(SYS_gettid);
-+#endif
- 
-   /* Wake up parent thread, thread_id is available. */
-   pthread_barrier_wait(barrier);
diff --git a/databases/percona56-server/files/patch-mysys_ssl_my_default.cc b/databases/percona56-server/files/patch-mysys_ssl_my_default.cc
deleted file mode 100644
index f6f38decb8ec..000000000000
--- a/databases/percona56-server/files/patch-mysys_ssl_my_default.cc
+++ /dev/null
@@ -1,31 +0,0 @@
---- mysys_ssl/my_default.cc.orig	2013-01-22 17:54:49.000000000 +0100
-+++ mysys_ssl/my_default.cc	2013-02-13 11:08:15.000000000 +0100
-@@ -119,7 +119,7 @@
- 
- /* 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;
- 
-@@ -1395,7 +1395,10 @@
- 
- #if defined(DEFAULT_SYSCONFDIR)
-   if (DEFAULT_SYSCONFDIR[0])
-+  {
-     errors += add_directory(alloc, DEFAULT_SYSCONFDIR, dirs);
-+    errors += add_directory(alloc, DEFAULT_SYSCONFDIR "/mysql", dirs);
-+  }
- #endif /* DEFAULT_SYSCONFDIR */
- 
- #endif
-@@ -1466,7 +1469,7 @@
-   MY_STAT stat_info;
- 
-   if (!my_stat(file_name,&stat_info,MYF(0)))
--    return 1;
-+    return 0;
-   /*
-     Ignore .mylogin.cnf file if not exclusively readable/writable
-     by current user.
diff --git a/databases/percona56-server/files/patch-plugin_password_validation_validate_password.cc b/databases/percona56-server/files/patch-plugin_password_validation_validate_password.cc
deleted file mode 100644
index 653f03095030..000000000000
--- a/databases/percona56-server/files/patch-plugin_password_validation_validate_password.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- plugin/password_validation/validate_password.cc.orig	2013-09-10 07:38:25.000000000 +0000
-+++ plugin/password_validation/validate_password.cc	2013-10-05 15:40:20.790380179 +0000
-@@ -16,6 +16,8 @@
- #include <my_sys.h>
- #include <string>
- #include <mysql/plugin_validate_password.h>
-+/* solve clash between libc++ bitset::test() and test macro from my_global.h */
-+#undef test
- #include <set>
- #include <iostream>
- #include <fstream>
diff --git a/databases/percona56-server/files/patch-scripts_CMakeLists.txt b/databases/percona56-server/files/patch-scripts_CMakeLists.txt
deleted file mode 100644
index 1ba5136f14c3..000000000000
--- a/databases/percona56-server/files/patch-scripts_CMakeLists.txt
+++ /dev/null
@@ -1,38 +0,0 @@
---- scripts/CMakeLists.txt.orig	2015-02-05 14:28:58.000000000 +0100
-+++ scripts/CMakeLists.txt	2015-02-12 23:25:55.432292000 +0100
-@@ -273,6 +273,8 @@
-           GET_FILENAME_COMPONENT(lib "${lib}" NAME_WE)
-           STRING(REGEX REPLACE "^lib" "" lib "${lib}")
-           SET(${var} "${${var}}-l${lib} " ) 
-+        ELSEIF(lib STREQUAL "-pthread")
-+          SET(${var} "${${var}}-pthread " ) 
-         ELSE()
-           SET(${var} "${${var}}-l${lib} " ) 
-         ENDIF()
-@@ -326,25 +328,19 @@
-   # On Unix, most of the files end up in the bin directory
-   SET(mysql_config_COMPONENT COMPONENT Development)
-   SET(BIN_SCRIPTS
--    msql2mysql
--    mysql_config
-     mysql_fix_extensions
-     mysql_setpermission
-     mysql_zap
--    mysqlaccess
--    mysqlaccess.conf
-     mysql_convert_table_format
--    mysql_find_rows
-     mysqlhotcopy
-     mysqldumpslow
-     mysqld_multi
-     mysqld_safe
--    ps_tokudb_admin
-   )
-   FOREACH(file ${BIN_SCRIPTS})
-     IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh)
-       CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh
--        ${CMAKE_CURRENT_BINARY_DIR}/${file} ESCAPE_QUOTES @ONLY)
-+        ${CMAKE_CURRENT_BINARY_DIR}/${file} @ONLY)
-     ELSEIF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${file})
-       CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${file}
-          ${CMAKE_CURRENT_BINARY_DIR}/${file} COPYONLY)
diff --git a/databases/percona56-server/files/patch-scripts_mysqld_safe.sh b/databases/percona56-server/files/patch-scripts_mysqld_safe.sh
deleted file mode 100644
index 2a30469922f0..000000000000
--- a/databases/percona56-server/files/patch-scripts_mysqld_safe.sh
+++ /dev/null
@@ -1,24 +0,0 @@
---- scripts/mysqld_safe.sh.orig	2007-10-08 10:39:23.000000000 +0200
-+++ scripts/mysqld_safe.sh	2007-10-08 10:40:52.000000000 +0200
-@@ -242,10 +242,10 @@
- 
- 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"
- 
-@@ -254,7 +254,7 @@
-   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"
-     MYSQL_HOME=$DATADIR
-   else
-     MYSQL_HOME=$MY_BASEDIR_VERSION
diff --git a/databases/percona56-server/files/patch-sql-common_client.c b/databases/percona56-server/files/patch-sql-common_client.c
deleted file mode 100644
index 2a6f3fe1a37f..000000000000
--- a/databases/percona56-server/files/patch-sql-common_client.c
+++ /dev/null
@@ -1,38 +0,0 @@
---- sql-common/client.c.orig	2018-01-17 11:39:51.315029000 +0000
-+++ sql-common/client.c	2018-01-17 11:44:53.493273000 +0000
-@@ -1884,7 +1884,7 @@
-     *errptr= "Failed to get DNS name from SAN list item";
-     DBUG_RETURN(1);
-   }
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-   cn= (const char *)ASN1_STRING_data(dns_name);
- #else
-   cn= (const char *)ASN1_STRING_get0_data(dns_name);
-@@ -1946,7 +1946,7 @@
-     *errptr= "Invalid IP address embedded in the certificate SAN IP address";
-     DBUG_RETURN(1);
-   }
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-   ip= ASN1_STRING_data(ip_address);
- #else
-   ip= ASN1_STRING_get0_data(ip_address);
-@@ -2111,7 +2111,7 @@
-   if(server_ip_address != NULL)
-   {
-     iplen= ASN1_STRING_length(server_ip_address);
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-     ipout= (const unsigned char *) ASN1_STRING_data(server_ip_address);
- #else
-     ipout= (const unsigned char *) ASN1_STRING_get0_data(server_ip_address);
-@@ -2163,7 +2163,7 @@
-       goto error;
-     }
- 
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-     cn= (const char *) ASN1_STRING_data(cn_asn1);
- #else
-     cn= (const char *) ASN1_STRING_get0_data(cn_asn1);
diff --git a/databases/percona56-server/files/patch-sql_CMakeLists.txt b/databases/percona56-server/files/patch-sql_CMakeLists.txt
deleted file mode 100644
index 60567b7b61cb..000000000000
--- a/databases/percona56-server/files/patch-sql_CMakeLists.txt
+++ /dev/null
@@ -1,18 +0,0 @@
---- sql/CMakeLists.txt.orig	2013-06-03 00:02:34.000000000 +0200
-+++ sql/CMakeLists.txt	2013-06-06 00:56:54.121744790 +0200
-@@ -430,6 +430,7 @@
- 
- IF(INSTALL_LAYOUT STREQUAL "STANDALONE")
- 
-+IF(FALSE)
- # Copy db.opt into data/test/
- SET(DBOPT_FILE ${CMAKE_CURRENT_SOURCE_DIR}/db.opt ) 
- INSTALL(FILES ${DBOPT_FILE} DESTINATION data/test COMPONENT DataFiles)
-@@ -474,6 +475,7 @@
-   INSTALL(FILES ${DUMMY_FILE} DESTINATION data/mysql COMPONENT DataFiles)
- ENDIF()
- ENDIF()
-+ENDIF()
- 
- ADD_CUSTOM_TARGET(show-dist-name
-   COMMAND ${CMAKE_COMMAND} -E echo "${CPACK_PACKAGE_FILE_NAME}"
diff --git a/databases/percona56-server/files/patch-sql_mysqld.cc b/databases/percona56-server/files/patch-sql_mysqld.cc
deleted file mode 100644
index 586f267f28c6..000000000000
--- a/databases/percona56-server/files/patch-sql_mysqld.cc
+++ /dev/null
@@ -1,19 +0,0 @@
---- sql/mysqld.cc.orig	2015-07-25 17:06:21 UTC
-+++ sql/mysqld.cc
-@@ -2117,6 +2117,16 @@
- #ifndef EMBEDDED_LIBRARY
-
- /* Initialise proxy protocol. */
-+
-+/* At least OpenBSD and NexentaCore do not
-+* define s6_addr32 for user land settings.
-+*/
-+#if !defined s6_addr32 && defined __sun__
-+#       define s6_addr32 _S6_un._S6_u32
-+#elif !defined s6_addr32 && ( defined __OpenBSD__ || defined __FreeBSD__ )
-+#       define s6_addr32 __u6_addr.__u6_addr32
-+#endif  /* !defined s6_addr32 */
-+
- static void set_proxy()
- {
-   const char *p;
diff --git a/databases/percona56-server/files/patch-sql_sys_vars.cc b/databases/percona56-server/files/patch-sql_sys_vars.cc
deleted file mode 100644
index e8f0caff4aff..000000000000
--- a/databases/percona56-server/files/patch-sql_sys_vars.cc
+++ /dev/null
@@ -1,38 +0,0 @@
---- sql/sys_vars.cc.orig	2012-06-15 17:03:32.000000000 +0200
-+++ sql/sys_vars.cc	2012-06-15 17:16:23.000000000 +0200
-@@ -900,7 +900,7 @@
-        "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_ulong Sys_join_buffer_size(
-        "join_buffer_size",
-@@ -1401,7 +1401,7 @@
-        "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));
- 
-@@ -1416,7 +1416,7 @@
-        "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));
- 
-@@ -2257,7 +2257,7 @@
-        "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 */
diff --git a/databases/percona56-server/files/patch-support-files_CMakeLists.txt b/databases/percona56-server/files/patch-support-files_CMakeLists.txt
deleted file mode 100644
index 159e1fa71ba2..000000000000
--- a/databases/percona56-server/files/patch-support-files_CMakeLists.txt
+++ /dev/null
@@ -1,12 +0,0 @@
---- support-files/CMakeLists.txt.orig	2010-12-23 17:38:19.000000000 +0100
-+++ support-files/CMakeLists.txt	2010-12-23 17:41:11.000000000 +0100
-@@ -74,7 +74,9 @@
-     INSTALL(FILES magic DESTINATION ${inst_location} COMPONENT SupportFiles)
-   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)
-   CONFIGURE_FILE(mysql.spec.sh ${CMAKE_CURRENT_BINARY_DIR}/mysql.${VERSION}.spec @ONLY)
diff --git a/databases/percona56-server/files/patch-vio_viosocket.c b/databases/percona56-server/files/patch-vio_viosocket.c
deleted file mode 100644
index dee21830f520..000000000000
--- a/databases/percona56-server/files/patch-vio_viosocket.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- vio/viosocket.c.orig	2015-07-08 07:38:39 UTC
-+++ vio/viosocket.c
-@@ -33,6 +33,10 @@
- static void (*before_io_wait)(void)= 0;
- static void (*after_io_wait)(void)= 0;
- 
-+#ifdef __FreeBSD__
-+#define s6_addr32 __u6_addr.__u6_addr32
-+#endif
-+
- /* Wait callback macros (both performance schema and threadpool */
- #define START_SOCKET_WAIT(locker, state_ptr, sock, which, timeout) \
- do                                                                 \
diff --git a/databases/percona56-server/files/patch-vio_viosslfactories.c b/databases/percona56-server/files/patch-vio_viosslfactories.c
deleted file mode 100644
index 42a28cd67cdd..000000000000
--- a/databases/percona56-server/files/patch-vio_viosslfactories.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- vio/viosslfactories.c.orig	2020-07-21 12:31:43.000000000 +0200
-+++ vio/viosslfactories.c	2020-09-17 22:38:47.837385000 +0200
-@@ -128,7 +128,7 @@
-     BIGNUM *p= BN_bin2bn(dh2048_p, sizeof(dh2048_p), NULL);
-     BIGNUM *g= BN_bin2bn(dh2048_g, sizeof(dh2048_g), NULL);
-     if (!p || !g
--#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L || defined( LIBRESSL_VERSION_NUMBER )
-         || !DH_set0_pqg(dh, p, NULL, g)
- #endif /* OPENSSL_VERSION_NUMBER >= 0x10100000L */
-     ) {
-@@ -136,7 +136,7 @@
-       DH_free(dh);
-       return NULL;
-     }
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined( LIBRESSL_VERSION_NUMBER )
-     dh->p= p;
-     dh->g= g;
- #endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
diff --git a/databases/percona56-server/pkg-descr b/databases/percona56-server/pkg-descr
deleted file mode 100644
index cb5d1681d1bb..000000000000
--- a/databases/percona56-server/pkg-descr
+++ /dev/null
@@ -1,4 +0,0 @@
-MySQL replacement : Percona ServerPercona Server is a drop-in alternative
-for MySQL with enhanced performance and enterprise-grade features.
-
-WWW: http://www.percona.com/software/percona-server
diff --git a/databases/percona56-server/pkg-message b/databases/percona56-server/pkg-message
deleted file mode 100644
index e619c93e68e7..000000000000
--- a/databases/percona56-server/pkg-message
+++ /dev/null
@@ -1,8 +0,0 @@
-[
-{ type: upgrade
-  message: <<EOM
-Remember to run mysql_upgrade the first time you start the MySQL server
-after an upgrade from an earlier version.
-EOM
-}
-]
diff --git a/databases/percona56-server/pkg-plist b/databases/percona56-server/pkg-plist
deleted file mode 100644
index 894cbe2fc9c9..000000000000
--- a/databases/percona56-server/pkg-plist
+++ /dev/null
@@ -1,177 +0,0 @@
-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/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
-%%TOKUDB%%bin/tokuft_logprint
-%%TOKUDB%%bin/tokuftdump
-%%TOKUDB%%include/backup.h
-%%TOKUDB%%lib/mysql/libHotBackup.so
-lib/mysql/libmysqld.a
-lib/mysql/plugin/adt_null.so
-lib/mysql/plugin/audit_log.so
-lib/mysql/plugin/auth.so
-lib/mysql/plugin/auth_test_plugin.so
-lib/mysql/plugin/connection_control.so
-lib/mysql/plugin/daemon_example.ini
-lib/mysql/plugin/ha_example.so
-%%TOKUDB%%lib/mysql/plugin/ha_tokudb.so
-lib/mysql/plugin/handlersocket.so
-%%INNODBMEMCACHED%%lib/mysql/plugin/innodb_engine.so
-lib/mysql/plugin/libdaemon_example.so
-lib/mysql/plugin/libfnv1a_udf.so
-lib/mysql/plugin/libfnv_udf.so
-%%INNODBMEMCACHED%%lib/mysql/plugin/libmemcached.so
-lib/mysql/plugin/libmurmur_udf.so
-lib/mysql/plugin/mypluglib.so
-lib/mysql/plugin/mysql_no_login.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_response_time.so
-lib/mysql/plugin/semisync_master.so
-lib/mysql/plugin/semisync_slave.so
-lib/mysql/plugin/test_udf_services.so
-%%TOKUDB%%lib/mysql/plugin/tokudb_backup.so
-lib/mysql/plugin/udf_example.so
-lib/mysql/plugin/validate_password.so
-libexec/mysqld
-share/man/man1/my_print_defaults.1.gz
-share/man/man1/myisam_ftdump.1.gz
-share/man/man1/myisamchk.1.gz
-share/man/man1/myisamlog.1.gz
-share/man/man1/myisampack.1.gz
-share/man/man1/mysql.server.1.gz
-share/man/man1/mysql_convert_table_format.1.gz
-share/man/man1/mysql_fix_extensions.1.gz
-share/man/man1/mysql_install_db.1.gz
-share/man/man1/mysql_plugin.1.gz
-share/man/man1/mysql_secure_installation.1.gz
-share/man/man1/mysql_setpermission.1.gz
-share/man/man1/mysql_tzinfo_to_sql.1.gz
-share/man/man1/mysql_upgrade.1.gz
-share/man/man1/mysql_zap.1.gz
-share/man/man1/mysqlbug.1.gz
-share/man/man1/mysqld_multi.1.gz
-share/man/man1/mysqld_safe.1.gz
-share/man/man1/mysqldumpslow.1.gz
-share/man/man1/mysqlhotcopy.1.gz
-share/man/man1/mysqlman.1.gz
-share/man/man1/perror.1.gz
-share/man/man1/replace.1.gz
-share/man/man1/resolve_stack_dump.1.gz
-share/man/man1/resolveip.1.gz
-share/man/man8/mysqld.8.gz
-%%TOKUDB%%share/doc/mysql/COPYING.AGPLv3
-%%TOKUDB%%share/doc/mysql/COPYING.GPLv2
-%%TOKUDB%%share/doc/mysql/PATENTS
-%%TOKUDB%%share/doc/mysql/README.md
-%%TOKUDB%%share/doc/mysql/README_tokudb_backup
-%%DATADIR%%/binary-configure
-%%DATADIR%%/bulgarian/errmsg.sys
-%%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%%/dictionary.txt
-%%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%%/innodb_memcached_config.sql
-%%DATADIR%%/italian/errmsg.sys
-%%DATADIR%%/japanese/errmsg.sys
-%%DATADIR%%/korean/errmsg.sys
-%%DATADIR%%/magic
-%%DATADIR%%/my-default.cnf
-%%DATADIR%%/mysql-log-rotate
-%%DATADIR%%/mysql.server
-%%DATADIR%%/mysql_security_commands.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%%/tests/suite/query_response_time/basic.result
-%%DATADIR%%/tests/suite/query_response_time/basic.test
-%%DATADIR%%/tests/suite/query_response_time/bug1453277-master.opt
-%%DATADIR%%/tests/suite/query_response_time/bug1453277.result
-%%DATADIR%%/tests/suite/query_response_time/bug1453277.test
-%%DATADIR%%/tests/suite/query_response_time/install_query_response_time-master.opt
-%%DATADIR%%/tests/suite/query_response_time/install_query_response_time.result
-%%DATADIR%%/tests/suite/query_response_time/install_query_response_time.test
-%%DATADIR%%/tests/suite/query_response_time/session_toggle.result
-%%DATADIR%%/tests/suite/query_response_time/query_response_time-rw-begin.inc
-%%DATADIR%%/tests/suite/query_response_time/query_response_time-rw-end.inc
-%%DATADIR%%/tests/suite/query_response_time/query_response_time-rw.result
-%%DATADIR%%/tests/suite/query_response_time/query_response_time-rw.test
-%%DATADIR%%/tests/suite/query_response_time/query_response_time-stored.inc
-%%DATADIR%%/tests/suite/query_response_time/query_response_time-stored.result
-%%DATADIR%%/tests/suite/query_response_time/query_response_time-stored.test
-%%DATADIR%%/tests/suite/query_response_time/query_response_time-check.inc
-%%DATADIR%%/tests/suite/query_response_time/query_response_time.inc
-%%DATADIR%%/tests/suite/query_response_time/query_response_time.result
-%%DATADIR%%/tests/suite/query_response_time/query_response_time.test
-%%DATADIR%%/tests/suite/query_response_time/session_toggle.test
-%%DATADIR%%/tests/suite/query_response_time/suite.opt
-%%DATADIR%%/tests/suite/query_response_time/suite.pm
-%%DATADIR%%/ukrainian/errmsg.sys
-@dir(mysql,mysql,) /var/db/mysql