2 files changed, 37 insertions, 37 deletions

diff --git a/devel/doc++/Makefile b/devel/doc++/Makefile
index 0de3aa2b22e0..3efea0213995 100644
--- a/devel/doc++/Makefile
+++ b/devel/doc++/Makefile
@@ -56,10 +56,10 @@ ADDITIONAL_DOCS=	ClassGraph.class \
 			toc.html
 
 post-install:
-.if !defined(NOPORTSDOCS)
-	${MKDIR} ${PREFIX}/share/doc/doc++
+.if !defined(NOPORTDOCS)
+	${MKDIR} ${DOCSDIR}
 	for i in $(ADDITIONAL_DOCS); do \
-		${INSTALL_MAN} ${WRKSRC}/doc/manual/html/$$i ${PREFIX}/share/doc/doc++ ;\
+		${INSTALL_MAN} ${WRKSRC}/doc/manual/html/$$i ${DOCSDIR} ;\
 	done
 .endif
 
diff --git a/devel/doc++/pkg-plist b/devel/doc++/pkg-plist
index 800d3cf35ec2..b210c52489ce 100644
--- a/devel/doc++/pkg-plist
+++ b/devel/doc++/pkg-plist
@@ -1,41 +1,41 @@
 bin/doc++
 bin/docify
 bin/promote
-share/doc/doc++/ClassGraph.class
-share/doc/doc++/ClassGraphPanel.class
-share/doc/doc++/ClassLayout.class
-share/doc/doc++/CommonBase.html
-share/doc/doc++/CommandLineOptions.html
-share/doc/doc++/ConfigurationFile.html
-share/doc/doc++/Derived_Class.html
-share/doc/doc++/Example.html
-share/doc/doc++/FileInclusion.html
-share/doc/doc++/FrequentlyAskedQuestions.html
-share/doc/doc++/General.html
-share/doc/doc++/GeneralInformations.html
-share/doc/doc++/HIER.html
-share/doc/doc++/HIERjava.html
-share/doc/doc++/InstallationInstructions.html
-share/doc/doc++/Intermediate.html
-share/doc/doc++/Introduction.html
-share/doc/doc++/ManualEntries.html
-share/doc/doc++/ManualEntryFields.html
-share/doc/doc++/NavigatorButton.class
-share/doc/doc++/Quickstart.html
-share/doc/doc++/ReferenceManual.html
-share/doc/doc++/Structure.html
-share/doc/doc++/TextFormatting.html
-share/doc/doc++/Tags.html
-share/doc/doc++/Usage.html
-share/doc/doc++/function.html
-share/doc/doc++/icon1.gif
-share/doc/doc++/icon2.gif
-share/doc/doc++/index.html
-share/doc/doc++/supportedHTMLmacros.html
-share/doc/doc++/supportedTeXmacros.html
-share/doc/doc++/toc.html
+%%PORTDOCS%%%%DOCSDIR%%/ClassGraph.class
+%%PORTDOCS%%%%DOCSDIR%%/ClassGraphPanel.class
+%%PORTDOCS%%%%DOCSDIR%%/ClassLayout.class
+%%PORTDOCS%%%%DOCSDIR%%/CommonBase.html
+%%PORTDOCS%%%%DOCSDIR%%/CommandLineOptions.html
+%%PORTDOCS%%%%DOCSDIR%%/ConfigurationFile.html
+%%PORTDOCS%%%%DOCSDIR%%/Derived_Class.html
+%%PORTDOCS%%%%DOCSDIR%%/Example.html
+%%PORTDOCS%%%%DOCSDIR%%/FileInclusion.html
+%%PORTDOCS%%%%DOCSDIR%%/FrequentlyAskedQuestions.html
+%%PORTDOCS%%%%DOCSDIR%%/General.html
+%%PORTDOCS%%%%DOCSDIR%%/GeneralInformations.html
+%%PORTDOCS%%%%DOCSDIR%%/HIER.html
+%%PORTDOCS%%%%DOCSDIR%%/HIERjava.html
+%%PORTDOCS%%%%DOCSDIR%%/InstallationInstructions.html
+%%PORTDOCS%%%%DOCSDIR%%/Intermediate.html
+%%PORTDOCS%%%%DOCSDIR%%/Introduction.html
+%%PORTDOCS%%%%DOCSDIR%%/ManualEntries.html
+%%PORTDOCS%%%%DOCSDIR%%/ManualEntryFields.html
+%%PORTDOCS%%%%DOCSDIR%%/NavigatorButton.class
+%%PORTDOCS%%%%DOCSDIR%%/Quickstart.html
+%%PORTDOCS%%%%DOCSDIR%%/ReferenceManual.html
+%%PORTDOCS%%%%DOCSDIR%%/Structure.html
+%%PORTDOCS%%%%DOCSDIR%%/TextFormatting.html
+%%PORTDOCS%%%%DOCSDIR%%/Tags.html
+%%PORTDOCS%%%%DOCSDIR%%/Usage.html
+%%PORTDOCS%%%%DOCSDIR%%/function.html
+%%PORTDOCS%%%%DOCSDIR%%/icon1.gif
+%%PORTDOCS%%%%DOCSDIR%%/icon2.gif
+%%PORTDOCS%%%%DOCSDIR%%/index.html
+%%PORTDOCS%%%%DOCSDIR%%/supportedHTMLmacros.html
+%%PORTDOCS%%%%DOCSDIR%%/supportedTeXmacros.html
+%%PORTDOCS%%%%DOCSDIR%%/toc.html
 share/locale/fr/LC_MESSAGES/doc++.mo
 share/locale/ja/LC_MESSAGES/doc++.mo
 share/locale/ro/LC_MESSAGES/doc++.mo
 share/locale/ru/LC_MESSAGES/doc++.mo
-@dirrm share/doc/doc++
+%%PORTDOCS%%@dirrm %%DOCSDIR%%