Fix build problem with Ruby 2.2 and later.

NetBSD · May 30, 2016 · ae5b6e2 · ae5b6e2
1 parent 0028a23
commit ae5b6e2
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 4 deletions.
diff --git a/devel/libthrift/distinfo b/devel/libthrift/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.11 2015/11/03 03:27:45 agc Exp $
+$NetBSD: distinfo,v 1.12 2016/05/30 09:22:58 taca Exp $
 
 SHA1 (thrift-0.7.0.tar.gz) = b8f6877bc75878984355da4efe171ad99ff05b6a
 RMD160 (thrift-0.7.0.tar.gz) = d9db8ff077347134101cd017e086511c4317b052
@@ -8,7 +8,7 @@ SHA1 (patch-ac) = 84032447dc90b7071d8f54fc56dd30584fbc8116
 SHA1 (patch-compiler_cpp_src_generate_t__rb__generator.cc) = 1b2e71c38fdf3211be65bc199f348fcbadfe805c
 SHA1 (patch-compiler_cpp_src_thrifty.yy) = 69ccc48794edf8358ab39950794e1c542641fb3f
 SHA1 (patch-lib__rb__ext__extconf.rb) = 627725567f6d78070e28d430ebe7ac96910df8ec
-SHA1 (patch-lib__rb__setup.rb) = 4e08bb4c0828306ee2391f5d5760e74a5df30a73
+SHA1 (patch-lib__rb__setup.rb) = 9b189208c01a654ff633756d8800fb327ba7a9b7
 SHA1 (patch-lib_cpp_src_async_TAsyncBufferProcessor.h) = 2387b52d1dcd01637bd0853743ede85dd4a3357b
 SHA1 (patch-lib_cpp_src_async_TAsyncChannel.cpp) = dd3d65fd83f6ab4ebbc81f7e6ea98b05ef13592e
 SHA1 (patch-lib_cpp_src_async_TAsyncChannel.h) = 6a9e25f84d9d1d8b1192c5f3b059ea7a39c8396a

diff --git a/devel/libthrift/patches/patch-lib__rb__setup.rb b/devel/libthrift/patches/patch-lib__rb__setup.rb
@@ -1,7 +1,11 @@
-$NetBSD: patch-lib__rb__setup.rb,v 1.1 2011/06/03 13:39:45 fhajny Exp $
+$NetBSD: patch-lib__rb__setup.rb,v 1.2 2016/05/30 09:22:58 taca Exp $
+
+* Changes for pkgsrc.
+* Remove duplicate 'bin-dir' key.
+* Do not use obsolete Config::CONFIG but RbConfig::CONFIG.
 
 pkgsrc prefers vendor Ruby dirs.
---- lib/rb/setup.rb.orig	2011-01-31 01:13:14.000000000 +0000
+--- lib/rb/setup.rb.orig	2011-08-11 13:19:12.000000000 +0000
 +++ lib/rb/setup.rb
 @@ -165,9 +165,9 @@ class ConfigTable
        libruby         = "#{c['prefix']}/lib/ruby"
@@ -16,3 +20,20 @@
      elsif newpath_p
        # 1.4.4 <= V <= 1.6.3
        libruby         = "#{c['prefix']}/lib/ruby"
+@@ -281,7 +281,6 @@ class ConfigTable
+     'site-ruby-common' => 'siteruby',     # For backward compatibility
+     'site-ruby'        => 'siterubyver',  # For backward compatibility
+     'bin-dir'          => 'bindir',
+-    'bin-dir'          => 'bindir',
+     'rb-dir'           => 'rbdir',
+     'so-dir'           => 'sodir',
+     'data-dir'         => 'datadir',
+@@ -785,7 +784,7 @@ class ToplevelInstaller
+     else
+       require 'rbconfig'
+     end
+-    ::Config::CONFIG
++    ::RbConfig::CONFIG
+   end
+
+   def initialize(ardir_root, config)