2 files changed, 25 insertions, 25 deletions

diff --git a/textproc/ruby-nqxml/Makefile b/textproc/ruby-nqxml/Makefile
index 36f52083538d..15f915f8b623 100644
--- a/textproc/ruby-nqxml/Makefile
+++ b/textproc/ruby-nqxml/Makefile
@@ -24,12 +24,12 @@ DOCS=		ChangeLog README Credits TODO
 do-install:
 	cd ${WRKSRC}; ${RUBY} install.rb
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${RUBY_EXAMPLESDIR}/${PORTNAME}/dispatcher
-	${INSTALL_DATA} ${WRKSRC}/examples/* ${RUBY_EXAMPLESDIR}/${PORTNAME}/
-	${INSTALL_DATA} ${WRKSRC}/contrib/* ${RUBY_EXAMPLESDIR}/${PORTNAME}/dispatcher/
-	${MKDIR} ${RUBY_DOCDIR}/${PORTNAME}
+	${MKDIR} ${RUBY_MODEXAMPLESDIR}/dispatcher
+	${INSTALL_DATA} ${WRKSRC}/examples/* ${RUBY_MODEXAMPLESDIR}/
+	${INSTALL_DATA} ${WRKSRC}/contrib/* ${RUBY_MODEXAMPLESDIR}/dispatcher/
+	${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/textproc/ruby-nqxml/pkg-plist b/textproc/ruby-nqxml/pkg-plist
index c6eccc5d830b..aff84f0efa3d 100644
--- a/textproc/ruby-nqxml/pkg-plist
+++ b/textproc/ruby-nqxml/pkg-plist
@@ -10,23 +10,23 @@
 %%RUBY_SITELIBDIR%%/nqxml/utils.rb
 %%RUBY_SITELIBDIR%%/nqxml/writer.rb
 @dirrm %%RUBY_SITELIBDIR%%/nqxml
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/nqxml/data.xml
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/nqxml/doc.xml
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/nqxml/dumpXML.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/nqxml/parseTestStream.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/nqxml/parseTestTree.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/nqxml/printEntityClassNames.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/nqxml/reverseTags.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/nqxml/reverseText.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/nqxml/write.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/nqxml/writeManualDoc.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/nqxml/writeParsedDoc.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/nqxml/dispatcher/autodis_1.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/nqxml/dispatcher/autodis_2.rb
-%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/nqxml/dispatcher
-%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/nqxml
-%%PORTDOCS%%%%RUBY_DOCDIR%%/nqxml/ChangeLog
-%%PORTDOCS%%%%RUBY_DOCDIR%%/nqxml/Credits
-%%PORTDOCS%%%%RUBY_DOCDIR%%/nqxml/README
-%%PORTDOCS%%%%RUBY_DOCDIR%%/nqxml/TODO
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/nqxml
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/data.xml
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/doc.xml
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/dumpXML.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/parseTestStream.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/parseTestTree.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/printEntityClassNames.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/reverseTags.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/reverseText.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/write.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/writeManualDoc.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/writeParsedDoc.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/dispatcher/autodis_1.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/dispatcher/autodis_2.rb
+%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%/dispatcher
+%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ChangeLog
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/Credits
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/README
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/TODO
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%