Sat May 23 07:35:56 2020 UTC ()
MySQL 5.5 and PostgreSQL 9.4 are no longer with us


(adam)
diff -r1.26 -r1.27 pkgsrc/mk/mysql.buildlink3.mk
diff -r1.50 -r1.51 pkgsrc/mk/pgsql.buildlink3.mk
cvs diff -r1.26 -r1.27 pkgsrc/mk/mysql.buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/mk/mysql.buildlink3.mk 2020/03/15 17:50:28 1.26
+++ pkgsrc/mk/mysql.buildlink3.mk 2020/05/23 07:35:56 1.27
@@ -1,86 +1,80 @@ @@ -1,86 +1,80 @@
1# $NetBSD: mysql.buildlink3.mk,v 1.26 2020/03/15 17:50:28 rillig Exp $ 1# $NetBSD: mysql.buildlink3.mk,v 1.27 2020/05/23 07:35:56 adam 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 55 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 22
23.if !defined(MYSQL_VERSION_MK) 23.if !defined(MYSQL_VERSION_MK)
24MYSQL_VERSION_MK= # defined 24MYSQL_VERSION_MK= # defined
25 25
26BUILD_DEFS+= MYSQL_VERSION_DEFAULT 26BUILD_DEFS+= MYSQL_VERSION_DEFAULT
27BUILD_DEFS_EFFECTS+= MYSQL_PKGSRCDIR 27BUILD_DEFS_EFFECTS+= MYSQL_PKGSRCDIR
28 28
29_VARGROUPS+= mysql 29_VARGROUPS+= mysql
30_USER_VARS.mysql= MYSQL_VERSION_DEFAULT 30_USER_VARS.mysql= MYSQL_VERSION_DEFAULT
31_PKG_VARS.mysql= MYSQL_VERSIONS_ACCEPTED 31_PKG_VARS.mysql= MYSQL_VERSIONS_ACCEPTED
32_SYS_VARS.mysql= MYSQL_PKGSRCDIR 32_SYS_VARS.mysql= MYSQL_PKGSRCDIR
33 33
34.include "../../mk/bsd.prefs.mk" 34.include "../../mk/bsd.prefs.mk"
35 35
36MYSQL_VERSION_DEFAULT?= 57 36MYSQL_VERSION_DEFAULT?= 57
37MYSQL_VERSIONS_ACCEPTED?= 57 56 55 MARIADB55 37MYSQL_VERSIONS_ACCEPTED?= 57 56 MARIADB55
38 38
39# transform the list into individual variables 39# transform the list into individual variables
40.for mv in ${MYSQL_VERSIONS_ACCEPTED} 40.for mv in ${MYSQL_VERSIONS_ACCEPTED}
41_MYSQL_VERSION_${mv}_OK= yes 41_MYSQL_VERSION_${mv}_OK= yes
42.endfor 42.endfor
43 43
44# check what is installed 44# check what is installed
45.if ${OPSYS} == "Darwin" 45.if ${OPSYS} == "Darwin"
46. if exists(${LOCALBASE}/lib/libmysqlclient.20.dylib) 46. if exists(${LOCALBASE}/lib/libmysqlclient.20.dylib)
47_MYSQL_VERSION_57_INSTALLED= yes 47_MYSQL_VERSION_57_INSTALLED= yes
48_MYSQL_VERSION_INSTALLED= 57 48_MYSQL_VERSION_INSTALLED= 57
49. endif 49. endif
50. if exists(${LOCALBASE}/lib/libmysqlclient.18.dylib) 50. if exists(${LOCALBASE}/lib/libmysqlclient.18.dylib)
51. if exists(${LOCALBASE}/include/mysql/mysql/client_authentication.h) 51. if exists(${LOCALBASE}/include/mysql/mysql/client_authentication.h)
52_MYSQL_VERSION_56_INSTALLED= yes 52_MYSQL_VERSION_56_INSTALLED= yes
53_MYSQL_VERSION_INSTALLED= 56 53_MYSQL_VERSION_INSTALLED= 56
54. else 
55_MYSQL_VERSION_55_INSTALLED= yes 
56_MYSQL_VERSION_INSTALLED= 55 
57. endif 54. endif
58. endif 55. endif
59.else 56.else
60. if exists(${LOCALBASE}/lib/libmysqlclient.so.20) 57. if exists(${LOCALBASE}/lib/libmysqlclient.so.20)
61_MYSQL_VERSION_57_INSTALLED= yes 58_MYSQL_VERSION_57_INSTALLED= yes
62_MYSQL_VERSION_INSTALLED= 57 59_MYSQL_VERSION_INSTALLED= 57
63. endif 60. endif
64. if exists(${LOCALBASE}/lib/libmysqlclient.so.18) 61. if exists(${LOCALBASE}/lib/libmysqlclient.so.18)
65. if exists(${LOCALBASE}/include/mysql/mysql/client_authentication.h) 62. if exists(${LOCALBASE}/include/mysql/mysql/client_authentication.h)
66_MYSQL_VERSION_56_INSTALLED= yes 63_MYSQL_VERSION_56_INSTALLED= yes
67_MYSQL_VERSION_INSTALLED= 56 64_MYSQL_VERSION_INSTALLED= 56
68. elif exists(${LOCALBASE}/share/mariadb) 65. elif exists(${LOCALBASE}/share/mariadb)
69_MYSQL_VERSION_MARIADB55_INSTALLED= yes 66_MYSQL_VERSION_MARIADB55_INSTALLED= yes
70_MYSQL_VERSION_INSTALLED= MARIADB55 67_MYSQL_VERSION_INSTALLED= MARIADB55
71. else 
72_MYSQL_VERSION_55_INSTALLED= yes 
73_MYSQL_VERSION_INSTALLED= 55 
74. endif 68. endif
75. endif 69. endif
76.endif 70.endif
77 71
78 72
79# if a version is explicitely required, take it 73# if a version is explicitely required, take it
80.if defined(MYSQL_VERSION_REQD) 74.if defined(MYSQL_VERSION_REQD)
81_MYSQL_VERSION= ${MYSQL_VERSION_REQD} 75_MYSQL_VERSION= ${MYSQL_VERSION_REQD}
82.endif 76.endif
83# if the default is already installed, it is first choice 77# if the default is already installed, it is first choice
84.if !defined(_MYSQL_VERSION) 78.if !defined(_MYSQL_VERSION)
85. if defined(_MYSQL_VERSION_${MYSQL_VERSION_DEFAULT}_OK) 79. if defined(_MYSQL_VERSION_${MYSQL_VERSION_DEFAULT}_OK)
86. if defined(_MYSQL_VERSION_${MYSQL_VERSION_DEFAULT}_INSTALLED) 80. if defined(_MYSQL_VERSION_${MYSQL_VERSION_DEFAULT}_INSTALLED)
@@ -109,28 +103,26 @@ _MYSQL_VERSION= ${MYSQL_VERSION_DEFAULT} @@ -109,28 +103,26 @@ _MYSQL_VERSION= ${MYSQL_VERSION_DEFAULT}
109.if !defined(_MYSQL_VERSION) 103.if !defined(_MYSQL_VERSION)
110_MYSQL_VERSION= ${_MYSQL_VERSION_FIRSTACCEPTED} 104_MYSQL_VERSION= ${_MYSQL_VERSION_FIRSTACCEPTED}
111.endif 105.endif
112 106
113# 107#
114# set variables for the version we decided to use: 108# set variables for the version we decided to use:
115# 109#
116.if ${_MYSQL_VERSION} == "57" 110.if ${_MYSQL_VERSION} == "57"
117MYSQL_PKGSRCDIR= ../../databases/mysql57-client 111MYSQL_PKGSRCDIR= ../../databases/mysql57-client
118.elif ${_MYSQL_VERSION} == "56" 112.elif ${_MYSQL_VERSION} == "56"
119MYSQL_PKGSRCDIR= ../../databases/mysql56-client 113MYSQL_PKGSRCDIR= ../../databases/mysql56-client
120.elif ${_MYSQL_VERSION} == "MARIADB55" 114.elif ${_MYSQL_VERSION} == "MARIADB55"
121MYSQL_PKGSRCDIR= ../../databases/mariadb55-client 115MYSQL_PKGSRCDIR= ../../databases/mariadb55-client
122.elif ${_MYSQL_VERSION} == "55" 
123MYSQL_PKGSRCDIR= ../../databases/mysql55-client 
124.else 116.else
125# force an error 117# force an error
126PKG_FAIL_REASON+= "[mysql.buildlink3.mk] ${_MYSQL_VERSION} is not a valid mysql package." 118PKG_FAIL_REASON+= "[mysql.buildlink3.mk] ${_MYSQL_VERSION} is not a valid mysql package."
127.endif 119.endif
128 120
129# 121#
130# check installed version aginst required: 122# check installed version aginst required:
131# 123#
132.if defined(_MYSQL_VERSION_INSTALLED) 124.if defined(_MYSQL_VERSION_INSTALLED)
133. if ${_MYSQL_VERSION} != ${_MYSQL_VERSION_INSTALLED} 125. if ${_MYSQL_VERSION} != ${_MYSQL_VERSION_INSTALLED}
134PKG_FAIL_REASON+= "${PKGBASE} requires mysql-${_MYSQL_VERSION}, but mysql-${_MYSQL_VERSION_INSTALLED} is already installed." 126PKG_FAIL_REASON+= "${PKGBASE} requires mysql-${_MYSQL_VERSION}, but mysql-${_MYSQL_VERSION_INSTALLED} is already installed."
135. endif 127. endif
136.endif 128.endif
cvs diff -r1.50 -r1.51 pkgsrc/mk/pgsql.buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/mk/pgsql.buildlink3.mk 2019/10/07 19:21:48 1.50
+++ pkgsrc/mk/pgsql.buildlink3.mk 2020/05/23 07:35:56 1.51
@@ -1,41 +1,41 @@ @@ -1,41 +1,41 @@
1# $NetBSD: pgsql.buildlink3.mk,v 1.50 2019/10/07 19:21:48 adam Exp $ 1# $NetBSD: pgsql.buildlink3.mk,v 1.51 2020/05/23 07:35:56 adam 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 16
17.if !defined(PGVERSION_MK) 17.if !defined(PGVERSION_MK)
18PGVERSION_MK= defined 18PGVERSION_MK= defined
19 19
20_VARGROUPS+= pgsql 20_VARGROUPS+= pgsql
21_USER_VARS.pgsql= PGSQL_VERSION_DEFAULT 21_USER_VARS.pgsql= PGSQL_VERSION_DEFAULT
22_PKG_VARS.pgsql= PGSQL_VERSIONS_ACCEPTED 22_PKG_VARS.pgsql= PGSQL_VERSIONS_ACCEPTED
23_SYS_VARS.pgsql= PG_LIB_EXT PGSQL_TYPE PGPKGSRCDIR 23_SYS_VARS.pgsql= PG_LIB_EXT PGSQL_TYPE PGPKGSRCDIR
24 24
25.include "../../mk/bsd.prefs.mk" 25.include "../../mk/bsd.prefs.mk"
26 26
27PGSQL_VERSION_DEFAULT?= 95 27PGSQL_VERSION_DEFAULT?= 95
28PGSQL_VERSIONS_ACCEPTED?= 12 11 10 96 95 94 28PGSQL_VERSIONS_ACCEPTED?= 12 11 10 96 95
29 29
30# transform the list into individual variables 30# transform the list into individual variables
31.for pv in ${PGSQL_VERSIONS_ACCEPTED} 31.for pv in ${PGSQL_VERSIONS_ACCEPTED}
32_PGSQL_VERSION_${pv}_OK= yes 32_PGSQL_VERSION_${pv}_OK= yes
33.endfor 33.endfor
34 34
35.if ${SHLIB_TYPE} == "dylib" 35.if ${SHLIB_TYPE} == "dylib"
36PG_LIB_EXT=dylib 36PG_LIB_EXT=dylib
37.else 37.else
38PG_LIB_EXT=so 38PG_LIB_EXT=so
39.endif 39.endif
40 40
41# check what is installed 41# check what is installed
@@ -45,48 +45,42 @@ _PGSQL_VERSION_12_INSTALLED= yes @@ -45,48 +45,42 @@ _PGSQL_VERSION_12_INSTALLED= yes
45. endif 45. endif
46. if exists(${LOCALBASE}/lib/libecpg.6.11.dylib) 46. if exists(${LOCALBASE}/lib/libecpg.6.11.dylib)
47_PGSQL_VERSION_11_INSTALLED= yes 47_PGSQL_VERSION_11_INSTALLED= yes
48. endif 48. endif
49. if exists(${LOCALBASE}/lib/libecpg.6.10.dylib) 49. if exists(${LOCALBASE}/lib/libecpg.6.10.dylib)
50_PGSQL_VERSION_10_INSTALLED= yes 50_PGSQL_VERSION_10_INSTALLED= yes
51. endif 51. endif
52. if exists(${LOCALBASE}/lib/libecpg.6.8.dylib) 52. if exists(${LOCALBASE}/lib/libecpg.6.8.dylib)
53_PGSQL_VERSION_96_INSTALLED= yes 53_PGSQL_VERSION_96_INSTALLED= yes
54. endif 54. endif
55. if exists(${LOCALBASE}/lib/libecpg.6.7.dylib) 55. if exists(${LOCALBASE}/lib/libecpg.6.7.dylib)
56_PGSQL_VERSION_95_INSTALLED= yes 56_PGSQL_VERSION_95_INSTALLED= yes
57. endif 57. endif
58. if exists(${LOCALBASE}/lib/libecpg.6.6.dylib) 
59_PGSQL_VERSION_94_INSTALLED= yes 
60. endif 
61.else 58.else
62. if exists(${LOCALBASE}/lib/libecpg.so.6.12) 59. if exists(${LOCALBASE}/lib/libecpg.so.6.12)
63_PGSQL_VERSION_12_INSTALLED= yes 60_PGSQL_VERSION_12_INSTALLED= yes
64. endif 61. endif
65. if exists(${LOCALBASE}/lib/libecpg.so.6.11) 62. if exists(${LOCALBASE}/lib/libecpg.so.6.11)
66_PGSQL_VERSION_11_INSTALLED= yes 63_PGSQL_VERSION_11_INSTALLED= yes
67. endif 64. endif
68. if exists(${LOCALBASE}/lib/libecpg.so.6.10) 65. if exists(${LOCALBASE}/lib/libecpg.so.6.10)
69_PGSQL_VERSION_10_INSTALLED= yes 66_PGSQL_VERSION_10_INSTALLED= yes
70. endif 67. endif
71. if exists(${LOCALBASE}/lib/libecpg.so.6.8) 68. if exists(${LOCALBASE}/lib/libecpg.so.6.8)
72_PGSQL_VERSION_96_INSTALLED= yes 69_PGSQL_VERSION_96_INSTALLED= yes
73. endif 70. endif
74. if exists(${LOCALBASE}/lib/libecpg.so.6.7) 71. if exists(${LOCALBASE}/lib/libecpg.so.6.7)
75_PGSQL_VERSION_95_INSTALLED= yes 72_PGSQL_VERSION_95_INSTALLED= yes
76. endif 73. endif
77. if exists(${LOCALBASE}/lib/libecpg.so.6.6) 
78_PGSQL_VERSION_94_INSTALLED= yes 
79. endif 
80.endif 74.endif
81 75
82# if a version is explicitely required, take it 76# if a version is explicitely required, take it
83.if defined(PGSQL_VERSION_REQD) 77.if defined(PGSQL_VERSION_REQD)
84_PGSQL_VERSION= ${PGSQL_VERSION_REQD} 78_PGSQL_VERSION= ${PGSQL_VERSION_REQD}
85.endif 79.endif
86# if the default is already installed, it is first choice 80# if the default is already installed, it is first choice
87.if !defined(_PGSQL_VERSION) 81.if !defined(_PGSQL_VERSION)
88.if defined(_PGSQL_VERSION_${PGSQL_VERSION_DEFAULT}_OK) 82.if defined(_PGSQL_VERSION_${PGSQL_VERSION_DEFAULT}_OK)
89.if defined(_PGSQL_VERSION_${PGSQL_VERSION_DEFAULT}_INSTALLED) 83.if defined(_PGSQL_VERSION_${PGSQL_VERSION_DEFAULT}_INSTALLED)
90_PGSQL_VERSION= ${PGSQL_VERSION_DEFAULT} 84_PGSQL_VERSION= ${PGSQL_VERSION_DEFAULT}
91.endif 85.endif
92.endif 86.endif
@@ -119,28 +113,25 @@ PGSQL_TYPE= postgresql12-client @@ -119,28 +113,25 @@ PGSQL_TYPE= postgresql12-client
119PGPKGSRCDIR= ../../databases/postgresql12-client 113PGPKGSRCDIR= ../../databases/postgresql12-client
120.elif ${_PGSQL_VERSION} == "11" 114.elif ${_PGSQL_VERSION} == "11"
121PGSQL_TYPE= postgresql11-client 115PGSQL_TYPE= postgresql11-client
122PGPKGSRCDIR= ../../databases/postgresql11-client 116PGPKGSRCDIR= ../../databases/postgresql11-client
123.elif ${_PGSQL_VERSION} == "10" 117.elif ${_PGSQL_VERSION} == "10"
124PGSQL_TYPE= postgresql10-client 118PGSQL_TYPE= postgresql10-client
125PGPKGSRCDIR= ../../databases/postgresql10-client 119PGPKGSRCDIR= ../../databases/postgresql10-client
126.elif ${_PGSQL_VERSION} == "96" 120.elif ${_PGSQL_VERSION} == "96"
127PGSQL_TYPE= postgresql96-client 121PGSQL_TYPE= postgresql96-client
128PGPKGSRCDIR= ../../databases/postgresql96-client 122PGPKGSRCDIR= ../../databases/postgresql96-client
129.elif ${_PGSQL_VERSION} == "95" 123.elif ${_PGSQL_VERSION} == "95"
130PGSQL_TYPE= postgresql95-client 124PGSQL_TYPE= postgresql95-client
131PGPKGSRCDIR= ../../databases/postgresql95-client 125PGPKGSRCDIR= ../../databases/postgresql95-client
132.elif ${_PGSQL_VERSION} == "94" 
133PGSQL_TYPE= postgresql94-client 
134PGPKGSRCDIR= ../../databases/postgresql94-client 
135.else 126.else
136# force an error 127# force an error
137PGSQL_TYPE= none 128PGSQL_TYPE= none
138PKG_FAIL_REASON+= "${_PGSQL_VERSION} is not a valid package" 129PKG_FAIL_REASON+= "${_PGSQL_VERSION} is not a valid package"
139.endif 130.endif
140 131
141.include "${PGPKGSRCDIR}/buildlink3.mk" 132.include "${PGPKGSRCDIR}/buildlink3.mk"
142PGSQL_PREFIX= ${BUILDLINK_PREFIX.${PGSQL_TYPE}} 133PGSQL_PREFIX= ${BUILDLINK_PREFIX.${PGSQL_TYPE}}
143 134
144PGSQL_VERSION= ${_PGSQL_VERSION} 135PGSQL_VERSION= ${_PGSQL_VERSION}
145 136
146.endif # PGVERSION_MK 137.endif # PGVERSION_MK