Mon Jul 10 22:57:42 2023 UTC ()
mk: Add support for mariadb 10.11 to the infrastructure


(nia)
diff -r1.38 -r1.39 pkgsrc/mk/mysql.buildlink3.mk
cvs diff -r1.38 -r1.39 pkgsrc/mk/mysql.buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/mk/mysql.buildlink3.mk 2021/09/27 15:25:54 1.38
+++ pkgsrc/mk/mysql.buildlink3.mk 2023/07/10 22:57:41 1.39
@@ -1,24 +1,24 @@ @@ -1,24 +1,24 @@
1# $NetBSD: mysql.buildlink3.mk,v 1.38 2021/09/27 15:25:54 ryoon Exp $ 1# $NetBSD: mysql.buildlink3.mk,v 1.39 2023/07/10 22:57:41 nia Exp $
2# 2#
3# This file is included by packages that require some version of the 3# This file is included by packages that require some version of the
4# MySQL database client. 4# MySQL database client.
5# 5#
6# User-settable variables: 6# User-settable variables:
7# 7#
8# MYSQL_VERSION_DEFAULT 8# MYSQL_VERSION_DEFAULT
9# The preferred MySQL version. 9# The preferred MySQL version.
10# 10#
11# Possible: 57 56 80 mariadb106 mariadb105 mariadb104 11# Possible: 57 56 80 mariadb1011 mariadb106 mariadb105 mariadb104
12# Default: mariadb106 12# Default: mariadb106
13# 13#
14# Package-settable variables: 14# Package-settable variables:
15# 15#
16# MYSQL_VERSIONS_ACCEPTED 16# MYSQL_VERSIONS_ACCEPTED
17# The list of MySQL versions that the package accepts. 17# The list of MySQL versions that the package accepts.
18# 18#
19# Possible: (see MYSQL_VERSION_DEFAULT) 19# Possible: (see MYSQL_VERSION_DEFAULT)
20# Default: (all) 20# Default: (all)
21# 21#
22# Variables set by this file: 22# Variables set by this file:
23# 23#
24# MYSQL_VERSION 24# MYSQL_VERSION
@@ -27,61 +27,65 @@ @@ -27,61 +27,65 @@
27MYSQL_VERSION_MK= # defined 27MYSQL_VERSION_MK= # defined
28 28
29BUILD_DEFS+= MYSQL_VERSION_DEFAULT 29BUILD_DEFS+= MYSQL_VERSION_DEFAULT
30BUILD_DEFS_EFFECTS+= MYSQL_VERSION 30BUILD_DEFS_EFFECTS+= MYSQL_VERSION
31 31
32_VARGROUPS+= mysql 32_VARGROUPS+= mysql
33_USER_VARS.mysql= MYSQL_VERSION_DEFAULT 33_USER_VARS.mysql= MYSQL_VERSION_DEFAULT
34_PKG_VARS.mysql= MYSQL_VERSIONS_ACCEPTED 34_PKG_VARS.mysql= MYSQL_VERSIONS_ACCEPTED
35_SYS_VARS.mysql= MYSQL_VERSION MYSQL_VERSION_REQD MYSQL_VERSIONS_ALL 35_SYS_VARS.mysql= MYSQL_VERSION MYSQL_VERSION_REQD MYSQL_VERSIONS_ALL
36 36
37# 37#
38# Set variables for all possible MySQL variants 38# Set variables for all possible MySQL variants
39# 39#
40MYSQL_VERSIONS_ALL= 80 57 56 mariadb106 mariadb105 mariadb104 40MYSQL_VERSIONS_ALL= 80 57 56
 41MYSQL_VERSIONS_ALL+= mariadb1011 mariadb106 mariadb105 mariadb104
41 42
42MYSQL_PKGBASE.80= mysql-client-8.0.* 43MYSQL_PKGBASE.80= mysql-client-8.0.*
43MYSQL_PKGSRCDIR.80= ../../databases/mysql80-client 44MYSQL_PKGSRCDIR.80= ../../databases/mysql80-client
44 45
45MYSQL_PKGBASE.57= mysql-client-5.7.* 46MYSQL_PKGBASE.57= mysql-client-5.7.*
46MYSQL_PKGSRCDIR.57= ../../databases/mysql57-client 47MYSQL_PKGSRCDIR.57= ../../databases/mysql57-client
47 48
48MYSQL_PKGBASE.56= mysql-client-5.6.* 49MYSQL_PKGBASE.56= mysql-client-5.6.*
49MYSQL_PKGSRCDIR.56= ../../databases/mysql56-client 50MYSQL_PKGSRCDIR.56= ../../databases/mysql56-client
50 51
51MYSQL_PKGBASE.mariadb104= mariadb-client-10.4.* 52MYSQL_PKGBASE.mariadb104= mariadb-client-10.4.*
52MYSQL_PKGSRCDIR.mariadb104= ../../databases/mariadb104-client 53MYSQL_PKGSRCDIR.mariadb104= ../../databases/mariadb104-client
53 54
54MYSQL_PKGBASE.mariadb105= mariadb-client-10.5.* 55MYSQL_PKGBASE.mariadb105= mariadb-client-10.5.*
55MYSQL_PKGSRCDIR.mariadb105= ../../databases/mariadb105-client 56MYSQL_PKGSRCDIR.mariadb105= ../../databases/mariadb105-client
56 57
57MYSQL_PKGBASE.mariadb106= mariadb-client-10.6.* 58MYSQL_PKGBASE.mariadb106= mariadb-client-10.6.*
58MYSQL_PKGSRCDIR.mariadb106= ../../databases/mariadb106-client 59MYSQL_PKGSRCDIR.mariadb106= ../../databases/mariadb106-client
59 60
 61MYSQL_PKGBASE.mariadb1011= mariadb-client-10.11.*
 62MYSQL_PKGSRCDIR.mariadb1011= ../../databases/mariadb1011-client
 63
60.for ver in ${MYSQL_VERSIONS_ALL} 64.for ver in ${MYSQL_VERSIONS_ALL}
61MYSQL_OK.${ver}= no 65MYSQL_OK.${ver}= no
62MYSQL_INSTALLED.${ver}= no 66MYSQL_INSTALLED.${ver}= no
63_SYS_VARS.mysql+= MYSQL_PKGBASE.${ver} MYSQL_PKGSRCDIR.${ver} 67_SYS_VARS.mysql+= MYSQL_PKGBASE.${ver} MYSQL_PKGSRCDIR.${ver}
64.endfor 68.endfor
65 69
66.include "../../mk/bsd.prefs.mk" 70.include "../../mk/bsd.prefs.mk"
67 71
68# 72#
69# Ordering here matters. Unless a more specific version is requested, or if 73# Ordering here matters. Unless a more specific version is requested, or if
70# the default version is installed, the first accepted installed version will 74# the default version is installed, the first accepted installed version will
71# be chosen. 75# be chosen.
72# 76#
73MYSQL_VERSION_DEFAULT?= mariadb106 77MYSQL_VERSION_DEFAULT?= mariadb106
74MYSQL_VERSIONS_ACCEPTED?= 57 56 80 mariadb106 mariadb105 mariadb104 78MYSQL_VERSIONS_ACCEPTED?= 57 56 80 mariadb1011 mariadb106 mariadb105 mariadb104
75 79
76# 80#
77# Previous versions of this file used shouty caps in the version names. We 81# Previous versions of this file used shouty caps in the version names. We
78# don't do that any longer, but do still support the older syntax. 82# don't do that any longer, but do still support the older syntax.
79# 83#
80MYSQL_VERSION_DEFAULT:= ${MYSQL_VERSION_DEFAULT:tl} 84MYSQL_VERSION_DEFAULT:= ${MYSQL_VERSION_DEFAULT:tl}
81MYSQL_VERSIONS_ACCEPTED:= ${MYSQL_VERSIONS_ACCEPTED:tl} 85MYSQL_VERSIONS_ACCEPTED:= ${MYSQL_VERSIONS_ACCEPTED:tl}
82 86
83# 87#
84# If version is acceptable, mark as OK and check to see if installed. 88# If version is acceptable, mark as OK and check to see if installed.
85# 89#
86.for ver in ${MYSQL_VERSIONS_ACCEPTED} 90.for ver in ${MYSQL_VERSIONS_ACCEPTED}
87MYSQL_OK.${ver}= yes 91MYSQL_OK.${ver}= yes