[pkgsrc/trunk]: pkgsrc/databases/mariadb104-server mariadb104-server: sync wi...

[nia <nia%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/192ca68fadb4
branches:  trunk
changeset: 453262:192ca68fadb4
user:      nia <nia%pkgsrc.org@localhost>
date:      Wed May 26 11:24:56 2021 +0000

description:
mariadb104-server: sync with mariadb105-server

diffstat:

 databases/mariadb104-server/Makefile       |   15 +--
 databases/mariadb104-server/PLIST          |  153 +++++++++++++++-------------
 databases/mariadb104-server/PLIST.embedded |   14 --
 databases/mariadb104-server/buildlink3.mk  |    6 +-
 databases/mariadb104-server/options.mk     |   70 ++++++++++++-
 5 files changed, 156 insertions(+), 102 deletions(-)

diffs (truncated from 386 to 300 lines):

diff -r 82a95f758d08 -r 192ca68fadb4 databases/mariadb104-server/Makefile
--- a/databases/mariadb104-server/Makefile      Wed May 26 10:14:07 2021 +0000
+++ b/databases/mariadb104-server/Makefile      Wed May 26 11:24:56 2021 +0000
@@ -1,15 +1,13 @@
-# $NetBSD: Makefile,v 1.6 2021/05/25 11:14:54 jperkin Exp $
+# $NetBSD: Makefile,v 1.7 2021/05/26 11:24:56 nia Exp $
 
 PKGNAME=       ${DISTNAME:S/-/-server-/}
-PKGREVISION=   3
+PKGREVISION=   4
 COMMENT=       MariaDB 10.4, a free MySQL compatible database (server)
 
 CONFLICTS=     mysql-server-[0-9]*
 
 .include "../../databases/mariadb104-client/Makefile.common"
 
-CMAKE_ARGS+=           -DPYTHON_SHEBANG=${PYTHONBIN}
-
 BUILD_DEFS+=           VARBASE
 
 .include "../../mk/bsd.fast.prefs.mk"
@@ -48,15 +46,10 @@
        ${CHMOD} +x ${DESTDIR}${PREFIX}/bin/mysql_install_db
 
 .include "options.mk"
-.include "../../archivers/lz4/buildlink3.mk"
+.include "../../archivers/bzip2/buildlink3.mk"
+.include "../../archivers/xz/buildlink3.mk"
 .include "../../databases/mariadb104-client/buildlink3.mk"
-.include "../../devel/boost-libs/buildlink3.mk"
 .include "../../devel/libexecinfo/buildlink3.mk"
-.include "../../devel/libjudy/buildlink3.mk"
-.include "../../devel/msgpack/buildlink3.mk"
-.include "../../devel/pcre/buildlink3.mk"
-.include "../../devel/snappy/buildlink3.mk"
-.include "../../lang/python/application.mk"
 .include "../../security/tcp_wrappers/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 82a95f758d08 -r 192ca68fadb4 databases/mariadb104-server/PLIST
--- a/databases/mariadb104-server/PLIST Wed May 26 10:14:07 2021 +0000
+++ b/databases/mariadb104-server/PLIST Wed May 26 11:24:56 2021 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2021/05/10 14:15:55 nia Exp $
+@comment $NetBSD: PLIST,v 1.3 2021/05/26 11:24:56 nia Exp $
 bin/aria_chk
 bin/aria_dump_log
 bin/aria_ftdump
@@ -7,9 +7,12 @@
 bin/innochecksum
 bin/mariabackup
 bin/mariadb-backup
+${PLIST.embedded}bin/mariadb-client-test-embedded
 bin/mariadb-dumpslow
+${PLIST.embedded}bin/mariadb-embedded
 bin/mariadb-fix-extensions
-bin/mariadb-ldb
+${PLIST.rocksdb}bin/mariadb-ldb
+${PLIST.embedded}bin/mariadb-test-embedded
 bin/mariadb-tzinfo-to-sql
 bin/mariadb-waitpid
 bin/mariadbd-multi
@@ -21,21 +24,25 @@
 bin/myisamchk
 bin/myisamlog
 bin/myisampack
-bin/myrocks_hotbackup
+${PLIST.rocksdb}bin/myrocks_hotbackup
+${PLIST.embedded}bin/mysql_client_test_embedded
+${PLIST.embedded}bin/mysql_embedded
 bin/mysql_fix_extensions
 bin/mysql_install_db
-bin/mysql_ldb
+${PLIST.rocksdb}bin/mysql_ldb
 bin/mysql_tzinfo_to_sql
 bin/mysql_waitpid
 bin/mysqld_multi
 bin/mysqld_safe
 bin/mysqld_safe_helper
 bin/mysqldumpslow
+${PLIST.embedded}bin/mysqltest_embedded
 bin/perror
 bin/replace
 bin/resolve_stack_dump
 bin/resolveip
-bin/sst_dump
+${PLIST.rocksdb}bin/sst_dump
+${PLIST.embedded}bin/test-connect-t
 bin/wsrep_sst_common
 bin/wsrep_sst_mariabackup
 bin/wsrep_sst_mysqldump
@@ -55,6 +62,7 @@
 include/mysql/server/private/derror.h
 include/mysql/server/private/des_key_file.h
 include/mysql/server/private/discover.h
+${PLIST.embedded}include/mysql/server/private/embedded_priv.h
 include/mysql/server/private/event_data_objects.h
 include/mysql/server/private/event_db_repository.h
 include/mysql/server/private/event_parse_data.h
@@ -276,6 +284,11 @@
 include/mysql/server/private/wsrep_var.h
 include/mysql/server/private/wsrep_xid.h
 include/mysql/server/private/xa.h
+${PLIST.embedded}lib/libmariadbd.a
+${PLIST.embedded}lib/libmariadbd.so
+${PLIST.embedded}lib/libmariadbd.so.19
+${PLIST.embedded}lib/libmysqld.a
+${PLIST.embedded}lib/libmysqld.so
 lib/libmysqlservices.a
 lib/mysql/plugin/adt_null.so
 lib/mysql/plugin/auth_0x0100.so
@@ -295,8 +308,8 @@
 lib/mysql/plugin/ha_connect.so
 lib/mysql/plugin/ha_federated.so
 lib/mysql/plugin/ha_federatedx.so
-lib/mysql/plugin/ha_oqgraph.so
-lib/mysql/plugin/ha_rocksdb.so
+${PLIST.oqgraph}lib/mysql/plugin/ha_oqgraph.so
+${PLIST.rocksdb}lib/mysql/plugin/ha_rocksdb.so
 lib/mysql/plugin/ha_sphinx.so
 lib/mysql/plugin/ha_spider.so
 lib/mysql/plugin/ha_test_sql_discovery.so
@@ -3746,69 +3759,69 @@
 share/mysql/test/plugin/myisammrg/storage_engine/type_spatial.rdiff
 share/mysql/test/plugin/myisammrg/storage_engine/type_spatial_indexes.rdiff
 share/mysql/test/plugin/myisammrg/storage_engine/vcol.rdiff
-share/mysql/test/plugin/oqgraph/oqgraph/boundary_conditions.result
-share/mysql/test/plugin/oqgraph/oqgraph/boundary_conditions.test
-share/mysql/test/plugin/oqgraph/oqgraph/connections_mdev5748.result
-share/mysql/test/plugin/oqgraph/oqgraph/connections_mdev5748.test
-share/mysql/test/plugin/oqgraph/oqgraph/create_attr.result
-share/mysql/test/plugin/oqgraph/oqgraph/create_attr.test
-share/mysql/test/plugin/oqgraph/oqgraph/create_attr_legacy.result
-share/mysql/test/plugin/oqgraph/oqgraph/create_attr_legacy.test
-share/mysql/test/plugin/oqgraph/oqgraph/general-Aria.result
-share/mysql/test/plugin/oqgraph/oqgraph/general-Aria.test
-share/mysql/test/plugin/oqgraph/oqgraph/general-MyISAM.result
-share/mysql/test/plugin/oqgraph/oqgraph/general-MyISAM.test
-share/mysql/test/plugin/oqgraph/oqgraph/general-innodb.result
-share/mysql/test/plugin/oqgraph/oqgraph/general-innodb.test
-share/mysql/test/plugin/oqgraph/oqgraph/general.inc
-share/mysql/test/plugin/oqgraph/oqgraph/generate_backing_table_tests_suite.sh
-share/mysql/test/plugin/oqgraph/oqgraph/invalid_operations.result
-share/mysql/test/plugin/oqgraph/oqgraph/invalid_operations.test
-share/mysql/test/plugin/oqgraph/oqgraph/isnull.result
-share/mysql/test/plugin/oqgraph/oqgraph/isnull.test
-share/mysql/test/plugin/oqgraph/oqgraph/legacy_upgrade.result
-share/mysql/test/plugin/oqgraph/oqgraph/legacy_upgrade.test
-share/mysql/test/plugin/oqgraph/oqgraph/maintainer-general-record.sh
-share/mysql/test/plugin/oqgraph/oqgraph/regression_1133093.result
-share/mysql/test/plugin/oqgraph/oqgraph/regression_1133093.test
-share/mysql/test/plugin/oqgraph/oqgraph/regression_1134355.result
-share/mysql/test/plugin/oqgraph/oqgraph/regression_1134355.test
-share/mysql/test/plugin/oqgraph/oqgraph/regression_1195735.result
-share/mysql/test/plugin/oqgraph/oqgraph/regression_1195735.test
-share/mysql/test/plugin/oqgraph/oqgraph/regression_1196020.result
-share/mysql/test/plugin/oqgraph/oqgraph/regression_1196020.test
-share/mysql/test/plugin/oqgraph/oqgraph/regression_1196027.result
-share/mysql/test/plugin/oqgraph/oqgraph/regression_1196027.test
-share/mysql/test/plugin/oqgraph/oqgraph/regression_1196036.result
-share/mysql/test/plugin/oqgraph/oqgraph/regression_1196036.test
-share/mysql/test/plugin/oqgraph/oqgraph/regression_1213120.result
-share/mysql/test/plugin/oqgraph/oqgraph/regression_1213120.test
-share/mysql/test/plugin/oqgraph/oqgraph/regression_1233113.result
-share/mysql/test/plugin/oqgraph/oqgraph/regression_1233113.test
-share/mysql/test/plugin/oqgraph/oqgraph/regression_796647.result
-share/mysql/test/plugin/oqgraph/oqgraph/regression_796647.test
-share/mysql/test/plugin/oqgraph/oqgraph/regression_796647b.result
-share/mysql/test/plugin/oqgraph/oqgraph/regression_796647b.test
-share/mysql/test/plugin/oqgraph/oqgraph/regression_796647c.result
-share/mysql/test/plugin/oqgraph/oqgraph/regression_796647c.test
-share/mysql/test/plugin/oqgraph/oqgraph/regression_drop_after.result
-share/mysql/test/plugin/oqgraph/oqgraph/regression_drop_after.test
-share/mysql/test/plugin/oqgraph/oqgraph/regression_mdev5744.opt
-share/mysql/test/plugin/oqgraph/oqgraph/regression_mdev5744.result
-share/mysql/test/plugin/oqgraph/oqgraph/regression_mdev5744.test
-share/mysql/test/plugin/oqgraph/oqgraph/regression_mdev5871.result
-share/mysql/test/plugin/oqgraph/oqgraph/regression_mdev5871.test
-share/mysql/test/plugin/oqgraph/oqgraph/regression_mdev5996.inc
-share/mysql/test/plugin/oqgraph/oqgraph/regression_mdev5996.result
-share/mysql/test/plugin/oqgraph/oqgraph/regression_mdev5996.test
-share/mysql/test/plugin/oqgraph/oqgraph/regression_mdev6282.result
-share/mysql/test/plugin/oqgraph/oqgraph/regression_mdev6282.test
-share/mysql/test/plugin/oqgraph/oqgraph/regression_mdev6345.result
-share/mysql/test/plugin/oqgraph/oqgraph/regression_mdev6345.test
-share/mysql/test/plugin/oqgraph/oqgraph/social.result
-share/mysql/test/plugin/oqgraph/oqgraph/social.test
-share/mysql/test/plugin/oqgraph/oqgraph/suite.opt
-share/mysql/test/plugin/oqgraph/oqgraph/suite.pm
+${PLIST.oqgraph}share/mysql/test/plugin/oqgraph/oqgraph/boundary_conditions.result
+${PLIST.oqgraph}share/mysql/test/plugin/oqgraph/oqgraph/boundary_conditions.test
+${PLIST.oqgraph}share/mysql/test/plugin/oqgraph/oqgraph/connections_mdev5748.result
+${PLIST.oqgraph}share/mysql/test/plugin/oqgraph/oqgraph/connections_mdev5748.test
+${PLIST.oqgraph}share/mysql/test/plugin/oqgraph/oqgraph/create_attr.result
+${PLIST.oqgraph}share/mysql/test/plugin/oqgraph/oqgraph/create_attr.test
+${PLIST.oqgraph}share/mysql/test/plugin/oqgraph/oqgraph/create_attr_legacy.result
+${PLIST.oqgraph}share/mysql/test/plugin/oqgraph/oqgraph/create_attr_legacy.test
+${PLIST.oqgraph}share/mysql/test/plugin/oqgraph/oqgraph/general-Aria.result
+${PLIST.oqgraph}share/mysql/test/plugin/oqgraph/oqgraph/general-Aria.test
+${PLIST.oqgraph}share/mysql/test/plugin/oqgraph/oqgraph/general-MyISAM.result
+${PLIST.oqgraph}share/mysql/test/plugin/oqgraph/oqgraph/general-MyISAM.test
+${PLIST.oqgraph}share/mysql/test/plugin/oqgraph/oqgraph/general-innodb.result
+${PLIST.oqgraph}share/mysql/test/plugin/oqgraph/oqgraph/general-innodb.test
+${PLIST.oqgraph}share/mysql/test/plugin/oqgraph/oqgraph/general.inc
+${PLIST.oqgraph}share/mysql/test/plugin/oqgraph/oqgraph/generate_backing_table_tests_suite.sh
+${PLIST.oqgraph}share/mysql/test/plugin/oqgraph/oqgraph/invalid_operations.result
+${PLIST.oqgraph}share/mysql/test/plugin/oqgraph/oqgraph/invalid_operations.test
+${PLIST.oqgraph}share/mysql/test/plugin/oqgraph/oqgraph/isnull.result
+${PLIST.oqgraph}share/mysql/test/plugin/oqgraph/oqgraph/isnull.test
+${PLIST.oqgraph}share/mysql/test/plugin/oqgraph/oqgraph/legacy_upgrade.result
+${PLIST.oqgraph}share/mysql/test/plugin/oqgraph/oqgraph/legacy_upgrade.test
+${PLIST.oqgraph}share/mysql/test/plugin/oqgraph/oqgraph/maintainer-general-record.sh
+${PLIST.oqgraph}share/mysql/test/plugin/oqgraph/oqgraph/regression_1133093.result
+${PLIST.oqgraph}share/mysql/test/plugin/oqgraph/oqgraph/regression_1133093.test
+${PLIST.oqgraph}share/mysql/test/plugin/oqgraph/oqgraph/regression_1134355.result
+${PLIST.oqgraph}share/mysql/test/plugin/oqgraph/oqgraph/regression_1134355.test
+${PLIST.oqgraph}share/mysql/test/plugin/oqgraph/oqgraph/regression_1195735.result
+${PLIST.oqgraph}share/mysql/test/plugin/oqgraph/oqgraph/regression_1195735.test
+${PLIST.oqgraph}share/mysql/test/plugin/oqgraph/oqgraph/regression_1196020.result
+${PLIST.oqgraph}share/mysql/test/plugin/oqgraph/oqgraph/regression_1196020.test
+${PLIST.oqgraph}share/mysql/test/plugin/oqgraph/oqgraph/regression_1196027.result
+${PLIST.oqgraph}share/mysql/test/plugin/oqgraph/oqgraph/regression_1196027.test
+${PLIST.oqgraph}share/mysql/test/plugin/oqgraph/oqgraph/regression_1196036.result
+${PLIST.oqgraph}share/mysql/test/plugin/oqgraph/oqgraph/regression_1196036.test
+${PLIST.oqgraph}share/mysql/test/plugin/oqgraph/oqgraph/regression_1213120.result
+${PLIST.oqgraph}share/mysql/test/plugin/oqgraph/oqgraph/regression_1213120.test
+${PLIST.oqgraph}share/mysql/test/plugin/oqgraph/oqgraph/regression_1233113.result
+${PLIST.oqgraph}share/mysql/test/plugin/oqgraph/oqgraph/regression_1233113.test
+${PLIST.oqgraph}share/mysql/test/plugin/oqgraph/oqgraph/regression_796647.result
+${PLIST.oqgraph}share/mysql/test/plugin/oqgraph/oqgraph/regression_796647.test
+${PLIST.oqgraph}share/mysql/test/plugin/oqgraph/oqgraph/regression_796647b.result
+${PLIST.oqgraph}share/mysql/test/plugin/oqgraph/oqgraph/regression_796647b.test
+${PLIST.oqgraph}share/mysql/test/plugin/oqgraph/oqgraph/regression_796647c.result
+${PLIST.oqgraph}share/mysql/test/plugin/oqgraph/oqgraph/regression_796647c.test
+${PLIST.oqgraph}share/mysql/test/plugin/oqgraph/oqgraph/regression_drop_after.result
+${PLIST.oqgraph}share/mysql/test/plugin/oqgraph/oqgraph/regression_drop_after.test
+${PLIST.oqgraph}share/mysql/test/plugin/oqgraph/oqgraph/regression_mdev5744.opt
+${PLIST.oqgraph}share/mysql/test/plugin/oqgraph/oqgraph/regression_mdev5744.result
+${PLIST.oqgraph}share/mysql/test/plugin/oqgraph/oqgraph/regression_mdev5744.test
+${PLIST.oqgraph}share/mysql/test/plugin/oqgraph/oqgraph/regression_mdev5871.result
+${PLIST.oqgraph}share/mysql/test/plugin/oqgraph/oqgraph/regression_mdev5871.test
+${PLIST.oqgraph}share/mysql/test/plugin/oqgraph/oqgraph/regression_mdev5996.inc
+${PLIST.oqgraph}share/mysql/test/plugin/oqgraph/oqgraph/regression_mdev5996.result
+${PLIST.oqgraph}share/mysql/test/plugin/oqgraph/oqgraph/regression_mdev5996.test
+${PLIST.oqgraph}share/mysql/test/plugin/oqgraph/oqgraph/regression_mdev6282.result
+${PLIST.oqgraph}share/mysql/test/plugin/oqgraph/oqgraph/regression_mdev6282.test
+${PLIST.oqgraph}share/mysql/test/plugin/oqgraph/oqgraph/regression_mdev6345.result
+${PLIST.oqgraph}share/mysql/test/plugin/oqgraph/oqgraph/regression_mdev6345.test
+${PLIST.oqgraph}share/mysql/test/plugin/oqgraph/oqgraph/social.result
+${PLIST.oqgraph}share/mysql/test/plugin/oqgraph/oqgraph/social.test
+${PLIST.oqgraph}share/mysql/test/plugin/oqgraph/oqgraph/suite.opt
+${PLIST.oqgraph}share/mysql/test/plugin/oqgraph/oqgraph/suite.pm
 share/mysql/test/plugin/query_response_time/query_response_time/basic.result
 share/mysql/test/plugin/query_response_time/query_response_time/basic.test
 share/mysql/test/plugin/query_response_time/query_response_time/query_response_time-stored.inc
diff -r 82a95f758d08 -r 192ca68fadb4 databases/mariadb104-server/PLIST.embedded
--- a/databases/mariadb104-server/PLIST.embedded        Wed May 26 10:14:07 2021 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-@comment $NetBSD: PLIST.embedded,v 1.1 2021/05/08 19:47:16 jdolecek Exp $
-bin/mariadb-client-test-embedded
-bin/mariadb-embedded
-bin/mariadb-test-embedded
-bin/mysql_client_test_embedded
-bin/mysql_embedded
-bin/mysqltest_embedded
-bin/test-connect-t
-include/mysql/server/private/embedded_priv.h
-lib/libmariadbd.a
-lib/libmariadbd.so
-lib/libmariadbd.so.19
-lib/libmysqld.a
-lib/libmysqld.so
diff -r 82a95f758d08 -r 192ca68fadb4 databases/mariadb104-server/buildlink3.mk
--- a/databases/mariadb104-server/buildlink3.mk Wed May 26 10:14:07 2021 +0000
+++ b/databases/mariadb104-server/buildlink3.mk Wed May 26 11:24:56 2021 +0000
@@ -1,12 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.2 2021/05/10 17:31:27 nia Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2021/05/26 11:24:56 nia Exp $
 
 BUILDLINK_TREE+=       mysql-server
 
 .if !defined(MYSQL_SERVER_BUILDLINK3_MK)
 MYSQL_SERVER_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.mysql-server+=   mariadb-server>=10.4.0
-BUILDLINK_ABI_DEPENDS.mysql-server+=   mariadb-server>=10.4.0
+BUILDLINK_API_DEPENDS.mysql-server+=   mariadb-server>=10.4.0<10.5.0
+BUILDLINK_ABI_DEPENDS.mysql-server+=   mariadb-server>=10.4.0<10.5.0
 BUILDLINK_PKGSRCDIR.mysql-server?=     ../../databases/mariadb104-server
 BUILDLINK_LIBDIRS.mysql-server+=       lib
 
diff -r 82a95f758d08 -r 192ca68fadb4 databases/mariadb104-server/options.mk
--- a/databases/mariadb104-server/options.mk    Wed May 26 10:14:07 2021 +0000
+++ b/databases/mariadb104-server/options.mk    Wed May 26 11:24:56 2021 +0000
@@ -1,20 +1,75 @@
-# $NetBSD: options.mk,v 1.2 2021/05/10 17:31:27 nia Exp $
+# $NetBSD: options.mk,v 1.3 2021/05/26 11:24:56 nia Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.mysql-server