[pkgsrc/trunk]: pkgsrc/databases/ruby-tokyotyrant Make this package build on ...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/a1493ee441f2
branches:  trunk
changeset: 652412:a1493ee441f2
user:      taca <taca%pkgsrc.org@localhost>
date:      Sun May 31 15:25:41 2015 +0000

description:
Make this package build on Ruby 2.2.

diffstat:

 databases/ruby-tokyotyrant/distinfo              |   5 +++--
 databases/ruby-tokyotyrant/patches/patch-aa      |  11 +++++++----
 databases/ruby-tokyotyrant/patches/patch-test.rb |  15 +++++++++++++++
 3 files changed, 25 insertions(+), 6 deletions(-)

diffs (58 lines):

diff -r bff7d908be4a -r a1493ee441f2 databases/ruby-tokyotyrant/distinfo
--- a/databases/ruby-tokyotyrant/distinfo       Sun May 31 15:23:36 2015 +0000
+++ b/databases/ruby-tokyotyrant/distinfo       Sun May 31 15:25:41 2015 +0000
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.14 2010/09/10 04:56:04 taca Exp $
+$NetBSD: distinfo,v 1.15 2015/05/31 15:25:41 taca Exp $
 
 SHA1 (tokyotyrant-ruby-1.13.tar.gz) = 519fe95fe846bc741fffe0034f81d2dac48c97ce
 RMD160 (tokyotyrant-ruby-1.13.tar.gz) = 52579fca8a469472ff8d6d847ce88a78f8849ec8
 Size (tokyotyrant-ruby-1.13.tar.gz) = 47663 bytes
-SHA1 (patch-aa) = ae47703873f1f82cb179152b5df3190c7dac278c
+SHA1 (patch-aa) = f2bdf37849c9b3968732ad68daf2d46a0868e736
+SHA1 (patch-test.rb) = da9b1a09c9a34f18e7076bf9600fc1a3623d13ee
diff -r bff7d908be4a -r a1493ee441f2 databases/ruby-tokyotyrant/patches/patch-aa
--- a/databases/ruby-tokyotyrant/patches/patch-aa       Sun May 31 15:23:36 2015 +0000
+++ b/databases/ruby-tokyotyrant/patches/patch-aa       Sun May 31 15:25:41 2015 +0000
@@ -1,6 +1,7 @@
-$NetBSD: patch-aa,v 1.3 2010/09/10 04:56:04 taca Exp $
+$NetBSD: patch-aa,v 1.4 2015/05/31 15:25:41 taca Exp $
 
-Add support for DESTDIR.
+* Add support for DESTDIR.
+* Fix build problem on Ruby 2.2 and later.
 
 --- install.rb.orig    2008-10-22 15:53:45.000000000 +0000
 +++ install.rb
@@ -8,8 +9,10 @@
  require 'rbconfig'
 +require 'fileutils'
  
- sitelibdir = Config::CONFIG.fetch("sitelibdir")
- bindir = Config::CONFIG.fetch("bindir")
+-sitelibdir = Config::CONFIG.fetch("sitelibdir")
+-bindir = Config::CONFIG.fetch("bindir")
++sitelibdir = RbConfig::CONFIG.fetch("sitelibdir")
++bindir = RbConfig::CONFIG.fetch("bindir")
  
  def copy(src, dest, mode)
 +  if (destdir = ENV['DESTDIR'])
diff -r bff7d908be4a -r a1493ee441f2 databases/ruby-tokyotyrant/patches/patch-test.rb
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/databases/ruby-tokyotyrant/patches/patch-test.rb  Sun May 31 15:25:41 2015 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-test.rb,v 1.1 2015/05/31 15:25:41 taca Exp $
+
+Fix build problem on Ruby 2.2 and later.
+
+--- test.rb.orig       2009-11-04 06:51:22.000000000 +0000
++++ test.rb
+@@ -12,7 +12,7 @@ commands = [
+             "tcrtest.rb rcat -tout 3 -ext put 127.0.0.1 1000",
+             "tcrtest.rb misc -tout 3 127.0.0.1 1000",
+            ]
+-rubycmd = Config::CONFIG["bindir"] + "/" + RbConfig::CONFIG['ruby_install_name']
++rubycmd = RbConfig::CONFIG["bindir"] + "/" + RbConfig::CONFIG['ruby_install_name']
+ num = 1
+ commands.each do |command|
+   rv = system("#{rubycmd} #{command} >/dev/null")