4 files changed, 30 insertions, 39 deletions
diff --git a/textproc/ruby-rttool/Makefile b/textproc/ruby-rttool/Makefile
index 1c878d6ddee..c941bf8cc94 100644
--- a/textproc/ruby-rttool/Makefile
+++ b/textproc/ruby-rttool/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2005/10/25 04:15:49 taca Exp $
+# $NetBSD: Makefile,v 1.12 2005/11/03 05:26:10 taca Exp $
 
 DISTNAME=	rttool-${VERSION}
 PKGNAME=	${RUBY_PKGPREFIX}-${DISTNAME}
-PKGREVISION=	1
 CATEGORIES=	textproc ruby
 MASTER_SITES=	http://www.rubyist.net/~rubikitch/archive/
 
@@ -12,13 +11,14 @@ COMMENT=	RT to HTML (and hopefully LaTeX in future) table converter
 
 CONFLICTS+=	ruby[1-9][0-9]-rttool-*
 
-VERSION=	0.1.8
+VERSION=		1.0.1
 USE_RUBY_DIST_SUBDIR=	yes
-USE_RUBY_SETUP=	yes
-REPLACE_RUBY=	bin/rt/rt2 lib/rt/rt2html-lib.rb \
-		lib/rt/rt2txt-lib.rb lib/rt/rtparser.rb \
-		lib/rt/rtvisitor.rb lib/rt/w3m.rb
-EXAMPLES=	rttest.rd test1.rt test2.rt
+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
 
 .include "../../lang/ruby/rubyversion.mk"
 
@@ -26,18 +26,14 @@ EXAMPLES=	rttest.rd test1.rt test2.rt
 DEPENDS+=	${RUBY_PKGPREFIX}-optparse>=0.7:../../devel/ruby-optparse
 .endif
 
-pre-configure:
-	${RM} -f ${WRKSRC}/setup/rt.rb ${WRKSRC}/lib/rt/rtparser-test.rb
-
 post-install:
 	${INSTALL_DATA_DIR} ${RUBY_DOCDIR}/rt
-	${INSTALL_DATA} ${WRKSRC}/rt.html ${RUBY_DOCDIR}/rt/rt.ja.html
-	${INSTALL_DATA} ${WRKSRC}/rt.rd ${RUBY_DOCDIR}/rt/rt.ja.rd
-	${INSTALL_DATA_DIR} ${RUBY_EXAMPLESDIR}/rt
-	${INSTALL_DATA} ${WRKSRC}/dot.rt.rd2rc ${RUBY_EXAMPLESDIR}/rt
-.for f in ${EXAMPLES}
-	${INSTALL_DATA} ${WRKSRC}/examples/${f} ${RUBY_EXAMPLESDIR}/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
 
 .include "../../lang/ruby/modules.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/ruby-rttool/PLIST b/textproc/ruby-rttool/PLIST
index 14199e4883c..c6ee07f9e61 100644
--- a/textproc/ruby-rttool/PLIST
+++ b/textproc/ruby-rttool/PLIST
@@ -1,17 +1,26 @@
-@comment $NetBSD: PLIST,v 1.4 2005/03/06 17:13:11 taca Exp $
+@comment $NetBSD: PLIST,v 1.5 2005/11/03 05:26:10 taca 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
 @dirrm ${RUBY_SITELIBDIR}/rt
-${RUBY_DOCDIR}/rt/rt.ja.html
-${RUBY_DOCDIR}/rt/rt.ja.rd
+${RUBY_DOCDIR}/rt/rttool.en.rd
+${RUBY_DOCDIR}/rt/rttool.ja.rd
+${RUBY_DOCDIR}/rt/rttool.en.html
+${RUBY_DOCDIR}/rt/rttool.ja.html
 @dirrm ${RUBY_DOCDIR}/rt
-${RUBY_EXAMPLESDIR}/rt/dot.rt.rd2rc
+${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_EXAMPLESDIR}/rt
diff --git a/textproc/ruby-rttool/distinfo b/textproc/ruby-rttool/distinfo
index 3d31f462c32..1e43681b9b4 100644
--- a/textproc/ruby-rttool/distinfo
+++ b/textproc/ruby-rttool/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.6 2005/02/24 14:48:49 agc Exp $
+$NetBSD: distinfo,v 1.7 2005/11/03 05:26:10 taca Exp $
 
-SHA1 (ruby/rttool-0.1.8.tar.gz) = b70f89a4bc0c044486625fbeb46183cbf9e06b6d
-RMD160 (ruby/rttool-0.1.8.tar.gz) = c6512fb48dd6d7262c4e75feb20e53495b6ff10c
-Size (ruby/rttool-0.1.8.tar.gz) = 25800 bytes
-SHA1 (patch-aa) = a12ea85a3c060325d18c44493eafdc1aa688db61
+SHA1 (ruby/rttool-1.0.1.tar.gz) = c71dea6ec5e27fc1aa3b8d32e6aaedaa69b8fc7a
+RMD160 (ruby/rttool-1.0.1.tar.gz) = f9b5b65b84ed7543d9ffd6c896d7e4e72a81fb99
+Size (ruby/rttool-1.0.1.tar.gz) = 35153 bytes
diff --git a/textproc/ruby-rttool/patches/patch-aa b/textproc/ruby-rttool/patches/patch-aa
deleted file mode 100644
index cfa5617cb7a..00000000000
--- a/textproc/ruby-rttool/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2004/11/28 04:48:25 taca Exp $
-
---- setup.rb.orig	2001-07-09 17:53:45.000000000 +0900
-+++ setup.rb
-@@ -640,7 +640,7 @@ class Installer
-   end
- 
-   def install_so( dest )
--    to = isdir(File.expand_path @config['so-dir'] + '/' + dest)
-+    to = isdir(File.expand_path(@config['so-dir'] + '/' + dest))
-     find_so('.').each do |name|
-       install name, to, 0555
-     end