- Switch to use vendor_dir with Ruby 1.8.7.

- Make it build with Ruby 1.8.7, too.

Bump PKGREVISION.

7 files changed, 23 insertions, 12 deletions

diff --git a/textproc/hyperestraier/distinfo b/textproc/hyperestraier/distinfo
index 9727b820dc3..4bcc986819c 100644
--- a/textproc/hyperestraier/distinfo
+++ b/textproc/hyperestraier/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.27 2008/05/27 13:51:02 obache Exp $
+$NetBSD: distinfo,v 1.28 2008/06/19 15:18:31 taca Exp $
 
 SHA1 (hyperestraier-1.4.13.tar.gz) = 21c3f325f42019fef096172105c2fc16f3e72fc0
 RMD160 (hyperestraier-1.4.13.tar.gz) = 8af0af25df6d5bd45a09e9abfbb26300339b5a2c
@@ -6,5 +6,5 @@ Size (hyperestraier-1.4.13.tar.gz) = 1014600 bytes
 SHA1 (patch-aa) = 67e563ac93b2b3e09122d3fcd12fc443d437fdb3
 SHA1 (patch-ab) = f3f57404f02ff9928adc0a8c5c9ddec65700ce85
 SHA1 (patch-ac) = 06bc0a56cc3a7592995d615a1afbffce8fb99931
-SHA1 (patch-ad) = f2656b84d5f81d9844b97b5536262edc7dee1bdc
-SHA1 (patch-ae) = 28e525d1856ff21fa93f479b3eda65e292857d53
+SHA1 (patch-ad) = 519ec64e5e87b5de00a488b4d19d82fe336724f4
+SHA1 (patch-ae) = fcde455f65834f004897805b61de40b1171ae6dd
diff --git a/textproc/hyperestraier/patches/patch-ad b/textproc/hyperestraier/patches/patch-ad
index e31a5ab7ef8..c103c5f3fa0 100644
--- a/textproc/hyperestraier/patches/patch-ad
+++ b/textproc/hyperestraier/patches/patch-ad
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.3 2008/05/27 13:51:02 obache Exp $
+$NetBSD: patch-ad,v 1.4 2008/06/19 15:18:31 taca Exp $
 
 --- rubynative/configure.orig	2007-12-25 01:53:40.000000000 +0000
 +++ rubynative/configure
@@ -35,7 +35,7 @@ $NetBSD: patch-ad,v 1.3 2008/05/27 13:51:02 obache Exp $
  
  # Librarh path
 -myrblibdir=`ruby -rrbconfig -e 'puts(Config::CONFIG.fetch("sitelibdir"))'`
-+myrblibdir=`ruby -rrbconfig -e 'puts(Config::CONFIG.fetch("sitearchdir"))'`
++myrblibdir=`ruby -rrbconfig -e 'puts(Config::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 4deea65b1bf..fb79a1fbb1f 100644
--- a/textproc/hyperestraier/patches/patch-ae
+++ b/textproc/hyperestraier/patches/patch-ae
@@ -1,4 +1,4 @@
-$NetBSD: patch-ae,v 1.1 2008/05/27 13:51:02 obache Exp $
+$NetBSD: patch-ae,v 1.2 2008/06/19 15:18:31 taca Exp $
 
 --- rubypure/configure.orig	2007-12-25 01:53:42.000000000 +0000
 +++ rubypure/configure
@@ -30,3 +30,12 @@ $NetBSD: patch-ae,v 1.1 2008/05/27 13:51:02 obache Exp $
  
  # Setting the default prefix
  if test "$prefix" = NONE
+@@ -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"))'`
+ if test -n "$myrblibdir"
+ then
+   MYRBLIBDIR="$myrblibdir"
diff --git a/textproc/ruby-native-hyperestraier/Makefile b/textproc/ruby-native-hyperestraier/Makefile
index 080ce22923c..827f904031d 100644
--- a/textproc/ruby-native-hyperestraier/Makefile
+++ b/textproc/ruby-native-hyperestraier/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.1.1.1 2006/11/17 15:42:27 obache Exp $
+# $NetBSD: Makefile,v 1.2 2008/06/19 15:18:31 taca Exp $
 #
 
 .include "../../textproc/hyperestraier/Makefile.common"
 
 PKGNAME=	${RUBY_PKGPREFIX}-native-hyperestraier-1.0.0.${HYPERESTRAIER_VERSION}
+PKGREVISION=	1
 CATEGORIES=	textproc ruby
 
 COMMENT=	Ruby native interface of Hyper Estaier
diff --git a/textproc/ruby-native-hyperestraier/PLIST b/textproc/ruby-native-hyperestraier/PLIST
index 10f5a2c2557..356c5ecf8af 100644
--- a/textproc/ruby-native-hyperestraier/PLIST
+++ b/textproc/ruby-native-hyperestraier/PLIST
@@ -1,3 +1,3 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2006/11/17 15:42:27 obache Exp $
-${RUBY_SITEARCHLIBDIR}/estraier.${RUBY_DLEXT}
+@comment $NetBSD: PLIST,v 1.2 2008/06/19 15:18:31 taca Exp $
+${RUBY_VENDORARCHLIB}/estraier.${RUBY_DLEXT}
 bin/estcmd.rb
diff --git a/textproc/ruby-pure-hyperestraier/Makefile b/textproc/ruby-pure-hyperestraier/Makefile
index efb08ccef8c..eae6bf70d83 100644
--- a/textproc/ruby-pure-hyperestraier/Makefile
+++ b/textproc/ruby-pure-hyperestraier/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.2 2007/04/05 12:21:27 obache Exp $
+# $NetBSD: Makefile,v 1.3 2008/06/19 15:18:31 taca Exp $
 #
 
 .include "../../textproc/hyperestraier/Makefile.common"
 
 PKGNAME=	${RUBY_PKGPREFIX}-pure-hyperestraier-1.0.0.${HYPERESTRAIER_VERSION}
+PKGREVISION=	1
 CATEGORIES=	textproc ruby
 
 COMMENT=	Ruby pure interface of Hyper Estaier
diff --git a/textproc/ruby-pure-hyperestraier/PLIST b/textproc/ruby-pure-hyperestraier/PLIST
index ba47625934d..901e8eb4589 100644
--- a/textproc/ruby-pure-hyperestraier/PLIST
+++ b/textproc/ruby-pure-hyperestraier/PLIST
@@ -1,3 +1,3 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2006/11/17 15:45:46 obache Exp $
-${RUBY_SITELIBDIR}/estraierpure.rb
+@comment $NetBSD: PLIST,v 1.2 2008/06/19 15:18:31 taca Exp $
+${RUBY_VENDORLIB}/estraierpure.rb
 bin/estcall.rb