Index: head/games/imaze/Makefile
===================================================================
--- head/games/imaze/Makefile	(revision 470209)
+++ head/games/imaze/Makefile	(revision 470210)
@@ -1,57 +1,67 @@
 # Created by: Ronald Kuehn <rk@ronald.org>
 # $FreeBSD$
 
 PORTNAME=	imaze
 PORTVERSION=	1.4
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	games
 MASTER_SITES=	http://www.sourcefiles.org/Games/Arcade/
 PKGNAMESUFFIX=	-${TOOLKIT}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Multi-player network action game for TCP/IP with 3D graphics
 
 LICENSE=	BSD4CLAUSE
 LICENSE_FILE=	${WRKSRC}/Copyright
 
 USE_XORG=	x11 xaw xmu xt
 
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	${TOOLKIT} X11Dir="${LOCALBASE}" CFlags="${CFLAGS}"
 MAKE_ENV=	SOUNDDIR="${DATADIR}/sounds"
 
 BUILD_WRKSRC=	${WRKSRC}/source
 CONFIGURE_WRKSRC=	${WRKSRC}/source
 
-OPTIONS_DEFINE=	AUDIO JOYSTICK
+OPTIONS_DEFINE=	AUDIO DOCS JOYSTICK
 OPTIONS_SINGLE=	GUI
 OPTIONS_SINGLE_GUI=	ATHENA MOTIF XVIEW
 OPTIONS_DEFAULT=	ATHENA AUDIO JOYSTICK
 
 ATHENA_DESC=	Athena widget library support
 AUDIO_DESC=	Audio support
 JOYSTICK_DESC=	Joystick support
 XVIEW_DESC=	XView widget library support
 
 ATHENA_VARS=	TOOLKIT=athena
 AUDIO_CONFIGURE_OFF=	noaudio
 JOYSTICK_CONFIGURE_OFF=	nojoystick
 MOTIF_USES=	motif
 MOTIF_VARS=	MOTIFLIB="-L${LOCALBASE}/lib -lXm -lXt" TOOLKIT=motif
 XVIEW_LIB_DEPENDS=	libxview.so:x11-toolkits/xview
 XVIEW_VARS=	TOOLKIT=xview
 
+post-patch:
+	@${REINPLACE_CMD} 's@ninja@imazeninja@g' ${WRKSRC}/man6/*.6
+
 do-install:
-.for i in genlab imaze imazesrv imazestat ninja xlabed
-	(cd ${WRKSRC}/source && ${INSTALL_PROGRAM} ${i} ${STAGEDIR}${PREFIX}/bin)
-.endfor
-	(cd ${WRKSRC}/man6 && ${INSTALL_MAN} *.6 ${STAGEDIR}${MAN6PREFIX}/man/man6)
-	@${MKDIR} ${STAGEDIR}${DATADIR}
-	(cd ${WRKSRC} && ${INSTALL_DATA} README ${STAGEDIR}${DATADIR})
+	cd ${WRKSRC}/source && ${INSTALL_PROGRAM} \
+		genlab imaze imazesrv imazestat xlabed \
+		${STAGEDIR}${PREFIX}/bin
+# Install ninja as imazeninja to resolve conflict with devel/ninja
+	${INSTALL_PROGRAM} ${WRKSRC}/source/ninja ${STAGEDIR}${PREFIX}/bin/imazeninja
+	cd ${WRKSRC}/man6 && ${INSTALL_MAN} \
+		genlab.6 imaze.6 imazesrv.6 imazestat.6 xlabed.6 \
+		${STAGEDIR}${MAN6PREFIX}/man/man6
+	${INSTALL_MAN} ${WRKSRC}/man6/ninja.6 \
+		${STAGEDIR}${MAN6PREFIX}/man/man6/imazeninja.6
 	@${MKDIR} ${STAGEDIR}${DATADIR}/labs
-	(cd ${WRKSRC}/labs && ${INSTALL_DATA} *.lab ${STAGEDIR}${DATADIR}/labs)
+	${INSTALL_DATA} ${WRKSRC}/labs/*.lab ${STAGEDIR}${DATADIR}/labs
 	@${MKDIR} ${STAGEDIR}${DATADIR}/sounds
-	(cd ${WRKSRC}/sounds && ${INSTALL_DATA} *.au ${STAGEDIR}${DATADIR}/sounds)
-	@${ECHO_MSG} "Please read the file \"${DATADIR}/README\"."
+	${INSTALL_DATA} ${WRKSRC}/sounds/*.au ${STAGEDIR}${DATADIR}/sounds
+
+post-install-DOCS-on:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
Index: head/games/imaze/pkg-plist
===================================================================
--- head/games/imaze/pkg-plist	(revision 470209)
+++ head/games/imaze/pkg-plist	(revision 470210)
@@ -1,32 +1,32 @@
-bin/imaze
-bin/ninja
 bin/genlab
+bin/imaze
+bin/imazeninja
 bin/imazesrv
 bin/imazestat
 bin/xlabed
 man/man6/genlab.6.gz
 man/man6/imaze.6.gz
+man/man6/imazeninja.6.gz
 man/man6/imazesrv.6.gz
 man/man6/imazestat.6.gz
-man/man6/ninja.6.gz
 man/man6/xlabed.6.gz
 %%DATADIR%%/labs/10x10.lab
 %%DATADIR%%/labs/12x12.lab
 %%DATADIR%%/labs/15x15.lab
 %%DATADIR%%/labs/20x20.lab
 %%DATADIR%%/labs/25x25.lab
 %%DATADIR%%/labs/april.lab
 %%DATADIR%%/labs/demolab.lab
 %%DATADIR%%/labs/doors.lab
 %%DATADIR%%/labs/longest.lab
 %%DATADIR%%/labs/no1.lab
 %%DATADIR%%/labs/november.lab
 %%DATADIR%%/sounds/awake.au
 %%DATADIR%%/sounds/bounce.au
 %%DATADIR%%/sounds/dead.au
 %%DATADIR%%/sounds/kill.au
 %%DATADIR%%/sounds/miss.au
 %%DATADIR%%/sounds/pause.au
 %%DATADIR%%/sounds/shoot.au
 %%DATADIR%%/sounds/title.au
-%%DATADIR%%/README
+%%DOCSDIR%%/README