Introduce a knob RUBY_NO_RD_HTML and enable it by default on alpha. This

replaces the non-working NOPORTDOCS workaround and fixes build on the alpha,
where rd2 coredumps.

Tested on:	the axp cluster
Approved by:	kris

54 files changed, 419 insertions, 385 deletions

diff --git a/Mk/bsd.ruby.mk b/Mk/bsd.ruby.mk
index fe502fd4508e..c6896f6a8a20 100644
--- a/Mk/bsd.ruby.mk
+++ b/Mk/bsd.ruby.mk
@@ -17,6 +17,7 @@ Ruby_Include_MAINTAINER=	knu@FreeBSD.org
 # RUBY_VER		- (See below)
 # RUBY_DEFAULT_VER	- Set to (e.g.) "1.7" if you want to refer to "ruby17" just as "ruby".
 # RUBY_ARCH		- (See below)
+# RUBY_NO_RD_HTML	- Define if you don't want HTML files generated from RD files.
 #
 # [variables that each port can define]
 #
@@ -267,7 +268,7 @@ USE_RUBY=		yes
 post-patch:	ruby-shebang-patch
 
 ruby-shebang-patch:
-	@for f in ${RUBY_SHEBANG_FILES}; do \
+	@cd ${WRKSRC}; for f in ${RUBY_SHEBANG_FILES}; do \
 	${ECHO_MSG} "===>  Fixing the #! line of $$f"; \
 	${RUBY} ${RUBY_FLAGS} -i -p \
 			-e 'if $$. == 1; ' \
@@ -350,7 +351,7 @@ do-install:	ruby-setup-install
 
 ruby-setup-install:
 	@${ECHO_MSG} "===>  Running ${RUBY_SETUP} to install"
-	cd ${INSTALL_WRKSRC}; \
+	@cd ${INSTALL_WRKSRC}; \
 	${SETENV} ${MAKE_ENV} ${RUBY} ${RUBY_FLAGS} ${RUBY_SETUP} install
 .endif
 
@@ -392,26 +393,39 @@ RUN_DEPENDS+=		${DEPEND_RUBY_AMSTD}
 
 # documents
 
-.if ${ARCH} == alpha && ${RUBY_VER} <= 1.6 && defined(USE_RUBY_RDTOOL)
-NOPORTDOCS=	yes
+.if defined(NOPORTDOCS)
+RUBY_NO_RD_HTML=	yes
 .endif
 
-.if defined(RUBY_RD_FILES) && !empty(RUBY_RD_FILES)
+.if ${ARCH} == alpha && ${RUBY_VER} <= 1.6
+RUBY_NO_RD_HTML=	yes
+.endif
+
+.if defined(RUBY_RD_FILES) && !defined(RUBY_NO_RD_HTML)
 USE_RUBY_RDTOOL=	yes
 
-RUBY_RD_HTML_FILES=	${RUBY_RD_FILES:S/.rd//:S/$/.html/}
+RUBY_RD_HTML_FILES=	${RUBY_RD_FILES:S/.rb$//:S/.rd././:S/.rd$//:S/$/.html/}
 
-do-build:	ruby-rd-build
+PLIST_SUB+=		RUBY_RD_HTML_FILES=""
+
+pre-install:	ruby-rd-build
 
 ruby-rd-build:
-.if !defined(NOPORTDOCS)
+.if !empty(RUBY_RD_FILES)
 	@${ECHO_MSG} "===>  Generating HTML documents from RD documents"
-	@for rd in ${RUBY_RD_FILES}; do \
-		html="$$(echo $$rd | sed 's/\.rd//').html"; \
+	@cd ${WRKSRC}; for rd in ${RUBY_RD_FILES}; do \
+		html=$$(echo $$rd | ${SED} 's/\.rb$$//;s/\.rd\././;s/\.rd$$//').html; \
 		${ECHO_MSG} "${RUBY_RD2} $$rd > $$html"; \
 		${RUBY_RD2} $$rd > $$html; \
 	done
+.else
+	@${DO_NADA}
 .endif
+
+.else
+RUBY_RD_HTML_FILES=	# empty
+
+PLIST_SUB+=		RUBY_RD_HTML_FILES="@comment "
 .endif
 
 .if !defined(NOPORTDOCS) && defined(USE_RUBY_RDTOOL)
diff --git a/archivers/ruby-bz2/Makefile b/archivers/ruby-bz2/Makefile
index 90ef8fafc830..b943d4aa0bd7 100644
--- a/archivers/ruby-bz2/Makefile
+++ b/archivers/ruby-bz2/Makefile
@@ -17,25 +17,30 @@ MAINTAINER=	knu@FreeBSD.org
 USE_RUBY=	yes
 USE_RUBY_EXTCONF=	yes
 USE_RUBY_RDOC=		yes
-USE_RUBY_RDTOOL=	yes
 
 INSTALL_TARGET=	site-install
 
-DOCS=		Changes		README.en	bz2.html	bz2.rd	\
+RUBY_RD_FILES=	bz2.rd
+
+DOCS=		Changes \
+		README.en \
+		${RUBY_RD_FILES} \
+		${RUBY_RD_HTML_FILES} \
 		docs/doc
 
 post-build:
 .if !defined(NOPORTDOCS)
-	cd ${WRKSRC}; ${RUBY_RD2} bz2.rd > bz2.html
-	cd ${WRKSRC}/docs; ${RUBY} b.rb bz2; rdoc bz2.rb
+	cd ${WRKSRC}/docs; ${RUBY} b.rb bz2; ${RUBY_RDOC} bz2.rb
 .endif
 
-post-install:
+post-install: doc-install
+
+.include <bsd.port.mk>
+
+doc-install:
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${RUBY_MODDOCDIR}
 .for f in ${DOCS}
 	${CP} -R ${WRKSRC}/${f} ${RUBY_MODDOCDIR}/
 .endfor
 .endif
-
-.include <bsd.port.mk>
diff --git a/archivers/ruby-bz2/pkg-plist b/archivers/ruby-bz2/pkg-plist
index 236211dc6ebf..80320d176fe7 100644
--- a/archivers/ruby-bz2/pkg-plist
+++ b/archivers/ruby-bz2/pkg-plist
@@ -1,7 +1,7 @@
 %%RUBY_SITEARCHLIBDIR%%/bz2.so
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/Changes
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/README.en
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/bz2.html
+%%PORTDOCS%%%%RUBY_RD_HTML_FILES%%%%RUBY_MODDOCDIR%%/bz2.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/bz2.rd
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/BZ2.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/BZ2.src/M000001.html
diff --git a/comms/ruby-termios/Makefile b/comms/ruby-termios/Makefile
index a654b22b16e9..36340c962873 100644
--- a/comms/ruby-termios/Makefile
+++ b/comms/ruby-termios/Makefile
@@ -18,22 +18,24 @@ MAINTAINER=	knu@FreeBSD.org
 
 USE_RUBY=	yes
 USE_RUBY_EXTCONF=	yes
-USE_RUBY_RDTOOL=	yes
 
 INSTALL_TARGET=	site-install
 
-DOCS=		ChangeLog	README		termios.html	termios.rd
+RUBY_RD_FILES=	termios.rd
+
+DOCS=		ChangeLog	README \
+		${RUBY_RD_FILES} \
+		${RUBY_RD_HTML_FILES}
 
 post-patch:
 	${RUBY} -i -pe 'gsub(/ttyS\d/, "cuaa0")' ${WRKSRC}/examples/*.rb
 	${RUBY} -i -pe 'gsub(/\.c_/, ".")' ${WRKSRC}/examples/*.rb
 
-post-build:
-.if !defined(NOPORTDOCS)
-	cd ${WRKSRC}; ${RUBY_RD2} termios.rd > termios.html
-.endif
+post-install: doc-install
 
-post-install:
+.include <bsd.port.mk>
+
+doc-install:
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${RUBY_MODEXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/examples/*.rb ${RUBY_MODEXAMPLESDIR}/
@@ -42,5 +44,3 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_MODDOCDIR}/
 .endfor
 .endif
-
-.include <bsd.port.mk>
diff --git a/comms/ruby-termios/pkg-plist b/comms/ruby-termios/pkg-plist
index b762482c3efc..03d879f8e0bf 100644
--- a/comms/ruby-termios/pkg-plist
+++ b/comms/ruby-termios/pkg-plist
@@ -1,7 +1,7 @@
 %%RUBY_SITEARCHLIBDIR%%/termios.so
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ChangeLog
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/README
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/termios.html
+%%PORTDOCS%%%%RUBY_RD_HTML_FILES%%%%RUBY_MODDOCDIR%%/termios.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/termios.rd
 %%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/modem_check0.rb
diff --git a/databases/ruby-search-namazu/Makefile b/databases/ruby-search-namazu/Makefile
index 3089064d0675..4318f4cf8d6c 100644
--- a/databases/ruby-search-namazu/Makefile
+++ b/databases/ruby-search-namazu/Makefile
@@ -19,21 +19,26 @@ LIB_DEPENDS=	nmz.6:${PORTSDIR}/japanese/namazu2
 
 USE_RUBY=	yes
 USE_RUBY_EXTCONF=	yes
-USE_RUBY_RDTOOL=	yes
 
 INSTALL_TARGET=	site-install
 
-post-build:
-.if !defined(NOPORTDOCS)
-	cd ${WRKSRC}; ${RUBY_RD2} search-namazu.en.rd > search-namazu.en.html
-	cd ${WRKSRC}; ${RUBY_RD2} search-namazu.ja.rd > search-namazu.ja.html
-.endif
+RUBY_RD_FILES=	search-namazu.en.rd search-namazu.ja.rd
+DOCS_EN=	${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}
 
-post-install:
+post-install: doc-install
+
+.include <bsd.port.mk>
+
+doc-install:
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${RUBY_MODDOCDIR}/ja
-	${INSTALL_DATA} ${WRKSRC}/search-namazu.en.* ${RUBY_MODDOCDIR}/
-	${INSTALL_DATA} ${WRKSRC}/search-namazu.ja.* ${RUBY_MODDOCDIR}/ja/
+.for f in ${DOCS_EN}
+	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_MODDOCDIR}/
+.endfor
+.for f in ${DOCS_JA}
+	${INSTALL_SCRIPT} ${WRKSRC}/${f} ${RUBY_MODDOCDIR}/ja/
+.endfor
 .endif
-
-.include <bsd.port.mk>
diff --git a/databases/ruby-search-namazu/pkg-plist b/databases/ruby-search-namazu/pkg-plist
index 71d2b3d31dcd..43b26a4db2fc 100644
--- a/databases/ruby-search-namazu/pkg-plist
+++ b/databases/ruby-search-namazu/pkg-plist
@@ -1,8 +1,8 @@
 %%RUBY_SITEARCHLIBDIR%%/search/namazu.so
 @dirrm %%RUBY_SITEARCHLIBDIR%%/search
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/search-namazu.ja.html
+%%PORTDOCS%%%%RUBY_RD_HTML_FILES%%%%RUBY_MODDOCDIR%%/ja/search-namazu.ja.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/search-namazu.ja.rd
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/search-namazu.en.html
+%%PORTDOCS%%%%RUBY_RD_HTML_FILES%%%%RUBY_MODDOCDIR%%/search-namazu.en.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/search-namazu.en.rd
 %%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/ja
 %%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%
diff --git a/devel/ruby-bsearch/Makefile b/devel/ruby-bsearch/Makefile
index 5fc0539b517b..54b53110b4fe 100644
--- a/devel/ruby-bsearch/Makefile
+++ b/devel/ruby-bsearch/Makefile
@@ -16,21 +16,24 @@ DIST_SUBDIR=	ruby
 MAINTAINER=	knu@FreeBSD.org
 
 USE_RUBY=	yes
-USE_RUBY_RDTOOL=	yes
 
-DOCS_EN=	ChangeLog bsearch.en.html bsearch.en.rd
-DOCS_JA=	bsearch.ja.html bsearch.ja.rd
+NO_BUILD=	yes
 
-do-build:
-.if !defined(NOPORTDOCS)
-.for f in bsearch.en.rd bsearch.ja.rd
-	@cd ${WRKSRC}; \
-	${RUBY_RD2} ${f} > ${f:R}.html
-.endfor
-.endif
+RUBY_RD_FILES=	bsearch.en.rd bsearch.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}
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/bsearch.rb ${RUBY_SITELIBDIR}/
+
+post-install: doc-install
+
+.include <bsd.port.mk>
+
+doc-install:
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${RUBY_MODDOCDIR}/ja
 .for f in ${DOCS_EN}
@@ -40,5 +43,3 @@ do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/${f} ${RUBY_MODDOCDIR}/ja/
 .endfor
 .endif
-
-.include <bsd.port.mk>
diff --git a/devel/ruby-bsearch/pkg-plist b/devel/ruby-bsearch/pkg-plist
index 11b0c3c4dc9f..59b938ce76a9 100644
--- a/devel/ruby-bsearch/pkg-plist
+++ b/devel/ruby-bsearch/pkg-plist
@@ -1,8 +1,8 @@
 %%RUBY_SITELIBDIR%%/bsearch.rb
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ChangeLog
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/bsearch.en.html
+%%PORTDOCS%%%%RUBY_RD_HTML_FILES%%%%RUBY_MODDOCDIR%%/bsearch.en.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/bsearch.en.rd
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/bsearch.ja.html
+%%PORTDOCS%%%%RUBY_RD_HTML_FILES%%%%RUBY_MODDOCDIR%%/ja/bsearch.ja.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/bsearch.ja.rd
 %%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/ja
 %%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%
diff --git a/devel/ruby-cache/pkg-plist b/devel/ruby-cache/pkg-plist
index 512f6a0d6ebb..9eb2d90b0d0d 100644
--- a/devel/ruby-cache/pkg-plist
+++ b/devel/ruby-cache/pkg-plist
@@ -1,7 +1,7 @@
 %%RUBY_SITELIBDIR%%/cache.rb
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/MANUAL.html
+%%PORTDOCS%%%%RUBY_RD_HTML_FILES%%%%RUBY_MODDOCDIR%%/MANUAL.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/MANUAL.rd
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/README.html
+%%PORTDOCS%%%%RUBY_RD_HTML_FILES%%%%RUBY_MODDOCDIR%%/README.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/README.rd
 %%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/filecache.rb
diff --git a/devel/ruby-cvs/Makefile b/devel/ruby-cvs/Makefile
index 262ad66b8706..25b07fcd6b1f 100644
--- a/devel/ruby-cvs/Makefile
+++ b/devel/ruby-cvs/Makefile
@@ -19,23 +19,29 @@ MAINTAINER=	knu@FreeBSD.org
 RUN_DEPENDS=	${RUBY_SITEARCHLIBDIR}/flex.so:${PORTSDIR}/devel/ruby-flex_rb
 
 USE_RUBY=	yes
-USE_RUBY_RDTOOL=	yes
 
+NO_BUILD=	yes
+
+RUBY_RD_FILES=	cvs.rb diff.rb tempdir.rb
 RUBY_SHEBANG_FILES=	${WRKSRC}/viztree ${WRKSRC}/reviz/reviz
 
 WRKSRC=		${WRKDIR}/ruby-${PORTNAME}
 
-DOCS=	README TODO cvs.html diff.html tempdir.html
+DOCS=		README TODO ${RUBY_RD_HTML_FILES}
 
-do-build:
-.if !defined(NOPORTDOCS)
-	cd ${WRKSRC}; ${RUBY_RD2} lib/cvs.rb > cvs.html
-	cd ${WRKSRC}; ${RUBY_RD2} lib/diff.rb > diff.html
-	cd ${WRKSRC}; ${RUBY_RD2} lib/tempdir.rb > tempdir.html
-.endif
+post-extract:
+.for f in ${RUBY_RD_FILES}
+	cd ${WRKSRC}; ${LN} -sf lib/${f}
+.endfor
 
 do-install:
 	${CP} -R ${WRKSRC}/lib/* ${RUBY_SITELIBDIR}/
+
+post-install: doc-install
+
+.include <bsd.port.mk>
+
+doc-install:
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${RUBY_MODEXAMPLESDIR}/reviz
 	${INSTALL_DATA} ${WRKSRC}/viztree ${RUBY_MODEXAMPLESDIR}/
@@ -45,5 +51,3 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_MODDOCDIR}/
 .endfor
 .endif
-
-.include <bsd.port.mk>
diff --git a/devel/ruby-cvs/pkg-plist b/devel/ruby-cvs/pkg-plist
index c1c6ef1002d1..40128e4eb71e 100644
--- a/devel/ruby-cvs/pkg-plist
+++ b/devel/ruby-cvs/pkg-plist
@@ -34,7 +34,7 @@
 %%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/README
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/TODO
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/cvs.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/diff.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/tempdir.html
+%%PORTDOCS%%%%RUBY_RD_HTML_FILES%%%%RUBY_MODDOCDIR%%/cvs.html
+%%PORTDOCS%%%%RUBY_RD_HTML_FILES%%%%RUBY_MODDOCDIR%%/diff.html
+%%PORTDOCS%%%%RUBY_RD_HTML_FILES%%%%RUBY_MODDOCDIR%%/tempdir.html
 %%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%
diff --git a/devel/ruby-gemfinder/Makefile b/devel/ruby-gemfinder/Makefile
index ea799f98c3d1..db18572ab345 100644
--- a/devel/ruby-gemfinder/Makefile
+++ b/devel/ruby-gemfinder/Makefile
@@ -18,26 +18,31 @@ MAINTAINER=	knu@FreeBSD.org
 RUN_DEPENDS=	${RUBY_LIBDIR}/tk.rb:${PORTSDIR}/x11-toolkits/ruby-tk
 
 USE_RUBY=	yes
-USE_RUBY_RDTOOL=	yes
 
+NO_BUILD=	yes
+
+RUBY_RD_FILES=	gemfinder.rd
 RUBY_SHEBANG_FILES=	${WRKSRC}/gemfinder
 
-DOCS=		README		gemfinder.html	gemfinder.rd
+DOCS=		README \
+		${RUBY_RD_FILES} \
+		${RUBY_RD_HTML_FILES}
 
-do-build:
-.if !defined(NOPORTDOCS)
-	${RUBY_RD2} < ${WRKSRC}/gemfinder.rd \
-		| ${SED} -e 's/<BODY>/<body bgcolor="#ffffff">/' \
-		> ${WRKSRC}/gemfinder.html
-.endif
+post-patch:
+	${RUBY} -i -pe 'sub(/<BODY>/, "<BODY bgcolor=\"#ffffff\">")' \
+		${WRKSRC}/gemfinder.rd
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/gemfinder ${PREFIX}/bin/
+
+post-install: doc-install
+
+.include <bsd.port.mk>
+
+doc-install:
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${RUBY_MODDOCDIR}
 .for f in ${DOCS}
 	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_MODDOCDIR}/
 .endfor
 .endif
-
-.include <bsd.port.mk>
diff --git a/devel/ruby-gemfinder/pkg-plist b/devel/ruby-gemfinder/pkg-plist
index e2f84edb970e..532e66f668f3 100644
--- a/devel/ruby-gemfinder/pkg-plist
+++ b/devel/ruby-gemfinder/pkg-plist
@@ -1,5 +1,5 @@
 bin/gemfinder
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/README
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/gemfinder.html
+%%PORTDOCS%%%%RUBY_RD_HTML_FILES%%%%RUBY_MODDOCDIR%%/gemfinder.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/gemfinder.rd
 %%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%
diff --git a/devel/ruby-gettext/Makefile b/devel/ruby-gettext/Makefile
index f2e7bcf0ddda..a2512d611310 100644
--- a/devel/ruby-gettext/Makefile
+++ b/devel/ruby-gettext/Makefile
@@ -19,24 +19,24 @@ MAINTAINER=	knu@FreeBSD.org
 BUILD_DEPENDS=	msgfmt:${PORTSDIR}/devel/gettext
 
 USE_RUBY=	yes
-USE_RUBY_RDTOOL=	yes
 USE_RUBY_SETUP=	yes
 RUBY_SETUP=	install.rb
 
+RUBY_RD_FILES=	# defined
 RUBY_SHEBANG_FILES=	${WRKSRC}/samples/*.rb
 
-post-build:
+post-install: doc-install
+
+.include <bsd.port.mk>
+
+doc-install:
 .if !defined(NOPORTDOCS)
+.if !defined(RUBY_NO_RD_HTML)
 	cd ${WRKSRC}/docs; ${RUBY} makehtml.rb
-	cd ${WRKSRC}/samples; ${RUBY} makemo.rb
 .endif
-
-post-install:
-.if !defined(NOPORTDOCS)
+	cd ${WRKSRC}/samples; ${RUBY} makemo.rb
 	${MKDIR} ${RUBY_MODEXAMPLESDIR}
 	${CP} -R ${WRKSRC}/samples/* ${RUBY_MODEXAMPLESDIR}/
 	${MKDIR} ${RUBY_MODDOCDIR}
 	${CP} -R ${WRKSRC}/docs/* ${RUBY_MODDOCDIR}/
 .endif
-
-.include <bsd.port.mk>
diff --git a/devel/ruby-gettext/pkg-plist b/devel/ruby-gettext/pkg-plist
index 140b127da44a..5f2a7aeda4f7 100644
--- a/devel/ruby-gettext/pkg-plist
+++ b/devel/ruby-gettext/pkg-plist
@@ -45,8 +45,8 @@ share/locale/ja/LC_MESSAGES/rgettext.mo
 %%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/README
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/config.rb
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/html/en/ruby-gettext.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/html/ja/ruby-gettext.html
+%%PORTDOCS%%%%RUBY_RD_HTML_FILES%%%%RUBY_MODDOCDIR%%/html/en/ruby-gettext.html
+%%PORTDOCS%%%%RUBY_RD_HTML_FILES%%%%RUBY_MODDOCDIR%%/html/ja/ruby-gettext.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/html/style.css
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/makehtml.rb
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/rd/en/LANGUAGE
diff --git a/devel/ruby-mmap/Makefile b/devel/ruby-mmap/Makefile
index cf6b2271eb62..26d9acc95340 100644
--- a/devel/ruby-mmap/Makefile
+++ b/devel/ruby-mmap/Makefile
@@ -20,25 +20,30 @@ BUILD_DEPENDS=	rdoc:${PORTSDIR}/textproc/ruby-rdoc
 
 USE_RUBY=	yes
 USE_RUBY_EXTCONF=	yes
-USE_RUBY_RDTOOL=	yes
+
+RUBY_RD_FILES=	mmap.rd
 
 INSTALL_TARGET=	site-install
 
-DOCS=		Changes		README.en	mmap.html	mmap.rd	\
+DOCS=		Changes \
+		README.en \
+		${RUBY_RD_FILES} \
+		${RUBY_RD_HTML_FILES} \
 		docs/doc
 
 post-build:
 .if !defined(NOPORTDOCS)
-	cd ${WRKSRC}; ${RUBY_RD2} mmap.rd > mmap.html
-	cd ${WRKSRC}/docs; ${RUBY} b.rb mmap; rdoc mmap.rb
+	cd ${WRKSRC}/docs; ${RUBY} b.rb mmap; ${RUBY_RDOC} mmap.rb
 .endif
 
-post-install:
+post-install: doc-install
+
+.include <bsd.port.mk>
+
+doc-install:
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${RUBY_MODDOCDIR}
 .for f in ${DOCS}
 	${CP} -R ${WRKSRC}/${f} ${RUBY_MODDOCDIR}/
 .endfor
 .endif
-
-.include <bsd.port.mk>
diff --git a/devel/ruby-mmap/pkg-plist b/devel/ruby-mmap/pkg-plist
index 01f7113ef980..f174228f331e 100644
--- a/devel/ruby-mmap/pkg-plist
+++ b/devel/ruby-mmap/pkg-plist
@@ -1,7 +1,7 @@
 %%RUBY_SITEARCHLIBDIR%%/mmap.so
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/Changes
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/README.en
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/mmap.html
+%%PORTDOCS%%%%RUBY_RD_HTML_FILES%%%%RUBY_MODDOCDIR%%/mmap.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/mmap.rd
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Mmap.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Mmap.src/M000001.html
diff --git a/devel/ruby-sdl/Makefile b/devel/ruby-sdl/Makefile
index 9e19496fba7d..29ed31e2b35b 100644
--- a/devel/ruby-sdl/Makefile
+++ b/devel/ruby-sdl/Makefile
@@ -26,7 +26,6 @@ RUBY_OPENGL_WRKSRC_CMD=	cd ${RUBY_OPENGL_PORTDIR}; ${MAKE} -V WRKSRC
 
 USE_RUBY=	yes
 USE_RUBY_EXTCONF=	yes
-USE_RUBY_RDTOOL=	yes
 RUBY_WITH_PTHREAD=	yes
 
 CONFIGURE_ARGS=	--with-sdl-config="sdl11-config" \
@@ -34,13 +33,15 @@ CONFIGURE_ARGS=	--with-sdl-config="sdl11-config" \
 		--with-x11-dir="${X11BASE}"
 INSTALL_TARGET=	site-install
 
-RD_DOCS_EN=	rubysdl_doc.en.rd
-RD_DOCS_JA=	rubysdl_doc.rd
+RUBY_RD_FILES=	rubysdl_doc.en.rd \
+		rubysdl_doc.rd
 
 DOCS_EN=	NEWS.en README.en rubysdl_const_list.txt \
-		${RD_DOCS_EN} ${RD_DOCS_EN:S/.rd$/.html/}
+		${RUBY_RD_FILES:M*.en.rd} \
+		${RUBY_RD_HTML_FILES:M*.en.html}
 DOCS_JA=	NEWS.ja README.ja \
-		${RD_DOCS_JA} ${RD_DOCS_JA:S/.rd$/.html/}
+		${RUBY_RD_FILES:N*.en.rd} \
+		${RUBY_RD_HTML_FILES:N*.en.html}
 
 post-extract:
 	dir=`${RUBY_OPENGL_WRKSRC_CMD}`; \
@@ -52,14 +53,11 @@ post-patch:
 	${RUBY} -i -pe '/require \x27mkmf\x27/ and $$_ += "dir_config(\x27x11\x27)\n"' \
 		${WRKSRC}/${RUBY_EXTCONF}
 
-post-build:
-.if !defined(NOPORTDOCS)
-.for f in ${RD_DOCS_EN} ${RD_DOCS_JA}
-	@cd ${WRKSRC}; ${RUBY_RD2} ${f} > ${f:S/.rd$/.html/}
-.endfor
-.endif
+post-install: doc-install
 
-post-install:
+.include <bsd.port.mk>
+
+doc-install:
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${RUBY_MODEXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/sample/* ${RUBY_MODEXAMPLESDIR}/
@@ -71,5 +69,3 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_MODDOCDIR}/ja/
 .endfor
 .endif
-
-.include <bsd.port.mk>
diff --git a/devel/ruby-sdl/pkg-plist b/devel/ruby-sdl/pkg-plist
index a520a6794b8d..bd227cb50f53 100644
--- a/devel/ruby-sdl/pkg-plist
+++ b/devel/ruby-sdl/pkg-plist
@@ -25,11 +25,11 @@
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/NEWS.en
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/README.en
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/rubysdl_const_list.txt
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/rubysdl_doc.en.html
+%%PORTDOCS%%%%RUBY_RD_HTML_FILES%%%%RUBY_MODDOCDIR%%/rubysdl_doc.en.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/rubysdl_doc.en.rd
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/NEWS.ja
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/README.ja
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/rubysdl_doc.html
+%%PORTDOCS%%%%RUBY_RD_HTML_FILES%%%%RUBY_MODDOCDIR%%/ja/rubysdl_doc.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/rubysdl_doc.rd
 %%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/ja
 %%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%
diff --git a/devel/ruby-sysvipc/Makefile b/devel/ruby-sysvipc/Makefile
index 7a04e3550dcd..0de531392ca0 100644
--- a/devel/ruby-sysvipc/Makefile
+++ b/devel/ruby-sysvipc/Makefile
@@ -17,23 +17,22 @@ MAINTAINER=	knu@FreeBSD.org
 
 USE_RUBY=	yes
 USE_RUBY_EXTCONF=	yes
-USE_RUBY_RDTOOL=	yes
+
+RUBY_RD_FILES=	sysvipc.rd
 
 INSTALL_TARGET=	site-install
 
-DOCS=		sysvipc.html	sysvipc.rd
+DOCS=		${RUBY_RD_FILES} \
+		${RUBY_RD_HTML_FILES}
 
-post-build:
-.if !defined(NOPORTDOCS)
-	cd ${WRKSRC}; ${RUBY_RD2} sysvipc.rd > sysvipc.html
-.endif
+post-install: doc-install
 
-post-install:
+.include <bsd.port.mk>
+
+doc-install:
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${RUBY_MODDOCDIR}
 .for f in ${DOCS}
 	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_MODDOCDIR}/
 .endfor
 .endif
-
-.include <bsd.port.mk>
diff --git a/devel/ruby-sysvipc/pkg-plist b/devel/ruby-sysvipc/pkg-plist
index 9d34e6c50276..bebe68c29105 100644
--- a/devel/ruby-sysvipc/pkg-plist
+++ b/devel/ruby-sysvipc/pkg-plist
@@ -1,4 +1,4 @@
 %%RUBY_SITEARCHLIBDIR%%/sysvipc.so
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/sysvipc.html
+%%PORTDOCS%%%%RUBY_RD_HTML_FILES%%%%RUBY_MODDOCDIR%%/sysvipc.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/sysvipc.rd
 %%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%
diff --git a/devel/ruby-tzfile/Makefile b/devel/ruby-tzfile/Makefile
index fc5ce7c27c5c..a80383f9c7d7 100644
--- a/devel/ruby-tzfile/Makefile
+++ b/devel/ruby-tzfile/Makefile
@@ -16,20 +16,26 @@ DIST_SUBDIR=	ruby
 MAINTAINER=	knu@FreeBSD.org
 
 USE_RUBY=	yes
-USE_RUBY_RDTOOL=	yes
+
+NO_BUILD=	yes
+
+RUBY_RD_FILES=	tzfile.rb
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
-do-build:
-.if !defined(NOPORTDOCS)
-	cd ${WRKSRC}; ${RUBY_RD2} tzfile.rb > tzfile.html
-.endif
+DOCS=		${RUBY_RD_HTML_FILES}
 
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/tzfile.rb ${RUBY_SITELIBDIR}/
+
+post-install: doc-install
+
+.include <bsd.port.mk>
+
+doc-install:
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${RUBY_MODDOCDIR}
-	${INSTALL_DATA} ${WRKSRC}/tzfile.html ${RUBY_MODDOCDIR}/
+.for f in ${DOCS}
+	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_MODDOCDIR}/
+.endfor
 .endif
-
-.include <bsd.port.mk>
diff --git a/devel/ruby-tzfile/pkg-plist b/devel/ruby-tzfile/pkg-plist
index d95efc9d09aa..5addbb35da97 100644
--- a/devel/ruby-tzfile/pkg-plist
+++ b/devel/ruby-tzfile/pkg-plist
@@ -1,3 +1,3 @@
 %%RUBY_SITELIBDIR%%/tzfile.rb
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/tzfile.html
+%%PORTDOCS%%%%RUBY_RD_HTML_FILES%%%%RUBY_MODDOCDIR%%/tzfile.html
 %%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%
diff --git a/devel/ruby-unit/Makefile b/devel/ruby-unit/Makefile
index c734d1c49d62..423afe2fc04e 100644
--- a/devel/ruby-unit/Makefile
+++ b/devel/ruby-unit/Makefile
@@ -16,10 +16,12 @@ DIST_SUBDIR=	ruby
 MAINTAINER=	knu@FreeBSD.org
 
 USE_RUBY=	yes
-USE_RUBY_RDTOOL=	yes
+
+NO_BUILD=	yes
 
 RUBY_MODNAME=	runit
 
+RUBY_RD_FILES=	# defined
 RUBY_SHEBANG_FILES=	${WRKSRC}/bin/c2t.rb	\
 			${WRKSRC}/bin/runtest.rb
 
@@ -27,19 +29,21 @@ BINS=		c2t		runtest
 DOCS=		ChangeLog	README		ToDo
 DOCS_JA=	README.ja
 
-do-build:
-.if !defined(NOPORTDOCS)
-	@cd ${WRKSRC}; \
-	${SETENV} ${MAKE_ENV} ${RUBY} makehtml.rb
-.endif
-
 do-install:
-	@cd ${WRKSRC}; \
-	${SETENV} ${MAKE_ENV} ${RUBY} install.rb
+	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${RUBY} install.rb
 .for f in ${BINS}
 	${LN} -sf ${f}.rb ${PREFIX}/bin/${f}
 .endfor
+
+post-install: doc-install
+
+.include <bsd.port.mk>
+
+doc-install:
 .if !defined(NOPORTDOCS)
+.if !defined(RUBY_NO_RD_HTML)
+	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${RUBY} makehtml.rb
+.endif
 	${MKDIR} ${RUBY_MODEXAMPLESDIR}
 	${CP} -R ${WRKSRC}/sample/ ${RUBY_MODEXAMPLESDIR}/
 	${MKDIR} ${RUBY_MODDOCDIR}/ja
@@ -52,5 +56,3 @@ do-install:
 	${CP} -R ${WRKSRC}/doc_en/ ${RUBY_MODDOCDIR}/
 	${CP} -R ${WRKSRC}/doc_ja/ ${RUBY_MODDOCDIR}/ja/
 .endif
-
-.include <bsd.port.mk>
diff --git a/devel/ruby-unit/pkg-plist b/devel/ruby-unit/pkg-plist
index 35c1f8aeeb86..05e59411044a 100644
--- a/devel/ruby-unit/pkg-plist
+++ b/devel/ruby-unit/pkg-plist
@@ -33,66 +33,66 @@ bin/runtest.rb
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ChangeLog
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/README
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ToDo
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/assert.html
+%%PORTDOCS%%%%RUBY_RD_HTML_FILES%%%%RUBY_MODDOCDIR%%/assert.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/assert.rd
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/error.html
+%%PORTDOCS%%%%RUBY_RD_HTML_FILES%%%%RUBY_MODDOCDIR%%/error.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/error.rd
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/index.html
+%%PORTDOCS%%%%RUBY_RD_HTML_FILES%%%%RUBY_MODDOCDIR%%/index.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/index.rd
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/README.ja
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/assert.html
+%%PORTDOCS%%%%RUBY_RD_HTML_FILES%%%%RUBY_MODDOCDIR%%/ja/assert.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/assert.rd
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/error.html
+%%PORTDOCS%%%%RUBY_RD_HTML_FILES%%%%RUBY_MODDOCDIR%%/ja/error.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/error.rd
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/index.html
+%%PORTDOCS%%%%RUBY_RD_HTML_FILES%%%%RUBY_MODDOCDIR%%/ja/index.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/index.rd
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/repeatedtest.html
+%%PORTDOCS%%%%RUBY_RD_HTML_FILES%%%%RUBY_MODDOCDIR%%/ja/repeatedtest.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/repeatedtest.rd
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/robserver.html
+%%PORTDOCS%%%%RUBY_RD_HTML_FILES%%%%RUBY_MODDOCDIR%%/ja/robserver.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/robserver.rd
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/setuppable.html
+%%PORTDOCS%%%%RUBY_RD_HTML_FILES%%%%RUBY_MODDOCDIR%%/ja/setuppable.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/setuppable.rd
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/teardownable.html
+%%PORTDOCS%%%%RUBY_RD_HTML_FILES%%%%RUBY_MODDOCDIR%%/ja/teardownable.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/teardownable.rd
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/testcase.html
+%%PORTDOCS%%%%RUBY_RD_HTML_FILES%%%%RUBY_MODDOCDIR%%/ja/testcase.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/testcase.rd
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/testdecorator.html
+%%PORTDOCS%%%%RUBY_RD_HTML_FILES%%%%RUBY_MODDOCDIR%%/ja/testdecorator.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/testdecorator.rd
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/testfailure.html
+%%PORTDOCS%%%%RUBY_RD_HTML_FILES%%%%RUBY_MODDOCDIR%%/ja/testfailure.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/testfailure.rd
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/testresult.html
+%%PORTDOCS%%%%RUBY_RD_HTML_FILES%%%%RUBY_MODDOCDIR%%/ja/testresult.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/testresult.rd
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/testrunner.html
+%%PORTDOCS%%%%RUBY_RD_HTML_FILES%%%%RUBY_MODDOCDIR%%/ja/testrunner.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/testrunner.rd
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/testsetup.html
+%%PORTDOCS%%%%RUBY_RD_HTML_FILES%%%%RUBY_MODDOCDIR%%/ja/testsetup.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/testsetup.rd
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/testsuite.html
+%%PORTDOCS%%%%RUBY_RD_HTML_FILES%%%%RUBY_MODDOCDIR%%/ja/testsuite.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/testsuite.rd
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/version.html
+%%PORTDOCS%%%%RUBY_RD_HTML_FILES%%%%RUBY_MODDOCDIR%%/ja/version.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/version.rd
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/repeatedtest.html
+%%PORTDOCS%%%%RUBY_RD_HTML_FILES%%%%RUBY_MODDOCDIR%%/repeatedtest.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/repeatedtest.rd
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/robserver.html
+%%PORTDOCS%%%%RUBY_RD_HTML_FILES%%%%RUBY_MODDOCDIR%%/robserver.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/robserver.rd
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/setuppable.html
+%%PORTDOCS%%%%RUBY_RD_HTML_FILES%%%%RUBY_MODDOCDIR%%/setuppable.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/setuppable.rd
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/teardownable.html
+%%PORTDOCS%%%%RUBY_RD_HTML_FILES%%%%RUBY_MODDOCDIR%%/teardownable.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/teardownable.rd
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/testcase.html
+%%PORTDOCS%%%%RUBY_RD_HTML_FILES%%%%RUBY_MODDOCDIR%%/testcase.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/testcase.rd
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/testdecorator.html
+%%PORTDOCS%%%%RUBY_RD_HTML_FILES%%%%RUBY_MODDOCDIR%%/testdecorator.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/testdecorator.rd
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/testfailure.html
+%%PORTDOCS%%%%RUBY_RD_HTML_FILES%%%%RUBY_MODDOCDIR%%/testfailure.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/testfailure.rd
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/testresult.html
+%%PORTDOCS%%%%RUBY_RD_HTML_FILES%%%%RUBY_MODDOCDIR%%/testresult.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/testresult.rd
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/testrunner.html
+%%PORTDOCS%%%%RUBY_RD_HTML_FILES%%%%RUBY_MODDOCDIR%%/testrunner.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/testrunner.rd
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/testsetup.html
+%%PORTDOCS%%%%RUBY_RD_HTML_FILES%%%%RUBY_MODDOCDIR%%/testsetup.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/testsetup.rd
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/testsuite.html
+%%PORTDOCS%%%%RUBY_RD_HTML_FILES%%%%RUBY_MODDOCDIR%%/testsuite.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/testsuite.rd
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/version.html
+%%PORTDOCS%%%%RUBY_RD_HTML_FILES%%%%RUBY_MODDOCDIR%%/version.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/version.rd
 %%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/ja
 %%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%
diff --git a/devel/rubygem-gettext/Makefile b/devel/rubygem-gettext/Makefile
index f2e7bcf0ddda..a2512d611310 100644
--- a/devel/rubygem-gettext/Makefile
+++ b/devel/rubygem-gettext/Makefile
@@ -19,24 +19,24 @@ MAINTAINER=	knu@FreeBSD.org
 BUILD_DEPENDS=	msgfmt:${PORTSDIR}/devel/gettext
 
 USE_RUBY=	yes
-USE_RUBY_RDTOOL=	yes
 USE_RUBY_SETUP=	yes
 RUBY_SETUP=	install.rb
 
+RUBY_RD_FILES=	# defined
 RUBY_SHEBANG_FILES=	${WRKSRC}/samples/*.rb
 
-post-build:
+post-install: doc-install
+
+.include <bsd.port.mk>
+
+doc-install:
 .if !defined(NOPORTDOCS)
+.if !defined(RUBY_NO_RD_HTML)
 	cd ${WRKSRC}/docs; ${RUBY} makehtml.rb
-	cd ${WRKSRC}/samples; ${RUBY} makemo.rb
 .endif
-
-post-install:
-.if !defined(NOPORTDOCS)
+	cd ${WRKSRC}/samples; ${RUBY} makemo.rb
 	${MKDIR} ${RUBY_MODEXAMPLESDIR}
 	${CP} -R ${WRKSRC}/samples/* ${RUBY_MODEXAMPLESDIR}/
 	${MKDIR} ${RUBY_MODDOCDIR}
 	${CP} -R ${WRKSRC}/docs/* ${RUBY_MODDOCDIR}/
 .endif
-
-.include <bsd.port.mk>
diff --git a/devel/rubygem-gettext/pkg-plist b/devel/rubygem-gettext/pkg-plist
index 140b127da44a..5f2a7aeda4f7 100644
--- a/devel/rubygem-gettext/pkg-plist
+++ b/devel/rubygem-gettext/pkg-plist
@@ -45,8 +45,8 @@ share/locale/ja/LC_MESSAGES/rgettext.mo
 %%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/README
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/config.rb
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/html/en/ruby-gettext.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/html/ja/ruby-gettext.html
+%%PORTDOCS%%%%RUBY_RD_HTML_FILES%%%%RUBY_MODDOCDIR%%/html/en/ruby-gettext.html
+%%PORTDOCS%%%%RUBY_RD_HTML_FILES%%%%RUBY_MODDOCDIR%%/html/ja/ruby-gettext.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/html/style.css
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/makehtml.rb
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/rd/en/LANGUAGE
diff --git a/devel/rubygem-locale/Makefile b/devel/rubygem-locale/Makefile
index f2e7bcf0ddda..a2512d611310 100644
--- a/devel/rubygem-locale/Makefile
+++ b/devel/rubygem-locale/Makefile
@@ -19,24 +19,24 @@ MAINTAINER=	knu@FreeBSD.org
 BUILD_DEPENDS=	msgfmt:${PORTSDIR}/devel/gettext
 
 USE_RUBY=	yes
-USE_RUBY_RDTOOL=	yes
 USE_RUBY_SETUP=	yes
 RUBY_SETUP=	install.rb
 
+RUBY_RD_FILES=	# defined
 RUBY_SHEBANG_FILES=	${WRKSRC}/samples/*.rb
 
-post-build:
+post-install: doc-install
+
+.include <bsd.port.mk>
+
+doc-install:
 .if !defined(NOPORTDOCS)
+.if !defined(RUBY_NO_RD_HTML)
 	cd ${WRKSRC}/docs; ${RUBY} makehtml.rb
-	cd ${WRKSRC}/samples; ${RUBY} makemo.rb
 .endif
-
-post-install:
-.if !defined(NOPORTDOCS)
+	cd ${WRKSRC}/samples; ${RUBY} makemo.rb
 	${MKDIR} ${RUBY_MODEXAMPLESDIR}
 	${CP} -R ${WRKSRC}/samples/* ${RUBY_MODEXAMPLESDIR}/
 	${MKDIR} ${RUBY_MODDOCDIR}
 	${CP} -R ${WRKSRC}/docs/* ${RUBY_MODDOCDIR}/
 .endif
-
-.include <bsd.port.mk>
diff --git a/devel/rubygem-locale/pkg-plist b/devel/rubygem-locale/pkg-plist
index 140b127da44a..5f2a7aeda4f7 100644
--- a/devel/rubygem-locale/pkg-plist
+++ b/devel/rubygem-locale/pkg-plist
@@ -45,8 +45,8 @@ share/locale/ja/LC_MESSAGES/rgettext.mo
 %%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/README
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/config.rb
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/html/en/ruby-gettext.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/html/ja/ruby-gettext.html
+%%PORTDOCS%%%%RUBY_RD_HTML_FILES%%%%RUBY_MODDOCDIR%%/html/en/ruby-gettext.html
+%%PORTDOCS%%%%RUBY_RD_HTML_FILES%%%%RUBY_MODDOCDIR%%/html/ja/ruby-gettext.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/html/style.css
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/makehtml.rb
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/rd/en/LANGUAGE
diff --git a/graphics/ruby-evas/Makefile b/graphics/ruby-evas/Makefile
index f627917b13f5..78e85cd03302 100644
--- a/graphics/ruby-evas/Makefile
+++ b/graphics/ruby-evas/Makefile
@@ -19,22 +19,25 @@ LIB_DEPENDS=	evas.6:${PORTSDIR}/graphics/evas
 
 USE_RUBY=	yes
 USE_RUBY_EXTCONF=	yes
-USE_RUBY_RDTOOL=	yes
+
+RUBY_RD_FILES=	# defined
 
 CONFIGURE_WRKSRC=	${WRKSRC}/src
 BUILD_WRKSRC=	${CONFIGURE_WRKSRC}
 INSTALL_WRKSRC=	${BUILD_WRKSRC}
 INSTALL_TARGET=	site-install
 
-DOCS=		README doc/evas.rd doc/evas.html
+DOCS=		README doc/evas.*
+
+post-install: doc-install
+
+.include <bsd.port.mk>
 
-post-build:
+doc-install:
 .if !defined(NOPORTDOCS)
+.if !defined(RUBY_NO_RD_HTML)
 	cd ${WRKSRC}/doc; ${MAKE}
 .endif
-
-post-install:
-.if !defined(NOPORTDOCS)
 	${MKDIR} ${RUBY_MODEXAMPLESDIR}
 	${CP} -R ${WRKSRC}/tests/* ${RUBY_MODEXAMPLESDIR}/
 	${MKDIR} ${RUBY_MODDOCDIR}
@@ -42,5 +45,3 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_MODDOCDIR}/
 .endfor
 .endif
-
-.include <bsd.port.mk>
diff --git a/graphics/ruby-evas/pkg-plist b/graphics/ruby-evas/pkg-plist
index 6d1605225e34..ea641fbcff11 100644
--- a/graphics/ruby-evas/pkg-plist
+++ b/graphics/ruby-evas/pkg-plist
@@ -9,6 +9,6 @@
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/nonblock.rb
 %%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/README
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/evas.html
+%%PORTDOCS%%%%RUBY_RD_HTML_FILES%%%%RUBY_MODDOCDIR%%/evas.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/evas.rd
 %%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%
diff --git a/graphics/ruby-image_size/Makefile b/graphics/ruby-image_size/Makefile
index 9e53d1bff802..23936a69d29c 100644
--- a/graphics/ruby-image_size/Makefile
+++ b/graphics/ruby-image_size/Makefile
@@ -17,31 +17,31 @@ DIST_SUBDIR=	ruby
 MAINTAINER=	knu@FreeBSD.org
 
 USE_RUBY=	yes
-USE_RUBY_RDTOOL=	yes
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
-DOCS=		readme.en.html
-DOCS_JA=	readme.ja.rd readme.ja.html
+NO_BUILD=	yes
 
-do-build:
-.if !defined(NOPORTDOCS)
-	@cd ${WRKSRC}; \
-	${RUBY_RD2} image_size.rb > readme.en.html
-	@cd ${WRKSRC}; \
-	${RUBY_RD2} readme.ja.rd > readme.ja.html
-.endif
+RUBY_RD_FILES=	image_size.rb readme.ja.rd
+
+DOCS_EN=	${RUBY_RD_HTML_FILES:N*.ja.html}
+DOCS_JA=	${RUBY_RD_FILES:M*.ja.rd} \
+		${RUBY_RD_HTML_FILES:M*.ja.html}
 
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/image_size.rb ${RUBY_SITELIBDIR}/
+
+post-install: doc-install
+
+.include <bsd.port.mk>
+
+doc-install:
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${RUBY_MODDOCDIR}/ja
-.for f in ${DOCS}
+.for f in ${DOCS_EN}
 	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_MODDOCDIR}/
 .endfor
 .for f in ${DOCS_JA}
 	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_MODDOCDIR}/ja/
 .endfor
 .endif
-
-.include <bsd.port.mk>
diff --git a/graphics/ruby-image_size/pkg-plist b/graphics/ruby-image_size/pkg-plist
index bd050d2bd058..27c45616a960 100644
--- a/graphics/ruby-image_size/pkg-plist
+++ b/graphics/ruby-image_size/pkg-plist
@@ -1,6 +1,6 @@
 %%RUBY_SITELIBDIR%%/image_size.rb
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/readme.en.html
+%%PORTDOCS%%%%RUBY_RD_HTML_FILES%%%%RUBY_MODDOCDIR%%/image_size.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/readme.ja.rd
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/readme.ja.html
+%%PORTDOCS%%%%RUBY_RD_HTML_FILES%%%%RUBY_MODDOCDIR%%/ja/readme.ja.html
 %%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/ja
 %%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%
diff --git a/graphics/ruby-libexif/Makefile b/graphics/ruby-libexif/Makefile
index 749125c3ec27..37f7e7109087 100644
--- a/graphics/ruby-libexif/Makefile
+++ b/graphics/ruby-libexif/Makefile
@@ -19,21 +19,22 @@ LIB_DEPENDS=	exif.8:${PORTSDIR}/graphics/libexif
 
 USE_RUBY=	yes
 USE_RUBY_EXTCONF=	yes
-USE_RUBY_RDTOOL=	yes
 
 INSTALL_TARGET=	site-install
 
-DOCS_EN=	ChangeLog	README	exif.rd.en	exif.en.html
-DOCS_JA=				exif.rd.ja	exif.ja.html
+RUBY_RD_FILES=	exif.rd.en	exif.rd.ja
 
-.if !defined(NOPORTDOCS)
-post-build:
-.for lang in en ja
-	cd ${WRKSRC}; ${RUBY_RD2} exif.rd.${lang} > exif.${lang}.html
-.endfor
-.endif
+DOCS_EN=	ChangeLog	README \
+		${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}
+
+post-install: doc-install
 
-post-install:
+.include <bsd.port.mk>
+
+doc-install:
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${RUBY_MODDOCDIR}/ja
 .for f in ${DOCS_EN}
@@ -43,5 +44,3 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_MODDOCDIR}/ja/
 .endfor
 .endif
-
-.include <bsd.port.mk>
diff --git a/graphics/ruby-libexif/pkg-plist b/graphics/ruby-libexif/pkg-plist
index 81df550ac323..9dbc0195c4f6 100644
--- a/graphics/ruby-libexif/pkg-plist
+++ b/graphics/ruby-libexif/pkg-plist
@@ -1,9 +1,9 @@
 %%RUBY_SITEARCHLIBDIR%%/exif.so
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/exif.ja.html
+%%PORTDOCS%%%%RUBY_RD_HTML_FILES%%%%RUBY_MODDOCDIR%%/ja/exif.ja.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/exif.rd.ja
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ChangeLog
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/README
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/exif.en.html
+%%PORTDOCS%%%%RUBY_RD_HTML_FILES%%%%RUBY_MODDOCDIR%%/exif.en.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/exif.rd.en
 %%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/ja
 %%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%
diff --git a/graphics/ruby-libpng/Makefile b/graphics/ruby-libpng/Makefile
index 285a51d6bfad..45f699ae638b 100644
--- a/graphics/ruby-libpng/Makefile
+++ b/graphics/ruby-libpng/Makefile
@@ -22,23 +22,24 @@ LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png
 
 USE_RUBY=	yes
 USE_RUBY_EXTCONF=	yes
-USE_RUBY_RDTOOL=	yes
 
 INSTALL_TARGET=	site-install
 
-DOCS_JA=	readme.ja.html	readme.ja.rd	readme.ja.txt
+RUBY_RD_FILES=	readme.ja.rd
+
+DOCS_JA=	readme.ja.txt \
+		${RUBY_RD_FILES} \
+		${RUBY_RD_HTML_FILES}
 EXAMPLES_EN=	es.png		png.rb		pngtest.rb	pngtest.sh	\
 		sample/0.png	sample/1.png	sample/2.png	sample/3.png	\
 		sample/4.png	sample/5.png	sample/6.png	sample/7.png	\
 		sample/8.png	sample/9.png	sample/pngcat.rb
 
-.if !defined(NOPORTDOCS)
-post-build:
-	@cd ${WRKSRC}; \
-	${RUBY_RD2} readme.ja.rd > readme.ja.html
-.endif
+post-install: doc-install
 
-post-install:
+.include <bsd.port.mk>
+
+doc-install:
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${RUBY_MODEXAMPLESDIR}
 .for f in ${EXAMPLES_EN}
@@ -49,5 +50,3 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_MODDOCDIR}/ja/
 .endfor
 .endif
-
-.include <bsd.port.mk>
diff --git a/graphics/ruby-libpng/pkg-plist b/graphics/ruby-libpng/pkg-plist
index 66bc90e9ab12..3ddabeb36bb4 100644
--- a/graphics/ruby-libpng/pkg-plist
+++ b/graphics/ruby-libpng/pkg-plist
@@ -15,7 +15,7 @@
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/9.png
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/pngcat.rb
 %%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/readme.ja.html
+%%PORTDOCS%%%%RUBY_RD_HTML_FILES%%%%RUBY_MODDOCDIR%%/ja/readme.ja.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/readme.ja.rd
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/readme.ja.txt
 %%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/ja
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%%
diff --git a/net/ruby-drb/Makefile b/net/ruby-drb/Makefile
index 9a42b37197b4..2706f3e3df37 100644
--- a/net/ruby-drb/Makefile
+++ b/net/ruby-drb/Makefile
@@ -18,42 +18,30 @@ MAINTAINER=	knu@FreeBSD.org
 RUN_DEPENDS=	${RUBY_SITELIBDIR}/acl.rb:${PORTSDIR}/security/ruby-acl
 
 USE_RUBY=	yes
-USE_RUBY_RDTOOL=	yes
+
+NO_BUILD=	yes
+
+RUBY_RD_FILES=	doc/*.rd doc/ja/*.rd.ja
 
 post-extract:
 	${MKDIR} ${WRKSRC}/acl/doc ${WRKSRC}/acl/lib ${WRKSRC}/acl/runit
 	cd ${WRKSRC}; for f in */acl*; do ${MV} $$f ${WRKSRC}/acl/$$f; done
 	${MKDIR} ${WRKSRC}/sample/ja
 	${MV} ${WRKSRC}/sample/*.ja ${WRKSRC}/sample/ja/
-
-post-patch:
-.if !defined(NOPORTDOCS)
-	cd ${WRKSRC}/doc; for f in drb-ref.rd*; do \
-		${MV} $$f $$f.orig; \
-		( ${ECHO_CMD} '=begin'; ${CAT} $$f.orig; ${ECHO_CMD} '=end' ) > $$f; \
-		${RM} $$f.orig; \
-	done
-.endif
-
-do-build:
-.if !defined(NOPORTDOCS)
-	cd ${WRKSRC}/doc; for f in *.rd; do \
-		${RUBY_RD2} $$f > `${ECHO_CMD} $$f | ${SED} 's/\.rd$$/.html/'`; \
-	done
-	cd ${WRKSRC}/doc; for f in *.rd.ja; do \
-		${RUBY_RD2} $$f > `${ECHO_CMD} $$f | ${SED} 's/\.rd.ja$$/.ja.html/'`; \
-	done
 	${MKDIR} ${WRKSRC}/doc/ja
-	cd ${WRKSRC}/doc; ${MV} *.rd.ja *.ja.html ja/
-.endif
+	${MV} ${WRKSRC}/doc/*.ja ${WRKSRC}/doc/ja/
 
 do-install:
 	${CP} -R ${WRKSRC}/lib/* ${RUBY_SITELIBDIR}/
+
+post-install: doc-install
+
+.include <bsd.port.mk>
+
+doc-install:
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${RUBY_MODEXAMPLESDIR}
 	${CP} -R ${WRKSRC}/sample/* ${RUBY_MODEXAMPLESDIR}/
-	${MKDIR} ${RUBY_MODDOCDIR}/ja
+	${MKDIR} ${RUBY_MODDOCDIR}
 	${CP} -R ${WRKSRC}/doc/* ${RUBY_MODDOCDIR}/
 .endif
-
-.include <bsd.port.mk>
diff --git a/net/ruby-drb/pkg-plist b/net/ruby-drb/pkg-plist
index 055a6f5bb85c..cae66c8f021d 100644
--- a/net/ruby-drb/pkg-plist
+++ b/net/ruby-drb/pkg-plist
@@ -45,18 +45,18 @@
 %%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%/ja
 %%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/changelog.rd
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/changelog.html
+%%PORTDOCS%%%%RUBY_RD_HTML_FILES%%%%RUBY_MODDOCDIR%%/changelog.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/drb-ref.rd
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/drb-ref.html
+%%PORTDOCS%%%%RUBY_RD_HTML_FILES%%%%RUBY_MODDOCDIR%%/drb-ref.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/security.rd
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/security.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/drb-ref.ja.html
+%%PORTDOCS%%%%RUBY_RD_HTML_FILES%%%%RUBY_MODDOCDIR%%/security.html
+%%PORTDOCS%%%%RUBY_RD_HTML_FILES%%%%RUBY_MODDOCDIR%%/ja/drb-ref.ja.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/drb-ref.rd.ja
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/mutexm.ja.html
+%%PORTDOCS%%%%RUBY_RD_HTML_FILES%%%%RUBY_MODDOCDIR%%/ja/mutexm.ja.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/mutexm.rd.ja
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/security.ja.html
+%%PORTDOCS%%%%RUBY_RD_HTML_FILES%%%%RUBY_MODDOCDIR%%/ja/security.ja.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/security.rd.ja
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/tuplespace-ref.ja.html
+%%PORTDOCS%%%%RUBY_RD_HTML_FILES%%%%RUBY_MODDOCDIR%%/ja/tuplespace-ref.ja.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/tuplespace-ref.rd.ja
 %%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/ja
 %%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%
diff --git a/print/ruby-pdflib/Makefile b/print/ruby-pdflib/Makefile
index 1655da5e68ab..59a8a344de99 100644
--- a/print/ruby-pdflib/Makefile
+++ b/print/ruby-pdflib/Makefile
@@ -22,30 +22,28 @@ LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 
 USE_RUBY=	yes
 USE_RUBY_EXTCONF=	yes
-USE_RUBY_RDTOOL=	yes
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 INSTALL_TARGET=	site-install
 
+RUBY_RD_FILES=	pdflib-api.rd pdflib-api-jp.rd
+
 DOCS_EN=	ChangeLog	README \
-		${RD_DOCS_EN}	${RD_DOCS_EN:S/.rd/.html/}
+		${RUBY_RD_FILES:N*-jp.rd} \
+		${RUBY_RD_HTML_FILES:N*-jp.html}
 DOCS_JA=	ChangeLog.jp	README.jp \
-		${RD_DOCS_JA}	${RD_DOCS_JA:S/.rd/.html/}
-RD_DOCS_EN=	pdflib-api.rd
-RD_DOCS_JA=	pdflib-api-jp.rd
+		${RUBY_RD_FILES:M*-jp.rd} \
+		${RUBY_RD_HTML_FILES:M*-jp.html}
+
 EXAMPLES_EN=	hello.rb	pdfclock.rb	pdfgraph.rb \
 		pdfimage.rb	text2pdf.rb
 EXAMPLES_JA=	jtext2pdf.rb
 
-post-build:
-.if !defined(NOPORTDOCS)
-.for f in ${RD_DOCS_EN} ${RD_DOCS_JA}
-	cd ${WRKSRC}; \
-	${RUBY_RD2} ${f} > ${f:S/.rd/.html/}
-.endfor
-.endif
+post-install: doc-install
 
-post-install:
+.include <bsd.port.mk>
+
+doc-install:
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${RUBY_MODEXAMPLESDIR}/ja
 .for f in ${EXAMPLES_EN}
@@ -62,5 +60,3 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_MODDOCDIR}/ja/
 .endfor
 .endif
-
-.include <bsd.port.mk>
diff --git a/print/ruby-pdflib/pkg-plist b/print/ruby-pdflib/pkg-plist
index 29020613836a..d8a6805009fc 100644
--- a/print/ruby-pdflib/pkg-plist
+++ b/print/ruby-pdflib/pkg-plist
@@ -1,11 +1,11 @@
 %%RUBY_SITEARCHLIBDIR%%/pdflib.so
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ChangeLog
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/README
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/pdflib-api.html
+%%PORTDOCS%%%%RUBY_RD_HTML_FILES%%%%RUBY_MODDOCDIR%%/pdflib-api.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/pdflib-api.rd
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/ChangeLog.jp
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/README.jp
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/pdflib-api-jp.html
+%%PORTDOCS%%%%RUBY_RD_HTML_FILES%%%%RUBY_MODDOCDIR%%/ja/pdflib-api-jp.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/pdflib-api-jp.rd
 %%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/ja
 %%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%
diff --git a/security/ruby-acl/Makefile b/security/ruby-acl/Makefile
index 678a571fa5b8..18baddefbc56 100644
--- a/security/ruby-acl/Makefile
+++ b/security/ruby-acl/Makefile
@@ -15,29 +15,27 @@ DIST_SUBDIR=	ruby
 MAINTAINER=	knu@FreeBSD.org
 
 USE_RUBY=	yes
-USE_RUBY_RDTOOL=	yes
 
-do-build:
-.if !defined(NOPORTDOCS)
-.for f in acl.rd acl.rd.ja
-	@cd ${WRKSRC}/doc; \
-	${RUBY_RD2} ${f} > ${f:S/.rd/.html/}
-.endfor
-.endif
+NO_BUILD=	yess
+
+RUBY_RD_FILES=	doc/acl.rd doc/ja/acl.rd.ja
+
+post-extract:
+	${MKDIR} ${WRKSRC}/doc/ja
+	${MV} ${WRKSRC}/README ${WRKSRC}/doc/
+	${MV} ${WRKSRC}/README.ja ${WRKSRC}/doc/*.ja ${WRKSRC}/doc/ja/
 
 do-install:
-	@cd ${WRKSRC}; \
-	${RUBY} install.rb
+	@cd ${WRKSRC}; ${RUBY} install.rb
+
+post-install: doc-install
+
+.include <bsd.port.mk>
+
+doc-install:
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${RUBY_MODEXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/acltest.rb ${RUBY_MODEXAMPLESDIR}
-	${MKDIR} ${RUBY_MODDOCDIR}/ja
-.for f in README doc/acl.rd doc/acl.html
-	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_MODDOCDIR}
-.endfor
-.for f in README.ja doc/acl.rd.ja doc/acl.html.ja
-	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_MODDOCDIR}/ja
-.endfor
+	${MKDIR} ${RUBY_MODDOCDIR}
+	${CP} -R ${WRKSRC}/doc/* ${RUBY_MODDOCDIR}/
 .endif
-
-.include <bsd.port.mk>
diff --git a/security/ruby-acl/pkg-plist b/security/ruby-acl/pkg-plist
index 916bf89eb9d0..700782ea6071 100644
--- a/security/ruby-acl/pkg-plist
+++ b/security/ruby-acl/pkg-plist
@@ -2,10 +2,10 @@
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/acltest.rb
 %%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/README
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/acl.html
+%%PORTDOCS%%%%RUBY_RD_HTML_FILES%%%%RUBY_MODDOCDIR%%/acl.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/acl.rd
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/README.ja
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/acl.html.ja
+%%PORTDOCS%%%%RUBY_RD_HTML_FILES%%%%RUBY_MODDOCDIR%%/ja/acl.ja.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/acl.rd.ja
 %%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/ja
 %%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%
diff --git a/textproc/eruby/Makefile b/textproc/eruby/Makefile
index da85716a67ec..d3d72e62dc39 100644
--- a/textproc/eruby/Makefile
+++ b/textproc/eruby/Makefile
@@ -14,7 +14,6 @@ DIST_SUBDIR=	ruby
 MAINTAINER=	knu@FreeBSD.org
 
 USE_RUBY=	yes
-USE_RUBY_RDTOOL=	yes
 
 CONFIGURE_ARGS=	--enable-shared --with-charset="${DEFAULT_CHARSET}"
 INSTALL_TARGET=	site-install
@@ -24,18 +23,21 @@ DEFAULT_CHARSET?=	ISO-8859-1
 
 MAN1=		eruby.1
 
-DOCS_EN=	COPYING ChangeLog README.en eruby.html eruby.rd
+RUBY_RD_FILES=	eruby.rd
+
+DOCS_EN=	COPYING ChangeLog README.en \
+		${RUBY_RD_FILES} \
+		${RUBY_RD_HTML_FILES}
 DOCS_JA=	README.ja
 
 do-configure:
 	@cd ${WRKSRC}; ${SETENV} ${CONFIGURE_ENV} ${RUBY} configure.rb ${CONFIGURE_ARGS}
 
-post-build:
-.if !defined(NOPORTDOCS)
-	cd ${WRKSRC}; ${RUBY_RD2} eruby.rd > eruby.html
-.endif
+post-install: doc-install
 
-post-install:
+.include <bsd.port.mk>
+
+doc-install:
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${RUBY_MODEXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/examples/* ${RUBY_MODEXAMPLESDIR}/
@@ -47,5 +49,3 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_MODDOCDIR}/ja/
 .endfor
 .endif
-
-.include <bsd.port.mk>
diff --git a/textproc/eruby/pkg-plist b/textproc/eruby/pkg-plist
index 0290cea3bffa..936342446ce0 100644
--- a/textproc/eruby/pkg-plist
+++ b/textproc/eruby/pkg-plist
@@ -12,7 +12,7 @@ lib/liberuby.a
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/COPYING
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ChangeLog
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/README.en
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/eruby.html
+%%PORTDOCS%%%%RUBY_RD_HTML_FILES%%%%RUBY_MODDOCDIR%%/eruby.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/eruby.rd
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/README.ja
 %%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/ja
diff --git a/textproc/ruby-sary/Makefile b/textproc/ruby-sary/Makefile
index f2ed6de3cc84..dbfe48b49334 100644
--- a/textproc/ruby-sary/Makefile
+++ b/textproc/ruby-sary/Makefile
@@ -19,24 +19,25 @@ LIB_DEPENDS=	sary.8:${PORTSDIR}/textproc/sary
 
 USE_RUBY=	yes
 USE_RUBY_EXTCONF=	yes
-USE_RUBY_RDTOOL=	yes
 
 RUBY_WITH_PTHREAD=	yes
 
 INSTALL_TARGET=	site-install
 
-DOCS_EN=	ChangeLog *.en.*
-DOCS_JA=	*.ja.*
+RUBY_RD_FILES=	*.en.rd *.ja.rd
 
-post-build:
-.if !defined(NOPORTDOCS)
-	cd ${WRKSRC}; for f in *.rd; do \
-		${RUBY_RD2} $$f > $${f%.rd}.html; \
-	done
-.endif
+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}
 
-post-install:
+post-install: doc-install
 	${INSTALL_SCRIPT} ${WRKSRC}/rsary.rb ${PREFIX}/bin/
+
+.include <bsd.port.mk>
+
+doc-install:
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${RUBY_MODDOCDIR}/ja
 .for f in ${DOCS_EN}
@@ -46,5 +47,3 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_MODDOCDIR}/ja/
 .endfor
 .endif
-
-.include <bsd.port.mk>
diff --git a/textproc/ruby-sary/pkg-plist b/textproc/ruby-sary/pkg-plist
index 996ea25602fd..c19df584e113 100644
--- a/textproc/ruby-sary/pkg-plist
+++ b/textproc/ruby-sary/pkg-plist
@@ -1,13 +1,13 @@
 bin/rsary.rb
 %%RUBY_SITEARCHLIBDIR%%/sary.so
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ChangeLog
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/README.en.html
+%%PORTDOCS%%%%RUBY_RD_HTML_FILES%%%%RUBY_MODDOCDIR%%/README.en.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/README.en.rd
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/Reference.en.html
+%%PORTDOCS%%%%RUBY_RD_HTML_FILES%%%%RUBY_MODDOCDIR%%/Reference.en.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/Reference.en.rd
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/README.ja.html
+%%PORTDOCS%%%%RUBY_RD_HTML_FILES%%%%RUBY_MODDOCDIR%%/ja/README.ja.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/README.ja.rd
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/Reference.ja.html
+%%PORTDOCS%%%%RUBY_RD_HTML_FILES%%%%RUBY_MODDOCDIR%%/ja/Reference.ja.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/Reference.ja.rd
 %%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/ja
 %%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%
diff --git a/www/mod_ruby/Makefile b/www/mod_ruby/Makefile
index 213573634bc2..a19b93c70734 100644
--- a/www/mod_ruby/Makefile
+++ b/www/mod_ruby/Makefile
@@ -18,7 +18,6 @@ LIB_DEPENDS=	eruby.09:${PORTSDIR}/textproc/eruby
 RUN_DEPENDS=	${APXS}:${APACHE_PORT}
 
 USE_RUBY=	yes
-USE_RUBY_RDTOOL=	yes
 
 APXS?=		${LOCALBASE}/sbin/apxs
 APACHE_PORT?=	${PORTSDIR}/www/apache13
@@ -30,6 +29,8 @@ CONFIGURE_ARGS=	--with-apxs="${APXS}" \
 MAKE_ARGS=	RUBY="${RUBY}"
 INSTALL_TARGET=	site-install
 
+RUBY_RD_FILES=	# empty
+
 DOCS_EN=	COPYING ChangeLog README.en doc/default.css doc/*.en.*
 DOCS_JA=	README.ja doc/default.css doc/*.ja.*
 
@@ -41,14 +42,16 @@ post-patch:
 do-configure:
 	@cd ${WRKSRC}; ${SETENV} ${CONFIGURE_ENV} ${RUBY} ${RUBY_FLAGS} configure.rb ${CONFIGURE_ARGS}
 
-post-build:
-.if !defined(NOPORTDOCS)
-	@cd ${WRKSRC}/doc; ${MAKE}
-.endif
-
-post-install:
+post-install: doc-install
 	${INSTALL_DATA} ${WRKSRC}/examples/httpd.conf `${APXS} -q SYSCONFDIR`/httpd.conf.${PORTNAME}
+
+.include <bsd.port.mk>
+
+doc-install:
 .if !defined(NOPORTDOCS)
+.if !defined(RUBY_NO_RD_HTML)
+	cd ${WRKSRC}/doc; ${MAKE}
+.endif
 	${MKDIR} ${RUBY_MODDOCDIR}/ja
 .for f in ${DOCS_EN}
 	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_MODDOCDIR}/
@@ -58,5 +61,3 @@ post-install:
 .endfor
 .endif
 	@${CAT} ${PKGMESSAGE}
-
-.include <bsd.port.mk>
diff --git a/www/mod_ruby/pkg-plist b/www/mod_ruby/pkg-plist
index 7155791aef95..8c6386406777 100644
--- a/www/mod_ruby/pkg-plist
+++ b/www/mod_ruby/pkg-plist
@@ -11,28 +11,28 @@ libexec/apache/mod_ruby.so
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/COPYING
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ChangeLog
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/README.en
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/classes.en.html
+%%PORTDOCS%%%%RUBY_RD_HTML_FILES%%%%RUBY_MODDOCDIR%%/classes.en.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/classes.en.rd
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/default.css
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/directives.en.html
+%%PORTDOCS%%%%RUBY_RD_HTML_FILES%%%%RUBY_MODDOCDIR%%/directives.en.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/directives.en.rd
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/faq.en.html
+%%PORTDOCS%%%%RUBY_RD_HTML_FILES%%%%RUBY_MODDOCDIR%%/faq.en.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/faq.en.rd
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/index.en.html
+%%PORTDOCS%%%%RUBY_RD_HTML_FILES%%%%RUBY_MODDOCDIR%%/index.en.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/index.en.rd
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/install.en.html
+%%PORTDOCS%%%%RUBY_RD_HTML_FILES%%%%RUBY_MODDOCDIR%%/install.en.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/install.en.rd
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/README.ja
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/classes.ja.euc.rd
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/classes.ja.jis.html
+%%PORTDOCS%%%%RUBY_RD_HTML_FILES%%%%RUBY_MODDOCDIR%%/ja/classes.ja.jis.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/default.css
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/directives.ja.euc.rd
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/directives.ja.jis.html
+%%PORTDOCS%%%%RUBY_RD_HTML_FILES%%%%RUBY_MODDOCDIR%%/ja/directives.ja.jis.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/faq.ja.euc.rd
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/faq.ja.jis.html
+%%PORTDOCS%%%%RUBY_RD_HTML_FILES%%%%RUBY_MODDOCDIR%%/ja/faq.ja.jis.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/index.ja.euc.rd
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/index.ja.jis.html
+%%PORTDOCS%%%%RUBY_RD_HTML_FILES%%%%RUBY_MODDOCDIR%%/ja/index.ja.jis.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/install.ja.euc.rd
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/install.ja.jis.html
+%%PORTDOCS%%%%RUBY_RD_HTML_FILES%%%%RUBY_MODDOCDIR%%/ja/install.ja.jis.html
 %%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/ja
 %%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%