- Switch to use vendor_dir with Ruby 1.8.7.

Bump PKGREVISION.

4 files changed, 42 insertions, 39 deletions

diff --git a/textproc/ruby-html-parser/Makefile b/textproc/ruby-html-parser/Makefile
index b37447fb1dc..37011c13fb6 100644
--- a/textproc/ruby-html-parser/Makefile
+++ b/textproc/ruby-html-parser/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2005/11/03 05:16:51 taca Exp $
+# $NetBSD: Makefile,v 1.9 2008/06/19 14:55:41 taca Exp $
 
 DISTNAME=	html-parser-${VERSION}
 PKGNAME=	${RUBY_PKGPREFIX}-html-parser-${VERSION}
+PKGREVISION=	1
 CATEGORIES=	textproc ruby
 MASTER_SITES=	http://www.jin.gr.jp/~nahi/Ruby/html-parser/
 
@@ -14,10 +15,11 @@ NO_CONFIGURE=	yes
 
 USE_RUBY_INSTALL=	yes
 VERSION=		19990912p2
+INSTALLATION_DIRS=	${RUBY_DOC}/html-parser
 
 post-install:
-	${INSTALL_DATA_DIR} ${RUBY_DOCDIR}/html-parser
-	${INSTALL_DATA} ${WRKSRC}/README.html ${RUBY_DOCDIR}/html-parser
+	${INSTALL_DATA} ${WRKSRC}/README.html \
+		${DESTDIR}${PREFIX}/${RUBY_DOC}/html-parser
 
 .include "../../lang/ruby/modules.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/ruby-html-parser/PLIST b/textproc/ruby-html-parser/PLIST
index c47759c3144..595dbefe704 100644
--- a/textproc/ruby-html-parser/PLIST
+++ b/textproc/ruby-html-parser/PLIST
@@ -1,6 +1,6 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:58:39 zuntum Exp $
-${RUBY_SITELIBDIR}/formatter.rb
-${RUBY_SITELIBDIR}/html-parser.rb
-${RUBY_SITELIBDIR}/sgml-parser.rb
-${RUBY_DOCDIR}/html-parser/README.html
-@dirrm ${RUBY_DOCDIR}/html-parser
+@comment $NetBSD: PLIST,v 1.2 2008/06/19 14:55:41 taca Exp $
+${RUBY_VENDORLIB}/formatter.rb
+${RUBY_VENDORLIB}/html-parser.rb
+${RUBY_VENDORLIB}/sgml-parser.rb
+${RUBY_DOC}/html-parser/README.html
+@dirrm ${RUBY_DOC}/html-parser
diff --git a/textproc/ruby-htree/Makefile b/textproc/ruby-htree/Makefile
index d40a062cc40..834275f0089 100644
--- a/textproc/ruby-htree/Makefile
+++ b/textproc/ruby-htree/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2007/05/26 13:16:00 obache Exp $
+# $NetBSD: Makefile,v 1.2 2008/06/19 14:55:48 taca Exp $
 
 DISTNAME=	htree-0.6
 PKGNAME=	${RUBY_PKGPREFIX}-${DISTNAME}
+PKGREVISION=	2
 CATEGORIES=	textproc ruby
 MASTER_SITES=	http://www.a-k-r.org/htree/
 
diff --git a/textproc/ruby-htree/PLIST b/textproc/ruby-htree/PLIST
index e6d1b43c4c6..81fee035936 100644
--- a/textproc/ruby-htree/PLIST
+++ b/textproc/ruby-htree/PLIST
@@ -1,29 +1,29 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2007/05/26 13:16:00 obache Exp $
-${RUBY_SITELIBDIR}/htree.rb
-${RUBY_SITELIBDIR}/htree/container.rb
-${RUBY_SITELIBDIR}/htree/context.rb
-${RUBY_SITELIBDIR}/htree/display.rb
-${RUBY_SITELIBDIR}/htree/doc.rb
-${RUBY_SITELIBDIR}/htree/elem.rb
-${RUBY_SITELIBDIR}/htree/encoder.rb
-${RUBY_SITELIBDIR}/htree/equality.rb
-${RUBY_SITELIBDIR}/htree/extract_text.rb
-${RUBY_SITELIBDIR}/htree/fstr.rb
-${RUBY_SITELIBDIR}/htree/gencode.rb
-${RUBY_SITELIBDIR}/htree/htmlinfo.rb
-${RUBY_SITELIBDIR}/htree/inspect.rb
-${RUBY_SITELIBDIR}/htree/leaf.rb
-${RUBY_SITELIBDIR}/htree/loc.rb
-${RUBY_SITELIBDIR}/htree/modules.rb
-${RUBY_SITELIBDIR}/htree/name.rb
-${RUBY_SITELIBDIR}/htree/output.rb
-${RUBY_SITELIBDIR}/htree/parse.rb
-${RUBY_SITELIBDIR}/htree/raw_string.rb
-${RUBY_SITELIBDIR}/htree/regexp-util.rb
-${RUBY_SITELIBDIR}/htree/rexml.rb
-${RUBY_SITELIBDIR}/htree/scan.rb
-${RUBY_SITELIBDIR}/htree/tag.rb
-${RUBY_SITELIBDIR}/htree/template.rb
-${RUBY_SITELIBDIR}/htree/text.rb
-${RUBY_SITELIBDIR}/htree/traverse.rb
-@dirrm ${RUBY_SITELIBDIR}/htree
+@comment $NetBSD: PLIST,v 1.2 2008/06/19 14:55:48 taca Exp $
+${RUBY_VENDORLIB}/htree.rb
+${RUBY_VENDORLIB}/htree/container.rb
+${RUBY_VENDORLIB}/htree/context.rb
+${RUBY_VENDORLIB}/htree/display.rb
+${RUBY_VENDORLIB}/htree/doc.rb
+${RUBY_VENDORLIB}/htree/elem.rb
+${RUBY_VENDORLIB}/htree/encoder.rb
+${RUBY_VENDORLIB}/htree/equality.rb
+${RUBY_VENDORLIB}/htree/extract_text.rb
+${RUBY_VENDORLIB}/htree/fstr.rb
+${RUBY_VENDORLIB}/htree/gencode.rb
+${RUBY_VENDORLIB}/htree/htmlinfo.rb
+${RUBY_VENDORLIB}/htree/inspect.rb
+${RUBY_VENDORLIB}/htree/leaf.rb
+${RUBY_VENDORLIB}/htree/loc.rb
+${RUBY_VENDORLIB}/htree/modules.rb
+${RUBY_VENDORLIB}/htree/name.rb
+${RUBY_VENDORLIB}/htree/output.rb
+${RUBY_VENDORLIB}/htree/parse.rb
+${RUBY_VENDORLIB}/htree/raw_string.rb
+${RUBY_VENDORLIB}/htree/regexp-util.rb
+${RUBY_VENDORLIB}/htree/rexml.rb
+${RUBY_VENDORLIB}/htree/scan.rb
+${RUBY_VENDORLIB}/htree/tag.rb
+${RUBY_VENDORLIB}/htree/template.rb
+${RUBY_VENDORLIB}/htree/text.rb
+${RUBY_VENDORLIB}/htree/traverse.rb
+@dirrm ${RUBY_VENDORLIB}/htree