- Switch to use vendor_dir with Ruby 1.8.7.

Bump PKGREVISION.

2 files changed, 62 insertions, 63 deletions

diff --git a/textproc/ruby-xmlscan/Makefile b/textproc/ruby-xmlscan/Makefile
index b30bc393482..2cbb3ca5bde 100644
--- a/textproc/ruby-xmlscan/Makefile
+++ b/textproc/ruby-xmlscan/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2008/05/26 02:13:24 joerg Exp $
+# $NetBSD: Makefile,v 1.5 2008/06/19 14:58:13 taca Exp $
 #
 
 DISTNAME=	xmlscan-${VER}
 PKGNAME=	${RUBY_PKGPREFIX}-xmlscan-${VER}
+PKGREVISION=	1
 CATEGORIES=	textproc ruby
 MASTER_SITES=	http://www.blue.sky.or.jp/atelier/ruby/xmlscan/
 
@@ -14,32 +15,30 @@ VER=		0.2.3
 
 NO_BUILD=		yes
 USE_RUBY_INSTALL=	yes
-USE_TOOLS+=	pax
+USE_TOOLS+=		pax
 
-REPLACE_RUBY=	samples/getxmlchar.rb samples/xmlbench.rb \
-		samples/xmlconftest.rb
+INSTALLATION_DIRS=	${RUBY_DOC}/xmlscan/en ${RUBY_DOC}/xmlscan/ja \
+			${RUBY_EG}/xmlscan
 
 DOCS=		ChangeLog README THANKS
+REPLACE_RUBY=	samples/getxmlchar.rb samples/xmlbench.rb \
+		samples/xmlconftest.rb
 
 post-install:
-	${INSTALL_DATA_DIR} ${RUBY_DOCDIR}/xmlscan
 .for f in ${DOCS}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_DOCDIR}/xmlscan
+	${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${PREFIX}/${RUBY_DOC}/xmlscan
 .endfor
-	${INSTALL_DATA} ${WRKSRC}/doc/changes.html ${RUBY_DOCDIR}/xmlscan
-	${INSTALL_DATA} ${WRKSRC}/doc/changes.rd ${RUBY_DOCDIR}/xmlscan
-	${INSTALL_DATA_DIR} ${RUBY_DOCDIR}/xmlscan/en
-	${INSTALL_DATA} ${WRKSRC}/doc/en/conformance.html ${RUBY_DOCDIR}/xmlscan/en
-	${INSTALL_DATA} ${WRKSRC}/doc/en/conformance.rd ${RUBY_DOCDIR}/xmlscan/en
-	${INSTALL_DATA} ${WRKSRC}/doc/en/manual.html ${RUBY_DOCDIR}/xmlscan/en
-	${INSTALL_DATA} ${WRKSRC}/doc/en/manual.rd ${RUBY_DOCDIR}/xmlscan/en
-	${INSTALL_DATA_DIR} ${RUBY_DOCDIR}/xmlscan/ja
-	${INSTALL_DATA} ${WRKSRC}/doc/ja/conformance.ja.html ${RUBY_DOCDIR}/xmlscan/ja
-	${INSTALL_DATA} ${WRKSRC}/doc/ja/conformance.ja.rd ${RUBY_DOCDIR}/xmlscan/ja
-	${INSTALL_DATA} ${WRKSRC}/doc/ja/manual.ja.html ${RUBY_DOCDIR}/xmlscan/ja
-	${INSTALL_DATA} ${WRKSRC}/doc/ja/manual.ja.rd ${RUBY_DOCDIR}/xmlscan/ja
-	${INSTALL_DATA_DIR} ${RUBY_EXAMPLESDIR}/xmlscan
-	cd ${WRKSRC}/samples && pax -rw -pp * ${RUBY_EXAMPLESDIR}/xmlscan
+	${INSTALL_DATA} ${WRKSRC}/doc/changes.html ${DESTDIR}${PREFIX}/${RUBY_DOC}/xmlscan
+	${INSTALL_DATA} ${WRKSRC}/doc/changes.rd ${DESTDIR}${PREFIX}/${RUBY_DOC}/xmlscan
+	${INSTALL_DATA} ${WRKSRC}/doc/en/conformance.html ${DESTDIR}${PREFIX}/${RUBY_DOC}/xmlscan/en
+	${INSTALL_DATA} ${WRKSRC}/doc/en/conformance.rd ${DESTDIR}${PREFIX}/${RUBY_DOC}/xmlscan/en
+	${INSTALL_DATA} ${WRKSRC}/doc/en/manual.html ${DESTDIR}${PREFIX}/${RUBY_DOC}/xmlscan/en
+	${INSTALL_DATA} ${WRKSRC}/doc/en/manual.rd ${DESTDIR}${PREFIX}/${RUBY_DOC}/xmlscan/en
+	${INSTALL_DATA} ${WRKSRC}/doc/ja/conformance.ja.html ${DESTDIR}${PREFIX}/${RUBY_DOC}/xmlscan/ja
+	${INSTALL_DATA} ${WRKSRC}/doc/ja/conformance.ja.rd ${DESTDIR}${PREFIX}/${RUBY_DOC}/xmlscan/ja
+	${INSTALL_DATA} ${WRKSRC}/doc/ja/manual.ja.html ${DESTDIR}${PREFIX}/${RUBY_DOC}/xmlscan/ja
+	${INSTALL_DATA} ${WRKSRC}/doc/ja/manual.ja.rd ${DESTDIR}${PREFIX}/${RUBY_DOC}/xmlscan/ja
+	cd ${WRKSRC}/samples && pax -rw -pp * ${DESTDIR}${PREFIX}/${RUBY_EG}/xmlscan
 
 .include "../../lang/ruby/modules.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/ruby-xmlscan/PLIST b/textproc/ruby-xmlscan/PLIST
index 1c675563d51..9b0a08a0775 100644
--- a/textproc/ruby-xmlscan/PLIST
+++ b/textproc/ruby-xmlscan/PLIST
@@ -1,43 +1,43 @@
-@comment $NetBSD: PLIST,v 1.2 2006/09/07 15:55:51 taca Exp $
-${RUBY_SITELIBDIR}/xmlscan/encoding.rb
-${RUBY_SITELIBDIR}/xmlscan/htmlscan.rb
-${RUBY_SITELIBDIR}/xmlscan/namespace.rb
-${RUBY_SITELIBDIR}/xmlscan/parser.rb
-${RUBY_SITELIBDIR}/xmlscan/scanner.rb
-${RUBY_SITELIBDIR}/xmlscan/version.rb
-${RUBY_SITELIBDIR}/xmlscan/visitor.rb
-${RUBY_SITELIBDIR}/xmlscan/xmlchar.rb
-${RUBY_DOCDIR}/xmlscan/ChangeLog
-${RUBY_DOCDIR}/xmlscan/README
-${RUBY_DOCDIR}/xmlscan/THANKS
-${RUBY_DOCDIR}/xmlscan/changes.html
-${RUBY_DOCDIR}/xmlscan/changes.rd
-${RUBY_DOCDIR}/xmlscan/en/conformance.html
-${RUBY_DOCDIR}/xmlscan/en/conformance.rd
-${RUBY_DOCDIR}/xmlscan/en/manual.html
-${RUBY_DOCDIR}/xmlscan/en/manual.rd
-${RUBY_DOCDIR}/xmlscan/ja/conformance.ja.html
-${RUBY_DOCDIR}/xmlscan/ja/conformance.ja.rd
-${RUBY_DOCDIR}/xmlscan/ja/manual.ja.html
-${RUBY_DOCDIR}/xmlscan/ja/manual.ja.rd
-${RUBY_EXAMPLESDIR}/xmlscan/chibixml.rb
-${RUBY_EXAMPLESDIR}/xmlscan/getxmlchar.rb
-${RUBY_EXAMPLESDIR}/xmlscan/rexml.rb
-${RUBY_EXAMPLESDIR}/xmlscan/xmlbench.rb
-${RUBY_EXAMPLESDIR}/xmlscan/xmlconftest.rb
-${RUBY_EXAMPLESDIR}/xmlscan/xmlbench/xmlbench-lib.rb
-${RUBY_EXAMPLESDIR}/xmlscan/xmlbench/parser/chibixml.rb
-${RUBY_EXAMPLESDIR}/xmlscan/xmlbench/parser/nqxml.rb
-${RUBY_EXAMPLESDIR}/xmlscan/xmlbench/parser/rexml.rb
-${RUBY_EXAMPLESDIR}/xmlscan/xmlbench/parser/xmlparser.rb
-${RUBY_EXAMPLESDIR}/xmlscan/xmlbench/parser/xmlscan-0.0.10.rb
-${RUBY_EXAMPLESDIR}/xmlscan/xmlbench/parser/xmlscan-chibixml.rb
-${RUBY_EXAMPLESDIR}/xmlscan/xmlbench/parser/xmlscan-rexml.rb
-${RUBY_EXAMPLESDIR}/xmlscan/xmlbench/parser/xmlscan.rb
-@dirrm ${RUBY_SITELIBDIR}/xmlscan
-@dirrm ${RUBY_DOCDIR}/xmlscan/en
-@dirrm ${RUBY_DOCDIR}/xmlscan/ja
-@dirrm ${RUBY_DOCDIR}/xmlscan
-@dirrm ${RUBY_EXAMPLESDIR}/xmlscan/xmlbench/parser
-@dirrm ${RUBY_EXAMPLESDIR}/xmlscan/xmlbench
-@dirrm ${RUBY_EXAMPLESDIR}/xmlscan
+@comment $NetBSD: PLIST,v 1.3 2008/06/19 14:58:13 taca Exp $
+${RUBY_VENDORLIB}/xmlscan/encoding.rb
+${RUBY_VENDORLIB}/xmlscan/htmlscan.rb
+${RUBY_VENDORLIB}/xmlscan/namespace.rb
+${RUBY_VENDORLIB}/xmlscan/parser.rb
+${RUBY_VENDORLIB}/xmlscan/scanner.rb
+${RUBY_VENDORLIB}/xmlscan/version.rb
+${RUBY_VENDORLIB}/xmlscan/visitor.rb
+${RUBY_VENDORLIB}/xmlscan/xmlchar.rb
+${RUBY_DOC}/xmlscan/ChangeLog
+${RUBY_DOC}/xmlscan/README
+${RUBY_DOC}/xmlscan/THANKS
+${RUBY_DOC}/xmlscan/changes.html
+${RUBY_DOC}/xmlscan/changes.rd
+${RUBY_DOC}/xmlscan/en/conformance.html
+${RUBY_DOC}/xmlscan/en/conformance.rd
+${RUBY_DOC}/xmlscan/en/manual.html
+${RUBY_DOC}/xmlscan/en/manual.rd
+${RUBY_DOC}/xmlscan/ja/conformance.ja.html
+${RUBY_DOC}/xmlscan/ja/conformance.ja.rd
+${RUBY_DOC}/xmlscan/ja/manual.ja.html
+${RUBY_DOC}/xmlscan/ja/manual.ja.rd
+${RUBY_EG}/xmlscan/chibixml.rb
+${RUBY_EG}/xmlscan/getxmlchar.rb
+${RUBY_EG}/xmlscan/rexml.rb
+${RUBY_EG}/xmlscan/xmlbench.rb
+${RUBY_EG}/xmlscan/xmlconftest.rb
+${RUBY_EG}/xmlscan/xmlbench/xmlbench-lib.rb
+${RUBY_EG}/xmlscan/xmlbench/parser/chibixml.rb
+${RUBY_EG}/xmlscan/xmlbench/parser/nqxml.rb
+${RUBY_EG}/xmlscan/xmlbench/parser/rexml.rb
+${RUBY_EG}/xmlscan/xmlbench/parser/xmlparser.rb
+${RUBY_EG}/xmlscan/xmlbench/parser/xmlscan-0.0.10.rb
+${RUBY_EG}/xmlscan/xmlbench/parser/xmlscan-chibixml.rb
+${RUBY_EG}/xmlscan/xmlbench/parser/xmlscan-rexml.rb
+${RUBY_EG}/xmlscan/xmlbench/parser/xmlscan.rb
+@dirrm ${RUBY_VENDORLIB}/xmlscan
+@dirrm ${RUBY_DOC}/xmlscan/en
+@dirrm ${RUBY_DOC}/xmlscan/ja
+@dirrm ${RUBY_DOC}/xmlscan
+@dirrm ${RUBY_EG}/xmlscan/xmlbench/parser
+@dirrm ${RUBY_EG}/xmlscan/xmlbench
+@dirrm ${RUBY_EG}/xmlscan