Wed Nov 17 14:27:10 2010 UTC ()
Some improvements for rubyversion.mk:

- Set RUBY_API_VERSION after RUBY_VERSION has decided.
- Change old RUBY_DOCDIR and RUBY_EXAMPLESDIR to RUBY_DOC and RUBY_EG in
  comment.
- Fix shared libraries PLIST to support Mac OS X with introducing RUBY_SLEXT:
	Shared library => .dylib
	Extension library => .bundle
- Improve PRINT_PLIST_AWK to handle new shared libraries.

No functional change shoud be done and fix PR pkg/44050.


(taca)
diff -r1.52 -r1.53 pkgsrc/lang/ruby/rubyversion.mk
diff -r1.17 -r1.18 pkgsrc/lang/ruby18-base/PLIST
diff -r1.2 -r1.3 pkgsrc/lang/ruby19-base/PLIST
cvs diff -r1.52 -r1.53 pkgsrc/lang/ruby/rubyversion.mk (expand / switch to unified diff)

--- pkgsrc/lang/ruby/rubyversion.mk 2010/09/28 20:24:25 1.52
+++ pkgsrc/lang/ruby/rubyversion.mk 2010/11/17 14:27:09 1.53
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: rubyversion.mk,v 1.52 2010/09/28 20:24:25 joerg Exp $ 1# $NetBSD: rubyversion.mk,v 1.53 2010/11/17 14:27:09 taca Exp $
2# 2#
3 3
4.if !defined(_RUBYVERSION_MK) 4.if !defined(_RUBYVERSION_MK)
5_RUBYVERSION_MK= # defined 5_RUBYVERSION_MK= # defined
6 6
7.include "../../mk/bsd.prefs.mk" 7.include "../../mk/bsd.prefs.mk"
8 8
9# current supported Ruby's version 9# current supported Ruby's version
10RUBY18_VERSION= 1.8.7 10RUBY18_VERSION= 1.8.7
11RUBY19_VERSION= 1.9.2 11RUBY19_VERSION= 1.9.2
12 12
13# patch 13# patch
14RUBY18_PATCHLEVEL= pl302 14RUBY18_PATCHLEVEL= pl302
@@ -23,70 +23,70 @@ RUBY19_API_VERSION= 1.9.1 @@ -23,70 +23,70 @@ RUBY19_API_VERSION= 1.9.1
23# 23#
24RUBY_VERSION_DEFAULT?= 1.8 24RUBY_VERSION_DEFAULT?= 1.8
25_RUBY_VERSION_DEFAULT= ${RUBY_VERSION_DEFAULT:S/.//} 25_RUBY_VERSION_DEFAULT= ${RUBY_VERSION_DEFAULT:S/.//}
26 26
27# RUBY_VERSION defines the specific Ruby's version which is supported 27# RUBY_VERSION defines the specific Ruby's version which is supported
28# by the package. It should be defined by packages whose distfiles 28# by the package. It should be defined by packages whose distfiles
29# are contained by Ruby's release distribution. 29# are contained by Ruby's release distribution.
30# 30#
31# Default value is set to ${RUBY_VERSION_DEFAULT} 31# Default value is set to ${RUBY_VERSION_DEFAULT}
32# 32#
33.if defined(RUBY_VERSION_REQD) 33.if defined(RUBY_VERSION_REQD)
34. if ${RUBY_VERSION_REQD} == "18" 34. if ${RUBY_VERSION_REQD} == "18"
35RUBY_VERSION?= ${RUBY18_VERSION} 35RUBY_VERSION?= ${RUBY18_VERSION}
36RUBY_API_VERSION?= ${RUBY18_API_VERSION} 
37. elif ${RUBY_VERSION_REQD} == "19" 36. elif ${RUBY_VERSION_REQD} == "19"
38RUBY_VERSION?= ${RUBY19_VERSION} 37RUBY_VERSION?= ${RUBY19_VERSION}
39RUBY_API_VERSION?= ${RUBY19_API_VERSION} 
40. else 38. else
41RUBY_VERSION?= ${RUBY18_VERSION} 39RUBY_VERSION?= ${RUBY18_VERSION}
42RUBY_API_VERSION?= ${RUBY18_API_VERSION} 
43PKG_FAIL_REASON+= "Unknown value for ${RUBY_VERSION_REQD}" 40PKG_FAIL_REASON+= "Unknown value for ${RUBY_VERSION_REQD}"
44. endif 41. endif
45.else 42.else
46. if ${RUBY_VERSION_DEFAULT} == "1.8" 43. if ${RUBY_VERSION_DEFAULT} == "1.8"
47RUBY_VERSION?= ${RUBY18_VERSION} 44RUBY_VERSION?= ${RUBY18_VERSION}
48RUBY_API_VERSION?= ${RUBY18_API_VERSION} 
49. elif ${RUBY_VERSION_DEFAULT} == "1.9" 45. elif ${RUBY_VERSION_DEFAULT} == "1.9"
50RUBY_VERSION?= ${RUBY19_VERSION} 46RUBY_VERSION?= ${RUBY19_VERSION}
51RUBY_API_VERSION?= ${RUBY19_API_VERSION} 47. else
 48RUBY_VERSION?= ${RUBY18_VERSION}
52. endif 49. endif
53.endif 50.endif
54 51
55RUBY_PATCH_LEVEL= ${RUBY${RUBY_VER}_PATCHLEVEL} 52RUBY_PATCH_LEVEL= ${RUBY${RUBY_VER}_PATCHLEVEL}
 53
56.if ${RUBY_VERSION} == ${RUBY18_VERSION} 54.if ${RUBY_VERSION} == ${RUBY18_VERSION}
 55RUBY_API_VERSION= ${RUBY18_API_VERSION}
57RUBY_VERSION_SUFFIX= ${RUBY_VERSION}${RUBY_PATCH_LEVEL:S/pl/./} 56RUBY_VERSION_SUFFIX= ${RUBY_VERSION}${RUBY_PATCH_LEVEL:S/pl/./}
58.elif ${RUBY_VERSION} == ${RUBY19_VERSION} 57.elif ${RUBY_VERSION} == ${RUBY19_VERSION}
 58RUBY_API_VERSION= ${RUBY19_API_VERSION}
59RUBY_VERSION_SUFFIX= ${RUBY_VERSION}${RUBY_PATCH_LEVEL} 59RUBY_VERSION_SUFFIX= ${RUBY_VERSION}${RUBY_PATCH_LEVEL}
60.endif 60.endif
61 61
62# RUBY_VERSION_SUPPORTED defines the list of ${RUBY_VER} which is 62# RUBY_VERSION_SUPPORTED defines the list of ${RUBY_VER} which is
63# supported by the package. It should be defined by the packages 63# supported by the package. It should be defined by the packages
64# for specific Ruby versions. 64# for specific Ruby versions.
65# 65#
66RUBY_VERSION_SUPPORTED?= 18 19 66RUBY_VERSION_SUPPORTED?= 18 19
67 67
68# RUBY_VERSION_LIST defines the list of ${RUBY_VER} which is known to 68# RUBY_VERSION_LIST defines the list of ${RUBY_VER} which is known to
69# this framework. 69# this framework.
70# 70#
71RUBY_VERSION_LIST= 18 19 71RUBY_VERSION_LIST= 18 19
72 72
73# RUBY_NOVERSION should be set to "Yes" if the package dosen't depend on 73# RUBY_NOVERSION should be set to "Yes" if the package dosen't depend on
74# any specific version of ruby command. In this case, package's 74# any specific version of ruby command. In this case, package's
75# name begin with "ruby-". 75# name begin with "ruby-".
76# If RUBY_NOVERSION is "No" (default), the package's name is begin 76# If RUBY_NOVERSION is "No" (default), the package's name is begin
77# with ${RUBY_NAME}; "ruby18", "ruby19", and so on. 77# with ${RUBY_NAME}; "ruby18", "ruby19", and so on.
78# 78#
79# It also affects to RUBY_DOCDIR, RUBY_EXAMPLESDIR... 79# It also affects to RUBY_DOC, RUBY_EG...
80# 80#
81RUBY_NOVERSION?= No 81RUBY_NOVERSION?= No
82 82
83# _RUBY_VER_MAJOR, _RUBY_VER_MINOR, _RUBY_VER_TEENY and _RUBY_PATCHLEVEL 83# _RUBY_VER_MAJOR, _RUBY_VER_MINOR, _RUBY_VER_TEENY and _RUBY_PATCHLEVEL
84# is defined from version of Ruby. It should not be used in packages' 84# is defined from version of Ruby. It should not be used in packages'
85# Makefile. 85# Makefile.
86# 86#
87_RUBY_VER= ${RUBY_VERSION:C/(-.*)//} 87_RUBY_VER= ${RUBY_VERSION:C/(-.*)//}
88_RUBY_VER_MAJOR= ${_RUBY_VER:C/([0-9]+)\.([0-9]+)\.([0-9]+)/\1/} 88_RUBY_VER_MAJOR= ${_RUBY_VER:C/([0-9]+)\.([0-9]+)\.([0-9]+)/\1/}
89_RUBY_VER_MINOR= ${_RUBY_VER:C/([0-9]+)\.([0-9]+)\.([0-9]+)/\2/} 89_RUBY_VER_MINOR= ${_RUBY_VER:C/([0-9]+)\.([0-9]+)\.([0-9]+)/\2/}
90_RUBY_VER_TEENY= ${_RUBY_VER:C/([0-9]+)\.([0-9]+)\.([0-9]+)/\3/} 90_RUBY_VER_TEENY= ${_RUBY_VER:C/([0-9]+)\.([0-9]+)\.([0-9]+)/\3/}
91 91
92# RUBY_VER defines Ruby base release. 92# RUBY_VER defines Ruby base release.
@@ -159,59 +159,66 @@ RUBY_BUILD_RDOC?= YES @@ -159,59 +159,66 @@ RUBY_BUILD_RDOC?= YES
159RUBY_BUILD_RI?= YES 159RUBY_BUILD_RI?= YES
160 160
161# RUBY related command's full pathname. 161# RUBY related command's full pathname.
162# 162#
163RUBY?= ${PREFIX}/bin/${RUBY_NAME} 163RUBY?= ${PREFIX}/bin/${RUBY_NAME}
164RDOC?= ${PREFIX}/bin/rdoc${RUBY_VER} 164RDOC?= ${PREFIX}/bin/rdoc${RUBY_VER}
165 165
166# 166#
167# RUBY_ARCH is used as architecture-dependent directory name. 167# RUBY_ARCH is used as architecture-dependent directory name.
168# 168#
169RUBY_ARCH?= ${LOWER_ARCH}-${LOWER_OPSYS}${APPEND_ELF}${LOWER_OPSYS_VERSUFFIX} 169RUBY_ARCH?= ${LOWER_ARCH}-${LOWER_OPSYS}${APPEND_ELF}${LOWER_OPSYS_VERSUFFIX}
170 170
171# 171#
172# Ruby shared library version handling. 172# Ruby shared and static library version handling.
173# 173#
174RUBY_SHLIBMAJOR?= ${_RUBY_VER_MAJOR} 
175RUBY_SHLIBVER?= ${RUBY_API_VERSION} 174RUBY_SHLIBVER?= ${RUBY_API_VERSION}
 175RUBY_SHLIB?= ${RUBY_VER}.${RUBY_SLEXT}.${RUBY_SHLIBVER}
 176RUBY_SHLIBALIAS?= @comment
 177RUBY_STATICLIB?= ${RUBY_VER}-static.a
176 178
177.if ${OPSYS} == "NetBSD" || ${OPSYS} == "Interix" 179.if ${OPSYS} == "NetBSD" || ${OPSYS} == "Interix"
178RUBY_SHLIBMAJOR= ${RUBY_VER} 
179RUBY_SHLIBVER= ${RUBY_VER}.${RUBY_API_TEENY} 180RUBY_SHLIBVER= ${RUBY_VER}.${RUBY_API_TEENY}
 181_RUBY_SHLIBALIAS= ${RUBY_VER}.${RUBY_SLEXT}.${RUBY_VER}
180.elif ${OPSYS} == "FreeBSD" || ${OPSYS} == "DragonFly" 182.elif ${OPSYS} == "FreeBSD" || ${OPSYS} == "DragonFly"
181RUBY_SHLIBMAJOR= # unused 
182RUBY_SHLIBVER= ${RUBY_VER} 183RUBY_SHLIBVER= ${RUBY_VER}
183.elif ${OPSYS} == "OpenBSD" 184.elif ${OPSYS} == "OpenBSD"
184RUBY_SHLIBMAJOR= # unused 
185RUBY_SHLIBVER= ${_RUBY_VER_MAJOR}.${_RUBY_VER_MINOR}${RUBY_API_TEENY} 185RUBY_SHLIBVER= ${_RUBY_VER_MAJOR}.${_RUBY_VER_MINOR}${RUBY_API_TEENY}
186.elif ${OPSYS} == "IRIX" 186.elif ${OPSYS} == "Darwin"
187RUBY_SHLIBMAJOR= # unused 187RUBY_SHLIB= ${RUBY_VER}.${RUBY_SHLIBVER}.${RUBY_SLEXT}
 188.if ${RUBY_VER} == "18"
 189_RUBY_SHLIBALIAS= ${RUBY_VER}.${_RUBY_VER_MAJOR}.${_RUBY_VER_MINOR}.${RUBY_SLEXT}
 190.else
 191_RUBY_SHLIBALIAS= .${_RUBY_VER_MAJOR}.${_RUBY_VER_MINOR}.${RUBY_SLEXT}
 192RUBY_STATICLIB= ${RUBY_VER}.${RUBY_API_VERSION}-static.a
 193.endif
188.elif ${OPSYS} == "Linux" 194.elif ${OPSYS} == "Linux"
189RUBY_SHLIBMAJOR= ${_RUBY_VER_MAJOR}.${_RUBY_VER_MINOR} 195_RUBY_SHLIBALIAS= ${_RUBY_VER_MAJOR}.${_RUBY_VER_MINOR}
190.endif 196.endif
191 197
192.if empty(RUBY_SHLIBMAJOR) 198.if !empty(_RUBY_SHLIBALIAS)
193RUBY_NOSHLIBMAJOR= "@comment " 199RUBY_SHLIBALIAS= lib/libruby${_RUBY_SHLIBALIAS}
194.else 
195RUBY_NOSHLIBMAJOR= 
196.endif 200.endif
197 201
198# 202#
199# RUBY_DLEXT is suffix of extention library. 203# RUBY_DLEXT is suffix of extention library.
 204# RUBY_SLEXT is suffix of shared library.
200# 205#
201.if ${OPSYS} == "Darwin" 206.if ${OPSYS} == "Darwin"
202RUBY_DLEXT= bundle 207RUBY_DLEXT= bundle
 208RUBY_SLEXT= dylib
203.else 209.else
204RUBY_DLEXT= so 210RUBY_DLEXT= so
 211RUBY_SLEXT= so
205.endif 212.endif
206 213
207# 214#
208# Use pthread library with Ruby 215# Use pthread library with Ruby
209# 216#
210.if ${OPSYS} == "NetBSD" && !empty(OS_VERSION:M1.[0-9].*) 217.if ${OPSYS} == "NetBSD" && !empty(OS_VERSION:M1.[0-9].*)
211RUBY_USE_PTHREAD?= no 218RUBY_USE_PTHREAD?= no
212.elif !empty(MACHINE_PLATFORM:MDarwin-9.*-powerpc) 219.elif !empty(MACHINE_PLATFORM:MDarwin-9.*-powerpc)
213# Workaround for Ruby Bug #193 220# Workaround for Ruby Bug #193
214# http://redmine.ruby-lang.org/issues/show/193 221# http://redmine.ruby-lang.org/issues/show/193
215RUBY_USE_PTHREAD?= no 222RUBY_USE_PTHREAD?= no
216.else 223.else
217RUBY_USE_PTHREAD?= yes 224RUBY_USE_PTHREAD?= yes
@@ -311,27 +318,30 @@ FILES_SUBST+= RUBY=${RUBY:Q} RUBY_NAME= @@ -311,27 +318,30 @@ FILES_SUBST+= RUBY=${RUBY:Q} RUBY_NAME=
311 RUBY_PKGPREFIX=${RUBY_PKGPREFIX:Q} \ 318 RUBY_PKGPREFIX=${RUBY_PKGPREFIX:Q} \
312 RUBY_VER=${RUBY_VER:Q} \ 319 RUBY_VER=${RUBY_VER:Q} \
313 ${PLIST_RUBY_DIRS} 320 ${PLIST_RUBY_DIRS}
314 321
315MESSAGE_SUBST+= RUBY="${RUBY}" RUBY_VER="${RUBY_VER}" \ 322MESSAGE_SUBST+= RUBY="${RUBY}" RUBY_VER="${RUBY_VER}" \
316 RUBY_VERSION="${RUBY_VERSION}" \ 323 RUBY_VERSION="${RUBY_VERSION}" \
317 RUBY_PKGPREFIX="${RUBY_PKGPREFIX}" \ 324 RUBY_PKGPREFIX="${RUBY_PKGPREFIX}" \
318 ${PLIST_RUBY_DIRS:S,DIR="${PREFIX}/,DIR=",} 325 ${PLIST_RUBY_DIRS:S,DIR="${PREFIX}/,DIR=",}
319 326
320PLIST_SUBST+= RUBY=${RUBY:Q} RUBY_VER=${RUBY_VER:Q} \ 327PLIST_SUBST+= RUBY=${RUBY:Q} RUBY_VER=${RUBY_VER:Q} \
321 RUBY_PKGPREFIX=${RUBY_PKGPREFIX} \ 328 RUBY_PKGPREFIX=${RUBY_PKGPREFIX} \
322 RUBY_VERSION=${RUBY_VERSION:Q} \ 329 RUBY_VERSION=${RUBY_VERSION:Q} \
323 RUBY_VER_DIR=${RUBY_VER_DIR:Q} \ 330 RUBY_VER_DIR=${RUBY_VER_DIR:Q} \
324 RUBY_DLEXT=${RUBY_DLEXT:Q} \ 331 RUBY_DLEXT=${RUBY_DLEXT:Q} RUBY_SLEXT=${RUBY_SLEXT:Q} \
 332 RUBY_SHLIB=${RUBY_SHLIB:Q} \
 333 RUBY_SHLIBALIAS=${RUBY_SHLIBALIAS:Q} \
 334 RUBY_STATICLIB=${RUBY_STATICLIB:Q} \
325 RUBY_ARCH=${RUBY_ARCH:Q} \ 335 RUBY_ARCH=${RUBY_ARCH:Q} \
326 ${PLIST_RUBY_DIRS:S,DIR="${PREFIX}/,DIR=",} \ 336 ${PLIST_RUBY_DIRS:S,DIR="${PREFIX}/,DIR=",} \
327 GEM_HOME=${GEM_HOME:Q} 337 GEM_HOME=${GEM_HOME:Q}
328 338
329# 339#
330# make dynamic PLIST 340# make dynamic PLIST
331# 341#
332.if !empty(RUBY_DYNAMIC_DIRS) 342.if !empty(RUBY_DYNAMIC_DIRS)
333 343
334RUBY_PLIST_DYNAMIC= ${WRKDIR}/PLIST.work 344RUBY_PLIST_DYNAMIC= ${WRKDIR}/PLIST.work
335 345
336.if !defined(PLIST_SRC) 346.if !defined(PLIST_SRC)
337. if exists(${PKGDIR}/PLIST.common) 347. if exists(${PKGDIR}/PLIST.common)
@@ -359,33 +369,40 @@ RUBY_GENERATE_PLIST = ( \ @@ -359,33 +369,40 @@ RUBY_GENERATE_PLIST = ( \
359.endif 369.endif
360 370
361.if !empty(RUBY_NOVERSION:M[nN][oO]) 371.if !empty(RUBY_NOVERSION:M[nN][oO])
362.if empty(RUBY_USE_PTHREAD:M[nN][oO]) 372.if empty(RUBY_USE_PTHREAD:M[nN][oO])
363.include "../../mk/pthread.buildlink3.mk" 373.include "../../mk/pthread.buildlink3.mk"
364.endif 374.endif
365.include "../../mk/bdb.buildlink3.mk" 375.include "../../mk/bdb.buildlink3.mk"
366.include "../../converters/libiconv/buildlink3.mk" 376.include "../../converters/libiconv/buildlink3.mk"
367.include "../../devel/zlib/buildlink3.mk" 377.include "../../devel/zlib/buildlink3.mk"
368.include "../../security/openssl/buildlink3.mk" 378.include "../../security/openssl/buildlink3.mk"
369.include "../../mk/dlopen.buildlink3.mk" 379.include "../../mk/dlopen.buildlink3.mk"
370.endif 380.endif
371 381
372.if ${RUBY_VER} == "19" 382PRINT_PLIST_AWK+= /lib\/libruby${RUBY_STATICLIB}$$/ \
373PRINT_PLIST_AWK+= /${RUBY_DLEXT}\.${RUBY_SHLIBVER:S|.|\\.|}$$/ \ 383 { sub(/${RUBY_STATICLIB}/, "$${RUBY_STATICLIB}"); }
374 { sub(/${RUBY_DLEXT}\.${RUBY_SHLIBVER:S|.|\\.|}$$/, \ 384PRINT_PLIST_AWK+= /lib\/libruby${RUBY_VER}\.${RUBY_SLEXT}/ \
375 "$${RUBY_DLEXT}.$${RUBY_SHLIBVER}"); } 385 { sub(/${RUBY_VER}\.${RUBY_SLEXT}$$/, \
376PRINT_PLIST_AWK+= /${RUBY_DLEXT}\.${RUBY_SHLIBMAJOR}$$/ \ 386 "$${RUBY_VER}.$${RUBY_SLEXT}"); }
377 { sub(/${RUBY_DLEXT}\.${RUBY_SHLIBMAJOR}$$/, \ 387PRINT_PLIST_AWK+= /${RUBY_SHLIB}$$/ \
378 "$${RUBY_DLEXT}.$${RUBY_SHLIBMAJOR}"); } 388 { sub(/${RUBY_SHLIB}$$/, "$${RUBY_SHLIB}"); }
 389PRINT_PLIST_AWK+= /${RUBY_SLEXT}\.${RUBY_SHLIBVER}$$/ \
 390 { sub(/${RUBY_SLEXT}\.${RUBY_SHLIBVER}$$/, \
 391 "$${RUBY_SLEXT}.$${RUBY_SHLIBVER}"); }
 392.if ${RUBY_SHLIBALIAS} != "@comment"
 393PRINT_PLIST_AWK+= /${RUBY_SHLIBALIAS:S/\//\\\//}$$/ \
 394 { sub(/${RUBY_SHLIBALIAS:S/\//\\\//}$$/, \
 395 "$${RUBY_SHLIBALIAS}"); }
379.endif 396.endif
380PRINT_PLIST_AWK+= /^${RUBY_ARCHINC:S|/|\\/|g}/ \ 397PRINT_PLIST_AWK+= /^${RUBY_ARCHINC:S|/|\\/|g}/ \
381 { gsub(/${RUBY_ARCHINC:S|/|\\/|g}/, "$${RUBY_ARCHINC}"); \ 398 { gsub(/${RUBY_ARCHINC:S|/|\\/|g}/, "$${RUBY_ARCHINC}"); \
382 print; next; } 399 print; next; }
383PRINT_PLIST_AWK+= /^${RUBY_INC:S|/|\\/|g}/ \ 400PRINT_PLIST_AWK+= /^${RUBY_INC:S|/|\\/|g}/ \
384 { gsub(/${RUBY_INC:S|/|\\/|g}/, "$${RUBY_INC}"); \ 401 { gsub(/${RUBY_INC:S|/|\\/|g}/, "$${RUBY_INC}"); \
385 print; next; } 402 print; next; }
386PRINT_PLIST_AWK+= /\.${RUBY_DLEXT}$$/ \ 403PRINT_PLIST_AWK+= /\.${RUBY_DLEXT}$$/ \
387 { gsub(/${RUBY_DLEXT}$$/, "$${RUBY_DLEXT}") } 404 { gsub(/${RUBY_DLEXT}$$/, "$${RUBY_DLEXT}") }
388PRINT_PLIST_AWK+= /^${RUBY_ARCHLIB:S|/|\\/|g}/ \ 405PRINT_PLIST_AWK+= /^${RUBY_ARCHLIB:S|/|\\/|g}/ \
389 { gsub(/${RUBY_ARCHLIB:S|/|\\/|g}/, "$${RUBY_ARCHLIB}"); \ 406 { gsub(/${RUBY_ARCHLIB:S|/|\\/|g}/, "$${RUBY_ARCHLIB}"); \
390 print; next; } 407 print; next; }
391PRINT_PLIST_AWK+= /^${RUBY_VENDORARCHLIB:S|/|\\/|g}/ \ 408PRINT_PLIST_AWK+= /^${RUBY_VENDORARCHLIB:S|/|\\/|g}/ \
cvs diff -r1.17 -r1.18 pkgsrc/lang/ruby18-base/Attic/PLIST (expand / switch to unified diff)

--- pkgsrc/lang/ruby18-base/Attic/PLIST 2010/09/10 03:29:00 1.17
+++ pkgsrc/lang/ruby18-base/Attic/PLIST 2010/11/17 14:27:09 1.18
@@ -1,25 +1,25 @@ @@ -1,25 +1,25 @@
1@comment $NetBSD: PLIST,v 1.17 2010/09/10 03:29:00 taca Exp $ 1@comment $NetBSD: PLIST,v 1.18 2010/11/17 14:27:09 taca Exp $
2bin/erb${RUBY_VER} 2bin/erb${RUBY_VER}
3bin/h2rb${RUBY_VER} 3bin/h2rb${RUBY_VER}
4bin/irb${RUBY_VER} 4bin/irb${RUBY_VER}
5bin/rdoc${RUBY_VER} 5bin/rdoc${RUBY_VER}
6bin/ri${RUBY_VER} 6bin/ri${RUBY_VER}
7bin/${RUBY_NAME} 7bin/${RUBY_NAME}
8bin/testrb${RUBY_VER} 8bin/testrb${RUBY_VER}
9lib/libruby${RUBY_VER}-static.a 9lib/libruby${RUBY_STATICLIB}
10lib/libruby${RUBY_VER}.${RUBY_DLEXT} 10lib/libruby${RUBY_VER}.${RUBY_SLEXT}
11${RUBY_NOSHLIBMAJOR}lib/libruby${RUBY_VER}.${RUBY_DLEXT}.${RUBY_SHLIBMAJOR} 11${RUBY_SHLIBALIAS}
12lib/libruby${RUBY_VER}.${RUBY_DLEXT}.${RUBY_SHLIBVER} 12lib/libruby${RUBY_SHLIB}
13${RUBY_LIB}/English.rb 13${RUBY_LIB}/English.rb
14${RUBY_LIB}/Env.rb 14${RUBY_LIB}/Env.rb
15${RUBY_LIB}/abbrev.rb 15${RUBY_LIB}/abbrev.rb
16${RUBY_LIB}/base64.rb 16${RUBY_LIB}/base64.rb
17${RUBY_LIB}/benchmark.rb 17${RUBY_LIB}/benchmark.rb
18${RUBY_LIB}/bigdecimal/jacobian.rb 18${RUBY_LIB}/bigdecimal/jacobian.rb
19${RUBY_LIB}/bigdecimal/ludcmp.rb 19${RUBY_LIB}/bigdecimal/ludcmp.rb
20${RUBY_LIB}/bigdecimal/math.rb 20${RUBY_LIB}/bigdecimal/math.rb
21${RUBY_LIB}/bigdecimal/newton.rb 21${RUBY_LIB}/bigdecimal/newton.rb
22${RUBY_LIB}/bigdecimal/util.rb 22${RUBY_LIB}/bigdecimal/util.rb
23${RUBY_LIB}/cgi-lib.rb 23${RUBY_LIB}/cgi-lib.rb
24${RUBY_LIB}/cgi.rb 24${RUBY_LIB}/cgi.rb
25${RUBY_LIB}/cgi/session.rb 25${RUBY_LIB}/cgi/session.rb
cvs diff -r1.2 -r1.3 pkgsrc/lang/ruby19-base/Attic/PLIST (expand / switch to unified diff)

--- pkgsrc/lang/ruby19-base/Attic/PLIST 2010/09/26 13:16:11 1.2
+++ pkgsrc/lang/ruby19-base/Attic/PLIST 2010/11/17 14:27:10 1.3
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.2 2010/09/26 13:16:11 taca Exp $ 1@comment $NetBSD: PLIST,v 1.3 2010/11/17 14:27:10 taca Exp $
2bin/erb${RUBY_VER} 2bin/erb${RUBY_VER}
3bin/gem${RUBY_VER} 3bin/gem${RUBY_VER}
4bin/irb${RUBY_VER} 4bin/irb${RUBY_VER}
5bin/rake${RUBY_VER} 5bin/rake${RUBY_VER}
6bin/rdoc${RUBY_VER} 6bin/rdoc${RUBY_VER}
7bin/ri${RUBY_VER} 7bin/ri${RUBY_VER}
8bin/${RUBY_NAME} 8bin/${RUBY_NAME}
9bin/testrb${RUBY_VER} 9bin/testrb${RUBY_VER}
10${RUBY_ARCHINC}/ruby/config.h 10${RUBY_ARCHINC}/ruby/config.h
11${RUBY_INC}/ruby.h 11${RUBY_INC}/ruby.h
12${RUBY_INC}/ruby/backward/rubyio.h 12${RUBY_INC}/ruby/backward/rubyio.h
13${RUBY_INC}/ruby/backward/rubysig.h 13${RUBY_INC}/ruby/backward/rubysig.h
14${RUBY_INC}/ruby/backward/st.h 14${RUBY_INC}/ruby/backward/st.h
@@ -18,30 +18,30 @@ ${RUBY_INC}/ruby/digest.h @@ -18,30 +18,30 @@ ${RUBY_INC}/ruby/digest.h
18${RUBY_INC}/ruby/dl.h 18${RUBY_INC}/ruby/dl.h
19${RUBY_INC}/ruby/encoding.h 19${RUBY_INC}/ruby/encoding.h
20${RUBY_INC}/ruby/intern.h 20${RUBY_INC}/ruby/intern.h
21${RUBY_INC}/ruby/io.h 21${RUBY_INC}/ruby/io.h
22${RUBY_INC}/ruby/missing.h 22${RUBY_INC}/ruby/missing.h
23${RUBY_INC}/ruby/oniguruma.h 23${RUBY_INC}/ruby/oniguruma.h
24${RUBY_INC}/ruby/re.h 24${RUBY_INC}/ruby/re.h
25${RUBY_INC}/ruby/regex.h 25${RUBY_INC}/ruby/regex.h
26${RUBY_INC}/ruby/ruby.h 26${RUBY_INC}/ruby/ruby.h
27${RUBY_INC}/ruby/st.h 27${RUBY_INC}/ruby/st.h
28${RUBY_INC}/ruby/util.h 28${RUBY_INC}/ruby/util.h
29${RUBY_INC}/ruby/version.h 29${RUBY_INC}/ruby/version.h
30${RUBY_INC}/ruby/vm.h 30${RUBY_INC}/ruby/vm.h
31lib/libruby${RUBY_VER}-static.a 31lib/libruby${RUBY_STATICLIB}
32lib/libruby${RUBY_VER}.${RUBY_DLEXT} 32lib/libruby${RUBY_VER}.${RUBY_SLEXT}
33${RUBY_NOSHLIBMAJOR}lib/libruby${RUBY_VER}.so.${RUBY_SHLIBMAJOR} 33${RUBY_SHLIBALIAS}
34lib/libruby${RUBY_VER}.${RUBY_DLEXT}.${RUBY_SHLIBVER} 34lib/libruby${RUBY_SHLIB}
35${RUBY_LIB}/English.rb 35${RUBY_LIB}/English.rb
36${RUBY_LIB}/abbrev.rb 36${RUBY_LIB}/abbrev.rb
37${RUBY_LIB}/base64.rb 37${RUBY_LIB}/base64.rb
38${RUBY_LIB}/benchmark.rb 38${RUBY_LIB}/benchmark.rb
39${RUBY_LIB}/bigdecimal/jacobian.rb 39${RUBY_LIB}/bigdecimal/jacobian.rb
40${RUBY_LIB}/bigdecimal/ludcmp.rb 40${RUBY_LIB}/bigdecimal/ludcmp.rb
41${RUBY_LIB}/bigdecimal/math.rb 41${RUBY_LIB}/bigdecimal/math.rb
42${RUBY_LIB}/bigdecimal/newton.rb 42${RUBY_LIB}/bigdecimal/newton.rb
43${RUBY_LIB}/bigdecimal/util.rb 43${RUBY_LIB}/bigdecimal/util.rb
44${RUBY_LIB}/cgi.rb 44${RUBY_LIB}/cgi.rb
45${RUBY_LIB}/cgi/cookie.rb 45${RUBY_LIB}/cgi/cookie.rb
46${RUBY_LIB}/cgi/core.rb 46${RUBY_LIB}/cgi/core.rb
47${RUBY_LIB}/cgi/html.rb 47${RUBY_LIB}/cgi/html.rb