- Improve pkg-plist

- Add stage support

3 files changed, 65 insertions, 70 deletions

diff --git a/games/xataxx/Makefile b/games/xataxx/Makefile
index 30ea5441cd9b..96b3c901f24e 100644
--- a/games/xataxx/Makefile
+++ b/games/xataxx/Makefile
@@ -17,17 +17,10 @@ OPTIONS_DEFINE=	DOCS
 USES=		imake
 USE_XORG=	x11 xext
 
-MAN6=		xataxx.6
-
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
-
 post-install:
-.if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for i in README TODO
-	(cd ${WRKSRC} && ${INSTALL_DATA} ${i} ${DOCSDIR})
+	(cd ${WRKSRC} && ${INSTALL_DATA} ${i} ${STAGEDIR}${DOCSDIR})
 .endfor
-.endif
 
 .include <bsd.port.mk>
diff --git a/games/xataxx/files/patch-aa b/games/xataxx/files/patch-aa
index ca0d01aea6c9..41f9e9040088 100644
--- a/games/xataxx/files/patch-aa
+++ b/games/xataxx/files/patch-aa
@@ -1,5 +1,5 @@
---- Imakefile.orig	Tue Oct 29 13:23:52 1991
-+++ Imakefile	Fri Oct 13 21:42:28 2000
+--- ./Imakefile.orig	1991-10-29 02:23:52.000000000 -0200
++++ ./Imakefile	2013-11-16 00:46:31.000000000 -0200
 @@ -4,11 +4,13 @@
  # in the system default BINDIR
  # BINDIR =
@@ -22,5 +22,6 @@
 +	@if [ -d $(DESTDIR)$(DATADIR) ]; then set +x; \
 +	else (set -x; $(MKDIRHIER) $(DESTDIR)$(DATADIR)); fi
  	for i in lib//**/*; do \
- 		(set -x; install -c $$i $(DATADIR)); \
+-		(set -x; install -c $$i $(DATADIR)); \
++		(set -x; install -c $$i $(DESTDIR)$(DATADIR)); \
  	done
diff --git a/games/xataxx/pkg-plist b/games/xataxx/pkg-plist
index 6e01db1e4e47..41780ae47d33 100644
--- a/games/xataxx/pkg-plist
+++ b/games/xataxx/pkg-plist
@@ -1,59 +1,60 @@
 bin/xataxx
-%%PORTDOCS%%share/doc/xataxx/README
-%%PORTDOCS%%share/doc/xataxx/TODO
-share/xataxx/1.xbd
-share/xataxx/10.xbd
-share/xataxx/11.xbd
-share/xataxx/12.xbd
-share/xataxx/13.xbd
-share/xataxx/14.xbd
-share/xataxx/15.xbd
-share/xataxx/16.xbd
-share/xataxx/17.xbd
-share/xataxx/18.xbd
-share/xataxx/19.xbd
-share/xataxx/2.xbd
-share/xataxx/20.xbd
-share/xataxx/21.xbd
-share/xataxx/22.xbd
-share/xataxx/23.xbd
-share/xataxx/24.xbd
-share/xataxx/25.xbd
-share/xataxx/26.xbd
-share/xataxx/27.xbd
-share/xataxx/28.xbd
-share/xataxx/29.xbd
-share/xataxx/3.xbd
-share/xataxx/30.xbd
-share/xataxx/31.xbd
-share/xataxx/32.xbd
-share/xataxx/33.xbd
-share/xataxx/34.xbd
-share/xataxx/35.xbd
-share/xataxx/4.xbd
-share/xataxx/5.xbd
-share/xataxx/6.xbd
-share/xataxx/7.xbd
-share/xataxx/8.xbd
-share/xataxx/9.xbd
-share/xataxx/boards.num
-share/xataxx/clearstone.xbm
-share/xataxx/dkblock.xbm
-share/xataxx/dksmiley.xbm
-share/xataxx/dkstone.xbm
-share/xataxx/downcursor.xbm
-share/xataxx/downmask.xbm
-share/xataxx/ltblock.xbm
-share/xataxx/ltsmiley.xbm
-share/xataxx/ltstone.xbm
-share/xataxx/scowlcurs.xbm
-share/xataxx/scowlcursmask.xbm
-share/xataxx/smilecurs.xbm
-share/xataxx/smilecursmask.xbm
-share/xataxx/stone.xbm
-share/xataxx/stonemask.xbm
-share/xataxx/title.xbm
-share/xataxx/upcursor.xbm
-share/xataxx/upmask.xbm
-%%PORTDOCS%%@dirrm share/doc/xataxx
-@dirrm share/xataxx
+man/man6/xataxx.6.gz
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/TODO
+%%DATADIR%%/1.xbd
+%%DATADIR%%/10.xbd
+%%DATADIR%%/11.xbd
+%%DATADIR%%/12.xbd
+%%DATADIR%%/13.xbd
+%%DATADIR%%/14.xbd
+%%DATADIR%%/15.xbd
+%%DATADIR%%/16.xbd
+%%DATADIR%%/17.xbd
+%%DATADIR%%/18.xbd
+%%DATADIR%%/19.xbd
+%%DATADIR%%/2.xbd
+%%DATADIR%%/20.xbd
+%%DATADIR%%/21.xbd
+%%DATADIR%%/22.xbd
+%%DATADIR%%/23.xbd
+%%DATADIR%%/24.xbd
+%%DATADIR%%/25.xbd
+%%DATADIR%%/26.xbd
+%%DATADIR%%/27.xbd
+%%DATADIR%%/28.xbd
+%%DATADIR%%/29.xbd
+%%DATADIR%%/3.xbd
+%%DATADIR%%/30.xbd
+%%DATADIR%%/31.xbd
+%%DATADIR%%/32.xbd
+%%DATADIR%%/33.xbd
+%%DATADIR%%/34.xbd
+%%DATADIR%%/35.xbd
+%%DATADIR%%/4.xbd
+%%DATADIR%%/5.xbd
+%%DATADIR%%/6.xbd
+%%DATADIR%%/7.xbd
+%%DATADIR%%/8.xbd
+%%DATADIR%%/9.xbd
+%%DATADIR%%/boards.num
+%%DATADIR%%/clearstone.xbm
+%%DATADIR%%/dkblock.xbm
+%%DATADIR%%/dksmiley.xbm
+%%DATADIR%%/dkstone.xbm
+%%DATADIR%%/downcursor.xbm
+%%DATADIR%%/downmask.xbm
+%%DATADIR%%/ltblock.xbm
+%%DATADIR%%/ltsmiley.xbm
+%%DATADIR%%/ltstone.xbm
+%%DATADIR%%/scowlcurs.xbm
+%%DATADIR%%/scowlcursmask.xbm
+%%DATADIR%%/smilecurs.xbm
+%%DATADIR%%/smilecursmask.xbm
+%%DATADIR%%/stone.xbm
+%%DATADIR%%/stonemask.xbm
+%%DATADIR%%/title.xbm
+%%DATADIR%%/upcursor.xbm
+%%DATADIR%%/upmask.xbm
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrm %%DATADIR%%