CVS commit: pkgsrc/databases

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Tue Mar  7 10:47:14 UTC 2023

Modified Files:
        pkgsrc/databases/mariadb106-client: Makefile.common
        pkgsrc/databases/mariadb106-server: Makefile PLIST

Log Message:
mariadb106: Various SunOS fixes.


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 pkgsrc/databases/mariadb106-client/Makefile.common
cvs rdiff -u -r1.21 -r1.22 pkgsrc/databases/mariadb106-server/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/databases/mariadb106-server/PLIST

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

Modified files:

Index: pkgsrc/databases/mariadb106-client/Makefile.common
diff -u pkgsrc/databases/mariadb106-client/Makefile.common:1.14 pkgsrc/databases/mariadb106-client/Makefile.common:1.15
--- pkgsrc/databases/mariadb106-client/Makefile.common:1.14     Tue Jan 24 23:47:49 2023
+++ pkgsrc/databases/mariadb106-client/Makefile.common  Tue Mar  7 10:47:14 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.14 2023/01/24 23:47:49 wiz Exp $
+# $NetBSD: Makefile.common,v 1.15 2023/03/07 10:47:14 jperkin Exp $
 #
 # used by databases/mariadb106-client/Makefile
 # used by databases/mariadb106-server/Makefile
@@ -56,10 +56,6 @@ CMAKE_ARGS+=         -DINSTALL_SUPPORTFILESDIR=
 CMAKE_ARGS+=           -DINSTALL_SYSCONFDIR="${PKG_SYSCONFDIR}"
 CMAKE_ARGS+=           -DMYSQL_DATADIR=${MARIADB_DATADIR}
 
-.if ${OPSYS} == "SunOS"
-CMAKE_ARGS+=           -DWITH_MARIABACKUP=OFF
-.endif
-
 CMAKE_ARGS+=           -DWITH_UNIT_TESTS=OFF
 CMAKE_ARGS+=           -DWITH_LIBWRAP=ON
 CMAKE_ARGS+=           -DWITH_PCRE="system"

Index: pkgsrc/databases/mariadb106-server/Makefile
diff -u pkgsrc/databases/mariadb106-server/Makefile:1.21 pkgsrc/databases/mariadb106-server/Makefile:1.22
--- pkgsrc/databases/mariadb106-server/Makefile:1.21    Sun Jan 22 16:28:21 2023
+++ pkgsrc/databases/mariadb106-server/Makefile Tue Mar  7 10:47:14 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2023/01/22 16:28:21 ryoon Exp $
+# $NetBSD: Makefile,v 1.22 2023/03/07 10:47:14 jperkin Exp $
 
 PKGNAME=       ${DISTNAME:S/-/-server-/}
 PKGREVISION=   1
@@ -9,13 +9,13 @@ CONFLICTS=    mysql-server-[0-9]*
 .include "../../databases/mariadb106-client/Makefile.common"
 
 BUILD_DEFS+=           VARBASE
+PLIST_VARS+=           disks
 
 .include "../../mk/bsd.fast.prefs.mk"
 
-# mariabackup is not built on SunOS due to symbol resolution problems
-PLIST_VARS+=           mariabackup
+# Requires getmntinfo
 .if ${OPSYS} != "SunOS"
-PLIST.mariabackup=     yes
+PLIST.disks=           yes
 .endif
 
 MARIADB_USER?=         ${MYSQL_USER:Umariadb}

Index: pkgsrc/databases/mariadb106-server/PLIST
diff -u pkgsrc/databases/mariadb106-server/PLIST:1.9 pkgsrc/databases/mariadb106-server/PLIST:1.10
--- pkgsrc/databases/mariadb106-server/PLIST:1.9        Sun Nov 27 20:05:52 2022
+++ pkgsrc/databases/mariadb106-server/PLIST    Tue Mar  7 10:47:14 2023
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2022/11/27 20:05:52 nia Exp $
+@comment $NetBSD: PLIST,v 1.10 2023/03/07 10:47:14 jperkin Exp $
 bin/aria_chk
 bin/aria_dump_log
 bin/aria_ftdump
@@ -6,8 +6,8 @@ bin/aria_pack
 bin/aria_read_log
 bin/aria_s3_copy
 bin/innochecksum
-${PLIST.mariabackup}bin/mariabackup
-${PLIST.mariabackup}bin/mariadb-backup
+bin/mariabackup
+bin/mariadb-backup
 ${PLIST.embedded}bin/mariadb-client-test-embedded
 ${PLIST.embedded}bin/mariadb-embedded
 bin/mariadb-fix-extensions
@@ -19,7 +19,7 @@ bin/mariadb-waitpid
 bin/mariadbd-multi
 bin/mariadbd-safe
 bin/mariadbd-safe-helper
-${PLIST.mariabackup}bin/mbstream
+bin/mbstream
 bin/my_print_defaults
 bin/myisam_ftdump
 bin/myisamchk
@@ -315,7 +315,7 @@ 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
-lib/mysql/plugin/disks.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