- Switch to use vendor_dir with Ruby 1.8.7.

- And make it build with Ruby 1.8.7, too.

Bump PKGREVISION.

4 files changed, 54 insertions, 24 deletions

diff --git a/textproc/ruby-eruby/Makefile b/textproc/ruby-eruby/Makefile
index 26b90068e9d..0e3037c9f11 100644
--- a/textproc/ruby-eruby/Makefile
+++ b/textproc/ruby-eruby/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.21 2007/03/17 17:29:01 rillig Exp $
+# $NetBSD: Makefile,v 1.22 2008/06/19 14:55:16 taca Exp $
 
 DISTNAME=	eruby-${ERUBY_VERSION}
 PKGNAME=	${RUBY_PKGPREFIX}-${DISTNAME}
-PKGREVISION=	6
+PKGREVISION=	7
 CATEGORIES=	textproc ruby
 MASTER_SITES=	http://www.modruby.net/archive/
 
@@ -35,17 +35,18 @@ MAN1=			eruby.1
 DOCS=			ChangeLog README.en README.ja eruby.rd eruby.html
 EXAMPLES=		e2r.rb foo.rhtml test.rb test.rhtml
 
+INSTALLATION_DIRS=	bin include lib ${RUBY_DOC}/eruby ${RUBY_EG}/eruby
+
 post-build:
 	cd ${WRKSRC}; ${RUBY_RD} eruby.rd > eruby.html
 
 post-install:
-	${INSTALL_DATA_DIR} ${RUBY_DOCDIR}/eruby
 .for f in ${DOCS}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_DOCDIR}/eruby
+	${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${PREFIX}/${RUBY_DOC}/eruby
 .endfor
-	${INSTALL_DATA_DIR} ${RUBY_EXAMPLESDIR}/eruby
 .for f in ${EXAMPLES}
-	${INSTALL_DATA} ${WRKSRC}/examples/${f} ${RUBY_EXAMPLESDIR}/eruby
+	${INSTALL_DATA} ${WRKSRC}/examples/${f} \
+		${DESTDIR}${PREFIX}/${RUBY_EG}/eruby
 .endfor
 
 .include "../../lang/ruby/modules.mk"
diff --git a/textproc/ruby-eruby/PLIST b/textproc/ruby-eruby/PLIST
index fcf9f7cb9f2..b7dd4d47138 100644
--- a/textproc/ruby-eruby/PLIST
+++ b/textproc/ruby-eruby/PLIST
@@ -1,20 +1,20 @@
-@comment $NetBSD: PLIST,v 1.7 2006/09/07 15:55:50 taca Exp $
+@comment $NetBSD: PLIST,v 1.8 2008/06/19 14:55:16 taca Exp $
 bin/eruby
 include/eruby.h
 lib/liberuby.a
 lib/liberuby.so
 lib/liberuby.so.${ERUBY_MAJOR}${ERUBY_MINOR}
 lib/liberuby.so.${ERUBY_MAJOR}${ERUBY_MINOR}.${ERUBY_TEENY}
-${RUBY_SITEARCHLIBDIR}/eruby.${RUBY_DLEXT}
+${RUBY_VENDORARCHLIB}/eruby.${RUBY_DLEXT}
 man/man1/eruby.1
-${RUBY_DOCDIR}/eruby/ChangeLog
-${RUBY_DOCDIR}/eruby/README.en
-${RUBY_DOCDIR}/eruby/README.ja
-${RUBY_DOCDIR}/eruby/eruby.rd
-${RUBY_DOCDIR}/eruby/eruby.html
-${RUBY_EXAMPLESDIR}/eruby/e2r.rb
-${RUBY_EXAMPLESDIR}/eruby/foo.rhtml
-${RUBY_EXAMPLESDIR}/eruby/test.rb
-${RUBY_EXAMPLESDIR}/eruby/test.rhtml
-@dirrm ${RUBY_DOCDIR}/eruby
-@dirrm ${RUBY_EXAMPLESDIR}/eruby
+${RUBY_DOC}/eruby/ChangeLog
+${RUBY_DOC}/eruby/README.en
+${RUBY_DOC}/eruby/README.ja
+${RUBY_DOC}/eruby/eruby.rd
+${RUBY_DOC}/eruby/eruby.html
+${RUBY_EG}/eruby/e2r.rb
+${RUBY_EG}/eruby/foo.rhtml
+${RUBY_EG}/eruby/test.rb
+${RUBY_EG}/eruby/test.rhtml
+@dirrm ${RUBY_DOC}/eruby
+@dirrm ${RUBY_EG}/eruby
diff --git a/textproc/ruby-eruby/distinfo b/textproc/ruby-eruby/distinfo
index e154e7333e9..3a630c5c67b 100644
--- a/textproc/ruby-eruby/distinfo
+++ b/textproc/ruby-eruby/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.10 2006/01/03 14:25:50 taca Exp $
+$NetBSD: distinfo,v 1.11 2008/06/19 14:55:16 taca Exp $
 
 SHA1 (eruby-1.0.5.tar.gz) = d8900f8a7c30661351d2bf6f53753fa86df24996
 RMD160 (eruby-1.0.5.tar.gz) = 4fb288dd768f98780dc705574968f090cd82d560
 Size (eruby-1.0.5.tar.gz) = 61187 bytes
 SHA1 (patch-aa) = ca7a9d4d9827b18040cbebac54eabe762355b76d
 SHA1 (patch-ab) = bf3bce49348e0e157b67e5e4a26c2e9411248a84
-SHA1 (patch-ac) = 1b035cbaec6c905a01344eb56401f5b0c4fa6ed6
+SHA1 (patch-ac) = 1480e55e46dccfdf29015f0cac7a8395cb725bc6
diff --git a/textproc/ruby-eruby/patches/patch-ac b/textproc/ruby-eruby/patches/patch-ac
index 6794e07409f..3b16e823a32 100644
--- a/textproc/ruby-eruby/patches/patch-ac
+++ b/textproc/ruby-eruby/patches/patch-ac
@@ -1,8 +1,37 @@
-$NetBSD: patch-ac,v 1.3 2005/02/17 15:11:23 taca Exp $
+$NetBSD: patch-ac,v 1.4 2008/06/19 14:55:16 taca Exp $
 
---- configure.rb.orig	2003-02-10 12:18:10.000000000 +0900
+--- configure.rb.orig	2003-02-10 03:18:10.000000000 +0000
 +++ configure.rb
-@@ -443,27 +443,22 @@ $LIBERUBY_A = "liberuby.a"
+@@ -210,6 +210,7 @@ $bindir = CONFIG["bindir"].sub(prefix, "
+ $datadir = CONFIG["datadir"].sub(prefix, "$(prefix)").sub(drive, '')
+ $libdir = CONFIG["libdir"].sub(prefix, "$(exec_prefix)").sub(drive, '')
+ $archdir = $archdir.sub(prefix, "$(prefix)").sub(drive, '')
++$sitedir = $vendordir
+ $sitelibdir = $sitelibdir.sub(prefix, "$(prefix)").sub(drive, '')
+ $sitearchdir = $sitearchdir.sub(prefix, "$(prefix)").sub(drive, '')
+ $includedir = CONFIG["includedir"].sub(prefix, "$(prefix)").sub(drive, '')
+@@ -307,11 +308,15 @@ if $LDFLAGS.to_s.empty? && /mswin32/ =~ 
+ end
+ $LIBS = CONFIG["LIBS"]
+ $XLDFLAGS = CONFIG["XLDFLAGS"]
+-$XLDFLAGS.gsub!(/-L\./, "")
+-if /mswin32/ !~ RUBY_PLATFORM
+-  $XLDFLAGS += " -L$(libdir)"
+-elsif RUBY_VERSION >= "1.8"
+-  $XLDFLAGS += " #{CONFIG['LIBPATHFLAG'] % '$(libdir)'}"
++if $XLDFLAGS.nil?
++   $XLDFLAGS = ''
++else
++  $XLDFLAGS.gsub!(/-L\./, "")
++  if /mswin32/ !~ RUBY_PLATFORM
++    $XLDFLAGS += " -L$(libdir)"
++  elsif RUBY_VERSION >= "1.8"
++    $XLDFLAGS += " #{CONFIG['LIBPATHFLAG'] % '$(libdir)'}"
++  end
+ end
+ $DLDFLAGS = CONFIG["DLDFLAGS"]
+ $LDSHARED = CONFIG["LDSHARED"]
+@@ -443,27 +448,22 @@ $LIBERUBY_A = "liberuby.a"
  $LIBERUBY = "${LIBERUBY_A}"
  $LIBERUBYARG="$(LIBERUBY_A)"