aboutsummaryrefslogtreecommitdiff
path: root/databases/mariadb104-server
diff options
context:
space:
mode:
Diffstat (limited to 'databases/mariadb104-server')
-rw-r--r--databases/mariadb104-server/Makefile259
-rw-r--r--databases/mariadb104-server/distinfo3
-rw-r--r--databases/mariadb104-server/files/client.cnf.sample.in52
-rw-r--r--databases/mariadb104-server/files/my.cnf.sample.in13
-rw-r--r--databases/mariadb104-server/files/mysql-server.in147
-rw-r--r--databases/mariadb104-server/files/patch-CMakeLists.txt12
-rw-r--r--databases/mariadb104-server/files/patch-MDEV-1179046
-rw-r--r--databases/mariadb104-server/files/patch-MDEV-2024813
-rw-r--r--databases/mariadb104-server/files/patch-cmake_install__layout.cmake13
-rw-r--r--databases/mariadb104-server/files/patch-libmariadb_include_CMakeLists.txt15
-rw-r--r--databases/mariadb104-server/files/patch-libmariadb_libmariadb_CMakeLists.txt14
-rw-r--r--databases/mariadb104-server/files/patch-libmariadb_plugins_auth_CMakeLists.txt31
-rw-r--r--databases/mariadb104-server/files/patch-libservices_CMakeLists.txt11
-rw-r--r--databases/mariadb104-server/files/patch-mysys_my__default.c52
-rw-r--r--databases/mariadb104-server/files/patch-oqgraph-MDEV-1529140
-rw-r--r--databases/mariadb104-server/files/patch-pcre_CMakeLists.txt11
-rw-r--r--databases/mariadb104-server/files/patch-plugin_auth__pam_testing_CMakeLists.txt10
-rw-r--r--databases/mariadb104-server/files/patch-scripts_mysql__config.sh12
-rw-r--r--databases/mariadb104-server/files/patch-scripts_mysqld__safe.sh16
-rw-r--r--databases/mariadb104-server/files/patch-scripts_wsrep__sst__mariabackup.sh11
-rw-r--r--databases/mariadb104-server/files/patch-sql_mysqld.cc31
-rw-r--r--databases/mariadb104-server/files/patch-storage_innobase_lz4.cmake36
-rw-r--r--databases/mariadb104-server/files/patch-storage_innobase_lzo.cmake38
-rw-r--r--databases/mariadb104-server/files/patch-storage_innobase_snappy.cmake24
-rw-r--r--databases/mariadb104-server/files/patch-storage_mroonga_CMakeLists.txt11
-rw-r--r--databases/mariadb104-server/files/patch-storage_mroonga_vendor_groonga_CMakeLists.txt15
-rw-r--r--databases/mariadb104-server/files/patch-storage_tokudb_CMakeLists.txt9
-rw-r--r--databases/mariadb104-server/files/patch-storage_tokudb_PerconaFT_CMakeLists.txt11
-rw-r--r--databases/mariadb104-server/files/patch-storage_tokudb_PerconaFT_cmake__modules_TokuThirdParty.cmake38
-rw-r--r--databases/mariadb104-server/files/patch-storage_tokudb_PerconaFT_portability_memory.cc16
-rw-r--r--databases/mariadb104-server/files/patch-support-files_CMakeLists.txt14
-rw-r--r--databases/mariadb104-server/files/pkg-message.in26
-rw-r--r--databases/mariadb104-server/files/server.cnf.sample.in60
-rw-r--r--databases/mariadb104-server/pkg-descr14
-rw-r--r--databases/mariadb104-server/pkg-plist442
35 files changed, 0 insertions, 1566 deletions
diff --git a/databases/mariadb104-server/Makefile b/databases/mariadb104-server/Makefile
deleted file mode 100644
index 474b8c133db6..000000000000
--- a/databases/mariadb104-server/Makefile
+++ /dev/null
@@ -1,259 +0,0 @@
-# Created by: Bernard Spil <brnrd@FreeBSD.org>
-
-PORTNAME?= mariadb
-PORTVERSION= 10.4.20
-CATEGORIES= databases
-MASTER_SITES= http://mirrors.supportex.net/${SITESDIR}/ \
- http://mirror2.hs-esslingen.de/pub/Mirrors/${SITESDIR}/ \
- http://gd.tuwien.ac.at/db/${SITESDIR}/ \
- http://mirrors.fe.up.pt/pub/${SITESDIR}/ \
- http://mirror.de.gsnw.de:56431/${SITESDIR}/ \
- http://mirror.layerjet.com/${SITESDIR}/ \
- http://mirror.switch.ch/mirror/${SITESDIR}/ \
- http://ftp.osuosl.org/pub/${SITESDIR}/
-PKGNAMESUFFIX?= 104-server
-
-MAINTAINER= brnrd@FreeBSD.org
-COMMENT?= Multithreaded SQL database (server)
-
-LICENSE= GPLv2
-LICENSE_FILE= ${WRKSRC}/COPYING
-
-USES= bison:build cmake:insource,noninja compiler:c++11-lib cpe iconv:translit libedit ncurses shebangfix ssl
-
-SUB_FILES= pkg-message
-PKGMESSAGE= ${WRKDIR}/pkg-message
-
-USE_LDCONFIG= ${PREFIX}/lib/mysql
-SHEBANG_FILES= scripts/*.sh
-SITESDIR= mariadb/mariadb-${PORTVERSION}/source
-
-DOCSDIR= ${PREFIX}/share/doc/mysql
-ETCDIR= ${PREFIX}/etc/mysql
-
-MARIADB_USER?= mysql
-MARIADB_GROUP?= mysql
-
-MARIADB_RUNDIR?= /var/run/mysql
-MARIADB_SOCK?= mysql.sock
-MARIADB_LOGDIR?= /var/log/mysql
-
-OPTIONS_SINGLE= GSSAPI
-OPTIONS_SINGLE_GSSAPI= GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE
-OPTIONS_DEFAULT= GSSAPI_BASE
-
-.if ${PKGNAMESUFFIX:M*-server}
-# MySQL-Server options
-OPTIONS_DEFAULT+= CONNECT_EXTRA INNOBASE SPHINX SPIDER WSREP
-OPTIONS_GROUP= COMPRESSION ENGINES GROONGA
-OPTIONS_DEFINE= CONNECT_EXTRA DOCS
-OPTIONS_DEFINE_amd64= WSREP
-OPTIONS_GROUP_COMPRESSION= LZ4 LZO SNAPPY ZSTD
-OPTIONS_GROUP_ENGINES= INNOBASE MROONGA OQGRAPH ROCKSDB SPHINX SPIDER TOKUDB
-OPTIONS_GROUP_GROONGA= ZMQ MSGPACK
-OPTIONS_EXCLUDE_i386= ROCKSDB TOKUDB
-
-CONNECT_EXTRA_DESC= Enable ODBC and XML in CONNECT engine
-COMPRESSION_DESC= Optional page compression
-ENGINES_DESC= Optional MariaDB storage engines
-GROONGA_DESC= Optional Mroonga features
-INNOBASE_DESC= InnoDB default engine
-MROONGA_DESC= Mroonga Full Text Search engine
-MSGPACK_DESC= MsgPack support
-OQGRAPH_DESC= Open Query Graph Computation engine
-ROCKSDB_DESC= RocksDB LSM engine (Alpha)
-SPHINX_DESC= SphinxSE engine
-SPIDER_DESC= Partitioning and XA-transactions engine
-TOKUDB_DESC= Fractal tree index tree data structure engine
-WSREP_DESC= Build wsrep clustering
-ZMQ_DESC= ZeroMQ support
-ZSTD_DESC+= Zstandard compression support (RocksDB only)
-.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" \
- -DDEFAULT_SYSCONFDIR="${PREFIX}/etc" \
- -DDEFAULT_SYSCONF2DIR="${ETCDIR}/conf.d" \
- -DINSTALL_UNIX_ADDRDIR="${MARIADB_RUNDIR}/${MARIADB_SOCK}" \
- -DWITH_SSL="${OPENSSLBASE}" \
- -DCURSES_CURSES_LIBRARY="/usr/lib/libcurses.so" \
- -DCURSES_FORM_LIBRARY="/usr/lib/libform.so" \
- -DCURSES_CURSES_LIBRARY="/usr/lib/libncurses.so" \
- -DKRB5_CONFIG="${KRB5CONFIG}" \
- -DCURSES_NCURSES_LIBRARY="${NCURSESLIB}/libncurses.so" \
- -DCOMPILATION_COMMENT="FreeBSD Ports" \
- -DCMAKE_PREFIX_PATH=${PREFIX}
-CMAKE_OFF+= CONC_WITH_UNIT_TESTS CONNECT_WITH_MONGO WITH_UNIT_TESTS
-CMAKE_ON+= WITH_LIBWRAP WITHOUT_DOCS
-DISABLED_PLUGINS+= AUTH_TEST_PLUGIN DAEMON_EXAMPLE DIALOG_EXAMPLES \
- EXAMPLE EXAMPLE_KEY_MANAGEMENT FTEXAMPLE
-
-DATADIR= ${PREFIX}/share/mysql
-ETCDIR= ${PREFIX}/etc/mysql
-
-CONFLICTS_INSTALL= mariadb10[0-24-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
-GSSAPI_NONE_CMAKE_ON= -DPLUGIN_AUTH_GSSAPI_CLIENT=OFF
-OPTIONS_SUB= yes
-SUB_LIST+= MARIADB_USER="${MARIADB_USER}" \
- MARIADB_RUNDIR="${MARIADB_RUNDIR}" \
- MARIADB_SOCK="${MARIADB_SOCK}"
-PLIST_SUB+= MARIADB_USER="${MARIADB_USER}" \
- MARIADB_GROUP="${MARIADB_GROUP}"
-
-.if ${PKGNAMESUFFIX:M*-client}
-# MySQL-Client part
-CMAKE_ON+= CONC_WITH_MYSQLCOMPAT WITHOUT_SERVER
-CMAKE_OFF+= WITH_WSREP
-USES+= readline
-USE_LDCONFIG= ${PREFIX}/lib/mysql
-SUB_FILES+= my.cnf.sample client.cnf.sample
-PLIST_SUB+= MARIADB_RUNDIR="${MARIADB_RUNDIR}"
-.else # ! ${PKGNAMESUFFIX:M*-client}
-# MySQL-Server part
-USES+= mysql:104m
-USE_LDCONFIG+= ${PREFIX}/lib/mysql/plugin
-USE_RC_SUBR= mysql-server
-USERS= ${MARIADB_USER}
-GROUPS= ${MARIADB_GROUP}
-CMAKE_ON+= CMAKE_SKIP_BUILD_RPATH WITH_EMBEDDED_SERVER
-CMAKE_OFF+= WITH_CLIENT
-SUB_FILES+= server.cnf.sample
-SUB_LIST+= MARIADB_LOGDIR="${MARIADB_LOGDIR}"
-PLIST_SUB+= MARIADB_LOGDIR="${MARIADB_LOGDIR}"
-
-.for ENGINE in ${OPTIONS_GROUP_ENGINES:NINNOBASE}
-${ENGINE}_CMAKE_OFF= -DPLUGIN_${ENGINE}=NO
-${ENGINE}_CMAKE_ON= -DPLUGIN_${ENGINE}=DYNAMIC
-.endfor
-INNOBASE_VARS_OFF= disabled_plugins+=INNOBASE
-
-CONNECT_EXTRA_LIB_DEPENDS= libodbc.so:databases/unixODBC
-CONNECT_EXTRA_USE= gnome=libxml2
-CONNECT_EXTRA_USES= gnome
-CONNECT_EXTRA_CMAKE_BOOL= CONNECT_WITH_LIBXML2 CONNECT_WITH_ODBC
-GSSAPI_NONE_VARS= disabled_plugins+=AUTH_GSSAPI
-LZ4_CMAKE_ON= -DGRN_WITH_LZ4=ON -DWITH_INNODB_LZ4=ON -DWITH_ROCKSDB_LZ4=ON
-LZ4_CMAKE_OFF= -DGRN_WITH_LZ4=OFF -DWITH_INNODB_LZ4=OFF -DWITH_ROCKSDB_LZ4=OFF
-LZ4_LIB_DEPENDS= liblz4.so:archivers/liblz4
-LZO_CMAKE_ON= -DWITH_INNODB_LZO=ON
-LZO_CMAKE_OFF= -DWITH_INNODB_LZO=OFF
-LZO_LIB_DEPENDS= liblzo2.so:archivers/lzo2
-MROONGA_IMPLIES= LZ4
-MSGPACK_LIB_DEPENDS= libmsgpackc.so:devel/msgpack
-OQGRAPH_LIB_DEPENDS= libboost_system.so:devel/boost-libs \
- libJudy.so:devel/judy
-ROCKSDB_USES= python
-ROCKSDB_CMAKE_ON= -DPYTHON_SHEBANG=${PYTHON_CMD}
-SNAPPY_CMAKE_ON= -DWITH_INNODB_SNAPPY=ON -DWITH_ROCKSDB_snappy=ON
-SNAPPY_CMAKE_OFF= -DWITH_INNODB_SNAPPY=OFF -DWITH_ROCKSDB_snappy=OFF
-SNAPPY_LIB_DEPENDS= libsnappy.so:archivers/snappy
-TOKUDB_IMPLIES= SNAPPY
-TOKUDB_PORTDOCS= README.md
-WSREP_CMAKE_BOOL= WITH_WSREP
-WSREP_LIB_DEPENDS= libgalera.so:databases/galera26
-WSREP_RUN_DEPENDS= bash:shells/bash \
- rsync:net/rsync \
- #stunnel:security/stunnel
-WSREP_SHEBANG_FILES= bin/wsrep_sst_rsync
-ZMQ_LIB_DEPENDS= libzmq.so:net/libzmq4
-ZSTD_CMAKE_ON= -DWITH_ROCKSDB_zstd=ON
-ZSTD_CMAKE_OFF= -DWITH_ROCKSDB_zstd=OFF
-ZSTD_LIB_DEPENDS= libzstd.so:archivers/zstd
-
-.for PLUGIN in ${DISABLED_PLUGINS}
-CMAKE_ARGS+= -DPLUGIN_${PLUGIN}=NO
-.endfor
-
-.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 ${SSL_DEFAULT} != base && ${PORT_OPTIONS:MGSSAPI_BASE}
-GSSAPI_BASE_IGNORE= BASE_GSSAPI is not compatible with OpenSSL from ports. Use other GSSAPI options or OpenSSL from base system
-.endif
-
-.include <bsd.port.pre.mk>
-
-.if ${ARCH} != amd64
-PLIST_SUB+= WSREP="@comment "
-.endif
-
-.if ${OPSYS} == DragonFly
-CMAKE_OFF+= WITH_TOKUDB
-.endif
-
-post-patch:
- ${REINPLACE_CMD} 's|%%LOCALBASE%%|${LOCALBASE}|g' \
- ${WRKSRC}/storage/tokudb/PerconaFT/cmake_modules/TokuThirdParty.cmake
- ${REINPLACE_CMD} 's|%%PREFIX%%|${PREFIX}|' ${WRKSRC}/mysys/my_default.c
- ${MV} ${WRKSRC}/storage/mroonga/version ${WRKSRC}/storage/mroonga/version_txt
-.if ${OPSYS} == DragonFly
- ${CP} ${WRKSRC}/cmake/os/FreeBSD.cmake \
- ${WRKSRC}/cmake/os/DragonFly.cmake
-.endif
-
-post-configure:
- ${REINPLACE_CMD} -Ee 's|(#define INCLUDE.*)"$$|\1 -I${PREFIX}/include"|' \
- -e 's|(#define LIBS .*)"$$|\1 -L${PREFIX}/lib"|' \
- ${WRKSRC}/libmariadb/mariadb_config/mariadb_config.c
-
-pre-install:
- ${MKDIR} ${STAGEDIR}${ETCDIR}/conf.d
-
-.if ${PKGNAMESUFFIX:M*-client}
-post-install:
- ${INSTALL_DATA} ${WRKDIR}/my.cnf.sample ${STAGEDIR}${ETCDIR}/my.cnf.sample
- ${INSTALL_DATA} ${WRKDIR}/client.cnf.sample \
- ${STAGEDIR}${ETCDIR}/conf.d/client.cnf.sample
- ${RM} -r ${STAGEDIR}${DATADIR} \
- ${STAGEDIR}${PREFIX}/include/mysql/server
- ${MV} ${STAGEDIR}${PREFIX}/lib/mysql/pkgconfig/mariadb.pc \
- ${STAGEDIR}${PREFIX}/libdata/pkgconfig/mariadb.pc
- ${RMDIR} ${STAGEDIR}${PREFIX}/lib/mysql/pkgconfig
- ${MKDIR} ${STAGEDIR}/${MARIADB_RUNDIR}
-
-post-install-GSSAPI_NONE-off:
- ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/mysql/plugin/auth_gssapi_client.so
-
-.else # ! ${PKGNAMESUFFIX:M*-client}
-post-install:
- ${INSTALL_DATA} ${WRKDIR}/server.cnf.sample \
- ${STAGEDIR}${ETCDIR}/conf.d/server.cnf.sample
- ${RM} -r ${STAGEDIR}${PREFIX}/share/mysql/policy \
- ${STAGEDIR}${PREFIX}/include/mysql/server/private \
- ${STAGEDIR}${PREFIX}/lib/mysql/pkgconfig
- ${MV} ${STAGEDIR}${PREFIX}/etc/mysql/user_map.conf \
- ${STAGEDIR}${PREFIX}/etc/mysql/user_map.conf.sample
- ${MV} ${STAGEDIR}${DATADIR}/wsrep.cnf \
- ${STAGEDIR}${ETCDIR}/conf.d/wsrep.cnf.sample || true
- ${MKDIR} ${STAGEDIR}/${MARIADB_LOGDIR}
-.endif # ${PKGNAMESUFFIX:M*-client}
-
-.include <bsd.port.post.mk>
diff --git a/databases/mariadb104-server/distinfo b/databases/mariadb104-server/distinfo
deleted file mode 100644
index ca5fdaed7c2f..000000000000
--- a/databases/mariadb104-server/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1625063243
-SHA256 (mariadb-10.4.20.tar.gz) = 87d5e29ee1f18de153266ec658138607703ed2a05b3ffb1f89091d33f4abf545
-SIZE (mariadb-10.4.20.tar.gz) = 82043644
diff --git a/databases/mariadb104-server/files/client.cnf.sample.in b/databases/mariadb104-server/files/client.cnf.sample.in
deleted file mode 100644
index d468cb8705b8..000000000000
--- a/databases/mariadb104-server/files/client.cnf.sample.in
+++ /dev/null
@@ -1,52 +0,0 @@
-# Options specific to client applications, see
-# https://mariadb.com/kb/en/configuring-mariadb-with-option-files/#client-option-groups
-
-# Options specific to all client programs
-[client]
-# port = 3306 # inherited from %%ETCDIR%%/my.cnf
-# socket = %%MARIADB_RUNDIR%%/mysql.sock # inherited from %%ETCDIR%%/my.cnf
-
-# Options specific to MariaDB client programs
-[client-mariadb]
-
-#
-## Options for specific client Tools
-#
-
-# Options read by `mysql`
-# Renamed from [mysql] starting with MariaDB 10.4.6.
-[mariadb-client] Options read by mysql. Available starting with MariaDB 10.4.6.
-prompt = \u@\h [\d]>\_
-no_auto_rehash
-
-# Options read by `mysqldump`
-# Renamed from [mysqldump] starting with MariaDB 10.4.6.
-[mariadb-dump]
-max_allowed_packet = 256M
-quote_names
-quick
-
-# Options read by `mysqladmin`
-# Renamed from [mysqladmin] starting with MariaDB 10.4.6.
-[mariadb-admin]
-
-# Options read by `mysqlbinlog`
-# Renamed from [mysqlbinlog] starting with MariaDB 10.4.6.
-[mariadb-binlog]
-
-# Options read by `mysqlcheck`
-# Renamed from [mysqlcheck] starting with MariaDB 10.4.6.
-[mariadb-check]
-
-# Options read by `mysqlimport`
-# Renamed from [mysqlimport] starting with MariaDB 10.4.6.
-[mariadb-import]
-
-# Options read by `mysqlshow`
-# Renamed from [mysqlshow] starting with MariaDB 10.4.6.
-[mariadb-show]
-
-# Options read by `mysqlslap`
-# Renamed from [mysqlslap] starting with MariaDB 10.4.6.
-[mariadb-slap]
-
diff --git a/databases/mariadb104-server/files/my.cnf.sample.in b/databases/mariadb104-server/files/my.cnf.sample.in
deleted file mode 100644
index 15dbc7e64da8..000000000000
--- a/databases/mariadb104-server/files/my.cnf.sample.in
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-# This group is read both by the client and the server
-# use it for options that affect everything, see
-# https://mariadb.com/kb/en/configuring-mariadb-with-option-files/#option-groups
-#
-[client-server]
-port = 3306
-socket = %%MARIADB_RUNDIR%%/%%MARIADB_SOCK%%
-
-#
-# include *.cnf from the config directory
-#
-!includedir %%ETCDIR%%/conf.d/
diff --git a/databases/mariadb104-server/files/mysql-server.in b/databases/mariadb104-server/files/mysql-server.in
deleted file mode 100644
index 4e2753f09ee6..000000000000
--- a/databases/mariadb104-server/files/mysql-server.in
+++ /dev/null
@@ -1,147 +0,0 @@
-#!/bin/sh
-
-# 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): Base database directory.
-# Default to "/var/db/mysql"
-# 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 "%%MARIADB_USER%%" created by the port
-# mysql_(instance_)?socket (str): Name of the socket file.
-# Default to "" and used from %%ETCDIR%%/my.cnf,
-# where default is "%%MARIADB_RUNDIR%%/%%MARIADB_SOCK%%".
-# 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="%%MARIADB_USER%%"}
-%%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_socket="\${mysql_${instance}_socket:-\"${mysql_socket}\"}"
- 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_socket:+--socket=${mysql_socket}} ${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
- [ "${mysql_socket}" = "" ] && mysql_rundir="%%MARIADB_RUNDIR%%" || mysql_rundir="`/usr/bin/dirname ${mysql_socket}`"
- if [ ! -d "${mysql_rundir}" ]; then
- install -d -o ${mysql_user} -g $(id -gn $mysql_user) "${mysql_rundir}"
-
- fi
-%%LEGACY_LIMITS%% if checkyesno mysql_limits; then
-%%LEGACY_LIMITS%% eval `/usr/bin/limits ${mysql_limits_args}` 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/mariadb104-server/files/patch-CMakeLists.txt b/databases/mariadb104-server/files/patch-CMakeLists.txt
deleted file mode 100644
index 567e4df8a720..000000000000
--- a/databases/mariadb104-server/files/patch-CMakeLists.txt
+++ /dev/null
@@ -1,12 +0,0 @@
---- CMakeLists.txt.orig 2019-11-07 05:52:21 UTC
-+++ CMakeLists.txt
-@@ -504,7 +504,9 @@ ADD_CUSTOM_TARGET(INFO_BIN ALL
- WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
- )
-
-+IF(FALSE)
- INSTALL_DOCUMENTATION(README.md CREDITS COPYING THIRDPARTY COMPONENT Readme)
-+ENDIF()
-
- # MDEV-6526 these files are not installed anymore
- #INSTALL_DOCUMENTATION(${CMAKE_BINARY_DIR}/Docs/INFO_SRC
diff --git a/databases/mariadb104-server/files/patch-MDEV-11790 b/databases/mariadb104-server/files/patch-MDEV-11790
deleted file mode 100644
index 1794bcf44da7..000000000000
--- a/databases/mariadb104-server/files/patch-MDEV-11790
+++ /dev/null
@@ -1,46 +0,0 @@
-WITHOUT_SERVER installs server-only files
-
-https://jira.mariadb.org/browse/MDEV-11790
---- extra/CMakeLists.txt.orig 2018-10-02 09:45:40 UTC
-+++ extra/CMakeLists.txt
-@@ -99,7 +99,7 @@ IF(WITH_INNOBASE_STORAGE_ENGINE)
- ADD_DEPENDENCIES(innochecksum GenError)
- ENDIF()
-
--MYSQL_ADD_EXECUTABLE(replace replace.c COMPONENT Server)
-+MYSQL_ADD_EXECUTABLE(replace replace.c COMPONENT Client)
- TARGET_LINK_LIBRARIES(replace mysys)
-
- IF(UNIX)
---- scripts/CMakeLists.txt.orig 2018-10-02 09:45:42 UTC
-+++ scripts/CMakeLists.txt
-@@ -241,7 +241,10 @@ ENDIF()
- SET(mysql_config_COMPONENT COMPONENT Development)
- SET(msql2mysql_COMPONENT COMPONENT Client)
- SET(mysqlaccess_COMPONENT COMPONENT Client)
-+SET(mysqlhotcopy_COMPONENT COMPONENT Client)
-+SET(mysql_convert_table_format_COMPONENT COMPONENT Client)
- SET(mysql_find_rows_COMPONENT COMPONENT Client)
-+SET(mysql_setpermission_COMPONENT COMPONENT Client)
- SET(mytop_COMPONENT Mytop)
-
- IF(WIN32)
-@@ -298,14 +301,14 @@ ELSE()
- # On Unix, most of the files end up in the bin directory
- SET(BIN_SCRIPTS
- msql2mysql
-- mysql_config
-- mysql_setpermission
-- mysql_secure_installation
- mysqlaccess
-+ mysqlhotcopy
-+ mysql_config
- mysql_convert_table_format
- mysql_find_rows
-+ mysql_secure_installation
-+ mysql_setpermission
- mytop
-- mysqlhotcopy
- ${SERVER_SCRIPTS}
- ${WSREP_SCRIPTS}
- ${SYSTEMD_SCRIPTS}
diff --git a/databases/mariadb104-server/files/patch-MDEV-20248 b/databases/mariadb104-server/files/patch-MDEV-20248
deleted file mode 100644
index ef0d97b17225..000000000000
--- a/databases/mariadb104-server/files/patch-MDEV-20248
+++ /dev/null
@@ -1,13 +0,0 @@
---- storage/rocksdb/rocksdb/port/jemalloc_helper.h.orig 2019-07-30 11:32:15 UTC
-+++ storage/rocksdb/rocksdb/port/jemalloc_helper.h
-@@ -12,6 +12,10 @@
- #include <jemalloc/jemalloc.h>
- #endif
-
-+#ifdef __FreeBSD__
-+#define JEMALLOC_USABLE_SIZE_CONST const
-+#endif
-+
- #ifndef JEMALLOC_CXX_THROW
- #define JEMALLOC_CXX_THROW
- #endif
diff --git a/databases/mariadb104-server/files/patch-cmake_install__layout.cmake b/databases/mariadb104-server/files/patch-cmake_install__layout.cmake
deleted file mode 100644
index 2f6b38ffa45d..000000000000
--- a/databases/mariadb104-server/files/patch-cmake_install__layout.cmake
+++ /dev/null
@@ -1,13 +0,0 @@
---- cmake/install_layout.cmake.orig 2020-05-09 19:27:56 UTC
-+++ cmake/install_layout.cmake
-@@ -128,8 +128,8 @@ SET(INSTALL_SUPPORTFILESDIR_STANDALONE "support-files
- SET(INSTALL_MYSQLDATADIR_STANDALONE "data")
-
- SET(INSTALL_UNIX_ADDRDIR_STANDALONE "/tmp/mysql.sock")
--SET(INSTALL_PAMDIR_STANDALONE "share")
--SET(INSTALL_PAMDATADIR_STANDALONE "share")
-+SET(INSTALL_PAMDIR_STANDALONE "lib/mysql/plugin")
-+SET(INSTALL_PAMDATADIR_STANDALONE "etc/mysql")
- #
- # RPM layout
- #
diff --git a/databases/mariadb104-server/files/patch-libmariadb_include_CMakeLists.txt b/databases/mariadb104-server/files/patch-libmariadb_include_CMakeLists.txt
deleted file mode 100644
index 70e8fad20f85..000000000000
--- a/databases/mariadb104-server/files/patch-libmariadb_include_CMakeLists.txt
+++ /dev/null
@@ -1,15 +0,0 @@
---- libmariadb/include/CMakeLists.txt.orig 2017-05-14 23:13:15 UTC
-+++ libmariadb/include/CMakeLists.txt
-@@ -21,6 +21,7 @@ IF(WIN32)
- SET(WIX_INCLUDES ${MARIADB_CLIENT_INCLUDES} ${MARIADB_ADDITIONAL_INCLUDES} ${MYSQL_ADDITIONAL_INCLUDES} PARENT_SCOPE)
- ENDIF()
-
-+IF(NOT WITHOUT_CLIENT)
- INSTALL(FILES
- ${MARIADB_CLIENT_INCLUDES}
- DESTINATION ${INSTALL_INCLUDEDIR}
-@@ -33,3 +34,4 @@ INSTALL(FILES
- ${MARIADB_ADDITIONAL_INCLUDES}
- DESTINATION ${INSTALL_INCLUDEDIR}/mariadb
- COMPONENT Development)
-+ENDIF()
diff --git a/databases/mariadb104-server/files/patch-libmariadb_libmariadb_CMakeLists.txt b/databases/mariadb104-server/files/patch-libmariadb_libmariadb_CMakeLists.txt
deleted file mode 100644
index 0542221db134..000000000000
--- a/databases/mariadb104-server/files/patch-libmariadb_libmariadb_CMakeLists.txt
+++ /dev/null
@@ -1,14 +0,0 @@
---- libmariadb/libmariadb/CMakeLists.txt.orig 2017-05-14 23:13:15 UTC
-+++ libmariadb/libmariadb/CMakeLists.txt
-@@ -401,9 +401,11 @@ SET_TARGET_PROPERTIES(libmariadb PROPERT
- INSTALL(TARGETS mariadbclient
- COMPONENT Development
- DESTINATION ${INSTALL_LIBDIR})
-+IF(NOT WITHOUT_CLIENT)
- INSTALL(TARGETS libmariadb
- COMPONENT SharedLibraries
- DESTINATION ${INSTALL_LIBDIR})
-+ENDIF()
-
- IF(WIN32)
- # On Windows, install PDB
diff --git a/databases/mariadb104-server/files/patch-libmariadb_plugins_auth_CMakeLists.txt b/databases/mariadb104-server/files/patch-libmariadb_plugins_auth_CMakeLists.txt
deleted file mode 100644
index f9edf6c4e50e..000000000000
--- a/databases/mariadb104-server/files/patch-libmariadb_plugins_auth_CMakeLists.txt
+++ /dev/null
@@ -1,31 +0,0 @@
---- libmariadb/plugins/auth/CMakeLists.txt.orig 2019-11-07 05:52:21 UTC
-+++ libmariadb/plugins/auth/CMakeLists.txt
-@@ -3,6 +3,7 @@ SET(AUTH_DIR ${CC_SOURCE_DIR}/plugins/auth)
- INCLUDE_DIRECTORIES(${AUTH_DIR})
- INCLUDE_DIRECTORIES(${CC_SOURCE_DIR}/include)
-
-+IF(NOT WITHOUT_CLIENT)
- SET(CRYPTO_PLUGIN 1)
- IF(WIN32)
- SET(CRYPT_SOURCE ${CC_SOURCE_DIR}/libmariadb/secure/win_crypt.c)
-@@ -18,6 +19,7 @@ ELSEIF(WITH_SSL STREQUAL "GNUTLS")
- ELSE()
- UNSET(CRYPTO_PLUGIN)
- ENDIF()
-+ENDIF()
-
- #native password
- REGISTER_PLUGIN(TARGET mysql_native_password
-@@ -119,10 +121,11 @@ REGISTER_PLUGIN(TARGET mysql_old_password
- DEFAULT STATIC
- SOURCES ${AUTH_DIR}/old_password.c)
-
-+IF(NOT WITHOUT_CLIENT)
- # Cleartext
- REGISTER_PLUGIN(TARGET mysql_clear_password
- TYPE MARIADB_CLIENT_PLUGIN_AUTH
- CONFIGURATIONS DYNAMIC STATIC OFF
- DEFAULT DYNAMIC
- SOURCES ${AUTH_DIR}/mariadb_cleartext.c)
--
-+ENDIF()
diff --git a/databases/mariadb104-server/files/patch-libservices_CMakeLists.txt b/databases/mariadb104-server/files/patch-libservices_CMakeLists.txt
deleted file mode 100644
index 82bf5fac68ea..000000000000
--- a/databases/mariadb104-server/files/patch-libservices_CMakeLists.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-Fix up missing WITHOUT_DOCS, WITHOUT_CLIENT options
-
---- libservices/CMakeLists.txt.orig 2017-05-14 23:13:16 UTC
-+++ libservices/CMakeLists.txt
-@@ -40,4 +40,6 @@ SET(MYSQLSERVICES_SOURCES
- )
-
- ADD_CONVENIENCE_LIBRARY(mysqlservices ${MYSQLSERVICES_SOURCES})
-+IF(FALSE)
- INSTALL(TARGETS mysqlservices DESTINATION ${INSTALL_LIBDIR} COMPONENT Development)
-+ENDIF()
diff --git a/databases/mariadb104-server/files/patch-mysys_my__default.c b/databases/mariadb104-server/files/patch-mysys_my__default.c
deleted file mode 100644
index ef8d9b5ca53e..000000000000
--- a/databases/mariadb104-server/files/patch-mysys_my__default.c
+++ /dev/null
@@ -1,52 +0,0 @@
---- mysys/my_default.c.orig 2017-05-14 23:13:17 UTC
-+++ mysys/my_default.c
-@@ -785,7 +785,7 @@ static int search_default_file_with_ext(
- {
- MY_STAT stat_info;
- if (!my_stat(name,&stat_info,MYF(0)))
-- return 1;
-+ return 0;
- /*
- Ignore world-writable regular files.
- This is mainly done to protect us to not read a file created by
-@@ -803,6 +803,14 @@ static int search_default_file_with_ext(
- if (!(fp= mysql_file_fopen(key_file_cnf, name, O_RDONLY, MYF(0))))
- return 1; /* Ignore wrong files */
-
-+ if (strstr(name, "/etc") == name)
-+ {
-+ fprintf(stderr,
-+ "error: Config file %s in invalid location, please move to or merge with %%PREFIX%%%s\n",
-+ name,name);
-+ goto err;
-+ }
-+
- while (mysql_file_fgets(buff, sizeof(buff) - 1, fp))
- {
- line++;
-@@ -1067,7 +1075,8 @@ void my_print_default_files(const char *
- if (name[0] == FN_HOMELIB) /* Add . to filenames in home */
- *end++= '.';
- strxmov(end, conf_file, *ext, " ", NullS);
-- fputs(name, stdout);
-+ if (strstr(name, "/etc") != name)
-+ fputs(name, stdout);
- }
- }
- }
-@@ -1192,13 +1201,10 @@ static const char **init_default_directo
-
- #else
-
--#if defined(DEFAULT_SYSCONFDIR)
-- if (DEFAULT_SYSCONFDIR[0])
-- errors += add_directory(alloc, DEFAULT_SYSCONFDIR, dirs);
--#else
- errors += add_directory(alloc, "/etc/", dirs);
- errors += add_directory(alloc, "/etc/mysql/", dirs);
--#endif /* DEFAULT_SYSCONFDIR */
-+ errors += add_directory(alloc, "%%PREFIX%%/etc/", dirs);
-+ errors += add_directory(alloc, "%%PREFIX%%/etc/mysql/", dirs);
-
- #endif
-
diff --git a/databases/mariadb104-server/files/patch-oqgraph-MDEV-15291 b/databases/mariadb104-server/files/patch-oqgraph-MDEV-15291
deleted file mode 100644
index 05083cd206ac..000000000000
--- a/databases/mariadb104-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/mariadb104-server/files/patch-pcre_CMakeLists.txt b/databases/mariadb104-server/files/patch-pcre_CMakeLists.txt
deleted file mode 100644
index c09bb5f9d875..000000000000
--- a/databases/mariadb104-server/files/patch-pcre_CMakeLists.txt
+++ /dev/null
@@ -1,11 +0,0 @@
---- pcre/CMakeLists.txt.orig 2017-08-17 10:05:39 UTC
-+++ pcre/CMakeLists.txt
-@@ -510,6 +510,8 @@ IF(PCRE_SHOW_REPORT)
- MESSAGE(STATUS "")
- ENDIF(PCRE_SHOW_REPORT)
-
-+IF(FALSE)
- INSTALL(FILES ${CMAKE_BINARY_DIR}/pcre/pcre.h DESTINATION ${INSTALL_INCLUDEDIR}/server/private COMPONENT Development)
-+ENDIF()
-
- # end CMakeLists.txt
diff --git a/databases/mariadb104-server/files/patch-plugin_auth__pam_testing_CMakeLists.txt b/databases/mariadb104-server/files/patch-plugin_auth__pam_testing_CMakeLists.txt
deleted file mode 100644
index b759accf8e2a..000000000000
--- a/databases/mariadb104-server/files/patch-plugin_auth__pam_testing_CMakeLists.txt
+++ /dev/null
@@ -1,10 +0,0 @@
---- plugin/auth_pam/testing/CMakeLists.txt.orig 2019-11-07 05:52:22 UTC
-+++ plugin/auth_pam/testing/CMakeLists.txt
-@@ -5,5 +5,7 @@ SET_TARGET_PROPERTIES (pam_mariadb_mtr PROPERTIES PREF
- TARGET_LINK_LIBRARIES(pam_mariadb_mtr pam)
-
- SET(dest DESTINATION "${INSTALL_MYSQLTESTDIR}/suite/plugins/pam" COMPONENT Test)
-+IF(FALSE)
- INSTALL(TARGETS pam_mariadb_mtr ${dest})
- INSTALL(FILES mariadb_mtr.conf RENAME mariadb_mtr ${dest})
-+ENDIF()
diff --git a/databases/mariadb104-server/files/patch-scripts_mysql__config.sh b/databases/mariadb104-server/files/patch-scripts_mysql__config.sh
deleted file mode 100644
index 13f25ca9fb74..000000000000
--- a/databases/mariadb104-server/files/patch-scripts_mysql__config.sh
+++ /dev/null
@@ -1,12 +0,0 @@
---- scripts/mysql_config.sh.orig 2017-05-24 09:15:23 UTC
-+++ scripts/mysql_config.sh
-@@ -106,7 +106,9 @@ fi
-
- # Create options
- libs="-L$pkglibdir @RPATH_OPTION@ @LIBS_FOR_CLIENTS@"
-+libs="$libs -L%%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/mariadb104-server/files/patch-scripts_mysqld__safe.sh b/databases/mariadb104-server/files/patch-scripts_mysqld__safe.sh
deleted file mode 100644
index 0c694bd3a30a..000000000000
--- a/databases/mariadb104-server/files/patch-scripts_mysqld__safe.sh
+++ /dev/null
@@ -1,16 +0,0 @@
---- scripts/mysqld_safe.sh.orig 2017-05-24 09:15:23 UTC
-+++ scripts/mysqld_safe.sh
-@@ -568,11 +568,11 @@ fi
-
- if test -z "$MYSQL_HOME"
- then
-- if test -r "$DATADIR/my.cnf"
-+ if test -r "$DATADIR/etc/my.cnf"
- then
- log_error "WARNING: Found $DATADIR/my.cnf
- The data directory is not a valid location for my.cnf, please move it to
--$MY_BASEDIR_VERSION/my.cnf"
-+$MY_BASEDIR_VERSION/etc/my.cnf"
- fi
- MYSQL_HOME=$MY_BASEDIR_VERSION
- fi
diff --git a/databases/mariadb104-server/files/patch-scripts_wsrep__sst__mariabackup.sh b/databases/mariadb104-server/files/patch-scripts_wsrep__sst__mariabackup.sh
deleted file mode 100644
index dc45c2d238c7..000000000000
--- a/databases/mariadb104-server/files/patch-scripts_wsrep__sst__mariabackup.sh
+++ /dev/null
@@ -1,11 +0,0 @@
---- scripts/wsrep_sst_mariabackup.sh.orig 2021-06-09 14:23:11.000000000 +0200
-+++ scripts/wsrep_sst_mariabackup.sh
-@@ -696,7 +696,7 @@
- local ltcmd="$tcmd"
- if [ $tmt -gt 0 ]; then
- if [ -n "$(command -v timeout)" ]; then
-- if timeout --help | grep -qw -- '-k'; then
-+ if timeout --help 2>&1 | grep -qw -- '-k'; then
- ltcmd="timeout -k $(( tmt+10 )) $tmt $tcmd"
- else
- ltcmd="timeout -s9 $tmt $tcmd"
diff --git a/databases/mariadb104-server/files/patch-sql_mysqld.cc b/databases/mariadb104-server/files/patch-sql_mysqld.cc
deleted file mode 100644
index 4109d800da4c..000000000000
--- a/databases/mariadb104-server/files/patch-sql_mysqld.cc
+++ /dev/null
@@ -1,31 +0,0 @@
---- sql/mysqld.cc.orig 2021-05-05 15:26:23 UTC
-+++ sql/mysqld.cc
-@@ -206,7 +206,7 @@ typedef fp_except fp_except_t;
-
- inline void setup_fpu()
- {
--#if defined(__FreeBSD__) && defined(HAVE_IEEEFP_H) && !defined(HAVE_FEDISABLEEXCEPT)
-+#if defined(__FreeBSD__) && defined(HAVE_IEEEFP_H) && !defined(HAVE_FEDISABLEEXCEPT) && defined(FP_X_INV)
- /* We can't handle floating point exceptions with threads, so disable
- this on freebsd
- Don't fall for overflow, underflow,divide-by-zero or loss of precision.
-@@ -219,7 +219,7 @@ inline void setup_fpu()
- fpsetmask(~(FP_X_INV | FP_X_OFL | FP_X_UFL | FP_X_DZ |
- FP_X_IMP));
- #endif /* FP_X_DNML */
--#endif /* __FreeBSD__ && HAVE_IEEEFP_H && !HAVE_FEDISABLEEXCEPT */
-+#endif /* __FreeBSD__ && HAVE_IEEEFP_H && !HAVE_FEDISABLEEXCEPT && defined(FP_X_INV) */
-
- #ifdef HAVE_FEDISABLEEXCEPT
- fedisableexcept(FE_ALL_EXCEPT);
-@@ -5033,8 +5033,9 @@ static void init_ssl()
- while ((err= ERR_get_error()))
- sql_print_warning("SSL error: %s", ERR_error_string(err, NULL));
- }
-- else
-+ else {
- ERR_remove_state(0);
-+ }
- }
- else
- {
diff --git a/databases/mariadb104-server/files/patch-storage_innobase_lz4.cmake b/databases/mariadb104-server/files/patch-storage_innobase_lz4.cmake
deleted file mode 100644
index 096529fae9f5..000000000000
--- a/databases/mariadb104-server/files/patch-storage_innobase_lz4.cmake
+++ /dev/null
@@ -1,36 +0,0 @@
---- storage/innobase/lz4.cmake.orig 2017-05-14 23:13:18 UTC
-+++ storage/innobase/lz4.cmake
-@@ -17,21 +17,29 @@ SET(WITH_INNODB_LZ4 AUTO CACHE STRING
-
- MACRO (MYSQL_CHECK_LZ4)
- IF (WITH_INNODB_LZ4 STREQUAL "ON" OR WITH_INNODB_LZ4 STREQUAL "AUTO")
-- CHECK_INCLUDE_FILES(lz4.h HAVE_LZ4_H)
-- CHECK_LIBRARY_EXISTS(lz4 LZ4_compress_limitedOutput "" HAVE_LZ4_SHARED_LIB)
-- CHECK_LIBRARY_EXISTS(lz4 LZ4_compress_default "" HAVE_LZ4_COMPRESS_DEFAULT)
-+ find_path(LZ4_INCLUDE_DIR NAMES lz4.h)
-+ find_library(LZ4_LIBRARY NAMES lz4)
-+ IF (LZ4_LIBRARY)
-+ get_filename_component(LZ4_LIBDIR ${LZ4_LIBRARY} DIRECTORY)
-+#MESSAGE(STATUS "LZ4_INCLUDE_DIR=${LZ4_INCLUDE_DIR} LZ4_LIBRARY=${LZ4_LIBRARY} LZ4_LIBDIR=${LZ4_LIBDIR}")
-+ IF (LZ4_INCLUDE_DIR)
-+ SET(HAVE_LZ4_H YES)
-+ ENDIF()
-+ CHECK_LIBRARY_EXISTS(lz4 LZ4_compress_limitedOutput ${LZ4_LIBDIR} HAVE_LZ4_SHARED_LIB)
-+ CHECK_LIBRARY_EXISTS(lz4 LZ4_compress_default ${LZ4_LIBDIR} HAVE_LZ4_COMPRESS_DEFAULT)
-
- IF (HAVE_LZ4_SHARED_LIB AND HAVE_LZ4_H)
- ADD_DEFINITIONS(-DHAVE_LZ4=1)
- IF (HAVE_LZ4_COMPRESS_DEFAULT)
- ADD_DEFINITIONS(-DHAVE_LZ4_COMPRESS_DEFAULT=1)
- ENDIF()
-- LINK_LIBRARIES(lz4)
-+ LINK_LIBRARIES(innobase ${LZ4_LIBRARY})
- ELSE()
- IF (WITH_INNODB_LZ4 STREQUAL "ON")
- MESSAGE(FATAL_ERROR "Required lz4 library is not found")
- ENDIF()
- ENDIF()
-+ ENDIF()
- ENDIF()
- ENDMACRO()
-
diff --git a/databases/mariadb104-server/files/patch-storage_innobase_lzo.cmake b/databases/mariadb104-server/files/patch-storage_innobase_lzo.cmake
deleted file mode 100644
index afabe8542926..000000000000
--- a/databases/mariadb104-server/files/patch-storage_innobase_lzo.cmake
+++ /dev/null
@@ -1,38 +0,0 @@
---- storage/innobase/lzo.cmake.orig 2017-05-14 23:13:18 UTC
-+++ storage/innobase/lzo.cmake
-@@ -17,12 +17,10 @@ SET(WITH_INNODB_LZO AUTO CACHE STRING
-
- MACRO (MYSQL_CHECK_LZO_STATIC)
- IF (WITH_INNODB_LZO STREQUAL "ON" OR WITH_INNODB_LZO STREQUAL "AUTO")
-- CHECK_INCLUDE_FILES(lzo/lzo1x.h HAVE_LZO_H)
-- CHECK_LIBRARY_EXISTS(liblzo2.a lzo1x_1_compress "" HAVE_LZO_LIB)
--
-+ CHECK_LIBRARY_EXISTS(lzo2 lzo1x_1_compress "${LZO_LIBDIR}" HAVE_LZO_LIB)
- IF(HAVE_LZO_LIB AND HAVE_LZO_H)
- ADD_DEFINITIONS(-DHAVE_LZO=1)
-- LINK_LIBRARIES(liblzo2.a)
-+ LINK_LIBRARIES(lzo2)
- ELSE()
- IF (WITH_INNODB_LZO STREQUAL "ON")
- MESSAGE(FATAL_ERROR "Required lzo library is not found")
-@@ -33,12 +31,16 @@ ENDMACRO()
-
- MACRO (MYSQL_CHECK_LZO)
- IF (WITH_INNODB_LZO STREQUAL "ON" OR WITH_INNODB_LZO STREQUAL "AUTO")
-- CHECK_INCLUDE_FILES(lzo/lzo1x.h HAVE_LZO_H)
-- CHECK_LIBRARY_EXISTS(lzo2 lzo1x_1_compress "" HAVE_LZO_SHARED_LIB)
--
-+ find_path(LZO_INCLUDE NAMES lzo/lzo1x.h)
-+ find_library(LZO_LIBRARY NAMES lzo2)
-+ get_filename_component(LZO_LIBDIR ${LZO_LIBRARY} DIRECTORY)
-+ IF (LZO_INCLUDE)
-+ SET(HAVE_LZO_H 1)
-+ ENDIF()
-+ CHECK_LIBRARY_EXISTS(lzo2 lzo1x_1_compress ${LZO_LIBDIR} HAVE_LZO_SHARED_LIB)
- IF(HAVE_LZO_SHARED_LIB AND HAVE_LZO_H)
- ADD_DEFINITIONS(-DHAVE_LZO=1)
-- LINK_LIBRARIES(lzo2)
-+ LINK_LIBRARIES(${LZO_LIBRARY})
- ELSE()
- IF (WITH_INNODB_LZO STREQUAL "ON")
- MESSAGE(FATAL_ERROR "Required lzo library is not found")
diff --git a/databases/mariadb104-server/files/patch-storage_innobase_snappy.cmake b/databases/mariadb104-server/files/patch-storage_innobase_snappy.cmake
deleted file mode 100644
index 42c80e08d04a..000000000000
--- a/databases/mariadb104-server/files/patch-storage_innobase_snappy.cmake
+++ /dev/null
@@ -1,24 +0,0 @@
---- storage/innobase/snappy.cmake.orig 2017-05-14 23:13:18 UTC
-+++ storage/innobase/snappy.cmake
-@@ -17,12 +17,17 @@ SET(WITH_INNODB_SNAPPY AUTO CACHE STRING
-
- MACRO (MYSQL_CHECK_SNAPPY)
- IF (WITH_INNODB_SNAPPY STREQUAL "ON" OR WITH_INNODB_SNAPPY STREQUAL "AUTO")
-- CHECK_INCLUDE_FILES(snappy-c.h HAVE_SNAPPY_H)
-- CHECK_LIBRARY_EXISTS(snappy snappy_uncompress "" HAVE_SNAPPY_SHARED_LIB)
--
-+ find_path(SNAPPY_INCLUDE_DIR NAMES snappy-c.h)
-+ find_library(SNAPPY_LIBRARY NAMES snappy)
-+ get_filename_component(SNAPPY_LIBDIR ${SNAPPY_LIBRARY} DIRECTORY)
-+ IF (SNAPPY_INCLUDE_DIR)
-+ SET(HAVE_SNAPPY_H 1)
-+ ENDIF()
-+ CHECK_LIBRARY_EXISTS(snappy snappy_uncompress ${SNAPPY_LIBDIR} HAVE_SNAPPY_SHARED_LIB)
-+MESSAGE(STATUS "HAVE_SNAPPY_H=${HAVE_SNAPPY_H} HAVE_SNAPPY_SHARED_LIB=${HAVE_SNAPPY_SHARED_LIB} SNAPPY_LIBDIR=${SNAPPY_LIBDIR} ")
- IF(HAVE_SNAPPY_SHARED_LIB AND HAVE_SNAPPY_H)
- ADD_DEFINITIONS(-DHAVE_SNAPPY=1)
-- LINK_LIBRARIES(snappy)
-+ LINK_LIBRARIES(${SNAPPY_LIBRARY})
- ELSE()
- IF (WITH_INNODB_SNAPPY STREQUAL "ON")
- MESSAGE(FATAL_ERROR "Required snappy library is not found")
diff --git a/databases/mariadb104-server/files/patch-storage_mroonga_CMakeLists.txt b/databases/mariadb104-server/files/patch-storage_mroonga_CMakeLists.txt
deleted file mode 100644
index 3a9984980272..000000000000
--- a/databases/mariadb104-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/mariadb104-server/files/patch-storage_mroonga_vendor_groonga_CMakeLists.txt b/databases/mariadb104-server/files/patch-storage_mroonga_vendor_groonga_CMakeLists.txt
deleted file mode 100644
index 023d10e97d94..000000000000
--- a/databases/mariadb104-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 2017-05-14 23:13:18 UTC
-+++ storage/mroonga/vendor/groonga/CMakeLists.txt
-@@ -167,6 +167,10 @@ if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_COM
- 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/mariadb104-server/files/patch-storage_tokudb_CMakeLists.txt b/databases/mariadb104-server/files/patch-storage_tokudb_CMakeLists.txt
deleted file mode 100644
index e75813586e40..000000000000
--- a/databases/mariadb104-server/files/patch-storage_tokudb_CMakeLists.txt
+++ /dev/null
@@ -1,9 +0,0 @@
---- storage/tokudb/CMakeLists.txt.orig 2017-09-25 08:33:26.000000000 +0200
-+++ storage/tokudb/CMakeLists.txt 2017-09-28 21:46:55.119327000 +0200
-@@ -108,6 +108,3 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINA
-
- TARGET_LINK_LIBRARIES(tokudb tokufractaltree_static tokuportability_static
- ${ZLIB_LIBRARY} ${LIBJEMALLOC} 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")
diff --git a/databases/mariadb104-server/files/patch-storage_tokudb_PerconaFT_CMakeLists.txt b/databases/mariadb104-server/files/patch-storage_tokudb_PerconaFT_CMakeLists.txt
deleted file mode 100644
index 9ef62147175b..000000000000
--- a/databases/mariadb104-server/files/patch-storage_tokudb_PerconaFT_CMakeLists.txt
+++ /dev/null
@@ -1,11 +0,0 @@
---- storage/tokudb/PerconaFT/CMakeLists.txt.orig 2017-05-14 23:13:20 UTC
-+++ storage/tokudb/PerconaFT/CMakeLists.txt
-@@ -80,7 +80,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/mariadb104-server/files/patch-storage_tokudb_PerconaFT_cmake__modules_TokuThirdParty.cmake b/databases/mariadb104-server/files/patch-storage_tokudb_PerconaFT_cmake__modules_TokuThirdParty.cmake
deleted file mode 100644
index 7f9ff7913496..000000000000
--- a/databases/mariadb104-server/files/patch-storage_tokudb_PerconaFT_cmake__modules_TokuThirdParty.cmake
+++ /dev/null
@@ -1,38 +0,0 @@
-Do NOT use bundled libs, use xz/lzma from base and archivers/snappy from ports
-
---- storage/tokudb/PerconaFT/cmake_modules/TokuThirdParty.cmake.orig 2019-11-07 05:52:23 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("%%LOCALBASE%%/include")
-
-+ add_library(snappy SHARED IMPORTED)
-+ set_target_properties(snappy PROPERTIES IMPORTED_LOCATION
-+ "%%LOCALBASE%%/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/mariadb104-server/files/patch-storage_tokudb_PerconaFT_portability_memory.cc b/databases/mariadb104-server/files/patch-storage_tokudb_PerconaFT_portability_memory.cc
deleted file mode 100644
index c6eb23c5a525..000000000000
--- a/databases/mariadb104-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 2017-05-14 23:13:21 UTC
-+++ storage/tokudb/PerconaFT/portability/memory.cc
-@@ -42,11 +42,6 @@ Copyright (c) 2006, 2015, Percona and/or
- #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/mariadb104-server/files/patch-support-files_CMakeLists.txt b/databases/mariadb104-server/files/patch-support-files_CMakeLists.txt
deleted file mode 100644
index c9392ca628a2..000000000000
--- a/databases/mariadb104-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 2017-05-14 23:13:28 UTC
-+++ support-files/CMakeLists.txt
-@@ -83,7 +83,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/mariadb104-server/files/pkg-message.in b/databases/mariadb104-server/files/pkg-message.in
deleted file mode 100644
index 7c031a3048ed..000000000000
--- a/databases/mariadb104-server/files/pkg-message.in
+++ /dev/null
@@ -1,26 +0,0 @@
-[
-{ type: install
- message: <<EOM
-MariaDB respects hier(7) and doesn't check /etc and /etc/mysql for
-my.cnf. Please move existing my.cnf files from those paths to
-%%PREFIX%%/etc/mysql or %%PREFIX%%/etc. Sample
-configuration files are provided in %%PREFIX%%/etc/mysql
-and %%PREFIX%%/etc/mysql/conf.d.
-
-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
-}
-{ type: upgrade
- message: <<EOM
-The default MySQL socket location has moved from /tmp to %%MARIADB_RUNDIR%%
-for both client and server packages. Make sure you update your configurations
-in /var/db/mysql and %%PREFIX%%/etc.
-
-Remember to run mariadb-upgrade (with the optional --datadir=<dbdir> flag)
-the first time you start the MySQL server after an upgrade from an
-earlier version.
-EOM
-}
-
diff --git a/databases/mariadb104-server/files/server.cnf.sample.in b/databases/mariadb104-server/files/server.cnf.sample.in
deleted file mode 100644
index c08ce7461ed2..000000000000
--- a/databases/mariadb104-server/files/server.cnf.sample.in
+++ /dev/null
@@ -1,60 +0,0 @@
-# Options specific to server applications, see
-# https://mariadb.com/kb/en/configuring-mariadb-with-option-files/#server-option-groups
-
-# Options specific to all server programs
-[server]
-
-# Options specific to MariaDB server programs
-[server-mariadb]
-
-#
-# Options for specific server tools
-#
-
-[mysqld]
-user = %%MARIADB_USER%%
-# port = 3306 # inherited from %%ETCDIR%%/my.cnf
-# socket = %%MARIADB_RUNDIR%%/%%MARIADB_SOCK%% # inherited from %%ETCDIR%%/my.cnf
-bind-address = 127.0.0.1
-basedir = %%PREFIX%%
-datadir = /var/db/mysql
-net_retry_count = 16384
-log_error = %%MARIADB_LOGDIR%%/mysqld.err
-# [mysqld] configuration for ZFS
-# From https://www.percona.com/resources/technical-presentations/zfs-mysql-percona-technical-webinar
-# Create separate datasets for data and logs, eg
-# zroot/mysql compression=on recordsize=128k atime=off
-# zroot/mysql/data recordsize=16k
-# zroot/mysql/logs
-# datadir = /var/db/mysql/data
-# innodb_log_group_home_dir = /var/db/mysql/log
-# audit_log_file = /var/db/mysql/log/audit.log
-# general_log_file = /var/db/mysql/log/general.log
-# log_bin = /var/db/mysql/log/mysql-bin
-# relay_log = /var/db/mysql/log/relay-log
-# slow_query_log_file = /var/db/mysql/log/slow.log
-# innodb_doublewrite = 0
-# innodb_flush_method = O_DSYNC
-
-# Options read by `mysqld_safe`
-# Renamed from [mysqld_safe] starting with MariaDB 10.4.6.
-[mariadb_safe]
-
-# Options read my `mariabackup`
-[mariabackup]
-
-# Options read by `mysql_upgrade`
-# Renamed from [mysql_upgrade] starting with MariaDB 10.4.6.
-[mariadb-upgrade]
-
-# Specific options read by the mariabackup SST method
-[sst]
-
-# Options read by `mysqlbinlog`
-# Renamed from [mysqlbinlog] starting with MariaDB 10.4.6.
-[mariadb-binlog]
-
-# Options read by `mysqladmin`
-# Renamed from [mysqladmin] starting with MariaDB 10.4.6.
-[mariadb-admin]
-
diff --git a/databases/mariadb104-server/pkg-descr b/databases/mariadb104-server/pkg-descr
deleted file mode 100644
index 874d96eeaa95..000000000000
--- a/databases/mariadb104-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/mariadb104-server/pkg-plist b/databases/mariadb104-server/pkg-plist
deleted file mode 100644
index ac3a50adb345..000000000000
--- a/databases/mariadb104-server/pkg-plist
+++ /dev/null
@@ -1,442 +0,0 @@
-bin/aria_chk
-bin/aria_dump_log
-bin/aria_ftdump
-bin/aria_pack
-bin/aria_read_log
-%%INNOBASE%%bin/innochecksum
-%%INNOBASE%%bin/mariabackup
-bin/mariadb-backup
-bin/mariadb-dumpslow
-bin/mariadb-embedded
-bin/mariadb-fix-extensions
-bin/mariadb-install-db
-%%ROCKSDB%%bin/mariadb-ldb
-bin/mariadb-secure-installation
-bin/mariadb-tzinfo-to-sql
-bin/mariadb-upgrade
-bin/mariadbd-multi
-bin/mariadbd-safe
-bin/mariadbd-safe-helper
-bin/mariadb-waitpid
-%%INNOBASE%%bin/mbstream
-bin/my_print_defaults
-bin/myisam_ftdump
-bin/myisamchk
-bin/myisamlog
-bin/myisampack
-%%ROCKSDB%%bin/myrocks_hotbackup
-bin/mysql_client_test
-bin/mysql_client_test_embedded
-bin/mysql_embedded
-bin/mysql_fix_extensions
-bin/mysql_install_db
-%%ROCKSDB%%bin/mysql_ldb
-bin/mysql_plugin
-bin/mysql_secure_installation
-bin/mysql_tzinfo_to_sql
-bin/mysql_upgrade
-bin/mysql_waitpid
-bin/mysqld_multi
-bin/mysqld_safe
-bin/mysqld_safe_helper
-bin/mysqldumpslow
-@comment bin/mysqltest_embedded
-bin/perror
-bin/resolve_stack_dump
-bin/resolveip
-%%ROCKSDB%%bin/sst_dump
-@comment bin/test-connect-t
-%%TOKUDB%%bin/tokuft_logprint
-%%TOKUDB%%bin/tokuftdump
-%%WSREP%%bin/wsrep_sst_common
-%%WSREP%%bin/wsrep_sst_mariabackup
-%%WSREP%%bin/wsrep_sst_mysqldump
-%%WSREP%%bin/wsrep_sst_rsync
-%%WSREP%%bin/wsrep_sst_rsync_wan
-@sample %%ETCDIR%%/conf.d/server.cnf.sample
-%%WSREP%%%%ETCDIR%%/conf.d/wsrep.cnf.sample
-@sample %%ETCDIR%%/user_map.conf.sample
-@comment data/test/db.opt
-include/mysql/server/big_endian.h
-include/mysql/server/byte_order_generic.h
-include/mysql/server/byte_order_generic_x86.h
-include/mysql/server/byte_order_generic_x86_64.h
-include/mysql/server/decimal.h
-include/mysql/server/errmsg.h
-include/mysql/server/handler_ername.h
-include/mysql/server/handler_state.h
-include/mysql/server/json_lib.h
-include/mysql/server/keycache.h
-include/mysql/server/little_endian.h
-include/mysql/server/m_ctype.h
-include/mysql/server/m_string.h
-include/mysql/server/ma_dyncol.h
-include/mysql/server/my_alloc.h
-include/mysql/server/my_attribute.h
-include/mysql/server/my_byteorder.h
-include/mysql/server/my_compiler.h
-include/mysql/server/my_config.h
-include/mysql/server/my_dbug.h
-include/mysql/server/my_decimal_limits.h
-include/mysql/server/my_dir.h
-include/mysql/server/my_getopt.h
-include/mysql/server/my_global.h
-include/mysql/server/my_list.h
-include/mysql/server/my_net.h
-include/mysql/server/my_pthread.h
-include/mysql/server/my_sys.h
-include/mysql/server/my_valgrind.h
-include/mysql/server/my_xml.h
-include/mysql/server/mysql.h
-include/mysql/server/mysql/auth_dialog_client.h
-include/mysql/server/mysql/client_plugin.h
-include/mysql/server/mysql/plugin.h
-include/mysql/server/mysql/plugin_audit.h
-include/mysql/server/mysql/plugin_auth.h
-include/mysql/server/mysql/plugin_auth_common.h
-include/mysql/server/mysql/plugin_encryption.h
-include/mysql/server/mysql/plugin_ftparser.h
-include/mysql/server/mysql/plugin_password_validation.h
-include/mysql/server/mysql/psi/mysql_file.h
-include/mysql/server/mysql/psi/mysql_idle.h
-include/mysql/server/mysql/psi/mysql_socket.h
-include/mysql/server/mysql/psi/mysql_stage.h
-include/mysql/server/mysql/psi/mysql_statement.h
-include/mysql/server/mysql/psi/mysql_table.h
-include/mysql/server/mysql/psi/mysql_thread.h
-include/mysql/server/mysql/psi/psi.h
-include/mysql/server/mysql/psi/psi_abi_v0.h
-include/mysql/server/mysql/psi/psi_abi_v1.h
-include/mysql/server/mysql/psi/psi_abi_v2.h
-include/mysql/server/mysql/psi/psi_base.h
-include/mysql/server/mysql/psi/psi_memory.h
-include/mysql/server/mysql/service_base64.h
-include/mysql/server/mysql/service_debug_sync.h
-include/mysql/server/mysql/service_encryption.h
-include/mysql/server/mysql/service_encryption_scheme.h
-include/mysql/server/mysql/service_json.h
-include/mysql/server/mysql/service_kill_statement.h
-include/mysql/server/mysql/service_logger.h
-include/mysql/server/mysql/service_md5.h
-include/mysql/server/mysql/service_my_crypt.h
-include/mysql/server/mysql/service_my_print_error.h
-include/mysql/server/mysql/service_my_snprintf.h
-include/mysql/server/mysql/service_progress_report.h
-include/mysql/server/mysql/service_sha1.h
-include/mysql/server/mysql/service_sha2.h
-include/mysql/server/mysql/service_thd_alloc.h
-include/mysql/server/mysql/service_thd_autoinc.h
-include/mysql/server/mysql/service_thd_error_context.h
-include/mysql/server/mysql/service_thd_rnd.h
-include/mysql/server/mysql/service_thd_specifics.h
-include/mysql/server/mysql/service_thd_timezone.h
-include/mysql/server/mysql/service_thd_wait.h
-include/mysql/server/mysql/service_wsrep.h
-include/mysql/server/mysql/services.h
-include/mysql/server/mysql_com.h
-include/mysql/server/mysql_com_server.h
-include/mysql/server/mysql_embed.h
-include/mysql/server/mysql_time.h
-include/mysql/server/mysql_version.h
-include/mysql/server/mysqld_ername.h
-include/mysql/server/mysqld_error.h
-include/mysql/server/pack.h
-include/mysql/server/sql_common.h
-include/mysql/server/sql_state.h
-include/mysql/server/sslopt-case.h
-include/mysql/server/sslopt-longopts.h
-include/mysql/server/sslopt-vars.h
-include/mysql/server/typelib.h
-@comment lib/mysql/libmariadbclient.a
-lib/mysql/libmariadbd.a
-lib/mysql/libmariadbd.so
-lib/mysql/libmariadbd.so.19
-lib/mysql/libmysqld.a
-lib/mysql/libmysqld.so
-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_pam_tool_dir/auth_pam_tool
-lib/mysql/plugin/auth_pam_v1.so
-lib/mysql/plugin/caching_sha2_password.so
-lib/mysql/plugin/debug_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
-%%MROONGA%%lib/mysql/plugin/ha_mroonga.so
-%%OQGRAPH%%lib/mysql/plugin/ha_oqgraph.so
-%%ROCKSDB%%lib/mysql/plugin/ha_rocksdb.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/locales.so
-lib/mysql/plugin/metadata_lock_info.so
-lib/mysql/plugin/pam_user_map.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/server_audit.so
-lib/mysql/plugin/simple_password_check.so
-lib/mysql/plugin/sql_errlog.so
-lib/mysql/plugin/test_versioning.so
-%%WSREP%%lib/mysql/plugin/wsrep_info.so
-libexec/mariadbd
-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-backup.1.gz
-man/man1/mariadb-dumpslow.1.gz
-man/man1/mariadb-embedded.1.gz
-man/man1/mariadb-fix-extensions.1.gz
-man/man1/mariadb-install-db.1.gz
-%%ROCKSDB%%man/man1/mariadb-ldb.1.gz
-man/man1/mariadb-secure-installation.1.gz
-@comment man/man1/mariadb-service-convert.1.gz
-man/man1/mariadb-tzinfo-to-sql.1.gz
-man/man1/mariadb-upgrade.1.gz
-man/man1/mariadbd-multi.1.gz
-man/man1/mariadbd-safe-helper.1.gz
-man/man1/mariadbd-safe.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_fix_extensions.1.gz
-%%ROCKSDB%%man/man1/mysql_ldb.1.gz
-man/man1/mysql_install_db.1.gz
-man/man1/mysql_secure_installation.1.gz
-man/man1/mysql_tzinfo_to_sql.1.gz
-man/man1/mysql_upgrade.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/perror.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
-%%WSREP%%man/man1/wsrep_sst_common.1.gz
-%%WSREP%%man/man1/wsrep_sst_mariabackup.1.gz
-%%WSREP%%man/man1/wsrep_sst_mysqldump.1.gz
-%%WSREP%%man/man1/wsrep_sst_rsync.1.gz
-%%WSREP%%man/man1/wsrep_sst_rsync_wan.1.gz
-man/man8/mariadbd.8.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%%/hindi/errmsg.sys
-%%DATADIR%%/hungarian/errmsg.sys
-%%SPIDER%%%%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%%/mroonga/AUTHORS
-%%MROONGA%%%%DATADIR%%/mroonga/install.sql
-%%MROONGA%%%%DATADIR%%/mroonga/uninstall.sql
-%%DATADIR%%/mysql-log-rotate
-%%DATADIR%%/mysql.server
-%%DATADIR%%/mysql_performance_tables.sql
-%%DATADIR%%/mysql_system_tables.sql
-%%DATADIR%%/mysql_system_tables_data.sql
-%%DATADIR%%/mysql_test_data_timezone.sql
-%%DATADIR%%/mysql_test_db.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
-%%WSREP%%%%DATADIR%%/wsrep_notify
-@comment %%DOCSDIR%%/COPYING
-%%DOCSDIR%%/INSTALL-BINARY
-%%WSREP%%%%DOCSDIR%%/README-wsrep
-@comment %%DOCSDIR%%/THIRDPARTY
-@comment share/groonga-normalizer-mysql/lgpl-2.0.txt
-@comment share/groonga/COPYING
-@comment share/mysql/mroonga/COPYING
-%%MROONGA%%share/groonga-normalizer-mysql/README.md
-%%MROONGA%%share/groonga/README.md
-@comment bin/mariadb
-@comment bin/mariadb-access
-@comment bin/mariadb-admin
-@comment bin/mariadb-binlog
-@comment bin/mariadb-check
-@comment bin/mariadb-client-test
-@comment bin/mariadb-client-test-embedded
-@comment bin/mariadb-convert-table-format
-@comment bin/mariadb-dump
-@comment bin/mariadb-find-rows
-@comment bin/mariadb-hotcopy
-@comment bin/mariadb-import
-@comment bin/mariadb-plugin
-@comment bin/mariadb-setpermission
-@comment bin/mariadb-show
-@comment bin/mariadb-slap
-@comment bin/mariadb-test
-@comment bin/mariadb-test-embedded
-@comment bin/mariadb_config
-@comment bin/msql2mysql
-@comment bin/mysql
-@comment bin/mysql_config
-@comment bin/mysql_convert_table_format
-@comment bin/mysql_find_rows
-@comment bin/mysql_setpermission
-@comment bin/mysqlaccess
-@comment bin/mysqladmin
-@comment bin/mysqlbinlog
-@comment bin/mysqlcheck
-@comment bin/mysqldump
-@comment bin/mysqlhotcopy
-@comment bin/mysqlimport
-@comment bin/mysqlshow
-@comment bin/mysqlslap
-@comment bin/mysqltest
-@comment bin/mytop
-@comment bin/replace
-@comment include/mysql/errmsg.h
-@comment include/mysql/ma_list.h
-@comment include/mysql/ma_pvio.h
-@comment include/mysql/ma_tls.h
-@comment include/mysql/mariadb/ma_io.h
-@comment include/mysql/mariadb_com.h
-@comment include/mysql/mariadb_ctype.h
-@comment include/mysql/mariadb_dyncol.h
-@comment include/mysql/mariadb_rpl.h
-@comment include/mysql/mariadb_stmt.h
-@comment include/mysql/mariadb_version.h
-@comment include/mysql/my_config.h
-@comment include/mysql/my_global.h
-@comment include/mysql/my_sys.h
-@comment include/mysql/mysql.h
-@comment include/mysql/mysql/client_plugin.h
-@comment include/mysql/mysql/plugin_auth.h
-@comment include/mysql/mysql/plugin_auth_common.h
-@comment include/mysql/mysql_com.h
-@comment include/mysql/mysql_version.h
-@comment include/mysql/mysqld_error.h
-@comment lib/mysql/libmariadb.so
-@comment lib/mysql/libmariadb.so.3
-@comment lib/mysql/libmariadbclient.a
-@comment lib/mysql/libmysqlclient.a
-@comment lib/mysql/libmysqlclient.so
-@comment lib/mysql/libmysqlclient_r.a
-@comment lib/mysql/libmysqlclient_r.so
-@comment lib/mysql/plugin/auth_gssapi_client.so
-@comment lib/mysql/plugin/client_ed25519.so
-@comment lib/mysql/plugin/daemon_example.ini
-@comment lib/mysql/plugin/dialog.so
-@comment lib/mysql/plugin/mysql_clear_password.so
-@comment lib/mysql/plugin/sha256_password.so
-@comment libdata/pkgconfig/libmariadb.pc
-@comment man/man1/mariadb-access.1.gz
-@comment man/man1/mariadb-admin.1.gz
-@comment man/man1/mariadb-binlog.1.gz
-@comment man/man1/mariadb-check.1.gz
-@comment man/man1/mariadb-client-test-embedded.1.gz
-@comment man/man1/mariadb-client-test.1.gz
-@comment man/man1/mariadb-convert-table-format.1.gz
-@comment man/man1/mariadb-dump.1.gz
-@comment man/man1/mariadb-find-rows.1.gz
-@comment man/man1/mariadb-hotcopy.1.gz
-@comment man/man1/mariadb-import.1.gz
-@comment man/man1/mariadb-plugin.1.gz
-@comment man/man1/mariadb-service-convert.1.gz
-@comment man/man1/mariadb-setpermission.1.gz
-@comment man/man1/mariadb-show.1.gz
-@comment man/man1/mariadb-slap.1.gz
-@comment man/man1/mariadb-test-embedded.1.gz
-@comment man/man1/mariadb-test.1.gz
-man/man1/mariadb-waitpid.1.gz
-@comment man/man1/mariadb.1.gz
-@comment man/man1/msql2mysql.1.gz
-@comment man/man1/my_safe_process.1.gz
-@comment man/man1/mysql-stress-test.pl.1.gz
-@comment man/man1/mysql-test-run.pl.1.gz
-@comment man/man1/mysql.1.gz
-@comment man/man1/mysql_client_test.1.gz
-@comment man/man1/mysql_client_test_embedded.1.gz
-@comment man/man1/mysql_config.1.gz
-@comment man/man1/mysql_convert_table_format.1.gz
-@comment man/man1/mysql_embedded.1.gz
-@comment man/man1/mysql_find_rows.1.gz
-@comment man/man1/mysql_plugin.1.gz
-@comment man/man1/mysql_setpermission.1.gz
-@comment man/man1/mysql_waitpid.1.gz
-@comment man/man1/mysqlaccess.1.gz
-@comment man/man1/mysqladmin.1.gz
-@comment man/man1/mysqlbinlog.1.gz
-@comment man/man1/mysqlcheck.1.gz
-@comment man/man1/mysqldump.1.gz
-@comment man/man1/mysqlhotcopy.1.gz
-@comment man/man1/mysqlimport.1.gz
-@comment man/man1/mysqlshow.1.gz
-@comment man/man1/mysqlslap.1.gz
-@comment man/man1/mysqltest.1.gz
-@comment man/man1/mysqltest_embedded.1.gz
-@comment man/man1/replace.1.gz
-@comment share/pkgconfig/mariadb.pc
-@dir(%%MARIADB_USER%%,%%MARIADB_GROUP%%,) %%MARIADB_LOGDIR%%