[pkgsrc/trunk]: pkgsrc/lang/ruby21-base One more rubygem's platform fix from ...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/a10e4d527cf3
branches:  trunk
changeset: 632469:a10e4d527cf3
user:      taca <taca%pkgsrc.org@localhost>
date:      Sun Mar 30 17:15:01 2014 +0000

description:
One more rubygem's platform fix from jperkin@.  It solves some build
problem of ruby extension on NetBSD/i386.

Bump PKGREVISION.

diffstat:

 lang/ruby21-base/Makefile                               |   4 +-
 lang/ruby21-base/distinfo                               |   4 +-
 lang/ruby21-base/patches/patch-lib_rubygems_platform.rb |  26 ++++++++++++++--
 3 files changed, 26 insertions(+), 8 deletions(-)

diffs (73 lines):

diff -r 9d904867fbd5 -r a10e4d527cf3 lang/ruby21-base/Makefile
--- a/lang/ruby21-base/Makefile Sun Mar 30 16:44:59 2014 +0000
+++ b/lang/ruby21-base/Makefile Sun Mar 30 17:15:01 2014 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2014/03/26 13:22:44 taca Exp $
+# $NetBSD: Makefile,v 1.3 2014/03/30 17:15:01 taca Exp $
 #
 
 DISTNAME=      ${RUBY_DISTNAME}
 PKGNAME=       ${RUBY_PKGPREFIX}-base-${RUBY_VERSION_FULL}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    lang ruby
 MASTER_SITES=  ${MASTER_SITE_RUBY}
 
diff -r 9d904867fbd5 -r a10e4d527cf3 lang/ruby21-base/distinfo
--- a/lang/ruby21-base/distinfo Sun Mar 30 16:44:59 2014 +0000
+++ b/lang/ruby21-base/distinfo Sun Mar 30 17:15:01 2014 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2014/03/30 00:18:08 taca Exp $
+$NetBSD: distinfo,v 1.5 2014/03/30 17:15:01 taca Exp $
 
 SHA1 (ruby-2.1.1.tar.bz2) = a7fd539f64864bc00fc64444d2d814df6c19fd4a
 RMD160 (ruby-2.1.1.tar.bz2) = b200bb8d1542f79306c5cd0760781ec9dc759998
@@ -17,7 +17,7 @@
 SHA1 (patch-lib_rubygems_dependency__installer.rb) = 840626e388dae2e2059b38ef300edecf60f80100
 SHA1 (patch-lib_rubygems_install__update__options.rb) = 9a15d509928aa0440691bef8ad43bbfd2688542f
 SHA1 (patch-lib_rubygems_installer.rb) = b9f5f83db56e89e0996acd9677a090cf0856bf75
-SHA1 (patch-lib_rubygems_platform.rb) = 5150a27be7d637dc2ffa44c1d053a39d5f8c9059
+SHA1 (patch-lib_rubygems_platform.rb) = 193b73e6612e947f4a4669322acc7a54c9d604f8
 SHA1 (patch-lib_rubygems_specification.rb) = 034ad0404e8cdfed42def4cfb5c1f98a1597b0c0
 SHA1 (patch-lib_rubygems_uninstaller.rb) = 87fdddc435440aab57a6d44aba64abd0b2de6907
 SHA1 (patch-man_erb.1) = 1fe6ce4f4fe6418bfabb5e132a63596562030116
diff -r 9d904867fbd5 -r a10e4d527cf3 lang/ruby21-base/patches/patch-lib_rubygems_platform.rb
--- a/lang/ruby21-base/patches/patch-lib_rubygems_platform.rb   Sun Mar 30 16:44:59 2014 +0000
+++ b/lang/ruby21-base/patches/patch-lib_rubygems_platform.rb   Sun Mar 30 17:15:01 2014 +0000
@@ -1,14 +1,32 @@
-$NetBSD: patch-lib_rubygems_platform.rb,v 1.1 2014/03/14 19:40:47 taca Exp $
+$NetBSD: patch-lib_rubygems_platform.rb,v 1.2 2014/03/30 17:15:01 taca Exp $
 
-Allow simple "netbsd" as Gem::Platform.
+* Don't replace "i486" to "x86".
+* Allow simple "netbsd" as Gem::Platform.
 
 --- lib/rubygems/platform.rb.orig      2014-02-06 02:59:36.000000000 +0000
 +++ lib/rubygems/platform.rb
-@@ -94,6 +94,7 @@ class Gem::Platform
+@@ -63,7 +63,7 @@ class Gem::Platform
+       cpu = arch.shift
+ 
+       @cpu = case cpu
+-             when /i\d86/ then 'x86'
++             when /noti\d86/ then 'x86'
+              else cpu
+              end
+ 
+@@ -94,8 +94,9 @@ 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  ]
+-                      when /solaris(\d+\.\d+)?/ then    [ 'solaris',   $1  ]
++                      when /solaris(\d+\.\d+)?/ then    [ "solaris#{$1}", nil ]
                        # test
+                       when /^(\w+_platform)(\d+)?/ then [ $1,          $2  ]
+                       else                              [ 'unknown',   nil ]
+@@ -201,3 +202,4 @@ class Gem::Platform
+   CURRENT = 'current'
+ end
+ 
++