Use RUBY_MOD*.

14 files changed, 165 insertions, 165 deletions

diff --git a/www/mod_ruby/Makefile b/www/mod_ruby/Makefile
index 3d1cd21936a5..54308f663c98 100644
--- a/www/mod_ruby/Makefile
+++ b/www/mod_ruby/Makefile
@@ -43,12 +43,12 @@ post-build:
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/examples/httpd.conf `${APXS} -q SYSCONFDIR`/httpd.conf.${PORTNAME}
 .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
 	@${CAT} ${PKGMESSAGE}
diff --git a/www/mod_ruby/pkg-plist b/www/mod_ruby/pkg-plist
index 3cdc6893c9f0..7155791aef95 100644
--- a/www/mod_ruby/pkg-plist
+++ b/www/mod_ruby/pkg-plist
@@ -8,31 +8,31 @@
 @dirrm %%RUBY_SITELIBDIR%%/apache
 etc/apache/httpd.conf.mod_ruby
 libexec/apache/mod_ruby.so
-%%PORTDOCS%%%%RUBY_DOCDIR%%/mod_ruby/COPYING
-%%PORTDOCS%%%%RUBY_DOCDIR%%/mod_ruby/ChangeLog
-%%PORTDOCS%%%%RUBY_DOCDIR%%/mod_ruby/README.en
-%%PORTDOCS%%%%RUBY_DOCDIR%%/mod_ruby/classes.en.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/mod_ruby/classes.en.rd
-%%PORTDOCS%%%%RUBY_DOCDIR%%/mod_ruby/default.css
-%%PORTDOCS%%%%RUBY_DOCDIR%%/mod_ruby/directives.en.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/mod_ruby/directives.en.rd
-%%PORTDOCS%%%%RUBY_DOCDIR%%/mod_ruby/faq.en.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/mod_ruby/faq.en.rd
-%%PORTDOCS%%%%RUBY_DOCDIR%%/mod_ruby/index.en.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/mod_ruby/index.en.rd
-%%PORTDOCS%%%%RUBY_DOCDIR%%/mod_ruby/install.en.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/mod_ruby/install.en.rd
-%%PORTDOCS%%%%RUBY_DOCDIR%%/mod_ruby/ja/README.ja
-%%PORTDOCS%%%%RUBY_DOCDIR%%/mod_ruby/ja/classes.ja.euc.rd
-%%PORTDOCS%%%%RUBY_DOCDIR%%/mod_ruby/ja/classes.ja.jis.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/mod_ruby/ja/default.css
-%%PORTDOCS%%%%RUBY_DOCDIR%%/mod_ruby/ja/directives.ja.euc.rd
-%%PORTDOCS%%%%RUBY_DOCDIR%%/mod_ruby/ja/directives.ja.jis.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/mod_ruby/ja/faq.ja.euc.rd
-%%PORTDOCS%%%%RUBY_DOCDIR%%/mod_ruby/ja/faq.ja.jis.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/mod_ruby/ja/index.ja.euc.rd
-%%PORTDOCS%%%%RUBY_DOCDIR%%/mod_ruby/ja/index.ja.jis.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/mod_ruby/ja/install.ja.euc.rd
-%%PORTDOCS%%%%RUBY_DOCDIR%%/mod_ruby/ja/install.ja.jis.html
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/mod_ruby/ja
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/mod_ruby
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/COPYING
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ChangeLog
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/README.en
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/classes.en.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/classes.en.rd
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/default.css
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/directives.en.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/directives.en.rd
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/faq.en.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/faq.en.rd
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/index.en.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/index.en.rd
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/install.en.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/install.en.rd
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/README.ja
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/classes.ja.euc.rd
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/classes.ja.jis.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/default.css
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/directives.ja.euc.rd
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/directives.ja.jis.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/faq.ja.euc.rd
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/faq.ja.jis.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/index.ja.euc.rd
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/index.ja.jis.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/install.ja.euc.rd
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/install.ja.jis.html
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/ja
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%
diff --git a/www/pruby/Makefile b/www/pruby/Makefile
index 9dee3290f397..c4901a702464 100644
--- a/www/pruby/Makefile
+++ b/www/pruby/Makefile
@@ -62,9 +62,9 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/ext_pruby_src/pruby_*.rb $${dir}/; \
 	${PERL} -i -pe "s,%%EXTENSION_DIR%%,$${dir#${PREFIX}/},g" ${TMPPLIST}
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${RUBY_DOCDIR}/${PORTNAME}
+	${MKDIR} ${RUBY_MODDOCDIR}
 .for f in ${DOCS_EN}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_DOCDIR}/${PORTNAME}/
+	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_MODDOCDIR}/
 .endfor
 .endif
 
diff --git a/www/pruby/pkg-plist b/www/pruby/pkg-plist
index 1c223c7d3531..ca39591c7d1a 100644
--- a/www/pruby/pkg-plist
+++ b/www/pruby/pkg-plist
@@ -2,6 +2,6 @@
 %%EXTENSION_DIR%%/pruby_ervi.rb
 %%EXTENSION_DIR%%/pruby_tops.rb
 @unexec rmdir -p %D/%%EXTENSION_DIR%% 2>/dev/null || true
-%%PORTDOCS%%%%RUBY_DOCDIR%%/pruby/README
-%%PORTDOCS%%%%RUBY_DOCDIR%%/pruby/_htaccess
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/pruby
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/README
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/_htaccess
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%
diff --git a/www/ruby-google/Makefile b/www/ruby-google/Makefile
index f1d1a9399821..d0b7bbf52a3b 100644
--- a/www/ruby-google/Makefile
+++ b/www/ruby-google/Makefile
@@ -26,13 +26,13 @@ EXAMPLES=	examples/*
 
 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/www/ruby-google/pkg-plist b/www/ruby-google/pkg-plist
index 9b6319673767..12669d431450 100644
--- a/www/ruby-google/pkg-plist
+++ b/www/ruby-google/pkg-plist
@@ -1,11 +1,11 @@
 %%RUBY_SITELIBDIR%%/google.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/google/cache.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/google/search.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/google/spell.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/google/tkspell.rb
-%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/google
-%%PORTDOCS%%%%RUBY_DOCDIR%%/google/CHANGES
-%%PORTDOCS%%%%RUBY_DOCDIR%%/google/Changelog
-%%PORTDOCS%%%%RUBY_DOCDIR%%/google/README
-%%PORTDOCS%%%%RUBY_DOCDIR%%/google/google.html
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/google
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/cache.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/search.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/spell.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/tkspell.rb
+%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/CHANGES
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/Changelog
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/README
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/google.html
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%
diff --git a/www/ruby-http-access/Makefile b/www/ruby-http-access/Makefile
index 6385661151c9..482c1218e4be 100644
--- a/www/ruby-http-access/Makefile
+++ b/www/ruby-http-access/Makefile
@@ -22,8 +22,8 @@ NO_BUILD=	yes
 do-install:
 	cd ${WRKSRC}; ${RUBY} install.rb
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${RUBY_EXAMPLESDIR}/${PORTNAME}
-	${INSTALL_DATA} ${WRKSRC}/sample/*.rb ${RUBY_EXAMPLESDIR}/${PORTNAME}/
+	${MKDIR} ${RUBY_MODEXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/sample/*.rb ${RUBY_MODEXAMPLESDIR}/
 .endif
 
 .include <bsd.port.mk>
diff --git a/www/ruby-http-access/pkg-plist b/www/ruby-http-access/pkg-plist
index e3a80745d51d..e77be29c3420 100644
--- a/www/ruby-http-access/pkg-plist
+++ b/www/ruby-http-access/pkg-plist
@@ -1,7 +1,7 @@
 %%RUBY_SITELIBDIR%%/http-access2.rb
 %%RUBY_SITELIBDIR%%/http-access2/http.rb
 @dirrm %%RUBY_SITELIBDIR%%/http-access2
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/http-access/dav.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/http-access/thread.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/http-access/wcat.rb
-%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/http-access
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/dav.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/thread.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/wcat.rb
+%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%
diff --git a/www/ruby-mnogosearch/Makefile b/www/ruby-mnogosearch/Makefile
index ebb23f09f46b..0b26e584baff 100644
--- a/www/ruby-mnogosearch/Makefile
+++ b/www/ruby-mnogosearch/Makefile
@@ -26,11 +26,11 @@ DOCS=		README README.ru
 
 post-install:
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${RUBY_EXAMPLESDIR}/${PORTNAME}
-	${INSTALL_DATA} ${WRKSRC}/test/* ${RUBY_EXAMPLESDIR}/${PORTNAME}/
-	${MKDIR} ${RUBY_DOCDIR}/${PORTNAME}
+	${MKDIR} ${RUBY_MODEXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/test/* ${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/www/ruby-mnogosearch/pkg-plist b/www/ruby-mnogosearch/pkg-plist
index da063cced339..39cf25d6b5de 100644
--- a/www/ruby-mnogosearch/pkg-plist
+++ b/www/ruby-mnogosearch/pkg-plist
@@ -1,11 +1,11 @@
 %%RUBY_SITEARCHLIBDIR%%/mnogo.so
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/mnogosearch/example.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/mnogosearch/old.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/mnogosearch/test.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/mnogosearch/test.rhtml
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/mnogosearch/test.xsl
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/mnogosearch/testx.rb
-%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/mnogosearch
-%%PORTDOCS%%%%RUBY_DOCDIR%%/mnogosearch/README
-%%PORTDOCS%%%%RUBY_DOCDIR%%/mnogosearch/README.ru
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/mnogosearch
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/example.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/old.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test.rhtml
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test.xsl
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/testx.rb
+%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/README
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/README.ru
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%
diff --git a/www/ruby-webrick/Makefile b/www/ruby-webrick/Makefile
index 8b0747247bbf..f3308c41a49e 100644
--- a/www/ruby-webrick/Makefile
+++ b/www/ruby-webrick/Makefile
@@ -27,11 +27,11 @@ DOCS=		ChangeLog README doc/*
 do-install:
 	cd ${WRKSRC}; ${RUBY} install.rb
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${RUBY_EXAMPLESDIR}/${PORTNAME}
-	${CP} -R ${WRKSRC}/sample/* ${RUBY_EXAMPLESDIR}/${PORTNAME}/
-	${MKDIR} ${RUBY_DOCDIR}/${PORTNAME}
+	${MKDIR} ${RUBY_MODEXAMPLESDIR}
+	${CP} -R ${WRKSRC}/sample/* ${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/www/ruby-webrick/pkg-plist b/www/ruby-webrick/pkg-plist
index a74ec7e2387f..733ead344fa5 100644
--- a/www/ruby-webrick/pkg-plist
+++ b/www/ruby-webrick/pkg-plist
@@ -26,25 +26,25 @@
 %%RUBY_SITELIBDIR%%/webrick/version.rb
 @dirrm %%RUBY_SITELIBDIR%%/webrick/httpservlet
 @dirrm %%RUBY_SITELIBDIR%%/webrick
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/webrick/httpd/conf/sample.crt
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/webrick/httpd/conf/sample.key
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/webrick/httpd/htdocs/test.cgi
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/webrick/httpd/htdocs/test.rhtml
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/webrick/httpd/htproxy.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/webrick/httpd/httpd.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/webrick/httpd/httpsd.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/webrick/rfc/cache/.keep_me
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/webrick/rfc/rfc.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/webrick/webdic/ndtp.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/webrick/webdic/webdic.rb
-%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/webrick/webdic
-%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/webrick/rfc/cache
-%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/webrick/rfc
-%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/webrick/httpd/htdocs
-%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/webrick/httpd/conf
-%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/webrick/httpd
-%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/webrick
-%%PORTDOCS%%%%RUBY_DOCDIR%%/webrick/ChangeLog
-%%PORTDOCS%%%%RUBY_DOCDIR%%/webrick/README
-%%PORTDOCS%%%%RUBY_DOCDIR%%/webrick/webrick.rd
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/webrick
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/httpd/conf/sample.crt
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/httpd/conf/sample.key
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/httpd/htdocs/test.cgi
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/httpd/htdocs/test.rhtml
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/httpd/htproxy.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/httpd/httpd.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/httpd/httpsd.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/rfc/cache/.keep_me
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/rfc/rfc.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/webdic/ndtp.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/webdic/webdic.rb
+%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%/webdic
+%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%/rfc/cache
+%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%/rfc
+%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%/httpd/htdocs
+%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%/httpd/conf
+%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%/httpd
+%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ChangeLog
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/README
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/webrick.rd
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%
diff --git a/www/ruby-webunit/Makefile b/www/ruby-webunit/Makefile
index 7f061dbb4b41..064787ebea06 100644
--- a/www/ruby-webunit/Makefile
+++ b/www/ruby-webunit/Makefile
@@ -33,16 +33,16 @@ DOCS_JA=	index-ja.html TIPS-ja.html TODO-ja.sdf
 do-install:
 	cd ${WRKSRC}; ${RUBY} install.rb
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${RUBY_EXAMPLESDIR}/${PORTNAME}
+	${MKDIR} ${RUBY_MODEXAMPLESDIR}
 .for f in ${EXAMPLES_EN}
-	${CP} -R ${WRKSRC}/${f} ${RUBY_EXAMPLESDIR}/${PORTNAME}/
+	${CP} -R ${WRKSRC}/${f} ${RUBY_MODEXAMPLESDIR}/
 .endfor
-	${MKDIR} ${RUBY_DOCDIR}/${PORTNAME}/ja
+	${MKDIR} ${RUBY_MODDOCDIR}/ja
 .for f in ${DOCS_EN}
-	${INSTALL_DATA} ${WRKSRC}/doc/${f} ${RUBY_DOCDIR}/${PORTNAME}/
+	${INSTALL_DATA} ${WRKSRC}/doc/${f} ${RUBY_MODDOCDIR}/
 .endfor
 .for f in ${DOCS_JA}
-	${INSTALL_DATA} ${WRKSRC}/doc/${f} ${RUBY_DOCDIR}/${PORTNAME}/ja/
+	${INSTALL_DATA} ${WRKSRC}/doc/${f} ${RUBY_MODDOCDIR}/ja/
 .endfor
 .endif
 
diff --git a/www/ruby-webunit/pkg-plist b/www/ruby-webunit/pkg-plist
index b9a8faccf5f9..32caffdcf2e6 100644
--- a/www/ruby-webunit/pkg-plist
+++ b/www/ruby-webunit/pkg-plist
@@ -16,67 +16,67 @@
 %%RUBY_SITELIBDIR%%/webunit/utils.rb
 %%RUBY_SITELIBDIR%%/webunit/webunit.rb
 @dirrm %%RUBY_SITELIBDIR%%/webunit
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/webunit/cgi/assert.html
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/webunit/cgi/auth/.htaccess
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/webunit/cgi/auth/.htpasswd
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/webunit/cgi/auth/index.html
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/webunit/cgi/badtags.html
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/webunit/cgi/cookie.cgi
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/webunit/cgi/document.xml
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/webunit/cgi/form.html
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/webunit/cgi/frame-0.html
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/webunit/cgi/frame-1.html
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/webunit/cgi/frame.html
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/webunit/cgi/image.html
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/webunit/cgi/images/x.gif
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/webunit/cgi/images/y.gif
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/webunit/cgi/jscript-0.html
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/webunit/cgi/jscript-1.html
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/webunit/cgi/jscript.html
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/webunit/cgi/link.html
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/webunit/cgi/params.html
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/webunit/cgi/redirect.cgi
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/webunit/cgi/response.html
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/webunit/cgi/simple.cgi
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/webunit/cgi/stock.cgi
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/webunit/cgi/table.html
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/webunit/sample/conv/digit-0.cgi
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/webunit/sample/conv/digit-0.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/webunit/sample/conv/digit-1.cgi
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/webunit/sample/conv/digit-1.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/webunit/sample/conv/digit.cgi
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/webunit/sample/conv/digit.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/webunit/sample/conv/test_digit-0.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/webunit/sample/conv/test_digit-1.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/webunit/sample/conv/test_digit.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/webunit/sample/conv/test_digit_view-0.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/webunit/sample/conv/test_digit_view-1.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/webunit/sample/conv/test_digit_view.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/webunit/test/test_assert.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/webunit/test/test_cookie.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/webunit/test/test_domwalker.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/webunit/test/test_form.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/webunit/test/test_frame.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/webunit/test/test_htmlelem.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/webunit/test/test_image.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/webunit/test/test_jscript.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/webunit/test/test_link.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/webunit/test/test_params.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/webunit/test/test_parser.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/webunit/test/test_response.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/webunit/test/test_table.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/webunit/test/test_utils.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/webunit/test/test_webunit.rb
-%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/webunit/test
-%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/webunit/sample/conv
-%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/webunit/sample
-%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/webunit/cgi/images
-%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/webunit/cgi/auth
-%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/webunit/cgi
-%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/webunit
-%%PORTDOCS%%%%RUBY_DOCDIR%%/webunit/index-en.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/webunit/ja/index-ja.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/webunit/ja/TIPS-ja.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/webunit/ja/TODO-ja.sdf
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/webunit/ja
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/webunit
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/cgi/assert.html
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/cgi/auth/.htaccess
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/cgi/auth/.htpasswd
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/cgi/auth/index.html
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/cgi/badtags.html
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/cgi/cookie.cgi
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/cgi/document.xml
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/cgi/form.html
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/cgi/frame-0.html
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/cgi/frame-1.html
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/cgi/frame.html
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/cgi/image.html
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/cgi/images/x.gif
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/cgi/images/y.gif
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/cgi/jscript-0.html
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/cgi/jscript-1.html
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/cgi/jscript.html
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/cgi/link.html
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/cgi/params.html
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/cgi/redirect.cgi
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/cgi/response.html
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/cgi/simple.cgi
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/cgi/stock.cgi
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/cgi/table.html
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/sample/conv/digit-0.cgi
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/sample/conv/digit-0.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/sample/conv/digit-1.cgi
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/sample/conv/digit-1.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/sample/conv/digit.cgi
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/sample/conv/digit.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/sample/conv/test_digit-0.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/sample/conv/test_digit-1.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/sample/conv/test_digit.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/sample/conv/test_digit_view-0.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/sample/conv/test_digit_view-1.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/sample/conv/test_digit_view.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test/test_assert.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test/test_cookie.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test/test_domwalker.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test/test_form.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test/test_frame.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test/test_htmlelem.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test/test_image.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test/test_jscript.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test/test_link.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test/test_params.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test/test_parser.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test/test_response.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test/test_table.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test/test_utils.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test/test_webunit.rb
+%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%/test
+%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%/sample/conv
+%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%/sample
+%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%/cgi/images
+%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%/cgi/auth
+%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%/cgi
+%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/index-en.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/index-ja.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/TIPS-ja.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/TODO-ja.sdf
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/ja
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%