Update ruby-rttool to version 1.0.2.0. Changes from version 1.0.2

are only that this now installs as a gem, but the gem has a slightly
different version number.

4 files changed, 82 insertions, 52 deletions

diff --git a/textproc/ruby-rttool/Makefile b/textproc/ruby-rttool/Makefile
index 4172cce8904..24cb50b7738 100644
--- a/textproc/ruby-rttool/Makefile
+++ b/textproc/ruby-rttool/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.17 2007/02/22 19:01:26 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2008/04/04 15:22:20 jlam Exp $
 
-DISTNAME=	rttool-${VERSION}
+DISTNAME=	rttool-1.0.2.0
 PKGNAME=	${RUBY_PKGPREFIX}-${DISTNAME}
-CATEGORIES=	textproc ruby
-MASTER_SITES=	http://www.rubyist.net/~rubikitch/archive/
+CATEGORIES=	textproc
 
 MAINTAINER=	taca@NetBSD.org
 HOMEPAGE=	http://www.rubyist.net/~rubikitch/computer/rttool/
@@ -11,27 +10,16 @@ COMMENT=	RT to HTML (and hopefully LaTeX in future) table converter
 
 CONFLICTS+=	ruby[1-9][0-9]-rttool-*
 
-.include "../../lang/ruby/rubyversion.mk"
-# install a library file to rdtool's directory, too
-BUILDLINK_DEPMETHOD.${RUBY_PKGPREFIX}-rdtool= full
+DEPENDS+=	${RUBY_PKGPREFIX}-rdtool>=0.6.18:../../textproc/ruby-rdtool
 
-VERSION=		1.0.2
-USE_RUBY_SETUP=		yes
-REPLACE_RUBY_DIRS=	${WRKSRC}/bin/rt ${WRKSRC}/lib/rt
-HTMLDOCS=		rttool.en.html rttool.ja.html
-DOCS=			rttool.en.rd rttool.ja.rd
-SRCS=			rt2html-lib.rb rt2txt-lib.rb rtparser.rb \
-			rtvisitor.rb w3m.rb
+GEM_BUILD=	gemspec
 
-post-install:
-	${INSTALL_DATA_DIR} ${RUBY_DOCDIR}/rt
-.for f in ${DOCS} ${HTMLDOCS}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_DOCDIR}/rt
-	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_DOCDIR}/rt
-.endfor
-	${INSTALL_DATA_DIR} ${RUBY_EXAMPLESDIR}/rt
-	${INSTALL_DATA} ${WRKSRC}/examples/* ${RUBY_EXAMPLESDIR}/rt
+# Move the rt scripts into the main "bin" directory so they're
+# automatically found and wrapped by the gem script during installation.
+#
+pre-build:
+	cd ${WRKSRC}/bin && mv rt/* .
+	rmdir ${WRKSRC}/bin/rt
 
-.include "../../lang/ruby/modules.mk"
-.include "../../textproc/ruby-rdtool/buildlink3.mk"
+.include "../../misc/rubygems/rubygem.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/ruby-rttool/PLIST b/textproc/ruby-rttool/PLIST
index b624104fd19..31f21c0a707 100644
--- a/textproc/ruby-rttool/PLIST
+++ b/textproc/ruby-rttool/PLIST
@@ -1,26 +1,41 @@
-@comment $NetBSD: PLIST,v 1.6 2006/09/07 15:55:50 taca Exp $
+@comment $NetBSD: PLIST,v 1.7 2008/04/04 15:22:20 jlam Exp $
 bin/rdrt2
 bin/rt2
-${RUBY_SITELIBDIR}/rd/rt-filter.rb
-${RUBY_SITELIBDIR}/rt/rt2html-lib.rb
-${RUBY_SITELIBDIR}/rt/rt2txt-lib.rb
-${RUBY_SITELIBDIR}/rt/rtparser.rb
-${RUBY_SITELIBDIR}/rt/rtvisitor.rb
-${RUBY_SITELIBDIR}/rt/w3m.rb
-${RUBY_DOCDIR}/rt/rttool.en.rd
-${RUBY_DOCDIR}/rt/rttool.ja.rd
-${RUBY_DOCDIR}/rt/rttool.en.html
-${RUBY_DOCDIR}/rt/rttool.ja.html
-${RUBY_EXAMPLESDIR}/rt/easiest.html
-${RUBY_EXAMPLESDIR}/rt/easiest.rt
-${RUBY_EXAMPLESDIR}/rt/escape.html
-${RUBY_EXAMPLESDIR}/rt/escape.rt
-${RUBY_EXAMPLESDIR}/rt/rttest.html
-${RUBY_EXAMPLESDIR}/rt/rttest.rd
-${RUBY_EXAMPLESDIR}/rt/test1.html
-${RUBY_EXAMPLESDIR}/rt/test1.rt
-${RUBY_EXAMPLESDIR}/rt/test2.html
-${RUBY_EXAMPLESDIR}/rt/test2.rt
-@dirrm ${RUBY_SITELIBDIR}/rt
-@dirrm ${RUBY_DOCDIR}/rt
-@dirrm ${RUBY_EXAMPLESDIR}/rt
+${GEM_HOME}/cache/rttool-${PKGVERSION}.gem
+${GEM_LIBDIR}/ChangeLog
+${GEM_LIBDIR}/GPL
+${GEM_LIBDIR}/bin/rdrt2
+${GEM_LIBDIR}/bin/rt2
+${GEM_LIBDIR}/examples/easiest.html
+${GEM_LIBDIR}/examples/easiest.rt
+${GEM_LIBDIR}/examples/escape.html
+${GEM_LIBDIR}/examples/escape.rt
+${GEM_LIBDIR}/examples/rttest.html
+${GEM_LIBDIR}/examples/rttest.rd
+${GEM_LIBDIR}/examples/test1.html
+${GEM_LIBDIR}/examples/test1.rt
+${GEM_LIBDIR}/examples/test2.html
+${GEM_LIBDIR}/examples/test2.rt
+${GEM_LIBDIR}/lib/rd/rt-filter.rb
+${GEM_LIBDIR}/lib/rt/rt2html-lib.rb
+${GEM_LIBDIR}/lib/rt/rt2txt-lib.rb
+${GEM_LIBDIR}/lib/rt/rtparser.rb
+${GEM_LIBDIR}/lib/rt/rtvisitor.rb
+${GEM_LIBDIR}/lib/rt/w3m.rb
+${GEM_LIBDIR}/rttool.en.html
+${GEM_LIBDIR}/rttool.en.rd
+${GEM_LIBDIR}/rttool.ja.html
+${GEM_LIBDIR}/rttool.ja.rd
+${GEM_LIBDIR}/test/rttool-sub.rb
+${GEM_LIBDIR}/test/test-rt2html-lib.rb
+${GEM_LIBDIR}/test/test-rtparser.rb
+${GEM_LIBDIR}/test/test.rb
+${GEM_HOME}/specifications/rttool-${PKGVERSION}.gemspec
+@dirrm ${GEM_LIBDIR}/test
+@dirrm ${GEM_LIBDIR}/lib/rt
+@dirrm ${GEM_LIBDIR}/lib/rd
+@dirrm ${GEM_LIBDIR}/lib
+@dirrm ${GEM_LIBDIR}/examples
+@dirrm ${GEM_LIBDIR}/bin
+@dirrm ${GEM_LIBDIR}
+@exec ${MKDIR} %D/${GEM_DOCDIR}
diff --git a/textproc/ruby-rttool/distinfo b/textproc/ruby-rttool/distinfo
index 48ce018d4aa..fc368e5990f 100644
--- a/textproc/ruby-rttool/distinfo
+++ b/textproc/ruby-rttool/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.9 2007/01/28 15:24:21 taca Exp $
+$NetBSD: distinfo,v 1.10 2008/04/04 15:22:20 jlam Exp $
 
-SHA1 (rttool-1.0.2.tar.gz) = a4267f7b34edee29d359cba54638164f47261211
-RMD160 (rttool-1.0.2.tar.gz) = 59964eccdbcc369862289f3209ca2b5b4b9bec25
-Size (rttool-1.0.2.tar.gz) = 35810 bytes
+SHA1 (rttool-1.0.2.0.gem) = e2c29a1d8f9247b45db8f4bec7efd4460c823633
+RMD160 (rttool-1.0.2.0.gem) = 6d075f46d0e376ef4da9b38550f21675c8fc7118
+Size (rttool-1.0.2.0.gem) = 33792 bytes
+SHA1 (patch-ab) = 4e42a678c47af375c31687bab791d7782601a9c7
diff --git a/textproc/ruby-rttool/patches/patch-ab b/textproc/ruby-rttool/patches/patch-ab
new file mode 100644
index 00000000000..2babf265b44
--- /dev/null
+++ b/textproc/ruby-rttool/patches/patch-ab
@@ -0,0 +1,26 @@
+$NetBSD: patch-ab,v 1.1 2008/04/04 15:22:20 jlam Exp $
+
+--- ../rttool-1.0.2.0.gemspec.orig	2008-03-30 23:51:39.000000000 -0400
++++ ../rttool-1.0.2.0.gemspec
+@@ -16,8 +16,8 @@ dependencies: []
+ description: 
+ email: zn@mbf.nifty.com
+ executables: 
+-- rt/rdrt2
+-- rt/rt2
++- rdrt2
++- rt2
+ extensions: []
+ 
+ extra_rdoc_files: []
+@@ -25,8 +25,8 @@ extra_rdoc_files: []
+ files: 
+ - ChangeLog
+ - GPL
+-- bin/rt/rdrt2
+-- bin/rt/rt2
++- bin/rdrt2
++- bin/rt2
+ - examples/easiest.html
+ - examples/easiest.rt
+ - examples/escape.html