3 files changed, 29 insertions, 27 deletions

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%%