From 9e96e0181811844ad70df523e8e8f072a0aae138 Mon Sep 17 00:00:00 2001
From: taca <taca@pkgsrc.org>
Date: Sun, 31 May 2015 15:25:41 +0000
Subject: Make this package build on Ruby 2.2.

---
 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(-)
 create mode 100644 databases/ruby-tokyotyrant/patches/patch-test.rb

diff --git a/databases/ruby-tokyotyrant/distinfo b/databases/ruby-tokyotyrant/distinfo
index 2e386a0ed74..10622eb708f 100644
--- a/databases/ruby-tokyotyrant/distinfo
+++ b/databases/ruby-tokyotyrant/distinfo
@@ -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 --git a/databases/ruby-tokyotyrant/patches/patch-aa b/databases/ruby-tokyotyrant/patches/patch-aa
index c2130c41ed1..3f56cd1b927 100644
--- a/databases/ruby-tokyotyrant/patches/patch-aa
+++ b/databases/ruby-tokyotyrant/patches/patch-aa
@@ -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 @@ Add support for DESTDIR.
  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 --git a/databases/ruby-tokyotyrant/patches/patch-test.rb b/databases/ruby-tokyotyrant/patches/patch-test.rb
new file mode 100644
index 00000000000..8eb8d73687d
--- /dev/null
+++ b/databases/ruby-tokyotyrant/patches/patch-test.rb
@@ -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")
-- 
cgit v1.2.3