diff --git a/Mk/Uses/mysql.mk b/Mk/Uses/mysql.mk
index 27d4418aa055b..e439940bc4436 100644
--- a/Mk/Uses/mysql.mk
+++ b/Mk/Uses/mysql.mk
@@ -74,6 +74,7 @@ MYSQL102m_LIBVER=	3
 MYSQL103m_LIBVER=	3
 MYSQL104m_LIBVER=	3
 MYSQL105m_LIBVER=	3
+MYSQL106m_LIBVER=	3
 
 # Setting/finding MySQL version we want.
 .if exists(${LOCALBASE}/bin/mysql)
diff --git a/databases/Makefile b/databases/Makefile
index 804feea3297a0..6ddadfc9b28f3 100644
--- a/databases/Makefile
+++ b/databases/Makefile
@@ -193,6 +193,8 @@
     SUBDIR += mariadb104-server
     SUBDIR += mariadb105-client
     SUBDIR += mariadb105-server
+    SUBDIR += mariadb106-client
+    SUBDIR += mariadb106-server
     SUBDIR += mdbtools
     SUBDIR += mdbx
     SUBDIR += mdcached
diff --git a/databases/mariadb106-client/Makefile b/databases/mariadb106-client/Makefile
new file mode 100644
index 0000000000000..bdcbee7baf475
--- /dev/null
+++ b/databases/mariadb106-client/Makefile
@@ -0,0 +1,12 @@
+# Created by: Bernard Spil <brnrd@FreeBSD.org>
+
+PORTNAME=	mariadb
+PKGNAMESUFFIX=	106-client
+
+COMMENT=	Multithreaded SQL database (client)
+
+MASTERDIR=	${.CURDIR}/../${PORTNAME}${PKGNAMESUFFIX:C/-client/-server/}
+
+PLIST=		${.CURDIR}/pkg-plist
+
+.include "${MASTERDIR}/Makefile"
diff --git a/databases/mariadb106-client/pkg-plist b/databases/mariadb106-client/pkg-plist
new file mode 100644
index 0000000000000..289f0e332aa5d
--- /dev/null
+++ b/databases/mariadb106-client/pkg-plist
@@ -0,0 +1,265 @@
+bin/mariadb
+bin/mariadb-access
+bin/mariadb-admin
+bin/mariadb-binlog
+bin/mariadb-check
+bin/mariadb-config
+bin/mariadb-conv
+bin/mariadb-convert-table-format
+bin/mariadb-dump
+@comment bin/mariadb-dumpslow
+bin/mariadb-find-rows
+bin/mariadb-hotcopy
+bin/mariadb-import
+bin/mariadb-plugin
+bin/mariadb-show
+@comment bin/mariadb-secure-installation
+bin/mariadb-setpermission
+bin/mariadb-slap
+bin/mariadb-test
+bin/mariadb-waitpid
+bin/mariadb_config
+bin/msql2mysql
+bin/mysql
+bin/mysql_config
+bin/mysql_convert_table_format
+bin/mysql_find_rows
+@comment bin/mysql_secure_installation
+bin/mysql_setpermission
+@comment bin/mysql_plugin
+@comment bin/mysql_waitpid
+bin/mysqlaccess
+bin/mysqladmin
+bin/mysqlbinlog
+bin/mysqlcheck
+bin/mysqldump
+@comment bin/mysqldumpslow
+bin/mysqlhotcopy
+bin/mysqlimport
+bin/mysqlshow
+bin/mysqlslap
+bin/mysqltest
+@comment bin/mytop
+bin/my_print_defaults
+bin/replace
+@sample %%ETCDIR%%/my.cnf.sample
+@sample %%ETCDIR%%/conf.d/client.cnf.sample
+include/mysql/errmsg.h
+include/mysql/ma_list.h
+include/mysql/ma_pvio.h
+include/mysql/ma_tls.h
+include/mysql/mariadb/ma_io.h
+include/mysql/mariadb_com.h
+include/mysql/mariadb_ctype.h
+include/mysql/mariadb_dyncol.h
+include/mysql/mariadb_rpl.h
+include/mysql/mariadb_stmt.h
+include/mysql/mariadb_version.h
+include/mysql/my_config.h
+include/mysql/my_global.h
+include/mysql/my_sys.h
+include/mysql/mysql.h
+include/mysql/mysql_com.h
+include/mysql/mysql_version.h
+include/mysql/mysql/client_plugin.h
+include/mysql/mysql/plugin_auth.h
+include/mysql/mysql/plugin_auth_common.h
+include/mysql/mysqld_error.h
+%%NO_GSSAPI_NONE%%lib/mysql/plugin/auth_gssapi_client.so
+lib/mysql/libmariadb.a
+lib/mysql/libmariadb.so
+lib/mysql/libmariadb.so.3
+lib/mysql/libmariadbclient.a
+lib/mysql/libmysqlclient.a
+lib/mysql/libmysqlclient.so
+lib/mysql/libmysqlclient_r.a
+lib/mysql/libmysqlclient_r.so
+lib/mysql/libmysqlservices.a
+lib/mysql/plugin/caching_sha2_password.so
+lib/mysql/plugin/client_ed25519.so
+lib/mysql/plugin/daemon_example.ini
+lib/mysql/plugin/dialog.so
+lib/mysql/plugin/mysql_clear_password.so
+lib/mysql/plugin/sha256_password.so
+libdata/pkgconfig/libmariadb.pc
+man/man1/mariadb.1.gz
+man/man1/mariadb-access.1.gz
+man/man1/mariadb-admin.1.gz
+man/man1/mariadb-binlog.1.gz
+man/man1/mariadb-check.1.gz
+man/man1/mariadb-client-test-embedded.1.gz
+man/man1/mariadb-client-test.1.gz
+man/man1/mariadb-convert-table-format.1.gz
+man/man1/mariadb_config.1.gz
+man/man1/mariadb-dump.1.gz
+@comment man/man1/mariadb-dumpslow.1.gz
+@comment man/man1/mariadb-embedded.1.gz
+man/man1/mariadb-find-rows.1.gz
+man/man1/mariadb-hotcopy.1.gz
+man/man1/mariadb-import.1.gz
+man/man1/mariadb-plugin.1.gz
+@comment man/man1/mariadb-secure-installation.1.gz
+man/man1/mariadb-setpermission.1.gz
+man/man1/mariadb-show.1.gz
+man/man1/mariadb-slap.1.gz
+man/man1/mariadb-test-embedded.1.gz
+man/man1/mariadb-test.1.gz
+@comment man/man1/mariadb-tzinfo-to-sql.1.gz
+@comment man/man1/mariadb-waitpid.1.gz
+man/man1/msql2mysql.1.gz
+man/man1/my_print_defaults.1.gz
+man/man1/my_safe_process.1.gz
+@comment man/man1/myisam_ftdump.1.gz
+@comment man/man1/myisamchk.1.gz
+@comment man/man1/myisamlog.1.gz
+@comment man/man1/myisampack.1.gz
+man/man1/mysql-stress-test.pl.1.gz
+man/man1/mysql-test-run.pl.1.gz
+man/man1/mysql.1.gz
+man/man1/mysql_client_test.1.gz
+man/man1/mysql_client_test_embedded.1.gz
+man/man1/mysql_config.1.gz
+man/man1/mysql_convert_table_format.1.gz
+man/man1/mysql_embedded.1.gz
+man/man1/mysql_find_rows.1.gz
+man/man1/mysql_plugin.1.gz
+@comment man/man1/mysql_secure_installation.1.gz
+man/man1/mysql_setpermission.1.gz
+@comment man/man1/mysql_tzinfo_to_sql.1.gz
+@comment man/man1/mysql_waitpid.1.gz
+man/man1/mysqlaccess.1.gz
+man/man1/mysqladmin.1.gz
+man/man1/mysqlbinlog.1.gz
+man/man1/mysqlcheck.1.gz
+man/man1/mysqldump.1.gz
+@comment man/man1/mysqldumpslow.1.gz
+man/man1/mysqlhotcopy.1.gz
+man/man1/mysqlimport.1.gz
+man/man1/mysqlshow.1.gz
+man/man1/mysqlslap.1.gz
+man/man1/mysqltest.1.gz
+man/man1/mysqltest_embedded.1.gz
+@comment man/man1/mytop.1.gz
+@comment man/man1/perror.1.gz
+man/man1/replace.1.gz
+@comment man/man1/resolve_stack_dump.1.gz
+man/man3/mariadb_cancel.3.gz
+man/man3/mariadb_connection.3.gz
+man/man3/mariadb_dyncol_check.3.gz
+man/man3/mariadb_dyncol_column_cmp_named.3.gz
+man/man3/mariadb_dyncol_column_count.3.gz
+man/man3/mariadb_dyncol_create_many_named.3.gz
+man/man3/mariadb_dyncol_create_many_num.3.gz
+man/man3/mariadb_dyncol_exists_named.3.gz
+man/man3/mariadb_dyncol_exists_num.3.gz
+man/man3/mariadb_dyncol_free.3.gz
+man/man3/mariadb_dyncol_list_named.3.gz
+man/man3/mariadb_dyncol_list_num.3.gz
+man/man3/mariadb_dyncol_unpack.3.gz
+man/man3/mariadb_dyncol_update_many_named.3.gz
+man/man3/mariadb_dyncol_update_many_num.3.gz
+man/man3/mariadb_get_infov.3.gz
+man/man3/mariadb_reconnect.3.gz
+man/man3/mariadb_rpl_close.3.gz
+man/man3/mariadb_rpl_fetch.3.gz
+man/man3/mariadb_rpl_get_optionsv.3.gz
+man/man3/mariadb_rpl_open.3.gz
+man/man3/mariadb_rpl_optionsv.3.gz
+man/man3/mariadb_stmt_execute_direct.3.gz
+man/man3/mariadb_stmt_fetch_fields.3.gz
+man/man3/mysql_affected_rows.3.gz
+man/man3/mysql_autocommit.3.gz
+man/man3/mysql_change_user.3.gz
+man/man3/mysql_close.3.gz
+man/man3/mysql_commit.3.gz
+man/man3/mysql_data_seek.3.gz
+man/man3/mysql_errno.3.gz
+man/man3/mysql_error.3.gz
+man/man3/mysql_fetch_field.3.gz
+man/man3/mysql_fetch_field_direct.3.gz
+man/man3/mysql_fetch_fields.3.gz
+man/man3/mysql_fetch_lengths.3.gz
+man/man3/mysql_fetch_row.3.gz
+man/man3/mysql_field_count.3.gz
+man/man3/mysql_field_seek.3.gz
+man/man3/mysql_field_tell.3.gz
+man/man3/mysql_free_result.3.gz
+man/man3/mysql_get_character_set_info.3.gz
+man/man3/mysql_get_client_info.3.gz
+man/man3/mysql_get_client_version.3.gz
+man/man3/mysql_get_host_info.3.gz
+man/man3/mysql_get_proto_info.3.gz
+man/man3/mysql_get_server_info.3.gz
+man/man3/mysql_get_server_version.3.gz
+man/man3/mysql_get_socket.3.gz
+man/man3/mysql_get_ssl_cipher.3.gz
+man/man3/mysql_hex_string.3.gz
+man/man3/mysql_info.3.gz
+man/man3/mysql_init.3.gz
+man/man3/mysql_kill.3.gz
+man/man3/mysql_more_results.3.gz
+man/man3/mysql_next_result.3.gz
+man/man3/mysql_num_fields.3.gz
+man/man3/mysql_num_rows.3.gz
+man/man3/mysql_options.3.gz
+man/man3/mysql_options4.3.gz
+man/man3/mysql_optionsv.3.gz
+man/man3/mysql_ping.3.gz
+man/man3/mysql_query.3.gz
+man/man3/mysql_read_query_result.3.gz
+man/man3/mysql_real_connect.3.gz
+man/man3/mysql_real_escape_string.3.gz
+man/man3/mysql_real_query.3.gz
+man/man3/mysql_refresh.3.gz
+man/man3/mysql_reset_connection.3.gz
+man/man3/mysql_rollback.3.gz
+man/man3/mysql_row_seek.3.gz
+man/man3/mysql_row_tell.3.gz
+man/man3/mysql_select_db.3.gz
+man/man3/mysql_send_query.3.gz
+man/man3/mysql_server_end.3.gz
+man/man3/mysql_server_init.3.gz
+man/man3/mysql_session_track_get_first.3.gz
+man/man3/mysql_session_track_get_next.3.gz
+man/man3/mysql_set_character_set.3.gz
+man/man3/mysql_set_server_option.3.gz
+man/man3/mysql_shutdown.3.gz
+man/man3/mysql_sqlstate.3.gz
+man/man3/mysql_ssl_set.3.gz
+man/man3/mysql_stat.3.gz
+man/man3/mysql_stmt_affected_rows.3.gz
+man/man3/mysql_stmt_attr_get.3.gz
+man/man3/mysql_stmt_attr_set.3.gz
+man/man3/mysql_stmt_bind_param.3.gz
+man/man3/mysql_stmt_bind_result.3.gz
+man/man3/mysql_stmt_close.3.gz
+man/man3/mysql_stmt_data_seek.3.gz
+man/man3/mysql_stmt_errno.3.gz
+man/man3/mysql_stmt_error.3.gz
+man/man3/mysql_stmt_execute.3.gz
+man/man3/mysql_stmt_fetch.3.gz
+man/man3/mysql_stmt_fetch_column.3.gz
+man/man3/mysql_stmt_field_count.3.gz
+man/man3/mysql_stmt_free_result.3.gz
+man/man3/mysql_stmt_init.3.gz
+man/man3/mysql_stmt_insert_id.3.gz
+man/man3/mysql_stmt_more_results.3.gz
+man/man3/mysql_stmt_next_result.3.gz
+man/man3/mysql_stmt_num_rows.3.gz
+man/man3/mysql_stmt_param_count.3.gz
+man/man3/mysql_stmt_param_metadata.3.gz
+man/man3/mysql_stmt_prepare.3.gz
+man/man3/mysql_stmt_reset.3.gz
+man/man3/mysql_stmt_result_metadata.3.gz
+man/man3/mysql_stmt_row_seek.3.gz
+man/man3/mysql_stmt_row_tell.3.gz
+man/man3/mysql_stmt_send_long_data.3.gz
+man/man3/mysql_stmt_sqlstate.3.gz
+man/man3/mysql_stmt_store_result.3.gz
+man/man3/mysql_stmt_warning_count.3.gz
+man/man3/mysql_store_result.3.gz
+man/man3/mysql_thread_end.3.gz
+man/man3/mysql_thread_id.3.gz
+man/man3/mysql_thread_init.3.gz
+man/man3/mysql_use_result.3.gz
+man/man3/mysql_warning_count.3.gz
diff --git a/databases/mariadb106-server/Makefile b/databases/mariadb106-server/Makefile
new file mode 100644
index 0000000000000..e5e6e26372b0d
--- /dev/null
+++ b/databases/mariadb106-server/Makefile
@@ -0,0 +1,289 @@
+# Created by: Bernard Spil <brnrd@FreeBSD.org>
+
+PORTNAME?=	mariadb
+PORTVERSION=	10.6.7
+PORTREVISION?=	0
+CATEGORIES=	databases
+MASTER_SITES=	http://mirrors.supportex.net/${SITESDIR}/ \
+		http://mirror2.hs-esslingen.de/pub/Mirrors/${SITESDIR}/ \
+		http://gd.tuwien.ac.at/db/${SITESDIR}/ \
+		http://mirrors.fe.up.pt/pub/${SITESDIR}/ \
+		http://mirror.de.gsnw.de:56431/${SITESDIR}/ \
+		http://mirror.layerjet.com/${SITESDIR}/ \
+		http://mirror.switch.ch/mirror/${SITESDIR}/ \
+		http://ftp.osuosl.org/pub/${SITESDIR}/
+PKGNAMESUFFIX?=	106-server
+
+MAINTAINER=	brnrd@FreeBSD.org
+COMMENT?=	Multithreaded SQL database (server)
+
+LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/COPYING
+
+BROKEN_riscv64=	fails to compile: needs FP_X_INV from empty sys/riscv/include/ieeefp.h
+
+LIB_DEPENDS+=	libpcre2-8.so:devel/pcre2
+
+# Ugly workaround for MariaDB/CMake library detection
+LDFLAGS+=	-L${LOCALBASE}/lib
+
+USES=		bison:build cmake:insource 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
+
+MARIADB_USER?=		mysql
+MARIADB_GROUP?=		mysql
+MARIADB_DBDIR?=		/var/db/mysql
+MARIADB_RUNDIR?=	/var/run/mysql
+MARIADB_SOCK?=		mysql.sock
+MARIADB_LOGDIR?=	/var/log/mysql
+
+USERS=			${MARIADB_USER}
+GROUPS=			${MARIADB_GROUP}
+
+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_DEFINE_aarch64=	WSREP
+OPTIONS_GROUP_COMPRESSION=	LZ4 LZO SNAPPY ZSTD
+OPTIONS_GROUP_ENGINES=	COLUMNSTORE INNOBASE MROONGA OQGRAPH ROCKSDB S3 SPHINX SPIDER
+OPTIONS_GROUP_GROONGA=	ZMQ MSGPACK
+OPTIONS_EXCLUDE_i386=	ROCKSDB
+
+COLUMNSTORE_DESC=	Columnar storage egine (BETA)
+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
+S3_DESC=	S3 storage engine (Alpha)
+SPHINX_DESC=	SphinxSE engine
+SPIDER_DESC=	Partitioning and XA-transactions engine
+WSREP_DESC=	Build wsrep clustering
+ZMQ_DESC=	ZeroMQ support
+ZSTD_DESC+=	Zstandard compression support (RocksDB only)
+.endif
+
+CMAKE_ARGS+=	-DCMAKE_PREFIX_PATH=${PREFIX} \
+		-DINSTALL_DOCDIR="share/doc/mysql" \
+		-DINSTALL_DOCREADMEDIR="share/doc/mysql" \
+		-DINSTALL_INFODIR="info" \
+		-DINSTALL_LIBDIR="lib/mysql" \
+		-DINSTALL_MYSQLDATADIR="${MARIADB_DBDIR}" \
+		-DINSTALL_MYSQLSHAREDIR="share/mysql" \
+		-DINSTALL_MYSQLTESTDIR= \
+		-DINSTALL_PLUGINDIR="lib/mysql/plugin" \
+		-DINSTALL_SBINDIR="libexec" \
+		-DINSTALL_SCRIPTDIR="bin" \
+		-DINSTALL_SQLBENCHDIR= \
+		-DINSTALL_SUPPORTFILESDIR="share/mysql" \
+		-DINSTALL_SYSCONFDIR="${ETCDIR}" \
+		-DINSTALL_SYSCONF2DIR="${ETCDIR}/conf.d" \
+		-DINSTALL_UNIX_ADDRDIR="${MARIADB_RUNDIR}/${MARIADB_SOCK}" \
+		-DWITH_PCRE=system \
+		-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" \
+		-DPLUGIN_AUTH_TEST_PLUGIN=NO
+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-46-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_RUNDIR="${MARIADB_RUNDIR}" \
+		MARIADB_SOCK="${MARIADB_SOCK}"
+
+.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
+
+.else # ! ${PKGNAMESUFFIX:M*-client}
+# MySQL-Server part
+USES+=		mysql:106m
+
+USE_LDCONFIG+=	${PREFIX}/lib/mysql/plugin
+USE_RC_SUBR=	mysql-server
+
+CMAKE_ON+=	CMAKE_SKIP_BUILD_RPATH WITH_EMBEDDED_SERVER
+CMAKE_OFF+=	WITH_CLIENT
+SUB_FILES+=	server.cnf.sample
+SUB_LIST+=	MARIADB_DBDIR="${MARIADB_DBDIR}" \
+		MARIADB_LOGDIR="${MARIADB_LOGDIR}" \
+		MARIADB_USER="${MARIADB_USER}"
+PLIST_SUB+=	MARIADB_LOGDIR="${MARIADB_LOGDIR}" \
+		MARIADB_USER="${MARIADB_USER}" \
+		MARIADB_GROUP="${MARIADB_GROUP}"
+
+.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
+#COLUMNSTORE_BROKEN=	fatal error: 'sys/sysinfo.h' file not found
+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
+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=	GSSAPI_BASE is not compatible with OpenSSL from ports. Use other GSSAPI options or OpenSSL from base system
+.endif
+
+.if ${ARCH} != amd64 && ${ARCH} != aarch64
+PLIST_SUB+=	WSREP="@comment "
+.endif
+
+#.if ${ARCH} == i386
+#USE_GCC=	9
+#CFLAGS+=	-DHAVE_GCC_C11_ATOMICS -latomic -DUSE_NEW_READLINE_INTERFACE
+#CXXFLAGS+=	-fpermissive
+#.endif
+
+post-patch:
+.if ${OPSYS} == DragonFly
+	${CP} ${WRKSRC}/cmake/os/FreeBSD.cmake \
+		${WRKSRC}/cmake/os/DragonFly.cmake
+.endif
+
+pre-configure:
+	${REINPLACE_CMD} 's|\(CHECK_LIBRARY_EXISTS.*\) "" HAVE_|\1 ${LOCALBASE}/lib HAVE_|' \
+		${WRKSRC}/cmake/pcre.cmake \
+		${WRKSRC}/storage/innobase/*.cmake
+
+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
+	${REINPLACE_CMD} 's|%%LOCALBASE%%|${PREFIX}|' \
+		${WRKSRC}/scripts/mysql_config.sh
+
+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 \
+		${STAGEDIR}${ETCDIR}/init.d \
+		${STAGEDIR}${PREFIX}/lib/mysql/pkgconfig
+
+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
+	${MV} ${STAGEDIR}${PREFIX}/share/user_map.conf \
+		${STAGEDIR}${PREFIX}/etc/mysql/user_map.conf.sample
+	${MV} ${STAGEDIR}${PREFIX}/share/pam_user_map.so \
+		${STAGEDIR}${PREFIX}/lib/mysql/
+	${RM} -r ${STAGEDIR}${PREFIX}/share/mysql/policy \
+		${STAGEDIR}${PREFIX}/include/mysql/server/private \
+		${STAGEDIR}${PREFIX}/lib/mysql/pkgconfig \
+		${STAGEDIR}/suite \
+		${STAGEDIR}${ETCDIR}/init.d \
+		${STAGEDIR}${ETCDIR}/logrotate.d \
+		${STAGEDIR}${DOCSDIR}/COPYING
+	${MKDIR} ${STAGEDIR}${MARIADB_LOGDIR}
+	${SED} '/%%/d;/^@comment /d;s/^/@comment /' ../${PORTNAME}${PKGNAMESUFFIX:S/-server/-client/}/pkg-plist \
+		>> ${TMPPLIST}
+
+post-install-MROONGA-on:
+	${MV} ${STAGEDIR}${PREFIX}/share/groonga ${STAGEDIR}${DOCSDIR}
+	${RM}	${STAGEDIR}${DOCSDIR}/groonga/COPYING \
+		${STAGEDIR}${DATADIR}/mroonga/COPYING
+
+post-install-SPIDER-on:
+	${MV} ${STAGEDIR}${ETCDIR}/conf.d/spider.cnf \
+		${STAGEDIR}${ETCDIR}/conf.d/spider.cnf.sample
+
+post-install-WSREP-on:
+	${MV} ${STAGEDIR}${DATADIR}/wsrep.cnf \
+		${STAGEDIR}${ETCDIR}/conf.d/wsrep.cnf.sample
+
+.endif # ${PKGNAMESUFFIX:M*-client}
+
+.include <bsd.port.mk>
diff --git a/databases/mariadb106-server/distinfo b/databases/mariadb106-server/distinfo
new file mode 100644
index 0000000000000..f825cab9228e1
--- /dev/null
+++ b/databases/mariadb106-server/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1645292669
+SHA256 (mariadb-10.6.7.tar.gz) = 75ee0f1f865a765fc461ab165419417a719e308faba784b2c97ecbe9e4b4b2c5
+SIZE (mariadb-10.6.7.tar.gz) = 85882896
diff --git a/databases/mariadb106-server/files/client.cnf.sample.in b/databases/mariadb106-server/files/client.cnf.sample.in
new file mode 100644
index 0000000000000..2513f6a04fb27
--- /dev/null
+++ b/databases/mariadb106-server/files/client.cnf.sample.in
@@ -0,0 +1,52 @@
+# 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%%/%%MARIADB_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/mariadb106-server/files/my.cnf.sample.in b/databases/mariadb106-server/files/my.cnf.sample.in
new file mode 100644
index 0000000000000..15dbc7e64da8a
--- /dev/null
+++ b/databases/mariadb106-server/files/my.cnf.sample.in
@@ -0,0 +1,13 @@
+#
+# 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/mariadb106-server/files/mysql-server.in b/databases/mariadb106-server/files/mysql-server.in
new file mode 100644
index 0000000000000..c4fd7307ca249
--- /dev/null
+++ b/databases/mariadb106-server/files/mysql-server.in
@@ -0,0 +1,149 @@
+#!/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):	Default to "%%MARIADB_DBDIR%%"
+#			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 "%%MARIADB_USER%%" created by the port
+# mysql_(instance_)?optfile (str): Server-specific option file.
+#			Default to "${mysql_dbdir}/my.cnf".
+# mysql_(instance)?rundir (str):	Default to "%%MARIADB_RUNDIR%%"
+# 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="%%MARIADB_DBDIR%%"}
+: ${mysql_optfile="%%ETCDIR%%/my.cnf"}
+: ${mysql_rundir="%%MARIADB_RUNDIR%%"}
+
+command="/usr/sbin/daemon"
+procname="%%PREFIX%%/libexec/mariadbd"
+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:-\"%%MARIADB_DBDIR%%_${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:-\"%%MARIADB_RUNDIR%%_${instance}/%%MARIADB_SOCK%%\"}"
+		eval mysql_optfile="\${mysql_${instance}_optfile:-\"%%ETCDIR%%_${instance}/my.cnf\"}"
+		eval mysql_pidfile="\${mysql_${instance}_pidfile:-\"%%MARIADB_RUNDIR%%_${instance}/mysqld.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:-"%%MARIADB_RUNDIR%%/mysqld.pid"}
+	fi
+fi
+
+pidfile=$mysql_pidfile
+mysql_install_db="%%PREFIX%%/bin/mariadb-install-db"
+mysql_install_db_args="--basedir=%%PREFIX%% --datadir=${mysql_dbdir} --force"
+command_args="-c -f %%PREFIX%%/bin/mariadbd-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 /usr/local/etc /etc/mysql /var/db/mysql; do
+		if [ -f "${dir}/my.cnf" ]; then
+			echo "Please merge existing ${dir}/my.cnf file with %%ETCDIR%%/conf.d/server.cnf"
+			return 1
+		fi
+	done
+	if [ ! -d "${mysql_dbdir}/mysql/." ]; then
+		mysql_create_auth_tables || return 1
+	fi
+	mysql_group="`/usr/bin/id -gn ${mysql_user}`"
+	[ "${mysql_socket}" = "" ] && mysql_rundir="%%MARIADB_RUNDIR%%" || mysql_rundir="`/usr/bin/dirname ${mysql_socket}`"
+	if [ ! -d "${mysql_rundir}" ]; then
+		install -d -o ${mysql_user} -g ${mysql_group} "${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
+	if [ ! -d "${mysql_rundir}" ]; then
+		install -d -u${mysql_user} -g$(id -gn $mysql_user) -m755 ${mysql_rundir}
+	fi
+}
+
+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/mariadb106-server/files/patch-include_m__ctype.h b/databases/mariadb106-server/files/patch-include_m__ctype.h
new file mode 100644
index 0000000000000..8e323646752eb
--- /dev/null
+++ b/databases/mariadb106-server/files/patch-include_m__ctype.h
@@ -0,0 +1,13 @@
+--- include/m_ctype.h.orig	2021-08-04 18:00:35 UTC
++++ include/m_ctype.h
+@@ -43,6 +43,10 @@ extern "C" {
+ 
+ #define CHARSET_DIR	"charsets/"
+ 
++#ifndef ulong
++typedef unsigned long ulong;
++#endif
++
+ #define my_wc_t ulong
+ 
+ #define MY_CS_REPLACEMENT_CHARACTER 0xFFFD
diff --git a/databases/mariadb106-server/files/patch-mysys_crc32_crc32c.cc b/databases/mariadb106-server/files/patch-mysys_crc32_crc32c.cc
new file mode 100644
index 0000000000000..445fd0e978656
--- /dev/null
+++ b/databases/mariadb106-server/files/patch-mysys_crc32_crc32c.cc
@@ -0,0 +1,24 @@
+--- mysys/crc32/crc32c.cc.orig	2021-08-04 18:00:35 UTC
++++ mysys/crc32/crc32c.cc
+@@ -543,6 +543,21 @@ static int arch_ppc_probe(void) {
+ 
+   return arch_ppc_crc32;
+ }
++#elif __FreeBSD__
++#include <machine/cpu.h>
++#include <sys/auxv.h>
++#include <sys/elf_common.h>
++static int arch_ppc_probe(void) {
++  unsigned long cpufeatures;
++  arch_ppc_crc32 = 0;
++
++#if defined(__powerpc64__)
++  elf_aux_info(AT_HWCAP2, &cpufeatures, sizeof(cpufeatures));
++  if (cpufeatures & PPC_FEATURE2_HAS_VEC_CRYPTO) arch_ppc_crc32 = 1;
++#endif  /* __powerpc64__ */
++
++  return arch_ppc_crc32;
++}
+ #endif  // __linux__
+ #endif
+ 
diff --git a/databases/mariadb106-server/files/patch-scripts_mysql__config.sh b/databases/mariadb106-server/files/patch-scripts_mysql__config.sh
new file mode 100644
index 0000000000000..334353a99b4ce
--- /dev/null
+++ b/databases/mariadb106-server/files/patch-scripts_mysql__config.sh
@@ -0,0 +1,10 @@
+--- scripts/mysql_config.sh.orig	2021-07-07 20:25:20 UTC
++++ scripts/mysql_config.sh
+@@ -88,6 +88,7 @@ fi
+ # Create options 
+ libs="-L$pkglibdir @RPATH_OPTION@ @LIBS_FOR_CLIENTS@"
+ embedded_libs="-L$pkglibdir @RPATH_OPTION@ @EMB_LIBS_FOR_CLIENTS@"
++embedded_libs="$embedded_libs -L/usr/local/lib "
+ 
+ include="-I$pkgincludedir"
+ if [ "$basedir" != "/usr" ]; then
diff --git a/databases/mariadb106-server/files/patch-storage_columnstore_columnstore_utils_common_threadnaming.cpp b/databases/mariadb106-server/files/patch-storage_columnstore_columnstore_utils_common_threadnaming.cpp
new file mode 100644
index 0000000000000..da71156da758f
--- /dev/null
+++ b/databases/mariadb106-server/files/patch-storage_columnstore_columnstore_utils_common_threadnaming.cpp
@@ -0,0 +1,24 @@
+--- storage/columnstore/columnstore/utils/common/threadnaming.cpp.orig	2021-08-04 18:07:21 UTC
++++ storage/columnstore/columnstore/utils/common/threadnaming.cpp
+@@ -22,13 +22,21 @@ namespace utils
+ {
+     void setThreadName(const char *threadName)
+     {
++#ifdef __FreeBSD__
++        pthread_set_name_np(pthread_self(), threadName);
++#else
+         prctl(PR_SET_NAME, threadName, 0, 0, 0);
++#endif
+     }
+ 
+     std::string getThreadName()
+     {
+       char buf[32];
++#ifdef __FreeBSD__
++      pthread_get_name_np(pthread_self(), buf, sizeof(buf));
++#else
+       prctl(PR_GET_NAME, buf, 0, 0, 0);
++#endif
+       return std::string(buf);
+     }
+ } // end of namespace
diff --git a/databases/mariadb106-server/files/patch-storage_rocksdb_rocksdb_port_jemalloc__helper.h b/databases/mariadb106-server/files/patch-storage_rocksdb_rocksdb_port_jemalloc__helper.h
new file mode 100644
index 0000000000000..dab7177b65b8f
--- /dev/null
+++ b/databases/mariadb106-server/files/patch-storage_rocksdb_rocksdb_port_jemalloc__helper.h
@@ -0,0 +1,13 @@
+--- storage/rocksdb/rocksdb/port/jemalloc_helper.h.orig	2020-06-23 15:10:17 UTC
++++ storage/rocksdb/rocksdb/port/jemalloc_helper.h
+@@ -26,6 +26,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/mariadb106-server/files/patch-tpool_CMakeLists.txt b/databases/mariadb106-server/files/patch-tpool_CMakeLists.txt
new file mode 100644
index 0000000000000..5ab7d5de3dd2a
--- /dev/null
+++ b/databases/mariadb106-server/files/patch-tpool_CMakeLists.txt
@@ -0,0 +1,8 @@
+--- tpool/CMakeLists.txt.orig	2020-06-23 15:10:18 UTC
++++ tpool/CMakeLists.txt
+@@ -1,4 +1,5 @@
+ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR} ${PROJECT_SOURCE_DIR}/include)
++ADD_DEFINITIONS(-fPIC)
+ IF(WIN32)
+   SET(EXTRA_SOURCES tpool_win.cc aio_win.cc)
+ ELSEIF(CMAKE_SYSTEM_NAME STREQUAL "Linux")
diff --git a/databases/mariadb106-server/files/pkg-message.in b/databases/mariadb106-server/files/pkg-message.in
new file mode 100644
index 0000000000000..189a27624f5df
--- /dev/null
+++ b/databases/mariadb106-server/files/pkg-message.in
@@ -0,0 +1,24 @@
+[
+{ 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.
+The rc(8) script no longer uses /var/db/mysql/my.cnf for configuration
+nor /var/db/mysql for logs and PID-file.
+
+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
+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/mariadb106-server/files/server.cnf.sample.in b/databases/mariadb106-server/files/server.cnf.sample.in
new file mode 100644
index 0000000000000..9e84965c76795
--- /dev/null
+++ b/databases/mariadb106-server/files/server.cnf.sample.in
@@ -0,0 +1,60 @@
+# 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%%/mysql.sock # inherited from %%ETCDIR%%/my.cnf
+bind-address			= 127.0.0.1
+basedir				= %%PREFIX%%
+datadir				= %%MARIADB_DBDIR%%
+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 			= %%MARIADB_DBDIR%%/data
+# innodb_log_group_home_dir	= %%MARIADB_DBDIR%%/log
+# audit_log_file		= %%MARIADB_DBDIR%%/log/audit.log
+# general_log_file		= %%MARIADB_DBDIR%%/log/general.log
+# log_bin			= %%MARIADB_DBDIR%%/log/mysql-bin
+# relay_log			= %%MARIADB_DBDIR%%/log/relay-log
+# slow_query_log_file		= %%MARIADB_DBDIR%%/log/slow.log
+# innodb_doublewrite		= 0
+# innodb_flush_method		= O_DSYNC
+
+# Options read by `mariadb_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/mariadb106-server/pkg-descr b/databases/mariadb106-server/pkg-descr
new file mode 100644
index 0000000000000..874d96eeaa955
--- /dev/null
+++ b/databases/mariadb106-server/pkg-descr
@@ -0,0 +1,14 @@
+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/mariadb106-server/pkg-plist b/databases/mariadb106-server/pkg-plist
new file mode 100644
index 0000000000000..bc9b805a676ce
--- /dev/null
+++ b/databases/mariadb106-server/pkg-plist
@@ -0,0 +1,347 @@
+bin/aria_chk
+bin/aria_dump_log
+bin/aria_ftdump
+bin/aria_pack
+bin/aria_read_log
+%%S3%%bin/aria_s3_copy
+%%INNOBASE%%bin/innochecksum
+%%INNOBASE%%bin/mariabackup
+bin/mariadb-backup
+bin/mariadb-client-test
+bin/mariadb-client-test-embedded
+bin/mariadb-dumpslow
+bin/mariadb-embedded
+bin/mariadb-fix-extensions
+bin/mariadb-install-db
+%%ROCKSDB%%bin/mariadb-ldb
+bin/mariadb-secure-installation
+bin/mariadb-test-embedded
+bin/mariadb-tzinfo-to-sql
+bin/mariadb-upgrade
+bin/mariadbd-multi
+bin/mariadbd-safe
+bin/mariadbd-safe-helper
+%%INNOBASE%%bin/mbstream
+bin/myisam_ftdump
+bin/myisamchk
+bin/myisamlog
+bin/myisampack
+@comment bin/mytop
+%%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
+bin/mysqltest_embedded
+bin/perror
+bin/resolve_stack_dump
+bin/resolveip
+%%ROCKSDB%%bin/sst_dump
+bin/test-connect-t
+%%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
+@comment %%ETCDIR%%/conf.d/client.cnf
+%%ETCDIR%%/conf.d/enable_encryption.preset
+%%ETCDIR%%/conf.d/mysql-clients.cnf
+%%S3%%%%ETCDIR%%/conf.d/s3.cnf
+@comment %%ETCDIR%%/server.cnf
+@sample %%ETCDIR%%/conf.d/server.cnf.sample
+@sample %%ETCDIR%%/conf.d/spider.cnf.sample
+%%WSREP%%@sample %%ETCDIR%%/conf.d/wsrep.cnf.sample
+@comment %%ETCDIR%%/my.cnf
+@sample %%ETCDIR%%/user_map.conf.sample
+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_data_type.h
+include/mysql/server/mysql/plugin_encryption.h
+include/mysql/server/mysql/plugin_ftparser.h
+include/mysql/server/mysql/plugin_function.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_mdl.h
+include/mysql/server/mysql/psi/mysql_memory.h
+include/mysql/server/mysql/psi/mysql_ps.h
+include/mysql/server/mysql/psi/mysql_socket.h
+include/mysql/server/mysql/psi/mysql_sp.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/mysql_transaction.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_mdl.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
+lib/mysql/libmariadbd.a
+lib/mysql/libmariadbd.so
+lib/mysql/libmariadbd.so.19
+lib/mysql/libmysqld.a
+lib/mysql/libmysqld.so
+lib/mysql/pam_user_map.so
+lib/mysql/plugin/adt_null.so
+lib/mysql/plugin/auth_0x0100.so
+lib/mysql/plugin/auth_ed25519.so
+@comment lib/mysql/plugin/auth_gssapi_client.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/debug_key_management.so
+lib/mysql/plugin/file_key_management.so
+lib/mysql/plugin/func_test.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
+%%S3%%lib/mysql/plugin/ha_s3.so
+%%SPHINX%%lib/mysql/plugin/ha_sphinx.so
+%%SPIDER%%lib/mysql/plugin/ha_spider.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/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_sql_service.so
+lib/mysql/plugin/test_versioning.so
+lib/mysql/plugin/type_mysql_json.so
+lib/mysql/plugin/type_test.so
+%%WSREP%%lib/mysql/plugin/wsrep_info.so
+libexec/mariadbd
+libexec/mysqld
+libexec/rcmysql
+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
+%%S3%%man/man1/aria_s3_copy.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-conv.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
+man/man1/mariadb-service-convert.1.gz
+man/man1/mariadb-tzinfo-to-sql.1.gz
+man/man1/mariadb-upgrade.1.gz
+man/man1/mariadb-waitpid.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/myisam_ftdump.1.gz
+man/man1/myisamchk.1.gz
+man/man1/myisamlog.1.gz
+man/man1/myisampack.1.gz
+%%ROCKSDB%%man/man1/myrocks_hotbackup.1.gz
+@comment man/man1/mytop.1.gz
+man/man1/mysql.server.1.gz
+man/man1/mysql_fix_extensions.1.gz
+man/man1/mysql_install_db.1.gz
+%%ROCKSDB%%man/man1/mysql_ldb.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/mysql_waitpid.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
+%%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
+share/aclocal/mysql.m4
+%%PORTDOCS%%%%DOCSDIR%%/CREDITS
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL-BINARY
+%%PORTDOCS%%%%WSREP%%%%DOCSDIR%%/README-wsrep
+%%PORTDOCS%%%%DOCSDIR%%/README.md
+%%PORTDOCS%%%%DOCSDIR%%/THIRDPARTY
+%%MROONGA%%%%PORTDOCS%%%%DOCSDIR%%/groonga/README.md
+%%MROONGA%%share/groonga-normalizer-mysql/README.md
+%%MROONGA%%share/groonga-normalizer-mysql/lgpl-2.0.txt
+%%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
+%%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_sys_schema.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
+@comment %%DATADIR%%/wsrep.cnf
+%%WSREP%%%%DATADIR%%/wsrep_notify
+@dir(%%MARIADB_USER%%,%%MARIADB_GROUP%%,) %%MARIADB_LOGDIR%%
+