[pkgsrc/trunk]: pkgsrc/devel/ruby-mkrf Fix build problem on Ruby 2.2 and later.

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/33095aaddfd7
branches:  trunk
changeset: 652542:33095aaddfd7
user:      taca <taca%pkgsrc.org@localhost>
date:      Thu Jun 04 13:20:10 2015 +0000

description:
Fix build problem on Ruby 2.2 and later.

Bump PKGREVISION.

diffstat:

 devel/ruby-mkrf/Makefile                               |   3 +-
 devel/ruby-mkrf/distinfo                               |   6 +-
 devel/ruby-mkrf/patches/patch-aa                       |  16 ++++-
 devel/ruby-mkrf/patches/patch-lib_mkrf_availability.rb |  51 ++++++++++++++++++
 devel/ruby-mkrf/patches/patch-lib_mkrf_generator.rb    |  15 +++++
 5 files changed, 85 insertions(+), 6 deletions(-)

diffs (132 lines):

diff -r eb0441ee0cc9 -r 33095aaddfd7 devel/ruby-mkrf/Makefile
--- a/devel/ruby-mkrf/Makefile  Thu Jun 04 13:07:08 2015 +0000
+++ b/devel/ruby-mkrf/Makefile  Thu Jun 04 13:20:10 2015 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2010/09/10 05:59:06 taca Exp $
+# $NetBSD: Makefile,v 1.3 2015/06/04 13:20:10 taca Exp $
 
 DISTNAME=      mkrf-0.2.3
+PKGREVISION=   1
 CATEGORIES=    devel
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
diff -r eb0441ee0cc9 -r 33095aaddfd7 devel/ruby-mkrf/distinfo
--- a/devel/ruby-mkrf/distinfo  Thu Jun 04 13:07:08 2015 +0000
+++ b/devel/ruby-mkrf/distinfo  Thu Jun 04 13:20:10 2015 +0000
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.2 2010/09/10 05:59:06 taca Exp $
+$NetBSD: distinfo,v 1.3 2015/06/04 13:20:10 taca Exp $
 
 SHA1 (mkrf-0.2.3.gem) = 01b9b98b36487ec12da41ea4e7df21e55ffb502d
 RMD160 (mkrf-0.2.3.gem) = 44a142750af4dddb17b17deadbd4796489ce3017
 Size (mkrf-0.2.3.gem) = 415232 bytes
-SHA1 (patch-aa) = cc0bd77b3cb0e18d6ca5a2ddd08680371d9b7493
+SHA1 (patch-aa) = 35b81c3447146bc86700fd8993317dd74d83c0bc
+SHA1 (patch-lib_mkrf_availability.rb) = dbc20341379d4b950ce41317c6a33bd46cc23de2
+SHA1 (patch-lib_mkrf_generator.rb) = a8bba437199b4e22920fcec7ecd9790008945e44
diff -r eb0441ee0cc9 -r 33095aaddfd7 devel/ruby-mkrf/patches/patch-aa
--- a/devel/ruby-mkrf/patches/patch-aa  Thu Jun 04 13:07:08 2015 +0000
+++ b/devel/ruby-mkrf/patches/patch-aa  Thu Jun 04 13:20:10 2015 +0000
@@ -1,8 +1,9 @@
-$NetBSD: patch-aa,v 1.1 2010/09/10 05:59:06 taca Exp $
+$NetBSD: patch-aa,v 1.2 2015/06/04 13:20:11 taca Exp $
 
-Allow changeing rake command's name.
+* Allow changeing rake command's name.
+* Do not use obsolete Config but RbConfig
 
---- lib/mkrf/rakehelper.rb.orig        2010-08-28 10:52:11.000000000 +0000
+--- lib/mkrf/rakehelper.rb.orig        2015-05-30 13:40:54.000000000 +0000
 +++ lib/mkrf/rakehelper.rb
 @@ -5,7 +5,7 @@
  
@@ -13,6 +14,15 @@
    end
  end
  
+@@ -41,7 +41,7 @@ end
+ 
+ def setup_extension(dir, extension)
+   ext = "ext/#{dir}"
+-  ext_so = "#{ext}/#{extension}.#{Config::CONFIG['DLEXT']}"
++  ext_so = "#{ext}/#{extension}.#{RbConfig::CONFIG['DLEXT']}"
+   ext_files = FileList[
+     "#{ext}/*.c",
+     "#{ext}/*.h",
 @@ -105,7 +105,7 @@ end
  def sub_project(project, *targets)
    targets.each do |target|
diff -r eb0441ee0cc9 -r 33095aaddfd7 devel/ruby-mkrf/patches/patch-lib_mkrf_availability.rb
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/ruby-mkrf/patches/patch-lib_mkrf_availability.rb    Thu Jun 04 13:20:10 2015 +0000
@@ -0,0 +1,51 @@
+$NetBSD: patch-lib_mkrf_availability.rb,v 1.1 2015/06/04 13:20:11 taca Exp $
+
+* Do not use obsolete Config but RbConfig
+
+--- lib/mkrf/availability.rb.orig      2015-05-30 13:40:54.000000000 +0000
++++ lib/mkrf/availability.rb
+@@ -10,14 +10,14 @@ module Mkrf
+   # on the current system.
+   class Availability
+     # ruby 1.9+
+-    if Config::CONFIG['rubyhdrdir']
+-      DEFAULT_INCLUDES = [Config::CONFIG['rubyhdrdir'],
+-                          Config::CONFIG['rubyhdrdir'] + "/" + Config::CONFIG['arch'],
+-                          Config::CONFIG["archdir"],Config::CONFIG['sitelibdir'], "."]
++    if RbConfig::CONFIG['rubyhdrdir']
++      DEFAULT_INCLUDES = [RbConfig::CONFIG['rubyhdrdir'],
++                          RbConfig::CONFIG['rubyhdrdir'] + "/" + RbConfig::CONFIG['arch'],
++                          RbConfig::CONFIG["archdir"],RbConfig::CONFIG['sitelibdir'], "."]
+ 
+     else
+-      DEFAULT_INCLUDES = [Config::CONFIG['includedir'], Config::CONFIG["archdir"],
+-                          Config::CONFIG['sitelibdir'], "."]
++      DEFAULT_INCLUDES = [RbConfig::CONFIG['includedir'], RbConfig::CONFIG["archdir"],
++                          RbConfig::CONFIG['sitelibdir'], "."]
+     end
+                         
+     # These really shouldn't be static like this..
+@@ -35,11 +35,11 @@ module Mkrf
+     # * <tt>:compiler</tt> -- which compiler to use when determining availability
+     # * <tt>:includes</tt> -- directories that should be searched for include files
+     def initialize(options = {})      
+-      @loaded_libs = [(options[:loaded_libs] || Config::CONFIG["LIBS"].gsub('-l', '').split)].flatten
++      @loaded_libs = [(options[:loaded_libs] || RbConfig::CONFIG["LIBS"].gsub('-l', '').split)].flatten
+       @library_paths = [(options[:library_paths] || [])].flatten
+       # Not sure what COMMON_HEADERS looks like when populated
+-      @headers = options[:headers] || [] # Config::CONFIG["COMMON_HEADERS"]
+-      @compiler = options[:compiler] || Config::CONFIG["CC"]
++      @headers = options[:headers] || [] # RbConfig::CONFIG["COMMON_HEADERS"]
++      @compiler = options[:compiler] || RbConfig::CONFIG["CC"]
+       @includes = [(options[:includes] || DEFAULT_INCLUDES)].flatten
+       @logger = Logger.new('mkrf.log')
+       @defines = []
+@@ -167,7 +167,7 @@ module Mkrf
+       if RUBY_PLATFORM =~ /mswin/
+         "link -nologo -incremental:no -debug -opt:ref -opt:icf -dll"
+       else
+-        Config::CONFIG['LDSHARED']
++        RbConfig::CONFIG['LDSHARED']
+       end
+     end
+ 
diff -r eb0441ee0cc9 -r 33095aaddfd7 devel/ruby-mkrf/patches/patch-lib_mkrf_generator.rb
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/ruby-mkrf/patches/patch-lib_mkrf_generator.rb       Thu Jun 04 13:20:10 2015 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-lib_mkrf_generator.rb,v 1.1 2015/06/04 13:20:11 taca Exp $
+
+* Do not use obsolete Config but RbConfig
+
+--- lib/mkrf/generator.rb.orig 2015-05-30 13:40:54.000000000 +0000
++++ lib/mkrf/generator.rb
+@@ -41,7 +41,7 @@ module Mkrf
+   class Generator
+     include Rake
+     
+-    CONFIG = Config::CONFIG
++    CONFIG = RbConfig::CONFIG
+     
+     # Any extra code, given as a string, to be appended to the Rakefile.
+     attr_accessor :additional_code