[pkgsrc/trunk]: pkgsrc/lang Update ruby200-base and ruby200 packages to 2.0.0...

[taca <taca%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/aeef4ee30229
branches:  trunk
changeset: 631778:aeef4ee30229
user:      taca <taca%pkgsrc.org@localhost>
date:      Thu Mar 13 18:00:02 2014 +0000

description:
Update ruby200-base and ruby200 packages to 2.0.0p451 (Ruby 2.0.0-p451).

pkgsrc chagnges:

* Use RUBY_SUFFIX instead of RUBY_VER for appropriate place.
* Detect NetBSD correctly in Gem::Platform.

Quote from release announce:

 This release includes many bugfixes. See tickets and ChangeLog for details.

diffstat:

 lang/ruby/rubyversion.mk                                               |   4 +-
 lang/ruby200-base/Makefile                                             |   5 +--
 lang/ruby200-base/distinfo                                             |  10 +++---
 lang/ruby200-base/patches/patch-ext_tk_lib_tkextlib_tktable_tktable.rb |  15 ----------
 lang/ruby200-base/patches/patch-lib_rubygems_platform.rb               |  14 +++++++++
 5 files changed, 23 insertions(+), 25 deletions(-)

diffs (106 lines):

diff -r 9d4ab45bc50a -r aeef4ee30229 lang/ruby/rubyversion.mk
--- a/lang/ruby/rubyversion.mk  Thu Mar 13 17:56:50 2014 +0000
+++ b/lang/ruby/rubyversion.mk  Thu Mar 13 18:00:02 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: rubyversion.mk,v 1.113 2014/03/13 17:53:36 taca Exp $
+# $NetBSD: rubyversion.mk,v 1.114 2014/03/13 18:00:02 taca Exp $
 #
 
 # This file determines which Ruby version is used as a dependency for
@@ -220,7 +220,7 @@
 # patch
 RUBY18_PATCHLEVEL=     pl374
 RUBY193_PATCHLEVEL=    p545
-RUBY200_PATCHLEVEL=    p353
+RUBY200_PATCHLEVEL=    p451
 
 # current API compatible version; used for version of shared library
 RUBY18_API_VERSION=    1.8.7
diff -r 9d4ab45bc50a -r aeef4ee30229 lang/ruby200-base/Makefile
--- a/lang/ruby200-base/Makefile        Thu Mar 13 17:56:50 2014 +0000
+++ b/lang/ruby200-base/Makefile        Thu Mar 13 18:00:02 2014 +0000
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2014/02/19 15:52:05 taca Exp $
+# $NetBSD: Makefile,v 1.10 2014/03/13 18:00:02 taca Exp $
 #
 
 DISTNAME=      ${RUBY_DISTNAME}
 PKGNAME=       ${RUBY_PKGPREFIX}-base-${RUBY_VERSION_FULL}
-PKGREVISION=   3
 CATEGORIES=    lang ruby
 MASTER_SITES=  ${MASTER_SITE_RUBY}
 
@@ -149,7 +148,7 @@
        ${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 -r 9d4ab45bc50a -r aeef4ee30229 lang/ruby200-base/distinfo
--- a/lang/ruby200-base/distinfo        Thu Mar 13 17:56:50 2014 +0000
+++ b/lang/ruby200-base/distinfo        Thu Mar 13 18:00:02 2014 +0000
@@ -1,12 +1,11 @@
-$NetBSD: distinfo,v 1.10 2014/02/19 15:52:05 taca Exp $
+$NetBSD: distinfo,v 1.11 2014/03/13 18:00:02 taca Exp $
 
-SHA1 (ruby-2.0.0-p353.tar.bz2) = 0be863f1c39d7764c52cbb79ca06105743e27c42
-RMD160 (ruby-2.0.0-p353.tar.bz2) = e12445ef618953c89d1c198899b6a3a959fc55f2
-Size (ruby-2.0.0-p353.tar.bz2) = 10730412 bytes
+SHA1 (ruby-2.0.0-p451.tar.bz2) = 22b76e421fedba99267601702af74cf396110229
+RMD160 (ruby-2.0.0-p451.tar.bz2) = c7e7efd5c8e081f69c91618c72187e7f66174cc2
+Size (ruby-2.0.0-p451.tar.bz2) = 10725438 bytes
 SHA1 (patch-configure) = 5e0897ef60a14073e87427911b45c2b238bbe2a3
 SHA1 (patch-defs_default__gems) = 28a47952e27c22055bac6ad151d092572b96b1ec
 SHA1 (patch-ext_dl_extconf.rb) = f6c71db3c3076216c9b5db92692c7c8dad012af0
-SHA1 (patch-ext_tk_lib_tkextlib_tktable_tktable.rb) = 10c7842daa3c23d57dcd08dc00adf5770af9dad1
 SHA1 (patch-lib_rdoc_ri_driver.rb) = 53ce4055b4c008c8ee13d38a81334d4846debdbc
 SHA1 (patch-lib_rubygems.rb) = 0f0b8f14745998f5ed0ade9b0b5cdefc8f30d988
 SHA1 (patch-lib_rubygems_commands_setup__command.rb) = 46991d63256d0d3cc2f707fb286d1691331ad40e
@@ -17,6 +16,7 @@
 SHA1 (patch-lib_rubygems_dependency__installer.rb) = f4e40727d231b336c1d4c2303ac1c1e2b50f2710
 SHA1 (patch-lib_rubygems_install__update__options.rb) = 22cfafe090db72211253b8528937e5be0e677ebf
 SHA1 (patch-lib_rubygems_installer.rb) = 7ce68eaa5893c83780f7b4e1af44a88ae63a39cf
+SHA1 (patch-lib_rubygems_platform.rb) = 135f2e9d6c0c529da9ffcea4b96507675cdf1f16
 SHA1 (patch-lib_rubygems_specification.rb) = 3e9e95178127da862add4141665b80d965874f21
 SHA1 (patch-lib_rubygems_uninstaller.rb) = cb4db78829af11d6294b15d1e81066227e3ea3bb
 SHA1 (patch-man_erb.1) = 1fe6ce4f4fe6418bfabb5e132a63596562030116
diff -r 9d4ab45bc50a -r aeef4ee30229 lang/ruby200-base/patches/patch-ext_tk_lib_tkextlib_tktable_tktable.rb
--- a/lang/ruby200-base/patches/patch-ext_tk_lib_tkextlib_tktable_tktable.rb    Thu Mar 13 17:56:50 2014 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -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 -r 9d4ab45bc50a -r aeef4ee30229 lang/ruby200-base/patches/patch-lib_rubygems_platform.rb
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/ruby200-base/patches/patch-lib_rubygems_platform.rb  Thu Mar 13 18:00:02 2014 +0000
@@ -0,0 +1,14 @@
+$NetBSD: patch-lib_rubygems_platform.rb,v 1.1 2014/03/13 18:00:02 taca Exp $
+
+Allow simple "netbsd" as Gem::Platform.
+
+--- lib/rubygems/platform.rb.orig      2013-07-22 16:33:18.000000000 +0000
++++ lib/rubygems/platform.rb
+@@ -83,6 +83,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 /openbsd(\d+\.\d+)?/ then    [ 'openbsd',   $1  ]
+                       when /solaris(\d+\.\d+)?/ then    [ 'solaris',   $1  ]