- Fix plist for NOPORTDOCS case, use DOCSDIR

Reported by:	QAT

2 files changed, 67 insertions, 66 deletions

diff --git a/misc/magicpoint/Makefile b/misc/magicpoint/Makefile
index 4c1465179185..3bf425690acd 100644
--- a/misc/magicpoint/Makefile
+++ b/misc/magicpoint/Makefile
@@ -28,6 +28,7 @@ OPTIONS+=	FREETYPE	"With FreeType support" on \
 
 MAN1=	mgp.1 mgp2ps.1 mgpembed.1 mgpnet.1 xwintoppm.1 xmindpath.1
 
+DOCSDIR=	${PREFIX}/share/doc/mgp
 DOCS=	COPYRIGHT COPYRIGHT.jp FAQ README README.fonts README.fonts.jp \
 	README.lang RELNOTES SYNTAX TODO.jp USAGE USAGE.jp
 SAMPLES=	README README.jp cloud.jpg dad.eps dad.jpg default.mgp \
@@ -95,21 +96,21 @@ post-install:
 	(cd ${WRKSRC}/contrib/xmindpath; make install)
 	${GZIP_CMD} ${PREFIX}/man/man1/xmindpath.1
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/doc/mgp
+	${MKDIR} ${DOCSDIR}
 	for i in $(DOCS); do \
-		${INSTALL_DATA} ${WRKSRC}/$$i ${PREFIX}/share/doc/mgp; \
+		${INSTALL_DATA} ${WRKSRC}/$$i ${DOCSDIR}; \
 	done
-	${MKDIR} ${PREFIX}/share/doc/mgp/sample
+	${MKDIR} ${DOCSDIR}/sample
 	for i in $(SAMPLES); do \
-		${INSTALL_DATA} ${WRKSRC}/sample/$$i ${PREFIX}/share/doc/mgp/sample; \
+		${INSTALL_DATA} ${WRKSRC}/sample/$$i ${DOCSDIR}/sample; \
 	done
-	${MKDIR} ${PREFIX}/share/doc/mgp/emacs-lisp/mgp-el
+	${MKDIR} ${DOCSDIR}/emacs-lisp/mgp-el
 	for i in $(EMACS_LISPS); do \
-		${INSTALL_DATA} ${WRKSRC}/contrib/$$i ${PREFIX}/share/doc/mgp/emacs-lisp/$$i; \
+		${INSTALL_DATA} ${WRKSRC}/contrib/$$i ${DOCSDIR}/emacs-lisp/$$i; \
 	done
-	${MKDIR} ${PREFIX}/share/doc/mgp/scripts
+	${MKDIR} ${DOCSDIR}/scripts
 	for i in $(SAMPLE_SCRIPTS); do \
-		${INSTALL_SCRIPT} ${WRKSRC}/contrib/$$i ${PREFIX}/share/doc/mgp/scripts/$$i; \
+		${INSTALL_SCRIPT} ${WRKSRC}/contrib/$$i ${DOCSDIR}/scripts/$$i; \
 	done
 .endif
 
diff --git a/misc/magicpoint/pkg-plist b/misc/magicpoint/pkg-plist
index bfff8de4cf5b..7b892eefd295 100644
--- a/misc/magicpoint/pkg-plist
+++ b/misc/magicpoint/pkg-plist
@@ -8,62 +8,62 @@ lib/X11/mgp/default.mgp
 lib/X11/mgp/mgp1.jpg
 lib/X11/mgp/mgp2.jpg
 lib/X11/mgp/mgp3.jpg
-share/doc/mgp/COPYRIGHT
-share/doc/mgp/COPYRIGHT.jp
-share/doc/mgp/FAQ
-share/doc/mgp/README
-share/doc/mgp/README.fonts
-share/doc/mgp/README.fonts.jp
-share/doc/mgp/README.lang
-share/doc/mgp/RELNOTES
-share/doc/mgp/SYNTAX
-share/doc/mgp/TODO.jp
-share/doc/mgp/USAGE
-share/doc/mgp/USAGE.jp
-share/doc/mgp/sample/README
-share/doc/mgp/sample/README.jp
-share/doc/mgp/sample/cloud.jpg
-share/doc/mgp/sample/dad.eps
-share/doc/mgp/sample/dad.jpg
-share/doc/mgp/sample/default.mgp
-share/doc/mgp/sample/embed-jp.mgp
-share/doc/mgp/sample/embed.mgp
-share/doc/mgp/sample/gradation-jp.mgp
-share/doc/mgp/sample/gradation.mgp
-share/doc/mgp/sample/mgp-old1.jpg
-share/doc/mgp/sample/mgp-old2.jpg
-share/doc/mgp/sample/mgp-old3.jpg
-share/doc/mgp/sample/mgp.mng
-share/doc/mgp/sample/mgp1.jpg
-share/doc/mgp/sample/mgp2.jpg
-share/doc/mgp/sample/mgp3.jpg
-share/doc/mgp/sample/mgp3.xbm
-share/doc/mgp/sample/mgprc-sample
-share/doc/mgp/sample/multilingual.mgp
-share/doc/mgp/sample/sample-fr.mgp
-share/doc/mgp/sample/sample-jp.mgp
-share/doc/mgp/sample/sample.mgp
-share/doc/mgp/sample/sendmail6-jp.mgp
-share/doc/mgp/sample/sendmail6.mgp
-share/doc/mgp/sample/tutorial-jp.mgp
-share/doc/mgp/sample/tutorial.mgp
-share/doc/mgp/sample/v6-jp.mgp
-share/doc/mgp/sample/v6.mgp
-share/doc/mgp/sample/v6header.eps
-share/doc/mgp/sample/v6header.jpg
-share/doc/mgp/emacs-lisp/mgp-el/COPYING
-share/doc/mgp/emacs-lisp/mgp-el/README
-share/doc/mgp/emacs-lisp/mgp-el/mgp.el
-share/doc/mgp/emacs-lisp/mgp-el/mgp.sty
-share/doc/mgp/emacs-lisp/mgp-el/sample.tex
-share/doc/mgp/emacs-lisp/mgp-mode.el
-share/doc/mgp/scripts/eqn2eps.sh
-share/doc/mgp/scripts/tex2eps.sh
-share/doc/mgp/scripts/mgp2html.pl
-share/doc/mgp/scripts/mgp2latex.pl
-@dirrm share/doc/mgp/emacs-lisp/mgp-el
-@dirrm share/doc/mgp/emacs-lisp
-@dirrm share/doc/mgp/scripts
-@dirrm share/doc/mgp/sample
-@dirrm share/doc/mgp
+%%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT
+%%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT.jp
+%%PORTDOCS%%%%DOCSDIR%%/FAQ
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/README.fonts
+%%PORTDOCS%%%%DOCSDIR%%/README.fonts.jp
+%%PORTDOCS%%%%DOCSDIR%%/README.lang
+%%PORTDOCS%%%%DOCSDIR%%/RELNOTES
+%%PORTDOCS%%%%DOCSDIR%%/SYNTAX
+%%PORTDOCS%%%%DOCSDIR%%/TODO.jp
+%%PORTDOCS%%%%DOCSDIR%%/USAGE
+%%PORTDOCS%%%%DOCSDIR%%/USAGE.jp
+%%PORTDOCS%%%%DOCSDIR%%/sample/README
+%%PORTDOCS%%%%DOCSDIR%%/sample/README.jp
+%%PORTDOCS%%%%DOCSDIR%%/sample/cloud.jpg
+%%PORTDOCS%%%%DOCSDIR%%/sample/dad.eps
+%%PORTDOCS%%%%DOCSDIR%%/sample/dad.jpg
+%%PORTDOCS%%%%DOCSDIR%%/sample/default.mgp
+%%PORTDOCS%%%%DOCSDIR%%/sample/embed-jp.mgp
+%%PORTDOCS%%%%DOCSDIR%%/sample/embed.mgp
+%%PORTDOCS%%%%DOCSDIR%%/sample/gradation-jp.mgp
+%%PORTDOCS%%%%DOCSDIR%%/sample/gradation.mgp
+%%PORTDOCS%%%%DOCSDIR%%/sample/mgp-old1.jpg
+%%PORTDOCS%%%%DOCSDIR%%/sample/mgp-old2.jpg
+%%PORTDOCS%%%%DOCSDIR%%/sample/mgp-old3.jpg
+%%PORTDOCS%%%%DOCSDIR%%/sample/mgp.mng
+%%PORTDOCS%%%%DOCSDIR%%/sample/mgp1.jpg
+%%PORTDOCS%%%%DOCSDIR%%/sample/mgp2.jpg
+%%PORTDOCS%%%%DOCSDIR%%/sample/mgp3.jpg
+%%PORTDOCS%%%%DOCSDIR%%/sample/mgp3.xbm
+%%PORTDOCS%%%%DOCSDIR%%/sample/mgprc-sample
+%%PORTDOCS%%%%DOCSDIR%%/sample/multilingual.mgp
+%%PORTDOCS%%%%DOCSDIR%%/sample/sample-fr.mgp
+%%PORTDOCS%%%%DOCSDIR%%/sample/sample-jp.mgp
+%%PORTDOCS%%%%DOCSDIR%%/sample/sample.mgp
+%%PORTDOCS%%%%DOCSDIR%%/sample/sendmail6-jp.mgp
+%%PORTDOCS%%%%DOCSDIR%%/sample/sendmail6.mgp
+%%PORTDOCS%%%%DOCSDIR%%/sample/tutorial-jp.mgp
+%%PORTDOCS%%%%DOCSDIR%%/sample/tutorial.mgp
+%%PORTDOCS%%%%DOCSDIR%%/sample/v6-jp.mgp
+%%PORTDOCS%%%%DOCSDIR%%/sample/v6.mgp
+%%PORTDOCS%%%%DOCSDIR%%/sample/v6header.eps
+%%PORTDOCS%%%%DOCSDIR%%/sample/v6header.jpg
+%%PORTDOCS%%%%DOCSDIR%%/emacs-lisp/mgp-el/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/emacs-lisp/mgp-el/README
+%%PORTDOCS%%%%DOCSDIR%%/emacs-lisp/mgp-el/mgp.el
+%%PORTDOCS%%%%DOCSDIR%%/emacs-lisp/mgp-el/mgp.sty
+%%PORTDOCS%%%%DOCSDIR%%/emacs-lisp/mgp-el/sample.tex
+%%PORTDOCS%%%%DOCSDIR%%/emacs-lisp/mgp-mode.el
+%%PORTDOCS%%%%DOCSDIR%%/scripts/eqn2eps.sh
+%%PORTDOCS%%%%DOCSDIR%%/scripts/tex2eps.sh
+%%PORTDOCS%%%%DOCSDIR%%/scripts/mgp2html.pl
+%%PORTDOCS%%%%DOCSDIR%%/scripts/mgp2latex.pl
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/emacs-lisp/mgp-el
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/emacs-lisp
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/scripts
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/sample
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm lib/X11/mgp