Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 11 Jul 2020 20:17:08 +0000 (UTC)
From:      Bernard Spil <brnrd@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r542046 - in head/databases: . mariadb105-client mariadb105-server mariadb105-server/files
Message-ID:  <202007112017.06BKH8KZ023248@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: brnrd
Date: Sat Jul 11 20:17:08 2020
New Revision: 542046
URL: https://svnweb.freebsd.org/changeset/ports/542046

Log:
  databases/mariadb105-server: New port MariaDB 10.5
  
  PR:		247535
  Reported by:	VVD <vvd unislabs com>

Added:
  head/databases/mariadb105-client/
     - copied from r541970, head/databases/mariadb104-client/
  head/databases/mariadb105-server/
     - copied from r542045, head/databases/mariadb104-server/
  head/databases/mariadb105-server/files/patch-extra_CMakeLists.txt   (contents, props changed)
  head/databases/mariadb105-server/files/patch-storage_perfschema_my__thread.h   (contents, props changed)
  head/databases/mariadb105-server/files/patch-storage_rocksdb_rocksdb_port_jemalloc__helper.h   (contents, props changed)
  head/databases/mariadb105-server/files/patch-tpool_CMakeLists.txt   (contents, props changed)
Deleted:
  head/databases/mariadb105-server/files/patch-CMakeLists.txt
  head/databases/mariadb105-server/files/patch-MDEV-11790
  head/databases/mariadb105-server/files/patch-MDEV-15961
  head/databases/mariadb105-server/files/patch-MDEV-20248
  head/databases/mariadb105-server/files/patch-cmake_install__layout.cmake
  head/databases/mariadb105-server/files/patch-libmariadb_include_CMakeLists.txt
  head/databases/mariadb105-server/files/patch-libmariadb_libmariadb_CMakeLists.txt
  head/databases/mariadb105-server/files/patch-libmariadb_plugins_auth_CMakeLists.txt
  head/databases/mariadb105-server/files/patch-libservices_CMakeLists.txt
  head/databases/mariadb105-server/files/patch-mysys_my__default.c
  head/databases/mariadb105-server/files/patch-oqgraph-MDEV-15291
  head/databases/mariadb105-server/files/patch-pcre_CMakeLists.txt
  head/databases/mariadb105-server/files/patch-plugin_auth__pam_testing_CMakeLists.txt
  head/databases/mariadb105-server/files/patch-scripts_mysqld__safe.sh
  head/databases/mariadb105-server/files/patch-sql_mysqld.cc
  head/databases/mariadb105-server/files/patch-storage_innobase_lz4.cmake
  head/databases/mariadb105-server/files/patch-storage_innobase_lzo.cmake
  head/databases/mariadb105-server/files/patch-storage_innobase_snappy.cmake
  head/databases/mariadb105-server/files/patch-storage_mroonga_vendor_groonga_CMakeLists.txt
  head/databases/mariadb105-server/files/patch-storage_rocksdb_build__rocksdb.cmake
  head/databases/mariadb105-server/files/patch-storage_tokudb_CMakeLists.txt
  head/databases/mariadb105-server/files/patch-storage_tokudb_PerconaFT_CMakeLists.txt
  head/databases/mariadb105-server/files/patch-storage_tokudb_PerconaFT_cmake__modules_TokuThirdParty.cmake
  head/databases/mariadb105-server/files/patch-storage_tokudb_PerconaFT_portability_memory.cc
  head/databases/mariadb105-server/files/patch-support-files_CMakeLists.txt
Modified:
  head/databases/Makefile
  head/databases/mariadb105-client/Makefile
  head/databases/mariadb105-client/pkg-plist
  head/databases/mariadb105-server/Makefile
  head/databases/mariadb105-server/distinfo
  head/databases/mariadb105-server/files/client.cnf.sample.in
  head/databases/mariadb105-server/files/mysql-server.in
  head/databases/mariadb105-server/files/patch-scripts_mysql__config.sh
  head/databases/mariadb105-server/files/patch-storage_mroonga_CMakeLists.txt
  head/databases/mariadb105-server/files/pkg-message.in
  head/databases/mariadb105-server/pkg-plist

Modified: head/databases/Makefile
==============================================================================
--- head/databases/Makefile	Sat Jul 11 19:31:06 2020	(r542045)
+++ head/databases/Makefile	Sat Jul 11 20:17:08 2020	(r542046)
@@ -179,6 +179,8 @@
     SUBDIR += mariadb103-server
     SUBDIR += mariadb104-client
     SUBDIR += mariadb104-server
+    SUBDIR += mariadb105-client
+    SUBDIR += mariadb105-server
     SUBDIR += mdbtools
     SUBDIR += mdcached
     SUBDIR += memcached

Modified: head/databases/mariadb105-client/Makefile
==============================================================================
--- head/databases/mariadb104-client/Makefile	Sat Jul 11 13:09:10 2020	(r541970)
+++ head/databases/mariadb105-client/Makefile	Sat Jul 11 20:17:08 2020	(r542046)
@@ -2,14 +2,12 @@
 # $FreeBSD$
 
 PORTNAME=	mariadb
-PKGNAMESUFFIX=	104-client
+PKGNAMESUFFIX=	105-client
 
 COMMENT=	Multithreaded SQL database (client)
 
 MASTERDIR=	${.CURDIR}/../${PORTNAME}${PKGNAMESUFFIX:C/-client/-server/}
 
 PLIST=		${.CURDIR}/pkg-plist
-
-CONFLICTS_INSTALL=	databases/mytop
 
 .include "${MASTERDIR}/Makefile"

Modified: head/databases/mariadb105-client/pkg-plist
==============================================================================
--- head/databases/mariadb104-client/pkg-plist	Sat Jul 11 13:09:10 2020	(r541970)
+++ head/databases/mariadb105-client/pkg-plist	Sat Jul 11 20:17:08 2020	(r542046)
@@ -3,23 +3,24 @@ bin/mariadb-access
 bin/mariadb-admin
 bin/mariadb-binlog
 bin/mariadb-check
-bin/mariadb-convert-table-format
+bin/mariadb-config
+bin/mariadb-conv
 bin/mariadb-dump
 bin/mariadb-find-rows
-bin/mariadb-hotcopy
 bin/mariadb-import
+@comment bin/mysql_install_db
 bin/mariadb-plugin
-bin/mariadb-setpermission
 bin/mariadb-show
 bin/mariadb-slap
-@comment bin/mariadb-test
-@comment bin/mariadb-waitpid
+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
@@ -32,12 +33,17 @@ bin/mysqlhotcopy
 bin/mysqlimport
 bin/mysqlshow
 bin/mysqlslap
-@comment bin/mysqltest
-bin/mytop
-bin/replace
+bin/mysqltest
+@comment bin/mytop
+bin/my_print_defaults
 @comment bin/wsrep_sst_rsync_wan
 @sample %%ETCDIR%%/my.cnf.sample
 @sample %%ETCDIR%%/conf.d/client.cnf.sample
+@comment %%ETCDIR%%/conf.d/enable_encryption.preset
+@comment %%ETCDIR%%/conf.d/mysql-clients.cnf
+@comment %%ETCDIR%%/conf.d/server.cnf
+@comment %%ETCDIR%%/init.d/mysql
+@comment %%ETCDIR%%/logrotate.d/mysql
 include/mysql/errmsg.h
 include/mysql/ma_list.h
 include/mysql/ma_pvio.h
@@ -67,13 +73,16 @@ lib/mysql/libmysqlclient.a
 lib/mysql/libmysqlclient.so
 lib/mysql/libmysqlclient_r.a
 lib/mysql/libmysqlclient_r.so
-@comment lib/mysql/plugin/caching_sha2_password.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
+libdata/pkgconfig/mariadb.pc
+@comment libexec/rcmysql
 @comment man/man1/aria_chk.1.gz
 @comment man/man1/aria_dump_log.1.gz
 @comment man/man1/aria_ftdump.1.gz
@@ -89,9 +98,11 @@ man/man1/mariadb-admin.1.gz
 @comment man/man1/mariadb-backup.1.gz
 man/man1/mariadb-binlog.1.gz
 man/man1/mariadb-check.1.gz
-@comment man/man1/mariadb-client-test-embedded.1.gz
-@comment man/man1/mariadb-client-test.1.gz
+man/man1/mariadb-client-test-embedded.1.gz
+man/man1/mariadb-client-test.1.gz
+man/man1/mariadb-conv.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
@@ -103,36 +114,36 @@ man/man1/mariadb-import.1.gz
 @comment man/man1/mariadb-ldb.1.gz
 man/man1/mariadb-plugin.1.gz
 @comment man/man1/mariadb-secure-installation.1.gz
-@comment man/man1/mariadb-service-convert.1.gz
+man/man1/mariadb-service-convert.1.gz
 man/man1/mariadb-setpermission.1.gz
 man/man1/mariadb-show.1.gz
 man/man1/mariadb-slap.1.gz
-@comment man/man1/mariadb-test-embedded.1.gz
-@comment man/man1/mariadb-test.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-upgrade.1.gz
 @comment man/man1/mariadb-waitpid.1.gz
 @comment man/man1/mariadbd-multi.1.gz
 @comment man/man1/mariadbd-safe-helper.1.gz
 @comment man/man1/mariadbd-safe.1.gz
-@comment man/man8/mariadbd.8.gz
-man/man1/msql2mysql.1.gz
 @comment man/man1/mbstream.1.gz
-@comment man/man1/my_print_defaults.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
+@comment man/man1/myrocks_hotbackup.1.gz
 man/man1/mysql-stress-test.pl.1.gz
 man/man1/mysql-test-run.pl.1.gz
 man/man1/mysql.1.gz
 @comment man/man1/mysql.server.1.gz
-@comment man/man1/mysql_client_test.1.gz
-@comment man/man1/mysql_client_test_embedded.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
-@comment man/man1/mysql_embedded.1.gz
+man/man1/mysql_embedded.1.gz
 man/man1/mysql_find_rows.1.gz
 @comment man/man1/mysql_fix_extensions.1.gz
 @comment man/man1/mysql_install_db.1.gz
@@ -142,7 +153,7 @@ man/man1/mysql_plugin.1.gz
 man/man1/mysql_setpermission.1.gz
 @comment man/man1/mysql_tzinfo_to_sql.1.gz
 @comment man/man1/mysql_upgrade.1.gz
-man/man1/mysql_waitpid.1.gz
+@comment man/man1/mysql_waitpid.1.gz
 man/man1/mysqlaccess.1.gz
 man/man1/mysqladmin.1.gz
 man/man1/mysqlbinlog.1.gz
@@ -156,8 +167,9 @@ man/man1/mysqlhotcopy.1.gz
 man/man1/mysqlimport.1.gz
 man/man1/mysqlshow.1.gz
 man/man1/mysqlslap.1.gz
-@comment man/man1/mysqltest.1.gz
-@comment man/man1/mysqltest_embedded.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
@@ -167,6 +179,7 @@ man/man1/replace.1.gz
 @comment man/man1/wsrep_sst_mysqldump.1.gz
 @comment man/man1/wsrep_sst_rsync.1.gz
 @comment man/man1/wsrep_sst_rsync_wan.1.gz
+@comment man/man8/mariadbd.8.gz
 @comment man/man8/mysqld.8.gz
-libdata/pkgconfig/mariadb.pc
+share/aclocal/mysql.m4
 @dir(%%MARIADB_USER%%,%%MARIADB_GROUP%%,) %%MARIADB_RUNDIR%%

Modified: head/databases/mariadb105-server/Makefile
==============================================================================
--- head/databases/mariadb104-server/Makefile	Sat Jul 11 19:31:06 2020	(r542045)
+++ head/databases/mariadb105-server/Makefile	Sat Jul 11 20:17:08 2020	(r542046)
@@ -2,8 +2,8 @@
 # $FreeBSD$
 
 PORTNAME?=	mariadb
-PORTVERSION=	10.4.13
-PORTREVISION?=	3
+PORTVERSION=	10.5.4
+PORTREVISION?=	0
 CATEGORIES=	databases
 MASTER_SITES=	http://mirrors.supportex.net/${SITESDIR}/ \
 		http://mirror2.hs-esslingen.de/pub/Mirrors/${SITESDIR}/ \
@@ -13,7 +13,7 @@ MASTER_SITES=	http://mirrors.supportex.net/${SITESDIR}
 		http://mirror.layerjet.com/${SITESDIR}/ \
 		http://mirror.switch.ch/mirror/${SITESDIR}/ \
 		http://ftp.osuosl.org/pub/${SITESDIR}/
-PKGNAMESUFFIX?=	104-server
+PKGNAMESUFFIX?=	105-server
 
 MAINTAINER=	brnrd@FreeBSD.org
 COMMENT?=	Multithreaded SQL database (server)
@@ -26,24 +26,21 @@ LICENSE_PERMS_PerconaFT=	dist-mirror dist-sell pkg-mir
 
 BROKEN_i386=	compile error: undeclared identifier 'my_atomic_add32'
 
-USES=		bison:build cmake:insource,noninja compiler:c++11-lib cpe iconv:translit libedit ncurses shebangfix ssl
+LIB_DEPENDS+=	libpcre2-8.so:devel/pcre2
 
+# Ugly workaround for MariaDB/CMake library detection
+CFLAGS+=	-L/usr/local/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
-ETCDIR=		${PREFIX}/etc/mysql
 
-MARIADB_USER?=	mysql
-MARIADB_GROUP?=	mysql
-
-MARIADB_RUNDIR?=	/var/run/mysql
-MARIADB_LOGDIR?=	/var/log/mysql
-
 OPTIONS_SINGLE=		GSSAPI
 OPTIONS_SINGLE_GSSAPI=	GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE
 OPTIONS_DEFAULT=	GSSAPI_BASE
@@ -55,10 +52,11 @@ 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_ENGINES=	COLUMNSTORE INNOBASE MROONGA OQGRAPH ROCKSDB S3 SPHINX SPIDER
 OPTIONS_GROUP_GROONGA=	ZMQ MSGPACK
-OPTIONS_EXCLUDE_i386=	ROCKSDB TOKUDB
+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
@@ -67,33 +65,32 @@ 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)
+ROCKSDB_DESC=	RocksDB LSM engine
+S3_DESC=	S3 storage 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" \
+CMAKE_ARGS+=	-DCMAKE_PREFIX_PATH=${PREFIX} \
+		-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_SYSCONFDIR="${ETCDIR}" \
+		-DINSTALL_SYSCONF2DIR="${ETCDIR}/conf.d" \
 		-DINSTALL_UNIX_ADDRDIR="${MARIADB_RUNDIR}" \
+		-DWITH_PCRE=system \
 		-DWITH_SSL="${OPENSSLBASE}" \
 		-DCURSES_CURSES_LIBRARY="/usr/lib/libcurses.so" \
 		-DCURSES_FORM_LIBRARY="/usr/lib/libform.so" \
@@ -101,16 +98,21 @@ CMAKE_ARGS+=	-DINSTALL_DOCDIR="share/doc/mysql" \
 		-DKRB5_CONFIG="${KRB5CONFIG}" \
 		-DCURSES_NCURSES_LIBRARY="${NCURSESLIB}/libncurses.so" \
 		-DCOMPILATION_COMMENT="FreeBSD Ports" \
-		-DCMAKE_PREFIX_PATH=${PREFIX}
+		-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
+		EXAMPLE EXAMPLE_KEY_MANAGEMENT FTEXAMPLE TOKUDB
 
 DATADIR=	${PREFIX}/share/mysql
 ETCDIR=		${PREFIX}/etc/mysql
 
-CONFLICTS_INSTALL=	mariadb10[0-24-9]-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \
+MARIADB_RUNDIR?=	/var/run/mysql
+MARIADB_LOGDIR?=	/var/log/mysql
+MARIADB_USER?=		mysql
+MARIADB_GROUP?=		mysql
+
+CONFLICTS_INSTALL=	mariadb10[0-35-9]-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \
 			mysql[0-9]*-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \
 			mysqlwsrep* \
 			percona[0-9]*-${PKGNAMESUFFIX:C/^[0-9]*-//}-*
@@ -121,11 +123,12 @@ 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}"
-PLIST_SUB+=		MARIADB_USER="${MARIADB_USER}" \
-			MARIADB_GROUP="${MARIADB_GROUP}"
 
+PLIST_SUB+=	MARIADB_USER="${MARIADB_USER}"
+PLIST_SUB+=	MARIADB_GROUP="${MARIADB_GROUP}"
+PLIST_SUB+=	MARIADB_RUNDIR="${MARIADB_RUNDIR}"
+PLIST_SUB+=	MARIADB_LOGDIR="${MARIADB_LOGDIR}"
+
 .if ${PKGNAMESUFFIX:M*-client}
 # MySQL-Client part
 CMAKE_ON+=	CONC_WITH_MYSQLCOMPAT WITHOUT_SERVER
@@ -133,24 +136,24 @@ 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
+USES+=		mysql:105m
+
 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_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
-
+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
@@ -171,9 +174,6 @@ 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
-TOKUDB_VARS=		LICENSE+=PerconaFT LICENSE_COMB=multi
 WSREP_CMAKE_BOOL=	WITH_WSREP
 WSREP_LIB_DEPENDS=	libgalera.so:databases/galera26
 WSREP_RUN_DEPENDS=	bash:shells/bash \
@@ -200,7 +200,7 @@ 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
+GSSAPI_BASE_IGNORE=	GSSAPI_BASE is not compatible with OpenSSL from ports. Use other GSSAPI options or OpenSSL from base system
 .endif
 
 .include <bsd.port.pre.mk>
@@ -209,14 +209,7 @@ GSSAPI_BASE_IGNORE=	BASE_GSSAPI is not compatible with
 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 \
@@ -227,21 +220,24 @@ 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
+	${MKDIR} -p ${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}
+	${RM} -r ${STAGEDIR}${DATADIR} \
+		${STAGEDIR}${PREFIX}/include/mysql/server \
+		${STAGEDIR}${ETCDIR}/init.d \
+		${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
@@ -250,16 +246,26 @@ post-install-GSSAPI_NONE-off:
 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
-	${MV} ${STAGEDIR}${PREFIX}/etc/mysql/user_map.conf \
-		${STAGEDIR}${PREFIX}/etc/mysql/user_map.conf.sample
-	${MKDIR} ${STAGEDIR}/${MARIADB_LOGDIR}
+		${STAGEDIR}${PREFIX}/lib/mysql/pkgconfig \
+		${STAGEDIR}/suite \
+		${STAGEDIR}${ETCDIR}/init.d \
+		${STAGEDIR}${ETCDIR}/logrotate.d
+	${MKDIR} ${STAGEDIR}${MARIADB_LOGDIR}
 
 post-install-WSREP-on:
 	${MV} ${STAGEDIR}${DATADIR}/wsrep.cnf \
 		${STAGEDIR}${ETCDIR}/conf.d/wsrep.cnf.sample
+
+post-install-SPIDER-on:
+	${MV} ${STAGEDIR}${ETCDIR}/conf.d/spider.cnf \
+		${STAGEDIR}${ETCDIR}/conf.d/spider.cnf.sample
+	
 .endif # ${PKGNAMESUFFIX:M*-client}
 
 .include <bsd.port.post.mk>

Modified: head/databases/mariadb105-server/distinfo
==============================================================================
--- head/databases/mariadb104-server/distinfo	Sat Jul 11 19:31:06 2020	(r542045)
+++ head/databases/mariadb105-server/distinfo	Sat Jul 11 20:17:08 2020	(r542046)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1589288654
-SHA256 (mariadb-10.4.13.tar.gz) = 45bbbb12d1de8febd9edf630e940c23cf14efd60570c743b268069516a5d91df
-SIZE (mariadb-10.4.13.tar.gz) = 80608459
+TIMESTAMP = 1593020847
+SHA256 (mariadb-10.5.4.tar.gz) = 26db2becc9cec37e99a4e73390bd2eaa74568e21f9cf110359f4f68b37154c72
+SIZE (mariadb-10.5.4.tar.gz) = 86793964

Modified: head/databases/mariadb105-server/files/client.cnf.sample.in
==============================================================================
--- head/databases/mariadb104-server/files/client.cnf.sample.in	Sat Jul 11 19:31:06 2020	(r542045)
+++ head/databases/mariadb105-server/files/client.cnf.sample.in	Sat Jul 11 20:17:08 2020	(r542046)
@@ -3,8 +3,8 @@
 
 # Options specific to all client programs
 [client]
-# port			= 3306 # inherited from %%ETCDIR%%/my.cnf
-# socket		= %%MARIADB_RUNDIR%%/mysql.sock # inherited from %%ETCDIR%%/my.cnf
+# port			= 3306 # set in %%ETCDIR%%/my.cnf
+# socket		= /var/run/mysql/mysql.sock # set in %%ETCDIR%%/my.cnf
 
 # Options specific to MariaDB client programs
 [client-mariadb]

Modified: head/databases/mariadb105-server/files/mysql-server.in
==============================================================================
--- head/databases/mariadb104-server/files/mysql-server.in	Sat Jul 11 19:31:06 2020	(r542045)
+++ head/databases/mariadb105-server/files/mysql-server.in	Sat Jul 11 20:17:08 2020	(r542046)
@@ -19,7 +19,7 @@
 # mysql_(instance_)?pidfile (str): Custum PID file path and name.
 #			Default to "${mysql_dbdir}/${hostname}.pid".
 # mysql_(instance_)?user (str): User to run mysqld as
-#			Default to "mysql" created by the port
+#			Default to "%%MARIADB_USER%%" created by the port
 # mysql_(instance_)?optfile (str): Server-specific option file.
 #			Default to "${mysql_dbdir}/my.cnf".
 # mysql_instances (str): Set to "" by default. 
@@ -34,10 +34,10 @@ load_rc_config $name
 
 : ${mysql_enable="NO"}
 %%LEGACY_LIMITS%%: ${mysql_limits="NO"}
-: ${mysql_user="mysql"}
+: ${mysql_user="%%MARIADB_USER"}
 %%LEGACY_LIMITS%%mysql_limits_args="-e -U ${mysql_user}"
 : ${mysql_dbdir="/var/db/mysql"}
-: ${mysql_optfile="${mysql_dbdir}/my.cnf"}
+: ${mysql_optfile="%%ETCDIR%%/my.cnf"}
 
 command="/usr/sbin/daemon"
 procname="%%PREFIX%%/libexec/mysqld"
@@ -92,7 +92,7 @@ else
 		done
 		exit 0
 	else
-		mysql_pidfile=${mysql_pidfile:-"${mysql_dbdir}/`/bin/hostname`.pid"}
+		mysql_pidfile=${mysql_pidfile:-"/var/run/mysqld.pid"}
 	fi
 fi
 
@@ -110,9 +110,9 @@ mysql_create_auth_tables()
 mysql_prestart()
 {
 	local dir
-	for dir in /etc /etc/mysql; do
+	for dir in /etc /usr/local/etc /etc/mysql /var/db/mysql; do
 		if [ -f "${dir}/my.cnf" ]; then
-			echo "Please move existing my.cnf file from ${dir} to %%PREFIX%%${dir}"
+			echo "Please merge existing ${dir}/my.cnf file with %%ETCDIR%%/conf.d/server.cnf"
 			return 1
 		fi
 	done

Added: head/databases/mariadb105-server/files/patch-extra_CMakeLists.txt
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/databases/mariadb105-server/files/patch-extra_CMakeLists.txt	Sat Jul 11 20:17:08 2020	(r542046)
@@ -0,0 +1,11 @@
+--- extra/CMakeLists.txt.orig	2020-06-23 15:10:16 UTC
++++ extra/CMakeLists.txt
+@@ -46,7 +46,7 @@ ADD_CUSTOM_TARGET(GenError
+                   DEPENDS
+                   ${CMAKE_BINARY_DIR}/include/mysqld_error.h.tmp)
+ 
+-MYSQL_ADD_EXECUTABLE(my_print_defaults my_print_defaults.c)
++MYSQL_ADD_EXECUTABLE(my_print_defaults my_print_defaults.c COMPONENT Client)
+ TARGET_LINK_LIBRARIES(my_print_defaults  mysys)
+ 
+ MYSQL_ADD_EXECUTABLE(perror perror.c)

Modified: head/databases/mariadb105-server/files/patch-scripts_mysql__config.sh
==============================================================================
--- head/databases/mariadb104-server/files/patch-scripts_mysql__config.sh	Sat Jul 11 19:31:06 2020	(r542045)
+++ head/databases/mariadb105-server/files/patch-scripts_mysql__config.sh	Sat Jul 11 20:17:08 2020	(r542046)
@@ -1,10 +1,8 @@
---- scripts/mysql_config.sh.orig	2017-05-24 09:15:23 UTC
+--- scripts/mysql_config.sh.orig	2020-07-11 14:16:47 UTC
 +++ scripts/mysql_config.sh
-@@ -106,7 +106,9 @@ fi
- 
+@@ -88,6 +88,7 @@ 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 "
  

Modified: head/databases/mariadb105-server/files/patch-storage_mroonga_CMakeLists.txt
==============================================================================
--- head/databases/mariadb104-server/files/patch-storage_mroonga_CMakeLists.txt	Sat Jul 11 19:31:06 2020	(r542045)
+++ head/databases/mariadb105-server/files/patch-storage_mroonga_CMakeLists.txt	Sat Jul 11 20:17:08 2020	(r542046)
@@ -1,4 +1,4 @@
---- storage/mroonga/CMakeLists.txt.orig	2019-11-06 16:01:58 UTC
+--- storage/mroonga/CMakeLists.txt.orig	2020-06-23 15:10:17 UTC
 +++ storage/mroonga/CMakeLists.txt
 @@ -80,7 +80,7 @@ else()
    set(MRN_SOURCE_DIR ${CMAKE_SOURCE_DIR})

Added: head/databases/mariadb105-server/files/patch-storage_perfschema_my__thread.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/databases/mariadb105-server/files/patch-storage_perfschema_my__thread.h	Sat Jul 11 20:17:08 2020	(r542046)
@@ -0,0 +1,13 @@
+--- storage/perfschema/my_thread.h.orig	2020-06-23 15:10:17 UTC
++++ storage/perfschema/my_thread.h
+@@ -10,6 +10,10 @@
+ #include <sys/syscall.h>
+ #endif
+ 
++#ifdef HAVE_PTHREAD_GETTHREADID_NP
++#include <pthread_np.h>
++#endif
++
+ typedef pthread_key_t thread_local_key_t;
+ typedef pthread_t my_thread_handle;
+ typedef pthread_attr_t my_thread_attr_t;

Added: head/databases/mariadb105-server/files/patch-storage_rocksdb_rocksdb_port_jemalloc__helper.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/databases/mariadb105-server/files/patch-storage_rocksdb_rocksdb_port_jemalloc__helper.h	Sat Jul 11 20:17:08 2020	(r542046)
@@ -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

Added: head/databases/mariadb105-server/files/patch-tpool_CMakeLists.txt
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/databases/mariadb105-server/files/patch-tpool_CMakeLists.txt	Sat Jul 11 20:17:08 2020	(r542046)
@@ -0,0 +1,17 @@
+--- tpool/CMakeLists.txt.orig	2020-06-23 15:10:18 UTC
++++ tpool/CMakeLists.txt
+@@ -2,6 +2,7 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
+ IF(WIN32)
+   SET(EXTRA_SOURCES tpool_win.cc aio_win.cc)
+ ELSE()
++  ADD_DEFINITIONS(-fPIC)
+   SET(EXTRA_SOURCES aio_linux.cc)
+ ENDIF()
+ 
+@@ -26,4 +27,4 @@ ADD_LIBRARY(tpool STATIC
+   ${EXTRA_SOURCES}
+ )
+ 
+-INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/include)
+\ No newline at end of file
++INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/include)

Modified: head/databases/mariadb105-server/files/pkg-message.in
==============================================================================
--- head/databases/mariadb104-server/files/pkg-message.in	Sat Jul 11 19:31:06 2020	(r542045)
+++ head/databases/mariadb105-server/files/pkg-message.in	Sat Jul 11 20:17:08 2020	(r542046)
@@ -6,6 +6,8 @@ my.cnf. Please move existing my.cnf files from those p
 %%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
@@ -14,10 +16,6 @@ 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.

Modified: head/databases/mariadb105-server/pkg-plist
==============================================================================
--- head/databases/mariadb104-server/pkg-plist	Sat Jul 11 19:31:06 2020	(r542045)
+++ head/databases/mariadb105-server/pkg-plist	Sat Jul 11 20:17:08 2020	(r542046)
@@ -6,6 +6,8 @@ bin/aria_read_log
 %%INNOBASE%%bin/innochecksum
 %%INNOBASE%%bin/mariabackup
 bin/mariadb-backup
+@comment bin/mariadb-config
+@comment bin/mariadb-conv
 bin/mariadb-dumpslow
 bin/mariadb-embedded
 bin/mariadb-fix-extensions
@@ -17,9 +19,9 @@ bin/mariadb-upgrade
 bin/mariadbd-multi
 bin/mariadbd-safe
 bin/mariadbd-safe-helper
-bin/mariadb-waitpid
+@comment bin/mariadb-waitpid
 %%INNOBASE%%bin/mbstream
-bin/my_print_defaults
+@comment bin/my_print_defaults
 bin/myisam_ftdump
 bin/myisamchk
 bin/myisamlog
@@ -46,14 +48,17 @@ 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
+@comment %%ETCDIR%%/my.cnf
+@comment %%ETCDIR%%/conf.d/client.cnf
+%%ETCDIR%%/conf.d/enable_encryption.preset
+@comment %%ETCDIR%%/conf.d/mysql-clients.cnf
 @sample %%ETCDIR%%/conf.d/server.cnf.sample
+%%SPIDER%%@sample %%ETCDIR%%/conf.d/spider.cnf.sample 
 %%WSREP%%%%ETCDIR%%/conf.d/wsrep.cnf.sample
 @sample %%ETCDIR%%/user_map.conf.sample
 @comment data/test/db.opt
@@ -94,16 +99,23 @@ 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
@@ -127,6 +139,7 @@ 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
@@ -153,6 +166,7 @@ lib/mysql/libmariadbd.so
 lib/mysql/libmariadbd.so.19
 lib/mysql/libmysqld.a
 lib/mysql/libmysqld.so
+@comment lib/mysql/libmysqlservices.a
 lib/mysql/plugin/adt_null.so
 lib/mysql/plugin/auth_0x0100.so
 lib/mysql/plugin/auth_ed25519.so
@@ -160,9 +174,10 @@ lib/mysql/plugin/auth_ed25519.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
+@comment lib/mysql/plugin/caching_sha2_password.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
@@ -173,12 +188,11 @@ lib/mysql/plugin/ha_federatedx.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/pam_user_map.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
@@ -188,9 +202,11 @@ 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
+lib/mysql/plugin/type_test.so
 %%WSREP%%lib/mysql/plugin/wsrep_info.so
 libexec/mariadbd
 libexec/mysqld
+@comment libexec/rcmysql
 man/man1/aria_chk.1.gz
 man/man1/aria_dump_log.1.gz
 man/man1/aria_ftdump.1.gz
@@ -201,6 +217,8 @@ man/man1/galera_recovery.1.gz
 man/man1/innochecksum.1.gz
 man/man1/mariabackup.1.gz
 man/man1/mariadb-backup.1.gz
+@comment man/man1/mariadb-conv.1.gz
+@comment man/man1/mariadb_config.1.gz
 man/man1/mariadb-dumpslow.1.gz
 man/man1/mariadb-embedded.1.gz
 man/man1/mariadb-fix-extensions.1.gz
@@ -214,11 +232,12 @@ 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
+@comment 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
+%%ROCKSDB%%man/man1/myrocks_hotbackup.1.gz
 man/man1/mysql.server.1.gz
 man/man1/mysql_fix_extensions.1.gz
 %%ROCKSDB%%man/man1/mysql_ldb.1.gz
@@ -230,11 +249,10 @@ man/man1/mysqld_multi.1.gz
 man/man1/mysqld_safe.1.gz
 man/man1/mysqld_safe_helper.1.gz
 man/man1/mysqldumpslow.1.gz
+@comment man/man1/mytop.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
@@ -242,6 +260,7 @@ man/man1/resolveip.1.gz
 %%WSREP%%man/man1/wsrep_sst_rsync_wan.1.gz
 man/man8/mariadbd.8.gz
 man/man8/mysqld.8.gz
+@comment share/aclocal/mysql.m4
 %%DATADIR%%/binary-configure
 %%DATADIR%%/charsets/Index.xml
 %%DATADIR%%/charsets/README
@@ -281,7 +300,6 @@ man/man8/mysqld.8.gz
 %%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
@@ -313,8 +331,11 @@ man/man8/mysqld.8.gz
 %%DATADIR%%/ukrainian/errmsg.sys
 %%WSREP%%%%DATADIR%%/wsrep_notify
 @comment %%DOCSDIR%%/COPYING
-%%DOCSDIR%%/INSTALL-BINARY
-%%WSREP%%%%DOCSDIR%%/README-wsrep
+%%PORTDOCS%%%%DOCSDIR%%/CREDITS
+%%PORTDOCS%%%%DOCSDIR%%/EXCEPTIONS-CLIENT
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL-BINARY
+%%PORTDOCS%%%%DOCSDIR%%/README.md
+%%PORTDOCS%%%%WSREP%%%%DOCSDIR%%/README-wsrep
 @comment %%DOCSDIR%%/THIRDPARTY
 @comment share/groonga-normalizer-mysql/lgpl-2.0.txt
 @comment share/groonga/COPYING



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202007112017.06BKH8KZ023248>