CVS commit: pkgsrc/databases

["David Brownlee" <abs%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   abs
Date:           Wed Dec  8 15:11:32 UTC 2021

Modified Files:
        pkgsrc/databases/mariadb104-server: Makefile
        pkgsrc/databases/mariadb105-server: Makefile
        pkgsrc/databases/mariadb106-server: Makefile

Log Message:
Add -DCONNECT_WITH_MONGO=NO to mariadb10{4,5,6}-server

Avoids build failure if monogb 4.x is installed.

Someone can always add a mongodb option to options.mk if they want, but
this is just to ensure reliable builds


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 pkgsrc/databases/mariadb104-server/Makefile
cvs rdiff -u -r1.18 -r1.19 pkgsrc/databases/mariadb105-server/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/databases/mariadb106-server/Makefile

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.15 pkgsrc/databases/mariadb104-server/Makefile:1.16
--- pkgsrc/databases/mariadb104-server/Makefile:1.15    Thu Oct 21 07:46:33 2021
+++ pkgsrc/databases/mariadb104-server/Makefile Wed Dec  8 15:11:32 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2021/10/21 07:46:33 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2021/12/08 15:11:32 abs Exp $
 
 PKGNAME=       ${DISTNAME:S/-/-server-/}
 PKGREVISION=   2
@@ -38,6 +38,8 @@ RCD_SCRIPTS=          mariadb
 SMF_NAME=              mariadb
 SMF_METHODS=           ${RCD_SCRIPTS}
 
+CMAKE_ARGS+=           -DCONNECT_WITH_MONGO=NO
+
 FILES_SUBST+=          HOSTNAME_CMD=${HOSTNAME_CMD:Q}
 FILES_SUBST+=          MARIADB_DATADIR=${MARIADB_DATADIR}
 FILES_SUBST+=          MARIADB_USER=${MARIADB_USER} MARIADB_GROUP=${MARIADB_GROUP}

Index: pkgsrc/databases/mariadb105-server/Makefile
diff -u pkgsrc/databases/mariadb105-server/Makefile:1.18 pkgsrc/databases/mariadb105-server/Makefile:1.19
--- pkgsrc/databases/mariadb105-server/Makefile:1.18    Sat Nov 27 22:52:15 2021
+++ pkgsrc/databases/mariadb105-server/Makefile Wed Dec  8 15:11:31 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2021/11/27 22:52:15 nia Exp $
+# $NetBSD: Makefile,v 1.19 2021/12/08 15:11:31 abs Exp $
 
 PKGNAME=       ${DISTNAME:S/-/-server-/}
 COMMENT=       MariaDB 10.5, a free MySQL compatible database (server)
@@ -37,6 +37,8 @@ RCD_SCRIPTS=          mariadb
 SMF_NAME=              mariadb
 SMF_METHODS=           ${RCD_SCRIPTS}
 
+CMAKE_ARGS+=           -DCONNECT_WITH_MONGO=NO
+
 FILES_SUBST+=          HOSTNAME_CMD=${HOSTNAME_CMD:Q}
 FILES_SUBST+=          MARIADB_DATADIR=${MARIADB_DATADIR}
 FILES_SUBST+=          MARIADB_USER=${MARIADB_USER} MARIADB_GROUP=${MARIADB_GROUP}

Index: pkgsrc/databases/mariadb106-server/Makefile
diff -u pkgsrc/databases/mariadb106-server/Makefile:1.7 pkgsrc/databases/mariadb106-server/Makefile:1.8
--- pkgsrc/databases/mariadb106-server/Makefile:1.7     Sat Nov 27 23:40:28 2021
+++ pkgsrc/databases/mariadb106-server/Makefile Wed Dec  8 15:11:31 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2021/11/27 23:40:28 nia Exp $
+# $NetBSD: Makefile,v 1.8 2021/12/08 15:11:31 abs Exp $
 
 PKGNAME=       ${DISTNAME:S/-/-server-/}
 COMMENT=       MariaDB 10.6, a free MySQL compatible database (server)
@@ -37,6 +37,8 @@ RCD_SCRIPTS=          mariadb
 SMF_NAME=              mariadb
 SMF_METHODS=           ${RCD_SCRIPTS}
 
+CMAKE_ARGS+=           -DCONNECT_WITH_MONGO=NO
+
 FILES_SUBST+=          HOSTNAME_CMD=${HOSTNAME_CMD:Q}
 FILES_SUBST+=          MARIADB_DATADIR=${MARIADB_DATADIR}
 FILES_SUBST+=          MARIADB_USER=${MARIADB_USER} MARIADB_GROUP=${MARIADB_GROUP}