CVS commit: pkgsrc/mk

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

Module Name:    pkgsrc
Committed By:   nia
Date:           Sat Aug 17 00:59:12 UTC 2024

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

Log Message:
mk: Remove support for mariadb104


To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 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.42 pkgsrc/mk/mysql.buildlink3.mk:1.43
--- pkgsrc/mk/mysql.buildlink3.mk:1.42  Mon Aug  5 06:30:25 2024
+++ pkgsrc/mk/mysql.buildlink3.mk       Sat Aug 17 00:59:12 2024
@@ -1,4 +1,4 @@
-# $NetBSD: mysql.buildlink3.mk,v 1.42 2024/08/05 06:30:25 wiz Exp $
+# $NetBSD: mysql.buildlink3.mk,v 1.43 2024/08/17 00:59:12 nia 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: 80 mariadb1011 mariadb106 mariadb105 mariadb104
+#      Possible: 80 mariadb1011 mariadb106 mariadb105
 #      Default: mariadb1011
 #
 # Package-settable variables:
@@ -38,7 +38,7 @@ _SYS_VARS.mysql=      MYSQL_VERSION MYSQL_VER
 #
 # Set variables for all possible MySQL variants
 #
-MARIADB_VERSIONS_ALL+=         mariadb1011 mariadb106 mariadb105 mariadb104
+MARIADB_VERSIONS_ALL+=         mariadb1011 mariadb106 mariadb105
 
 MYSQL_VERSIONS_ALL=            80
 MYSQL_VERSIONS_ALL+=           ${MARIADB_VERSIONS_ALL}
@@ -46,9 +46,6 @@ MYSQL_VERSIONS_ALL+=          ${MARIADB_VERSIONS
 MYSQL_PKGBASE.80=              mysql-client-8.0.*
 MYSQL_PKGSRCDIR.80=            ../../databases/mysql80-client
 
-MYSQL_PKGBASE.mariadb104=      mariadb-client-10.4.*
-MYSQL_PKGSRCDIR.mariadb104=    ../../databases/mariadb104-client
-
 MYSQL_PKGBASE.mariadb105=      mariadb-client-10.5.*
 MYSQL_PKGSRCDIR.mariadb105=    ../../databases/mariadb105-client
 
@@ -72,7 +69,7 @@ _SYS_VARS.mysql+=             MYSQL_PKGBASE.${ver} 
 # be chosen.
 #
 MYSQL_VERSION_DEFAULT?=                mariadb1011
-MYSQL_VERSIONS_ACCEPTED?=      80 mariadb1011 mariadb106 mariadb105 mariadb104
+MYSQL_VERSIONS_ACCEPTED?=      80 mariadb1011 mariadb106 mariadb105
 
 #
 # Previous versions of this file used shouty caps in the version names.  We