pkgsrc-Changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

CVS commit: pkgsrc/databases



Module Name:    pkgsrc
Committed By:   nia
Date:           Mon Jul 10 22:55:50 UTC 2023

Modified Files:
        pkgsrc/databases: Makefile
Added Files:
        pkgsrc/databases/mariadb1011-client: DESCR Makefile Makefile.common
            PLIST buildlink3.mk distinfo options.mk
        pkgsrc/databases/mariadb1011-client/patches:
            patch-BUILD_compile-pentium32-gcov patch-CMakeLists.txt
            patch-client_CMakeLists.txt patch-client_mysql.cc
            patch-extra_readline_CMakeLists.txt patch-include_my__global.h
            patch-mysys_my__gethwaddr.c
            patch-plugin_auth__pam_testing_pam__mariadb__mtr.c
            patch-plugin_auth__socket_CMakeLists.txt
            patch-scripts_CMakeLists.txt patch-scripts_mysqld__safe.sh
            patch-sql_mysqld.cc patch-storage_connect_tabvct.cpp
            patch-storage_innobase_include_transactional__lock__guard.h
            patch-storage_rocksdb_rdb__io__watchdog.cc
            patch-storage_rocksdb_rdb__io__watchdog.h
            patch-storage_rocksdb_rocksdb_Makefile
            patch-storage_rocksdb_rocksdb_build__tools_fb__compile__mongo.sh
            patch-support-files_mysql.server.sh
        pkgsrc/databases/mariadb1011-server: DESCR Makefile PLIST buildlink3.mk
            options.mk
        pkgsrc/databases/mariadb1011-server/files: mariadb.sh
        pkgsrc/databases/mariadb1011-server/files/smf: manifest.xml mariadb.sh

Log Message:
Import mariadb-10.11, the most recent LTS branch.


To generate a diff of this commit:
cvs rdiff -u -r1.679 -r1.680 pkgsrc/databases/Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/databases/mariadb1011-client/DESCR \
    pkgsrc/databases/mariadb1011-client/Makefile \
    pkgsrc/databases/mariadb1011-client/Makefile.common \
    pkgsrc/databases/mariadb1011-client/PLIST \
    pkgsrc/databases/mariadb1011-client/buildlink3.mk \
    pkgsrc/databases/mariadb1011-client/distinfo \
    pkgsrc/databases/mariadb1011-client/options.mk
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/databases/mariadb1011-client/patches/patch-BUILD_compile-pentium32-gcov \
    pkgsrc/databases/mariadb1011-client/patches/patch-CMakeLists.txt \
    pkgsrc/databases/mariadb1011-client/patches/patch-client_CMakeLists.txt \
    pkgsrc/databases/mariadb1011-client/patches/patch-client_mysql.cc \
    pkgsrc/databases/mariadb1011-client/patches/patch-extra_readline_CMakeLists.txt \
    pkgsrc/databases/mariadb1011-client/patches/patch-include_my__global.h \
    pkgsrc/databases/mariadb1011-client/patches/patch-mysys_my__gethwaddr.c \
    pkgsrc/databases/mariadb1011-client/patches/patch-plugin_auth__pam_testing_pam__mariadb__mtr.c \
    pkgsrc/databases/mariadb1011-client/patches/patch-plugin_auth__socket_CMakeLists.txt \
    pkgsrc/databases/mariadb1011-client/patches/patch-scripts_CMakeLists.txt \
    pkgsrc/databases/mariadb1011-client/patches/patch-scripts_mysqld__safe.sh \
    pkgsrc/databases/mariadb1011-client/patches/patch-sql_mysqld.cc \
    pkgsrc/databases/mariadb1011-client/patches/patch-storage_connect_tabvct.cpp \
    pkgsrc/databases/mariadb1011-client/patches/patch-storage_innobase_include_transactional__lock__guard.h \
    pkgsrc/databases/mariadb1011-client/patches/patch-storage_rocksdb_rdb__io__watchdog.cc \
    pkgsrc/databases/mariadb1011-client/patches/patch-storage_rocksdb_rdb__io__watchdog.h \
    pkgsrc/databases/mariadb1011-client/patches/patch-storage_rocksdb_rocksdb_Makefile \
    pkgsrc/databases/mariadb1011-client/patches/patch-storage_rocksdb_rocksdb_build__tools_fb__compile__mongo.sh \
    pkgsrc/databases/mariadb1011-client/patches/patch-support-files_mysql.server.sh
cvs rdiff -u -r0 -r1.1 pkgsrc/databases/mariadb1011-server/DESCR \
    pkgsrc/databases/mariadb1011-server/Makefile \
    pkgsrc/databases/mariadb1011-server/PLIST \
    pkgsrc/databases/mariadb1011-server/buildlink3.mk \
    pkgsrc/databases/mariadb1011-server/options.mk
cvs rdiff -u -r0 -r1.1 pkgsrc/databases/mariadb1011-server/files/mariadb.sh
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/databases/mariadb1011-server/files/smf/manifest.xml \
    pkgsrc/databases/mariadb1011-server/files/smf/mariadb.sh

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/databases/Makefile
diff -u pkgsrc/databases/Makefile:1.679 pkgsrc/databases/Makefile:1.680
--- pkgsrc/databases/Makefile:1.679     Mon Jun 26 11:47:46 2023
+++ pkgsrc/databases/Makefile   Mon Jul 10 22:55:49 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.679 2023/06/26 11:47:46 wiz Exp $
+# $NetBSD: Makefile,v 1.680 2023/07/10 22:55:49 nia Exp $
 
 COMMENT=       Databases
 
@@ -100,6 +100,8 @@ SUBDIR+=    lua-sql-postgres
 SUBDIR+=       lua-sql-sqlite3
 SUBDIR+=       lua-sqlite3
 SUBDIR+=       lua-tokyocabinet
+SUBDIR+=       mariadb1011-client
+SUBDIR+=       mariadb1011-server
 SUBDIR+=       mariadb104-client
 SUBDIR+=       mariadb104-server
 SUBDIR+=       mariadb105-client

Added files:

Index: pkgsrc/databases/mariadb1011-client/DESCR
diff -u /dev/null pkgsrc/databases/mariadb1011-client/DESCR:1.1
--- /dev/null   Mon Jul 10 22:55:50 2023
+++ pkgsrc/databases/mariadb1011-client/DESCR   Mon Jul 10 22:55:49 2023
@@ -0,0 +1,14 @@
+MariaDB Server is one of the most popular open source relational databases.
+It's made by the original developers of MySQL.
+
+MariaDB turns data into structured information in a wide array of applications,
+ranging from banking to websites. It is an enhanced, drop-in replacement
+for MySQL. MariaDB is used because it is fast, scalable and robust, with a
+rich ecosystem of storage engines, plugins and many other tools make it very
+versatile for a wide variety of use cases.
+
+MariaDB is developed as open source software and as a relational database
+it provides an SQL interface for accessing data. The latest versions of
+MariaDB also include GIS and JSON features.
+
+This package contains the MariaDB client programs and libraries.
Index: pkgsrc/databases/mariadb1011-client/Makefile
diff -u /dev/null pkgsrc/databases/mariadb1011-client/Makefile:1.1
--- /dev/null   Mon Jul 10 22:55:50 2023
+++ pkgsrc/databases/mariadb1011-client/Makefile        Mon Jul 10 22:55:49 2023
@@ -0,0 +1,17 @@
+# $NetBSD: Makefile,v 1.1 2023/07/10 22:55:49 nia Exp $
+
+PKGNAME=       ${DISTNAME:S/-/-client-/}
+COMMENT=       MariaDB 10.11, a free MySQL compatible database (client)
+
+CONFLICTS=     mysql-client-[0-9]*
+
+.include "Makefile.common"
+
+CMAKE_ARGS+=   -DWITHOUT_SERVER=ON
+
+INSTALL_DIRS+= client include libmariadb man scripts
+
+CMAKE_ARGS.NetBSD+=    -DTGOTOLIB=-ltermcap
+
+.include "options.mk"
+.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/databases/mariadb1011-client/Makefile.common
diff -u /dev/null pkgsrc/databases/mariadb1011-client/Makefile.common:1.1
--- /dev/null   Mon Jul 10 22:55:50 2023
+++ pkgsrc/databases/mariadb1011-client/Makefile.common Mon Jul 10 22:55:49 2023
@@ -0,0 +1,130 @@
+# $NetBSD: Makefile.common,v 1.1 2023/07/10 22:55:49 nia Exp $
+#
+# used by databases/mariadb1011-client/Makefile
+# used by databases/mariadb1011-server/Makefile
+
+DISTNAME=      mariadb-10.11.4
+CATEGORIES=    databases
+MASTER_SITES=  https://archive.mariadb.org/${DISTNAME}/source/
+
+MAINTAINER?=   pkgsrc-users%NetBSD.org@localhost
+HOMEPAGE=      https://mariadb.org/
+LICENSE=       gnu-gpl-v2
+
+DISTINFO_FILE?=        ${.CURDIR}/../../databases/mariadb1011-client/distinfo
+PATCHDIR?=     ${.CURDIR}/../../databases/mariadb1011-client/patches
+
+USE_CMAKE=     yes
+USE_LANGUAGES= c c++
+USE_TOOLS+=    perl:run pkg-config bison
+USE_CURSES=    wide
+
+PLIST_SRC=     ${PLIST_SRC_DFLT}
+
+.include "../../mk/bsd.prefs.mk"
+
+#
+# Use MySQL defaults if set.
+#
+MARIADB_DATADIR?=      ${MYSQL_DATADIR:U${VARBASE}/db/mariadb}
+MARIADB_CHARSET?=      ${MYSQL_CHARSET:Uutf8mb4}
+MARIADB_COLLATION?=    ${MYSQL_COLLATION:Uutf8mb4_unicode_ci}
+MARIADB_EXTRA_CHARSET?=        ${MYSQL_EXTRA_CHARSET:Uall}
+
+BUILD_DEFS+=           VARBASE
+
+CMAKE_ARGS+=           -DCOMPILATION_COMMENT="pkgsrc"
+
+CMAKE_ARGS+=           -DCMAKE_BUILD_TYPE="Release"
+
+CMAKE_ARGS+=           -DINSTALL_BINDIR="bin"
+CMAKE_ARGS+=           -DINSTALL_DOCDIR="share/doc/mysql"
+CMAKE_ARGS+=           -DINSTALL_DOCREADMEDIR="share/doc/mysql"
+CMAKE_ARGS+=           -DINSTALL_INCLUDEDIR="include/mysql"
+CMAKE_ARGS+=           -DINSTALL_INFODIR="${PKGINFODIR}"
+CMAKE_ARGS+=           -DINSTALL_LIBDIR="lib"
+CMAKE_ARGS+=           -DINSTALL_MANDIR="${PKGMANDIR}"
+CMAKE_ARGS+=           -DINSTALL_MYSQLSHAREDIR="share/mysql"
+CMAKE_ARGS+=           -DINSTALL_MYSQLTESTDIR=""
+CMAKE_ARGS+=           -DINSTALL_PAMDIR="lib/security"
+CMAKE_ARGS+=           -DINSTALL_PAMDATADIR="share/examples/mariadb_auth_pam"
+CMAKE_ARGS+=           -DINSTALL_PLUGINDIR="lib/mysql/plugin"
+CMAKE_ARGS+=           -DINSTALL_SBINDIR="sbin"
+CMAKE_ARGS+=           -DINSTALL_SCRIPTDIR="bin"
+CMAKE_ARGS+=           -DINSTALL_SQLBENCHDIR="share/mysql/sql-bench"
+CMAKE_ARGS+=           -DINSTALL_SUPPORTFILESDIR="share/mysql"
+CMAKE_ARGS+=           -DINSTALL_SYSCONFDIR="${PKG_SYSCONFDIR}"
+CMAKE_ARGS+=           -DMYSQL_DATADIR=${MARIADB_DATADIR}
+
+CMAKE_ARGS+=           -DWITH_UNIT_TESTS=OFF
+CMAKE_ARGS+=           -DWITH_LIBWRAP=ON
+CMAKE_ARGS+=           -DWITH_PCRE="system"
+CMAKE_ARGS+=           -DWITH_ZLIB="system"
+CMAKE_ARGS+=           -DDEFAULT_CHARSET=${MARIADB_CHARSET}
+CMAKE_ARGS+=           -DDEFAULT_COLLATION=${MARIADB_COLLATION:Q}
+CMAKE_ARGS+=           -DWITH_EXTRA_CHARSETS=${MARIADB_EXTRA_CHARSET:Q}
+
+CMAKE_ARGS+=           -DPLUGIN_EXAMPLE=NO
+CMAKE_ARGS+=           -DPLUGIN_FEEDBACK=NO
+
+# Requires Java
+CMAKE_ARGS+=           -DCONNECT_WITH_JDBC=OFF
+
+# Options which affect generation of includes
+CMAKE_ARGS+=           -DWITH_ARIA_STORAGE_ENGINE=ON
+CMAKE_ARGS+=           -DWITH_PARTITION_STORAGE_ENGINE=ON
+CMAKE_ARGS+=           -DWITH_PERFSCHEMA_STORAGE_ENGINE=ON
+CMAKE_ARGS+=           -DCMAKE_DISABLE_FIND_PACKAGE_Snappy=ON
+CMAKE_ARGS+=           -DCMAKE_DISABLE_FIND_PACKAGE_LZO=ON
+CMAKE_ARGS+=           -DCMAKE_DISABLE_FIND_PACKAGE_LZ4=ON
+CMAKE_ARGS+=           -DWITHOUT_MROONGA_STORAGE_ENGINE=ON
+
+CMAKE_ARGS+=           -DENABLE_DTRACE=OFF
+
+# Ensure the correct DTrace ABI is used.
+.if !empty(ABI)
+CMAKE_ARGS+=           -DDTRACE_FLAGS="-${ABI}"
+.endif
+
+# We don't clone MariaDB from git, so avoid peeking into
+# the parent repository.
+CMAKE_ARGS+=           -DCMAKE_DISABLE_FIND_PACKAGE_Git=ON
+
+
+# https://github.com/MariaDB/server/pull/2326
+# https://github.com/MariaDB/server/pull/2321
+CFLAGS.SunOS+=         -fPIC -DHAVE_ALLOCA_H=1
+CFLAGS.NetBSD+=                -DIOAPI_NO_64
+
+REPLACE_PERL+=         scripts/mytop.sh
+REPLACE_PERL+=         sql-bench/*.sh
+
+SUBST_CLASSES+=                perl
+SUBST_STAGE.perl=      pre-configure
+SUBST_FILES.perl=      scripts/CMakeLists.txt
+SUBST_SED.perl=                -e "s,/usr/bin/perl,${TOOLS_PATH.perl},g"
+SUBST_SED.perl+=       -e "s,/usr/local/bin/perl,${TOOLS_PATH.perl},g"
+
+CHECK_INTERPRETER_SKIP+=       share/mysql/test/*
+CHECK_PORTABILITY_SKIP+=       storage/columnstore/columnstore/oam/cloud/*.sh.in
+CHECK_PORTABILITY_SKIP+=       storage/columnstore/columnstore/oam/install_scripts/*.sh.in
+CHECK_PORTABILITY_SKIP+=       storage/columnstore/columnstore/oam/install_scripts/*.in
+CHECK_PORTABILITY_SKIP+=       BUILD/compile-pentium-gcov
+
+PKGCONFIG_OVERRIDE+=   support-files/mariadb.pc.in
+PKGCONFIG_OVERRIDE+=   libmariadb/mariadb_config/libmariadb.pc.in
+
+.include "../../archivers/bzip2/buildlink3.mk"
+.include "../../archivers/zstd/buildlink3.mk"
+.include "../../archivers/xz/buildlink3.mk"
+.include "../../devel/pcre2/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
+.include "../../textproc/fmtlib/buildlink3.mk"
+.include "../../www/curl/buildlink3.mk"
+.include "../../mk/atomic64.mk"
+.include "../../mk/curses.buildlink3.mk"
+.include "../../mk/dlopen.buildlink3.mk"
+BUILDLINK_TRANSFORM+=  opt:-ldl:${BUILDLINK_LDADD.dl:Q}
+.include "../../mk/krb5.buildlink3.mk"
+.include "../../mk/pam.buildlink3.mk"
+.include "../../mk/readline.buildlink3.mk"
Index: pkgsrc/databases/mariadb1011-client/PLIST
diff -u /dev/null pkgsrc/databases/mariadb1011-client/PLIST:1.1
--- /dev/null   Mon Jul 10 22:55:50 2023
+++ pkgsrc/databases/mariadb1011-client/PLIST   Mon Jul 10 22:55:49 2023
@@ -0,0 +1,437 @@
+@comment $NetBSD: PLIST,v 1.1 2023/07/10 22:55:49 nia Exp $
+bin/mariadb
+bin/mariadb-access
+bin/mariadb-admin
+bin/mariadb-binlog
+bin/mariadb-check
+bin/mariadb-conv
+bin/mariadb-convert-table-format
+bin/mariadb-dump
+bin/mariadb-dumpslow
+bin/mariadb-find-rows
+bin/mariadb-hotcopy
+bin/mariadb-import
+bin/mariadb-plugin
+bin/mariadb-secure-installation
+bin/mariadb-setpermission
+bin/mariadb-show
+bin/mariadb-slap
+bin/mariadb-test
+bin/mariadb-upgrade
+bin/mariadb_config
+bin/msql2mysql
+bin/mysql
+bin/mysql_config
+bin/mysql_convert_table_format
+bin/mysql_find_rows
+bin/mysql_plugin
+bin/mysql_secure_installation
+bin/mysql_setpermission
+bin/mysql_upgrade
+bin/mysqlaccess
+bin/mysqladmin
+bin/mysqlbinlog
+bin/mysqlcheck
+bin/mysqldump
+bin/mysqldumpslow
+bin/mysqlhotcopy
+bin/mysqlimport
+bin/mysqlshow
+bin/mysqlslap
+bin/mysqltest
+bin/mytop
+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_alloca.h
+include/mysql/my_config.h
+include/mysql/my_global.h
+include/mysql/my_sys.h
+include/mysql/mysql.h
+include/mysql/mysql/client_plugin.h
+include/mysql/mysql/plugin_auth.h
+include/mysql/mysql/plugin_auth_common.h
+include/mysql/mysql_com.h
+include/mysql/mysql_version.h
+include/mysql/mysqld_error.h
+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/mariadb_capi_rename.h
+include/mysql/server/my_alloc.h
+include/mysql/server/my_alloca.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_sql.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/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/private/aligned.h
+include/mysql/server/private/aria_backup.h
+include/mysql/server/private/assume_aligned.h
+include/mysql/server/private/atomic/gcc_builtins.h
+include/mysql/server/private/atomic/generic-msvc.h
+include/mysql/server/private/atomic/solaris.h
+include/mysql/server/private/config.h
+include/mysql/server/private/dur_prop.h
+include/mysql/server/private/ft_global.h
+include/mysql/server/private/hash.h
+include/mysql/server/private/heap.h
+include/mysql/server/private/ilist.h
+include/mysql/server/private/lf.h
+include/mysql/server/private/maria.h
+include/mysql/server/private/my_alarm.h
+include/mysql/server/private/my_atomic.h
+include/mysql/server/private/my_atomic_wrapper.h
+include/mysql/server/private/my_base.h
+include/mysql/server/private/my_bit.h
+include/mysql/server/private/my_bitmap.h
+include/mysql/server/private/my_check_opt.h
+include/mysql/server/private/my_compare.h
+include/mysql/server/private/my_counter.h
+include/mysql/server/private/my_cpu.h
+include/mysql/server/private/my_crypt.h
+include/mysql/server/private/my_default.h
+include/mysql/server/private/my_handler_errors.h
+include/mysql/server/private/my_libwrap.h
+include/mysql/server/private/my_md5.h
+include/mysql/server/private/my_minidump.h
+include/mysql/server/private/my_nosys.h
+include/mysql/server/private/my_rdtsc.h
+include/mysql/server/private/my_rnd.h
+include/mysql/server/private/my_service_manager.h
+include/mysql/server/private/my_stack_alloc.h
+include/mysql/server/private/my_stacktrace.h
+include/mysql/server/private/my_time.h
+include/mysql/server/private/my_tree.h
+include/mysql/server/private/my_uctype.h
+include/mysql/server/private/my_user.h
+include/mysql/server/private/myisam.h
+include/mysql/server/private/myisamchk.h
+include/mysql/server/private/myisammrg.h
+include/mysql/server/private/myisampack.h
+include/mysql/server/private/mysqld_default_groups.h
+include/mysql/server/private/mysys_err.h
+include/mysql/server/private/password.h
+include/mysql/server/private/pfs_file_provider.h
+include/mysql/server/private/pfs_idle_provider.h
+include/mysql/server/private/pfs_memory_provider.h
+include/mysql/server/private/pfs_metadata_provider.h
+include/mysql/server/private/pfs_socket_provider.h
+include/mysql/server/private/pfs_stage_provider.h
+include/mysql/server/private/pfs_statement_provider.h
+include/mysql/server/private/pfs_table_provider.h
+include/mysql/server/private/pfs_thread_provider.h
+include/mysql/server/private/pfs_transaction_provider.h
+include/mysql/server/private/probes_mysql.h
+include/mysql/server/private/probes_mysql_nodtrace.h
+include/mysql/server/private/providers/bzlib.h
+include/mysql/server/private/providers/lz4.h
+include/mysql/server/private/providers/lzma.h
+include/mysql/server/private/providers/lzo/lzo1x.h
+include/mysql/server/private/providers/snappy-c.h
+include/mysql/server/private/queues.h
+include/mysql/server/private/rijndael.h
+include/mysql/server/private/scope.h
+include/mysql/server/private/service_versions.h
+include/mysql/server/private/source_revision.h
+include/mysql/server/private/span.h
+include/mysql/server/private/ssl_compat.h
+include/mysql/server/private/t_ctype.h
+include/mysql/server/private/thr_alarm.h
+include/mysql/server/private/thr_lock.h
+include/mysql/server/private/thr_timer.h
+include/mysql/server/private/violite.h
+include/mysql/server/private/waiting_threads.h
+include/mysql/server/private/welcome_copyright_notice.h
+include/mysql/server/private/wqueue.h
+include/mysql/server/private/wsrep.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/libmariadb.a
+lib/libmariadb.so
+lib/libmariadb.so.3
+lib/libmariadbclient.a
+lib/libmysqlclient.a
+lib/libmysqlclient.so
+lib/libmysqlclient_r.a
+lib/libmysqlclient_r.so
+lib/mysql/plugin/auth_gssapi_client.so
+lib/mysql/plugin/caching_sha2_password.so
+lib/mysql/plugin/client_ed25519.so
+lib/mysql/plugin/dialog.so
+lib/mysql/plugin/mysql_clear_password.so
+lib/mysql/plugin/sha256_password.so
+lib/mysql/plugin/zstd.so
+lib/pkgconfig/libmariadb.pc
+man/man1/mariadb-access.1
+man/man1/mariadb-admin.1
+man/man1/mariadb-binlog.1
+man/man1/mariadb-check.1
+man/man1/mariadb-client-test-embedded.1
+man/man1/mariadb-client-test.1
+man/man1/mariadb-convert-table-format.1
+man/man1/mariadb-dump.1
+man/man1/mariadb-dumpslow.1
+man/man1/mariadb-embedded.1
+man/man1/mariadb-find-rows.1
+man/man1/mariadb-hotcopy.1
+man/man1/mariadb-import.1
+man/man1/mariadb-plugin.1
+man/man1/mariadb-secure-installation.1
+man/man1/mariadb-setpermission.1
+man/man1/mariadb-show.1
+man/man1/mariadb-slap.1
+man/man1/mariadb-test-embedded.1
+man/man1/mariadb-test.1
+man/man1/mariadb-tzinfo-to-sql.1
+man/man1/mariadb-waitpid.1
+man/man1/mariadb.1
+man/man1/mariadb_config.1
+man/man1/msql2mysql.1
+man/man1/my_print_defaults.1
+man/man1/my_safe_process.1
+man/man1/mysql-stress-test.pl.1
+man/man1/mysql-test-run.pl.1
+man/man1/mysql.1
+man/man1/mysql_client_test.1
+man/man1/mysql_client_test_embedded.1
+man/man1/mysql_config.1
+man/man1/mysql_convert_table_format.1
+man/man1/mysql_embedded.1
+man/man1/mysql_find_rows.1
+man/man1/mysql_plugin.1
+man/man1/mysql_secure_installation.1
+man/man1/mysql_setpermission.1
+man/man1/mysql_tzinfo_to_sql.1
+man/man1/mysql_waitpid.1
+man/man1/mysqlaccess.1
+man/man1/mysqladmin.1
+man/man1/mysqlbinlog.1
+man/man1/mysqlcheck.1
+man/man1/mysqldump.1
+man/man1/mysqldumpslow.1
+man/man1/mysqlhotcopy.1
+man/man1/mysqlimport.1
+man/man1/mysqlshow.1
+man/man1/mysqlslap.1
+man/man1/mysqltest.1
+man/man1/mysqltest_embedded.1
+man/man1/mytop.1
+man/man1/perror.1
+man/man1/replace.1
+man/man1/resolve_stack_dump.1
+man/man3/mariadb_cancel.3
+man/man3/mariadb_connection.3
+man/man3/mariadb_dyncol_check.3
+man/man3/mariadb_dyncol_column_cmp_named.3
+man/man3/mariadb_dyncol_column_count.3
+man/man3/mariadb_dyncol_create_many_named.3
+man/man3/mariadb_dyncol_create_many_num.3
+man/man3/mariadb_dyncol_exists_named.3
+man/man3/mariadb_dyncol_exists_num.3
+man/man3/mariadb_dyncol_free.3
+man/man3/mariadb_dyncol_list_named.3
+man/man3/mariadb_dyncol_list_num.3
+man/man3/mariadb_dyncol_unpack.3
+man/man3/mariadb_dyncol_update_many_named.3
+man/man3/mariadb_dyncol_update_many_num.3
+man/man3/mariadb_get_infov.3
+man/man3/mariadb_reconnect.3
+man/man3/mariadb_rpl_close.3
+man/man3/mariadb_rpl_fetch.3
+man/man3/mariadb_rpl_get_optionsv.3
+man/man3/mariadb_rpl_open.3
+man/man3/mariadb_rpl_optionsv.3
+man/man3/mariadb_stmt_execute_direct.3
+man/man3/mariadb_stmt_fetch_fields.3
+man/man3/mysql_affected_rows.3
+man/man3/mysql_autocommit.3
+man/man3/mysql_change_user.3
+man/man3/mysql_close.3
+man/man3/mysql_commit.3
+man/man3/mysql_data_seek.3
+man/man3/mysql_errno.3
+man/man3/mysql_error.3
+man/man3/mysql_fetch_field.3
+man/man3/mysql_fetch_field_direct.3
+man/man3/mysql_fetch_fields.3
+man/man3/mysql_fetch_lengths.3
+man/man3/mysql_fetch_row.3
+man/man3/mysql_field_count.3
+man/man3/mysql_field_seek.3
+man/man3/mysql_field_tell.3
+man/man3/mysql_free_result.3
+man/man3/mysql_get_character_set_info.3
+man/man3/mysql_get_client_info.3
+man/man3/mysql_get_client_version.3
+man/man3/mysql_get_host_info.3
+man/man3/mysql_get_proto_info.3
+man/man3/mysql_get_server_info.3
+man/man3/mysql_get_server_version.3
+man/man3/mysql_get_socket.3
+man/man3/mysql_get_ssl_cipher.3
+man/man3/mysql_hex_string.3
+man/man3/mysql_info.3
+man/man3/mysql_init.3
+man/man3/mysql_kill.3
+man/man3/mysql_more_results.3
+man/man3/mysql_next_result.3
+man/man3/mysql_num_fields.3
+man/man3/mysql_num_rows.3
+man/man3/mysql_options.3
+man/man3/mysql_options4.3
+man/man3/mysql_optionsv.3
+man/man3/mysql_ping.3
+man/man3/mysql_query.3
+man/man3/mysql_read_query_result.3
+man/man3/mysql_real_connect.3
+man/man3/mysql_real_escape_string.3
+man/man3/mysql_real_query.3
+man/man3/mysql_refresh.3
+man/man3/mysql_reset_connection.3
+man/man3/mysql_rollback.3
+man/man3/mysql_row_seek.3
+man/man3/mysql_row_tell.3
+man/man3/mysql_select_db.3
+man/man3/mysql_send_query.3
+man/man3/mysql_server_end.3
+man/man3/mysql_server_init.3
+man/man3/mysql_session_track_get_first.3
+man/man3/mysql_session_track_get_next.3
+man/man3/mysql_set_character_set.3
+man/man3/mysql_set_server_option.3
+man/man3/mysql_shutdown.3
+man/man3/mysql_sqlstate.3
+man/man3/mysql_ssl_set.3
+man/man3/mysql_stat.3
+man/man3/mysql_stmt_affected_rows.3
+man/man3/mysql_stmt_attr_get.3
+man/man3/mysql_stmt_attr_set.3
+man/man3/mysql_stmt_bind_param.3
+man/man3/mysql_stmt_bind_result.3
+man/man3/mysql_stmt_close.3
+man/man3/mysql_stmt_data_seek.3
+man/man3/mysql_stmt_errno.3
+man/man3/mysql_stmt_error.3
+man/man3/mysql_stmt_execute.3
+man/man3/mysql_stmt_fetch.3
+man/man3/mysql_stmt_fetch_column.3
+man/man3/mysql_stmt_field_count.3
+man/man3/mysql_stmt_free_result.3
+man/man3/mysql_stmt_init.3
+man/man3/mysql_stmt_insert_id.3
+man/man3/mysql_stmt_more_results.3
+man/man3/mysql_stmt_next_result.3
+man/man3/mysql_stmt_num_rows.3
+man/man3/mysql_stmt_param_count.3
+man/man3/mysql_stmt_param_metadata.3
+man/man3/mysql_stmt_prepare.3
+man/man3/mysql_stmt_reset.3
+man/man3/mysql_stmt_result_metadata.3
+man/man3/mysql_stmt_row_seek.3
+man/man3/mysql_stmt_row_tell.3
+man/man3/mysql_stmt_send_long_data.3
+man/man3/mysql_stmt_sqlstate.3
+man/man3/mysql_stmt_store_result.3
+man/man3/mysql_stmt_warning_count.3
+man/man3/mysql_store_result.3
+man/man3/mysql_thread_end.3
+man/man3/mysql_thread_id.3
+man/man3/mysql_thread_init.3
+man/man3/mysql_use_result.3
+man/man3/mysql_warning_count.3
Index: pkgsrc/databases/mariadb1011-client/buildlink3.mk
diff -u /dev/null pkgsrc/databases/mariadb1011-client/buildlink3.mk:1.1
--- /dev/null   Mon Jul 10 22:55:50 2023
+++ pkgsrc/databases/mariadb1011-client/buildlink3.mk   Mon Jul 10 22:55:49 2023
@@ -0,0 +1,27 @@
+# $NetBSD: buildlink3.mk,v 1.1 2023/07/10 22:55:49 nia Exp $
+
+# This buildlink file uses mysql-client and not mariadb-client,
+# because some packages depending on it expect BUILDLINK_*.mysql-client
+# to be set and will fail build if they get BUILDLINK_*.mariadb-client
+# instead.
+BUILDLINK_TREE+=       mysql-client
+
+.if !defined(MYSQL_CLIENT_BUILDLINK3_MK)
+MYSQL_CLIENT_BUILDLINK3_MK:=
+
+BUILDLINK_API_DEPENDS.mysql-client+=   mariadb-client>=10.11.0<10.12.0
+BUILDLINK_ABI_DEPENDS.mysql-client+=   mariadb-client>=10.11.0
+BUILDLINK_PKGSRCDIR.mysql-client?=     ../../databases/mariadb1011-client
+BUILDLINK_INCDIRS.mysql-client+=       include/mysql
+BUILDLINK_LIBDIRS.mysql-client+=       lib
+
+pkgbase := mysql-client
+.include "../../mk/pkg-build-options.mk"
+
+.if ${PKG_BUILD_OPTIONS.mysql-client:Mssl}
+.  include "../../security/openssl/buildlink3.mk"
+.endif
+.include "../../devel/zlib/buildlink3.mk"
+.endif # MYSQL_CLIENT_BUILDLINK3_MK
+
+BUILDLINK_TREE+=       -mysql-client
Index: pkgsrc/databases/mariadb1011-client/distinfo
diff -u /dev/null pkgsrc/databases/mariadb1011-client/distinfo:1.1
--- /dev/null   Mon Jul 10 22:55:50 2023
+++ pkgsrc/databases/mariadb1011-client/distinfo        Mon Jul 10 22:55:49 2023
@@ -0,0 +1,24 @@
+$NetBSD: distinfo,v 1.1 2023/07/10 22:55:49 nia Exp $
+
+BLAKE2s (mariadb-10.11.4.tar.gz) = 46bcc07ff234fcd7b1e96aeae72c28d2364cd4c390c8b1666fa9ead59f3803a1
+SHA512 (mariadb-10.11.4.tar.gz) = 62fc05395857dd036ebeed53b1ff0ecd9abd95ce8e5316194286521caae0f9452cf96a93613adec809e39e1d8ef20c330b24fee82b3bb90ee27a84f2bbd0d8d2
+Size (mariadb-10.11.4.tar.gz) = 96770117 bytes
+SHA1 (patch-BUILD_compile-pentium32-gcov) = 89a7da728f94f19c153b4d2d2d6ba5462acc941f
+SHA1 (patch-CMakeLists.txt) = 9bdc3c88521b9bd217d37d286950a71ae0d0e1e0
+SHA1 (patch-client_CMakeLists.txt) = 8fdd8a182304f0b84e120ce95334ace23d02ce88
+SHA1 (patch-client_mysql.cc) = e9c33cd51c11b6be309ee6d1404da2d9ece38efd
+SHA1 (patch-extra_readline_CMakeLists.txt) = 37873deaeccb37e1313179103bb12dcde4a496d6
+SHA1 (patch-include_my__global.h) = a3b831f91ba2efea9f78e70ab4f706da23b80403
+SHA1 (patch-mysys_my__gethwaddr.c) = c3f179aa659e16f2fd9b858a718dd1cdd6f93c9f
+SHA1 (patch-plugin_auth__pam_testing_pam__mariadb__mtr.c) = 6062cfbb200af5b95ac05e4759f08b414f63db3d
+SHA1 (patch-plugin_auth__socket_CMakeLists.txt) = b2fddab1d94ba75c69cbf660f546f8e5821e1d51
+SHA1 (patch-scripts_CMakeLists.txt) = b8a13304e314162ab0a1fc06c5620d6b757975f5
+SHA1 (patch-scripts_mysqld__safe.sh) = 4124e4c8df1527049f5eec9f3d2d4bbe80e7c33f
+SHA1 (patch-sql_mysqld.cc) = 19d325124cde1b45376c9710cdd104dc460f4bea
+SHA1 (patch-storage_connect_tabvct.cpp) = 2e3c7cd7e4b0a86d443da47d3cc514b8b276d836
+SHA1 (patch-storage_innobase_include_transactional__lock__guard.h) = d5ff507acdd21858791246ef5a2559e653cb7833
+SHA1 (patch-storage_rocksdb_rdb__io__watchdog.cc) = 85ee5007cfda0d3070ec20b2b774738b01f8e083
+SHA1 (patch-storage_rocksdb_rdb__io__watchdog.h) = d790c092d7d35d014c5ef209635c18614c3a8301
+SHA1 (patch-storage_rocksdb_rocksdb_Makefile) = 67ea4d154f4f623fdca739f50b236c973e118a12
+SHA1 (patch-storage_rocksdb_rocksdb_build__tools_fb__compile__mongo.sh) = 3b632521c23765c39f4638dc7a80d04b9e1d58bd
+SHA1 (patch-support-files_mysql.server.sh) = a98d82cdda1dbd5ef8ebb7e457bb51661b5fd275
Index: pkgsrc/databases/mariadb1011-client/options.mk
diff -u /dev/null pkgsrc/databases/mariadb1011-client/options.mk:1.1
--- /dev/null   Mon Jul 10 22:55:50 2023
+++ pkgsrc/databases/mariadb1011-client/options.mk      Mon Jul 10 22:55:49 2023
@@ -0,0 +1,16 @@
+# $NetBSD: options.mk,v 1.1 2023/07/10 22:55:49 nia Exp $
+
+PKG_OPTIONS_VAR=       PKG_OPTIONS.mysql-client
+
+PKG_SUPPORTED_OPTIONS+=        ssl
+PKG_SUGGESTED_OPTIONS+=        ssl
+
+.include "../../mk/bsd.options.mk"
+
+# Enable OpenSSL support
+.if !empty(PKG_OPTIONS:Mssl)
+.include "../../security/openssl/buildlink3.mk"
+CMAKE_ARGS+=   -DWITH_SSL=system
+.else
+CMAKE_ARGS+=   -DWITH_SSL=no
+.endif

Index: pkgsrc/databases/mariadb1011-client/patches/patch-BUILD_compile-pentium32-gcov
diff -u /dev/null pkgsrc/databases/mariadb1011-client/patches/patch-BUILD_compile-pentium32-gcov:1.1
--- /dev/null   Mon Jul 10 22:55:50 2023
+++ pkgsrc/databases/mariadb1011-client/patches/patch-BUILD_compile-pentium32-gcov      Mon Jul 10 22:55:49 2023
@@ -0,0 +1,15 @@
+$NetBSD: patch-BUILD_compile-pentium32-gcov,v 1.1 2023/07/10 22:55:49 nia Exp $
+
+Shell portability.
+
+--- BUILD/compile-pentium32-gcov.orig  2020-01-26 20:43:49.000000000 +0000
++++ BUILD/compile-pentium32-gcov
+@@ -22,7 +22,7 @@ CCACHE_GCOV_VERSION_ENABLED=0
+ if ccache -V > /dev/null 2>&1
+ then
+   CCACHE_VER=`ccache -V | head -1 | sed s/"ccache version "//`
+-  if test "$CCACHE_VER" == "2.4-gcov"
++  if test "$CCACHE_VER" = "2.4-gcov"
+   then
+     CCACHE_GCOV_VERSION_ENABLED=1
+   else
Index: pkgsrc/databases/mariadb1011-client/patches/patch-CMakeLists.txt
diff -u /dev/null pkgsrc/databases/mariadb1011-client/patches/patch-CMakeLists.txt:1.1
--- /dev/null   Mon Jul 10 22:55:50 2023
+++ pkgsrc/databases/mariadb1011-client/patches/patch-CMakeLists.txt    Mon Jul 10 22:55:49 2023
@@ -0,0 +1,109 @@
+$NetBSD: patch-CMakeLists.txt,v 1.1 2023/07/10 22:55:49 nia Exp $
+
+Allow building a server-only configuration.
+
+--- CMakeLists.txt.orig        2023-06-05 17:14:07.000000000 +0000
++++ CMakeLists.txt
+@@ -426,8 +426,6 @@ ENDIF()
+ 
+ UNSET (MYSQLD_STATIC_PLUGIN_LIBS CACHE)
+ 
+-INCLUDE(mariadb_connector_c) # this does ADD_SUBDIRECTORY(libmariadb)
+-
+ INCLUDE(cpack_tgz)
+ INCLUDE(cpack_rpm)
+ INCLUDE(cpack_deb)
+@@ -438,19 +436,16 @@ MARK_AS_ADVANCED(PYTHON_SHEBANG)
+ # Add storage engines and plugins.
+ CONFIGURE_PLUGINS()
+ 
+-ADD_SUBDIRECTORY(include)
+ ADD_SUBDIRECTORY(dbug)
+ ADD_SUBDIRECTORY(strings)
+ ADD_SUBDIRECTORY(vio)
+ ADD_SUBDIRECTORY(mysys)
+ ADD_SUBDIRECTORY(mysys_ssl)
+-ADD_SUBDIRECTORY(client)
+ ADD_SUBDIRECTORY(extra)
+ ADD_SUBDIRECTORY(libservices)
+ ADD_SUBDIRECTORY(sql/share)
+ 
+ IF(NOT WITHOUT_SERVER)
+-  ADD_SUBDIRECTORY(tests)
+   ADD_SUBDIRECTORY(sql)
+   OPTION (WITH_EMBEDDED_SERVER "Compile MariaDB with embedded server" OFF)
+   IF(WITH_EMBEDDED_SERVER)
+@@ -469,23 +464,26 @@ IF(NOT WITHOUT_SERVER)
+     ADD_SUBDIRECTORY(win/upgrade_wizard)
+     ADD_SUBDIRECTORY(win/packaging)
+   ENDIF()
+-ENDIF()
+-
+-IF(UNIX)
++ELSE()
++  INCLUDE(mariadb_connector_c) # this does ADD_SUBDIRECTORY(libmariadb)
++  ADD_SUBDIRECTORY(client)
++  ADD_SUBDIRECTORY(include)
+   ADD_SUBDIRECTORY(man)
++  ADD_SUBDIRECTORY(support-files)
+ ENDIF()
+ 
+ INCLUDE(cmake/abi_check.cmake)
+ INCLUDE(cmake/tags.cmake)
+ INCLUDE(for_clients)
+ ADD_SUBDIRECTORY(scripts)
+-ADD_SUBDIRECTORY(support-files)
+ ADD_SUBDIRECTORY(extra/aws_sdk)
+ 
+ IF(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
+-  SET(EXPORTED comp_err comp_sql factorial uca-dump)
++  SET(EXPORTED comp_err factorial uca-dump)
+   IF(NOT WITHOUT_SERVER)
+     SET(EXPORTED ${EXPORTED} gen_lex_hash gen_lex_token)
++  ELSE()
++    SET(EXPORTED ${EXPORTED} comp_sql)
+   ENDIF()
+   # minimal target to build only binaries for export
+   ADD_CUSTOM_TARGET(import_executables DEPENDS ${EXPORTED})
+@@ -569,41 +567,3 @@ IF(NON_DISTRIBUTABLE_WARNING)
+   MESSAGE(WARNING "
+ You have linked MariaDB with ${NON_DISTRIBUTABLE_WARNING} libraries!  You may not distribute the resulting binary. If you do, you will put yourself into a legal problem with the Free Software 
Foundation.")
+ ENDIF()
+-
+-IF(NOT WITHOUT_SERVER)
+-  # Define target for minimal mtr-testable build
+-  ADD_CUSTOM_TARGET(minbuild)
+-  ADD_DEPENDENCIES(minbuild
+-   aria_chk
+-   aria_pack
+-   mariadb
+-   mariadb-admin
+-   mariadb-binlog
+-   mariadb-check
+-   mariadb-client-test
+-   mariadb-conv
+-   mariadb-dump
+-   mariadb-import
+-   mariadb-plugin
+-   mariadb-show
+-   mariadb-slap
+-   mariadb-test
+-   mariadb-tzinfo-to-sql
+-   mariadb-upgrade
+-   mariadbd
+-   my_print_defaults
+-   my_safe_process
+-   myisam_ftdump
+-   myisamchk
+-   myisamlog
+-   myisampack
+-   perror
+-   replace)
+-  IF(WIN32)
+-    ADD_DEPENDENCIES(minbuild echo mariadb-install-db my_safe_kill)
+-  ENDIF()
+-  ADD_CUSTOM_TARGET(smoketest
+-    COMMAND perl ./mysql-test-run.pl main.1st
+-    WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/mysql-test)
+-  ADD_DEPENDENCIES(smoketest minbuild)
+-ENDIF()
Index: pkgsrc/databases/mariadb1011-client/patches/patch-client_CMakeLists.txt
diff -u /dev/null pkgsrc/databases/mariadb1011-client/patches/patch-client_CMakeLists.txt:1.1
--- /dev/null   Mon Jul 10 22:55:50 2023
+++ pkgsrc/databases/mariadb1011-client/patches/patch-client_CMakeLists.txt     Mon Jul 10 22:55:49 2023
@@ -0,0 +1,15 @@
+$NetBSD: patch-client_CMakeLists.txt,v 1.1 2023/07/10 22:55:49 nia Exp $
+
+Allow building a server-only configuration.
+
+--- client/CMakeLists.txt.orig 2021-05-05 21:00:18.000000000 +0000
++++ client/CMakeLists.txt
+@@ -60,7 +60,7 @@ MYSQL_ADD_EXECUTABLE(mariadb-import mysq
+ SET_SOURCE_FILES_PROPERTIES(mysqlimport.c PROPERTIES COMPILE_FLAGS "-DTHREADS")
+ TARGET_LINK_LIBRARIES(mariadb-import ${CLIENT_LIB})
+ 
+-MYSQL_ADD_EXECUTABLE(mariadb-upgrade mysql_upgrade.c COMPONENT Server)
++MYSQL_ADD_EXECUTABLE(mariadb-upgrade mysql_upgrade.c)
+ TARGET_LINK_LIBRARIES(mariadb-upgrade ${CLIENT_LIB})
+ ADD_DEPENDENCIES(mariadb-upgrade GenFixPrivs)
+ 
Index: pkgsrc/databases/mariadb1011-client/patches/patch-client_mysql.cc
diff -u /dev/null pkgsrc/databases/mariadb1011-client/patches/patch-client_mysql.cc:1.1
--- /dev/null   Mon Jul 10 22:55:50 2023
+++ pkgsrc/databases/mariadb1011-client/patches/patch-client_mysql.cc   Mon Jul 10 22:55:49 2023
@@ -0,0 +1,21 @@
+$NetBSD: patch-client_mysql.cc,v 1.1 2023/07/10 22:55:49 nia Exp $
+
+Do not special case __APPLE__ for pkgsrc builds.
+
+--- client/mysql.cc.orig       2023-06-05 17:14:07.000000000 +0000
++++ client/mysql.cc
+@@ -89,14 +89,10 @@ extern "C" {
+ 
+ #undef bcmp                           // Fix problem with new readline
+ #if !defined(_WIN32)
+-# ifdef __APPLE__
+-#  include <editline/readline.h>
+-# else
+ #  include <readline.h>
+ #  if !defined(USE_LIBEDIT_INTERFACE)
+ #   include <history.h>
+ #  endif
+-# endif
+ #define HAVE_READLINE
+ #endif
+ #define USE_POPEN
Index: pkgsrc/databases/mariadb1011-client/patches/patch-extra_readline_CMakeLists.txt
diff -u /dev/null pkgsrc/databases/mariadb1011-client/patches/patch-extra_readline_CMakeLists.txt:1.1
--- /dev/null   Mon Jul 10 22:55:50 2023
+++ pkgsrc/databases/mariadb1011-client/patches/patch-extra_readline_CMakeLists.txt     Mon Jul 10 22:55:49 2023
@@ -0,0 +1,12 @@
+$NetBSD: patch-extra_readline_CMakeLists.txt,v 1.1 2023/07/10 22:55:49 nia Exp $
+
+On NetBSD, tgoto is in libtermcap - helper patch.
+
+--- extra/readline/CMakeLists.txt.orig 2022-11-03 10:07:23.000000000 +0000
++++ extra/readline/CMakeLists.txt
+@@ -56,4 +56,4 @@ ADD_LIBRARY(readline STATIC
+ 
+ # Declare dependency
+ # so every executable that links with readline links with curses as well
+-TARGET_LINK_LIBRARIES(readline ${CURSES_LIBRARY})
++TARGET_LINK_LIBRARIES(readline ${CURSES_LIBRARY} ${TGOTOLIB})
Index: pkgsrc/databases/mariadb1011-client/patches/patch-include_my__global.h
diff -u /dev/null pkgsrc/databases/mariadb1011-client/patches/patch-include_my__global.h:1.1
--- /dev/null   Mon Jul 10 22:55:50 2023
+++ pkgsrc/databases/mariadb1011-client/patches/patch-include_my__global.h      Mon Jul 10 22:55:49 2023
@@ -0,0 +1,20 @@
+$NetBSD: patch-include_my__global.h,v 1.1 2023/07/10 22:55:49 nia Exp $
+
+NetBSD guards C99 printf format macros, needs to be triggered
+here for early includes.
+
+--- include/my_global.h.orig   2015-02-25 15:40:54.000000000 +0000
++++ include/my_global.h
+@@ -50,6 +50,12 @@
+ #define _POSIX_THREAD_CPUTIME
+ #endif /* __CYGWIN__ */
+ 
++/* NetBSD guards C99 printf format macros, needs to be triggered
++   here for early includes */
++#if defined(__NetBSD__)
++#define __STDC_FORMAT_MACROS
++#endif
++
+ #if defined(__OpenBSD__) && (OpenBSD >= 200411)
+ #define HAVE_ERRNO_AS_DEFINE
+ #endif
Index: pkgsrc/databases/mariadb1011-client/patches/patch-mysys_my__gethwaddr.c
diff -u /dev/null pkgsrc/databases/mariadb1011-client/patches/patch-mysys_my__gethwaddr.c:1.1
--- /dev/null   Mon Jul 10 22:55:50 2023
+++ pkgsrc/databases/mariadb1011-client/patches/patch-mysys_my__gethwaddr.c     Mon Jul 10 22:55:49 2023
@@ -0,0 +1,15 @@
+$NetBSD: patch-mysys_my__gethwaddr.c,v 1.1 2023/07/10 22:55:49 nia Exp $
+
+SunOS doesn't support hwaddr.
+
+--- mysys/my_gethwaddr.c.orig  2022-09-13 06:00:23.000000000 +0000
++++ mysys/my_gethwaddr.c
+@@ -74,7 +74,7 @@ err:
+   return res;
+ }
+ 
+-#elif defined(_AIX) || defined(__linux__) || defined(__sun)
++#elif defined(_AIX) || defined(__linux__)
+ #include <net/if.h>
+ #include <sys/ioctl.h>
+ #include <net/if_arp.h>
Index: pkgsrc/databases/mariadb1011-client/patches/patch-plugin_auth__pam_testing_pam__mariadb__mtr.c
diff -u /dev/null pkgsrc/databases/mariadb1011-client/patches/patch-plugin_auth__pam_testing_pam__mariadb__mtr.c:1.1
--- /dev/null   Mon Jul 10 22:55:50 2023
+++ pkgsrc/databases/mariadb1011-client/patches/patch-plugin_auth__pam_testing_pam__mariadb__mtr.c      Mon Jul 10 22:55:49 2023
@@ -0,0 +1,16 @@
+$NetBSD: patch-plugin_auth__pam_testing_pam__mariadb__mtr.c,v 1.1 2023/07/10 22:55:49 nia Exp $
+
+Re-order include for pam_modules dependency (pam_appl.h) especially on SunOS.
+
+--- plugin/auth_pam/testing/pam_mariadb_mtr.c.orig     2021-11-05 20:03:30.000000000 +0000
++++ plugin/auth_pam/testing/pam_mariadb_mtr.c
+@@ -10,8 +10,8 @@
+ 
+ #include <stdlib.h>
+ #include <string.h>
+-#include <security/pam_modules.h>
+ #include <security/pam_appl.h>
++#include <security/pam_modules.h>
+ 
+ #define N 3
+ 
Index: pkgsrc/databases/mariadb1011-client/patches/patch-plugin_auth__socket_CMakeLists.txt
diff -u /dev/null pkgsrc/databases/mariadb1011-client/patches/patch-plugin_auth__socket_CMakeLists.txt:1.1
--- /dev/null   Mon Jul 10 22:55:50 2023
+++ pkgsrc/databases/mariadb1011-client/patches/patch-plugin_auth__socket_CMakeLists.txt        Mon Jul 10 22:55:49 2023
@@ -0,0 +1,37 @@
+$NetBSD: patch-plugin_auth__socket_CMakeLists.txt,v 1.1 2023/07/10 22:55:49 nia Exp $
+
+Add SO_PEERCRED definitions for NetBSD.
+https://github.com/MariaDB/server/pull/1884
+
+--- plugin/auth_socket/CMakeLists.txt.orig     2021-07-05 10:15:49.000000000 +0000
++++ plugin/auth_socket/CMakeLists.txt
+@@ -57,6 +57,21 @@ IF (HAVE_XUCRED)
+   SET(ok 1)
+ ELSE()
+ 
++# NetBSD, is that you?
++CHECK_CXX_SOURCE_COMPILES(
++"#include <sys/un.h>
++#include <sys/socket.h>
++int main() {
++  struct unpcbid unp;
++  socklen_t unpl = sizeof(unp);
++  getsockopt(0, 0, LOCAL_PEEREID, &unp, &unpl);
++  }" HAVE_UNPCBID)
++
++IF (HAVE_UNPCBID)
++  ADD_DEFINITIONS(-DHAVE_UNPCBID)
++  SET(ok 1)
++ELSE()
++
+ # illumos, is that you?
+ CHECK_CXX_SOURCE_COMPILES(
+ "#include <ucred.h>
+@@ -104,6 +119,7 @@ ENDIF()
+ ENDIF()
+ ENDIF()
+ ENDIF()
++ENDIF()
+ 
+ IF(ok)
+   MYSQL_ADD_PLUGIN(auth_socket auth_socket.c DEFAULT)
Index: pkgsrc/databases/mariadb1011-client/patches/patch-scripts_CMakeLists.txt
diff -u /dev/null pkgsrc/databases/mariadb1011-client/patches/patch-scripts_CMakeLists.txt:1.1
--- /dev/null   Mon Jul 10 22:55:50 2023
+++ pkgsrc/databases/mariadb1011-client/patches/patch-scripts_CMakeLists.txt    Mon Jul 10 22:55:49 2023
@@ -0,0 +1,43 @@
+$NetBSD: patch-scripts_CMakeLists.txt,v 1.1 2023/07/10 22:55:49 nia Exp $
+
+Allow building a server-only configuration.
+
+--- scripts/CMakeLists.txt.orig        2021-11-05 20:03:30.000000000 +0000
++++ scripts/CMakeLists.txt
+@@ -324,22 +324,26 @@ ELSE()
+       mariadbd-safe
+       ${SYSTEMD_SCRIPTS}
+     )
++  ELSE()
++    SET(CLIENT_SCRIPTS
++      msql2mysql
++      mariadb-setpermission
++      mariadb-secure-installation
++      mariadb-access
++      mariadb-convert-table-format
++      mariadb-find-rows
++      mariadb-dumpslow
++      mysql_config
++      mytop
++      mariadb-hotcopy
++    )
+   ENDIF()
+   # Configure this one, for testing, but do not install it.
+   CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/mysql_config.pl.in
+     ${CMAKE_CURRENT_BINARY_DIR}/mysql_config.pl ESCAPE_QUOTES @ONLY)
+   # On Unix, most of the files end up in the bin directory
+   SET(BIN_SCRIPTS
+-    msql2mysql
+-    mariadb-setpermission
+-    mariadb-secure-installation
+-    mariadb-access
+-    mariadb-convert-table-format
+-    mariadb-find-rows
+-    mariadb-dumpslow
+-    mysql_config
+-    mytop
+-    mariadb-hotcopy
++    ${CLIENT_SCRIPTS}
+     ${SERVER_SCRIPTS}
+     ${WSREP_SCRIPTS}
+   )
Index: pkgsrc/databases/mariadb1011-client/patches/patch-scripts_mysqld__safe.sh
diff -u /dev/null pkgsrc/databases/mariadb1011-client/patches/patch-scripts_mysqld__safe.sh:1.1
--- /dev/null   Mon Jul 10 22:55:50 2023
+++ pkgsrc/databases/mariadb1011-client/patches/patch-scripts_mysqld__safe.sh   Mon Jul 10 22:55:49 2023
@@ -0,0 +1,15 @@
+$NetBSD: patch-scripts_mysqld__safe.sh,v 1.1 2023/07/10 22:55:49 nia Exp $
+
+Shell portability.
+
+--- scripts/mysqld_safe.sh.orig        2020-01-26 20:43:53.000000000 +0000
++++ scripts/mysqld_safe.sh
+@@ -210,7 +210,7 @@ wsrep_pick_url() {
+     nc -z "$host" $port >/dev/null && break
+   done
+ 
+-  if [ "$url" == "0" ]; then
++  if [ "$url" = "0" ]; then
+     log_error "ERROR: none of the URLs in '$@' is reachable."
+     return 1
+   fi
Index: pkgsrc/databases/mariadb1011-client/patches/patch-sql_mysqld.cc
diff -u /dev/null pkgsrc/databases/mariadb1011-client/patches/patch-sql_mysqld.cc:1.1
--- /dev/null   Mon Jul 10 22:55:50 2023
+++ pkgsrc/databases/mariadb1011-client/patches/patch-sql_mysqld.cc     Mon Jul 10 22:55:49 2023
@@ -0,0 +1,16 @@
+$NetBSD: patch-sql_mysqld.cc,v 1.1 2023/07/10 22:55:49 nia Exp $
+
+Add missing declaration of "concurrency".
+Fixes build on illumos. From OmniOS CE.
+
+--- sql/mysqld.cc.orig 2021-08-03 14:48:41.000000000 +0000
++++ sql/mysqld.cc
+@@ -443,7 +443,7 @@ Atomic_counter<uint32_t> THD_count::coun
+ bool shutdown_wait_for_slaves;
+ Atomic_counter<uint32_t> slave_open_temp_tables;
+ ulong thread_created;
+-ulong back_log, connect_timeout, server_id;
++ulong back_log, connect_timeout, concurrency, server_id;
+ ulong what_to_log;
+ ulong slow_launch_time;
+ ulong open_files_limit, max_binlog_size;
Index: pkgsrc/databases/mariadb1011-client/patches/patch-storage_connect_tabvct.cpp
diff -u /dev/null pkgsrc/databases/mariadb1011-client/patches/patch-storage_connect_tabvct.cpp:1.1
--- /dev/null   Mon Jul 10 22:55:50 2023
+++ pkgsrc/databases/mariadb1011-client/patches/patch-storage_connect_tabvct.cpp        Mon Jul 10 22:55:49 2023
@@ -0,0 +1,15 @@
+$NetBSD: patch-storage_connect_tabvct.cpp,v 1.1 2023/07/10 22:55:49 nia Exp $
+
+Don't redefine strerror.
+
+--- storage/connect/tabvct.cpp.orig    2015-02-25 15:40:55.000000000 +0000
++++ storage/connect/tabvct.cpp
+@@ -71,7 +71,7 @@
+ #include "tabvct.h"
+ #include "valblk.h"
+ 
+-#if defined(UNIX)
++#if defined(UNIX) && !defined(__sun)
+ //add dummy strerror   (NGC)
+ char *strerror(int num);
+ #endif   // UNIX
Index: pkgsrc/databases/mariadb1011-client/patches/patch-storage_innobase_include_transactional__lock__guard.h
diff -u /dev/null pkgsrc/databases/mariadb1011-client/patches/patch-storage_innobase_include_transactional__lock__guard.h:1.1
--- /dev/null   Mon Jul 10 22:55:50 2023
+++ pkgsrc/databases/mariadb1011-client/patches/patch-storage_innobase_include_transactional__lock__guard.h     Mon Jul 10 22:55:49 2023
@@ -0,0 +1,20 @@
+$NetBSD: patch-storage_innobase_include_transactional__lock__guard.h,v 1.1 2023/07/10 22:55:49 nia Exp $
+
+Strange build failures on NetBSD:
+error: 'rw_lock' is not an accessible base of 'page_hash_latch'
+
+--- storage/innobase/include/transactional_lock_guard.h.orig   2022-05-18 08:34:16.000000000 +0000
++++ storage/innobase/include/transactional_lock_guard.h
+@@ -21,12 +21,6 @@ this program; if not, write to the Free 
+ #if defined __powerpc64__
+ #elif defined __s390__
+ #elif defined _MSC_VER && (defined _M_IX86 || defined _M_X64) && !defined(__clang__)
+-#elif defined __GNUC__ && (defined __i386__ || defined __x86_64__)
+-# if __GNUC__ >= 8
+-# elif defined __clang_major__ && __clang_major__ > 6
+-# else
+-#  define NO_ELISION
+-# endif
+ #else /* Transactional memory has not been implemented for this ISA */
+ # define NO_ELISION
+ #endif
Index: pkgsrc/databases/mariadb1011-client/patches/patch-storage_rocksdb_rdb__io__watchdog.cc
diff -u /dev/null pkgsrc/databases/mariadb1011-client/patches/patch-storage_rocksdb_rdb__io__watchdog.cc:1.1
--- /dev/null   Mon Jul 10 22:55:50 2023
+++ pkgsrc/databases/mariadb1011-client/patches/patch-storage_rocksdb_rdb__io__watchdog.cc      Mon Jul 10 22:55:49 2023
@@ -0,0 +1,17 @@
+$NetBSD: patch-storage_rocksdb_rdb__io__watchdog.cc,v 1.1 2023/07/10 22:55:49 nia Exp $
+
+If timer_t is an integer type, setting it to nullptr fails.
+
+XXX: Using NULL turns it into a warning.
+
+--- storage/rocksdb/rdb_io_watchdog.cc.orig    2020-01-26 20:43:56.000000000 +0000
++++ storage/rocksdb/rdb_io_watchdog.cc
+@@ -111,7 +111,7 @@ void Rdb_io_watchdog::io_check_callback(
+     sql_print_warning("Deleting the watchdog I/O timer failed with %d.", errno);
+   }
+ 
+-  m_io_check_watchdog_timer = nullptr;
++  m_io_check_watchdog_timer = NULL;
+ 
+   RDB_MUTEX_UNLOCK_CHECK(m_reset_mutex);
+ }
Index: pkgsrc/databases/mariadb1011-client/patches/patch-storage_rocksdb_rdb__io__watchdog.h
diff -u /dev/null pkgsrc/databases/mariadb1011-client/patches/patch-storage_rocksdb_rdb__io__watchdog.h:1.1
--- /dev/null   Mon Jul 10 22:55:50 2023
+++ pkgsrc/databases/mariadb1011-client/patches/patch-storage_rocksdb_rdb__io__watchdog.h       Mon Jul 10 22:55:49 2023
@@ -0,0 +1,37 @@
+$NetBSD: patch-storage_rocksdb_rdb__io__watchdog.h,v 1.1 2023/07/10 22:55:49 nia Exp $
+
+If timer_t is an integer type, setting it to nullptr fails.
+
+XXX: Using NULL turns it into a warning.
+
+--- storage/rocksdb/rdb_io_watchdog.h.orig     2020-01-26 20:43:56.000000000 +0000
++++ storage/rocksdb/rdb_io_watchdog.h
+@@ -60,7 +60,7 @@ class Rdb_io_watchdog {
+       ret = timer_delete(m_io_check_watchdog_timer);
+ 
+       if (!ret) {
+-        m_io_check_watchdog_timer = nullptr;
++        m_io_check_watchdog_timer = NULL;
+       }
+     }
+ 
+@@ -68,7 +68,7 @@ class Rdb_io_watchdog {
+       ret = timer_delete(m_io_check_timer);
+ 
+       if (!ret) {
+-        m_io_check_timer = nullptr;
++        m_io_check_timer = NULL;
+       }
+     }
+ 
+@@ -93,8 +93,8 @@ class Rdb_io_watchdog {
+ 
+  public:
+   explicit Rdb_io_watchdog(std::vector<std::string> &&directories)
+-      : m_io_check_timer(nullptr),
+-        m_io_check_watchdog_timer(nullptr),
++      : m_io_check_timer(NULL),
++        m_io_check_watchdog_timer(NULL),
+         m_io_in_progress(false),
+         m_dirs_to_check(std::move(directories)),
+         m_buf(nullptr) {
Index: pkgsrc/databases/mariadb1011-client/patches/patch-storage_rocksdb_rocksdb_Makefile
diff -u /dev/null pkgsrc/databases/mariadb1011-client/patches/patch-storage_rocksdb_rocksdb_Makefile:1.1
--- /dev/null   Mon Jul 10 22:55:50 2023
+++ pkgsrc/databases/mariadb1011-client/patches/patch-storage_rocksdb_rocksdb_Makefile  Mon Jul 10 22:55:49 2023
@@ -0,0 +1,24 @@
+$NetBSD: patch-storage_rocksdb_rocksdb_Makefile,v 1.1 2023/07/10 22:55:49 nia Exp $
+
+Shell portability.
+
+--- storage/rocksdb/rocksdb/Makefile.orig      2021-02-18 23:22:28.000000000 +0000
++++ storage/rocksdb/rocksdb/Makefile
+@@ -911,7 +911,7 @@ valgrind_check_0:
+         | grep -E '$(tests-regexp)'                                   \
+         | grep -E -v '$(valgrind-blacklist-regexp)'                                   \
+         | build_tools/gnu_parallel -j$(J) --plain --joblog=LOG $$eta --gnu \
+-        '(if [[ "{}" == "./"* ]] ; then $(DRIVER) {}; else {}; fi) ' \
++        '(if [ "{}" = "./"* ] ; then $(DRIVER) {}; else {}; fi) ' \
+         '>& t/valgrind_log-{/}'
+ 
+ CLEAN_FILES += t LOG $(TMPD)
+@@ -1952,7 +1952,7 @@ rocksdbjavastatic: $(java_static_all_lib
+         -o ./java/target/$(ROCKSDBJNILIB) $(JNI_NATIVE_SOURCES) \
+         $(java_static_all_libobjects) $(COVERAGEFLAGS) \
+         $(JAVA_COMPRESSIONS) $(JAVA_STATIC_LDFLAGS)
+-      cd java/target;if [ "$(DEBUG_LEVEL)" == "0" ]; then \
++      cd java/target;if [ "$(DEBUG_LEVEL)" = "0" ]; then \
+               strip $(STRIPFLAGS) $(ROCKSDBJNILIB); \
+       fi
+       cd java;jar -cf target/$(ROCKSDB_JAR) HISTORY*.md
Index: pkgsrc/databases/mariadb1011-client/patches/patch-storage_rocksdb_rocksdb_build__tools_fb__compile__mongo.sh
diff -u /dev/null pkgsrc/databases/mariadb1011-client/patches/patch-storage_rocksdb_rocksdb_build__tools_fb__compile__mongo.sh:1.1
--- /dev/null   Mon Jul 10 22:55:50 2023
+++ pkgsrc/databases/mariadb1011-client/patches/patch-storage_rocksdb_rocksdb_build__tools_fb__compile__mongo.sh        Mon Jul 10 22:55:49 2023
@@ -0,0 +1,15 @@
+$NetBSD: patch-storage_rocksdb_rocksdb_build__tools_fb__compile__mongo.sh,v 1.1 2023/07/10 22:55:49 nia Exp $
+
+Shell portability.
+
+--- storage/rocksdb/rocksdb/build_tools/fb_compile_mongo.sh.orig       2021-02-18 23:22:28.000000000 +0000
++++ storage/rocksdb/rocksdb/build_tools/fb_compile_mongo.sh
+@@ -13,7 +13,7 @@ EXTRA_LDFLAGS=""
+ if test -z $ALLOC; then
+   # default
+   ALLOC=tcmalloc
+-elif [[ $ALLOC == "jemalloc" ]]; then
++elif [ $ALLOC = "jemalloc" ]; then
+   ALLOC=system
+   EXTRA_LDFLAGS+=" -Wl,--whole-archive $JEMALLOC_LIB -Wl,--no-whole-archive"
+ fi
Index: pkgsrc/databases/mariadb1011-client/patches/patch-support-files_mysql.server.sh
diff -u /dev/null pkgsrc/databases/mariadb1011-client/patches/patch-support-files_mysql.server.sh:1.1
--- /dev/null   Mon Jul 10 22:55:50 2023
+++ pkgsrc/databases/mariadb1011-client/patches/patch-support-files_mysql.server.sh     Mon Jul 10 22:55:49 2023
@@ -0,0 +1,15 @@
+$NetBSD: patch-support-files_mysql.server.sh,v 1.1 2023/07/10 22:55:49 nia Exp $
+
+Shell portability.
+
+--- support-files/mysql.server.sh.orig 2020-01-26 20:43:57.000000000 +0000
++++ support-files/mysql.server.sh
+@@ -436,7 +436,7 @@ case "$mode" in
+     exit $r
+     ;;
+   'bootstrap')
+-      if test "$_use_systemctl" == 1 ; then
++      if test "$_use_systemctl" = 1 ; then
+         log_failure_msg "Please use galera_new_cluster to start the mariadb service with --wsrep-new-cluster"
+         exit 1
+       fi

Index: pkgsrc/databases/mariadb1011-server/DESCR
diff -u /dev/null pkgsrc/databases/mariadb1011-server/DESCR:1.1
--- /dev/null   Mon Jul 10 22:55:50 2023
+++ pkgsrc/databases/mariadb1011-server/DESCR   Mon Jul 10 22:55:50 2023
@@ -0,0 +1,14 @@
+MariaDB Server is one of the most popular open source relational databases.
+It's made by the original developers of MySQL.
+
+MariaDB turns data into structured information in a wide array of applications,
+ranging from banking to websites. It is an enhanced, drop-in replacement
+for MySQL. MariaDB is used because it is fast, scalable and robust, with a
+rich ecosystem of storage engines, plugins and many other tools make it very
+versatile for a wide variety of use cases.
+
+MariaDB is developed as open source software and as a relational database
+it provides an SQL interface for accessing data. The latest versions of
+MariaDB also include GIS and JSON features.
+
+This package contains the MariaDB server programs and libraries.
Index: pkgsrc/databases/mariadb1011-server/Makefile
diff -u /dev/null pkgsrc/databases/mariadb1011-server/Makefile:1.1
--- /dev/null   Mon Jul 10 22:55:50 2023
+++ pkgsrc/databases/mariadb1011-server/Makefile        Mon Jul 10 22:55:50 2023
@@ -0,0 +1,58 @@
+# $NetBSD: Makefile,v 1.1 2023/07/10 22:55:50 nia Exp $
+
+PKGNAME=       ${DISTNAME:S/-/-server-/}
+COMMENT=       MariaDB 10.11, a free MySQL compatible database (server)
+
+CONFLICTS=     mysql-server-[0-9]*
+
+.include "../../databases/mariadb1011-client/Makefile.common"
+
+BUILD_DEFS+=           VARBASE
+PLIST_VARS+=           disks
+
+.include "../../mk/bsd.fast.prefs.mk"
+
+# Requires getmntinfo
+.if ${OPSYS} != "SunOS"
+PLIST.disks=           yes
+.endif
+
+MARIADB_USER?=         ${MYSQL_USER:Umariadb}
+MARIADB_GROUP?=                ${MYSQL_GROUP:Umariadb}
+
+PKG_USERS_VARS+=       MARIADB_USER
+PKG_GROUPS_VARS+=      MARIADB_GROUP
+
+PKG_GROUPS=            ${MARIADB_GROUP}
+PKG_USERS=             ${MARIADB_USER}:${MARIADB_GROUP}
+
+PKG_GECOS.${MARIADB_USER}=     MariaDB administrator
+PKG_HOME.${MARIADB_USER}=      ${MARIADB_DATADIR}
+PKG_SHELL.${MARIADB_USER}=     ${SH}
+
+RCD_SCRIPTS=           mariadb
+SMF_NAME=              mariadb
+SMF_METHODS=           ${RCD_SCRIPTS}
+
+CMAKE_ARGS+=           -DCONNECT_WITH_MONGO=NO
+
+FILES_SUBST+=          HOSTNAME_CMD=${HOSTNAME_CMD:Q}
+FILES_SUBST+=          MARIADB_DATADIR=${MARIADB_DATADIR}
+FILES_SUBST+=          MARIADB_USER=${MARIADB_USER} MARIADB_GROUP=${MARIADB_GROUP}
+BUILD_DEFS+=           MARIADB_DATADIR
+
+OWN_DIRS_PERMS+=       ${MARIADB_DATADIR} ${MARIADB_USER} ${MARIADB_GROUP} 0700
+OWN_DIRS_PERMS+=       ${VARBASE}/log/mariadb ${MARIADB_USER} ${MARIADB_GROUP} 0700
+
+USE_TOOLS=             bash:run perl:run
+REPLACE_BASH+=         scripts/wsrep_sst_*.sh
+REPLACE_BASH+=         scripts/mariadb-service-convert
+
+.include "options.mk"
+.include "../../archivers/bzip2/buildlink3.mk"
+.include "../../archivers/xz/buildlink3.mk"
+.include "../../databases/mariadb1011-client/buildlink3.mk"
+.include "../../devel/libexecinfo/buildlink3.mk"
+.include "../../security/tcp_wrappers/buildlink3.mk"
+.include "../../textproc/libxml2/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/databases/mariadb1011-server/PLIST
diff -u /dev/null pkgsrc/databases/mariadb1011-server/PLIST:1.1
--- /dev/null   Mon Jul 10 22:55:50 2023
+++ pkgsrc/databases/mariadb1011-server/PLIST   Mon Jul 10 22:55:50 2023
@@ -0,0 +1,515 @@
+@comment $NetBSD: PLIST,v 1.1 2023/07/10 22:55:50 nia Exp $
+bin/aria_chk
+bin/aria_dump_log
+bin/aria_ftdump
+bin/aria_pack
+bin/aria_read_log
+bin/aria_s3_copy
+bin/innochecksum
+bin/mariabackup
+bin/mariadb-backup
+${PLIST.embedded}bin/mariadb-client-test-embedded
+${PLIST.embedded}bin/mariadb-embedded
+bin/mariadb-fix-extensions
+bin/mariadb-install-db
+${PLIST.rocksdb}bin/mariadb-ldb
+${PLIST.embedded}bin/mariadb-test-embedded
+bin/mariadb-tzinfo-to-sql
+bin/mariadb-waitpid
+bin/mariadbd-multi
+bin/mariadbd-safe
+bin/mariadbd-safe-helper
+bin/mbstream
+bin/my_print_defaults
+bin/myisam_ftdump
+bin/myisamchk
+bin/myisamlog
+bin/myisampack
+${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
+${PLIST.rocksdb}bin/mysql_ldb
+bin/mysql_tzinfo_to_sql
+bin/mysql_waitpid
+bin/mysqld_multi
+bin/mysqld_safe
+bin/mysqld_safe_helper
+${PLIST.embedded}bin/mysqltest_embedded
+bin/perror
+bin/replace
+bin/resolve_stack_dump
+bin/resolveip
+${PLIST.rocksdb}bin/sst_dump
+${PLIST.embedded}bin/test-connect-t
+bin/wsrep_sst_backup
+bin/wsrep_sst_common
+bin/wsrep_sst_mariabackup
+bin/wsrep_sst_mysqldump
+bin/wsrep_sst_rsync
+bin/wsrep_sst_rsync_wan
+include/mysql/server/private/authors.h
+include/mysql/server/private/backup.h
+include/mysql/server/private/bounded_queue.h
+include/mysql/server/private/client_settings.h
+include/mysql/server/private/compat56.h
+include/mysql/server/private/contributors.h
+include/mysql/server/private/create_options.h
+include/mysql/server/private/create_tmp_table.h
+include/mysql/server/private/custom_conf.h
+include/mysql/server/private/datadict.h
+include/mysql/server/private/ddl_log.h
+include/mysql/server/private/debug.h
+include/mysql/server/private/debug_sync.h
+include/mysql/server/private/derived_handler.h
+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
+include/mysql/server/private/event_queue.h
+include/mysql/server/private/event_scheduler.h
+include/mysql/server/private/events.h
+include/mysql/server/private/field.h
+include/mysql/server/private/field_comp.h
+include/mysql/server/private/filesort.h
+include/mysql/server/private/filesort_utils.h
+include/mysql/server/private/gcalc_slicescan.h
+include/mysql/server/private/gcalc_tools.h
+include/mysql/server/private/grant.h
+include/mysql/server/private/group_by_handler.h
+include/mysql/server/private/gstream.h
+include/mysql/server/private/ha_partition.h
+include/mysql/server/private/ha_sequence.h
+include/mysql/server/private/handle_connections_win.h
+include/mysql/server/private/handler.h
+include/mysql/server/private/hash_filo.h
+include/mysql/server/private/hostname.h
+include/mysql/server/private/init.h
+include/mysql/server/private/innodb_priv.h
+include/mysql/server/private/item.h
+include/mysql/server/private/item_cmpfunc.h
+include/mysql/server/private/item_create.h
+include/mysql/server/private/item_func.h
+include/mysql/server/private/item_geofunc.h
+include/mysql/server/private/item_jsonfunc.h
+include/mysql/server/private/item_row.h
+include/mysql/server/private/item_strfunc.h
+include/mysql/server/private/item_subselect.h
+include/mysql/server/private/item_sum.h
+include/mysql/server/private/item_timefunc.h
+include/mysql/server/private/item_vers.h
+include/mysql/server/private/item_windowfunc.h
+include/mysql/server/private/item_xmlfunc.h
+include/mysql/server/private/json_table.h
+include/mysql/server/private/key.h
+include/mysql/server/private/keycaches.h
+include/mysql/server/private/lex.h
+include/mysql/server/private/lex_charset.h
+include/mysql/server/private/lex_hash.h
+include/mysql/server/private/lex_string.h
+include/mysql/server/private/lex_symbol.h
+include/mysql/server/private/lex_token.h
+include/mysql/server/private/lock.h
+include/mysql/server/private/log.h
+include/mysql/server/private/log_event.h
+include/mysql/server/private/log_event_old.h
+include/mysql/server/private/log_slow.h
+include/mysql/server/private/mariadb.h
+include/mysql/server/private/mdl.h
+include/mysql/server/private/mem_root_array.h
+include/mysql/server/private/message.h
+include/mysql/server/private/multi_range_read.h
+include/mysql/server/private/my_apc.h
+include/mysql/server/private/my_decimal.h
+include/mysql/server/private/my_json_writer.h
+include/mysql/server/private/mysqld.h
+include/mysql/server/private/mysqld_suffix.h
+include/mysql/server/private/opt_histogram_json.h
+include/mysql/server/private/opt_range.h
+include/mysql/server/private/opt_subselect.h
+include/mysql/server/private/opt_trace.h
+include/mysql/server/private/opt_trace_context.h
+include/mysql/server/private/parse_file.h
+include/mysql/server/private/partition_element.h
+include/mysql/server/private/partition_info.h
+include/mysql/server/private/privilege.h
+include/mysql/server/private/procedure.h
+include/mysql/server/private/protocol.h
+include/mysql/server/private/proxy_protocol.h
+include/mysql/server/private/records.h
+include/mysql/server/private/repl_failsafe.h
+include/mysql/server/private/replication.h
+include/mysql/server/private/rowid_filter.h
+include/mysql/server/private/rpl_constants.h
+include/mysql/server/private/rpl_filter.h
+include/mysql/server/private/rpl_gtid.h
+include/mysql/server/private/rpl_injector.h
+include/mysql/server/private/rpl_mi.h
+include/mysql/server/private/rpl_parallel.h
+include/mysql/server/private/rpl_record.h
+include/mysql/server/private/rpl_record_old.h
+include/mysql/server/private/rpl_reporting.h
+include/mysql/server/private/rpl_rli.h
+include/mysql/server/private/rpl_tblmap.h
+include/mysql/server/private/rpl_utility.h
+include/mysql/server/private/scheduler.h
+include/mysql/server/private/select_handler.h
+include/mysql/server/private/semisync.h
+include/mysql/server/private/semisync_master.h
+include/mysql/server/private/semisync_master_ack_receiver.h
+include/mysql/server/private/semisync_slave.h
+include/mysql/server/private/session_tracker.h
+include/mysql/server/private/set_var.h
+include/mysql/server/private/slave.h
+include/mysql/server/private/sp.h
+include/mysql/server/private/sp_cache.h
+include/mysql/server/private/sp_head.h
+include/mysql/server/private/sp_pcontext.h
+include/mysql/server/private/sp_rcontext.h
+include/mysql/server/private/spatial.h
+include/mysql/server/private/sql_acl.h
+include/mysql/server/private/sql_admin.h
+include/mysql/server/private/sql_alloc.h
+include/mysql/server/private/sql_alter.h
+include/mysql/server/private/sql_analyse.h
+include/mysql/server/private/sql_analyze_stmt.h
+include/mysql/server/private/sql_array.h
+include/mysql/server/private/sql_audit.h
+include/mysql/server/private/sql_base.h
+include/mysql/server/private/sql_basic_types.h
+include/mysql/server/private/sql_binlog.h
+include/mysql/server/private/sql_bitmap.h
+include/mysql/server/private/sql_bootstrap.h
+include/mysql/server/private/sql_cache.h
+include/mysql/server/private/sql_callback.h
+include/mysql/server/private/sql_class.h
+include/mysql/server/private/sql_cmd.h
+include/mysql/server/private/sql_connect.h
+include/mysql/server/private/sql_const.h
+include/mysql/server/private/sql_crypt.h
+include/mysql/server/private/sql_cte.h
+include/mysql/server/private/sql_cursor.h
+include/mysql/server/private/sql_db.h
+include/mysql/server/private/sql_debug.h
+include/mysql/server/private/sql_delete.h
+include/mysql/server/private/sql_derived.h
+include/mysql/server/private/sql_digest.h
+include/mysql/server/private/sql_digest_stream.h
+include/mysql/server/private/sql_do.h
+include/mysql/server/private/sql_error.h
+include/mysql/server/private/sql_explain.h
+include/mysql/server/private/sql_expression_cache.h
+include/mysql/server/private/sql_get_diagnostics.h
+include/mysql/server/private/sql_handler.h
+include/mysql/server/private/sql_help.h
+include/mysql/server/private/sql_hset.h
+include/mysql/server/private/sql_i_s.h
+include/mysql/server/private/sql_insert.h
+include/mysql/server/private/sql_join_cache.h
+include/mysql/server/private/sql_lex.h
+include/mysql/server/private/sql_lifo_buffer.h
+include/mysql/server/private/sql_limit.h
+include/mysql/server/private/sql_list.h
+include/mysql/server/private/sql_load.h
+include/mysql/server/private/sql_locale.h
+include/mysql/server/private/sql_manager.h
+include/mysql/server/private/sql_mode.h
+include/mysql/server/private/sql_parse.h
+include/mysql/server/private/sql_partition.h
+include/mysql/server/private/sql_partition_admin.h
+include/mysql/server/private/sql_plist.h
+include/mysql/server/private/sql_plugin.h
+include/mysql/server/private/sql_plugin_compat.h
+include/mysql/server/private/sql_prepare.h
+include/mysql/server/private/sql_priv.h
+include/mysql/server/private/sql_profile.h
+include/mysql/server/private/sql_reload.h
+include/mysql/server/private/sql_rename.h
+include/mysql/server/private/sql_repl.h
+include/mysql/server/private/sql_schema.h
+include/mysql/server/private/sql_select.h
+include/mysql/server/private/sql_sequence.h
+include/mysql/server/private/sql_servers.h
+include/mysql/server/private/sql_show.h
+include/mysql/server/private/sql_signal.h
+include/mysql/server/private/sql_sort.h
+include/mysql/server/private/sql_statistics.h
+include/mysql/server/private/sql_string.h
+include/mysql/server/private/sql_table.h
+include/mysql/server/private/sql_test.h
+include/mysql/server/private/sql_time.h
+include/mysql/server/private/sql_trigger.h
+include/mysql/server/private/sql_truncate.h
+include/mysql/server/private/sql_tvc.h
+include/mysql/server/private/sql_type.h
+include/mysql/server/private/sql_type_fixedbin.h
+include/mysql/server/private/sql_type_fixedbin_storage.h
+include/mysql/server/private/sql_type_geom.h
+include/mysql/server/private/sql_type_int.h
+include/mysql/server/private/sql_type_json.h
+include/mysql/server/private/sql_type_real.h
+include/mysql/server/private/sql_type_string.h
+include/mysql/server/private/sql_udf.h
+include/mysql/server/private/sql_union.h
+include/mysql/server/private/sql_update.h
+include/mysql/server/private/sql_view.h
+include/mysql/server/private/sql_window.h
+include/mysql/server/private/strfunc.h
+include/mysql/server/private/structs.h
+include/mysql/server/private/sys_vars_shared.h
+include/mysql/server/private/table.h
+include/mysql/server/private/table_cache.h
+include/mysql/server/private/thr_malloc.h
+include/mysql/server/private/thread_cache.h
+include/mysql/server/private/threadpool.h
+include/mysql/server/private/threadpool_generic.h
+include/mysql/server/private/threadpool_winsockets.h
+include/mysql/server/private/transaction.h
+include/mysql/server/private/tzfile.h
+include/mysql/server/private/tztime.h
+include/mysql/server/private/uniques.h
+include/mysql/server/private/unireg.h
+include/mysql/server/private/vers_string.h
+include/mysql/server/private/win_tzname_data.h
+include/mysql/server/private/winservice.h
+include/mysql/server/private/wsrep_allowlist_service.h
+include/mysql/server/private/wsrep_applier.h
+include/mysql/server/private/wsrep_binlog.h
+include/mysql/server/private/wsrep_client_service.h
+include/mysql/server/private/wsrep_client_state.h
+include/mysql/server/private/wsrep_condition_variable.h
+include/mysql/server/private/wsrep_high_priority_service.h
+include/mysql/server/private/wsrep_mutex.h
+include/mysql/server/private/wsrep_mysqld.h
+include/mysql/server/private/wsrep_mysqld_c.h
+include/mysql/server/private/wsrep_on.h
+include/mysql/server/private/wsrep_priv.h
+include/mysql/server/private/wsrep_schema.h
+include/mysql/server/private/wsrep_server_service.h
+include/mysql/server/private/wsrep_server_state.h
+include/mysql/server/private/wsrep_sst.h
+include/mysql/server/private/wsrep_status.h
+include/mysql/server/private/wsrep_storage_service.h
+include/mysql/server/private/wsrep_thd.h
+include/mysql/server/private/wsrep_trans_observer.h
+include/mysql/server/private/wsrep_types.h
+include/mysql/server/private/wsrep_utils.h
+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
+lib/mysql/plugin/auth_ed25519.so
+lib/mysql/plugin/auth_gssapi.so
+${PLIST.auth_pam}lib/mysql/plugin/auth_pam.so
+${PLIST.auth_pam}lib/mysql/plugin/auth_pam_tool_dir/auth_pam_tool
+${PLIST.auth_pam}lib/mysql/plugin/auth_pam_v1.so
+lib/mysql/plugin/auth_test_plugin.so
+lib/mysql/plugin/daemon_example.ini
+lib/mysql/plugin/debug_key_management.so
+lib/mysql/plugin/dialog_examples.so
+${PLIST.disks}lib/mysql/plugin/disks.so
+lib/mysql/plugin/example_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
+${PLIST.oqgraph}lib/mysql/plugin/ha_oqgraph.so
+${PLIST.rocksdb}lib/mysql/plugin/ha_rocksdb.so
+lib/mysql/plugin/ha_s3.so
+lib/mysql/plugin/ha_sphinx.so
+lib/mysql/plugin/ha_spider.so
+lib/mysql/plugin/ha_test_sql_discovery.so
+lib/mysql/plugin/handlersocket.so
+lib/mysql/plugin/hashicorp_key_management.so
+lib/mysql/plugin/libdaemon_example.so
+lib/mysql/plugin/locales.so
+lib/mysql/plugin/metadata_lock_info.so
+lib/mysql/plugin/mypluglib.so
+lib/mysql/plugin/password_reuse_check.so
+lib/mysql/plugin/provider_bzip2.so
+lib/mysql/plugin/provider_lzma.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
+lib/mysql/plugin/wsrep_info.so
+${PLIST.auth_pam}lib/security/pam_user_map.so
+sbin/mariadbd
+sbin/mysqld
+share/doc/mysql/COPYING
+share/doc/mysql/CREDITS
+share/doc/mysql/INSTALL-BINARY
+share/doc/mysql/README-wsrep
+share/doc/mysql/README.md
+share/doc/mysql/THIRDPARTY
+share/doc/mysql/hashicorp_key_management.txt
+${PLIST.auth_pam}share/examples/mariadb_auth_pam/user_map.conf
+share/mysql/bulgarian/errmsg.sys
+share/mysql/charsets/Index.xml
+share/mysql/charsets/README
+share/mysql/charsets/armscii8.xml
+share/mysql/charsets/ascii.xml
+share/mysql/charsets/cp1250.xml
+share/mysql/charsets/cp1251.xml
+share/mysql/charsets/cp1256.xml
+share/mysql/charsets/cp1257.xml
+share/mysql/charsets/cp850.xml
+share/mysql/charsets/cp852.xml
+share/mysql/charsets/cp866.xml
+share/mysql/charsets/dec8.xml
+share/mysql/charsets/geostd8.xml
+share/mysql/charsets/greek.xml
+share/mysql/charsets/hebrew.xml
+share/mysql/charsets/hp8.xml
+share/mysql/charsets/keybcs2.xml
+share/mysql/charsets/koi8r.xml
+share/mysql/charsets/koi8u.xml
+share/mysql/charsets/latin1.xml
+share/mysql/charsets/latin2.xml
+share/mysql/charsets/latin5.xml
+share/mysql/charsets/latin7.xml
+share/mysql/charsets/macce.xml
+share/mysql/charsets/macroman.xml
+share/mysql/charsets/swe7.xml
+share/mysql/chinese/errmsg.sys
+share/mysql/czech/errmsg.sys
+share/mysql/danish/errmsg.sys
+share/mysql/dutch/errmsg.sys
+share/mysql/english/errmsg.sys
+share/mysql/errmsg-utf8.txt
+share/mysql/estonian/errmsg.sys
+share/mysql/fill_help_tables.sql
+share/mysql/french/errmsg.sys
+share/mysql/georgian/errmsg.sys
+share/mysql/german/errmsg.sys
+share/mysql/greek/errmsg.sys
+share/mysql/hindi/errmsg.sys
+share/mysql/hungarian/errmsg.sys
+share/mysql/italian/errmsg.sys
+share/mysql/japanese/errmsg.sys
+share/mysql/korean/errmsg.sys
+share/mysql/maria_add_gis_sp.sql
+share/mysql/maria_add_gis_sp_bootstrap.sql
+share/mysql/mysql_performance_tables.sql
+share/mysql/mysql_sys_schema.sql
+share/mysql/mysql_system_tables.sql
+share/mysql/mysql_system_tables_data.sql
+share/mysql/mysql_test_data_timezone.sql
+share/mysql/mysql_test_db.sql
+share/mysql/norwegian-ny/errmsg.sys
+share/mysql/norwegian/errmsg.sys
+share/mysql/polish/errmsg.sys
+share/mysql/portuguese/errmsg.sys
+share/mysql/romanian/errmsg.sys
+share/mysql/russian/errmsg.sys
+share/mysql/serbian/errmsg.sys
+share/mysql/slovak/errmsg.sys
+share/mysql/spanish/errmsg.sys
+share/mysql/sql-bench/sql-bench/Data/ATIS/aircraft.txt
+share/mysql/sql-bench/sql-bench/Data/ATIS/airline.txt
+share/mysql/sql-bench/sql-bench/Data/ATIS/airport.txt
+share/mysql/sql-bench/sql-bench/Data/ATIS/airport_service.txt
+share/mysql/sql-bench/sql-bench/Data/ATIS/city.txt
+share/mysql/sql-bench/sql-bench/Data/ATIS/class_of_service.txt
+share/mysql/sql-bench/sql-bench/Data/ATIS/code_description.txt
+share/mysql/sql-bench/sql-bench/Data/ATIS/compound_class.txt
+share/mysql/sql-bench/sql-bench/Data/ATIS/connect_leg.txt
+share/mysql/sql-bench/sql-bench/Data/ATIS/date_day.txt
+share/mysql/sql-bench/sql-bench/Data/ATIS/day_name.txt
+share/mysql/sql-bench/sql-bench/Data/ATIS/dual_carrier.txt
+share/mysql/sql-bench/sql-bench/Data/ATIS/fare.txt
+share/mysql/sql-bench/sql-bench/Data/ATIS/fconnection.txt
+share/mysql/sql-bench/sql-bench/Data/ATIS/flight.txt
+share/mysql/sql-bench/sql-bench/Data/ATIS/flight_class.txt
+share/mysql/sql-bench/sql-bench/Data/ATIS/flight_day.txt
+share/mysql/sql-bench/sql-bench/Data/ATIS/flight_fare.txt
+share/mysql/sql-bench/sql-bench/Data/ATIS/food_service.txt
+share/mysql/sql-bench/sql-bench/Data/ATIS/ground_service.txt
+share/mysql/sql-bench/sql-bench/Data/ATIS/month_name.txt
+share/mysql/sql-bench/sql-bench/Data/ATIS/restrict_carrier.txt
+share/mysql/sql-bench/sql-bench/Data/ATIS/restrict_class.txt
+share/mysql/sql-bench/sql-bench/Data/ATIS/restriction.txt
+share/mysql/sql-bench/sql-bench/Data/ATIS/state.txt
+share/mysql/sql-bench/sql-bench/Data/ATIS/stop.txt
+share/mysql/sql-bench/sql-bench/Data/ATIS/stop1.txt
+share/mysql/sql-bench/sql-bench/Data/ATIS/time_interval.txt
+share/mysql/sql-bench/sql-bench/Data/ATIS/time_zone.txt
+share/mysql/sql-bench/sql-bench/Data/ATIS/transport.txt
+share/mysql/sql-bench/sql-bench/Data/Wisconsin/onek.data
+share/mysql/sql-bench/sql-bench/Data/Wisconsin/tenk.data
+share/mysql/sql-bench/sql-bench/README
+share/mysql/sql-bench/sql-bench/bench-count-distinct
+share/mysql/sql-bench/sql-bench/bench-init.pl
+share/mysql/sql-bench/sql-bench/compare-results
+share/mysql/sql-bench/sql-bench/copy-db
+share/mysql/sql-bench/sql-bench/crash-me
+share/mysql/sql-bench/sql-bench/graph-compare-results
+share/mysql/sql-bench/sql-bench/innotest1
+share/mysql/sql-bench/sql-bench/innotest1a
+share/mysql/sql-bench/sql-bench/innotest1b
+share/mysql/sql-bench/sql-bench/innotest2
+share/mysql/sql-bench/sql-bench/innotest2a
+share/mysql/sql-bench/sql-bench/innotest2b
+share/mysql/sql-bench/sql-bench/limits/Adabas.cfg
+share/mysql/sql-bench/sql-bench/limits/Informix.cfg
+share/mysql/sql-bench/sql-bench/limits/access.cfg
+share/mysql/sql-bench/sql-bench/limits/access_odbc.cfg
+share/mysql/sql-bench/sql-bench/limits/db2.cfg
+share/mysql/sql-bench/sql-bench/limits/empress.cfg
+share/mysql/sql-bench/sql-bench/limits/frontbase.cfg
+share/mysql/sql-bench/sql-bench/limits/interbase-dialect1.cfg
+share/mysql/sql-bench/sql-bench/limits/interbase-dialect3.cfg
+share/mysql/sql-bench/sql-bench/limits/interbase-superserver.cfg
+share/mysql/sql-bench/sql-bench/limits/interbase.cfg
+share/mysql/sql-bench/sql-bench/limits/mimer.cfg
+share/mysql/sql-bench/sql-bench/limits/ms-sql.cfg
+share/mysql/sql-bench/sql-bench/limits/ms-sql65.cfg
+share/mysql/sql-bench/sql-bench/limits/msql.cfg
+share/mysql/sql-bench/sql-bench/limits/mysql-3.22.cfg
+share/mysql/sql-bench/sql-bench/limits/mysql-3.23.cfg
+share/mysql/sql-bench/sql-bench/limits/mysql-4.0.cfg
+share/mysql/sql-bench/sql-bench/limits/mysql-4.1.cfg
+share/mysql/sql-bench/sql-bench/limits/mysql.cfg
+share/mysql/sql-bench/sql-bench/limits/oracle.cfg
+share/mysql/sql-bench/sql-bench/limits/pg.cfg
+share/mysql/sql-bench/sql-bench/limits/solid-nt4.cfg
+share/mysql/sql-bench/sql-bench/limits/solid.cfg
+share/mysql/sql-bench/sql-bench/limits/sybase.cfg
+share/mysql/sql-bench/sql-bench/myisam.cnf
+share/mysql/sql-bench/sql-bench/run-all-tests
+share/mysql/sql-bench/sql-bench/server-cfg
+share/mysql/sql-bench/sql-bench/test-ATIS
+share/mysql/sql-bench/sql-bench/test-alter-table
+share/mysql/sql-bench/sql-bench/test-big-tables
+share/mysql/sql-bench/sql-bench/test-connect
+share/mysql/sql-bench/sql-bench/test-create
+share/mysql/sql-bench/sql-bench/test-insert
+share/mysql/sql-bench/sql-bench/test-select
+share/mysql/sql-bench/sql-bench/test-table-elimination
+share/mysql/sql-bench/sql-bench/test-transactions
+share/mysql/sql-bench/sql-bench/test-wisconsin
+share/mysql/swedish/errmsg.sys
+share/mysql/ukrainian/errmsg.sys
+@pkgdir include/mysql/server/private/data
Index: pkgsrc/databases/mariadb1011-server/buildlink3.mk
diff -u /dev/null pkgsrc/databases/mariadb1011-server/buildlink3.mk:1.1
--- /dev/null   Mon Jul 10 22:55:50 2023
+++ pkgsrc/databases/mariadb1011-server/buildlink3.mk   Mon Jul 10 22:55:50 2023
@@ -0,0 +1,15 @@
+# $NetBSD: buildlink3.mk,v 1.1 2023/07/10 22:55:50 nia Exp $
+
+BUILDLINK_TREE+=       mysql-server
+
+.if !defined(MYSQL_SERVER_BUILDLINK3_MK)
+MYSQL_SERVER_BUILDLINK3_MK:=
+
+BUILDLINK_API_DEPENDS.mysql-server+=   mariadb-server>=10.11.0<10.12.0
+BUILDLINK_ABI_DEPENDS.mysql-server+=   mariadb-server>=10.11.0
+BUILDLINK_PKGSRCDIR.mysql-server?=     ../../databases/mariadb1011-server
+BUILDLINK_LIBDIRS.mysql-server+=       lib
+
+.endif # MYSQL_SERVER_BUILDLINK3_MK
+
+BUILDLINK_TREE+=       -mysql-server
Index: pkgsrc/databases/mariadb1011-server/options.mk
diff -u /dev/null pkgsrc/databases/mariadb1011-server/options.mk:1.1
--- /dev/null   Mon Jul 10 22:55:50 2023
+++ pkgsrc/databases/mariadb1011-server/options.mk      Mon Jul 10 22:55:50 2023
@@ -0,0 +1,108 @@
+# $NetBSD: options.mk,v 1.1 2023/07/10 22:55:50 nia Exp $
+
+PKG_OPTIONS_VAR=       PKG_OPTIONS.mysql-server
+
+#PKG_SUPPORTED_OPTIONS+=       columnstore
+
+PKG_SUPPORTED_OPTIONS+=        auth-pam embedded-server lzo lz4 oqgraph
+PKG_SUPPORTED_OPTIONS+=        rocksdb snappy ssl zstd
+
+.include "../../mk/bsd.fast.prefs.mk"
+
+PKG_SUGGESTED_OPTIONS= ssl
+
+# auth_pam is not built on Solaris < 11.2 due to lack of getgrouplist
+# but will work on illumos
+.if ${OS_VARIANT} != "Solaris"
+PKG_SUGGESTED_OPTIONS+=        auth-pam
+.endif
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mcolumnstore)
+.include "../../devel/boost-headers/buildlink3.mk"
+CMAKE_ARGS+=   -DPLUGIN_COLUMNSTORE=YES
+.else
+CMAKE_ARGS+=   -DPLUGIN_COLUMNSTORE=NO
+.endif
+
+PLIST_VARS+=   embedded
+.if !empty(PKG_OPTIONS:Membedded-server)
+CMAKE_ARGS+=   -DWITH_EMBEDDED_SERVER=ON
+PLIST.embedded=        yes
+.else
+CMAKE_ARGS+=   -DWITH_EMBEDDED_SERVER=OFF
+.endif
+
+.if !empty(PKG_OPTIONS:Mlzo)
+.include "../../archivers/lzo/buildlink3.mk"
+CMAKE_ARGS+=   -DWITH_INNODB_LZO=ON
+.else
+CMAKE_ARGS+=   -DWITH_INNODB_LZO=OFF
+.endif
+
+.if !empty(PKG_OPTIONS:Mlz4)
+.include "../../archivers/lz4/buildlink3.mk"
+CMAKE_ARGS+=   -DGRN_WITH_LZ4=ON
+CMAKE_ARGS+=   -DWITH_INNODB_LZ4=ON
+CMAKE_ARGS+=   -DWITH_ROCKSDB_LZ4=ON
+.else
+CMAKE_ARGS+=   -DGRN_WITH_LZ4=OFF
+CMAKE_ARGS+=   -DWITH_INNODB_LZ4=OFF
+CMAKE_ARGS+=   -DWITH_ROCKSDB_LZ4=OFF
+.endif
+
+PLIST_VARS+=   oqgraph
+.if !empty(PKG_OPTIONS:Moqgraph)
+CMAKE_ARGS+=   -DPLUGIN_OQGRAPH=YES
+PLIST.oqgraph= yes
+.include "../../devel/boost-libs/buildlink3.mk"
+.include "../../devel/libjudy/buildlink3.mk"
+.else
+CMAKE_ARGS+=   -DPLUGIN_OQGRAPH=NO
+.endif
+
+PLIST_VARS+=   rocksdb
+.if !empty(PKG_OPTIONS:Mrocksdb)
+.include "../../lang/python/application.mk"
+PLIST.rocksdb= yes
+CMAKE_ARGS+=   -DWITHOUT_ROCKSDB_STORAGE_ENGINE=OFF
+CMAKE_ARGS+=   -DPYTHON_SHEBANG=${PYTHONBIN}
+.else
+CMAKE_ARGS+=   -DWITHOUT_ROCKSDB_STORAGE_ENGINE=ON
+.endif
+
+.if !empty(PKG_OPTIONS:Msnappy)
+.include "../../devel/snappy/buildlink3.mk"
+CMAKE_ARGS+=   -DWITH_INNODB_SNAPPY=ON
+CMAKE_ARGS+=   -DWITH_ROCKSDB_snappy=ON
+.else
+CMAKE_ARGS+=   -DWITH_INNODB_SNAPPY=OFF
+CMAKE_ARGS+=   -DWITH_ROCKSDB_snappy=OFF
+.endif
+
+# Enable OpenSSL support
+.if !empty(PKG_OPTIONS:Mssl)
+.include "../../security/openssl/buildlink3.mk"
+CMAKE_ARGS+=   -DWITH_SSL=system
+LDFLAGS+=      -lcrypto -lssl
+.else
+CMAKE_ARGS+=   -DWITH_SSL=no
+.endif
+
+.if !empty(PKG_OPTIONS:Mzstd)
+.include "../../archivers/zstd/buildlink3.mk"
+CMAKE_ARGS+=   -DWITH_ROCKSDB_zstd=ON
+.else
+CMAKE_ARGS+=   -DWITH_ROCKSDB_zstd=OFF
+.endif
+
+PLIST_VARS+=   auth_pam
+.if !empty(PKG_OPTIONS:Mauth-pam)
+CMAKE_ARGS+=   -DPLUGIN_AUTH_PAM=YES
+CMAKE_ARGS+=   -DPLUGIN_AUTH_PAM_V1=YES
+PLIST.auth_pam=        yes
+.else
+CMAKE_ARGS+=   -DPLUGIN_AUTH_PAM=NO
+CMAKE_ARGS+=   -DPLUGIN_AUTH_PAM_V1=NO
+.endif

Index: pkgsrc/databases/mariadb1011-server/files/mariadb.sh
diff -u /dev/null pkgsrc/databases/mariadb1011-server/files/mariadb.sh:1.1
--- /dev/null   Mon Jul 10 22:55:50 2023
+++ pkgsrc/databases/mariadb1011-server/files/mariadb.sh        Mon Jul 10 22:55:50 2023
@@ -0,0 +1,64 @@
+#!/bin/sh
+#
+# $NetBSD: mariadb.sh,v 1.1 2023/07/10 22:55:50 nia Exp $
+#
+# PROVIDE: mariadb mysqld
+# REQUIRE: DAEMON LOGIN mountall
+# KEYWORD: shutdown
+#
+# Optional rc.conf variables:
+#      mariadb_flags=""                   # additional mariadb startup flags
+#      mariadb_datadir="/path/to/datadir" # path to mariadb datadir
+
+if [ -f /etc/rc.subr ]
+then
+       . /etc/rc.subr
+fi
+
+name="mariadb"
+rcvar=${name}
+
+load_rc_config $name
+: ${mariadb_datadir:=@MARIADB_DATADIR@}
+
+procname="@PREFIX@/sbin/mariadbd"
+command="@PREFIX@/bin/mariadbd-safe"
+command_args="--pid-file=@VARBASE@/run/mariadb/mariadb.pid"
+command_args="${command_args} --user=@MARIADB_USER@"
+command_args="${command_args} --datadir=$mariadb_datadir"
+command_args="${command_args} --log-error=@VARBASE@/log/mariadb/error.log"
+command_args="${command_args} ${mariadb_flags} &"
+extra_commands="initdb"
+initdb_cmd="mariadb_initdb"
+start_precmd="mariadb_prestart"
+pidfile="@VARBASE@/run/mariadb/mariadb.pid"
+
+mariadb_initdb() {
+        if [ -f $mariadb_datadir/mysql/user.frm ]; then
+                echo "The MariaDB database has already been initialized."
+                echo "Skipping database initialization."
+        else
+               echo "Initializing MariaDB database system tables."
+               sh @PREFIX@/bin/mysql_install_db --force \
+                       --user=@MARIADB_USER@ \
+                       --datadir=$mariadb_datadir
+               if [ -d $mariadb_datadir ]; then
+                       /usr/sbin/chown -R @MARIADB_USER@:@MARIADB_GROUP@ \
+                               $mariadb_datadir
+                fi
+       fi
+}
+
+mariadb_prestart() {
+       if ! [ -f $mariadb_datadir/mysql/user.frm ]; then
+               mariadb_initdb
+       fi
+       rundir=$(dirname "${pidfile}")
+       if ! [ -d "${rundir}" ]; then
+               mkdir -p "${rundir}"
+               chown @MARIADB_USER@:@MARIADB_GROUP@ "${rundir}"
+       fi
+       ulimit -n 4096
+}
+
+run_rc_command "$1"

Index: pkgsrc/databases/mariadb1011-server/files/smf/manifest.xml
diff -u /dev/null pkgsrc/databases/mariadb1011-server/files/smf/manifest.xml:1.1
--- /dev/null   Mon Jul 10 22:55:50 2023
+++ pkgsrc/databases/mariadb1011-server/files/smf/manifest.xml  Mon Jul 10 22:55:50 2023
@@ -0,0 +1,32 @@
+<?xml version='1.0'?>
+<!DOCTYPE service_bundle SYSTEM '/usr/share/lib/xml/dtd/service_bundle.dtd.1'>
+<service_bundle type='manifest' name='@SMF_NAME@'>
+  <service name='@SMF_PREFIX@/@SMF_NAME@' type='service' version='1'>
+    <create_default_instance enabled='false' />
+    <single_instance />
+    <dependency name='fs' grouping='require_all' restart_on='none' type='service'>
+      <service_fmri value='svc:/system/filesystem/local' />
+    </dependency>
+    <dependency name='net' grouping='require_all' restart_on='none' type='service'>
+      <service_fmri value='svc:/network/loopback' />
+    </dependency>
+    <method_context project='mariadb' working_directory='@MARIADB_DATADIR@'>
+      <method_credential user='@MARIADB_USER@' group='@MARIADB_GROUP@' />
+      <method_environment>
+        <envvar name='LD_PRELOAD_32' value='/usr/lib/extendedFILE.so.1' />
+      </method_environment>
+    </method_context>
+    <exec_method name='start' type='method' exec='@PREFIX@/@SMF_METHOD_FILE.mariadb@ start' timeout_seconds='0' />
+    <exec_method name='stop' type='method' exec='@PREFIX@/@SMF_METHOD_FILE.mariadb@ stop' timeout_seconds='0' />
+    <stability value='Evolving' />
+    <template>
+      <common_name>
+        <loctext xml:lang='C'>MariaDB database</loctext>
+      </common_name>
+      <documentation>
+        <manpage title='MariaDB' section='1' />
+        <doc_link name='mariadb.org' uri='https://mariadb.org/docs/' />
+      </documentation>
+    </template>
+  </service>
+</service_bundle>
Index: pkgsrc/databases/mariadb1011-server/files/smf/mariadb.sh
diff -u /dev/null pkgsrc/databases/mariadb1011-server/files/smf/mariadb.sh:1.1
--- /dev/null   Mon Jul 10 22:55:50 2023
+++ pkgsrc/databases/mariadb1011-server/files/smf/mariadb.sh    Mon Jul 10 22:55:50 2023
@@ -0,0 +1,37 @@
+#!@SMF_METHOD_SHELL@
+#
+# $NetBSD: mariadb.sh,v 1.1 2023/07/10 22:55:50 nia Exp $
+#
+# Init script for mysqld.
+#
+
+. /lib/svc/share/smf_include.sh
+
+PIDFILE="@MARIADB_DATADIR@/mariadb.pid"
+
+ulimit -n 10240
+
+case "$1" in
+start)
+       if [ ! -d @MARIADB_DATADIR@/mysql ]; then
+               @LOCALBASE@/bin/mysql_install_db \
+                       --datadir=@MARIADB_DATADIR@ \
+                       --user=@MARIADB_USER@
+       fi
+
+       @LOCALBASE@/sbin/mariadbd --user=@MARIADB_USER@ \
+               --basedir=@LOCALBASE@ \
+               --datadir=@MARIADB_DATADIR@ \
+               --pid-file=${PIDFILE} \
+               --log-error=@VARBASE@/log/mariadb/error.log &
+       ;;
+stop)
+       [ -f ${PIDFILE} ] && kill `@HEAD@ -1 ${PIDFILE}`
+       ;;
+*)
+       echo "Usage: $0 {start|stop}" >&2
+       exit 1
+       ;;
+esac
+
+exit $SMF_EXIT_OK



Home | Main Index | Thread Index | Old Index