18 files changed, 390 insertions, 396 deletions

diff --git a/lang/ruby-lua/Makefile b/lang/ruby-lua/Makefile
index 4a19e23065db..747893f10f91 100644
--- a/lang/ruby-lua/Makefile
+++ b/lang/ruby-lua/Makefile
@@ -31,12 +31,12 @@ EXAMPLES=	html_ssi_lua.rb test_*
 
 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}
-	${INSTALL_DATA} ${WRKSRC}/rubylua.txt ${RUBY_DOCDIR}/${PORTNAME}/
+	${MKDIR} ${RUBY_MODDOCDIR}
+	${INSTALL_DATA} ${WRKSRC}/rubylua.txt ${RUBY_MODDOCDIR}/
 .endif
 
 .include <bsd.port.mk>
diff --git a/lang/ruby-lua/pkg-plist b/lang/ruby-lua/pkg-plist
index 8b0116098daf..dff815fb1d93 100644
--- a/lang/ruby-lua/pkg-plist
+++ b/lang/ruby-lua/pkg-plist
@@ -1,10 +1,10 @@
 %%RUBY_SITEARCHLIBDIR%%/lua.so
-%%PORTDOCS%%%%RUBY_DOCDIR%%/lua/rubylua.txt
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/lua
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/lua/html_ssi_lua.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/lua/test_lua.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/lua/test_ssi_lua2_2.html
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/lua/test_ssi_lua3_2.html
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/lua/test_ssi_lua_2.html
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/lua/test_ssi_lua_2.rb
-%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/lua
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/rubylua.txt
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/html_ssi_lua.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test_lua.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test_ssi_lua2_2.html
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test_ssi_lua3_2.html
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test_ssi_lua_2.html
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test_ssi_lua_2.rb
+%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%
diff --git a/lang/ruby-man/Makefile b/lang/ruby-man/Makefile
index 7b616f87f527..6f22b65c11fa 100644
--- a/lang/ruby-man/Makefile
+++ b/lang/ruby-man/Makefile
@@ -19,14 +19,14 @@ USE_RUBY=	yes
 RUBY_NO_BUILD_DEPENDS=	yes
 RUBY_NO_RUN_DEPENDS=	yes
 
+RUBY_MODNAME=	ruby-man${LANGSUFFIX}
+
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:R}${LANGSUFFIX}
 NO_BUILD=	yes
 PLIST_SUB=	LANGSUFFIX="${LANGSUFFIX}"
 
-DOCDIR=		${RUBY_DOCDIR}/ruby-man${LANGSUFFIX}
-
 do-install:
-	${MKDIR} ${DOCDIR}
-	${INSTALL_DATA} ${WRKSRC}/*.html ${DOCDIR}
+	${MKDIR} ${RUBY_MODDOCDIR}
+	${INSTALL_DATA} ${WRKSRC}/*.html ${RUBY_MODDOCDIR}
 
 .include <bsd.port.mk>
diff --git a/lang/ruby-man/pkg-plist b/lang/ruby-man/pkg-plist
index bf7401678001..9ffc2eeecd78 100644
--- a/lang/ruby-man/pkg-plist
+++ b/lang/ruby-man/pkg-plist
@@ -1,51 +1,51 @@
-%%RUBY_DOCDIR%%/ruby-man/Array.html
-%%RUBY_DOCDIR%%/ruby-man/Bignum.html
-%%RUBY_DOCDIR%%/ruby-man/Class.html
-%%RUBY_DOCDIR%%/ruby-man/Compar.html
-%%RUBY_DOCDIR%%/ruby-man/Data.html
-%%RUBY_DOCDIR%%/ruby-man/Dir.html
-%%RUBY_DOCDIR%%/ruby-man/ENV.html
-%%RUBY_DOCDIR%%/ruby-man/Enum.html
-%%RUBY_DOCDIR%%/ruby-man/Errno.html
-%%RUBY_DOCDIR%%/ruby-man/Exception.html
-%%RUBY_DOCDIR%%/ruby-man/File.html
-%%RUBY_DOCDIR%%/ruby-man/FileTest.html
-%%RUBY_DOCDIR%%/ruby-man/Fixnum.html
-%%RUBY_DOCDIR%%/ruby-man/Float.html
-%%RUBY_DOCDIR%%/ruby-man/GC.html
-%%RUBY_DOCDIR%%/ruby-man/Hash.html
-%%RUBY_DOCDIR%%/ruby-man/IO.html
-%%RUBY_DOCDIR%%/ruby-man/Integer.html
-%%RUBY_DOCDIR%%/ruby-man/Kernel.html
-%%RUBY_DOCDIR%%/ruby-man/Marshal.html
-%%RUBY_DOCDIR%%/ruby-man/Match.html
-%%RUBY_DOCDIR%%/ruby-man/Math.html
-%%RUBY_DOCDIR%%/ruby-man/Module.html
-%%RUBY_DOCDIR%%/ruby-man/NilClass.html
-%%RUBY_DOCDIR%%/ruby-man/Numeric.html
-%%RUBY_DOCDIR%%/ruby-man/ObSpace.html
-%%RUBY_DOCDIR%%/ruby-man/Object.html
-%%RUBY_DOCDIR%%/ruby-man/Prec.html
-%%RUBY_DOCDIR%%/ruby-man/Proc.html
-%%RUBY_DOCDIR%%/ruby-man/Process.html
-%%RUBY_DOCDIR%%/ruby-man/Range.html
-%%RUBY_DOCDIR%%/ruby-man/Regexp.html
-%%RUBY_DOCDIR%%/ruby-man/String.html
-%%RUBY_DOCDIR%%/ruby-man/Struct.html
-%%RUBY_DOCDIR%%/ruby-man/Time.html
-%%RUBY_DOCDIR%%/ruby-man/bundle.html
-%%RUBY_DOCDIR%%/ruby-man/classes.html
-%%RUBY_DOCDIR%%/ruby-man/dbm.html
-%%RUBY_DOCDIR%%/ruby-man/function.html
-%%RUBY_DOCDIR%%/ruby-man/glossary.html
-%%RUBY_DOCDIR%%/ruby-man/index.html
-%%RUBY_DOCDIR%%/ruby-man/kconv.html
-%%RUBY_DOCDIR%%/ruby-man/options.html
-%%RUBY_DOCDIR%%/ruby-man/preface.html
-%%RUBY_DOCDIR%%/ruby-man/socket.html
-%%RUBY_DOCDIR%%/ruby-man/syntax.html
-%%RUBY_DOCDIR%%/ruby-man/thread.html
-%%RUBY_DOCDIR%%/ruby-man/variable.html
-%%RUBY_DOCDIR%%/ruby-man/yacc.html
-@dirrm %%RUBY_DOCDIR%%/ruby-man
+%%RUBY_MODDOCDIR%%/Array.html
+%%RUBY_MODDOCDIR%%/Bignum.html
+%%RUBY_MODDOCDIR%%/Class.html
+%%RUBY_MODDOCDIR%%/Compar.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%%/function.html
+%%RUBY_MODDOCDIR%%/glossary.html
+%%RUBY_MODDOCDIR%%/index.html
+%%RUBY_MODDOCDIR%%/kconv.html
+%%RUBY_MODDOCDIR%%/options.html
+%%RUBY_MODDOCDIR%%/preface.html
+%%RUBY_MODDOCDIR%%/socket.html
+%%RUBY_MODDOCDIR%%/syntax.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/lang/ruby-perl/Makefile b/lang/ruby-perl/Makefile
index c7fd44ad8e31..6f19c12e326e 100644
--- a/lang/ruby-perl/Makefile
+++ b/lang/ruby-perl/Makefile
@@ -38,12 +38,12 @@ post-install:
 	@cd ${WRKSRC}/Ruby; \
 	${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} install
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${RUBY_EXAMPLESDIR}/perl
+	${MKDIR} ${RUBY_MODEXAMPLESDIR}
 .for f in ${EXAMPLES}
-	${INSTALL_DATA} ${WRKSRC}/samples/${f} ${RUBY_EXAMPLESDIR}/perl/
+	${INSTALL_DATA} ${WRKSRC}/samples/${f} ${RUBY_MODEXAMPLESDIR}/
 .endfor
-	${MKDIR} ${RUBY_DOCDIR}/perl/ja
-	${INSTALL_DATA} ${WRKSRC}/README.ja ${RUBY_DOCDIR}/perl/ja/
+	${MKDIR} ${RUBY_MODDOCDIR}/ja
+	${INSTALL_DATA} ${WRKSRC}/README.ja ${RUBY_MODDOCDIR}/ja/
 .endif
 
 .include <bsd.port.mk>
diff --git a/lang/ruby-perl/pkg-plist b/lang/ruby-perl/pkg-plist
index dfaa3c45cc6d..30830750ff66 100644
--- a/lang/ruby-perl/pkg-plist
+++ b/lang/ruby-perl/pkg-plist
@@ -1,14 +1,14 @@
 %%RUBY_SITEARCHLIBDIR%%/perl.so
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/perl/htmlparse.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/perl/http.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/perl/perllib.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/perl/ping.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/perl/test.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/perl/xmlparser.rb
-%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/perl
-%%PORTDOCS%%%%RUBY_DOCDIR%%/perl/ja/README.ja
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/perl/ja
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/perl
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/htmlparse.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/http.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/perllib.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/ping.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/xmlparser.rb
+%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/README.ja
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/ja
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Ruby.pm
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Ruby/.packlist
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Ruby/Ruby.bs
diff --git a/lang/ruby-programmingruby/Makefile b/lang/ruby-programmingruby/Makefile
index c0d521565f59..f4df087a4a8f 100644
--- a/lang/ruby-programmingruby/Makefile
+++ b/lang/ruby-programmingruby/Makefile
@@ -22,10 +22,8 @@ RUBY_NO_RUN_DEPENDS=	yes
 
 NO_BUILD=	yes
 
-DOCDIR=		${RUBY_DOCDIR}/${PORTNAME}
-
 do-install:
-	${MKDIR} ${DOCDIR}
-	${CP} -R ${WRKSRC}/* ${DOCDIR}/
+	${MKDIR} ${RUBY_MODDOCDIR}
+	${CP} -R ${WRKSRC}/* ${RUBY_MODDOCDIR}/
 
 .include <bsd.port.mk>
diff --git a/lang/ruby-programmingruby/pkg-plist b/lang/ruby-programmingruby/pkg-plist
index 497634c16e01..3576369333fd 100644
--- a/lang/ruby-programmingruby/pkg-plist
+++ b/lang/ruby-programmingruby/pkg-plist
@@ -1,161 +1,161 @@
-%%RUBY_DOCDIR%%/programmingruby/COPYING
-%%RUBY_DOCDIR%%/programmingruby/README
-%%RUBY_DOCDIR%%/programmingruby/html/builtins.html
-%%RUBY_DOCDIR%%/programmingruby/html/classes.html
-%%RUBY_DOCDIR%%/programmingruby/html/dot.gif
-%%RUBY_DOCDIR%%/programmingruby/html/ext_ruby.html
-%%RUBY_DOCDIR%%/programmingruby/html/ext_tk.html
-%%RUBY_DOCDIR%%/programmingruby/html/fadedcover.gif
-%%RUBY_DOCDIR%%/programmingruby/html/foreword.html
-%%RUBY_DOCDIR%%/programmingruby/html/index.html
-%%RUBY_DOCDIR%%/programmingruby/html/intro.html
-%%RUBY_DOCDIR%%/programmingruby/html/irb.html
-%%RUBY_DOCDIR%%/programmingruby/html/language.html
-%%RUBY_DOCDIR%%/programmingruby/html/lib_network.html
-%%RUBY_DOCDIR%%/programmingruby/html/lib_patterns.html
-%%RUBY_DOCDIR%%/programmingruby/html/lib_standard.html
-%%RUBY_DOCDIR%%/programmingruby/html/lib_windows.html
-%%RUBY_DOCDIR%%/programmingruby/html/ospace.html
-%%RUBY_DOCDIR%%/programmingruby/html/pr_style.css
-%%RUBY_DOCDIR%%/programmingruby/html/preface.html
-%%RUBY_DOCDIR%%/programmingruby/html/rdtool.html
-%%RUBY_DOCDIR%%/programmingruby/html/ref_c_array.html
-%%RUBY_DOCDIR%%/programmingruby/html/ref_c_bignum.html
-%%RUBY_DOCDIR%%/programmingruby/html/ref_c_binding.html
-%%RUBY_DOCDIR%%/programmingruby/html/ref_c_class.html
-%%RUBY_DOCDIR%%/programmingruby/html/ref_c_continuation.html
-%%RUBY_DOCDIR%%/programmingruby/html/ref_c_dir.html
-%%RUBY_DOCDIR%%/programmingruby/html/ref_c_exception.html
-%%RUBY_DOCDIR%%/programmingruby/html/ref_c_falseclass.html
-%%RUBY_DOCDIR%%/programmingruby/html/ref_c_file.html
-%%RUBY_DOCDIR%%/programmingruby/html/ref_c_file__stat.html
-%%RUBY_DOCDIR%%/programmingruby/html/ref_c_fixnum.html
-%%RUBY_DOCDIR%%/programmingruby/html/ref_c_float.html
-%%RUBY_DOCDIR%%/programmingruby/html/ref_c_hash.html
-%%RUBY_DOCDIR%%/programmingruby/html/ref_c_integer.html
-%%RUBY_DOCDIR%%/programmingruby/html/ref_c_io.html
-%%RUBY_DOCDIR%%/programmingruby/html/ref_c_matchdata.html
-%%RUBY_DOCDIR%%/programmingruby/html/ref_c_method.html
-%%RUBY_DOCDIR%%/programmingruby/html/ref_c_module.html
-%%RUBY_DOCDIR%%/programmingruby/html/ref_c_nilclass.html
-%%RUBY_DOCDIR%%/programmingruby/html/ref_c_numeric.html
-%%RUBY_DOCDIR%%/programmingruby/html/ref_c_object.html
-%%RUBY_DOCDIR%%/programmingruby/html/ref_c_proc.html
-%%RUBY_DOCDIR%%/programmingruby/html/ref_c_range.html
-%%RUBY_DOCDIR%%/programmingruby/html/ref_c_regexp.html
-%%RUBY_DOCDIR%%/programmingruby/html/ref_c_string.html
-%%RUBY_DOCDIR%%/programmingruby/html/ref_c_struct.html
-%%RUBY_DOCDIR%%/programmingruby/html/ref_c_struct__tms.html
-%%RUBY_DOCDIR%%/programmingruby/html/ref_c_symbol.html
-%%RUBY_DOCDIR%%/programmingruby/html/ref_c_thread.html
-%%RUBY_DOCDIR%%/programmingruby/html/ref_c_threadgroup.html
-%%RUBY_DOCDIR%%/programmingruby/html/ref_c_time.html
-%%RUBY_DOCDIR%%/programmingruby/html/ref_c_trueclass.html
-%%RUBY_DOCDIR%%/programmingruby/html/ref_m_comparable.html
-%%RUBY_DOCDIR%%/programmingruby/html/ref_m_enumerable.html
-%%RUBY_DOCDIR%%/programmingruby/html/ref_m_errno.html
-%%RUBY_DOCDIR%%/programmingruby/html/ref_m_filetest.html
-%%RUBY_DOCDIR%%/programmingruby/html/ref_m_gc.html
-%%RUBY_DOCDIR%%/programmingruby/html/ref_m_kernel.html
-%%RUBY_DOCDIR%%/programmingruby/html/ref_m_marshal.html
-%%RUBY_DOCDIR%%/programmingruby/html/ref_m_math.html
-%%RUBY_DOCDIR%%/programmingruby/html/ref_m_objectspace.html
-%%RUBY_DOCDIR%%/programmingruby/html/ref_m_process.html
-%%RUBY_DOCDIR%%/programmingruby/html/roadmap.html
-%%RUBY_DOCDIR%%/programmingruby/html/rubyworld.html
-%%RUBY_DOCDIR%%/programmingruby/html/support.html
-%%RUBY_DOCDIR%%/programmingruby/html/taint.html
-%%RUBY_DOCDIR%%/programmingruby/html/trouble.html
-%%RUBY_DOCDIR%%/programmingruby/html/tut_classes.html
-%%RUBY_DOCDIR%%/programmingruby/html/tut_containers.html
-%%RUBY_DOCDIR%%/programmingruby/html/tut_exceptions.html
-%%RUBY_DOCDIR%%/programmingruby/html/tut_expressions.html
-%%RUBY_DOCDIR%%/programmingruby/html/tut_io.html
-%%RUBY_DOCDIR%%/programmingruby/html/tut_methods.html
-%%RUBY_DOCDIR%%/programmingruby/html/tut_modules.html
-%%RUBY_DOCDIR%%/programmingruby/html/tut_stdtypes.html
-%%RUBY_DOCDIR%%/programmingruby/html/tut_threads.html
-%%RUBY_DOCDIR%%/programmingruby/html/visible_space.gif
-%%RUBY_DOCDIR%%/programmingruby/html/web.html
-%%RUBY_DOCDIR%%/programmingruby/html/win32.html
-%%RUBY_DOCDIR%%/programmingruby/index.html
-%%RUBY_DOCDIR%%/programmingruby/pr_idx.html
-%%RUBY_DOCDIR%%/programmingruby/pr_toc.html
-%%RUBY_DOCDIR%%/programmingruby/xml/builtins.xml
-%%RUBY_DOCDIR%%/programmingruby/xml/classes.xml
-%%RUBY_DOCDIR%%/programmingruby/xml/ext_ruby.xml
-%%RUBY_DOCDIR%%/programmingruby/xml/ext_tk.xml
-%%RUBY_DOCDIR%%/programmingruby/xml/foreword.xml
-%%RUBY_DOCDIR%%/programmingruby/xml/index.xml
-%%RUBY_DOCDIR%%/programmingruby/xml/intro.xml
-%%RUBY_DOCDIR%%/programmingruby/xml/irb.xml
-%%RUBY_DOCDIR%%/programmingruby/xml/language.xml
-%%RUBY_DOCDIR%%/programmingruby/xml/lib_network.xml
-%%RUBY_DOCDIR%%/programmingruby/xml/lib_patterns.xml
-%%RUBY_DOCDIR%%/programmingruby/xml/lib_standard.xml
-%%RUBY_DOCDIR%%/programmingruby/xml/lib_windows.xml
-%%RUBY_DOCDIR%%/programmingruby/xml/ospace.xml
-%%RUBY_DOCDIR%%/programmingruby/xml/preface.xml
-%%RUBY_DOCDIR%%/programmingruby/xml/rdtool.xml
-%%RUBY_DOCDIR%%/programmingruby/xml/ref_c_array.xml
-%%RUBY_DOCDIR%%/programmingruby/xml/ref_c_bignum.xml
-%%RUBY_DOCDIR%%/programmingruby/xml/ref_c_binding.xml
-%%RUBY_DOCDIR%%/programmingruby/xml/ref_c_class.xml
-%%RUBY_DOCDIR%%/programmingruby/xml/ref_c_continuation.xml
-%%RUBY_DOCDIR%%/programmingruby/xml/ref_c_dir.xml
-%%RUBY_DOCDIR%%/programmingruby/xml/ref_c_exception.xml
-%%RUBY_DOCDIR%%/programmingruby/xml/ref_c_falseclass.xml
-%%RUBY_DOCDIR%%/programmingruby/xml/ref_c_file.xml
-%%RUBY_DOCDIR%%/programmingruby/xml/ref_c_file__stat.xml
-%%RUBY_DOCDIR%%/programmingruby/xml/ref_c_fixnum.xml
-%%RUBY_DOCDIR%%/programmingruby/xml/ref_c_float.xml
-%%RUBY_DOCDIR%%/programmingruby/xml/ref_c_hash.xml
-%%RUBY_DOCDIR%%/programmingruby/xml/ref_c_integer.xml
-%%RUBY_DOCDIR%%/programmingruby/xml/ref_c_io.xml
-%%RUBY_DOCDIR%%/programmingruby/xml/ref_c_matchdata.xml
-%%RUBY_DOCDIR%%/programmingruby/xml/ref_c_method.xml
-%%RUBY_DOCDIR%%/programmingruby/xml/ref_c_module.xml
-%%RUBY_DOCDIR%%/programmingruby/xml/ref_c_nilclass.xml
-%%RUBY_DOCDIR%%/programmingruby/xml/ref_c_numeric.xml
-%%RUBY_DOCDIR%%/programmingruby/xml/ref_c_object.xml
-%%RUBY_DOCDIR%%/programmingruby/xml/ref_c_proc.xml
-%%RUBY_DOCDIR%%/programmingruby/xml/ref_c_range.xml
-%%RUBY_DOCDIR%%/programmingruby/xml/ref_c_regexp.xml
-%%RUBY_DOCDIR%%/programmingruby/xml/ref_c_string.xml
-%%RUBY_DOCDIR%%/programmingruby/xml/ref_c_struct.xml
-%%RUBY_DOCDIR%%/programmingruby/xml/ref_c_struct__tms.xml
-%%RUBY_DOCDIR%%/programmingruby/xml/ref_c_symbol.xml
-%%RUBY_DOCDIR%%/programmingruby/xml/ref_c_thread.xml
-%%RUBY_DOCDIR%%/programmingruby/xml/ref_c_threadgroup.xml
-%%RUBY_DOCDIR%%/programmingruby/xml/ref_c_time.xml
-%%RUBY_DOCDIR%%/programmingruby/xml/ref_c_trueclass.xml
-%%RUBY_DOCDIR%%/programmingruby/xml/ref_m_comparable.xml
-%%RUBY_DOCDIR%%/programmingruby/xml/ref_m_enumerable.xml
-%%RUBY_DOCDIR%%/programmingruby/xml/ref_m_errno.xml
-%%RUBY_DOCDIR%%/programmingruby/xml/ref_m_filetest.xml
-%%RUBY_DOCDIR%%/programmingruby/xml/ref_m_gc.xml
-%%RUBY_DOCDIR%%/programmingruby/xml/ref_m_kernel.xml
-%%RUBY_DOCDIR%%/programmingruby/xml/ref_m_marshal.xml
-%%RUBY_DOCDIR%%/programmingruby/xml/ref_m_math.xml
-%%RUBY_DOCDIR%%/programmingruby/xml/ref_m_objectspace.xml
-%%RUBY_DOCDIR%%/programmingruby/xml/ref_m_process.xml
-%%RUBY_DOCDIR%%/programmingruby/xml/roadmap.xml
-%%RUBY_DOCDIR%%/programmingruby/xml/rubyworld.xml
-%%RUBY_DOCDIR%%/programmingruby/xml/support.xml
-%%RUBY_DOCDIR%%/programmingruby/xml/taint.xml
-%%RUBY_DOCDIR%%/programmingruby/xml/trouble.xml
-%%RUBY_DOCDIR%%/programmingruby/xml/tut_classes.xml
-%%RUBY_DOCDIR%%/programmingruby/xml/tut_containers.xml
-%%RUBY_DOCDIR%%/programmingruby/xml/tut_exceptions.xml
-%%RUBY_DOCDIR%%/programmingruby/xml/tut_expressions.xml
-%%RUBY_DOCDIR%%/programmingruby/xml/tut_io.xml
-%%RUBY_DOCDIR%%/programmingruby/xml/tut_methods.xml
-%%RUBY_DOCDIR%%/programmingruby/xml/tut_modules.xml
-%%RUBY_DOCDIR%%/programmingruby/xml/tut_stdtypes.xml
-%%RUBY_DOCDIR%%/programmingruby/xml/tut_threads.xml
-%%RUBY_DOCDIR%%/programmingruby/xml/web.xml
-%%RUBY_DOCDIR%%/programmingruby/xml/win32.xml
-@dirrm %%RUBY_DOCDIR%%/programmingruby/html
-@dirrm %%RUBY_DOCDIR%%/programmingruby/xml
-@dirrm %%RUBY_DOCDIR%%/programmingruby
+%%RUBY_MODDOCDIR%%/COPYING
+%%RUBY_MODDOCDIR%%/README
+%%RUBY_MODDOCDIR%%/html/builtins.html
+%%RUBY_MODDOCDIR%%/html/classes.html
+%%RUBY_MODDOCDIR%%/html/dot.gif
+%%RUBY_MODDOCDIR%%/html/ext_ruby.html
+%%RUBY_MODDOCDIR%%/html/ext_tk.html
+%%RUBY_MODDOCDIR%%/html/fadedcover.gif
+%%RUBY_MODDOCDIR%%/html/foreword.html
+%%RUBY_MODDOCDIR%%/html/index.html
+%%RUBY_MODDOCDIR%%/html/intro.html
+%%RUBY_MODDOCDIR%%/html/irb.html
+%%RUBY_MODDOCDIR%%/html/language.html
+%%RUBY_MODDOCDIR%%/html/lib_network.html
+%%RUBY_MODDOCDIR%%/html/lib_patterns.html
+%%RUBY_MODDOCDIR%%/html/lib_standard.html
+%%RUBY_MODDOCDIR%%/html/lib_windows.html
+%%RUBY_MODDOCDIR%%/html/ospace.html
+%%RUBY_MODDOCDIR%%/html/pr_style.css
+%%RUBY_MODDOCDIR%%/html/preface.html
+%%RUBY_MODDOCDIR%%/html/rdtool.html
+%%RUBY_MODDOCDIR%%/html/ref_c_array.html
+%%RUBY_MODDOCDIR%%/html/ref_c_bignum.html
+%%RUBY_MODDOCDIR%%/html/ref_c_binding.html
+%%RUBY_MODDOCDIR%%/html/ref_c_class.html
+%%RUBY_MODDOCDIR%%/html/ref_c_continuation.html
+%%RUBY_MODDOCDIR%%/html/ref_c_dir.html
+%%RUBY_MODDOCDIR%%/html/ref_c_exception.html
+%%RUBY_MODDOCDIR%%/html/ref_c_falseclass.html
+%%RUBY_MODDOCDIR%%/html/ref_c_file.html
+%%RUBY_MODDOCDIR%%/html/ref_c_file__stat.html
+%%RUBY_MODDOCDIR%%/html/ref_c_fixnum.html
+%%RUBY_MODDOCDIR%%/html/ref_c_float.html
+%%RUBY_MODDOCDIR%%/html/ref_c_hash.html
+%%RUBY_MODDOCDIR%%/html/ref_c_integer.html
+%%RUBY_MODDOCDIR%%/html/ref_c_io.html
+%%RUBY_MODDOCDIR%%/html/ref_c_matchdata.html
+%%RUBY_MODDOCDIR%%/html/ref_c_method.html
+%%RUBY_MODDOCDIR%%/html/ref_c_module.html
+%%RUBY_MODDOCDIR%%/html/ref_c_nilclass.html
+%%RUBY_MODDOCDIR%%/html/ref_c_numeric.html
+%%RUBY_MODDOCDIR%%/html/ref_c_object.html
+%%RUBY_MODDOCDIR%%/html/ref_c_proc.html
+%%RUBY_MODDOCDIR%%/html/ref_c_range.html
+%%RUBY_MODDOCDIR%%/html/ref_c_regexp.html
+%%RUBY_MODDOCDIR%%/html/ref_c_string.html
+%%RUBY_MODDOCDIR%%/html/ref_c_struct.html
+%%RUBY_MODDOCDIR%%/html/ref_c_struct__tms.html
+%%RUBY_MODDOCDIR%%/html/ref_c_symbol.html
+%%RUBY_MODDOCDIR%%/html/ref_c_thread.html
+%%RUBY_MODDOCDIR%%/html/ref_c_threadgroup.html
+%%RUBY_MODDOCDIR%%/html/ref_c_time.html
+%%RUBY_MODDOCDIR%%/html/ref_c_trueclass.html
+%%RUBY_MODDOCDIR%%/html/ref_m_comparable.html
+%%RUBY_MODDOCDIR%%/html/ref_m_enumerable.html
+%%RUBY_MODDOCDIR%%/html/ref_m_errno.html
+%%RUBY_MODDOCDIR%%/html/ref_m_filetest.html
+%%RUBY_MODDOCDIR%%/html/ref_m_gc.html
+%%RUBY_MODDOCDIR%%/html/ref_m_kernel.html
+%%RUBY_MODDOCDIR%%/html/ref_m_marshal.html
+%%RUBY_MODDOCDIR%%/html/ref_m_math.html
+%%RUBY_MODDOCDIR%%/html/ref_m_objectspace.html
+%%RUBY_MODDOCDIR%%/html/ref_m_process.html
+%%RUBY_MODDOCDIR%%/html/roadmap.html
+%%RUBY_MODDOCDIR%%/html/rubyworld.html
+%%RUBY_MODDOCDIR%%/html/support.html
+%%RUBY_MODDOCDIR%%/html/taint.html
+%%RUBY_MODDOCDIR%%/html/trouble.html
+%%RUBY_MODDOCDIR%%/html/tut_classes.html
+%%RUBY_MODDOCDIR%%/html/tut_containers.html
+%%RUBY_MODDOCDIR%%/html/tut_exceptions.html
+%%RUBY_MODDOCDIR%%/html/tut_expressions.html
+%%RUBY_MODDOCDIR%%/html/tut_io.html
+%%RUBY_MODDOCDIR%%/html/tut_methods.html
+%%RUBY_MODDOCDIR%%/html/tut_modules.html
+%%RUBY_MODDOCDIR%%/html/tut_stdtypes.html
+%%RUBY_MODDOCDIR%%/html/tut_threads.html
+%%RUBY_MODDOCDIR%%/html/visible_space.gif
+%%RUBY_MODDOCDIR%%/html/web.html
+%%RUBY_MODDOCDIR%%/html/win32.html
+%%RUBY_MODDOCDIR%%/index.html
+%%RUBY_MODDOCDIR%%/pr_idx.html
+%%RUBY_MODDOCDIR%%/pr_toc.html
+%%RUBY_MODDOCDIR%%/xml/builtins.xml
+%%RUBY_MODDOCDIR%%/xml/classes.xml
+%%RUBY_MODDOCDIR%%/xml/ext_ruby.xml
+%%RUBY_MODDOCDIR%%/xml/ext_tk.xml
+%%RUBY_MODDOCDIR%%/xml/foreword.xml
+%%RUBY_MODDOCDIR%%/xml/index.xml
+%%RUBY_MODDOCDIR%%/xml/intro.xml
+%%RUBY_MODDOCDIR%%/xml/irb.xml
+%%RUBY_MODDOCDIR%%/xml/language.xml
+%%RUBY_MODDOCDIR%%/xml/lib_network.xml
+%%RUBY_MODDOCDIR%%/xml/lib_patterns.xml
+%%RUBY_MODDOCDIR%%/xml/lib_standard.xml
+%%RUBY_MODDOCDIR%%/xml/lib_windows.xml
+%%RUBY_MODDOCDIR%%/xml/ospace.xml
+%%RUBY_MODDOCDIR%%/xml/preface.xml
+%%RUBY_MODDOCDIR%%/xml/rdtool.xml
+%%RUBY_MODDOCDIR%%/xml/ref_c_array.xml
+%%RUBY_MODDOCDIR%%/xml/ref_c_bignum.xml
+%%RUBY_MODDOCDIR%%/xml/ref_c_binding.xml
+%%RUBY_MODDOCDIR%%/xml/ref_c_class.xml
+%%RUBY_MODDOCDIR%%/xml/ref_c_continuation.xml
+%%RUBY_MODDOCDIR%%/xml/ref_c_dir.xml
+%%RUBY_MODDOCDIR%%/xml/ref_c_exception.xml
+%%RUBY_MODDOCDIR%%/xml/ref_c_falseclass.xml
+%%RUBY_MODDOCDIR%%/xml/ref_c_file.xml
+%%RUBY_MODDOCDIR%%/xml/ref_c_file__stat.xml
+%%RUBY_MODDOCDIR%%/xml/ref_c_fixnum.xml
+%%RUBY_MODDOCDIR%%/xml/ref_c_float.xml
+%%RUBY_MODDOCDIR%%/xml/ref_c_hash.xml
+%%RUBY_MODDOCDIR%%/xml/ref_c_integer.xml
+%%RUBY_MODDOCDIR%%/xml/ref_c_io.xml
+%%RUBY_MODDOCDIR%%/xml/ref_c_matchdata.xml
+%%RUBY_MODDOCDIR%%/xml/ref_c_method.xml
+%%RUBY_MODDOCDIR%%/xml/ref_c_module.xml
+%%RUBY_MODDOCDIR%%/xml/ref_c_nilclass.xml
+%%RUBY_MODDOCDIR%%/xml/ref_c_numeric.xml
+%%RUBY_MODDOCDIR%%/xml/ref_c_object.xml
+%%RUBY_MODDOCDIR%%/xml/ref_c_proc.xml
+%%RUBY_MODDOCDIR%%/xml/ref_c_range.xml
+%%RUBY_MODDOCDIR%%/xml/ref_c_regexp.xml
+%%RUBY_MODDOCDIR%%/xml/ref_c_string.xml
+%%RUBY_MODDOCDIR%%/xml/ref_c_struct.xml
+%%RUBY_MODDOCDIR%%/xml/ref_c_struct__tms.xml
+%%RUBY_MODDOCDIR%%/xml/ref_c_symbol.xml
+%%RUBY_MODDOCDIR%%/xml/ref_c_thread.xml
+%%RUBY_MODDOCDIR%%/xml/ref_c_threadgroup.xml
+%%RUBY_MODDOCDIR%%/xml/ref_c_time.xml
+%%RUBY_MODDOCDIR%%/xml/ref_c_trueclass.xml
+%%RUBY_MODDOCDIR%%/xml/ref_m_comparable.xml
+%%RUBY_MODDOCDIR%%/xml/ref_m_enumerable.xml
+%%RUBY_MODDOCDIR%%/xml/ref_m_errno.xml
+%%RUBY_MODDOCDIR%%/xml/ref_m_filetest.xml
+%%RUBY_MODDOCDIR%%/xml/ref_m_gc.xml
+%%RUBY_MODDOCDIR%%/xml/ref_m_kernel.xml
+%%RUBY_MODDOCDIR%%/xml/ref_m_marshal.xml
+%%RUBY_MODDOCDIR%%/xml/ref_m_math.xml
+%%RUBY_MODDOCDIR%%/xml/ref_m_objectspace.xml
+%%RUBY_MODDOCDIR%%/xml/ref_m_process.xml
+%%RUBY_MODDOCDIR%%/xml/roadmap.xml
+%%RUBY_MODDOCDIR%%/xml/rubyworld.xml
+%%RUBY_MODDOCDIR%%/xml/support.xml
+%%RUBY_MODDOCDIR%%/xml/taint.xml
+%%RUBY_MODDOCDIR%%/xml/trouble.xml
+%%RUBY_MODDOCDIR%%/xml/tut_classes.xml
+%%RUBY_MODDOCDIR%%/xml/tut_containers.xml
+%%RUBY_MODDOCDIR%%/xml/tut_exceptions.xml
+%%RUBY_MODDOCDIR%%/xml/tut_expressions.xml
+%%RUBY_MODDOCDIR%%/xml/tut_io.xml
+%%RUBY_MODDOCDIR%%/xml/tut_methods.xml
+%%RUBY_MODDOCDIR%%/xml/tut_modules.xml
+%%RUBY_MODDOCDIR%%/xml/tut_stdtypes.xml
+%%RUBY_MODDOCDIR%%/xml/tut_threads.xml
+%%RUBY_MODDOCDIR%%/xml/web.xml
+%%RUBY_MODDOCDIR%%/xml/win32.xml
+@dirrm %%RUBY_MODDOCDIR%%/html
+@dirrm %%RUBY_MODDOCDIR%%/xml
+@dirrm %%RUBY_MODDOCDIR%%
 @unexec rmdir %D/%%RUBY_DOCDIR%% 2>/dev/null || true
diff --git a/lang/ruby-python/Makefile b/lang/ruby-python/Makefile
index 01c4cb76db71..4bdb5ce513c1 100644
--- a/lang/ruby-python/Makefile
+++ b/lang/ruby-python/Makefile
@@ -29,13 +29,13 @@ INSTALL_TARGET=	site-install
 
 post-install:
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${RUBY_EXAMPLESDIR}/python
-	${CP} -R ${WRKSRC}/examples/ ${RUBY_EXAMPLESDIR}/python/
-	${MKDIR} ${RUBY_DOCDIR}/python/ja
+	${MKDIR} ${RUBY_MODEXAMPLESDIR}
+	${CP} -R ${WRKSRC}/examples/ ${RUBY_MODEXAMPLESDIR}/
+	${MKDIR} ${RUBY_MODDOCDIR}/ja
 	${INSTALL_DATA} ${WRKSRC}/ChangeLog ${WRKSRC}/README ${WRKSRC}/doc/* \
-		${RUBY_DOCDIR}/python/
+		${RUBY_MODDOCDIR}/
 	${INSTALL_DATA} ${WRKSRC}/README.ja ${WRKSRC}/doc-ja/* \
-		${RUBY_DOCDIR}/python/ja/
+		${RUBY_MODDOCDIR}/ja/
 .endif
 
 .include <bsd.port.mk>
diff --git a/lang/ruby-python/pkg-plist b/lang/ruby-python/pkg-plist
index 831ab7c7a560..cd45cf9fb238 100644
--- a/lang/ruby-python/pkg-plist
+++ b/lang/ruby-python/pkg-plist
@@ -1,26 +1,26 @@
 %%RUBY_SITEARCHLIBDIR%%/python.so
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/python/Lib/BaseHTTPServer.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/python/Lib/README
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/python/Lib/base64.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/python/Lib/rfc822.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/python/Lib/urllib.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/python/hello.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/python/html.py
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/python/html.rb
-%%PORTDOCS%%%%RUBY_DOCDIR%%/python/ja/README.ja
-%%PORTDOCS%%%%RUBY_DOCDIR%%/python/ja/Mapping.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/python/ja/Object.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/python/ja/Py.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/python/ja/Sequence.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/python/ja/index.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/python/ChangeLog
-%%PORTDOCS%%%%RUBY_DOCDIR%%/python/README
-%%PORTDOCS%%%%RUBY_DOCDIR%%/python/Mapping.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/python/Object.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/python/Py.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/python/Sequence.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/python/index.html
-%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/python/Lib
-%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/python
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/python/ja
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/python
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/Lib/BaseHTTPServer.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/Lib/README
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/Lib/base64.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/Lib/rfc822.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/Lib/urllib.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/hello.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/html.py
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/html.rb
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/README.ja
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/Mapping.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/Object.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/Py.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/Sequence.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/index.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ChangeLog
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/README
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/Mapping.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/Object.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/Py.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/Sequence.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/index.html
+%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%/Lib
+%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/ja
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%
diff --git a/lang/ruby-reference/Makefile b/lang/ruby-reference/Makefile
index d7529e286b5d..0eb1a9ebcc93 100644
--- a/lang/ruby-reference/Makefile
+++ b/lang/ruby-reference/Makefile
@@ -23,10 +23,8 @@ RUBY_NO_RUN_DEPENDS=	yes
 WRKSRC=		${WRKDIR}/ref
 NO_BUILD=	yes
 
-DOCDIR=		${RUBY_DOCDIR}/${PORTNAME}
-
 do-install:
-	${MKDIR} ${DOCDIR}
-	${INSTALL_DATA} ${WRKSRC}/* ${DOCDIR}
+	${MKDIR} ${RUBY_MODDOCDIR}
+	${INSTALL_DATA} ${WRKSRC}/* ${RUBY_MODDOCDIR}
 
 .include <bsd.port.mk>
diff --git a/lang/ruby-reference/pkg-plist b/lang/ruby-reference/pkg-plist
index f5dde0929dac..7b76ea2e42ff 100644
--- a/lang/ruby-reference/pkg-plist
+++ b/lang/ruby-reference/pkg-plist
@@ -1,48 +1,48 @@
-%%RUBY_DOCDIR%%/ruby-reference/COPYING
-%%RUBY_DOCDIR%%/ruby-reference/README
-%%RUBY_DOCDIR%%/ruby-reference/index.html
-%%RUBY_DOCDIR%%/ruby-reference/ref_c_array.html
-%%RUBY_DOCDIR%%/ruby-reference/ref_c_bignum.html
-%%RUBY_DOCDIR%%/ruby-reference/ref_c_binding.html
-%%RUBY_DOCDIR%%/ruby-reference/ref_c_class.html
-%%RUBY_DOCDIR%%/ruby-reference/ref_c_continuation.html
-%%RUBY_DOCDIR%%/ruby-reference/ref_c_dir.html
-%%RUBY_DOCDIR%%/ruby-reference/ref_c_exception.html
-%%RUBY_DOCDIR%%/ruby-reference/ref_c_falseclass.html
-%%RUBY_DOCDIR%%/ruby-reference/ref_c_file.html
-%%RUBY_DOCDIR%%/ruby-reference/ref_c_file__stat.html
-%%RUBY_DOCDIR%%/ruby-reference/ref_c_fixnum.html
-%%RUBY_DOCDIR%%/ruby-reference/ref_c_float.html
-%%RUBY_DOCDIR%%/ruby-reference/ref_c_hash.html
-%%RUBY_DOCDIR%%/ruby-reference/ref_c_integer.html
-%%RUBY_DOCDIR%%/ruby-reference/ref_c_io.html
-%%RUBY_DOCDIR%%/ruby-reference/ref_c_matchdata.html
-%%RUBY_DOCDIR%%/ruby-reference/ref_c_matchingdata.html
-%%RUBY_DOCDIR%%/ruby-reference/ref_c_method.html
-%%RUBY_DOCDIR%%/ruby-reference/ref_c_module.html
-%%RUBY_DOCDIR%%/ruby-reference/ref_c_nilclass.html
-%%RUBY_DOCDIR%%/ruby-reference/ref_c_numeric.html
-%%RUBY_DOCDIR%%/ruby-reference/ref_c_object.html
-%%RUBY_DOCDIR%%/ruby-reference/ref_c_proc.html
-%%RUBY_DOCDIR%%/ruby-reference/ref_c_range.html
-%%RUBY_DOCDIR%%/ruby-reference/ref_c_regexp.html
-%%RUBY_DOCDIR%%/ruby-reference/ref_c_string.html
-%%RUBY_DOCDIR%%/ruby-reference/ref_c_struct.html
-%%RUBY_DOCDIR%%/ruby-reference/ref_c_struct__tms.html
-%%RUBY_DOCDIR%%/ruby-reference/ref_c_symbol.html
-%%RUBY_DOCDIR%%/ruby-reference/ref_c_thread.html
-%%RUBY_DOCDIR%%/ruby-reference/ref_c_threadgroup.html
-%%RUBY_DOCDIR%%/ruby-reference/ref_c_time.html
-%%RUBY_DOCDIR%%/ruby-reference/ref_c_trueclass.html
-%%RUBY_DOCDIR%%/ruby-reference/ref_m_comparable.html
-%%RUBY_DOCDIR%%/ruby-reference/ref_m_enumerable.html
-%%RUBY_DOCDIR%%/ruby-reference/ref_m_errno.html
-%%RUBY_DOCDIR%%/ruby-reference/ref_m_filetest.html
-%%RUBY_DOCDIR%%/ruby-reference/ref_m_gc.html
-%%RUBY_DOCDIR%%/ruby-reference/ref_m_kernel.html
-%%RUBY_DOCDIR%%/ruby-reference/ref_m_marshal.html
-%%RUBY_DOCDIR%%/ruby-reference/ref_m_math.html
-%%RUBY_DOCDIR%%/ruby-reference/ref_m_objectspace.html
-%%RUBY_DOCDIR%%/ruby-reference/ref_m_process.html
-@dirrm %%RUBY_DOCDIR%%/ruby-reference
+%%RUBY_MODDOCDIR%%/COPYING
+%%RUBY_MODDOCDIR%%/README
+%%RUBY_MODDOCDIR%%/index.html
+%%RUBY_MODDOCDIR%%/ref_c_array.html
+%%RUBY_MODDOCDIR%%/ref_c_bignum.html
+%%RUBY_MODDOCDIR%%/ref_c_binding.html
+%%RUBY_MODDOCDIR%%/ref_c_class.html
+%%RUBY_MODDOCDIR%%/ref_c_continuation.html
+%%RUBY_MODDOCDIR%%/ref_c_dir.html
+%%RUBY_MODDOCDIR%%/ref_c_exception.html
+%%RUBY_MODDOCDIR%%/ref_c_falseclass.html
+%%RUBY_MODDOCDIR%%/ref_c_file.html
+%%RUBY_MODDOCDIR%%/ref_c_file__stat.html
+%%RUBY_MODDOCDIR%%/ref_c_fixnum.html
+%%RUBY_MODDOCDIR%%/ref_c_float.html
+%%RUBY_MODDOCDIR%%/ref_c_hash.html
+%%RUBY_MODDOCDIR%%/ref_c_integer.html
+%%RUBY_MODDOCDIR%%/ref_c_io.html
+%%RUBY_MODDOCDIR%%/ref_c_matchdata.html
+%%RUBY_MODDOCDIR%%/ref_c_matchingdata.html
+%%RUBY_MODDOCDIR%%/ref_c_method.html
+%%RUBY_MODDOCDIR%%/ref_c_module.html
+%%RUBY_MODDOCDIR%%/ref_c_nilclass.html
+%%RUBY_MODDOCDIR%%/ref_c_numeric.html
+%%RUBY_MODDOCDIR%%/ref_c_object.html
+%%RUBY_MODDOCDIR%%/ref_c_proc.html
+%%RUBY_MODDOCDIR%%/ref_c_range.html
+%%RUBY_MODDOCDIR%%/ref_c_regexp.html
+%%RUBY_MODDOCDIR%%/ref_c_string.html
+%%RUBY_MODDOCDIR%%/ref_c_struct.html
+%%RUBY_MODDOCDIR%%/ref_c_struct__tms.html
+%%RUBY_MODDOCDIR%%/ref_c_symbol.html
+%%RUBY_MODDOCDIR%%/ref_c_thread.html
+%%RUBY_MODDOCDIR%%/ref_c_threadgroup.html
+%%RUBY_MODDOCDIR%%/ref_c_time.html
+%%RUBY_MODDOCDIR%%/ref_c_trueclass.html
+%%RUBY_MODDOCDIR%%/ref_m_comparable.html
+%%RUBY_MODDOCDIR%%/ref_m_enumerable.html
+%%RUBY_MODDOCDIR%%/ref_m_errno.html
+%%RUBY_MODDOCDIR%%/ref_m_filetest.html
+%%RUBY_MODDOCDIR%%/ref_m_gc.html
+%%RUBY_MODDOCDIR%%/ref_m_kernel.html
+%%RUBY_MODDOCDIR%%/ref_m_marshal.html
+%%RUBY_MODDOCDIR%%/ref_m_math.html
+%%RUBY_MODDOCDIR%%/ref_m_objectspace.html
+%%RUBY_MODDOCDIR%%/ref_m_process.html
+@dirrm %%RUBY_MODDOCDIR%%
 @unexec rmdir %D/%%RUBY_DOCDIR%% 2>/dev/null || true
diff --git a/lang/ruby-ri/Makefile b/lang/ruby-ri/Makefile
index 763406b26cde..5c494f894038 100644
--- a/lang/ruby-ri/Makefile
+++ b/lang/ruby-ri/Makefile
@@ -43,12 +43,12 @@ do-install:
 	${LN} -sf ${RUBY_ELISPDIR}/${f} ${XEMACSLISPDIR}/
 .endfor
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${RUBY_DOCDIR}/${PORTNAME}/emacs
+	${MKDIR} ${RUBY_MODDOCDIR}/emacs
 .for f in ${DOCS}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_DOCDIR}/${PORTNAME}/
+	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_MODDOCDIR}/
 .endfor
 .for f in ${EMACS_DOCS}
-	${INSTALL_DATA} ${WRKSRC}/contrib/dblack/emacs/${f} ${RUBY_DOCDIR}/${PORTNAME}/emacs/
+	${INSTALL_DATA} ${WRKSRC}/contrib/dblack/emacs/${f} ${RUBY_MODDOCDIR}/emacs/
 .endfor
 .endif
 	@${CAT} ${PKGMESSAGE}
diff --git a/lang/ruby-ri/pkg-plist b/lang/ruby-ri/pkg-plist
index c091ea4d4395..d725652b48b5 100644
--- a/lang/ruby-ri/pkg-plist
+++ b/lang/ruby-ri/pkg-plist
@@ -50,13 +50,13 @@ bin/ri
 %%RUBY_SITELIBDIR%%/ri/op/Plain.rb
 @dirrm %%RUBY_SITELIBDIR%%/ri/op
 @dirrm %%RUBY_SITELIBDIR%%/ri
-%%PORTDOCS%%%%RUBY_DOCDIR%%/ri/COPYING
-%%PORTDOCS%%%%RUBY_DOCDIR%%/ri/ChangeLog
-%%PORTDOCS%%%%RUBY_DOCDIR%%/ri/README
-%%PORTDOCS%%%%RUBY_DOCDIR%%/ri/emacs/Changelog
-%%PORTDOCS%%%%RUBY_DOCDIR%%/ri/emacs/DESCRIPTION
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/ri/emacs
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/ri
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/COPYING
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ChangeLog
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/README
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/emacs/Changelog
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/emacs/DESCRIPTION
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/emacs
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%
 lib/xemacs/site-lisp/ri.el
 share/emacs/site-lisp/ri.el
 %%RUBY_ELISPDIR%%/ri.el
diff --git a/lang/ruby-tcltklib/Makefile b/lang/ruby-tcltklib/Makefile
index 95a3e55ab8db..7da3f9332cd9 100644
--- a/lang/ruby-tcltklib/Makefile
+++ b/lang/ruby-tcltklib/Makefile
@@ -63,12 +63,12 @@ do-extract:
 
 post-install:
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${RUBY_EXAMPLESDIR}/${PORTNAME}
-	${INSTALL_DATA} ${WRKSRC}/sample/* ${RUBY_EXAMPLESDIR}/${PORTNAME}/
-	${MKDIR} ${RUBY_EXAMPLESDIR}/${PORTNAME}/demo
-	${INSTALL_DATA} ${WRKSRC}/demo/* ${RUBY_EXAMPLESDIR}/${PORTNAME}/demo/
-	${MKDIR} ${RUBY_DOCDIR}/${PORTNAME}/ja
-	${INSTALL_DATA} ${WRKSRC}/*.euc ${RUBY_DOCDIR}/${PORTNAME}/ja/
+	${MKDIR} ${RUBY_MODEXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/sample/* ${RUBY_MODEXAMPLESDIR}/
+	${MKDIR} ${RUBY_MODEXAMPLESDIR}/demo
+	${INSTALL_DATA} ${WRKSRC}/demo/* ${RUBY_MODEXAMPLESDIR}/demo/
+	${MKDIR} ${RUBY_MODDOCDIR}/ja
+	${INSTALL_DATA} ${WRKSRC}/*.euc ${RUBY_MODDOCDIR}/ja/
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/lang/ruby-tcltklib/pkg-plist b/lang/ruby-tcltklib/pkg-plist
index c5e5b6eaeb93..c888662ecb2d 100644
--- a/lang/ruby-tcltklib/pkg-plist
+++ b/lang/ruby-tcltklib/pkg-plist
@@ -1,16 +1,16 @@
 %%RUBY_ARCHLIBDIR%%/tcltklib.so
 %%RUBY_LIBDIR%%/tcltk.rb
-%%PORTDOCS%%%%RUBY_DOCDIR%%/tcltklib/ja/MANUAL.euc
-%%PORTDOCS%%%%RUBY_DOCDIR%%/tcltklib/ja/README.euc
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/tcltklib/ja
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/tcltklib
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/tcltklib/batsu.gif
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/tcltklib/maru.gif
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/tcltklib/sample0.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/tcltklib/sample1.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/tcltklib/sample2.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/tcltklib/demo/lines0.tcl
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/tcltklib/demo/lines1.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/tcltklib/demo/lines2.rb
-%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/tcltklib/demo
-%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/tcltklib
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/MANUAL.euc
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/README.euc
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/ja
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/batsu.gif
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/maru.gif
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/sample0.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/sample1.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/sample2.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/demo/lines0.tcl
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/demo/lines1.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/demo/lines2.rb
+%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%/demo
+%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%
diff --git a/lang/ruby-usersguide/Makefile b/lang/ruby-usersguide/Makefile
index 098e518e8c97..c879ab61e6e6 100644
--- a/lang/ruby-usersguide/Makefile
+++ b/lang/ruby-usersguide/Makefile
@@ -21,10 +21,8 @@ RUBY_NO_RUN_DEPENDS=	yes
 WRKSRC=		${WRKDIR}/rg
 NO_BUILD=	yes
 
-DOCDIR=		${RUBY_DOCDIR}/${PORTNAME}
-
 do-install:
-	${MKDIR} ${DOCDIR}
-	${INSTALL_DATA} ${WRKSRC}/* ${DOCDIR}
+	${MKDIR} ${RUBY_MODDOCDIR}
+	${INSTALL_DATA} ${WRKSRC}/* ${RUBY_MODDOCDIR}
 
 .include <bsd.port.mk>
diff --git a/lang/ruby-usersguide/pkg-plist b/lang/ruby-usersguide/pkg-plist
index c57a194a688d..4e4292666914 100644
--- a/lang/ruby-usersguide/pkg-plist
+++ b/lang/ruby-usersguide/pkg-plist
@@ -1,37 +1,37 @@
-%%RUBY_DOCDIR%%/ruby-usersguide/README.txt
-%%RUBY_DOCDIR%%/ruby-usersguide/a2l.gif
-%%RUBY_DOCDIR%%/ruby-usersguide/a2r.gif
-%%RUBY_DOCDIR%%/ruby-usersguide/a2u.gif
-%%RUBY_DOCDIR%%/ruby-usersguide/eval.rb
-%%RUBY_DOCDIR%%/ruby-usersguide/accesscontrol.html
-%%RUBY_DOCDIR%%/ruby-usersguide/accessors.html
-%%RUBY_DOCDIR%%/ruby-usersguide/arrays.html
-%%RUBY_DOCDIR%%/ruby-usersguide/backtoexamples.html
-%%RUBY_DOCDIR%%/ruby-usersguide/classes.html
-%%RUBY_DOCDIR%%/ruby-usersguide/constants.html
-%%RUBY_DOCDIR%%/ruby-usersguide/control.html
-%%RUBY_DOCDIR%%/ruby-usersguide/ensure.html
-%%RUBY_DOCDIR%%/ruby-usersguide/examples.html
-%%RUBY_DOCDIR%%/ruby-usersguide/getstarted.html
-%%RUBY_DOCDIR%%/ruby-usersguide/globalvars.html
-%%RUBY_DOCDIR%%/ruby-usersguide/index.html
-%%RUBY_DOCDIR%%/ruby-usersguide/inheritance.html
-%%RUBY_DOCDIR%%/ruby-usersguide/instancevars.html
-%%RUBY_DOCDIR%%/ruby-usersguide/iterators.html
-%%RUBY_DOCDIR%%/ruby-usersguide/localvars.html
-%%RUBY_DOCDIR%%/ruby-usersguide/methods.html
-%%RUBY_DOCDIR%%/ruby-usersguide/misc.html
-%%RUBY_DOCDIR%%/ruby-usersguide/modules.html
-%%RUBY_DOCDIR%%/ruby-usersguide/objinitialization.html
-%%RUBY_DOCDIR%%/ruby-usersguide/oothinking.html
-%%RUBY_DOCDIR%%/ruby-usersguide/procobjects.html
-%%RUBY_DOCDIR%%/ruby-usersguide/redefinemethods.html
-%%RUBY_DOCDIR%%/ruby-usersguide/regexp.html
-%%RUBY_DOCDIR%%/ruby-usersguide/rescue.html
-%%RUBY_DOCDIR%%/ruby-usersguide/rubyguide.html
-%%RUBY_DOCDIR%%/ruby-usersguide/singletonmethods.html
-%%RUBY_DOCDIR%%/ruby-usersguide/strings.html
-%%RUBY_DOCDIR%%/ruby-usersguide/variables.html
-%%RUBY_DOCDIR%%/ruby-usersguide/whatisruby.html
-@dirrm %%RUBY_DOCDIR%%/ruby-usersguide
+%%RUBY_MODDOCDIR%%/README.txt
+%%RUBY_MODDOCDIR%%/a2l.gif
+%%RUBY_MODDOCDIR%%/a2r.gif
+%%RUBY_MODDOCDIR%%/a2u.gif
+%%RUBY_MODDOCDIR%%/eval.rb
+%%RUBY_MODDOCDIR%%/accesscontrol.html
+%%RUBY_MODDOCDIR%%/accessors.html
+%%RUBY_MODDOCDIR%%/arrays.html
+%%RUBY_MODDOCDIR%%/backtoexamples.html
+%%RUBY_MODDOCDIR%%/classes.html
+%%RUBY_MODDOCDIR%%/constants.html
+%%RUBY_MODDOCDIR%%/control.html
+%%RUBY_MODDOCDIR%%/ensure.html
+%%RUBY_MODDOCDIR%%/examples.html
+%%RUBY_MODDOCDIR%%/getstarted.html
+%%RUBY_MODDOCDIR%%/globalvars.html
+%%RUBY_MODDOCDIR%%/index.html
+%%RUBY_MODDOCDIR%%/inheritance.html
+%%RUBY_MODDOCDIR%%/instancevars.html
+%%RUBY_MODDOCDIR%%/iterators.html
+%%RUBY_MODDOCDIR%%/localvars.html
+%%RUBY_MODDOCDIR%%/methods.html
+%%RUBY_MODDOCDIR%%/misc.html
+%%RUBY_MODDOCDIR%%/modules.html
+%%RUBY_MODDOCDIR%%/objinitialization.html
+%%RUBY_MODDOCDIR%%/oothinking.html
+%%RUBY_MODDOCDIR%%/procobjects.html
+%%RUBY_MODDOCDIR%%/redefinemethods.html
+%%RUBY_MODDOCDIR%%/regexp.html
+%%RUBY_MODDOCDIR%%/rescue.html
+%%RUBY_MODDOCDIR%%/rubyguide.html
+%%RUBY_MODDOCDIR%%/singletonmethods.html
+%%RUBY_MODDOCDIR%%/strings.html
+%%RUBY_MODDOCDIR%%/variables.html
+%%RUBY_MODDOCDIR%%/whatisruby.html
+@dirrm %%RUBY_MODDOCDIR%%
 @unexec rmdir %D/%%RUBY_DOCDIR%% 2>/dev/null || true