Sun Mar 8 14:53:39 2015 UTC ()
* Add patch ot fix rdoc bug; Get rid of infitite loop with '\r' only in text.
* Change "os" of Gem::Platform, now it change the case of "netbsd" only.

Bump PKGREVISION.


(taca)
diff -r1.48 -r1.49 pkgsrc/lang/ruby193-base/Makefile
diff -r1.41 -r1.42 pkgsrc/lang/ruby193-base/distinfo
diff -r0 -r1.1 pkgsrc/lang/ruby193-base/patches/patch-lib_rdoc_text.rb
diff -r1.1 -r1.2 pkgsrc/lang/ruby193-base/patches/patch-lib_rubygems_platform.rb
cvs diff -r1.48 -r1.49 pkgsrc/lang/ruby193-base/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/ruby193-base/Attic/Makefile 2014/11/01 01:25:06 1.48
+++ pkgsrc/lang/ruby193-base/Attic/Makefile 2015/03/08 14:53:39 1.49
@@ -1,18 +1,19 @@ @@ -1,18 +1,19 @@
1# $NetBSD: Makefile,v 1.48 2014/11/01 01:25:06 wiz Exp $ 1# $NetBSD: Makefile,v 1.49 2015/03/08 14:53:39 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= 1
6CATEGORIES= lang ruby 7CATEGORIES= lang ruby
7MASTER_SITES= ${MASTER_SITE_RUBY} 8MASTER_SITES= ${MASTER_SITE_RUBY}
8 9
9MAINTAINER= taca@NetBSD.org 10MAINTAINER= taca@NetBSD.org
10HOMEPAGE= ${RUBY_HOMEPAGE} 11HOMEPAGE= ${RUBY_HOMEPAGE}
11COMMENT= Ruby ${RUBY_VERSION} release minimum base package 12COMMENT= Ruby ${RUBY_VERSION} release minimum base package
12LICENSE= ${RUBY_LICENSE} 13LICENSE= ${RUBY_LICENSE}
13 14
14RUBY_VERSION_SUPPORTED= 193 15RUBY_VERSION_SUPPORTED= 193
15 16
16USE_GCC_RUNTIME= yes 17USE_GCC_RUNTIME= yes
17USE_LANGUAGES= c 18USE_LANGUAGES= c
18USE_TOOLS+= pax yacc 19USE_TOOLS+= pax yacc
cvs diff -r1.41 -r1.42 pkgsrc/lang/ruby193-base/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/lang/ruby193-base/Attic/distinfo 2015/01/07 10:35:59 1.41
+++ pkgsrc/lang/ruby193-base/Attic/distinfo 2015/03/08 14:53:39 1.42
@@ -1,46 +1,47 @@ @@ -1,46 +1,47 @@
1$NetBSD: distinfo,v 1.41 2015/01/07 10:35:59 taca Exp $ 1$NetBSD: distinfo,v 1.42 2015/03/08 14:53:39 taca Exp $
2 2
3SHA1 (ruby-1.9.3-p551.tar.bz2) = 35600f4e2ac98653fa8a634104cb6ab3d47a1535 3SHA1 (ruby-1.9.3-p551.tar.bz2) = 35600f4e2ac98653fa8a634104cb6ab3d47a1535
4RMD160 (ruby-1.9.3-p551.tar.bz2) = 59cfcaf4e02957f53bf83557962b0d428156bc01 4RMD160 (ruby-1.9.3-p551.tar.bz2) = 59cfcaf4e02957f53bf83557962b0d428156bc01
5Size (ruby-1.9.3-p551.tar.bz2) = 10049332 bytes 5Size (ruby-1.9.3-p551.tar.bz2) = 10049332 bytes
6SHA1 (patch-configure) = 0ef7e10bbff37118c48053e7189f87528a3e408b 6SHA1 (patch-configure) = 0ef7e10bbff37118c48053e7189f87528a3e408b
7SHA1 (patch-configure.in) = 09dfe819b6a9bd7c9af704eeaef659857d33d0c3 7SHA1 (patch-configure.in) = 09dfe819b6a9bd7c9af704eeaef659857d33d0c3
8SHA1 (patch-defs_default__gems) = fb24111736f1a76a05e853aa068024dbdd24e5a5 8SHA1 (patch-defs_default__gems) = fb24111736f1a76a05e853aa068024dbdd24e5a5
9SHA1 (patch-ext_dbm_extconf.rb) = cc16af8f4999ef6c54c9652e2748504c31e5ef4e 9SHA1 (patch-ext_dbm_extconf.rb) = cc16af8f4999ef6c54c9652e2748504c31e5ef4e
10SHA1 (patch-ext_dl_extconf.rb) = aed210606893d2b9c463d794df039f06003848e4 10SHA1 (patch-ext_dl_extconf.rb) = aed210606893d2b9c463d794df039f06003848e4
11SHA1 (patch-ext_tk_extconf.rb) = 7cda490107ce8d23644152feeade8a8cf21d9898 11SHA1 (patch-ext_tk_extconf.rb) = 7cda490107ce8d23644152feeade8a8cf21d9898
12SHA1 (patch-ext_tk_lib_tk.rb) = 78034ed6fa0f24099ce06a717da2423731b276cb 12SHA1 (patch-ext_tk_lib_tk.rb) = 78034ed6fa0f24099ce06a717da2423731b276cb
13SHA1 (patch-ext_tk_lib_tk_autoload.rb) = e8bcb93feae90fd46531a412f6c963a6d5d2c132 13SHA1 (patch-ext_tk_lib_tk_autoload.rb) = e8bcb93feae90fd46531a412f6c963a6d5d2c132
14SHA1 (patch-ext_tk_lib_tk_fontchooser.rb) = cb0155332e5f519ada386fae770cd2f879527323 14SHA1 (patch-ext_tk_lib_tk_fontchooser.rb) = cb0155332e5f519ada386fae770cd2f879527323
15SHA1 (patch-ext_tk_lib_tk_tk__mac.rb) = c7b946dd8d37014d9cd43ce787fbb560a21cce2e 15SHA1 (patch-ext_tk_lib_tk_tk__mac.rb) = c7b946dd8d37014d9cd43ce787fbb560a21cce2e
16SHA1 (patch-ext_tk_lib_tkextlib_tcllib_validator.rb) = 4e429b8775f9a079e5338d58db7520179566c4b7 16SHA1 (patch-ext_tk_lib_tkextlib_tcllib_validator.rb) = 4e429b8775f9a079e5338d58db7520179566c4b7
17SHA1 (patch-ext_tk_lib_tkextlib_tile_treeview.rb) = e31201b5d0f5c333f14b795ac5e670fdb9a250cf 17SHA1 (patch-ext_tk_lib_tkextlib_tile_treeview.rb) = e31201b5d0f5c333f14b795ac5e670fdb9a250cf
18SHA1 (patch-ext_tk_lib_tkextlib_tkimg_dted.rb) = c73d94032c22cbefb55daee2ba359d70751b1416 18SHA1 (patch-ext_tk_lib_tkextlib_tkimg_dted.rb) = c73d94032c22cbefb55daee2ba359d70751b1416
19SHA1 (patch-ext_tk_lib_tkextlib_tkimg_raw.rb) = 2c99d8f59c0ad5d6a493dd6e663850262487f5ef 19SHA1 (patch-ext_tk_lib_tkextlib_tkimg_raw.rb) = 2c99d8f59c0ad5d6a493dd6e663850262487f5ef
20SHA1 (patch-ext_tk_tcltklib.c) = c58bffdde4a89ea7c442b1cf37c12c5ce53ee890 20SHA1 (patch-ext_tk_tcltklib.c) = c58bffdde4a89ea7c442b1cf37c12c5ce53ee890
21SHA1 (patch-lib_rdoc_ri_driver.rb) = acb4cb022893eb8dea2adf7564f5e5e1a0f1e9c8 21SHA1 (patch-lib_rdoc_ri_driver.rb) = acb4cb022893eb8dea2adf7564f5e5e1a0f1e9c8
 22SHA1 (patch-lib_rdoc_text.rb) = cfbf48096ce14da8016177f6a8e6ef4416929647
22SHA1 (patch-lib_rubygems.rb) = e472c981e544b75c3762385895c9a0197be9badd 23SHA1 (patch-lib_rubygems.rb) = e472c981e544b75c3762385895c9a0197be9badd
23SHA1 (patch-lib_rubygems_command.rb) = 916a93372e714b56a741acc15350536194f34c77 24SHA1 (patch-lib_rubygems_command.rb) = 916a93372e714b56a741acc15350536194f34c77
24SHA1 (patch-lib_rubygems_command__manager.rb) = 4fabf9a6c8bf5e47a4fb3bb3d398105b4452ec7e 25SHA1 (patch-lib_rubygems_command__manager.rb) = 4fabf9a6c8bf5e47a4fb3bb3d398105b4452ec7e
25SHA1 (patch-lib_rubygems_commands_install__command.rb) = ff637f39f3fd76b7550fd7f8c32fe303eec6f8c3 26SHA1 (patch-lib_rubygems_commands_install__command.rb) = ff637f39f3fd76b7550fd7f8c32fe303eec6f8c3
26SHA1 (patch-lib_rubygems_commands_setup__command.rb) = 85b666544fc0787e67bb54071d8660cbfe3015d6 27SHA1 (patch-lib_rubygems_commands_setup__command.rb) = 85b666544fc0787e67bb54071d8660cbfe3015d6
27SHA1 (patch-lib_rubygems_commands_uninstall__command.rb) = 7d8dd07d332f0e89822d06f2d71e7552358107cc 28SHA1 (patch-lib_rubygems_commands_uninstall__command.rb) = 7d8dd07d332f0e89822d06f2d71e7552358107cc
28SHA1 (patch-lib_rubygems_commands_unpack__command.rb) = b8e18f1feedb7966e2a5280d6020c6134a7d83a3 29SHA1 (patch-lib_rubygems_commands_unpack__command.rb) = b8e18f1feedb7966e2a5280d6020c6134a7d83a3
29SHA1 (patch-lib_rubygems_config__file.rb) = ed4ff25ea89a2d13ee601c7edfda0902f08fe29c 30SHA1 (patch-lib_rubygems_config__file.rb) = ed4ff25ea89a2d13ee601c7edfda0902f08fe29c
30SHA1 (patch-lib_rubygems_defaults.rb) = 101a6e653ef3811cdda3ed333b50448c0d3f0d26 31SHA1 (patch-lib_rubygems_defaults.rb) = 101a6e653ef3811cdda3ed333b50448c0d3f0d26
31SHA1 (patch-lib_rubygems_dependency__installer.rb) = 8832e6d0157191b1c137ad7ad7ba5429bcfadd5a 32SHA1 (patch-lib_rubygems_dependency__installer.rb) = 8832e6d0157191b1c137ad7ad7ba5429bcfadd5a
32SHA1 (patch-lib_rubygems_doc__manager.rb) = 4b2d70e5dfaeff1f1b70ff27f1084065dcc742d3 33SHA1 (patch-lib_rubygems_doc__manager.rb) = 4b2d70e5dfaeff1f1b70ff27f1084065dcc742d3
33SHA1 (patch-lib_rubygems_gem__runner.rb) = 03ff2f0b72004ef7e09b5ba9d56752109e4e6b73 34SHA1 (patch-lib_rubygems_gem__runner.rb) = 03ff2f0b72004ef7e09b5ba9d56752109e4e6b73
34SHA1 (patch-lib_rubygems_install__update__options.rb) = 74f81900c92bc3c7a663a112cccf6ff88b6ae180 35SHA1 (patch-lib_rubygems_install__update__options.rb) = 74f81900c92bc3c7a663a112cccf6ff88b6ae180
35SHA1 (patch-lib_rubygems_installer.rb) = fe1c97abaf0b7a3fbecf8327a6d1ccd697cb62cc 36SHA1 (patch-lib_rubygems_installer.rb) = fe1c97abaf0b7a3fbecf8327a6d1ccd697cb62cc
36SHA1 (patch-lib_rubygems_platform.rb) = dff117b80a004325e7012575e838f49740a37dba 37SHA1 (patch-lib_rubygems_platform.rb) = af6ceaea50c0ccdf0539f79eb25d2afef7c05e73
37SHA1 (patch-lib_rubygems_specification.rb) = 3da23596f701c1966bc12f2341c82f2f2c646779 38SHA1 (patch-lib_rubygems_specification.rb) = 3da23596f701c1966bc12f2341c82f2f2c646779
38SHA1 (patch-lib_rubygems_uninstaller.rb) = 038df207f0ad4ef674ff60976fcda969d50c3c4e 39SHA1 (patch-lib_rubygems_uninstaller.rb) = 038df207f0ad4ef674ff60976fcda969d50c3c4e
39SHA1 (patch-man_erb.1) = a8f69ebb02b4d5e1c80b270a3d683c23d8dfbcf1 40SHA1 (patch-man_erb.1) = a8f69ebb02b4d5e1c80b270a3d683c23d8dfbcf1
40SHA1 (patch-man_irb.1) = 58fcccbb5f5f76450715cbf246a018af58d9b57e 41SHA1 (patch-man_irb.1) = 58fcccbb5f5f76450715cbf246a018af58d9b57e
41SHA1 (patch-man_ri.1) = 25d82d08a9eb74ccc1cbbc1fc324d23f1a56ed64 42SHA1 (patch-man_ri.1) = 25d82d08a9eb74ccc1cbbc1fc324d23f1a56ed64
42SHA1 (patch-man_ruby.1) = 43c638a38bed8257f33d8f5a491acd77a18032b7 43SHA1 (patch-man_ruby.1) = 43c638a38bed8257f33d8f5a491acd77a18032b7
43SHA1 (patch-pack.c) = d1e2c9871d2ba012a9136bdf708c2d42588d863c 44SHA1 (patch-pack.c) = d1e2c9871d2ba012a9136bdf708c2d42588d863c
44SHA1 (patch-test_rubygems_test__gem.rb) = fe8b8e436b255595122d2a01462ba0a686575f24 45SHA1 (patch-test_rubygems_test__gem.rb) = fe8b8e436b255595122d2a01462ba0a686575f24
45SHA1 (patch-tool_rbinstall.rb) = f0497085a09b31145f57028b30e335b09acabcff 46SHA1 (patch-tool_rbinstall.rb) = f0497085a09b31145f57028b30e335b09acabcff
46SHA1 (patch-vsnprintf.c) = 7bb4ca07381536717518143ef7803634168ca9fa 47SHA1 (patch-vsnprintf.c) = 7bb4ca07381536717518143ef7803634168ca9fa
File Added: pkgsrc/lang/ruby193-base/patches/Attic/patch-lib_rdoc_text.rb
$NetBSD: patch-lib_rdoc_text.rb,v 1.1 2015/03/08 14:53:39 taca Exp $

* Get rid of infitite loop with '\r' only in text.

--- lib/rdoc/text.rb.orig	2011-08-05 21:21:55.000000000 +0000
+++ lib/rdoc/text.rb
@@ -45,11 +45,11 @@ module RDoc::Text
     expanded = []
 
     text.each_line do |line|
-      line.gsub!(/^(.{8}*?)([^\t\r\n]{0,7})\t/) do
+      nil while line.gsub!(/(?:\G|\r)((?:.{8})*?)([^\t\r\n]{0,7})\t/) do
         r = "#{$1}#{$2}#{' ' * (8 - $2.size)}"
         r.force_encoding text.encoding if Object.const_defined? :Encoding
         r
-      end until line !~ /\t/
+      end
 
       expanded << line
     end
cvs diff -r1.1 -r1.2 pkgsrc/lang/ruby193-base/patches/Attic/patch-lib_rubygems_platform.rb (expand / switch to unified diff)

--- pkgsrc/lang/ruby193-base/patches/Attic/patch-lib_rubygems_platform.rb 2014/03/13 17:53:37 1.1
+++ pkgsrc/lang/ruby193-base/patches/Attic/patch-lib_rubygems_platform.rb 2015/03/08 14:53:39 1.2
@@ -1,14 +1,27 @@ @@ -1,14 +1,27 @@
1$NetBSD: patch-lib_rubygems_platform.rb,v 1.1 2014/03/13 17:53:37 taca Exp $ 1$NetBSD: patch-lib_rubygems_platform.rb,v 1.2 2015/03/08 14:53:39 taca Exp $
2 2
3Allow simple "netbsd" as Gem::Platform. 3Allow simple "netbsd" as Gem::Platform.
4 4
5--- lib/rubygems/platform.rb.orig 2012-04-19 22:43:16.000000000 +0000 5--- lib/rubygems/platform.rb.orig 2012-04-19 22:43:16.000000000 +0000
6+++ lib/rubygems/platform.rb 6+++ lib/rubygems/platform.rb
7@@ -82,6 +82,7 @@ class Gem::Platform 7@@ -51,10 +51,7 @@ class Gem::Platform
 8
 9 cpu = arch.shift
 10
 11- @cpu = case cpu
 12- when /i\d86/ then 'x86'
 13- else cpu
 14- end
 15+ @cpu = cpu
 16
 17 if arch.length == 2 and arch.last =~ /^\d+(\.\d+)?$/ then # for command-line
 18 @os, @version = arch
 19@@ -81,7 +78,7 @@ class Gem::Platform
 20 os, version = $1, $3
8 @cpu = 'x86' if @cpu.nil? and os =~ /32$/ 21 @cpu = 'x86' if @cpu.nil? and os =~ /32$/
9 [os, version] 22 [os, version]
10 when /netbsdelf/ then [ 'netbsdelf', nil ] 23- when /netbsdelf/ then [ 'netbsdelf', nil ]
11+ when /netbsd/ then [ 'netbsd', nil ] 24+ when /netbsd/ then [ 'netbsd', nil ]
12 when /openbsd(\d+\.\d+)/ then [ 'openbsd', $1 ] 25 when /openbsd(\d+\.\d+)/ then [ 'openbsd', $1 ]
13 when /solaris(\d+\.\d+)/ then [ 'solaris', $1 ] 26 when /solaris(\d+\.\d+)/ then [ 'solaris', $1 ]
14 # test 27 # test