mariadb106: Various SunOS fixes.

NetBSD · Mar 7, 2023 · 13b9b4a · 13b9b4a
1 parent 96c298a
commit 13b9b4a
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 14 deletions.
diff --git a/databases/mariadb106-client/Makefile.common b/databases/mariadb106-client/Makefile.common
@@ -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="share/mysql"
 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"

diff --git a/databases/mariadb106-server/Makefile b/databases/mariadb106-server/Makefile
@@ -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}

diff --git a/databases/mariadb106-server/PLIST b/databases/mariadb106-server/PLIST
@@ -1,13 +1,13 @@
-@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
 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