- use DOCSDIR and EXAMPLESDIR

- fix plist for -DNOPORTDOCS
- bump PORTREVISION

Approved by:	maintainer timeout on QAT BotMail
Prompted by:	QAT QA run

2 files changed, 67 insertions, 65 deletions

diff --git a/games/mindfocus/Makefile b/games/mindfocus/Makefile
index 1803b7a5bcfb..9a56b5a7cfb7 100644
--- a/games/mindfocus/Makefile
+++ b/games/mindfocus/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mindfocus
 PORTVERSION=	0.88
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	http://www.toyoshima-house.net/classic/mf/files/
 DISTFILES=	mindfocus-0.88.tar.gz mindfocus-data1.tar.gz
@@ -19,9 +19,11 @@ USE_IMAKE=	yes
 USE_XORG=	xpm
 RESTRICTED=	'contains commercial character data'
 
+DOCSDIR=	${PREFIX}/share/doc/ja/${PORTNAME}
+
 post-install:
 .for i in mayu.mfc mio.mfc misaki2.mfc mizuka.mfc myu.mfc ryoko.mfc
-	${INSTALL_DATA} ${WRKDIR}/$i ${PREFIX}/share/examples/mindfocus
+	${INSTALL_DATA} ${WRKDIR}/$i ${EXAMPLESDIR}
 .endfor
 .for i in mayu1.xpm mayu2.xpm mayu3.xpm mayu4.xpm \
 	mio1.xpm mio2.xpm mio3.xpm mio4.xpm \
@@ -29,16 +31,16 @@ post-install:
 	mizuka1.xpm mizuka2.xpm mizuka3.xpm mizuka4.xpm \
 	myu1.xpm myu2.xpm myu3.xpm myu4.xpm \
 	ryoko1.xpm ryoko2.xpm ryoko3.xpm ryoko4.xpm
-	${INSTALL_DATA} ${WRKDIR}/pixmaps/$i ${PREFIX}/share/examples/mindfocus/pixmaps
+	${INSTALL_DATA} ${WRKDIR}/pixmaps/$i ${EXAMPLESDIR}/pixmaps
 .endfor
 
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/doc/ja/mindfocus
-	${INSTALL_MAN} ${WRKSRC}/doc/HISTORY.euc ${PREFIX}/share/doc/ja/mindfocus
-	${INSTALL_MAN} ${WRKSRC}/doc/MFC.euc ${PREFIX}/share/doc/ja/mindfocus
-	${INSTALL_MAN} ${WRKSRC}/doc/README.euc ${PREFIX}/share/doc/ja/mindfocus
-	${INSTALL_MAN} ${WRKSRC}/doc/SCRIPT.euc ${PREFIX}/share/doc/ja/mindfocus
-	${INSTALL_MAN} ${WRKSRC}/doc/TODO.euc ${PREFIX}/share/doc/ja/mindfocus
+	${MKDIR} ${DOCSDIR}
+	${INSTALL_MAN} ${WRKSRC}/doc/HISTORY.euc ${DOCSDIR}
+	${INSTALL_MAN} ${WRKSRC}/doc/MFC.euc ${DOCSDIR}
+	${INSTALL_MAN} ${WRKSRC}/doc/README.euc ${DOCSDIR}
+	${INSTALL_MAN} ${WRKSRC}/doc/SCRIPT.euc ${DOCSDIR}
+	${INSTALL_MAN} ${WRKSRC}/doc/TODO.euc ${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/games/mindfocus/pkg-plist b/games/mindfocus/pkg-plist
index f3a93ea21276..9caee22e9688 100644
--- a/games/mindfocus/pkg-plist
+++ b/games/mindfocus/pkg-plist
@@ -1,57 +1,57 @@
 bin/mindfocus
-share/examples/mindfocus/akane.mfc
-share/examples/mindfocus/misaki.mfc
-share/examples/mindfocus/nanase.mfc
-share/examples/mindfocus/mayu.mfc
-share/examples/mindfocus/mio.mfc
-share/examples/mindfocus/misaki2.mfc
-share/examples/mindfocus/mizuka.mfc
-share/examples/mindfocus/myu.mfc
-share/examples/mindfocus/ryoko.mfc
-share/examples/mindfocus/system.mindfocus
-share/examples/mindfocus/pixmaps/akane0.xpm
-share/examples/mindfocus/pixmaps/akane1.xpm
-share/examples/mindfocus/pixmaps/akane2.xpm
-share/examples/mindfocus/pixmaps/akane3.xpm
-share/examples/mindfocus/pixmaps/misaki0.xpm
-share/examples/mindfocus/pixmaps/misaki1.xpm
-share/examples/mindfocus/pixmaps/misaki2.xpm
-share/examples/mindfocus/pixmaps/misaki3.xpm
-share/examples/mindfocus/pixmaps/nanase0.xpm
-share/examples/mindfocus/pixmaps/nanase1.xpm
-share/examples/mindfocus/pixmaps/nanase2.xpm
-share/examples/mindfocus/pixmaps/nanase3.xpm
-share/examples/mindfocus/pixmaps/mayu1.xpm
-share/examples/mindfocus/pixmaps/mayu2.xpm
-share/examples/mindfocus/pixmaps/mayu3.xpm
-share/examples/mindfocus/pixmaps/mayu4.xpm
-share/examples/mindfocus/pixmaps/mio1.xpm
-share/examples/mindfocus/pixmaps/mio2.xpm
-share/examples/mindfocus/pixmaps/mio3.xpm
-share/examples/mindfocus/pixmaps/mio4.xpm
-share/examples/mindfocus/pixmaps/misaki2-1.xpm
-share/examples/mindfocus/pixmaps/misaki2-2.xpm
-share/examples/mindfocus/pixmaps/misaki2-3.xpm
-share/examples/mindfocus/pixmaps/misaki2-4.xpm
-share/examples/mindfocus/pixmaps/mizuka1.xpm
-share/examples/mindfocus/pixmaps/mizuka2.xpm
-share/examples/mindfocus/pixmaps/mizuka3.xpm
-share/examples/mindfocus/pixmaps/mizuka4.xpm
-share/examples/mindfocus/pixmaps/myu1.xpm
-share/examples/mindfocus/pixmaps/myu2.xpm
-share/examples/mindfocus/pixmaps/myu3.xpm
-share/examples/mindfocus/pixmaps/myu4.xpm
-share/examples/mindfocus/pixmaps/ryoko1.xpm
-share/examples/mindfocus/pixmaps/ryoko2.xpm
-share/examples/mindfocus/pixmaps/ryoko3.xpm
-share/examples/mindfocus/pixmaps/ryoko4.xpm
-share/examples/mindfocus/scripts/eye.ms
-share/doc/ja/mindfocus/HISTORY.euc
-share/doc/ja/mindfocus/MFC.euc
-share/doc/ja/mindfocus/README.euc
-share/doc/ja/mindfocus/SCRIPT.euc
-share/doc/ja/mindfocus/TODO.euc
-@dirrm share/examples/mindfocus/pixmaps
-@dirrm share/examples/mindfocus/scripts
-@dirrm share/examples/mindfocus
-@dirrm share/doc/ja/mindfocus
+%%EXAMPLESDIR%%/akane.mfc
+%%EXAMPLESDIR%%/misaki.mfc
+%%EXAMPLESDIR%%/nanase.mfc
+%%EXAMPLESDIR%%/mayu.mfc
+%%EXAMPLESDIR%%/mio.mfc
+%%EXAMPLESDIR%%/misaki2.mfc
+%%EXAMPLESDIR%%/mizuka.mfc
+%%EXAMPLESDIR%%/myu.mfc
+%%EXAMPLESDIR%%/ryoko.mfc
+%%EXAMPLESDIR%%/system.mindfocus
+%%EXAMPLESDIR%%/pixmaps/akane0.xpm
+%%EXAMPLESDIR%%/pixmaps/akane1.xpm
+%%EXAMPLESDIR%%/pixmaps/akane2.xpm
+%%EXAMPLESDIR%%/pixmaps/akane3.xpm
+%%EXAMPLESDIR%%/pixmaps/misaki0.xpm
+%%EXAMPLESDIR%%/pixmaps/misaki1.xpm
+%%EXAMPLESDIR%%/pixmaps/misaki2.xpm
+%%EXAMPLESDIR%%/pixmaps/misaki3.xpm
+%%EXAMPLESDIR%%/pixmaps/nanase0.xpm
+%%EXAMPLESDIR%%/pixmaps/nanase1.xpm
+%%EXAMPLESDIR%%/pixmaps/nanase2.xpm
+%%EXAMPLESDIR%%/pixmaps/nanase3.xpm
+%%EXAMPLESDIR%%/pixmaps/mayu1.xpm
+%%EXAMPLESDIR%%/pixmaps/mayu2.xpm
+%%EXAMPLESDIR%%/pixmaps/mayu3.xpm
+%%EXAMPLESDIR%%/pixmaps/mayu4.xpm
+%%EXAMPLESDIR%%/pixmaps/mio1.xpm
+%%EXAMPLESDIR%%/pixmaps/mio2.xpm
+%%EXAMPLESDIR%%/pixmaps/mio3.xpm
+%%EXAMPLESDIR%%/pixmaps/mio4.xpm
+%%EXAMPLESDIR%%/pixmaps/misaki2-1.xpm
+%%EXAMPLESDIR%%/pixmaps/misaki2-2.xpm
+%%EXAMPLESDIR%%/pixmaps/misaki2-3.xpm
+%%EXAMPLESDIR%%/pixmaps/misaki2-4.xpm
+%%EXAMPLESDIR%%/pixmaps/mizuka1.xpm
+%%EXAMPLESDIR%%/pixmaps/mizuka2.xpm
+%%EXAMPLESDIR%%/pixmaps/mizuka3.xpm
+%%EXAMPLESDIR%%/pixmaps/mizuka4.xpm
+%%EXAMPLESDIR%%/pixmaps/myu1.xpm
+%%EXAMPLESDIR%%/pixmaps/myu2.xpm
+%%EXAMPLESDIR%%/pixmaps/myu3.xpm
+%%EXAMPLESDIR%%/pixmaps/myu4.xpm
+%%EXAMPLESDIR%%/pixmaps/ryoko1.xpm
+%%EXAMPLESDIR%%/pixmaps/ryoko2.xpm
+%%EXAMPLESDIR%%/pixmaps/ryoko3.xpm
+%%EXAMPLESDIR%%/pixmaps/ryoko4.xpm
+%%EXAMPLESDIR%%/scripts/eye.ms
+%%PORTDOCS%%%%DOCSDIR%%/HISTORY.euc
+%%PORTDOCS%%%%DOCSDIR%%/MFC.euc
+%%PORTDOCS%%%%DOCSDIR%%/README.euc
+%%PORTDOCS%%%%DOCSDIR%%/SCRIPT.euc
+%%PORTDOCS%%%%DOCSDIR%%/TODO.euc
+@dirrm %%EXAMPLESDIR%%/pixmaps
+@dirrm %%EXAMPLESDIR%%/scripts
+@dirrm %%EXAMPLESDIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%