2 files changed, 38 insertions, 38 deletions

diff --git a/textproc/ruby-sablot/Makefile b/textproc/ruby-sablot/Makefile
index 0ce594a6ef37..75f4f4c8de99 100644
--- a/textproc/ruby-sablot/Makefile
+++ b/textproc/ruby-sablot/Makefile
@@ -35,14 +35,14 @@ DOCS_JA=	doc/sablot_ja.html \
 
 post-install:
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${RUBY_EXAMPLESDIR}/${PORTNAME}
-	${CP} -R ${WRKSRC}/sample/* ${RUBY_EXAMPLESDIR}/${PORTNAME}/
-	${MKDIR} ${RUBY_DOCDIR}/${PORTNAME}/ja
+	${MKDIR} ${RUBY_MODEXAMPLESDIR}
+	${CP} -R ${WRKSRC}/sample/* ${RUBY_MODEXAMPLESDIR}/
+	${MKDIR} ${RUBY_MODDOCDIR}/ja
 .for f in ${DOCS_EN}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_DOCDIR}/${PORTNAME}/
+	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_MODDOCDIR}/
 .endfor
 .for f in ${DOCS_JA}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_DOCDIR}/${PORTNAME}/ja/
+	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_MODDOCDIR}/ja/
 .endfor
 .endif
 
diff --git a/textproc/ruby-sablot/pkg-plist b/textproc/ruby-sablot/pkg-plist
index 33641e6f3c2a..ab923c2d2cb9 100644
--- a/textproc/ruby-sablot/pkg-plist
+++ b/textproc/ruby-sablot/pkg-plist
@@ -1,34 +1,34 @@
 %%RUBY_SITEARCHLIBDIR%%/sablot.so
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/sablot/basic/sample.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/sablot/basic/sample.xml
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/sablot/basic/sample.xsl
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/sablot/basic/sample_file.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/sablot/basic/sample_obj.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/sablot/basic/sample_param.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/sablot/basic/sample_param.xsl
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/sablot/encoding/ddhc-iso-8859-1.xml
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/sablot/encoding/ddhc-utf-8.xml
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/sablot/encoding/doc-euc-jp.xml
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/sablot/encoding/doc-iso-2022-jp.xml
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/sablot/encoding/doc-shift_jis.xml
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/sablot/encoding/doc-utf-8.xml
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/sablot/encoding/doc2html.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/sablot/encoding/doc2html.xsl
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/sablot/encoding/doc2html_fr.xsl
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/sablot/encoding/doc2html_ja.xsl
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/sablot/handler/sample.xml
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/sablot/handler/sample.xsl
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/sablot/handler/sample_err.xsl
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/sablot/handler/sample_mh.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/sablot/sample.rb
-%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/sablot/basic
-%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/sablot/encoding
-%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/sablot/handler
-%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/sablot
-%%PORTDOCS%%%%RUBY_DOCDIR%%/sablot/README
-%%PORTDOCS%%%%RUBY_DOCDIR%%/sablot/sablot.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/sablot/sablot.rd
-%%PORTDOCS%%%%RUBY_DOCDIR%%/sablot/ja/sablot.rd.ja
-%%PORTDOCS%%%%RUBY_DOCDIR%%/sablot/ja/sablot_ja.html
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/sablot/ja
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/sablot
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/basic/sample.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/basic/sample.xml
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/basic/sample.xsl
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/basic/sample_file.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/basic/sample_obj.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/basic/sample_param.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/basic/sample_param.xsl
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/encoding/ddhc-iso-8859-1.xml
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/encoding/ddhc-utf-8.xml
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/encoding/doc-euc-jp.xml
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/encoding/doc-iso-2022-jp.xml
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/encoding/doc-shift_jis.xml
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/encoding/doc-utf-8.xml
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/encoding/doc2html.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/encoding/doc2html.xsl
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/encoding/doc2html_fr.xsl
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/encoding/doc2html_ja.xsl
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/handler/sample.xml
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/handler/sample.xsl
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/handler/sample_err.xsl
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/handler/sample_mh.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/sample.rb
+%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%/basic
+%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%/encoding
+%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%/handler
+%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/README
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/sablot.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/sablot.rd
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/sablot.rd.ja
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/sablot_ja.html
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/ja
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%