Use RUBY_MOD*.

88 files changed, 1051 insertions, 1051 deletions

diff --git a/devel/ruby-amstd/Makefile b/devel/ruby-amstd/Makefile
index 4f0e3ed8fb49..9f03a3bba213 100644
--- a/devel/ruby-amstd/Makefile
+++ b/devel/ruby-amstd/Makefile
@@ -25,12 +25,12 @@ DOCS_JA=	README.ja manual.rd.ja
 
 post-install:
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${RUBY_DOCDIR}/${PORTNAME}/ja
+	${MKDIR} ${RUBY_MODDOCDIR}/ja
 .for f in ${DOCS_EN}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_DOCDIR}/${PORTNAME}/
+	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_MODDOCDIR}/
 .endfor
 .for f in ${DOCS_JA}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_DOCDIR}/${PORTNAME}/ja/
+	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_MODDOCDIR}/ja/
 .endfor
 .endif
 
diff --git a/devel/ruby-amstd/pkg-plist b/devel/ruby-amstd/pkg-plist
index 47aa747539ed..c2518b58749a 100644
--- a/devel/ruby-amstd/pkg-plist
+++ b/devel/ruby-amstd/pkg-plist
@@ -11,8 +11,8 @@
 %%RUBY_SITELIBDIR%%/amstd/timer.rb
 %%RUBY_SITELIBDIR%%/amstd/version.rb
 @dirrm %%RUBY_SITELIBDIR%%/amstd
-%%PORTDOCS%%%%RUBY_DOCDIR%%/amstd/README.en
-%%PORTDOCS%%%%RUBY_DOCDIR%%/amstd/ja/README.ja
-%%PORTDOCS%%%%RUBY_DOCDIR%%/amstd/ja/manual.rd.ja
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/amstd/ja
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/amstd
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/README.en
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/README.ja
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/manual.rd.ja
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/ja
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%
diff --git a/devel/ruby-aspectr/Makefile b/devel/ruby-aspectr/Makefile
index 5101a9701dfa..5900cf4dd671 100644
--- a/devel/ruby-aspectr/Makefile
+++ b/devel/ruby-aspectr/Makefile
@@ -26,12 +26,12 @@ DOCS=		CHANGELOG README TODO
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/lib/aspectr.rb ${RUBY_SITELIBDIR}/
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${RUBY_DOCDIR}/${PORTNAME}
+	${MKDIR} ${RUBY_MODDOCDIR}
 .for f in ${DOCS}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_DOCDIR}/${PORTNAME}/
+	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_MODDOCDIR}/
 .endfor
-	${MKDIR} ${RUBY_EXAMPLESDIR}/${PORTNAME}
-	${INSTALL_DATA} ${WRKSRC}/examples/logger.rb ${RUBY_EXAMPLESDIR}/${PORTNAME}/
+	${MKDIR} ${RUBY_MODEXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/examples/logger.rb ${RUBY_MODEXAMPLESDIR}/
 .endif
 
 .include <bsd.port.mk>
diff --git a/devel/ruby-aspectr/pkg-plist b/devel/ruby-aspectr/pkg-plist
index c45a420b6e3d..534ce1079bc3 100644
--- a/devel/ruby-aspectr/pkg-plist
+++ b/devel/ruby-aspectr/pkg-plist
@@ -1,7 +1,7 @@
 %%RUBY_SITELIBDIR%%/aspectr.rb
-%%PORTDOCS%%%%RUBY_DOCDIR%%/aspectr/CHANGELOG
-%%PORTDOCS%%%%RUBY_DOCDIR%%/aspectr/README
-%%PORTDOCS%%%%RUBY_DOCDIR%%/aspectr/TODO
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/aspectr
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/aspectr/logger.rb
-%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/aspectr
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/CHANGELOG
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/README
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/TODO
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/logger.rb
+%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%
diff --git a/devel/ruby-avl/Makefile b/devel/ruby-avl/Makefile
index a12dc2bf1655..58e7e420acb1 100644
--- a/devel/ruby-avl/Makefile
+++ b/devel/ruby-avl/Makefile
@@ -30,13 +30,13 @@ DOCS=		README
 
 post-install:
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${RUBY_EXAMPLESDIR}/${PORTNAME}
+	${MKDIR} ${RUBY_MODEXAMPLESDIR}
 .for f in ${EXAMPLES}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_EXAMPLESDIR}/${PORTNAME}
+	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_MODEXAMPLESDIR}
 .endfor
-	${MKDIR} ${RUBY_DOCDIR}/${PORTNAME}
+	${MKDIR} ${RUBY_MODDOCDIR}
 .for f in ${DOCS}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_DOCDIR}/${PORTNAME}/
+	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_MODDOCDIR}/
 .endfor
 .endif
 
diff --git a/devel/ruby-avl/pkg-plist b/devel/ruby-avl/pkg-plist
index 0481654c9669..444d672a4641 100644
--- a/devel/ruby-avl/pkg-plist
+++ b/devel/ruby-avl/pkg-plist
@@ -1,10 +1,10 @@
 %%RUBY_SITEARCHLIBDIR%%/AVL.so
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/avl/Dussel.txt
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/avl/getwords.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/avl/test.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/avl/test2.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/avl/test3.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/avl/test4.rb
-%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/avl
-%%PORTDOCS%%%%RUBY_DOCDIR%%/avl/README
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/avl
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/Dussel.txt
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/getwords.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test2.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test3.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test4.rb
+%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/README
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%
diff --git a/devel/ruby-bsearch/Makefile b/devel/ruby-bsearch/Makefile
index e84e89abaee2..5fc0539b517b 100644
--- a/devel/ruby-bsearch/Makefile
+++ b/devel/ruby-bsearch/Makefile
@@ -32,12 +32,12 @@ do-build:
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/bsearch.rb ${RUBY_SITELIBDIR}/
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${RUBY_DOCDIR}/${PORTNAME}/ja
+	${MKDIR} ${RUBY_MODDOCDIR}/ja
 .for f in ${DOCS_EN}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_DOCDIR}/${PORTNAME}/
+	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_MODDOCDIR}/
 .endfor
 .for f in ${DOCS_JA}
-	${INSTALL_SCRIPT} ${WRKSRC}/${f} ${RUBY_DOCDIR}/${PORTNAME}/ja/
+	${INSTALL_SCRIPT} ${WRKSRC}/${f} ${RUBY_MODDOCDIR}/ja/
 .endfor
 .endif
 
diff --git a/devel/ruby-bsearch/pkg-plist b/devel/ruby-bsearch/pkg-plist
index 9c2a2ef790f7..11b0c3c4dc9f 100644
--- a/devel/ruby-bsearch/pkg-plist
+++ b/devel/ruby-bsearch/pkg-plist
@@ -1,8 +1,8 @@
 %%RUBY_SITELIBDIR%%/bsearch.rb
-%%PORTDOCS%%%%RUBY_DOCDIR%%/bsearch/ChangeLog
-%%PORTDOCS%%%%RUBY_DOCDIR%%/bsearch/bsearch.en.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/bsearch/bsearch.en.rd
-%%PORTDOCS%%%%RUBY_DOCDIR%%/bsearch/ja/bsearch.ja.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/bsearch/ja/bsearch.ja.rd
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/bsearch/ja
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/bsearch
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ChangeLog
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/bsearch.en.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/bsearch.en.rd
+%%PORTDOCS%%%%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-byaccr/Makefile b/devel/ruby-byaccr/Makefile
index 529285482963..9e30cd5a87de 100644
--- a/devel/ruby-byaccr/Makefile
+++ b/devel/ruby-byaccr/Makefile
@@ -28,11 +28,11 @@ pre-build:
 
 post-install:
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${RUBY_EXAMPLESDIR}/${PORTNAME}
-	${INSTALL_DATA} ${WRKSRC}/sample/* ${RUBY_EXAMPLESDIR}/${PORTNAME}/
-	${MKDIR} ${RUBY_DOCDIR}/${PORTNAME}
+	${MKDIR} ${RUBY_MODEXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/sample/* ${RUBY_MODEXAMPLESDIR}/
+	${MKDIR} ${RUBY_MODDOCDIR}
 .for f in ${DOCS}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_DOCDIR}/${PORTNAME}/
+	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_MODDOCDIR}/
 .endfor
 .endif
 
diff --git a/devel/ruby-byaccr/pkg-plist b/devel/ruby-byaccr/pkg-plist
index fed72a495217..a0b6befb7892 100644
--- a/devel/ruby-byaccr/pkg-plist
+++ b/devel/ruby-byaccr/pkg-plist
@@ -1,11 +1,11 @@
 bin/byaccr
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/byaccr/Makefile
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/byaccr/cal.y
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/byaccr/calfunc.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/byaccr/main.rb
-%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/byaccr
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/Makefile
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/cal.y
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/calfunc.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/main.rb
+%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%
 %%PORTDOCS%%@unexec rmdir %D/%%RUBY_EXAMPLESDIR%% 2>/dev/null || true
-%%PORTDOCS%%%%RUBY_DOCDIR%%/byaccr/README
-%%PORTDOCS%%%%RUBY_DOCDIR%%/byaccr/README.html
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/byaccr
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/README
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/README.html
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%
 %%PORTDOCS%%@unexec rmdir %D/%%RUBY_DOCDIR%% 2>/dev/null || true
diff --git a/devel/ruby-calendar/Makefile b/devel/ruby-calendar/Makefile
index f311abccdbba..8a460d06107a 100644
--- a/devel/ruby-calendar/Makefile
+++ b/devel/ruby-calendar/Makefile
@@ -24,16 +24,16 @@ EXAMPLES_EN=	ext/calendar/cal*.rb
 
 post-install:
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${RUBY_EXAMPLESDIR}/${PORTNAME}
+	${MKDIR} ${RUBY_MODEXAMPLESDIR}
 .for f in ${EXAMPLES_EN}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_EXAMPLESDIR}/${PORTNAME}/
+	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_MODEXAMPLESDIR}/
 .endfor
-	${MKDIR} ${RUBY_DOCDIR}/${PORTNAME}/ja
+	${MKDIR} ${RUBY_MODDOCDIR}/ja
 .for f in ${DOCS_EN}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_DOCDIR}/${PORTNAME}/
+	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_MODDOCDIR}/
 .endfor
 .for f in ${DOCS_JA}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_DOCDIR}/${PORTNAME}/ja/
+	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_MODDOCDIR}/ja/
 .endfor
 .endif
 
diff --git a/devel/ruby-calendar/pkg-plist b/devel/ruby-calendar/pkg-plist
index 0e6c60265031..41f4624f436b 100644
--- a/devel/ruby-calendar/pkg-plist
+++ b/devel/ruby-calendar/pkg-plist
@@ -1,11 +1,11 @@
 %%RUBY_SITEARCHLIBDIR%%/calendar.so
 %%RUBY_SITEARCHLIBDIR%%/getdate.so
 %%RUBY_SITEARCHLIBDIR%%/sdn.so
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/calendar/cal.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/calendar/calclass.rb
-%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/calendar
-%%PORTDOCS%%%%RUBY_DOCDIR%%/calendar/README.en
-%%PORTDOCS%%%%RUBY_DOCDIR%%/calendar/README.sdncal20
-%%PORTDOCS%%%%RUBY_DOCDIR%%/calendar/ja/README
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/calendar/ja
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/calendar
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/cal.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/calclass.rb
+%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/README.en
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/README.sdncal20
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/README
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/ja
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%
diff --git a/devel/ruby-cvs/Makefile b/devel/ruby-cvs/Makefile
index 115c0e6f6ef2..262ad66b8706 100644
--- a/devel/ruby-cvs/Makefile
+++ b/devel/ruby-cvs/Makefile
@@ -37,12 +37,12 @@ do-build:
 do-install:
 	${CP} -R ${WRKSRC}/lib/* ${RUBY_SITELIBDIR}/
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${RUBY_EXAMPLESDIR}/${PORTNAME}/reviz
-	${INSTALL_DATA} ${WRKSRC}/viztree ${RUBY_EXAMPLESDIR}/${PORTNAME}/
-	${INSTALL_DATA} ${WRKSRC}/reviz/* ${RUBY_EXAMPLESDIR}/${PORTNAME}/reviz/
-	${MKDIR} ${RUBY_DOCDIR}/${PORTNAME}
+	${MKDIR} ${RUBY_MODEXAMPLESDIR}/reviz
+	${INSTALL_DATA} ${WRKSRC}/viztree ${RUBY_MODEXAMPLESDIR}/
+	${INSTALL_DATA} ${WRKSRC}/reviz/* ${RUBY_MODEXAMPLESDIR}/reviz/
+	${MKDIR} ${RUBY_MODDOCDIR}
 .for f in ${DOCS}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_DOCDIR}/${PORTNAME}/
+	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_MODDOCDIR}/
 .endfor
 .endif
 
diff --git a/devel/ruby-cvs/pkg-plist b/devel/ruby-cvs/pkg-plist
index 8264adedd89b..c1c6ef1002d1 100644
--- a/devel/ruby-cvs/pkg-plist
+++ b/devel/ruby-cvs/pkg-plist
@@ -19,22 +19,22 @@
 @dirrm %%RUBY_SITELIBDIR%%/cvs
 @dirrm %%RUBY_SITELIBDIR%%/diff
 @dirrm %%RUBY_SITELIBDIR%%/rcs
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/cvs/viztree
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/cvs/reviz/list_repositories.rsp
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/cvs/reviz/log.rsp
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/cvs/reviz/reviz
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/cvs/reviz/reviz-conf.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/cvs/reviz/rsp.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/cvs/reviz/view_annotate.rsp
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/cvs/reviz/view_checkout.rsp
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/cvs/reviz/view_diff.rsp
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/cvs/reviz/view_directory.rsp
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/cvs/reviz/view_log.rsp
-%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/cvs/reviz
-%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/cvs
-%%PORTDOCS%%%%RUBY_DOCDIR%%/cvs/README
-%%PORTDOCS%%%%RUBY_DOCDIR%%/cvs/TODO
-%%PORTDOCS%%%%RUBY_DOCDIR%%/cvs/cvs.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/cvs/diff.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/cvs/tempdir.html
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/cvs
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/viztree
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/reviz/list_repositories.rsp
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/reviz/log.rsp
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/reviz/reviz
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/reviz/reviz-conf.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/reviz/rsp.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/reviz/view_annotate.rsp
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/reviz/view_checkout.rsp
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/reviz/view_diff.rsp
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/reviz/view_directory.rsp
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/reviz/view_log.rsp
+%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%/reviz
+%%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%%@dirrm %%RUBY_MODDOCDIR%%
diff --git a/devel/ruby-date2/Makefile b/devel/ruby-date2/Makefile
index 812e908f23cc..e7f66e5a0f51 100644
--- a/devel/ruby-date2/Makefile
+++ b/devel/ruby-date2/Makefile
@@ -31,19 +31,19 @@ IGNORE=		is part of ruby ${RUBY_VER} distribution
 
 post-install:
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${RUBY_EXAMPLESDIR}/date2/ja
+	${MKDIR} ${RUBY_MODEXAMPLESDIR}/ja
 .for f in ${EXAMPLES_EN}
-	${INSTALL_DATA} ${WRKSRC}/sample/${f} ${RUBY_EXAMPLESDIR}/date2/
+	${INSTALL_DATA} ${WRKSRC}/sample/${f} ${RUBY_MODEXAMPLESDIR}/
 .endfor
 .for f in ${EXAMPLES_JA}
-	${INSTALL_DATA} ${WRKSRC}/sample/${f} ${RUBY_EXAMPLESDIR}/date2/ja/
+	${INSTALL_DATA} ${WRKSRC}/sample/${f} ${RUBY_MODEXAMPLESDIR}/ja/
 .endfor
-	${MKDIR} ${RUBY_DOCDIR}/date2/ja
+	${MKDIR} ${RUBY_MODDOCDIR}/ja
 .for f in ${DOCS_EN}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_DOCDIR}/date2/
+	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_MODDOCDIR}/
 .endfor
 .for f in ${DOCS_JA}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_DOCDIR}/date2/ja/
+	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_MODDOCDIR}/ja/
 .endfor
 .endif
 
diff --git a/devel/ruby-date2/pkg-plist b/devel/ruby-date2/pkg-plist
index 376e8989f9d4..da844061027b 100644
--- a/devel/ruby-date2/pkg-plist
+++ b/devel/ruby-date2/pkg-plist
@@ -3,19 +3,19 @@
 %%RUBY_SITELIBDIR%%/date/format.rb
 %%RUBY_SITELIBDIR%%/date/holiday.rb
 @dirrm %%RUBY_SITELIBDIR%%/date
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/date2/cal.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/date2/daylight.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/date2/goodfriday.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/date2/ja/ncal.rb
-%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/date2/ja
-%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/date2
-%%PORTDOCS%%%%RUBY_DOCDIR%%/date2/MANUAL.en
-%%PORTDOCS%%%%RUBY_DOCDIR%%/date2/MANUAL.en.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/date2/MANUAL.en.rd
-%%PORTDOCS%%%%RUBY_DOCDIR%%/date2/README.en
-%%PORTDOCS%%%%RUBY_DOCDIR%%/date2/ja/MANUAL
-%%PORTDOCS%%%%RUBY_DOCDIR%%/date2/ja/MANUAL.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/date2/ja/MANUAL.rd
-%%PORTDOCS%%%%RUBY_DOCDIR%%/date2/ja/README
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/date2/ja
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/date2
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/cal.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/daylight.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/goodfriday.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/ja/ncal.rb
+%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%/ja
+%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/MANUAL.en
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/MANUAL.en.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/MANUAL.en.rd
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/README.en
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/MANUAL
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/MANUAL.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/MANUAL.rd
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/README
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/ja
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%
diff --git a/devel/ruby-dialogs/Makefile b/devel/ruby-dialogs/Makefile
index 107ccbf42e3e..fd6eea02b57a 100644
--- a/devel/ruby-dialogs/Makefile
+++ b/devel/ruby-dialogs/Makefile
@@ -23,8 +23,8 @@ NO_BUILD=	yes
 do-install:
 	${INSTALL_DATA} ${WRKDIR}/dialogs.rb ${RUBY_SITELIBDIR}/
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${RUBY_DOCDIR}/dialogs
-	${INSTALL_DATA} ${WRKDIR}/dialogs.html ${RUBY_DOCDIR}/dialogs/
+	${MKDIR} ${RUBY_MODDOCDIR}
+	${INSTALL_DATA} ${WRKDIR}/dialogs.html ${RUBY_MODDOCDIR}/
 .endif
 
 .include <bsd.port.mk>
diff --git a/devel/ruby-dialogs/pkg-plist b/devel/ruby-dialogs/pkg-plist
index f9b17ced665f..f8c60a7f781a 100644
--- a/devel/ruby-dialogs/pkg-plist
+++ b/devel/ruby-dialogs/pkg-plist
@@ -1,3 +1,3 @@
 %%RUBY_SITELIBDIR%%/dialogs.rb
-%%PORTDOCS%%%%RUBY_DOCDIR%%/dialogs/dialogs.html
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/dialogs
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/dialogs.html
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%
diff --git a/devel/ruby-fam/Makefile b/devel/ruby-fam/Makefile
index 91c105fe275a..eecb41fc778d 100644
--- a/devel/ruby-fam/Makefile
+++ b/devel/ruby-fam/Makefile
@@ -26,11 +26,11 @@ DOCS=		COPYING ChangeLog README doc
 
 post-install:
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${RUBY_EXAMPLESDIR}/${PORTNAME}
-	${CP} -R ${WRKSRC}/examples/* ${RUBY_EXAMPLESDIR}/${PORTNAME}/
-	${MKDIR} ${RUBY_DOCDIR}/${PORTNAME}
+	${MKDIR} ${RUBY_MODEXAMPLESDIR}
+	${CP} -R ${WRKSRC}/examples/* ${RUBY_MODEXAMPLESDIR}/
+	${MKDIR} ${RUBY_MODDOCDIR}
 .for f in ${DOCS}
-	${CP} -R ${WRKSRC}/${f} ${RUBY_DOCDIR}/${PORTNAME}/
+	${CP} -R ${WRKSRC}/${f} ${RUBY_MODDOCDIR}/
 .endfor
 .endif
 
diff --git a/devel/ruby-fam/pkg-plist b/devel/ruby-fam/pkg-plist
index 499fd8e75607..6966b073e5a2 100644
--- a/devel/ruby-fam/pkg-plist
+++ b/devel/ruby-fam/pkg-plist
@@ -1,51 +1,51 @@
 %%RUBY_SITEARCHLIBDIR%%/fam.so
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/fam/dirmon.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/fam/famtest.rb
-%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/fam
-%%PORTDOCS%%%%RUBY_DOCDIR%%/fam/COPYING
-%%PORTDOCS%%%%RUBY_DOCDIR%%/fam/ChangeLog
-%%PORTDOCS%%%%RUBY_DOCDIR%%/fam/README
-%%PORTDOCS%%%%RUBY_DOCDIR%%/fam/doc/classes/Fam.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/fam/doc/classes/Fam/Connection.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/fam/doc/classes/Fam/Connection.src/M000007.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/fam/doc/classes/Fam/Connection.src/M000008.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/fam/doc/classes/Fam/Connection.src/M000009.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/fam/doc/classes/Fam/Connection.src/M000010.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/fam/doc/classes/Fam/Connection.src/M000011.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/fam/doc/classes/Fam/Connection.src/M000012.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/fam/doc/classes/Fam/Connection.src/M000013.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/fam/doc/classes/Fam/Connection.src/M000014.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/fam/doc/classes/Fam/Connection.src/M000015.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/fam/doc/classes/Fam/Connection.src/M000016.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/fam/doc/classes/Fam/Connection.src/M000017.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/fam/doc/classes/Fam/Connection.src/M000018.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/fam/doc/classes/Fam/Connection.src/M000019.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/fam/doc/classes/Fam/Connection.src/M000020.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/fam/doc/classes/Fam/Connection.src/M000021.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/fam/doc/classes/Fam/Debug.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/fam/doc/classes/Fam/Event.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/fam/doc/classes/Fam/Event.src/M000002.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/fam/doc/classes/Fam/Event.src/M000003.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/fam/doc/classes/Fam/Event.src/M000004.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/fam/doc/classes/Fam/Event.src/M000005.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/fam/doc/classes/Fam/Event.src/M000006.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/fam/doc/classes/Fam/Request.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/fam/doc/classes/Fam/Request.src/M000001.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/fam/doc/created.rid
-%%PORTDOCS%%%%RUBY_DOCDIR%%/fam/doc/event_codes.txt
-%%PORTDOCS%%%%RUBY_DOCDIR%%/fam/doc/files/_/fam_c.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/fam/doc/files/fam_c.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/fam/doc/fr_class_index.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/fam/doc/fr_file_index.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/fam/doc/fr_method_index.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/fam/doc/index.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/fam/doc/rdoc-style.css
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/fam/doc/files/_
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/fam/doc/files
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/fam/doc/classes/Fam/Request.src
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/fam/doc/classes/Fam/Event.src
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/fam/doc/classes/Fam/Connection.src
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/fam/doc/classes/Fam
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/fam/doc/classes
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/fam/doc
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/fam
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/dirmon.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/famtest.rb
+%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/COPYING
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ChangeLog
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/README
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Fam.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Fam/Connection.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Fam/Connection.src/M000007.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Fam/Connection.src/M000008.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Fam/Connection.src/M000009.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Fam/Connection.src/M000010.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Fam/Connection.src/M000011.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Fam/Connection.src/M000012.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Fam/Connection.src/M000013.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Fam/Connection.src/M000014.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Fam/Connection.src/M000015.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Fam/Connection.src/M000016.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Fam/Connection.src/M000017.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Fam/Connection.src/M000018.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Fam/Connection.src/M000019.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Fam/Connection.src/M000020.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Fam/Connection.src/M000021.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Fam/Debug.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Fam/Event.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Fam/Event.src/M000002.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Fam/Event.src/M000003.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Fam/Event.src/M000004.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Fam/Event.src/M000005.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Fam/Event.src/M000006.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Fam/Request.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Fam/Request.src/M000001.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/created.rid
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/event_codes.txt
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/files/_/fam_c.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/files/fam_c.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/fr_class_index.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/fr_file_index.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/fr_method_index.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/index.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/rdoc-style.css
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/doc/files/_
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/doc/files
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/doc/classes/Fam/Request.src
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/doc/classes/Fam/Event.src
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/doc/classes/Fam/Connection.src
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/doc/classes/Fam
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/doc/classes
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/doc
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%
diff --git a/devel/ruby-filelock/Makefile b/devel/ruby-filelock/Makefile
index 308582c7e39e..e1d1c836bea7 100644
--- a/devel/ruby-filelock/Makefile
+++ b/devel/ruby-filelock/Makefile
@@ -26,13 +26,13 @@ EXAMPLES=	test.rb	tst1.rb	tst2.rb	tst3.rb	tst4.rb
 
 post-install:
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${RUBY_EXAMPLESDIR}/filelock
+	${MKDIR} ${RUBY_MODEXAMPLESDIR}
 .for f in ${EXAMPLES}
-	${INSTALL_DATA} ${WRKSRC}/samples/${f} ${RUBY_EXAMPLESDIR}/filelock/
+	${INSTALL_DATA} ${WRKSRC}/samples/${f} ${RUBY_MODEXAMPLESDIR}/
 .endfor
-	${MKDIR} ${RUBY_DOCDIR}/filelock
+	${MKDIR} ${RUBY_MODDOCDIR}
 .for f in ${DOCS}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_DOCDIR}/filelock/
+	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_MODDOCDIR}/
 .endfor
 .endif
 
diff --git a/devel/ruby-filelock/pkg-plist b/devel/ruby-filelock/pkg-plist
index ca3ae6880cf9..3cd6c68cc016 100644
--- a/devel/ruby-filelock/pkg-plist
+++ b/devel/ruby-filelock/pkg-plist
@@ -1,10 +1,10 @@
 %%RUBY_SITEARCHLIBDIR%%/_filelock.so
 %%RUBY_SITELIBDIR%%/filelock.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/filelock/test.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/filelock/tst1.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/filelock/tst2.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/filelock/tst3.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/filelock/tst4.rb
-%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/filelock
-%%PORTDOCS%%%%RUBY_DOCDIR%%/filelock/README
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/filelock
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/tst1.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/tst2.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/tst3.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/tst4.rb
+%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/README
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%
diff --git a/devel/ruby-flex_rb/Makefile b/devel/ruby-flex_rb/Makefile
index 957a514d63f7..722be52a7227 100644
--- a/devel/ruby-flex_rb/Makefile
+++ b/devel/ruby-flex_rb/Makefile
@@ -28,13 +28,13 @@ post-patch:
 
 post-install:
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${RUBY_EXAMPLESDIR}/${PORTNAME}
+	${MKDIR} ${RUBY_MODEXAMPLESDIR}
 .for f in ${EXAMPLES}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_EXAMPLESDIR}/${PORTNAME}/
+	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_MODEXAMPLESDIR}/
 .endfor
-	${MKDIR} ${RUBY_DOCDIR}/${PORTNAME}
+	${MKDIR} ${RUBY_MODDOCDIR}
 .for f in ${DOCS}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_DOCDIR}/${PORTNAME}/
+	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_MODDOCDIR}/
 .endfor
 .endif
 
diff --git a/devel/ruby-flex_rb/pkg-plist b/devel/ruby-flex_rb/pkg-plist
index 5f8da93ad059..6a1debff58f4 100644
--- a/devel/ruby-flex_rb/pkg-plist
+++ b/devel/ruby-flex_rb/pkg-plist
@@ -1,13 +1,11 @@
 %%RUBY_SITEARCHLIBDIR%%/flex.so
 %%RUBY_SITELIBDIR%%/flex2.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/flex_rb/ex_fr.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/flex_rb/ex_rr.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/flex_rb/test01.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/flex_rb/test02.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/flex_rb/test03.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/flex_rb/test04.rb
-%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/flex_rb
-%%PORTDOCS%%@unexec rmdir %D/%%RUBY_EXAMPLESDIR%% 2>/dev/null || true
-%%PORTDOCS%%%%RUBY_DOCDIR%%/flex_rb/README
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/flex_rb
-%%PORTDOCS%%@unexec rmdir %D/%%RUBY_DOCDIR%% 2>/dev/null || true
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/ex_fr.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/ex_rr.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test01.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test02.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test03.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test04.rb
+%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/README
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%
diff --git a/devel/ruby-gconf/Makefile b/devel/ruby-gconf/Makefile
index 9a121a2c5dca..733aa6f1f2b5 100644
--- a/devel/ruby-gconf/Makefile
+++ b/devel/ruby-gconf/Makefile
@@ -36,9 +36,9 @@ DOCS=	CREDITS \
 
 post-install:
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${RUBY_DOCDIR}/${PORTNAME}
+	${MKDIR} ${RUBY_MODDOCDIR}
 .for f in ${DOCS}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_DOCDIR}/${PORTNAME}/
+	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_MODDOCDIR}/
 .endfor
 .endif
 
diff --git a/devel/ruby-gconf/pkg-plist b/devel/ruby-gconf/pkg-plist
index 196f339e4597..0045cb1aac7a 100644
--- a/devel/ruby-gconf/pkg-plist
+++ b/devel/ruby-gconf/pkg-plist
@@ -1,9 +1,9 @@
 %%RUBY_SITEARCHLIBDIR%%/gconf.so
-%%PORTDOCS%%%%RUBY_DOCDIR%%/gconf/CREDITS
-%%PORTDOCS%%%%RUBY_DOCDIR%%/gconf/ChangeLog
-%%PORTDOCS%%%%RUBY_DOCDIR%%/gconf/INSTALL
-%%PORTDOCS%%%%RUBY_DOCDIR%%/gconf/Makefile
-%%PORTDOCS%%%%RUBY_DOCDIR%%/gconf/README
-%%PORTDOCS%%%%RUBY_DOCDIR%%/gconf/README.DEV
-%%PORTDOCS%%%%RUBY_DOCDIR%%/gconf/TODO
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/gconf
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/CREDITS
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ChangeLog
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/INSTALL
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/Makefile
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/README
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/README.DEV
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/TODO
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%
diff --git a/devel/ruby-gconf2/Makefile b/devel/ruby-gconf2/Makefile
index 9a121a2c5dca..733aa6f1f2b5 100644
--- a/devel/ruby-gconf2/Makefile
+++ b/devel/ruby-gconf2/Makefile
@@ -36,9 +36,9 @@ DOCS=	CREDITS \
 
 post-install:
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${RUBY_DOCDIR}/${PORTNAME}
+	${MKDIR} ${RUBY_MODDOCDIR}
 .for f in ${DOCS}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_DOCDIR}/${PORTNAME}/
+	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_MODDOCDIR}/
 .endfor
 .endif
 
diff --git a/devel/ruby-gconf2/pkg-plist b/devel/ruby-gconf2/pkg-plist
index 196f339e4597..0045cb1aac7a 100644
--- a/devel/ruby-gconf2/pkg-plist
+++ b/devel/ruby-gconf2/pkg-plist
@@ -1,9 +1,9 @@
 %%RUBY_SITEARCHLIBDIR%%/gconf.so
-%%PORTDOCS%%%%RUBY_DOCDIR%%/gconf/CREDITS
-%%PORTDOCS%%%%RUBY_DOCDIR%%/gconf/ChangeLog
-%%PORTDOCS%%%%RUBY_DOCDIR%%/gconf/INSTALL
-%%PORTDOCS%%%%RUBY_DOCDIR%%/gconf/Makefile
-%%PORTDOCS%%%%RUBY_DOCDIR%%/gconf/README
-%%PORTDOCS%%%%RUBY_DOCDIR%%/gconf/README.DEV
-%%PORTDOCS%%%%RUBY_DOCDIR%%/gconf/TODO
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/gconf
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/CREDITS
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ChangeLog
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/INSTALL
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/Makefile
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/README
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/README.DEV
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/TODO
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%
diff --git a/devel/ruby-gemfinder/Makefile b/devel/ruby-gemfinder/Makefile
index 08413b078a8e..ea799f98c3d1 100644
--- a/devel/ruby-gemfinder/Makefile
+++ b/devel/ruby-gemfinder/Makefile
@@ -34,9 +34,9 @@ do-build:
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/gemfinder ${PREFIX}/bin/
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${RUBY_DOCDIR}/gemfinder
+	${MKDIR} ${RUBY_MODDOCDIR}
 .for f in ${DOCS}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_DOCDIR}/gemfinder/
+	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_MODDOCDIR}/
 .endfor
 .endif
 
diff --git a/devel/ruby-gemfinder/pkg-plist b/devel/ruby-gemfinder/pkg-plist
index dc004afb0a3e..e2f84edb970e 100644
--- a/devel/ruby-gemfinder/pkg-plist
+++ b/devel/ruby-gemfinder/pkg-plist
@@ -1,5 +1,5 @@
 bin/gemfinder
-%%PORTDOCS%%%%RUBY_DOCDIR%%/gemfinder/README
-%%PORTDOCS%%%%RUBY_DOCDIR%%/gemfinder/gemfinder.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/gemfinder/gemfinder.rd
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/gemfinder
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/README
+%%PORTDOCS%%%%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 154ce14d1b9f..46d821db7194 100644
--- a/devel/ruby-gettext/Makefile
+++ b/devel/ruby-gettext/Makefile
@@ -30,10 +30,10 @@ RUBY_SETUP=	install.rb
 
 post-install:
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${RUBY_EXAMPLESDIR}/${PORTNAME}
-	${CP} -R ${WRKSRC}/samples/* ${RUBY_EXAMPLESDIR}/${PORTNAME}/
-	${MKDIR} ${RUBY_DOCDIR}/${PORTNAME}
-	${CP} -R ${WRKSRC}/docs/* ${RUBY_DOCDIR}/${PORTNAME}/
+	${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 7b1dfaf1225b..376dd627d089 100644
--- a/devel/ruby-gettext/pkg-plist
+++ b/devel/ruby-gettext/pkg-plist
@@ -10,47 +10,47 @@ bin/rgettext
 @dirrm %%RUBY_SITELIBDIR%%/gettext
 share/locale/ja/LC_MESSAGES/rgettext.mo
 @unexec rmdir -p %D/share/locale/ja/LC_MESSAGES 2>/dev/null || true
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/gettext/hello.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/gettext/hello2.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/gettext/hellogtk.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/gettext/hellogtk_utf8.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/gettext/hello_noop.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/gettext/hellotk.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/gettext/locale/ja/LC_MESSAGES/hello.mo
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/gettext/locale/ja/LC_MESSAGES/hello2.mo
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/gettext/locale/ja/LC_MESSAGES/hello_noop.mo
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/gettext/locale/ja/LC_MESSAGES/hellogtk.mo
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/gettext/locale/ja/LC_MESSAGES/hellotk.mo
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/gettext/po/hello.pot
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/gettext/po/hello2.pot
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/gettext/po/hello_noop.pot
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/gettext/po/hellogtk.pot
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/gettext/po/ja/hello.po
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/gettext/po/ja/hello2.po
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/gettext/po/ja/hello_noop.po
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/gettext/po/ja/hellogtk.po
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/gettext/po/ja/hellotk.po
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/gettext/po/makemo.rb
-%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/gettext/po/ja
-%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/gettext/po/ja_JP.eucJP
-%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/gettext/po
-%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/gettext/locale/ja/LC_MESSAGES
-%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/gettext/locale/ja
-%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/gettext/locale
-%%PORTDOCS%%%%RUBY_DOCDIR%%/gettext/README
-%%PORTDOCS%%%%RUBY_DOCDIR%%/gettext/config.rb
-%%PORTDOCS%%%%RUBY_DOCDIR%%/gettext/html/en/ruby-gettext.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/gettext/html/ja/ruby-gettext.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/gettext/html/style.css
-%%PORTDOCS%%%%RUBY_DOCDIR%%/gettext/rd/en/LANGUAGE
-%%PORTDOCS%%%%RUBY_DOCDIR%%/gettext/rd/en/ruby-gettext.rd
-%%PORTDOCS%%%%RUBY_DOCDIR%%/gettext/rd/ja/LANGUAGE
-%%PORTDOCS%%%%RUBY_DOCDIR%%/gettext/rd/ja/ruby-gettext.rd
-%%PORTDOCS%%%%RUBY_DOCDIR%%/gettext/yard2html.rb
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/gettext/rd/ja
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/gettext/rd/en
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/gettext/rd
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/gettext/html/ja
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/gettext/html/en
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/gettext/html
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/gettext
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/hello.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/hello2.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/hellogtk.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/hellogtk_utf8.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/hello_noop.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/hellotk.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/locale/ja/LC_MESSAGES/hello.mo
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/locale/ja/LC_MESSAGES/hello2.mo
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/locale/ja/LC_MESSAGES/hello_noop.mo
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/locale/ja/LC_MESSAGES/hellogtk.mo
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/locale/ja/LC_MESSAGES/hellotk.mo
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/po/hello.pot
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/po/hello2.pot
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/po/hello_noop.pot
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/po/hellogtk.pot
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/po/ja/hello.po
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/po/ja/hello2.po
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/po/ja/hello_noop.po
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/po/ja/hellogtk.po
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/po/ja/hellotk.po
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/po/makemo.rb
+%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%/po/ja
+%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%/po/ja_JP.eucJP
+%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%/po
+%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%/locale/ja/LC_MESSAGES
+%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%/locale/ja
+%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%/locale
+%%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_MODDOCDIR%%/html/style.css
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/rd/en/LANGUAGE
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/rd/en/ruby-gettext.rd
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/rd/ja/LANGUAGE
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/rd/ja/ruby-gettext.rd
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/yard2html.rb
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/rd/ja
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/rd/en
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/rd
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/html/ja
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/html/en
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/html
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%
diff --git a/devel/ruby-gnustep/Makefile b/devel/ruby-gnustep/Makefile
index b3eb0a7a3e33..d69c219ce90f 100644
--- a/devel/ruby-gnustep/Makefile
+++ b/devel/ruby-gnustep/Makefile
@@ -72,11 +72,11 @@ post-patch:
 
 post-install:
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${RUBY_EXAMPLESDIR}/${PORTNAME}
-	${CP} -R ${WRKSRC}/Examples/* ${RUBY_EXAMPLESDIR}/${PORTNAME}/
-	${MKDIR} ${RUBY_DOCDIR}/${PORTNAME}
+	${MKDIR} ${RUBY_MODEXAMPLESDIR}
+	${CP} -R ${WRKSRC}/Examples/* ${RUBY_MODEXAMPLESDIR}/
+	${MKDIR} ${RUBY_MODDOCDIR}
 .for f in ChangeLog NEWS README TODO
-	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_DOCDIR}/${PORTNAME}/
+	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_MODDOCDIR}/
 .endfor
 .endif
 
diff --git a/devel/ruby-gnustep/pkg-plist b/devel/ruby-gnustep/pkg-plist
index a25425caf634..fc5bd2b4cee8 100644
--- a/devel/ruby-gnustep/pkg-plist
+++ b/devel/ruby-gnustep/pkg-plist
@@ -70,27 +70,27 @@ GNUstep/Local/Libraries/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu/librigs.so
 @unexec /bin/rmdir %D/GNUstep/Local/Libraries/%%GNU_ARCH%% 2> /dev/null || true
 @unexec /bin/rmdir %D/GNUstep/Local/Libraries 2> /dev/null || true
 @unexec /bin/rmdir %D/GNUstep/Local/Headers 2> /dev/null || true
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/gnustep/Base/Simple.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/gnustep/Gui/CurrencyConverter/CurrencyConverter.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/gnustep/Gui/CurrencyConverter/CurrencyConverterIcon.tiff
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/gnustep/Gui/CurrencyConverter/CurrencyConverterInfo.plist
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/gnustep/Gui/CurrencyConverter/GNUmakefile
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/gnustep/Gui/CurrencyConverter/GNUmakefile.postamble
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/gnustep/Gui/CurrencyConverter/fake.m
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/gnustep/Gui/FirstApp/FirstApp.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/gnustep/Gui/FirstApp/FirstAppIcon.tiff
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/gnustep/Gui/FirstApp/FirstAppInfo.plist
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/gnustep/Gui/FirstApp/GNUmakefile
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/gnustep/Gui/FirstApp/GNUmakefile.postamble
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/gnustep/Gui/FirstApp/fake.m
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/gnustep/Gui/README
-%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/gnustep/Base
-%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/gnustep/Gui/CurrencyConverter
-%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/gnustep/Gui/FirstApp
-%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/gnustep/Gui
-%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/gnustep
-%%PORTDOCS%%%%RUBY_DOCDIR%%/gnustep/ChangeLog
-%%PORTDOCS%%%%RUBY_DOCDIR%%/gnustep/NEWS
-%%PORTDOCS%%%%RUBY_DOCDIR%%/gnustep/README
-%%PORTDOCS%%%%RUBY_DOCDIR%%/gnustep/TODO
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/gnustep
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/Base/Simple.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/Gui/CurrencyConverter/CurrencyConverter.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/Gui/CurrencyConverter/CurrencyConverterIcon.tiff
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/Gui/CurrencyConverter/CurrencyConverterInfo.plist
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/Gui/CurrencyConverter/GNUmakefile
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/Gui/CurrencyConverter/GNUmakefile.postamble
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/Gui/CurrencyConverter/fake.m
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/Gui/FirstApp/FirstApp.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/Gui/FirstApp/FirstAppIcon.tiff
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/Gui/FirstApp/FirstAppInfo.plist
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/Gui/FirstApp/GNUmakefile
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/Gui/FirstApp/GNUmakefile.postamble
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/Gui/FirstApp/fake.m
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/Gui/README
+%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%/Base
+%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%/Gui/CurrencyConverter
+%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%/Gui/FirstApp
+%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%/Gui
+%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ChangeLog
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/NEWS
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/README
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/TODO
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%
diff --git a/devel/ruby-intl/Makefile b/devel/ruby-intl/Makefile
index f7b63b90a337..a61adce61c7d 100644
--- a/devel/ruby-intl/Makefile
+++ b/devel/ruby-intl/Makefile
@@ -26,12 +26,12 @@ INSTALL_TARGET=	site-install
 
 post-install:
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${RUBY_EXAMPLESDIR}/intl/po/
-	${INSTALL_DATA} ${WRKSRC}/hello.rb ${RUBY_EXAMPLESDIR}/intl/
-	${INSTALL_DATA} ${WRKSRC}/ja.po ${RUBY_EXAMPLESDIR}/intl/po/
-	${MKDIR} ${RUBY_DOCDIR}/intl/ja
-	${INSTALL_DATA} ${WRKSRC}/README ${RUBY_DOCDIR}/intl/
-	${INSTALL_DATA} ${WRKSRC}/README.jp ${RUBY_DOCDIR}/intl/ja/
+	${MKDIR} ${RUBY_MODEXAMPLESDIR}/po/
+	${INSTALL_DATA} ${WRKSRC}/hello.rb ${RUBY_MODEXAMPLESDIR}/
+	${INSTALL_DATA} ${WRKSRC}/ja.po ${RUBY_MODEXAMPLESDIR}/po/
+	${MKDIR} ${RUBY_MODDOCDIR}/ja
+	${INSTALL_DATA} ${WRKSRC}/README ${RUBY_MODDOCDIR}/
+	${INSTALL_DATA} ${WRKSRC}/README.jp ${RUBY_MODDOCDIR}/ja/
 .endif
 
 .include <bsd.port.mk>
diff --git a/devel/ruby-intl/pkg-plist b/devel/ruby-intl/pkg-plist
index 39b19439a769..619b62b7330b 100644
--- a/devel/ruby-intl/pkg-plist
+++ b/devel/ruby-intl/pkg-plist
@@ -1,9 +1,9 @@
 %%RUBY_SITEARCHLIBDIR%%/intl.so
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/intl/hello.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/intl/po/ja.po
-%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/intl/po
-%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/intl
-%%PORTDOCS%%%%RUBY_DOCDIR%%/intl/README
-%%PORTDOCS%%%%RUBY_DOCDIR%%/intl/ja/README.jp
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/intl/ja
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/intl
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/hello.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/po/ja.po
+%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%/po
+%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/README
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/README.jp
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/ja
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%
diff --git a/devel/ruby-libglade/Makefile b/devel/ruby-libglade/Makefile
index dce569cd462e..481186050665 100644
--- a/devel/ruby-libglade/Makefile
+++ b/devel/ruby-libglade/Makefile
@@ -31,10 +31,10 @@ INSTALL_TARGET=	site-install
 
 post-install:
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${RUBY_EXAMPLESDIR}/${PORTNAME}
-	${INSTALL_DATA} ${WRKSRC}/sample/* ${RUBY_EXAMPLESDIR}/${PORTNAME}/
-	${MKDIR} ${RUBY_DOCDIR}/${PORTNAME}
-	${INSTALL_DATA} ${WRKSRC}/README ${RUBY_DOCDIR}/${PORTNAME}/
+	${MKDIR} ${RUBY_MODEXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/sample/* ${RUBY_MODEXAMPLESDIR}/
+	${MKDIR} ${RUBY_MODDOCDIR}
+	${INSTALL_DATA} ${WRKSRC}/README ${RUBY_MODDOCDIR}/
 .endif
 
 .include <bsd.port.mk>
diff --git a/devel/ruby-libglade/pkg-plist b/devel/ruby-libglade/pkg-plist
index 331700550447..9491c205aaeb 100644
--- a/devel/ruby-libglade/pkg-plist
+++ b/devel/ruby-libglade/pkg-plist
@@ -1,6 +1,6 @@
 %%RUBY_SITEARCHLIBDIR%%/lglade.so
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/libglade/test.glade
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/libglade/test.rb
-%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/libglade
-%%PORTDOCS%%%%RUBY_DOCDIR%%/libglade/README
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/libglade
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test.glade
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test.rb
+%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/README
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%
diff --git a/devel/ruby-libglade2/Makefile b/devel/ruby-libglade2/Makefile
index dce569cd462e..481186050665 100644
--- a/devel/ruby-libglade2/Makefile
+++ b/devel/ruby-libglade2/Makefile
@@ -31,10 +31,10 @@ INSTALL_TARGET=	site-install
 
 post-install:
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${RUBY_EXAMPLESDIR}/${PORTNAME}
-	${INSTALL_DATA} ${WRKSRC}/sample/* ${RUBY_EXAMPLESDIR}/${PORTNAME}/
-	${MKDIR} ${RUBY_DOCDIR}/${PORTNAME}
-	${INSTALL_DATA} ${WRKSRC}/README ${RUBY_DOCDIR}/${PORTNAME}/
+	${MKDIR} ${RUBY_MODEXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/sample/* ${RUBY_MODEXAMPLESDIR}/
+	${MKDIR} ${RUBY_MODDOCDIR}
+	${INSTALL_DATA} ${WRKSRC}/README ${RUBY_MODDOCDIR}/
 .endif
 
 .include <bsd.port.mk>
diff --git a/devel/ruby-libglade2/pkg-plist b/devel/ruby-libglade2/pkg-plist
index 331700550447..9491c205aaeb 100644
--- a/devel/ruby-libglade2/pkg-plist
+++ b/devel/ruby-libglade2/pkg-plist
@@ -1,6 +1,6 @@
 %%RUBY_SITEARCHLIBDIR%%/lglade.so
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/libglade/test.glade
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/libglade/test.rb
-%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/libglade
-%%PORTDOCS%%%%RUBY_DOCDIR%%/libglade/README
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/libglade
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test.glade
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test.rb
+%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/README
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%
diff --git a/devel/ruby-libgtop/Makefile b/devel/ruby-libgtop/Makefile
index 5d4c3b936654..c3435e1ebee1 100644
--- a/devel/ruby-libgtop/Makefile
+++ b/devel/ruby-libgtop/Makefile
@@ -29,13 +29,13 @@ EXAMPLES=	test.rb
 
 post-install:
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${RUBY_EXAMPLESDIR}/${PORTNAME}
+	${MKDIR} ${RUBY_MODEXAMPLESDIR}
 .for f in ${EXAMPLES}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_EXAMPLESDIR}/${PORTNAME}/
+	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_MODEXAMPLESDIR}/
 .endfor
-	${MKDIR} ${RUBY_DOCDIR}/${PORTNAME}
+	${MKDIR} ${RUBY_MODDOCDIR}
 .for f in ${DOCS}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_DOCDIR}/${PORTNAME}/
+	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_MODDOCDIR}/
 .endfor
 .endif
 
diff --git a/devel/ruby-libgtop/pkg-plist b/devel/ruby-libgtop/pkg-plist
index c3b55b8757fb..f09a4479ea69 100644
--- a/devel/ruby-libgtop/pkg-plist
+++ b/devel/ruby-libgtop/pkg-plist
@@ -1,6 +1,6 @@
 %%RUBY_SITEARCHLIBDIR%%/ruby_libgtop.so
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/libgtop/test.rb
-%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/libgtop
-%%PORTDOCS%%%%RUBY_DOCDIR%%/libgtop/ChangeLog
-%%PORTDOCS%%%%RUBY_DOCDIR%%/libgtop/README
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/libgtop
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test.rb
+%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ChangeLog
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/README
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%
diff --git a/devel/ruby-locale/Makefile b/devel/ruby-locale/Makefile
index caad5eaad08c..1fb40dd63c59 100644
--- a/devel/ruby-locale/Makefile
+++ b/devel/ruby-locale/Makefile
@@ -25,10 +25,10 @@ INSTALL_TARGET=	site-install
 
 post-install:
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${RUBY_EXAMPLESDIR}/locale
-	${INSTALL_DATA} ${WRKSRC}/test.rb ${RUBY_EXAMPLESDIR}/locale/
-	${MKDIR} ${RUBY_DOCDIR}/locale
-	${INSTALL_DATA} ${WRKSRC}/README ${RUBY_DOCDIR}/locale/
+	${MKDIR} ${RUBY_MODEXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/test.rb ${RUBY_MODEXAMPLESDIR}/
+	${MKDIR} ${RUBY_MODDOCDIR}
+	${INSTALL_DATA} ${WRKSRC}/README ${RUBY_MODDOCDIR}/
 .endif
 
 .include <bsd.port.mk>
diff --git a/devel/ruby-locale/pkg-plist b/devel/ruby-locale/pkg-plist
index 20bd4878bfd9..e7d66bb97a20 100644
--- a/devel/ruby-locale/pkg-plist
+++ b/devel/ruby-locale/pkg-plist
@@ -1,5 +1,5 @@
 %%RUBY_SITEARCHLIBDIR%%/locale.so
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/locale/test.rb
-%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/locale
-%%PORTDOCS%%%%RUBY_DOCDIR%%/locale/README
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/locale
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test.rb
+%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/README
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%
diff --git a/devel/ruby-metaruby/Makefile b/devel/ruby-metaruby/Makefile
index 881d32596096..bff9cdbde28e 100644
--- a/devel/ruby-metaruby/Makefile
+++ b/devel/ruby-metaruby/Makefile
@@ -22,11 +22,11 @@ DOCS=		ChangeLog	Overview	TODO		doc/*
 
 post-install:
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${RUBY_EXAMPLESDIR}/${PORTNAME}
-	${INSTALL_DATA} ${WRKSRC}/samples/* ${RUBY_EXAMPLESDIR}/${PORTNAME}/
-	${MKDIR} ${RUBY_DOCDIR}/${PORTNAME}
+	${MKDIR} ${RUBY_MODEXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/samples/* ${RUBY_MODEXAMPLESDIR}/
+	${MKDIR} ${RUBY_MODDOCDIR}
 .for f in ${DOCS}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_DOCDIR}/${PORTNAME}/
+	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_MODDOCDIR}/
 .endfor
 .endif
 
diff --git a/devel/ruby-metaruby/pkg-plist b/devel/ruby-metaruby/pkg-plist
index 6d698275ad01..7d7d340ee88a 100644
--- a/devel/ruby-metaruby/pkg-plist
+++ b/devel/ruby-metaruby/pkg-plist
@@ -12,12 +12,12 @@
 %%RUBY_SITELIBDIR%%/lgram/Marshal.rb
 @dirrm %%RUBY_SITELIBDIR%%/Hollow
 @dirrm %%RUBY_SITELIBDIR%%/lgram
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/metaruby/BitArray.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/metaruby/ProcAsArray.rb
-%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/metaruby
-%%PORTDOCS%%%%RUBY_DOCDIR%%/metaruby/ChangeLog
-%%PORTDOCS%%%%RUBY_DOCDIR%%/metaruby/Hollow.txt
-%%PORTDOCS%%%%RUBY_DOCDIR%%/metaruby/LGram.txt
-%%PORTDOCS%%%%RUBY_DOCDIR%%/metaruby/Overview
-%%PORTDOCS%%%%RUBY_DOCDIR%%/metaruby/TODO
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/metaruby
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/BitArray.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/ProcAsArray.rb
+%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ChangeLog
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/Hollow.txt
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/LGram.txt
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/Overview
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/TODO
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%
diff --git a/devel/ruby-mmap/Makefile b/devel/ruby-mmap/Makefile
index 7dac75fc7e1f..355cd79a31e9 100644
--- a/devel/ruby-mmap/Makefile
+++ b/devel/ruby-mmap/Makefile
@@ -36,13 +36,13 @@ post-build:
 
 post-install:
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${RUBY_EXAMPLESDIR}/${PORTNAME}/
+	${MKDIR} ${RUBY_MODEXAMPLESDIR}/
 .for f in ${EXAMPLES}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_EXAMPLESDIR}/${PORTNAME}/
+	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_MODEXAMPLESDIR}/
 .endfor
-	${MKDIR} ${RUBY_DOCDIR}/${PORTNAME}
+	${MKDIR} ${RUBY_MODDOCDIR}
 .for f in ${DOCS}
-	${CP} -R ${WRKSRC}/${f} ${RUBY_DOCDIR}/${PORTNAME}/
+	${CP} -R ${WRKSRC}/${f} ${RUBY_MODDOCDIR}/
 .endfor
 .endif
 
diff --git a/devel/ruby-mmap/pkg-plist b/devel/ruby-mmap/pkg-plist
index b2f472cba11c..0030a70eab1f 100644
--- a/devel/ruby-mmap/pkg-plist
+++ b/devel/ruby-mmap/pkg-plist
@@ -1,84 +1,84 @@
 %%RUBY_SITEARCHLIBDIR%%/mmap.so
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/mmap/b.rb
-%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/mmap
-%%PORTDOCS%%%%RUBY_DOCDIR%%/mmap/Changes
-%%PORTDOCS%%%%RUBY_DOCDIR%%/mmap/README.en
-%%PORTDOCS%%%%RUBY_DOCDIR%%/mmap/mmap.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/mmap/mmap.rd
-%%PORTDOCS%%%%RUBY_DOCDIR%%/mmap/doc/classes/Mmap.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/mmap/doc/classes/Mmap.src/M000001.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/mmap/doc/classes/Mmap.src/M000002.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/mmap/doc/classes/Mmap.src/M000003.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/mmap/doc/classes/Mmap.src/M000004.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/mmap/doc/classes/Mmap.src/M000005.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/mmap/doc/classes/Mmap.src/M000006.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/mmap/doc/classes/Mmap.src/M000007.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/mmap/doc/classes/Mmap.src/M000008.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/mmap/doc/classes/Mmap.src/M000009.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/mmap/doc/classes/Mmap.src/M000010.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/mmap/doc/classes/Mmap.src/M000011.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/mmap/doc/classes/Mmap.src/M000012.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/mmap/doc/classes/Mmap.src/M000013.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/mmap/doc/classes/Mmap.src/M000014.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/mmap/doc/classes/Mmap.src/M000015.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/mmap/doc/classes/Mmap.src/M000016.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/mmap/doc/classes/Mmap.src/M000017.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/mmap/doc/classes/Mmap.src/M000018.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/mmap/doc/classes/Mmap.src/M000019.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/mmap/doc/classes/Mmap.src/M000020.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/mmap/doc/classes/Mmap.src/M000021.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/mmap/doc/classes/Mmap.src/M000022.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/mmap/doc/classes/Mmap.src/M000023.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/mmap/doc/classes/Mmap.src/M000024.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/mmap/doc/classes/Mmap.src/M000025.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/mmap/doc/classes/Mmap.src/M000026.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/mmap/doc/classes/Mmap.src/M000027.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/mmap/doc/classes/Mmap.src/M000028.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/mmap/doc/classes/Mmap.src/M000029.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/mmap/doc/classes/Mmap.src/M000030.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/mmap/doc/classes/Mmap.src/M000031.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/mmap/doc/classes/Mmap.src/M000032.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/mmap/doc/classes/Mmap.src/M000033.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/mmap/doc/classes/Mmap.src/M000034.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/mmap/doc/classes/Mmap.src/M000035.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/mmap/doc/classes/Mmap.src/M000036.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/mmap/doc/classes/Mmap.src/M000037.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/mmap/doc/classes/Mmap.src/M000038.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/mmap/doc/classes/Mmap.src/M000039.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/mmap/doc/classes/Mmap.src/M000040.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/mmap/doc/classes/Mmap.src/M000041.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/mmap/doc/classes/Mmap.src/M000042.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/mmap/doc/classes/Mmap.src/M000043.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/mmap/doc/classes/Mmap.src/M000044.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/mmap/doc/classes/Mmap.src/M000045.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/mmap/doc/classes/Mmap.src/M000046.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/mmap/doc/classes/Mmap.src/M000047.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/mmap/doc/classes/Mmap.src/M000048.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/mmap/doc/classes/Mmap.src/M000049.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/mmap/doc/classes/Mmap.src/M000050.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/mmap/doc/classes/Mmap.src/M000051.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/mmap/doc/classes/Mmap.src/M000052.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/mmap/doc/classes/Mmap.src/M000053.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/mmap/doc/classes/Mmap.src/M000054.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/mmap/doc/classes/Mmap.src/M000055.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/mmap/doc/classes/Mmap.src/M000056.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/mmap/doc/classes/Mmap.src/M000057.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/mmap/doc/classes/Mmap.src/M000058.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/mmap/doc/classes/Mmap.src/M000059.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/mmap/doc/classes/Mmap.src/M000060.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/mmap/doc/classes/Mmap.src/M000061.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/mmap/doc/classes/Mmap.src/M000062.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/mmap/doc/classes/Mmap.src/M000063.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/mmap/doc/classes/Mmap.src/M000064.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/mmap/doc/created.rid
-%%PORTDOCS%%%%RUBY_DOCDIR%%/mmap/doc/files/mmap_rb.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/mmap/doc/fr_class_index.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/mmap/doc/fr_file_index.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/mmap/doc/fr_method_index.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/mmap/doc/index.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/mmap/doc/rdoc-style.css
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/mmap/doc/files
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/mmap/doc/classes/Mmap.src
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/mmap/doc/classes
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/mmap/doc
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/mmap
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/b.rb
+%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/Changes
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/README.en
+%%PORTDOCS%%%%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
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Mmap.src/M000002.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Mmap.src/M000003.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Mmap.src/M000004.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Mmap.src/M000005.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Mmap.src/M000006.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Mmap.src/M000007.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Mmap.src/M000008.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Mmap.src/M000009.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Mmap.src/M000010.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Mmap.src/M000011.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Mmap.src/M000012.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Mmap.src/M000013.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Mmap.src/M000014.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Mmap.src/M000015.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Mmap.src/M000016.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Mmap.src/M000017.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Mmap.src/M000018.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Mmap.src/M000019.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Mmap.src/M000020.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Mmap.src/M000021.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Mmap.src/M000022.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Mmap.src/M000023.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Mmap.src/M000024.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Mmap.src/M000025.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Mmap.src/M000026.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Mmap.src/M000027.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Mmap.src/M000028.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Mmap.src/M000029.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Mmap.src/M000030.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Mmap.src/M000031.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Mmap.src/M000032.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Mmap.src/M000033.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Mmap.src/M000034.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Mmap.src/M000035.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Mmap.src/M000036.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Mmap.src/M000037.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Mmap.src/M000038.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Mmap.src/M000039.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Mmap.src/M000040.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Mmap.src/M000041.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Mmap.src/M000042.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Mmap.src/M000043.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Mmap.src/M000044.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Mmap.src/M000045.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Mmap.src/M000046.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Mmap.src/M000047.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Mmap.src/M000048.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Mmap.src/M000049.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Mmap.src/M000050.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Mmap.src/M000051.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Mmap.src/M000052.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Mmap.src/M000053.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Mmap.src/M000054.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Mmap.src/M000055.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Mmap.src/M000056.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Mmap.src/M000057.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Mmap.src/M000058.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Mmap.src/M000059.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Mmap.src/M000060.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Mmap.src/M000061.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Mmap.src/M000062.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Mmap.src/M000063.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Mmap.src/M000064.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/created.rid
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/files/mmap_rb.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/fr_class_index.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/fr_file_index.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/fr_method_index.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/index.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/rdoc-style.css
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/doc/files
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/doc/classes/Mmap.src
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/doc/classes
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/doc
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%
diff --git a/devel/ruby-mock/Makefile b/devel/ruby-mock/Makefile
index ce441ea02636..0a3f3f9c174d 100644
--- a/devel/ruby-mock/Makefile
+++ b/devel/ruby-mock/Makefile
@@ -27,10 +27,10 @@ post-patch:
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/mock.rb ${RUBY_SITELIBDIR}/
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${RUBY_EXAMPLESDIR}/${PORTNAME}
-	${INSTALL_DATA} ${WRKSRC}/demo/* ${RUBY_EXAMPLESDIR}/${PORTNAME}/
-	${MKDIR} ${RUBY_DOCDIR}/${PORTNAME}
-	${INSTALL_DATA} ${WRKSRC}/README ${RUBY_DOCDIR}/${PORTNAME}/
+	${MKDIR} ${RUBY_MODEXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/demo/* ${RUBY_MODEXAMPLESDIR}/
+	${MKDIR} ${RUBY_MODDOCDIR}
+	${INSTALL_DATA} ${WRKSRC}/README ${RUBY_MODDOCDIR}/
 .endif
 
 .include <bsd.port.mk>
diff --git a/devel/ruby-mock/pkg-plist b/devel/ruby-mock/pkg-plist
index ba303f39d72e..d6db70754532 100644
--- a/devel/ruby-mock/pkg-plist
+++ b/devel/ruby-mock/pkg-plist
@@ -1,6 +1,6 @@
 %%RUBY_SITELIBDIR%%/mock.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/mock/demo_mock.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/mock/demo_mock_class.rb
-%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/mock
-%%PORTDOCS%%%%RUBY_DOCDIR%%/mock/README
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/mock
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/demo_mock.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/demo_mock_class.rb
+%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/README
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%
diff --git a/devel/ruby-ncurses/Makefile b/devel/ruby-ncurses/Makefile
index a66d7f05f710..07799f9683fe 100644
--- a/devel/ruby-ncurses/Makefile
+++ b/devel/ruby-ncurses/Makefile
@@ -30,12 +30,12 @@ post-extract:
 
 post-install:
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${RUBY_DOCDIR}/${PORTNAME}
+	${MKDIR} ${RUBY_MODDOCDIR}
 .for f in ${DOCS}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_DOCDIR}/${PORTNAME}/
+	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_MODDOCDIR}/
 .endfor
-	${MKDIR} ${RUBY_EXAMPLESDIR}/${PORTNAME}
-	${INSTALL_DATA} ${WRKSRC}/examples/* ${RUBY_EXAMPLESDIR}/${PORTNAME}/
+	${MKDIR} ${RUBY_MODEXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/examples/* ${RUBY_MODEXAMPLESDIR}/
 .endif
 
 .include <bsd.port.mk>
diff --git a/devel/ruby-ncurses/pkg-plist b/devel/ruby-ncurses/pkg-plist
index 736f1123bf72..07118c0b9d56 100644
--- a/devel/ruby-ncurses/pkg-plist
+++ b/devel/ruby-ncurses/pkg-plist
@@ -1,12 +1,12 @@
 %%RUBY_SITEARCHLIBDIR%%/ncurses.so
 %%RUBY_SITELIBDIR%%/ncurses.rb
-%%PORTDOCS%%%%RUBY_DOCDIR%%/ncurses/README
-%%PORTDOCS%%%%RUBY_DOCDIR%%/ncurses/THANKS
-%%PORTDOCS%%%%RUBY_DOCDIR%%/ncurses/TODO
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/ncurses
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/ncurses/LICENSES_for_examples
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/ncurses/example.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/ncurses/hello_ncurses.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/ncurses/rain.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/ncurses/tclock.rb
-%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/ncurses
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/README
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/THANKS
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/TODO
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/LICENSES_for_examples
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/example.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/hello_ncurses.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/rain.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/tclock.rb
+%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%
diff --git a/devel/ruby-pcsc-lite/Makefile b/devel/ruby-pcsc-lite/Makefile
index 3f92e0c3034d..77360506e099 100644
--- a/devel/ruby-pcsc-lite/Makefile
+++ b/devel/ruby-pcsc-lite/Makefile
@@ -28,13 +28,13 @@ EXAMPLES=	examples/test.rb examples/pcsclient.rb
 
 post-install:
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${RUBY_DOCDIR}/${PORTNAME}/
-	${MKDIR} ${RUBY_EXAMPLESDIR}/${PORTNAME}/
+	${MKDIR} ${RUBY_MODDOCDIR}/
+	${MKDIR} ${RUBY_MODEXAMPLESDIR}/
 .for f in ${DOCS}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_DOCDIR}/${PORTNAME}/
+	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_MODDOCDIR}/
 .endfor
 .for f in ${EXAMPLES}
-	${INSTALL_SCRIPT} ${WRKSRC}/${f} ${RUBY_EXAMPLESDIR}/${PORTNAME}/
+	${INSTALL_SCRIPT} ${WRKSRC}/${f} ${RUBY_MODEXAMPLESDIR}/
 .endfor
 .endif
 
diff --git a/devel/ruby-pcsc-lite/pkg-plist b/devel/ruby-pcsc-lite/pkg-plist
index 2b904ea9d466..0093c4ba1bd0 100644
--- a/devel/ruby-pcsc-lite/pkg-plist
+++ b/devel/ruby-pcsc-lite/pkg-plist
@@ -1,6 +1,6 @@
 %%RUBY_ARCHLIBDIR%%/PCSC.so
-%%PORTDOCS%%%%RUBY_DOCDIR%%/pcsc-lite/README.txt
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/pcsc-lite/test.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/pcsc-lite/pcsclient.rb
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/pcsc-lite
-%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/pcsc-lite
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/README.txt
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/pcsclient.rb
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%
+%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%
diff --git a/devel/ruby-property/Makefile b/devel/ruby-property/Makefile
index e51ab424f625..68012f339e36 100644
--- a/devel/ruby-property/Makefile
+++ b/devel/ruby-property/Makefile
@@ -27,12 +27,12 @@ post-patch:
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/property.rb ${RUBY_SITELIBDIR}
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${RUBY_DOCDIR}/property/ja
+	${MKDIR} ${RUBY_MODDOCDIR}/ja
 .for f in property-example.rb test.default property.README Properties.html rubyapi.css
-	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_DOCDIR}/property
+	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_MODDOCDIR}
 .endfor
 .for f in property.README.ja Properties-ja.html
-	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_DOCDIR}/property/ja
+	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_MODDOCDIR}/ja
 .endfor
 .endif
 
diff --git a/devel/ruby-property/pkg-plist b/devel/ruby-property/pkg-plist
index d15cf51fcf86..efa764367924 100644
--- a/devel/ruby-property/pkg-plist
+++ b/devel/ruby-property/pkg-plist
@@ -1,10 +1,10 @@
 %%RUBY_SITELIBDIR%%/property.rb
-%%PORTDOCS%%%%RUBY_DOCDIR%%/property/property-example.rb
-%%PORTDOCS%%%%RUBY_DOCDIR%%/property/test.default
-%%PORTDOCS%%%%RUBY_DOCDIR%%/property/property.README
-%%PORTDOCS%%%%RUBY_DOCDIR%%/property/Properties.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/property/rubyapi.css
-%%PORTDOCS%%%%RUBY_DOCDIR%%/property/ja/property.README.ja
-%%PORTDOCS%%%%RUBY_DOCDIR%%/property/ja/Properties-ja.html
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/property/ja
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/property
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/property-example.rb
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/test.default
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/property.README
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/Properties.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/rubyapi.css
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/property.README.ja
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/Properties-ja.html
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/ja
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%
diff --git a/devel/ruby-racc/Makefile b/devel/ruby-racc/Makefile
index 5e07835d38f5..3786a6d05ff6 100644
--- a/devel/ruby-racc/Makefile
+++ b/devel/ruby-racc/Makefile
@@ -30,11 +30,11 @@ post-extract:
 
 do-install:
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${RUBY_EXAMPLESDIR}/${PORTNAME}
-	${INSTALL_DATA} ${WRKDIR_RACC}/sample/* ${RUBY_EXAMPLESDIR}/${PORTNAME}/
-	${MKDIR} ${RUBY_DOCDIR}/${PORTNAME}/ja
-	${INSTALL_DATA} ${WRKDIR_RACC}/doc.en/* ${RUBY_DOCDIR}/${PORTNAME}/
-	${INSTALL_DATA} ${WRKDIR_RACC}/doc.ja/* ${RUBY_DOCDIR}/${PORTNAME}/ja/
+	${MKDIR} ${RUBY_MODEXAMPLESDIR}
+	${INSTALL_DATA} ${WRKDIR_RACC}/sample/* ${RUBY_MODEXAMPLESDIR}/
+	${MKDIR} ${RUBY_MODDOCDIR}/ja
+	${INSTALL_DATA} ${WRKDIR_RACC}/doc.en/* ${RUBY_MODDOCDIR}/
+	${INSTALL_DATA} ${WRKDIR_RACC}/doc.ja/* ${RUBY_MODDOCDIR}/ja/
 .endif
 
 .include <bsd.port.mk>
diff --git a/devel/ruby-racc/pkg-plist b/devel/ruby-racc/pkg-plist
index 1af0db9ba4c3..68a829809249 100644
--- a/devel/ruby-racc/pkg-plist
+++ b/devel/ruby-racc/pkg-plist
@@ -11,32 +11,32 @@ bin/y2racc
 %%RUBY_SITELIBDIR%%/racc/rubyloader.rb
 %%RUBY_SITELIBDIR%%/racc/state.rb
 %%RUBY_SITELIBDIR%%/racc/ucodep.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/racc/array.y
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/racc/array2.y
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/racc/calc-ja.y
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/racc/calc.y
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/racc/conflict.y
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/racc/hash.y
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/racc/lalr.y
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/racc/lists.y
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/racc/syntax.y
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/racc/yyerr.y
-%%PORTDOCS%%%%RUBY_DOCDIR%%/racc/ja/changes.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/racc/ja/command.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/racc/ja/debug.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/racc/ja/grammar.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/racc/ja/index.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/racc/ja/notes.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/racc/ja/parser.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/racc/ja/usage.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/racc/changes.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/racc/command.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/racc/debug.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/racc/grammar.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/racc/index.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/racc/notes.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/racc/parser.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/racc/usage.html
-%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/racc
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/racc/ja
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/racc
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/array.y
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/array2.y
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/calc-ja.y
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/calc.y
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/conflict.y
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/hash.y
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/lalr.y
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/lists.y
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/syntax.y
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/yyerr.y
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/changes.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/command.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/debug.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/grammar.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/index.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/notes.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/parser.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/usage.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/changes.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/command.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/debug.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/grammar.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/index.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/notes.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/parser.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/usage.html
+%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/ja
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%
diff --git a/devel/ruby-rbison/Makefile b/devel/ruby-rbison/Makefile
index d6a50cec7215..e39489e97c4d 100644
--- a/devel/ruby-rbison/Makefile
+++ b/devel/ruby-rbison/Makefile
@@ -29,13 +29,13 @@ NO_BUILD=	yes
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/rbison ${PREFIX}/bin/
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${RUBY_EXAMPLESDIR}/rbison
+	${MKDIR} ${RUBY_MODEXAMPLESDIR}
 .for f in ${EXAMPLES}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_EXAMPLESDIR}/rbison/
+	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_MODEXAMPLESDIR}/
 .endfor
-	${MKDIR} ${RUBY_DOCDIR}/rbison
+	${MKDIR} ${RUBY_MODDOCDIR}
 .for f in ${DOCS}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_DOCDIR}/rbison/
+	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_MODDOCDIR}/
 .endfor
 .endif
 
diff --git a/devel/ruby-rbison/pkg-plist b/devel/ruby-rbison/pkg-plist
index 4ca83249d7db..ce8e612f1555 100644
--- a/devel/ruby-rbison/pkg-plist
+++ b/devel/ruby-rbison/pkg-plist
@@ -1,10 +1,10 @@
 bin/rbison
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/rbison/CalcFileLexer.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/rbison/CalcStringLexer.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/rbison/calc.in
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/rbison/calc.ry
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/rbison/calc_test.rb
-%%PORTDOCS%%%%RUBY_DOCDIR%%/rbison/ChangeLog
-%%PORTDOCS%%%%RUBY_DOCDIR%%/rbison/README
-%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/rbison
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/rbison
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/CalcFileLexer.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/CalcStringLexer.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/calc.in
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/calc.ry
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/calc_test.rb
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ChangeLog
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/README
+%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%
diff --git a/devel/ruby-rbtree/Makefile b/devel/ruby-rbtree/Makefile
index c1657afae6d7..9a9bdddd724a 100644
--- a/devel/ruby-rbtree/Makefile
+++ b/devel/ruby-rbtree/Makefile
@@ -24,9 +24,9 @@ DOCS=		ChangeLog LICENSE README
 
 post-install:
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${RUBY_DOCDIR}/${PORTNAME}
+	${MKDIR} ${RUBY_MODDOCDIR}
 .for f in ${DOCS}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_DOCDIR}/${PORTNAME}/
+	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_MODDOCDIR}/
 .endfor
 .endif
 
diff --git a/devel/ruby-rbtree/pkg-plist b/devel/ruby-rbtree/pkg-plist
index 6c0a502530c0..9c2dc55dc41e 100644
--- a/devel/ruby-rbtree/pkg-plist
+++ b/devel/ruby-rbtree/pkg-plist
@@ -1,5 +1,5 @@
 %%RUBY_SITEARCHLIBDIR%%/rbtree.so
-%%PORTDOCS%%%%RUBY_DOCDIR%%/rbtree/ChangeLog
-%%PORTDOCS%%%%RUBY_DOCDIR%%/rbtree/LICENSE
-%%PORTDOCS%%%%RUBY_DOCDIR%%/rbtree/README
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/rbtree
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ChangeLog
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/LICENSE
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/README
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%
diff --git a/devel/ruby-rreadline/Makefile b/devel/ruby-rreadline/Makefile
index 080a6e7a64cf..1a5ef1a450c8 100644
--- a/devel/ruby-rreadline/Makefile
+++ b/devel/ruby-rreadline/Makefile
@@ -26,12 +26,12 @@ post-extract:
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}/*.rb ${RUBY_SITELIBDIR}/
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${RUBY_EXAMPLESDIR}/${PORTNAME}/rbsh
-	${INSTALL_SCRIPT} ${WRKSRC}/rbsh ${RUBY_EXAMPLESDIR}/${PORTNAME}/rbsh/
-	${INSTALL_DATA}  ${WRKSRC}/samples/rbsh/*.rb ${RUBY_EXAMPLESDIR}/${PORTNAME}/rbsh/
-	${MKDIR} ${RUBY_DOCDIR}/${PORTNAME}/ja
-	${INSTALL_DATA}  ${WRKSRC}/README ${RUBY_DOCDIR}/${PORTNAME}/
-	${INSTALL_DATA}  ${WRKSRC}/README.ja ${RUBY_DOCDIR}/${PORTNAME}/ja/
+	${MKDIR} ${RUBY_MODEXAMPLESDIR}/rbsh
+	${INSTALL_SCRIPT} ${WRKSRC}/rbsh ${RUBY_MODEXAMPLESDIR}/rbsh/
+	${INSTALL_DATA}  ${WRKSRC}/samples/rbsh/*.rb ${RUBY_MODEXAMPLESDIR}/rbsh/
+	${MKDIR} ${RUBY_MODDOCDIR}/ja
+	${INSTALL_DATA}  ${WRKSRC}/README ${RUBY_MODDOCDIR}/
+	${INSTALL_DATA}  ${WRKSRC}/README.ja ${RUBY_MODDOCDIR}/ja/
 .endif
 
 .include <bsd.port.mk>
diff --git a/devel/ruby-rreadline/pkg-plist b/devel/ruby-rreadline/pkg-plist
index 002cb4cf143d..c52101082dea 100644
--- a/devel/ruby-rreadline/pkg-plist
+++ b/devel/ruby-rreadline/pkg-plist
@@ -8,14 +8,14 @@
 %%RUBY_SITELIBDIR%%/RReadline.rb
 %%RUBY_SITELIBDIR%%/StringUtil.rb
 %%RUBY_SITELIBDIR%%/Terminal.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/rreadline/rbsh/rbsh
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/rreadline/rbsh/ContextualExecutables.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/rreadline/rbsh/RubyShell.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/rreadline/rbsh/ShellExecutables.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/rreadline/rbsh/UnixDirectoryClient.rb
-%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/rreadline/rbsh
-%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/rreadline
-%%PORTDOCS%%%%RUBY_DOCDIR%%/rreadline/README
-%%PORTDOCS%%%%RUBY_DOCDIR%%/rreadline/ja/README.ja
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/rreadline/ja
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/rreadline
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/rbsh/rbsh
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/rbsh/ContextualExecutables.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/rbsh/RubyShell.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/rbsh/ShellExecutables.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/rbsh/UnixDirectoryClient.rb
+%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%/rbsh
+%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/README
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/README.ja
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/ja
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%
diff --git a/devel/ruby-rudl/Makefile b/devel/ruby-rudl/Makefile
index e5f220908362..c5f87cfba2f3 100644
--- a/devel/ruby-rudl/Makefile
+++ b/devel/ruby-rudl/Makefile
@@ -33,11 +33,11 @@ post-patch:
 
 post-install:
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${RUBY_EXAMPLESDIR}/${PORTNAME}
-	${INSTALL_DATA} ${WRKSRC}/samples/* ${RUBY_EXAMPLESDIR}/${PORTNAME}/
-	${MKDIR} ${RUBY_DOCDIR}/${PORTNAME}
+	${MKDIR} ${RUBY_MODEXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/samples/* ${RUBY_MODEXAMPLESDIR}/
+	${MKDIR} ${RUBY_MODDOCDIR}
 .for f in ${DOCS}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_DOCDIR}/${PORTNAME}/
+	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_MODDOCDIR}/
 .endfor
 .endif
 
diff --git a/devel/ruby-rudl/pkg-plist b/devel/ruby-rudl/pkg-plist
index eccc05b54b94..5954ece252bf 100644
--- a/devel/ruby-rudl/pkg-plist
+++ b/devel/ruby-rudl/pkg-plist
@@ -1,20 +1,20 @@
 %%RUBY_SITEARCHLIBDIR%%/RUDL.so
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/rudl/bounce.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/rudl/bounceme.bmp
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/rudl/crap.xm
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/rudl/crapola.bmp
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/rudl/crapola.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/rudl/joystick.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/rudl/mousecursor.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/rudl/music.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/rudl/pixelaccess.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/rudl/pong.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/rudl/pong_bip.wav
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/rudl/pong_blerpblerp.wav
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/rudl/pong_bop.wav
-%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/rudl
-%%PORTDOCS%%%%RUBY_DOCDIR%%/rudl/INSTALL.txt
-%%PORTDOCS%%%%RUBY_DOCDIR%%/rudl/LICENSE.txt
-%%PORTDOCS%%%%RUBY_DOCDIR%%/rudl/README.txt
-%%PORTDOCS%%%%RUBY_DOCDIR%%/rudl/WARRANTY.txt
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/rudl
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/bounce.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/bounceme.bmp
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/crap.xm
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/crapola.bmp
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/crapola.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/joystick.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/mousecursor.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/music.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/pixelaccess.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/pong.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/pong_bip.wav
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/pong_blerpblerp.wav
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/pong_bop.wav
+%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/INSTALL.txt
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/LICENSE.txt
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/README.txt
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/WARRANTY.txt
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%
diff --git a/devel/ruby-sdl/Makefile b/devel/ruby-sdl/Makefile
index 17467a043588..62de45cd706c 100644
--- a/devel/ruby-sdl/Makefile
+++ b/devel/ruby-sdl/Makefile
@@ -61,14 +61,14 @@ post-build:
 
 post-install:
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${RUBY_EXAMPLESDIR}/${PORTNAME}
-	${INSTALL_DATA} ${WRKSRC}/sample/* ${RUBY_EXAMPLESDIR}/${PORTNAME}/
-	${MKDIR} ${RUBY_DOCDIR}/${PORTNAME}/ja
+	${MKDIR} ${RUBY_MODEXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/sample/* ${RUBY_MODEXAMPLESDIR}/
+	${MKDIR} ${RUBY_MODDOCDIR}/ja
 .for f in ${DOCS_EN}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_DOCDIR}/${PORTNAME}/
+	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_MODDOCDIR}/
 .endfor
 .for f in ${DOCS_JA}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_DOCDIR}/${PORTNAME}/ja/
+	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_MODDOCDIR}/ja/
 .endfor
 .endif
 
diff --git a/devel/ruby-sdl/pkg-plist b/devel/ruby-sdl/pkg-plist
index 0ee5110b628a..a520a6794b8d 100644
--- a/devel/ruby-sdl/pkg-plist
+++ b/devel/ruby-sdl/pkg-plist
@@ -1,35 +1,35 @@
 %%RUBY_SITEARCHLIBDIR%%/sdl.so
 %%RUBY_SITELIBDIR%%/rubysdl_aliases.rb
 %%RUBY_SITELIBDIR%%/sdl.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/sdl/alpha.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/sdl/cdrom.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/sdl/cursor.bmp
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/sdl/cursor.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/sdl/event2.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/sdl/font.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/sdl/icon.bmp
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/sdl/joy.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/sdl/joy2.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/sdl/movesp.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/sdl/playmod.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/sdl/plaympeg.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/sdl/playwave.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/sdl/randrect.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/sdl/rotate.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/sdl/sdlskk.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/sdl/sgetest.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/sdl/testgl.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/sdl/testsprite.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/sdl/transformblit.rb
-%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/sdl
-%%PORTDOCS%%%%RUBY_DOCDIR%%/sdl/NEWS.en
-%%PORTDOCS%%%%RUBY_DOCDIR%%/sdl/README.en
-%%PORTDOCS%%%%RUBY_DOCDIR%%/sdl/rubysdl_const_list.txt
-%%PORTDOCS%%%%RUBY_DOCDIR%%/sdl/rubysdl_doc.en.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/sdl/rubysdl_doc.en.rd
-%%PORTDOCS%%%%RUBY_DOCDIR%%/sdl/ja/NEWS.ja
-%%PORTDOCS%%%%RUBY_DOCDIR%%/sdl/ja/README.ja
-%%PORTDOCS%%%%RUBY_DOCDIR%%/sdl/ja/rubysdl_doc.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/sdl/ja/rubysdl_doc.rd
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/sdl/ja
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/sdl
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/alpha.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/cdrom.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/cursor.bmp
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/cursor.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/event2.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/font.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/icon.bmp
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/joy.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/joy2.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/movesp.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/playmod.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/plaympeg.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/playwave.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/randrect.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/rotate.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/sdlskk.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/sgetest.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/testgl.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/testsprite.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/transformblit.rb
+%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%
+%%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_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_MODDOCDIR%%/ja/rubysdl_doc.rd
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/ja
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%
diff --git a/devel/ruby-setup.rb/Makefile b/devel/ruby-setup.rb/Makefile
index 87b057c5e70d..be96c5e2ef83 100644
--- a/devel/ruby-setup.rb/Makefile
+++ b/devel/ruby-setup.rb/Makefile
@@ -40,12 +40,12 @@ do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/ruby-${f} ${PREFIX}/bin/
 .endfor
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${RUBY_DOCDIR}/${PORTNAME}/ja
+	${MKDIR} ${RUBY_MODDOCDIR}/ja
 .for f in ${DOCS_EN}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_DOCDIR}/${PORTNAME}/
+	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_MODDOCDIR}/
 .endfor
 .for f in ${DOCS_JA}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_DOCDIR}/${PORTNAME}/ja/
+	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_MODDOCDIR}/ja/
 .endfor
 .endif
 
diff --git a/devel/ruby-setup.rb/pkg-plist b/devel/ruby-setup.rb/pkg-plist
index 1126a65a0433..ffb33167642a 100644
--- a/devel/ruby-setup.rb/pkg-plist
+++ b/devel/ruby-setup.rb/pkg-plist
@@ -2,21 +2,21 @@ bin/ruby-install.rb
 bin/ruby-setup.rb
 %%RUBY_SITELIBDIR%%/install.rb
 %%RUBY_SITELIBDIR%%/setup.rb
-%%PORTDOCS%%%%RUBY_DOCDIR%%/setup.rb/changes.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/setup.rb/devel.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/setup.rb/hookapi.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/setup.rb/index.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/setup.rb/metaconfapi.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/setup.rb/notes.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/setup.rb/usage-en.txt
-%%PORTDOCS%%%%RUBY_DOCDIR%%/setup.rb/usage.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/setup.rb/ja/changes.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/setup.rb/ja/devel.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/setup.rb/ja/hookapi.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/setup.rb/ja/index.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/setup.rb/ja/metaconfapi.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/setup.rb/ja/notes.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/setup.rb/ja/usage-ja.txt
-%%PORTDOCS%%%%RUBY_DOCDIR%%/setup.rb/ja/usage.html
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/setup.rb/ja
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/setup.rb
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/changes.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/devel.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/hookapi.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/index.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/metaconfapi.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/notes.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/usage-en.txt
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/usage.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/changes.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/devel.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/hookapi.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/index.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/metaconfapi.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/notes.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/usage-ja.txt
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/usage.html
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/ja
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%
diff --git a/devel/ruby-slang/Makefile b/devel/ruby-slang/Makefile
index e058e674d1cd..94dc1847a3a2 100644
--- a/devel/ruby-slang/Makefile
+++ b/devel/ruby-slang/Makefile
@@ -45,19 +45,19 @@ PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
 
 post-install:
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${RUBY_EXAMPLESDIR}/slang/ja
+	${MKDIR} ${RUBY_MODEXAMPLESDIR}/ja
 .for f in ${EXAMPLES_EN}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_EXAMPLESDIR}/slang/
+	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_MODEXAMPLESDIR}/
 .endfor
 .for f in ${EXAMPLES_JA}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_EXAMPLESDIR}/slang/ja/
+	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_MODEXAMPLESDIR}/ja/
 .endfor
-	${MKDIR} ${RUBY_DOCDIR}/slang/ja
+	${MKDIR} ${RUBY_MODDOCDIR}/ja
 .for f in ${DOCS_EN}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_DOCDIR}/slang/
+	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_MODDOCDIR}/
 .endfor
 .for f in ${DOCS_JA}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_DOCDIR}/slang/ja/
+	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_MODDOCDIR}/ja/
 .endfor
 .endif
 
diff --git a/devel/ruby-slang/pkg-plist b/devel/ruby-slang/pkg-plist
index d364f4586d65..ff2b975b8379 100644
--- a/devel/ruby-slang/pkg-plist
+++ b/devel/ruby-slang/pkg-plist
@@ -1,13 +1,13 @@
 %%RUBY_SITEARCHLIBDIR%%/slanglib.so
 %%RUBY_SITELIBDIR%%/slang.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/slang/fm.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/slang/smgtest.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/slang/urlview.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/slang/ja/pager.rb
-%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/slang/ja
-%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/slang
-%%PORTDOCS%%%%RUBY_DOCDIR%%/slang/README
-%%PORTDOCS%%%%RUBY_DOCDIR%%/slang/changes.txt
-%%PORTDOCS%%%%RUBY_DOCDIR%%/slang/ja/README.euc
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/slang/ja
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/slang
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/fm.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/smgtest.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/urlview.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/ja/pager.rb
+%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%/ja
+%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/README
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/changes.txt
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/README.euc
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/ja
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%
diff --git a/devel/ruby-sysvipc/Makefile b/devel/ruby-sysvipc/Makefile
index 2c637ec8ec0a..7a04e3550dcd 100644
--- a/devel/ruby-sysvipc/Makefile
+++ b/devel/ruby-sysvipc/Makefile
@@ -30,9 +30,9 @@ post-build:
 
 post-install:
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${RUBY_DOCDIR}/${PORTNAME}
+	${MKDIR} ${RUBY_MODDOCDIR}
 .for f in ${DOCS}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_DOCDIR}/${PORTNAME}/
+	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_MODDOCDIR}/
 .endfor
 .endif
 
diff --git a/devel/ruby-sysvipc/pkg-plist b/devel/ruby-sysvipc/pkg-plist
index 3ae29bde3a89..9d34e6c50276 100644
--- a/devel/ruby-sysvipc/pkg-plist
+++ b/devel/ruby-sysvipc/pkg-plist
@@ -1,4 +1,4 @@
 %%RUBY_SITEARCHLIBDIR%%/sysvipc.so
-%%PORTDOCS%%%%RUBY_DOCDIR%%/sysvipc/sysvipc.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/sysvipc/sysvipc.rd
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/sysvipc
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/sysvipc.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/sysvipc.rd
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%
diff --git a/devel/ruby-testunit/Makefile b/devel/ruby-testunit/Makefile
index 658735b4e615..1075a48b4d2a 100644
--- a/devel/ruby-testunit/Makefile
+++ b/devel/ruby-testunit/Makefile
@@ -30,13 +30,13 @@ PLIST_SUB+=	RUNIT_COMPAT:=""
 
 post-install:
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${RUBY_EXAMPLESDIR}/${PORTNAME}
+	${MKDIR} ${RUBY_MODEXAMPLESDIR}
 .for f in ${EXAMPLES}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_EXAMPLESDIR}/${PORTNAME}/
+	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_MODEXAMPLESDIR}/
 .endfor
-	${MKDIR} ${RUBY_DOCDIR}/${PORTNAME}
+	${MKDIR} ${RUBY_MODDOCDIR}
 .for f in ${DOCS}
-	${CP} -R ${WRKSRC}/${f} ${RUBY_DOCDIR}/${PORTNAME}/
+	${CP} -R ${WRKSRC}/${f} ${RUBY_MODDOCDIR}/
 .endfor
 .endif
 
diff --git a/devel/ruby-testunit/pkg-plist b/devel/ruby-testunit/pkg-plist
index d7ab90c0cfc0..5706ba3d876c 100644
--- a/devel/ruby-testunit/pkg-plist
+++ b/devel/ruby-testunit/pkg-plist
@@ -31,169 +31,169 @@
 %%RUNIT_COMPAT:%%%%RUBY_SITELIBDIR%%/runit/topublic.rb
 %%RUNIT_COMPAT:%%@dirrm %%RUBY_SITELIBDIR%%/runit/cui
 %%RUNIT_COMPAT:%%@dirrm %%RUBY_SITELIBDIR%%/runit
-%%PORTDOCS%%%%RUBY_DOCDIR%%/testunit/ChangeLog
-%%PORTDOCS%%%%RUBY_DOCDIR%%/testunit/README
-%%PORTDOCS%%%%RUBY_DOCDIR%%/testunit/TODO
-%%PORTDOCS%%%%RUBY_DOCDIR%%/testunit/doc/classes/Test.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/testunit/doc/classes/Test/Unit.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/testunit/doc/classes/Test/Unit/AssertionFailedError.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/testunit/doc/classes/Test/Unit/Assertions.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/testunit/doc/classes/Test/Unit/Assertions.src/M000001.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/testunit/doc/classes/Test/Unit/Assertions.src/M000002.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/testunit/doc/classes/Test/Unit/Assertions.src/M000003.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/testunit/doc/classes/Test/Unit/Assertions.src/M000004.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/testunit/doc/classes/Test/Unit/Assertions.src/M000005.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/testunit/doc/classes/Test/Unit/Assertions.src/M000006.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/testunit/doc/classes/Test/Unit/Assertions.src/M000007.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/testunit/doc/classes/Test/Unit/Assertions.src/M000008.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/testunit/doc/classes/Test/Unit/Assertions.src/M000009.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/testunit/doc/classes/Test/Unit/Assertions.src/M000010.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/testunit/doc/classes/Test/Unit/Assertions.src/M000011.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/testunit/doc/classes/Test/Unit/Assertions.src/M000012.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/testunit/doc/classes/Test/Unit/Assertions.src/M000013.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/testunit/doc/classes/Test/Unit/Assertions.src/M000014.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/testunit/doc/classes/Test/Unit/Assertions.src/M000015.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/testunit/doc/classes/Test/Unit/Assertions.src/M000016.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/testunit/doc/classes/Test/Unit/Assertions.src/M000017.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/testunit/doc/classes/Test/Unit/Assertions.src/M000018.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/testunit/doc/classes/Test/Unit/Assertions.src/M000019.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/testunit/doc/classes/Test/Unit/Assertions.src/M000020.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/testunit/doc/classes/Test/Unit/Assertions.src/M000021.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/testunit/doc/classes/Test/Unit/Assertions.src/M000022.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/testunit/doc/classes/Test/Unit/Assertions/Message.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/testunit/doc/classes/Test/Unit/Error.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/testunit/doc/classes/Test/Unit/Error.src/M000042.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/testunit/doc/classes/Test/Unit/Error.src/M000043.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/testunit/doc/classes/Test/Unit/Error.src/M000044.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/testunit/doc/classes/Test/Unit/Error.src/M000045.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/testunit/doc/classes/Test/Unit/Error.src/M000046.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/testunit/doc/classes/Test/Unit/Failure.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/testunit/doc/classes/Test/Unit/Failure.src/M000047.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/testunit/doc/classes/Test/Unit/Failure.src/M000048.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/testunit/doc/classes/Test/Unit/Failure.src/M000049.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/testunit/doc/classes/Test/Unit/Failure.src/M000050.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/testunit/doc/classes/Test/Unit/TestCase.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/testunit/doc/classes/Test/Unit/TestCase.src/M000065.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/testunit/doc/classes/Test/Unit/TestCase.src/M000066.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/testunit/doc/classes/Test/Unit/TestCase.src/M000067.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/testunit/doc/classes/Test/Unit/TestCase.src/M000068.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/testunit/doc/classes/Test/Unit/TestCase.src/M000069.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/testunit/doc/classes/Test/Unit/TestCase.src/M000070.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/testunit/doc/classes/Test/Unit/TestCase.src/M000071.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/testunit/doc/classes/Test/Unit/TestCase.src/M000072.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/testunit/doc/classes/Test/Unit/TestResult.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/testunit/doc/classes/Test/Unit/TestResult.src/M000056.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/testunit/doc/classes/Test/Unit/TestResult.src/M000057.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/testunit/doc/classes/Test/Unit/TestResult.src/M000058.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/testunit/doc/classes/Test/Unit/TestResult.src/M000059.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/testunit/doc/classes/Test/Unit/TestResult.src/M000060.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/testunit/doc/classes/Test/Unit/TestResult.src/M000061.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/testunit/doc/classes/Test/Unit/TestResult.src/M000062.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/testunit/doc/classes/Test/Unit/TestResult.src/M000063.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/testunit/doc/classes/Test/Unit/TestResult.src/M000064.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/testunit/doc/classes/Test/Unit/TestSuite.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/testunit/doc/classes/Test/Unit/TestSuite.src/M000051.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/testunit/doc/classes/Test/Unit/TestSuite.src/M000052.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/testunit/doc/classes/Test/Unit/TestSuite.src/M000053.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/testunit/doc/classes/Test/Unit/TestSuite.src/M000054.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/testunit/doc/classes/Test/Unit/TestSuite.src/M000055.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/testunit/doc/classes/Test/Unit/UI.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/testunit/doc/classes/Test/Unit/UI/Console.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/testunit/doc/classes/Test/Unit/UI/Console/TestRunner.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/testunit/doc/classes/Test/Unit/UI/Console/TestRunner.src/M000031.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/testunit/doc/classes/Test/Unit/UI/Console/TestRunner.src/M000032.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/testunit/doc/classes/Test/Unit/UI/Console/TestRunner.src/M000033.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/testunit/doc/classes/Test/Unit/UI/Fox.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/testunit/doc/classes/Test/Unit/UI/Fox/FaultListItem.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/testunit/doc/classes/Test/Unit/UI/Fox/TestRunner.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/testunit/doc/classes/Test/Unit/UI/Fox/TestRunner.src/M000023.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/testunit/doc/classes/Test/Unit/UI/Fox/TestRunner.src/M000024.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/testunit/doc/classes/Test/Unit/UI/Fox/TestRunner.src/M000025.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/testunit/doc/classes/Test/Unit/UI/Fox/TestRunner/from-@fault_detail_label.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/testunit/doc/classes/Test/Unit/UI/GTK.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/testunit/doc/classes/Test/Unit/UI/GTK/EnhancedLabel.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/testunit/doc/classes/Test/Unit/UI/GTK/EnhancedProgressBar.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/testunit/doc/classes/Test/Unit/UI/GTK/FaultListItem.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/testunit/doc/classes/Test/Unit/UI/GTK/TestRunner.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/testunit/doc/classes/Test/Unit/UI/GTK/TestRunner.src/M000034.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/testunit/doc/classes/Test/Unit/UI/GTK/TestRunner.src/M000035.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/testunit/doc/classes/Test/Unit/UI/GTK/TestRunner.src/M000036.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/testunit/doc/classes/Test/Unit/UI/Status.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/testunit/doc/classes/Test/Unit/UI/Status.src/M000037.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/testunit/doc/classes/Test/Unit/UI/TestRunnerMediator.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/testunit/doc/classes/Test/Unit/UI/TestRunnerMediator.src/M000038.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/testunit/doc/classes/Test/Unit/UI/TestRunnerMediator.src/M000039.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/testunit/doc/classes/Test/Unit/UI/TestRunnerMediator.src/M000040.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/testunit/doc/classes/Test/Unit/UI/TestRunnerMediator.src/M000041.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/testunit/doc/classes/Test/Unit/UI/TestRunnerUtilities.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/testunit/doc/classes/Test/Unit/UI/TestRunnerUtilities.src/M000030.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/testunit/doc/classes/Test/Unit/UI/Util.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/testunit/doc/classes/Test/Unit/UI/Util/Observable.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/testunit/doc/classes/Test/Unit/UI/Util/Observable.src/M000026.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/testunit/doc/classes/Test/Unit/UI/Util/Observable.src/M000027.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/testunit/doc/classes/Test/Unit/UI/Util/Observable.src/M000028.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/testunit/doc/classes/Test/Unit/UI/Util/ProcWrapper.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/testunit/doc/classes/Test/Unit/UI/Util/ProcWrapper.src/M000029.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/testunit/doc/created.rid
-%%PORTDOCS%%%%RUBY_DOCDIR%%/testunit/doc/files/pre-install_rb.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/testunit/doc/files/test/unit/assertionfailederror_rb.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/testunit/doc/files/test/unit/assertions_rb.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/testunit/doc/files/test/unit/error_rb.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/testunit/doc/files/test/unit/failure_rb.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/testunit/doc/files/test/unit/testcase_rb.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/testunit/doc/files/test/unit/testresult_rb.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/testunit/doc/files/test/unit/testsuite_rb.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/testunit/doc/files/test/unit/ui/console/testrunner_rb.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/testunit/doc/files/test/unit/ui/fox/testrunner_rb.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/testunit/doc/files/test/unit/ui/gtk/testrunner_rb.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/testunit/doc/files/test/unit/ui/testrunnermediator_rb.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/testunit/doc/files/test/unit/ui/testrunnerutilities_rb.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/testunit/doc/files/test/unit/ui/util/observable_rb.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/testunit/doc/files/test/unit/ui/util/procwrapper_rb.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/testunit/doc/files/test/unit_rb.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/testunit/doc/fr_class_index.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/testunit/doc/fr_file_index.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/testunit/doc/fr_method_index.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/testunit/doc/index.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/testunit/doc/rdoc-style.css
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/testunit/doc/files/test/unit/ui/util
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/testunit/doc/files/test/unit/ui/gtk
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/testunit/doc/files/test/unit/ui/fox
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/testunit/doc/files/test/unit/ui/console
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/testunit/doc/files/test/unit/ui
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/testunit/doc/files/test/unit
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/testunit/doc/files/test
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/testunit/doc/files
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/testunit/doc/classes/Test/Unit/UI/Util/ProcWrapper.src
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/testunit/doc/classes/Test/Unit/UI/Util/Observable.src
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/testunit/doc/classes/Test/Unit/UI/Util
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/testunit/doc/classes/Test/Unit/UI/TestRunnerUtilities.src
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/testunit/doc/classes/Test/Unit/UI/TestRunnerMediator.src
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/testunit/doc/classes/Test/Unit/UI/Status.src
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/testunit/doc/classes/Test/Unit/UI/GTK/TestRunner.src
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/testunit/doc/classes/Test/Unit/UI/GTK
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/testunit/doc/classes/Test/Unit/UI/Fox/TestRunner.src
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/testunit/doc/classes/Test/Unit/UI/Fox/TestRunner
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/testunit/doc/classes/Test/Unit/UI/Fox
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/testunit/doc/classes/Test/Unit/UI/Console/TestRunner.src
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/testunit/doc/classes/Test/Unit/UI/Console
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/testunit/doc/classes/Test/Unit/UI
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/testunit/doc/classes/Test/Unit/TestSuite.src
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/testunit/doc/classes/Test/Unit/TestResult.src
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/testunit/doc/classes/Test/Unit/TestCase.src
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/testunit/doc/classes/Test/Unit/Failure.src
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/testunit/doc/classes/Test/Unit/Error.src
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/testunit/doc/classes/Test/Unit/Assertions.src
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/testunit/doc/classes/Test/Unit/Assertions
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/testunit/doc/classes/Test/Unit
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/testunit/doc/classes/Test
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/testunit/doc/classes
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/testunit/doc
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/testunit
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/testunit/adder.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/testunit/index.html
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/testunit/subtracter.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/testunit/tc_adder.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/testunit/tc_subtracter.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/testunit/ts_examples.rb
-%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/testunit
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ChangeLog
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/README
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/TODO
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Test.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Test/Unit.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Test/Unit/AssertionFailedError.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Test/Unit/Assertions.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Test/Unit/Assertions.src/M000001.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Test/Unit/Assertions.src/M000002.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Test/Unit/Assertions.src/M000003.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Test/Unit/Assertions.src/M000004.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Test/Unit/Assertions.src/M000005.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Test/Unit/Assertions.src/M000006.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Test/Unit/Assertions.src/M000007.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Test/Unit/Assertions.src/M000008.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Test/Unit/Assertions.src/M000009.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Test/Unit/Assertions.src/M000010.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Test/Unit/Assertions.src/M000011.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Test/Unit/Assertions.src/M000012.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Test/Unit/Assertions.src/M000013.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Test/Unit/Assertions.src/M000014.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Test/Unit/Assertions.src/M000015.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Test/Unit/Assertions.src/M000016.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Test/Unit/Assertions.src/M000017.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Test/Unit/Assertions.src/M000018.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Test/Unit/Assertions.src/M000019.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Test/Unit/Assertions.src/M000020.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Test/Unit/Assertions.src/M000021.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Test/Unit/Assertions.src/M000022.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Test/Unit/Assertions/Message.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Test/Unit/Error.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Test/Unit/Error.src/M000042.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Test/Unit/Error.src/M000043.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Test/Unit/Error.src/M000044.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Test/Unit/Error.src/M000045.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Test/Unit/Error.src/M000046.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Test/Unit/Failure.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Test/Unit/Failure.src/M000047.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Test/Unit/Failure.src/M000048.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Test/Unit/Failure.src/M000049.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Test/Unit/Failure.src/M000050.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Test/Unit/TestCase.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Test/Unit/TestCase.src/M000065.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Test/Unit/TestCase.src/M000066.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Test/Unit/TestCase.src/M000067.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Test/Unit/TestCase.src/M000068.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Test/Unit/TestCase.src/M000069.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Test/Unit/TestCase.src/M000070.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Test/Unit/TestCase.src/M000071.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Test/Unit/TestCase.src/M000072.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Test/Unit/TestResult.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Test/Unit/TestResult.src/M000056.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Test/Unit/TestResult.src/M000057.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Test/Unit/TestResult.src/M000058.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Test/Unit/TestResult.src/M000059.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Test/Unit/TestResult.src/M000060.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Test/Unit/TestResult.src/M000061.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Test/Unit/TestResult.src/M000062.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Test/Unit/TestResult.src/M000063.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Test/Unit/TestResult.src/M000064.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Test/Unit/TestSuite.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Test/Unit/TestSuite.src/M000051.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Test/Unit/TestSuite.src/M000052.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Test/Unit/TestSuite.src/M000053.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Test/Unit/TestSuite.src/M000054.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Test/Unit/TestSuite.src/M000055.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Test/Unit/UI.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Test/Unit/UI/Console.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Test/Unit/UI/Console/TestRunner.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Test/Unit/UI/Console/TestRunner.src/M000031.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Test/Unit/UI/Console/TestRunner.src/M000032.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Test/Unit/UI/Console/TestRunner.src/M000033.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Test/Unit/UI/Fox.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Test/Unit/UI/Fox/FaultListItem.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Test/Unit/UI/Fox/TestRunner.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Test/Unit/UI/Fox/TestRunner.src/M000023.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Test/Unit/UI/Fox/TestRunner.src/M000024.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Test/Unit/UI/Fox/TestRunner.src/M000025.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Test/Unit/UI/Fox/TestRunner/from-@fault_detail_label.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Test/Unit/UI/GTK.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Test/Unit/UI/GTK/EnhancedLabel.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Test/Unit/UI/GTK/EnhancedProgressBar.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Test/Unit/UI/GTK/FaultListItem.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Test/Unit/UI/GTK/TestRunner.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Test/Unit/UI/GTK/TestRunner.src/M000034.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Test/Unit/UI/GTK/TestRunner.src/M000035.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Test/Unit/UI/GTK/TestRunner.src/M000036.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Test/Unit/UI/Status.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Test/Unit/UI/Status.src/M000037.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Test/Unit/UI/TestRunnerMediator.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Test/Unit/UI/TestRunnerMediator.src/M000038.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Test/Unit/UI/TestRunnerMediator.src/M000039.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Test/Unit/UI/TestRunnerMediator.src/M000040.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Test/Unit/UI/TestRunnerMediator.src/M000041.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Test/Unit/UI/TestRunnerUtilities.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Test/Unit/UI/TestRunnerUtilities.src/M000030.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Test/Unit/UI/Util.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Test/Unit/UI/Util/Observable.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Test/Unit/UI/Util/Observable.src/M000026.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Test/Unit/UI/Util/Observable.src/M000027.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Test/Unit/UI/Util/Observable.src/M000028.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Test/Unit/UI/Util/ProcWrapper.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Test/Unit/UI/Util/ProcWrapper.src/M000029.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/created.rid
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/files/pre-install_rb.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/files/test/unit/assertionfailederror_rb.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/files/test/unit/assertions_rb.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/files/test/unit/error_rb.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/files/test/unit/failure_rb.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/files/test/unit/testcase_rb.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/files/test/unit/testresult_rb.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/files/test/unit/testsuite_rb.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/files/test/unit/ui/console/testrunner_rb.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/files/test/unit/ui/fox/testrunner_rb.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/files/test/unit/ui/gtk/testrunner_rb.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/files/test/unit/ui/testrunnermediator_rb.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/files/test/unit/ui/testrunnerutilities_rb.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/files/test/unit/ui/util/observable_rb.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/files/test/unit/ui/util/procwrapper_rb.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/files/test/unit_rb.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/fr_class_index.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/fr_file_index.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/fr_method_index.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/index.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/rdoc-style.css
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/doc/files/test/unit/ui/util
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/doc/files/test/unit/ui/gtk
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/doc/files/test/unit/ui/fox
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/doc/files/test/unit/ui/console
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/doc/files/test/unit/ui
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/doc/files/test/unit
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/doc/files/test
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/doc/files
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/doc/classes/Test/Unit/UI/Util/ProcWrapper.src
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/doc/classes/Test/Unit/UI/Util/Observable.src
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/doc/classes/Test/Unit/UI/Util
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/doc/classes/Test/Unit/UI/TestRunnerUtilities.src
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/doc/classes/Test/Unit/UI/TestRunnerMediator.src
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/doc/classes/Test/Unit/UI/Status.src
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/doc/classes/Test/Unit/UI/GTK/TestRunner.src
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/doc/classes/Test/Unit/UI/GTK
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/doc/classes/Test/Unit/UI/Fox/TestRunner.src
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/doc/classes/Test/Unit/UI/Fox/TestRunner
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/doc/classes/Test/Unit/UI/Fox
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/doc/classes/Test/Unit/UI/Console/TestRunner.src
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/doc/classes/Test/Unit/UI/Console
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/doc/classes/Test/Unit/UI
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/doc/classes/Test/Unit/TestSuite.src
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/doc/classes/Test/Unit/TestResult.src
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/doc/classes/Test/Unit/TestCase.src
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/doc/classes/Test/Unit/Failure.src
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/doc/classes/Test/Unit/Error.src
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/doc/classes/Test/Unit/Assertions.src
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/doc/classes/Test/Unit/Assertions
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/doc/classes/Test/Unit
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/doc/classes/Test
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/doc/classes
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/doc
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/adder.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/index.html
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/subtracter.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/tc_adder.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/tc_subtracter.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/ts_examples.rb
+%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%
diff --git a/devel/ruby-textbuf/Makefile b/devel/ruby-textbuf/Makefile
index 68311919002d..ef4de2e675b1 100644
--- a/devel/ruby-textbuf/Makefile
+++ b/devel/ruby-textbuf/Makefile
@@ -26,15 +26,15 @@ DOCS_JA=	README.ja
 
 do-install:
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${RUBY_EXAMPLESDIR}/${PORTNAME}/ja
-	${INSTALL_DATA} ${WRKSRC}/stest.rb ${RUBY_EXAMPLESDIR}/${PORTNAME}/
-	${INSTALL_DATA} ${WRKSRC}/test.rb ${RUBY_EXAMPLESDIR}/${PORTNAME}/ja/
-	${MKDIR} ${RUBY_DOCDIR}/${PORTNAME}/ja
+	${MKDIR} ${RUBY_MODEXAMPLESDIR}/ja
+	${INSTALL_DATA} ${WRKSRC}/stest.rb ${RUBY_MODEXAMPLESDIR}/
+	${INSTALL_DATA} ${WRKSRC}/test.rb ${RUBY_MODEXAMPLESDIR}/ja/
+	${MKDIR} ${RUBY_MODDOCDIR}/ja
 .for f in ${DOCS_EN}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_DOCDIR}/${PORTNAME}/
+	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_MODDOCDIR}/
 .endfor
 .for f in ${DOCS_JA}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_DOCDIR}/${PORTNAME}/ja/
+	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_MODDOCDIR}/ja/
 .endfor
 .endif
 
diff --git a/devel/ruby-textbuf/pkg-plist b/devel/ruby-textbuf/pkg-plist
index 9b6d7951d78c..3a197e004bd2 100644
--- a/devel/ruby-textbuf/pkg-plist
+++ b/devel/ruby-textbuf/pkg-plist
@@ -1,9 +1,9 @@
 %%RUBY_SITEARCHLIBDIR%%/textbuf.so
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/textbuf/stest.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/textbuf/ja/test.rb
-%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/textbuf/ja
-%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/textbuf
-%%PORTDOCS%%%%RUBY_DOCDIR%%/textbuf/README.en
-%%PORTDOCS%%%%RUBY_DOCDIR%%/textbuf/ja/README.ja
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/textbuf/ja
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/textbuf
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/stest.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/ja/test.rb
+%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%/ja
+%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/README.en
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/README.ja
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/ja
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%
diff --git a/devel/ruby-tzfile/Makefile b/devel/ruby-tzfile/Makefile
index 3bc4748c992b..fc5ce7c27c5c 100644
--- a/devel/ruby-tzfile/Makefile
+++ b/devel/ruby-tzfile/Makefile
@@ -28,8 +28,8 @@ do-build:
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/tzfile.rb ${RUBY_SITELIBDIR}/
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${RUBY_DOCDIR}/${PORTNAME}
-	${INSTALL_DATA} ${WRKSRC}/tzfile.html ${RUBY_DOCDIR}/${PORTNAME}/
+	${MKDIR} ${RUBY_MODDOCDIR}
+	${INSTALL_DATA} ${WRKSRC}/tzfile.html ${RUBY_MODDOCDIR}/
 .endif
 
 .include <bsd.port.mk>
diff --git a/devel/ruby-tzfile/pkg-plist b/devel/ruby-tzfile/pkg-plist
index d5b663e90609..d95efc9d09aa 100644
--- a/devel/ruby-tzfile/pkg-plist
+++ b/devel/ruby-tzfile/pkg-plist
@@ -1,3 +1,3 @@
 %%RUBY_SITELIBDIR%%/tzfile.rb
-%%PORTDOCS%%%%RUBY_DOCDIR%%/tzfile/tzfile.html
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/tzfile
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/tzfile.html
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%
diff --git a/devel/ruby-unit/Makefile b/devel/ruby-unit/Makefile
index d2cbfa805b5c..c734d1c49d62 100644
--- a/devel/ruby-unit/Makefile
+++ b/devel/ruby-unit/Makefile
@@ -18,6 +18,8 @@ MAINTAINER=	knu@FreeBSD.org
 USE_RUBY=	yes
 USE_RUBY_RDTOOL=	yes
 
+RUBY_MODNAME=	runit
+
 RUBY_SHEBANG_FILES=	${WRKSRC}/bin/c2t.rb	\
 			${WRKSRC}/bin/runtest.rb
 
@@ -38,17 +40,17 @@ do-install:
 	${LN} -sf ${f}.rb ${PREFIX}/bin/${f}
 .endfor
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${RUBY_EXAMPLESDIR}/runit
-	${CP} -R ${WRKSRC}/sample/ ${RUBY_EXAMPLESDIR}/runit/
-	${MKDIR} ${RUBY_DOCDIR}/runit/ja
+	${MKDIR} ${RUBY_MODEXAMPLESDIR}
+	${CP} -R ${WRKSRC}/sample/ ${RUBY_MODEXAMPLESDIR}/
+	${MKDIR} ${RUBY_MODDOCDIR}/ja
 .for f in ${DOCS}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_DOCDIR}/runit/
+	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_MODDOCDIR}/
 .endfor
 .for f in ${DOCS_JA}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_DOCDIR}/runit/ja/
+	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_MODDOCDIR}/ja/
 .endfor
-	${CP} -R ${WRKSRC}/doc_en/ ${RUBY_DOCDIR}/runit/
-	${CP} -R ${WRKSRC}/doc_ja/ ${RUBY_DOCDIR}/runit/ja/
+	${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 6e55da8f2d33..35c1f8aeeb86 100644
--- a/devel/ruby-unit/pkg-plist
+++ b/devel/ruby-unit/pkg-plist
@@ -22,77 +22,77 @@ bin/runtest.rb
 @dirrm %%RUBY_SITELIBDIR%%/runit/cui
 @dirrm %%RUBY_SITELIBDIR%%/runit/ext
 @dirrm %%RUBY_SITELIBDIR%%/runit
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/runit/sample01.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/runit/sampletestsetup.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/runit/simpletest.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/runit/testall.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/runit/testarray.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/runit/testrepeatedtest.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/runit/testtestsetup.rb
-%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/runit
-%%PORTDOCS%%%%RUBY_DOCDIR%%/runit/ChangeLog
-%%PORTDOCS%%%%RUBY_DOCDIR%%/runit/README
-%%PORTDOCS%%%%RUBY_DOCDIR%%/runit/ToDo
-%%PORTDOCS%%%%RUBY_DOCDIR%%/runit/assert.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/runit/assert.rd
-%%PORTDOCS%%%%RUBY_DOCDIR%%/runit/error.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/runit/error.rd
-%%PORTDOCS%%%%RUBY_DOCDIR%%/runit/index.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/runit/index.rd
-%%PORTDOCS%%%%RUBY_DOCDIR%%/runit/ja/README.ja
-%%PORTDOCS%%%%RUBY_DOCDIR%%/runit/ja/assert.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/runit/ja/assert.rd
-%%PORTDOCS%%%%RUBY_DOCDIR%%/runit/ja/error.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/runit/ja/error.rd
-%%PORTDOCS%%%%RUBY_DOCDIR%%/runit/ja/index.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/runit/ja/index.rd
-%%PORTDOCS%%%%RUBY_DOCDIR%%/runit/ja/repeatedtest.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/runit/ja/repeatedtest.rd
-%%PORTDOCS%%%%RUBY_DOCDIR%%/runit/ja/robserver.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/runit/ja/robserver.rd
-%%PORTDOCS%%%%RUBY_DOCDIR%%/runit/ja/setuppable.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/runit/ja/setuppable.rd
-%%PORTDOCS%%%%RUBY_DOCDIR%%/runit/ja/teardownable.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/runit/ja/teardownable.rd
-%%PORTDOCS%%%%RUBY_DOCDIR%%/runit/ja/testcase.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/runit/ja/testcase.rd
-%%PORTDOCS%%%%RUBY_DOCDIR%%/runit/ja/testdecorator.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/runit/ja/testdecorator.rd
-%%PORTDOCS%%%%RUBY_DOCDIR%%/runit/ja/testfailure.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/runit/ja/testfailure.rd
-%%PORTDOCS%%%%RUBY_DOCDIR%%/runit/ja/testresult.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/runit/ja/testresult.rd
-%%PORTDOCS%%%%RUBY_DOCDIR%%/runit/ja/testrunner.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/runit/ja/testrunner.rd
-%%PORTDOCS%%%%RUBY_DOCDIR%%/runit/ja/testsetup.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/runit/ja/testsetup.rd
-%%PORTDOCS%%%%RUBY_DOCDIR%%/runit/ja/testsuite.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/runit/ja/testsuite.rd
-%%PORTDOCS%%%%RUBY_DOCDIR%%/runit/ja/version.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/runit/ja/version.rd
-%%PORTDOCS%%%%RUBY_DOCDIR%%/runit/repeatedtest.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/runit/repeatedtest.rd
-%%PORTDOCS%%%%RUBY_DOCDIR%%/runit/robserver.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/runit/robserver.rd
-%%PORTDOCS%%%%RUBY_DOCDIR%%/runit/setuppable.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/runit/setuppable.rd
-%%PORTDOCS%%%%RUBY_DOCDIR%%/runit/teardownable.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/runit/teardownable.rd
-%%PORTDOCS%%%%RUBY_DOCDIR%%/runit/testcase.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/runit/testcase.rd
-%%PORTDOCS%%%%RUBY_DOCDIR%%/runit/testdecorator.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/runit/testdecorator.rd
-%%PORTDOCS%%%%RUBY_DOCDIR%%/runit/testfailure.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/runit/testfailure.rd
-%%PORTDOCS%%%%RUBY_DOCDIR%%/runit/testresult.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/runit/testresult.rd
-%%PORTDOCS%%%%RUBY_DOCDIR%%/runit/testrunner.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/runit/testrunner.rd
-%%PORTDOCS%%%%RUBY_DOCDIR%%/runit/testsetup.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/runit/testsetup.rd
-%%PORTDOCS%%%%RUBY_DOCDIR%%/runit/testsuite.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/runit/testsuite.rd
-%%PORTDOCS%%%%RUBY_DOCDIR%%/runit/version.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/runit/version.rd
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/runit/ja
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/runit
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/sample01.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/sampletestsetup.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/simpletest.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/testall.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/testarray.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/testrepeatedtest.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/testtestsetup.rb
+%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ChangeLog
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/README
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ToDo
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/assert.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/assert.rd
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/error.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/error.rd
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/index.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/index.rd
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/README.ja
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/assert.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/assert.rd
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/error.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/error.rd
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/index.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/index.rd
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/repeatedtest.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/repeatedtest.rd
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/robserver.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/robserver.rd
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/setuppable.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/setuppable.rd
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/teardownable.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/teardownable.rd
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/testcase.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/testcase.rd
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/testdecorator.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/testdecorator.rd
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/testfailure.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/testfailure.rd
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/testresult.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/testresult.rd
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/testrunner.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/testrunner.rd
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/testsetup.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/testsetup.rd
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/testsuite.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/testsuite.rd
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/version.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/version.rd
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/repeatedtest.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/repeatedtest.rd
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/robserver.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/robserver.rd
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/setuppable.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/setuppable.rd
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/teardownable.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/teardownable.rd
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/testcase.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/testcase.rd
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/testdecorator.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/testdecorator.rd
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/testfailure.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/testfailure.rd
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/testresult.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/testresult.rd
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/testrunner.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/testrunner.rd
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/testsetup.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/testsetup.rd
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/testsuite.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/testsuite.rd
+%%PORTDOCS%%%%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 154ce14d1b9f..46d821db7194 100644
--- a/devel/rubygem-gettext/Makefile
+++ b/devel/rubygem-gettext/Makefile
@@ -30,10 +30,10 @@ RUBY_SETUP=	install.rb
 
 post-install:
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${RUBY_EXAMPLESDIR}/${PORTNAME}
-	${CP} -R ${WRKSRC}/samples/* ${RUBY_EXAMPLESDIR}/${PORTNAME}/
-	${MKDIR} ${RUBY_DOCDIR}/${PORTNAME}
-	${CP} -R ${WRKSRC}/docs/* ${RUBY_DOCDIR}/${PORTNAME}/
+	${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 7b1dfaf1225b..376dd627d089 100644
--- a/devel/rubygem-gettext/pkg-plist
+++ b/devel/rubygem-gettext/pkg-plist
@@ -10,47 +10,47 @@ bin/rgettext
 @dirrm %%RUBY_SITELIBDIR%%/gettext
 share/locale/ja/LC_MESSAGES/rgettext.mo
 @unexec rmdir -p %D/share/locale/ja/LC_MESSAGES 2>/dev/null || true
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/gettext/hello.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/gettext/hello2.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/gettext/hellogtk.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/gettext/hellogtk_utf8.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/gettext/hello_noop.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/gettext/hellotk.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/gettext/locale/ja/LC_MESSAGES/hello.mo
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/gettext/locale/ja/LC_MESSAGES/hello2.mo
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/gettext/locale/ja/LC_MESSAGES/hello_noop.mo
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/gettext/locale/ja/LC_MESSAGES/hellogtk.mo
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/gettext/locale/ja/LC_MESSAGES/hellotk.mo
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/gettext/po/hello.pot
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/gettext/po/hello2.pot
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/gettext/po/hello_noop.pot
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/gettext/po/hellogtk.pot
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/gettext/po/ja/hello.po
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/gettext/po/ja/hello2.po
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/gettext/po/ja/hello_noop.po
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/gettext/po/ja/hellogtk.po
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/gettext/po/ja/hellotk.po
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/gettext/po/makemo.rb
-%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/gettext/po/ja
-%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/gettext/po/ja_JP.eucJP
-%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/gettext/po
-%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/gettext/locale/ja/LC_MESSAGES
-%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/gettext/locale/ja
-%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/gettext/locale
-%%PORTDOCS%%%%RUBY_DOCDIR%%/gettext/README
-%%PORTDOCS%%%%RUBY_DOCDIR%%/gettext/config.rb
-%%PORTDOCS%%%%RUBY_DOCDIR%%/gettext/html/en/ruby-gettext.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/gettext/html/ja/ruby-gettext.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/gettext/html/style.css
-%%PORTDOCS%%%%RUBY_DOCDIR%%/gettext/rd/en/LANGUAGE
-%%PORTDOCS%%%%RUBY_DOCDIR%%/gettext/rd/en/ruby-gettext.rd
-%%PORTDOCS%%%%RUBY_DOCDIR%%/gettext/rd/ja/LANGUAGE
-%%PORTDOCS%%%%RUBY_DOCDIR%%/gettext/rd/ja/ruby-gettext.rd
-%%PORTDOCS%%%%RUBY_DOCDIR%%/gettext/yard2html.rb
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/gettext/rd/ja
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/gettext/rd/en
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/gettext/rd
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/gettext/html/ja
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/gettext/html/en
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/gettext/html
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/gettext
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/hello.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/hello2.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/hellogtk.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/hellogtk_utf8.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/hello_noop.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/hellotk.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/locale/ja/LC_MESSAGES/hello.mo
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/locale/ja/LC_MESSAGES/hello2.mo
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/locale/ja/LC_MESSAGES/hello_noop.mo
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/locale/ja/LC_MESSAGES/hellogtk.mo
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/locale/ja/LC_MESSAGES/hellotk.mo
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/po/hello.pot
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/po/hello2.pot
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/po/hello_noop.pot
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/po/hellogtk.pot
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/po/ja/hello.po
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/po/ja/hello2.po
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/po/ja/hello_noop.po
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/po/ja/hellogtk.po
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/po/ja/hellotk.po
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/po/makemo.rb
+%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%/po/ja
+%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%/po/ja_JP.eucJP
+%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%/po
+%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%/locale/ja/LC_MESSAGES
+%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%/locale/ja
+%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%/locale
+%%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_MODDOCDIR%%/html/style.css
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/rd/en/LANGUAGE
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/rd/en/ruby-gettext.rd
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/rd/ja/LANGUAGE
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/rd/ja/ruby-gettext.rd
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/yard2html.rb
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/rd/ja
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/rd/en
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/rd
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/html/ja
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/html/en
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/html
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%
diff --git a/devel/rubygem-locale/Makefile b/devel/rubygem-locale/Makefile
index 154ce14d1b9f..46d821db7194 100644
--- a/devel/rubygem-locale/Makefile
+++ b/devel/rubygem-locale/Makefile
@@ -30,10 +30,10 @@ RUBY_SETUP=	install.rb
 
 post-install:
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${RUBY_EXAMPLESDIR}/${PORTNAME}
-	${CP} -R ${WRKSRC}/samples/* ${RUBY_EXAMPLESDIR}/${PORTNAME}/
-	${MKDIR} ${RUBY_DOCDIR}/${PORTNAME}
-	${CP} -R ${WRKSRC}/docs/* ${RUBY_DOCDIR}/${PORTNAME}/
+	${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 7b1dfaf1225b..376dd627d089 100644
--- a/devel/rubygem-locale/pkg-plist
+++ b/devel/rubygem-locale/pkg-plist
@@ -10,47 +10,47 @@ bin/rgettext
 @dirrm %%RUBY_SITELIBDIR%%/gettext
 share/locale/ja/LC_MESSAGES/rgettext.mo
 @unexec rmdir -p %D/share/locale/ja/LC_MESSAGES 2>/dev/null || true
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/gettext/hello.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/gettext/hello2.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/gettext/hellogtk.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/gettext/hellogtk_utf8.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/gettext/hello_noop.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/gettext/hellotk.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/gettext/locale/ja/LC_MESSAGES/hello.mo
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/gettext/locale/ja/LC_MESSAGES/hello2.mo
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/gettext/locale/ja/LC_MESSAGES/hello_noop.mo
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/gettext/locale/ja/LC_MESSAGES/hellogtk.mo
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/gettext/locale/ja/LC_MESSAGES/hellotk.mo
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/gettext/po/hello.pot
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/gettext/po/hello2.pot
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/gettext/po/hello_noop.pot
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/gettext/po/hellogtk.pot
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/gettext/po/ja/hello.po
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/gettext/po/ja/hello2.po
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/gettext/po/ja/hello_noop.po
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/gettext/po/ja/hellogtk.po
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/gettext/po/ja/hellotk.po
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/gettext/po/makemo.rb
-%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/gettext/po/ja
-%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/gettext/po/ja_JP.eucJP
-%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/gettext/po
-%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/gettext/locale/ja/LC_MESSAGES
-%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/gettext/locale/ja
-%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/gettext/locale
-%%PORTDOCS%%%%RUBY_DOCDIR%%/gettext/README
-%%PORTDOCS%%%%RUBY_DOCDIR%%/gettext/config.rb
-%%PORTDOCS%%%%RUBY_DOCDIR%%/gettext/html/en/ruby-gettext.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/gettext/html/ja/ruby-gettext.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/gettext/html/style.css
-%%PORTDOCS%%%%RUBY_DOCDIR%%/gettext/rd/en/LANGUAGE
-%%PORTDOCS%%%%RUBY_DOCDIR%%/gettext/rd/en/ruby-gettext.rd
-%%PORTDOCS%%%%RUBY_DOCDIR%%/gettext/rd/ja/LANGUAGE
-%%PORTDOCS%%%%RUBY_DOCDIR%%/gettext/rd/ja/ruby-gettext.rd
-%%PORTDOCS%%%%RUBY_DOCDIR%%/gettext/yard2html.rb
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/gettext/rd/ja
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/gettext/rd/en
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/gettext/rd
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/gettext/html/ja
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/gettext/html/en
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/gettext/html
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/gettext
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/hello.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/hello2.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/hellogtk.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/hellogtk_utf8.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/hello_noop.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/hellotk.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/locale/ja/LC_MESSAGES/hello.mo
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/locale/ja/LC_MESSAGES/hello2.mo
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/locale/ja/LC_MESSAGES/hello_noop.mo
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/locale/ja/LC_MESSAGES/hellogtk.mo
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/locale/ja/LC_MESSAGES/hellotk.mo
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/po/hello.pot
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/po/hello2.pot
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/po/hello_noop.pot
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/po/hellogtk.pot
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/po/ja/hello.po
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/po/ja/hello2.po
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/po/ja/hello_noop.po
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/po/ja/hellogtk.po
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/po/ja/hellotk.po
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/po/makemo.rb
+%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%/po/ja
+%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%/po/ja_JP.eucJP
+%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%/po
+%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%/locale/ja/LC_MESSAGES
+%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%/locale/ja
+%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%/locale
+%%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_MODDOCDIR%%/html/style.css
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/rd/en/LANGUAGE
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/rd/en/ruby-gettext.rd
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/rd/ja/LANGUAGE
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/rd/ja/ruby-gettext.rd
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/yard2html.rb
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/rd/ja
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/rd/en
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/rd
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/html/ja
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/html/en
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/html
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%
diff --git a/devel/swigruby/Makefile b/devel/swigruby/Makefile
index 7eaf5635f7f3..03f28135e193 100644
--- a/devel/swigruby/Makefile
+++ b/devel/swigruby/Makefile
@@ -29,14 +29,14 @@ do-configure:
 
 post-install:
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${RUBY_EXAMPLESDIR}/swigruby
-	${CP} -R ${WRKSRC}/examples/ ${RUBY_EXAMPLESDIR}/swigruby/
-	${MKDIR} ${RUBY_DOCDIR}/swigruby/ja
+	${MKDIR} ${RUBY_MODEXAMPLESDIR}
+	${CP} -R ${WRKSRC}/examples/ ${RUBY_MODEXAMPLESDIR}/
+	${MKDIR} ${RUBY_MODDOCDIR}/ja
 .for f in ${DOCS_EN}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_DOCDIR}/swigruby/
+	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_MODDOCDIR}/
 .endfor
 .for f in ${DOCS_JA}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_DOCDIR}/swigruby/ja/
+	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_MODDOCDIR}/ja/
 .endfor
 .endif
 
diff --git a/devel/swigruby/pkg-plist b/devel/swigruby/pkg-plist
index 2d36da2ba95b..ac577a10c260 100644
--- a/devel/swigruby/pkg-plist
+++ b/devel/swigruby/pkg-plist
@@ -8,19 +8,19 @@ lib/swig_lib/ruby/ptrlang.i
 lib/swig_lib/ruby/ruby.swg
 lib/swig_lib/ruby/typemaps.i
 @dirrm lib/swig_lib/ruby
-%%PORTDOCS%%%%RUBY_DOCDIR%%/swigruby/ChangeLog
-%%PORTDOCS%%%%RUBY_DOCDIR%%/swigruby/README
-%%PORTDOCS%%%%RUBY_DOCDIR%%/swigruby/ja/README.ja
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/swigruby/ja
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/swigruby
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/swigruby/dbm/Makefile.swig
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/swigruby/dbm/DBM.i
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/swigruby/dbm/extconf.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/swigruby/dbm/dbmtest.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/swigruby/qt/Makefile.swig
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/swigruby/qt/qt.i
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/swigruby/qt/extconf.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/swigruby/qt/hello.rb
-%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/swigruby/dbm
-%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/swigruby/qt
-%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/swigruby
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ChangeLog
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/README
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/README.ja
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/ja
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/dbm/Makefile.swig
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/dbm/DBM.i
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/dbm/extconf.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/dbm/dbmtest.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/qt/Makefile.swig
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/qt/qt.i
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/qt/extconf.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/qt/hello.rb
+%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%/dbm
+%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%/qt
+%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%