Update to 1.5

3 files changed, 12 insertions, 25 deletions

diff --git a/games/hlserver-cs/Makefile b/games/hlserver-cs/Makefile
index f2db9bf81f4d..4e315c86ef90 100644
--- a/games/hlserver-cs/Makefile
+++ b/games/hlserver-cs/Makefile
@@ -6,11 +6,13 @@
 #
 
 PORTNAME?=	cs
-PORTVERSION?=	1.4
+PORTVERSION?=	1.5
 CATEGORIES?=	games linux
-MASTER_SITES?=	http://www.redphive.org/files/ \
-		http://www.carnage.q-net.net.au/downloads/server/halflife/linux/ \
-		http://files.ausgamers.com:81/half-life/counter-strike/linux/
+MASTER_SITES?=	http://cstrike.thefusion.cc/ \
+		http://bteg.net/~ms/hl/ \
+		http://www.jetstreamgames.co.nz/files/pub/halflife/cstrike/ \
+		http://cs.webcabo.com.br/~mosca/cs/ \
+		http://lamas.counter-strike.hu:8080/letolt/extra/cs/
 PKGNAMEPREFIX=	hlserver-
 .ifndef(DISTFILES)
 DISTNAME?=	${PORTNAME}_${PORTVERSION:S/.//}_full
@@ -27,8 +29,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 +46,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.9 Beta C patch
-HALFLIFESERVER_PORT_WRKSRC!=	cd ${HALFLIFESERVER_PORT} && ${MAKE} -V WRKSRC
-.if (${PORTNAME}==cs) && !target(post-patch)
-post-patch:
-.if exists(${HALFLIFESERVER_PORT_WRKSRC}/cstrike)
-	@${ECHO_MSG} "===> Applying 3.1.0.9 Beta C patch"
-	@${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 e942d94040d2..429b778c2691 100644
--- a/games/hlserver-cs/distinfo
+++ b/games/hlserver-cs/distinfo
@@ -1 +1 @@
-MD5 (cs_14_full.tar.gz) = 0ed8d1455987ffa4924efdb3cdfe5033
+MD5 (cs_15_full.tar.gz) = d688876fa2864ff69ff808432c9e6fe7
diff --git a/games/hlserver-cs/pkg-plist b/games/hlserver-cs/pkg-plist
index c7d87b6ec688..b51aef2433f0 100644
--- a/games/hlserver-cs/pkg-plist
+++ b/games/hlserver-cs/pkg-plist
@@ -1,6 +1,5 @@
 %%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
@@ -42,7 +41,6 @@
 %%HLDSDIR%%cstrike/classes/usp.txt
 %%HLDSDIR%%cstrike/classes/xm1014.txt
 %%HLDSDIR%%cstrike/commandmenu.txt
-%%HLDSDIR%%cstrike/config.cfg
 %%HLDSDIR%%cstrike/cs_747.wad
 %%HLDSDIR%%cstrike/cs_assault.wad
 %%HLDSDIR%%cstrike/cs_bdog.wad
@@ -54,6 +52,7 @@
 %%HLDSDIR%%cstrike/cstrike.ico
 %%HLDSDIR%%cstrike/cstrike.wad
 %%HLDSDIR%%cstrike/de_aztec.wad
+%%HLDSDIR%%cstrike/de_piranesi.wad
 %%HLDSDIR%%cstrike/de_storm.wad
 %%HLDSDIR%%cstrike/de_vegas.wad
 %%HLDSDIR%%cstrike/decals.wad
@@ -89,7 +88,7 @@
 %%HLDSDIR%%cstrike/itsitaly.wad
 %%HLDSDIR%%cstrike/jos.wad
 %%HLDSDIR%%cstrike/liblist.gam
-%%HLDSDIR%%cstrike/manual/manual.htm
+%%PORTDOCS%%%%HLDSDIR%%cstrike/manual/manual.htm
 %%HLDSDIR%%cstrike/mapcycle.txt
 %%HLDSDIR%%cstrike/maps/as_oilrig.bsp
 %%PORTDOCS%%%%HLDSDIR%%cstrike/maps/as_oilrig.txt
@@ -127,6 +126,8 @@
 %%PORTDOCS%%%%HLDSDIR%%cstrike/maps/de_inferno.txt
 %%HLDSDIR%%cstrike/maps/de_nuke.bsp
 %%PORTDOCS%%%%HLDSDIR%%cstrike/maps/de_nuke.txt
+%%HLDSDIR%%cstrike/maps/de_piranesi.bsp
+%%PORTDOCS%%%%HLDSDIR%%cstrike/maps/de_piranesi.txt
 %%HLDSDIR%%cstrike/maps/de_prodigy.bsp
 %%PORTDOCS%%%%HLDSDIR%%cstrike/maps/de_prodigy.txt
 %%HLDSDIR%%cstrike/maps/de_storm.bsp
@@ -820,7 +821,7 @@
 @dirrm %%HLDSDIR%%cstrike/models
 @dirrm %%HLDSDIR%%cstrike/media
 @dirrm %%HLDSDIR%%cstrike/maps
-@dirrm %%HLDSDIR%%cstrike/manual
+%%PORTDOCS%%@dirrm %%HLDSDIR%%cstrike/manual
 @dirrm %%HLDSDIR%%cstrike/events
 @dirrm %%HLDSDIR%%cstrike/dlls
 @dirrm %%HLDSDIR%%cstrike/classes