CVS commit: pkgsrc/databases

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Sun Jul  4 10:14:54 UTC 2021

Modified Files:
        pkgsrc/databases/mariadb104-server: Makefile options.mk
        pkgsrc/databases/mariadb105-server: Makefile options.mk

Log Message:
mariadb*: Disable embedded-server on SunOS


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 pkgsrc/databases/mariadb104-server/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/databases/mariadb104-server/options.mk
cvs rdiff -u -r1.6 -r1.7 pkgsrc/databases/mariadb105-server/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/databases/mariadb105-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/mariadb104-server/Makefile
diff -u pkgsrc/databases/mariadb104-server/Makefile:1.7 pkgsrc/databases/mariadb104-server/Makefile:1.8
--- pkgsrc/databases/mariadb104-server/Makefile:1.7     Wed May 26 11:24:56 2021
+++ pkgsrc/databases/mariadb104-server/Makefile Sun Jul  4 10:14:54 2021
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2021/05/26 11:24:56 nia Exp $
+# $NetBSD: Makefile,v 1.8 2021/07/04 10:14:54 nia Exp $
 
 PKGNAME=       ${DISTNAME:S/-/-server-/}
-PKGREVISION=   4
+PKGREVISION=   5
 COMMENT=       MariaDB 10.4, a free MySQL compatible database (server)
 
 CONFLICTS=     mysql-server-[0-9]*

Index: pkgsrc/databases/mariadb104-server/options.mk
diff -u pkgsrc/databases/mariadb104-server/options.mk:1.3 pkgsrc/databases/mariadb104-server/options.mk:1.4
--- pkgsrc/databases/mariadb104-server/options.mk:1.3   Wed May 26 11:24:56 2021
+++ pkgsrc/databases/mariadb104-server/options.mk       Sun Jul  4 10:14:54 2021
@@ -1,10 +1,17 @@
-# $NetBSD: options.mk,v 1.3 2021/05/26 11:24:56 nia Exp $
+# $NetBSD: options.mk,v 1.4 2021/07/04 10:14:54 nia Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.mysql-server
 
 PKG_SUPPORTED_OPTIONS+=        columnstore embedded-server lzo lz4 oqgraph rocksdb
 PKG_SUPPORTED_OPTIONS+=        snappy ssl zstd
+
+.include "../../mk/bsd.fast.prefs.mk"
+
+.if ${OPSYS} != "SunOS"
 PKG_SUGGESTED_OPTIONS+=        embedded-server ssl
+.else
+PKG_SUGGESTED_OPTIONS+=        ssl
+.endif
 
 .include "../../mk/bsd.options.mk"
 

Index: pkgsrc/databases/mariadb105-server/Makefile
diff -u pkgsrc/databases/mariadb105-server/Makefile:1.6 pkgsrc/databases/mariadb105-server/Makefile:1.7
--- pkgsrc/databases/mariadb105-server/Makefile:1.6     Sun Jul  4 08:58:30 2021
+++ pkgsrc/databases/mariadb105-server/Makefile Sun Jul  4 10:14:54 2021
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2021/07/04 08:58:30 nia Exp $
+# $NetBSD: Makefile,v 1.7 2021/07/04 10:14:54 nia Exp $
 
 PKGNAME=       ${DISTNAME:S/-/-server-/}
-PKGREVISION=   3
+PKGREVISION=   4
 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.3 pkgsrc/databases/mariadb105-server/options.mk:1.4
--- pkgsrc/databases/mariadb105-server/options.mk:1.3   Tue May 25 15:51:21 2021
+++ pkgsrc/databases/mariadb105-server/options.mk       Sun Jul  4 10:14:54 2021
@@ -1,10 +1,17 @@
-# $NetBSD: options.mk,v 1.3 2021/05/25 15:51:21 nia Exp $
+# $NetBSD: options.mk,v 1.4 2021/07/04 10:14:54 nia Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.mysql-server
 
 PKG_SUPPORTED_OPTIONS+=        columnstore embedded-server lzo lz4 oqgraph rocksdb
 PKG_SUPPORTED_OPTIONS+=        snappy ssl zstd
+
+.include "../../mk/bsd.fast.prefs.mk"
+
+.if ${OPSYS} != "SunOS"
 PKG_SUGGESTED_OPTIONS+=        embedded-server ssl
+.else
+PKG_SUGGESTED_OPTIONS+=        ssl
+.endif
 
 .include "../../mk/bsd.options.mk"