Sat Nov 15 14:33:45 2014 UTC ()
Update ruby200-base and related packages to 2.0.0-p598 (Ruby 2.0.0-p598).

	* CVE-2014-8090: Another Denial of Service XML Expansion.


(taca)
diff -r1.127 -r1.128 pkgsrc/lang/ruby/rubyversion.mk
diff -r1.17 -r1.18 pkgsrc/lang/ruby200-base/distinfo
cvs diff -r1.127 -r1.128 pkgsrc/lang/ruby/rubyversion.mk (switch to unified diff)

--- pkgsrc/lang/ruby/rubyversion.mk 2014/10/27 16:29:57 1.127
+++ pkgsrc/lang/ruby/rubyversion.mk 2014/11/15 14:33:45 1.128
@@ -1,647 +1,647 @@ @@ -1,647 +1,647 @@
1# $NetBSD: rubyversion.mk,v 1.127 2014/10/27 16:29:57 taca Exp $ 1# $NetBSD: rubyversion.mk,v 1.128 2014/11/15 14:33:45 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 193 200 21 13# Possible values: 18 193 200 21
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#
27# Possible values: Yes No 27# Possible values: Yes No
28# Default: Yes 28# Default: Yes
29# 29#
30# === Infrastructure variables === 30# === Infrastructure variables ===
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 193 200 21 44# Possible values: 18 193 200 21
45# Default: 200 193 18 21 45# Default: 200 193 18 21
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 193 200 21 72# Possible values: 18 193 200 21
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, minor and teeny version unless RUBY_VER is "18". 81# major, minor and teeny version unless RUBY_VER is "18".
82# 82#
83# Example values: ruby18 ruby193 ruby200 ruby212 83# Example values: ruby18 ruby193 ruby200 ruby212
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#
97# RDOC 97# RDOC
98# Full path of rdoc command. 98# Full path of rdoc command.
99# 99#
100# RUBY_NAME 100# RUBY_NAME
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, minor 111# The value of RUBY_SUFFIX is concatination of Ruby's major, minor
112# and teeny version unless RUBY_VER is "18". 112# and teeny version unless RUBY_VER is "18".
113# 113#
114# Possible values: 18 193 200 212 114# Possible values: 18 193 200 212
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_BASE 122# RUBY_BASE
123# Name of ruby base package's name. 123# Name of ruby base package's name.
124# 124#
125# RUBY_SRCDIR 125# RUBY_SRCDIR
126# Relative path to directory of base ruby package. 126# Relative path to directory of base ruby package.
127# 127#
128# RUBY_SHLIBVER 128# RUBY_SHLIBVER
129# Suffix of libruby shared library's version. 129# Suffix of libruby shared library's version.
130# 130#
131# RUBY_SHLIB 131# RUBY_SHLIB
132# String after libruby shared library. 132# String after libruby shared library.
133# 133#
134# RUBY_SHLIBALIAS 134# RUBY_SHLIBALIAS
135# Symblic link with libruby shared library with major version only. 135# Symblic link with libruby shared library with major version only.
136# 136#
137# RUBY_STATICLIB 137# RUBY_STATICLIB
138# Name of libruby static library. 138# Name of libruby static library.
139# 139#
140# RUBY_VER_DIR 140# RUBY_VER_DIR
141# Name of version directory under each library (and more) directories. 141# Name of version directory under each library (and more) directories.
142# 142#
143# RUBY_ARCH 143# RUBY_ARCH
144# Name of architecture-dependent directory name. 144# Name of architecture-dependent directory name.
145# 145#
146# RUBY_INC 146# RUBY_INC
147# machine independent include directory of ruby. 147# machine independent include directory of ruby.
148# 148#
149# RUBY_ARCHINC 149# RUBY_ARCHINC
150# machine dependent include directory of ruby. 150# machine dependent include directory of ruby.
151# 151#
152# RUBY_LIB_BASE 152# RUBY_LIB_BASE
153# common relative path of ruby's library. 153# common relative path of ruby's library.
154# 154#
155# RUBY_LIB 155# RUBY_LIB
156# version specific relative path of ruby's library. 156# version specific relative path of ruby's library.
157# 157#
158# RUBY_ARCHLIB 158# RUBY_ARCHLIB
159# version specific and machine dependent relative path of ruby's library. 159# version specific and machine dependent relative path of ruby's library.
160# 160#
161# RUBY_SITELIB_BASE 161# RUBY_SITELIB_BASE
162# common site local directory. 162# common site local directory.
163# 163#
164# RUBY_SITELIB 164# RUBY_SITELIB
165# version specific site local directory. 165# version specific site local directory.
166# 166#
167# RUBY_SITEARCHLIB 167# RUBY_SITEARCHLIB
168# version specific and machine dependent site local directory. 168# version specific and machine dependent site local directory.
169# 169#
170# RUBY_VENDORLIB_BASE 170# RUBY_VENDORLIB_BASE
171# common vendor (pkgsrc) directory. 171# common vendor (pkgsrc) directory.
172# 172#
173# RUBY_VENDORLIB 173# RUBY_VENDORLIB
174# version specific vendor local directory. 174# version specific vendor local directory.
175# 175#
176# RUBY_VENDORARCHLIB 176# RUBY_VENDORARCHLIB
177# version specific and machine dependent vendor local directory. 177# version specific and machine dependent vendor local directory.
178# 178#
179# RUBY_DOC 179# RUBY_DOC
180# version specific document direcotry. 180# version specific document direcotry.
181# 181#
182# RUBY_EG 182# RUBY_EG
183# version specific examples direcotry. 183# version specific examples direcotry.
184# 184#
185# RUBY_GEM_BASE 185# RUBY_GEM_BASE
186# common GEM directory. 186# common GEM directory.
187# 187#
188# GEM_HOME 188# GEM_HOME
189# version specific GEM directory. 189# version specific GEM directory.
190# 190#
191# RUBY_RIDIR 191# RUBY_RIDIR
192# common ri directory. 192# common ri directory.
193# 193#
194# RUBY_BASERIDIR 194# RUBY_BASERIDIR
195# version specific ri directory. 195# version specific ri directory.
196# 196#
197# RUBY_SYSRIDIR 197# RUBY_SYSRIDIR
198# version specific system ri directory. 198# version specific system ri directory.
199# 199#
200# RUBY_SITERIDIR 200# RUBY_SITERIDIR
201# version specific site ri directory. 201# version specific site ri directory.
202# 202#
203# Keywords: ruby 203# Keywords: ruby
204# 204#
205 205
206.if !defined(_RUBYVERSION_MK) 206.if !defined(_RUBYVERSION_MK)
207_RUBYVERSION_MK= # defined 207_RUBYVERSION_MK= # defined
208 208
209.include "../../mk/bsd.prefs.mk" 209.include "../../mk/bsd.prefs.mk"
210 210
211.if defined(PKGNAME_REQD) 211.if defined(PKGNAME_REQD)
212. if !empty(PKGNAME_REQD:Mruby[0-9][0-9][0-9]-*) || !empty(PKGNAME_REQD:Mruby[0-9][0-9]-*) 212. if !empty(PKGNAME_REQD:Mruby[0-9][0-9][0-9]-*) || !empty(PKGNAME_REQD:Mruby[0-9][0-9]-*)
213_RUBY_VERSION_REQD:= ${PKGNAME_REQD:C/ruby([0-9][0-9]+)-.*/\1/} 213_RUBY_VERSION_REQD:= ${PKGNAME_REQD:C/ruby([0-9][0-9]+)-.*/\1/}
214. if ${_RUBY_VERSION_REQD} == "18" || ${_RUBY_VERSION_REQD} == "193" 214. if ${_RUBY_VERSION_REQD} == "18" || ${_RUBY_VERSION_REQD} == "193"
215RUBY_VERSION_REQD?= ${PKGNAME_REQD:C/ruby([0-9][0-9])[0-9]-.*/\1/} 215RUBY_VERSION_REQD?= ${PKGNAME_REQD:C/ruby([0-9][0-9])[0-9]-.*/\1/}
216. else 216. else
217RUBY_VERSION_REQD?= ${PKGNAME_REQD:C/ruby([0-9][0-9]+)-.*/\1/} 217RUBY_VERSION_REQD?= ${PKGNAME_REQD:C/ruby([0-9][0-9]+)-.*/\1/}
218. endif 218. endif
219. endif 219. endif
220.endif 220.endif
221 221
222# current supported Ruby's version 222# current supported Ruby's version
223RUBY18_VERSION= 1.8.7 223RUBY18_VERSION= 1.8.7
224RUBY193_VERSION= 1.9.3 224RUBY193_VERSION= 1.9.3
225RUBY200_VERSION= 2.0.0 225RUBY200_VERSION= 2.0.0
226RUBY21_VERSION= 2.1.4 226RUBY21_VERSION= 2.1.4
227 227
228# patch 228# patch
229RUBY18_PATCHLEVEL= pl374 229RUBY18_PATCHLEVEL= pl374
230RUBY193_PATCHLEVEL= p550 230RUBY193_PATCHLEVEL= p550
231RUBY200_PATCHLEVEL= p594 231RUBY200_PATCHLEVEL= p598
232#RUBY21_PATCHLEVEL= p265 232#RUBY21_PATCHLEVEL= p265
233 233
234# current API compatible version; used for version of shared library 234# current API compatible version; used for version of shared library
235RUBY18_API_VERSION= 1.8.7 235RUBY18_API_VERSION= 1.8.7
236RUBY193_API_VERSION= 1.9.1 236RUBY193_API_VERSION= 1.9.1
237RUBY200_API_VERSION= 2.0.0 237RUBY200_API_VERSION= 2.0.0
238RUBY21_API_VERSION= 2.1.0 238RUBY21_API_VERSION= 2.1.0
239 239
240# 240#
241RUBY_VERSION_DEFAULT?= 200 241RUBY_VERSION_DEFAULT?= 200
242 242
243RUBY_VERSION_SUPPORTED?= 200 193 18 21 243RUBY_VERSION_SUPPORTED?= 200 193 18 21
244 244
245.if defined(RUBY_VERSION_REQD) 245.if defined(RUBY_VERSION_REQD)
246. for rv in ${RUBY_VERSION_SUPPORTED} 246. for rv in ${RUBY_VERSION_SUPPORTED}
247. if "${rv}" == ${RUBY_VERSION_REQD} 247. if "${rv}" == ${RUBY_VERSION_REQD}
248RUBY_VER= ${rv} 248RUBY_VER= ${rv}
249. endif 249. endif
250. endfor 250. endfor
251.elif !defined(RUBY_VER) 251.elif !defined(RUBY_VER)
252. for rv in ${RUBY_VERSION_SUPPORTED} 252. for rv in ${RUBY_VERSION_SUPPORTED}
253. if "${rv}" == ${RUBY_VERSION_DEFAULT} 253. if "${rv}" == ${RUBY_VERSION_DEFAULT}
254RUBY_VER= ${rv} 254RUBY_VER= ${rv}
255. endif 255. endif
256. endfor 256. endfor
257.endif 257.endif
258 258
259.if !defined(RUBY_VER) 259.if !defined(RUBY_VER)
260. for rv in ${RUBY_VERSION_SUPPORTED} 260. for rv in ${RUBY_VERSION_SUPPORTED}
261. if !defined(RUBY_VER) 261. if !defined(RUBY_VER)
262RUBY_VER= ${rv} 262RUBY_VER= ${rv}
263. endif 263. endif
264. endfor 264. endfor
265.endif 265.endif
266 266
267RUBY_VER:= ${RUBY_VER_MAP.${RUBY_VER}:U${RUBY_VER}} 267RUBY_VER:= ${RUBY_VER_MAP.${RUBY_VER}:U${RUBY_VER}}
268 268
269RUBY_SUFFIX?= ${_RUBY_VER_MAJOR}${_RUBY_VER_MINOR}${_RUBY_VER_TEENY} 269RUBY_SUFFIX?= ${_RUBY_VER_MAJOR}${_RUBY_VER_MINOR}${_RUBY_VER_TEENY}
270 270
271.if ${RUBY_VER} == "18" 271.if ${RUBY_VER} == "18"
272RUBY_VERSION= ${RUBY18_VERSION} 272RUBY_VERSION= ${RUBY18_VERSION}
273RUBY_VERSION_FULL= ${RUBY_VERSION}${RUBY_PATCHLEVEL:S/pl/./} 273RUBY_VERSION_FULL= ${RUBY_VERSION}${RUBY_PATCHLEVEL:S/pl/./}
274RUBY_ABI_VERSION= ${RUBY18_API_VERSION} 274RUBY_ABI_VERSION= ${RUBY18_API_VERSION}
275 275
276RUBY_RDOC_VERSION= 1.0.1 276RUBY_RDOC_VERSION= 1.0.1
277 277
278RUBY_SUFFIX= ${RUBY_VER} 278RUBY_SUFFIX= ${RUBY_VER}
279 279
280.elif ${RUBY_VER} == "193" 280.elif ${RUBY_VER} == "193"
281RUBY_VERSION= ${RUBY193_VERSION} 281RUBY_VERSION= ${RUBY193_VERSION}
282RUBY_VERSION_FULL= ${RUBY_VERSION}${RUBY_PATCHLEVEL} 282RUBY_VERSION_FULL= ${RUBY_VERSION}${RUBY_PATCHLEVEL}
283RUBY_ABI_VERSION= ${RUBY_VERSION} 283RUBY_ABI_VERSION= ${RUBY_VERSION}
284 284
285RUBY_GEMS_VERSION= 1.8.23 285RUBY_GEMS_VERSION= 1.8.23
286RUBY_RDOC_VERSION= 3.9.4 286RUBY_RDOC_VERSION= 3.9.4
287RUBY_RAKE_VERSION= 0.9.2.2 287RUBY_RAKE_VERSION= 0.9.2.2
288RUBY_JSON_VERSION= 1.5.5 288RUBY_JSON_VERSION= 1.5.5
289 289
290.elif ${RUBY_VER} == "200" 290.elif ${RUBY_VER} == "200"
291RUBY_VERSION= ${RUBY200_VERSION} 291RUBY_VERSION= ${RUBY200_VERSION}
292RUBY_VERSION_FULL= ${RUBY_VERSION}${RUBY_PATCHLEVEL} 292RUBY_VERSION_FULL= ${RUBY_VERSION}${RUBY_PATCHLEVEL}
293RUBY_ABI_VERSION= ${RUBY_VERSION} 293RUBY_ABI_VERSION= ${RUBY_VERSION}
294 294
295RUBY_GEMS_VERSION= 2.0.3 295RUBY_GEMS_VERSION= 2.0.3
296RUBY_RDOC_VERSION= 4.1.0 296RUBY_RDOC_VERSION= 4.1.0
297RUBY_RAKE_VERSION= 0.9.6 297RUBY_RAKE_VERSION= 0.9.6
298RUBY_JSON_VERSION= 1.7.7 298RUBY_JSON_VERSION= 1.7.7
299 299
300.elif ${RUBY_VER} == "21" 300.elif ${RUBY_VER} == "21"
301RUBY_VERSION= ${RUBY21_VERSION} 301RUBY_VERSION= ${RUBY21_VERSION}
302RUBY_VERSION_FULL= ${RUBY_VERSION} 302RUBY_VERSION_FULL= ${RUBY_VERSION}
303RUBY_ABI_VERSION= ${RUBY_VERSION} 303RUBY_ABI_VERSION= ${RUBY_VERSION}
304 304
305RUBY_GEMS_VERSION= 2.2.2 305RUBY_GEMS_VERSION= 2.2.2
306RUBY_RDOC_VERSION= 4.1.0 306RUBY_RDOC_VERSION= 4.1.0
307RUBY_RAKE_VERSION= 10.1.0 307RUBY_RAKE_VERSION= 10.1.0
308RUBY_JSON_VERSION= 1.8.1 308RUBY_JSON_VERSION= 1.8.1
309 309
310.else 310.else
311PKG_FAIL_REASON+= "Unknown Ruby version specified: ${RUBY_VER}." 311PKG_FAIL_REASON+= "Unknown Ruby version specified: ${RUBY_VER}."
312.endif 312.endif
313 313
314.if !empty(RUBY_VERSION) 314.if !empty(RUBY_VERSION)
315RUBY_PATCHLEVEL= ${RUBY${RUBY_VER}_PATCHLEVEL} 315RUBY_PATCHLEVEL= ${RUBY${RUBY_VER}_PATCHLEVEL}
316RUBY_API_VERSION= ${RUBY${RUBY_VER}_API_VERSION} 316RUBY_API_VERSION= ${RUBY${RUBY_VER}_API_VERSION}
317.endif 317.endif
318 318
319# Variable assignment for multi-ruby packages 319# Variable assignment for multi-ruby packages
320MULTI+= RUBY_VER=${RUBY_VERS:U${RUBY_VERSION_DEFAULT}} 320MULTI+= RUBY_VER=${RUBY_VERS:U${RUBY_VERSION_DEFAULT}}
321 321
322# RUBY_NOVERSION should be set to "Yes" if the package dosen't depend on 322# RUBY_NOVERSION should be set to "Yes" if the package dosen't depend on
323# any specific version of ruby command. In this case, package's 323# any specific version of ruby command. In this case, package's
324# name begin with "ruby-". 324# name begin with "ruby-".
325# If RUBY_NOVERSION is "No" (default), the package's name is begin 325# If RUBY_NOVERSION is "No" (default), the package's name is begin
326# with ${RUBY_NAME}; "ruby18", "ruby193", and so on. 326# with ${RUBY_NAME}; "ruby18", "ruby193", and so on.
327# 327#
328# It also affects to RUBY_DOC, RUBY_EG... 328# It also affects to RUBY_DOC, RUBY_EG...
329# 329#
330RUBY_NOVERSION?= No 330RUBY_NOVERSION?= No
331 331
332# _RUBY_VER_MAJOR, _RUBY_VER_MINOR, _RUBY_VER_TEENY and _RUBY_PATCHLEVEL 332# _RUBY_VER_MAJOR, _RUBY_VER_MINOR, _RUBY_VER_TEENY and _RUBY_PATCHLEVEL
333# is defined from version of Ruby. It should not be used in packages' 333# is defined from version of Ruby. It should not be used in packages'
334# Makefile. 334# Makefile.
335# 335#
336_RUBY_VER_MAJOR= ${RUBY_VERSION:C/([0-9]+)\.([0-9]+)\.([0-9]+)/\1/} 336_RUBY_VER_MAJOR= ${RUBY_VERSION:C/([0-9]+)\.([0-9]+)\.([0-9]+)/\1/}
337_RUBY_VER_MINOR= ${RUBY_VERSION:C/([0-9]+)\.([0-9]+)\.([0-9]+)/\2/} 337_RUBY_VER_MINOR= ${RUBY_VERSION:C/([0-9]+)\.([0-9]+)\.([0-9]+)/\2/}
338_RUBY_VER_TEENY= ${RUBY_VERSION:C/([0-9]+)\.([0-9]+)\.([0-9]+)/\3/} 338_RUBY_VER_TEENY= ${RUBY_VERSION:C/([0-9]+)\.([0-9]+)\.([0-9]+)/\3/}
339 339
340_RUBY_API_MAJOR= ${RUBY_API_VERSION:C/([0-9]+)\.([0-9]+)\.([0-9]+)/\1\2/} 340_RUBY_API_MAJOR= ${RUBY_API_VERSION:C/([0-9]+)\.([0-9]+)\.([0-9]+)/\1\2/}
341_RUBY_API_MINOR= ${RUBY_API_VERSION:C/([0-9]+)\.([0-9]+)\.([0-9]+)/\3/} 341_RUBY_API_MINOR= ${RUBY_API_VERSION:C/([0-9]+)\.([0-9]+)\.([0-9]+)/\3/}
342 342
343RUBY_NAME= ruby${RUBY_SUFFIX} 343RUBY_NAME= ruby${RUBY_SUFFIX}
344RUBYGEM_NAME= gem${RUBY_SUFFIX} 344RUBYGEM_NAME= gem${RUBY_SUFFIX}
345RAKE_NAME= rake${RUBY_SUFFIX} 345RAKE_NAME= rake${RUBY_SUFFIX}
346 346
347RUBY_ENCODING_ARG?= 347RUBY_ENCODING_ARG?=
348 348
349RUBY_BASE= ${RUBY_NAME}-base 349RUBY_BASE= ${RUBY_NAME}-base
350 350
351RUBY_PKGPREFIX?= ${RUBY_NAME} 351RUBY_PKGPREFIX?= ${RUBY_NAME}
352 352
353.if ${RUBY_VER} == "18" 353.if ${RUBY_VER} == "18"
354RUBY_VER_DIR= ${_RUBY_VER_MAJOR}.${_RUBY_VER_MINOR} 354RUBY_VER_DIR= ${_RUBY_VER_MAJOR}.${_RUBY_VER_MINOR}
355.else 355.else
356RUBY_VER_DIR= ${RUBY_VERSION} 356RUBY_VER_DIR= ${RUBY_VERSION}
357.endif 357.endif
358 358
359.if empty(RUBY_NOVERSION:M[nN][oO]) 359.if empty(RUBY_NOVERSION:M[nN][oO])
360RUBY_SUFFIX= 360RUBY_SUFFIX=
361RUBY_NAME= ruby 361RUBY_NAME= ruby
362.endif 362.endif
363 363
364RUBY_BUILD_RDOC?= Yes 364RUBY_BUILD_RDOC?= Yes
365RUBY_BUILD_RI?= Yes 365RUBY_BUILD_RI?= Yes
366 366
367RUBY?= ${PREFIX}/bin/${RUBY_NAME} 367RUBY?= ${PREFIX}/bin/${RUBY_NAME}
368RDOC?= ${PREFIX}/bin/rdoc${RUBY_SUFFIX} 368RDOC?= ${PREFIX}/bin/rdoc${RUBY_SUFFIX}
369 369
370RUBY_ARCH?= ${MACHINE_GNU_ARCH}-${LOWER_OPSYS}${APPEND_ELF}${LOWER_OPSYS_VERSUFFIX} 370RUBY_ARCH?= ${MACHINE_GNU_ARCH}-${LOWER_OPSYS}${APPEND_ELF}${LOWER_OPSYS_VERSUFFIX}
371 371
372# 372#
373# Ruby shared and static library version handling. 373# Ruby shared and static library version handling.
374# 374#
375RUBY_SHLIBVER?= ${RUBY_API_VERSION} 375RUBY_SHLIBVER?= ${RUBY_API_VERSION}
376RUBY_SHLIB?= ${RUBY_SUFFIX}.${RUBY_SLEXT}.${RUBY_SHLIBVER} 376RUBY_SHLIB?= ${RUBY_SUFFIX}.${RUBY_SLEXT}.${RUBY_SHLIBVER}
377RUBY_SHLIBALIAS?= @comment 377RUBY_SHLIBALIAS?= @comment
378RUBY_STATICLIB?= ${RUBY_SUFFIX}-static.a 378RUBY_STATICLIB?= ${RUBY_SUFFIX}-static.a
379 379
380.if ${OPSYS} == "NetBSD" || ${OPSYS} == "Interix" 380.if ${OPSYS} == "NetBSD" || ${OPSYS} == "Interix"
381RUBY_SHLIBVER= ${_RUBY_API_MAJOR}.${_RUBY_API_MINOR} 381RUBY_SHLIBVER= ${_RUBY_API_MAJOR}.${_RUBY_API_MINOR}
382_RUBY_SHLIBALIAS= ${RUBY_SUFFIX}.${RUBY_SLEXT}.${_RUBY_API_MAJOR} 382_RUBY_SHLIBALIAS= ${RUBY_SUFFIX}.${RUBY_SLEXT}.${_RUBY_API_MAJOR}
383.elif ${OPSYS} == "FreeBSD" || ${OPSYS} == "DragonFly" 383.elif ${OPSYS} == "FreeBSD" || ${OPSYS} == "DragonFly"
384.if ${RUBY_VER} == "18" 384.if ${RUBY_VER} == "18"
385RUBY_SHLIBVER= ${RUBY_SUFFIX} 385RUBY_SHLIBVER= ${RUBY_SUFFIX}
386.else 386.else
387RUBY_SHLIBVER= ${_RUBY_VER_MAJOR}${_RUBY_VER_MINOR}${_RUBY_API_MINOR} 387RUBY_SHLIBVER= ${_RUBY_VER_MAJOR}${_RUBY_VER_MINOR}${_RUBY_API_MINOR}
388.endif 388.endif
389.elif ${OPSYS} == "OpenBSD" || ${OPSYS} == "MirBSD" 389.elif ${OPSYS} == "OpenBSD" || ${OPSYS} == "MirBSD"
390.if ${_RUBY_VER_MINOR} == 0 390.if ${_RUBY_VER_MINOR} == 0
391RUBY_SHLIBVER= ${_RUBY_VER_MAJOR}.${_RUBY_API_MINOR} 391RUBY_SHLIBVER= ${_RUBY_VER_MAJOR}.${_RUBY_API_MINOR}
392.else 392.else
393RUBY_SHLIBVER= ${_RUBY_VER_MAJOR}.${_RUBY_VER_MINOR}${_RUBY_API_MINOR} 393RUBY_SHLIBVER= ${_RUBY_VER_MAJOR}.${_RUBY_VER_MINOR}${_RUBY_API_MINOR}
394.endif 394.endif
395.elif ${OPSYS} == "Darwin" 395.elif ${OPSYS} == "Darwin"
396RUBY_SHLIB= ${RUBY_SUFFIX}.${RUBY_SHLIBVER}.${RUBY_SLEXT} 396RUBY_SHLIB= ${RUBY_SUFFIX}.${RUBY_SHLIBVER}.${RUBY_SLEXT}
397.if ${RUBY_VER} == "18" 397.if ${RUBY_VER} == "18"
398_RUBY_SHLIBALIAS= ${RUBY_SUFFIX}.${_RUBY_VER_MAJOR}.${_RUBY_VER_MINOR}.${RUBY_SLEXT} 398_RUBY_SHLIBALIAS= ${RUBY_SUFFIX}.${_RUBY_VER_MAJOR}.${_RUBY_VER_MINOR}.${RUBY_SLEXT}
399.else 399.else
400_RUBY_SHLIBALIAS= .${_RUBY_VER_MAJOR}.${_RUBY_VER_MINOR}.${RUBY_SLEXT} 400_RUBY_SHLIBALIAS= .${_RUBY_VER_MAJOR}.${_RUBY_VER_MINOR}.${RUBY_SLEXT}
401RUBY_STATICLIB= ${RUBY_SUFFIX}.${RUBY_API_VERSION}-static.a 401RUBY_STATICLIB= ${RUBY_SUFFIX}.${RUBY_API_VERSION}-static.a
402.endif 402.endif
403.elif ${OPSYS} == "Linux" 403.elif ${OPSYS} == "Linux"
404_RUBY_SHLIBALIAS= ${RUBY_SUFFIX}.${RUBY_SLEXT}.${_RUBY_VER_MAJOR}.${_RUBY_VER_MINOR} 404_RUBY_SHLIBALIAS= ${RUBY_SUFFIX}.${RUBY_SLEXT}.${_RUBY_VER_MAJOR}.${_RUBY_VER_MINOR}
405.elif ${OPSYS} == "SunOS" 405.elif ${OPSYS} == "SunOS"
406RUBY_SHLIBVER= ${_RUBY_VER_MAJOR} 406RUBY_SHLIBVER= ${_RUBY_VER_MAJOR}
407 _RUBY_SHLIBALIAS= ${RUBY_SUFFIX}.${RUBY_SLEXT}.${_RUBY_VER_MAJOR}.${_RUBY_VER_MINOR}.${_RUBY_API_MINOR} 407 _RUBY_SHLIBALIAS= ${RUBY_SUFFIX}.${RUBY_SLEXT}.${_RUBY_VER_MAJOR}.${_RUBY_VER_MINOR}.${_RUBY_API_MINOR}
408.elif ${OPSYS} == "Cygwin" 408.elif ${OPSYS} == "Cygwin"
409RUBY_SHLIB= ${RUBY_SUFFIX}${_RUBY_API_MAJOR}${_RUBY_API_MINOR}.dll.a 409RUBY_SHLIB= ${RUBY_SUFFIX}${_RUBY_API_MAJOR}${_RUBY_API_MINOR}.dll.a
410RUBY_SHLIBALIAS= bin/cygruby${RUBY_SUFFIX}${_RUBY_API_MAJOR}${_RUBY_API_MINOR}.dll 410RUBY_SHLIBALIAS= bin/cygruby${RUBY_SUFFIX}${_RUBY_API_MAJOR}${_RUBY_API_MINOR}.dll
411RUBY_STATICLIB= ${RUBY_SUFFIX}${_RUBY_API_MAJOR}${_RUBY_API_MINOR}-static.a 411RUBY_STATICLIB= ${RUBY_SUFFIX}${_RUBY_API_MAJOR}${_RUBY_API_MINOR}-static.a
412.endif 412.endif
413 413
414.if !empty(_RUBY_SHLIBALIAS) 414.if !empty(_RUBY_SHLIBALIAS)
415RUBY_SHLIBALIAS= lib/libruby${_RUBY_SHLIBALIAS} 415RUBY_SHLIBALIAS= lib/libruby${_RUBY_SHLIBALIAS}
416.endif 416.endif
417 417
418.if ${_OPSYS_SHLIB_TYPE} == "dylib" 418.if ${_OPSYS_SHLIB_TYPE} == "dylib"
419RUBY_DLEXT= bundle 419RUBY_DLEXT= bundle
420RUBY_SLEXT= dylib 420RUBY_SLEXT= dylib
421.else 421.else
422RUBY_DLEXT= so 422RUBY_DLEXT= so
423RUBY_SLEXT= so 423RUBY_SLEXT= so
424.endif 424.endif
425 425
426# 426#
427# Ruby distribution file, few package need it. 427# Ruby distribution file, few package need it.
428# 428#
429_RUBY_PATCHLEVEL= ${RUBY_PATCHLEVEL:S/pl/p/:S/pre/preview/} 429_RUBY_PATCHLEVEL= ${RUBY_PATCHLEVEL:S/pl/p/:S/pre/preview/}
430 430
431.if !empty(_RUBY_PATCHLEVEL) 431.if !empty(_RUBY_PATCHLEVEL)
432RUBY_DISTNAME?= ruby-${RUBY_VERSION}-${_RUBY_PATCHLEVEL} 432RUBY_DISTNAME?= ruby-${RUBY_VERSION}-${_RUBY_PATCHLEVEL}
433.else 433.else
434RUBY_DISTNAME?= ruby-${RUBY_VERSION} 434RUBY_DISTNAME?= ruby-${RUBY_VERSION}
435.endif 435.endif
436 436
437# 437#
438# Use pthread library with Ruby 438# Use pthread library with Ruby
439# 439#
440.if !empty(MACHINE_PLATFORM:MDarwin-9.*-powerpc) 440.if !empty(MACHINE_PLATFORM:MDarwin-9.*-powerpc)
441# Workaround for Ruby Bug #193 441# Workaround for Ruby Bug #193
442# http://redmine.ruby-lang.org/issues/show/193 442# http://redmine.ruby-lang.org/issues/show/193
443RUBY_USE_PTHREAD?= no 443RUBY_USE_PTHREAD?= no
444.else 444.else
445RUBY_USE_PTHREAD?= yes 445RUBY_USE_PTHREAD?= yes
446.endif 446.endif
447 447
448RUBY_DYNAMIC_DIRS?= # empty 448RUBY_DYNAMIC_DIRS?= # empty
449 449
450RUBY_SRCDIR?= ../../lang/ruby${RUBY_VER}-base 450RUBY_SRCDIR?= ../../lang/ruby${RUBY_VER}-base
451 451
452# 452#
453# common paths 453# common paths
454# 454#
455RUBY_INC= include/ruby-${RUBY_VER_DIR} 455RUBY_INC= include/ruby-${RUBY_VER_DIR}
456RUBY_ARCHINC= ${RUBY_INC}/${RUBY_ARCH} 456RUBY_ARCHINC= ${RUBY_INC}/${RUBY_ARCH}
457RUBY_LIB_BASE= lib/ruby 457RUBY_LIB_BASE= lib/ruby
458RUBY_LIB?= ${RUBY_LIB_BASE}/${RUBY_VER_DIR} 458RUBY_LIB?= ${RUBY_LIB_BASE}/${RUBY_VER_DIR}
459RUBY_ARCHLIB?= ${RUBY_LIB}/${RUBY_ARCH} 459RUBY_ARCHLIB?= ${RUBY_LIB}/${RUBY_ARCH}
460RUBY_SITELIB_BASE?= ${RUBY_LIB_BASE}/site_ruby 460RUBY_SITELIB_BASE?= ${RUBY_LIB_BASE}/site_ruby
461RUBY_SITELIB?= ${RUBY_SITELIB_BASE}/${RUBY_VER_DIR} 461RUBY_SITELIB?= ${RUBY_SITELIB_BASE}/${RUBY_VER_DIR}
462RUBY_SITEARCHLIB?= ${RUBY_SITELIB}/${RUBY_ARCH} 462RUBY_SITEARCHLIB?= ${RUBY_SITELIB}/${RUBY_ARCH}
463RUBY_VENDORLIB_BASE?= ${RUBY_LIB_BASE}/vendor_ruby 463RUBY_VENDORLIB_BASE?= ${RUBY_LIB_BASE}/vendor_ruby
464RUBY_VENDORLIB?= ${RUBY_VENDORLIB_BASE}/${RUBY_VER_DIR} 464RUBY_VENDORLIB?= ${RUBY_VENDORLIB_BASE}/${RUBY_VER_DIR}
465RUBY_VENDORARCHLIB?= ${RUBY_VENDORLIB}/${RUBY_ARCH} 465RUBY_VENDORARCHLIB?= ${RUBY_VENDORLIB}/${RUBY_ARCH}
466 466
467RUBY_DOC?= share/doc/${RUBY_NAME} 467RUBY_DOC?= share/doc/${RUBY_NAME}
468RUBY_EG?= share/examples/${RUBY_NAME} 468RUBY_EG?= share/examples/${RUBY_NAME}
469 469
470 470
471RUBY_GEM_BASE?= ${RUBY_LIB_BASE}/gems 471RUBY_GEM_BASE?= ${RUBY_LIB_BASE}/gems
472GEM_HOME?= ${RUBY_GEM_BASE}/${RUBY_VER_DIR} 472GEM_HOME?= ${RUBY_GEM_BASE}/${RUBY_VER_DIR}
473 473
474# 474#
475# ri database relative path 475# ri database relative path
476# 476#
477RUBY_RIDIR?= share/ri 477RUBY_RIDIR?= share/ri
478RUBY_BASERIDIR?= ${RUBY_RIDIR}/${RUBY_VER_DIR} 478RUBY_BASERIDIR?= ${RUBY_RIDIR}/${RUBY_VER_DIR}
479RUBY_SYSRIDIR?= ${RUBY_BASERIDIR}/system 479RUBY_SYSRIDIR?= ${RUBY_BASERIDIR}/system
480RUBY_SITERIDIR?= ${RUBY_BASERIDIR}/site 480RUBY_SITERIDIR?= ${RUBY_BASERIDIR}/site
481 481
482# 482#
483# MAKE_ENV 483# MAKE_ENV
484# 484#
485MAKE_ENV+= RUBY=${RUBY:Q} RUBY_VER=${RUBY_VER:Q} \ 485MAKE_ENV+= RUBY=${RUBY:Q} RUBY_VER=${RUBY_VER:Q} \
486 RUBY_VERSION_DEFAULT=${RUBY_VERSION_DEFAULT:Q} 486 RUBY_VERSION_DEFAULT=${RUBY_VERSION_DEFAULT:Q}
487 487
488MAKEFLAGS+= RUBY_VER=${RUBY_VER:Q} \ 488MAKEFLAGS+= RUBY_VER=${RUBY_VER:Q} \
489 RUBY_VERSION_DEFAULT=${RUBY_VERSION_DEFAULT:Q} 489 RUBY_VERSION_DEFAULT=${RUBY_VERSION_DEFAULT:Q}
490 490
491# 491#
492# PLIST_VARS for x11/ruby-tk package. 492# PLIST_VARS for x11/ruby-tk package.
493# 493#
494PLIST_VARS+= ruby19 ruby200 494PLIST_VARS+= ruby19 ruby200
495.if ${RUBY_VER} != "18" 495.if ${RUBY_VER} != "18"
496PLIST.ruby19= yes 496PLIST.ruby19= yes
497. if ${RUBY_VER} != "193" 497. if ${RUBY_VER} != "193"
498PLIST.ruby200= yes 498PLIST.ruby200= yes
499. endif 499. endif
500.endif 500.endif
501 501
502PLIST_RUBY_DIRS= RUBY_INC=${RUBY_INC:Q} RUBY_ARCHINC=${RUBY_ARCHINC:Q} \ 502PLIST_RUBY_DIRS= RUBY_INC=${RUBY_INC:Q} RUBY_ARCHINC=${RUBY_ARCHINC:Q} \
503 RUBY_LIB_BASE=${RUBY_LIB_BASE:Q} \ 503 RUBY_LIB_BASE=${RUBY_LIB_BASE:Q} \
504 RUBY_LIB=${RUBY_LIB:Q} \ 504 RUBY_LIB=${RUBY_LIB:Q} \
505 RUBY_ARCHLIB=${RUBY_ARCHLIB:Q} \ 505 RUBY_ARCHLIB=${RUBY_ARCHLIB:Q} \
506 RUBY_SITELIB_BASE=${RUBY_SITELIB_BASE:Q} \ 506 RUBY_SITELIB_BASE=${RUBY_SITELIB_BASE:Q} \
507 RUBY_SITELIB=${RUBY_SITELIB:Q} \ 507 RUBY_SITELIB=${RUBY_SITELIB:Q} \
508 RUBY_SITEARCHLIB=${RUBY_SITEARCHLIB:Q} \ 508 RUBY_SITEARCHLIB=${RUBY_SITEARCHLIB:Q} \
509 RUBY_VENDORLIB_BASE=${RUBY_VENDORLIB_BASE:Q} \ 509 RUBY_VENDORLIB_BASE=${RUBY_VENDORLIB_BASE:Q} \
510 RUBY_VENDORLIB=${RUBY_VENDORLIB:Q} \ 510 RUBY_VENDORLIB=${RUBY_VENDORLIB:Q} \
511 RUBY_VENDORARCHLIB=${RUBY_VENDORARCHLIB:Q} \ 511 RUBY_VENDORARCHLIB=${RUBY_VENDORARCHLIB:Q} \
512 RUBY_DOC=${RUBY_DOC:Q} \ 512 RUBY_DOC=${RUBY_DOC:Q} \
513 RUBY_EG=${RUBY_EG:Q} \ 513 RUBY_EG=${RUBY_EG:Q} \
514 RUBY_GEM_BASE=${RUBY_GEM_BASE:Q} \ 514 RUBY_GEM_BASE=${RUBY_GEM_BASE:Q} \
515 GEM_HOME=${GEM_HOME:Q} \ 515 GEM_HOME=${GEM_HOME:Q} \
516 RUBY_RIDIR=${RUBY_RIDIR:Q} \ 516 RUBY_RIDIR=${RUBY_RIDIR:Q} \
517 RUBY_BASERIDIR=${RUBY_BASERIDIR:Q} \ 517 RUBY_BASERIDIR=${RUBY_BASERIDIR:Q} \
518 RUBY_SYSRIDIR=${RUBY_SYSRIDIR:Q} \ 518 RUBY_SYSRIDIR=${RUBY_SYSRIDIR:Q} \
519 RUBY_SITERIDIR=${RUBY_SITERIDIR:Q} 519 RUBY_SITERIDIR=${RUBY_SITERIDIR:Q}
520 520
521# 521#
522# substitutions 522# substitutions
523# 523#
524FILES_SUBST+= RUBY=${RUBY:Q} RUBY_NAME=${RUBY_NAME:Q} \ 524FILES_SUBST+= RUBY=${RUBY:Q} RUBY_NAME=${RUBY_NAME:Q} \
525 RUBY_PKGPREFIX=${RUBY_PKGPREFIX:Q} \ 525 RUBY_PKGPREFIX=${RUBY_PKGPREFIX:Q} \
526 RUBY_SUFFIX=${RUBY_SUFFIX} \ 526 RUBY_SUFFIX=${RUBY_SUFFIX} \
527 RUBY_VER=${RUBY_VER:Q} \ 527 RUBY_VER=${RUBY_VER:Q} \
528 ${PLIST_RUBY_DIRS} 528 ${PLIST_RUBY_DIRS}
529 529
530MESSAGE_SUBST+= RUBY="${RUBY}" RUBY_VER="${RUBY_VER}" \ 530MESSAGE_SUBST+= RUBY="${RUBY}" RUBY_VER="${RUBY_VER}" \
531 RUBY_VERSION="${RUBY_VERSION}" \ 531 RUBY_VERSION="${RUBY_VERSION}" \
532 RUBY_PKGPREFIX="${RUBY_PKGPREFIX}" \ 532 RUBY_PKGPREFIX="${RUBY_PKGPREFIX}" \
533 RUBY_SUFFIX=${RUBY_SUFFIX} \ 533 RUBY_SUFFIX=${RUBY_SUFFIX} \
534 ${PLIST_RUBY_DIRS:S,DIR="${PREFIX}/,DIR=",} 534 ${PLIST_RUBY_DIRS:S,DIR="${PREFIX}/,DIR=",}
535 535
536PLIST_SUBST+= RUBY=${RUBY:Q} RUBY_VER=${RUBY_VER:Q} \ 536PLIST_SUBST+= RUBY=${RUBY:Q} RUBY_VER=${RUBY_VER:Q} \
537 RUBY_PKGPREFIX=${RUBY_PKGPREFIX} \ 537 RUBY_PKGPREFIX=${RUBY_PKGPREFIX} \
538 RUBY_SUFFIX=${RUBY_SUFFIX} \ 538 RUBY_SUFFIX=${RUBY_SUFFIX} \
539 RUBY_VERSION=${RUBY_VERSION:Q} \ 539 RUBY_VERSION=${RUBY_VERSION:Q} \
540 RUBY_VER_DIR=${RUBY_VER_DIR:Q} \ 540 RUBY_VER_DIR=${RUBY_VER_DIR:Q} \
541 RUBY_DLEXT=${RUBY_DLEXT:Q} RUBY_SLEXT=${RUBY_SLEXT:Q} \ 541 RUBY_DLEXT=${RUBY_DLEXT:Q} RUBY_SLEXT=${RUBY_SLEXT:Q} \
542 RUBY_SHLIB=${RUBY_SHLIB:Q} \ 542 RUBY_SHLIB=${RUBY_SHLIB:Q} \
543 RUBY_SHLIBALIAS=${RUBY_SHLIBALIAS:Q} \ 543 RUBY_SHLIBALIAS=${RUBY_SHLIBALIAS:Q} \
544 RUBY_STATICLIB=${RUBY_STATICLIB:Q} \ 544 RUBY_STATICLIB=${RUBY_STATICLIB:Q} \
545 RUBY_ARCH=${RUBY_ARCH:Q} \ 545 RUBY_ARCH=${RUBY_ARCH:Q} \
546 ${PLIST_RUBY_DIRS:S,DIR="${PREFIX}/,DIR=",} 546 ${PLIST_RUBY_DIRS:S,DIR="${PREFIX}/,DIR=",}
547 547
548# 548#
549# make dynamic PLIST 549# make dynamic PLIST
550# 550#
551.if !empty(RUBY_DYNAMIC_DIRS) 551.if !empty(RUBY_DYNAMIC_DIRS)
552 552
553RUBY_PLIST_DYNAMIC= ${WRKDIR}/PLIST.work 553RUBY_PLIST_DYNAMIC= ${WRKDIR}/PLIST.work
554 554
555.if !defined(PLIST_SRC) 555.if !defined(PLIST_SRC)
556. if exists(${PKGDIR}/PLIST.common) 556. if exists(${PKGDIR}/PLIST.common)
557PLIST_SRC+= ${PKGDIR}/PLIST.common 557PLIST_SRC+= ${PKGDIR}/PLIST.common
558. elif exists(${PKGDIR}/PLIST) 558. elif exists(${PKGDIR}/PLIST)
559PLIST_SRC+= ${PKGDIR}/PLIST 559PLIST_SRC+= ${PKGDIR}/PLIST
560. endif 560. endif
561 561
562PLIST_SRC+= ${RUBY_PLIST_DYNAMIC} 562PLIST_SRC+= ${RUBY_PLIST_DYNAMIC}
563 563
564. if exists(${PKGDIR}/PLIST.common_end) 564. if exists(${PKGDIR}/PLIST.common_end)
565PLIST_SRC+= ${PKGDIR}/PLIST.common_end 565PLIST_SRC+= ${PKGDIR}/PLIST.common_end
566. endif 566. endif
567 567
568.endif 568.endif
569 569
570RUBY_PLIST_COMMENT_CMD= \ 570RUBY_PLIST_COMMENT_CMD= \
571 ${ECHO} "@comment The following lines are automatically generated" 571 ${ECHO} "@comment The following lines are automatically generated"
572RUBY_PLIST_FILES_CMD= ( cd ${DESTDIR}${PREFIX}; \ 572RUBY_PLIST_FILES_CMD= ( cd ${DESTDIR}${PREFIX}; \
573 ${FIND} ${RUBY_DYNAMIC_DIRS} \( -type f -o -type l \) -print ) | \ 573 ${FIND} ${RUBY_DYNAMIC_DIRS} \( -type f -o -type l \) -print ) | \
574 ${SORT} -u 574 ${SORT} -u
575RUBY_GENERATE_PLIST = ( \ 575RUBY_GENERATE_PLIST = ( \
576 ${RUBY_PLIST_COMMENT_CMD}; \ 576 ${RUBY_PLIST_COMMENT_CMD}; \
577 ${RUBY_PLIST_FILES_CMD} ) > ${RUBY_PLIST_DYNAMIC} 577 ${RUBY_PLIST_FILES_CMD} ) > ${RUBY_PLIST_DYNAMIC}
578.endif 578.endif
579 579
580PRINT_PLIST_AWK+= /lib\/libruby${RUBY_STATICLIB}$$/ \ 580PRINT_PLIST_AWK+= /lib\/libruby${RUBY_STATICLIB}$$/ \
581 { sub(/${RUBY_STATICLIB}/, "$${RUBY_STATICLIB}"); } 581 { sub(/${RUBY_STATICLIB}/, "$${RUBY_STATICLIB}"); }
582PRINT_PLIST_AWK+= /lib\/libruby${RUBY_VER}\.${RUBY_SLEXT}/ \ 582PRINT_PLIST_AWK+= /lib\/libruby${RUBY_VER}\.${RUBY_SLEXT}/ \
583 { sub(/${RUBY_VER}\.${RUBY_SLEXT}$$/, \ 583 { sub(/${RUBY_VER}\.${RUBY_SLEXT}$$/, \
584 "$${RUBY_VER}.$${RUBY_SLEXT}"); } 584 "$${RUBY_VER}.$${RUBY_SLEXT}"); }
585PRINT_PLIST_AWK+= /${RUBY_SHLIB}$$/ \ 585PRINT_PLIST_AWK+= /${RUBY_SHLIB}$$/ \
586 { sub(/${RUBY_SHLIB}$$/, "$${RUBY_SHLIB}"); } 586 { sub(/${RUBY_SHLIB}$$/, "$${RUBY_SHLIB}"); }
587PRINT_PLIST_AWK+= /${RUBY_SLEXT}\.${RUBY_SHLIBVER}$$/ \ 587PRINT_PLIST_AWK+= /${RUBY_SLEXT}\.${RUBY_SHLIBVER}$$/ \
588 { sub(/${RUBY_SLEXT}\.${RUBY_SHLIBVER}$$/, \ 588 { sub(/${RUBY_SLEXT}\.${RUBY_SHLIBVER}$$/, \
589 "$${RUBY_SLEXT}.$${RUBY_SHLIBVER}"); } 589 "$${RUBY_SLEXT}.$${RUBY_SHLIBVER}"); }
590.if ${RUBY_SHLIBALIAS} != "@comment" 590.if ${RUBY_SHLIBALIAS} != "@comment"
591PRINT_PLIST_AWK+= /${RUBY_SHLIBALIAS:S/\//\\\//}$$/ \ 591PRINT_PLIST_AWK+= /${RUBY_SHLIBALIAS:S/\//\\\//}$$/ \
592 { sub(/${RUBY_SHLIBALIAS:S/\//\\\//}$$/, \ 592 { sub(/${RUBY_SHLIBALIAS:S/\//\\\//}$$/, \
593 "$${RUBY_SHLIBALIAS}"); } 593 "$${RUBY_SHLIBALIAS}"); }
594.endif 594.endif
595PRINT_PLIST_AWK+= /^${RUBY_ARCHINC:S|/|\\/|g}/ \ 595PRINT_PLIST_AWK+= /^${RUBY_ARCHINC:S|/|\\/|g}/ \
596 { gsub(/${RUBY_ARCHINC:S|/|\\/|g}/, "$${RUBY_ARCHINC}"); \ 596 { gsub(/${RUBY_ARCHINC:S|/|\\/|g}/, "$${RUBY_ARCHINC}"); \
597 print; next; } 597 print; next; }
598PRINT_PLIST_AWK+= /^${RUBY_INC:S|/|\\/|g}/ \ 598PRINT_PLIST_AWK+= /^${RUBY_INC:S|/|\\/|g}/ \
599 { gsub(/${RUBY_INC:S|/|\\/|g}/, "$${RUBY_INC}"); \ 599 { gsub(/${RUBY_INC:S|/|\\/|g}/, "$${RUBY_INC}"); \
600 print; next; } 600 print; next; }
601PRINT_PLIST_AWK+= /\.${RUBY_DLEXT}$$/ \ 601PRINT_PLIST_AWK+= /\.${RUBY_DLEXT}$$/ \
602 { gsub(/${RUBY_DLEXT}$$/, "$${RUBY_DLEXT}") } 602 { gsub(/${RUBY_DLEXT}$$/, "$${RUBY_DLEXT}") }
603PRINT_PLIST_AWK+= /^${RUBY_ARCHLIB:S|/|\\/|g}/ \ 603PRINT_PLIST_AWK+= /^${RUBY_ARCHLIB:S|/|\\/|g}/ \
604 { gsub(/${RUBY_ARCHLIB:S|/|\\/|g}/, "$${RUBY_ARCHLIB}"); \ 604 { gsub(/${RUBY_ARCHLIB:S|/|\\/|g}/, "$${RUBY_ARCHLIB}"); \
605 print; next; } 605 print; next; }
606PRINT_PLIST_AWK+= /^${RUBY_VENDORARCHLIB:S|/|\\/|g}/ \ 606PRINT_PLIST_AWK+= /^${RUBY_VENDORARCHLIB:S|/|\\/|g}/ \
607 { gsub(/${RUBY_VENDORARCHLIB:S|/|\\/|g}/, "$${RUBY_VENDORARCHLIB}"); \ 607 { gsub(/${RUBY_VENDORARCHLIB:S|/|\\/|g}/, "$${RUBY_VENDORARCHLIB}"); \
608 print; next; } 608 print; next; }
609PRINT_PLIST_AWK+= /^${RUBY_VENDORLIB:S|/|\\/|g}/ \ 609PRINT_PLIST_AWK+= /^${RUBY_VENDORLIB:S|/|\\/|g}/ \
610 { gsub(/${RUBY_VENDORLIB:S|/|\\/|g}/, "$${RUBY_VENDORLIB}"); \ 610 { gsub(/${RUBY_VENDORLIB:S|/|\\/|g}/, "$${RUBY_VENDORLIB}"); \
611 print; next; } 611 print; next; }
612PRINT_PLIST_AWK+= /^${RUBY_SITEARCHLIB:S|/|\\/|g}/ \ 612PRINT_PLIST_AWK+= /^${RUBY_SITEARCHLIB:S|/|\\/|g}/ \
613 { gsub(/${RUBY_SITEARCHLIB:S|/|\\/|g}/, "$${RUBY_SITEARCHLIB}"); \ 613 { gsub(/${RUBY_SITEARCHLIB:S|/|\\/|g}/, "$${RUBY_SITEARCHLIB}"); \
614 print; next; } 614 print; next; }
615PRINT_PLIST_AWK+= /^${RUBY_SITELIB:S|/|\\/|g}/ \ 615PRINT_PLIST_AWK+= /^${RUBY_SITELIB:S|/|\\/|g}/ \
616 { gsub(/${RUBY_SITELIB:S|/|\\/|g}/, "$${RUBY_SITELIB}"); \ 616 { gsub(/${RUBY_SITELIB:S|/|\\/|g}/, "$${RUBY_SITELIB}"); \
617 print; next; } 617 print; next; }
618PRINT_PLIST_AWK+= /^${RUBY_SITELIB_BASE:S|/|\\/|g}/ \ 618PRINT_PLIST_AWK+= /^${RUBY_SITELIB_BASE:S|/|\\/|g}/ \
619 { gsub(/${RUBY_SITELIB_BASE:S|/|\\/|g}/, "$${RUBY_SITELIB_BASE}"); \ 619 { gsub(/${RUBY_SITELIB_BASE:S|/|\\/|g}/, "$${RUBY_SITELIB_BASE}"); \
620 print; next; } 620 print; next; }
621PRINT_PLIST_AWK+= /^${RUBY_VENDORLIB_BASE:S|/|\\/|g}/ \ 621PRINT_PLIST_AWK+= /^${RUBY_VENDORLIB_BASE:S|/|\\/|g}/ \
622 { gsub(/${RUBY_VENDORLIB_BASE:S|/|\\/|g}/, "$${RUBY_VENDORLIB_BASE}"); \ 622 { gsub(/${RUBY_VENDORLIB_BASE:S|/|\\/|g}/, "$${RUBY_VENDORLIB_BASE}"); \
623 print; next; } 623 print; next; }
624PRINT_PLIST_AWK+= /^${RUBY_LIB:S|/|\\/|g}/ \ 624PRINT_PLIST_AWK+= /^${RUBY_LIB:S|/|\\/|g}/ \
625 { gsub(/${RUBY_LIB:S|/|\\/|g}/, "$${RUBY_LIB}"); \ 625 { gsub(/${RUBY_LIB:S|/|\\/|g}/, "$${RUBY_LIB}"); \
626 print; next; } 626 print; next; }
627PRINT_PLIST_AWK+= /^${RUBY_DOC:S|/|\\/|g}/ \ 627PRINT_PLIST_AWK+= /^${RUBY_DOC:S|/|\\/|g}/ \
628 { gsub(/${RUBY_DOC:S|/|\\/|g}/, "$${RUBY_DOC}"); \ 628 { gsub(/${RUBY_DOC:S|/|\\/|g}/, "$${RUBY_DOC}"); \
629 print; next; } 629 print; next; }
630PRINT_PLIST_AWK+= /^${RUBY_EG:S|/|\\/|g}/ \ 630PRINT_PLIST_AWK+= /^${RUBY_EG:S|/|\\/|g}/ \
631 { gsub(/${RUBY_EG:S|/|\\/|g}/, "$${RUBY_EG}"); \ 631 { gsub(/${RUBY_EG:S|/|\\/|g}/, "$${RUBY_EG}"); \
632 print; next; } 632 print; next; }
633PRINT_PLIST_AWK+= /^${RUBY_SITERIDIR:S|/|\\/|g}/ \ 633PRINT_PLIST_AWK+= /^${RUBY_SITERIDIR:S|/|\\/|g}/ \
634 { gsub(/${RUBY_SITERIDIR:S|/|\\/|g}/, "$${RUBY_SITERIDIR}"); \ 634 { gsub(/${RUBY_SITERIDIR:S|/|\\/|g}/, "$${RUBY_SITERIDIR}"); \
635 print; next; } 635 print; next; }
636PRINT_PLIST_AWK+= /^${RUBY_SYSRIDIR:S|/|\\/|g}\// \ 636PRINT_PLIST_AWK+= /^${RUBY_SYSRIDIR:S|/|\\/|g}\// \
637 { next; } 637 { next; }
638 638
639# Insert part of PRINT_PLIST_AWK from gem.mk 639# Insert part of PRINT_PLIST_AWK from gem.mk
640PRINT_PLIST_AWK+= ${_RUBY_PRINT_PLIST_GEM} 640PRINT_PLIST_AWK+= ${_RUBY_PRINT_PLIST_GEM}
641 641
642PRINT_PLIST_AWK+= /\/${RUBY_NAME}/ \ 642PRINT_PLIST_AWK+= /\/${RUBY_NAME}/ \
643 { sub(/${RUBY_NAME}/, "$${RUBY_NAME}"); } 643 { sub(/${RUBY_NAME}/, "$${RUBY_NAME}"); }
644PRINT_PLIST_AWK+= /^${GEM_HOME:S|/|\\/|g:S|.|\\.|g}/ \ 644PRINT_PLIST_AWK+= /^${GEM_HOME:S|/|\\/|g:S|.|\\.|g}/ \
645 { gsub(/${GEM_HOME:S|/|\\/|g}/, "$${GEM_HOME}"); } 645 { gsub(/${GEM_HOME:S|/|\\/|g}/, "$${GEM_HOME}"); }
646 646
647.endif # _RUBY_MK 647.endif # _RUBY_MK
cvs diff -r1.17 -r1.18 pkgsrc/lang/ruby200-base/Attic/distinfo (switch to unified diff)

--- pkgsrc/lang/ruby200-base/Attic/distinfo 2014/10/27 16:20:16 1.17
+++ pkgsrc/lang/ruby200-base/Attic/distinfo 2014/11/15 14:33:45 1.18
@@ -1,27 +1,27 @@ @@ -1,27 +1,27 @@
1$NetBSD: distinfo,v 1.17 2014/10/27 16:20:16 taca Exp $ 1$NetBSD: distinfo,v 1.18 2014/11/15 14:33:45 taca Exp $
2 2
3SHA1 (ruby-2.0.0-p594.tar.bz2) = 9995087d0857f7c9682297689691d606897333b8 3SHA1 (ruby-2.0.0-p598.tar.bz2) = 992416657832c775ff41452af81c962981ddbde2
4RMD160 (ruby-2.0.0-p594.tar.bz2) = fb5a2a5bd15a6e0208b75ad50134930356e6905c 4RMD160 (ruby-2.0.0-p598.tar.bz2) = 76f2f261236f820adbe7dcedda9b9714eaf8e178
5Size (ruby-2.0.0-p594.tar.bz2) = 10756895 bytes 5Size (ruby-2.0.0-p598.tar.bz2) = 10758882 bytes
6SHA1 (patch-configure) = ed31eee4192457aeba3ded9d42b1ed755a6d0acf 6SHA1 (patch-configure) = ed31eee4192457aeba3ded9d42b1ed755a6d0acf
7SHA1 (patch-defs_default__gems) = 28a47952e27c22055bac6ad151d092572b96b1ec 7SHA1 (patch-defs_default__gems) = 28a47952e27c22055bac6ad151d092572b96b1ec
8SHA1 (patch-lib_rdoc_ri_driver.rb) = 53ce4055b4c008c8ee13d38a81334d4846debdbc 8SHA1 (patch-lib_rdoc_ri_driver.rb) = 53ce4055b4c008c8ee13d38a81334d4846debdbc
9SHA1 (patch-lib_rubygems.rb) = 0f0b8f14745998f5ed0ade9b0b5cdefc8f30d988 9SHA1 (patch-lib_rubygems.rb) = 0f0b8f14745998f5ed0ade9b0b5cdefc8f30d988
10SHA1 (patch-lib_rubygems_commands_setup__command.rb) = 46991d63256d0d3cc2f707fb286d1691331ad40e 10SHA1 (patch-lib_rubygems_commands_setup__command.rb) = 46991d63256d0d3cc2f707fb286d1691331ad40e
11SHA1 (patch-lib_rubygems_commands_uninstall__command.rb) = f39435fbdbbfcc8c756e54fcbec89a4ff796ee2d 11SHA1 (patch-lib_rubygems_commands_uninstall__command.rb) = f39435fbdbbfcc8c756e54fcbec89a4ff796ee2d
12SHA1 (patch-lib_rubygems_commands_unpack__command.rb) = 58af5f0d1a185183ff9a4b4828ef1ca9fc074e05 12SHA1 (patch-lib_rubygems_commands_unpack__command.rb) = 58af5f0d1a185183ff9a4b4828ef1ca9fc074e05
13SHA1 (patch-lib_rubygems_config__file.rb) = 0d863d3f886c1ed83585d96064725e7db7bec1bc 13SHA1 (patch-lib_rubygems_config__file.rb) = 0d863d3f886c1ed83585d96064725e7db7bec1bc
14SHA1 (patch-lib_rubygems_defaults.rb) = 1af4161a83c0bf5b894c4ab3f4a77d4ee4183985 14SHA1 (patch-lib_rubygems_defaults.rb) = 1af4161a83c0bf5b894c4ab3f4a77d4ee4183985
15SHA1 (patch-lib_rubygems_dependency__installer.rb) = f4e40727d231b336c1d4c2303ac1c1e2b50f2710 15SHA1 (patch-lib_rubygems_dependency__installer.rb) = f4e40727d231b336c1d4c2303ac1c1e2b50f2710
16SHA1 (patch-lib_rubygems_install__update__options.rb) = 22cfafe090db72211253b8528937e5be0e677ebf 16SHA1 (patch-lib_rubygems_install__update__options.rb) = 22cfafe090db72211253b8528937e5be0e677ebf
17SHA1 (patch-lib_rubygems_installer.rb) = 7ce68eaa5893c83780f7b4e1af44a88ae63a39cf 17SHA1 (patch-lib_rubygems_installer.rb) = 7ce68eaa5893c83780f7b4e1af44a88ae63a39cf
18SHA1 (patch-lib_rubygems_platform.rb) = 135f2e9d6c0c529da9ffcea4b96507675cdf1f16 18SHA1 (patch-lib_rubygems_platform.rb) = 135f2e9d6c0c529da9ffcea4b96507675cdf1f16
19SHA1 (patch-lib_rubygems_specification.rb) = 3e9e95178127da862add4141665b80d965874f21 19SHA1 (patch-lib_rubygems_specification.rb) = 3e9e95178127da862add4141665b80d965874f21
20SHA1 (patch-lib_rubygems_uninstaller.rb) = cb4db78829af11d6294b15d1e81066227e3ea3bb 20SHA1 (patch-lib_rubygems_uninstaller.rb) = cb4db78829af11d6294b15d1e81066227e3ea3bb
21SHA1 (patch-man_erb.1) = 1fe6ce4f4fe6418bfabb5e132a63596562030116 21SHA1 (patch-man_erb.1) = 1fe6ce4f4fe6418bfabb5e132a63596562030116
22SHA1 (patch-man_irb.1) = 2bf807b4c1b1c68d1f518caa054cfd900e0fedb7 22SHA1 (patch-man_irb.1) = 2bf807b4c1b1c68d1f518caa054cfd900e0fedb7
23SHA1 (patch-man_ri.1) = af855135020f18c361cc55af676adc75e26bf4d3 23SHA1 (patch-man_ri.1) = af855135020f18c361cc55af676adc75e26bf4d3
24SHA1 (patch-man_ruby.1) = 5bc1e2e7c4c640659e33d0131d0982ce4e0d9fe0 24SHA1 (patch-man_ruby.1) = 5bc1e2e7c4c640659e33d0131d0982ce4e0d9fe0
25SHA1 (patch-pack.c) = d127a8887c685fa057c768e217a4cd8271998ad4 25SHA1 (patch-pack.c) = d127a8887c685fa057c768e217a4cd8271998ad4
26SHA1 (patch-test_rubygems_test__gem.rb) = 32ba1a7a2e9f6174297de969fc0b7cdcd083c764 26SHA1 (patch-test_rubygems_test__gem.rb) = 32ba1a7a2e9f6174297de969fc0b7cdcd083c764
27SHA1 (patch-tool_rbinstall.rb) = 287064ed2bc90e92cdc1b38fc4031d65819d3843 27SHA1 (patch-tool_rbinstall.rb) = 287064ed2bc90e92cdc1b38fc4031d65819d3843