- Belatedly update to version 0.5

- Offer to install community map pack (on by default)
- Convert one patch file to simple inplace editing

7 files changed, 200 insertions, 365 deletions

diff --git a/games/warsow-data/Makefile b/games/warsow-data/Makefile
index 0b2a0f3bc727..5dc579250d13 100644
--- a/games/warsow-data/Makefile
+++ b/games/warsow-data/Makefile
@@ -1,4 +1,4 @@
-# New ports collection makefile for:	warsow-data
+# New ports collection makefile for:	Warsow game data
 # Date created:				2006-08-03
 # Whom:				Jose Alonso Cardenas Marquez <acm@FreeBSD.org>
 #
@@ -6,17 +6,17 @@
 #
 
 PORTNAME=	data
-PORTVERSION=	0.42
+PORTVERSION=	0.5
 CATEGORIES=	games
-MASTER_SITES=	http://data.rodix.free.fr/warsow/files/ \
-		http://88.191.19.21/wsw/ \
-		http://www.derchris.net/warsow/ \
-		http://gedankenschlag.de/mirror/ \
-		http://uzz.cc/ \
-		http://wahs.de/warsow/ \
-		http://tastyspleen.net/quake/downloads/mods/warsow/
+MASTER_SITES=	http://woe.crying-wolves.net/ \
+		http://www.derchris.eu/warsow/ \
+		http://warsow.hangy.de/ \
+		http://static.warsow.net/release/ \
+		http://rewq.de/scratch/wsw05/ \
+		http://weseo.de/downloads/
 PKGNAMEPREFIX=	warsow-
 DISTNAME=	${PKGNAMEPREFIX:S/-//}_${PORTVERSION}_unified
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 DIST_SUBDIR=	${PKGNAMEPREFIX:S/-//}
 
 MAINTAINER=	acm@FreeBSD.org
@@ -24,20 +24,34 @@ COMMENT=	Warsow data files
 
 ONLY_FOR_ARCHS=	i386 amd64
 USE_ZIP=	yes
-USE_DOS2UNIX=	${TXTDOCS}
 
 NO_BUILD=	yes
+NO_WRKSUBDIR=	yes
 DATADIR=	${PREFIX}/share/${PKGNAMEPREFIX:S/-//}
 DOCSDIR=	${PREFIX}/share/doc/${PKGNAMEPREFIX:S/-//}
-TXTDOCS=	bots_navigation.txt changelog.txt contact.txt credits.txt \
+TXTDOCS=	bots_navigation.txt changelog.txt contact.txt \
 		dedicated_server_quide.txt demoavi.txt democams.txt \
 		features.txt huds.txt license.txt mousefilter.txt \
 		query_protocols.txt
 PORTDOCS=	0.4_renderer_changes.png ${TXTDOCS}
 
+OPTIONS=	MAPPACK		"Install community map pack"	on
+
+.include <bsd.port.options.mk>
+
+.if defined(WITH_MAPPACK)
+DISTFILES+=	warsow_comunity_map_pack_01${EXTRACT_SUFX}
+PLIST_SUB+=	MAPPACK=""
+.else
+PLIST_SUB+=	MAPPACK="@comment "
+.endif
+
 do-install:
 	@${MKDIR} ${DATADIR}
 	cd ${WRKSRC} && ${COPYTREE_SHARE} basewsw ${DATADIR}
+.if defined(WITH_MAPPACK)
+	cd ${WRKSRC} && ${COPYTREE_SHARE} previews ${DATADIR}
+.endif
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 	cd ${WRKSRC}/docs && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
diff --git a/games/warsow-data/distinfo b/games/warsow-data/distinfo
index 6ea5472d14a5..5c332487e449 100644
--- a/games/warsow-data/distinfo
+++ b/games/warsow-data/distinfo
@@ -1,3 +1,6 @@
-MD5 (warsow/warsow_0.42_unified.zip) = cba5fe9b8af01b378e685959098fa84f
-SHA256 (warsow/warsow_0.42_unified.zip) = 69e8d33dd73b92b8205a4de3feee2baf6ce27d155ed977aa4acd23c1fa9aa776
-SIZE (warsow/warsow_0.42_unified.zip) = 193348129
+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_comunity_map_pack_01.zip) = 58b84b10d5fbaa22e29d59194b8c5ebbc633356fbc6545a715e44a73bdd3c7e7
+SIZE (warsow/warsow_comunity_map_pack_01.zip) = 130057143
diff --git a/games/warsow-data/pkg-plist b/games/warsow-data/pkg-plist
index 612b7a563fae..ab706471f612 100644
--- a/games/warsow-data/pkg-plist
+++ b/games/warsow-data/pkg-plist
@@ -1,254 +1,78 @@
-%%DATADIR%%/basewsw/billboard.pk3
-%%DATADIR%%/basewsw/cfgs/ETR.cfg
-%%DATADIR%%/basewsw/cfgs/dedicated_allaround.cfg
-%%DATADIR%%/basewsw/cfgs/dedicated_ca.cfg
-%%DATADIR%%/basewsw/cfgs/dedicated_ctf.cfg
-%%DATADIR%%/basewsw/cfgs/dedicated_da.cfg
-%%DATADIR%%/basewsw/cfgs/dedicated_duel.cfg
-%%DATADIR%%/basewsw/cfgs/dedicated_duel_quad.cfg
-%%DATADIR%%/basewsw/cfgs/dedicated_ffa.cfg
-%%DATADIR%%/basewsw/cfgs/dedicated_quad.cfg
-%%DATADIR%%/basewsw/cfgs/dedicated_tdm.cfg
-%%DATADIR%%/basewsw/cfgs/dedicated_tdm_ctf.cfg
-%%DATADIR%%/basewsw/cfgs/jal.cfg
-%%DATADIR%%/basewsw/cfgs/nip.cfg
-%%DATADIR%%/basewsw/cfgs/timer/bs/0x.cfg
-%%DATADIR%%/basewsw/cfgs/timer/bs/1x.cfg
-%%DATADIR%%/basewsw/cfgs/timer/bs/2x.cfg
-%%DATADIR%%/basewsw/cfgs/timer/bs/3x.cfg
-%%DATADIR%%/basewsw/cfgs/timer/bs/4x.cfg
-%%DATADIR%%/basewsw/cfgs/timer/bs/5x.cfg
-%%DATADIR%%/basewsw/cfgs/timer/config.cfg
-%%DATADIR%%/basewsw/cfgs/timer/core.cfg
-%%DATADIR%%/basewsw/cfgs/timer/quad/0x.cfg
-%%DATADIR%%/basewsw/cfgs/timer/quad/1x.cfg
-%%DATADIR%%/basewsw/cfgs/timer/quad/2x.cfg
-%%DATADIR%%/basewsw/cfgs/timer/quad/3x.cfg
-%%DATADIR%%/basewsw/cfgs/timer/quad/4x.cfg
-%%DATADIR%%/basewsw/cfgs/timer/quad/5x.cfg
-%%DATADIR%%/basewsw/cfgs/timer/ra/0x.cfg
-%%DATADIR%%/basewsw/cfgs/timer/ra/1x.cfg
-%%DATADIR%%/basewsw/cfgs/timer/ra/2x.cfg
-%%DATADIR%%/basewsw/cfgs/timer/ra/3x.cfg
-%%DATADIR%%/basewsw/cfgs/timer/ra/4x.cfg
-%%DATADIR%%/basewsw/cfgs/timer/ra/5x.cfg
-%%DATADIR%%/basewsw/cfgs/timer/ya/0x.cfg
-%%DATADIR%%/basewsw/cfgs/timer/ya/1x.cfg
-%%DATADIR%%/basewsw/cfgs/timer/ya/2x.cfg
-%%DATADIR%%/basewsw/cfgs/timer/ya/3x.cfg
-%%DATADIR%%/basewsw/cfgs/timer/ya/4x.cfg
-%%DATADIR%%/basewsw/cfgs/timer/ya/5x.cfg
-%%DATADIR%%/basewsw/cfgs/timer/ya2/0x.cfg
-%%DATADIR%%/basewsw/cfgs/timer/ya2/1x.cfg
-%%DATADIR%%/basewsw/cfgs/timer/ya2/2x.cfg
-%%DATADIR%%/basewsw/cfgs/timer/ya2/3x.cfg
-%%DATADIR%%/basewsw/cfgs/timer/ya2/4x.cfg
-%%DATADIR%%/basewsw/cfgs/timer/ya2/5x.cfg
-%%DATADIR%%/basewsw/data0.pk3
-%%DATADIR%%/basewsw/data0_pure.pk3
-%%DATADIR%%/basewsw/data1.pk3
-%%DATADIR%%/basewsw/data1_pure.pk3
+%%DATADIR%%/basewsw/configs/jal.cfg
+%%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/da.cfg
+%%DATADIR%%/basewsw/configs/server/gametypes/dm.cfg
+%%DATADIR%%/basewsw/configs/server/gametypes/duel.cfg
+%%DATADIR%%/basewsw/configs/server/gametypes/ffa.cfg
+%%DATADIR%%/basewsw/configs/server/gametypes/headhunt.cfg
+%%DATADIR%%/basewsw/configs/server/gametypes/race.cfg
+%%DATADIR%%/basewsw/configs/server/gametypes/tdm.cfg
+%%DATADIR%%/basewsw/configs/server/gametypes/tdo.cfg
+%%DATADIR%%/basewsw/configs/timer/bs/0x.cfg
+%%DATADIR%%/basewsw/configs/timer/bs/1x.cfg
+%%DATADIR%%/basewsw/configs/timer/bs/2x.cfg
+%%DATADIR%%/basewsw/configs/timer/bs/3x.cfg
+%%DATADIR%%/basewsw/configs/timer/bs/4x.cfg
+%%DATADIR%%/basewsw/configs/timer/bs/5x.cfg
+%%DATADIR%%/basewsw/configs/timer/core.cfg
+%%DATADIR%%/basewsw/configs/timer/quad/0x.cfg
+%%DATADIR%%/basewsw/configs/timer/quad/1x.cfg
+%%DATADIR%%/basewsw/configs/timer/quad/2x.cfg
+%%DATADIR%%/basewsw/configs/timer/quad/3x.cfg
+%%DATADIR%%/basewsw/configs/timer/quad/4x.cfg
+%%DATADIR%%/basewsw/configs/timer/quad/5x.cfg
+%%DATADIR%%/basewsw/configs/timer/ra/0x.cfg
+%%DATADIR%%/basewsw/configs/timer/ra/1x.cfg
+%%DATADIR%%/basewsw/configs/timer/ra/2x.cfg
+%%DATADIR%%/basewsw/configs/timer/ra/3x.cfg
+%%DATADIR%%/basewsw/configs/timer/ra/4x.cfg
+%%DATADIR%%/basewsw/configs/timer/ra/5x.cfg
+%%DATADIR%%/basewsw/configs/timer/timerconfig.cfg
+%%DATADIR%%/basewsw/configs/timer/ya/0x.cfg
+%%DATADIR%%/basewsw/configs/timer/ya/1x.cfg
+%%DATADIR%%/basewsw/configs/timer/ya/2x.cfg
+%%DATADIR%%/basewsw/configs/timer/ya/3x.cfg
+%%DATADIR%%/basewsw/configs/timer/ya/4x.cfg
+%%DATADIR%%/basewsw/configs/timer/ya/5x.cfg
+%%DATADIR%%/basewsw/configs/timer/ya2/0x.cfg
+%%DATADIR%%/basewsw/configs/timer/ya2/1x.cfg
+%%DATADIR%%/basewsw/configs/timer/ya2/2x.cfg
+%%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/dedicated_autoexec.cfg
-%%DATADIR%%/basewsw/default.cfg
-%%DATADIR%%/basewsw/demos/tutorials/01_introduction.cam
-%%DATADIR%%/basewsw/demos/tutorials/01_introduction.ogg
-%%DATADIR%%/basewsw/demos/tutorials/01_introduction.wd10
-%%DATADIR%%/basewsw/demos/tutorials/02_bunnyjumping.cam
-%%DATADIR%%/basewsw/demos/tutorials/02_bunnyjumping.ogg
-%%DATADIR%%/basewsw/demos/tutorials/02_bunnyjumping.wd10
 %%DATADIR%%/basewsw/editortextures.pk3
-%%DATADIR%%/basewsw/huds/default.hud
-%%DATADIR%%/basewsw/huds/gr8.hud
-%%DATADIR%%/basewsw/huds/guwashi.hud
-%%DATADIR%%/basewsw/huds/inc/ammo.hud
-%%DATADIR%%/basewsw/huds/inc/armor.hud
-%%DATADIR%%/basewsw/huds/inc/awards.hud
-%%DATADIR%%/basewsw/huds/inc/capture_areas.hud
-%%DATADIR%%/basewsw/huds/inc/chasing.hud
-%%DATADIR%%/basewsw/huds/inc/clock.hud
-%%DATADIR%%/basewsw/huds/inc/crosshair.hud
-%%DATADIR%%/basewsw/huds/inc/ctf.hud
-%%DATADIR%%/basewsw/huds/inc/damage_indicator_screen.hud
-%%DATADIR%%/basewsw/huds/inc/fps.hud
-%%DATADIR%%/basewsw/huds/inc/frags.hud
-%%DATADIR%%/basewsw/huds/inc/gr8/ammo.hud
-%%DATADIR%%/basewsw/huds/inc/gr8/armor.hud
-%%DATADIR%%/basewsw/huds/inc/gr8/boxes.hud
-%%DATADIR%%/basewsw/huds/inc/gr8/chasing.hud
-%%DATADIR%%/basewsw/huds/inc/gr8/crystal.hud
-%%DATADIR%%/basewsw/huds/inc/gr8/ctf.hud
-%%DATADIR%%/basewsw/huds/inc/gr8/fps_right_small.hud
-%%DATADIR%%/basewsw/huds/inc/gr8/frags.hud
-%%DATADIR%%/basewsw/huds/inc/gr8/health.hud
-%%DATADIR%%/basewsw/huds/inc/gr8/help_message_center.hud
-%%DATADIR%%/basewsw/huds/inc/gr8/keystate.hud
-%%DATADIR%%/basewsw/huds/inc/gr8/net.hud
-%%DATADIR%%/basewsw/huds/inc/gr8/noammo.hud
-%%DATADIR%%/basewsw/huds/inc/gr8/obituaries.hud
-%%DATADIR%%/basewsw/huds/inc/gr8/pickup.hud
-%%DATADIR%%/basewsw/huds/inc/gr8/powerup_item.hud
-%%DATADIR%%/basewsw/huds/inc/gr8/race.hud
-%%DATADIR%%/basewsw/huds/inc/gr8/scores.hud
-%%DATADIR%%/basewsw/huds/inc/gr8/selected_weapon.hud
-%%DATADIR%%/basewsw/huds/inc/gr8/speed_right_small.hud
-%%DATADIR%%/basewsw/huds/inc/gr8/team_info.hud
-%%DATADIR%%/basewsw/huds/inc/gr8/timer.hud
-%%DATADIR%%/basewsw/huds/inc/gr8/weaponlist_left.hud
-%%DATADIR%%/basewsw/huds/inc/guwashi/ammo.hud
-%%DATADIR%%/basewsw/huds/inc/guwashi/armor.hud
-%%DATADIR%%/basewsw/huds/inc/guwashi/clock.hud
-%%DATADIR%%/basewsw/huds/inc/guwashi/ctf.hud
-%%DATADIR%%/basewsw/huds/inc/guwashi/health.hud
-%%DATADIR%%/basewsw/huds/inc/guwashi/keystate.hud
-%%DATADIR%%/basewsw/huds/inc/guwashi/picked_up_item.hud
-%%DATADIR%%/basewsw/huds/inc/guwashi/powerups.hud
-%%DATADIR%%/basewsw/huds/inc/guwashi/scores.hud
-%%DATADIR%%/basewsw/huds/inc/guwashi/speed.hud
-%%DATADIR%%/basewsw/huds/inc/guwashi/team_info.hud
-%%DATADIR%%/basewsw/huds/inc/guwashi/weaponlist.hud
-%%DATADIR%%/basewsw/huds/inc/health.hud
-%%DATADIR%%/basewsw/huds/inc/help_message.hud
-%%DATADIR%%/basewsw/huds/inc/keystate.hud
-%%DATADIR%%/basewsw/huds/inc/koffie/ammo.hud
-%%DATADIR%%/basewsw/huds/inc/koffie/crosshair.hud
-%%DATADIR%%/basewsw/huds/inc/minimap.hud
-%%DATADIR%%/basewsw/huds/inc/mystikal/armor_numbers.hud
-%%DATADIR%%/basewsw/huds/inc/mystikal/armor_pic.hud
-%%DATADIR%%/basewsw/huds/inc/mystikal/chasing.hud
-%%DATADIR%%/basewsw/huds/inc/mystikal/clock_mid_big.hud
-%%DATADIR%%/basewsw/huds/inc/mystikal/crosshairs.hud
-%%DATADIR%%/basewsw/huds/inc/mystikal/ctf.hud
-%%DATADIR%%/basewsw/huds/inc/mystikal/health_numbers.hud
-%%DATADIR%%/basewsw/huds/inc/mystikal/picked.hud
-%%DATADIR%%/basewsw/huds/inc/mystikal/pointing.hud
-%%DATADIR%%/basewsw/huds/inc/mystikal/powerups.hud
-%%DATADIR%%/basewsw/huds/inc/mystikal/race.hud
-%%DATADIR%%/basewsw/huds/inc/mystikal/race_timer.hud
-%%DATADIR%%/basewsw/huds/inc/mystikal/scores.hud
-%%DATADIR%%/basewsw/huds/inc/mystikal/scores_left.hud
-%%DATADIR%%/basewsw/huds/inc/mystikal/scores_right.hud
-%%DATADIR%%/basewsw/huds/inc/mystikal/speed.hud
-%%DATADIR%%/basewsw/huds/inc/mystikal/team.hud
-%%DATADIR%%/basewsw/huds/inc/mystikal/weaponlist.hud
-%%DATADIR%%/basewsw/huds/inc/mystikalspec/armor_numbers.hud
-%%DATADIR%%/basewsw/huds/inc/mystikalspec/armor_pic.hud
-%%DATADIR%%/basewsw/huds/inc/mystikalspec/awards.hud
-%%DATADIR%%/basewsw/huds/inc/mystikalspec/clock_center.hud
-%%DATADIR%%/basewsw/huds/inc/mystikalspec/crosshairs.hud
-%%DATADIR%%/basewsw/huds/inc/mystikalspec/ctf.hud
-%%DATADIR%%/basewsw/huds/inc/mystikalspec/frags.hud
-%%DATADIR%%/basewsw/huds/inc/mystikalspec/health.hud
-%%DATADIR%%/basewsw/huds/inc/mystikalspec/health_numbers.hud
-%%DATADIR%%/basewsw/huds/inc/mystikalspec/health_pic.hud
-%%DATADIR%%/basewsw/huds/inc/mystikalspec/picked.hud
-%%DATADIR%%/basewsw/huds/inc/mystikalspec/pointing.hud
-%%DATADIR%%/basewsw/huds/inc/mystikalspec/powerups.hud
-%%DATADIR%%/basewsw/huds/inc/mystikalspec/race_timer.hud
-%%DATADIR%%/basewsw/huds/inc/mystikalspec/scores.hud
-%%DATADIR%%/basewsw/huds/inc/mystikalspec/speed.hud
-%%DATADIR%%/basewsw/huds/inc/mystikalspec/team.hud
-%%DATADIR%%/basewsw/huds/inc/mystikalspec/weaponinfo.hud
-%%DATADIR%%/basewsw/huds/inc/mystikalspec/weaponlist.hud
-%%DATADIR%%/basewsw/huds/inc/net.hud
-%%DATADIR%%/basewsw/huds/inc/nip/ammo.hud
-%%DATADIR%%/basewsw/huds/inc/nip/armor_numbers.hud
-%%DATADIR%%/basewsw/huds/inc/nip/chasing_top.hud
-%%DATADIR%%/basewsw/huds/inc/nip/clock_right_mid.hud
-%%DATADIR%%/basewsw/huds/inc/nip/crosshair.hud
-%%DATADIR%%/basewsw/huds/inc/nip/fps.hud
-%%DATADIR%%/basewsw/huds/inc/nip/fps_right_small.hud
-%%DATADIR%%/basewsw/huds/inc/nip/frag_counter.hud
-%%DATADIR%%/basewsw/huds/inc/nip/health_numbers.hud
-%%DATADIR%%/basewsw/huds/inc/nip/obituaries.hud
-%%DATADIR%%/basewsw/huds/inc/nip/picked_up_item.hud
-%%DATADIR%%/basewsw/huds/inc/nip/pointing_middle.hud
-%%DATADIR%%/basewsw/huds/inc/nip/powerups.hud
-%%DATADIR%%/basewsw/huds/inc/nip/race_timer.hud
-%%DATADIR%%/basewsw/huds/inc/nip/selected_item.hud
-%%DATADIR%%/basewsw/huds/inc/nip/selected_weapon.hud
-%%DATADIR%%/basewsw/huds/inc/nip/speed_right_small.hud
-%%DATADIR%%/basewsw/huds/inc/nip/team_info.hud
-%%DATADIR%%/basewsw/huds/inc/nip/weaponlist_up.hud
-%%DATADIR%%/basewsw/huds/inc/obituaries.hud
-%%DATADIR%%/basewsw/huds/inc/picked_up_item.hud
-%%DATADIR%%/basewsw/huds/inc/pointing.hud
-%%DATADIR%%/basewsw/huds/inc/powerups.hud
-%%DATADIR%%/basewsw/huds/inc/race.hud
-%%DATADIR%%/basewsw/huds/inc/scores.hud
-%%DATADIR%%/basewsw/huds/inc/spec/PU_counter.hud
-%%DATADIR%%/basewsw/huds/inc/spec/ammo.hud
-%%DATADIR%%/basewsw/huds/inc/spec/armor_numbers.hud
-%%DATADIR%%/basewsw/huds/inc/spec/awards.hud
-%%DATADIR%%/basewsw/huds/inc/spec/chasing_left.hud
-%%DATADIR%%/basewsw/huds/inc/spec/clock_mid_big.hud
-%%DATADIR%%/basewsw/huds/inc/spec/frag_counter.hud
-%%DATADIR%%/basewsw/huds/inc/spec/health_numbers.hud
-%%DATADIR%%/basewsw/huds/inc/spec/picked_up_item.hud
-%%DATADIR%%/basewsw/huds/inc/spec/pointing_middle.hud
-%%DATADIR%%/basewsw/huds/inc/spec/powerup_item.hud
-%%DATADIR%%/basewsw/huds/inc/spec/scores.hud
-%%DATADIR%%/basewsw/huds/inc/spec/selected_weapon.hud
-%%DATADIR%%/basewsw/huds/inc/spec/team_info.hud
-%%DATADIR%%/basewsw/huds/inc/speed.hud
-%%DATADIR%%/basewsw/huds/inc/team_info.hud
-%%DATADIR%%/basewsw/huds/inc/tutorial/keystate.hud
-%%DATADIR%%/basewsw/huds/inc/tutorial/speed.hud
-%%DATADIR%%/basewsw/huds/inc/warlord/ammo.hud
-%%DATADIR%%/basewsw/huds/inc/warlord/armor.hud
-%%DATADIR%%/basewsw/huds/inc/warlord/awards.hud
-%%DATADIR%%/basewsw/huds/inc/warlord/chasing.hud
-%%DATADIR%%/basewsw/huds/inc/warlord/clock.hud
-%%DATADIR%%/basewsw/huds/inc/warlord/ctf.hud
-%%DATADIR%%/basewsw/huds/inc/warlord/damage_indicator_icons.hud
-%%DATADIR%%/basewsw/huds/inc/warlord/fps.hud
-%%DATADIR%%/basewsw/huds/inc/warlord/frags.hud
-%%DATADIR%%/basewsw/huds/inc/warlord/health.hud
-%%DATADIR%%/basewsw/huds/inc/warlord/keystate.hud
-%%DATADIR%%/basewsw/huds/inc/warlord/minimap.hud
-%%DATADIR%%/basewsw/huds/inc/warlord/obituaries.hud
-%%DATADIR%%/basewsw/huds/inc/warlord/picked_up_item.hud
-%%DATADIR%%/basewsw/huds/inc/warlord/powerups.hud
-%%DATADIR%%/basewsw/huds/inc/warlord/race.hud
-%%DATADIR%%/basewsw/huds/inc/warlord/scores.hud
-%%DATADIR%%/basewsw/huds/inc/warlord/spectatorlogo.hud
-%%DATADIR%%/basewsw/huds/inc/warlord/speed.hud
-%%DATADIR%%/basewsw/huds/inc/warlord/team_info.hud
-%%DATADIR%%/basewsw/huds/inc/warlord/weapon_orb.hud
-%%DATADIR%%/basewsw/huds/inc/warlord/weaponcrosshair.hud
-%%DATADIR%%/basewsw/huds/inc/warlord/weaponlist.hud
-%%DATADIR%%/basewsw/huds/inc/weaponlist.hud
-%%DATADIR%%/basewsw/huds/inc/zoom.hud
-%%DATADIR%%/basewsw/huds/koffie.hud
-%%DATADIR%%/basewsw/huds/mystikal.hud
-%%DATADIR%%/basewsw/huds/mystikalspec.hud
-%%DATADIR%%/basewsw/huds/nip.hud
-%%DATADIR%%/basewsw/huds/spec.hud
-%%DATADIR%%/basewsw/huds/tut-movement.hud
-%%DATADIR%%/basewsw/huds/warlord.hud
-%%DATADIR%%/basewsw/huds/warlord_DOT.hud
-%%DATADIR%%/basewsw/map_wamphi.pk3
+%%DATADIR%%/basewsw/map_wamphi1.pk3
+%%DATADIR%%/basewsw/map_wamphi2.pk3
+%%DATADIR%%/basewsw/map_wbomb1.pk3
+%%DATADIR%%/basewsw/map_wbomb2.pk3
 %%DATADIR%%/basewsw/map_wca1.pk3
 %%DATADIR%%/basewsw/map_wca2.pk3
-%%DATADIR%%/basewsw/map_wca4.pk3
+%%DATADIR%%/basewsw/map_wca3.pk3
 %%DATADIR%%/basewsw/map_wctf1.pk3
 %%DATADIR%%/basewsw/map_wctf2.pk3
 %%DATADIR%%/basewsw/map_wctf3.pk3
+%%DATADIR%%/basewsw/map_wctf4.pk3
 %%DATADIR%%/basewsw/map_wctf5.pk3
-%%DATADIR%%/basewsw/map_wda1.pk3
-%%DATADIR%%/basewsw/map_wda2.pk3
-%%DATADIR%%/basewsw/map_wda3.pk3
-%%DATADIR%%/basewsw/map_wda4.pk3
-%%DATADIR%%/basewsw/map_wda5.pk3
-%%DATADIR%%/basewsw/map_wda6.pk3
+%%DATADIR%%/basewsw/map_wctf6.pk3
 %%DATADIR%%/basewsw/map_wdm1.pk3
 %%DATADIR%%/basewsw/map_wdm10.pk3
-%%DATADIR%%/basewsw/map_wdm10a.pk3
 %%DATADIR%%/basewsw/map_wdm11.pk3
+%%DATADIR%%/basewsw/map_wdm12.pk3
+%%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
+%%DATADIR%%/basewsw/map_wdm20.pk3
 %%DATADIR%%/basewsw/map_wdm3.pk3
 %%DATADIR%%/basewsw/map_wdm4.pk3
 %%DATADIR%%/basewsw/map_wdm5.pk3
@@ -256,50 +80,90 @@
 %%DATADIR%%/basewsw/map_wdm7.pk3
 %%DATADIR%%/basewsw/map_wdm8.pk3
 %%DATADIR%%/basewsw/map_wdm9.pk3
-%%DATADIR%%/basewsw/map_wtest13.pk3
-%%DATADIR%%/basewsw/map_wtest18.pk3
-%%DATADIR%%/basewsw/modules_04.pk3
-%%DATADIR%%/basewsw/modules_041.pk3
-%%DATADIR%%/basewsw/modules_042.pk3
-%%DATADIR%%/basewsw/profiles/gfx_contrast.cfg
-%%DATADIR%%/basewsw/profiles/gfx_high+.cfg
-%%DATADIR%%/basewsw/profiles/gfx_high.cfg
-%%DATADIR%%/basewsw/profiles/gfx_low.cfg
-%%DATADIR%%/basewsw/profiles/gfx_medium.cfg
-%%DATADIR%%/basewsw/tex_blx_pure.pk3
-%%DATADIR%%/basewsw/tex_blxbis_pure.pk3
-%%DATADIR%%/basewsw/tex_chaoswsw_pure.pk3
-%%DATADIR%%/basewsw/tex_ecel_pure.pk3
-%%DATADIR%%/basewsw/tex_exwsw_pure.pk3
-%%DATADIR%%/basewsw/tex_factory_pure.pk3
-%%DATADIR%%/basewsw/tex_hazelh_pure.pk3
-%%DATADIR%%/basewsw/tex_hexagons_pure.pk3
-%%DATADIR%%/basewsw/tex_refly_pure.pk3
-%%DATADIR%%/basewsw/tex_russus_pure.pk3
-%%DATADIR%%/basewsw/tex_supersymmetry_ctf_pure.pk3
-%%DATADIR%%/basewsw/tex_supersymmetry_pure.pk3
-%%DATADIR%%/basewsw/tex_terrain_pure.pk3
+%%DATADIR%%/basewsw/mm_pubkey.txt
+%%DATADIR%%/basewsw/models_nate.pk3
+%%DATADIR%%/basewsw/modules_05.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_cha0swsw.pk3
+%%DATADIR%%/basewsw/tex_ecel.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_hazelh.pk3
+%%DATADIR%%/basewsw/tex_hexagons.pk3
+%%DATADIR%%/basewsw/tex_jewels.pk3
+%%DATADIR%%/basewsw/tex_melee.pk3
+%%DATADIR%%/basewsw/tex_nature.pk3
+%%DATADIR%%/basewsw/tex_refly.pk3
+%%DATADIR%%/basewsw/tex_russus.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_wsw_cave1.pk3
+%%DATADIR%%/basewsw/tex_wsw_city1.pk3
+%%DATADIR%%/basewsw/tex_wsw_flareshalos.pk3
+%%DATADIR%%/basewsw/tex_zone_neutre.pk3
 %%DATADIR%%/basewsw/tvserver_autoexec.cfg
-@dirrm %%DATADIR%%/basewsw/cfgs/timer/bs
-@dirrm %%DATADIR%%/basewsw/cfgs/timer/quad
-@dirrm %%DATADIR%%/basewsw/cfgs/timer/ra
-@dirrm %%DATADIR%%/basewsw/cfgs/timer/ya
-@dirrm %%DATADIR%%/basewsw/cfgs/timer/ya2
-@dirrm %%DATADIR%%/basewsw/cfgs/timer
-@dirrm %%DATADIR%%/basewsw/cfgs
-@dirrm %%DATADIR%%/basewsw/demos/tutorials
-@dirrm %%DATADIR%%/basewsw/demos
-@dirrm %%DATADIR%%/basewsw/huds/inc/gr8
-@dirrm %%DATADIR%%/basewsw/huds/inc/guwashi
-@dirrm %%DATADIR%%/basewsw/huds/inc/koffie
-@dirrm %%DATADIR%%/basewsw/huds/inc/mystikal
-@dirrm %%DATADIR%%/basewsw/huds/inc/mystikalspec
-@dirrm %%DATADIR%%/basewsw/huds/inc/nip
-@dirrm %%DATADIR%%/basewsw/huds/inc/spec
-@dirrm %%DATADIR%%/basewsw/huds/inc/tutorial
-@dirrm %%DATADIR%%/basewsw/huds/inc/warlord
-@dirrm %%DATADIR%%/basewsw/huds/inc
-@dirrm %%DATADIR%%/basewsw/huds
-@dirrm %%DATADIR%%/basewsw/profiles
+%%MAPPACK%%%%DATADIR%%/basewsw/cwCTF1.pk3
+%%MAPPACK%%%%DATADIR%%/basewsw/cwL1.pk3
+%%MAPPACK%%%%DATADIR%%/basewsw/cwL2.pk3
+%%MAPPACK%%%%DATADIR%%/basewsw/cwL3.pk3
+%%MAPPACK%%%%DATADIR%%/basewsw/cwL4.pk3
+%%MAPPACK%%%%DATADIR%%/basewsw/cwL5.pk3
+%%MAPPACK%%%%DATADIR%%/basewsw/cwM1.pk3
+%%MAPPACK%%%%DATADIR%%/basewsw/cwM2.pk3
+%%MAPPACK%%%%DATADIR%%/basewsw/cwM3.pk3
+%%MAPPACK%%%%DATADIR%%/basewsw/cwM4.pk3
+%%MAPPACK%%%%DATADIR%%/basewsw/cwM5.pk3
+%%MAPPACK%%%%DATADIR%%/basewsw/cwM6.pk3
+%%MAPPACK%%%%DATADIR%%/basewsw/cwM7.pk3
+%%MAPPACK%%%%DATADIR%%/basewsw/cwRACE1.pk3
+%%MAPPACK%%%%DATADIR%%/basewsw/cwRACE2.pk3
+%%MAPPACK%%%%DATADIR%%/basewsw/cwRACE3.pk3
+%%MAPPACK%%%%DATADIR%%/basewsw/cwRACE4.pk3
+%%MAPPACK%%%%DATADIR%%/basewsw/cwRACE5.pk3
+%%MAPPACK%%%%DATADIR%%/basewsw/cwS1.pk3
+%%MAPPACK%%%%DATADIR%%/basewsw/cwS2.pk3
+%%MAPPACK%%%%DATADIR%%/basewsw/cw_tex1.pk3
+%%MAPPACK%%%%DATADIR%%/basewsw/cw_tex2.pk3
+%%MAPPACK%%%%DATADIR%%/basewsw/map_cwBOMB1.pk3
+%%MAPPACK%%%%DATADIR%%/previews/cwBOMB1.jpg
+%%MAPPACK%%%%DATADIR%%/previews/cwCTF1.jpg
+%%MAPPACK%%%%DATADIR%%/previews/cwL1.jpg
+%%MAPPACK%%%%DATADIR%%/previews/cwL2.jpg
+%%MAPPACK%%%%DATADIR%%/previews/cwL3.jpg
+%%MAPPACK%%%%DATADIR%%/previews/cwL4.jpg
+%%MAPPACK%%%%DATADIR%%/previews/cwL5.jpg
+%%MAPPACK%%%%DATADIR%%/previews/cwM1.jpg
+%%MAPPACK%%%%DATADIR%%/previews/cwM2.jpg
+%%MAPPACK%%%%DATADIR%%/previews/cwM3.jpg
+%%MAPPACK%%%%DATADIR%%/previews/cwM4.jpg
+%%MAPPACK%%%%DATADIR%%/previews/cwM5.jpg
+%%MAPPACK%%%%DATADIR%%/previews/cwM6.jpg
+%%MAPPACK%%%%DATADIR%%/previews/cwM7.jpg
+%%MAPPACK%%%%DATADIR%%/previews/cwRACE1.jpg
+%%MAPPACK%%%%DATADIR%%/previews/cwRACE2.jpg
+%%MAPPACK%%%%DATADIR%%/previews/cwRACE3.jpg
+%%MAPPACK%%%%DATADIR%%/previews/cwRACE4.jpg
+%%MAPPACK%%%%DATADIR%%/previews/cwRACE5.jpg
+%%MAPPACK%%%%DATADIR%%/previews/cwS1.jpg
+%%MAPPACK%%%%DATADIR%%/previews/cwS2.jpg
+%%MAPPACK%%@dirrm %%DATADIR%%/previews
+@dirrm %%DATADIR%%/basewsw/configs/timer/ya2
+@dirrm %%DATADIR%%/basewsw/configs/timer/ya
+@dirrm %%DATADIR%%/basewsw/configs/timer/ra
+@dirrm %%DATADIR%%/basewsw/configs/timer/quad
+@dirrm %%DATADIR%%/basewsw/configs/timer/bs
+@dirrm %%DATADIR%%/basewsw/configs/timer
+@dirrm %%DATADIR%%/basewsw/configs/server/gametypes
+@dirrm %%DATADIR%%/basewsw/configs/server
+@dirrm %%DATADIR%%/basewsw/configs
 @dirrm %%DATADIR%%/basewsw
 @dirrm %%DATADIR%%
diff --git a/games/warsow/Makefile b/games/warsow/Makefile
index a0f7320b0a9b..788f941a57b6 100644
--- a/games/warsow/Makefile
+++ b/games/warsow/Makefile
@@ -6,11 +6,14 @@
 #
 
 PORTNAME=	warsow
-PORTVERSION=	0.42
-PORTREVISION=	3
+PORTVERSION=	0.5
 CATEGORIES=	games
-MASTER_SITES=	http://data.rodix.free.fr/warsow/files/ \
-		http://88.191.19.21/wsw/
+MASTER_SITES=	http://woe.crying-wolves.net/ \
+		http://www.derchris.eu/warsow/ \
+		http://warsow.hangy.de/ \
+		http://static.warsow.net/release/ \
+		http://rewq.de/scratch/wsw05/ \
+		http://weseo.de/downloads/
 DISTNAME=	${PORTNAME}_${PORTVERSION}_sdk
 DIST_SUBDIR=	${PORTNAME}
 
@@ -18,14 +21,13 @@ MAINTAINER=	danfe@FreeBSD.org
 COMMENT=	A fast paced first person shooter game
 
 LIB_DEPENDS=	curl.5:${PORTSDIR}/ftp/curl
-RUN_DEPENDS=	${DATADIR}/basewsw/data0.pk3:${PORTSDIR}/games/warsow-data
+RUN_DEPENDS=	${DATADIR}/basewsw/data0_05.pk3:${PORTSDIR}/games/warsow-data
 
 ONLY_FOR_ARCHS=	i386 amd64
 USE_GMAKE=	yes
 USE_ZIP=	yes
-USE_DOS2UNIX=	game/q_shared.h
 
-WRKSRC=		${WRKDIR}/${DISTNAME:S/sdk/src/}/source
+WRKSRC=		${WRKDIR}/source
 ALL_TARGET=	game
 MAKE_ARGS=	PTHREAD_LIBS="${PTHREAD_LIBS}"
 RELEASEDIR=	${WRKSRC}/release
@@ -117,6 +119,9 @@ post-patch: .SILENT
 # FreeBSD does not use stupid `64' suffix for 64-bit readdir(3)
 	${REINPLACE_CMD} -e 's/FILE64_SOURCE)/& || defined(__FreeBSD__)/' \
 		${WRKSRC}/unix/unix_fs.c
+# Adjust architecture names, get rid of ``freebsd_'' prefix
+	${REINPLACE_CMD} -e 's/x86_64/amd64/ ; s/freebsd_//' \
+		${WRKSRC}/gameshared/q_arch.h
 
 do-install:
 .for b in ${WSWBIN}
diff --git a/games/warsow/distinfo b/games/warsow/distinfo
index 1dfc4d51c59b..86ea789ccf48 100644
--- a/games/warsow/distinfo
+++ b/games/warsow/distinfo
@@ -1,3 +1,3 @@
-MD5 (warsow/warsow_0.42_sdk.zip) = 94c9bb2a48ac6f2687b38809e003f3b9
-SHA256 (warsow/warsow_0.42_sdk.zip) = 6c3c4cf161472646501c53672792e123787e5fef9f3dac60e70f1235525e9278
-SIZE (warsow/warsow_0.42_sdk.zip) = 16601262
+MD5 (warsow/warsow_0.5_sdk.zip) = acd0244435cc63967b0eb3468c21c454
+SHA256 (warsow/warsow_0.5_sdk.zip) = 35cc937b4b38659df803d84f6b3fd6e9d5a5480ecadb4b642d991b99e3401f05
+SIZE (warsow/warsow_0.5_sdk.zip) = 34213675
diff --git a/games/warsow/files/patch-Makefile b/games/warsow/files/patch-Makefile
index bf817c08763e..1df4f1a2be90 100644
--- a/games/warsow/files/patch-Makefile
+++ b/games/warsow/files/patch-Makefile
@@ -1,8 +1,8 @@
---- Makefile.orig	2006-06-08 22:44:02.000000000 +0200
-+++ Makefile	2008-04-11 13:18:40.000000000 +0200
-@@ -34,19 +34,12 @@
- CC=i586-mingw32msvc-gcc
- LD=i586-mingw32msvc-gcc
+--- Makefile.orig
++++ Makefile
+@@ -51,19 +51,12 @@
+ #CC=gcc
+ #LD=gcc
  else
 -CC?=gcc
 -LD=gcc
@@ -23,7 +23,7 @@
  SHARED_LIBRARY_EXTENSION=so
  endif
  
-@@ -134,7 +127,7 @@
+@@ -161,7 +154,7 @@
  LIB=lib
  endif
  
@@ -32,25 +32,16 @@
  LDFLAGS_DED=-lz $(shell curl-config --libs)
  LDFLAGS_MODULE=-shared
  LDFLAGS_TV_SERVER=-lz
-@@ -149,11 +142,7 @@
- 
- # sdl
- ifeq ($(BUILD_SND_QF),YES)
--ifeq ($(OS),FreeBSD)
--SDL_CONFIG?=sdl11-config
--else
- SDL_CONFIG?=sdl-config
--endif
- 
- CFLAGS_SDL=$(shell $(SDL_CONFIG) --cflags)
- LDFLAGS_QF=$(shell $(SDL_CONFIG) --libs) -lvorbisfile
-@@ -193,8 +182,7 @@
+@@ -217,10 +210,8 @@
  ######################################################################################################
  # Helper functions
  ######################################################################################################
 -DO_CC=echo "  > Compiling $<" && \
 -	$(CC) $(CFLAGS_COMMON) -c $< -o $@
+-DO_CXX=echo "  > Compiling (c++) $<" && \
+-	$(CXX) $(CFLAGS_COMMON) $(CXXFLAGS_COMMON) -c $< -o $@
 +DO_CC=$(CC) $(CFLAGS_COMMON) -c $< -o $@
++DO_CXX=$(CXX) $(CFLAGS_COMMON) $(CXXFLAGS_COMMON) -c $< -o $@
+ 
  
  DO_CC_CLIENT=$(DO_CC) $(CFLAGS_CLIENT)
- DO_CC_DED=$(DO_CC) $(CFLAGS_DED)
diff --git a/games/warsow/files/patch-game+q_shared.h b/games/warsow/files/patch-game+q_shared.h
deleted file mode 100644
index f5d6e16df096..000000000000
--- a/games/warsow/files/patch-game+q_shared.h
+++ /dev/null
@@ -1,42 +0,0 @@
---- game/q_shared.h.orig	2008-07-24 05:38:24.000000000 +0700
-+++ game/q_shared.h	2008-07-24 05:41:08.000000000 +0700
-@@ -98,15 +98,15 @@
- #ifdef _M_IX86
- #if defined __FreeBSD__
- #define CPUSTRING "i386"
--#define ARCH "freebsd_i386"
-+#define ARCH "i386"
- #else
- #define CPUSTRING "x86"
- #define ARCH "x86"
- #endif
- #elif defined ( _M_AMD64 )
- #if defined __FreeBSD__
--#define CPUSTRING "x86_64"
--#define ARCH "freebsd_x86_64"
-+#define CPUSTRING "amd64"
-+#define ARCH "amd64"
- #else
- #define CPUSTRING "x64"
- #define ARCH "x64"
-@@ -162,17 +162,12 @@
- #endif
- 
- #ifdef __i386__
--#if defined __FreeBSD__
--#define ARCH "freebsd_i386"
--#define CPUSTRING "i386"
--#else
- #define ARCH "i386"
- #define CPUSTRING "i386"
--#endif
--#elif defined ( __x86_64__ )
-+#elif defined ( __x86_64__ ) || defined( __amd64__ )
- #if defined __FreeBSD__
--#define ARCH "freebsd_x86_64"
--#define CPUSTRING "x86_64"
-+#define ARCH "amd64"
-+#define CPUSTRING "amd64"
- #else
- #define ARCH "x86_64"
- #define CPUSTRING "x86_64"