[pkgsrc/trunk]: pkgsrc/devel/ruby-setup Don't use obsolete Config::CONFIG but...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/166689644cc0
branches:  trunk
changeset: 632138:166689644cc0
user:      taca <taca%pkgsrc.org@localhost>
date:      Mon Mar 17 14:08:41 2014 +0000

description:
Don't use obsolete Config::CONFIG but RbConfig::CONFIG.

Bump PKGREVISION.

diffstat:

 devel/ruby-setup/Makefile         |   3 ++-
 devel/ruby-setup/distinfo         |   4 ++--
 devel/ruby-setup/patches/patch-aa |  22 ++++++++++++++++------
 3 files changed, 20 insertions(+), 9 deletions(-)

diffs (80 lines):

diff -r 95cfb4a0cb25 -r 166689644cc0 devel/ruby-setup/Makefile
--- a/devel/ruby-setup/Makefile Mon Mar 17 14:07:06 2014 +0000
+++ b/devel/ruby-setup/Makefile Mon Mar 17 14:08:41 2014 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2012/10/31 11:19:43 asau Exp $
+# $NetBSD: Makefile,v 1.5 2014/03/17 14:08:41 taca Exp $
 # $FreeBSD: ports/devel/ruby-setup.rb/Makefile,v 1.20 2006/06/08 20:25:19 sem Exp $
 
 DISTNAME=      setup-3.4.1
+PKGREVISION=   1
 CATEGORIES=    devel ruby
 MASTER_SITES=  http://i.loveruby.net/archive/setup/
 
diff -r 95cfb4a0cb25 -r 166689644cc0 devel/ruby-setup/distinfo
--- a/devel/ruby-setup/distinfo Mon Mar 17 14:07:06 2014 +0000
+++ b/devel/ruby-setup/distinfo Mon Mar 17 14:08:41 2014 +0000
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.2 2010/09/10 06:26:00 taca Exp $
+$NetBSD: distinfo,v 1.3 2014/03/17 14:08:41 taca Exp $
 
 SHA1 (setup-3.4.1.tar.gz) = 2e8fbdc4e0fdca917e231e3e961f9972086dd338
 RMD160 (setup-3.4.1.tar.gz) = bd32c4c8fa20b5ad858b2b7ba5e5caca25a4125b
 Size (setup-3.4.1.tar.gz) = 47192 bytes
-SHA1 (patch-aa) = df302feb77a5b7f4b89959c6bdd990658e40b5a6
+SHA1 (patch-aa) = 27ef9d8f54814191229f50b3ad552939c40fb6ad
diff -r 95cfb4a0cb25 -r 166689644cc0 devel/ruby-setup/patches/patch-aa
--- a/devel/ruby-setup/patches/patch-aa Mon Mar 17 14:07:06 2014 +0000
+++ b/devel/ruby-setup/patches/patch-aa Mon Mar 17 14:08:41 2014 +0000
@@ -1,15 +1,16 @@
-$NetBSD: patch-aa,v 1.1.1.1 2009/02/15 03:04:18 taca Exp $
+$NetBSD: patch-aa,v 1.2 2014/03/17 14:08:41 taca Exp $
 
-Add shbang path and use vendordir.
+* Add shbang path and use vendordir.
+* Don't use obsolete Config.
 
---- setup.rb.orig      2005-09-25 02:22:05.000000000 +0900
+--- setup.rb.orig      2005-11-20 11:54:27.000000000 +0000
 +++ setup.rb
 @@ -1,3 +1,4 @@
 +#!env ruby
  #
  # setup.rb
  #
-@@ -171,6 +172,9 @@ class ConfigTable
+@@ -168,6 +169,9 @@ class ConfigTable
        siteruby        = c['sitedir']
        siterubyver     = c['sitelibdir']
        siterubyverarch = c['sitearchdir']
@@ -19,7 +20,7 @@
      elsif newpath_p
        # 1.4.4 <= V <= 1.6.3
        libruby         = "#{c['prefix']}/lib/ruby"
-@@ -207,8 +211,8 @@ class ConfigTable
+@@ -204,8 +208,8 @@ class ConfigTable
                table['rbdir'] = '$librubyver'
                table['sodir'] = '$librubyverarch'
              when 'site'
@@ -30,7 +31,7 @@
              when 'home'
                setup_rb_error '$HOME was not set' unless ENV['HOME']
                table['prefix'] = ENV['HOME']
-@@ -242,9 +246,15 @@ class ConfigTable
+@@ -239,9 +243,15 @@ class ConfigTable
                     'the directory for aux ruby libraries'),
        PathItem.new('siterubyverarch', 'path', siterubyverarch,
                     'the directory for aux ruby binaries'),
@@ -48,3 +49,12 @@
                     'the directory for ruby extentions'),
        PathItem.new('rubypath', 'path', rubypath,
                     'the path to set to #! line'),
+@@ -785,7 +795,7 @@ class ToplevelInstaller
+     else
+       require 'rbconfig'
+     end
+-    ::Config::CONFIG
++    ::RbConfig::CONFIG
+   end
+ 
+   def initialize(ardir_root, config)