2 files changed, 83 insertions, 81 deletions

diff --git a/devel/ruby-unit/Makefile b/devel/ruby-unit/Makefile
index d2cbfa805b5c..c734d1c49d62 100644
--- a/devel/ruby-unit/Makefile
+++ b/devel/ruby-unit/Makefile
@@ -18,6 +18,8 @@ MAINTAINER=	knu@FreeBSD.org
 USE_RUBY=	yes
 USE_RUBY_RDTOOL=	yes
 
+RUBY_MODNAME=	runit
+
 RUBY_SHEBANG_FILES=	${WRKSRC}/bin/c2t.rb	\
 			${WRKSRC}/bin/runtest.rb
 
@@ -38,17 +40,17 @@ do-install:
 	${LN} -sf ${f}.rb ${PREFIX}/bin/${f}
 .endfor
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${RUBY_EXAMPLESDIR}/runit
-	${CP} -R ${WRKSRC}/sample/ ${RUBY_EXAMPLESDIR}/runit/
-	${MKDIR} ${RUBY_DOCDIR}/runit/ja
+	${MKDIR} ${RUBY_MODEXAMPLESDIR}
+	${CP} -R ${WRKSRC}/sample/ ${RUBY_MODEXAMPLESDIR}/
+	${MKDIR} ${RUBY_MODDOCDIR}/ja
 .for f in ${DOCS}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_DOCDIR}/runit/
+	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_MODDOCDIR}/
 .endfor
 .for f in ${DOCS_JA}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_DOCDIR}/runit/ja/
+	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_MODDOCDIR}/ja/
 .endfor
-	${CP} -R ${WRKSRC}/doc_en/ ${RUBY_DOCDIR}/runit/
-	${CP} -R ${WRKSRC}/doc_ja/ ${RUBY_DOCDIR}/runit/ja/
+	${CP} -R ${WRKSRC}/doc_en/ ${RUBY_MODDOCDIR}/
+	${CP} -R ${WRKSRC}/doc_ja/ ${RUBY_MODDOCDIR}/ja/
 .endif
 
 .include <bsd.port.mk>
diff --git a/devel/ruby-unit/pkg-plist b/devel/ruby-unit/pkg-plist
index 6e55da8f2d33..35c1f8aeeb86 100644
--- a/devel/ruby-unit/pkg-plist
+++ b/devel/ruby-unit/pkg-plist
@@ -22,77 +22,77 @@ bin/runtest.rb
 @dirrm %%RUBY_SITELIBDIR%%/runit/cui
 @dirrm %%RUBY_SITELIBDIR%%/runit/ext
 @dirrm %%RUBY_SITELIBDIR%%/runit
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/runit/sample01.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/runit/sampletestsetup.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/runit/simpletest.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/runit/testall.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/runit/testarray.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/runit/testrepeatedtest.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/runit/testtestsetup.rb
-%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/runit
-%%PORTDOCS%%%%RUBY_DOCDIR%%/runit/ChangeLog
-%%PORTDOCS%%%%RUBY_DOCDIR%%/runit/README
-%%PORTDOCS%%%%RUBY_DOCDIR%%/runit/ToDo
-%%PORTDOCS%%%%RUBY_DOCDIR%%/runit/assert.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/runit/assert.rd
-%%PORTDOCS%%%%RUBY_DOCDIR%%/runit/error.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/runit/error.rd
-%%PORTDOCS%%%%RUBY_DOCDIR%%/runit/index.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/runit/index.rd
-%%PORTDOCS%%%%RUBY_DOCDIR%%/runit/ja/README.ja
-%%PORTDOCS%%%%RUBY_DOCDIR%%/runit/ja/assert.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/runit/ja/assert.rd
-%%PORTDOCS%%%%RUBY_DOCDIR%%/runit/ja/error.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/runit/ja/error.rd
-%%PORTDOCS%%%%RUBY_DOCDIR%%/runit/ja/index.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/runit/ja/index.rd
-%%PORTDOCS%%%%RUBY_DOCDIR%%/runit/ja/repeatedtest.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/runit/ja/repeatedtest.rd
-%%PORTDOCS%%%%RUBY_DOCDIR%%/runit/ja/robserver.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/runit/ja/robserver.rd
-%%PORTDOCS%%%%RUBY_DOCDIR%%/runit/ja/setuppable.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/runit/ja/setuppable.rd
-%%PORTDOCS%%%%RUBY_DOCDIR%%/runit/ja/teardownable.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/runit/ja/teardownable.rd
-%%PORTDOCS%%%%RUBY_DOCDIR%%/runit/ja/testcase.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/runit/ja/testcase.rd
-%%PORTDOCS%%%%RUBY_DOCDIR%%/runit/ja/testdecorator.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/runit/ja/testdecorator.rd
-%%PORTDOCS%%%%RUBY_DOCDIR%%/runit/ja/testfailure.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/runit/ja/testfailure.rd
-%%PORTDOCS%%%%RUBY_DOCDIR%%/runit/ja/testresult.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/runit/ja/testresult.rd
-%%PORTDOCS%%%%RUBY_DOCDIR%%/runit/ja/testrunner.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/runit/ja/testrunner.rd
-%%PORTDOCS%%%%RUBY_DOCDIR%%/runit/ja/testsetup.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/runit/ja/testsetup.rd
-%%PORTDOCS%%%%RUBY_DOCDIR%%/runit/ja/testsuite.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/runit/ja/testsuite.rd
-%%PORTDOCS%%%%RUBY_DOCDIR%%/runit/ja/version.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/runit/ja/version.rd
-%%PORTDOCS%%%%RUBY_DOCDIR%%/runit/repeatedtest.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/runit/repeatedtest.rd
-%%PORTDOCS%%%%RUBY_DOCDIR%%/runit/robserver.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/runit/robserver.rd
-%%PORTDOCS%%%%RUBY_DOCDIR%%/runit/setuppable.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/runit/setuppable.rd
-%%PORTDOCS%%%%RUBY_DOCDIR%%/runit/teardownable.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/runit/teardownable.rd
-%%PORTDOCS%%%%RUBY_DOCDIR%%/runit/testcase.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/runit/testcase.rd
-%%PORTDOCS%%%%RUBY_DOCDIR%%/runit/testdecorator.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/runit/testdecorator.rd
-%%PORTDOCS%%%%RUBY_DOCDIR%%/runit/testfailure.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/runit/testfailure.rd
-%%PORTDOCS%%%%RUBY_DOCDIR%%/runit/testresult.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/runit/testresult.rd
-%%PORTDOCS%%%%RUBY_DOCDIR%%/runit/testrunner.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/runit/testrunner.rd
-%%PORTDOCS%%%%RUBY_DOCDIR%%/runit/testsetup.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/runit/testsetup.rd
-%%PORTDOCS%%%%RUBY_DOCDIR%%/runit/testsuite.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/runit/testsuite.rd
-%%PORTDOCS%%%%RUBY_DOCDIR%%/runit/version.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/runit/version.rd
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/runit/ja
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/runit
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/sample01.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/sampletestsetup.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/simpletest.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/testall.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/testarray.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/testrepeatedtest.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/testtestsetup.rb
+%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ChangeLog
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/README
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ToDo
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/assert.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/assert.rd
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/error.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/error.rd
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/index.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/index.rd
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/README.ja
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/assert.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/assert.rd
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/error.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/error.rd
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/index.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/index.rd
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/repeatedtest.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/repeatedtest.rd
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/robserver.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/robserver.rd
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/setuppable.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/setuppable.rd
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/teardownable.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/teardownable.rd
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/testcase.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/testcase.rd
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/testdecorator.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/testdecorator.rd
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/testfailure.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/testfailure.rd
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/testresult.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/testresult.rd
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/testrunner.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/testrunner.rd
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/testsetup.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/testsetup.rd
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/testsuite.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/testsuite.rd
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/version.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/version.rd
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/repeatedtest.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/repeatedtest.rd
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/robserver.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/robserver.rd
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/setuppable.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/setuppable.rd
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/teardownable.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/teardownable.rd
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/testcase.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/testcase.rd
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/testdecorator.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/testdecorator.rd
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/testfailure.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/testfailure.rd
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/testresult.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/testresult.rd
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/testrunner.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/testrunner.rd
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/testsetup.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/testsetup.rd
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/testsuite.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/testsuite.rd
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/version.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/version.rd
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/ja
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%