[pkgsrc/trunk]: pkgsrc/lang Update ruby193-base and related packages to 1.9.3...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/1d66b926d41e
branches:  trunk
changeset: 631776:1d66b926d41e
user:      taca <taca%pkgsrc.org@localhost>
date:      Thu Mar 13 17:53:36 2014 +0000

description:
Update ruby193-base and related packages to 1.9.3p545 (Ruby 1.9.3-p545).

pkgsrc chagnges:

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

Quote from release announce:

This is the last ordinal release of Ruby 1.9.3. It means that Ruby 1.9.3 goes
into the state of the security maintenance phase, and will never be released
unless any critical regressions or security issues are found.  This phase is
planned to be maintained for 1 year. Then, maintenance of Ruby 1.9.3 will be
ended at Feb. 24th, 2015.

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

diffstat:

 lang/ruby/rubyversion.mk                                               |   4 +-
 lang/ruby193-base/Makefile                                             |   5 +-
 lang/ruby193-base/distinfo                                             |  11 +--
 lang/ruby193-base/patches/patch-ext_tk_lib_tkextlib_tktable_tktable.rb |  15 -----
 lang/ruby193-base/patches/patch-lib_rubygems_platform.rb               |  14 +++++
 lang/ruby193-base/patches/patch-lib_rubygems_version.rb                |  27 ----------
 6 files changed, 23 insertions(+), 53 deletions(-)

diffs (141 lines):

diff -r 2914add1036e -r 1d66b926d41e lang/ruby/rubyversion.mk
--- a/lang/ruby/rubyversion.mk  Thu Mar 13 17:21:01 2014 +0000
+++ b/lang/ruby/rubyversion.mk  Thu Mar 13 17:53:36 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: rubyversion.mk,v 1.112 2014/03/13 17:06:12 taca Exp $
+# $NetBSD: rubyversion.mk,v 1.113 2014/03/13 17:53:36 taca Exp $
 #
 
 # This file determines which Ruby version is used as a dependency for
@@ -219,7 +219,7 @@
 
 # patch
 RUBY18_PATCHLEVEL=     pl374
-RUBY193_PATCHLEVEL=    p484
+RUBY193_PATCHLEVEL=    p545
 RUBY200_PATCHLEVEL=    p353
 
 # current API compatible version; used for version of shared library
diff -r 2914add1036e -r 1d66b926d41e lang/ruby193-base/Makefile
--- a/lang/ruby193-base/Makefile        Thu Mar 13 17:21:01 2014 +0000
+++ b/lang/ruby193-base/Makefile        Thu Mar 13 17:53:36 2014 +0000
@@ -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 @@
        ${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 2914add1036e -r 1d66b926d41e lang/ruby193-base/distinfo
--- a/lang/ruby193-base/distinfo        Thu Mar 13 17:21:01 2014 +0000
+++ b/lang/ruby193-base/distinfo        Thu Mar 13 17:53:36 2014 +0000
@@ -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_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 -r 2914add1036e -r 1d66b926d41e lang/ruby193-base/patches/patch-ext_tk_lib_tkextlib_tktable_tktable.rb
--- a/lang/ruby193-base/patches/patch-ext_tk_lib_tkextlib_tktable_tktable.rb    Thu Mar 13 17:21:01 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 2914add1036e -r 1d66b926d41e lang/ruby193-base/patches/patch-lib_rubygems_platform.rb
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/ruby193-base/patches/patch-lib_rubygems_platform.rb  Thu Mar 13 17:53:36 2014 +0000
@@ -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 -r 2914add1036e -r 1d66b926d41e lang/ruby193-base/patches/patch-lib_rubygems_version.rb
--- a/lang/ruby193-base/patches/patch-lib_rubygems_version.rb   Thu Mar 13 17:21:01 2014 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -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
-