5 files changed, 35 insertions, 22 deletions
diff --git a/textproc/ruby-rttool/DESCR b/textproc/ruby-rttool/DESCR
index 24655fc7420..cc29cde6202 100644
--- a/textproc/ruby-rttool/DESCR
+++ b/textproc/ruby-rttool/DESCR
@@ -2,5 +2,3 @@ RTtool converts RT to HTML table.
 
 Currently it supports only HTML, but it will hopefully support other
 formats like LaTeX later.
-
-Author:	rubikitch@ruby-lang.org
diff --git a/textproc/ruby-rttool/Makefile b/textproc/ruby-rttool/Makefile
index 64eb1044128..0fe5117d996 100644
--- a/textproc/ruby-rttool/Makefile
+++ b/textproc/ruby-rttool/Makefile
@@ -1,29 +1,31 @@
-# $NetBSD: Makefile,v 1.8 2004/03/16 02:01:11 taca Exp $
+# $NetBSD: Makefile,v 1.9 2004/11/28 04:48:25 taca Exp $
 
 DISTNAME=	rttool-${VERSION}
-PKGNAME=	${RUBY_PKGNAMEPREFIX}${DISTNAME}
+PKGNAME=	${RUBY_PKGPREFIX}-${DISTNAME}
 CATEGORIES=	textproc ruby
-MASTER_SITES=	http://www.rubyist.net/~rubikitch/computer/rt/
+MASTER_SITES=	http://www.rubyist.net/~rubikitch/archive/
 
 MAINTAINER=	taca@NetBSD.org
-HOMEPAGE=	http://www.rubyist.net/~rubikitch/archive/
+HOMEPAGE=	http://www.rubyist.net/~rubikitch/computer/rt/
 COMMENT=	RT to HTML (and hopefully LaTeX in future) table converter
 
-DEPENDS+=	${RUBY_PKGNAMEPREFIX}optparse>=0.7:../../devel/ruby-optparse
+CONFLICTS+=	ruby[1-9][0-9]-rttool-*
 
-DIST_SUBDIR=	ruby
-VERSION=	0.1.7
-RUBY_REQD=	1.6.0
-USE_RUBY_SETUP=	# defined
-
-REPLACE_RUBY=	bin/rt/rt2 lib/rt/rt2html-lib.rb lib/rt/rt2txt-lib.rb \
-		lib/rt/rtparser-test.rb lib/rt/rtparser.rb \
+VERSION=	0.1.8
+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
 
+.include "../../lang/ruby/rubyversion.mk"
+
+.if ${RUBY_VER} == 16
+DEPENDS+=	${RUBY_PKGPREFIX}-optparse>=0.7:../../devel/ruby-optparse
+.endif
+
 pre-configure:
-	${RM} -f ${WRKSRC}/setup/rt.rb
+	${RM} -f ${WRKSRC}/setup/rt.rb ${WRKSRC}/lib/rt/rtparser-test.rb
 
 post-install:
 	${INSTALL_DATA_DIR} ${RUBY_DOCDIR}/rt
@@ -35,5 +37,5 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/examples/${f} ${RUBY_EXAMPLESDIR}/rt
 .endfor
 
-.include "../../lang/ruby-base/Makefile.common"
+.include "../../lang/ruby/modules.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/ruby-rttool/PLIST b/textproc/ruby-rttool/PLIST
index a6314357482..2c174234a13 100644
--- a/textproc/ruby-rttool/PLIST
+++ b/textproc/ruby-rttool/PLIST
@@ -1,9 +1,8 @@
-@comment $NetBSD: PLIST,v 1.2 2002/01/04 00:13:06 taca Exp $
+@comment $NetBSD: PLIST,v 1.3 2004/11/28 04:48:25 taca Exp $
 bin/rt2
 bin/rdrt2
 ${RUBY_SITELIBDIR}/rt/rt2html-lib.rb
 ${RUBY_SITELIBDIR}/rt/rt2txt-lib.rb
-${RUBY_SITELIBDIR}/rt/rtparser-test.rb
 ${RUBY_SITELIBDIR}/rt/rtparser.rb
 ${RUBY_SITELIBDIR}/rt/rtvisitor.rb
 ${RUBY_SITELIBDIR}/rt/w3m.rb
diff --git a/textproc/ruby-rttool/distinfo b/textproc/ruby-rttool/distinfo
index 36e1acdeecb..a276a4ebdfb 100644
--- a/textproc/ruby-rttool/distinfo
+++ b/textproc/ruby-rttool/distinfo
@@ -1,4 +1,5 @@
-$NetBSD: distinfo,v 1.4 2002/01/04 00:13:06 taca Exp $
+$NetBSD: distinfo,v 1.5 2004/11/28 04:48:25 taca Exp $
 
-SHA1 (ruby/rttool-0.1.7.tar.gz) = 6eb7420f798534a997fcf008ddf7fae2f1425c0e
-Size (ruby/rttool-0.1.7.tar.gz) = 25756 bytes
+SHA1 (ruby/rttool-0.1.8.tar.gz) = b70f89a4bc0c044486625fbeb46183cbf9e06b6d
+Size (ruby/rttool-0.1.8.tar.gz) = 25800 bytes
+SHA1 (patch-aa) = a12ea85a3c060325d18c44493eafdc1aa688db61
diff --git a/textproc/ruby-rttool/patches/patch-aa b/textproc/ruby-rttool/patches/patch-aa
new file mode 100644
index 00000000000..cfa5617cb7a
--- /dev/null
+++ b/textproc/ruby-rttool/patches/patch-aa
@@ -0,0 +1,13 @@
+$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