- Trim old-school Makefile header per new guidelines

- Convert to modern OPTIONS framework (courtesy of jgh@)
- Install routes for a few more deathmatch levels
- Mute MKDIR's and generally cleanup Makefile while here
- Reword port description and port message texts

5 files changed, 70 insertions, 48 deletions

diff --git a/games/quake2-3zb2/Makefile b/games/quake2-3zb2/Makefile
index efa0a0d027b5..8644027949a0 100644
--- a/games/quake2-3zb2/Makefile
+++ b/games/quake2-3zb2/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	quake2-3zb2
-# Date created:				2006-12-24
-# Whom:					alepulver
-#
+# Created by: Alejandro Pulver <alepulver@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	3zb2
 PORTVERSION=	0.97
@@ -18,28 +14,30 @@ DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:prog \
 DIST_SUBDIR=	${PKGNAMEPREFIX}${PORTNAME}
 
 MAINTAINER=	danfe@FreeBSD.org
-COMMENT=	3rd-Zigock Bot II for Quake II
+COMMENT=	3rd Zigock II bots for Quake II
 
 USE_ZIP=	yes
 USE_DOS2UNIX=	*.[ch]
 NO_WRKSUBDIR=	yes
-
-OPTIONS=	NODES "Install nodes for DM and CTF maps (recommended)" on
-
 SUB_FILES=	pkg-message
 
 DOCSDIR=	${PREFIX}/share/doc/${LATEST_LINK}
 
-.include "${.CURDIR}/../quake2-data/Makefile.include"
+OPTIONS_DEFINE=	NODES DOCS
+OPTIONS_DEFAULT=	NODES
+
+NODES_DESC=	Install nodes for DM and CTF maps (recommended)
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MNODES}
+NODES=		base_pk chflm2130_pk chfxmap0109_pk citycl_pk cmbbstr_pk \
+		cxdmx_pk cxxdmx_pk dm64_pk fact_pk hangar_pk ikdmx_pk \
+		ikdmx_pk2 jail_pk q2dmx_pk retinal_pk spasmox_pk trdmx_pk \
+		trpower_pk verm0x_pk ware_pk waste_pk xatrixmap_pk1 \
+		xatrixmap_pk2 xatrixmap_pk3 xatrixmap_pk4 xdm3 xdmx_pk \
+		xldmx_pk ztn2dmx_pk
 
-.if defined(WITH_NODES)
-NODES=		base_pk citycl_pk cmbbstr_pk cxdmx_pk cxxdmx_pk dm64_pk \
-		fact_pk hangar_pk ikdmx_pk2 jail_pk retinal_pk spasmox_pk \
-		trdmx_pk trpower_pk verm0x_pk ware_pk waste_pk xatrixmap_pk1 \
-		xatrixmap_pk2 xatrixmap_pk3 xatrixmap_pk4 xdm3 xldmx_pk \
-		ztn2dmx_pk chflm2130_pk chfxmap0109_pk
 .for f in ${NODES}
 DISTFILES+=	${f}${EXTRACT_SUFX}:nodes
 .endfor
@@ -49,29 +47,27 @@ PLIST_SUB+=	NODES="@comment "
 .endif
 
 post-extract:
-# Rename files and directories to lower case.
-	@cd ${WRKSRC}; \
-	    for f in *; do \
+# Rename files and directories to lower case
+	@cd ${WRKSRC}; for f in *; do \
 	    ${MV} $${f} `${ECHO_CMD} $${f} | ${TR} '[:upper:]' '[:lower:]'`; \
-	    done
+	done
 	@${CP} ${FILESDIR}/${MAKEFILE} ${WRKSRC}
 
 do-install:
-	${MKDIR} ${Q2DIR}/${PORTNAME}
-	${INSTALL_PROGRAM} ${WRKSRC}/game.so ${Q2DIR}/${PORTNAME}
-	cd ${WRKSRC}/3zb2 && \
-		${INSTALL_DATA} *.cfg 3ZBMaps.lst pak6.pak ${Q2DIR}/${PORTNAME}
 .for f in chctf chdtm
-	${MKDIR} ${Q2DIR}/${PORTNAME}/${f}
+	@${MKDIR} ${Q2DIR}/${PORTNAME}/${f}
 	${INSTALL_DATA} ${WRKSRC}/3zb2/${f}/* ${Q2DIR}/${PORTNAME}/${f}
 .endfor
-.if defined(WITH_NODES)
+	${INSTALL_PROGRAM} ${WRKSRC}/game.so ${Q2DIR}/${PORTNAME}
+	cd ${WRKSRC}/3zb2 && ${INSTALL_DATA} *.cfg 3ZBMaps.lst pak6.pak \
+		${Q2DIR}/${PORTNAME}
+.if ${PORT_OPTIONS:MNODES}
 	${INSTALL_DATA} ${WRKSRC}/*.chn ${Q2DIR}/${PORTNAME}/chdtm
 	${INSTALL_DATA} ${WRKSRC}/*.chf ${Q2DIR}/${PORTNAME}/chctf
 .endif
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
-	cd ${WRKSRC}/3zb2 && ${CP} -R *.txt "User Guide" ${DOCSDIR}
+.if ${PORT_OPTIONS:MDOCS}
+	@${MKDIR} ${DOCSDIR}
+	cd ${WRKSRC}/3zb2 && ${CP} -a *.txt "User Guide" ${DOCSDIR}
 	@${FIND} ${DOCSDIR} -type d -print0 | ${XARGS} -0 ${CHMOD} ${BINMODE}
 	@${FIND} ${DOCSDIR} -type f -print0 | ${XARGS} -0 ${CHMOD} ${SHAREMODE}
 .endif
@@ -81,4 +77,5 @@ post-install:
 	@${CAT} ${PKGMESSAGE}
 	@${ECHO_CMD}
 
-.include <bsd.port.post.mk>
+.include "${.CURDIR}/../quake2-data/Makefile.include"
+.include <bsd.port.mk>
diff --git a/games/quake2-3zb2/distinfo b/games/quake2-3zb2/distinfo
index f9c16f186e2e..04556a810c22 100644
--- a/games/quake2-3zb2/distinfo
+++ b/games/quake2-3zb2/distinfo
@@ -4,6 +4,10 @@ SHA256 (quake2-3zb2/3zb2src97.zip) = 2ce2811f82a37a02d15bd074c84776db8c07450b7cf
 SIZE (quake2-3zb2/3zb2src97.zip) = 261318
 SHA256 (quake2-3zb2/base_pk.zip) = 069300e4972231f2fa4627174a76d17db2a838205e80fbc5d8fa4370d718c214
 SIZE (quake2-3zb2/base_pk.zip) = 27281
+SHA256 (quake2-3zb2/chflm2130_pk.zip) = 9c75345939e377b65a542fd74aa67132ce3246ca64d4a5abe23d157e82962afc
+SIZE (quake2-3zb2/chflm2130_pk.zip) = 290793
+SHA256 (quake2-3zb2/chfxmap0109_pk.zip) = 24236d112941c13e9886e61605a388f7ba0e3568bb1224746d4e9762804d8473
+SIZE (quake2-3zb2/chfxmap0109_pk.zip) = 201481
 SHA256 (quake2-3zb2/citycl_pk.zip) = c28a6165014d4f7badaa2d1a6bf24cde5cf808fb94537f986f503b44b21c0b05
 SIZE (quake2-3zb2/citycl_pk.zip) = 93774
 SHA256 (quake2-3zb2/cmbbstr_pk.zip) = 0d8f520e4efa880346258cd09d8f9941e2748e2b951c39abc3c3c3bca1b23b80
@@ -18,10 +22,14 @@ SHA256 (quake2-3zb2/fact_pk.zip) = 20975414ff17d5b465315c5743db24cdb612f7d18ff66
 SIZE (quake2-3zb2/fact_pk.zip) = 40340
 SHA256 (quake2-3zb2/hangar_pk.zip) = c1cbfc826f29d8510982f72217a44b98b4daff71a6eace689dd8e69168cf98ab
 SIZE (quake2-3zb2/hangar_pk.zip) = 44275
+SHA256 (quake2-3zb2/ikdmx_pk.zip) = c396b2c91dc3020a77add6058b92c90b7e970409644f253da1f27d9b37e4573b
+SIZE (quake2-3zb2/ikdmx_pk.zip) = 39791
 SHA256 (quake2-3zb2/ikdmx_pk2.zip) = f94742401e20fb3ac27082f9ed8425c8ff36efd70a0fc1dc162032b692b3b8f0
 SIZE (quake2-3zb2/ikdmx_pk2.zip) = 27976
 SHA256 (quake2-3zb2/jail_pk.zip) = a84139daf5e09b833cb139bec72a1c4f8e5a3d84ec75a32a290e346415dcd9c4
 SIZE (quake2-3zb2/jail_pk.zip) = 85296
+SHA256 (quake2-3zb2/q2dmx_pk.zip) = 0e69142d43cd6b53f80e7fb26f2164a3d4a2b0af978d71cf4718ee40aeb2e88e
+SIZE (quake2-3zb2/q2dmx_pk.zip) = 114283
 SHA256 (quake2-3zb2/retinal_pk.zip) = 8ce625f6e7b15d4c1b7ab9c8ae52db35b7c12781ef18d1a373ae3fe03988d5f4
 SIZE (quake2-3zb2/retinal_pk.zip) = 24628
 SHA256 (quake2-3zb2/spasmox_pk.zip) = a252e97b8b5cb6cdcd7039f4fd694fb6daf3be79193637ecab4f8b5c378a61dd
@@ -46,11 +54,9 @@ SHA256 (quake2-3zb2/xatrixmap_pk4.zip) = 443a69ef46ab1aecaec1cf96305492e13660f33
 SIZE (quake2-3zb2/xatrixmap_pk4.zip) = 94790
 SHA256 (quake2-3zb2/xdm3.zip) = dd358ece377ed0f28c3a7cfd6a3dad94bcac827903ffef953a32ec6d19307d92
 SIZE (quake2-3zb2/xdm3.zip) = 24634
+SHA256 (quake2-3zb2/xdmx_pk.zip) = 0152fc78922fd71c0501ac8e01e1d4fa98896636c34584530d70afa78ad2f08e
+SIZE (quake2-3zb2/xdmx_pk.zip) = 101174
 SHA256 (quake2-3zb2/xldmx_pk.zip) = 489ea6d8e0f3984ac9e6a221dbc9e82ffa29264735567afb0245d141bf6d3ed6
 SIZE (quake2-3zb2/xldmx_pk.zip) = 26609
 SHA256 (quake2-3zb2/ztn2dmx_pk.zip) = bf99e5156ce92a5cc21398329ddefc363674922d6cc9a43e82ade864b7777688
 SIZE (quake2-3zb2/ztn2dmx_pk.zip) = 30631
-SHA256 (quake2-3zb2/chflm2130_pk.zip) = 9c75345939e377b65a542fd74aa67132ce3246ca64d4a5abe23d157e82962afc
-SIZE (quake2-3zb2/chflm2130_pk.zip) = 290793
-SHA256 (quake2-3zb2/chfxmap0109_pk.zip) = 24236d112941c13e9886e61605a388f7ba0e3568bb1224746d4e9762804d8473
-SIZE (quake2-3zb2/chfxmap0109_pk.zip) = 201481
diff --git a/games/quake2-3zb2/files/pkg-message.in b/games/quake2-3zb2/files/pkg-message.in
index ca908d91e49b..69ebad8d9dd5 100644
--- a/games/quake2-3zb2/files/pkg-message.in
+++ b/games/quake2-3zb2/files/pkg-message.in
@@ -1,22 +1,22 @@
 ==============================================================================
 
-3ZB2 has been installed.
+3rd Zigock II bots has been installed.
 
-Due to the game library (i.e. game.so file) being unable to read the
-filesystem paths (i.e. %%Q2DIR%% in the client
-(i.e. quake2 executable), it will look for and write node files in the current
-directory. So you have to do the following (only once) in the directory where
-you want to run it from (you could use ~/.quake2 for example):
+Due to the fact that game library (i.e. game.so file) is unable to read the
+file system paths (i.e. %%Q2DIR%% in the client executable),
+it will look for and write node files in the current directory.  So you have
+to do the following (only once) in the directory where you want to run it
+from (you could use ~/.quake2 for example):
 
-$ mkdir -p ~/.quake2/3zb2
-$ cd %%Q2DIR%%/3zb2
-$ cp -r 3ZBConfig.cfg 3ZBMaps.lst chctf chdtm ~/.quake2/3zb2
-$ chmod -r u+w ~/.quake2/3zb2
+  $ mkdir -p ~/.quake2/3zb2
+  $ cd %%Q2DIR%%/3zb2
+  $ cp -a 3ZBConfig.cfg 3ZBMaps.lst chctf chdtm ~/.quake2/3zb2
+  $ chmod -R u+w ~/.quake2/3zb2
 
 Then run it from the recently created directory.
 
-$ cd ~/.quake2
-$ quake2 +set game 3zb2
+  $ cd ~/.quake2
+  $ quake2 +set game 3zb2
 
 See the docs in %%DOCSDIR%% for help on using it.
 
diff --git a/games/quake2-3zb2/pkg-descr b/games/quake2-3zb2/pkg-descr
index 2ba3da6e3d07..3831843fddc5 100644
--- a/games/quake2-3zb2/pkg-descr
+++ b/games/quake2-3zb2/pkg-descr
@@ -1,3 +1,3 @@
-3rd-Zigock Bot II for Quake II.
+3rd Zigock II are probably the best bots available for Quake II.
 
 WWW: http://users.jp.tri6.net/~ponpoko/3zb2/
diff --git a/games/quake2-3zb2/pkg-plist b/games/quake2-3zb2/pkg-plist
index 61b2410e32fd..af43fb912fe0 100644
--- a/games/quake2-3zb2/pkg-plist
+++ b/games/quake2-3zb2/pkg-plist
@@ -61,6 +61,11 @@
 %%NODES%%%%Q2DIR%%/3zb2/chdtm/fixed1.chn
 %%NODES%%%%Q2DIR%%/3zb2/chdtm/hangar1.chn
 %%NODES%%%%Q2DIR%%/3zb2/chdtm/hangar2.chn
+%%NODES%%%%Q2DIR%%/3zb2/chdtm/ikdm1.chn
+%%NODES%%%%Q2DIR%%/3zb2/chdtm/ikdm2.chn
+%%NODES%%%%Q2DIR%%/3zb2/chdtm/ikdm3.chn
+%%NODES%%%%Q2DIR%%/3zb2/chdtm/ikdm4.chn
+%%NODES%%%%Q2DIR%%/3zb2/chdtm/ikdm5.chn
 %%NODES%%%%Q2DIR%%/3zb2/chdtm/ikdm6.chn
 %%NODES%%%%Q2DIR%%/3zb2/chdtm/ikdm7.chn
 %%NODES%%%%Q2DIR%%/3zb2/chdtm/ikdm8.chn
@@ -70,10 +75,18 @@
 %%NODES%%%%Q2DIR%%/3zb2/chdtm/jail3.chn
 %%NODES%%%%Q2DIR%%/3zb2/chdtm/jail4.chn
 %%NODES%%%%Q2DIR%%/3zb2/chdtm/jail5.chn
+%%NODES%%%%Q2DIR%%/3zb2/chdtm/match1.chn
 %%NODES%%%%Q2DIR%%/3zb2/chdtm/outbase.chn
 %%NODES%%%%Q2DIR%%/3zb2/chdtm/power1.chn
 %%NODES%%%%Q2DIR%%/3zb2/chdtm/power2.chn
 %%Q2DIR%%/3zb2/chdtm/q2dm1.chn
+%%NODES%%%%Q2DIR%%/3zb2/chdtm/q2dm2.chn
+%%NODES%%%%Q2DIR%%/3zb2/chdtm/q2dm3.chn
+%%NODES%%%%Q2DIR%%/3zb2/chdtm/q2dm4.chn
+%%NODES%%%%Q2DIR%%/3zb2/chdtm/q2dm5.chn
+%%NODES%%%%Q2DIR%%/3zb2/chdtm/q2dm6.chn
+%%NODES%%%%Q2DIR%%/3zb2/chdtm/q2dm7.chn
+%%NODES%%%%Q2DIR%%/3zb2/chdtm/q2dm8.chn
 %%NODES%%%%Q2DIR%%/3zb2/chdtm/refinery.chn
 %%NODES%%%%Q2DIR%%/3zb2/chdtm/sewer64.chn
 %%NODES%%%%Q2DIR%%/3zb2/chdtm/spasmo1.chn
@@ -107,7 +120,13 @@
 %%NODES%%%%Q2DIR%%/3zb2/chdtm/waste3.chn
 %%NODES%%%%Q2DIR%%/3zb2/chdtm/xcompnd1.chn
 %%NODES%%%%Q2DIR%%/3zb2/chdtm/xcompnd2.chn
+%%NODES%%%%Q2DIR%%/3zb2/chdtm/xdm1.chn
+%%NODES%%%%Q2DIR%%/3zb2/chdtm/xdm2.chn
 %%NODES%%%%Q2DIR%%/3zb2/chdtm/xdm3.chn
+%%NODES%%%%Q2DIR%%/3zb2/chdtm/xdm4.chn
+%%NODES%%%%Q2DIR%%/3zb2/chdtm/xdm5.chn
+%%NODES%%%%Q2DIR%%/3zb2/chdtm/xdm6.chn
+%%NODES%%%%Q2DIR%%/3zb2/chdtm/xdm7.chn
 %%NODES%%%%Q2DIR%%/3zb2/chdtm/xhangar1.chn
 %%NODES%%%%Q2DIR%%/3zb2/chdtm/xhangar2.chn
 %%NODES%%%%Q2DIR%%/3zb2/chdtm/xintell.chn