git: 0393f0c56a56 - main - databases/mariadb10*: fix pkg-plist use share/man
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 16 May 2022 06:57:27 UTC
The branch main has been updated by lbartoletti:
URL: https://cgit.FreeBSD.org/ports/commit/?id=0393f0c56a56373a5fb0098a4f246b4718909aa9
commit 0393f0c56a56373a5fb0098a4f246b4718909aa9
Author: Loïc Bartoletti <lbartoletti@FreeBSD.org>
AuthorDate: 2022-04-14 18:10:15 +0000
Commit: Loïc Bartoletti <lbartoletti@FreeBSD.org>
CommitDate: 2022-05-16 06:49:44 +0000
databases/mariadb10*: fix pkg-plist use share/man
Approved by: portmgr (blanket)
---
databases/mariadb103-client/pkg-plist | 124 ++++++------
databases/mariadb103-server/Makefile | 2 +-
databases/mariadb103-server/pkg-plist | 86 ++++----
databases/mariadb104-client/pkg-plist | 188 +++++++++---------
databases/mariadb104-server/Makefile | 2 +-
databases/mariadb104-server/pkg-plist | 194 +++++++++---------
databases/mariadb105-client/pkg-plist | 198 +++++++++----------
databases/mariadb105-server/Makefile | 1 +
databases/mariadb105-server/pkg-plist | 200 +++++++++----------
databases/mariadb106-client/pkg-plist | 362 +++++++++++++++++-----------------
databases/mariadb106-server/Makefile | 1 +
databases/mariadb106-server/pkg-plist | 273 ++++++++++++++++++++-----
12 files changed, 899 insertions(+), 732 deletions(-)
diff --git a/databases/mariadb103-client/pkg-plist b/databases/mariadb103-client/pkg-plist
index 7e71f3d1ebe8..038def763f8a 100644
--- a/databases/mariadb103-client/pkg-plist
+++ b/databases/mariadb103-client/pkg-plist
@@ -63,68 +63,68 @@ lib/mysql/plugin/mysql_clear_password.so
lib/mysql/plugin/sha256_password.so
libdata/pkgconfig/libmariadb.pc
libdata/pkgconfig/mariadb.pc
-@comment man/man1/aria_chk.1.gz
-@comment man/man1/aria_dump_log.1.gz
-@comment man/man1/aria_ftdump.1.gz
-@comment man/man1/aria_pack.1.gz
-@comment man/man1/aria_read_log.1.gz
-@comment man/man1/galera_new_cluster.1.gz
-@comment man/man1/galera_recovery.1.gz
-@comment man/man1/innochecksum.1.gz
-@comment man/man1/mariabackup.1.gz
-@comment man/man1/mariadb-service-convert.1.gz
-man/man1/msql2mysql.1.gz
-@comment man/man1/mbstream.1.gz
-@comment 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
-@comment man/man1/mysql.server.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_find_rows.1.gz
-@comment man/man1/mysql_fix_extensions.1.gz
-@comment man/man1/mysql_install_db.1.gz
-@comment man/man1/mysql_ldb.1.gz
-man/man1/mysql_plugin.1.gz
-@comment man/man1/mysql_secure_installation.1.gz
-man/man1/mysql_setpermission.1.gz
-man/man1/mysql_tzinfo_to_sql.1.gz
-@comment man/man1/mysql_upgrade.1.gz
-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
-@comment man/man1/mysqld_multi.1.gz
-@comment man/man1/mysqld_safe.1.gz
-@comment man/man1/mysqld_safe_helper.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/perror.1.gz
-man/man1/replace.1.gz
-@comment man/man1/resolve_stack_dump.1.gz
-@comment man/man1/resolveip.1.gz
-@comment man/man1/wsrep_sst_common.1.gz
-@comment man/man1/wsrep_sst_mariabackup.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/mysqld.8.gz
+@comment share/man/man1/aria_chk.1.gz
+@comment share/man/man1/aria_dump_log.1.gz
+@comment share/man/man1/aria_ftdump.1.gz
+@comment share/man/man1/aria_pack.1.gz
+@comment share/man/man1/aria_read_log.1.gz
+@comment share/man/man1/galera_new_cluster.1.gz
+@comment share/man/man1/galera_recovery.1.gz
+@comment share/man/man1/innochecksum.1.gz
+@comment share/man/man1/mariabackup.1.gz
+@comment share/man/man1/mariadb-service-convert.1.gz
+share/man/man1/msql2mysql.1.gz
+@comment share/man/man1/mbstream.1.gz
+@comment share/man/man1/my_print_defaults.1.gz
+share/man/man1/my_safe_process.1.gz
+@comment share/man/man1/myisam_ftdump.1.gz
+@comment share/man/man1/myisamchk.1.gz
+@comment share/man/man1/myisamlog.1.gz
+@comment share/man/man1/myisampack.1.gz
+share/man/man1/mysql-stress-test.pl.1.gz
+share/man/man1/mysql-test-run.pl.1.gz
+share/man/man1/mysql.1.gz
+@comment share/man/man1/mysql.server.1.gz
+share/man/man1/mysql_client_test.1.gz
+share/man/man1/mysql_client_test_embedded.1.gz
+share/man/man1/mysql_config.1.gz
+share/man/man1/mysql_convert_table_format.1.gz
+@comment share/man/man1/mysql_embedded.1.gz
+share/man/man1/mysql_find_rows.1.gz
+@comment share/man/man1/mysql_fix_extensions.1.gz
+@comment share/man/man1/mysql_install_db.1.gz
+@comment share/man/man1/mysql_ldb.1.gz
+share/man/man1/mysql_plugin.1.gz
+@comment share/man/man1/mysql_secure_installation.1.gz
+share/man/man1/mysql_setpermission.1.gz
+share/man/man1/mysql_tzinfo_to_sql.1.gz
+@comment share/man/man1/mysql_upgrade.1.gz
+share/man/man1/mysql_waitpid.1.gz
+share/man/man1/mysqlaccess.1.gz
+share/man/man1/mysqladmin.1.gz
+share/man/man1/mysqlbinlog.1.gz
+share/man/man1/mysqlcheck.1.gz
+@comment share/man/man1/mysqld_multi.1.gz
+@comment share/man/man1/mysqld_safe.1.gz
+@comment share/man/man1/mysqld_safe_helper.1.gz
+share/man/man1/mysqldump.1.gz
+@comment share/man/man1/mysqldumpslow.1.gz
+share/man/man1/mysqlhotcopy.1.gz
+share/man/man1/mysqlimport.1.gz
+share/man/man1/mysqlshow.1.gz
+share/man/man1/mysqlslap.1.gz
+share/man/man1/mysqltest.1.gz
+share/man/man1/mysqltest_embedded.1.gz
+@comment share/man/man1/perror.1.gz
+share/man/man1/replace.1.gz
+@comment share/man/man1/resolve_stack_dump.1.gz
+@comment share/man/man1/resolveip.1.gz
+@comment share/man/man1/wsrep_sst_common.1.gz
+@comment share/man/man1/wsrep_sst_mariabackup.1.gz
+@comment share/man/man1/wsrep_sst_mysqldump.1.gz
+@comment share/man/man1/wsrep_sst_rsync.1.gz
+@comment share/man/man1/wsrep_sst_rsync_wan.1.gz
+@comment share/man/man8/mysqld.8.gz
@comment share/aclocal/mysql.m4
@dir etc/mysql
@dir etc/mysql/conf.d
diff --git a/databases/mariadb103-server/Makefile b/databases/mariadb103-server/Makefile
index f9e9846cdf8d..1d7e9d92d3b6 100644
--- a/databases/mariadb103-server/Makefile
+++ b/databases/mariadb103-server/Makefile
@@ -73,7 +73,7 @@ CMAKE_ARGS+= -DINSTALL_DOCDIR="share/doc/mysql" \
-DINSTALL_INCLUDEDIR="include/mysql" \
-DINSTALL_INFODIR="info" \
-DINSTALL_LIBDIR="lib/mysql" \
- -DINSTALL_MANDIR="man" \
+ -DINSTALL_MANDIR="share/man" \
-DINSTALL_MYSQLDATADIR="/var/db/mysql" \
-DINSTALL_MYSQLSHAREDIR="share/mysql" \
-DINSTALL_MYSQLTESTDIR= \
diff --git a/databases/mariadb103-server/pkg-plist b/databases/mariadb103-server/pkg-plist
index 1fc101501ad0..ee4b433e621c 100644
--- a/databases/mariadb103-server/pkg-plist
+++ b/databases/mariadb103-server/pkg-plist
@@ -201,49 +201,49 @@ lib/mysql/plugin/test_versioning.so
%%WSREP%%lib/mysql/plugin/wsrep_info.so
libexec/mysqld
@comment 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
-man/man1/galera_new_cluster.1.gz
-man/man1/galera_recovery.1.gz
-man/man1/innochecksum.1.gz
-@comment man/man1/mariadb-service-convert.1.gz
-man/man1/mariabackup.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
-@comment man/man1/mysql_convert_table_format.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
-@comment man/man1/mysql_setpermission.1.gz
-@comment 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
-@comment man/man1/mysqlhotcopy.1.gz
-@comment man/man1/mysqltest.1.gz
-man/man1/perror.1.gz
-@comment man/man1/replace.1.gz
-man/man1/resolve_stack_dump.1.gz
-man/man1/resolveip.1.gz
-%%TOKUDB%%man/man1/tokuft_logprint.1.gz
-%%TOKUDB%%man/man1/tokuftdump.1.gz
-%%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/mysqld.8.gz
+share/man/man1/aria_chk.1.gz
+share/man/man1/aria_dump_log.1.gz
+share/man/man1/aria_ftdump.1.gz
+share/man/man1/aria_pack.1.gz
+share/man/man1/aria_read_log.1.gz
+share/man/man1/galera_new_cluster.1.gz
+share/man/man1/galera_recovery.1.gz
+share/man/man1/innochecksum.1.gz
+@comment share/man/man1/mariadb-service-convert.1.gz
+share/man/man1/mariabackup.1.gz
+share/man/man1/mbstream.1.gz
+share/man/man1/my_print_defaults.1.gz
+share/man/man1/myisam_ftdump.1.gz
+share/man/man1/myisamchk.1.gz
+share/man/man1/myisamlog.1.gz
+share/man/man1/myisampack.1.gz
+share/man/man1/mysql.server.1.gz
+@comment share/man/man1/mysql_convert_table_format.1.gz
+share/man/man1/mysql_fix_extensions.1.gz
+%%ROCKSDB%%share/man/man1/mysql_ldb.1.gz
+share/man/man1/mysql_install_db.1.gz
+share/man/man1/mysql_secure_installation.1.gz
+@comment share/man/man1/mysql_setpermission.1.gz
+@comment share/man/man1/mysql_tzinfo_to_sql.1.gz
+share/man/man1/mysql_upgrade.1.gz
+share/man/man1/mysqld_multi.1.gz
+share/man/man1/mysqld_safe.1.gz
+share/man/man1/mysqld_safe_helper.1.gz
+share/man/man1/mysqldumpslow.1.gz
+@comment share/man/man1/mysqlhotcopy.1.gz
+@comment share/man/man1/mysqltest.1.gz
+share/man/man1/perror.1.gz
+@comment share/man/man1/replace.1.gz
+share/man/man1/resolve_stack_dump.1.gz
+share/man/man1/resolveip.1.gz
+%%TOKUDB%%share/man/man1/tokuft_logprint.1.gz
+%%TOKUDB%%share/man/man1/tokuftdump.1.gz
+%%WSREP%%share/man/man1/wsrep_sst_common.1.gz
+%%WSREP%%share/man/man1/wsrep_sst_mariabackup.1.gz
+%%WSREP%%share/man/man1/wsrep_sst_mysqldump.1.gz
+%%WSREP%%share/man/man1/wsrep_sst_rsync.1.gz
+%%WSREP%%share/man/man1/wsrep_sst_rsync_wan.1.gz
+share/man/man8/mysqld.8.gz
%%DATADIR%%/binary-configure
%%DATADIR%%/fill_help_tables.sql
%%DATADIR%%/magic
diff --git a/databases/mariadb104-client/pkg-plist b/databases/mariadb104-client/pkg-plist
index 10ef8d556ee5..c93bdbc1dcb0 100644
--- a/databases/mariadb104-client/pkg-plist
+++ b/databases/mariadb104-client/pkg-plist
@@ -75,99 +75,99 @@ lib/mysql/plugin/dialog.so
lib/mysql/plugin/mysql_clear_password.so
lib/mysql/plugin/sha256_password.so
libdata/pkgconfig/libmariadb.pc
-@comment man/man1/aria_chk.1.gz
-@comment man/man1/aria_dump_log.1.gz
-@comment man/man1/aria_ftdump.1.gz
-@comment man/man1/aria_pack.1.gz
-@comment man/man1/aria_read_log.1.gz
-@comment man/man1/galera_new_cluster.1.gz
-@comment man/man1/galera_recovery.1.gz
-@comment man/man1/innochecksum.1.gz
-@comment man/man1/mariabackup.1.gz
-man/man1/mariadb.1.gz
-man/man1/mariadb-access.1.gz
-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-convert-table-format.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
-@comment man/man1/mariadb-fix-extensions.1.gz
-man/man1/mariadb-hotcopy.1.gz
-man/man1/mariadb-import.1.gz
-@comment man/man1/mariadb-install-db.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-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
-@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/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
-@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_config.1.gz
-man/man1/mysql_convert_table_format.1.gz
-@comment 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
-@comment man/man1/mysql_ldb.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_upgrade.1.gz
-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
-@comment man/man1/mysqld_multi.1.gz
-@comment man/man1/mysqld_safe.1.gz
-@comment man/man1/mysqld_safe_helper.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
-@comment man/man1/mysqltest.1.gz
-@comment man/man1/mysqltest_embedded.1.gz
-@comment man/man1/perror.1.gz
-man/man1/replace.1.gz
-@comment man/man1/resolve_stack_dump.1.gz
-@comment man/man1/resolveip.1.gz
-@comment man/man1/wsrep_sst_common.1.gz
-@comment man/man1/wsrep_sst_mariabackup.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/mysqld.8.gz
+@comment share/man/man1/aria_chk.1.gz
+@comment share/man/man1/aria_dump_log.1.gz
+@comment share/man/man1/aria_ftdump.1.gz
+@comment share/man/man1/aria_pack.1.gz
+@comment share/man/man1/aria_read_log.1.gz
+@comment share/man/man1/galera_new_cluster.1.gz
+@comment share/man/man1/galera_recovery.1.gz
+@comment share/man/man1/innochecksum.1.gz
+@comment share/man/man1/mariabackup.1.gz
+share/man/man1/mariadb.1.gz
+share/man/man1/mariadb-access.1.gz
+share/man/man1/mariadb-admin.1.gz
+@comment share/man/man1/mariadb-backup.1.gz
+share/man/man1/mariadb-binlog.1.gz
+share/man/man1/mariadb-check.1.gz
+@comment share/man/man1/mariadb-client-test-embedded.1.gz
+@comment share/man/man1/mariadb-client-test.1.gz
+share/man/man1/mariadb-convert-table-format.1.gz
+share/man/man1/mariadb-dump.1.gz
+@comment share/man/man1/mariadb-dumpslow.1.gz
+@comment share/man/man1/mariadb-embedded.1.gz
+share/man/man1/mariadb-find-rows.1.gz
+@comment share/man/man1/mariadb-fix-extensions.1.gz
+share/man/man1/mariadb-hotcopy.1.gz
+share/man/man1/mariadb-import.1.gz
+@comment share/man/man1/mariadb-install-db.1.gz
+@comment share/man/man1/mariadb-ldb.1.gz
+share/man/man1/mariadb-plugin.1.gz
+@comment share/man/man1/mariadb-secure-installation.1.gz
+@comment share/man/man1/mariadb-service-convert.1.gz
+share/man/man1/mariadb-setpermission.1.gz
+share/man/man1/mariadb-show.1.gz
+share/man/man1/mariadb-slap.1.gz
+@comment share/man/man1/mariadb-test-embedded.1.gz
+@comment share/man/man1/mariadb-test.1.gz
+@comment share/man/man1/mariadb-tzinfo-to-sql.1.gz
+@comment share/man/man1/mariadb-upgrade.1.gz
+@comment share/man/man1/mariadb-waitpid.1.gz
+@comment share/man/man1/mariadbd-multi.1.gz
+@comment share/man/man1/mariadbd-safe-helper.1.gz
+@comment share/man/man1/mariadbd-safe.1.gz
+@comment share/man/man8/mariadbd.8.gz
+share/man/man1/msql2mysql.1.gz
+@comment share/man/man1/mbstream.1.gz
+@comment share/man/man1/my_print_defaults.1.gz
+share/man/man1/my_safe_process.1.gz
+@comment share/man/man1/myisam_ftdump.1.gz
+@comment share/man/man1/myisamchk.1.gz
+@comment share/man/man1/myisamlog.1.gz
+@comment share/man/man1/myisampack.1.gz
+share/man/man1/mysql-stress-test.pl.1.gz
+share/man/man1/mysql-test-run.pl.1.gz
+share/man/man1/mysql.1.gz
+@comment share/man/man1/mysql.server.1.gz
+@comment share/man/man1/mysql_client_test.1.gz
+@comment share/man/man1/mysql_client_test_embedded.1.gz
+share/man/man1/mysql_config.1.gz
+share/man/man1/mysql_convert_table_format.1.gz
+@comment share/man/man1/mysql_embedded.1.gz
+share/man/man1/mysql_find_rows.1.gz
+@comment share/man/man1/mysql_fix_extensions.1.gz
+@comment share/man/man1/mysql_install_db.1.gz
+@comment share/man/man1/mysql_ldb.1.gz
+share/man/man1/mysql_plugin.1.gz
+@comment share/man/man1/mysql_secure_installation.1.gz
+share/man/man1/mysql_setpermission.1.gz
+@comment share/man/man1/mysql_tzinfo_to_sql.1.gz
+@comment share/man/man1/mysql_upgrade.1.gz
+share/man/man1/mysql_waitpid.1.gz
+share/man/man1/mysqlaccess.1.gz
+share/man/man1/mysqladmin.1.gz
+share/man/man1/mysqlbinlog.1.gz
+share/man/man1/mysqlcheck.1.gz
+@comment share/man/man1/mysqld_multi.1.gz
+@comment share/man/man1/mysqld_safe.1.gz
+@comment share/man/man1/mysqld_safe_helper.1.gz
+share/man/man1/mysqldump.1.gz
+@comment share/man/man1/mysqldumpslow.1.gz
+share/man/man1/mysqlhotcopy.1.gz
+share/man/man1/mysqlimport.1.gz
+share/man/man1/mysqlshow.1.gz
+share/man/man1/mysqlslap.1.gz
+@comment share/man/man1/mysqltest.1.gz
+@comment share/man/man1/mysqltest_embedded.1.gz
+@comment share/man/man1/perror.1.gz
+share/man/man1/replace.1.gz
+@comment share/man/man1/resolve_stack_dump.1.gz
+@comment share/man/man1/resolveip.1.gz
+@comment share/man/man1/wsrep_sst_common.1.gz
+@comment share/man/man1/wsrep_sst_mariabackup.1.gz
+@comment share/man/man1/wsrep_sst_mysqldump.1.gz
+@comment share/man/man1/wsrep_sst_rsync.1.gz
+@comment share/man/man1/wsrep_sst_rsync_wan.1.gz
+@comment share/man/man8/mysqld.8.gz
libdata/pkgconfig/mariadb.pc
@dir(%%MARIADB_USER%%,%%MARIADB_GROUP%%,) %%MARIADB_RUNDIR%%
diff --git a/databases/mariadb104-server/Makefile b/databases/mariadb104-server/Makefile
index a8370c5f621a..b75c767c6a83 100644
--- a/databases/mariadb104-server/Makefile
+++ b/databases/mariadb104-server/Makefile
@@ -83,7 +83,7 @@ CMAKE_ARGS+= -DINSTALL_DOCDIR="share/doc/mysql" \
-DINSTALL_INCLUDEDIR="include/mysql" \
-DINSTALL_INFODIR="info" \
-DINSTALL_LIBDIR="lib/mysql" \
- -DINSTALL_MANDIR="man" \
+ -DINSTALL_MANDIR="share/man" \
-DINSTALL_MYSQLDATADIR="/var/db/mysql" \
-DINSTALL_MYSQLSHAREDIR="share/mysql" \
-DINSTALL_MYSQLTESTDIR= \
diff --git a/databases/mariadb104-server/pkg-plist b/databases/mariadb104-server/pkg-plist
index 7a65cd836c1d..72c1788177b6 100644
--- a/databases/mariadb104-server/pkg-plist
+++ b/databases/mariadb104-server/pkg-plist
@@ -192,57 +192,57 @@ 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
+share/man/man1/aria_chk.1.gz
+share/man/man1/aria_dump_log.1.gz
+share/man/man1/aria_ftdump.1.gz
+share/man/man1/aria_pack.1.gz
+share/man/man1/aria_read_log.1.gz
+share/man/man1/galera_new_cluster.1.gz
+share/man/man1/galera_recovery.1.gz
+share/man/man1/innochecksum.1.gz
+share/man/man1/mariabackup.1.gz
+share/man/man1/mariadb-backup.1.gz
+share/man/man1/mariadb-dumpslow.1.gz
+share/man/man1/mariadb-embedded.1.gz
+share/man/man1/mariadb-fix-extensions.1.gz
+share/man/man1/mariadb-install-db.1.gz
+%%ROCKSDB%%share/man/man1/mariadb-ldb.1.gz
+share/man/man1/mariadb-secure-installation.1.gz
+@comment share/man/man1/mariadb-service-convert.1.gz
+share/man/man1/mariadb-tzinfo-to-sql.1.gz
+share/man/man1/mariadb-upgrade.1.gz
+share/man/man1/mariadbd-multi.1.gz
+share/man/man1/mariadbd-safe-helper.1.gz
+share/man/man1/mariadbd-safe.1.gz
+share/man/man1/mbstream.1.gz
+share/man/man1/my_print_defaults.1.gz
+share/man/man1/myisam_ftdump.1.gz
+share/man/man1/myisamchk.1.gz
+share/man/man1/myisamlog.1.gz
+share/man/man1/myisampack.1.gz
+share/man/man1/mysql.server.1.gz
+share/man/man1/mysql_fix_extensions.1.gz
+%%ROCKSDB%%share/man/man1/mysql_ldb.1.gz
+share/man/man1/mysql_install_db.1.gz
+share/man/man1/mysql_secure_installation.1.gz
+share/man/man1/mysql_tzinfo_to_sql.1.gz
+share/man/man1/mysql_upgrade.1.gz
+share/man/man1/mysqld_multi.1.gz
+share/man/man1/mysqld_safe.1.gz
+share/man/man1/mysqld_safe_helper.1.gz
+share/man/man1/mysqldumpslow.1.gz
+share/man/man1/perror.1.gz
+share/man/man1/resolve_stack_dump.1.gz
+share/man/man1/resolveip.1.gz
+%%TOKUDB%%share/man/man1/tokuft_logprint.1.gz
+%%TOKUDB%%share/man/man1/tokuftdump.1.gz
+%%WSREP%%share/man/man1/wsrep_sst_common.1.gz
+%%WSREP%%share/man/man1/wsrep_sst_mariabackup.1.gz
+%%WSREP%%share/man/man1/wsrep_sst_mysqldump.1.gz
+%%WSREP%%share/man/man1/wsrep_sst_rsync.1.gz
+%%WSREP%%share/man/man1/wsrep_sst_rsync_wan.1.gz
+share/man/man8/mariadbd.8.gz
+share/man/man8/mysqld.8.gz
%%DATADIR%%/binary-configure
%%DATADIR%%/charsets/Index.xml
%%DATADIR%%/charsets/README
@@ -393,51 +393,51 @@ man/man8/mysqld.8.gz
@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/man/man1/mariadb-access.1.gz
+@comment share/man/man1/mariadb-admin.1.gz
+@comment share/man/man1/mariadb-binlog.1.gz
+@comment share/man/man1/mariadb-check.1.gz
+@comment share/man/man1/mariadb-client-test-embedded.1.gz
+@comment share/man/man1/mariadb-client-test.1.gz
+@comment share/man/man1/mariadb-convert-table-format.1.gz
+@comment share/man/man1/mariadb-dump.1.gz
+@comment share/man/man1/mariadb-find-rows.1.gz
+@comment share/man/man1/mariadb-hotcopy.1.gz
+@comment share/man/man1/mariadb-import.1.gz
+@comment share/man/man1/mariadb-plugin.1.gz
+@comment share/man/man1/mariadb-service-convert.1.gz
+@comment share/man/man1/mariadb-setpermission.1.gz
+@comment share/man/man1/mariadb-show.1.gz
+@comment share/man/man1/mariadb-slap.1.gz
+@comment share/man/man1/mariadb-test-embedded.1.gz
+@comment share/man/man1/mariadb-test.1.gz
+share/man/man1/mariadb-waitpid.1.gz
+@comment share/man/man1/mariadb.1.gz
+@comment share/man/man1/msql2mysql.1.gz
+@comment share/man/man1/my_safe_process.1.gz
+@comment share/man/man1/mysql-stress-test.pl.1.gz
+@comment share/man/man1/mysql-test-run.pl.1.gz
+@comment share/man/man1/mysql.1.gz
+@comment share/man/man1/mysql_client_test.1.gz
+@comment share/man/man1/mysql_client_test_embedded.1.gz
+@comment share/man/man1/mysql_config.1.gz
+@comment share/man/man1/mysql_convert_table_format.1.gz
+@comment share/man/man1/mysql_embedded.1.gz
+@comment share/man/man1/mysql_find_rows.1.gz
+@comment share/man/man1/mysql_plugin.1.gz
+@comment share/man/man1/mysql_setpermission.1.gz
+@comment share/man/man1/mysql_waitpid.1.gz
+@comment share/man/man1/mysqlaccess.1.gz
+@comment share/man/man1/mysqladmin.1.gz
+@comment share/man/man1/mysqlbinlog.1.gz
+@comment share/man/man1/mysqlcheck.1.gz
+@comment share/man/man1/mysqldump.1.gz
+@comment share/man/man1/mysqlhotcopy.1.gz
+@comment share/man/man1/mysqlimport.1.gz
+@comment share/man/man1/mysqlshow.1.gz
+@comment share/man/man1/mysqlslap.1.gz
+@comment share/man/man1/mysqltest.1.gz
+@comment share/man/man1/mysqltest_embedded.1.gz
+@comment share/man/man1/replace.1.gz
@comment share/pkgconfig/mariadb.pc
@dir(%%MARIADB_USER%%,%%MARIADB_GROUP%%,) %%MARIADB_LOGDIR%%
diff --git a/databases/mariadb105-client/pkg-plist b/databases/mariadb105-client/pkg-plist
index 01ecd70b93c6..80bf6c7f182e 100644
--- a/databases/mariadb105-client/pkg-plist
+++ b/databases/mariadb105-client/pkg-plist
@@ -84,103 +84,103 @@ 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
-@comment man/man1/aria_pack.1.gz
-@comment man/man1/aria_read_log.1.gz
-@comment man/man1/aria_s3_copy.1.gz
-@comment man/man1/galera_new_cluster.1.gz
-@comment man/man1/galera_recovery.1.gz
-@comment man/man1/innochecksum.1.gz
-@comment man/man1/mariabackup.1.gz
-man/man1/mariadb.1.gz
-man/man1/mariadb-access.1.gz
-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
-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
-man/man1/mariadb-find-rows.1.gz
-@comment man/man1/mariadb-fix-extensions.1.gz
-man/man1/mariadb-hotcopy.1.gz
-man/man1/mariadb-import.1.gz
-@comment man/man1/mariadb-install-db.1.gz
-@comment man/man1/mariadb-ldb.1.gz
-man/man1/mariadb-plugin.1.gz
-@comment man/man1/mariadb-secure-installation.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
-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/man1/mbstream.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
-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
-@comment man/man1/mysql_fix_extensions.1.gz
-@comment man/man1/mysql_install_db.1.gz
-@comment man/man1/mysql_ldb.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_upgrade.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
-@comment man/man1/mysqld_multi.1.gz
-@comment man/man1/mysqld_safe.1.gz
-@comment man/man1/mysqld_safe_helper.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
-@comment man/man1/resolveip.1.gz
-@comment man/man1/wsrep_sst_common.1.gz
-@comment man/man1/wsrep_sst_mariabackup.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
+@comment share/man/man1/aria_chk.1.gz
+@comment share/man/man1/aria_dump_log.1.gz
+@comment share/man/man1/aria_ftdump.1.gz
+@comment share/man/man1/aria_pack.1.gz
+@comment share/man/man1/aria_read_log.1.gz
+@comment share/man/man1/aria_s3_copy.1.gz
+@comment share/man/man1/galera_new_cluster.1.gz
+@comment share/man/man1/galera_recovery.1.gz
+@comment share/man/man1/innochecksum.1.gz
+@comment share/man/man1/mariabackup.1.gz
+share/man/man1/mariadb.1.gz
+share/man/man1/mariadb-access.1.gz
+share/man/man1/mariadb-admin.1.gz
+@comment share/man/man1/mariadb-backup.1.gz
+share/man/man1/mariadb-binlog.1.gz
+share/man/man1/mariadb-check.1.gz
+share/man/man1/mariadb-client-test-embedded.1.gz
+share/man/man1/mariadb-client-test.1.gz
+share/man/man1/mariadb-conv.1.gz
+share/man/man1/mariadb-convert-table-format.1.gz
+share/man/man1/mariadb_config.1.gz
+share/man/man1/mariadb-dump.1.gz
+@comment share/man/man1/mariadb-dumpslow.1.gz
+@comment share/man/man1/mariadb-embedded.1.gz
+share/man/man1/mariadb-find-rows.1.gz
+@comment share/man/man1/mariadb-fix-extensions.1.gz
+share/man/man1/mariadb-hotcopy.1.gz
+share/man/man1/mariadb-import.1.gz
+@comment share/man/man1/mariadb-install-db.1.gz
+@comment share/man/man1/mariadb-ldb.1.gz
+share/man/man1/mariadb-plugin.1.gz
+@comment share/man/man1/mariadb-secure-installation.1.gz
+share/man/man1/mariadb-service-convert.1.gz
+share/man/man1/mariadb-setpermission.1.gz
+share/man/man1/mariadb-show.1.gz
+share/man/man1/mariadb-slap.1.gz
+share/man/man1/mariadb-test-embedded.1.gz
+share/man/man1/mariadb-test.1.gz
+@comment share/man/man1/mariadb-tzinfo-to-sql.1.gz
+@comment share/man/man1/mariadb-upgrade.1.gz
+@comment share/man/man1/mariadb-waitpid.1.gz
+@comment share/man/man1/mariadbd-multi.1.gz
+@comment share/man/man1/mariadbd-safe-helper.1.gz
+@comment share/man/man1/mariadbd-safe.1.gz
+@comment share/man/man1/mbstream.1.gz
+share/man/man1/msql2mysql.1.gz
+share/man/man1/my_print_defaults.1.gz
+share/man/man1/my_safe_process.1.gz
+@comment share/man/man1/myisam_ftdump.1.gz
+@comment share/man/man1/myisamchk.1.gz
+@comment share/man/man1/myisamlog.1.gz
+@comment share/man/man1/myisampack.1.gz
+@comment share/man/man1/myrocks_hotbackup.1.gz
+share/man/man1/mysql-stress-test.pl.1.gz
+share/man/man1/mysql-test-run.pl.1.gz
+share/man/man1/mysql.1.gz
+@comment share/man/man1/mysql.server.1.gz
+share/man/man1/mysql_client_test.1.gz
+share/man/man1/mysql_client_test_embedded.1.gz
+share/man/man1/mysql_config.1.gz
+share/man/man1/mysql_convert_table_format.1.gz
+share/man/man1/mysql_embedded.1.gz
+share/man/man1/mysql_find_rows.1.gz
+@comment share/man/man1/mysql_fix_extensions.1.gz
+@comment share/man/man1/mysql_install_db.1.gz
+@comment share/man/man1/mysql_ldb.1.gz
+share/man/man1/mysql_plugin.1.gz
+@comment share/man/man1/mysql_secure_installation.1.gz
+share/man/man1/mysql_setpermission.1.gz
+@comment share/man/man1/mysql_tzinfo_to_sql.1.gz
+@comment share/man/man1/mysql_upgrade.1.gz
+@comment share/man/man1/mysql_waitpid.1.gz
+share/man/man1/mysqlaccess.1.gz
+share/man/man1/mysqladmin.1.gz
+share/man/man1/mysqlbinlog.1.gz
+share/man/man1/mysqlcheck.1.gz
+@comment share/man/man1/mysqld_multi.1.gz
+@comment share/man/man1/mysqld_safe.1.gz
+@comment share/man/man1/mysqld_safe_helper.1.gz
+share/man/man1/mysqldump.1.gz
+@comment share/man/man1/mysqldumpslow.1.gz
+share/man/man1/mysqlhotcopy.1.gz
+share/man/man1/mysqlimport.1.gz
+share/man/man1/mysqlshow.1.gz
+share/man/man1/mysqlslap.1.gz
+share/man/man1/mysqltest.1.gz
+share/man/man1/mysqltest_embedded.1.gz
+@comment share/man/man1/mytop.1.gz
+@comment share/man/man1/perror.1.gz
+share/man/man1/replace.1.gz
+@comment share/man/man1/resolve_stack_dump.1.gz
+@comment share/man/man1/resolveip.1.gz
+@comment share/man/man1/wsrep_sst_common.1.gz
+@comment share/man/man1/wsrep_sst_mariabackup.1.gz
+@comment share/man/man1/wsrep_sst_mysqldump.1.gz
+@comment share/man/man1/wsrep_sst_rsync.1.gz
+@comment share/man/man1/wsrep_sst_rsync_wan.1.gz
+@comment share/man/man8/mariadbd.8.gz
+@comment share/man/man8/mysqld.8.gz
share/aclocal/mysql.m4
diff --git a/databases/mariadb105-server/Makefile b/databases/mariadb105-server/Makefile
index b57803e69c47..15656e403f16 100644
--- a/databases/mariadb105-server/Makefile
+++ b/databases/mariadb105-server/Makefile
@@ -91,6 +91,7 @@ CMAKE_ARGS+= -DCMAKE_PREFIX_PATH=${PREFIX} \
-DINSTALL_DOCREADMEDIR="share/doc/mysql" \
-DINSTALL_INFODIR="info" \
-DINSTALL_LIBDIR="lib/mysql" \
+ -DINSTALL_MANDIR="share/man" \
-DINSTALL_MYSQLDATADIR="${MARIADB_DBDIR}" \
-DINSTALL_MYSQLSHAREDIR="share/mysql" \
-DINSTALL_MYSQLTESTDIR= \
diff --git a/databases/mariadb105-server/pkg-plist b/databases/mariadb105-server/pkg-plist
index 42bfa4d8e6a8..7791e674e5f5 100644
--- a/databases/mariadb105-server/pkg-plist
+++ b/databases/mariadb105-server/pkg-plist
@@ -214,60 +214,60 @@ lib/mysql/plugin/type_test.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
-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
-@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
-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
-@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
-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
-@comment man/man1/mytop.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/man/man1/aria_chk.1.gz
+share/man/man1/aria_dump_log.1.gz
+share/man/man1/aria_ftdump.1.gz
+share/man/man1/aria_pack.1.gz
+share/man/man1/aria_read_log.1.gz
+%%S3%%share/man/man1/aria_s3_copy.1.gz
+share/man/man1/galera_new_cluster.1.gz
+share/man/man1/galera_recovery.1.gz
+share/man/man1/innochecksum.1.gz
+share/man/man1/mariabackup.1.gz
+share/man/man1/mariadb-backup.1.gz
*** 810 LINES SKIPPED ***