Update to 0.6.16.

4 files changed, 13 insertions, 43 deletions

diff --git a/textproc/ruby-rd-mode.el/Makefile b/textproc/ruby-rd-mode.el/Makefile
index 4341054ca3c5..c516c06d3e3a 100644
--- a/textproc/ruby-rd-mode.el/Makefile
+++ b/textproc/ruby-rd-mode.el/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	rd-mode.el
-PORTVERSION=	0.6.10
+PORTVERSION=	0.6.16
 CATEGORIES=	textproc ruby elisp
 MASTER_SITES=	# none
 PKGNAMEPREFIX=	ruby-	# not ${RUBY_PKGNAMEPREFIX} since this is not version specific
diff --git a/textproc/ruby-rdtool/Makefile b/textproc/ruby-rdtool/Makefile
index a77facb4a8f8..b1cd92dd8d97 100644
--- a/textproc/ruby-rdtool/Makefile
+++ b/textproc/ruby-rdtool/Makefile
@@ -6,9 +6,9 @@
 #
 
 PORTNAME=	rdtool
-PORTVERSION=	0.6.14
+PORTVERSION=	0.6.16
 CATEGORIES=	textproc ruby
-MASTER_SITES=	http://www2.pos.to/~tosh/ruby/rdtool/archive/
+MASTER_SITES=	http://www.moonwolf.com/ruby/archive/
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
 DIST_SUBDIR=	ruby
 
@@ -20,44 +20,17 @@ BUILD_DEPENDS=	${DEPEND_RUBY_AMSTD} \
 
 USE_RUBY=	yes
 USE_RUBY_FEATURES=	optparse strscan
+USE_RUBY_SETUP=	yes
 
 RUBY_MODNAME=	rd
 
-RUBY_SHEBANG_FILES=	 ${WRKSRC}/rmi2html.rb
-
-EMACSLISPDIR=	${PREFIX}/share/emacs/site-lisp
-XEMACSLISPDIR=	${PREFIX}/lib/xemacs/site-lisp
-
-DOCS_EN=	README.html	doc/rd-draft.rd		doc/rd-draft.html
-DOCS_JA=	README.ja.html	doc/rd-draft.rd.ja	doc/rd-draft.ja.html
-
-do-configure:
-	@cd ${WRKSRC}; \
-	${SETENV} ${CONFIGURE_ENV} ${RUBY} rdtoolconf.rb
-
-post-patch:
-	${RUBY} -i -pe 'gsub %r"/usr/local\b", "${PREFIX}"' ${WRKSRC}/utils/rdswap.rb
-
-pre-build:
-	@cd ${WRKSRC}; \
-	${LN} -s missing/strscan.rb
-
-.if !defined(NOPORTDOCS)
-post-build:
-.for f in README.rd.ja doc/rd-draft.rd doc/rd-draft.rd.ja
-	cd ${WRKSRC}; ${RUBY} -I. rd2 -r rd/rd2html-lib.rb ${f} \
-		> ${f:S/.rd.ja$/.ja.html/:S/.rd$/.html/}
-.endfor
-.endif
+DOCS_EN=	README.rd	README.html	doc/rd-draft.rd
+DOCS_JA=	README.rd.ja	README.ja.html	doc/rd-draft.rd.ja
 
 post-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/rmi2html.rb ${PREFIX}/bin/
-	${LN} -sf rmi2html.rb ${PREFIX}/bin/rmi2html
-	${INSTALL_DATA} ${WRKSRC}/rd/rd2rmi-lib.rb ${RUBY_SITELIBDIR}/rd/
-	${INSTALL_SCRIPT} ${WRKSRC}/utils/rdswap.rb ${PREFIX}/bin/rdswap
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${RUBY_MODEXAMPLESDIR}
-	${INSTALL_DATA} ${WRKSRC}/rd/dot.rd2rc ${RUBY_MODEXAMPLESDIR}/
+	${INSTALL_DATA} ${WRKSRC}/lib/rd/dot.rd2rc ${RUBY_MODEXAMPLESDIR}/
 	${MKDIR} ${RUBY_MODDOCDIR}/ja
 .for f in ${DOCS_EN}
 	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_MODDOCDIR}/
diff --git a/textproc/ruby-rdtool/distinfo b/textproc/ruby-rdtool/distinfo
index a957972d1564..e8bf4baf0e80 100644
--- a/textproc/ruby-rdtool/distinfo
+++ b/textproc/ruby-rdtool/distinfo
@@ -1,2 +1,2 @@
-MD5 (ruby/rdtool-0.6.14.tar.gz) = 908e750737c628e060dfb1468ac8ae62
-SIZE (ruby/rdtool-0.6.14.tar.gz) = 58750
+MD5 (ruby/rdtool-0.6.16.tar.gz) = 9a72767684dd4f0ff57cc50489b4a86b
+SIZE (ruby/rdtool-0.6.16.tar.gz) = 67689
diff --git a/textproc/ruby-rdtool/pkg-plist b/textproc/ruby-rdtool/pkg-plist
index 549aef406175..09b3630058fa 100644
--- a/textproc/ruby-rdtool/pkg-plist
+++ b/textproc/ruby-rdtool/pkg-plist
@@ -1,12 +1,9 @@
 bin/rd2
-bin/rdswap
-bin/rmi2html
-bin/rmi2html.rb
+bin/rdswap.rb
 %%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
@@ -38,10 +35,10 @@ bin/rmi2html.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/dot.rd2rc
 %%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/README.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/rd-draft.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/rd-draft.rd
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/README.rd
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/README.ja.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/rd-draft.ja.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/README.rd.ja
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/rd-draft.rd.ja
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/rd-draft.rd
 %%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/ja
 %%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%