3 files changed, 30 insertions, 17 deletions

diff --git a/textproc/ruby-rdtool/Makefile b/textproc/ruby-rdtool/Makefile
index 38ba1b5ef9bd..bb03c7b4402e 100644
--- a/textproc/ruby-rdtool/Makefile
+++ b/textproc/ruby-rdtool/Makefile
@@ -16,21 +16,28 @@ MAINTAINER=	knu@FreeBSD.org
 
 BUILD_DEPENDS=	ruby:${PORTSDIR}/lang/ruby \
 		racc:${PORTSDIR}/devel/ruby-racc \
-		${LOCALBASE}/lib/ruby/site_ruby/${RUBY_VER}/${RUBY_ARCH}/strscan.so:${PORTSDIR}/devel/ruby-strscan \
-		${LOCALBASE}/lib/ruby/site_ruby/optparse.rb:${PORTSDIR}/devel/ruby-optparse
+		${RUBY_SITEARCHLIBDIR}/strscan.so:${PORTSDIR}/devel/ruby-strscan \
+		${RUBY_SITELIBDIR}/optparse.rb:${PORTSDIR}/devel/ruby-optparse
 RUN_DEPENDS=	ruby:${PORTSDIR}/lang/ruby \
-		${LOCALBASE}/lib/ruby/site_ruby/${RUBY_VER}/${RUBY_ARCH}/strscan.so:${PORTSDIR}/devel/ruby-strscan \
-		${LOCALBASE}/lib/ruby/site_ruby/optparse.rb:${PORTSDIR}/devel/ruby-optparse
+		${RUBY_SITEARCHLIBDIR}/strscan.so:${PORTSDIR}/devel/ruby-strscan \
+		${RUBY_SITELIBDIR}/optparse.rb:${PORTSDIR}/devel/ruby-optparse
 
 PLIST_SUB=	RUBY_VER="${RUBY_VER}" RUBY_ARCH="${RUBY_ARCH}"
 
-RUBY=		${LOCALBASE}/bin/ruby
-RUBY_VER=	1.4
-RUBY_ARCH=	${ARCH}-freebsd${OSREL}
+RUBY?=		${LOCALBASE}/bin/ruby
+RUBY_VER?=	1.4
+RUBY_ARCH?=	${ARCH}-freebsd${OSREL}
+
+RUBY_SITELIBDIR?=	${LOCALBASE}/lib/ruby/site_ruby/${RUBY_VER}
+RUBY_SITEARCHLIBDIR?=	${LOCALBASE}/lib/ruby/site_ruby/${RUBY_VER}/${RUBY_ARCH}
 
 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/dev-note.rd.ja	doc/rd-draft.rd.ja \
+		doc/dev-note.ja.html doc/rd-draft.ja.html
+
 do-configure:
 	@cd ${WRKSRC}; \
 	${SETENV} ${CONFIGURE_ENV} ${RUBY} rdtoolconf.rb
@@ -53,23 +60,24 @@ post-build:
 
 post-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/rmi2html.rb ${PREFIX}/bin/rmi2html
-	${INSTALL_DATA} ${WRKSRC}/rd/rd2rmi-lib.rb \
-		${PREFIX}/lib/ruby/site_ruby/${RUBY_VER}/rd/
-	${MKDIR} ${PREFIX}/share/examples/ruby/rd
-	${CP} ${PREFIX}/lib/ruby/site_ruby/${RUBY_VER}/rd/dot.rd2rc \
-		${PREFIX}/share/examples/ruby/rd/
+	${INSTALL_DATA} ${WRKSRC}/rd/rd2rmi-lib.rb ${RUBY_SITELIBDIR}/rd/
 	${MKDIR} ${EMACSLISPDIR}
 	${INSTALL_DATA} ${WRKSRC}/utils/rd-mode.el ${EMACSLISPDIR}/
 	${MKDIR} ${XEMACSLISPDIR}
 	${LN} -sf ${EMACSLISPDIR}/rd-mode.el ${XEMACSLISPDIR}
 	${INSTALL_SCRIPT} ${WRKSRC}/utils/rdswap.rb ${PREFIX}/bin/rdswap
 .if !defined(NOPORTDOCS)
+	rd2 ${PREFIX}/share/doc/ruby/optparse/ja/optparse.ja.rd \
+		> ${PREFIX}/share/doc/ruby/optparse/ja/optparse.ja.html
+	${MKDIR} ${PREFIX}/share/examples/ruby/rd
+	${CP} ${RUBY_SITELIBDIR}/rd/dot.rd2rc ${PREFIX}/share/examples/ruby/rd/
 	${MKDIR} ${PREFIX}/share/doc/ruby/rd/ja
-	${INSTALL_DATA} ${WRKSRC}/README.html ${PREFIX}/share/doc/ruby/rd/
-	${INSTALL_DATA} ${WRKSRC}/README.ja.html ${PREFIX}/share/doc/ruby/rd/ja/
-	${INSTALL_DATA} ${WRKSRC}/doc/dev-note.ja.html ${PREFIX}/share/doc/ruby/rd/ja/
-	${INSTALL_DATA} ${WRKSRC}/doc/rd-draft.html ${PREFIX}/share/doc/ruby/rd/
-	${INSTALL_DATA} ${WRKSRC}/doc/rd-draft.ja.html ${PREFIX}/share/doc/ruby/rd/ja/
+.for f in ${DOCS_EN}
+	${INSTALL_DATA} ${WRKSRC}/${f} ${PREFIX}/share/doc/ruby/rd/
+.endfor
+.for f in ${DOCS_JA}
+	${INSTALL_DATA} ${WRKSRC}/${f} ${PREFIX}/share/doc/ruby/rd/ja/
+.endfor
 .endif
 
 .include <bsd.port.mk>
diff --git a/textproc/ruby-rdtool/pkg-descr b/textproc/ruby-rdtool/pkg-descr
index df1cca5115aa..c093d7be602d 100644
--- a/textproc/ruby-rdtool/pkg-descr
+++ b/textproc/ruby-rdtool/pkg-descr
@@ -4,4 +4,5 @@ RD is a multipurpose documentation format created for documentating
 Ruby and output of Ruby world.  Briefly, RD is to Ruby as POD is to
 Perl.
 
+Author:	Tosh (Toshiro Kuwabara) <toshirok@yb3.so-net.ne.jp>
 WWW:	http://www2.pos.to/~tosh/ruby/rdtool/en/index.html
diff --git a/textproc/ruby-rdtool/pkg-plist b/textproc/ruby-rdtool/pkg-plist
index 0fe70532af73..b90d9f466438 100644
--- a/textproc/ruby-rdtool/pkg-plist
+++ b/textproc/ruby-rdtool/pkg-plist
@@ -19,10 +19,14 @@ share/emacs/site-lisp/rd-mode.el
 lib/xemacs/site-lisp/rd-mode.el
 @unexec rmdir -p %D/share/emacs/site-lisp 2>/dev/null || true
 @unexec rmdir -p %D/lib/xemacs/site-lisp 2>/dev/null || true
+share/doc/ruby/optparse/ja/optparse.ja.html
 share/doc/ruby/rd/README.html
 share/doc/ruby/rd/rd-draft.html
+share/doc/ruby/rd/rd-draft.rd
 share/doc/ruby/rd/ja/README.ja.html
 share/doc/ruby/rd/ja/dev-note.ja.html
+share/doc/ruby/rd/ja/dev-note.rd.ja
 share/doc/ruby/rd/ja/rd-draft.ja.html
+share/doc/ruby/rd/ja/rd-draft.rd.ja
 @dirrm share/doc/ruby/rd/ja
 @dirrm share/doc/ruby/rd