2 files changed, 31 insertions, 31 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%%