Wed Dec 30 14:49:38 2015 UTC ()
Add support for Ruby 2.3.


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

--- pkgsrc/lang/ruby/rubyversion.mk 2015/12/29 00:57:28 1.154
+++ pkgsrc/lang/ruby/rubyversion.mk 2015/12/30 14:49:37 1.155
@@ -1,26 +1,26 @@ @@ -1,26 +1,26 @@
1# $NetBSD: rubyversion.mk,v 1.154 2015/12/29 00:57:28 rillig Exp $ 1# $NetBSD: rubyversion.mk,v 1.155 2015/12/30 14:49:37 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: 18 200 21 22 13# Possible values: 18 200 21 22 23
14# Default: 200 14# Default: 200
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,66 +31,66 @@ @@ -31,66 +31,66 @@
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_VERSION_SUPPORTED} 36# Possible values: ${RUBY_VERSION_SUPPORTED}
37# Default: ${RUBY_VERSION_DEFAULT} 37# Default: ${RUBY_VERSION_DEFAULT}
38# 38#
39# === Package-settable variables === 39# === Package-settable variables ===
40# 40#
41# RUBY_VERSION_SUPPORTED 41# RUBY_VERSION_SUPPORTED
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: 18 200 21 22 44# Possible values: 18 200 21 22 23
45# Default: 200 21 45# Default: 200 21 22 23
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: 18 200 21 22 72# Possible values: 18 200 21 22 23
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# The value of RUBY_PKGPREFIX is "ruby-" and concatination of Ruby's 80# The value of RUBY_PKGPREFIX is "ruby-" and concatination of Ruby's
81# major and minor version unless RUBY_VER is "200". 81# major and minor version unless RUBY_VER is "200".
82# 82#
83# Example values: ruby18 ruby200 ruby21 ruby22 83# Example values: ruby18 ruby200 ruby21 ruby22 ruby23
84# 84#
85# RUBY_ABI_VERSION 85# RUBY_ABI_VERSION
86# Ruby's ABI version. 86# Ruby's ABI version.
87# 87#
88# RUBY_DLEXT 88# RUBY_DLEXT
89# Suffix of extention library. 89# Suffix of extention library.
90# 90#
91# RUBY_SLEXT 91# RUBY_SLEXT
92# Suffix of shared library. 92# Suffix of shared library.
93# 93#
94# RUBY 94# RUBY
95# Full path of ruby command. 95# Full path of ruby command.
96# 96#
@@ -101,27 +101,27 @@ @@ -101,27 +101,27 @@
101# Name of ruby command. 101# Name of ruby command.
102# 102#
103# RUBYGEM_NAME 103# RUBYGEM_NAME
104# Name of gem command. 104# Name of gem command.
105# 105#
106# RAKE_NAME 106# RAKE_NAME
107# Name of rake command. 107# Name of rake command.
108# 108#
109# RUBY_SUFFIX 109# RUBY_SUFFIX
110# Extra string for each ruby commands; ruby, irb and so on. 110# Extra string for each ruby commands; ruby, irb and so on.
111# The value of RUBY_SUFFIX is concatination of Ruby's major and minor 111# The value of RUBY_SUFFIX is concatination of Ruby's major and minor
112# unless RUBY_VER is "200". 112# unless RUBY_VER is "200".
113# 113#
114# Possible values: 18 200 21 22 114# Possible values: 18 200 21 22 23
115# 115#
116# RUBY_VERSION 116# RUBY_VERSION
117# Version of real Ruby's version excluding patchlevel. 117# Version of real Ruby's version excluding patchlevel.
118# 118#
119# RUBY_VERSION_FULL 119# RUBY_VERSION_FULL
120# Version of Ruby including patchlevel. 120# Version of Ruby including patchlevel.
121# 121#
122# RUBY_GEMS_PKGSRC_VERS 122# RUBY_GEMS_PKGSRC_VERS
123# Version of rubygems provided by misc/rubygems. 123# Version of rubygems provided by misc/rubygems.
124# 124#
125# RUBY_RDOC_PKGSRC_VERS 125# RUBY_RDOC_PKGSRC_VERS
126# Version of rdoc provided by devel/rdoc. 126# Version of rdoc provided by devel/rdoc.
127# 127#
@@ -220,47 +220,52 @@ _RUBY_VERSION_REQD:= ${PKGNAME_REQD:C/ru @@ -220,47 +220,52 @@ _RUBY_VERSION_REQD:= ${PKGNAME_REQD:C/ru
220. if ${_RUBY_VERSION_REQD} == "18" 220. if ${_RUBY_VERSION_REQD} == "18"
221RUBY_VERSION_REQD?= ${PKGNAME_REQD:C/ruby([0-9][0-9])[0-9]-.*/\1/} 221RUBY_VERSION_REQD?= ${PKGNAME_REQD:C/ruby([0-9][0-9])[0-9]-.*/\1/}
222. else 222. else
223RUBY_VERSION_REQD?= ${PKGNAME_REQD:C/ruby([0-9][0-9]+)-.*/\1/} 223RUBY_VERSION_REQD?= ${PKGNAME_REQD:C/ruby([0-9][0-9]+)-.*/\1/}
224. endif 224. endif
225. endif 225. endif
226.endif 226.endif
227 227
228# current supported Ruby's version 228# current supported Ruby's version
229RUBY18_VERSION= 1.8.7 229RUBY18_VERSION= 1.8.7
230RUBY200_VERSION= 2.0.0 230RUBY200_VERSION= 2.0.0
231RUBY21_VERSION= 2.1.8 231RUBY21_VERSION= 2.1.8
232RUBY22_VERSION= 2.2.4 232RUBY22_VERSION= 2.2.4
 233RUBY23_VERSION= 2.3.0
233 234
234# patch 235# patch level
235RUBY18_PATCHLEVEL= pl374 236RUBY18_PATCHLEVEL= pl374
236RUBY200_PATCHLEVEL= p648 237RUBY200_PATCHLEVEL= p648
 238#RUBY21_PATCHLEVEL= p440
 239#RUBY22_PATCHLEVEL= p230
 240#RUBY23_PATCHLEVEL= p0
237 241
238# current API compatible version; used for version of shared library 242# current API compatible version; used for version of shared library
239RUBY18_API_VERSION= 1.8.7 243RUBY18_API_VERSION= 1.8.7
240RUBY200_API_VERSION= 2.0.0 244RUBY200_API_VERSION= 2.0.0
241RUBY21_API_VERSION= 2.1.0 245RUBY21_API_VERSION= 2.1.0
242RUBY22_API_VERSION= 2.2.0 246RUBY22_API_VERSION= 2.2.0
 247RUBY23_API_VERSION= 2.3.0
243 248
244# pkgsrc's rubygems's version 249# pkgsrc's rubygems's version
245RUBY_GEMS_PKGSRC_VERS= 2.4.8 250RUBY_GEMS_PKGSRC_VERS= 2.4.8
246 251
247# pkgsrc's rdoc's version 252# pkgsrc's rdoc's version
248RUBY_RDOC_PKGSRC_VERS= 4.2.0 253RUBY_RDOC_PKGSRC_VERS= 4.2.0
249 254
250# 255#
251RUBY_VERSION_DEFAULT?= 200 256RUBY_VERSION_DEFAULT?= 200
252 257
253RUBY_VERSION_SUPPORTED?= 200 21 22 258RUBY_VERSION_SUPPORTED?= 200 21 22 23
254 259
255.if defined(RUBY_VERSION_REQD) 260.if defined(RUBY_VERSION_REQD)
256. for rv in ${RUBY_VERSION_SUPPORTED} 261. for rv in ${RUBY_VERSION_SUPPORTED}
257. if "${rv}" == ${RUBY_VERSION_REQD} 262. if "${rv}" == ${RUBY_VERSION_REQD}
258RUBY_VER= ${rv} 263RUBY_VER= ${rv}
259. endif 264. endif
260. endfor 265. endfor
261.elif !defined(RUBY_VER) 266.elif !defined(RUBY_VER)
262. for rv in ${RUBY_VERSION_SUPPORTED} 267. for rv in ${RUBY_VERSION_SUPPORTED}
263. if "${rv}" == ${RUBY_VERSION_DEFAULT} 268. if "${rv}" == ${RUBY_VERSION_DEFAULT}
264RUBY_VER= ${rv} 269RUBY_VER= ${rv}
265. endif 270. endif
266. endfor 271. endfor
@@ -311,26 +316,38 @@ RUBY_SUFFIX= ${_RUBY_VER_MAJOR}${_RUBY_V @@ -311,26 +316,38 @@ RUBY_SUFFIX= ${_RUBY_VER_MAJOR}${_RUBY_V
311 316
312.elif ${RUBY_VER} == "22" 317.elif ${RUBY_VER} == "22"
313RUBY_VERSION= ${RUBY22_VERSION} 318RUBY_VERSION= ${RUBY22_VERSION}
314RUBY_VERSION_FULL= ${RUBY_VERSION} 319RUBY_VERSION_FULL= ${RUBY_VERSION}
315RUBY_ABI_VERSION= ${RUBY_VERSION} 320RUBY_ABI_VERSION= ${RUBY_VERSION}
316 321
317RUBY_GEMS_VERSION= 2.4.5 322RUBY_GEMS_VERSION= 2.4.5
318RUBY_RDOC_VERSION= 4.2.0 323RUBY_RDOC_VERSION= 4.2.0
319RUBY_RAKE_VERSION= 10.4.2 324RUBY_RAKE_VERSION= 10.4.2
320RUBY_JSON_VERSION= 1.8.1 325RUBY_JSON_VERSION= 1.8.1
321 326
322RUBY_SUFFIX= ${_RUBY_VER_MAJOR}${_RUBY_VER_MINOR} 327RUBY_SUFFIX= ${_RUBY_VER_MAJOR}${_RUBY_VER_MINOR}
323 328
 329.elif ${RUBY_VER} == "23"
 330RUBY_VERSION= ${RUBY23_VERSION}
 331RUBY_VERSION_FULL= ${RUBY_VERSION}
 332RUBY_ABI_VERSION= ${RUBY_VERSION}
 333
 334RUBY_GEMS_VERSION= 2.5.1
 335RUBY_RDOC_VERSION= 4.2.1
 336RUBY_RAKE_VERSION= 10.4.2
 337RUBY_JSON_VERSION= 1.8.3
 338
 339RUBY_SUFFIX= ${_RUBY_VER_MAJOR}${_RUBY_VER_MINOR}
 340
324.else 341.else
325PKG_FAIL_REASON+= "Unknown Ruby version specified: ${RUBY_VER}." 342PKG_FAIL_REASON+= "Unknown Ruby version specified: ${RUBY_VER}."
326.endif 343.endif
327 344
328.if !empty(RUBY_VERSION) 345.if !empty(RUBY_VERSION)
329RUBY_PATCHLEVEL= ${RUBY${RUBY_VER}_PATCHLEVEL} 346RUBY_PATCHLEVEL= ${RUBY${RUBY_VER}_PATCHLEVEL}
330RUBY_API_VERSION= ${RUBY${RUBY_VER}_API_VERSION} 347RUBY_API_VERSION= ${RUBY${RUBY_VER}_API_VERSION}
331.endif 348.endif
332 349
333# Variable assignment for multi-ruby packages 350# Variable assignment for multi-ruby packages
334MULTI+= RUBY_VER=${RUBY_VERS:U${RUBY_VERSION_DEFAULT}} 351MULTI+= RUBY_VER=${RUBY_VERS:U${RUBY_VERSION_DEFAULT}}
335 352
336# RUBY_NOVERSION should be set to "Yes" if the package dosen't depend on 353# RUBY_NOVERSION should be set to "Yes" if the package dosen't depend on