CVS commit: pkgsrc/databases

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

Module Name:    pkgsrc
Committed By:   nia
Date:           Mon Jul 12 22:40:00 UTC 2021

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

Log Message:
mariadb*: Disable embedded server by default.

It is off by default upstream and doesn't seem to work well with
any non-GNU linker.


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 pkgsrc/databases/mariadb104-server/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/databases/mariadb104-server/options.mk
cvs rdiff -u -r1.7 -r1.8 pkgsrc/databases/mariadb105-server/Makefile
cvs rdiff -u -r1.4 -r1.5 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.9 pkgsrc/databases/mariadb104-server/Makefile:1.10
--- pkgsrc/databases/mariadb104-server/Makefile:1.9     Sun Jul  4 10:58:59 2021
+++ pkgsrc/databases/mariadb104-server/Makefile Mon Jul 12 22:39:59 2021
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2021/07/04 10:58:59 nia Exp $
+# $NetBSD: Makefile,v 1.10 2021/07/12 22:39:59 nia Exp $
 
 PKGNAME=       ${DISTNAME:S/-/-server-/}
-PKGREVISION=   6
+PKGREVISION=   7
 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.4 pkgsrc/databases/mariadb104-server/options.mk:1.5
--- pkgsrc/databases/mariadb104-server/options.mk:1.4   Sun Jul  4 10:14:54 2021
+++ pkgsrc/databases/mariadb104-server/options.mk       Mon Jul 12 22:39:59 2021
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.4 2021/07/04 10:14:54 nia Exp $
+# $NetBSD: options.mk,v 1.5 2021/07/12 22:39:59 nia Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.mysql-server
 
@@ -7,11 +7,7 @@ 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
+PKG_SUGGESTED_OPTIONS= ssl
 
 .include "../../mk/bsd.options.mk"
 

Index: pkgsrc/databases/mariadb105-server/Makefile
diff -u pkgsrc/databases/mariadb105-server/Makefile:1.7 pkgsrc/databases/mariadb105-server/Makefile:1.8
--- pkgsrc/databases/mariadb105-server/Makefile:1.7     Sun Jul  4 10:14:54 2021
+++ pkgsrc/databases/mariadb105-server/Makefile Mon Jul 12 22:40:00 2021
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2021/07/04 10:14:54 nia Exp $
+# $NetBSD: Makefile,v 1.8 2021/07/12 22:40:00 nia Exp $
 
 PKGNAME=       ${DISTNAME:S/-/-server-/}
-PKGREVISION=   4
+PKGREVISION=   5
 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.4 pkgsrc/databases/mariadb105-server/options.mk:1.5
--- pkgsrc/databases/mariadb105-server/options.mk:1.4   Sun Jul  4 10:14:54 2021
+++ pkgsrc/databases/mariadb105-server/options.mk       Mon Jul 12 22:40:00 2021
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.4 2021/07/04 10:14:54 nia Exp $
+# $NetBSD: options.mk,v 1.5 2021/07/12 22:40:00 nia Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.mysql-server
 
@@ -7,11 +7,7 @@ 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
+PKG_SUGGESTED_OPTIONS= ssl
 
 .include "../../mk/bsd.options.mk"