Fri Oct 12 15:27:48 2012 UTC ()
Update ruby18-base and ruby18 to 1.8.7.371 (Ruby 1.8.7-p371).

Additional fix to CVE-2011-1005 was incorporated.
So, there is no change to ruby18/ruby18-base packages of pkgsrc except
version.


(taca)
diff -r1.90 -r1.91 pkgsrc/lang/ruby/rubyversion.mk
diff -r1.75 -r1.76 pkgsrc/lang/ruby18-base/Makefile
diff -r1.57 -r1.58 pkgsrc/lang/ruby18-base/distinfo
diff -r1.1 -r0 pkgsrc/lang/ruby18-base/patches/patch-error.c
cvs diff -r1.90 -r1.91 pkgsrc/lang/ruby/rubyversion.mk (switch to unified diff)

--- pkgsrc/lang/ruby/rubyversion.mk 2012/10/12 14:51:31 1.90
+++ pkgsrc/lang/ruby/rubyversion.mk 2012/10/12 15:27:48 1.91
@@ -1,566 +1,566 @@ @@ -1,566 +1,566 @@
1# $NetBSD: rubyversion.mk,v 1.90 2012/10/12 14:51:31 taca Exp $ 1# $NetBSD: rubyversion.mk,v 1.91 2012/10/12 15:27:48 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 13# Possible values: 18 193
14# Default: 193 14# Default: 193
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 44# Possible values: 18 193
45# Default: 18 193 45# Default: 18 193
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}; "ruby18" or "ruby193". 51# ${RUBY_PKGPREFIX}; "ruby18" or "ruby193".
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 72# Possible values: 18 193
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# RUBY_ABI_VERSION 81# RUBY_ABI_VERSION
82# Ruby's ABI version. 82# Ruby's ABI version.
83# 83#
84# RUBY_DLEXT 84# RUBY_DLEXT
85# Suffix of extention library. 85# Suffix of extention library.
86# 86#
87# RUBY_SLEXT 87# RUBY_SLEXT
88# Suffix of shared library. 88# Suffix of shared library.
89# 89#
90# RUBY 90# RUBY
91# Full path of ruby command. 91# Full path of ruby command.
92# 92#
93# RDOC 93# RDOC
94# Full path of rdoc command. 94# Full path of rdoc command.
95# 95#
96# RUBY_NAME 96# RUBY_NAME
97# Name of ruby command. 97# Name of ruby command.
98# 98#
99# RUBYGEM_NAME 99# RUBYGEM_NAME
100# Name of gem command. 100# Name of gem command.
101# 101#
102# RAKE_NAME 102# RAKE_NAME
103# Name of rake command. 103# Name of rake command.
104# 104#
105# RUBY_SUFFIX 105# RUBY_SUFFIX
106# Extra string for each ruby commands; ruby, irb and so on. 106# Extra string for each ruby commands; ruby, irb and so on.
107# 107#
108# RUBY_VERSION 108# RUBY_VERSION
109# Version of real Ruby's version excluding patchlevel. 109# Version of real Ruby's version excluding patchlevel.
110# 110#
111# RUBY_VERSION_FULL 111# RUBY_VERSION_FULL
112# Version of Ruby including patchlevel. 112# Version of Ruby including patchlevel.
113#  113#
114# RUBY_BASE 114# RUBY_BASE
115# Name of ruby base package's name. 115# Name of ruby base package's name.
116# 116#
117# RUBY_SRCDIR 117# RUBY_SRCDIR
118# Directory of base ruby package. 118# Directory of base ruby package.
119# 119#
120# RUBY_SHLIBVER 120# RUBY_SHLIBVER
121# Suffix of libruby shared library's version. 121# Suffix of libruby shared library's version.
122# 122#
123# RUBY_SHLIB 123# RUBY_SHLIB
124# String after libruby shared library. 124# String after libruby shared library.
125# 125#
126# RUBY_SHLIBALIAS 126# RUBY_SHLIBALIAS
127# Symblic link with libruby shared library with major version only. 127# Symblic link with libruby shared library with major version only.
128# 128#
129# RUBY_STATICLIB 129# RUBY_STATICLIB
130# Name of libruby static library. 130# Name of libruby static library.
131# 131#
132# RUBY_VER_DIR 132# RUBY_VER_DIR
133# Name of version directory under each library (and more) directories. 133# Name of version directory under each library (and more) directories.
134# 134#
135# RUBY_ARCH 135# RUBY_ARCH
136# Name of architecture-dependent directory name. 136# Name of architecture-dependent directory name.
137# 137#
138# RUBY_INC 138# RUBY_INC
139# machine independent include directory of ruby. 139# machine independent include directory of ruby.
140# 140#
141# RUBY_ARCHINC 141# RUBY_ARCHINC
142# machine dependent include directory of ruby. 142# machine dependent include directory of ruby.
143# 143#
144# RUBY_LIB_BASE 144# RUBY_LIB_BASE
145# common relative path of ruby's library. 145# common relative path of ruby's library.
146# 146#
147# RUBY_LIB 147# RUBY_LIB
148# version specific relative path of ruby's library. 148# version specific relative path of ruby's library.
149# 149#
150# RUBY_ARCHLIB 150# RUBY_ARCHLIB
151# version specific and machine dependent relative path of ruby's library. 151# version specific and machine dependent relative path of ruby's library.
152# 152#
153# RUBY_SITELIB_BASE 153# RUBY_SITELIB_BASE
154# common site local directory. 154# common site local directory.
155# 155#
156# RUBY_SITELIB 156# RUBY_SITELIB
157# version specific site local directory. 157# version specific site local directory.
158# 158#
159# RUBY_SITEARCHLIB 159# RUBY_SITEARCHLIB
160# version specific and machine dependent site local directory. 160# version specific and machine dependent site local directory.
161# 161#
162# RUBY_VENDORLIB_BASE 162# RUBY_VENDORLIB_BASE
163# common vendor (pkgsrc) directory. 163# common vendor (pkgsrc) directory.
164# 164#
165# RUBY_VENDORLIB 165# RUBY_VENDORLIB
166# version specific vendor local directory. 166# version specific vendor local directory.
167# 167#
168# RUBY_VENDORARCHLIB 168# RUBY_VENDORARCHLIB
169# version specific and machine dependent vendor local directory. 169# version specific and machine dependent vendor local directory.
170# 170#
171# RUBY_DOC 171# RUBY_DOC
172# version specific document direcotry. 172# version specific document direcotry.
173# 173#
174# RUBY_EG 174# RUBY_EG
175# version specific examples direcotry. 175# version specific examples direcotry.
176# 176#
177# RUBY_GEM_BASE 177# RUBY_GEM_BASE
178# common GEM directory. 178# common GEM directory.
179#  179#
180# GEM_HOME 180# GEM_HOME
181# version specific GEM directory. 181# version specific GEM directory.
182# 182#
183# RUBY_RIDIR 183# RUBY_RIDIR
184# common ri directory. 184# common ri directory.
185# 185#
186# RUBY_BASERIDIR 186# RUBY_BASERIDIR
187# version specific ri directory. 187# version specific ri directory.
188# 188#
189# RUBY_SYSRIDIR 189# RUBY_SYSRIDIR
190# version specific system ri directory. 190# version specific system ri directory.
191# 191#
192# RUBY_SITERIDIR 192# RUBY_SITERIDIR
193# version specific site ri directory. 193# version specific site ri directory.
194# 194#
195# Keywords: ruby 195# Keywords: ruby
196# 196#
197 197
198.if !defined(_RUBYVERSION_MK) 198.if !defined(_RUBYVERSION_MK)
199_RUBYVERSION_MK= # defined 199_RUBYVERSION_MK= # defined
200 200
201.include "../../mk/bsd.prefs.mk" 201.include "../../mk/bsd.prefs.mk"
202 202
203# current supported Ruby's version 203# current supported Ruby's version
204RUBY18_VERSION= 1.8.7 204RUBY18_VERSION= 1.8.7
205RUBY193_VERSION= 1.9.3 205RUBY193_VERSION= 1.9.3
206 206
207# patch 207# patch
208RUBY18_PATCHLEVEL= pl370 208RUBY18_PATCHLEVEL= pl371
209RUBY193_PATCHLEVEL= p286 209RUBY193_PATCHLEVEL= p286
210 210
211# current API compatible version; used for version of shared library 211# current API compatible version; used for version of shared library
212RUBY18_API_VERSION= 1.8.7 212RUBY18_API_VERSION= 1.8.7
213RUBY193_API_VERSION= 1.9.1 213RUBY193_API_VERSION= 1.9.1
214 214
215# 215#
216RUBY_VERSION_DEFAULT?= 193 216RUBY_VERSION_DEFAULT?= 193
217 217
218RUBY_VERSION_SUPPORTED?= 193 18 218RUBY_VERSION_SUPPORTED?= 193 18
219RUBY_VER?= ${RUBY_VERSION_DEFAULT} 219RUBY_VER?= ${RUBY_VERSION_DEFAULT}
220 220
221# If package support only one version, use it. 221# If package support only one version, use it.
222.if ${RUBY_VERSION_SUPPORTED:[\#]} == 1 222.if ${RUBY_VERSION_SUPPORTED:[\#]} == 1
223RUBY_VER= ${RUBY_VERSION_SUPPORTED} 223RUBY_VER= ${RUBY_VERSION_SUPPORTED}
224RUBY_VERSION_DEFAULT= ${RUBY_VERSION_SUPPORTED} 224RUBY_VERSION_DEFAULT= ${RUBY_VERSION_SUPPORTED}
225.endif 225.endif
226 226
227.if defined(RUBY_VERSION_REQD) 227.if defined(RUBY_VERSION_REQD)
228. for rv in ${RUBY_VERSION_SUPPORTED} 228. for rv in ${RUBY_VERSION_SUPPORTED}
229. if ${rv} == ${RUBY_VERSION_REQD} 229. if ${rv} == ${RUBY_VERSION_REQD}
230RUBY_VER= ${rv} 230RUBY_VER= ${rv}
231. endif 231. endif
232. endfor 232. endfor
233.endif 233.endif
234 234
235RUBY_VER:= ${RUBY_VER_MAP.${RUBY_VER}:U${RUBY_VER}} 235RUBY_VER:= ${RUBY_VER_MAP.${RUBY_VER}:U${RUBY_VER}}
236 236
237.if ${RUBY_VER} == "18" 237.if ${RUBY_VER} == "18"
238RUBY_VERSION= ${RUBY18_VERSION} 238RUBY_VERSION= ${RUBY18_VERSION}
239RUBY_VERSION_FULL= ${RUBY_VERSION}${RUBY_PATCHLEVEL:S/pl/./} 239RUBY_VERSION_FULL= ${RUBY_VERSION}${RUBY_PATCHLEVEL:S/pl/./}
240RUBY_ABI_VERSION= ${RUBY18_API_VERSION} 240RUBY_ABI_VERSION= ${RUBY18_API_VERSION}
241.elif ${RUBY_VER} == "193" 241.elif ${RUBY_VER} == "193"
242RUBY_VERSION= ${RUBY193_VERSION} 242RUBY_VERSION= ${RUBY193_VERSION}
243RUBY_VERSION_FULL= ${RUBY_VERSION}${RUBY_PATCHLEVEL} 243RUBY_VERSION_FULL= ${RUBY_VERSION}${RUBY_PATCHLEVEL}
244RUBY_ABI_VERSION= ${RUBY_VERSION} 244RUBY_ABI_VERSION= ${RUBY_VERSION}
245.else 245.else
246PKG_FAIL_REASON+= "Unknown Ruby version specified: ${RUBY_VER}." 246PKG_FAIL_REASON+= "Unknown Ruby version specified: ${RUBY_VER}."
247.endif 247.endif
248 248
249RUBY_PATCHLEVEL= ${RUBY${RUBY_VER}_PATCHLEVEL} 249RUBY_PATCHLEVEL= ${RUBY${RUBY_VER}_PATCHLEVEL}
250RUBY_API_VERSION= ${RUBY${RUBY_VER}_API_VERSION} 250RUBY_API_VERSION= ${RUBY${RUBY_VER}_API_VERSION}
251 251
252# Variable assignment for multi-ruby packages 252# Variable assignment for multi-ruby packages
253MULTI+= RUBY_VER=${RUBY_VERS:U${RUBY_VERSION_DEFAULT}} 253MULTI+= RUBY_VER=${RUBY_VERS:U${RUBY_VERSION_DEFAULT}}
254 254
255# RUBY_NOVERSION should be set to "Yes" if the package dosen't depend on 255# RUBY_NOVERSION should be set to "Yes" if the package dosen't depend on
256# any specific version of ruby command. In this case, package's 256# any specific version of ruby command. In this case, package's
257# name begin with "ruby-". 257# name begin with "ruby-".
258# If RUBY_NOVERSION is "No" (default), the package's name is begin 258# If RUBY_NOVERSION is "No" (default), the package's name is begin
259# with ${RUBY_NAME}; "ruby18", "ruby193", and so on. 259# with ${RUBY_NAME}; "ruby18", "ruby193", and so on.
260# 260#
261# It also affects to RUBY_DOC, RUBY_EG... 261# It also affects to RUBY_DOC, RUBY_EG...
262# 262#
263RUBY_NOVERSION?= No 263RUBY_NOVERSION?= No
264 264
265# _RUBY_VER_MAJOR, _RUBY_VER_MINOR, _RUBY_VER_TEENY and _RUBY_PATCHLEVEL 265# _RUBY_VER_MAJOR, _RUBY_VER_MINOR, _RUBY_VER_TEENY and _RUBY_PATCHLEVEL
266# is defined from version of Ruby. It should not be used in packages' 266# is defined from version of Ruby. It should not be used in packages'
267# Makefile. 267# Makefile.
268# 268#
269_RUBY_VER_MAJOR= ${RUBY_VERSION:C/([0-9]+)\.([0-9]+)\.([0-9]+)/\1/} 269_RUBY_VER_MAJOR= ${RUBY_VERSION:C/([0-9]+)\.([0-9]+)\.([0-9]+)/\1/}
270_RUBY_VER_MINOR= ${RUBY_VERSION:C/([0-9]+)\.([0-9]+)\.([0-9]+)/\2/} 270_RUBY_VER_MINOR= ${RUBY_VERSION:C/([0-9]+)\.([0-9]+)\.([0-9]+)/\2/}
271_RUBY_VER_TEENY= ${RUBY_VERSION:C/([0-9]+)\.([0-9]+)\.([0-9]+)/\3/} 271_RUBY_VER_TEENY= ${RUBY_VERSION:C/([0-9]+)\.([0-9]+)\.([0-9]+)/\3/}
272 272
273_RUBY_API_MAJOR= ${RUBY_API_VERSION:C/([0-9]+)\.([0-9]+)\.([0-9]+)/\1\2/} 273_RUBY_API_MAJOR= ${RUBY_API_VERSION:C/([0-9]+)\.([0-9]+)\.([0-9]+)/\1\2/}
274_RUBY_API_MINOR= ${RUBY_API_VERSION:C/([0-9]+)\.([0-9]+)\.([0-9]+)/\3/} 274_RUBY_API_MINOR= ${RUBY_API_VERSION:C/([0-9]+)\.([0-9]+)\.([0-9]+)/\3/}
275 275
276RUBY_SUFFIX= ${RUBY_VER} 276RUBY_SUFFIX= ${RUBY_VER}
277 277
278RUBY_NAME= ruby${RUBY_SUFFIX} 278RUBY_NAME= ruby${RUBY_SUFFIX}
279RUBYGEM_NAME= gem${RUBY_SUFFIX} 279RUBYGEM_NAME= gem${RUBY_SUFFIX}
280RAKE_NAME= rake${RUBY_SUFFIX} 280RAKE_NAME= rake${RUBY_SUFFIX}
281 281
282RUBY_ENCODING_ARG?= 282RUBY_ENCODING_ARG?=
283 283
284RUBY_BASE= ruby${RUBY_VER}-base 284RUBY_BASE= ruby${RUBY_VER}-base
285 285
286RUBY_PKGPREFIX?= ${RUBY_NAME} 286RUBY_PKGPREFIX?= ${RUBY_NAME}
287 287
288.if ${RUBY_VER} == "18" 288.if ${RUBY_VER} == "18"
289RUBY_VER_DIR= ${_RUBY_VER_MAJOR}.${_RUBY_VER_MINOR} 289RUBY_VER_DIR= ${_RUBY_VER_MAJOR}.${_RUBY_VER_MINOR}
290.else 290.else
291RUBY_VER_DIR= ${RUBY_VERSION} 291RUBY_VER_DIR= ${RUBY_VERSION}
292.endif 292.endif
293 293
294.if empty(RUBY_NOVERSION:M[nN][oO]) 294.if empty(RUBY_NOVERSION:M[nN][oO])
295RUBY_SUFFIX= 295RUBY_SUFFIX=
296RUBY_NAME= ruby 296RUBY_NAME= ruby
297.endif 297.endif
298 298
299RUBY_BUILD_RDOC?= Yes 299RUBY_BUILD_RDOC?= Yes
300RUBY_BUILD_RI?= Yes 300RUBY_BUILD_RI?= Yes
301 301
302RUBY?= ${PREFIX}/bin/${RUBY_NAME} 302RUBY?= ${PREFIX}/bin/${RUBY_NAME}
303RDOC?= ${PREFIX}/bin/rdoc${RUBY_VER} 303RDOC?= ${PREFIX}/bin/rdoc${RUBY_VER}
304 304
305RUBY_ARCH?= ${LOWER_ARCH}-${LOWER_OPSYS}${APPEND_ELF}${LOWER_OPSYS_VERSUFFIX} 305RUBY_ARCH?= ${LOWER_ARCH}-${LOWER_OPSYS}${APPEND_ELF}${LOWER_OPSYS_VERSUFFIX}
306 306
307# 307#
308# Ruby shared and static library version handling. 308# Ruby shared and static library version handling.
309# 309#
310RUBY_SHLIBVER?= ${RUBY_API_VERSION} 310RUBY_SHLIBVER?= ${RUBY_API_VERSION}
311RUBY_SHLIB?= ${RUBY_VER}.${RUBY_SLEXT}.${RUBY_SHLIBVER} 311RUBY_SHLIB?= ${RUBY_VER}.${RUBY_SLEXT}.${RUBY_SHLIBVER}
312RUBY_SHLIBALIAS?= @comment 312RUBY_SHLIBALIAS?= @comment
313RUBY_STATICLIB?= ${RUBY_VER}-static.a 313RUBY_STATICLIB?= ${RUBY_VER}-static.a
314 314
315.if ${OPSYS} == "NetBSD" || ${OPSYS} == "Interix" 315.if ${OPSYS} == "NetBSD" || ${OPSYS} == "Interix"
316RUBY_SHLIBVER= ${_RUBY_API_MAJOR}.${_RUBY_API_MINOR} 316RUBY_SHLIBVER= ${_RUBY_API_MAJOR}.${_RUBY_API_MINOR}
317_RUBY_SHLIBALIAS= ${RUBY_VER}.${RUBY_SLEXT}.${_RUBY_API_MAJOR} 317_RUBY_SHLIBALIAS= ${RUBY_VER}.${RUBY_SLEXT}.${_RUBY_API_MAJOR}
318.elif ${OPSYS} == "FreeBSD" || ${OPSYS} == "DragonFly" 318.elif ${OPSYS} == "FreeBSD" || ${OPSYS} == "DragonFly"
319.if ${RUBY_VER} == "18" 319.if ${RUBY_VER} == "18"
320RUBY_SHLIBVER= ${RUBY_VER} 320RUBY_SHLIBVER= ${RUBY_VER}
321.else 321.else
322RUBY_SHLIBVER= ${_RUBY_VER_MAJOR}${_RUBY_VER_MINOR}${_RUBY_API_MINOR} 322RUBY_SHLIBVER= ${_RUBY_VER_MAJOR}${_RUBY_VER_MINOR}${_RUBY_API_MINOR}
323.endif 323.endif
324.elif ${OPSYS} == "OpenBSD" || ${OPSYS} == "MirBSD" 324.elif ${OPSYS} == "OpenBSD" || ${OPSYS} == "MirBSD"
325RUBY_SHLIBVER= ${_RUBY_VER_MAJOR}.${_RUBY_VER_MINOR}${_RUBY_API_MINOR} 325RUBY_SHLIBVER= ${_RUBY_VER_MAJOR}.${_RUBY_VER_MINOR}${_RUBY_API_MINOR}
326.elif ${OPSYS} == "Darwin" 326.elif ${OPSYS} == "Darwin"
327RUBY_SHLIB= ${RUBY_VER}.${RUBY_SHLIBVER}.${RUBY_SLEXT} 327RUBY_SHLIB= ${RUBY_VER}.${RUBY_SHLIBVER}.${RUBY_SLEXT}
328.if ${RUBY_VER} == "18" 328.if ${RUBY_VER} == "18"
329_RUBY_SHLIBALIAS= ${RUBY_VER}.${_RUBY_VER_MAJOR}.${_RUBY_VER_MINOR}.${RUBY_SLEXT} 329_RUBY_SHLIBALIAS= ${RUBY_VER}.${_RUBY_VER_MAJOR}.${_RUBY_VER_MINOR}.${RUBY_SLEXT}
330.else 330.else
331_RUBY_SHLIBALIAS= .${_RUBY_VER_MAJOR}.${_RUBY_VER_MINOR}.${RUBY_SLEXT} 331_RUBY_SHLIBALIAS= .${_RUBY_VER_MAJOR}.${_RUBY_VER_MINOR}.${RUBY_SLEXT}
332RUBY_STATICLIB= ${RUBY_VER}.${RUBY_API_VERSION}-static.a 332RUBY_STATICLIB= ${RUBY_VER}.${RUBY_API_VERSION}-static.a
333.endif 333.endif
334.elif ${OPSYS} == "Linux" 334.elif ${OPSYS} == "Linux"
335_RUBY_SHLIBALIAS= ${RUBY_VER}.${RUBY_SLEXT}.${_RUBY_VER_MAJOR}.${_RUBY_VER_MINOR} 335_RUBY_SHLIBALIAS= ${RUBY_VER}.${RUBY_SLEXT}.${_RUBY_VER_MAJOR}.${_RUBY_VER_MINOR}
336.elif ${OPSYS} == "SunOS" 336.elif ${OPSYS} == "SunOS"
337RUBY_SHLIBVER= ${_RUBY_VER_MAJOR} 337RUBY_SHLIBVER= ${_RUBY_VER_MAJOR}
338 _RUBY_SHLIBALIAS= ${RUBY_VER}.${RUBY_SLEXT}.${_RUBY_VER_MAJOR}.${_RUBY_VER_MINOR}.${_RUBY_API_MINOR} 338 _RUBY_SHLIBALIAS= ${RUBY_VER}.${RUBY_SLEXT}.${_RUBY_VER_MAJOR}.${_RUBY_VER_MINOR}.${_RUBY_API_MINOR}
339.endif 339.endif
340 340
341.if !empty(_RUBY_SHLIBALIAS) 341.if !empty(_RUBY_SHLIBALIAS)
342RUBY_SHLIBALIAS= lib/libruby${_RUBY_SHLIBALIAS} 342RUBY_SHLIBALIAS= lib/libruby${_RUBY_SHLIBALIAS}
343.endif 343.endif
344 344
345.if ${_OPSYS_SHLIB_TYPE} == "dylib" 345.if ${_OPSYS_SHLIB_TYPE} == "dylib"
346RUBY_DLEXT= bundle 346RUBY_DLEXT= bundle
347RUBY_SLEXT= dylib 347RUBY_SLEXT= dylib
348.else 348.else
349RUBY_DLEXT= so 349RUBY_DLEXT= so
350RUBY_SLEXT= so 350RUBY_SLEXT= so
351.endif 351.endif
352 352
353# 353#
354# Ruby distribution file, few package need it. 354# Ruby distribution file, few package need it.
355# 355#
356_RUBY_PATCHLEVEL= ${RUBY_PATCHLEVEL:S/pl/p/:S/pre/preview/} 356_RUBY_PATCHLEVEL= ${RUBY_PATCHLEVEL:S/pl/p/:S/pre/preview/}
357 357
358.if !empty(_RUBY_PATCHLEVEL) 358.if !empty(_RUBY_PATCHLEVEL)
359RUBY_DISTNAME?= ruby-${RUBY_VERSION}-${_RUBY_PATCHLEVEL} 359RUBY_DISTNAME?= ruby-${RUBY_VERSION}-${_RUBY_PATCHLEVEL}
360.else 360.else
361RUBY_DISTNAME?= ruby-${RUBY_VERSION} 361RUBY_DISTNAME?= ruby-${RUBY_VERSION}
362.endif 362.endif
363 363
364# 364#
365# Use pthread library with Ruby 365# Use pthread library with Ruby
366# 366#
367.if !empty(MACHINE_PLATFORM:MDarwin-9.*-powerpc) 367.if !empty(MACHINE_PLATFORM:MDarwin-9.*-powerpc)
368# Workaround for Ruby Bug #193 368# Workaround for Ruby Bug #193
369# http://redmine.ruby-lang.org/issues/show/193 369# http://redmine.ruby-lang.org/issues/show/193
370RUBY_USE_PTHREAD?= no 370RUBY_USE_PTHREAD?= no
371.else 371.else
372RUBY_USE_PTHREAD?= yes 372RUBY_USE_PTHREAD?= yes
373.endif 373.endif
374 374
375RUBY_DYNAMIC_DIRS?= # empty 375RUBY_DYNAMIC_DIRS?= # empty
376 376
377RUBY_SRCDIR?= ${_PKGSRC_TOPDIR}/lang/${RUBY_BASE} 377RUBY_SRCDIR?= ${_PKGSRC_TOPDIR}/lang/${RUBY_BASE}
378 378
379# 379#
380# common paths 380# common paths
381# 381#
382RUBY_INC= include/ruby-${RUBY_VER_DIR} 382RUBY_INC= include/ruby-${RUBY_VER_DIR}
383RUBY_ARCHINC= ${RUBY_INC}/${RUBY_ARCH} 383RUBY_ARCHINC= ${RUBY_INC}/${RUBY_ARCH}
384RUBY_LIB_BASE= lib/ruby 384RUBY_LIB_BASE= lib/ruby
385RUBY_LIB?= ${RUBY_LIB_BASE}/${RUBY_VER_DIR} 385RUBY_LIB?= ${RUBY_LIB_BASE}/${RUBY_VER_DIR}
386RUBY_ARCHLIB?= ${RUBY_LIB}/${RUBY_ARCH} 386RUBY_ARCHLIB?= ${RUBY_LIB}/${RUBY_ARCH}
387RUBY_SITELIB_BASE?= ${RUBY_LIB_BASE}/site_ruby 387RUBY_SITELIB_BASE?= ${RUBY_LIB_BASE}/site_ruby
388RUBY_SITELIB?= ${RUBY_SITELIB_BASE}/${RUBY_VER_DIR} 388RUBY_SITELIB?= ${RUBY_SITELIB_BASE}/${RUBY_VER_DIR}
389RUBY_SITEARCHLIB?= ${RUBY_SITELIB}/${RUBY_ARCH} 389RUBY_SITEARCHLIB?= ${RUBY_SITELIB}/${RUBY_ARCH}
390RUBY_VENDORLIB_BASE?= ${RUBY_LIB_BASE}/vendor_ruby 390RUBY_VENDORLIB_BASE?= ${RUBY_LIB_BASE}/vendor_ruby
391RUBY_VENDORLIB?= ${RUBY_VENDORLIB_BASE}/${RUBY_VER_DIR} 391RUBY_VENDORLIB?= ${RUBY_VENDORLIB_BASE}/${RUBY_VER_DIR}
392RUBY_VENDORARCHLIB?= ${RUBY_VENDORLIB}/${RUBY_ARCH} 392RUBY_VENDORARCHLIB?= ${RUBY_VENDORLIB}/${RUBY_ARCH}
393 393
394RUBY_DOC?= share/doc/${RUBY_NAME} 394RUBY_DOC?= share/doc/${RUBY_NAME}
395RUBY_EG?= share/examples/${RUBY_NAME} 395RUBY_EG?= share/examples/${RUBY_NAME}
396 396
397 397
398RUBY_GEM_BASE?= ${RUBY_LIB_BASE}/gems 398RUBY_GEM_BASE?= ${RUBY_LIB_BASE}/gems
399GEM_HOME?= ${RUBY_GEM_BASE}/${RUBY_VER_DIR} 399GEM_HOME?= ${RUBY_GEM_BASE}/${RUBY_VER_DIR}
400 400
401# 401#
402# ri database relative path 402# ri database relative path
403# 403#
404RUBY_RIDIR?= share/ri 404RUBY_RIDIR?= share/ri
405RUBY_BASERIDIR?= ${RUBY_RIDIR}/${RUBY_VER_DIR} 405RUBY_BASERIDIR?= ${RUBY_RIDIR}/${RUBY_VER_DIR}
406RUBY_SYSRIDIR?= ${RUBY_BASERIDIR}/system 406RUBY_SYSRIDIR?= ${RUBY_BASERIDIR}/system
407RUBY_SITERIDIR?= ${RUBY_BASERIDIR}/site 407RUBY_SITERIDIR?= ${RUBY_BASERIDIR}/site
408 408
409# 409#
410# MAKE_ENV 410# MAKE_ENV
411# 411#
412MAKE_ENV+= RUBY=${RUBY:Q} RUBY_VER=${RUBY_VER:Q} \ 412MAKE_ENV+= RUBY=${RUBY:Q} RUBY_VER=${RUBY_VER:Q} \
413 RUBY_VERSION_DEFAULT=${RUBY_VERSION_DEFAULT:Q} 413 RUBY_VERSION_DEFAULT=${RUBY_VERSION_DEFAULT:Q}
414 414
415MAKEFLAGS+= RUBY_VERSION_DEFAULT=${RUBY_VERSION_DEFAULT:Q} 415MAKEFLAGS+= RUBY_VERSION_DEFAULT=${RUBY_VERSION_DEFAULT:Q}
416 416
417# 417#
418# PLIST 418# PLIST
419# 419#
420PLIST_VARS+= ruby18 ruby19 ruby193 420PLIST_VARS+= ruby18 ruby19 ruby193
421.if ${RUBY_VER} == "18" 421.if ${RUBY_VER} == "18"
422PLIST.ruby18= yes 422PLIST.ruby18= yes
423.elif ${RUBY_VER} == "193" 423.elif ${RUBY_VER} == "193"
424PLIST.ruby19= yes 424PLIST.ruby19= yes
425PLIST.ruby193= yes 425PLIST.ruby193= yes
426.endif 426.endif
427 427
428PLIST_RUBY_DIRS= RUBY_INC=${RUBY_INC:Q} RUBY_ARCHINC=${RUBY_ARCHINC:Q} \ 428PLIST_RUBY_DIRS= RUBY_INC=${RUBY_INC:Q} RUBY_ARCHINC=${RUBY_ARCHINC:Q} \
429 RUBY_LIB_BASE=${RUBY_LIB_BASE:Q} \ 429 RUBY_LIB_BASE=${RUBY_LIB_BASE:Q} \
430 RUBY_LIB=${RUBY_LIB:Q} \ 430 RUBY_LIB=${RUBY_LIB:Q} \
431 RUBY_ARCHLIB=${RUBY_ARCHLIB:Q} \ 431 RUBY_ARCHLIB=${RUBY_ARCHLIB:Q} \
432 RUBY_SITELIB_BASE=${RUBY_SITELIB_BASE:Q} \ 432 RUBY_SITELIB_BASE=${RUBY_SITELIB_BASE:Q} \
433 RUBY_SITELIB=${RUBY_SITELIB:Q} \ 433 RUBY_SITELIB=${RUBY_SITELIB:Q} \
434 RUBY_SITEARCHLIB=${RUBY_SITEARCHLIB:Q} \ 434 RUBY_SITEARCHLIB=${RUBY_SITEARCHLIB:Q} \
435 RUBY_VENDORLIB_BASE=${RUBY_VENDORLIB_BASE:Q} \ 435 RUBY_VENDORLIB_BASE=${RUBY_VENDORLIB_BASE:Q} \
436 RUBY_VENDORLIB=${RUBY_VENDORLIB:Q} \ 436 RUBY_VENDORLIB=${RUBY_VENDORLIB:Q} \
437 RUBY_VENDORARCHLIB=${RUBY_VENDORARCHLIB:Q} \ 437 RUBY_VENDORARCHLIB=${RUBY_VENDORARCHLIB:Q} \
438 RUBY_DOC=${RUBY_DOC:Q} \ 438 RUBY_DOC=${RUBY_DOC:Q} \
439 RUBY_EG=${RUBY_EG:Q} \ 439 RUBY_EG=${RUBY_EG:Q} \
440 RUBY_GEM_BASE=${RUBY_GEM_BASE:Q} \ 440 RUBY_GEM_BASE=${RUBY_GEM_BASE:Q} \
441 GEM_HOME=${GEM_HOME:Q} \ 441 GEM_HOME=${GEM_HOME:Q} \
442 RUBY_RIDIR=${RUBY_RIDIR:Q} \ 442 RUBY_RIDIR=${RUBY_RIDIR:Q} \
443 RUBY_BASERIDIR=${RUBY_BASERIDIR:Q} \ 443 RUBY_BASERIDIR=${RUBY_BASERIDIR:Q} \
444 RUBY_SYSRIDIR=${RUBY_SYSRIDIR:Q} \ 444 RUBY_SYSRIDIR=${RUBY_SYSRIDIR:Q} \
445 RUBY_SITERIDIR=${RUBY_SITERIDIR:Q} 445 RUBY_SITERIDIR=${RUBY_SITERIDIR:Q}
446 446
447# 447#
448# substitutions 448# substitutions
449# 449#
450FILES_SUBST+= RUBY=${RUBY:Q} RUBY_NAME=${RUBY_NAME:Q} \ 450FILES_SUBST+= RUBY=${RUBY:Q} RUBY_NAME=${RUBY_NAME:Q} \
451 RUBY_PKGPREFIX=${RUBY_PKGPREFIX:Q} \ 451 RUBY_PKGPREFIX=${RUBY_PKGPREFIX:Q} \
452 RUBY_VER=${RUBY_VER:Q} \ 452 RUBY_VER=${RUBY_VER:Q} \
453 ${PLIST_RUBY_DIRS} 453 ${PLIST_RUBY_DIRS}
454 454
455MESSAGE_SUBST+= RUBY="${RUBY}" RUBY_VER="${RUBY_VER}" \ 455MESSAGE_SUBST+= RUBY="${RUBY}" RUBY_VER="${RUBY_VER}" \
456 RUBY_VERSION="${RUBY_VERSION}" \ 456 RUBY_VERSION="${RUBY_VERSION}" \
457 RUBY_PKGPREFIX="${RUBY_PKGPREFIX}" \ 457 RUBY_PKGPREFIX="${RUBY_PKGPREFIX}" \
458 ${PLIST_RUBY_DIRS:S,DIR="${PREFIX}/,DIR=",} 458 ${PLIST_RUBY_DIRS:S,DIR="${PREFIX}/,DIR=",}
459 459
460PLIST_SUBST+= RUBY=${RUBY:Q} RUBY_VER=${RUBY_VER:Q} \ 460PLIST_SUBST+= RUBY=${RUBY:Q} RUBY_VER=${RUBY_VER:Q} \
461 RUBY_PKGPREFIX=${RUBY_PKGPREFIX} \ 461 RUBY_PKGPREFIX=${RUBY_PKGPREFIX} \
462 RUBY_VERSION=${RUBY_VERSION:Q} \ 462 RUBY_VERSION=${RUBY_VERSION:Q} \
463 RUBY_VER_DIR=${RUBY_VER_DIR:Q} \ 463 RUBY_VER_DIR=${RUBY_VER_DIR:Q} \
464 RUBY_DLEXT=${RUBY_DLEXT:Q} RUBY_SLEXT=${RUBY_SLEXT:Q} \ 464 RUBY_DLEXT=${RUBY_DLEXT:Q} RUBY_SLEXT=${RUBY_SLEXT:Q} \
465 RUBY_SHLIB=${RUBY_SHLIB:Q} \ 465 RUBY_SHLIB=${RUBY_SHLIB:Q} \
466 RUBY_SHLIBALIAS=${RUBY_SHLIBALIAS:Q} \ 466 RUBY_SHLIBALIAS=${RUBY_SHLIBALIAS:Q} \
467 RUBY_STATICLIB=${RUBY_STATICLIB:Q} \ 467 RUBY_STATICLIB=${RUBY_STATICLIB:Q} \
468 RUBY_ARCH=${RUBY_ARCH:Q} \ 468 RUBY_ARCH=${RUBY_ARCH:Q} \
469 ${PLIST_RUBY_DIRS:S,DIR="${PREFIX}/,DIR=",} 469 ${PLIST_RUBY_DIRS:S,DIR="${PREFIX}/,DIR=",}
470 470
471# 471#
472# make dynamic PLIST 472# make dynamic PLIST
473# 473#
474.if !empty(RUBY_DYNAMIC_DIRS) 474.if !empty(RUBY_DYNAMIC_DIRS)
475 475
476RUBY_PLIST_DYNAMIC= ${WRKDIR}/PLIST.work 476RUBY_PLIST_DYNAMIC= ${WRKDIR}/PLIST.work
477 477
478.if !defined(PLIST_SRC) 478.if !defined(PLIST_SRC)
479. if exists(${PKGDIR}/PLIST.common) 479. if exists(${PKGDIR}/PLIST.common)
480PLIST_SRC+= ${PKGDIR}/PLIST.common 480PLIST_SRC+= ${PKGDIR}/PLIST.common
481. elif exists(${PKGDIR}/PLIST) 481. elif exists(${PKGDIR}/PLIST)
482PLIST_SRC+= ${PKGDIR}/PLIST 482PLIST_SRC+= ${PKGDIR}/PLIST
483. endif 483. endif
484 484
485PLIST_SRC+= ${RUBY_PLIST_DYNAMIC} 485PLIST_SRC+= ${RUBY_PLIST_DYNAMIC}
486 486
487. if exists(${PKGDIR}/PLIST.common_end) 487. if exists(${PKGDIR}/PLIST.common_end)
488PLIST_SRC+= ${PKGDIR}/PLIST.common_end 488PLIST_SRC+= ${PKGDIR}/PLIST.common_end
489. endif 489. endif
490 490
491.endif 491.endif
492 492
493RUBY_PLIST_COMMENT_CMD= \ 493RUBY_PLIST_COMMENT_CMD= \
494 ${ECHO} "@comment The following lines are automatically generated" 494 ${ECHO} "@comment The following lines are automatically generated"
495RUBY_PLIST_FILES_CMD= ( cd ${DESTDIR}${PREFIX}; \ 495RUBY_PLIST_FILES_CMD= ( cd ${DESTDIR}${PREFIX}; \
496 ${FIND} ${RUBY_DYNAMIC_DIRS} \( -type f -o -type l \) -print ) | \ 496 ${FIND} ${RUBY_DYNAMIC_DIRS} \( -type f -o -type l \) -print ) | \
497 ${SORT} -u 497 ${SORT} -u
498RUBY_GENERATE_PLIST = ( \ 498RUBY_GENERATE_PLIST = ( \
499 ${RUBY_PLIST_COMMENT_CMD}; \ 499 ${RUBY_PLIST_COMMENT_CMD}; \
500 ${RUBY_PLIST_FILES_CMD} ) > ${RUBY_PLIST_DYNAMIC} 500 ${RUBY_PLIST_FILES_CMD} ) > ${RUBY_PLIST_DYNAMIC}
501.endif 501.endif
502 502
503PRINT_PLIST_AWK+= /lib\/libruby${RUBY_STATICLIB}$$/ \ 503PRINT_PLIST_AWK+= /lib\/libruby${RUBY_STATICLIB}$$/ \
504 { sub(/${RUBY_STATICLIB}/, "$${RUBY_STATICLIB}"); } 504 { sub(/${RUBY_STATICLIB}/, "$${RUBY_STATICLIB}"); }
505PRINT_PLIST_AWK+= /lib\/libruby${RUBY_VER}\.${RUBY_SLEXT}/ \ 505PRINT_PLIST_AWK+= /lib\/libruby${RUBY_VER}\.${RUBY_SLEXT}/ \
506 { sub(/${RUBY_VER}\.${RUBY_SLEXT}$$/, \ 506 { sub(/${RUBY_VER}\.${RUBY_SLEXT}$$/, \
507 "$${RUBY_VER}.$${RUBY_SLEXT}"); } 507 "$${RUBY_VER}.$${RUBY_SLEXT}"); }
508PRINT_PLIST_AWK+= /${RUBY_SHLIB}$$/ \ 508PRINT_PLIST_AWK+= /${RUBY_SHLIB}$$/ \
509 { sub(/${RUBY_SHLIB}$$/, "$${RUBY_SHLIB}"); } 509 { sub(/${RUBY_SHLIB}$$/, "$${RUBY_SHLIB}"); }
510PRINT_PLIST_AWK+= /${RUBY_SLEXT}\.${RUBY_SHLIBVER}$$/ \ 510PRINT_PLIST_AWK+= /${RUBY_SLEXT}\.${RUBY_SHLIBVER}$$/ \
511 { sub(/${RUBY_SLEXT}\.${RUBY_SHLIBVER}$$/, \ 511 { sub(/${RUBY_SLEXT}\.${RUBY_SHLIBVER}$$/, \
512 "$${RUBY_SLEXT}.$${RUBY_SHLIBVER}"); } 512 "$${RUBY_SLEXT}.$${RUBY_SHLIBVER}"); }
513.if ${RUBY_SHLIBALIAS} != "@comment" 513.if ${RUBY_SHLIBALIAS} != "@comment"
514PRINT_PLIST_AWK+= /${RUBY_SHLIBALIAS:S/\//\\\//}$$/ \ 514PRINT_PLIST_AWK+= /${RUBY_SHLIBALIAS:S/\//\\\//}$$/ \
515 { sub(/${RUBY_SHLIBALIAS:S/\//\\\//}$$/, \ 515 { sub(/${RUBY_SHLIBALIAS:S/\//\\\//}$$/, \
516 "$${RUBY_SHLIBALIAS}"); } 516 "$${RUBY_SHLIBALIAS}"); }
517.endif 517.endif
518PRINT_PLIST_AWK+= /^${RUBY_ARCHINC:S|/|\\/|g}/ \ 518PRINT_PLIST_AWK+= /^${RUBY_ARCHINC:S|/|\\/|g}/ \
519 { gsub(/${RUBY_ARCHINC:S|/|\\/|g}/, "$${RUBY_ARCHINC}"); \ 519 { gsub(/${RUBY_ARCHINC:S|/|\\/|g}/, "$${RUBY_ARCHINC}"); \
520 print; next; } 520 print; next; }
521PRINT_PLIST_AWK+= /^${RUBY_INC:S|/|\\/|g}/ \ 521PRINT_PLIST_AWK+= /^${RUBY_INC:S|/|\\/|g}/ \
522 { gsub(/${RUBY_INC:S|/|\\/|g}/, "$${RUBY_INC}"); \ 522 { gsub(/${RUBY_INC:S|/|\\/|g}/, "$${RUBY_INC}"); \
523 print; next; } 523 print; next; }
524PRINT_PLIST_AWK+= /\.${RUBY_DLEXT}$$/ \ 524PRINT_PLIST_AWK+= /\.${RUBY_DLEXT}$$/ \
525 { gsub(/${RUBY_DLEXT}$$/, "$${RUBY_DLEXT}") } 525 { gsub(/${RUBY_DLEXT}$$/, "$${RUBY_DLEXT}") }
526PRINT_PLIST_AWK+= /^${RUBY_ARCHLIB:S|/|\\/|g}/ \ 526PRINT_PLIST_AWK+= /^${RUBY_ARCHLIB:S|/|\\/|g}/ \
527 { gsub(/${RUBY_ARCHLIB:S|/|\\/|g}/, "$${RUBY_ARCHLIB}"); \ 527 { gsub(/${RUBY_ARCHLIB:S|/|\\/|g}/, "$${RUBY_ARCHLIB}"); \
528 print; next; } 528 print; next; }
529PRINT_PLIST_AWK+= /^${RUBY_VENDORARCHLIB:S|/|\\/|g}/ \ 529PRINT_PLIST_AWK+= /^${RUBY_VENDORARCHLIB:S|/|\\/|g}/ \
530 { gsub(/${RUBY_VENDORARCHLIB:S|/|\\/|g}/, "$${RUBY_VENDORARCHLIB}"); \ 530 { gsub(/${RUBY_VENDORARCHLIB:S|/|\\/|g}/, "$${RUBY_VENDORARCHLIB}"); \
531 print; next; } 531 print; next; }
532PRINT_PLIST_AWK+= /^${RUBY_VENDORLIB:S|/|\\/|g}/ \ 532PRINT_PLIST_AWK+= /^${RUBY_VENDORLIB:S|/|\\/|g}/ \
533 { gsub(/${RUBY_VENDORLIB:S|/|\\/|g}/, "$${RUBY_VENDORLIB}"); \ 533 { gsub(/${RUBY_VENDORLIB:S|/|\\/|g}/, "$${RUBY_VENDORLIB}"); \
534 print; next; } 534 print; next; }
535PRINT_PLIST_AWK+= /^${RUBY_SITEARCHLIB:S|/|\\/|g}/ \ 535PRINT_PLIST_AWK+= /^${RUBY_SITEARCHLIB:S|/|\\/|g}/ \
536 { gsub(/${RUBY_SITEARCHLIB:S|/|\\/|g}/, "$${RUBY_SITEARCHLIB}"); \ 536 { gsub(/${RUBY_SITEARCHLIB:S|/|\\/|g}/, "$${RUBY_SITEARCHLIB}"); \
537 print; next; } 537 print; next; }
538PRINT_PLIST_AWK+= /^${RUBY_SITELIB:S|/|\\/|g}/ \ 538PRINT_PLIST_AWK+= /^${RUBY_SITELIB:S|/|\\/|g}/ \
539 { gsub(/${RUBY_SITELIB:S|/|\\/|g}/, "$${RUBY_SITELIB}"); \ 539 { gsub(/${RUBY_SITELIB:S|/|\\/|g}/, "$${RUBY_SITELIB}"); \
540 print; next; } 540 print; next; }
541PRINT_PLIST_AWK+= /^${RUBY_SITELIB_BASE:S|/|\\/|g}/ \ 541PRINT_PLIST_AWK+= /^${RUBY_SITELIB_BASE:S|/|\\/|g}/ \
542 { gsub(/${RUBY_SITELIB_BASE:S|/|\\/|g}/, "$${RUBY_SITELIB_BASE}"); \ 542 { gsub(/${RUBY_SITELIB_BASE:S|/|\\/|g}/, "$${RUBY_SITELIB_BASE}"); \
543 print; next; } 543 print; next; }
544PRINT_PLIST_AWK+= /^${RUBY_VENDORLIB_BASE:S|/|\\/|g}/ \ 544PRINT_PLIST_AWK+= /^${RUBY_VENDORLIB_BASE:S|/|\\/|g}/ \
545 { gsub(/${RUBY_VENDORLIB_BASE:S|/|\\/|g}/, "$${RUBY_VENDORLIB_BASE}"); \ 545 { gsub(/${RUBY_VENDORLIB_BASE:S|/|\\/|g}/, "$${RUBY_VENDORLIB_BASE}"); \
546 print; next; } 546 print; next; }
547PRINT_PLIST_AWK+= /^${RUBY_LIB:S|/|\\/|g}/ \ 547PRINT_PLIST_AWK+= /^${RUBY_LIB:S|/|\\/|g}/ \
548 { gsub(/${RUBY_LIB:S|/|\\/|g}/, "$${RUBY_LIB}"); \ 548 { gsub(/${RUBY_LIB:S|/|\\/|g}/, "$${RUBY_LIB}"); \
549 print; next; } 549 print; next; }
550PRINT_PLIST_AWK+= /^${RUBY_DOC:S|/|\\/|g}/ \ 550PRINT_PLIST_AWK+= /^${RUBY_DOC:S|/|\\/|g}/ \
551 { gsub(/${RUBY_DOC:S|/|\\/|g}/, "$${RUBY_DOC}"); \ 551 { gsub(/${RUBY_DOC:S|/|\\/|g}/, "$${RUBY_DOC}"); \
552 print; next; } 552 print; next; }
553PRINT_PLIST_AWK+= /^${RUBY_EG:S|/|\\/|g}/ \ 553PRINT_PLIST_AWK+= /^${RUBY_EG:S|/|\\/|g}/ \
554 { gsub(/${RUBY_EG:S|/|\\/|g}/, "$${RUBY_EG}"); \ 554 { gsub(/${RUBY_EG:S|/|\\/|g}/, "$${RUBY_EG}"); \
555 print; next; } 555 print; next; }
556PRINT_PLIST_AWK+= /^${RUBY_SITERIDIR:S|/|\\/|g}/ \ 556PRINT_PLIST_AWK+= /^${RUBY_SITERIDIR:S|/|\\/|g}/ \
557 { gsub(/${RUBY_SITERIDIR:S|/|\\/|g}/, "$${RUBY_SITERIDIR}"); \ 557 { gsub(/${RUBY_SITERIDIR:S|/|\\/|g}/, "$${RUBY_SITERIDIR}"); \
558 print; next; } 558 print; next; }
559PRINT_PLIST_AWK+= /^${RUBY_SYSRIDIR:S|/|\\/|g}\// \ 559PRINT_PLIST_AWK+= /^${RUBY_SYSRIDIR:S|/|\\/|g}\// \
560 { next; } 560 { next; }
561PRINT_PLIST_AWK+= /\/${RUBY_NAME}/ \ 561PRINT_PLIST_AWK+= /\/${RUBY_NAME}/ \
562 { sub(/${RUBY_NAME}/, "$${RUBY_NAME}"); } 562 { sub(/${RUBY_NAME}/, "$${RUBY_NAME}"); }
563PRINT_PLIST_AWK+= /^${GEM_HOME:S|/|\\/|g:S|.|\\.|g}/ \ 563PRINT_PLIST_AWK+= /^${GEM_HOME:S|/|\\/|g:S|.|\\.|g}/ \
564 { gsub(/${GEM_HOME:S|/|\\/|g}/, "$${GEM_HOME}"); } 564 { gsub(/${GEM_HOME:S|/|\\/|g}/, "$${GEM_HOME}"); }
565 565
566.endif # _RUBY_MK 566.endif # _RUBY_MK
cvs diff -r1.75 -r1.76 pkgsrc/lang/ruby18-base/Attic/Makefile (switch to unified diff)

--- pkgsrc/lang/ruby18-base/Attic/Makefile 2012/10/06 16:30:28 1.75
+++ pkgsrc/lang/ruby18-base/Attic/Makefile 2012/10/12 15:27:48 1.76
@@ -1,168 +1,167 @@ @@ -1,168 +1,167 @@
1# $NetBSD: Makefile,v 1.75 2012/10/06 16:30:28 taca Exp $ 1# $NetBSD: Makefile,v 1.76 2012/10/12 15:27:48 taca Exp $
2# 2#
3 3
4DISTNAME= ${RUBY_DISTNAME} 4DISTNAME= ${RUBY_DISTNAME}
5PKGNAME= ${RUBY_PKGPREFIX}-base-${RUBY_VERSION_FULL} 5PKGNAME= ${RUBY_PKGPREFIX}-base-${RUBY_VERSION_FULL}
6PKGREVISION= 2 
7CATEGORIES= lang ruby 6CATEGORIES= lang ruby
8MASTER_SITES= ${MASTER_SITE_RUBY} 7MASTER_SITES= ${MASTER_SITE_RUBY}
9 8
10MAINTAINER= taca@NetBSD.org 9MAINTAINER= taca@NetBSD.org
11HOMEPAGE= ${RUBY_HOMEPAGE} 10HOMEPAGE= ${RUBY_HOMEPAGE}
12COMMENT= Ruby 1.8 based release minimum package 11COMMENT= Ruby 1.8 based release minimum package
13LICENSE= gnu-gpl-v2 OR ruby-license 12LICENSE= gnu-gpl-v2 OR ruby-license
14 13
15RUBY_VERSION_SUPPORTED= 18 14RUBY_VERSION_SUPPORTED= 18
16 15
17CONFLICTS= ${RUBY_PKGPREFIX}-dbm-[0-9]* \ 16CONFLICTS= ${RUBY_PKGPREFIX}-dbm-[0-9]* \
18 ${RUBY_PKGPREFIX}-digest-[0-9]* \ 17 ${RUBY_PKGPREFIX}-digest-[0-9]* \
19 ${RUBY_PKGPREFIX}-iconv-[0-9]* \ 18 ${RUBY_PKGPREFIX}-iconv-[0-9]* \
20 ${RUBY_PKGPREFIX}-openssl-[0-9]* \ 19 ${RUBY_PKGPREFIX}-openssl-[0-9]* \
21 ${RUBY_PKGPREFIX}-tcltk-[0-9]* 20 ${RUBY_PKGPREFIX}-tcltk-[0-9]*
22 21
23USE_LANGUAGES= c 22USE_LANGUAGES= c
24USE_TOOLS+= pax yacc 23USE_TOOLS+= pax yacc
25GNU_CONFIGURE= yes 24GNU_CONFIGURE= yes
26TEST_TARGET= test 25TEST_TARGET= test
27CONFIGURE_ARGS+= --enable-shared \ 26CONFIGURE_ARGS+= --enable-shared \
28 --with-ssl-include="${BUILDLINK_PREFIX.openssl}/include" \ 27 --with-ssl-include="${BUILDLINK_PREFIX.openssl}/include" \
29 --with-ssl-lib="${BUILDLINK_PREFIX.openssl}/lib" 28 --with-ssl-lib="${BUILDLINK_PREFIX.openssl}/lib"
30WRKSRC= ${RUBY_WRKSRC} 29WRKSRC= ${RUBY_WRKSRC}
31 30
32# 31#
33# Don't refrect pkgsrc's INSTALL macro since Ruby expect it could 32# Don't refrect pkgsrc's INSTALL macro since Ruby expect it could
34# execute by unprivileged user. 33# execute by unprivileged user.
35# 34#
36CONFIGURE_ENV+= INSTALL="${INSTALL} ${COPY}" \ 35CONFIGURE_ENV+= INSTALL="${INSTALL} ${COPY}" \
37 INSTALL_DATA= INSTALL_PROGRAM= INSTALL_SCRIPT= 36 INSTALL_DATA= INSTALL_PROGRAM= INSTALL_SCRIPT=
38 37
39.include "../../mk/compiler.mk" 38.include "../../mk/compiler.mk"
40 39
41.if !empty(PKGSRC_COMPILER:Msunpro) 40.if !empty(PKGSRC_COMPILER:Msunpro)
42LIBS.SunOS+= -B static -lsunmath -B dynamic -lm 41LIBS.SunOS+= -B static -lsunmath -B dynamic -lm
43LDFLAGS.SunOS+= -L${SUNWSPROBASE}/lib ${COMPILER_RPATH_FLAG}${SUNWSPROBASE}/lib 42LDFLAGS.SunOS+= -L${SUNWSPROBASE}/lib ${COMPILER_RPATH_FLAG}${SUNWSPROBASE}/lib
44CONFIGURE_ENV+= LDSHARED="${CC} -G" 43CONFIGURE_ENV+= LDSHARED="${CC} -G"
45.else 44.else
46LIBS.SunOS+= -lm 45LIBS.SunOS+= -lm
47.endif 46.endif
48 47
49.if !empty(PKGSRC_COMPILER:Mclang) 48.if !empty(PKGSRC_COMPILER:Mclang)
50CONFIGURE_ARGS+= --enable-frame-address 49CONFIGURE_ARGS+= --enable-frame-address
51.endif 50.endif
52 51
53# Avoid segfaults as per https://bugs.ruby-lang.org/issues/6383 52# Avoid segfaults as per https://bugs.ruby-lang.org/issues/6383
54.if !empty(CC_VERSION:Mgcc-4.[7-9].*) 53.if !empty(CC_VERSION:Mgcc-4.[7-9].*)
55CFLAGS+= -fno-tree-dce -fno-optimize-sibling-calls 54CFLAGS+= -fno-tree-dce -fno-optimize-sibling-calls
56.endif 55.endif
57 56
58# Ruby build process depends on config.status's content 57# Ruby build process depends on config.status's content
59CONFIG_STATUS_OVERRIDE= # empty 58CONFIG_STATUS_OVERRIDE= # empty
60 59
61MAKE_DIRS+= ${RUBY_SITERIDIR} 60MAKE_DIRS+= ${RUBY_SITERIDIR}
62FILES_SUBST+= DATE=${DATE:Q} 61FILES_SUBST+= DATE=${DATE:Q}
63 62
64.include "options.mk" 63.include "options.mk"
65 64
66.include "../../lang/ruby/rubyversion.mk" 65.include "../../lang/ruby/rubyversion.mk"
67 66
68.if !empty(RUBY_SUFFIX) 67.if !empty(RUBY_SUFFIX)
69CONFIGURE_ARGS+= --program-suffix=${RUBY_SUFFIX:Q} 68CONFIGURE_ARGS+= --program-suffix=${RUBY_SUFFIX:Q}
70.endif 69.endif
71 70
72# 71#
73# IRIX work around which should be fixed. 72# IRIX work around which should be fixed.
74# 73#
75PLIST_VARS+= io 74PLIST_VARS+= io
76.if ${OPSYS} != "IRIX" 75.if ${OPSYS} != "IRIX"
77PLIST.io= yes 76PLIST.io= yes
78.endif 77.endif
79 78
80# 79#
81# Work around for ucontext(3). It was broken in older DragonFly 80# Work around for ucontext(3). It was broken in older DragonFly
82# versions and is slow in newer ones. 81# versions and is slow in newer ones.
83# 82#
84.if ${OPSYS} == "DragonFly" 83.if ${OPSYS} == "DragonFly"
85CONFIGURE_ENV+= ac_cv_header_ucontext_h=no 84CONFIGURE_ENV+= ac_cv_header_ucontext_h=no
86.endif 85.endif
87 86
88# 87#
89# work around for getaddrinfo(3) 88# work around for getaddrinfo(3)
90# 89#
91.if ${OPSYS} == "SunOS" && !empty(OS_VERSION:M5.[6-9]) 90.if ${OPSYS} == "SunOS" && !empty(OS_VERSION:M5.[6-9])
92CONFIGURE_ARGS+= --enable-wide-getaddrinfo 91CONFIGURE_ARGS+= --enable-wide-getaddrinfo
93.endif 92.endif
94 93
95DOCS= COPYING COPYING.ja ChangeLog NEWS README \ 94DOCS= COPYING COPYING.ja ChangeLog NEWS README \
96 README.EXT README.EXT.ja README.ja ToDo \ 95 README.EXT README.EXT.ja README.ja ToDo \
97 doc/ChangeLog-1.8.0 doc/NEWS-1.8.0 \ 96 doc/ChangeLog-1.8.0 doc/NEWS-1.8.0 \
98 doc/forwardable.rd doc/forwardable.rd.ja \ 97 doc/forwardable.rd doc/forwardable.rd.ja \
99 doc/irb/irb-tools.rd.ja doc/irb/irb.rd doc/irb/irb.rd.ja \ 98 doc/irb/irb-tools.rd.ja doc/irb/irb.rd doc/irb/irb.rd.ja \
100 doc/shell.rd doc/shell.rd.ja 99 doc/shell.rd doc/shell.rd.ja
101EXT_DOCS= bigdecimal/bigdecimal_en.html bigdecimal/bigdecimal_ja.html \ 100EXT_DOCS= bigdecimal/bigdecimal_en.html bigdecimal/bigdecimal_ja.html \
102 dl/doc/dl.txt etc/etc.txt etc/etc.txt.ja syslog/syslog.txt \ 101 dl/doc/dl.txt etc/etc.txt etc/etc.txt.ja syslog/syslog.txt \
103 zlib/doc/zlib.rd 102 zlib/doc/zlib.rd
104 103
105BIGDECIMAL_EXAMPLES= linear.rb nlsolve.rb pi.rb 104BIGDECIMAL_EXAMPLES= linear.rb nlsolve.rb pi.rb
106DL_EXAMPLES= c++sample.C c++sample.rb drives.rb getch.rb libc.rb \ 105DL_EXAMPLES= c++sample.C c++sample.rb drives.rb getch.rb libc.rb \
107 msgbox.rb msgbox2.rb stream.rb 106 msgbox.rb msgbox2.rb stream.rb
108OPENSSL_EXAMPLES= c_rehash.rb cert2text.rb cert_store_view.rb \ 107OPENSSL_EXAMPLES= c_rehash.rb cert2text.rb cert_store_view.rb \
109 certstore.rb cipher.rb crlstore.rb echo_cli.rb \ 108 certstore.rb cipher.rb crlstore.rb echo_cli.rb \
110 echo_svr.rb gen_csr.rb smime_read.rb smime_write.rb \ 109 echo_svr.rb gen_csr.rb smime_read.rb smime_write.rb \
111 wget.rb 110 wget.rb
112PTY_EXAMPLES= expect_sample.rb script.rb shl.rb 111PTY_EXAMPLES= expect_sample.rb script.rb shl.rb
113 112
114REPLACE_RUBY_DIRS= bin ext lib sample 113REPLACE_RUBY_DIRS= bin ext lib sample
115REPLACE_RUBY= ext/dl/h2rb 114REPLACE_RUBY= ext/dl/h2rb
116INSTALLATION_DIRS= bin ${RUBY_ARCHLIB} ${RUBY_DOC}/irb ${RUBY_DOC}/pty \ 115INSTALLATION_DIRS= bin ${RUBY_ARCHLIB} ${RUBY_DOC}/irb ${RUBY_DOC}/pty \
117 ${RUBY_EG}/bigdecimal ${RUBY_EG}/dl \ 116 ${RUBY_EG}/bigdecimal ${RUBY_EG}/dl \
118 ${RUBY_EG}/openssl ${RUBY_EG}/pty 117 ${RUBY_EG}/openssl ${RUBY_EG}/pty
119FIX_PERM= ${RUBY_ARCHLIB}/digest.h ${RUBY_ARCHLIB}/dl.h \ 118FIX_PERM= ${RUBY_ARCHLIB}/digest.h ${RUBY_ARCHLIB}/dl.h \
120 ${RUBY_ARCHLIB}/dlconfig.h 119 ${RUBY_ARCHLIB}/dlconfig.h
121 120
122pre-configure: 121pre-configure:
123 ${RM} -f ${WRKSRC}/ext/curses/extconf.rb 122 ${RM} -f ${WRKSRC}/ext/curses/extconf.rb
124 ${RM} -f ${WRKSRC}/ext/gdbm/extconf.rb 123 ${RM} -f ${WRKSRC}/ext/gdbm/extconf.rb
125 ${RM} -f ${WRKSRC}/ext/readline/extconf.rb 124 ${RM} -f ${WRKSRC}/ext/readline/extconf.rb
126 ${RM} -f ${WRKSRC}/ext/tk/extconf.rb 125 ${RM} -f ${WRKSRC}/ext/tk/extconf.rb
127 126
128pre-install: 127pre-install:
129 cd ${WRKSRC}; ${FIND} . \( -name '*.orig' -o -name '*.orig_dist' \) \ 128 cd ${WRKSRC}; ${FIND} . \( -name '*.orig' -o -name '*.orig_dist' \) \
130 -exec ${RM} -f {} \; 129 -exec ${RM} -f {} \;
131 130
132post-install: 131post-install:
133 ${INSTALL_DATA} ${FILESDIR}/CHANGES.pkgsrc ${DESTDIR}${PREFIX}/${RUBY_DOC} 132 ${INSTALL_DATA} ${FILESDIR}/CHANGES.pkgsrc ${DESTDIR}${PREFIX}/${RUBY_DOC}
134.for f in ${DOCS} 133.for f in ${DOCS}
135 ${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${PREFIX}/${RUBY_DOC}/${f:C/^doc\///} 134 ${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${PREFIX}/${RUBY_DOC}/${f:C/^doc\///}
136.endfor 135.endfor
137 ${INSTALL_SCRIPT} ${WRKSRC}/ext/dl/h2rb ${DESTDIR}${PREFIX}/bin/h2rb${RUBY_VER} 136 ${INSTALL_SCRIPT} ${WRKSRC}/ext/dl/h2rb ${DESTDIR}${PREFIX}/bin/h2rb${RUBY_VER}
138.for f in ${EXT_DOCS} 137.for f in ${EXT_DOCS}
139 ${INSTALL_DATA} ${WRKSRC}/ext/${f} ${DESTDIR}${PREFIX}/${RUBY_DOC} 138 ${INSTALL_DATA} ${WRKSRC}/ext/${f} ${DESTDIR}${PREFIX}/${RUBY_DOC}
140.endfor 139.endfor
141 cd ${WRKSRC}/ext/pty; ${PAX} -rw README.* ${DESTDIR}${PREFIX}/${RUBY_DOC}/pty 140 cd ${WRKSRC}/ext/pty; ${PAX} -rw README.* ${DESTDIR}${PREFIX}/${RUBY_DOC}/pty
142 cd ${WRKSRC}/sample; ${PAX} -rw . ${DESTDIR}${PREFIX}/${RUBY_EG} 141 cd ${WRKSRC}/sample; ${PAX} -rw . ${DESTDIR}${PREFIX}/${RUBY_EG}
143.for f in ${BIGDECIMAL_EXAMPLES} 142.for f in ${BIGDECIMAL_EXAMPLES}
144 ${INSTALL_DATA} ${RUBY_WRKSRC}/ext/bigdecimal/sample/${f} \ 143 ${INSTALL_DATA} ${RUBY_WRKSRC}/ext/bigdecimal/sample/${f} \
145 ${DESTDIR}${PREFIX}/${RUBY_EG}/bigdecimal 144 ${DESTDIR}${PREFIX}/${RUBY_EG}/bigdecimal
146.endfor 145.endfor
147.for f in ${DL_EXAMPLES} 146.for f in ${DL_EXAMPLES}
148 ${INSTALL_DATA} ${RUBY_WRKSRC}/ext/dl/sample/${f} \ 147 ${INSTALL_DATA} ${RUBY_WRKSRC}/ext/dl/sample/${f} \
149 ${DESTDIR}${PREFIX}/${RUBY_EG}/dl 148 ${DESTDIR}${PREFIX}/${RUBY_EG}/dl
150.endfor 149.endfor
151.for f in ${OPENSSL_EXAMPLES} 150.for f in ${OPENSSL_EXAMPLES}
152 ${INSTALL_DATA} ${RUBY_WRKSRC}/sample/openssl/${f} \ 151 ${INSTALL_DATA} ${RUBY_WRKSRC}/sample/openssl/${f} \
153 ${DESTDIR}${PREFIX}/${RUBY_EG}/openssl 152 ${DESTDIR}${PREFIX}/${RUBY_EG}/openssl
154.endfor 153.endfor
155.for f in ${PTY_EXAMPLES} 154.for f in ${PTY_EXAMPLES}
156 ${INSTALL_DATA} ${WRKSRC}/ext/pty/${f} ${DESTDIR}${PREFIX}/${RUBY_EG}/pty 155 ${INSTALL_DATA} ${WRKSRC}/ext/pty/${f} ${DESTDIR}${PREFIX}/${RUBY_EG}/pty
157.endfor 156.endfor
158.for f in ${FIX_PERM} 157.for f in ${FIX_PERM}
159 ${CHMOD} ${SHAREMODE} ${DESTDIR}${PREFIX}/${f} 158 ${CHMOD} ${SHAREMODE} ${DESTDIR}${PREFIX}/${f}
160.endfor 159.endfor
161 ${RUBY_GENERATE_PLIST} 160 ${RUBY_GENERATE_PLIST}
162 161
163.include "../../mk/bdb.buildlink3.mk" 162.include "../../mk/bdb.buildlink3.mk"
164.include "../../converters/libiconv/buildlink3.mk" 163.include "../../converters/libiconv/buildlink3.mk"
165.include "../../devel/zlib/buildlink3.mk" 164.include "../../devel/zlib/buildlink3.mk"
166.include "../../security/openssl/buildlink3.mk" 165.include "../../security/openssl/buildlink3.mk"
167.include "../../lang/ruby/Makefile.common" 166.include "../../lang/ruby/Makefile.common"
168.include "../../mk/bsd.pkg.mk" 167.include "../../mk/bsd.pkg.mk"
cvs diff -r1.57 -r1.58 pkgsrc/lang/ruby18-base/Attic/distinfo (switch to unified diff)

--- pkgsrc/lang/ruby18-base/Attic/distinfo 2012/10/06 16:30:28 1.57
+++ pkgsrc/lang/ruby18-base/Attic/distinfo 2012/10/12 15:27:48 1.58
@@ -1,52 +1,51 @@ @@ -1,52 +1,51 @@
1$NetBSD: distinfo,v 1.57 2012/10/06 16:30:28 taca Exp $ 1$NetBSD: distinfo,v 1.58 2012/10/12 15:27:48 taca Exp $
2 2
3SHA1 (ruby-1.8.7-p370.tar.bz2) = 92770a8159cd9049ffc5bc3ce4777b701eb19d7b 3SHA1 (ruby-1.8.7-p371.tar.bz2) = 2a709358417330cfacba6b9f8206eab577640b2b
4RMD160 (ruby-1.8.7-p370.tar.bz2) = 0c35ed92e4e77c6e6859d39244489c93f4efad50 4RMD160 (ruby-1.8.7-p371.tar.bz2) = ad1da5b8b8e818d6a77b70ab81586a37099cbac0
5Size (ruby-1.8.7-p370.tar.bz2) = 4211597 bytes 5Size (ruby-1.8.7-p371.tar.bz2) = 4248262 bytes
6SHA1 (patch-aa) = 9f0ffa6fd0bcf2f59eba2604d2b6a4aaad075231 6SHA1 (patch-aa) = 9f0ffa6fd0bcf2f59eba2604d2b6a4aaad075231
7SHA1 (patch-ab) = 1466b6179cb6ac3a8ee3255eab98a1d3065a12ed 7SHA1 (patch-ab) = 1466b6179cb6ac3a8ee3255eab98a1d3065a12ed
8SHA1 (patch-ac) = 0119134d778bb85c58ef5bfe30d337dc76ed47e0 8SHA1 (patch-ac) = 0119134d778bb85c58ef5bfe30d337dc76ed47e0
9SHA1 (patch-ad) = 2b194a26f3a7b9bdf3afcc0819ab239479f47c5b 9SHA1 (patch-ad) = 2b194a26f3a7b9bdf3afcc0819ab239479f47c5b
10SHA1 (patch-aw) = d3dc491da64426ff72a9417a65eb99bee2d21044 10SHA1 (patch-aw) = d3dc491da64426ff72a9417a65eb99bee2d21044
11SHA1 (patch-az) = 55c9cba404add5293168ae7fae7ae7aaf4df6550 11SHA1 (patch-az) = 55c9cba404add5293168ae7fae7ae7aaf4df6550
12SHA1 (patch-bd) = 4bdf2230fd8a6ea21f28150ba5705ebd0db4af99 12SHA1 (patch-bd) = 4bdf2230fd8a6ea21f28150ba5705ebd0db4af99
13SHA1 (patch-be) = 2286b14b5992686481d1d7a964c43cfc72118a45 13SHA1 (patch-be) = 2286b14b5992686481d1d7a964c43cfc72118a45
14SHA1 (patch-dj) = 9d67b57daf6111361c478481f39ee8764a861106 14SHA1 (patch-dj) = 9d67b57daf6111361c478481f39ee8764a861106
15SHA1 (patch-dk) = ee85c9489f6074e6818713746691ce99ef778159 15SHA1 (patch-dk) = ee85c9489f6074e6818713746691ce99ef778159
16SHA1 (patch-dl) = 0a5010f57e0f21170530fd4f940e66608c6d9630 16SHA1 (patch-dl) = 0a5010f57e0f21170530fd4f940e66608c6d9630
17SHA1 (patch-dn) = 3cd429fcd4f48ad0ab784058a4ac8672f6ae17db 17SHA1 (patch-dn) = 3cd429fcd4f48ad0ab784058a4ac8672f6ae17db
18SHA1 (patch-do) = d2b190074647a591106797922e2ec907f6b3efde 18SHA1 (patch-do) = d2b190074647a591106797922e2ec907f6b3efde
19SHA1 (patch-dp) = ebdc27a84c24d3373769250bf4b7052058f89d9b 19SHA1 (patch-dp) = ebdc27a84c24d3373769250bf4b7052058f89d9b
20SHA1 (patch-dq) = 4cd59c9a965c70ed5ee50dc2e8cebe3bce094fbd 20SHA1 (patch-dq) = 4cd59c9a965c70ed5ee50dc2e8cebe3bce094fbd
21SHA1 (patch-dr) = ed734e802f2d1cb59c2b49952d646849c9226d1e 21SHA1 (patch-dr) = ed734e802f2d1cb59c2b49952d646849c9226d1e
22SHA1 (patch-ds) = e60434cb299d070289a3c80765187e4058a65f99 22SHA1 (patch-ds) = e60434cb299d070289a3c80765187e4058a65f99
23SHA1 (patch-dt) = 59c09f6ea19cc02a1d8ca92a99eed7f8c30a5f10 23SHA1 (patch-dt) = 59c09f6ea19cc02a1d8ca92a99eed7f8c30a5f10
24SHA1 (patch-du) = e3703b678f3b09f2878389a0a0ecbd453bae59d0 24SHA1 (patch-du) = e3703b678f3b09f2878389a0a0ecbd453bae59d0
25SHA1 (patch-dv) = c3eeeaf6e52e27ce945d29494d42ee4d7b11a14b 25SHA1 (patch-dv) = c3eeeaf6e52e27ce945d29494d42ee4d7b11a14b
26SHA1 (patch-dy) = 4daf6f49dbcc4f07dc43df811aec03639d636d8a 26SHA1 (patch-dy) = 4daf6f49dbcc4f07dc43df811aec03639d636d8a
27SHA1 (patch-eb) = e5105edd12906a5599668e96a424132abe523871 27SHA1 (patch-eb) = e5105edd12906a5599668e96a424132abe523871
28SHA1 (patch-ec) = 0fcd05fea21d480a6536e2f711021ac4c1448771 28SHA1 (patch-ec) = 0fcd05fea21d480a6536e2f711021ac4c1448771
29SHA1 (patch-ed) = 70b8ec8b2d466a3868556cbe1c19bf50462bae6d 29SHA1 (patch-ed) = 70b8ec8b2d466a3868556cbe1c19bf50462bae6d
30SHA1 (patch-ee) = 8240954e7f07d94bd3e87abc1946ea5cef2d854a 30SHA1 (patch-ee) = 8240954e7f07d94bd3e87abc1946ea5cef2d854a
31SHA1 (patch-ef) = ffc28b86ddce44483fcb7967fdc9a4483b61e0a0 31SHA1 (patch-ef) = ffc28b86ddce44483fcb7967fdc9a4483b61e0a0
32SHA1 (patch-eg) = 12e5fdc31adfc578cdbc3efec5b3d6fae58ad767 32SHA1 (patch-eg) = 12e5fdc31adfc578cdbc3efec5b3d6fae58ad767
33SHA1 (patch-eh) = a6ff0e0baaf03b5bde8c98a91220dfbf4c08fc61 33SHA1 (patch-eh) = a6ff0e0baaf03b5bde8c98a91220dfbf4c08fc61
34SHA1 (patch-ei) = 95c921cecd9a6d5d4557066d2a160276a37634b0 34SHA1 (patch-ei) = 95c921cecd9a6d5d4557066d2a160276a37634b0
35SHA1 (patch-ej) = c8f2c5dbf2ba463d852b94fecf6014bb5ef1e3f8 35SHA1 (patch-ej) = c8f2c5dbf2ba463d852b94fecf6014bb5ef1e3f8
36SHA1 (patch-ek) = a5de28017bc57d4e01ec986b6a5602cba2b75670 36SHA1 (patch-ek) = a5de28017bc57d4e01ec986b6a5602cba2b75670
37SHA1 (patch-el) = c071250196cff37c413e724ce4fc149b920e6dde 37SHA1 (patch-el) = c071250196cff37c413e724ce4fc149b920e6dde
38SHA1 (patch-em) = 13ccef1c981c9bf312a104c9eb0a9e2339f38461 38SHA1 (patch-em) = 13ccef1c981c9bf312a104c9eb0a9e2339f38461
39SHA1 (patch-en) = 5f92c80c321149055b962a4c2ba97105c00706e2 39SHA1 (patch-en) = 5f92c80c321149055b962a4c2ba97105c00706e2
40SHA1 (patch-eo) = 41a1ff4e1037415eb50373eff64322f6e1423e27 40SHA1 (patch-eo) = 41a1ff4e1037415eb50373eff64322f6e1423e27
41SHA1 (patch-ep) = f881aece8ec0836c75df3be567d57ffc3ad8bce1 41SHA1 (patch-ep) = f881aece8ec0836c75df3be567d57ffc3ad8bce1
42SHA1 (patch-eq) = d9dfa070d1f12de4f5f48f07d5a32d649035a657 42SHA1 (patch-eq) = d9dfa070d1f12de4f5f48f07d5a32d649035a657
43SHA1 (patch-er) = 666fc6c22544c7f74f7c17ffef30563effcb4df7 43SHA1 (patch-er) = 666fc6c22544c7f74f7c17ffef30563effcb4df7
44SHA1 (patch-error.c) = b756a8f7c3368a296715d035d544657e8f832ada 
45SHA1 (patch-et) = eba90415e5279c9eb8bea67635f5f8cab5d1e7ac 44SHA1 (patch-et) = eba90415e5279c9eb8bea67635f5f8cab5d1e7ac
46SHA1 (patch-eu) = dbf65258dcdc619d220ab39864389c4ec4c5c625 45SHA1 (patch-eu) = dbf65258dcdc619d220ab39864389c4ec4c5c625
47SHA1 (patch-ev) = 6178be681ca1cf2647cab9a61c8ef989ff5b23cb 46SHA1 (patch-ev) = 6178be681ca1cf2647cab9a61c8ef989ff5b23cb
48SHA1 (patch-ew) = 3f23697dddbb11a10d1f0c3e47fb602822ecd11f 47SHA1 (patch-ew) = 3f23697dddbb11a10d1f0c3e47fb602822ecd11f
49SHA1 (patch-ga) = 73f50504baf74ee77d00dcfb5a9446bbaf122726 48SHA1 (patch-ga) = 73f50504baf74ee77d00dcfb5a9446bbaf122726
50SHA1 (patch-gb) = 345ad3e5df6fd9febe7b398f091662fd7c300dc4 49SHA1 (patch-gb) = 345ad3e5df6fd9febe7b398f091662fd7c300dc4
51SHA1 (patch-lib_rdoc_options.rb) = 0f14417733ad6fc6fbc93af1c8463ecd59abce7c 50SHA1 (patch-lib_rdoc_options.rb) = 0f14417733ad6fc6fbc93af1c8463ecd59abce7c
52SHA1 (patch-lib_rdoc_rdoc.rb) = bef895245cc06ca84fd1e5d506c3c65932921b3a 51SHA1 (patch-lib_rdoc_rdoc.rb) = bef895245cc06ca84fd1e5d506c3c65932921b3a
File Deleted: pkgsrc/lang/ruby18-base/patches/Attic/patch-error.c