Allow ruby-native-hyperestraier and ruby-pure-hyperestraier packages

build on Ruby 2.2.

3 files changed, 27 insertions, 9 deletions

diff --git a/textproc/hyperestraier/distinfo b/textproc/hyperestraier/distinfo
index 52d25a18003..4eb45daa6a2 100644
--- a/textproc/hyperestraier/distinfo
+++ b/textproc/hyperestraier/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.30 2013/10/20 17:49:58 joerg Exp $
+$NetBSD: distinfo,v 1.31 2015/06/11 15:14:14 taca Exp $
 
 SHA1 (hyperestraier-1.4.13.tar.gz) = 21c3f325f42019fef096172105c2fc16f3e72fc0
 RMD160 (hyperestraier-1.4.13.tar.gz) = 8af0af25df6d5bd45a09e9abfbb26300339b5a2c
@@ -6,7 +6,7 @@ Size (hyperestraier-1.4.13.tar.gz) = 1014600 bytes
 SHA1 (patch-aa) = 67e563ac93b2b3e09122d3fcd12fc443d437fdb3
 SHA1 (patch-ab) = f3f57404f02ff9928adc0a8c5c9ddec65700ce85
 SHA1 (patch-ac) = 06bc0a56cc3a7592995d615a1afbffce8fb99931
-SHA1 (patch-ad) = 519ec64e5e87b5de00a488b4d19d82fe336724f4
-SHA1 (patch-ae) = fcde455f65834f004897805b61de40b1171ae6dd
+SHA1 (patch-ad) = 1ac7dad8bc89fc8bba945a89fa771b925daed7bf
+SHA1 (patch-ae) = 61621529c87c9040b8b948f03d461111c8488644
 SHA1 (patch-af) = 24ba33d20fc9b23cbc91c8345d2250db14dab536
 SHA1 (patch-rubynative_src_extconf.rb) = fbe2f3b3156a04a4d8ed78719dc429070eb9a559
diff --git a/textproc/hyperestraier/patches/patch-ad b/textproc/hyperestraier/patches/patch-ad
index c103c5f3fa0..d27af4d2502 100644
--- a/textproc/hyperestraier/patches/patch-ad
+++ b/textproc/hyperestraier/patches/patch-ad
@@ -1,8 +1,11 @@
-$NetBSD: patch-ad,v 1.4 2008/06/19 15:18:31 taca Exp $
+$NetBSD: patch-ad,v 1.5 2015/06/11 15:14:14 taca Exp $
+
+* Do not guess paths.
+* Fix build problem on Ruby 2.2 and later.
 
 --- rubynative/configure.orig	2007-12-25 01:53:40.000000000 +0000
 +++ rubynative/configure
-@@ -1233,27 +1233,6 @@ RDOC="rdoc"
+@@ -1233,32 +1233,11 @@ RDOC="rdoc"
  MYRBLIBDIR=/usr/local/lib/ruby/site_ruby
  MYRUNPATH=""
  
@@ -30,12 +33,18 @@ $NetBSD: patch-ad,v 1.4 2008/06/19 15:18:31 taca Exp $
  
  # Setting the default prefix
  if test "$prefix" = NONE
+ then
+-  prefix=`ruby -rrbconfig -e 'puts(Config::CONFIG.fetch("prefix"))'`
++  prefix=`ruby -rrbconfig -e 'puts(RbConfig::CONFIG.fetch("prefix"))'`
+ fi
+ 
+ 
 @@ -1285,7 +1264,7 @@ fi
  printf '%s\n' "$RDOC"
  
  # Librarh path
 -myrblibdir=`ruby -rrbconfig -e 'puts(Config::CONFIG.fetch("sitelibdir"))'`
-+myrblibdir=`ruby -rrbconfig -e 'puts(Config::CONFIG.fetch("vendorarchdir"))'`
++myrblibdir=`ruby -rrbconfig -e 'puts(RbConfig::CONFIG.fetch("vendorarchdir"))'`
  if test -n "$myrblibdir"
  then
    MYRBLIBDIR="$myrblibdir"
diff --git a/textproc/hyperestraier/patches/patch-ae b/textproc/hyperestraier/patches/patch-ae
index fb79a1fbb1f..b91546ee5a6 100644
--- a/textproc/hyperestraier/patches/patch-ae
+++ b/textproc/hyperestraier/patches/patch-ae
@@ -1,8 +1,11 @@
-$NetBSD: patch-ae,v 1.2 2008/06/19 15:18:31 taca Exp $
+$NetBSD: patch-ae,v 1.3 2015/06/11 15:14:14 taca Exp $
+
+* Do not guess paths.
+* Fix build problem on Ruby 2.2 and later.
 
 --- rubypure/configure.orig	2007-12-25 01:53:42.000000000 +0000
 +++ rubypure/configure
-@@ -1232,27 +1232,6 @@ RUBY="ruby"
+@@ -1232,32 +1232,11 @@ RUBY="ruby"
  RDOC="rdoc"
  MYRBLIBDIR=/usr/local/lib/ruby/site_ruby
  
@@ -30,12 +33,18 @@ $NetBSD: patch-ae,v 1.2 2008/06/19 15:18:31 taca Exp $
  
  # Setting the default prefix
  if test "$prefix" = NONE
+ then
+-  prefix=`ruby -rrbconfig -e 'puts(Config::CONFIG.fetch("prefix"))'`
++  prefix=`ruby -rrbconfig -e 'puts(RbConfig::CONFIG.fetch("prefix"))'`
+ fi
+ 
+ 
 @@ -1284,7 +1263,7 @@ fi
  printf '%s\n' "$RDOC"
  
  # Librarh path
 -myrblibdir=`ruby -rrbconfig -e 'puts(Config::CONFIG.fetch("sitelibdir"))'`
-+myrblibdir=`ruby -rrbconfig -e 'puts(Config::CONFIG.fetch("vendorlibdir"))'`
++myrblibdir=`ruby -rrbconfig -e 'puts(RbConfig::CONFIG.fetch("vendorlibdir"))'`
  if test -n "$myrblibdir"
  then
    MYRBLIBDIR="$myrblibdir"