Sun Apr 14 15:40:23 2019 UTC ()
lang/ruby: remove support for ruby23

Remove support for ruby23.


(taca)
diff -r1.203 -r1.204 pkgsrc/lang/ruby/rubyversion.mk
cvs diff -r1.203 -r1.204 pkgsrc/lang/ruby/rubyversion.mk (expand / switch to unified diff)

--- pkgsrc/lang/ruby/rubyversion.mk 2019/04/07 16:17:39 1.203
+++ pkgsrc/lang/ruby/rubyversion.mk 2019/04/14 15:40:22 1.204
@@ -1,26 +1,26 @@ @@ -1,26 +1,26 @@
1# $NetBSD: rubyversion.mk,v 1.203 2019/04/07 16:17:39 taca Exp $ 1# $NetBSD: rubyversion.mk,v 1.204 2019/04/14 15:40:22 taca Exp $
2# 2#
3 3
4# This file determines which Ruby version is used as a dependency for 4# This file determines which Ruby version is used as a dependency for
5# a package. 5# a package.
6# 6#
7# 7#
8# === User-settable variables === 8# === User-settable variables ===
9# 9#
10# RUBY_VERSION_DEFAULT 10# RUBY_VERSION_DEFAULT
11# The preferered Ruby version to use. 11# The preferered Ruby version to use.
12# 12#
13# Possible values: 22 23 24 25 26 13# Possible values: 22 24 25 26
14# Default: 24 14# Default: 24
15# 15#
16# RUBY_BUILD_RDOC 16# RUBY_BUILD_RDOC
17# Build rdoc of this package and so that install formated 17# Build rdoc of this package and so that install formated
18# documentation. It is also used in each package. 18# documentation. It is also used in each package.
19# 19#
20# Possible values: Yes No 20# Possible values: Yes No
21# Default: Yes 21# Default: Yes
22# 22#
23# RUBY_BUILD_RI 23# RUBY_BUILD_RI
24# Build ri format of this package so that ri command would be 24# Build ri format of this package so that ri command would be
25# display class/module definitions. It is also used in each package. 25# display class/module definitions. It is also used in each package.
26# 26#
@@ -31,64 +31,64 @@ @@ -31,64 +31,64 @@
31# 31#
32# RUBY_VERSION_REQD 32# RUBY_VERSION_REQD
33# Ruby version to use. This variable should not be set in 33# Ruby version to use. This variable should not be set in
34# packages. Normally it is used by bulk build tools. 34# packages. Normally it is used by bulk build tools.
35# 35#
36# Possible values: ${RUBY_VERSIONS_ACCEPTED} 36# Possible values: ${RUBY_VERSIONS_ACCEPTED}
37# Default: ${RUBY_VERSION_DEFAULT} 37# Default: ${RUBY_VERSION_DEFAULT}
38# 38#
39# === Package-settable variables === 39# === Package-settable variables ===
40# 40#
41# RUBY_VERSIONS_ACCEPTED 41# RUBY_VERSIONS_ACCEPTED
42# The Ruby versions that are acceptable for the package. 42# The Ruby versions that are acceptable for the package.
43# 43#
44# Possible values: 22 23 24 25 26 44# Possible values: 22 24 25 26
45# Default: 23 24 25 26 45# Default: 24 25 26
46# 46#
47# RUBY_NOVERSION 47# RUBY_NOVERSION
48# If "Yes", the package dosen't depend on any version of Ruby, such 48# If "Yes", the package dosen't depend on any version of Ruby, such
49# as editing mode for emacs. In this case, package's name would begin 49# as editing mode for emacs. In this case, package's name would begin
50# with "ruby-". Otherwise, the package's name is begin with 50# with "ruby-". Otherwise, the package's name is begin with
51# ${RUBY_PKGPREFIX}. 51# ${RUBY_PKGPREFIX}.
52# 52#
53# Possible values: Yes No 53# Possible values: Yes No
54# Default: No 54# Default: No
55# 55#
56# RUBY_DYNAMIC_DIRS 56# RUBY_DYNAMIC_DIRS
57# Build dynamic PLIST from directories. 57# Build dynamic PLIST from directories.
58# 58#
59# Default: (empty) 59# Default: (empty)
60# 60#
61# RUBY_ENCODING_ARG 61# RUBY_ENCODING_ARG
62# 62#
63# Optional encoding argument for shbang line. 63# Optional encoding argument for shbang line.
64# 64#
65# Default: (empty) 65# Default: (empty)
66# 66#
67# === Defined variables === 67# === Defined variables ===
68# 68#
69# RUBY_VER 69# RUBY_VER
70# Really selected version of ruby. 70# Really selected version of ruby.
71# 71#
72# Possible values: 22 23 24 25 26 72# Possible values: 22 24 25 26
73# 73#
74# Use this variable in pkgsrc's Makefile 74# Use this variable in pkgsrc's Makefile
75# 75#
76# RUBY_PKGPREFIX 76# RUBY_PKGPREFIX
77# Prefix part for ruby based packages. It is recommended that to 77# Prefix part for ruby based packages. It is recommended that to
78# use RUBY_PKGPREFIX with ruby related packages since you can supply 78# use RUBY_PKGPREFIX with ruby related packages since you can supply
79# different binary packages as each version of Ruby. 79# different binary packages as each version of Ruby.
80# 80#
81# Example values: ruby22 ruby23 ruby24 ruby25 81# Example values: ruby22 ruby24 ruby25 ruby26
82# 82#
83# RUBY_ABI_VERSION 83# RUBY_ABI_VERSION
84# Ruby's ABI version. 84# Ruby's ABI version.
85# 85#
86# RUBY_DLEXT 86# RUBY_DLEXT
87# Suffix of extention library. 87# Suffix of extention library.
88# 88#
89# RUBY_SLEXT 89# RUBY_SLEXT
90# Suffix of shared library. 90# Suffix of shared library.
91# 91#
92# RUBY 92# RUBY
93# Full path of ruby command. 93# Full path of ruby command.
94# 94#
@@ -97,27 +97,27 @@ @@ -97,27 +97,27 @@
97# 97#
98# RUBY_NAME 98# RUBY_NAME
99# Name of ruby command. 99# Name of ruby command.
100# 100#
101# RUBYGEM_NAME 101# RUBYGEM_NAME
102# Name of gem command. 102# Name of gem command.
103# 103#
104# RAKE_NAME 104# RAKE_NAME
105# Name of rake command. 105# Name of rake command.
106# 106#
107# RUBY_SUFFIX 107# RUBY_SUFFIX
108# Extra string for each ruby commands; ruby, irb and so on. 108# Extra string for each ruby commands; ruby, irb and so on.
109# 109#
110# Possible values: 22 23 24 25 26 110# Possible values: 22 24 25 26
111# 111#
112# RUBY_VERSION 112# RUBY_VERSION
113# Version of Ruby's version. 113# Version of Ruby's version.
114# 114#
115# RUBY_BASE 115# RUBY_BASE
116# Name of ruby base package's name. 116# Name of ruby base package's name.
117# 117#
118# RUBY_SRCDIR 118# RUBY_SRCDIR
119# Relative path to directory of base ruby package. 119# Relative path to directory of base ruby package.
120# 120#
121# RUBY_SHLIBVER 121# RUBY_SHLIBVER
122# Suffix of libruby shared library's version. 122# Suffix of libruby shared library's version.
123# 123#
@@ -205,45 +205,43 @@ @@ -205,45 +205,43 @@
205_RUBYVERSION_MK= # defined 205_RUBYVERSION_MK= # defined
206 206
207.include "../../mk/bsd.prefs.mk" 207.include "../../mk/bsd.prefs.mk"
208 208
209.if defined(PKGNAME_REQD) 209.if defined(PKGNAME_REQD)
210. if !empty(PKGNAME_REQD:Mruby[0-9][0-9]-*) 210. if !empty(PKGNAME_REQD:Mruby[0-9][0-9]-*)
211_RUBY_VERSION_REQD:= ${PKGNAME_REQD:C/ruby([0-9][0-9])-.*/\1/} 211_RUBY_VERSION_REQD:= ${PKGNAME_REQD:C/ruby([0-9][0-9])-.*/\1/}
212RUBY_VERSION_REQD?= ${PKGNAME_REQD:C/ruby([0-9][0-9])-.*/\1/} 212RUBY_VERSION_REQD?= ${PKGNAME_REQD:C/ruby([0-9][0-9])-.*/\1/}
213. endif 213. endif
214.endif 214.endif
215 215
216# current supported Ruby's version 216# current supported Ruby's version
217RUBY22_VERSION= 2.2.10 217RUBY22_VERSION= 2.2.10
218RUBY23_VERSION= 2.3.8 
219RUBY24_VERSION= 2.4.6 218RUBY24_VERSION= 2.4.6
220RUBY25_VERSION= 2.5.5 219RUBY25_VERSION= 2.5.5
221RUBY26_VERSION= 2.6.2 220RUBY26_VERSION= 2.6.2
222 221
223# current API compatible version; used for version of shared library 222# current API compatible version; used for version of shared library
224RUBY22_API_VERSION= 2.2.0 223RUBY22_API_VERSION= 2.2.0
225RUBY23_API_VERSION= 2.3.0 
226RUBY24_API_VERSION= 2.4.0 224RUBY24_API_VERSION= 2.4.0
227RUBY25_API_VERSION= 2.5.0 225RUBY25_API_VERSION= 2.5.0
228RUBY26_API_VERSION= 2.6.0 226RUBY26_API_VERSION= 2.6.0
229 227
230# 228#
231RUBY_VERSION_DEFAULT?= 24 229RUBY_VERSION_DEFAULT?= 24
232 230
233# supported Ruby's version 231# supported Ruby's version
234RUBY_VERSIONS_SUPPORTED= 24 25 26 23 22 232RUBY_VERSIONS_SUPPORTED= 24 25 26 22
235 233
236RUBY_VERSIONS_ACCEPTED?= 24 25 26 23 234RUBY_VERSIONS_ACCEPTED?= 24 25 26
237RUBY_VERSIONS_INCOMPATIBLE?= 235RUBY_VERSIONS_INCOMPATIBLE?=
238 236
239.if empty(RUBY_VERSIONS_SUPPORTED:M${RUBY_VERSION_DEFAULT}) 237.if empty(RUBY_VERSIONS_SUPPORTED:M${RUBY_VERSION_DEFAULT})
240.error Unsuported RUBY_VERSION_DEFAULT: ${RUBY_VERSION_DEFAULT} 238.error Unsuported RUBY_VERSION_DEFAULT: ${RUBY_VERSION_DEFAULT}
241.endif 239.endif
242 240
243.for rv in ${RUBY_VERSIONS_ACCEPTED} 241.for rv in ${RUBY_VERSIONS_ACCEPTED}
244. if empty(RUBY_VERSIONS_INCOMPATIBLE:M${rv}) 242. if empty(RUBY_VERSIONS_INCOMPATIBLE:M${rv})
245_RUBY_VERSIONS_ACCEPTED+= ${rv} 243_RUBY_VERSIONS_ACCEPTED+= ${rv}
246. endif 244. endif
247.endfor 245.endfor
248 246
249.if defined(RUBY_VERSION_REQD) 247.if defined(RUBY_VERSION_REQD)
@@ -279,45 +277,26 @@ RUBY_ABI_VERSION= ${RUBY_VERSION} @@ -279,45 +277,26 @@ RUBY_ABI_VERSION= ${RUBY_VERSION}
279RUBY_RDOC_VERSION= 4.2.0 277RUBY_RDOC_VERSION= 4.2.0
280RUBY_RAKE_VERSION= 10.4.2 278RUBY_RAKE_VERSION= 10.4.2
281RUBY_JSON_VERSION= 1.8.1.1 279RUBY_JSON_VERSION= 1.8.1.1
282 280
283RUBY_BIGDECIMAL_VERSION= 1.2.6 281RUBY_BIGDECIMAL_VERSION= 1.2.6
284RUBY_IO_CONSOLE_VERSION= 0.4.3 282RUBY_IO_CONSOLE_VERSION= 0.4.3
285RUBY_PSYCH_VERSION= 2.0.8.1 283RUBY_PSYCH_VERSION= 2.0.8.1
286RUBY_MINITEST_VERSION= 5.4.3 284RUBY_MINITEST_VERSION= 5.4.3
287RUBY_POWER_ASSERT_VERSION= 0.2.2 285RUBY_POWER_ASSERT_VERSION= 0.2.2
288RUBY_TEST_UNIT_VERSION= 3.0.8 286RUBY_TEST_UNIT_VERSION= 3.0.8
289 287
290RUBY_SUFFIX= ${_RUBY_VER_MAJOR}${_RUBY_VER_MINOR} 288RUBY_SUFFIX= ${_RUBY_VER_MAJOR}${_RUBY_VER_MINOR}
291 289
292.elif ${RUBY_VER} == "23" 
293RUBY_VERSION= ${RUBY23_VERSION} 
294RUBY_ABI_VERSION= ${RUBY_VERSION} 
295 
296RUBY_RDOC_VERSION= 4.2.1 
297RUBY_RAKE_VERSION= 10.4.2 
298RUBY_JSON_VERSION= 1.8.3.1 
299 
300RUBY_BIGDECIMAL_VERSION= 1.2.8 
301RUBY_IO_CONSOLE_VERSION= 0.4.5 
302RUBY_PSYCH_VERSION= 2.1.0.1 
303RUBY_DID_YOU_MEAN_VERSION= 1.0.0 
304RUBY_MINITEST_VERSION= 5.8.5 
305RUBY_NET_TELNET_VERSION= 0.1.1 
306RUBY_POWER_ASSERT_VERSION= 0.2.6 
307RUBY_TEST_UNIT_VERSION= 3.1.5 
308 
309RUBY_SUFFIX= ${_RUBY_VER_MAJOR}${_RUBY_VER_MINOR} 
310 
311.elif ${RUBY_VER} == "24" 290.elif ${RUBY_VER} == "24"
312RUBY_VERSION= ${RUBY24_VERSION} 291RUBY_VERSION= ${RUBY24_VERSION}
313RUBY_ABI_VERSION= ${RUBY_VERSION} 292RUBY_ABI_VERSION= ${RUBY_VERSION}
314 293
315RUBY_RDOC_VERSION= 5.0.0 294RUBY_RDOC_VERSION= 5.0.0
316RUBY_RAKE_VERSION= 12.0.0 295RUBY_RAKE_VERSION= 12.0.0
317RUBY_JSON_VERSION= 2.0.4 296RUBY_JSON_VERSION= 2.0.4
318 297
319RUBY_BIGDECIMAL_VERSION= 1.3.2 298RUBY_BIGDECIMAL_VERSION= 1.3.2
320RUBY_IO_CONSOLE_VERSION= 0.4.6 299RUBY_IO_CONSOLE_VERSION= 0.4.6
321RUBY_OPENSSL_VERSION= 2.0.9 300RUBY_OPENSSL_VERSION= 2.0.9
322RUBY_PSYCH_VERSION= 2.2.2 301RUBY_PSYCH_VERSION= 2.2.2
323RUBY_DID_YOU_MEAN_VERSION= 1.1.0 302RUBY_DID_YOU_MEAN_VERSION= 1.1.0
@@ -408,27 +387,27 @@ PKG_FAIL_REASON+= "Unknown Ruby version  @@ -408,27 +387,27 @@ PKG_FAIL_REASON+= "Unknown Ruby version
408 387
409.if !empty(RUBY_VERSION) 388.if !empty(RUBY_VERSION)
410RUBY_PATCHLEVEL= ${RUBY${RUBY_VER}_PATCHLEVEL} 389RUBY_PATCHLEVEL= ${RUBY${RUBY_VER}_PATCHLEVEL}
411RUBY_API_VERSION= ${RUBY${RUBY_VER}_API_VERSION} 390RUBY_API_VERSION= ${RUBY${RUBY_VER}_API_VERSION}
412.endif 391.endif
413 392
414# Variable assignment for multi-ruby packages 393# Variable assignment for multi-ruby packages
415MULTI+= RUBY_VER=${RUBY_VERS:U${RUBY_VERSION_DEFAULT}} 394MULTI+= RUBY_VER=${RUBY_VERS:U${RUBY_VERSION_DEFAULT}}
416 395
417# RUBY_NOVERSION should be set to "Yes" if the package dosen't depend on 396# RUBY_NOVERSION should be set to "Yes" if the package dosen't depend on
418# any specific version of ruby command. In this case, package's 397# any specific version of ruby command. In this case, package's
419# name begin with "ruby-". 398# name begin with "ruby-".
420# If RUBY_NOVERSION is "No" (default), the package's name is begin 399# If RUBY_NOVERSION is "No" (default), the package's name is begin
421# with ${RUBY_NAME}; "ruby23", "ruby24", and so on. 400# with ${RUBY_NAME}; "ruby24", "ruby25", and so on.
422# 401#
423# It also affects to RUBY_DOC, RUBY_EG... 402# It also affects to RUBY_DOC, RUBY_EG...
424# 403#
425RUBY_NOVERSION?= No 404RUBY_NOVERSION?= No
426 405
427# _RUBY_VER_MAJOR, _RUBY_VER_MINOR 406# _RUBY_VER_MAJOR, _RUBY_VER_MINOR
428# is defined from version of Ruby. It should not be used in packages' 407# is defined from version of Ruby. It should not be used in packages'
429# Makefile. 408# Makefile.
430# 409#
431_RUBY_VER_MAJOR= ${RUBY_VERSION:C/([0-9]+)\.([0-9]+)\.([0-9]+)/\1/} 410_RUBY_VER_MAJOR= ${RUBY_VERSION:C/([0-9]+)\.([0-9]+)\.([0-9]+)/\1/}
432_RUBY_VER_MINOR= ${RUBY_VERSION:C/([0-9]+)\.([0-9]+)\.([0-9]+)/\2/} 411_RUBY_VER_MINOR= ${RUBY_VERSION:C/([0-9]+)\.([0-9]+)\.([0-9]+)/\2/}
433 412
434RUBY_NAME= ruby${RUBY_SUFFIX} 413RUBY_NAME= ruby${RUBY_SUFFIX}
@@ -450,27 +429,27 @@ RUBY_BUILD_RDOC?= Yes @@ -450,27 +429,27 @@ RUBY_BUILD_RDOC?= Yes
450RUBY_BUILD_RI?= Yes 429RUBY_BUILD_RI?= Yes
451 430
452RUBY?= ${PREFIX}/bin/${RUBY_NAME} 431RUBY?= ${PREFIX}/bin/${RUBY_NAME}
453RAKE?= ${PREFIX}/bin/${RAKE_NAME} 432RAKE?= ${PREFIX}/bin/${RAKE_NAME}
454RDOC?= ${PREFIX}/bin/rdoc${RUBY_SUFFIX} 433RDOC?= ${PREFIX}/bin/rdoc${RUBY_SUFFIX}
455 434
456RUBY_ARCH?= ${MACHINE_GNU_ARCH}-${LOWER_OPSYS}${APPEND_ELF}${LOWER_OPSYS_VERSUFFIX}${APPEND_ABI} 435RUBY_ARCH?= ${MACHINE_GNU_ARCH}-${LOWER_OPSYS}${APPEND_ELF}${LOWER_OPSYS_VERSUFFIX}${APPEND_ABI}
457 436
458RUBY_MAJOR_MINOR= ${_RUBY_VER_MAJOR}.${_RUBY_VER_MINOR} 437RUBY_MAJOR_MINOR= ${_RUBY_VER_MAJOR}.${_RUBY_VER_MINOR}
459 438
460# 439#
461# Ruby shared and static library version handling. 440# Ruby shared and static library version handling.
462# 441#
463.if ${RUBY_VER} == "22" || ${RUBY_VER} == "23" 442.if ${RUBY_VER} == "22"
464RUBY_SHLIBVER?= ${RUBY_API_VERSION} 443RUBY_SHLIBVER?= ${RUBY_API_VERSION}
465.else 444.else
466RUBY_SHLIBVER?= ${RUBY_VERSION} 445RUBY_SHLIBVER?= ${RUBY_VERSION}
467.endif 446.endif
468 447
469_RUBY_SHLIB_MAJOR:= ${RUBY_SHLIBVER:C/([0-9]+)\.([0-9]+)\.([0-9]+)/\1\2/} 448_RUBY_SHLIB_MAJOR:= ${RUBY_SHLIBVER:C/([0-9]+)\.([0-9]+)\.([0-9]+)/\1\2/}
470_RUBY_SHLIB_MINOR:= ${RUBY_SHLIBVER:C/([0-9]+)\.([0-9]+)\.([0-9]+)/\3/} 449_RUBY_SHLIB_MINOR:= ${RUBY_SHLIBVER:C/([0-9]+)\.([0-9]+)\.([0-9]+)/\3/}
471 450
472RUBY_SHLIB?= ${RUBY_SUFFIX}.${RUBY_SLEXT}.${RUBY_SHLIBVER} 451RUBY_SHLIB?= ${RUBY_SUFFIX}.${RUBY_SLEXT}.${RUBY_SHLIBVER}
473RUBY_SHLIBALIAS?= @comment 452RUBY_SHLIBALIAS?= @comment
474RUBY_STATICLIB?= ${RUBY_SUFFIX}-static.a 453RUBY_STATICLIB?= ${RUBY_SUFFIX}-static.a
475 454
476.if ${OPSYS} == "NetBSD" || ${OPSYS} == "Interix" 455.if ${OPSYS} == "NetBSD" || ${OPSYS} == "Interix"