CVS commit: pkgsrc/databases

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/databases
From: "Nia Alarie" <nia%netbsd.org@localhost>
Date: Sun, 16 Feb 2025 23:28:14 +0000

Module Name:    pkgsrc
Committed By:   nia
Date:           Sun Feb 16 23:28:14 UTC 2025

Modified Files:
        pkgsrc/databases/mariadb1011-client: Makefile.common PLIST distinfo
        pkgsrc/databases/mariadb1011-client/patches: patch-CMakeLists.txt
        pkgsrc/databases/mariadb1011-server: Makefile options.mk
        pkgsrc/databases/mariadb105-client: Makefile.common PLIST distinfo
        pkgsrc/databases/mariadb105-client/patches: patch-CMakeLists.txt
        pkgsrc/databases/mariadb105-server: Makefile options.mk
        pkgsrc/databases/mariadb106-client: Makefile.common PLIST distinfo
        pkgsrc/databases/mariadb106-client/patches: patch-CMakeLists.txt
        pkgsrc/databases/mariadb106-server: Makefile options.mk
        pkgsrc/databases/mariadb114-client: Makefile.common PLIST distinfo
        pkgsrc/databases/mariadb114-client/patches: patch-CMakeLists.txt
        pkgsrc/databases/mariadb114-server: Makefile options.mk

Log Message:
mariadb: Update packages to latest minor version of LTS releases.

While here, delint (mainly fixing whitespace issues in options.mk).

Builds on: FreeBSD NetBSD OmniOS macOS


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 \
    pkgsrc/databases/mariadb1011-client/Makefile.common
cvs rdiff -u -r1.2 -r1.3 pkgsrc/databases/mariadb1011-client/PLIST
cvs rdiff -u -r1.13 -r1.14 pkgsrc/databases/mariadb1011-client/distinfo
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/databases/mariadb1011-client/patches/patch-CMakeLists.txt
cvs rdiff -u -r1.22 -r1.23 pkgsrc/databases/mariadb1011-server/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/databases/mariadb1011-server/options.mk
cvs rdiff -u -r1.34 -r1.35 pkgsrc/databases/mariadb105-client/Makefile.common
cvs rdiff -u -r1.9 -r1.10 pkgsrc/databases/mariadb105-client/PLIST
cvs rdiff -u -r1.25 -r1.26 pkgsrc/databases/mariadb105-client/distinfo
cvs rdiff -u -r1.3 -r1.4 \
    pkgsrc/databases/mariadb105-client/patches/patch-CMakeLists.txt
cvs rdiff -u -r1.52 -r1.53 pkgsrc/databases/mariadb105-server/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/databases/mariadb105-server/options.mk
cvs rdiff -u -r1.30 -r1.31 pkgsrc/databases/mariadb106-client/Makefile.common
cvs rdiff -u -r1.9 -r1.10 pkgsrc/databases/mariadb106-client/PLIST
cvs rdiff -u -r1.21 -r1.22 pkgsrc/databases/mariadb106-client/distinfo
cvs rdiff -u -r1.3 -r1.4 \
    pkgsrc/databases/mariadb106-client/patches/patch-CMakeLists.txt
cvs rdiff -u -r1.42 -r1.43 pkgsrc/databases/mariadb106-server/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/databases/mariadb106-server/options.mk
cvs rdiff -u -r1.3 -r1.4 pkgsrc/databases/mariadb114-client/Makefile.common \
    pkgsrc/databases/mariadb114-client/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/databases/mariadb114-client/PLIST
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/databases/mariadb114-client/patches/patch-CMakeLists.txt
cvs rdiff -u -r1.8 -r1.9 pkgsrc/databases/mariadb114-server/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/databases/mariadb114-server/options.mk

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

Modified files:

Index: pkgsrc/databases/mariadb1011-client/Makefile.common
diff -u pkgsrc/databases/mariadb1011-client/Makefile.common:1.16 pkgsrc/databases/mariadb1011-client/Makefile.common:1.17
--- pkgsrc/databases/mariadb1011-client/Makefile.common:1.16    Tue Dec 10 18:23:08 2024
+++ pkgsrc/databases/mariadb1011-client/Makefile.common Sun Feb 16 23:28:12 2025
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile.common,v 1.16 2024/12/10 18:23:08 nia Exp $
+# $NetBSD: Makefile.common,v 1.17 2025/02/16 23:28:12 nia Exp $
 #
 # used by databases/mariadb1011-client/Makefile
 # used by databases/mariadb1011-server/Makefile
 # used by databases/mariadb1011-embedded/Makefile
 
-DISTNAME=      mariadb-10.11.10
+DISTNAME=      mariadb-10.11.11
 CATEGORIES=    databases
 MASTER_SITES=  https://archive.mariadb.org/${DISTNAME}/source/
 

Index: pkgsrc/databases/mariadb1011-client/PLIST
diff -u pkgsrc/databases/mariadb1011-client/PLIST:1.2 pkgsrc/databases/mariadb1011-client/PLIST:1.3
--- pkgsrc/databases/mariadb1011-client/PLIST:1.2       Tue May 21 09:52:52 2024
+++ pkgsrc/databases/mariadb1011-client/PLIST   Sun Feb 16 23:28:12 2025
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2024/05/21 09:52:52 nia Exp $
+@comment $NetBSD: PLIST,v 1.3 2025/02/16 23:28:12 nia Exp $
 bin/mariadb
 bin/mariadb-access
 bin/mariadb-admin
@@ -80,6 +80,7 @@ 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_cmp.h
 include/mysql/server/my_compiler.h
 include/mysql/server/my_config.h
 include/mysql/server/my_dbug.h
@@ -129,6 +130,7 @@ include/mysql/server/mysql/service_encry
 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_log_warnings.h
 include/mysql/server/mysql/service_logger.h
 include/mysql/server/mysql/service_md5.h
 include/mysql/server/mysql/service_my_crypt.h

Index: pkgsrc/databases/mariadb1011-client/distinfo
diff -u pkgsrc/databases/mariadb1011-client/distinfo:1.13 pkgsrc/databases/mariadb1011-client/distinfo:1.14
--- pkgsrc/databases/mariadb1011-client/distinfo:1.13   Fri Dec 13 14:07:45 2024
+++ pkgsrc/databases/mariadb1011-client/distinfo        Sun Feb 16 23:28:12 2025
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.13 2024/12/13 14:07:45 nia Exp $
+$NetBSD: distinfo,v 1.14 2025/02/16 23:28:12 nia Exp $
 
-BLAKE2s (mariadb-10.11.10.tar.gz) = 07830db81c463489dc3b005ab899b1aa29bc445806bc862ee6cb59ca2b1c9a4e
-SHA512 (mariadb-10.11.10.tar.gz) = 3a8655384813ba515ce185e8a03427785fbea75b3226e2a1db02839dd66c22622ba27eeb2ca7b3d840bba43720a4393bbf71eb4b2b9e41ab837629e89a8b5976
-Size (mariadb-10.11.10.tar.gz) = 104463642 bytes
+BLAKE2s (mariadb-10.11.11.tar.gz) = e6568174c2ac244c68cd618a9788ff33518f2ed2bae7a1773b22decc115dd4df
+SHA512 (mariadb-10.11.11.tar.gz) = d9c154207a9f435ce08d5fbfe31814a739e577c656ef9996cf7e60c2cad8b4c07e2de8d94b6191fefa2b5cbde56437b586f85f144d3b4fcec8533449ed8411ac
+Size (mariadb-10.11.11.tar.gz) = 105754084 bytes
 SHA1 (patch-BUILD_compile-pentium32-gcov) = 89a7da728f94f19c153b4d2d2d6ba5462acc941f
-SHA1 (patch-CMakeLists.txt) = b41fc869c3ebf0b13138a566a03080a0f3475551
+SHA1 (patch-CMakeLists.txt) = ed2d6200cd6023bdb3847a514a948522d70ce210
 SHA1 (patch-client_CMakeLists.txt) = 8fdd8a182304f0b84e120ce95334ace23d02ce88
 SHA1 (patch-client_mysql.cc) = e9c33cd51c11b6be309ee6d1404da2d9ece38efd
 SHA1 (patch-cmake_libfmt.cmake) = 5b33ee5491bfd02ae0d255e372df497e4257aff6

Index: pkgsrc/databases/mariadb1011-client/patches/patch-CMakeLists.txt
diff -u pkgsrc/databases/mariadb1011-client/patches/patch-CMakeLists.txt:1.2 pkgsrc/databases/mariadb1011-client/patches/patch-CMakeLists.txt:1.3
--- pkgsrc/databases/mariadb1011-client/patches/patch-CMakeLists.txt:1.2        Tue May 21 09:52:52 2024
+++ pkgsrc/databases/mariadb1011-client/patches/patch-CMakeLists.txt    Sun Feb 16 23:28:12 2025
@@ -1,10 +1,10 @@
-$NetBSD: patch-CMakeLists.txt,v 1.2 2024/05/21 09:52:52 nia Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.3 2025/02/16 23:28:12 nia Exp $
 
 Allow building a server-only configuration.
 
---- CMakeLists.txt.orig        2024-05-10 21:02:16.000000000 +0000
+--- CMakeLists.txt.orig        2025-01-30 17:54:53.000000000 +0000
 +++ CMakeLists.txt
-@@ -441,8 +441,6 @@ ENDIF()
+@@ -458,8 +458,6 @@ ENDIF()
  
  UNSET (MYSQLD_STATIC_PLUGIN_LIBS CACHE)
  
@@ -13,7 +13,7 @@ Allow building a server-only configurati
  INCLUDE(cpack_tgz)
  INCLUDE(cpack_rpm)
  INCLUDE(cpack_deb)
-@@ -453,19 +451,16 @@ MARK_AS_ADVANCED(PYTHON_SHEBANG)
+@@ -470,19 +468,16 @@ MARK_AS_ADVANCED(PYTHON_SHEBANG)
  # Add storage engines and plugins.
  CONFIGURE_PLUGINS()
  
@@ -33,7 +33,7 @@ Allow building a server-only configurati
    ADD_SUBDIRECTORY(sql)
    OPTION (WITH_EMBEDDED_SERVER "Compile MariaDB with embedded server" OFF)
    IF(WITH_EMBEDDED_SERVER)
-@@ -484,23 +479,26 @@ IF(NOT WITHOUT_SERVER)
+@@ -501,10 +496,12 @@ IF(NOT WITHOUT_SERVER)
      ADD_SUBDIRECTORY(win/upgrade_wizard)
      ADD_SUBDIRECTORY(win/packaging)
    ENDIF()
@@ -48,7 +48,8 @@ Allow building a server-only configurati
 +  ADD_SUBDIRECTORY(support-files)
  ENDIF()
  
- INCLUDE(cmake/abi_check.cmake)
+ IF (NOT WITHOUT_ABI_CHECK)
+@@ -513,13 +510,14 @@ ENDIF()
  INCLUDE(cmake/tags.cmake)
  INCLUDE(for_clients)
  ADD_SUBDIRECTORY(scripts)
@@ -65,7 +66,7 @@ Allow building a server-only configurati
    ENDIF()
    # minimal target to build only binaries for export
    ADD_CUSTOM_TARGET(import_executables DEPENDS ${EXPORTED})
-@@ -572,7 +570,7 @@ IF(WIN32 AND SIGNCODE)
+@@ -591,7 +589,7 @@ IF(WIN32 AND SIGNCODE)
    INSTALL(SCRIPT ${PROJECT_BINARY_DIR}/sign.cmake)
  ENDIF()
  
@@ -74,7 +75,7 @@ Allow building a server-only configurati
  
  OPTION(FEATURE_SUMMARY "Print feature summary at the end of configure step" ON)
  IF (FEATURE_SUMMARY)
-@@ -584,41 +582,3 @@ IF(NON_DISTRIBUTABLE_WARNING)
+@@ -603,41 +601,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()

Index: pkgsrc/databases/mariadb1011-server/Makefile
diff -u pkgsrc/databases/mariadb1011-server/Makefile:1.22 pkgsrc/databases/mariadb1011-server/Makefile:1.23
--- pkgsrc/databases/mariadb1011-server/Makefile:1.22   Sun Dec 29 15:09:43 2024
+++ pkgsrc/databases/mariadb1011-server/Makefile        Sun Feb 16 23:28:12 2025
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.22 2024/12/29 15:09:43 adam Exp $
+# $NetBSD: Makefile,v 1.23 2025/02/16 23:28:12 nia Exp $
 
 PKGNAME=       ${DISTNAME:S/-/-server-/}
-PKGREVISION=   1
 COMMENT=       MariaDB 10.11, a free MySQL compatible database (server)
 
 CONFLICTS=     mysql-server-[0-9]*

Index: pkgsrc/databases/mariadb1011-server/options.mk
diff -u pkgsrc/databases/mariadb1011-server/options.mk:1.2 pkgsrc/databases/mariadb1011-server/options.mk:1.3
--- pkgsrc/databases/mariadb1011-server/options.mk:1.2  Sun Aug 25 06:18:29 2024
+++ pkgsrc/databases/mariadb1011-server/options.mk      Sun Feb 16 23:28:12 2025
@@ -1,9 +1,7 @@
-# $NetBSD: options.mk,v 1.2 2024/08/25 06:18:29 wiz Exp $
+# $NetBSD: options.mk,v 1.3 2025/02/16 23:28:12 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
 
@@ -26,10 +24,10 @@ CMAKE_CONFIGURE_ARGS+=      -DPLUGIN_COLUMNST
 CMAKE_CONFIGURE_ARGS+= -DPLUGIN_COLUMNSTORE=NO
 .endif
 
-PLIST_VARS+=   embedded
+PLIST_VARS+=           embedded
 .if !empty(PKG_OPTIONS:Membedded-server)
 CMAKE_CONFIGURE_ARGS+= -DWITH_EMBEDDED_SERVER=ON
-PLIST.embedded=        yes
+PLIST.embedded=                yes
 .else
 CMAKE_CONFIGURE_ARGS+= -DWITH_EMBEDDED_SERVER=OFF
 .endif
@@ -97,11 +95,11 @@ CMAKE_CONFIGURE_ARGS+=      -DWITH_ROCKSDB_zs
 CMAKE_CONFIGURE_ARGS+= -DWITH_ROCKSDB_zstd=OFF
 .endif
 
-PLIST_VARS+=   auth_pam
+PLIST_VARS+=           auth_pam
 .if !empty(PKG_OPTIONS:Mauth-pam)
 CMAKE_CONFIGURE_ARGS+= -DPLUGIN_AUTH_PAM=YES
 CMAKE_CONFIGURE_ARGS+= -DPLUGIN_AUTH_PAM_V1=YES
-PLIST.auth_pam=        yes
+PLIST.auth_pam=                yes
 .else
 CMAKE_CONFIGURE_ARGS+= -DPLUGIN_AUTH_PAM=NO
 CMAKE_CONFIGURE_ARGS+= -DPLUGIN_AUTH_PAM_V1=NO

Index: pkgsrc/databases/mariadb105-client/Makefile.common
diff -u pkgsrc/databases/mariadb105-client/Makefile.common:1.34 pkgsrc/databases/mariadb105-client/Makefile.common:1.35
--- pkgsrc/databases/mariadb105-client/Makefile.common:1.34     Wed Dec 11 07:55:52 2024
+++ pkgsrc/databases/mariadb105-client/Makefile.common  Sun Feb 16 23:28:13 2025
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.34 2024/12/11 07:55:52 nia Exp $
+# $NetBSD: Makefile.common,v 1.35 2025/02/16 23:28:13 nia Exp $
 #
 # used by databases/mariadb105-client/Makefile
 # used by databases/mariadb105-server/Makefile
 
-DISTNAME=      mariadb-10.5.27
+DISTNAME=      mariadb-10.5.28
 CATEGORIES=    databases
 MASTER_SITES=  https://archive.mariadb.org/${DISTNAME}/source/
 

Index: pkgsrc/databases/mariadb105-client/PLIST
diff -u pkgsrc/databases/mariadb105-client/PLIST:1.9 pkgsrc/databases/mariadb105-client/PLIST:1.10
--- pkgsrc/databases/mariadb105-client/PLIST:1.9        Mon May 20 15:53:41 2024
+++ pkgsrc/databases/mariadb105-client/PLIST    Sun Feb 16 23:28:13 2025
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2024/05/20 15:53:41 nia Exp $
+@comment $NetBSD: PLIST,v 1.10 2025/02/16 23:28:13 nia Exp $
 bin/mariadb
 bin/mariadb-access
 bin/mariadb-admin
@@ -78,6 +78,7 @@ 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_cmp.h
 include/mysql/server/my_compiler.h
 include/mysql/server/my_config.h
 include/mysql/server/my_dbug.h

Index: pkgsrc/databases/mariadb105-client/distinfo
diff -u pkgsrc/databases/mariadb105-client/distinfo:1.25 pkgsrc/databases/mariadb105-client/distinfo:1.26
--- pkgsrc/databases/mariadb105-client/distinfo:1.25    Wed Dec 11 07:55:52 2024
+++ pkgsrc/databases/mariadb105-client/distinfo Sun Feb 16 23:28:13 2025
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.25 2024/12/11 07:55:52 nia Exp $
+$NetBSD: distinfo,v 1.26 2025/02/16 23:28:13 nia Exp $
 
-BLAKE2s (mariadb-10.5.27.tar.gz) = e9abe1b9f1b6dfbfd2e2d52e957dadc10280ee114faa9640c054173b5b3ac6a8
-SHA512 (mariadb-10.5.27.tar.gz) = c19474189fb480d77f9662b6295470d84ee39c5d0ab4a039153ea617b575e5a97ca124eee138856b991685655366c539319d8d14b76d09f6970b95be7725a692
-Size (mariadb-10.5.27.tar.gz) = 116496630 bytes
+BLAKE2s (mariadb-10.5.28.tar.gz) = 61e5217a8555046ce10c68af5edfb80b31456a7c3e1447de0c511c500c7a0334
+SHA512 (mariadb-10.5.28.tar.gz) = 829e05a00772ff5a6db62b5c22ee7d6642439dfd47660a41876db0107b1648318f3f8ce5dc01ef52f5d6c88f7e39d89c5f24a55b95ae88676f4ead01146cd0c7
+Size (mariadb-10.5.28.tar.gz) = 117755203 bytes
 SHA1 (patch-BUILD_compile-pentium32-gcov) = 89a7da728f94f19c153b4d2d2d6ba5462acc941f
-SHA1 (patch-CMakeLists.txt) = 96e43de080e7596cc02edfce7e621fe64a13bcb0
+SHA1 (patch-CMakeLists.txt) = 3c2748774822710f79f6f6ce2d13b7bcb2afbff0
 SHA1 (patch-client_CMakeLists.txt) = 8fdd8a182304f0b84e120ce95334ace23d02ce88
 SHA1 (patch-client_mysql.cc) = 89fe80fb66b8791131a8c6d1b209e57082804a01
 SHA1 (patch-include_my__global.h) = a3b831f91ba2efea9f78e70ab4f706da23b80403

Index: pkgsrc/databases/mariadb105-client/patches/patch-CMakeLists.txt
diff -u pkgsrc/databases/mariadb105-client/patches/patch-CMakeLists.txt:1.3 pkgsrc/databases/mariadb105-client/patches/patch-CMakeLists.txt:1.4
--- pkgsrc/databases/mariadb105-client/patches/patch-CMakeLists.txt:1.3 Mon May 20 15:53:42 2024
+++ pkgsrc/databases/mariadb105-client/patches/patch-CMakeLists.txt     Sun Feb 16 23:28:13 2025
@@ -1,10 +1,10 @@
-$NetBSD: patch-CMakeLists.txt,v 1.3 2024/05/20 15:53:42 nia Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.4 2025/02/16 23:28:13 nia Exp $
 
 Allow building a server-only configuration.
 
---- CMakeLists.txt.orig        2024-05-08 18:05:51.000000000 +0000
+--- CMakeLists.txt.orig        2025-01-28 18:36:04.000000000 +0000
 +++ CMakeLists.txt
-@@ -438,8 +438,6 @@ ENDIF()
+@@ -451,8 +451,6 @@ ENDIF()
  
  UNSET (MYSQLD_STATIC_PLUGIN_LIBS CACHE)
  
@@ -13,7 +13,7 @@ Allow building a server-only configurati
  INCLUDE(cpack_tgz)
  INCLUDE(cpack_rpm)
  INCLUDE(cpack_deb)
-@@ -450,20 +448,17 @@ MARK_AS_ADVANCED(PYTHON_SHEBANG)
+@@ -463,20 +461,17 @@ MARK_AS_ADVANCED(PYTHON_SHEBANG)
  # Add storage engines and plugins.
  CONFIGURE_PLUGINS()
  
@@ -34,7 +34,7 @@ Allow building a server-only configurati
    ADD_SUBDIRECTORY(sql)
    OPTION (WITH_EMBEDDED_SERVER "Compile MariaDB with embedded server" OFF)
    IF(WITH_EMBEDDED_SERVER)
-@@ -482,23 +477,27 @@ IF(NOT WITHOUT_SERVER)
+@@ -495,10 +490,12 @@ IF(NOT WITHOUT_SERVER)
      ADD_SUBDIRECTORY(win/upgrade_wizard)
      ADD_SUBDIRECTORY(win/packaging)
    ENDIF()
@@ -47,10 +47,10 @@ Allow building a server-only configurati
 +  ADD_SUBDIRECTORY(include)
    ADD_SUBDIRECTORY(man)
 +  ADD_SUBDIRECTORY(support-files)
-+  ADD_SUBDIRECTORY(tests)
  ENDIF()
  
- INCLUDE(cmake/abi_check.cmake)
+ IF (NOT WITHOUT_ABI_CHECK)
+@@ -507,13 +504,14 @@ ENDIF()
  INCLUDE(cmake/tags.cmake)
  INCLUDE(for_clients)
  ADD_SUBDIRECTORY(scripts)
@@ -63,11 +63,20 @@ Allow building a server-only configurati
    IF(NOT WITHOUT_SERVER)
      SET(EXPORTED ${EXPORTED} gen_lex_hash gen_lex_token)
 +  ELSE()
-+    SET(EXPORTED ${EXPORTED} comp_sql) 
++    SET(EXPORTED ${EXPORTED} comp_sql)
    ENDIF()
    # minimal target to build only binaries for export
    ADD_CUSTOM_TARGET(import_executables DEPENDS ${EXPORTED})
-@@ -582,41 +581,3 @@ IF(NON_DISTRIBUTABLE_WARNING)
+@@ -585,7 +583,7 @@ IF(WIN32 AND SIGNCODE)
+   INSTALL(SCRIPT ${PROJECT_BINARY_DIR}/sign.cmake)
+ ENDIF()
+ 
+-FEATURE_SUMMARY(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES VAR MARIADB_FEATURE_SUMMARY)
++FEATURE_SUMMARY(WHAT ALL VAR MARIADB_FEATURE_SUMMARY)
+ 
+ OPTION(FEATURE_SUMMARY "Print feature summary at the end of configure step" ON)
+ IF (FEATURE_SUMMARY)
+@@ -597,41 +595,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()

Index: pkgsrc/databases/mariadb105-server/Makefile
diff -u pkgsrc/databases/mariadb105-server/Makefile:1.52 pkgsrc/databases/mariadb105-server/Makefile:1.53
--- pkgsrc/databases/mariadb105-server/Makefile:1.52    Sun Dec 29 15:09:43 2024
+++ pkgsrc/databases/mariadb105-server/Makefile Sun Feb 16 23:28:13 2025
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.52 2024/12/29 15:09:43 adam Exp $
+# $NetBSD: Makefile,v 1.53 2025/02/16 23:28:13 nia Exp $
 
 PKGNAME=       ${DISTNAME:S/-/-server-/}
-PKGREVISION=   1
 COMMENT=       MariaDB 10.5, a free MySQL compatible database (server)
 
 CONFLICTS=     mysql-server-[0-9]*

Index: pkgsrc/databases/mariadb105-server/options.mk
diff -u pkgsrc/databases/mariadb105-server/options.mk:1.6 pkgsrc/databases/mariadb105-server/options.mk:1.7
--- pkgsrc/databases/mariadb105-server/options.mk:1.6   Sun Aug 25 06:18:29 2024
+++ pkgsrc/databases/mariadb105-server/options.mk       Sun Feb 16 23:28:13 2025
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.6 2024/08/25 06:18:29 wiz Exp $
+# $NetBSD: options.mk,v 1.7 2025/02/16 23:28:13 nia Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.mysql-server
 
@@ -18,10 +18,10 @@ CMAKE_CONFIGURE_ARGS+=      -DPLUGIN_COLUMNST
 CMAKE_CONFIGURE_ARGS+= -DPLUGIN_COLUMNSTORE=NO
 .endif
 
-PLIST_VARS+=   embedded
+PLIST_VARS+=           embedded
 .if !empty(PKG_OPTIONS:Membedded-server)
 CMAKE_CONFIGURE_ARGS+= -DWITH_EMBEDDED_SERVER=ON
-PLIST.embedded=        yes
+PLIST.embedded=                yes
 .else
 CMAKE_CONFIGURE_ARGS+= -DWITH_EMBEDDED_SERVER=OFF
 .endif
@@ -54,10 +54,10 @@ PLIST.oqgraph=      yes
 CMAKE_CONFIGURE_ARGS+= -DPLUGIN_OQGRAPH=NO
 .endif
 
-PLIST_VARS+=   rocksdb
+PLIST_VARS+=           rocksdb
 .if !empty(PKG_OPTIONS:Mrocksdb)
 .include "../../lang/python/application.mk"
-PLIST.rocksdb= yes
+PLIST.rocksdb=         yes
 CMAKE_CONFIGURE_ARGS+= -DWITHOUT_ROCKSDB_STORAGE_ENGINE=OFF
 CMAKE_CONFIGURE_ARGS+= -DPYTHON_SHEBANG=${PYTHONBIN}
 .else

Index: pkgsrc/databases/mariadb106-client/Makefile.common
diff -u pkgsrc/databases/mariadb106-client/Makefile.common:1.30 pkgsrc/databases/mariadb106-client/Makefile.common:1.31
--- pkgsrc/databases/mariadb106-client/Makefile.common:1.30     Tue Dec 10 22:36:36 2024
+++ pkgsrc/databases/mariadb106-client/Makefile.common  Sun Feb 16 23:28:13 2025
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.30 2024/12/10 22:36:36 nia Exp $
+# $NetBSD: Makefile.common,v 1.31 2025/02/16 23:28:13 nia Exp $
 #
 # used by databases/mariadb106-client/Makefile
 # used by databases/mariadb106-server/Makefile
 
-DISTNAME=      mariadb-10.6.20
+DISTNAME=      mariadb-10.6.21
 CATEGORIES=    databases
 MASTER_SITES=  https://archive.mariadb.org/${DISTNAME}/source/
 

Index: pkgsrc/databases/mariadb106-client/PLIST
diff -u pkgsrc/databases/mariadb106-client/PLIST:1.9 pkgsrc/databases/mariadb106-client/PLIST:1.10
--- pkgsrc/databases/mariadb106-client/PLIST:1.9        Mon May 20 11:59:10 2024
+++ pkgsrc/databases/mariadb106-client/PLIST    Sun Feb 16 23:28:13 2025
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2024/05/20 11:59:10 nia Exp $
+@comment $NetBSD: PLIST,v 1.10 2025/02/16 23:28:13 nia Exp $
 bin/mariadb
 bin/mariadb-access
 bin/mariadb-admin
@@ -80,6 +80,7 @@ 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_cmp.h
 include/mysql/server/my_compiler.h
 include/mysql/server/my_config.h
 include/mysql/server/my_dbug.h
@@ -129,6 +130,7 @@ include/mysql/server/mysql/service_encry
 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_log_warnings.h
 include/mysql/server/mysql/service_logger.h
 include/mysql/server/mysql/service_md5.h
 include/mysql/server/mysql/service_my_crypt.h

Index: pkgsrc/databases/mariadb106-client/distinfo
diff -u pkgsrc/databases/mariadb106-client/distinfo:1.21 pkgsrc/databases/mariadb106-client/distinfo:1.22
--- pkgsrc/databases/mariadb106-client/distinfo:1.21    Tue Dec 10 22:36:36 2024
+++ pkgsrc/databases/mariadb106-client/distinfo Sun Feb 16 23:28:13 2025
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.21 2024/12/10 22:36:36 nia Exp $
+$NetBSD: distinfo,v 1.22 2025/02/16 23:28:13 nia Exp $
 
-BLAKE2s (mariadb-10.6.20.tar.gz) = 252d13f005ee3fe370e01c31ef2c816a9004bb1a95db804ed4e09e86192df192
-SHA512 (mariadb-10.6.20.tar.gz) = de5465551fa837b6834b8435a5f04f894c2c2d5d0fdb7a05373728e166755a384f19cebd4e87910240929d3657d361b3943616246b4fcf0d97cf706e317ece96
-Size (mariadb-10.6.20.tar.gz) = 102697156 bytes
+BLAKE2s (mariadb-10.6.21.tar.gz) = fa1ad8a841c5fe61250696fa7d5fc38e9fa7831abc9f97e17c1e9d1a28e47612
+SHA512 (mariadb-10.6.21.tar.gz) = fe74a6fbf409723d69b35481a57d00fb04a2c560ad503ae50ff7b9d41b650dda32fe997c50303428e79a546e5c7fe91872fe3436cc3b7323f13a7138e04f5a53
+Size (mariadb-10.6.21.tar.gz) = 103982296 bytes
 SHA1 (patch-BUILD_compile-pentium32-gcov) = 89a7da728f94f19c153b4d2d2d6ba5462acc941f
-SHA1 (patch-CMakeLists.txt) = 042d9d361a5c3ff7e7df15f5de4a30eb7984cddd
+SHA1 (patch-CMakeLists.txt) = bb5e35aea168a7f6a15bff0aa3aa179470bb693b
 SHA1 (patch-client_CMakeLists.txt) = 8fdd8a182304f0b84e120ce95334ace23d02ce88
 SHA1 (patch-client_mysql.cc) = f49f942b765ccf427e9bcc9e4e0045ec74c94815
 SHA1 (patch-extra_readline_CMakeLists.txt) = 37873deaeccb37e1313179103bb12dcde4a496d6

Index: pkgsrc/databases/mariadb106-client/patches/patch-CMakeLists.txt
diff -u pkgsrc/databases/mariadb106-client/patches/patch-CMakeLists.txt:1.3 pkgsrc/databases/mariadb106-client/patches/patch-CMakeLists.txt:1.4
--- pkgsrc/databases/mariadb106-client/patches/patch-CMakeLists.txt:1.3 Sat May 21 09:36:02 2022
+++ pkgsrc/databases/mariadb106-client/patches/patch-CMakeLists.txt     Sun Feb 16 23:28:13 2025
@@ -1,10 +1,10 @@
-$NetBSD: patch-CMakeLists.txt,v 1.3 2022/05/21 09:36:02 nia Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.4 2025/02/16 23:28:13 nia Exp $
 
 Allow building a server-only configuration.
 
---- CMakeLists.txt.orig        2022-05-18 08:34:14.000000000 +0000
+--- CMakeLists.txt.orig        2025-01-29 10:22:18.000000000 +0000
 +++ CMakeLists.txt
-@@ -421,8 +421,6 @@ ENDIF()
+@@ -454,8 +454,6 @@ ENDIF()
  
  UNSET (MYSQLD_STATIC_PLUGIN_LIBS CACHE)
  
@@ -13,7 +13,7 @@ Allow building a server-only configurati
  INCLUDE(cpack_tgz)
  INCLUDE(cpack_rpm)
  INCLUDE(cpack_deb)
-@@ -433,19 +431,16 @@ MARK_AS_ADVANCED(PYTHON_SHEBANG)
+@@ -466,19 +464,16 @@ MARK_AS_ADVANCED(PYTHON_SHEBANG)
  # Add storage engines and plugins.
  CONFIGURE_PLUGINS()
  
@@ -33,7 +33,7 @@ Allow building a server-only configurati
    ADD_SUBDIRECTORY(sql)
    OPTION (WITH_EMBEDDED_SERVER "Compile MariaDB with embedded server" OFF)
    IF(WITH_EMBEDDED_SERVER)
-@@ -464,23 +459,26 @@ IF(NOT WITHOUT_SERVER)
+@@ -497,10 +492,12 @@ IF(NOT WITHOUT_SERVER)
      ADD_SUBDIRECTORY(win/upgrade_wizard)
      ADD_SUBDIRECTORY(win/packaging)
    ENDIF()
@@ -48,7 +48,8 @@ Allow building a server-only configurati
 +  ADD_SUBDIRECTORY(support-files)
  ENDIF()
  
- INCLUDE(cmake/abi_check.cmake)
+ IF (NOT WITHOUT_ABI_CHECK)
+@@ -509,13 +506,14 @@ ENDIF()
  INCLUDE(cmake/tags.cmake)
  INCLUDE(for_clients)
  ADD_SUBDIRECTORY(scripts)
@@ -61,11 +62,20 @@ Allow building a server-only configurati
    IF(NOT WITHOUT_SERVER)
      SET(EXPORTED ${EXPORTED} gen_lex_hash gen_lex_token)
 +  ELSE()
-+    SET(EXPORTED ${EXPORTED} comp_sql) 
++    SET(EXPORTED ${EXPORTED} comp_sql)
    ENDIF()
    # minimal target to build only binaries for export
    ADD_CUSTOM_TARGET(import_executables DEPENDS ${EXPORTED})
-@@ -561,41 +559,3 @@ IF(NON_DISTRIBUTABLE_WARNING)
+@@ -587,7 +585,7 @@ IF(WIN32 AND SIGNCODE)
+   INSTALL(SCRIPT ${PROJECT_BINARY_DIR}/sign.cmake)
+ ENDIF()
+ 
+-FEATURE_SUMMARY(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES VAR MARIADB_FEATURE_SUMMARY)
++FEATURE_SUMMARY(WHAT ALL VAR MARIADB_FEATURE_SUMMARY)
+ 
+ OPTION(FEATURE_SUMMARY "Print feature summary at the end of configure step" ON)
+ IF (FEATURE_SUMMARY)
+@@ -599,41 +597,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()

Index: pkgsrc/databases/mariadb106-server/Makefile
diff -u pkgsrc/databases/mariadb106-server/Makefile:1.42 pkgsrc/databases/mariadb106-server/Makefile:1.43
--- pkgsrc/databases/mariadb106-server/Makefile:1.42    Sun Dec 29 15:09:43 2024
+++ pkgsrc/databases/mariadb106-server/Makefile Sun Feb 16 23:28:13 2025
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.42 2024/12/29 15:09:43 adam Exp $
+# $NetBSD: Makefile,v 1.43 2025/02/16 23:28:13 nia Exp $
 
 PKGNAME=       ${DISTNAME:S/-/-server-/}
-PKGREVISION=   1
 COMMENT=       MariaDB 10.6, a free MySQL compatible database (server)
 
 CONFLICTS=     mysql-server-[0-9]*

Index: pkgsrc/databases/mariadb106-server/options.mk
diff -u pkgsrc/databases/mariadb106-server/options.mk:1.4 pkgsrc/databases/mariadb106-server/options.mk:1.5
--- pkgsrc/databases/mariadb106-server/options.mk:1.4   Sun Aug 25 06:18:29 2024
+++ pkgsrc/databases/mariadb106-server/options.mk       Sun Feb 16 23:28:13 2025
@@ -1,9 +1,7 @@
-# $NetBSD: options.mk,v 1.4 2024/08/25 06:18:29 wiz Exp $
+# $NetBSD: options.mk,v 1.5 2025/02/16 23:28:13 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
 
@@ -19,17 +17,10 @@ PKG_SUGGESTED_OPTIONS+=     auth-pam
 
 .include "../../mk/bsd.options.mk"
 
-.if !empty(PKG_OPTIONS:Mcolumnstore)
-.include "../../devel/boost-headers/buildlink3.mk"
-CMAKE_CONFIGURE_ARGS+= -DPLUGIN_COLUMNSTORE=YES
-.else
-CMAKE_CONFIGURE_ARGS+= -DPLUGIN_COLUMNSTORE=NO
-.endif
-
-PLIST_VARS+=   embedded
+PLIST_VARS+=           embedded
 .if !empty(PKG_OPTIONS:Membedded-server)
 CMAKE_CONFIGURE_ARGS+= -DWITH_EMBEDDED_SERVER=ON
-PLIST.embedded=        yes
+PLIST.embedded=                yes
 .else
 CMAKE_CONFIGURE_ARGS+= -DWITH_EMBEDDED_SERVER=OFF
 .endif
@@ -52,10 +43,10 @@ CMAKE_CONFIGURE_ARGS+=      -DWITH_INNODB_LZ4
 CMAKE_CONFIGURE_ARGS+= -DWITH_ROCKSDB_LZ4=OFF
 .endif
 
-PLIST_VARS+=   oqgraph
+PLIST_VARS+=           oqgraph
 .if !empty(PKG_OPTIONS:Moqgraph)
 CMAKE_CONFIGURE_ARGS+= -DPLUGIN_OQGRAPH=YES
-PLIST.oqgraph= yes
+PLIST.oqgraph=         yes
 .include "../../devel/boost-libs/buildlink3.mk"
 .include "../../devel/libjudy/buildlink3.mk"
 .else
@@ -97,11 +88,11 @@ CMAKE_CONFIGURE_ARGS+=      -DWITH_ROCKSDB_zs
 CMAKE_CONFIGURE_ARGS+= -DWITH_ROCKSDB_zstd=OFF
 .endif
 
-PLIST_VARS+=   auth_pam
+PLIST_VARS+=           auth_pam
 .if !empty(PKG_OPTIONS:Mauth-pam)
 CMAKE_CONFIGURE_ARGS+= -DPLUGIN_AUTH_PAM=YES
 CMAKE_CONFIGURE_ARGS+= -DPLUGIN_AUTH_PAM_V1=YES
-PLIST.auth_pam=        yes
+PLIST.auth_pam=                yes
 .else
 CMAKE_CONFIGURE_ARGS+= -DPLUGIN_AUTH_PAM=NO
 CMAKE_CONFIGURE_ARGS+= -DPLUGIN_AUTH_PAM_V1=NO

Index: pkgsrc/databases/mariadb114-client/Makefile.common
diff -u pkgsrc/databases/mariadb114-client/Makefile.common:1.3 pkgsrc/databases/mariadb114-client/Makefile.common:1.4
--- pkgsrc/databases/mariadb114-client/Makefile.common:1.3      Wed Dec 11 10:32:04 2024
+++ pkgsrc/databases/mariadb114-client/Makefile.common  Sun Feb 16 23:28:13 2025
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.3 2024/12/11 10:32:04 nia Exp $
+# $NetBSD: Makefile.common,v 1.4 2025/02/16 23:28:13 nia Exp $
 #
 # used by databases/mariadb114-client/Makefile
 # used by databases/mariadb114-server/Makefile
 
-DISTNAME=      mariadb-11.4.4
+DISTNAME=      mariadb-11.4.5
 CATEGORIES=    databases
 MASTER_SITES=  https://archive.mariadb.org/${DISTNAME}/source/
 
Index: pkgsrc/databases/mariadb114-client/distinfo
diff -u pkgsrc/databases/mariadb114-client/distinfo:1.3 pkgsrc/databases/mariadb114-client/distinfo:1.4
--- pkgsrc/databases/mariadb114-client/distinfo:1.3     Fri Dec 13 14:07:44 2024
+++ pkgsrc/databases/mariadb114-client/distinfo Sun Feb 16 23:28:13 2025
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.3 2024/12/13 14:07:44 nia Exp $
+$NetBSD: distinfo,v 1.4 2025/02/16 23:28:13 nia Exp $
 
-BLAKE2s (mariadb-11.4.4.tar.gz) = fc52142819f7f0db26a0e7b21bf66938950c72705ffdca93d6720dc7235b2425
-SHA512 (mariadb-11.4.4.tar.gz) = dfa4c137d67c11c997bf67bceb27d072c51831f35e2ad438fe2f234cb530eb74e3283429aef620036db06943d7309dec36a4d015f578fd2a1f933637681841fb
-Size (mariadb-11.4.4.tar.gz) = 111017581 bytes
+BLAKE2s (mariadb-11.4.5.tar.gz) = c42832b5368c1bcc142f1e6fcca41c6c48a0139da06b209364ad40b7a636b8e1
+SHA512 (mariadb-11.4.5.tar.gz) = 65b74e5443c2b7e8bc6a4c2a22838e3440bdbfef9c8fa6ed2b142e3ed0121d77a049c1054b05859ff8232386894ae0e7429d1a646ecf503e9c01c4952c83c51a
+Size (mariadb-11.4.5.tar.gz) = 112382453 bytes
 SHA1 (patch-BUILD_compile-pentium32-gcov) = 89a7da728f94f19c153b4d2d2d6ba5462acc941f
-SHA1 (patch-CMakeLists.txt) = b41fc869c3ebf0b13138a566a03080a0f3475551
+SHA1 (patch-CMakeLists.txt) = ed2d6200cd6023bdb3847a514a948522d70ce210
 SHA1 (patch-client_CMakeLists.txt) = 8fdd8a182304f0b84e120ce95334ace23d02ce88
 SHA1 (patch-client_mysql.cc) = e9c33cd51c11b6be309ee6d1404da2d9ece38efd
 SHA1 (patch-cmake_libfmt.cmake) = 5b33ee5491bfd02ae0d255e372df497e4257aff6

Index: pkgsrc/databases/mariadb114-client/PLIST
diff -u pkgsrc/databases/mariadb114-client/PLIST:1.1 pkgsrc/databases/mariadb114-client/PLIST:1.2
--- pkgsrc/databases/mariadb114-client/PLIST:1.1        Wed Aug 21 21:08:33 2024
+++ pkgsrc/databases/mariadb114-client/PLIST    Sun Feb 16 23:28:13 2025
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2024/08/21 21:08:33 nia Exp $
+@comment $NetBSD: PLIST,v 1.2 2025/02/16 23:28:13 nia Exp $
 bin/mariadb
 bin/mariadb-access
 bin/mariadb-admin
@@ -80,6 +80,7 @@ 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_cmp.h
 include/mysql/server/my_compiler.h
 include/mysql/server/my_config.h
 include/mysql/server/my_dbug.h
@@ -129,6 +130,7 @@ include/mysql/server/mysql/service_encry
 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_log_warnings.h
 include/mysql/server/mysql/service_logger.h
 include/mysql/server/mysql/service_md5.h
 include/mysql/server/mysql/service_my_crypt.h

Index: pkgsrc/databases/mariadb114-client/patches/patch-CMakeLists.txt
diff -u pkgsrc/databases/mariadb114-client/patches/patch-CMakeLists.txt:1.1 pkgsrc/databases/mariadb114-client/patches/patch-CMakeLists.txt:1.2
--- pkgsrc/databases/mariadb114-client/patches/patch-CMakeLists.txt:1.1 Wed Aug 21 21:08:34 2024
+++ pkgsrc/databases/mariadb114-client/patches/patch-CMakeLists.txt     Sun Feb 16 23:28:14 2025
@@ -1,10 +1,10 @@
-$NetBSD: patch-CMakeLists.txt,v 1.1 2024/08/21 21:08:34 nia Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.2 2025/02/16 23:28:14 nia Exp $
 
 Allow building a server-only configuration.
 
---- CMakeLists.txt.orig        2024-05-10 21:02:16.000000000 +0000
+--- CMakeLists.txt.orig        2025-01-30 17:54:53.000000000 +0000
 +++ CMakeLists.txt
-@@ -441,8 +441,6 @@ ENDIF()
+@@ -458,8 +458,6 @@ ENDIF()
  
  UNSET (MYSQLD_STATIC_PLUGIN_LIBS CACHE)
  
@@ -13,7 +13,7 @@ Allow building a server-only configurati
  INCLUDE(cpack_tgz)
  INCLUDE(cpack_rpm)
  INCLUDE(cpack_deb)
-@@ -453,19 +451,16 @@ MARK_AS_ADVANCED(PYTHON_SHEBANG)
+@@ -470,19 +468,16 @@ MARK_AS_ADVANCED(PYTHON_SHEBANG)
  # Add storage engines and plugins.
  CONFIGURE_PLUGINS()
  
@@ -33,7 +33,7 @@ Allow building a server-only configurati
    ADD_SUBDIRECTORY(sql)
    OPTION (WITH_EMBEDDED_SERVER "Compile MariaDB with embedded server" OFF)
    IF(WITH_EMBEDDED_SERVER)
-@@ -484,23 +479,26 @@ IF(NOT WITHOUT_SERVER)
+@@ -501,10 +496,12 @@ IF(NOT WITHOUT_SERVER)
      ADD_SUBDIRECTORY(win/upgrade_wizard)
      ADD_SUBDIRECTORY(win/packaging)
    ENDIF()
@@ -48,7 +48,8 @@ Allow building a server-only configurati
 +  ADD_SUBDIRECTORY(support-files)
  ENDIF()
  
- INCLUDE(cmake/abi_check.cmake)
+ IF (NOT WITHOUT_ABI_CHECK)
+@@ -513,13 +510,14 @@ ENDIF()
  INCLUDE(cmake/tags.cmake)
  INCLUDE(for_clients)
  ADD_SUBDIRECTORY(scripts)
@@ -65,7 +66,7 @@ Allow building a server-only configurati
    ENDIF()
    # minimal target to build only binaries for export
    ADD_CUSTOM_TARGET(import_executables DEPENDS ${EXPORTED})
-@@ -572,7 +570,7 @@ IF(WIN32 AND SIGNCODE)
+@@ -591,7 +589,7 @@ IF(WIN32 AND SIGNCODE)
    INSTALL(SCRIPT ${PROJECT_BINARY_DIR}/sign.cmake)
  ENDIF()
  
@@ -74,7 +75,7 @@ Allow building a server-only configurati
  
  OPTION(FEATURE_SUMMARY "Print feature summary at the end of configure step" ON)
  IF (FEATURE_SUMMARY)
-@@ -584,41 +582,3 @@ IF(NON_DISTRIBUTABLE_WARNING)
+@@ -603,41 +601,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()

Index: pkgsrc/databases/mariadb114-server/Makefile
diff -u pkgsrc/databases/mariadb114-server/Makefile:1.8 pkgsrc/databases/mariadb114-server/Makefile:1.9
--- pkgsrc/databases/mariadb114-server/Makefile:1.8     Sun Dec 29 15:09:43 2024
+++ pkgsrc/databases/mariadb114-server/Makefile Sun Feb 16 23:28:14 2025
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.8 2024/12/29 15:09:43 adam Exp $
+# $NetBSD: Makefile,v 1.9 2025/02/16 23:28:14 nia Exp $
 
 PKGNAME=       ${DISTNAME:S/-/-server-/}
-PKGREVISION=   1
 COMMENT=       MariaDB 11.4, a free MySQL compatible database (server)
 
 CONFLICTS=     mysql-server-[0-9]*

Index: pkgsrc/databases/mariadb114-server/options.mk
diff -u pkgsrc/databases/mariadb114-server/options.mk:1.2 pkgsrc/databases/mariadb114-server/options.mk:1.3
--- pkgsrc/databases/mariadb114-server/options.mk:1.2   Sun Aug 25 06:18:30 2024
+++ pkgsrc/databases/mariadb114-server/options.mk       Sun Feb 16 23:28:14 2025
@@ -1,9 +1,7 @@
-# $NetBSD: options.mk,v 1.2 2024/08/25 06:18:30 wiz Exp $
+# $NetBSD: options.mk,v 1.3 2025/02/16 23:28:14 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
 
@@ -19,17 +17,10 @@ PKG_SUGGESTED_OPTIONS+=     auth-pam
 
 .include "../../mk/bsd.options.mk"
 
-.if !empty(PKG_OPTIONS:Mcolumnstore)
-.include "../../devel/boost-headers/buildlink3.mk"
-CMAKE_CONFIGURE_ARGS+= -DPLUGIN_COLUMNSTORE=YES
-.else
-CMAKE_CONFIGURE_ARGS+= -DPLUGIN_COLUMNSTORE=NO
-.endif
-
-PLIST_VARS+=   embedded
+PLIST_VARS+=           embedded
 .if !empty(PKG_OPTIONS:Membedded-server)
 CMAKE_CONFIGURE_ARGS+= -DWITH_EMBEDDED_SERVER=ON
-PLIST.embedded=        yes
+PLIST.embedded=                yes
 .else
 CMAKE_CONFIGURE_ARGS+= -DWITH_EMBEDDED_SERVER=OFF
 .endif
@@ -62,10 +53,10 @@ PLIST.oqgraph=      yes
 CMAKE_CONFIGURE_ARGS+= -DPLUGIN_OQGRAPH=NO
 .endif
 
-PLIST_VARS+=   rocksdb
+PLIST_VARS+=           rocksdb
 .if !empty(PKG_OPTIONS:Mrocksdb)
 .include "../../lang/python/application.mk"
-PLIST.rocksdb= yes
+PLIST.rocksdb=         yes
 CMAKE_CONFIGURE_ARGS+= -DWITHOUT_ROCKSDB_STORAGE_ENGINE=OFF
 CMAKE_CONFIGURE_ARGS+= -DPYTHON_SHEBANG=${PYTHONBIN}
 .else
@@ -97,11 +88,11 @@ CMAKE_CONFIGURE_ARGS+=      -DWITH_ROCKSDB_zs
 CMAKE_CONFIGURE_ARGS+= -DWITH_ROCKSDB_zstd=OFF
 .endif
 
-PLIST_VARS+=   auth_pam
+PLIST_VARS+=           auth_pam
 .if !empty(PKG_OPTIONS:Mauth-pam)
 CMAKE_CONFIGURE_ARGS+= -DPLUGIN_AUTH_PAM=YES
 CMAKE_CONFIGURE_ARGS+= -DPLUGIN_AUTH_PAM_V1=YES
-PLIST.auth_pam=        yes
+PLIST.auth_pam=                yes
 .else
 CMAKE_CONFIGURE_ARGS+= -DPLUGIN_AUTH_PAM=NO
 CMAKE_CONFIGURE_ARGS+= -DPLUGIN_AUTH_PAM_V1=NO

Prev by Date: CVS commit: pkgsrc/graphics/librsvg
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/graphics/librsvg
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index