* 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.

4 files changed, 42 insertions, 7 deletions

diff --git a/lang/ruby193-base/Makefile b/lang/ruby193-base/Makefile
index f5869174608..54c6af931e3 100644
--- a/lang/ruby193-base/Makefile
+++ b/lang/ruby193-base/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.48 2014/11/01 01:25:06 wiz Exp $
+# $NetBSD: Makefile,v 1.49 2015/03/08 14:53:39 taca Exp $
 #
 
 DISTNAME=	${RUBY_DISTNAME}
 PKGNAME=	${RUBY_PKGPREFIX}-base-${RUBY_VERSION_FULL}
+PKGREVISION=	1
 CATEGORIES=	lang ruby
 MASTER_SITES=	${MASTER_SITE_RUBY}
 
diff --git a/lang/ruby193-base/distinfo b/lang/ruby193-base/distinfo
index 5ee1c684cb2..4c780461853 100644
--- a/lang/ruby193-base/distinfo
+++ b/lang/ruby193-base/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.41 2015/01/07 10:35:59 taca Exp $
+$NetBSD: distinfo,v 1.42 2015/03/08 14:53:39 taca Exp $
 
 SHA1 (ruby-1.9.3-p551.tar.bz2) = 35600f4e2ac98653fa8a634104cb6ab3d47a1535
 RMD160 (ruby-1.9.3-p551.tar.bz2) = 59cfcaf4e02957f53bf83557962b0d428156bc01
@@ -19,6 +19,7 @@ SHA1 (patch-ext_tk_lib_tkextlib_tkimg_dted.rb) = c73d94032c22cbefb55daee2ba359d7
 SHA1 (patch-ext_tk_lib_tkextlib_tkimg_raw.rb) = 2c99d8f59c0ad5d6a493dd6e663850262487f5ef
 SHA1 (patch-ext_tk_tcltklib.c) = c58bffdde4a89ea7c442b1cf37c12c5ce53ee890
 SHA1 (patch-lib_rdoc_ri_driver.rb) = acb4cb022893eb8dea2adf7564f5e5e1a0f1e9c8
+SHA1 (patch-lib_rdoc_text.rb) = cfbf48096ce14da8016177f6a8e6ef4416929647
 SHA1 (patch-lib_rubygems.rb) = e472c981e544b75c3762385895c9a0197be9badd
 SHA1 (patch-lib_rubygems_command.rb) = 916a93372e714b56a741acc15350536194f34c77
 SHA1 (patch-lib_rubygems_command__manager.rb) = 4fabf9a6c8bf5e47a4fb3bb3d398105b4452ec7e
@@ -33,7 +34,7 @@ SHA1 (patch-lib_rubygems_doc__manager.rb) = 4b2d70e5dfaeff1f1b70ff27f1084065dcc7
 SHA1 (patch-lib_rubygems_gem__runner.rb) = 03ff2f0b72004ef7e09b5ba9d56752109e4e6b73
 SHA1 (patch-lib_rubygems_install__update__options.rb) = 74f81900c92bc3c7a663a112cccf6ff88b6ae180
 SHA1 (patch-lib_rubygems_installer.rb) = fe1c97abaf0b7a3fbecf8327a6d1ccd697cb62cc
-SHA1 (patch-lib_rubygems_platform.rb) = dff117b80a004325e7012575e838f49740a37dba
+SHA1 (patch-lib_rubygems_platform.rb) = af6ceaea50c0ccdf0539f79eb25d2afef7c05e73
 SHA1 (patch-lib_rubygems_specification.rb) = 3da23596f701c1966bc12f2341c82f2f2c646779
 SHA1 (patch-lib_rubygems_uninstaller.rb) = 038df207f0ad4ef674ff60976fcda969d50c3c4e
 SHA1 (patch-man_erb.1) = a8f69ebb02b4d5e1c80b270a3d683c23d8dfbcf1
diff --git a/lang/ruby193-base/patches/patch-lib_rdoc_text.rb b/lang/ruby193-base/patches/patch-lib_rdoc_text.rb
new file mode 100644
index 00000000000..e89bb804234
--- /dev/null
+++ b/lang/ruby193-base/patches/patch-lib_rdoc_text.rb
@@ -0,0 +1,20 @@
+$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
diff --git a/lang/ruby193-base/patches/patch-lib_rubygems_platform.rb b/lang/ruby193-base/patches/patch-lib_rubygems_platform.rb
index 7e490b31b49..8916e511f8d 100644
--- a/lang/ruby193-base/patches/patch-lib_rubygems_platform.rb
+++ b/lang/ruby193-base/patches/patch-lib_rubygems_platform.rb
@@ -1,14 +1,27 @@
-$NetBSD: patch-lib_rubygems_platform.rb,v 1.1 2014/03/13 17:53:37 taca Exp $
+$NetBSD: patch-lib_rubygems_platform.rb,v 1.2 2015/03/08 14:53:39 taca Exp $
 
 Allow simple "netbsd" as Gem::Platform.
 
 --- lib/rubygems/platform.rb.orig	2012-04-19 22:43:16.000000000 +0000
 +++ lib/rubygems/platform.rb
-@@ -82,6 +82,7 @@ class Gem::Platform
+@@ -51,10 +51,7 @@ class Gem::Platform
+ 
+       cpu = arch.shift
+ 
+-      @cpu = case cpu
+-             when /i\d86/ then 'x86'
+-             else cpu
+-             end
++      @cpu = cpu
+ 
+       if arch.length == 2 and arch.last =~ /^\d+(\.\d+)?$/ then # for command-line
+         @os, @version = arch
+@@ -81,7 +78,7 @@ class Gem::Platform
+                         os, version = $1, $3
                          @cpu = 'x86' if @cpu.nil? and os =~ /32$/
                          [os, version]
-                       when /netbsdelf/ then            [ 'netbsdelf', nil ]
-+                      when /netbsd/ then               [ 'netbsd', nil ]
+-                      when /netbsdelf/ then            [ 'netbsdelf', nil ]
++                      when /netbsd/ then               [ 'netbsd',    nil ]
                        when /openbsd(\d+\.\d+)/ then    [ 'openbsd',   $1  ]
                        when /solaris(\d+\.\d+)/ then    [ 'solaris',   $1  ]
                        # test