Bump package revision.

- Make dependency with racc to build time only.
- Remove extra dependency to ruby-strscan package.

3 files changed, 27 insertions, 10 deletions

diff --git a/textproc/ruby-rdtool/Makefile b/textproc/ruby-rdtool/Makefile
index a3b5185de1d..ad70dacc54d 100644
--- a/textproc/ruby-rdtool/Makefile
+++ b/textproc/ruby-rdtool/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.9 2004/02/11 15:46:32 taca Exp $
+# $NetBSD: Makefile,v 1.10 2004/03/07 04:40:26 taca Exp $
 # FreeBSD: ports/textproc/ruby-rdtool/Makefile,v 1.15 2001/01/30 19:20:09 knu Exp
 
 DISTNAME=	rdtool-${RUBY_RD_VERSION}
 PKGNAME=	${RUBY_PKGNAMEPREFIX}${DISTNAME}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	textproc
 MASTER_SITES=	http://www2.pos.to/~tosh/ruby/rdtool/archive/
 
@@ -11,10 +11,8 @@ MAINTAINER=	taca@NetBSD.org
 HOMEPAGE=	http://www2.pos.to/~tosh/ruby/rdtool/
 COMMENT=	RD (Ruby Document) converter to HTML/man/etc
 
+BUILD_DEPENDS+=	${RUBY_PKGNAMEPREFIX}racc>=1.3.6:../../devel/ruby-racc
 DEPENDS+=	${RUBY_PKGNAMEPREFIX}optparse>=0.7:../../devel/ruby-optparse
-DEPENDS+=	${RUBY_PKGNAMEPREFIX}racc>=1.3.6:../../devel/ruby-racc
-DEPENDS+=	${RUBY_PKGNAMEPREFIX}strscan>=0.6.1:../../devel/ruby-strscan
-#DEPENDS+=	${RUBY_PKGNAMEPREFIX}forwardable>=1.1:../../devel/ruby14-forwardable
 
 DIST_SUBDIR=	ruby
 USE_RUBY=	yes
@@ -28,6 +26,8 @@ DOCS=		${DOCS_RD} README.html README.html.ja \
 
 do-configure:
 	@cd ${WRKSRC}; ${SETENV} ${CONFIGURE_ENV} ${RUBY} rdtoolconf.rb
+	@cd ${WRKSRC}; \
+		${RM} -f rd/rdinlineparser.tab.rb rd/rdblockparser.tab.rb
 
 post-build:
 .for f in ${DOCS_RD}
diff --git a/textproc/ruby-rdtool/distinfo b/textproc/ruby-rdtool/distinfo
index 044b99ca972..93337d77e4e 100644
--- a/textproc/ruby-rdtool/distinfo
+++ b/textproc/ruby-rdtool/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.8 2004/02/20 14:18:07 taca Exp $
+$NetBSD: distinfo,v 1.9 2004/03/07 04:40:26 taca Exp $
 
 SHA1 (ruby/rdtool-0.6.14.tar.gz) = 6c61ffad85c62c7d3708c19a8793c1f8b395a1c0
 Size (ruby/rdtool-0.6.14.tar.gz) = 58750 bytes
-SHA1 (patch-ac) = 1ad92ec36383855ed69dced37272962c387eaaaa
+SHA1 (patch-ac) = d4121acf5bae2dfbda9ad16e7155761e46d76c99
diff --git a/textproc/ruby-rdtool/patches/patch-ac b/textproc/ruby-rdtool/patches/patch-ac
index d3d03b688d8..197c6d03e5c 100644
--- a/textproc/ruby-rdtool/patches/patch-ac
+++ b/textproc/ruby-rdtool/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.2 2004/02/20 14:18:07 taca Exp $
+$NetBSD: patch-ac,v 1.3 2004/03/07 04:40:26 taca Exp $
 
 --- rdtoolconf.rb.orig	2003-03-08 21:45:07.000000000 +0900
 +++ rdtoolconf.rb
-@@ -4,12 +4,11 @@
+@@ -4,20 +4,32 @@
  
  require 'mkmf'
  require 'rbconfig'
@@ -17,7 +17,15 @@ $NetBSD: patch-ac,v 1.2 2004/02/20 14:18:07 taca Exp $
  $rddir = CONFIG["datadir"] + "/ruby/rd"
  $racc = "racc"
  
-@@ -18,6 +17,12 @@ mfile.print  <<"EOM"
++ruby_version = CONFIG['MAJOR'] + "." + CONFIG['MINOR']
++racc_opt = "# -gv"
++if ruby_version < "1.8"
++  racc_opt = "-E " + racc_opt
++else
++end
++
+ mfile = open("Makefile", "w")
+ mfile.print  <<"EOM"
  #
  # RDtool makefile
  
@@ -30,3 +38,12 @@ $NetBSD: patch-ac,v 1.2 2004/02/20 14:18:07 taca Exp $
  BIN_DIR = #{$bindir}
  SITE_RUBY = #{$siterubydir}
  RD_DIR = #{$rddir}
+@@ -25,7 +37,7 @@ RD_DIR = #{$rddir}
+ RUBY = #{CONFIG["ruby_install_name"]}
+ RUBY_OPT = -I.
+ RACC = #{$racc}
+-# RACC_OPT = -gv
++RACC_OPT = #{racc_opt}
+ 
+ RD_LIBS = rd/block-element.rb \\
+           rd/complex-list-item.rb \\