Tue Oct 20 21:53:31 2020 UTC ()
Set MYSQL_VERSION from within mysql.buildlink3.mk simialrly
to what pgsql.buildlink3.mk does for PostgreSQL.

And while here, document PGSQL_VERSION as variable set by
pgsql.buildlink3.mk


(otis)
diff -r1.27 -r1.28 pkgsrc/mk/mysql.buildlink3.mk
diff -r1.53 -r1.54 pkgsrc/mk/pgsql.buildlink3.mk
cvs diff -r1.27 -r1.28 pkgsrc/mk/mysql.buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/mk/mysql.buildlink3.mk 2020/05/23 07:35:56 1.27
+++ pkgsrc/mk/mysql.buildlink3.mk 2020/10/20 21:53:31 1.28
@@ -1,34 +1,37 @@ @@ -1,34 +1,37 @@
1# $NetBSD: mysql.buildlink3.mk,v 1.27 2020/05/23 07:35:56 adam Exp $ 1# $NetBSD: mysql.buildlink3.mk,v 1.28 2020/10/20 21:53:31 otis 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 MARIADB55 11# Possible: 57 56 MARIADB55
12# Default: 57 12# Default: 57
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:
 23#
 24# MYSQL_VERSION
22 25
23.if !defined(MYSQL_VERSION_MK) 26.if !defined(MYSQL_VERSION_MK)
24MYSQL_VERSION_MK= # defined 27MYSQL_VERSION_MK= # defined
25 28
26BUILD_DEFS+= MYSQL_VERSION_DEFAULT 29BUILD_DEFS+= MYSQL_VERSION_DEFAULT
27BUILD_DEFS_EFFECTS+= MYSQL_PKGSRCDIR 30BUILD_DEFS_EFFECTS+= MYSQL_PKGSRCDIR
28 31
29_VARGROUPS+= mysql 32_VARGROUPS+= mysql
30_USER_VARS.mysql= MYSQL_VERSION_DEFAULT 33_USER_VARS.mysql= MYSQL_VERSION_DEFAULT
31_PKG_VARS.mysql= MYSQL_VERSIONS_ACCEPTED 34_PKG_VARS.mysql= MYSQL_VERSIONS_ACCEPTED
32_SYS_VARS.mysql= MYSQL_PKGSRCDIR 35_SYS_VARS.mysql= MYSQL_PKGSRCDIR
33 36
34.include "../../mk/bsd.prefs.mk" 37.include "../../mk/bsd.prefs.mk"
@@ -121,14 +124,16 @@ PKG_FAIL_REASON+= "[mysql.buildlink3.mk] @@ -121,14 +124,16 @@ PKG_FAIL_REASON+= "[mysql.buildlink3.mk]
121# 124#
122# check installed version aginst required: 125# check installed version aginst required:
123# 126#
124.if defined(_MYSQL_VERSION_INSTALLED) 127.if defined(_MYSQL_VERSION_INSTALLED)
125. if ${_MYSQL_VERSION} != ${_MYSQL_VERSION_INSTALLED} 128. if ${_MYSQL_VERSION} != ${_MYSQL_VERSION_INSTALLED}
126PKG_FAIL_REASON+= "${PKGBASE} requires mysql-${_MYSQL_VERSION}, but mysql-${_MYSQL_VERSION_INSTALLED} is already installed." 129PKG_FAIL_REASON+= "${PKGBASE} requires mysql-${_MYSQL_VERSION}, but mysql-${_MYSQL_VERSION_INSTALLED} is already installed."
127. endif 130. endif
128.endif 131.endif
129 132
130.if defined(MYSQL_PKGSRCDIR) 133.if defined(MYSQL_PKGSRCDIR)
131.include "${MYSQL_PKGSRCDIR}/buildlink3.mk" 134.include "${MYSQL_PKGSRCDIR}/buildlink3.mk"
132.endif 135.endif
133 136
 137MYSQL_VERSION= ${_MYSQL_VERSION}
 138
134.endif # MYSQL_VERSION_MK 139.endif # MYSQL_VERSION_MK
cvs diff -r1.53 -r1.54 pkgsrc/mk/pgsql.buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/mk/pgsql.buildlink3.mk 2020/10/18 09:24:02 1.53
+++ pkgsrc/mk/pgsql.buildlink3.mk 2020/10/20 21:53:31 1.54
@@ -1,28 +1,29 @@ @@ -1,28 +1,29 @@
1# $NetBSD: pgsql.buildlink3.mk,v 1.53 2020/10/18 09:24:02 adam Exp $ 1# $NetBSD: pgsql.buildlink3.mk,v 1.54 2020/10/20 21:53:31 otis Exp $
2# 2#
3# User-settable variables: 3# User-settable variables:
4# 4#
5# PGSQL_VERSION_DEFAULT 5# PGSQL_VERSION_DEFAULT
6# 6#
7# Package-settable variables: 7# Package-settable variables:
8# 8#
9# PGSQL_VERSIONS_ACCEPTED 9# PGSQL_VERSIONS_ACCEPTED
10# 10#
11# Variables set by this file: 11# Variables set by this file:
12# 12#
13# PG_LIB_EXT 13# PG_LIB_EXT
14# PGSQL_TYPE 14# PGSQL_TYPE
15# PGPKGSRCDIR 15# PGPKGSRCDIR
 16# PGSQL_VERSION
16 17
17.if !defined(PGVERSION_MK) 18.if !defined(PGVERSION_MK)
18PGVERSION_MK= defined 19PGVERSION_MK= defined
19 20
20_VARGROUPS+= pgsql 21_VARGROUPS+= pgsql
21_USER_VARS.pgsql= PGSQL_VERSION_DEFAULT 22_USER_VARS.pgsql= PGSQL_VERSION_DEFAULT
22_PKG_VARS.pgsql= PGSQL_VERSIONS_ACCEPTED 23_PKG_VARS.pgsql= PGSQL_VERSIONS_ACCEPTED
23_SYS_VARS.pgsql= PG_LIB_EXT PGSQL_TYPE PGPKGSRCDIR 24_SYS_VARS.pgsql= PG_LIB_EXT PGSQL_TYPE PGPKGSRCDIR
24 25
25.include "../../mk/bsd.prefs.mk" 26.include "../../mk/bsd.prefs.mk"
26 27
27PGSQL_VERSION_DEFAULT?= 12 28PGSQL_VERSION_DEFAULT?= 12
28PGSQL_VERSIONS_ACCEPTED?= 13 12 11 10 96 95 29PGSQL_VERSIONS_ACCEPTED?= 13 12 11 10 96 95