4 files changed, 38 insertions, 23 deletions

diff --git a/games/warsow-data/Makefile b/games/warsow-data/Makefile
index 5dc579250d13..499d40918c11 100644
--- a/games/warsow-data/Makefile
+++ b/games/warsow-data/Makefile
@@ -6,14 +6,14 @@
 #
 
 PORTNAME=	data
-PORTVERSION=	0.5
+PORTVERSION=	0.6
 CATEGORIES=	games
-MASTER_SITES=	http://woe.crying-wolves.net/ \
+MASTER_SITES=	http://www.zcdn.org/dl/ \
 		http://www.derchris.eu/warsow/ \
-		http://warsow.hangy.de/ \
-		http://static.warsow.net/release/ \
-		http://rewq.de/scratch/wsw05/ \
-		http://weseo.de/downloads/
+		http://www.derchris.eu/warsow/:mappack \
+		http://static.warsow.net/release/:mappack \
+		http://rewq.de/scratch/wsw05/:mappack \
+		http://weseo.de/downloads/:mappack
 PKGNAMEPREFIX=	warsow-
 DISTNAME=	${PKGNAMEPREFIX:S/-//}_${PORTVERSION}_unified
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
@@ -22,6 +22,9 @@ DIST_SUBDIR=	${PKGNAMEPREFIX:S/-//}
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	Warsow data files
 
+# Package size below is for default set of OPTIONS
+NO_PACKAGE=	Package will be 550MB, set FORCE_PACKAGE if you really want it
+
 ONLY_FOR_ARCHS=	i386 amd64
 USE_ZIP=	yes
 
@@ -40,7 +43,7 @@ OPTIONS=	MAPPACK		"Install community map pack"	on
 .include <bsd.port.options.mk>
 
 .if defined(WITH_MAPPACK)
-DISTFILES+=	warsow_comunity_map_pack_01${EXTRACT_SUFX}
+DISTFILES+=	warsow_comunity_map_pack_01${EXTRACT_SUFX}:mappack
 PLIST_SUB+=	MAPPACK=""
 .else
 PLIST_SUB+=	MAPPACK="@comment "
diff --git a/games/warsow-data/distinfo b/games/warsow-data/distinfo
index 5c332487e449..5e4e7a5de173 100644
--- a/games/warsow-data/distinfo
+++ b/games/warsow-data/distinfo
@@ -1,6 +1,4 @@
-MD5 (warsow/warsow_0.5_unified.zip) = d0cb961256bbc1b93bf240b8bcf8eff5
-SHA256 (warsow/warsow_0.5_unified.zip) = 66ac784277def8d90a8368d44e7ca72cd1d3a50b63cee4ad7c3e102cf16f5100
-SIZE (warsow/warsow_0.5_unified.zip) = 256768515
-MD5 (warsow/warsow_comunity_map_pack_01.zip) = acee1ef5da9dec69ec87d45f3d73a6eb
+SHA256 (warsow/warsow_0.6_unified.zip) = 43f389e97df976f3dd13832922537bb3f1735f0335b51602c9db1bc4e7018428
+SIZE (warsow/warsow_0.6_unified.zip) = 450797008
 SHA256 (warsow/warsow_comunity_map_pack_01.zip) = 58b84b10d5fbaa22e29d59194b8c5ebbc633356fbc6545a715e44a73bdd3c7e7
 SIZE (warsow/warsow_comunity_map_pack_01.zip) = 130057143
diff --git a/games/warsow-data/pkg-descr b/games/warsow-data/pkg-descr
index bab52a0bfbef..e512e606e012 100644
--- a/games/warsow-data/pkg-descr
+++ b/games/warsow-data/pkg-descr
@@ -1,5 +1,3 @@
-Warsow game data files.
-
 This port installs data files needed to run Warsow, a free multiplayer
 first person shooter with cartoonish graphics based on Qfusion (a cool
 improvement over the Quake II engine).
diff --git a/games/warsow-data/pkg-plist b/games/warsow-data/pkg-plist
index ab706471f612..9dc501fc85f7 100644
--- a/games/warsow-data/pkg-plist
+++ b/games/warsow-data/pkg-plist
@@ -2,6 +2,7 @@
 %%DATADIR%%/basewsw/configs/server/gametypes/bomb.cfg
 %%DATADIR%%/basewsw/configs/server/gametypes/ca.cfg
 %%DATADIR%%/basewsw/configs/server/gametypes/ctf.cfg
+%%DATADIR%%/basewsw/configs/server/gametypes/ctftactics.cfg
 %%DATADIR%%/basewsw/configs/server/gametypes/da.cfg
 %%DATADIR%%/basewsw/configs/server/gametypes/dm.cfg
 %%DATADIR%%/basewsw/configs/server/gametypes/duel.cfg
@@ -42,15 +43,17 @@
 %%DATADIR%%/basewsw/configs/timer/ya2/3x.cfg
 %%DATADIR%%/basewsw/configs/timer/ya2/4x.cfg
 %%DATADIR%%/basewsw/configs/timer/ya2/5x.cfg
-%%DATADIR%%/basewsw/custominfoparms.txt
-%%DATADIR%%/basewsw/data0_05.pk3
-%%DATADIR%%/basewsw/data0_05pure.pk3
+%%DATADIR%%/basewsw/data0_06.pk3
+%%DATADIR%%/basewsw/data0_06pure.pk3
 %%DATADIR%%/basewsw/dedicated_autoexec.cfg
 %%DATADIR%%/basewsw/editortextures.pk3
 %%DATADIR%%/basewsw/map_wamphi1.pk3
 %%DATADIR%%/basewsw/map_wamphi2.pk3
 %%DATADIR%%/basewsw/map_wbomb1.pk3
 %%DATADIR%%/basewsw/map_wbomb2.pk3
+%%DATADIR%%/basewsw/map_wbomb3.pk3
+%%DATADIR%%/basewsw/map_wbomb4.pk3
+%%DATADIR%%/basewsw/map_wbomb5.pk3
 %%DATADIR%%/basewsw/map_wca1.pk3
 %%DATADIR%%/basewsw/map_wca2.pk3
 %%DATADIR%%/basewsw/map_wca3.pk3
@@ -60,6 +63,10 @@
 %%DATADIR%%/basewsw/map_wctf4.pk3
 %%DATADIR%%/basewsw/map_wctf5.pk3
 %%DATADIR%%/basewsw/map_wctf6.pk3
+%%DATADIR%%/basewsw/map_wda1.pk3
+%%DATADIR%%/basewsw/map_wda2.pk3
+%%DATADIR%%/basewsw/map_wda3.pk3
+%%DATADIR%%/basewsw/map_wda4.pk3
 %%DATADIR%%/basewsw/map_wdm1.pk3
 %%DATADIR%%/basewsw/map_wdm10.pk3
 %%DATADIR%%/basewsw/map_wdm11.pk3
@@ -67,8 +74,6 @@
 %%DATADIR%%/basewsw/map_wdm13.pk3
 %%DATADIR%%/basewsw/map_wdm14.pk3
 %%DATADIR%%/basewsw/map_wdm15.pk3
-%%DATADIR%%/basewsw/map_wdm16.pk3
-%%DATADIR%%/basewsw/map_wdm17.pk3
 %%DATADIR%%/basewsw/map_wdm18.pk3
 %%DATADIR%%/basewsw/map_wdm19.pk3
 %%DATADIR%%/basewsw/map_wdm2.pk3
@@ -80,32 +85,43 @@
 %%DATADIR%%/basewsw/map_wdm7.pk3
 %%DATADIR%%/basewsw/map_wdm8.pk3
 %%DATADIR%%/basewsw/map_wdm9.pk3
-%%DATADIR%%/basewsw/mm_pubkey.txt
 %%DATADIR%%/basewsw/models_nate.pk3
-%%DATADIR%%/basewsw/modules_05.pk3
+%%DATADIR%%/basewsw/modules_06.pk3
 %%DATADIR%%/basewsw/tex_36.pk3
 %%DATADIR%%/basewsw/tex_baxandall.pk3
 %%DATADIR%%/basewsw/tex_billboard.pk3
 %%DATADIR%%/basewsw/tex_blx.pk3
 %%DATADIR%%/basewsw/tex_blxbis.pk3
+%%DATADIR%%/basewsw/tex_bricks.pk3
 %%DATADIR%%/basewsw/tex_cha0swsw.pk3
-%%DATADIR%%/basewsw/tex_ecel.pk3
+%%DATADIR%%/basewsw/tex_cleansurface.pk3
+%%DATADIR%%/basewsw/tex_concrete.pk3
+%%DATADIR%%/basewsw/tex_decals.pk3
+%%DATADIR%%/basewsw/tex_env1.pk3
 %%DATADIR%%/basewsw/tex_etr.pk3
 %%DATADIR%%/basewsw/tex_exwsw.pk3
 %%DATADIR%%/basewsw/tex_factory.pk3
-%%DATADIR%%/basewsw/tex_fakeads.pk3
 %%DATADIR%%/basewsw/tex_format.pk3
+%%DATADIR%%/basewsw/tex_glass.pk3
+%%DATADIR%%/basewsw/tex_grates.pk3
 %%DATADIR%%/basewsw/tex_hazelh.pk3
 %%DATADIR%%/basewsw/tex_hexagons.pk3
 %%DATADIR%%/basewsw/tex_jewels.pk3
+%%DATADIR%%/basewsw/tex_lights.pk3
 %%DATADIR%%/basewsw/tex_melee.pk3
+%%DATADIR%%/basewsw/tex_metal.pk3
 %%DATADIR%%/basewsw/tex_nature.pk3
+%%DATADIR%%/basewsw/tex_neon.pk3
+%%DATADIR%%/basewsw/tex_plastic.pk3
 %%DATADIR%%/basewsw/tex_refly.pk3
 %%DATADIR%%/basewsw/tex_russus.pk3
+%%DATADIR%%/basewsw/tex_sky.pk3
 %%DATADIR%%/basewsw/tex_solidfake.pk3
 %%DATADIR%%/basewsw/tex_supersymmetry.pk3
 %%DATADIR%%/basewsw/tex_terrain.pk3
-%%DATADIR%%/basewsw/tex_wsw_adverts.pk3
+%%DATADIR%%/basewsw/tex_tiles.pk3
+%%DATADIR%%/basewsw/tex_window.pk3
+%%DATADIR%%/basewsw/tex_wood.pk3
 %%DATADIR%%/basewsw/tex_wsw_cave1.pk3
 %%DATADIR%%/basewsw/tex_wsw_city1.pk3
 %%DATADIR%%/basewsw/tex_wsw_flareshalos.pk3