summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortaca <taca@pkgsrc.org>2008-06-19 14:56:39 +0000
committertaca <taca@pkgsrc.org>2008-06-19 14:56:39 +0000
commit8e736657ea80f5cdab0e890080641bb10579b43e (patch)
treeecadf297687f683d11f0e3a009c968e3e55eeb59
parent6719719262568054375b35ad8421d3ea2bc6f40a (diff)
downloadpkgsrc-8e736657ea80f5cdab0e890080641bb10579b43e.tar.gz
- Switch to use vendor_dir with Ruby 1.8.7.
Bump PKGREVISION.
-rw-r--r--textproc/ruby-mecab/Makefile3
-rw-r--r--textproc/ruby-mecab/PLIST4
-rw-r--r--textproc/ruby-nqxml/Makefile20
-rw-r--r--textproc/ruby-nqxml/PLIST78
-rw-r--r--textproc/ruby-rdtool/Makefile20
-rw-r--r--textproc/ruby-rdtool/PLIST90
-rw-r--r--textproc/ruby-sary/Makefile7
-rw-r--r--textproc/ruby-sary/PLIST10
-rw-r--r--textproc/ruby-suikyo/Makefile5
-rw-r--r--textproc/ruby-suikyo/PLIST10
-rw-r--r--textproc/ruby-xmlscan/Makefile39
-rw-r--r--textproc/ruby-xmlscan/PLIST86
12 files changed, 191 insertions, 181 deletions
diff --git a/textproc/ruby-mecab/Makefile b/textproc/ruby-mecab/Makefile
index 819a379e2f7..a38464c5bfe 100644
--- a/textproc/ruby-mecab/Makefile
+++ b/textproc/ruby-mecab/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.2 2008/02/04 04:58:53 obache Exp $
+# $NetBSD: Makefile,v 1.3 2008/06/19 14:56:39 taca Exp $
.include "../../textproc/mecab/Makefile.common"
DISTNAME= mecab-ruby-${MECAB_VERSION}
PKGNAME= ${RUBY_PKGPREFIX}-mecab-${MECAB_VERSION}
+PKGREVISION= 1
CATEGORIES+= ruby
COMMENT= MeCab ruby module
diff --git a/textproc/ruby-mecab/PLIST b/textproc/ruby-mecab/PLIST
index 54cacd35aa9..103775f11e4 100644
--- a/textproc/ruby-mecab/PLIST
+++ b/textproc/ruby-mecab/PLIST
@@ -1,2 +1,2 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2007/05/12 13:57:22 obache Exp $
-${RUBY_SITEARCHLIBDIR}/MeCab.${RUBY_DLEXT}
+@comment $NetBSD: PLIST,v 1.2 2008/06/19 14:56:39 taca Exp $
+${RUBY_VENDORARCHLIB}/MeCab.${RUBY_DLEXT}
diff --git a/textproc/ruby-nqxml/Makefile b/textproc/ruby-nqxml/Makefile
index acde33dd951..22c43220bec 100644
--- a/textproc/ruby-nqxml/Makefile
+++ b/textproc/ruby-nqxml/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.10 2008/04/04 15:31:39 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2008/06/19 14:56:48 taca Exp $
#
DISTNAME= nqxml-1.1.3p1
PKGNAME= ${RUBY_PKGPREFIX}-${DISTNAME:S/p/./}
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= textproc ruby
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=nqxml/}
@@ -25,22 +25,24 @@ TESTS= dispatchertester.rb oasis.rb streamingparsertester.rb test.rb \
writertester.rb
REPLACE_RUBY_DIRS= examples tests
+INSTALLATION_DIRS= ${RUBY_DOC}/nqxml ${RUBY_EG}/nqxml/contrib \
+ ${RUBY_EG}/nqxml/tests
+
post-install:
- ${INSTALL_DATA_DIR} ${RUBY_DOCDIR}/nqxml
.for f in ${DOC}
- ${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_DOCDIR}/nqxml
+ ${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${PREFIX}/${RUBY_DOC}/nqxml
.endfor
- ${INSTALL_DATA_DIR} ${RUBY_EXAMPLESDIR}/nqxml/contrib
.for f in ${EXAMPLES}
- ${INSTALL_DATA} ${WRKSRC}/examples/${f} ${RUBY_EXAMPLESDIR}/nqxml
+ ${INSTALL_DATA} ${WRKSRC}/examples/${f} \
+ ${DESTDIR}${PREFIX}/${RUBY_EG}/nqxml
.endfor
.for f in ${CONTRIB_LIB}
${INSTALL_DATA} ${WRKSRC}/contrib/${f} \
- ${RUBY_EXAMPLESDIR}/nqxml/contrib
+ ${DESTDIR}${PREFIX}/${RUBY_EG}/nqxml/contrib
.endfor
- ${INSTALL_DATA_DIR} ${RUBY_EXAMPLESDIR}/nqxml/tests
.for f in ${TESTS}
- ${INSTALL_DATA} ${WRKSRC}/tests/${f} ${RUBY_EXAMPLESDIR}/nqxml/tests
+ ${INSTALL_DATA} ${WRKSRC}/tests/${f} \
+ ${DESTDIR}${PREFIX}/${RUBY_EG}/nqxml/tests
.endfor
.include "../../lang/ruby/modules.mk"
diff --git a/textproc/ruby-nqxml/PLIST b/textproc/ruby-nqxml/PLIST
index 46b75ad612b..438109987d4 100644
--- a/textproc/ruby-nqxml/PLIST
+++ b/textproc/ruby-nqxml/PLIST
@@ -1,39 +1,39 @@
-@comment $NetBSD: PLIST,v 1.2 2006/09/07 15:55:50 taca Exp $
-${RUBY_SITELIBDIR}/nqxml/dispatcher.rb
-${RUBY_SITELIBDIR}/nqxml/document.rb
-${RUBY_SITELIBDIR}/nqxml/entities.rb
-${RUBY_SITELIBDIR}/nqxml/error.rb
-${RUBY_SITELIBDIR}/nqxml/info.rb
-${RUBY_SITELIBDIR}/nqxml/parser.rb
-${RUBY_SITELIBDIR}/nqxml/streamingparser.rb
-${RUBY_SITELIBDIR}/nqxml/tokenizer.rb
-${RUBY_SITELIBDIR}/nqxml/treeparser.rb
-${RUBY_SITELIBDIR}/nqxml/utils.rb
-${RUBY_SITELIBDIR}/nqxml/writer.rb
-${RUBY_DOCDIR}/nqxml/README
-${RUBY_EXAMPLESDIR}/nqxml/contrib/autodis_1.rb
-${RUBY_EXAMPLESDIR}/nqxml/contrib/autodis_2.rb
-${RUBY_EXAMPLESDIR}/nqxml/data.xml
-${RUBY_EXAMPLESDIR}/nqxml/doc.xml
-${RUBY_EXAMPLESDIR}/nqxml/dumpXML.rb
-${RUBY_EXAMPLESDIR}/nqxml/parseTestStream.rb
-${RUBY_EXAMPLESDIR}/nqxml/parseTestTree.rb
-${RUBY_EXAMPLESDIR}/nqxml/printEntityClassNames.rb
-${RUBY_EXAMPLESDIR}/nqxml/reverseTags.rb
-${RUBY_EXAMPLESDIR}/nqxml/reverseText.rb
-${RUBY_EXAMPLESDIR}/nqxml/tests/dispatchertester.rb
-${RUBY_EXAMPLESDIR}/nqxml/tests/oasis.rb
-${RUBY_EXAMPLESDIR}/nqxml/tests/streamingparsertester.rb
-${RUBY_EXAMPLESDIR}/nqxml/tests/test.rb
-${RUBY_EXAMPLESDIR}/nqxml/tests/testresource.rb
-${RUBY_EXAMPLESDIR}/nqxml/tests/tokenizertester.rb
-${RUBY_EXAMPLESDIR}/nqxml/tests/treeparsertester.rb
-${RUBY_EXAMPLESDIR}/nqxml/tests/writertester.rb
-${RUBY_EXAMPLESDIR}/nqxml/write.rb
-${RUBY_EXAMPLESDIR}/nqxml/writeManualDoc.rb
-${RUBY_EXAMPLESDIR}/nqxml/writeParsedDoc.rb
-@dirrm ${RUBY_SITELIBDIR}/nqxml
-@dirrm ${RUBY_DOCDIR}/nqxml
-@dirrm ${RUBY_EXAMPLESDIR}/nqxml/contrib
-@dirrm ${RUBY_EXAMPLESDIR}/nqxml/tests
-@dirrm ${RUBY_EXAMPLESDIR}/nqxml
+@comment $NetBSD: PLIST,v 1.3 2008/06/19 14:56:48 taca Exp $
+${RUBY_VENDORLIB}/nqxml/dispatcher.rb
+${RUBY_VENDORLIB}/nqxml/document.rb
+${RUBY_VENDORLIB}/nqxml/entities.rb
+${RUBY_VENDORLIB}/nqxml/error.rb
+${RUBY_VENDORLIB}/nqxml/info.rb
+${RUBY_VENDORLIB}/nqxml/parser.rb
+${RUBY_VENDORLIB}/nqxml/streamingparser.rb
+${RUBY_VENDORLIB}/nqxml/tokenizer.rb
+${RUBY_VENDORLIB}/nqxml/treeparser.rb
+${RUBY_VENDORLIB}/nqxml/utils.rb
+${RUBY_VENDORLIB}/nqxml/writer.rb
+${RUBY_DOC}/nqxml/README
+${RUBY_EG}/nqxml/contrib/autodis_1.rb
+${RUBY_EG}/nqxml/contrib/autodis_2.rb
+${RUBY_EG}/nqxml/data.xml
+${RUBY_EG}/nqxml/doc.xml
+${RUBY_EG}/nqxml/dumpXML.rb
+${RUBY_EG}/nqxml/parseTestStream.rb
+${RUBY_EG}/nqxml/parseTestTree.rb
+${RUBY_EG}/nqxml/printEntityClassNames.rb
+${RUBY_EG}/nqxml/reverseTags.rb
+${RUBY_EG}/nqxml/reverseText.rb
+${RUBY_EG}/nqxml/tests/dispatchertester.rb
+${RUBY_EG}/nqxml/tests/oasis.rb
+${RUBY_EG}/nqxml/tests/streamingparsertester.rb
+${RUBY_EG}/nqxml/tests/test.rb
+${RUBY_EG}/nqxml/tests/testresource.rb
+${RUBY_EG}/nqxml/tests/tokenizertester.rb
+${RUBY_EG}/nqxml/tests/treeparsertester.rb
+${RUBY_EG}/nqxml/tests/writertester.rb
+${RUBY_EG}/nqxml/write.rb
+${RUBY_EG}/nqxml/writeManualDoc.rb
+${RUBY_EG}/nqxml/writeParsedDoc.rb
+@dirrm ${RUBY_VENDORLIB}/nqxml
+@dirrm ${RUBY_DOC}/nqxml
+@dirrm ${RUBY_EG}/nqxml/contrib
+@dirrm ${RUBY_EG}/nqxml/tests
+@dirrm ${RUBY_EG}/nqxml
diff --git a/textproc/ruby-rdtool/Makefile b/textproc/ruby-rdtool/Makefile
index 3abbad3be3d..ee1736ad789 100644
--- a/textproc/ruby-rdtool/Makefile
+++ b/textproc/ruby-rdtool/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.26 2008/03/13 19:40:51 jlam Exp $
+# $NetBSD: Makefile,v 1.27 2008/06/19 14:57:20 taca Exp $
DISTNAME= rdtool-0.6.20
PKGNAME= ${RUBY_PKGPREFIX}-${DISTNAME}
+PKGREVISION= 1
CATEGORIES= textproc ruby
MASTER_SITES= http://www.moonwolf.com/ruby/archive/
@@ -18,7 +19,14 @@ CONFLICTS+= ruby[1-9][0-9]-rdtool-*
USE_RUBY_SETUP= yes
REPLACE_RUBY= bin/rd2 bin/rdswap
-CONF_FILES+= ${RUBY_SITELIBDIR}/rd/dot.rd2rc ${PKG_SYSCONFDIR}/dot.rd2rc
+CONFIGURE_ARGS+= --siteruby=${PREFIX}/${RUBY_VENDORLIB_BASE} \
+ --siterubyver=${PREFIX}/${RUBY_VENDORLIB} \
+ --siterubyverarch=${PREFIX}/${RUBY_VENDORARCHLIB}
+
+CONF_FILES+= ${PREFIX}/${RUBY_VENDORLIB}/rd/dot.rd2rc \
+ ${PKG_SYSCONFDIR}/dot.rd2rc
+
+INSTALLATION_DIRS= ${RUBY_DOC}/rd ${RUBY_EG}/rd
SUBST_CLASSES+= path
SUBST_STAGE.path= post-configure
@@ -40,14 +48,12 @@ post-build:
post-install:
${INSTALL_DATA} ${WRKSRC}/lib/rd/dot.rd2rc \
- ${DESTDIR}${RUBY_SITELIBDIR}/rd/dot.rd2rc
- ${INSTALL_DATA_DIR} ${DESTDIR}${RUBY_DOCDIR}/rd
+ ${DESTDIR}${PREFIX}/${RUBY_VENDORLIB}/rd/dot.rd2rc
.for f in ${DOCS}
- ${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${RUBY_DOCDIR}/rd
+ ${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${PREFIX}/${RUBY_DOC}/rd
.endfor
- ${INSTALL_DATA_DIR} ${DESTDIR}${RUBY_EXAMPLESDIR}/rd
${INSTALL_DATA} ${WRKSRC}/lib/rd/dot.rd2rc \
- ${DESTDIR}${RUBY_EXAMPLESDIR}/rd/dot.rd2rc
+ ${DESTDIR}${PREFIX}/${RUBY_EG}/rd/dot.rd2rc
.include "../../lang/ruby/modules.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/textproc/ruby-rdtool/PLIST b/textproc/ruby-rdtool/PLIST
index ed7924aefc3..2d2b5fd0c58 100644
--- a/textproc/ruby-rdtool/PLIST
+++ b/textproc/ruby-rdtool/PLIST
@@ -1,47 +1,47 @@
-@comment $NetBSD: PLIST,v 1.5 2006/09/07 15:55:50 taca Exp $
+@comment $NetBSD: PLIST,v 1.6 2008/06/19 14:57:20 taca Exp $
bin/rd2
bin/rdswap
-${RUBY_SITELIBDIR}/rd/block-element.rb
-${RUBY_SITELIBDIR}/rd/complex-list-item.rb
-${RUBY_SITELIBDIR}/rd/desclist.rb
-${RUBY_SITELIBDIR}/rd/document-struct.rb
-${RUBY_SITELIBDIR}/rd/element.rb
-${RUBY_SITELIBDIR}/rd/filter.rb
-${RUBY_SITELIBDIR}/rd/inline-element.rb
-${RUBY_SITELIBDIR}/rd/labeled-element.rb
-${RUBY_SITELIBDIR}/rd/list.rb
-${RUBY_SITELIBDIR}/rd/loose-struct.rb
-${RUBY_SITELIBDIR}/rd/methodlist.rb
-${RUBY_SITELIBDIR}/rd/output-format-visitor.rb
-${RUBY_SITELIBDIR}/rd/package.rb
-${RUBY_SITELIBDIR}/rd/parser-util.rb
-${RUBY_SITELIBDIR}/rd/rbl-file.rb
-${RUBY_SITELIBDIR}/rd/rbl-suite.rb
-${RUBY_SITELIBDIR}/rd/rd-struct.rb
-${RUBY_SITELIBDIR}/rd/dot.rd2rc
-${RUBY_SITELIBDIR}/rd/rd2html-lib.rb
-${RUBY_SITELIBDIR}/rd/rd2html-opt.rb
-${RUBY_SITELIBDIR}/rd/rd2man-lib.rb
-${RUBY_SITELIBDIR}/rd/rd2rdo-lib.rb
-${RUBY_SITELIBDIR}/rd/rd2rmi-lib.rb
-${RUBY_SITELIBDIR}/rd/rdblockparser.tab.rb
-${RUBY_SITELIBDIR}/rd/rdfmt.rb
-${RUBY_SITELIBDIR}/rd/rdinlineparser.tab.rb
-${RUBY_SITELIBDIR}/rd/rdvisitor.rb
-${RUBY_SITELIBDIR}/rd/reference-resolver.rb
-${RUBY_SITELIBDIR}/rd/search-file.rb
-${RUBY_SITELIBDIR}/rd/tree.rb
-${RUBY_SITELIBDIR}/rd/version.rb
-${RUBY_SITELIBDIR}/rd/visitor.rb
-${RUBY_EXAMPLESDIR}/rd/dot.rd2rc
-${RUBY_DOCDIR}/rd/README.html
-${RUBY_DOCDIR}/rd/README.html.ja
-${RUBY_DOCDIR}/rd/README.rd
-${RUBY_DOCDIR}/rd/README.rd.ja
-${RUBY_DOCDIR}/rd/rd-draft.html
-${RUBY_DOCDIR}/rd/rd-draft.html.ja
-${RUBY_DOCDIR}/rd/rd-draft.rd
-${RUBY_DOCDIR}/rd/rd-draft.rd.ja
-@dirrm ${RUBY_SITELIBDIR}/rd
-@dirrm ${RUBY_EXAMPLESDIR}/rd
-@dirrm ${RUBY_DOCDIR}/rd
+${RUBY_VENDORLIB}/rd/block-element.rb
+${RUBY_VENDORLIB}/rd/complex-list-item.rb
+${RUBY_VENDORLIB}/rd/desclist.rb
+${RUBY_VENDORLIB}/rd/document-struct.rb
+${RUBY_VENDORLIB}/rd/element.rb
+${RUBY_VENDORLIB}/rd/filter.rb
+${RUBY_VENDORLIB}/rd/inline-element.rb
+${RUBY_VENDORLIB}/rd/labeled-element.rb
+${RUBY_VENDORLIB}/rd/list.rb
+${RUBY_VENDORLIB}/rd/loose-struct.rb
+${RUBY_VENDORLIB}/rd/methodlist.rb
+${RUBY_VENDORLIB}/rd/output-format-visitor.rb
+${RUBY_VENDORLIB}/rd/package.rb
+${RUBY_VENDORLIB}/rd/parser-util.rb
+${RUBY_VENDORLIB}/rd/rbl-file.rb
+${RUBY_VENDORLIB}/rd/rbl-suite.rb
+${RUBY_VENDORLIB}/rd/rd-struct.rb
+${RUBY_VENDORLIB}/rd/dot.rd2rc
+${RUBY_VENDORLIB}/rd/rd2html-lib.rb
+${RUBY_VENDORLIB}/rd/rd2html-opt.rb
+${RUBY_VENDORLIB}/rd/rd2man-lib.rb
+${RUBY_VENDORLIB}/rd/rd2rdo-lib.rb
+${RUBY_VENDORLIB}/rd/rd2rmi-lib.rb
+${RUBY_VENDORLIB}/rd/rdblockparser.tab.rb
+${RUBY_VENDORLIB}/rd/rdfmt.rb
+${RUBY_VENDORLIB}/rd/rdinlineparser.tab.rb
+${RUBY_VENDORLIB}/rd/rdvisitor.rb
+${RUBY_VENDORLIB}/rd/reference-resolver.rb
+${RUBY_VENDORLIB}/rd/search-file.rb
+${RUBY_VENDORLIB}/rd/tree.rb
+${RUBY_VENDORLIB}/rd/version.rb
+${RUBY_VENDORLIB}/rd/visitor.rb
+${RUBY_EG}/rd/dot.rd2rc
+${RUBY_DOC}/rd/README.html
+${RUBY_DOC}/rd/README.html.ja
+${RUBY_DOC}/rd/README.rd
+${RUBY_DOC}/rd/README.rd.ja
+${RUBY_DOC}/rd/rd-draft.html
+${RUBY_DOC}/rd/rd-draft.html.ja
+${RUBY_DOC}/rd/rd-draft.rd
+${RUBY_DOC}/rd/rd-draft.rd.ja
+@dirrm ${RUBY_VENDORLIB}/rd
+@dirrm ${RUBY_EG}/rd
+@dirrm ${RUBY_DOC}/rd
diff --git a/textproc/ruby-sary/Makefile b/textproc/ruby-sary/Makefile
index bdc7b90fc16..734078e4f8a 100644
--- a/textproc/ruby-sary/Makefile
+++ b/textproc/ruby-sary/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2008/03/10 03:00:18 obache Exp $
+# $NetBSD: Makefile,v 1.3 2008/06/19 14:57:36 taca Exp $
#
DISTNAME= sary-ruby-1.2.0
PKGNAME= ${RUBY_PKGPREFIX}-${DISTNAME:S/-ruby-/-/}
+PKGREVISION= 1
CATEGORIES= textproc ruby
MASTER_SITES= http://sary.sourceforge.net/
@@ -21,11 +22,11 @@ SUBST_STAGE.ruby= post-build
SUBST_FILES.ruby= ${DOCS}
SUBST_SED.ruby= -e 's|/usr/local/bin/ruby|${RUBY}|g'
-INSTALLATION_DIRS= ${RUBY_DOCDIR}/sary
+INSTALLATION_DIRS= ${RUBY_DOC}/sary
post-install:
.for d in ${DOCS}
- ${INSTALL_DATA} ${WRKSRC}/${d} ${DESTDIR}${RUBY_DOCDIR}/sary
+ ${INSTALL_DATA} ${WRKSRC}/${d} ${DESTDIR}${PREFIX}/${RUBY_DOC}/sary
.endfor
.include "../../lang/ruby/modules.mk"
diff --git a/textproc/ruby-sary/PLIST b/textproc/ruby-sary/PLIST
index 7122e285726..7e13be303fd 100644
--- a/textproc/ruby-sary/PLIST
+++ b/textproc/ruby-sary/PLIST
@@ -1,5 +1,5 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2008/03/01 08:30:48 obache Exp $
-${RUBY_SITEARCHLIBDIR}/sary.${RUBY_DLEXT}
-${RUBY_DOCDIR}/sary/Reference.en.rd
-${RUBY_DOCDIR}/sary/Reference.ja.rd
-@dirrm ${RUBY_DOCDIR}/sary
+@comment $NetBSD: PLIST,v 1.2 2008/06/19 14:57:36 taca Exp $
+${RUBY_VENDORARCHLIB}/sary.${RUBY_DLEXT}
+${RUBY_DOC}/sary/Reference.en.rd
+${RUBY_DOC}/sary/Reference.ja.rd
+@dirrm ${RUBY_DOC}/sary
diff --git a/textproc/ruby-suikyo/Makefile b/textproc/ruby-suikyo/Makefile
index ac22de7081f..8c1fa2d1bad 100644
--- a/textproc/ruby-suikyo/Makefile
+++ b/textproc/ruby-suikyo/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.1.1.1 2008/03/02 02:42:03 obache Exp $
+# $NetBSD: Makefile,v 1.2 2008/06/19 14:57:45 taca Exp $
#
.include "../../textproc/suikyo/Makefile.common"
PKGNAME= ${RUBY_PKGPREFIX}-${DISTNAME}
+PKGREVISION= 1
MAINTAINER= obache@NetBSD.org
HOMEPAGE= http://taiyaki.org/suikyo/ruby/index.html
@@ -16,7 +17,7 @@ DEPENDS+= suikyo-docs>=${SUIKYO_VER}:../../textproc/suikyo-docs
BUILD_DIRS+= ruby
-CONFIGURE_ARGS+= --with-rubydir=${RUBY_SITELIBDIR}
+CONFIGURE_ARGS+= --with-rubydir=${PREFIX}/${RUBY_VENDORLIB}
.include "../../lang/ruby/modules.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/textproc/ruby-suikyo/PLIST b/textproc/ruby-suikyo/PLIST
index 1eea0c84872..6ed4264aa50 100644
--- a/textproc/ruby-suikyo/PLIST
+++ b/textproc/ruby-suikyo/PLIST
@@ -1,7 +1,7 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2008/03/02 02:42:03 obache Exp $
-${RUBY_SITELIBDIR}/suikyo/suikyo-composer.rb
-${RUBY_SITELIBDIR}/suikyo/suikyo-config.rb
-${RUBY_SITELIBDIR}/suikyo/suikyo.rb
+@comment $NetBSD: PLIST,v 1.2 2008/06/19 14:57:45 taca Exp $
+${RUBY_VENDORLIB}/suikyo/suikyo-composer.rb
+${RUBY_VENDORLIB}/suikyo/suikyo-config.rb
+${RUBY_VENDORLIB}/suikyo/suikyo.rb
share/doc/suikyo/ruby/index.html
@dirrm share/doc/suikyo/ruby
-@dirrm ${RUBY_SITELIBDIR}/suikyo
+@dirrm ${RUBY_VENDORLIB}/suikyo
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