Update to 2.1

3 files changed, 36 insertions, 87 deletions

diff --git a/games/hlserver-dod/Makefile b/games/hlserver-dod/Makefile
index 6fa1aa5d856..ba8544dce65 100644
--- a/games/hlserver-dod/Makefile
+++ b/games/hlserver-dod/Makefile
@@ -6,11 +6,13 @@
 #
 
 PORTNAME=	dod
-PORTVERSION=	2.0
-MASTER_SITES=	http://games.gci.net/pub/Half-Life/Mods/DoD/ \
-		http://download.filefront.com/pub2/halflife/mods/day_of_defeat/ \
-		ftp://ftpuk.jolt.co.uk/games/halflife/mods/dod/patches/
-DISTNAME=	${PORTNAME}_v${PORTVERSION:S/.//}
+PORTVERSION=	2.1
+MASTER_SITES=	http://www.redphive.org/files/ \
+		ftp://ftp.dod-europe.com/dod/dod/2.1/linux/ \
+		ftp://ftp.dodfrance.com/dod/dod/2.1/linux/ \
+		ftp://209.239.96.42/ \
+		ftp://gamefiles.blueyonder.co.uk/blueyondergames/halflife/modifications/dayofdefeat/patches/linux/
+DISTNAME=	${PORTNAME}_v${PORTVERSION:S/.//}_full
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
diff --git a/games/hlserver-dod/distinfo b/games/hlserver-dod/distinfo
index 304acd173be..427844a8170 100644
--- a/games/hlserver-dod/distinfo
+++ b/games/hlserver-dod/distinfo
@@ -1 +1 @@
-MD5 (dod_v20.tar.gz) = 77bbf235dbc2a3140a7978d09c1f1682
+MD5 (dod_v21_full.tar.gz) = e2d1dd3bf518599f2db6222df206829f
diff --git a/games/hlserver-dod/pkg-plist b/games/hlserver-dod/pkg-plist
index 4f54d1f5e4d..d86dc24cf32 100644
--- a/games/hlserver-dod/pkg-plist
+++ b/games/hlserver-dod/pkg-plist
@@ -195,10 +195,12 @@
 %%HLDSDIR%%dod/maps/dod_avalanche.txt
 %%HLDSDIR%%dod/maps/dod_caen2.bsp
 %%HLDSDIR%%dod/maps/dod_caen2.txt
-%%HLDSDIR%%dod/maps/dod_dog1.bsp
-%%HLDSDIR%%dod/maps/dod_dog1.txt
+%%HLDSDIR%%dod/maps/dod_cherbourg.bsp
+%%HLDSDIR%%dod/maps/dod_cherbourg.txt
 %%HLDSDIR%%dod/maps/dod_heutau.bsp
 %%HLDSDIR%%dod/maps/dod_heutau.txt
+%%HLDSDIR%%dod/maps/dod_koln.bsp
+%%HLDSDIR%%dod/maps/dod_koln.txt
 %%HLDSDIR%%dod/maps/dod_overlord.bsp
 %%HLDSDIR%%dod/maps/dod_overlord.txt
 %%HLDSDIR%%dod/maps/dod_ramelle.bsp
@@ -225,11 +227,8 @@
 %%HLDSDIR%%dod/models/mapmodels/cindergibs.mdl
 %%HLDSDIR%%dod/models/mapmodels/concretegibs.mdl
 %%HLDSDIR%%dod/models/mapmodels/dead-sniper-bridge1.mdl
+%%HLDSDIR%%dod/models/mapmodels/dead1.mdl
 %%HLDSDIR%%dod/models/mapmodels/dod_jeep1.mdl
-%%HLDSDIR%%dod/models/mapmodels/dog1_hedgehogsmall.mdl
-%%HLDSDIR%%dod/models/mapmodels/dog1_only_hk_searchlightg.mdl
-%%HLDSDIR%%dod/models/mapmodels/dog1_shellpile1.mdl
-%%HLDSDIR%%dod/models/mapmodels/dog1_shellpile2.mdl
 %%HLDSDIR%%dod/models/mapmodels/flag.mdl
 %%HLDSDIR%%dod/models/mapmodels/gflag_sch.mdl
 %%HLDSDIR%%dod/models/mapmodels/hay.mdl
@@ -250,6 +249,7 @@
 %%HLDSDIR%%dod/models/mapmodels/messerschmitt_tail.mdl
 %%HLDSDIR%%dod/models/mapmodels/null.mdl
 %%HLDSDIR%%dod/models/mapmodels/panzer3.mdl
+%%HLDSDIR%%dod/models/mapmodels/phono.mdl
 %%HLDSDIR%%dod/models/mapmodels/rockgibs.mdl
 %%HLDSDIR%%dod/models/mapmodels/rubblepile4k.mdl
 %%HLDSDIR%%dod/models/mapmodels/shellpile1.mdl
@@ -396,6 +396,7 @@
 %%HLDSDIR%%dod/sound/ambience/mortar.wav
 %%HLDSDIR%%dod/sound/ambience/seg1-boom2.wav
 %%HLDSDIR%%dod/sound/ambience/thunder_rain.wav
+%%HLDSDIR%%dod/sound/ambience/thunder_rain2.wav
 %%HLDSDIR%%dod/sound/ambience/thundergerman2.wav
 %%HLDSDIR%%dod/sound/ambience/usareasecure.wav
 %%HLDSDIR%%dod/sound/ambience/usobjectivesecure.wav
@@ -434,62 +435,29 @@
 %%HLDSDIR%%dod/sound/mapsounds/alliesscore.wav
 %%HLDSDIR%%dod/sound/mapsounds/anziobell.wav
 %%HLDSDIR%%dod/sound/mapsounds/anziotree.wav
+%%HLDSDIR%%dod/sound/mapsounds/arc_tango.wav
 %%HLDSDIR%%dod/sound/mapsounds/axiscap.wav
 %%HLDSDIR%%dod/sound/mapsounds/axisscore.wav
+%%HLDSDIR%%dod/sound/mapsounds/bben1.wav
 %%HLDSDIR%%dod/sound/mapsounds/bell1k.wav
 %%HLDSDIR%%dod/sound/mapsounds/boogie.wav
 %%HLDSDIR%%dod/sound/mapsounds/burning1.wav
+%%HLDSDIR%%dod/sound/mapsounds/burning2.wav
 %%HLDSDIR%%dod/sound/mapsounds/c2amb.wav
 %%HLDSDIR%%dod/sound/mapsounds/clocktick.wav
 %%HLDSDIR%%dod/sound/mapsounds/creak.wav
+%%HLDSDIR%%dod/sound/mapsounds/crow.wav
 %%HLDSDIR%%dod/sound/mapsounds/dim_reaper_tankhit.wav
 %%HLDSDIR%%dod/sound/mapsounds/dodambience2.wav
-%%HLDSDIR%%dod/sound/mapsounds/dog1_ambience1.wav
-%%HLDSDIR%%dod/sound/mapsounds/dog1_ambience2.wav
-%%HLDSDIR%%dod/sound/mapsounds/dog1_arillerylomplett.wav
-%%HLDSDIR%%dod/sound/mapsounds/dog1_artyrequest2.wav
-%%HLDSDIR%%dod/sound/mapsounds/dog1_creak.wav
-%%HLDSDIR%%dod/sound/mapsounds/dog1_drboomsplash01.wav
-%%HLDSDIR%%dod/sound/mapsounds/dog1_drips.wav
-%%HLDSDIR%%dod/sound/mapsounds/dog1_drrumbling01.wav
-%%HLDSDIR%%dod/sound/mapsounds/dog1_fan4.wav
-%%HLDSDIR%%dod/sound/mapsounds/dog1_gunz.wav
-%%HLDSDIR%%dod/sound/mapsounds/dog1_hedgehog01.wav
-%%HLDSDIR%%dod/sound/mapsounds/dog1_hedgehog02.wav
-%%HLDSDIR%%dod/sound/mapsounds/dog1_hedgehog03.wav
-%%HLDSDIR%%dod/sound/mapsounds/dog1_hedgehog04.wav
-%%HLDSDIR%%dod/sound/mapsounds/dog1_hedgehog05.wav
-%%HLDSDIR%%dod/sound/mapsounds/dog1_metalclang01.wav
-%%HLDSDIR%%dod/sound/mapsounds/dog1_only_ambience1.wav
-%%HLDSDIR%%dod/sound/mapsounds/dog1_only_ambience2.wav
-%%HLDSDIR%%dod/sound/mapsounds/dog1_only_arillerylomplett.wav
-%%HLDSDIR%%dod/sound/mapsounds/dog1_only_artyrequest2.wav
-%%HLDSDIR%%dod/sound/mapsounds/dog1_only_drboomsplash01.wav
-%%HLDSDIR%%dod/sound/mapsounds/dog1_only_drrumbling01.wav
-%%HLDSDIR%%dod/sound/mapsounds/dog1_only_gunz.wav
-%%HLDSDIR%%dod/sound/mapsounds/dog1_only_hedgehog01.wav
-%%HLDSDIR%%dod/sound/mapsounds/dog1_only_hedgehog02.wav
-%%HLDSDIR%%dod/sound/mapsounds/dog1_only_hedgehog03.wav
-%%HLDSDIR%%dod/sound/mapsounds/dog1_only_hedgehog04.wav
-%%HLDSDIR%%dod/sound/mapsounds/dog1_only_hedgehog05.wav
-%%HLDSDIR%%dod/sound/mapsounds/dog1_only_metalclang01.wav
-%%HLDSDIR%%dod/sound/mapsounds/dog1_only_pak40.wav
-%%HLDSDIR%%dod/sound/mapsounds/dog1_only_retreat2.wav
-%%HLDSDIR%%dod/sound/mapsounds/dog1_only_ridgegoboom.wav
-%%HLDSDIR%%dod/sound/mapsounds/dog1_only_screamm3.wav
-%%HLDSDIR%%dod/sound/mapsounds/dog1_only_underground.wav
-%%HLDSDIR%%dod/sound/mapsounds/dog1_pak40.wav
-%%HLDSDIR%%dod/sound/mapsounds/dog1_retreat2.wav
-%%HLDSDIR%%dod/sound/mapsounds/dog1_ridgegoboom.wav
-%%HLDSDIR%%dod/sound/mapsounds/dog1_screamm3.wav
-%%HLDSDIR%%dod/sound/mapsounds/dog1_underground.wav
-%%HLDSDIR%%dod/sound/mapsounds/dog1_usfireinhole.wav
 %%HLDSDIR%%dod/sound/mapsounds/drboomsplash01.wav
+%%HLDSDIR%%dod/sound/mapsounds/erriewind.wav
 %%HLDSDIR%%dod/sound/mapsounds/flyby.wav
 %%HLDSDIR%%dod/sound/mapsounds/fountain.wav
 %%HLDSDIR%%dod/sound/mapsounds/frenchcountry.wav
+%%HLDSDIR%%dod/sound/mapsounds/germananthem.wav
 %%HLDSDIR%%dod/sound/mapsounds/gerpointcaptured.wav
 %%HLDSDIR%%dod/sound/mapsounds/kami-bird1a.wav
+%%HLDSDIR%%dod/sound/mapsounds/leaves2.wav
 %%HLDSDIR%%dod/sound/mapsounds/malamoreno.wav
 %%HLDSDIR%%dod/sound/mapsounds/panzerlied.wav
 %%HLDSDIR%%dod/sound/mapsounds/ramelle-alliesscore.pk
@@ -498,10 +466,14 @@
 %%HLDSDIR%%dod/sound/mapsounds/ramelle-axisscore.wav
 %%HLDSDIR%%dod/sound/mapsounds/ramelle-bridgeallie.wav
 %%HLDSDIR%%dod/sound/mapsounds/ramelle-bridgeaxis.wav
+%%HLDSDIR%%dod/sound/mapsounds/sincity2.wav
 %%HLDSDIR%%dod/sound/mapsounds/thunderallies2.wav
 %%HLDSDIR%%dod/sound/mapsounds/thundergerman2.wav
+%%HLDSDIR%%dod/sound/mapsounds/tree1.wav
 %%HLDSDIR%%dod/sound/mapsounds/tu es partout 03.wav
 %%HLDSDIR%%dod/sound/mapsounds/uspointcaptured.wav
+%%HLDSDIR%%dod/sound/mapsounds/utah.wav
+%%HLDSDIR%%dod/sound/mapsounds/waterrun.wav
 %%HLDSDIR%%dod/sound/mapsounds/windy.wav
 %%HLDSDIR%%dod/sound/materials.txt
 %%HLDSDIR%%dod/sound/overlord/battle.wav
@@ -728,14 +700,17 @@
 %%HLDSDIR%%dod/sprites/SpringRightTop.spr
 %%HLDSDIR%%dod/sprites/SpringTopLeft.spr
 %%HLDSDIR%%dod/sprites/SpringTopRight.spr
+%%HLDSDIR%%dod/sprites/aflag.spr
 %%HLDSDIR%%dod/sprites/agren_extra.spr
 %%HLDSDIR%%dod/sprites/allied_grenade_large.spr
 %%HLDSDIR%%dod/sprites/allied_grenade_small.spr
 %%HLDSDIR%%dod/sprites/amer_wpn1.spr
 %%HLDSDIR%%dod/sprites/amer_wpn2.spr
+%%HLDSDIR%%dod/sprites/aplayer.spr
 %%HLDSDIR%%dod/sprites/axis_grenade_large.spr
 %%HLDSDIR%%dod/sprites/axis_grenade_small.spr
 %%HLDSDIR%%dod/sprites/bandage.spr
+%%HLDSDIR%%dod/sprites/banglr.spr
 %%HLDSDIR%%dod/sprites/bar_bullets.spr
 %%HLDSDIR%%dod/sprites/bar_clip.spr
 %%HLDSDIR%%dod/sprites/bar_clip_empty.spr
@@ -762,6 +737,7 @@
 %%HLDSDIR%%dod/sprites/colt_extra.spr
 %%HLDSDIR%%dod/sprites/dm_awpn.spr
 %%HLDSDIR%%dod/sprites/dm_gwpn.spr
+%%HLDSDIR%%dod/sprites/dodcross.blue.spr
 %%HLDSDIR%%dod/sprites/dodcross.spr
 %%HLDSDIR%%dod/sprites/explosion1.spr
 %%HLDSDIR%%dod/sprites/fire.spr
@@ -787,13 +763,16 @@
 %%HLDSDIR%%dod/sprites/gewehr_clip_extra.spr
 %%HLDSDIR%%dod/sprites/gewehr_clip_full.spr
 %%HLDSDIR%%dod/sprites/gewehr_extra.spr
+%%HLDSDIR%%dod/sprites/gflag.spr
 %%HLDSDIR%%dod/sprites/ggren_extra.spr
 %%HLDSDIR%%dod/sprites/glow01.spr
 %%HLDSDIR%%dod/sprites/glow02.spr
 %%HLDSDIR%%dod/sprites/glow03.spr
 %%HLDSDIR%%dod/sprites/glow04.spr
 %%HLDSDIR%%dod/sprites/glow05.spr
+%%HLDSDIR%%dod/sprites/gplayer.spr
 %%HLDSDIR%%dod/sprites/grass_kickup1.spr
+%%HLDSDIR%%dod/sprites/grenade_hltv.spr
 %%HLDSDIR%%dod/sprites/hb.spr
 %%HLDSDIR%%dod/sprites/hud.txt
 %%HLDSDIR%%dod/sprites/hud_health_overlay.spr
@@ -822,43 +801,8 @@
 %%HLDSDIR%%dod/sprites/mapsprites/c2_axis_target.spr
 %%HLDSDIR%%dod/sprites/mapsprites/caparea.spr
 %%HLDSDIR%%dod/sprites/mapsprites/dirt-explosion6c.spr
-%%HLDSDIR%%dod/sprites/mapsprites/dog1_ao_bangaloreobj.spr
-%%HLDSDIR%%dod/sprites/mapsprites/dog1_cexplo.spr
-%%HLDSDIR%%dod/sprites/mapsprites/dog1_crossedpoles.spr
-%%HLDSDIR%%dod/sprites/mapsprites/dog1_dr_bangaloreobj.spr
-%%HLDSDIR%%dod/sprites/mapsprites/dog1_dr_radioobj.spr
-%%HLDSDIR%%dod/sprites/mapsprites/dog1_dr_shellsobj.spr
-%%HLDSDIR%%dod/sprites/mapsprites/dog1_drblast01 2.spr
-%%HLDSDIR%%dod/sprites/mapsprites/dog1_drblast01.spr
-%%HLDSDIR%%dod/sprites/mapsprites/dog1_drblast01old.spr
-%%HLDSDIR%%dod/sprites/mapsprites/dog1_fog3.spr
-%%HLDSDIR%%dod/sprites/mapsprites/dog1_fog4.spr
-%%HLDSDIR%%dod/sprites/mapsprites/dog1_glow04.spr
-%%HLDSDIR%%dod/sprites/mapsprites/dog1_glowr01.spr
-%%HLDSDIR%%dod/sprites/mapsprites/dog1_glowr02.spr
-%%HLDSDIR%%dod/sprites/mapsprites/dog1_hb.spr
-%%HLDSDIR%%dod/sprites/mapsprites/dog1_only_ao_bangaloreobj.spr
-%%HLDSDIR%%dod/sprites/mapsprites/dog1_only_cexplo.spr
-%%HLDSDIR%%dod/sprites/mapsprites/dog1_only_crossedpoles.spr
-%%HLDSDIR%%dod/sprites/mapsprites/dog1_only_dr_bangaloreobj.spr
-%%HLDSDIR%%dod/sprites/mapsprites/dog1_only_dr_radioobj.spr
-%%HLDSDIR%%dod/sprites/mapsprites/dog1_only_dr_shellsobj.spr
-%%HLDSDIR%%dod/sprites/mapsprites/dog1_only_drblast01.spr
-%%HLDSDIR%%dod/sprites/mapsprites/dog1_only_fog3.spr
-%%HLDSDIR%%dod/sprites/mapsprites/dog1_only_fog4.spr
-%%HLDSDIR%%dod/sprites/mapsprites/dog1_only_glow04.spr
-%%HLDSDIR%%dod/sprites/mapsprites/dog1_only_glowr01.spr
-%%HLDSDIR%%dod/sprites/mapsprites/dog1_only_hb.spr
-%%HLDSDIR%%dod/sprites/mapsprites/dog1_only_pak40.spr
-%%HLDSDIR%%dod/sprites/mapsprites/dog1_only_roofdust.spr
-%%HLDSDIR%%dod/sprites/mapsprites/dog1_only_splasha01.spr
-%%HLDSDIR%%dod/sprites/mapsprites/dog1_only_team1.spr
-%%HLDSDIR%%dod/sprites/mapsprites/dog1_only_tracers01.spr
-%%HLDSDIR%%dod/sprites/mapsprites/dog1_pak40.spr
 %%HLDSDIR%%dod/sprites/mapsprites/dog1_roofdust.spr
 %%HLDSDIR%%dod/sprites/mapsprites/dog1_splasha01.spr
-%%HLDSDIR%%dod/sprites/mapsprites/dog1_team1.spr
-%%HLDSDIR%%dod/sprites/mapsprites/dog1_tracers01.spr
 %%HLDSDIR%%dod/sprites/mapsprites/dog1roofdust01.spr
 %%HLDSDIR%%dod/sprites/mapsprites/dog1splash08.spr
 %%HLDSDIR%%dod/sprites/mapsprites/flagh_sch.spr
@@ -912,6 +856,7 @@
 %%HLDSDIR%%dod/sprites/stamina-torn.spr
 %%HLDSDIR%%dod/sprites/stamina.spr
 %%HLDSDIR%%dod/sprites/steam1.spr
+%%HLDSDIR%%dod/sprites/stick_hltv.spr
 %%HLDSDIR%%dod/sprites/strip_bullets.spr
 %%HLDSDIR%%dod/sprites/strip_clip.spr
 %%HLDSDIR%%dod/sprites/strip_clip_empty.spr
@@ -921,6 +866,7 @@
 %%HLDSDIR%%dod/sprites/thompson_clip_empty.spr
 %%HLDSDIR%%dod/sprites/thompson_clip_extra.spr
 %%HLDSDIR%%dod/sprites/thompson_clip_full.spr
+%%HLDSDIR%%dod/sprites/tnt.spr
 %%HLDSDIR%%dod/sprites/tommy_bullets.spr
 %%HLDSDIR%%dod/sprites/tommy_clip.spr
 %%HLDSDIR%%dod/sprites/tommy_extra.spr
@@ -947,6 +893,7 @@
 %%HLDSDIR%%dod/sprites/weapon_spring.txt
 %%HLDSDIR%%dod/sprites/weapon_stickgrenade.txt
 %%HLDSDIR%%dod/sprites/weapon_thompson.txt
+%%HLDSDIR%%dod/sprites/wflag.spr
 %%HLDSDIR%%dod/sprites/wpns1.spr
 %%HLDSDIR%%dod/sprites/xsmoke3.spr
 %%HLDSDIR%%dod/sprites/zerogxplode.spr