Update rub-rdtool package to 0.6.31.

* Switch to use rubygem.

:0.6.31
  * Version bump from 0.6.21
  * Change Maintainer to Youhei SASAKI
  * Create gem. Many thanks to Kouhei Suto!!
  * apply OptionParser Issue, Thanks to Masaki Hasegawa!!

3 files changed, 105 insertions, 85 deletions

diff --git a/textproc/ruby-rdtool/Makefile b/textproc/ruby-rdtool/Makefile
index 9d2599d75c1..78ebca72f11 100644
--- a/textproc/ruby-rdtool/Makefile
+++ b/textproc/ruby-rdtool/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.29 2010/09/10 08:35:16 taca Exp $
+# $NetBSD: Makefile,v 1.30 2011/12/13 15:33:46 taca Exp $
 
-DISTNAME=	rdtool-0.6.22
+DISTNAME=	rdtool-0.6.31
 CATEGORIES=	textproc ruby
-MASTER_SITES=	http://rubyforge.org/frs/download.php/33346/
 
 MAINTAINER=	taca@NetBSD.org
-HOMEPAGE=	http://rubyforge.org/projects/rdtool/
+HOMEPAGE=	https://github.com/uwabami/rdtool
 COMMENT=	RD (Ruby Document) converter to HTML/man/etc
 LICENSE=	gnu-gpl-v2 OR ruby-license
 
@@ -15,17 +14,7 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 # install multiple ruby??-rd2 package (unless supported by pkgview.
 CONFLICTS+=	ruby[1-9][0-9]-rdtool-[0-9]*
 
-USE_RUBY_SETUP=	yes
-REPLACE_RUBY=	bin/rd2 bin/rdswap
-
-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
+CONF_FILES+=	${GEM_LIBDIR}/lib/rd/dot.rd2rc ${PKG_SYSCONFDIR}/dot.rd2rc
 
 SUBST_CLASSES+=		path
 SUBST_STAGE.path=	post-configure
@@ -33,26 +22,6 @@ SUBST_FILES.path=	bin/rd2
 SUBST_SED.path=		-e "s|@PKG_SYSCONFDIR@|${PKG_SYSCONFDIR}|"
 SUBST_MESSAGE.path=	Fixing PKG_SYSCONFDIR paths.
 
-DOCS_RD=	README.rd README.rd.ja doc/rd-draft.rd doc/rd-draft.rd.ja
-DOCS=		${DOCS_RD} ${DOCS_RD:S/.rd/.html/}
-
-pre-configure:
-	cd ${WRKSRC}/bin; ${MV} rdswap.rb rdswap; ${CHMOD} ${BINMODE} rdswap
-
-post-build:
-.for f in ${DOCS_RD}
-	cd ${WRKSRC}; ${RUBY} -I./lib bin/rd2 -r rd/rd2html-lib.rb ${f} \
-		> ${f:S/.rd/.html/}
-.endfor
-
-post-install:
-	${INSTALL_DATA} ${WRKSRC}/lib/rd/dot.rd2rc \
-		${DESTDIR}${PREFIX}/${RUBY_VENDORLIB}/rd/dot.rd2rc
-.for f in ${DOCS}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${PREFIX}/${RUBY_DOC}/rd
-.endfor
-	${INSTALL_DATA} ${WRKSRC}/lib/rd/dot.rd2rc \
-		${DESTDIR}${PREFIX}/${RUBY_EG}/rd/dot.rd2rc
-
+.include "../../lang/ruby/gem.mk"
 .include "../../lang/ruby/modules.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/ruby-rdtool/PLIST b/textproc/ruby-rdtool/PLIST
index 7c03b940dc7..9c559cfcf36 100644
--- a/textproc/ruby-rdtool/PLIST
+++ b/textproc/ruby-rdtool/PLIST
@@ -1,46 +1,97 @@
-@comment $NetBSD: PLIST,v 1.8 2009/06/14 18:17:29 joerg Exp $
+@comment $NetBSD: PLIST,v 1.9 2011/12/13 15:33:46 taca Exp $
 bin/rd2
-bin/rdswap
-${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.ry
-${RUBY_VENDORLIB}/rd/rdblockparser.tab.rb
-${RUBY_VENDORLIB}/rd/rdfmt.rb
-${RUBY_VENDORLIB}/rd/rdinlineparser.ry
-${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
+bin/rdswap.rb
+${GEM_HOME}/cache/${GEM_NAME}.gem
+${GEM_LIBDIR}/COPYING.txt
+${GEM_LIBDIR}/Gemfile
+${GEM_LIBDIR}/HISTORY
+${GEM_LIBDIR}/LICENSE.txt
+${GEM_LIBDIR}/MANIFEST
+${GEM_LIBDIR}/README.rd
+${GEM_LIBDIR}/README.rd.ja
+${GEM_LIBDIR}/Rakefile
+${GEM_LIBDIR}/TODO
+${GEM_LIBDIR}/VERSION
+${GEM_LIBDIR}/bin/rd2
+${GEM_LIBDIR}/bin/rdswap.rb
+${GEM_LIBDIR}/doc/rd-draft.rd
+${GEM_LIBDIR}/doc/rd-draft.rd.ja
+${GEM_LIBDIR}/lib/rd/block-element.rb
+${GEM_LIBDIR}/lib/rd/complex-list-item.rb
+${GEM_LIBDIR}/lib/rd/desclist.rb
+${GEM_LIBDIR}/lib/rd/document-struct.rb
+${GEM_LIBDIR}/lib/rd/dot.rd2rc
+${GEM_LIBDIR}/lib/rd/element.rb
+${GEM_LIBDIR}/lib/rd/filter.rb
+${GEM_LIBDIR}/lib/rd/inline-element.rb
+${GEM_LIBDIR}/lib/rd/labeled-element.rb
+${GEM_LIBDIR}/lib/rd/list.rb
+${GEM_LIBDIR}/lib/rd/loose-struct.rb
+${GEM_LIBDIR}/lib/rd/methodlist.rb
+${GEM_LIBDIR}/lib/rd/output-format-visitor.rb
+${GEM_LIBDIR}/lib/rd/package.rb
+${GEM_LIBDIR}/lib/rd/parser-util.rb
+${GEM_LIBDIR}/lib/rd/post-install
+${GEM_LIBDIR}/lib/rd/rbl-file.rb
+${GEM_LIBDIR}/lib/rd/rbl-suite.rb
+${GEM_LIBDIR}/lib/rd/rd-struct.rb
+${GEM_LIBDIR}/lib/rd/rd2html-lib.rb
+${GEM_LIBDIR}/lib/rd/rd2html-opt.rb
+${GEM_LIBDIR}/lib/rd/rd2man-lib.rb
+${GEM_LIBDIR}/lib/rd/rd2rdo-lib.rb
+${GEM_LIBDIR}/lib/rd/rd2rmi-lib.rb
+${GEM_LIBDIR}/lib/rd/rdblockparser.ry
+${GEM_LIBDIR}/lib/rd/rdblockparser.tab.rb
+${GEM_LIBDIR}/lib/rd/rdfmt.rb
+${GEM_LIBDIR}/lib/rd/rdinlineparser.ry
+${GEM_LIBDIR}/lib/rd/rdinlineparser.tab.rb
+${GEM_LIBDIR}/lib/rd/rdvisitor.rb
+${GEM_LIBDIR}/lib/rd/reference-resolver.rb
+${GEM_LIBDIR}/lib/rd/search-file.rb
+${GEM_LIBDIR}/lib/rd/tree.rb
+${GEM_LIBDIR}/lib/rd/version.rb
+${GEM_LIBDIR}/lib/rd/visitor.rb
+${GEM_LIBDIR}/makerdtool.rb
+${GEM_LIBDIR}/rdtool.gemspec
+${GEM_LIBDIR}/setup.rb
+${GEM_LIBDIR}/test.rb
+${GEM_LIBDIR}/test/data/includee1.html
+${GEM_LIBDIR}/test/data/includee2.html
+${GEM_LIBDIR}/test/data/includee3.nothtml
+${GEM_LIBDIR}/test/data/includee4.xhtml
+${GEM_LIBDIR}/test/data/label.rbl
+${GEM_LIBDIR}/test/data/label2.rbl
+${GEM_LIBDIR}/test/data/sub/includee2.html
+${GEM_LIBDIR}/test/data/sub/includee4.html
+${GEM_LIBDIR}/test/dummy-observer.rb
+${GEM_LIBDIR}/test/dummy.rb
+${GEM_LIBDIR}/test/temp-dir.rb
+${GEM_LIBDIR}/test/test-block-parser.rb
+${GEM_LIBDIR}/test/test-desclist-item.rb
+${GEM_LIBDIR}/test/test-document-element.rb
+${GEM_LIBDIR}/test/test-document-struct.rb
+${GEM_LIBDIR}/test/test-element.rb
+${GEM_LIBDIR}/test/test-headline.rb
+${GEM_LIBDIR}/test/test-inline-parser.rb
+${GEM_LIBDIR}/test/test-list-item.rb
+${GEM_LIBDIR}/test/test-list.rb
+${GEM_LIBDIR}/test/test-methodlist-item.rb
+${GEM_LIBDIR}/test/test-nonterminal-element.rb
+${GEM_LIBDIR}/test/test-nonterminal-inline.rb
+${GEM_LIBDIR}/test/test-output-format-visitor.rb
+${GEM_LIBDIR}/test/test-parser-util.rb
+${GEM_LIBDIR}/test/test-rbl-file.rb
+${GEM_LIBDIR}/test/test-rbl-suite.rb
+${GEM_LIBDIR}/test/test-rd2html-lib.rb
+${GEM_LIBDIR}/test/test-rdtree.rb
+${GEM_LIBDIR}/test/test-rdvisitor.rb
+${GEM_LIBDIR}/test/test-reference-resolver.rb
+${GEM_LIBDIR}/test/test-reference.rb
+${GEM_LIBDIR}/test/test-search-file.rb
+${GEM_LIBDIR}/test/test-terminal-inline.rb
+${GEM_LIBDIR}/test/test-textblock.rb
+${GEM_LIBDIR}/test/test-tree.rb
+${GEM_LIBDIR}/test/test-version.rb
+${GEM_LIBDIR}/test/test-visitor.rb
+${GEM_LIBDIR}/utils/rd-mode.el
+${GEM_HOME}/specifications/${GEM_NAME}.gemspec
diff --git a/textproc/ruby-rdtool/distinfo b/textproc/ruby-rdtool/distinfo
index 36a12ed1476..7405b844b71 100644
--- a/textproc/ruby-rdtool/distinfo
+++ b/textproc/ruby-rdtool/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.15 2008/09/15 08:34:44 taca Exp $
+$NetBSD: distinfo,v 1.16 2011/12/13 15:33:46 taca Exp $
 
-SHA1 (rdtool-0.6.22.tar.gz) = 987a75de9a698759d46e3253df42fcee3d50007e
-RMD160 (rdtool-0.6.22.tar.gz) = da52562c0679df8c1d6b22c6831077a969413c89
-Size (rdtool-0.6.22.tar.gz) = 89524 bytes
+SHA1 (rdtool-0.6.31.gem) = dc61d98395c841451ce9144803edaa816eee7150
+RMD160 (rdtool-0.6.31.gem) = 8d656ecd01b3863f0b5011b78fb82b74764d4a3a
+Size (rdtool-0.6.31.gem) = 96768 bytes
 SHA1 (patch-ae) = 13e2a54d6abec57d20f4d0e9a6d440e40f352787