Use RUBY_MOD*.

37 files changed, 350 insertions, 348 deletions

diff --git a/databases/postgresql-plruby/Makefile b/databases/postgresql-plruby/Makefile
index cb78cd20acec..83eef50c0018 100644
--- a/databases/postgresql-plruby/Makefile
+++ b/databases/postgresql-plruby/Makefile
@@ -46,12 +46,12 @@ post-build:
 
 post-install:
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${RUBY_EXAMPLESDIR}/${PORTNAME}/
-	${CP} -R ${WRKSRC}/test/* ${RUBY_EXAMPLESDIR}/${PORTNAME}/
-	${INSTALL_DATA} ${WRKDIR}/createlang.sql ${RUBY_EXAMPLESDIR}/${PORTNAME}/
-	${MKDIR} ${RUBY_DOCDIR}/${PORTNAME}
+	${MKDIR} ${RUBY_MODEXAMPLESDIR}/
+	${CP} -R ${WRKSRC}/test/* ${RUBY_MODEXAMPLESDIR}/
+	${INSTALL_DATA} ${WRKDIR}/createlang.sql ${RUBY_MODEXAMPLESDIR}/
+	${MKDIR} ${RUBY_MODDOCDIR}
 .for f in ${DOCS}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_DOCDIR}/${PORTNAME}/
+	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_MODDOCDIR}/
 .endfor
 .endif
 	@${CAT} ${PKGMESSAGE}
diff --git a/databases/postgresql-plruby/pkg-plist b/databases/postgresql-plruby/pkg-plist
index c5670a6dd35b..e648595fba27 100644
--- a/databases/postgresql-plruby/pkg-plist
+++ b/databases/postgresql-plruby/pkg-plist
@@ -1,32 +1,32 @@
 %%RUBY_SITEARCHLIBDIR%%/plruby.so
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/plruby/createlang.sql
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/plruby/plp/b.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/plruby/plp/runtest
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/plruby/plp/test.expected.65
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/plruby/plp/test.expected.70
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/plruby/plp/test.expected.71
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/plruby/plp/test.expected.72
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/plruby/plp/test.out
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/plruby/plp/test_mklang.sql
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/plruby/plp/test_queries.sql
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/plruby/plp/test_setup.sql
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/plruby/plt/b.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/plruby/plt/runtest
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/plruby/plt/test.expected.65
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/plruby/plt/test.expected.70
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/plruby/plt/test.expected.71
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/plruby/plt/test.expected.72
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/plruby/plt/test.out
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/plruby/plt/test_mklang.sql
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/plruby/plt/test_queries.sql
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/plruby/plt/test_setup.sql
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/plruby/plt/test_setup_new.sql
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/plruby/plt/test_setup_old.sql
-%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/plruby/plp
-%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/plruby/plt
-%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/plruby
-%%PORTDOCS%%%%RUBY_DOCDIR%%/plruby/Changes
-%%PORTDOCS%%%%RUBY_DOCDIR%%/plruby/README.en
-%%PORTDOCS%%%%RUBY_DOCDIR%%/plruby/plruby.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/plruby/plruby.rd
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/plruby
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/createlang.sql
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/plp/b.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/plp/runtest
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/plp/test.expected.65
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/plp/test.expected.70
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/plp/test.expected.71
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/plp/test.expected.72
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/plp/test.out
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/plp/test_mklang.sql
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/plp/test_queries.sql
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/plp/test_setup.sql
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/plt/b.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/plt/runtest
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/plt/test.expected.65
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/plt/test.expected.70
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/plt/test.expected.71
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/plt/test.expected.72
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/plt/test.out
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/plt/test_mklang.sql
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/plt/test_queries.sql
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/plt/test_setup.sql
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/plt/test_setup_new.sql
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/plt/test_setup_old.sql
+%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%/plp
+%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%/plt
+%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/Changes
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/README.en
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/plruby.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/plruby.rd
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%
diff --git a/databases/ruby-bdb/Makefile b/databases/ruby-bdb/Makefile
index 564d69013b31..39f92b5dc588 100644
--- a/databases/ruby-bdb/Makefile
+++ b/databases/ruby-bdb/Makefile
@@ -39,11 +39,11 @@ DOCS=		Changes README.en bdb.html bdb.rd docs/*
 
 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}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_DOCDIR}/${PORTNAME}/
+	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_MODDOCDIR}/
 .endfor
 .endif
 
diff --git a/databases/ruby-bdb/pkg-plist b/databases/ruby-bdb/pkg-plist
index a204a3bb6225..5483f30a91fa 100644
--- a/databases/ruby-bdb/pkg-plist
+++ b/databases/ruby-bdb/pkg-plist
@@ -1,49 +1,49 @@
 %%RUBY_SITEARCHLIBDIR%%/bdb.so
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/bdb/basic.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/bdb/cats.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/bdb/cursor.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/bdb/func.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/bdb/join.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/bdb/lock.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/bdb/log.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/bdb/queue.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/bdb/recno.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/bdb/record.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/bdb/txn.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/bdb/wordlist
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/bdb/wordtest
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/bdb/zeroc.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/bdb/replication/b.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/bdb/replication/cl.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/bdb/replication/example
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/bdb/replication/ma.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/bdb/replication/mc.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/bdb/replication/op.rb
-%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/bdb/replication/test1
-%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/bdb/replication/test2
-%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/bdb/replication/test3
-%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/bdb/replication
-%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/bdb/tmp
-%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/bdb/zippy
-%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/bdb
-%%PORTDOCS%%%%RUBY_DOCDIR%%/bdb/Changes
-%%PORTDOCS%%%%RUBY_DOCDIR%%/bdb/README.en
-%%PORTDOCS%%%%RUBY_DOCDIR%%/bdb/arraylike.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/bdb/arraylike.rd
-%%PORTDOCS%%%%RUBY_DOCDIR%%/bdb/bdb.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/bdb/bdb.rd
-%%PORTDOCS%%%%RUBY_DOCDIR%%/bdb/b.rb
-%%PORTDOCS%%%%RUBY_DOCDIR%%/bdb/bdb.rb
-%%PORTDOCS%%%%RUBY_DOCDIR%%/bdb/cursor.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/bdb/cursor.rd
-%%PORTDOCS%%%%RUBY_DOCDIR%%/bdb/env.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/bdb/env.rd
-%%PORTDOCS%%%%RUBY_DOCDIR%%/bdb/hashlike.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/bdb/hashlike.rd
-%%PORTDOCS%%%%RUBY_DOCDIR%%/bdb/log.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/bdb/log.rd
-%%PORTDOCS%%%%RUBY_DOCDIR%%/bdb/lock.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/bdb/lock.rd
-%%PORTDOCS%%%%RUBY_DOCDIR%%/bdb/transaction.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/bdb/transaction.rd
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/bdb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/basic.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/cats.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/cursor.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/func.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/join.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/lock.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/log.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/queue.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/recno.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/record.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/txn.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/wordlist
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/wordtest
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/zeroc.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/replication/b.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/replication/cl.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/replication/example
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/replication/ma.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/replication/mc.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/replication/op.rb
+%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%/replication/test1
+%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%/replication/test2
+%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%/replication/test3
+%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%/replication
+%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%/tmp
+%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%/zippy
+%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/Changes
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/README.en
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/arraylike.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/arraylike.rd
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/bdb.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/bdb.rd
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/b.rb
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/bdb.rb
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/cursor.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/cursor.rd
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/env.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/env.rd
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/hashlike.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/hashlike.rd
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/log.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/log.rd
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/lock.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/lock.rd
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/transaction.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/transaction.rd
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%
diff --git a/databases/ruby-bdb1/Makefile b/databases/ruby-bdb1/Makefile
index dfad213a9665..f4d257619922 100644
--- a/databases/ruby-bdb1/Makefile
+++ b/databases/ruby-bdb1/Makefile
@@ -24,11 +24,11 @@ DOCS=		Changes README.en bdb1.html bdb1.rd docs/*
 
 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}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_DOCDIR}/${PORTNAME}/
+	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_MODDOCDIR}/
 .endfor
 .endif
 
diff --git a/databases/ruby-bdb1/pkg-plist b/databases/ruby-bdb1/pkg-plist
index cb6dbd778621..e6d38b96a7d9 100644
--- a/databases/ruby-bdb1/pkg-plist
+++ b/databases/ruby-bdb1/pkg-plist
@@ -1,18 +1,18 @@
 %%RUBY_SITEARCHLIBDIR%%/bdb1.so
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/bdb1/basic.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/bdb1/func.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/bdb1/recno.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/bdb1/record.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/bdb1/wordtest
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/bdb1/zeroc.rb
-%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/bdb1/tmp
-%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/bdb1
-%%PORTDOCS%%%%RUBY_DOCDIR%%/bdb1/Changes
-%%PORTDOCS%%%%RUBY_DOCDIR%%/bdb1/README.en
-%%PORTDOCS%%%%RUBY_DOCDIR%%/bdb1/arraylike1.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/bdb1/arraylike1.rd
-%%PORTDOCS%%%%RUBY_DOCDIR%%/bdb1/bdb1.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/bdb1/bdb1.rd
-%%PORTDOCS%%%%RUBY_DOCDIR%%/bdb1/hashlike1.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/bdb1/hashlike1.rd
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/bdb1
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/basic.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/func.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/recno.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/record.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/wordtest
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/zeroc.rb
+%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%/tmp
+%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/Changes
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/README.en
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/arraylike1.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/arraylike1.rd
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/bdb1.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/bdb1.rd
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/hashlike1.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/hashlike1.rd
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%
diff --git a/databases/ruby-cdb/Makefile b/databases/ruby-cdb/Makefile
index 44ddfed7d8a4..ccfb6900610b 100644
--- a/databases/ruby-cdb/Makefile
+++ b/databases/ruby-cdb/Makefile
@@ -32,10 +32,10 @@ post-extract:
 
 post-install:
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${RUBY_EXAMPLESDIR}/${PORTNAME}/
-	${CP} -R ${WRKSRC}/sample/* ${RUBY_EXAMPLESDIR}/${PORTNAME}/
-	${MKDIR} ${RUBY_DOCDIR}/${PORTNAME}
-	${INSTALL_DATA} ${WRKSRC}/README ${RUBY_DOCDIR}/${PORTNAME}/
+	${MKDIR} ${RUBY_MODEXAMPLESDIR}/
+	${CP} -R ${WRKSRC}/sample/* ${RUBY_MODEXAMPLESDIR}/
+	${MKDIR} ${RUBY_MODDOCDIR}
+	${INSTALL_DATA} ${WRKSRC}/README ${RUBY_MODDOCDIR}/
 .endif
 
 .include <bsd.port.mk>
diff --git a/databases/ruby-cdb/pkg-plist b/databases/ruby-cdb/pkg-plist
index c6ab56997a28..c4f49be1aaf4 100644
--- a/databases/ruby-cdb/pkg-plist
+++ b/databases/ruby-cdb/pkg-plist
@@ -1,6 +1,6 @@
 %%RUBY_SITEARCHLIBDIR%%/cdb.so
 %%RUBY_SITELIBDIR%%/cdb.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/cdb/sample.rb
-%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/cdb
-%%PORTDOCS%%%%RUBY_DOCDIR%%/cdb/README
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/cdb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/sample.rb
+%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/README
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%
diff --git a/databases/ruby-dbd_mysql/Makefile b/databases/ruby-dbd_mysql/Makefile
index 5d9fd939bacd..6a69acacf625 100644
--- a/databases/ruby-dbd_mysql/Makefile
+++ b/databases/ruby-dbd_mysql/Makefile
@@ -31,9 +31,9 @@ DOCS_EN=	lib/${PORTNAME}/doc/*
 
 post-install:
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${RUBY_DOCDIR}/${RUBY_DBI_PORTNAME}/${PORTNAME}
+	${MKDIR} ${RUBY_MODDOCDIR}
 .for f in ${DOCS_EN}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_DOCDIR}/${RUBY_DBI_PORTNAME}/${PORTNAME}/
+	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_MODDOCDIR}/
 .endfor
 .endif
 
diff --git a/databases/ruby-dbd_mysql/pkg-plist b/databases/ruby-dbd_mysql/pkg-plist
index b41ebb46bce4..62f4b110ba17 100644
--- a/databases/ruby-dbd_mysql/pkg-plist
+++ b/databases/ruby-dbd_mysql/pkg-plist
@@ -1,5 +1,5 @@
 %%RUBY_SITELIBDIR%%/DBD/Mysql/Mysql.rb
 @dirrm %%RUBY_SITELIBDIR%%/DBD/Mysql
-%%PORTDOCS%%%%RUBY_DOCDIR%%/dbi/dbd_mysql/HISTORY
-%%PORTDOCS%%%%RUBY_DOCDIR%%/dbi/dbd_mysql/README
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/dbi/dbd_mysql
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/HISTORY
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/README
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%
diff --git a/databases/ruby-dbd_pg/Makefile b/databases/ruby-dbd_pg/Makefile
index 28a52d44b980..8d6e333e29f0 100644
--- a/databases/ruby-dbd_pg/Makefile
+++ b/databases/ruby-dbd_pg/Makefile
@@ -31,9 +31,9 @@ DOCS_EN=	lib/${PORTNAME}/doc/*
 
 post-install:
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${RUBY_DOCDIR}/${RUBY_DBI_PORTNAME}/${PORTNAME}
+	${MKDIR} ${RUBY_MODDOCDIR}
 .for f in ${DOCS_EN}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_DOCDIR}/${RUBY_DBI_PORTNAME}/${PORTNAME}/
+	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_MODDOCDIR}/
 .endfor
 .endif
 
diff --git a/databases/ruby-dbd_pg/pkg-plist b/databases/ruby-dbd_pg/pkg-plist
index 24122cb73973..0e32f13136c9 100644
--- a/databases/ruby-dbd_pg/pkg-plist
+++ b/databases/ruby-dbd_pg/pkg-plist
@@ -1,4 +1,4 @@
 %%RUBY_SITELIBDIR%%/DBD/Pg/Pg.rb
 @dirrm %%RUBY_SITELIBDIR%%/DBD/Pg
-%%PORTDOCS%%%%RUBY_DOCDIR%%/dbi/dbd_pg/README
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/dbi/dbd_pg
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/README
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%
diff --git a/databases/ruby-dbd_sqlite/Makefile b/databases/ruby-dbd_sqlite/Makefile
index 3a17208a069e..2b245cae2b3c 100644
--- a/databases/ruby-dbd_sqlite/Makefile
+++ b/databases/ruby-dbd_sqlite/Makefile
@@ -35,9 +35,9 @@ post-patch:
 
 post-install:
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${RUBY_DOCDIR}/${RUBY_DBI_PORTNAME}/${PORTNAME}
+	${MKDIR} ${RUBY_MODDOCDIR}
 .for f in ${DOCS_EN}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_DOCDIR}/${RUBY_DBI_PORTNAME}/${PORTNAME}/
+	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_MODDOCDIR}/
 .endfor
 .endif
 
diff --git a/databases/ruby-dbd_sqlite/pkg-plist b/databases/ruby-dbd_sqlite/pkg-plist
index 87eaf3b25da2..bc8df3de5bb0 100644
--- a/databases/ruby-dbd_sqlite/pkg-plist
+++ b/databases/ruby-dbd_sqlite/pkg-plist
@@ -1,4 +1,4 @@
 %%RUBY_SITEARCHLIBDIR%%/DBD/SQLite/SQLite.so
 @dirrm %%RUBY_SITEARCHLIBDIR%%/DBD/SQLite
-%%PORTDOCS%%%%RUBY_DOCDIR%%/dbi/dbd_sqlite/README
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/dbi/dbd_sqlite
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/README
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%
diff --git a/databases/ruby-dbd_sybase/Makefile b/databases/ruby-dbd_sybase/Makefile
index 42a979b04cb1..38d3ba587a4e 100644
--- a/databases/ruby-dbd_sybase/Makefile
+++ b/databases/ruby-dbd_sybase/Makefile
@@ -33,9 +33,9 @@ DOCS_EN=	ext/${PORTNAME}/doc/*
 
 post-install:
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${RUBY_DOCDIR}/${RUBY_DBI_PORTNAME}/${PORTNAME}
+	${MKDIR} ${RUBY_MODDOCDIR}
 .for f in ${DOCS_EN}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_DOCDIR}/${RUBY_DBI_PORTNAME}/${PORTNAME}/
+	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_MODDOCDIR}/
 .endfor
 .endif
 
diff --git a/databases/ruby-dbd_sybase/pkg-plist b/databases/ruby-dbd_sybase/pkg-plist
index 08a1679dbc11..6b014dc3f1b8 100644
--- a/databases/ruby-dbd_sybase/pkg-plist
+++ b/databases/ruby-dbd_sybase/pkg-plist
@@ -1,4 +1,4 @@
 %%RUBY_SITEARCHLIBDIR%%/dbi/dbd_sybase.so
-%%PORTDOCS%%%%RUBY_DOCDIR%%/dbi/dbd_sybase/HISTORY
-%%PORTDOCS%%%%RUBY_DOCDIR%%/dbi/dbd_sybase/README
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/dbi/dbd_sybase
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/HISTORY
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/README
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%
diff --git a/databases/ruby-dbi/Makefile b/databases/ruby-dbi/Makefile
index eaa6ce05ba36..e46de5dcc37e 100644
--- a/databases/ruby-dbi/Makefile
+++ b/databases/ruby-dbi/Makefile
@@ -34,11 +34,11 @@ post-install:
 	${MKDIR} ${RUBY_SITELIBDIR}/DBD
 	${MKDIR} ${RUBY_SITEARCHLIBDIR}/DBD
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${RUBY_EXAMPLESDIR}/${PORTNAME}
-	${INSTALL_DATA} ${WRKSRC}/examples/* ${RUBY_EXAMPLESDIR}/${PORTNAME}/
-	${MKDIR} ${RUBY_DOCDIR}/${PORTNAME}
+	${MKDIR} ${RUBY_MODEXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/examples/* ${RUBY_MODEXAMPLESDIR}/
+	${MKDIR} ${RUBY_MODDOCDIR}
 .for f in ${DOCS_EN}
-	${CP} -R ${WRKSRC}/${f} ${RUBY_DOCDIR}/${PORTNAME}/
+	${CP} -R ${WRKSRC}/${f} ${RUBY_MODDOCDIR}/
 .endfor
 .endif
 
diff --git a/databases/ruby-dbi/Makefile.common b/databases/ruby-dbi/Makefile.common
index 69252c59d6eb..a8a56aadfadd 100644
--- a/databases/ruby-dbi/Makefile.common
+++ b/databases/ruby-dbi/Makefile.common
@@ -13,3 +13,5 @@ RUBY_DBI_PORTDIR=	${PORTSDIR}/databases/ruby-${RUBY_DBI_PORTNAME}
 RUBY_DBI_WRKSRC?=	${WRKDIR}/ruby-${RUBY_DBI_PORTNAME}-all
 
 MD5_FILE?=		${RUBY_DBI_PORTDIR}/distinfo
+
+RUBY_MODNAME?=		${RUBY_DBI_PORTNAME}/${PORTNAME}
diff --git a/databases/ruby-dbi/pkg-plist b/databases/ruby-dbi/pkg-plist
index b4e6609550c2..7f2422baf705 100644
--- a/databases/ruby-dbi/pkg-plist
+++ b/databases/ruby-dbi/pkg-plist
@@ -11,26 +11,26 @@ bin/sqlsh.rb
 @dirrm %%RUBY_SITELIBDIR%%/DBD
 @dirrm %%RUBY_SITEARCHLIBDIR%%/dbi
 @dirrm %%RUBY_SITEARCHLIBDIR%%/DBD
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/dbi/persistence.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/dbi/sqlsh.rb.new
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/dbi/test1.pl
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/dbi/test1.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/dbi/test_blob.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/dbi/trace_test.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/dbi/xmlgen.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/dbi/xmltest.rb
-%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/dbi
-%%PORTDOCS%%%%RUBY_DOCDIR%%/dbi/DBD_SPEC
-%%PORTDOCS%%%%RUBY_DOCDIR%%/dbi/DBI_SPEC
-%%PORTDOCS%%%%RUBY_DOCDIR%%/dbi/README.1st
-%%PORTDOCS%%%%RUBY_DOCDIR%%/dbi/ToDo
-%%PORTDOCS%%%%RUBY_DOCDIR%%/dbi/index.rd
-%%PORTDOCS%%%%RUBY_DOCDIR%%/dbi/sf_logo.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/dbi/html/ChangeLog.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/dbi/html/DBD_SPEC.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/dbi/html/DBI_SPEC.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/dbi/html/ToDo.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/dbi/html/index.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/dbi/html/rubyStyle.css
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/dbi/html
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/dbi
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/persistence.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/sqlsh.rb.new
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test1.pl
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test1.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test_blob.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/trace_test.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/xmlgen.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/xmltest.rb
+%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/DBD_SPEC
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/DBI_SPEC
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/README.1st
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ToDo
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/index.rd
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/sf_logo.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/html/ChangeLog.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/html/DBD_SPEC.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/html/DBI_SPEC.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/html/ToDo.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/html/index.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/html/rubyStyle.css
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/html
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%
diff --git a/databases/ruby-interbase/Makefile b/databases/ruby-interbase/Makefile
index 33f9c01ae732..5be6b8e77b66 100644
--- a/databases/ruby-interbase/Makefile
+++ b/databases/ruby-interbase/Makefile
@@ -29,12 +29,12 @@ DOCS_JA=	README.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/databases/ruby-interbase/pkg-plist b/databases/ruby-interbase/pkg-plist
index 515a82cebef9..5d228a9e699c 100644
--- a/databases/ruby-interbase/pkg-plist
+++ b/databases/ruby-interbase/pkg-plist
@@ -1,5 +1,5 @@
 %%RUBY_SITEARCHLIBDIR%%/interbase.so
-%%PORTDOCS%%%%RUBY_DOCDIR%%/interbase/README
-%%PORTDOCS%%%%RUBY_DOCDIR%%/interbase/ja/README.ja
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/interbase/ja
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/interbase
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/README
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/README.ja
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/ja
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%
diff --git a/databases/ruby-msql/Makefile b/databases/ruby-msql/Makefile
index 032426637ffa..bdf2274d78e9 100644
--- a/databases/ruby-msql/Makefile
+++ b/databases/ruby-msql/Makefile
@@ -34,16 +34,16 @@ post-configure:
 
 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/databases/ruby-msql/pkg-plist b/databases/ruby-msql/pkg-plist
index 8a290197f016..bf7b9709c1e3 100644
--- a/databases/ruby-msql/pkg-plist
+++ b/databases/ruby-msql/pkg-plist
@@ -1,15 +1,15 @@
 %%RUBY_SITEARCHLIBDIR%%/msql.so
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/msql/Shakespeare.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/msql/msql.ry
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/msql/msqladmin.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/msql/msqldump.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/msql/msqlexport.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/msql/msqlm.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/msql/msqlparse.rb
-%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/msql
-%%PORTDOCS%%%%RUBY_DOCDIR%%/msql/msql.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/msql/msql.rd
-%%PORTDOCS%%%%RUBY_DOCDIR%%/msql/readme.en.txt
-%%PORTDOCS%%%%RUBY_DOCDIR%%/msql/ja/readme.ja.txt
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/msql/ja
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/msql
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/Shakespeare.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/msql.ry
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/msqladmin.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/msqldump.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/msqlexport.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/msqlm.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/msqlparse.rb
+%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/msql.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/msql.rd
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/readme.en.txt
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/readme.ja.txt
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/ja
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%
diff --git a/databases/ruby-mysql/Makefile b/databases/ruby-mysql/Makefile
index e9747bad5847..dcae83208bb3 100644
--- a/databases/ruby-mysql/Makefile
+++ b/databases/ruby-mysql/Makefile
@@ -25,9 +25,9 @@ INSTALL_TARGET=	site-install
 
 post-install:
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${RUBY_DOCDIR}/${PORTNAME}/ja
-	${INSTALL_DATA} ${WRKSRC}/README ${RUBY_DOCDIR}/${PORTNAME}/
-	${INSTALL_DATA} ${WRKSRC}/README.ja ${RUBY_DOCDIR}/${PORTNAME}/ja/
+	${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/databases/ruby-mysql/pkg-plist b/databases/ruby-mysql/pkg-plist
index 954066bc7adf..a3a66a8e3e33 100644
--- a/databases/ruby-mysql/pkg-plist
+++ b/databases/ruby-mysql/pkg-plist
@@ -1,5 +1,5 @@
 %%RUBY_SITEARCHLIBDIR%%/mysql.so
-%%PORTDOCS%%%%RUBY_DOCDIR%%/mysql/ja/README.ja
-%%PORTDOCS%%%%RUBY_DOCDIR%%/mysql/README
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/mysql/ja
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/mysql
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/README.ja
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/README
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/ja
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%
diff --git a/databases/ruby-o_dbm/Makefile b/databases/ruby-o_dbm/Makefile
index b1d037decb46..18ecaae0418d 100644
--- a/databases/ruby-o_dbm/Makefile
+++ b/databases/ruby-o_dbm/Makefile
@@ -23,10 +23,10 @@ do-install:
 	${MKDIR} ${RUBY_SITELIBDIR}
 	${INSTALL_DATA} ${WRKSRC}/o_dbm.rb ${RUBY_SITELIBDIR}/
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${RUBY_EXAMPLESDIR}/${PORTNAME}
-	${INSTALL_DATA} ${WRKSRC}/test-o_dbm.rb ${RUBY_EXAMPLESDIR}/${PORTNAME}/
-	${MKDIR} ${RUBY_DOCDIR}/${PORTNAME}/ja
-	${INSTALL_DATA} ${WRKSRC}/README.jp ${RUBY_DOCDIR}/${PORTNAME}/ja/
+	${MKDIR} ${RUBY_MODEXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/test-o_dbm.rb ${RUBY_MODEXAMPLESDIR}/
+	${MKDIR} ${RUBY_MODDOCDIR}/ja
+	${INSTALL_DATA} ${WRKSRC}/README.jp ${RUBY_MODDOCDIR}/ja/
 .endif
 
 .include <bsd.port.mk>
diff --git a/databases/ruby-o_dbm/pkg-plist b/databases/ruby-o_dbm/pkg-plist
index 72d95f2261de..592614ccf50a 100644
--- a/databases/ruby-o_dbm/pkg-plist
+++ b/databases/ruby-o_dbm/pkg-plist
@@ -1,6 +1,6 @@
 %%RUBY_SITELIBDIR%%/o_dbm.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/o_dbm/test-o_dbm.rb
-%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/o_dbm
-%%PORTDOCS%%%%RUBY_DOCDIR%%/o_dbm/ja/README.jp
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/o_dbm/ja
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/o_dbm
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test-o_dbm.rb
+%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/README.jp
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/ja
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%
diff --git a/databases/ruby-odbc/Makefile b/databases/ruby-odbc/Makefile
index d3a0e9e6fb2a..732b1c664025 100644
--- a/databases/ruby-odbc/Makefile
+++ b/databases/ruby-odbc/Makefile
@@ -26,11 +26,11 @@ DOCS_EN=	ChangeLog README doc/odbc.html
 
 post-install:
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${RUBY_EXAMPLESDIR}/${PORTNAME}
-	${CP} -R ${WRKSRC}/test* ${RUBY_EXAMPLESDIR}/${PORTNAME}/
-	${MKDIR} ${RUBY_DOCDIR}/${PORTNAME}
+	${MKDIR} ${RUBY_MODEXAMPLESDIR}
+	${CP} -R ${WRKSRC}/test* ${RUBY_MODEXAMPLESDIR}/
+	${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/databases/ruby-odbc/pkg-plist b/databases/ruby-odbc/pkg-plist
index c110f9177280..9dff390dfd66 100644
--- a/databases/ruby-odbc/pkg-plist
+++ b/databases/ruby-odbc/pkg-plist
@@ -1,15 +1,15 @@
 %%RUBY_SITEARCHLIBDIR%%/odbc.so
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/odbc/test.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/odbc/test/00connect.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/odbc/test/10create_table.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/odbc/test/20insert.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/odbc/test/30select.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/odbc/test/40update.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/odbc/test/50drop_table.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/odbc/test/70close.rb
-%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/odbc/test
-%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/odbc
-%%PORTDOCS%%%%RUBY_DOCDIR%%/odbc/ChangeLog
-%%PORTDOCS%%%%RUBY_DOCDIR%%/odbc/README
-%%PORTDOCS%%%%RUBY_DOCDIR%%/odbc/odbc.html
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/odbc
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test/00connect.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test/10create_table.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test/20insert.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test/30select.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test/40update.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test/50drop_table.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test/70close.rb
+%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%/test
+%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ChangeLog
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/README
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/odbc.html
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%
diff --git a/databases/ruby-postgres/Makefile b/databases/ruby-postgres/Makefile
index 42940ea27c3b..06122a3a671e 100644
--- a/databases/ruby-postgres/Makefile
+++ b/databases/ruby-postgres/Makefile
@@ -29,14 +29,14 @@ DOCS_JA=	README.jp doc/postgres.jp.html
 
 post-install:
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${RUBY_EXAMPLESDIR}/postgres
-	${INSTALL_DATA} ${WRKSRC}/sample/*.rb ${RUBY_EXAMPLESDIR}/postgres/
-	${MKDIR} ${RUBY_DOCDIR}/postgres/ja
+	${MKDIR} ${RUBY_MODEXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/sample/*.rb ${RUBY_MODEXAMPLESDIR}/
+	${MKDIR} ${RUBY_MODDOCDIR}/ja
 .for f in ${DOCS_EN}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_DOCDIR}/postgres/
+	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_MODDOCDIR}/
 .endfor
 .for f in ${DOCS_JA}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_DOCDIR}/postgres/ja/
+	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_MODDOCDIR}/ja/
 .endfor
 .endif
 
diff --git a/databases/ruby-postgres/pkg-plist b/databases/ruby-postgres/pkg-plist
index 6e2e16172337..55ff1a7c6233 100644
--- a/databases/ruby-postgres/pkg-plist
+++ b/databases/ruby-postgres/pkg-plist
@@ -1,15 +1,15 @@
 %%RUBY_SITEARCHLIBDIR%%/postgres.so
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/postgres/losample.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/postgres/psql.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/postgres/psqlHelp.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/postgres/test1.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/postgres/test2.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/postgres/test4.rb
-%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/postgres
-%%PORTDOCS%%%%RUBY_DOCDIR%%/postgres/ChangeLog
-%%PORTDOCS%%%%RUBY_DOCDIR%%/postgres/README
-%%PORTDOCS%%%%RUBY_DOCDIR%%/postgres/postgres.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/postgres/ja/README.jp
-%%PORTDOCS%%%%RUBY_DOCDIR%%/postgres/ja/postgres.jp.html
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/postgres/ja
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/postgres
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/losample.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/psql.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/psqlHelp.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test1.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test2.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test4.rb
+%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ChangeLog
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/README
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/postgres.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/README.jp
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/postgres.jp.html
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/ja
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%
diff --git a/databases/ruby-rdbc1/Makefile b/databases/ruby-rdbc1/Makefile
index b7238d9e84de..5541cb2d4592 100644
--- a/databases/ruby-rdbc1/Makefile
+++ b/databases/ruby-rdbc1/Makefile
@@ -27,11 +27,11 @@ do-install:
 	${MKDIR} ${RUBY_SITELIBDIR}
 	${INSTALL_DATA} ${WRKSRC}/*.rb ${RUBY_SITELIBDIR}/
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${RUBY_EXAMPLESDIR}/${PORTNAME}/
-	${INSTALL_DATA} ${WRKSRC}/sample/*.rb ${RUBY_EXAMPLESDIR}/${PORTNAME}/
-	${MKDIR} ${RUBY_DOCDIR}/${PORTNAME}/ja
-	${CP} -R ${WRKSRC}/doc/en/* ${RUBY_DOCDIR}/${PORTNAME}/
-	${CP} -R ${WRKSRC}/doc/ja/* ${RUBY_DOCDIR}/${PORTNAME}/ja/
+	${MKDIR} ${RUBY_MODEXAMPLESDIR}/
+	${INSTALL_DATA} ${WRKSRC}/sample/*.rb ${RUBY_MODEXAMPLESDIR}/
+	${MKDIR} ${RUBY_MODDOCDIR}/ja
+	${CP} -R ${WRKSRC}/doc/en/* ${RUBY_MODDOCDIR}/
+	${CP} -R ${WRKSRC}/doc/ja/* ${RUBY_MODDOCDIR}/ja/
 .endif
 
 .include <bsd.port.mk>
diff --git a/databases/ruby-rdbc1/pkg-plist b/databases/ruby-rdbc1/pkg-plist
index 7632688a8001..e0f9d434460a 100644
--- a/databases/ruby-rdbc1/pkg-plist
+++ b/databases/ruby-rdbc1/pkg-plist
@@ -1,77 +1,77 @@
 %%RUBY_SITELIBDIR%%/ora_rdbc1.rb
 %%RUBY_SITELIBDIR%%/pg_rdbc1.rb
 %%RUBY_SITELIBDIR%%/rdbc1.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/rdbc1/test1.rb
-%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/rdbc1
-%%PORTDOCS%%%%RUBY_DOCDIR%%/rdbc1/Composite.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/rdbc1/Connection.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/rdbc1/ConnectionBridge.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/rdbc1/DataTrancation.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/rdbc1/DatabaseMetaData.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/rdbc1/Date.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/rdbc1/Driver.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/rdbc1/DriverManager.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/rdbc1/DriverPropertyInfo.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/rdbc1/RDBC1.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/rdbc1/ResultSet.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/rdbc1/ResultSetBridge.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/rdbc1/ResultSetMetaData.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/rdbc1/ResultSetMetaDataBridge.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/rdbc1/SQLException.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/rdbc1/SQLWarning.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/rdbc1/Statement.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/rdbc1/StatementBridge.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/rdbc1/Time.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/rdbc1/Timestamp.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/rdbc1/rdbc1.txt
-%%PORTDOCS%%%%RUBY_DOCDIR%%/rdbc1/ora/ORA_ConnectionBridge.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/rdbc1/ora/ORA_Driver.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/rdbc1/ora/ORA_RDBC1.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/rdbc1/ora/ORA_ResultSetBridge.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/rdbc1/ora/ORA_ResultSetMetaDataBridge.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/rdbc1/ora/ORA_StatementBridge.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/rdbc1/pg/PG_ConnectionBridge.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/rdbc1/pg/PG_Driver.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/rdbc1/pg/PG_RDBC1.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/rdbc1/pg/PG_ResultSetBridge.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/rdbc1/pg/PG_ResultSetMetaDataBridge.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/rdbc1/pg/PG_StatementBridge.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/rdbc1/ja/Composite.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/rdbc1/ja/Connection.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/rdbc1/ja/ConnectionBridge.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/rdbc1/ja/DataTrancation.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/rdbc1/ja/DatabaseMetaData.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/rdbc1/ja/Date.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/rdbc1/ja/Driver.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/rdbc1/ja/DriverManager.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/rdbc1/ja/DriverPropertyInfo.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/rdbc1/ja/RDBC1.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/rdbc1/ja/ResultSet.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/rdbc1/ja/ResultSetBridge.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/rdbc1/ja/ResultSetMetaData.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/rdbc1/ja/ResultSetMetaDataBridge.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/rdbc1/ja/SQLException.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/rdbc1/ja/SQLWarning.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/rdbc1/ja/Statement.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/rdbc1/ja/StatementBridge.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/rdbc1/ja/Time.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/rdbc1/ja/Timestamp.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/rdbc1/ja/ora/ORA_ConnectionBridge.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/rdbc1/ja/ora/ORA_Driver.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/rdbc1/ja/ora/ORA_RDBC1.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/rdbc1/ja/ora/ORA_ResultSetBridge.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/rdbc1/ja/ora/ORA_ResultSetMetaDataBridge.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/rdbc1/ja/ora/ORA_StatementBridge.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/rdbc1/ja/pg/PG_ConnectionBridge.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/rdbc1/ja/pg/PG_Driver.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/rdbc1/ja/pg/PG_RDBC1.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/rdbc1/ja/pg/PG_ResultSetBridge.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/rdbc1/ja/pg/PG_ResultSetMetaDataBridge.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/rdbc1/ja/pg/PG_StatementBridge.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/rdbc1/ja/rdbc1.txt
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/rdbc1/ora
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/rdbc1/pg
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/rdbc1/ja/ora
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/rdbc1/ja/pg
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/rdbc1/ja
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/rdbc1
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test1.rb
+%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/Composite.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/Connection.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ConnectionBridge.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/DataTrancation.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/DatabaseMetaData.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/Date.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/Driver.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/DriverManager.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/DriverPropertyInfo.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/RDBC1.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ResultSet.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ResultSetBridge.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ResultSetMetaData.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ResultSetMetaDataBridge.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/SQLException.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/SQLWarning.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/Statement.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/StatementBridge.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/Time.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/Timestamp.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdbc1.txt
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ora/ORA_ConnectionBridge.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ora/ORA_Driver.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ora/ORA_RDBC1.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ora/ORA_ResultSetBridge.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ora/ORA_ResultSetMetaDataBridge.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ora/ORA_StatementBridge.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/pg/PG_ConnectionBridge.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/pg/PG_Driver.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/pg/PG_RDBC1.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/pg/PG_ResultSetBridge.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/pg/PG_ResultSetMetaDataBridge.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/pg/PG_StatementBridge.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/Composite.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/Connection.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/ConnectionBridge.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/DataTrancation.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/DatabaseMetaData.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/Date.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/Driver.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/DriverManager.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/DriverPropertyInfo.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/RDBC1.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/ResultSet.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/ResultSetBridge.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/ResultSetMetaData.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/ResultSetMetaDataBridge.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/SQLException.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/SQLWarning.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/Statement.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/StatementBridge.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/Time.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/Timestamp.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/ora/ORA_ConnectionBridge.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/ora/ORA_Driver.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/ora/ORA_RDBC1.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/ora/ORA_ResultSetBridge.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/ora/ORA_ResultSetMetaDataBridge.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/ora/ORA_StatementBridge.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/pg/PG_ConnectionBridge.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/pg/PG_Driver.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/pg/PG_RDBC1.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/pg/PG_ResultSetBridge.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/pg/PG_ResultSetMetaDataBridge.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/pg/PG_StatementBridge.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/rdbc1.txt
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/ora
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/pg
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/ja/ora
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/ja/pg
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/ja
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%
diff --git a/databases/ruby-search-namazu/Makefile b/databases/ruby-search-namazu/Makefile
index b95a8bc828ed..3089064d0675 100644
--- a/databases/ruby-search-namazu/Makefile
+++ b/databases/ruby-search-namazu/Makefile
@@ -31,9 +31,9 @@ post-build:
 
 post-install:
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${RUBY_DOCDIR}/${PORTNAME}/ja
-	${INSTALL_DATA} ${WRKSRC}/search-namazu.en.* ${RUBY_DOCDIR}/${PORTNAME}/
-	${INSTALL_DATA} ${WRKSRC}/search-namazu.ja.* ${RUBY_DOCDIR}/${PORTNAME}/ja/
+	${MKDIR} ${RUBY_MODDOCDIR}/ja
+	${INSTALL_DATA} ${WRKSRC}/search-namazu.en.* ${RUBY_MODDOCDIR}/
+	${INSTALL_DATA} ${WRKSRC}/search-namazu.ja.* ${RUBY_MODDOCDIR}/ja/
 .endif
 
 .include <bsd.port.mk>
diff --git a/databases/ruby-search-namazu/pkg-plist b/databases/ruby-search-namazu/pkg-plist
index a179bd4952db..71d2b3d31dcd 100644
--- a/databases/ruby-search-namazu/pkg-plist
+++ b/databases/ruby-search-namazu/pkg-plist
@@ -1,8 +1,8 @@
 %%RUBY_SITEARCHLIBDIR%%/search/namazu.so
 @dirrm %%RUBY_SITEARCHLIBDIR%%/search
-%%PORTDOCS%%%%RUBY_DOCDIR%%/search-namazu/ja/search-namazu.ja.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/search-namazu/ja/search-namazu.ja.rd
-%%PORTDOCS%%%%RUBY_DOCDIR%%/search-namazu/search-namazu.en.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/search-namazu/search-namazu.en.rd
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/search-namazu/ja
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/search-namazu
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/search-namazu.ja.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/search-namazu.ja.rd
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/search-namazu.en.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/search-namazu.en.rd
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/ja
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%
diff --git a/databases/rubygem-postgres/Makefile b/databases/rubygem-postgres/Makefile
index 42940ea27c3b..06122a3a671e 100644
--- a/databases/rubygem-postgres/Makefile
+++ b/databases/rubygem-postgres/Makefile
@@ -29,14 +29,14 @@ DOCS_JA=	README.jp doc/postgres.jp.html
 
 post-install:
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${RUBY_EXAMPLESDIR}/postgres
-	${INSTALL_DATA} ${WRKSRC}/sample/*.rb ${RUBY_EXAMPLESDIR}/postgres/
-	${MKDIR} ${RUBY_DOCDIR}/postgres/ja
+	${MKDIR} ${RUBY_MODEXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/sample/*.rb ${RUBY_MODEXAMPLESDIR}/
+	${MKDIR} ${RUBY_MODDOCDIR}/ja
 .for f in ${DOCS_EN}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_DOCDIR}/postgres/
+	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_MODDOCDIR}/
 .endfor
 .for f in ${DOCS_JA}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_DOCDIR}/postgres/ja/
+	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_MODDOCDIR}/ja/
 .endfor
 .endif
 
diff --git a/databases/rubygem-postgres/pkg-plist b/databases/rubygem-postgres/pkg-plist
index 6e2e16172337..55ff1a7c6233 100644
--- a/databases/rubygem-postgres/pkg-plist
+++ b/databases/rubygem-postgres/pkg-plist
@@ -1,15 +1,15 @@
 %%RUBY_SITEARCHLIBDIR%%/postgres.so
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/postgres/losample.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/postgres/psql.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/postgres/psqlHelp.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/postgres/test1.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/postgres/test2.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/postgres/test4.rb
-%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/postgres
-%%PORTDOCS%%%%RUBY_DOCDIR%%/postgres/ChangeLog
-%%PORTDOCS%%%%RUBY_DOCDIR%%/postgres/README
-%%PORTDOCS%%%%RUBY_DOCDIR%%/postgres/postgres.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/postgres/ja/README.jp
-%%PORTDOCS%%%%RUBY_DOCDIR%%/postgres/ja/postgres.jp.html
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/postgres/ja
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/postgres
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/losample.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/psql.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/psqlHelp.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test1.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test2.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test4.rb
+%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ChangeLog
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/README
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/postgres.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/README.jp
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/postgres.jp.html
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/ja
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%