pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/textproc - Switch to use vendor_dir with Ruby 1.8.7.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/bdb5d811d210
branches:  trunk
changeset: 543484:bdb5d811d210
user:      taca <taca%pkgsrc.org@localhost>
date:      Thu Jun 19 14:56:39 2008 +0000

description:
- Switch to use vendor_dir with Ruby 1.8.7.

Bump PKGREVISION.

diffstat:

 textproc/ruby-mecab/Makefile   |   3 +-
 textproc/ruby-mecab/PLIST      |   4 +-
 textproc/ruby-nqxml/Makefile   |  20 +++++----
 textproc/ruby-nqxml/PLIST      |  78 ++++++++++++++++++------------------
 textproc/ruby-rdtool/Makefile  |  20 ++++++---
 textproc/ruby-rdtool/PLIST     |  90 +++++++++++++++++++++---------------------
 textproc/ruby-sary/Makefile    |   7 +-
 textproc/ruby-sary/PLIST       |  10 ++--
 textproc/ruby-suikyo/Makefile  |   5 +-
 textproc/ruby-suikyo/PLIST     |  10 ++--
 textproc/ruby-xmlscan/Makefile |  39 ++++++++---------
 textproc/ruby-xmlscan/PLIST    |  86 ++++++++++++++++++++--------------------
 12 files changed, 191 insertions(+), 181 deletions(-)

diffs (truncated from 531 to 300 lines):

diff -r 5cab6a02dfaa -r bdb5d811d210 textproc/ruby-mecab/Makefile
--- a/textproc/ruby-mecab/Makefile      Thu Jun 19 14:56:14 2008 +0000
+++ b/textproc/ruby-mecab/Makefile      Thu Jun 19 14:56:39 2008 +0000
@@ -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 -r 5cab6a02dfaa -r bdb5d811d210 textproc/ruby-mecab/PLIST
--- a/textproc/ruby-mecab/PLIST Thu Jun 19 14:56:14 2008 +0000
+++ b/textproc/ruby-mecab/PLIST Thu Jun 19 14:56:39 2008 +0000
@@ -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 -r 5cab6a02dfaa -r bdb5d811d210 textproc/ruby-nqxml/Makefile
--- a/textproc/ruby-nqxml/Makefile      Thu Jun 19 14:56:14 2008 +0000
+++ b/textproc/ruby-nqxml/Makefile      Thu Jun 19 14:56:39 2008 +0000
@@ -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 @@
                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 -r 5cab6a02dfaa -r bdb5d811d210 textproc/ruby-nqxml/PLIST
--- a/textproc/ruby-nqxml/PLIST Thu Jun 19 14:56:14 2008 +0000
+++ b/textproc/ruby-nqxml/PLIST Thu Jun 19 14:56:39 2008 +0000
@@ -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 -r 5cab6a02dfaa -r bdb5d811d210 textproc/ruby-rdtool/Makefile
--- a/textproc/ruby-rdtool/Makefile     Thu Jun 19 14:56:14 2008 +0000
+++ b/textproc/ruby-rdtool/Makefile     Thu Jun 19 14:56:39 2008 +0000
@@ -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 @@
 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-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 -r 5cab6a02dfaa -r bdb5d811d210 textproc/ruby-rdtool/PLIST
--- a/textproc/ruby-rdtool/PLIST        Thu Jun 19 14:56:14 2008 +0000
+++ b/textproc/ruby-rdtool/PLIST        Thu Jun 19 14:56:39 2008 +0000
@@ -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 -r 5cab6a02dfaa -r bdb5d811d210 textproc/ruby-sary/Makefile
--- a/textproc/ruby-sary/Makefile       Thu Jun 19 14:56:14 2008 +0000
+++ b/textproc/ruby-sary/Makefile       Thu Jun 19 14:56:39 2008 +0000
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2008/03/10 03:00:18 obache Exp $



Home | Main Index | Thread Index | Old Index