Use RUBY_MOD*.

19 files changed, 190 insertions, 189 deletions

diff --git a/japanese/rbnamazu/Makefile b/japanese/rbnamazu/Makefile
index faf8cb04d8b8..31d98d4129b3 100644
--- a/japanese/rbnamazu/Makefile
+++ b/japanese/rbnamazu/Makefile
@@ -33,12 +33,12 @@ do-install:
 	cd ${WRKSRC}; \
 	${RUBY_RD2} ${f} > ${f:S/.rd/.html/}
 .endfor
-	${MKDIR} ${RUBY_DOCDIR}/rbnamazu/ja
+	${MKDIR} ${RUBY_MODDOCDIR}/ja
 .for f in ${RD_DOCS:S/.rd/.html/:M*.en}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_DOCDIR}/rbnamazu/
+	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_MODDOCDIR}/
 .endfor
 .for f in ${RD_DOCS:S/.rd/.html/:M*.ja}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_DOCDIR}/rbnamazu/ja/
+	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_MODDOCDIR}/ja/
 .endfor
 .endif
 
diff --git a/japanese/rbnamazu/pkg-plist b/japanese/rbnamazu/pkg-plist
index f046ff458974..b6c567764ab3 100644
--- a/japanese/rbnamazu/pkg-plist
+++ b/japanese/rbnamazu/pkg-plist
@@ -4,7 +4,7 @@ bin/rbnamazu
 %%RUBY_SITELIBDIR%%/nmzqr.rb
 %%RUBY_SITELIBDIR%%/nmzqr.tab.rb
 %%RUBY_SITELIBDIR%%/rbnamazu.rb
-%%PORTDOCS%%%%RUBY_DOCDIR%%/rbnamazu/ja/rbnamazu.html.ja
-%%PORTDOCS%%%%RUBY_DOCDIR%%/rbnamazu/rbnamazu.html.en
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/rbnamazu/ja
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/rbnamazu
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/rbnamazu.html.ja
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/rbnamazu.html.en
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/ja
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%
diff --git a/japanese/rskkserv/Makefile b/japanese/rskkserv/Makefile
index d2761d5be66f..b525646e741d 100644
--- a/japanese/rskkserv/Makefile
+++ b/japanese/rskkserv/Makefile
@@ -82,12 +82,12 @@ post-install:
 		${CHMOD} ${BINMODE} ${STARTUP_SCRIPT}; \
 	fi
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${RUBY_DOCDIR}/rskkserv/ja
+	${MKDIR} ${RUBY_MODDOCDIR}/ja
 .for f in ${DOCS_EN}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_DOCDIR}/rskkserv/
+	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_MODDOCDIR}/
 .endfor
 .for f in ${DOCS_JA}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_DOCDIR}/rskkserv/ja/
+	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_MODDOCDIR}/ja/
 .endfor
 .endif
 
diff --git a/japanese/rskkserv/pkg-plist b/japanese/rskkserv/pkg-plist
index dae4233c6a2b..916aa948d8fc 100644
--- a/japanese/rskkserv/pkg-plist
+++ b/japanese/rskkserv/pkg-plist
@@ -9,8 +9,8 @@ etc/rskkserv.conf.sample
 @dirrm %%RUBY_SITELIBDIR%%/skkserv
 libexec/rskkserv
 @unexec rm -f %D/share/skk/SKK-JISYO.[LMS].[an] 2>/dev/null || true
-%%PORTDOCS%%%%RUBY_DOCDIR%%/rskkserv/ChangeLog
-%%PORTDOCS%%%%RUBY_DOCDIR%%/rskkserv/ja/README
-%%PORTDOCS%%%%RUBY_DOCDIR%%/rskkserv/ja/TODO
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/rskkserv/ja
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/rskkserv
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ChangeLog
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/README
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/TODO
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/ja
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%
diff --git a/japanese/ruby-chasen/Makefile b/japanese/ruby-chasen/Makefile
index 27eae3a31fde..20fc34631fb3 100644
--- a/japanese/ruby-chasen/Makefile
+++ b/japanese/ruby-chasen/Makefile
@@ -30,10 +30,10 @@ PKGNAMEPREFIX:=	${PKGNAMEPREFIX}${RUBY_PKGNAMEPREFIX}
 
 post-install:
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${RUBY_EXAMPLESDIR}/chasen/ja/
-	${INSTALL_DATA} ${WRKSRC}/sample/* ${RUBY_EXAMPLESDIR}/chasen/ja/
-	${MKDIR} ${RUBY_DOCDIR}/chasen/ja
-	${INSTALL_DATA} ${WRKSRC}/chasen.html ${RUBY_DOCDIR}/chasen/ja/
+	${MKDIR} ${RUBY_MODEXAMPLESDIR}/ja/
+	${INSTALL_DATA} ${WRKSRC}/sample/* ${RUBY_MODEXAMPLESDIR}/ja/
+	${MKDIR} ${RUBY_MODDOCDIR}/ja
+	${INSTALL_DATA} ${WRKSRC}/chasen.html ${RUBY_MODDOCDIR}/ja/
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/japanese/ruby-chasen/pkg-plist b/japanese/ruby-chasen/pkg-plist
index f0ce0a77fdf7..0ca85f5e017e 100644
--- a/japanese/ruby-chasen/pkg-plist
+++ b/japanese/ruby-chasen/pkg-plist
@@ -1,8 +1,8 @@
 %%RUBY_SITEARCHLIBDIR%%/chasen.so
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/chasen/ja/chasenc.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/chasen/ja/test.rb
-%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/chasen/ja
-%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/chasen
-%%PORTDOCS%%%%RUBY_DOCDIR%%/chasen/ja/chasen.html
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/chasen/ja
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/chasen
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/ja/chasenc.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/ja/test.rb
+%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%/ja
+%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/chasen.html
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/ja
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%
diff --git a/japanese/ruby-eb/Makefile b/japanese/ruby-eb/Makefile
index eded5f29f17d..5158cbdd8a0c 100644
--- a/japanese/ruby-eb/Makefile
+++ b/japanese/ruby-eb/Makefile
@@ -28,10 +28,10 @@ PKGNAMEPREFIX:=	${PKGNAMEPREFIX}${RUBY_PKGNAMEPREFIX}
 
 post-install:
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${RUBY_EXAMPLESDIR}/eb/ja/
-	${INSTALL_DATA} ${WRKSRC}/test.rb ${RUBY_EXAMPLESDIR}/eb/ja/
-	${MKDIR} ${RUBY_DOCDIR}/eb/ja
-	${INSTALL_DATA} ${WRKSRC}/eb.html ${RUBY_DOCDIR}/eb/ja/
+	${MKDIR} ${RUBY_MODEXAMPLESDIR}/ja/
+	${INSTALL_DATA} ${WRKSRC}/test.rb ${RUBY_MODEXAMPLESDIR}/ja/
+	${MKDIR} ${RUBY_MODDOCDIR}/ja
+	${INSTALL_DATA} ${WRKSRC}/eb.html ${RUBY_MODDOCDIR}/ja/
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/japanese/ruby-eb/pkg-plist b/japanese/ruby-eb/pkg-plist
index df68df7002cd..f35e0bae5194 100644
--- a/japanese/ruby-eb/pkg-plist
+++ b/japanese/ruby-eb/pkg-plist
@@ -1,7 +1,7 @@
 %%RUBY_SITEARCHLIBDIR%%/eb.so
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/eb/ja/test.rb
-%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/eb/ja
-%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/eb
-%%PORTDOCS%%%%RUBY_DOCDIR%%/eb/ja/eb.html
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/eb/ja
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/eb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/ja/test.rb
+%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%/ja
+%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/eb.html
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/ja
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%
diff --git a/japanese/ruby-gyokuro/Makefile b/japanese/ruby-gyokuro/Makefile
index aae398ae282d..f0830f196b41 100644
--- a/japanese/ruby-gyokuro/Makefile
+++ b/japanese/ruby-gyokuro/Makefile
@@ -26,14 +26,14 @@ do-install:
 	${MKDIR} ${RUBY_SITELIBDIR}/gyokuro
 	${INSTALL_DATA} ${WRKSRC}/lib/gyokuro/*.rb ${RUBY_SITELIBDIR}/gyokuro/
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${RUBY_EXAMPLESDIR}/${PORTNAME}
-	${INSTALL_DATA} ${WRKSRC}/example/* ${RUBY_EXAMPLESDIR}/${PORTNAME}/
-	${MKDIR} ${RUBY_DOCDIR}/${PORTNAME}/ja
+	${MKDIR} ${RUBY_MODEXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/example/* ${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/japanese/ruby-gyokuro/pkg-plist b/japanese/ruby-gyokuro/pkg-plist
index dcf88d5acd80..2398634b2d13 100644
--- a/japanese/ruby-gyokuro/pkg-plist
+++ b/japanese/ruby-gyokuro/pkg-plist
@@ -3,15 +3,15 @@
 %%RUBY_SITELIBDIR%%/gyokuro/parts.rb
 %%RUBY_SITELIBDIR%%/gyokuro/table.rb
 @dirrm %%RUBY_SITELIBDIR%%/gyokuro
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/gyokuro/example1.txt
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/gyokuro/example2.txt
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/gyokuro/example3.txt
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/gyokuro/inspect.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/gyokuro/katakana.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/gyokuro/morpheme.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/gyokuro/noun.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/gyokuro/wakachi.rb
-%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/gyokuro
-%%PORTDOCS%%%%RUBY_DOCDIR%%/gyokuro/ja/README.ja.rd
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/gyokuro/ja
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/gyokuro
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/example1.txt
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/example2.txt
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/example3.txt
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/inspect.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/katakana.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/morpheme.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/noun.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/wakachi.rb
+%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/README.ja.rd
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/ja
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%
diff --git a/japanese/ruby-kakasi/Makefile b/japanese/ruby-kakasi/Makefile
index 0b457b8feecf..a0ef7acbf9b5 100644
--- a/japanese/ruby-kakasi/Makefile
+++ b/japanese/ruby-kakasi/Makefile
@@ -34,14 +34,14 @@ post-patch:
 post-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/wdcnt ${PREFIX}/bin/
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${RUBY_EXAMPLESDIR}/kakasi/ja/
-	${INSTALL_DATA} ${WRKSRC}/test.rb ${RUBY_EXAMPLESDIR}/kakasi/ja/
-	${MKDIR} ${RUBY_DOCDIR}/kakasi/ja
+	${MKDIR} ${RUBY_MODEXAMPLESDIR}/ja/
+	${INSTALL_DATA} ${WRKSRC}/test.rb ${RUBY_MODEXAMPLESDIR}/ja/
+	${MKDIR} ${RUBY_MODDOCDIR}/ja
 .for f in ${DOCS_EN}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_DOCDIR}/kakasi/
+	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_MODDOCDIR}/
 .endfor
 .for f in ${DOCS_JA}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_DOCDIR}/kakasi/ja/
+	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_MODDOCDIR}/ja/
 .endfor
 .endif
 
diff --git a/japanese/ruby-kakasi/pkg-plist b/japanese/ruby-kakasi/pkg-plist
index fbe82daaf926..c28e91ec6067 100644
--- a/japanese/ruby-kakasi/pkg-plist
+++ b/japanese/ruby-kakasi/pkg-plist
@@ -1,11 +1,11 @@
 bin/wdcnt
 %%RUBY_SITEARCHLIBDIR%%/kakasi.so
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/kakasi/ja/test.rb
-%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/kakasi/ja
-%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/kakasi
-%%PORTDOCS%%%%RUBY_DOCDIR%%/kakasi/ChangeLog
-%%PORTDOCS%%%%RUBY_DOCDIR%%/kakasi/README
-%%PORTDOCS%%%%RUBY_DOCDIR%%/kakasi/wdcnt.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/kakasi/ja/README.jp
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/kakasi/ja
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/kakasi
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/ja/test.rb
+%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%/ja
+%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ChangeLog
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/README
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/wdcnt.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/README.jp
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/ja
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%
diff --git a/japanese/ruby-man/pkg-plist b/japanese/ruby-man/pkg-plist
index 1dd27ddee26f..abf246c7b220 100644
--- a/japanese/ruby-man/pkg-plist
+++ b/japanese/ruby-man/pkg-plist
@@ -1,56 +1,56 @@
-%%RUBY_DOCDIR%%/ruby-man%%LANGSUFFIX%%/Array.html
-%%RUBY_DOCDIR%%/ruby-man%%LANGSUFFIX%%/Bignum.html
-%%RUBY_DOCDIR%%/ruby-man%%LANGSUFFIX%%/Class.html
-%%RUBY_DOCDIR%%/ruby-man%%LANGSUFFIX%%/Compar.html
-%%RUBY_DOCDIR%%/ruby-man%%LANGSUFFIX%%/Cont.html
-%%RUBY_DOCDIR%%/ruby-man%%LANGSUFFIX%%/Data.html
-%%RUBY_DOCDIR%%/ruby-man%%LANGSUFFIX%%/Dir.html
-%%RUBY_DOCDIR%%/ruby-man%%LANGSUFFIX%%/ENV.html
-%%RUBY_DOCDIR%%/ruby-man%%LANGSUFFIX%%/Enum.html
-%%RUBY_DOCDIR%%/ruby-man%%LANGSUFFIX%%/Errno.html
-%%RUBY_DOCDIR%%/ruby-man%%LANGSUFFIX%%/Exception.html
-%%RUBY_DOCDIR%%/ruby-man%%LANGSUFFIX%%/File.html
-%%RUBY_DOCDIR%%/ruby-man%%LANGSUFFIX%%/FileTest.html
-%%RUBY_DOCDIR%%/ruby-man%%LANGSUFFIX%%/Fixnum.html
-%%RUBY_DOCDIR%%/ruby-man%%LANGSUFFIX%%/Float.html
-%%RUBY_DOCDIR%%/ruby-man%%LANGSUFFIX%%/GC.html
-%%RUBY_DOCDIR%%/ruby-man%%LANGSUFFIX%%/Hash.html
-%%RUBY_DOCDIR%%/ruby-man%%LANGSUFFIX%%/IO.html
-%%RUBY_DOCDIR%%/ruby-man%%LANGSUFFIX%%/Integer.html
-%%RUBY_DOCDIR%%/ruby-man%%LANGSUFFIX%%/Kernel.html
-%%RUBY_DOCDIR%%/ruby-man%%LANGSUFFIX%%/Marshal.html
-%%RUBY_DOCDIR%%/ruby-man%%LANGSUFFIX%%/Match.html
-%%RUBY_DOCDIR%%/ruby-man%%LANGSUFFIX%%/Math.html
-%%RUBY_DOCDIR%%/ruby-man%%LANGSUFFIX%%/Module.html
-%%RUBY_DOCDIR%%/ruby-man%%LANGSUFFIX%%/NilClass.html
-%%RUBY_DOCDIR%%/ruby-man%%LANGSUFFIX%%/Numeric.html
-%%RUBY_DOCDIR%%/ruby-man%%LANGSUFFIX%%/ObSpace.html
-%%RUBY_DOCDIR%%/ruby-man%%LANGSUFFIX%%/Object.html
-%%RUBY_DOCDIR%%/ruby-man%%LANGSUFFIX%%/Prec.html
-%%RUBY_DOCDIR%%/ruby-man%%LANGSUFFIX%%/Proc.html
-%%RUBY_DOCDIR%%/ruby-man%%LANGSUFFIX%%/Process.html
-%%RUBY_DOCDIR%%/ruby-man%%LANGSUFFIX%%/Range.html
-%%RUBY_DOCDIR%%/ruby-man%%LANGSUFFIX%%/Regexp.html
-%%RUBY_DOCDIR%%/ruby-man%%LANGSUFFIX%%/String.html
-%%RUBY_DOCDIR%%/ruby-man%%LANGSUFFIX%%/Struct.html
-%%RUBY_DOCDIR%%/ruby-man%%LANGSUFFIX%%/Time.html
-%%RUBY_DOCDIR%%/ruby-man%%LANGSUFFIX%%/bundle.html
-%%RUBY_DOCDIR%%/ruby-man%%LANGSUFFIX%%/classes.html
-%%RUBY_DOCDIR%%/ruby-man%%LANGSUFFIX%%/dbm.html
-%%RUBY_DOCDIR%%/ruby-man%%LANGSUFFIX%%/ftplib.html
-%%RUBY_DOCDIR%%/ruby-man%%LANGSUFFIX%%/function.html
-%%RUBY_DOCDIR%%/ruby-man%%LANGSUFFIX%%/getopts.html
-%%RUBY_DOCDIR%%/ruby-man%%LANGSUFFIX%%/glossary.html
-%%RUBY_DOCDIR%%/ruby-man%%LANGSUFFIX%%/index.html
-%%RUBY_DOCDIR%%/ruby-man%%LANGSUFFIX%%/kconv.html
-%%RUBY_DOCDIR%%/ruby-man%%LANGSUFFIX%%/options.html
-%%RUBY_DOCDIR%%/ruby-man%%LANGSUFFIX%%/parsearg.html
-%%RUBY_DOCDIR%%/ruby-man%%LANGSUFFIX%%/preface.html
-%%RUBY_DOCDIR%%/ruby-man%%LANGSUFFIX%%/socket.html
-%%RUBY_DOCDIR%%/ruby-man%%LANGSUFFIX%%/syntax.html
-%%RUBY_DOCDIR%%/ruby-man%%LANGSUFFIX%%/template.html
-%%RUBY_DOCDIR%%/ruby-man%%LANGSUFFIX%%/thread.html
-%%RUBY_DOCDIR%%/ruby-man%%LANGSUFFIX%%/variable.html
-%%RUBY_DOCDIR%%/ruby-man%%LANGSUFFIX%%/yacc.html
-@dirrm %%RUBY_DOCDIR%%/ruby-man%%LANGSUFFIX%%
+%%RUBY_MODDOCDIR%%/Array.html
+%%RUBY_MODDOCDIR%%/Bignum.html
+%%RUBY_MODDOCDIR%%/Class.html
+%%RUBY_MODDOCDIR%%/Compar.html
+%%RUBY_MODDOCDIR%%/Cont.html
+%%RUBY_MODDOCDIR%%/Data.html
+%%RUBY_MODDOCDIR%%/Dir.html
+%%RUBY_MODDOCDIR%%/ENV.html
+%%RUBY_MODDOCDIR%%/Enum.html
+%%RUBY_MODDOCDIR%%/Errno.html
+%%RUBY_MODDOCDIR%%/Exception.html
+%%RUBY_MODDOCDIR%%/File.html
+%%RUBY_MODDOCDIR%%/FileTest.html
+%%RUBY_MODDOCDIR%%/Fixnum.html
+%%RUBY_MODDOCDIR%%/Float.html
+%%RUBY_MODDOCDIR%%/GC.html
+%%RUBY_MODDOCDIR%%/Hash.html
+%%RUBY_MODDOCDIR%%/IO.html
+%%RUBY_MODDOCDIR%%/Integer.html
+%%RUBY_MODDOCDIR%%/Kernel.html
+%%RUBY_MODDOCDIR%%/Marshal.html
+%%RUBY_MODDOCDIR%%/Match.html
+%%RUBY_MODDOCDIR%%/Math.html
+%%RUBY_MODDOCDIR%%/Module.html
+%%RUBY_MODDOCDIR%%/NilClass.html
+%%RUBY_MODDOCDIR%%/Numeric.html
+%%RUBY_MODDOCDIR%%/ObSpace.html
+%%RUBY_MODDOCDIR%%/Object.html
+%%RUBY_MODDOCDIR%%/Prec.html
+%%RUBY_MODDOCDIR%%/Proc.html
+%%RUBY_MODDOCDIR%%/Process.html
+%%RUBY_MODDOCDIR%%/Range.html
+%%RUBY_MODDOCDIR%%/Regexp.html
+%%RUBY_MODDOCDIR%%/String.html
+%%RUBY_MODDOCDIR%%/Struct.html
+%%RUBY_MODDOCDIR%%/Time.html
+%%RUBY_MODDOCDIR%%/bundle.html
+%%RUBY_MODDOCDIR%%/classes.html
+%%RUBY_MODDOCDIR%%/dbm.html
+%%RUBY_MODDOCDIR%%/ftplib.html
+%%RUBY_MODDOCDIR%%/function.html
+%%RUBY_MODDOCDIR%%/getopts.html
+%%RUBY_MODDOCDIR%%/glossary.html
+%%RUBY_MODDOCDIR%%/index.html
+%%RUBY_MODDOCDIR%%/kconv.html
+%%RUBY_MODDOCDIR%%/options.html
+%%RUBY_MODDOCDIR%%/parsearg.html
+%%RUBY_MODDOCDIR%%/preface.html
+%%RUBY_MODDOCDIR%%/socket.html
+%%RUBY_MODDOCDIR%%/syntax.html
+%%RUBY_MODDOCDIR%%/template.html
+%%RUBY_MODDOCDIR%%/thread.html
+%%RUBY_MODDOCDIR%%/variable.html
+%%RUBY_MODDOCDIR%%/yacc.html
+@dirrm %%RUBY_MODDOCDIR%%
 @unexec rmdir %D/%%RUBY_DOCDIR%% 2>/dev/null || true
diff --git a/japanese/ruby-romkan/Makefile b/japanese/ruby-romkan/Makefile
index ba62d7fc36c0..216dba9377b3 100644
--- a/japanese/ruby-romkan/Makefile
+++ b/japanese/ruby-romkan/Makefile
@@ -36,16 +36,16 @@ do-build:
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/romkan.rb ${RUBY_SITELIBDIR}/
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${RUBY_EXAMPLESDIR}/${PORTNAME}/ja
+	${MKDIR} ${RUBY_MODEXAMPLESDIR}/ja
 .for f in ${EXAMPLES_JA}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_EXAMPLESDIR}/${PORTNAME}/ja/
+	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_MODEXAMPLESDIR}/ja/
 .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_SCRIPT} ${WRKSRC}/${f} ${RUBY_DOCDIR}/${PORTNAME}/ja/
+	${INSTALL_SCRIPT} ${WRKSRC}/${f} ${RUBY_MODDOCDIR}/ja/
 .endfor
 .endif
 
diff --git a/japanese/ruby-romkan/pkg-plist b/japanese/ruby-romkan/pkg-plist
index aa96b5f36c5c..3a83a04a1efc 100644
--- a/japanese/ruby-romkan/pkg-plist
+++ b/japanese/ruby-romkan/pkg-plist
@@ -1,12 +1,12 @@
 %%RUBY_SITELIBDIR%%/romkan.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/romkan/ja/test.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/romkan/ja/test.sh
-%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/romkan/ja
-%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/romkan
-%%PORTDOCS%%%%RUBY_DOCDIR%%/romkan/ChangeLog
-%%PORTDOCS%%%%RUBY_DOCDIR%%/romkan/romkan.en.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/romkan/romkan.en.rd
-%%PORTDOCS%%%%RUBY_DOCDIR%%/romkan/ja/romkan.ja.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/romkan/ja/romkan.ja.rd
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/romkan/ja
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/romkan
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/ja/test.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/ja/test.sh
+%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%/ja
+%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ChangeLog
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/romkan.en.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/romkan.en.rd
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/romkan.ja.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/romkan.ja.rd
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/ja
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%
diff --git a/japanese/ruby-uconv/Makefile b/japanese/ruby-uconv/Makefile
index 1a32901578f2..402538ac6da3 100644
--- a/japanese/ruby-uconv/Makefile
+++ b/japanese/ruby-uconv/Makefile
@@ -29,14 +29,14 @@ EXAMPLES=	euc2unicode.rb \
 PKGNAMEPREFIX:=	${PKGNAMEPREFIX}${RUBY_PKGNAMEPREFIX}
 
 post-install:
-	${MKDIR} ${RUBY_EXAMPLESDIR}/uconv/ja
+	${MKDIR} ${RUBY_MODEXAMPLESDIR}/ja
 .for f in ${EXAMPLES}
-	${INSTALL_DATA} ${WRKSRC}/samples/${f} ${RUBY_EXAMPLESDIR}/uconv/ja
+	${INSTALL_DATA} ${WRKSRC}/samples/${f} ${RUBY_MODEXAMPLESDIR}/ja
 .endfor
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${RUBY_DOCDIR}/uconv/ja
-	${INSTALL_DATA} ${WRKSRC}/README ${RUBY_DOCDIR}/uconv/
-	${INSTALL_DATA} ${WRKSRC}/README.ja ${RUBY_DOCDIR}/uconv/ja/
+	${MKDIR} ${RUBY_MODDOCDIR}/ja
+	${INSTALL_DATA} ${WRKSRC}/README ${RUBY_MODDOCDIR}/
+	${INSTALL_DATA} ${WRKSRC}/README.ja ${RUBY_MODDOCDIR}/ja/
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/japanese/ruby-uconv/pkg-plist b/japanese/ruby-uconv/pkg-plist
index 20e2711deb60..2890684c75bb 100644
--- a/japanese/ruby-uconv/pkg-plist
+++ b/japanese/ruby-uconv/pkg-plist
@@ -1,15 +1,15 @@
 %%RUBY_SITEARCHLIBDIR%%/uconv.so
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/uconv/ja/euc2unicode.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/uconv/ja/test-utf.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/uconv/ja/test-utf2.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/uconv/ja/test_euc.txt
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/uconv/ja/test_euc.xml
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/uconv/ja/trilang.xml
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/uconv/ja/unicode2euc.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/uconv/ja/xmlconv.rb
-%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/uconv/ja
-%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/uconv
-%%PORTDOCS%%%%RUBY_DOCDIR%%/uconv/README
-%%PORTDOCS%%%%RUBY_DOCDIR%%/uconv/ja/README.ja
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/uconv/ja
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/uconv
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/ja/euc2unicode.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/ja/test-utf.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/ja/test-utf2.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/ja/test_euc.txt
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/ja/test_euc.xml
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/ja/trilang.xml
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/ja/unicode2euc.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/ja/xmlconv.rb
+%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%/ja
+%%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/japanese/ruby-usersguide/Makefile b/japanese/ruby-usersguide/Makefile
index ba42150681b2..560cbbbef44b 100644
--- a/japanese/ruby-usersguide/Makefile
+++ b/japanese/ruby-usersguide/Makefile
@@ -19,15 +19,16 @@ USE_RUBY=	yes
 RUBY_NO_BUILD_DEPENDS=	yes
 RUBY_NO_RUN_DEPENDS=	yes
 
+RUBY_MODNAME=	${PORTNAME}-jp
+
 SHORTNAME=	${PORTNAME:S/usersguide/uguide/}
 
 WRKSRC=		${WRKDIR}/${SHORTNAME}
 NO_BUILD=	yes
-DOCDIR=		${RUBY_DOCDIR}/${PORTNAME}-jp
 
 do-install:
-	${MKDIR} ${DOCDIR}
-	${INSTALL_DATA} ${WRKSRC}/* ${DOCDIR}
-	${LN} -fs uguide00.html ${DOCDIR}/index.html
+	${MKDIR} ${RUBY_MODDOCDIR}
+	${INSTALL_DATA} ${WRKSRC}/* ${RUBY_MODDOCDIR}
+	${LN} -fs uguide00.html ${RUBY_MODDOCDIR}/index.html
 
 .include <bsd.port.mk>
diff --git a/japanese/ruby-usersguide/pkg-plist b/japanese/ruby-usersguide/pkg-plist
index 92d59a761709..fd491a2605bf 100644
--- a/japanese/ruby-usersguide/pkg-plist
+++ b/japanese/ruby-usersguide/pkg-plist
@@ -1,29 +1,29 @@
-%%RUBY_DOCDIR%%/ruby-usersguide-jp/index.html
-%%RUBY_DOCDIR%%/ruby-usersguide-jp/uguide00.html
-%%RUBY_DOCDIR%%/ruby-usersguide-jp/uguide01.html
-%%RUBY_DOCDIR%%/ruby-usersguide-jp/uguide02.html
-%%RUBY_DOCDIR%%/ruby-usersguide-jp/uguide03.html
-%%RUBY_DOCDIR%%/ruby-usersguide-jp/uguide04.html
-%%RUBY_DOCDIR%%/ruby-usersguide-jp/uguide05.html
-%%RUBY_DOCDIR%%/ruby-usersguide-jp/uguide06.html
-%%RUBY_DOCDIR%%/ruby-usersguide-jp/uguide07.html
-%%RUBY_DOCDIR%%/ruby-usersguide-jp/uguide08.html
-%%RUBY_DOCDIR%%/ruby-usersguide-jp/uguide09.html
-%%RUBY_DOCDIR%%/ruby-usersguide-jp/uguide10.html
-%%RUBY_DOCDIR%%/ruby-usersguide-jp/uguide11.html
-%%RUBY_DOCDIR%%/ruby-usersguide-jp/uguide12.html
-%%RUBY_DOCDIR%%/ruby-usersguide-jp/uguide13.html
-%%RUBY_DOCDIR%%/ruby-usersguide-jp/uguide14.html
-%%RUBY_DOCDIR%%/ruby-usersguide-jp/uguide15.html
-%%RUBY_DOCDIR%%/ruby-usersguide-jp/uguide16.html
-%%RUBY_DOCDIR%%/ruby-usersguide-jp/uguide17.html
-%%RUBY_DOCDIR%%/ruby-usersguide-jp/uguide18.html
-%%RUBY_DOCDIR%%/ruby-usersguide-jp/uguide19.html
-%%RUBY_DOCDIR%%/ruby-usersguide-jp/uguide20.html
-%%RUBY_DOCDIR%%/ruby-usersguide-jp/uguide21.html
-%%RUBY_DOCDIR%%/ruby-usersguide-jp/uguide22.html
-%%RUBY_DOCDIR%%/ruby-usersguide-jp/uguide23.html
-%%RUBY_DOCDIR%%/ruby-usersguide-jp/uguide24.html
-%%RUBY_DOCDIR%%/ruby-usersguide-jp/uguide25.html
-@dirrm %%RUBY_DOCDIR%%/ruby-usersguide-jp
+%%RUBY_MODDOCDIR%%/index.html
+%%RUBY_MODDOCDIR%%/uguide00.html
+%%RUBY_MODDOCDIR%%/uguide01.html
+%%RUBY_MODDOCDIR%%/uguide02.html
+%%RUBY_MODDOCDIR%%/uguide03.html
+%%RUBY_MODDOCDIR%%/uguide04.html
+%%RUBY_MODDOCDIR%%/uguide05.html
+%%RUBY_MODDOCDIR%%/uguide06.html
+%%RUBY_MODDOCDIR%%/uguide07.html
+%%RUBY_MODDOCDIR%%/uguide08.html
+%%RUBY_MODDOCDIR%%/uguide09.html
+%%RUBY_MODDOCDIR%%/uguide10.html
+%%RUBY_MODDOCDIR%%/uguide11.html
+%%RUBY_MODDOCDIR%%/uguide12.html
+%%RUBY_MODDOCDIR%%/uguide13.html
+%%RUBY_MODDOCDIR%%/uguide14.html
+%%RUBY_MODDOCDIR%%/uguide15.html
+%%RUBY_MODDOCDIR%%/uguide16.html
+%%RUBY_MODDOCDIR%%/uguide17.html
+%%RUBY_MODDOCDIR%%/uguide18.html
+%%RUBY_MODDOCDIR%%/uguide19.html
+%%RUBY_MODDOCDIR%%/uguide20.html
+%%RUBY_MODDOCDIR%%/uguide21.html
+%%RUBY_MODDOCDIR%%/uguide22.html
+%%RUBY_MODDOCDIR%%/uguide23.html
+%%RUBY_MODDOCDIR%%/uguide24.html
+%%RUBY_MODDOCDIR%%/uguide25.html
+@dirrm %%RUBY_MODDOCDIR%%
 @unexec rmdir %D/%%RUBY_DOCDIR%% 2>/dev/null || true