summaryrefslogtreecommitdiff
path: root/databases/mariadb101-server
diff options
context:
space:
mode:
Diffstat (limited to 'databases/mariadb101-server')
-rw-r--r--databases/mariadb101-server/Makefile224
-rw-r--r--databases/mariadb101-server/distinfo3
-rw-r--r--databases/mariadb101-server/files/extra-patch-include_my__compare.h11
-rw-r--r--databases/mariadb101-server/files/mysql-server.in140
-rw-r--r--databases/mariadb101-server/files/patch-CMakeLists.txt26
-rw-r--r--databases/mariadb101-server/files/patch-MDEV-1596146
-rw-r--r--databases/mariadb101-server/files/patch-client_CMakeLists.txt72
-rw-r--r--databases/mariadb101-server/files/patch-cmake_ssl.cmake31
-rw-r--r--databases/mariadb101-server/files/patch-extra_CMakeLists.txt13
-rw-r--r--databases/mariadb101-server/files/patch-include_CMakeLists.txt26
-rw-r--r--databases/mariadb101-server/files/patch-libmysql_CMakeLists.txt41
-rw-r--r--databases/mariadb101-server/files/patch-libservices_CMakeLists.txt11
-rw-r--r--databases/mariadb101-server/files/patch-man_CMakeLists.txt14
-rw-r--r--databases/mariadb101-server/files/patch-mysys__ssl_my__crypt.cc20
-rw-r--r--databases/mariadb101-server/files/patch-mysys_my__default.c60
-rw-r--r--databases/mariadb101-server/files/patch-oqgraph-MDEV-1529140
-rw-r--r--databases/mariadb101-server/files/patch-pcre_CMakeLists.txt13
-rw-r--r--databases/mariadb101-server/files/patch-scripts_mysql__config.sh12
-rw-r--r--databases/mariadb101-server/files/patch-scripts_mysqld__safe.sh24
-rw-r--r--databases/mariadb101-server/files/patch-scripts_wsrep__sst__mariabackup.sh11
-rw-r--r--databases/mariadb101-server/files/patch-sql_CMakeLists.txt30
-rw-r--r--databases/mariadb101-server/files/patch-sql_sql__trigger.cc52
-rw-r--r--databases/mariadb101-server/files/patch-sql_sql__view.cc65
-rw-r--r--databases/mariadb101-server/files/patch-sql_sys__vars.cc40
-rw-r--r--databases/mariadb101-server/files/patch-storage_mroonga_CMakeLists.txt11
-rw-r--r--databases/mariadb101-server/files/patch-storage_mroonga_vendor_groonga_CMakeLists.txt15
-rw-r--r--databases/mariadb101-server/files/patch-storage_tokudb_CMakeLists.txt12
-rw-r--r--databases/mariadb101-server/files/patch-storage_tokudb_PerconaFT_CMakeLists.txt11
-rw-r--r--databases/mariadb101-server/files/patch-storage_tokudb_PerconaFT_cmake__modules_TokuThirdParty.cmake36
-rw-r--r--databases/mariadb101-server/files/patch-storage_tokudb_PerconaFT_portability_memory.cc16
-rw-r--r--databases/mariadb101-server/files/patch-support-files_CMakeLists.txt14
-rw-r--r--databases/mariadb101-server/files/pkg-message.in17
-rw-r--r--databases/mariadb101-server/pkg-descr14
-rw-r--r--databases/mariadb101-server/pkg-plist271
34 files changed, 0 insertions, 1442 deletions
diff --git a/databases/mariadb101-server/Makefile b/databases/mariadb101-server/Makefile
deleted file mode 100644
index 487801e41f20..000000000000
--- a/databases/mariadb101-server/Makefile
+++ /dev/null
@@ -1,224 +0,0 @@
-# $FreeBSD$
-
-PORTNAME?= mariadb
-PORTVERSION= 10.1.45
-PORTREVISION= 0
-CATEGORIES= databases
-MASTER_SITES= http://ftp.osuosl.org/pub/${SITESDIR}/ \
- http://mirrors.supportex.net/${SITESDIR}/ \
- http://mirror2.hs-esslingen.de/pub/Mirrors/${SITESDIR}/ \
- http://gd.tuwien.ac.at/db/${SITESDIR}/ \
- http://mirrors.fe.up.pt/pub/${SITESDIR}/ \
- http://mirror.de.gsnw.de:56431/${SITESDIR}/ \
- http://mirror.layerjet.com/${SITESDIR}/ \
- http://mirror.switch.ch/mirror/${SITESDIR}/
-PKGNAMESUFFIX?= 101-server
-
-DEPRECATED= Port will be removed when 10.5 is added, please\
- switch to a newer version
-EXPIRATION_DATE= 2020-07-01
-
-MAINTAINER= brnrd@FreeBSD.org
-COMMENT?= Multithreaded SQL database (server)
-
-LICENSE= GPLv2
-LICENSE_NAME_PerconaFT= PerconaFT patents license
-LICENSE_FILE_PerconaFT= ${WRKSRC}/storage/tokudb/PerconaFT/PATENTS
-LICENSE_PERMS_PerconaFT= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
-
-SUB_FILES= pkg-message
-
-USES= bison:build cmake:insource,noninja cpe libedit ncurses \
- shebangfix ssl
-USE_LDCONFIG= ${PREFIX}/lib/mysql
-SHEBANG_FILES= scripts/*.sh
-SITESDIR= mariadb/mariadb-${PORTVERSION}/source
-DOCSDIR= ${PREFIX}/share/doc/mysql
-
-OPTIONS_DEFINE= FASTMTX
-OPTIONS_SINGLE= GSSAPI
-OPTIONS_SINGLE_GSSAPI= GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE
-OPTIONS_DEFAULT= GSSAPI_BASE
-
-FASTMTX_DESC= Replace mutexes with spinlocks
-
-.if ${PKGNAMESUFFIX:M*-server}
-# MySQL-Server options
-OPTIONS_DEFINE+= CONNECT_EXTRA MAXKEY DOCS
-OPTIONS_DEFAULT+= MAXKEY SPHINX SPIDER
-OPTIONS_GROUP= COMPRESSION ENGINES GROONGA
-OPTIONS_GROUP_COMPRESSION= LZ4 LZO SNAPPY
-OPTIONS_GROUP_ENGINES= INNOBASE MROONGA OQGRAPH SPHINX SPIDER TOKUDB
-OPTIONS_GROUP_GROONGA= ZMQ MSGPACK
-OPTIONS_EXCLUDE_i386= TOKUDB
-
-CONNECT_EXTRA_DESC= Enable ODBC and XML in CONNECT engine
-COMPRESSION_DESC= Optional page compression
-ENGINES_DESC= Optional MariaDB storage engines
-GROONGA_DESC= Optional Mroonga features
-INNOBASE_DESC= Build InnoDB engine next to XtraDB
-MAXKEY_DESC= Change max key length from 1000 to 4000
-MROONGA_DESC= Mroonga Full Text Search engine
-MSGPACK_DESC= MsgPack support
-OQGRAPH_DESC= Open Query Graph Computation engine
-SPHINX_DESC= SphinxSE engine
-SPIDER_DESC= Partitioning and XA-transactions engine
-TOKUDB_DESC= Fractal tree index tree data structure engine
-ZMQ_DESC= ZeroMQ support
-.endif
-
-CMAKE_ARGS+= -DINSTALL_DOCDIR="share/doc/mysql" \
- -DINSTALL_DOCREADMEDIR="share/doc/mysql" \
- -DINSTALL_INCLUDEDIR="include/mysql" \
- -DINSTALL_INFODIR="info" \
- -DINSTALL_LIBDIR="lib/mysql" \
- -DINSTALL_MANDIR="man" \
- -DINSTALL_MYSQLDATADIR="/var/db/mysql" \
- -DINSTALL_MYSQLSHAREDIR="share/mysql" \
- -DINSTALL_MYSQLTESTDIR= \
- -DINSTALL_PLUGINDIR="lib/mysql/plugin" \
- -DINSTALL_SBINDIR="libexec" \
- -DINSTALL_SCRIPTDIR="bin" \
- -DINSTALL_SHAREDIR="share" \
- -DINSTALL_SQLBENCHDIR= \
- -DINSTALL_SUPPORTFILESDIR="share/mysql" \
- -DWITH_SSL=${OPENSSLBASE} \
- -DKRB5_CONFIG=${KRB5CONFIG} \
- -DCOMPILATION_COMMENT="FreeBSD Ports"
-CMAKE_ON+= WITH_LIBWRAP
-CMAKE_OFF+= WITH_UNIT_TESTS
-
-DATADIR= ${PREFIX}/share/mysql
-
-.ifdef USE_MYSQL
-.error You have 'USE_MYSQL' variable defined either in environment or in make(1) arguments. This leads to a circular dependency. Please undefine and try again.
-.endif
-
-CONFLICTS_INSTALL= mariadb5*-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \
- mariadb10[02-9]-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \
- mysql[0-9]*-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \
- mysqlwsrep* \
- percona[0-9]*-${PKGNAMESUFFIX:C/^[0-9]*-//}-*
-
-FASTMTX_CMAKE_BOOL= WITH_FAST_MUTEXES
-GSSAPI_BASE_USES= gssapi
-GSSAPI_HEIMDAL_USES= gssapi:heimdal
-GSSAPI_MIT_USES= gssapi:mit
-OPTIONS_SUB= yes
-
-.if ${PKGNAMESUFFIX:M*-client}
-# MySQL-Client part
-USES+= readline
-USE_LDCONFIG= ${PREFIX}/lib/mysql
-CMAKE_ON+= WITHOUT_SERVER
-GSSAPI_NONE_CMAKE_ON= -DPLUGIN_AUTH_GSSAPI_CLIENT=NO
-.else
-# MySQL-Server part
-USES+= gnome mysql:101m
-USE_GNOME= libxml2
-USE_LDCONFIG+= ${PREFIX}/lib/mysql/plugin
-USE_RC_SUBR= mysql-server
-USERS= mysql
-GROUPS= mysql
-CMAKE_ARGS+= -DPLUGIN_AUTH_GSSAPI_CLIENT=NO
-CMAKE_ON+= WITH_EMBEDDED_SERVER CMAKE_SKIP_BUILD_RPATH WITHOUT_EXAMPLE_STORAGE_ENGINE
-
-.for ENGINE in ${OPTIONS_GROUP_ENGINES}
-${ENGINE}_CMAKE_OFF= -DPLUGIN_${ENGINE}=NO
-${ENGINE}_CMAKE_ON= -DPLUGIN_${ENGINE}=DYNAMIC
-.endfor
-
-CONNECT_EXTRA_LIB_DEPENDS= libodbc.so:databases/unixODBC
-CONNECT_EXTRA_USES= gnome
-CONNECT_EXTRA_USE= gnome=libxml2
-GSSAPI_NONE_CMAKE_ON= -DPLUGIN_AUTH_GSSAPI=NO
-LZ4_BROKEN= LZ4 compression broken in 10.1, use a newer release
-LZ4_CMAKE_ON= -DGRN_WITH_LZ4=ON -DWITH_INNODB_LZ4=ON
-LZ4_CMAKE_OFF= -DGRN_WITH_LZ4=OFF -DWITH_INNODB_LZ4=OFF
-LZ4_LIB_DEPENDS= liblz4.so:archivers/liblz4
-LZO_BROKEN= LZO compression broken in 10.1, use a newer release
-LZO_CMAKE_ON= -DWITH_INNODB_LZO=ON
-LZO_CMAKE_OFF= -DWITH_INNODB_LZO=OFF
-LZO_LIB_DEPENDS= liblzo2.so:archivers/lzo2
-MAXKEY_EXTRA_PATCHES+= ${FILESDIR}/extra-patch-include_my__compare.h
-MROONGA_LIB_DEPENDS= liblz4.so:archivers/liblz4
-MROONGA_VARS= LICENSE+=LGPL20 LICENSE_COMB=multi
-MSGPACK_LIB_DEPENDS= libmsgpackc.so:devel/msgpack
-OQGRAPH_LIB_DEPENDS= libboost_system.so:devel/boost-libs \
- libJudy.so:devel/judy
-SNAPPY_BROKEN= Snappy compression broken in 10.1, use a newer release
-SNAPPY_CMAKE_ON= -DWITH_INNODB_SNAPPY=ON
-SNAPPY_CMAKE_OFF= -DWITH_INNODB_SNAPPY=OFF
-SNAPPY_LIB_DEPENDS= libsnappy.so:archivers/snappy
-TOKUDB_PORTDOCS= README.md
-TOKUDB_VARS= LICENSE+=PerconaFT LICENSE_COMB=multi
-ZMQ_LIB_DEPENDS= libzmq.so:net/libzmq4
-.endif # ${PKGNAMESUFFIX:M*-client}
-
-.include <bsd.port.options.mk>
-
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200057
-SUB_LIST+= LEGACY_LIMITS="@comment " MODERN_LIMITS=""
-.else
-SUB_LIST+= LEGACY_LIMITS="" MODERN_LIMITS="@comment "
-.endif
-
-.if defined(PPC_ABI) && ${PPC_ABI} == ELFv2
-USES+= compiler:gcc-c++11-lib
-.else
-USES+= compiler:c++11-lib
-.endif
-
-.include <bsd.port.pre.mk>
-
-.if ${SSL_DEFAULT} != base && ${PORT_OPTIONS:MGSSAPI_BASE}
-IGNORE= BASE_GSSAPI is not compatible with OpenSSL from ports. Use other GSSAPI options or OpenSSL from base system
-.endif
-
-.if ${OPSYS} == FreeBSD
-CMAKE_ARGS+= -DWITH_JEMALLOC="system"
-.endif
-
-post-patch:
- @${REINPLACE_CMD} 's/*.1/${MAN1}/' ${WRKSRC}/man/CMakeLists.txt
- @${REINPLACE_CMD} 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/mysys/my_default.c
- @${REINPLACE_CMD} 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/scripts/mysql_config.sh
- @${MV} ${WRKSRC}/storage/mroonga/version ${WRKSRC}/storage/mroonga/version_txt
-.if ${OPSYS} == DragonFly
- ${CP} ${WRKSRC}/cmake/os/FreeBSD.cmake \
- ${WRKSRC}/cmake/os/DragonFly.cmake
-.endif
-
-
-.if ${PKGNAMESUFFIX:M*-client}
-post-install:
- ${RM} ${STAGEDIR}${PREFIX}/bin/wsrep*
- ${RM} ${STAGEDIR}${PREFIX}/bin/mysqld_safe_helper
- ${RM} ${STAGEDIR}${PREFIX}/share/aclocal/mysql.m4
- ${RM} -r ${STAGEDIR}${PREFIX}/share/pkgconfig
- ${RM} -r ${STAGEDIR}${PREFIX}/include/mysql/private
-.else
-post-install:
-# Remove programs to avoid conflict with mariadb101-client
-# These are "client" components, so there should be a switch that
-# prevents them from being installed but it's unknown right now
- ${RM} ${STAGEDIR}${PREFIX}/bin/msql2mysql \
- ${STAGEDIR}${PREFIX}/bin/mysql_config \
- ${STAGEDIR}${PREFIX}/bin/mysql_find_rows \
- ${STAGEDIR}${PREFIX}/bin/mysqlaccess \
- ${STAGEDIR}${PREFIX}/lib/mysql/plugin/client_ed25519.so \
- ${STAGEDIR}${PREFIX}/share/groonga-normalizer-mysql/lgpl-2.0.txt \
- ${STAGEDIR}${PREFIX}/share/groonga/COPYING \
- ${STAGEDIR}${DATADIR}/mroonga/COPYING
- ${RM} -r ${STAGEDIR}${PREFIX}/share/mysql/policy \
- ${STAGEDIR}${PREFIX}/share/pkgconfig \
- ${STAGEDIR}${PREFIX}/mysql/mysql-test \
- ${STAGEDIR}${PREFIX}/mysql/sql-bench
-
-post-install-MROONGA-on:
- ${MV} ${STAGEDIR}${PREFIX}/share/groonga-normalizer-mysql \
- ${STAGEDIR}${PREFIX}/share/groonga \
- ${STAGEDIR}${PREFIX}/share/mysql
-.endif # ${PKGNAMESUFFIX:M*-client}
-
-.include <bsd.port.post.mk>
diff --git a/databases/mariadb101-server/distinfo b/databases/mariadb101-server/distinfo
deleted file mode 100644
index ec2b4f6441ea..000000000000
--- a/databases/mariadb101-server/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1589725786
-SHA256 (mariadb-10.1.45.tar.gz) = 9d8f0f71f9613b2028ffc5c5be8b98948ec955eb0d89600d18ed7cc04807dad5
-SIZE (mariadb-10.1.45.tar.gz) = 63673824
diff --git a/databases/mariadb101-server/files/extra-patch-include_my__compare.h b/databases/mariadb101-server/files/extra-patch-include_my__compare.h
deleted file mode 100644
index 5fc447b98cd7..000000000000
--- a/databases/mariadb101-server/files/extra-patch-include_my__compare.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- include/my_compare.h.orig 2012-11-28 17:49:43.000000000 +0200
-+++ include/my_compare.h 2012-12-23 02:45:51.000000000 +0200
-@@ -40,7 +40,7 @@
- But beware the dependency of MI_MAX_POSSIBLE_KEY_BUFF and HA_MAX_KEY_LENGTH.
- */
-
--#define HA_MAX_KEY_LENGTH 1000 /* Max length in bytes */
-+#define HA_MAX_KEY_LENGTH 4000 /* Max length in bytes */
- #define HA_MAX_KEY_SEG 32 /* Max segments for key */
-
- #define HA_MAX_POSSIBLE_KEY_BUFF (HA_MAX_KEY_LENGTH + 24+ 6+6)
diff --git a/databases/mariadb101-server/files/mysql-server.in b/databases/mariadb101-server/files/mysql-server.in
deleted file mode 100644
index d3417eebce5f..000000000000
--- a/databases/mariadb101-server/files/mysql-server.in
+++ /dev/null
@@ -1,140 +0,0 @@
-#!/bin/sh
-
-# $FreeBSD: head/databases/mariadb55-server/files/mysql-server.in 361647 2014-07-12 22:42:33Z rakuco $
-#
-# PROVIDE: mysql
-# REQUIRE: LOGIN
-# KEYWORD: shutdown
-#
-# Add the following line to /etc/rc.conf to enable mysql:
-# mysql_(instance_)?enable (bool): Set to "NO" by default.
-# Set it to "YES" to enable MySQL.
-%%LEGACY_LIMITS%%# mysql_(instance_)?limits (bool): Set to "NO" by default.
-%%LEGACY_LIMITS%%# Set it to yes to run `limits -e -U mysql`
-%%LEGACY_LIMITS%%# just before mysql starts.
-# mysql_(instance_)?dbdir (str): Default to "/var/db/mysql"
-# Base database directory.
-# mysql_(instance_)?args (str): Custom additional arguments to be passed
-# to mysqld_safe (default empty).
-# mysql_(instance_)?pidfile (str): Custum PID file path and name.
-# Default to "${mysql_dbdir}/${hostname}.pid".
-# mysql_(instance_)?user (str): User to run mysqld as
-# Default to "mysql" created by the port
-# mysql_(instance_)?optfile (str): Server-specific option file.
-# Default to "${mysql_dbdir}/my.cnf".
-# mysql_instances (str): Set to "" by default.
-# If defined, list of instances to enable
-
-. /etc/rc.subr
-
-name="mysql"
-rcvar=mysql_enable
-
-load_rc_config $name
-
-: ${mysql_enable="NO"}
-%%LEGACY_LIMITS%%: ${mysql_limits="NO"}
-: ${mysql_user="mysql"}
-%%LEGACY_LIMITS%%: ${mysql_limits_args="-e -U $mysql_user"}
-: ${mysql_dbdir="/var/db/mysql"}
-: ${mysql_optfile="${mysql_dbdir}/my.cnf"}
-
-command="/usr/sbin/daemon"
-procname="%%PREFIX%%/libexec/mysqld"
-start_precmd="${name}_prestart"
-start_postcmd="${name}_poststart"
-
-if [ -n "$2" ]; then
- instance="$2"
- load_rc_config ${name}_${instance}
- case "$mysql_instances" in
- "$2 "*|*" $2 "*|*" $2"|"$2")
- eval mysql_args="\${mysql_${instance}_args:-\"${mysql_args}\"}"
- eval mysql_dbdir="\${mysql_${instance}_dbdir:-\"/var/db/mysql_${instance}\"}"
-%%LEGACY_LIMITS%% eval mysql_limits="\${mysql_${instance}_limits:-\"${mysql_limits}\"}"
- eval mysql_user="\${mysql_${instance}_user:-\"${mysql_user}\"}"
-%%LEGACY_LIMITS%% eval mysql_limits_args="\${mysql_${instance}_limits_args:-\"-e -U $mysql_user\"}"
- eval mysql_optfile="\${mysql_${instance}_optfile:-\"${mysql_dbdir}/my.cnf\"}"
- eval mysql_pidfile="\${mysql_${instance}_pidfile:-\"${mysql_dbdir}/`/bin/hostname`.pid\"}"
- ;;
- *)
- err 1 "$2 not found in mysql_instances" ;;
- esac
-else
- if [ -n "${mysql_instances}" -a -n "$1" ]; then
- for instance in ${mysql_instances}; do
- eval _enable="\${mysql_${instance}_enable}"
- case "${_enable:-${mysql_enable}}" in
- [Nn][Oo]|[Ff][Aa][Ll][Ss][Ee]|[Oo][Ff][Ff]|0)
- continue
- ;;
- [Yy][Ee][Ss]|[Tt][Rr][Uu][Ee]|[Oo][Nn]|1)
- ;;
- *)
- if [ -z "$_enable" ]; then
- _var=mysql_enable
- else
- _var=mysql_${instance}_enable
- fi
- warn "Bad value" \
- "'${_enable:-${mysql_enable}}'" \
- "for ${_var}. " \
- "Instance ${instance} skipped."
- continue
- ;;
- esac
- echo "===> mysql instance: ${instance}"
- if %%PREFIX%%/etc/rc.d/mysql-server $1 ${instance}; then
- success="${instance} ${success}"
- else
- failed="${instance} (${retcode}) ${failed}"
- fi
- done
- exit 0
- else
- mysql_pidfile=${mysql_pidfile:-"${mysql_dbdir}/`/bin/hostname`.pid"}
- fi
-fi
-
-pidfile=$mysql_pidfile
-mysql_install_db="%%PREFIX%%/bin/mysql_install_db"
-mysql_install_db_args="--basedir=%%PREFIX%% --datadir=${mysql_dbdir} --force"
-command_args="-c -f %%PREFIX%%/bin/mysqld_safe --defaults-extra-file=${mysql_optfile} --user=${mysql_user} --datadir=${mysql_dbdir} --pid-file=${pidfile} ${mysql_args}"
-
-mysql_create_auth_tables()
-{
- eval $mysql_install_db $mysql_install_db_args
- [ $? -eq 0 ] && chown -R ${mysql_user}:$(id -gn $mysql_user) ${mysql_dbdir}
-}
-
-mysql_prestart()
-{
- local dir
- for dir in /etc /etc/mysql; do
- if [ -f "${dir}/my.cnf" ]; then
- echo "Please move existing my.cnf file from ${dir} to %%PREFIX%%${dir}"
- return 1
- fi
- done
- if [ ! -d "${mysql_dbdir}/mysql/." ]; then
- mysql_create_auth_tables || return 1
- fi
-%%LEGACY_LIMITS%% if checkyesno mysql_limits; then
-%%LEGACY_LIMITS%% eval `/usr/bin/limits ${mysql_limits_args:-"-e -U $mysql_user"}` 2>/dev/null
-%%LEGACY_LIMITS%% else
-%%LEGACY_LIMITS%% return 0
-%%LEGACY_LIMITS%% fi
-%%MODERN_LIMITS%% return 0
-}
-
-mysql_poststart()
-{
- local timeout=15
- while [ ! -f "${pidfile}" -a ${timeout} -gt 0 ]; do
- timeout=$(( timeout - 1 ))
- sleep 1
- done
- return 0
-}
-
-run_rc_command "$1"
diff --git a/databases/mariadb101-server/files/patch-CMakeLists.txt b/databases/mariadb101-server/files/patch-CMakeLists.txt
deleted file mode 100644
index f74e520ba0da..000000000000
--- a/databases/mariadb101-server/files/patch-CMakeLists.txt
+++ /dev/null
@@ -1,26 +0,0 @@
---- CMakeLists.txt.orig 2017-05-02 05:13:38 UTC
-+++ CMakeLists.txt
-@@ -388,7 +388,6 @@ ADD_SUBDIRECTORY(libservices)
- ADD_SUBDIRECTORY(sql/share)
-
- IF(NOT WITHOUT_SERVER)
-- ADD_SUBDIRECTORY(tests)
- ADD_SUBDIRECTORY(sql)
- OPTION (WITH_EMBEDDED_SERVER "Compile MySQL with embedded server" OFF)
- IF(WITH_EMBEDDED_SERVER)
-@@ -465,6 +465,7 @@ ADD_CUSTOM_TARGET(INFO_BIN ALL
- WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
- )
-
-+IF(FALSE)
- INSTALL_DOCUMENTATION(README CREDITS COPYING COPYING.thirdparty
- EXCEPTIONS-CLIENT COMPONENT Readme)
-
-@@ -476,6 +477,7 @@ IF(UNIX)
- INSTALL_DOCUMENTATION(Docs/INSTALL-BINARY COMPONENT Readme)
- INSTALL_DOCUMENTATION(Docs/INSTALL-BINARY Docs/README-wsrep COMPONENT Readme)
- ENDIF()
-+ENDIF()
-
- INCLUDE(CPack)
-
diff --git a/databases/mariadb101-server/files/patch-MDEV-15961 b/databases/mariadb101-server/files/patch-MDEV-15961
deleted file mode 100644
index 5e765675c815..000000000000
--- a/databases/mariadb101-server/files/patch-MDEV-15961
+++ /dev/null
@@ -1,46 +0,0 @@
---- mysys/stacktrace.c.orig 2018-03-26 14:18:03 UTC
-+++ mysys/stacktrace.c
-@@ -34,19 +34,19 @@
- #include <execinfo.h>
- #endif
-
-+#ifdef __linux__
- #define PTR_SANE(p) ((p) && (char*)(p) >= heap_start && (char*)(p) <= heap_end)
--
- static char *heap_start;
--
--#ifdef HAVE_BSS_START
- extern char *__bss_start;
--#endif
-+#else
-+#define PTR_SANE(p) (p)
-+#endif /* __linux */
-
- void my_init_stacktrace()
- {
--#ifdef HAVE_BSS_START
-+#ifdef __linux__
- heap_start = (char*) &__bss_start;
--#endif
-+#endif /* __linux__ */
- }
-
- #ifdef __linux__
-@@ -149,15 +149,15 @@ static int safe_print_str(const char *ad
-
- int my_safe_print_str(const char* val, int max_len)
- {
-+#ifdef __linux__
- char *heap_end;
-
--#ifdef __linux__
- // Try and make use of /proc filesystem to safely print memory contents.
- if (!safe_print_str(val, max_len))
- return 0;
--#endif
-
- heap_end= (char*) sbrk(0);
-+#endif
-
- if (!PTR_SANE(val))
- {
diff --git a/databases/mariadb101-server/files/patch-client_CMakeLists.txt b/databases/mariadb101-server/files/patch-client_CMakeLists.txt
deleted file mode 100644
index e82312f3dbd2..000000000000
--- a/databases/mariadb101-server/files/patch-client_CMakeLists.txt
+++ /dev/null
@@ -1,72 +0,0 @@
-Fix up missing WITHOUT_DOCS, WITHOUT_CLIENT options
-
---- client/CMakeLists.txt.orig 2015-10-15 15:43:35 UTC
-+++ client/CMakeLists.txt
-@@ -30,6 +30,7 @@ INCLUDE_DIRECTORIES(
- COPY_OPENSSL_DLLS(copy_openssl_client)
-
- ADD_DEFINITIONS(${SSL_DEFINES})
-+IF(FALSE)
- MYSQL_ADD_EXECUTABLE(mysql completion_hash.cc mysql.cc readline.cc
- ${CMAKE_SOURCE_DIR}/sql/sql_string.cc)
- TARGET_LINK_LIBRARIES(mysql mysqlclient)
-@@ -37,6 +38,7 @@ IF(UNIX)
- TARGET_LINK_LIBRARIES(mysql ${MY_READLINE_LIBRARY})
- SET_TARGET_PROPERTIES(mysql PROPERTIES ENABLE_EXPORTS TRUE)
- ENDIF(UNIX)
-+ENDIF()
-
- MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc COMPONENT Test)
- SET_SOURCE_FILES_PROPERTIES(mysqltest.cc PROPERTIES COMPILE_FLAGS "-DTHREADS")
-@@ -44,6 +46,7 @@ TARGET_LINK_LIBRARIES(mysqltest mysqlcli
- SET_TARGET_PROPERTIES(mysqltest PROPERTIES ENABLE_EXPORTS TRUE)
-
-
-+IF(FALSE)
- MYSQL_ADD_EXECUTABLE(mysqlcheck mysqlcheck.c)
- TARGET_LINK_LIBRARIES(mysqlcheck mysqlclient)
-
-@@ -53,17 +56,21 @@ TARGET_LINK_LIBRARIES(mysqldump mysqlcli
- MYSQL_ADD_EXECUTABLE(mysqlimport mysqlimport.c)
- SET_SOURCE_FILES_PROPERTIES(mysqlimport.c PROPERTIES COMPILE_FLAGS "-DTHREADS")
- TARGET_LINK_LIBRARIES(mysqlimport mysqlclient)
-+ENDIF()
-
- MYSQL_ADD_EXECUTABLE(mysql_upgrade mysql_upgrade.c COMPONENT Server)
- TARGET_LINK_LIBRARIES(mysql_upgrade mysqlclient)
- ADD_DEPENDENCIES(mysql_upgrade GenFixPrivs)
-
-+IF(FALSE)
- MYSQL_ADD_EXECUTABLE(mysqlshow mysqlshow.c)
- TARGET_LINK_LIBRARIES(mysqlshow mysqlclient)
-+ENDIF()
-
- MYSQL_ADD_EXECUTABLE(mysql_plugin mysql_plugin.c)
- TARGET_LINK_LIBRARIES(mysql_plugin mysqlclient)
-
-+IF(FALSE)
- MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc)
- TARGET_LINK_LIBRARIES(mysqlbinlog mysqlclient)
-
-@@ -73,17 +80,20 @@ TARGET_LINK_LIBRARIES(mysqladmin mysqlcl
- MYSQL_ADD_EXECUTABLE(mysqlslap mysqlslap.c)
- SET_SOURCE_FILES_PROPERTIES(mysqlslap.c PROPERTIES COMPILE_FLAGS "-DTHREADS")
- TARGET_LINK_LIBRARIES(mysqlslap mysqlclient)
-+ENDIF()
-
- # "WIN32" also covers 64 bit. "echo" is used in some files below "mysql-test/".
- IF(WIN32)
- MYSQL_ADD_EXECUTABLE(echo echo.c COMPONENT Junk)
- ENDIF(WIN32)
-
-+IF(FALSE)
- # async_example is just a code example, do not install it.
- ADD_EXECUTABLE(async_example async_example.c)
- TARGET_LINK_LIBRARIES(async_example mysqlclient)
-+ENDIF()
-
--SET_TARGET_PROPERTIES (mysqlcheck mysqldump mysqlimport mysql_upgrade mysqlshow mysqlslap mysql_plugin async_example
-+SET_TARGET_PROPERTIES (mysql_upgrade mysql_plugin
- PROPERTIES HAS_CXX TRUE)
-
- ADD_DEFINITIONS(-DHAVE_DLOPEN)
diff --git a/databases/mariadb101-server/files/patch-cmake_ssl.cmake b/databases/mariadb101-server/files/patch-cmake_ssl.cmake
deleted file mode 100644
index 5f8c1c0b6910..000000000000
--- a/databases/mariadb101-server/files/patch-cmake_ssl.cmake
+++ /dev/null
@@ -1,31 +0,0 @@
-MariaDB prefers static libraries, breaks builds with
-ports' OpenSSL libs
-
---- cmake/ssl.cmake.orig 2016-03-24 09:12:10 UTC
-+++ cmake/ssl.cmake
-@@ -145,9 +145,9 @@ MACRO (MYSQL_CHECK_SSL)
-
- # On mac this list is <.dylib;.so;.a>
- # We prefer static libraries, so we revert it here.
-- IF (WITH_SSL_PATH)
-- LIST(REVERSE CMAKE_FIND_LIBRARY_SUFFIXES)
-- ENDIF()
-+# IF (WITH_SSL_PATH)
-+# LIST(REVERSE CMAKE_FIND_LIBRARY_SUFFIXES)
-+# ENDIF()
- FIND_LIBRARY(OPENSSL_LIBRARIES
- NAMES ssl ssleay32 ssleay32MD
- HINTS ${OPENSSL_ROOT_DIR}/lib)
-@@ -156,9 +156,9 @@ MACRO (MYSQL_CHECK_SSL)
- HINTS ${OPENSSL_ROOT_DIR}/lib)
- MARK_AS_ADVANCED(CRYPTO_LIBRARY OPENSSL_LIBRARIES OPENSSL_ROOT_DIR
- OPENSSL_INCLUDE_DIR)
-- IF (WITH_SSL_PATH)
-- LIST(REVERSE CMAKE_FIND_LIBRARY_SUFFIXES)
-- ENDIF()
-+# IF (WITH_SSL_PATH)
-+# LIST(REVERSE CMAKE_FIND_LIBRARY_SUFFIXES)
-+# ENDIF()
-
- INCLUDE(CheckSymbolExists)
- SET(CMAKE_REQUIRED_INCLUDES ${OPENSSL_INCLUDE_DIR})
diff --git a/databases/mariadb101-server/files/patch-extra_CMakeLists.txt b/databases/mariadb101-server/files/patch-extra_CMakeLists.txt
deleted file mode 100644
index 997335e12623..000000000000
--- a/databases/mariadb101-server/files/patch-extra_CMakeLists.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-Fix up missing WITHOUT_DOCS, WITHOUT_CLIENT options
-
---- extra/CMakeLists.txt.orig 2015-10-15 15:43:36 UTC
-+++ extra/CMakeLists.txt
-@@ -100,6 +100,8 @@ IF(UNIX)
- MYSQL_ADD_EXECUTABLE(resolve_stack_dump resolve_stack_dump.c)
- TARGET_LINK_LIBRARIES(resolve_stack_dump mysys)
-
-+IF(FALSE)
- MYSQL_ADD_EXECUTABLE(mysql_waitpid mysql_waitpid.c COMPONENT Client)
- TARGET_LINK_LIBRARIES(mysql_waitpid mysys)
- ENDIF()
-+ENDIF()
diff --git a/databases/mariadb101-server/files/patch-include_CMakeLists.txt b/databases/mariadb101-server/files/patch-include_CMakeLists.txt
deleted file mode 100644
index 087fee6a15de..000000000000
--- a/databases/mariadb101-server/files/patch-include_CMakeLists.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-Fix up missing WITHOUT_DOCS, WITHOUT_CLIENT options
-
---- include/CMakeLists.txt.orig 2015-10-15 15:43:36 UTC
-+++ include/CMakeLists.txt
-@@ -62,17 +62,21 @@ SET(HEADERS
- handler_ername.h
- )
-
-+IF(FALSE)
- INSTALL(FILES ${HEADERS} DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development)
- FOREACH(f ${HEADERS_GEN_CONFIGURE})
- INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${f} DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development PERMISSIONS OWNER_READ GROUP_READ WORLD_READ)
- ENDFOREACH(f)
- INSTALL(DIRECTORY mysql/ DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development FILES_MATCHING PATTERN "*.h")
-+ENDIF()
-
- STRING(REPLACE "." "\\." EXCL_RE "${HEADERS};${HEADERS_GEN_CONFIGURE}")
- STRING(REPLACE ";" "|" EXCL_RE "${EXCL_RE}")
-
-+IF(FALSE)
- INSTALL(DIRECTORY . DESTINATION ${INSTALL_INCLUDEDIR}/private COMPONENT Development
- FILES_MATCHING PATTERN "*.h"
- PATTERN CMakeFiles EXCLUDE
- PATTERN mysql EXCLUDE
- REGEX "\\./(${EXCL_RE}$)" EXCLUDE)
-+ENDIF()
diff --git a/databases/mariadb101-server/files/patch-libmysql_CMakeLists.txt b/databases/mariadb101-server/files/patch-libmysql_CMakeLists.txt
deleted file mode 100644
index 32d51d33f642..000000000000
--- a/databases/mariadb101-server/files/patch-libmysql_CMakeLists.txt
+++ /dev/null
@@ -1,41 +0,0 @@
-Fix up missing WITHOUT_DOCS, WITHOUT_CLIENT options
-
---- libmysql/CMakeLists.txt.orig 2015-10-15 15:43:37 UTC
-+++ libmysql/CMakeLists.txt
-@@ -410,7 +410,7 @@ SET(LIBS clientlib dbug strings vio mysy
-
- # Merge several convenience libraries into one big mysqlclient
- # and link them together into shared library.
--MERGE_LIBRARIES(mysqlclient STATIC ${LIBS} COMPONENT Development)
-+MERGE_LIBRARIES(mysqlclient STATIC ${LIBS} COMPONENT Development NOINSTALL)
-
- # Visual Studio users need debug static library for debug projects
- IF(MSVC)
-@@ -418,6 +418,7 @@ IF(MSVC)
- INSTALL_DEBUG_TARGET(clientlib DESTINATION ${INSTALL_LIBDIR}/debug)
- ENDIF()
-
-+IF(FALSE)
- IF(UNIX)
- MACRO(GET_VERSIONED_LIBNAME LIBNAME EXTENSION VERSION OUTNAME)
- SET(DOT_VERSION ".${VERSION}")
-@@ -432,11 +433,13 @@ IF(UNIX)
- ENDMACRO()
- INSTALL_SYMLINK(${CMAKE_STATIC_LIBRARY_PREFIX}mysqlclient_r.a mysqlclient ${INSTALL_LIBDIR} Development)
- ENDIF()
-+ENDIF()
-
- IF(NOT DISABLE_SHARED)
- MERGE_LIBRARIES(libmysql SHARED ${LIBS}
- EXPORTS ${CLIENT_API_FUNCTIONS} ${CLIENT_API_5_1_EXTRA} ${CLIENT_API_5_5_EXTRA}
-- COMPONENT SharedLibraries)
-+ COMPONENT SharedLibraries NOINSTALL)
-+IF(FALSE)
- IF(UNIX)
- # libtool compatability
- IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR APPLE)
-@@ -484,3 +487,4 @@ IF(NOT DISABLE_SHARED)
- ENDFOREACH()
- ENDIF()
- ENDIF()
-+ENDIF()
diff --git a/databases/mariadb101-server/files/patch-libservices_CMakeLists.txt b/databases/mariadb101-server/files/patch-libservices_CMakeLists.txt
deleted file mode 100644
index 8148d781f343..000000000000
--- a/databases/mariadb101-server/files/patch-libservices_CMakeLists.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-Fix up missing WITHOUT_DOCS, WITHOUT_CLIENT options
-
---- libservices/CMakeLists.txt.orig 2015-10-15 15:43:37 UTC
-+++ libservices/CMakeLists.txt
-@@ -34,4 +34,6 @@ SET(MYSQLSERVICES_SOURCES
- logger_service.c)
-
- ADD_CONVENIENCE_LIBRARY(mysqlservices ${MYSQLSERVICES_SOURCES})
-+IF(FALSE)
- INSTALL(TARGETS mysqlservices DESTINATION ${INSTALL_LIBDIR} COMPONENT Development)
-+ENDIF()
diff --git a/databases/mariadb101-server/files/patch-man_CMakeLists.txt b/databases/mariadb101-server/files/patch-man_CMakeLists.txt
deleted file mode 100644
index df8956925052..000000000000
--- a/databases/mariadb101-server/files/patch-man_CMakeLists.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-Fix up missing WITHOUT_DOCS, WITHOUT_CLIENT options
-
---- man/CMakeLists.txt.orig 2015-10-15 15:43:37 UTC
-+++ man/CMakeLists.txt
-@@ -34,7 +34,8 @@ SET(MAN1_TEST mysql-stress-test.pl.1 mys
-
- INSTALL(FILES ${MAN1_SERVER} DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT ManPagesServer)
- INSTALL(FILES ${MAN8_SERVER} DESTINATION ${INSTALL_MANDIR}/man8 COMPONENT ManPagesServer)
-+IF(FALSE)
- INSTALL(FILES ${MAN1_CLIENT} DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT ManPagesClient)
- INSTALL(FILES ${MAN1_DEVEL} DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT ManPagesDevelopment)
- INSTALL(FILES ${MAN1_TEST} DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT ManPagesTest)
--
-+ENDIF()
diff --git a/databases/mariadb101-server/files/patch-mysys__ssl_my__crypt.cc b/databases/mariadb101-server/files/patch-mysys__ssl_my__crypt.cc
deleted file mode 100644
index 22ec55843e00..000000000000
--- a/databases/mariadb101-server/files/patch-mysys__ssl_my__crypt.cc
+++ /dev/null
@@ -1,20 +0,0 @@
---- mysys_ssl/my_crypt.cc.orig 2018-02-04 02:30:31 UTC
-+++ mysys_ssl/my_crypt.cc
-@@ -27,6 +27,7 @@
- #include <openssl/aes.h>
- #include <openssl/err.h>
- #include <openssl/rand.h>
-+#include <openssl/opensslv.h>
-
- #ifdef HAVE_ERR_remove_thread_state
- #define ERR_remove_state(X) ERR_remove_thread_state(NULL)
-@@ -295,6 +296,9 @@ unsigned int my_aes_ctx_size(enum my_aes
-
- int my_random_bytes(uchar *buf, int num)
- {
-+#ifdef LIBRESSL_VERSION_NUMBER
-+ arc4random_buf(buf, num);
-+#endif
- if (RAND_bytes(buf, num) != 1)
- return MY_AES_OPENSSL_ERROR;
- return MY_AES_OK;
diff --git a/databases/mariadb101-server/files/patch-mysys_my__default.c b/databases/mariadb101-server/files/patch-mysys_my__default.c
deleted file mode 100644
index eb3fb51932c2..000000000000
--- a/databases/mariadb101-server/files/patch-mysys_my__default.c
+++ /dev/null
@@ -1,60 +0,0 @@
---- mysys/my_default.c.orig 2017-01-17 19:38:25 UTC
-+++ mysys/my_default.c
-@@ -785,7 +785,7 @@ static int search_default_file_with_ext(
- {
- MY_STAT stat_info;
- if (!my_stat(name,&stat_info,MYF(0)))
-- return 1;
-+ return 0;
- /*
- Ignore world-writable regular files.
- This is mainly done to protect us to not read a file created by
-@@ -803,6 +803,22 @@ static int search_default_file_with_ext(
- if (!(fp= mysql_file_fopen(key_file_cnf, name, O_RDONLY, MYF(0))))
- return 1; /* Ignore wrong files */
-
-+ if (strstr(name, "/etc") == name)
-+ {
-+ fprintf(stderr,
-+ "error: Config file %s in invalid location, please move to or merge with /usr/local%s\n",
-+ name,name);
-+ goto err;
-+ }
-+
-+ if (strstr(name, "/etc") == name)
-+ {
-+ fprintf(stderr,
-+ "error: Config file %s in invalid location, please move to or merge with /usr/local%s\n",
-+ name,name);
-+ goto err;
-+ }
-+
- while (mysql_file_fgets(buff, sizeof(buff) - 1, fp))
- {
- line++;
-@@ -1067,7 +1083,8 @@ void my_print_default_files(const char *
- if (name[0] == FN_HOMELIB) /* Add . to filenames in home */
- *end++= '.';
- strxmov(end, conf_file, *ext, " ", NullS);
-- fputs(name, stdout);
-+ if (strstr(name, "/etc") != name)
-+ fputs(name, stdout);
- }
- }
- }
-@@ -1228,13 +1245,10 @@ static const char **init_default_directo
-
- #else
-
--#if defined(DEFAULT_SYSCONFDIR)
-- if (DEFAULT_SYSCONFDIR[0])
-- errors += add_directory(alloc, DEFAULT_SYSCONFDIR, dirs);
--#else
- errors += add_directory(alloc, "/etc/", dirs);
- errors += add_directory(alloc, "/etc/mysql/", dirs);
--#endif /* DEFAULT_SYSCONFDIR */
-+ errors += add_directory(alloc, "/usr/local/etc/", dirs);
-+ errors += add_directory(alloc, "/usr/local/etc/mysql/", dirs);
-
- #endif
-
diff --git a/databases/mariadb101-server/files/patch-oqgraph-MDEV-15291 b/databases/mariadb101-server/files/patch-oqgraph-MDEV-15291
deleted file mode 100644
index 05083cd206ac..000000000000
--- a/databases/mariadb101-server/files/patch-oqgraph-MDEV-15291
+++ /dev/null
@@ -1,40 +0,0 @@
---- storage/oqgraph/oqgraph_judy.cc.orig 2018-02-12 15:01:28 UTC
-+++ storage/oqgraph/oqgraph_judy.cc
-@@ -27,7 +27,7 @@
- /*
- Currently the only active code that can return error is:
- judy_bitset::reset()/J1U()
-- judy_bitset::setbit()/J1S()
-+ judy_bitset::jsetbit()/J1S()
-
- In most cases errors are either about wrong parameters passed to Judy
- functions or internal structures corruption. These definitely deserve
-@@ -60,7 +60,7 @@ bool open_query::judy_bitset::test(size_
- return rc == 1;
- }
-
--open_query::judy_bitset& open_query::judy_bitset::setbit(size_type n)
-+open_query::judy_bitset& open_query::judy_bitset::jsetbit(size_type n)
- {
- int rc;
- J1S(rc, array, n);
---- storage/oqgraph/oqgraph_judy.h.orig 2018-02-12 15:01:28 UTC
-+++ storage/oqgraph/oqgraph_judy.h
-@@ -63,7 +63,7 @@ namespace open_query
- if (!val)
- return reset(n);
- else
-- return setbit(n);
-+ return jsetbit(n);
- }
-
- judy_bitset& set(const judy_bitset& src);
-@@ -115,7 +115,7 @@ namespace open_query
- private:
- mutable void* array;
-
-- judy_bitset& setbit(size_type n);
-+ judy_bitset& jsetbit(size_type n);
- };
- }
-
diff --git a/databases/mariadb101-server/files/patch-pcre_CMakeLists.txt b/databases/mariadb101-server/files/patch-pcre_CMakeLists.txt
deleted file mode 100644
index 9aececfcf846..000000000000
--- a/databases/mariadb101-server/files/patch-pcre_CMakeLists.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-Fix up missing WITHOUT_DOCS, WITHOUT_CLIENT options
-
---- pcre/CMakeLists.txt.orig 2016-03-24 09:12:11 UTC
-+++ pcre/CMakeLists.txt
-@@ -508,6 +508,8 @@ IF(PCRE_SHOW_REPORT)
- MESSAGE(STATUS "")
- ENDIF(PCRE_SHOW_REPORT)
-
-+IF(FALSE)
- INSTALL(FILES ${CMAKE_BINARY_DIR}/pcre/pcre.h DESTINATION ${INSTALL_INCLUDEDIR}/private COMPONENT Development)
-+ENDIF()
-
- # end CMakeLists.txt
diff --git a/databases/mariadb101-server/files/patch-scripts_mysql__config.sh b/databases/mariadb101-server/files/patch-scripts_mysql__config.sh
deleted file mode 100644
index 6ce75cd52079..000000000000
--- a/databases/mariadb101-server/files/patch-scripts_mysql__config.sh
+++ /dev/null
@@ -1,12 +0,0 @@
---- scripts/mysql_config.sh.orig 2016-01-14 20:12:38 UTC
-+++ scripts/mysql_config.sh
-@@ -106,7 +106,9 @@ fi
-
- # Create options
- libs="-L$pkglibdir @RPATH_OPTION@ @LIBS_FOR_CLIENTS@"
-+libs="$libs -L%%LOCALBASE%%/lib "
- embedded_libs="-L$pkglibdir @RPATH_OPTION@ @EMB_LIBS_FOR_CLIENTS@"
-+embedded_libs="$embedded_libs -L%%LOCALBASE%%/lib "
-
- include="-I$pkgincludedir"
- if [ "$basedir" != "/usr" ]; then
diff --git a/databases/mariadb101-server/files/patch-scripts_mysqld__safe.sh b/databases/mariadb101-server/files/patch-scripts_mysqld__safe.sh
deleted file mode 100644
index 9645049c8987..000000000000
--- a/databases/mariadb101-server/files/patch-scripts_mysqld__safe.sh
+++ /dev/null
@@ -1,24 +0,0 @@
---- scripts/mysqld_safe.sh.orig 2017-01-18 20:11:42 UTC
-+++ scripts/mysqld_safe.sh
-@@ -581,10 +581,10 @@ fi
-
- if test -z "$MYSQL_HOME"
- then
-- if test -r "$MY_BASEDIR_VERSION/my.cnf" && test -r "$DATADIR/my.cnf"
-+ if test -r "$MY_BASEDIR_VERSION/etc/my.cnf" && test -r "$DATADIR/my.cnf"
- then
- log_error "WARNING: Found two instances of my.cnf -
--$MY_BASEDIR_VERSION/my.cnf and
-+$MY_BASEDIR_VERSION/etc/my.cnf and
- $DATADIR/my.cnf
- IGNORING $DATADIR/my.cnf"
-
-@@ -593,7 +593,7 @@ IGNORING $DATADIR/my.cnf"
- then
- log_error "WARNING: Found $DATADIR/my.cnf
- The data directory is a deprecated location for my.cnf, please move it to
--$MY_BASEDIR_VERSION/my.cnf"
-+$MY_BASEDIR_VERSION/etc/my.cnf"
- unsafe_my_cnf=1
- MYSQL_HOME=$DATADIR
- else
diff --git a/databases/mariadb101-server/files/patch-scripts_wsrep__sst__mariabackup.sh b/databases/mariadb101-server/files/patch-scripts_wsrep__sst__mariabackup.sh
deleted file mode 100644
index 2b81b4eca7b8..000000000000
--- a/databases/mariadb101-server/files/patch-scripts_wsrep__sst__mariabackup.sh
+++ /dev/null
@@ -1,11 +0,0 @@
---- scripts/wsrep_sst_mariabackup.sh.orig 2019-12-11 19:29:57 UTC
-+++ scripts/wsrep_sst_mariabackup.sh
-@@ -605,7 +605,7 @@ recv_joiner()
- set +e
-
- if [[ $tmt -gt 0 ]] && command -v timeout >/dev/null;then
-- if timeout --help | grep -q -- '-k';then
-+ if timeout --help 2>&1 | grep -q -- '-k';then
- ltcmd="timeout -k $(( tmt+10 )) $tmt $tcmd"
- else
- ltcmd="timeout -s9 $tmt $tcmd"
diff --git a/databases/mariadb101-server/files/patch-sql_CMakeLists.txt b/databases/mariadb101-server/files/patch-sql_CMakeLists.txt
deleted file mode 100644
index 168d4df691a6..000000000000
--- a/databases/mariadb101-server/files/patch-sql_CMakeLists.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-Fix up missing WITHOUT_DOCS, WITHOUT_CLIENT options
-
---- sql/CMakeLists.txt.orig 2015-10-15 15:43:45 UTC
-+++ sql/CMakeLists.txt
-@@ -340,6 +340,7 @@ ADD_CUSTOM_TARGET(distclean
- VERBATIM
- )
-
-+IF(FALSE)
- IF(INSTALL_LAYOUT STREQUAL "STANDALONE")
-
- # Copy db.opt into data/test/
-@@ -383,6 +384,7 @@ ELSE()
- INSTALL(FILES ${DUMMY_FILE} DESTINATION data/mysql COMPONENT DataFiles)
- ENDIF(WIN32 AND MYSQLD_EXECUTABLE)
- ENDIF(INSTALL_LAYOUT STREQUAL "STANDALONE")
-+ENDIF()
-
- IF(WIN32)
- SET(my_bootstrap_sql ${CMAKE_CURRENT_BINARY_DIR}/my_bootstrap.sql)
-@@ -425,7 +427,9 @@ IF(WIN32)
- TARGET_LINK_LIBRARIES(mysql_upgrade_service mysys winservice)
- ENDIF(WIN32)
-
-+IF(FALSE)
- INSTALL(DIRECTORY . DESTINATION ${INSTALL_INCLUDEDIR}/private COMPONENT Development
- FILES_MATCHING PATTERN "*.h"
- PATTERN share EXCLUDE
- PATTERN CMakeFiles EXCLUDE)
-+ENDIF()
diff --git a/databases/mariadb101-server/files/patch-sql_sql__trigger.cc b/databases/mariadb101-server/files/patch-sql_sql__trigger.cc
deleted file mode 100644
index 73958281577a..000000000000
--- a/databases/mariadb101-server/files/patch-sql_sql__trigger.cc
+++ /dev/null
@@ -1,52 +0,0 @@
-Fix clang build error
-
---- sql/sql_trigger.cc.orig 2015-10-15 15:43:47 UTC
-+++ sql/sql_trigger.cc
-@@ -192,32 +192,32 @@ static File_option triggers_file_paramet
- {
- {
- { C_STRING_WITH_LEN("triggers") },
-- my_offsetof(class Table_triggers_list, definitions_list),
-+ static_cast<int>(my_offsetof(class Table_triggers_list, definitions_list)),
- FILE_OPTIONS_STRLIST
- },
- {
- { C_STRING_WITH_LEN("sql_modes") },
-- my_offsetof(class Table_triggers_list, definition_modes_list),
-+ static_cast<int>(my_offsetof(class Table_triggers_list, definition_modes_list)),
- FILE_OPTIONS_ULLLIST
- },
- {
- { C_STRING_WITH_LEN("definers") },
-- my_offsetof(class Table_triggers_list, definers_list),
-+ static_cast<int>(my_offsetof(class Table_triggers_list, definers_list)),
- FILE_OPTIONS_STRLIST
- },
- {
- { C_STRING_WITH_LEN("client_cs_names") },
-- my_offsetof(class Table_triggers_list, client_cs_names),
-+ static_cast<int>(my_offsetof(class Table_triggers_list, client_cs_names)),
- FILE_OPTIONS_STRLIST
- },
- {
- { C_STRING_WITH_LEN("connection_cl_names") },
-- my_offsetof(class Table_triggers_list, connection_cl_names),
-+ static_cast<int>(my_offsetof(class Table_triggers_list, connection_cl_names)),
- FILE_OPTIONS_STRLIST
- },
- {
- { C_STRING_WITH_LEN("db_cl_names") },
-- my_offsetof(class Table_triggers_list, db_cl_names),
-+ static_cast<int>(my_offsetof(class Table_triggers_list, db_cl_names)),
- FILE_OPTIONS_STRLIST
- },
- { { 0, 0 }, 0, FILE_OPTIONS_STRING }
-@@ -226,7 +226,7 @@ static File_option triggers_file_paramet
- File_option sql_modes_parameters=
- {
- { C_STRING_WITH_LEN("sql_modes") },
-- my_offsetof(class Table_triggers_list, definition_modes_list),
-+ static_cast<int>(my_offsetof(class Table_triggers_list, definition_modes_list)),
- FILE_OPTIONS_ULLLIST
- };
-
diff --git a/databases/mariadb101-server/files/patch-sql_sql__view.cc b/databases/mariadb101-server/files/patch-sql_sql__view.cc
deleted file mode 100644
index 41045967418c..000000000000
--- a/databases/mariadb101-server/files/patch-sql_sql__view.cc
+++ /dev/null
@@ -1,65 +0,0 @@
-Fix clang build error
-
---- sql/sql_view.cc.orig 2015-10-15 15:43:47 UTC
-+++ sql/sql_view.cc
-@@ -720,46 +720,46 @@ static const int required_view_parameter
- */
- static File_option view_parameters[]=
- {{{ C_STRING_WITH_LEN("query")},
-- my_offsetof(TABLE_LIST, select_stmt),
-+ static_cast<int>(my_offsetof(TABLE_LIST, select_stmt)),
- FILE_OPTIONS_ESTRING},
- {{ C_STRING_WITH_LEN("md5")},
-- my_offsetof(TABLE_LIST, md5),
-+ static_cast<int>(my_offsetof(TABLE_LIST, md5)),
- FILE_OPTIONS_STRING},
- {{ C_STRING_WITH_LEN("updatable")},
-- my_offsetof(TABLE_LIST, updatable_view),
-+ static_cast<int>(my_offsetof(TABLE_LIST, updatable_view)),
- FILE_OPTIONS_ULONGLONG},
- {{ C_STRING_WITH_LEN("algorithm")},
-- my_offsetof(TABLE_LIST, algorithm),
-+ static_cast<int>(my_offsetof(TABLE_LIST, algorithm)),
- FILE_OPTIONS_VIEW_ALGO},
- {{ C_STRING_WITH_LEN("definer_user")},
-- my_offsetof(TABLE_LIST, definer.user),
-+ static_cast<int>(my_offsetof(TABLE_LIST, definer.user)),
- FILE_OPTIONS_STRING},
- {{ C_STRING_WITH_LEN("definer_host")},
-- my_offsetof(TABLE_LIST, definer.host),
-+ static_cast<int>(my_offsetof(TABLE_LIST, definer.host)),
- FILE_OPTIONS_STRING},
- {{ C_STRING_WITH_LEN("suid")},
-- my_offsetof(TABLE_LIST, view_suid),
-+ static_cast<int>(my_offsetof(TABLE_LIST, view_suid)),
- FILE_OPTIONS_ULONGLONG},
- {{ C_STRING_WITH_LEN("with_check_option")},
-- my_offsetof(TABLE_LIST, with_check),
-+ static_cast<int>(my_offsetof(TABLE_LIST, with_check)),
- FILE_OPTIONS_ULONGLONG},
- {{ C_STRING_WITH_LEN("timestamp")},
-- my_offsetof(TABLE_LIST, timestamp),
-+ static_cast<int>(my_offsetof(TABLE_LIST, timestamp)),
- FILE_OPTIONS_TIMESTAMP},
- {{ C_STRING_WITH_LEN("create-version")},
-- my_offsetof(TABLE_LIST, file_version),
-+ static_cast<int>(my_offsetof(TABLE_LIST, file_version)),
- FILE_OPTIONS_ULONGLONG},
- {{ C_STRING_WITH_LEN("source")},
-- my_offsetof(TABLE_LIST, source),
-+ static_cast<int>(my_offsetof(TABLE_LIST, source)),
- FILE_OPTIONS_ESTRING},
- {{(char*) STRING_WITH_LEN("client_cs_name")},
-- my_offsetof(TABLE_LIST, view_client_cs_name),
-+ static_cast<int>(my_offsetof(TABLE_LIST, view_client_cs_name)),
- FILE_OPTIONS_STRING},
- {{(char*) STRING_WITH_LEN("connection_cl_name")},
-- my_offsetof(TABLE_LIST, view_connection_cl_name),
-+ static_cast<int>(my_offsetof(TABLE_LIST, view_connection_cl_name)),
- FILE_OPTIONS_STRING},
- {{(char*) STRING_WITH_LEN("view_body_utf8")},
-- my_offsetof(TABLE_LIST, view_body_utf8),
-+ static_cast<int>(my_offsetof(TABLE_LIST, view_body_utf8)),
- FILE_OPTIONS_ESTRING},
- {{ C_STRING_WITH_LEN("mariadb-version")},
- my_offsetof(TABLE_LIST, mariadb_version),
diff --git a/databases/mariadb101-server/files/patch-sql_sys__vars.cc b/databases/mariadb101-server/files/patch-sql_sys__vars.cc
deleted file mode 100644
index f34ba95f612e..000000000000
--- a/databases/mariadb101-server/files/patch-sql_sys__vars.cc
+++ /dev/null
@@ -1,40 +0,0 @@
-Fix clang build error
-
---- sql/sys_vars.cc.orig 2016-03-24 09:12:12 UTC
-+++ sql/sys_vars.cc
-@@ -1052,7 +1052,7 @@ static Sys_var_ulong Sys_interactive_tim
- "connection before closing it",
- NO_SET_STMT SESSION_VAR(net_interactive_timeout),
- CMD_LINE(REQUIRED_ARG),
-- VALID_RANGE(1, LONG_TIMEOUT), DEFAULT(NET_WAIT_TIMEOUT), BLOCK_SIZE(1));
-+ VALID_RANGE(1, INT_MAX32/1000), DEFAULT(NET_WAIT_TIMEOUT), BLOCK_SIZE(1));
-
- static Sys_var_ulonglong Sys_join_buffer_size(
- "join_buffer_size",
-@@ -2239,7 +2239,7 @@ static Sys_var_ulong Sys_net_read_timeou
- "Number of seconds to wait for more data from a connection before "
- "aborting the read",
- SESSION_VAR(net_read_timeout), CMD_LINE(REQUIRED_ARG),
-- VALID_RANGE(1, LONG_TIMEOUT), DEFAULT(NET_READ_TIMEOUT), BLOCK_SIZE(1),
-+ VALID_RANGE(1, INT_MAX32/1000), DEFAULT(NET_READ_TIMEOUT), BLOCK_SIZE(1),
- NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0),
- ON_UPDATE(fix_net_read_timeout));
-
-@@ -2254,7 +2254,7 @@ static Sys_var_ulong Sys_net_write_timeo
- "Number of seconds to wait for a block to be written to a connection "
- "before aborting the write",
- SESSION_VAR(net_write_timeout), CMD_LINE(REQUIRED_ARG),
-- VALID_RANGE(1, LONG_TIMEOUT), DEFAULT(NET_WRITE_TIMEOUT), BLOCK_SIZE(1),
-+ VALID_RANGE(1, INT_MAX32/1000), DEFAULT(NET_WRITE_TIMEOUT), BLOCK_SIZE(1),
- NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0),
- ON_UPDATE(fix_net_write_timeout));
-
-@@ -3449,7 +3449,7 @@ static Sys_var_ulong Sys_net_wait_timeou
- "The number of seconds the server waits for activity on a "
- "connection before closing it",
- NO_SET_STMT SESSION_VAR(net_wait_timeout), CMD_LINE(REQUIRED_ARG),
-- VALID_RANGE(1, IF_WIN(INT_MAX32/1000, LONG_TIMEOUT)),
-+ VALID_RANGE(1, INT_MAX32/1000),
- DEFAULT(NET_WAIT_TIMEOUT), BLOCK_SIZE(1));
-
- static Sys_var_plugin Sys_default_storage_engine(
diff --git a/databases/mariadb101-server/files/patch-storage_mroonga_CMakeLists.txt b/databases/mariadb101-server/files/patch-storage_mroonga_CMakeLists.txt
deleted file mode 100644
index 3a9984980272..000000000000
--- a/databases/mariadb101-server/files/patch-storage_mroonga_CMakeLists.txt
+++ /dev/null
@@ -1,11 +0,0 @@
---- storage/mroonga/CMakeLists.txt.orig 2019-11-06 16:01:58 UTC
-+++ storage/mroonga/CMakeLists.txt
-@@ -80,7 +80,7 @@ else()
- set(MRN_SOURCE_DIR ${CMAKE_SOURCE_DIR})
- endif()
-
--file(READ ${MRN_SOURCE_DIR}/version MRN_VERSION)
-+file(READ ${MRN_SOURCE_DIR}/version_txt MRN_VERSION)
- file(READ ${MRN_SOURCE_DIR}/version_major MRN_VERSION_MAJOR)
- file(READ ${MRN_SOURCE_DIR}/version_minor MRN_VERSION_MINOR)
- file(READ ${MRN_SOURCE_DIR}/version_micro MRN_VERSION_MICRO)
diff --git a/databases/mariadb101-server/files/patch-storage_mroonga_vendor_groonga_CMakeLists.txt b/databases/mariadb101-server/files/patch-storage_mroonga_vendor_groonga_CMakeLists.txt
deleted file mode 100644
index 77a61fcc4197..000000000000
--- a/databases/mariadb101-server/files/patch-storage_mroonga_vendor_groonga_CMakeLists.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-From https://github.com/openquery/mariadb-server/commit/43bf72e45b9ead6aa0dc4abd6e5719c6381974b5
-
---- storage/mroonga/vendor/groonga/CMakeLists.txt.orig 2015-10-15 15:43:50 UTC
-+++ storage/mroonga/vendor/groonga/CMakeLists.txt
-@@ -167,6 +167,10 @@ if(CMAKE_COMPILER_IS_GNUCXX)
- MY_CHECK_AND_SET_COMPILER_FLAG("-Wno-clobbered")
- endif()
-
-+if(CMAKE_COMPILER_IS_CLANGCXX)
-+ MY_CHECK_AND_SET_COMPILER_FLAG("-fexceptions")
-+endif()
-+
- if(NOT DEFINED CMAKE_C_COMPILE_OPTIONS_PIC)
- # For old CMake
- if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_COMPILER_IS_CLANGCXX)
diff --git a/databases/mariadb101-server/files/patch-storage_tokudb_CMakeLists.txt b/databases/mariadb101-server/files/patch-storage_tokudb_CMakeLists.txt
deleted file mode 100644
index 5cf61d87a4f8..000000000000
--- a/databases/mariadb101-server/files/patch-storage_tokudb_CMakeLists.txt
+++ /dev/null
@@ -1,12 +0,0 @@
---- storage/tokudb/CMakeLists.txt.orig 2016-03-26 16:20:50 UTC
-+++ storage/tokudb/CMakeLists.txt
-@@ -103,9 +103,6 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINA
- TARGET_LINK_LIBRARIES(tokudb tokufractaltree_static tokuportability_static
- ${ZLIB_LIBRARY} stdc++)
-
--SET(CMAKE_MODULE_LINKER_FLAGS_RELEASE "${CMAKE_MODULE_LINKER_FLAGS_RELEASE} -flto -fuse-linker-plugin")
--SET(CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO "${CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO} -flto -fuse-linker-plugin")
--
- SET(CPACK_RPM_server_PACKAGE_OBSOLETES
- "${CPACK_RPM_server_PACKAGE_OBSOLETES} MariaDB-tokudb-engine < 10.0.5" PARENT_SCOPE)
-
diff --git a/databases/mariadb101-server/files/patch-storage_tokudb_PerconaFT_CMakeLists.txt b/databases/mariadb101-server/files/patch-storage_tokudb_PerconaFT_CMakeLists.txt
deleted file mode 100644
index 02a4b3a48684..000000000000
--- a/databases/mariadb101-server/files/patch-storage_tokudb_PerconaFT_CMakeLists.txt
+++ /dev/null
@@ -1,11 +0,0 @@
---- storage/tokudb/PerconaFT/CMakeLists.txt.orig 2016-03-26 18:18:05 UTC
-+++ storage/tokudb/PerconaFT/CMakeLists.txt
-@@ -77,7 +77,7 @@ add_subdirectory(src)
- add_subdirectory(ftcxx)
- add_subdirectory(tools)
-
--INSTALL_DOCUMENTATION(README.md COPYING.AGPLv3 COPYING.GPLv2 PATENTS
-+INSTALL_DOCUMENTATION(README.md
- COMPONENT Server)
-
- ## build tags
diff --git a/databases/mariadb101-server/files/patch-storage_tokudb_PerconaFT_cmake__modules_TokuThirdParty.cmake b/databases/mariadb101-server/files/patch-storage_tokudb_PerconaFT_cmake__modules_TokuThirdParty.cmake
deleted file mode 100644
index 8bb8392de6c8..000000000000
--- a/databases/mariadb101-server/files/patch-storage_tokudb_PerconaFT_cmake__modules_TokuThirdParty.cmake
+++ /dev/null
@@ -1,36 +0,0 @@
---- storage/tokudb/PerconaFT/cmake_modules/TokuThirdParty.cmake.orig 2019-11-06 06:20:37 UTC
-+++ storage/tokudb/PerconaFT/cmake_modules/TokuThirdParty.cmake
-@@ -1,5 +1,12 @@
- include(ExternalProject)
-
-+IF (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
-+ include_directories("/usr/include")
-+
-+ add_library(lzma SHARED IMPORTED)
-+ set_target_properties(lzma PROPERTIES IMPORTED_LOCATION
-+ "/usr/lib/liblzma.so")
-+ELSE()
- ## add lzma with an external project
- set(xz_configure_opts --with-pic --enable-static)
- if (APPLE)
-@@ -71,8 +78,15 @@ add_library(lzma STATIC IMPORTED)
- set_target_properties(lzma PROPERTIES IMPORTED_LOCATION
- "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/xz/lib/liblzma.a")
- add_dependencies(lzma build_lzma)
-+ENDIF()
-
-+IF (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
-+ include_directories("/usr/local/include")
-
-+ add_library(snappy SHARED IMPORTED)
-+ set_target_properties(snappy PROPERTIES IMPORTED_LOCATION
-+ "/usr/local/lib/libsnappy.so")
-+ELSE()
- ## add snappy with an external project
- set(SNAPPY_SOURCE_DIR "${TokuDB_SOURCE_DIR}/third_party/snappy-1.1.2" CACHE FILEPATH "Where to find sources for snappy.")
- if (NOT EXISTS "${SNAPPY_SOURCE_DIR}/CMakeLists.txt")
-@@ -109,3 +123,4 @@ add_library(snappy STATIC IMPORTED)
- set_target_properties(snappy PROPERTIES IMPORTED_LOCATION
- "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/snappy/lib/libsnappy.a")
- add_dependencies(snappy build_snappy)
-+ENDIF()
diff --git a/databases/mariadb101-server/files/patch-storage_tokudb_PerconaFT_portability_memory.cc b/databases/mariadb101-server/files/patch-storage_tokudb_PerconaFT_portability_memory.cc
deleted file mode 100644
index 505eaa61928c..000000000000
--- a/databases/mariadb101-server/files/patch-storage_tokudb_PerconaFT_portability_memory.cc
+++ /dev/null
@@ -1,16 +0,0 @@
-Fix build error
-
---- storage/tokudb/PerconaFT/portability/memory.cc.orig 2015-10-15 15:43:52 UTC
-+++ storage/tokudb/PerconaFT/portability/memory.cc
-@@ -94,11 +94,6 @@ PATENT RIGHTS GRANT:
- #include <string.h>
- #include <stdio.h>
- #include <stdlib.h>
--#if defined(HAVE_MALLOC_H)
--# include <malloc.h>
--#elif defined(HAVE_SYS_MALLOC_H)
--# include <sys/malloc.h>
--#endif
- #include <dlfcn.h>
- #include <toku_race_tools.h>
- #include "memory.h"
diff --git a/databases/mariadb101-server/files/patch-support-files_CMakeLists.txt b/databases/mariadb101-server/files/patch-support-files_CMakeLists.txt
deleted file mode 100644
index e97065fbfe4e..000000000000
--- a/databases/mariadb101-server/files/patch-support-files_CMakeLists.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-Fix up missing WITHOUT_DOCS, WITHOUT_CLIENT options
-
---- support-files/CMakeLists.txt.orig 2016-03-24 09:12:15 UTC
-+++ support-files/CMakeLists.txt
-@@ -64,7 +64,9 @@ IF(UNIX)
- CONFIGURE_FILE(mariadb.pc.in ${CMAKE_CURRENT_BINARY_DIR}/mariadb.pc @ONLY)
- INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/mariadb.pc DESTINATION ${INSTALL_SHAREDIR}/pkgconfig COMPONENT Development)
-
-+IF(FALSE)
- INSTALL(FILES mysql.m4 DESTINATION ${INSTALL_SHAREDIR}/aclocal COMPONENT Development)
-+ENDIF()
-
- SET(bindir ${INSTALL_BINDIRABS})
- SET(sbindir ${INSTALL_SBINDIRABS})
diff --git a/databases/mariadb101-server/files/pkg-message.in b/databases/mariadb101-server/files/pkg-message.in
deleted file mode 100644
index b9f6fea20baf..000000000000
--- a/databases/mariadb101-server/files/pkg-message.in
+++ /dev/null
@@ -1,17 +0,0 @@
-[
-{ type: install
- message: <<EOM
-Remember to run mysql_upgrade (with the optional --datadir=<dbdir> flag)
-the first time you start the MySQL server after an upgrade from an
-earlier version.
-
-MariaDB respects hier(7) and doesn't check /etc and /etc/mysql for
-my.cnf. Please move existing my.cnf files from those paths to
-%%PREFIX%%/etc and %%PREFIX%%/etc/mysql.
-
-This port does NOT include the mytop perl script, this is included in
-the MariaDB tarball but the most recent version can be found in the
-databases/mytop port
-EOM
-}
-]
diff --git a/databases/mariadb101-server/pkg-descr b/databases/mariadb101-server/pkg-descr
deleted file mode 100644
index 874d96eeaa95..000000000000
--- a/databases/mariadb101-server/pkg-descr
+++ /dev/null
@@ -1,14 +0,0 @@
-MariaDB is a database server that offers drop-in replacement functionality
-for MySQL. MariaDB is built by some of the original authors of MySQL, with
-assistance from the broader community of Free and open source software
-developers. In addition to the core functionality of MySQL, MariaDB offers
-a rich set of feature enhancements including alternate storage engines,
-server optimizations, and patches.
-
-MariaDB is primarily driven by developers at Monty Program, a company
-founded by Michael "Monty" Widenius, the original author of MySQL, but
-this is not the whole story about MariaDB. On the "About MariaDB" page you
-will find more information about all participants in the MariaDB community,
-including storage engines XtraDB and PBXT.
-
-WWW: https://mariadb.org/
diff --git a/databases/mariadb101-server/pkg-plist b/databases/mariadb101-server/pkg-plist
deleted file mode 100644
index 458fc2d1c68b..000000000000
--- a/databases/mariadb101-server/pkg-plist
+++ /dev/null
@@ -1,271 +0,0 @@
-bin/aria_chk
-bin/aria_dump_log
-bin/aria_ftdump
-bin/aria_pack
-bin/aria_read_log
-bin/innochecksum
-bin/mariabackup
-bin/mbstream
-bin/my_print_defaults
-bin/myisam_ftdump
-bin/myisamchk
-bin/myisamlog
-bin/myisampack
-bin/mysql_client_test_embedded
-bin/mysql_convert_table_format
-bin/mysql_embedded
-bin/mysql_fix_extensions
-bin/mysql_install_db
-bin/mysql_plugin
-bin/mysql_secure_installation
-bin/mysql_setpermission
-bin/mysql_tzinfo_to_sql
-bin/mysql_upgrade
-bin/mysql_zap
-bin/mysqlbug
-bin/mysqld_multi
-bin/mysqld_safe
-bin/mysqld_safe_helper
-bin/mysqldumpslow
-bin/mysqlhotcopy
-bin/mysqltest
-bin/mysqltest_embedded
-@comment bin/mytop
-bin/perror
-bin/replace
-bin/resolve_stack_dump
-bin/resolveip
-%%TOKUDB%%bin/tokuft_logprint
-%%TOKUDB%%bin/tokuftdump
-bin/wsrep_sst_common
-bin/wsrep_sst_mariabackup
-bin/wsrep_sst_mysqldump
-bin/wsrep_sst_rsync
-bin/wsrep_sst_rsync_wan
-bin/wsrep_sst_xtrabackup
-bin/wsrep_sst_xtrabackup-v2
-include/mysql/private/atomic/gcc_builtins.h
-include/mysql/private/atomic/generic-msvc.h
-include/mysql/private/atomic/nolock.h
-include/mysql/private/atomic/solaris.h
-include/mysql/private/atomic/x86-gcc.h
-include/mysql/private/config.h
-include/mysql/private/ft_global.h
-include/mysql/private/embedded_priv.h
-include/mysql/private/hash.h
-include/mysql/private/heap.h
-include/mysql/private/lf.h
-include/mysql/private/maria.h
-include/mysql/private/my_alarm.h
-include/mysql/private/my_atomic.h
-include/mysql/private/my_base.h
-include/mysql/private/my_bit.h
-include/mysql/private/my_bitmap.h
-include/mysql/private/my_check_opt.h
-include/mysql/private/my_compare.h
-include/mysql/private/my_context.h
-include/mysql/private/my_cpu.h
-include/mysql/private/my_crypt.h
-include/mysql/private/my_default.h
-include/mysql/private/my_handler_errors.h
-include/mysql/private/my_libwrap.h
-include/mysql/private/my_md5.h
-include/mysql/private/my_nosys.h
-include/mysql/private/my_rdtsc.h
-include/mysql/private/my_rnd.h
-include/mysql/private/my_service_manager.h
-include/mysql/private/my_stacktrace.h
-include/mysql/private/my_time.h
-include/mysql/private/my_tree.h
-include/mysql/private/my_uctype.h
-include/mysql/private/my_user.h
-include/mysql/private/myisam.h
-include/mysql/private/myisamchk.h
-include/mysql/private/myisammrg.h
-include/mysql/private/myisampack.h
-include/mysql/private/mysql_async.h
-include/mysql/private/mysqld_default_groups.h
-include/mysql/private/mysys_err.h
-include/mysql/private/password.h
-include/mysql/private/probes_mysql.h
-include/mysql/private/probes_mysql_nodtrace.h
-include/mysql/private/queues.h
-include/mysql/private/rijndael.h
-include/mysql/private/service_versions.h
-include/mysql/private/t_ctype.h
-include/mysql/private/thr_alarm.h
-include/mysql/private/thr_lock.h
-include/mysql/private/thr_timer.h
-include/mysql/private/thread_pool_priv.h
-include/mysql/private/violite.h
-include/mysql/private/waiting_threads.h
-include/mysql/private/welcome_copyright_notice.h
-include/mysql/private/wqueue.h
-include/mysql/private/wsrep.h
-lib/mysql/libmysqld.a
-lib/mysql/libmysqld.so
-lib/mysql/libmysqld.so.18
-lib/mysql/plugin/adt_null.so
-lib/mysql/plugin/auth_0x0100.so
-lib/mysql/plugin/auth_ed25519.so
-%%NO_GSSAPI_NONE%%lib/mysql/plugin/auth_gssapi.so
-lib/mysql/plugin/auth_pam.so
-lib/mysql/plugin/auth_socket.so
-lib/mysql/plugin/auth_test_plugin.so
-@comment lib/mysql/plugin/daemon_example.ini
-lib/mysql/plugin/debug_key_management.so
-@comment lib/mysql/plugin/dialog.so
-lib/mysql/plugin/dialog_examples.so
-lib/mysql/plugin/example_key_management.so
-lib/mysql/plugin/file_key_management.so
-lib/mysql/plugin/ha_archive.so
-lib/mysql/plugin/ha_blackhole.so
-lib/mysql/plugin/ha_connect.so
-lib/mysql/plugin/ha_federated.so
-lib/mysql/plugin/ha_federatedx.so
-%%INNOBASE%%lib/mysql/plugin/ha_innodb.so
-%%MROONGA%%lib/mysql/plugin/ha_mroonga.so
-%%OQGRAPH%%lib/mysql/plugin/ha_oqgraph.so
-%%SPHINX%%lib/mysql/plugin/ha_sphinx.so
-%%SPIDER%%lib/mysql/plugin/ha_spider.so
-%%TOKUDB%%lib/mysql/plugin/ha_tokudb.so
-lib/mysql/plugin/ha_test_sql_discovery.so
-lib/mysql/plugin/handlersocket.so
-lib/mysql/plugin/libdaemon_example.so
-lib/mysql/plugin/locales.so
-lib/mysql/plugin/metadata_lock_info.so
-lib/mysql/plugin/mypluglib.so
-@comment lib/mysql/plugin/mysql_clear_password.so
-lib/mysql/plugin/qa_auth_client.so
-lib/mysql/plugin/qa_auth_interface.so
-lib/mysql/plugin/qa_auth_server.so
-lib/mysql/plugin/query_cache_info.so
-lib/mysql/plugin/query_response_time.so
-lib/mysql/plugin/semisync_master.so
-lib/mysql/plugin/semisync_slave.so
-lib/mysql/plugin/server_audit.so
-lib/mysql/plugin/simple_password_check.so
-lib/mysql/plugin/sql_errlog.so
-lib/mysql/plugin/wsrep_info.so
-libexec/mysqld
-man/man1/aria_chk.1.gz
-man/man1/aria_dump_log.1.gz
-man/man1/aria_ftdump.1.gz
-man/man1/aria_pack.1.gz
-man/man1/aria_read_log.1.gz
-man/man1/galera_new_cluster.1.gz
-man/man1/galera_recovery.1.gz
-man/man1/innochecksum.1.gz
-man/man1/mariabackup.1.gz
-man/man1/mariadb-service-convert.1.gz
-man/man1/mbstream.1.gz
-man/man1/my_print_defaults.1.gz
-man/man1/myisam_ftdump.1.gz
-man/man1/myisamchk.1.gz
-man/man1/myisamlog.1.gz
-man/man1/myisampack.1.gz
-man/man1/mysql.server.1.gz
-man/man1/mysql_convert_table_format.1.gz
-man/man1/mysql_fix_extensions.1.gz
-man/man1/mysql_install_db.1.gz
-man/man1/mysql_secure_installation.1.gz
-man/man1/mysql_setpermission.1.gz
-man/man1/mysql_tzinfo_to_sql.1.gz
-man/man1/mysql_upgrade.1.gz
-man/man1/mysql_zap.1.gz
-man/man1/mysqlbug.1.gz
-man/man1/mysqld_multi.1.gz
-man/man1/mysqld_safe.1.gz
-man/man1/mysqld_safe_helper.1.gz
-man/man1/mysqldumpslow.1.gz
-man/man1/mysqlhotcopy.1.gz
-man/man1/perror.1.gz
-man/man1/replace.1.gz
-man/man1/resolve_stack_dump.1.gz
-man/man1/resolveip.1.gz
-%%TOKUDB%%man/man1/tokuft_logprint.1.gz
-%%TOKUDB%%man/man1/tokuftdump.1.gz
-man/man1/wsrep_sst_common.1.gz
-man/man1/wsrep_sst_mariabackup.1.gz
-man/man1/wsrep_sst_mysqldump.1.gz
-man/man1/wsrep_sst_rsync.1.gz
-man/man1/wsrep_sst_rsync_wan.1.gz
-man/man1/wsrep_sst_xtrabackup-v2.1.gz
-man/man1/wsrep_sst_xtrabackup.1.gz
-man/man8/mysqld.8.gz
-%%DATADIR%%/binary-configure
-%%DATADIR%%/charsets/Index.xml
-%%DATADIR%%/charsets/README
-%%DATADIR%%/charsets/armscii8.xml
-%%DATADIR%%/charsets/ascii.xml
-%%DATADIR%%/charsets/cp1250.xml
-%%DATADIR%%/charsets/cp1251.xml
-%%DATADIR%%/charsets/cp1256.xml
-%%DATADIR%%/charsets/cp1257.xml
-%%DATADIR%%/charsets/cp850.xml
-%%DATADIR%%/charsets/cp852.xml
-%%DATADIR%%/charsets/cp866.xml
-%%DATADIR%%/charsets/dec8.xml
-%%DATADIR%%/charsets/geostd8.xml
-%%DATADIR%%/charsets/greek.xml
-%%DATADIR%%/charsets/hebrew.xml
-%%DATADIR%%/charsets/hp8.xml
-%%DATADIR%%/charsets/keybcs2.xml
-%%DATADIR%%/charsets/koi8r.xml
-%%DATADIR%%/charsets/koi8u.xml
-%%DATADIR%%/charsets/latin1.xml
-%%DATADIR%%/charsets/latin2.xml
-%%DATADIR%%/charsets/latin5.xml
-%%DATADIR%%/charsets/latin7.xml
-%%DATADIR%%/charsets/macce.xml
-%%DATADIR%%/charsets/macroman.xml
-%%DATADIR%%/charsets/swe7.xml
-%%DATADIR%%/czech/errmsg.sys
-%%DATADIR%%/danish/errmsg.sys
-%%DATADIR%%/dutch/errmsg.sys
-%%DATADIR%%/english/errmsg.sys
-%%DATADIR%%/errmsg-utf8.txt
-%%DATADIR%%/estonian/errmsg.sys
-%%DATADIR%%/fill_help_tables.sql
-%%DATADIR%%/french/errmsg.sys
-%%DATADIR%%/german/errmsg.sys
-%%DATADIR%%/greek/errmsg.sys
-%%DATADIR%%/hungarian/errmsg.sys
-%%DATADIR%%/install_spider.sql
-%%DATADIR%%/italian/errmsg.sys
-%%DATADIR%%/japanese/errmsg.sys
-%%DATADIR%%/korean/errmsg.sys
-%%DATADIR%%/magic
-%%DATADIR%%/maria_add_gis_sp.sql
-%%DATADIR%%/maria_add_gis_sp_bootstrap.sql
-%%MROONGA%%%%DATADIR%%/groonga-normalizer-mysql/README.md
-%%MROONGA%%%%DATADIR%%/groonga/README.md
-%%MROONGA%%%%DATADIR%%/mroonga/AUTHORS
-%%MROONGA%%%%DATADIR%%/mroonga/install.sql
-%%MROONGA%%%%DATADIR%%/mroonga/uninstall.sql
-%%DATADIR%%/my-huge.cnf
-%%DATADIR%%/my-innodb-heavy-4G.cnf
-%%DATADIR%%/my-large.cnf
-%%DATADIR%%/my-medium.cnf
-%%DATADIR%%/my-small.cnf
-%%DATADIR%%/mysql-log-rotate
-%%DATADIR%%/mysql.server
-%%DATADIR%%/mysql_performance_tables.sql
-%%DATADIR%%/mysql_system_tables.sql
-%%DATADIR%%/mysql_system_tables_data.sql
-%%DATADIR%%/mysql_to_mariadb.sql
-%%DATADIR%%/mysql_test_data_timezone.sql
-%%DATADIR%%/mysqld_multi.server
-%%DATADIR%%/norwegian-ny/errmsg.sys
-%%DATADIR%%/norwegian/errmsg.sys
-%%DATADIR%%/polish/errmsg.sys
-%%DATADIR%%/portuguese/errmsg.sys
-%%DATADIR%%/romanian/errmsg.sys
-%%DATADIR%%/russian/errmsg.sys
-%%DATADIR%%/serbian/errmsg.sys
-%%DATADIR%%/slovak/errmsg.sys
-%%DATADIR%%/spanish/errmsg.sys
-%%DATADIR%%/swedish/errmsg.sys
-%%DATADIR%%/ukrainian/errmsg.sys
-%%DATADIR%%/wsrep.cnf
-%%DATADIR%%/wsrep_notify