5 files changed, 21 insertions, 51 deletions
diff --git a/lang/ruby193-base/Makefile b/lang/ruby193-base/Makefile
index d466392812f..4f32aa874a3 100644
--- a/lang/ruby193-base/Makefile
+++ b/lang/ruby193-base/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.41 2014/03/13 11:08:51 jperkin Exp $
+# $NetBSD: Makefile,v 1.42 2014/03/13 17:53:36 taca Exp $
 #
 
 DISTNAME=	${RUBY_DISTNAME}
 PKGNAME=	${RUBY_PKGPREFIX}-base-${RUBY_VERSION_FULL}
-PKGREVISION=	4
 CATEGORIES=	lang ruby
 MASTER_SITES=	${MASTER_SITE_RUBY}
 
@@ -144,7 +143,7 @@ pre-configure:
 	${RM} -f ${WRKSRC}/ext/tk/extconf.rb
 
 pre-install:
-	cd ${WRKSRC}/bin; for f in *; do ${LN} -f $$f $${f}${RUBY_VER}; done
+	cd ${WRKSRC}/bin; for f in *; do ${LN} -f $$f $${f}${RUBY_SUFFIX}; done
 	cd ${WRKSRC}/lib; \
 		${FIND} . \( -name '*.orig' -o -name '*.orig_dist' \) \
 		-exec ${RM} -f {} \;
diff --git a/lang/ruby193-base/distinfo b/lang/ruby193-base/distinfo
index b5cbbcb8442..a536a4b83d8 100644
--- a/lang/ruby193-base/distinfo
+++ b/lang/ruby193-base/distinfo
@@ -1,13 +1,12 @@
-$NetBSD: distinfo,v 1.32 2014/02/24 01:20:15 taca Exp $
+$NetBSD: distinfo,v 1.33 2014/03/13 17:53:36 taca Exp $
 
-SHA1 (ruby-1.9.3-p484.tar.bz2) = 81dbaf390b16157069d8d1dd5b787db44d5f881c
-RMD160 (ruby-1.9.3-p484.tar.bz2) = 21b4acab12b974d1f99d994a40cdfe3fe8d0be95
-Size (ruby-1.9.3-p484.tar.bz2) = 10041514 bytes
+SHA1 (ruby-1.9.3-p545.tar.bz2) = 99b97ce41b5fc751bdafdc00f589bcb7240ac542
+RMD160 (ruby-1.9.3-p545.tar.bz2) = 73e1391ee432575c06c7341499fc0a7792c03229
+Size (ruby-1.9.3-p545.tar.bz2) = 10038164 bytes
 SHA1 (patch-configure) = 0ef7e10bbff37118c48053e7189f87528a3e408b
 SHA1 (patch-configure.in) = 09dfe819b6a9bd7c9af704eeaef659857d33d0c3
 SHA1 (patch-defs_default__gems) = fb24111736f1a76a05e853aa068024dbdd24e5a5
 SHA1 (patch-ext_dl_extconf.rb) = aed210606893d2b9c463d794df039f06003848e4
-SHA1 (patch-ext_tk_lib_tkextlib_tktable_tktable.rb) = 10c7842daa3c23d57dcd08dc00adf5770af9dad1
 SHA1 (patch-lib_rdoc_ri_driver.rb) = acb4cb022893eb8dea2adf7564f5e5e1a0f1e9c8
 SHA1 (patch-lib_rubygems.rb) = e472c981e544b75c3762385895c9a0197be9badd
 SHA1 (patch-lib_rubygems_command.rb) = 916a93372e714b56a741acc15350536194f34c77
@@ -23,9 +22,9 @@ 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_specification.rb) = 3da23596f701c1966bc12f2341c82f2f2c646779
 SHA1 (patch-lib_rubygems_uninstaller.rb) = 038df207f0ad4ef674ff60976fcda969d50c3c4e
-SHA1 (patch-lib_rubygems_version.rb) = 1ebc87bec0af5875dcee6911b75319cb39423202
 SHA1 (patch-man_erb.1) = a8f69ebb02b4d5e1c80b270a3d683c23d8dfbcf1
 SHA1 (patch-man_irb.1) = 58fcccbb5f5f76450715cbf246a018af58d9b57e
 SHA1 (patch-man_ri.1) = 25d82d08a9eb74ccc1cbbc1fc324d23f1a56ed64
diff --git a/lang/ruby193-base/patches/patch-ext_tk_lib_tkextlib_tktable_tktable.rb b/lang/ruby193-base/patches/patch-ext_tk_lib_tkextlib_tktable_tktable.rb
deleted file mode 100644
index fa9c4f21815..00000000000
--- a/lang/ruby193-base/patches/patch-ext_tk_lib_tkextlib_tktable_tktable.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ext_tk_lib_tkextlib_tktable_tktable.rb,v 1.1 2013/11/24 15:26:30 taca Exp $
-
-Fix wrong parameter from [ruby-list:49643].
-
---- ext/tk/lib/tkextlib/tktable/tktable.rb.orig	2009-10-02 10:45:39.000000000 +0000
-+++ ext/tk/lib/tkextlib/tktable/tktable.rb
-@@ -70,7 +70,7 @@ module Tk::TkTable::ConfigMethod
-   private :__item_strval_optkeys
- 
-   def __item_val2ruby_optkeys(id)  # { key=>method, ... }
--    super(id).update('window'=>proc{|v| window(v)})
-+    super(id).update('window'=>proc{|k, v| window(v)})
-   end
-   private :__item_val2ruby_optkeys
- 
diff --git a/lang/ruby193-base/patches/patch-lib_rubygems_platform.rb b/lang/ruby193-base/patches/patch-lib_rubygems_platform.rb
new file mode 100644
index 00000000000..7e490b31b49
--- /dev/null
+++ b/lang/ruby193-base/patches/patch-lib_rubygems_platform.rb
@@ -0,0 +1,14 @@
+$NetBSD: patch-lib_rubygems_platform.rb,v 1.1 2014/03/13 17:53:37 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
+                         @cpu = 'x86' if @cpu.nil? and os =~ /32$/
+                         [os, version]
+                       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
diff --git a/lang/ruby193-base/patches/patch-lib_rubygems_version.rb b/lang/ruby193-base/patches/patch-lib_rubygems_version.rb
deleted file mode 100644
index 958484a930e..00000000000
--- a/lang/ruby193-base/patches/patch-lib_rubygems_version.rb
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-lib_rubygems_version.rb,v 1.3 2013/09/30 03:15:03 taca Exp $
-
-* A fix for CVE-2013-4363.
-* A small fix from Ruby 2.0.0 and Rubygem 1.8.25.
-
---- lib/rubygems/version.rb.orig	2012-04-19 22:43:16.000000000 +0000
-+++ lib/rubygems/version.rb
-@@ -145,8 +145,8 @@ class Gem::Version
- 
-   include Comparable
- 
--  VERSION_PATTERN = '[0-9]+(\.[0-9a-zA-Z]+)*' # :nodoc:
--  ANCHORED_VERSION_PATTERN = /\A\s*(#{VERSION_PATTERN})*\s*\z/ # :nodoc:
-+  VERSION_PATTERN = '[0-9]+(?>\.[0-9a-zA-Z]+)*' # :nodoc:
-+  ANCHORED_VERSION_PATTERN = /\A\s*(#{VERSION_PATTERN})?\s*\z/ # :nodoc:
- 
-   ##
-   # A string representation of this Version.
-@@ -187,7 +187,7 @@ class Gem::Version
-     raise ArgumentError, "Malformed version number string #{version}" unless
-       self.class.correct?(version)
- 
--    @version = version.to_s
-+    @version = version.to_s.dup
-     @version.strip!
-   end
-