CVS commit: pkgsrc/mk

["Jaromir Dolecek" <jdolecek%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jdolecek
Date:           Sat May  8 19:53:28 UTC 2021

Modified Files:
        pkgsrc/mk: mysql.buildlink3.mk

Log Message:
recognize MariaDB 10.4 as another accepted MySQL version


To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 pkgsrc/mk/mysql.buildlink3.mk

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

Modified files:

Index: pkgsrc/mk/mysql.buildlink3.mk
diff -u pkgsrc/mk/mysql.buildlink3.mk:1.29 pkgsrc/mk/mysql.buildlink3.mk:1.30
--- pkgsrc/mk/mysql.buildlink3.mk:1.29  Sat May  8 15:51:28 2021
+++ pkgsrc/mk/mysql.buildlink3.mk       Sat May  8 19:53:28 2021
@@ -1,4 +1,4 @@
-# $NetBSD: mysql.buildlink3.mk,v 1.29 2021/05/08 15:51:28 jdolecek Exp $
+# $NetBSD: mysql.buildlink3.mk,v 1.30 2021/05/08 19:53:28 jdolecek Exp $
 #
 # This file is included by packages that require some version of the
 # MySQL database client.
@@ -8,7 +8,7 @@
 # MYSQL_VERSION_DEFAULT
 #      The preferred MySQL version.
 #
-#      Possible: 57 56 MARIADB55
+#      Possible: 57 56 MARIADB55 MARIADB104
 #      Default: 57
 #
 # Package-settable variables:
@@ -37,7 +37,7 @@ _SYS_VARS.mysql=      MYSQL_PKGSRCDIR
 .include "../../mk/bsd.prefs.mk"
 
 MYSQL_VERSION_DEFAULT?=                57
-MYSQL_VERSIONS_ACCEPTED?=      57 56 MARIADB55
+MYSQL_VERSIONS_ACCEPTED?=      57 56 MARIADB55 MARIADB104
 
 # transform the list into individual variables
 .for mv in ${MYSQL_VERSIONS_ACCEPTED}
@@ -65,6 +65,9 @@ _MYSQL_VERSION_INSTALLED=     56
 _MYSQL_VERSION_MARIADB55_INSTALLED=    yes
 _MYSQL_VERSION_INSTALLED=      MARIADB55
 .  endif
+.elif exists(${LOCALBASE}/include/mysql/mariadb_version.h)
+_MYSQL_VERSION_MARIADB104_INSTALLED=   yes
+_MYSQL_VERSION_INSTALLED=      MARIADB104
 .endif
 
 
@@ -111,6 +114,8 @@ MYSQL_PKGSRCDIR=    ../../databases/mysql57
 MYSQL_PKGSRCDIR=       ../../databases/mysql56-client
 .elif ${_MYSQL_VERSION} == "MARIADB55"
 MYSQL_PKGSRCDIR=       ../../databases/mariadb55-client
+.elif ${_MYSQL_VERSION} == "MARIADB104"
+MYSQL_PKGSRCDIR=       ../../databases/mariadb104-client
 .else
 # force an error
 PKG_FAIL_REASON+=      "[mysql.buildlink3.mk] ${_MYSQL_VERSION} is not a valid mysql package."