Switch to use vendor_dir with Ruby 1.8.7.

Bump PKGREVISION.

2 files changed, 57 insertions, 53 deletions

diff --git a/devel/ruby-racc/Makefile b/devel/ruby-racc/Makefile
index ebebcfc5b33..3d94754d2c0 100644
--- a/devel/ruby-racc/Makefile
+++ b/devel/ruby-racc/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2007/03/17 15:49:43 taca Exp $
+# $NetBSD: Makefile,v 1.15 2008/06/19 14:47:54 taca Exp $
 
 DISTNAME=	racc-${RACC_VERSION}
 PKGNAME=	${RUBY_PKGPREFIX}-racc-${RACC_VERSION}
+PKGREVISION=	1
 CATEGORIES=	devel ruby
 MASTER_SITES=	http://i.loveruby.net/archive/racc/
 
@@ -12,6 +13,12 @@ COMMENT=	LALR(1) parser generator for Ruby
 USE_RUBY_SETUP=		yes
 RACC_VERSION=		1.4.5
 
+CONFIGURE_ARGS+=	--siteruby=${PREFIX}/${RUBY_VENDORLIB_BASE} \
+			--siterubyver=${PREFIX}/${RUBY_VENDORLIB} \
+			--siterubyverarch=${PREFIX}/${RUBY_VENDORARCHLIB}
+INSTALLATION_DIRS=	${RUBY_DOC}/racc/en ${RUBY_DOC}/racc/ja \
+			${RUBY_EG}/racc
+
 DOCS=		ChangeLog README.en README.ja TODO
 DOCS_HTML=	NEWS.html command.html debug.html grammar.html index.html \
 		parser.html usage.html
@@ -19,21 +26,18 @@ EXAMPLES=	array.y array2.y calc-ja.y calc.y conflict.y hash.y lalr.y \
 		syntax.y yyerr.y
 
 post-install:
-	${INSTALL_DATA_DIR} ${RUBY_DOCDIR}/racc/en
-	${INSTALL_DATA_DIR} ${RUBY_DOCDIR}/racc/ja
 .for f in ${DOCS}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_DOCDIR}/racc
+	${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${PREFIX}/${RUBY_DOC}/racc
 .endfor
 .for f in ${DOCS_HTML}
 	${INSTALL_DATA} ${WRKSRC}/doc.en/${f} \
-		${RUBY_DOCDIR}/racc/en
+		${DESTDIR}${PREFIX}/${RUBY_DOC}/racc/en
 	${INSTALL_DATA} ${WRKSRC}/doc.ja/${f} \
-		${RUBY_DOCDIR}/racc/ja
+		${DESTDIR}${PREFIX}/${RUBY_DOC}/racc/ja
 .endfor
-	${INSTALL_DATA_DIR} ${RUBY_EXAMPLESDIR}/racc
 .for f in ${EXAMPLES}
 	${INSTALL_DATA} ${WRKSRC}/sample/${f} \
-		${RUBY_EXAMPLESDIR}/racc
+		${DESTDIR}${PREFIX}/${RUBY_EG}/racc
 .endfor
 
 .include "../../lang/ruby/modules.mk"
diff --git a/devel/ruby-racc/PLIST b/devel/ruby-racc/PLIST
index b5b0d6ad44e..1a56d854738 100644
--- a/devel/ruby-racc/PLIST
+++ b/devel/ruby-racc/PLIST
@@ -1,48 +1,48 @@
-@comment $NetBSD: PLIST,v 1.9 2007/03/17 15:49:43 taca Exp $
+@comment $NetBSD: PLIST,v 1.10 2008/06/19 14:47:54 taca Exp $
 bin/racc
 bin/racc2y
 bin/y2racc
-${RUBY_SITELIBDIR}/racc/compat.rb
-${RUBY_SITELIBDIR}/racc/compiler.rb
-${RUBY_SITELIBDIR}/racc/exception.rb
-${RUBY_SITELIBDIR}/racc/grammar.rb
-${RUBY_SITELIBDIR}/racc/grammarfileparser.rb
-${RUBY_SITELIBDIR}/racc/grammarfilescanner.rb
-${RUBY_SITELIBDIR}/racc/info.rb
-${RUBY_SITELIBDIR}/racc/iset.rb
-${RUBY_SITELIBDIR}/racc/output.rb
-${RUBY_SITELIBDIR}/racc/parser-text.rb
-${RUBY_SITELIBDIR}/racc/state.rb
-${RUBY_SITELIBDIR}/racc/usercodeparser.rb
-${RUBY_DOCDIR}/racc/ChangeLog
-${RUBY_DOCDIR}/racc/README.en
-${RUBY_DOCDIR}/racc/README.ja
-${RUBY_DOCDIR}/racc/TODO
-${RUBY_DOCDIR}/racc/en/NEWS.html
-${RUBY_DOCDIR}/racc/en/command.html
-${RUBY_DOCDIR}/racc/en/debug.html
-${RUBY_DOCDIR}/racc/en/grammar.html
-${RUBY_DOCDIR}/racc/en/index.html
-${RUBY_DOCDIR}/racc/en/parser.html
-${RUBY_DOCDIR}/racc/en/usage.html
-${RUBY_DOCDIR}/racc/ja/NEWS.html
-${RUBY_DOCDIR}/racc/ja/command.html
-${RUBY_DOCDIR}/racc/ja/debug.html
-${RUBY_DOCDIR}/racc/ja/grammar.html
-${RUBY_DOCDIR}/racc/ja/index.html
-${RUBY_DOCDIR}/racc/ja/parser.html
-${RUBY_DOCDIR}/racc/ja/usage.html
-${RUBY_EXAMPLESDIR}/racc/array.y
-${RUBY_EXAMPLESDIR}/racc/array2.y
-${RUBY_EXAMPLESDIR}/racc/calc-ja.y
-${RUBY_EXAMPLESDIR}/racc/calc.y
-${RUBY_EXAMPLESDIR}/racc/conflict.y
-${RUBY_EXAMPLESDIR}/racc/hash.y
-${RUBY_EXAMPLESDIR}/racc/lalr.y
-${RUBY_EXAMPLESDIR}/racc/syntax.y
-${RUBY_EXAMPLESDIR}/racc/yyerr.y
-@dirrm ${RUBY_SITELIBDIR}/racc
-@dirrm ${RUBY_DOCDIR}/racc/en
-@dirrm ${RUBY_DOCDIR}/racc/ja
-@dirrm ${RUBY_DOCDIR}/racc
-@dirrm ${RUBY_EXAMPLESDIR}/racc
+${RUBY_VENDORLIB}/racc/compat.rb
+${RUBY_VENDORLIB}/racc/compiler.rb
+${RUBY_VENDORLIB}/racc/exception.rb
+${RUBY_VENDORLIB}/racc/grammar.rb
+${RUBY_VENDORLIB}/racc/grammarfileparser.rb
+${RUBY_VENDORLIB}/racc/grammarfilescanner.rb
+${RUBY_VENDORLIB}/racc/info.rb
+${RUBY_VENDORLIB}/racc/iset.rb
+${RUBY_VENDORLIB}/racc/output.rb
+${RUBY_VENDORLIB}/racc/parser-text.rb
+${RUBY_VENDORLIB}/racc/state.rb
+${RUBY_VENDORLIB}/racc/usercodeparser.rb
+${RUBY_DOC}/racc/ChangeLog
+${RUBY_DOC}/racc/README.en
+${RUBY_DOC}/racc/README.ja
+${RUBY_DOC}/racc/TODO
+${RUBY_DOC}/racc/en/NEWS.html
+${RUBY_DOC}/racc/en/command.html
+${RUBY_DOC}/racc/en/debug.html
+${RUBY_DOC}/racc/en/grammar.html
+${RUBY_DOC}/racc/en/index.html
+${RUBY_DOC}/racc/en/parser.html
+${RUBY_DOC}/racc/en/usage.html
+${RUBY_DOC}/racc/ja/NEWS.html
+${RUBY_DOC}/racc/ja/command.html
+${RUBY_DOC}/racc/ja/debug.html
+${RUBY_DOC}/racc/ja/grammar.html
+${RUBY_DOC}/racc/ja/index.html
+${RUBY_DOC}/racc/ja/parser.html
+${RUBY_DOC}/racc/ja/usage.html
+${RUBY_EG}/racc/array.y
+${RUBY_EG}/racc/array2.y
+${RUBY_EG}/racc/calc-ja.y
+${RUBY_EG}/racc/calc.y
+${RUBY_EG}/racc/conflict.y
+${RUBY_EG}/racc/hash.y
+${RUBY_EG}/racc/lalr.y
+${RUBY_EG}/racc/syntax.y
+${RUBY_EG}/racc/yyerr.y
+@dirrm ${RUBY_VENDORLIB}/racc
+@dirrm ${RUBY_DOC}/racc/en
+@dirrm ${RUBY_DOC}/racc/ja
+@dirrm ${RUBY_DOC}/racc
+@dirrm ${RUBY_EG}/racc