4 files changed, 38 insertions, 27 deletions
diff --git a/japanese/rbnamazu/Makefile b/japanese/rbnamazu/Makefile
index 31d98d4129b3..815a365cea3e 100644
--- a/japanese/rbnamazu/Makefile
+++ b/japanese/rbnamazu/Makefile
@@ -15,12 +15,18 @@ MAINTAINER=	knu@FreeBSD.org
 
 USE_RUBY=	yes
 USE_RUBY_FEATURES=	optparse
-USE_RUBY_RDTOOL=	yes
 
 NO_BUILD=	yes
 
 MODULES=	rbnamazu.rb nmzqr.rb nmzqr.tab.rb nmzdoc.rb
-RD_DOCS=	rbnamazu.rd.ja rbnamazu.rd.en
+RD_DOCS=	
+
+RUBY_RD_FILES=	rbnamazu.rd.ja rbnamazu.rd.en
+
+DOCS_EN=	${RUBY_RD_FILES:M*.rd.en} \
+		${RUBY_RD_HTML_FILES:M*.en.html}
+DOCS_JA=	${RUBY_RD_FILES:M*.rd.ja} \
+		${RUBY_RD_HTML_FILES:M*.ja.html}
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/namazu.rb ${PREFIX}/bin/
@@ -28,18 +34,18 @@ do-install:
 .for f in ${MODULES}
 	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_SITELIBDIR}
 .endfor
+
+post-install: doc-install
+
+.include <bsd.port.mk>
+
+doc-install:
 .if !defined(NOPORTDOCS)
-.for f in ${RD_DOCS}
-	cd ${WRKSRC}; \
-	${RUBY_RD2} ${f} > ${f:S/.rd/.html/}
-.endfor
 	${MKDIR} ${RUBY_MODDOCDIR}/ja
-.for f in ${RD_DOCS:S/.rd/.html/:M*.en}
+.for f in ${DOCS_EN}
 	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_MODDOCDIR}/
 .endfor
-.for f in ${RD_DOCS:S/.rd/.html/:M*.ja}
+.for f in ${DOCS_JA}
 	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_MODDOCDIR}/ja/
 .endfor
 .endif
-
-.include <bsd.port.mk>
diff --git a/japanese/rbnamazu/pkg-plist b/japanese/rbnamazu/pkg-plist
index b6c567764ab3..d0d47c5af3a2 100644
--- a/japanese/rbnamazu/pkg-plist
+++ b/japanese/rbnamazu/pkg-plist
@@ -4,7 +4,9 @@ bin/rbnamazu
 %%RUBY_SITELIBDIR%%/nmzqr.rb
 %%RUBY_SITELIBDIR%%/nmzqr.tab.rb
 %%RUBY_SITELIBDIR%%/rbnamazu.rb
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/rbnamazu.html.ja
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/rbnamazu.html.en
+%%PORTDOCS%%%%RUBY_RD_HTML_FILES%%%%RUBY_MODDOCDIR%%/ja/rbnamazu.ja.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/rbnamazu.rd.ja
+%%PORTDOCS%%%%RUBY_RD_HTML_FILES%%%%RUBY_MODDOCDIR%%/rbnamazu.en.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/rbnamazu.rd.en
 %%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/ja
 %%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%
diff --git a/japanese/ruby-romkan/Makefile b/japanese/ruby-romkan/Makefile
index 216dba9377b3..510a8ef02d3d 100644
--- a/japanese/ruby-romkan/Makefile
+++ b/japanese/ruby-romkan/Makefile
@@ -15,26 +15,31 @@ DIST_SUBDIR=	ruby
 MAINTAINER=	knu@FreeBSD.org
 
 USE_RUBY=	yes
-USE_RUBY_RDTOOL=	yes
+
+NO_BUILD=	yes
 
 EXAMPLES_JA=	test.rb test.sh
-DOCS_EN=	ChangeLog romkan.en.html romkan.en.rd
-DOCS_JA=	romkan.ja.html romkan.ja.rd
+
+RUBY_RD_FILES=	romkan.en.rd romkan.ja.rd
+
+DOCS_EN=	ChangeLog \
+		${RUBY_RD_FILES:M*.en.rd} \
+		${RUBY_RD_HTML_FILES:M*.en.html}
+DOCS_JA=	${RUBY_RD_FILES:M*.ja.rd} \
+		${RUBY_RD_HTML_FILES:M*.ja.html}
 
 .include <bsd.port.pre.mk>
 
 PKGNAMEPREFIX:=	${PKGNAMEPREFIX}${RUBY_PKGNAMEPREFIX}
 
-do-build:
-.if !defined(NOPORTDOCS)
-.for f in romkan.en.rd romkan.ja.rd
-	@cd ${WRKSRC}; \
-	${RUBY_RD2} ${f} > ${f:R}.html
-.endfor
-.endif
-
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/romkan.rb ${RUBY_SITELIBDIR}/
+
+post-install: doc-install
+
+.include <bsd.port.post.mk>
+
+doc-install:
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${RUBY_MODEXAMPLESDIR}/ja
 .for f in ${EXAMPLES_JA}
@@ -48,5 +53,3 @@ do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/${f} ${RUBY_MODDOCDIR}/ja/
 .endfor
 .endif
-
-.include <bsd.port.post.mk>
diff --git a/japanese/ruby-romkan/pkg-plist b/japanese/ruby-romkan/pkg-plist
index 3a83a04a1efc..6f8c39d2b458 100644
--- a/japanese/ruby-romkan/pkg-plist
+++ b/japanese/ruby-romkan/pkg-plist
@@ -4,9 +4,9 @@
 %%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%/ja
 %%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ChangeLog
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/romkan.en.html
+%%PORTDOCS%%%%RUBY_RD_HTML_FILES%%%%RUBY_MODDOCDIR%%/romkan.en.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/romkan.en.rd
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/romkan.ja.html
+%%PORTDOCS%%%%RUBY_RD_HTML_FILES%%%%RUBY_MODDOCDIR%%/ja/romkan.ja.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/romkan.ja.rd
 %%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/ja
 %%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%