Update to 1.4

3 files changed, 16 insertions, 20 deletions

diff --git a/games/hlserver-cs/Makefile b/games/hlserver-cs/Makefile
index 32dd2cc70a8b..4c7b7e6d2586 100644
--- a/games/hlserver-cs/Makefile
+++ b/games/hlserver-cs/Makefile
@@ -6,10 +6,11 @@
 #
 
 PORTNAME?=	cs
-PORTVERSION?=	1.3
+PORTVERSION?=	1.4
 CATEGORIES?=	games linux
-MASTER_SITES?=	http://games.velocity.net/files/Counter-Strike/ \
-		http://www.redphive.org/files/ \
+MASTER_SITES?=	http://gwforum.net/cs/valve/ \
+		http://stats.redphive.org/ \
+		http://www.carnage.q-net.net.au/downloads/server/halflife/linux/ \
 		http://files.ausgamers.com:81/half-life/counter-strike/linux/
 PKGNAMEPREFIX=	hlserver-
 .ifndef(DISTFILES)
@@ -27,8 +28,6 @@ USE_LINUX_PREFIX=	yes
 NO_CDROM=	"Size; the data set is much too big"
 NO_BUILD=	yes
 .if (${PORTNAME}==cs)
-PORTREVISION=	1
-BUILD_DEPENDS+=	${NONEXISTENT}:${HALFLIFESERVER_PORT}:patch
 WRKSRC?=		${WRKDIR}/cstrike
 .else
 .ifndef(NO_WRKSUBDIR)
@@ -46,20 +45,6 @@ HL_PROGRAM!=	cd ${HALFLIFESERVER_PORT} && ${MAKE} -V HL_PROGRAM
 PLIST_SUB_MASTER!=	cd ${HALFLIFESERVER_PORT} && ${MAKE} -V PLIST_SUB_FOR_THIS_PORT
 PKGMESSAGE!=	cd ${HALFLIFESERVER_PORT} && ${MAKE} -V PKGMESSAGE
 
-# 3.1.0.8 Beta A patch
-HALFLIFESERVER_PORT_WRKSRC!=	cd ${HALFLIFESERVER_PORT} && ${MAKE} -V WRKSRC
-
-.if (${PORTNAME}==cs) && !target(post-extract)
-post-extract:
-.if exists(${HALFLIFESERVER_PORT_WRKSRC}/cstrike)
-	${CP} -Rp ${HALFLIFESERVER_PORT_WRKSRC}/cstrike ${WRKDIR}
-.else
-	@${ECHO_MSG} "Please update your ports tree, it is not syncronized to the latest tree"
-	@${ECHO_MSG} "This port will not work. Check the FreeBSD Handbook on how to update"
-	@${FALSE}
-.endif
-.endif
-
 .if !target(slaveport-post-extract)
 slaveport-post-extract:
 .endif
diff --git a/games/hlserver-cs/distinfo b/games/hlserver-cs/distinfo
index 3fda81fd2b36..e942d94040d2 100644
--- a/games/hlserver-cs/distinfo
+++ b/games/hlserver-cs/distinfo
@@ -1 +1 @@
-MD5 (cs_13_full.tar.gz) = c17b30da26ee20db65c89eb5ac24bb63
+MD5 (cs_14_full.tar.gz) = 0ed8d1455987ffa4924efdb3cdfe5033
diff --git a/games/hlserver-cs/pkg-plist b/games/hlserver-cs/pkg-plist
index fc77ba7691d1..c7d87b6ec688 100644
--- a/games/hlserver-cs/pkg-plist
+++ b/games/hlserver-cs/pkg-plist
@@ -1,6 +1,7 @@
 %%HLDSDIR%%cstrike/ajawad.wad
 %%HLDSDIR%%cstrike/as_tundra.wad
 %%HLDSDIR%%cstrike/cached.wad
+%%HLDSDIR%%cstrike/chateau.wad
 %%HLDSDIR%%cstrike/cl_dlls/client.dll
 %%HLDSDIR%%cstrike/classes/ak47.txt
 %%HLDSDIR%%cstrike/classes/arctic.txt
@@ -48,6 +49,7 @@
 %%HLDSDIR%%cstrike/cs_cbble.rad
 %%HLDSDIR%%cstrike/cs_cbble.wad
 %%HLDSDIR%%cstrike/cs_dust.wad
+%%HLDSDIR%%cstrike/cs_havana.wad
 %%HLDSDIR%%cstrike/cs_office.wad
 %%HLDSDIR%%cstrike/cstrike.ico
 %%HLDSDIR%%cstrike/cstrike.wad
@@ -101,6 +103,8 @@
 %%PORTDOCS%%%%HLDSDIR%%cstrike/maps/cs_backalley.txt
 %%HLDSDIR%%cstrike/maps/cs_estate.bsp
 %%PORTDOCS%%%%HLDSDIR%%cstrike/maps/cs_estate.txt
+%%HLDSDIR%%cstrike/maps/cs_havana.bsp
+%%PORTDOCS%%%%HLDSDIR%%cstrike/maps/cs_havana.txt
 %%HLDSDIR%%cstrike/maps/cs_italy.bsp
 %%PORTDOCS%%%%HLDSDIR%%cstrike/maps/cs_italy.txt
 %%HLDSDIR%%cstrike/maps/cs_militia.bsp
@@ -113,6 +117,8 @@
 %%PORTDOCS%%%%HLDSDIR%%cstrike/maps/de_aztec.txt
 %%HLDSDIR%%cstrike/maps/de_cbble.bsp
 %%PORTDOCS%%%%HLDSDIR%%cstrike/maps/de_cbble.txt
+%%HLDSDIR%%cstrike/maps/de_chateau.bsp
+%%PORTDOCS%%%%HLDSDIR%%cstrike/maps/de_chateau.txt
 %%HLDSDIR%%cstrike/maps/de_dust.bsp
 %%PORTDOCS%%%%HLDSDIR%%cstrike/maps/de_dust.txt
 %%HLDSDIR%%cstrike/maps/de_dust2.bsp
@@ -326,6 +332,7 @@
 %%HLDSDIR%%cstrike/sound/ambience/dog7.wav
 %%HLDSDIR%%cstrike/sound/ambience/doorbell.wav
 %%HLDSDIR%%cstrike/sound/ambience/fallscream.wav
+%%HLDSDIR%%cstrike/sound/ambience/goal_1.wav
 %%HLDSDIR%%cstrike/sound/ambience/guit1.wav
 %%HLDSDIR%%cstrike/sound/ambience/kajika.wav
 %%HLDSDIR%%cstrike/sound/ambience/lv1.wav
@@ -698,9 +705,11 @@
 %%HLDSDIR%%cstrike/sprites/bottom_left.spr
 %%HLDSDIR%%cstrike/sprites/bottom_left2.spr
 %%HLDSDIR%%cstrike/sprites/bottom_left3.spr
+%%HLDSDIR%%cstrike/sprites/bottom_left_small.spr
 %%HLDSDIR%%cstrike/sprites/bottom_right.spr
 %%HLDSDIR%%cstrike/sprites/bottom_right2.spr
 %%HLDSDIR%%cstrike/sprites/bottom_right3.spr
+%%HLDSDIR%%cstrike/sprites/bottom_right_small.spr
 %%HLDSDIR%%cstrike/sprites/c4.spr
 %%HLDSDIR%%cstrike/sprites/ch_sniper.spr
 %%HLDSDIR%%cstrike/sprites/ch_sniper2.spr
@@ -745,9 +754,11 @@
 %%HLDSDIR%%cstrike/sprites/top_left.spr
 %%HLDSDIR%%cstrike/sprites/top_left2.spr
 %%HLDSDIR%%cstrike/sprites/top_left3.spr
+%%HLDSDIR%%cstrike/sprites/top_left_small.spr
 %%HLDSDIR%%cstrike/sprites/top_right.spr
 %%HLDSDIR%%cstrike/sprites/top_right2.spr
 %%HLDSDIR%%cstrike/sprites/top_right3.spr
+%%HLDSDIR%%cstrike/sprites/top_right_small.spr
 %%HLDSDIR%%cstrike/sprites/vertical.spr
 %%HLDSDIR%%cstrike/sprites/wall_puff1.spr
 %%HLDSDIR%%cstrike/sprites/wall_puff2.spr