Update textproc/ruby-rdtool package to 0.6.18 and it updates

devel/ruby-rd-mode pacakge, too.


= CHANGES
:0.6.18
  * bin/rd2 UTF-8 support.
  * support Ruby 1.9.
  * makerdtools.rb fixed some bugs.
  * fixed install dot.rd2rc problem
  * fixed some bugs.
:0.6.17
  * utils/rd-mode.el patch from <shirai@p1jp.com>
:0.6.16
  * utils/rd-mode.el font-face patch from HIRAOKA by MoonWolf <moonwolf@moonwolf.com>
:0.6.15
  * re-packaging by MoonWolf <moonwolf@moonwolf.com>

6 files changed, 54 insertions, 112 deletions

diff --git a/textproc/ruby-rdtool/Makefile b/textproc/ruby-rdtool/Makefile
index e7a3a15ed1b..f0a3a658456 100644
--- a/textproc/ruby-rdtool/Makefile
+++ b/textproc/ruby-rdtool/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.16 2005/10/25 04:15:49 taca Exp $
+# $NetBSD: Makefile,v 1.17 2005/11/03 05:21:18 taca Exp $
 
-DISTNAME=	rdtool-0.6.14
+DISTNAME=	rdtool-0.6.18
 PKGNAME=	${RUBY_PKGPREFIX}-${DISTNAME}
-PKGREVISION=	1
 CATEGORIES=	textproc ruby
-MASTER_SITES=	http://www2.pos.to/~tosh/ruby/rdtool/archive/
+MASTER_SITES=	http://www.moonwolf.com/ruby/archive/
 
 MAINTAINER=	taca@NetBSD.org
 HOMEPAGE=	http://www2.pos.to/~tosh/ruby/rdtool/
@@ -14,45 +13,47 @@ COMMENT=	RD (Ruby Document) converter to HTML/man/etc
 # install multiple ruby??-rd2 package (unless supported by pkgview.
 CONFLICTS+=	ruby[1-9][0-9]-rdtool-*
 
-REPLACE_RUBY=	rd2 rmi2html.rb utils/rdswap.rb
-INSTALL_TARGET=	install install-rmi2html
 USE_RUBY_DIST_SUBDIR=	yes
 
 .include "../../lang/ruby/rubyversion.mk"
 
 .if ${RUBY_VER} == "16"
-BUILD_DEPENDS+=	${RUBY_PKGPREFIX}-racc>=1.3.6:../../devel/ruby16-racc
 DEPENDS+=	${RUBY_PKGPREFIX}-optparse>=0.7:../../devel/ruby-optparse
 DEPENDS+=	${RUBY_PKGPREFIX}-strscan>=0.6.1:../../devel/ruby-strscan
-.else
-BUILD_DEPENDS+=	${RUBY_PKGPREFIX}-racc>=1.3.6:../../devel/ruby-racc
 .endif
 
-MAKE_ENV+=	RACC=${RACC}
-DOCS_RD=	README.rd README.rd.ja doc/rd-draft.rd doc/rd-draft.rd.ja
-DOCS=		${DOCS_RD} README.html README.html.ja \
-		doc/rd-draft.html doc/rd-draft.html.ja
+USE_RUBY_SETUP=	yes
+USE_PKGINSTALL=	yes
+REPLACE_RUBY=	bin/rd2 bin/rdswap.rb
+
+CONF_FILES+=	${RUBY_SITELIBDIR}/rd/dot.rd2rc ${PKG_SYSCONFDIR}/dot.rd2rc
 
-do-configure:
-	@cd ${WRKSRC}; ${SETENV} ${CONFIGURE_ENV} ${RUBY} rdtoolconf.rb
-	@cd ${WRKSRC}; \
-		${RM} -f rd/rdinlineparser.tab.rb rd/rdblockparser.tab.rb
+SUBST_CLASSES+=		path
+SUBST_STAGE.path=	post-configure
+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/}
 
 post-build:
 .for f in ${DOCS_RD}
-	cd ${WRKSRC}; ${RUBY} -I. rd2 -r rd/rd2html-lib.rb ${f} \
+	cd ${WRKSRC}; ${RUBY} -I./lib bin/rd2 -r lib/rd/rd2html-lib.rb ${f} \
 		> ${f:S/.rd/.html/}
 .endfor
 
 post-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/utils/rdswap.rb ${PREFIX}/bin/rdswap
+	${INSTALL_SCRIPT} ${WRKSRC}/bin/rdswap.rb ${PREFIX}/bin/rdswap
+	${INSTALL_DATA} ${WRKSRC}/lib/rd/dot.rd2rc \
+		${RUBY_SITELIBDIR}/rd/dot.rd2rc
 	${INSTALL_DATA_DIR} ${RUBY_DOCDIR}/rd
 .for f in ${DOCS}
 	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_DOCDIR}/rd
 .endfor
 	${INSTALL_DATA_DIR} ${RUBY_EXAMPLESDIR}/rd
-	${INSTALL_DATA} ${RUBY_SITELIBDIR}/rd/dot.rd2rc ${RUBY_EXAMPLESDIR}/rd
+	${INSTALL_DATA} ${WRKSRC}/lib/rd/dot.rd2rc \
+		${RUBY_EXAMPLESDIR}/rd/dot.rd2rc
 
 .include "../../lang/ruby/modules.mk"
-.include "../../devel/ruby-racc/raccversion.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/ruby-rdtool/PLIST b/textproc/ruby-rdtool/PLIST
index dd3cd39f6ee..08d96a0f84a 100644
--- a/textproc/ruby-rdtool/PLIST
+++ b/textproc/ruby-rdtool/PLIST
@@ -1,12 +1,10 @@
-@comment $NetBSD: PLIST,v 1.3 2004/11/27 15:28:30 taca Exp $
+@comment $NetBSD: PLIST,v 1.4 2005/11/03 05:21:18 taca Exp $
 bin/rd2
 bin/rdswap
-bin/rmi2html
 ${RUBY_SITELIBDIR}/rd/block-element.rb
 ${RUBY_SITELIBDIR}/rd/complex-list-item.rb
 ${RUBY_SITELIBDIR}/rd/desclist.rb
 ${RUBY_SITELIBDIR}/rd/document-struct.rb
-${RUBY_SITELIBDIR}/rd/dot.rd2rc
 ${RUBY_SITELIBDIR}/rd/element.rb
 ${RUBY_SITELIBDIR}/rd/filter.rb
 ${RUBY_SITELIBDIR}/rd/inline-element.rb
@@ -20,6 +18,7 @@ ${RUBY_SITELIBDIR}/rd/parser-util.rb
 ${RUBY_SITELIBDIR}/rd/rbl-file.rb
 ${RUBY_SITELIBDIR}/rd/rbl-suite.rb
 ${RUBY_SITELIBDIR}/rd/rd-struct.rb
+${RUBY_SITELIBDIR}/rd/dot.rd2rc
 ${RUBY_SITELIBDIR}/rd/rd2html-lib.rb
 ${RUBY_SITELIBDIR}/rd/rd2html-opt.rb
 ${RUBY_SITELIBDIR}/rd/rd2man-lib.rb
diff --git a/textproc/ruby-rdtool/distinfo b/textproc/ruby-rdtool/distinfo
index 49d27d943c0..c0f8f9ed799 100644
--- a/textproc/ruby-rdtool/distinfo
+++ b/textproc/ruby-rdtool/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.11 2005/02/24 14:48:49 agc Exp $
+$NetBSD: distinfo,v 1.12 2005/11/03 05:21:18 taca Exp $
 
-SHA1 (ruby/rdtool-0.6.14.tar.gz) = 6c61ffad85c62c7d3708c19a8793c1f8b395a1c0
-RMD160 (ruby/rdtool-0.6.14.tar.gz) = 7522709925a7ff08b4e602dfed8bda88dbda6e77
-Size (ruby/rdtool-0.6.14.tar.gz) = 58750 bytes
-SHA1 (patch-ac) = 8309d97d2fc13c3695738ec54ef3f93ae7642f5d
-SHA1 (patch-ad) = 0a80f85e8ec50a67273c0721b3018e582bf219d5
+SHA1 (ruby/rdtool-0.6.18.tar.gz) = 4c0ae3f25a5bca11b5a4b8d9a01f4683b958d9e0
+RMD160 (ruby/rdtool-0.6.18.tar.gz) = 10bd30d26d8264f86b6493a0430d1d1b9e807a9f
+Size (ruby/rdtool-0.6.18.tar.gz) = 80445 bytes
+SHA1 (patch-ae) = 13e2a54d6abec57d20f4d0e9a6d440e40f352787
diff --git a/textproc/ruby-rdtool/patches/patch-ac b/textproc/ruby-rdtool/patches/patch-ac
deleted file mode 100644
index e57d145bada..00000000000
--- a/textproc/ruby-rdtool/patches/patch-ac
+++ /dev/null
@@ -1,69 +0,0 @@
-$NetBSD: patch-ac,v 1.4 2004/11/27 15:28:30 taca Exp $
-
---- rdtoolconf.rb.orig	2003-03-08 21:45:07.000000000 +0900
-+++ rdtoolconf.rb
-@@ -4,28 +4,41 @@
- 
- require 'mkmf'
- require 'rbconfig'
--require 'amstd/rbparams'
- 
- STDERR.print "creating Makefile\n"
- 
--$bindir = RubyParams::BINDIR
--$siterubydir = RubyParams::SITE_RB
-+$bindir = CONFIG["bindir"]
-+$siterubydir = CONFIG["sitelibdir"]
- $rddir = CONFIG["datadir"] + "/ruby/rd"
- $racc = "racc"
- 
-+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
- 
-+prefix = #{CONFIG["prefix"]}
-+exec_prefix = #{CONFIG["exec_prefix"]}
-+ruby_version = #{CONFIG["ruby_version"]}
-+sitedir = #{CONFIG["sitedir"]}
-+MAJOR = #{CONFIG["MAJOR"]}
-+MINOR = #{CONFIG["MINOR"]}
- BIN_DIR = #{$bindir}
- SITE_RUBY = #{$siterubydir}
- RD_DIR = #{$rddir}
- 
- RUBY = #{CONFIG["ruby_install_name"]}
- RUBY_OPT = -I.
--RACC = #{$racc}
--# RACC_OPT = -gv
-+#RACC = #{$racc}
-+RACC_OPT = #{racc_opt}
-+#RD_SUFFIX=
- 
- RD_LIBS = rd/block-element.rb \\
-           rd/complex-list-item.rb \\
-@@ -90,7 +103,7 @@ clean :
- 	rm -f ./Makefile
- 
- install : rd2 $(RD_LIBS) $(PARSERS)
--	@$(RUBY) -r ftools -e 'File::install(ARGV[0], ARGV[1], 0755, true)' rd2 $(BIN_DIR)
-+	@$(RUBY) -r ftools -e 'File::install(ARGV[0], ARGV[1], 0755, true)' rd2 $(BIN_DIR)/rd2${RD_SUFFIX}
- 	@$(RUBY) -r ftools -e 'File::makedirs(*ARGV)' $(SITE_RUBY)/rd
- 	@$(RUBY) -r ftools -e "dest = ARGV[-1]; ARGV.each do |file| File::install(file, dest, 0644, true) if file != dest end" $(RD_LIBS) $(PARSERS) $(SITE_RUBY)/rd
- 
-@@ -100,7 +113,7 @@ install-nonext : rd2 $(RD_LIBS) $(PARSER
- 	@$(RUBY) -r ftools -e "dest = ARGV[-1]; ARGV.each do |file| File::install(file, dest, 0644, true) if file != dest end" $(RD_LIBS) $(PARSERS_NONEXT) $(SITE_RUBY)/rd
- 
- install-rmi2html : rmi2html.rb
--	@$(RUBY) -r ftools -e 'File::install(ARGV[0], ARGV[1], 0755, true)' rmi2html.rb $(BIN_DIR)
-+	@$(RUBY) -r ftools -e 'File::install(ARGV[0], ARGV[1], 0755, true)' rmi2html.rb $(BIN_DIR)/rmi2html${RD_SUFFIX}
- 	@$(RUBY) -r ftools -e 'File::install(ARGV[0], ARGV[1], 0644, true)' rd/rd2rmi-lib.rb $(SITE_RUBY)/rd
- 
- dist :
diff --git a/textproc/ruby-rdtool/patches/patch-ad b/textproc/ruby-rdtool/patches/patch-ad
deleted file mode 100644
index 819b056bb84..00000000000
--- a/textproc/ruby-rdtool/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2004/11/27 15:28:30 taca Exp $
-
---- rd2.orig	2003-03-08 21:45:07.000000000 +0900
-+++ rd2
-@@ -240,7 +240,7 @@ out = $Visitor.visit(tree)
- out = Kconv.kconv(out, Kconv::NAME2CONST[out_code], Kconv::AUTO) if out_code
- 
- if output_file
--  filename = output_file + "." + $Visitor.type::OUTPUT_SUFFIX
-+  filename = output_file + "." + $Visitor.class::OUTPUT_SUFFIX
-   file = open(filename, "w")
-   file.print(out)
-   file.close
diff --git a/textproc/ruby-rdtool/patches/patch-ae b/textproc/ruby-rdtool/patches/patch-ae
new file mode 100644
index 00000000000..aaa744c90bf
--- /dev/null
+++ b/textproc/ruby-rdtool/patches/patch-ae
@@ -0,0 +1,25 @@
+$NetBSD: patch-ae,v 1.1 2005/11/03 05:21:18 taca Exp $
+
+--- bin/rd2.orig	2005-10-26 20:20:49.000000000 +0900
++++ bin/rd2
+@@ -66,6 +66,7 @@ output_file = nil
+ output_index = nil
+ out_code = nil
+ from_rdo = nil
++sysconf = "@PKG_SYSCONFDIR@/dot.rd2rc"
+ 
+ # user option
+ $DEFAULT_FORMAT_LIB = "rd/rd2html-lib"
+@@ -76,10 +77,10 @@ begin
+     load "~/.rd2rc"
+     #  STDERR << "#{$0}: loading ~/.rd2rc\n"
+   else
+-    load "rd/dot.rd2rc"
++    load sysconf
+     #  STDERR << "#{$0}: loading rd/dot.rd2rc\n"
+   end
+-rescue
++rescue StandardError, LoadError
+   load "rd/dot.rd2rc"
+ end
+