games/ioquake3 and slaves: Fix options

Every touched port was build-tested and passed.

PR:		ports/180675
Submitted by:	Dominic Fandrey (maintainer)
Tested on:	FreeBSD 9.1/amd64 with poudriere

4 files changed, 51 insertions, 33 deletions

diff --git a/games/urbanterror-data/Makefile b/games/urbanterror-data/Makefile
index 1cd90057c3ca..4aaf62b693c4 100644
--- a/games/urbanterror-data/Makefile
+++ b/games/urbanterror-data/Makefile
@@ -1,18 +1,14 @@
-# New ports collection makefile for:	urbanterror-data
-# Date created:				2007-09-10
-# Whom:					alepulver
-#
+# Created by: alepulver
 # $FreeBSD$
-#
 
 PORTNAME=	data
-PORTVERSION=	4.1.1
+PORTVERSION=	4.2.014
 CATEGORIES=	games
-MASTER_SITES=	ftp://ftp.snt.utwente.nl/pub/games/urbanterror/full_install/linux_or_mac/ \
-		http://www.iourt.com/files/ \
-		http://urbanterror.mtc-team.fr/
+MASTER_SITES=	http://www.ftwgl.com/files/mirror/ \
+		http://www.f1m.fr/uploads/urt/ \
+		http://maps.goreclan.net/
 PKGNAMEPREFIX=	urbanterror-
-DISTNAME=	UrbanTerror${PORTVERSION:S/.//g}
+DISTNAME=	UrbanTerror${URT_VER}_full${URT_REV}
 EXTRACT_SUFX=	.zip
 EXTRACT_ONLY=
 
@@ -23,18 +19,25 @@ NO_BUILD=	yes
 NO_PACKAGE=	Package will be 1GB; set FORCE_PACKAGE if you really want it
 
 DATADIR=	${PREFIX}/share/quake3
+DOCSDIR=	${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
+
+URT_VER=	${PORTVERSION:C/([0-9]+).([0-9]+).*/\1\2/}
+URT_REV=	${PORTVERSION:C/([0-9]+\.[0-9]+).*\.([0-9]+)/\2/}
+
+PLIST_SUB+=	VER=${URT_VER}
+
+.include <bsd.port.options.mk>
 
 do-install:
 	${MKDIR} ${DATADIR}/q3ut4
 	${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${DISTDIR}/${DISTFILES} \
 		${EXTRACT_AFTER_ARGS} -C ${DATADIR} --strip-components 1 \
-		UrbanTerror/q3ut4
-.if !defined(NOPORTDOCS)
+		UrbanTerror${URT_VER}/q3ut4
+.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR}
-	${MV} ${DATADIR}/q3ut4/readme${PORTVERSION:S/.//:C/\..*//}.txt \
-		${DOCSDIR}/readme${PORTVERSION:S/.//g}.txt
+	${MV} ${DATADIR}/q3ut4/readme${URT_VER}.txt ${DOCSDIR}
 .else
-	${RM} ${DATADIR}/q3ut4/readme${PORTVERSION:S/.//:C/\..*//}.txt
+	${RM} ${DATADIR}/q3ut4/readme${URT_VER}.txt
 .endif
 
 .include <bsd.port.mk>
diff --git a/games/urbanterror-data/distinfo b/games/urbanterror-data/distinfo
index 4e26827e15a1..090a29263e83 100644
--- a/games/urbanterror-data/distinfo
+++ b/games/urbanterror-data/distinfo
@@ -1,2 +1,2 @@
-SHA256 (UrbanTerror411.zip) = 32d578c556975db2b09735d8be49b575cc0bfc4d379ca57d9981c656115a6f47
-SIZE (UrbanTerror411.zip) = 1074190065
+SHA256 (UrbanTerror42_full014.zip) = 52618f40223baedf37b0a97fc99fd05d3915d20eaff38c71e4eeb66835c7d169
+SIZE (UrbanTerror42_full014.zip) = 1548345447
diff --git a/games/urbanterror-data/pkg-descr b/games/urbanterror-data/pkg-descr
index 5c919f23dac8..807a9f869444 100644
--- a/games/urbanterror-data/pkg-descr
+++ b/games/urbanterror-data/pkg-descr
@@ -9,4 +9,4 @@ and nice jumps. Urban Terror has 7 game modes, 25 maps and 15 weapons.
 This port only contains the data, and can be played with ioUrbanTerror
 (games/iourbanterror) or any other Quake 3 Arena compatible engine.
 
-WWW:	http://www.urbanterror.net/
+WWW: http://www.urbanterror.net/
diff --git a/games/urbanterror-data/pkg-plist b/games/urbanterror-data/pkg-plist
index 083bc7955415..ed00678cfe95 100644
--- a/games/urbanterror-data/pkg-plist
+++ b/games/urbanterror-data/pkg-plist
@@ -1,19 +1,34 @@
-%%PORTDOCS%%%%DOCSDIR%%/readme411.txt
-%%DATADIR%%/q3ut4/QIIIA Game Source (SDK) License.doc
-%%DATADIR%%/q3ut4/Urban Terror on the Web.url
-%%DATADIR%%/q3ut4/autoexec.cfg
-%%DATADIR%%/q3ut4/demos/tutorial.dm_68
-%%DATADIR%%/q3ut4/description.txt
-%%DATADIR%%/q3ut4/mapcycle.txt
-%%DATADIR%%/q3ut4/q3ut.ico
-%%DATADIR%%/q3ut4/screenshots/shot0000.jpg
-%%DATADIR%%/q3ut4/server.cfg
+%%PORTDOCS%%%%DOCSDIR%%/readme%%VER%%.txt
+%%DATADIR%%/q3ut4/How_To_Install.txt
+%%DATADIR%%/q3ut4/QIIIA_Game_Source_License.doc
+%%DATADIR%%/q3ut4/autoexec_example.cfg
+%%DATADIR%%/q3ut4/mapcycle_example.txt
+%%DATADIR%%/q3ut4/server_example.cfg
 %%DATADIR%%/q3ut4/ut4_commune.pk3
-%%DATADIR%%/q3ut4/zpak000.pk3
-%%DATADIR%%/q3ut4/zpak000_assets.pk3
-%%DATADIR%%/q3ut4/zpak001_assets.pk3
-@dirrm %%DATADIR%%/q3ut4/screenshots
-@dirrm %%DATADIR%%/q3ut4/demos
+%%DATADIR%%/q3ut4/ut4_jumpents.pk3
+%%DATADIR%%/q3ut4/zUrT42_0001.pk3
+%%DATADIR%%/q3ut4/zUrT42_0002.pk3
+%%DATADIR%%/q3ut4/zUrT42_0003.pk3
+%%DATADIR%%/q3ut4/zUrT42_0004.pk3
+%%DATADIR%%/q3ut4/zUrT42_0005.pk3
+%%DATADIR%%/q3ut4/zUrT42_0006.pk3
+%%DATADIR%%/q3ut4/zUrT42_0007.pk3
+%%DATADIR%%/q3ut4/zUrT42_0008.pk3
+%%DATADIR%%/q3ut4/zUrT42_0009.pk3
+%%DATADIR%%/q3ut4/zUrT42_0010.pk3
+%%DATADIR%%/q3ut4/zUrT42_0011.pk3
+%%DATADIR%%/q3ut4/zUrT42_0012.pk3
+%%DATADIR%%/q3ut4/zUrT42_0013.pk3
+%%DATADIR%%/q3ut4/zUrT42_0014.pk3
+%%DATADIR%%/q3ut4/zUrT42_0015.pk3
+%%DATADIR%%/q3ut4/zUrT42_0016.pk3
+%%DATADIR%%/q3ut4/zUrT42_0017.pk3
+%%DATADIR%%/q3ut4/zUrT42_0018.pk3
+%%DATADIR%%/q3ut4/zUrT42_0019.pk3
+%%DATADIR%%/q3ut4/zUrT42_0020.pk3
+%%DATADIR%%/q3ut4/zUrT42_0021.pk3
+%%DATADIR%%/q3ut4/zUrT42_0022.pk3
+%%DATADIR%%/q3ut4/zUrT42_qvm.pk3
 @dirrm %%DATADIR%%/q3ut4
 @dirrmtry %%DATADIR%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%