4 files changed, 138 insertions, 305 deletions

diff --git a/games/hlserver-cs/Makefile b/games/hlserver-cs/Makefile
index 5c2a84031f15..81b11c969b13 100644
--- a/games/hlserver-cs/Makefile
+++ b/games/hlserver-cs/Makefile
@@ -1,109 +1,18 @@
 # New ports collection makefile for:	Counter Strike Server
 # Date created:				Sat Mar 10 16:40:06 EST 2001
-# Whom:					pat@databits.net
+# Whom:					pat
 #
 # $FreeBSD$
 #
 
-PORTNAME?=	cs
-PORTVERSION?=	1.5
-PORTREVISION?=	1
-CATEGORIES?=	games linux
-MASTER_SITES?=	http://files.redphive.org/ \
-		http://www.jetstreamgames.co.nz/files/pub/halflife/cstrike/ \
-		http://cs.webcabo.com.br/~mosca/cs/
+PORTNAME=	cs
+PORTVERSION=	1.6
 PKGNAMEPREFIX=	hlserver-
-.ifndef(DISTFILES)
-DISTNAME?=	${PORTNAME}_${PORTVERSION:S/.//}_full
-.endif
 
-MAINTAINER?=	pat@FreeBSD.org
-COMMENT?=	Half-Life mod Counter-Strike full server package for Linux
+RUN_DEPENDS=	${PREFIX}${HLDSDIR}${HL_PROGRAM}:${HALFLIFE_PORT_MASTER}
 
-RUN_DEPENDS=	${LINUXBASE}${HLDSDIR}${HL_PROGRAM}:${HALFLIFESERVER_PORT}
+COMMENT=	Half-Life mod Counter-Strike full server package for Linux
 
-USE_SUBMAKE=	yes
+HALFLIFE_PORT_MASTER=	${.CURDIR}/../halflifeserver
 
-ONLY_FOR_ARCHS=	i386
-USE_LINUX_PREFIX=	yes
-USE_LINUX=	yes
-USE_PERL5=	yes
-NO_CDROM=	"Size; the data set is much too big"
-NO_BUILD=	yes
-.if (${PORTNAME}==cs)
-WRKSRC?=		${WRKDIR}/cstrike
-.else
-.ifndef(NO_WRKSUBDIR)
-WRKSRC?=		${WRKDIR}/${PORTNAME}
-.endif # NO_WRKSUBDIR
-.endif
-PLIST_SUB+=	${PLIST_SUB_MASTER}
-
-INSTALL_DIR=	${INSTALL} -d -o ${BINOWN} -g ${BINGRP} -m 755
-
-HALFLIFESERVER_PORT=	${.CURDIR}/../halflifeserver
-HLDSDIR!=	cd ${HALFLIFESERVER_PORT} && ${MAKE} -V HLDSDIR
-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
-
-.if !target(slaveport-post-extract)
-slaveport-post-extract:
-.endif
-
-post-extract: slaveport-post-extract
-
-pre-patch:
-# remove trailing ^M
-	@${FIND} -E ${WRKSRC} -type f \
-		-iregex ".*\.(bat|cfg|gam|htm|html|inf|ini|lst|sc|scr|txt)" \
-		-exec ${PERL} -pi -ne 's!\r\n!\n!' {} 1>/dev/null 2>&1 \;
-
-# if you change the PLIST, please re-think the following
-# Parses PLIST
-# creates dirs from @dirrm entries
-# copies files from non ^@ entries
-do-install: install-parse-plist install-run-scripts
-# scan libraries
-	@( cd ${HALFLIFESERVER_PORT} ; ${MAKE} scan-libs )
-
-# kaboom, ashes to ashes, .... The problem is dead :)
-# Contributed by <lioux@FreeBSD.org>
-install-parse-plist: generate-plist
-	@${PERL} -e 'open(FHANDLER,"${TMPPLIST}");' \
-		-e 'open(FDIR,">${WRKDIR}/dirs.sh.tmp");' \
-		-e 'open(FFILES,">${WRKDIR}/files.sh");' \
-		-e 'while (!eof(FHANDLER)) {' \
-			-e 'chop($$file = <FHANDLER>);' \
-			-e '$$dir = $$file_partial = $$file;' \
-			-e '$$file_partial =~ s!^${HLDSDIR:S!^/!!}!!;' \
-			-e '$$file_partial =~ s!^[^/]+/!! if defined(${NO_WRKSUBDIR});' \
-			-e 'print FDIR "${INSTALL_DIR}", \
-				" ", "\"${PREFIX}/$$dir\"", \
-				"\n" if $$dir =~ s!(^\@dirrm\s+)!!;' \
-			-e 'print FFILES "${INSTALL_DATA:S/${SHAREMODE}/400/}", \
-				" ", "\"${WRKDIR}/$$file_partial\"", \
-				" ", "\"${PREFIX}/$$file\"", \
-				"\n" if ($$file !~ m!^\@!);' \
-		-e '}' \
-		-e 'close(FFILES);' \
-		-e 'close(FDIR);' \
-		-e 'close(FHANDLER);'
-# we want it sorted
-	@${SORT} ${WRKDIR}/dirs.sh.tmp > ${WRKDIR}/dirs.sh
-
-install-run-scripts:
-.for script in dirs files
-	@${SH} ${WRKDIR}/${script}.sh
-.endfor
-
-.if !target(slaveport-post-install)
-slaveport-post-install:
-.endif
-
-post-install: slaveport-post-install
-	@${CAT} ${PKGMESSAGE}
-
-.ifndef(_DONT_INCLUDE_MK_)
-.include <bsd.port.mk>
-.endif
+.include "${HALFLIFE_PORT_MASTER}/Makefile"
diff --git a/games/hlserver-cs/distinfo b/games/hlserver-cs/distinfo
index e7381b4b6866..db48bd6cd9fa 100644
--- a/games/hlserver-cs/distinfo
+++ b/games/hlserver-cs/distinfo
@@ -1,2 +1,2 @@
-MD5 (cs_15_full.tar.gz) = d688876fa2864ff69ff808432c9e6fe7
-SIZE (cs_15_full.tar.gz) = 112935519
+MD5 (hlds_l_1120_full.tgz) = 22000aea56f7565119992587ae88dd95
+SIZE (hlds_l_1120_full.tgz) = 445036101
diff --git a/games/hlserver-cs/pkg-descr b/games/hlserver-cs/pkg-descr
index 9f6a4a0ca8a5..1b522a480eb9 100644
--- a/games/hlserver-cs/pkg-descr
+++ b/games/hlserver-cs/pkg-descr
@@ -4,6 +4,3 @@ Counter Strike server under Linux emulation.
 Visit these following web pages for more information:
 
 WWW: http://www.counter-strike.net/
-
-- Patrick Li
-pat@FreeBSD.org
diff --git a/games/hlserver-cs/pkg-plist b/games/hlserver-cs/pkg-plist
index dd5e5a9536fc..634f6269456f 100644
--- a/games/hlserver-cs/pkg-plist
+++ b/games/hlserver-cs/pkg-plist
@@ -1,72 +1,39 @@
+%%HLDSDIR%%cstrike/GameServerConfig.vdf
 %%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
-%%HLDSDIR%%cstrike/classes/aug.txt
-%%HLDSDIR%%cstrike/classes/autoselect.txt
-%%HLDSDIR%%cstrike/classes/awp.txt
-%%HLDSDIR%%cstrike/classes/deagle.txt
-%%HLDSDIR%%cstrike/classes/defuser.txt
-%%HLDSDIR%%cstrike/classes/elite.txt
-%%HLDSDIR%%cstrike/classes/fiveseven.txt
-%%HLDSDIR%%cstrike/classes/flashbang.txt
-%%HLDSDIR%%cstrike/classes/g3sg1.txt
-%%HLDSDIR%%cstrike/classes/gign.txt
-%%HLDSDIR%%cstrike/classes/glock18.txt
-%%HLDSDIR%%cstrike/classes/gsg9.txt
-%%HLDSDIR%%cstrike/classes/guerilla.txt
-%%HLDSDIR%%cstrike/classes/hegrenade.txt
-%%HLDSDIR%%cstrike/classes/kevlar.txt
-%%HLDSDIR%%cstrike/classes/kevlar_helmet.txt
-%%HLDSDIR%%cstrike/classes/leet.txt
-%%HLDSDIR%%cstrike/classes/m249.txt
-%%HLDSDIR%%cstrike/classes/m3.txt
-%%HLDSDIR%%cstrike/classes/m4a1.txt
-%%HLDSDIR%%cstrike/classes/mac10.txt
-%%HLDSDIR%%cstrike/classes/mp5.txt
-%%HLDSDIR%%cstrike/classes/nightvision.txt
-%%HLDSDIR%%cstrike/classes/p228.txt
-%%HLDSDIR%%cstrike/classes/p90.txt
-%%HLDSDIR%%cstrike/classes/sas.txt
-%%HLDSDIR%%cstrike/classes/scout.txt
-%%HLDSDIR%%cstrike/classes/sg550.txt
-%%HLDSDIR%%cstrike/classes/sg552.txt
-%%HLDSDIR%%cstrike/classes/smokegrenade.txt
-%%HLDSDIR%%cstrike/classes/terror.txt
-%%HLDSDIR%%cstrike/classes/tmp.txt
-%%HLDSDIR%%cstrike/classes/ump45.txt
-%%HLDSDIR%%cstrike/classes/urban.txt
-%%HLDSDIR%%cstrike/classes/usp.txt
-%%HLDSDIR%%cstrike/classes/xm1014.txt
-%%HLDSDIR%%cstrike/commandmenu.txt
 %%HLDSDIR%%cstrike/cs_747.wad
 %%HLDSDIR%%cstrike/cs_assault.wad
 %%HLDSDIR%%cstrike/cs_bdog.wad
-%%HLDSDIR%%cstrike/cs_cbble.rad
 %%HLDSDIR%%cstrike/cs_cbble.wad
 %%HLDSDIR%%cstrike/cs_dust.wad
-%%HLDSDIR%%cstrike/cs_havana.wad
+%%HLDSDIR%%cstrike/cs_havana.WAD
 %%HLDSDIR%%cstrike/cs_office.wad
-%%HLDSDIR%%cstrike/cstrike.ico
+%%HLDSDIR%%cstrike/cstraining.wad
 %%HLDSDIR%%cstrike/cstrike.wad
+%%HLDSDIR%%cstrike/de_airstrip.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
 %%HLDSDIR%%cstrike/delta.lst
+%%HLDSDIR%%cstrike/dlls/cs_amd64.so
+%%HLDSDIR%%cstrike/dlls/cs_i386.so
+%%HLDSDIR%%cstrike/dlls/mp.dll
 %%HLDSDIR%%cstrike/events/ak47.sc
 %%HLDSDIR%%cstrike/events/aug.sc
 %%HLDSDIR%%cstrike/events/awp.sc
+%%HLDSDIR%%cstrike/events/createexplo.sc
 %%HLDSDIR%%cstrike/events/createsmoke.sc
 %%HLDSDIR%%cstrike/events/deagle.sc
 %%HLDSDIR%%cstrike/events/decal_reset.sc
 %%HLDSDIR%%cstrike/events/elite_left.sc
 %%HLDSDIR%%cstrike/events/elite_right.sc
+%%HLDSDIR%%cstrike/events/famas.sc
 %%HLDSDIR%%cstrike/events/fiveseven.sc
 %%HLDSDIR%%cstrike/events/g3sg1.sc
+%%HLDSDIR%%cstrike/events/galil.sc
 %%HLDSDIR%%cstrike/events/glock18.sc
 %%HLDSDIR%%cstrike/events/knife.sc
 %%HLDSDIR%%cstrike/events/m249.sc
@@ -87,72 +54,50 @@
 %%HLDSDIR%%cstrike/itsitaly.wad
 %%HLDSDIR%%cstrike/jos.wad
 %%HLDSDIR%%cstrike/liblist.gam
-%%PORTDOCS%%%%HLDSDIR%%cstrike/manual/manual.htm
+%%HLDSDIR%%cstrike/manual/manual.htm
 %%HLDSDIR%%cstrike/mapcycle.txt
 %%HLDSDIR%%cstrike/maps/as_oilrig.bsp
-%%PORTDOCS%%%%HLDSDIR%%cstrike/maps/as_oilrig.txt
-%%HLDSDIR%%cstrike/maps/as_tundra.bsp
-%%PORTDOCS%%%%HLDSDIR%%cstrike/maps/as_tundra.txt
 %%HLDSDIR%%cstrike/maps/cs_747.bsp
-%%PORTDOCS%%%%HLDSDIR%%cstrike/maps/cs_747.txt
 %%HLDSDIR%%cstrike/maps/cs_assault.bsp
-%%PORTDOCS%%%%HLDSDIR%%cstrike/maps/cs_assault.txt
 %%HLDSDIR%%cstrike/maps/cs_backalley.bsp
-%%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
-%%PORTDOCS%%%%HLDSDIR%%cstrike/maps/cs_militia.txt
 %%HLDSDIR%%cstrike/maps/cs_office.bsp
-%%PORTDOCS%%%%HLDSDIR%%cstrike/maps/cs_office.txt
 %%HLDSDIR%%cstrike/maps/cs_siege.bsp
-%%PORTDOCS%%%%HLDSDIR%%cstrike/maps/cs_siege.txt
+%%HLDSDIR%%cstrike/maps/de_airstrip.bsp
 %%HLDSDIR%%cstrike/maps/de_aztec.bsp
-%%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
-%%PORTDOCS%%%%HLDSDIR%%cstrike/maps/de_dust2.txt
 %%HLDSDIR%%cstrike/maps/de_inferno.bsp
-%%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
-%%HLDSDIR%%cstrike/maps/de_storm.res
-%%PORTDOCS%%%%HLDSDIR%%cstrike/maps/de_storm.txt
 %%HLDSDIR%%cstrike/maps/de_survivor.bsp
-%%PORTDOCS%%%%HLDSDIR%%cstrike/maps/de_survivor.txt
 %%HLDSDIR%%cstrike/maps/de_torn.bsp
 %%HLDSDIR%%cstrike/maps/de_train.bsp
-%%PORTDOCS%%%%HLDSDIR%%cstrike/maps/de_train.txt
-%%HLDSDIR%%cstrike/maps/de_vegas.bsp
-%%PORTDOCS%%%%HLDSDIR%%cstrike/maps/de_vegas.txt
 %%HLDSDIR%%cstrike/maps/de_vertigo.bsp
-%%PORTDOCS%%%%HLDSDIR%%cstrike/maps/de_vertigo.txt
-%%HLDSDIR%%cstrike/media/launch_deny1.wav
-%%HLDSDIR%%cstrike/media/launch_deny2.wav
-%%HLDSDIR%%cstrike/media/launch_dnmenu1.wav
-%%HLDSDIR%%cstrike/media/launch_glow1.wav
-%%HLDSDIR%%cstrike/media/launch_select1.wav
-%%HLDSDIR%%cstrike/media/launch_select2.wav
-%%HLDSDIR%%cstrike/media/launch_upmenu1.wav
-%%HLDSDIR%%cstrike/media/logo.avi
+%%HLDSDIR%%cstrike/models/PG-150.mdl
 %%HLDSDIR%%cstrike/models/arcticorange.mdl
-%%HLDSDIR%%cstrike/models/arcticoranget.mdl
+%%HLDSDIR%%cstrike/models/arcticorangeT.mdl
+%%HLDSDIR%%cstrike/models/bag.mdl
+%%HLDSDIR%%cstrike/models/bigtree.mdl
+%%HLDSDIR%%cstrike/models/bush.mdl
 %%HLDSDIR%%cstrike/models/chick.mdl
+%%HLDSDIR%%cstrike/models/conveyor1.mdl
+%%HLDSDIR%%cstrike/models/conveyor2.mdl
+%%HLDSDIR%%cstrike/models/conveyor3.mdl
+%%HLDSDIR%%cstrike/models/conveyor_turn.mdl
+%%HLDSDIR%%cstrike/models/dummyguerilla.mdl
 %%HLDSDIR%%cstrike/models/feather.mdl
+%%HLDSDIR%%cstrike/models/fern.mdl
+%%HLDSDIR%%cstrike/models/grass.mdl
+%%HLDSDIR%%cstrike/models/grass_01.spr
+%%HLDSDIR%%cstrike/models/guerilla.mdl
 %%HLDSDIR%%cstrike/models/head.mdl
 %%HLDSDIR%%cstrike/models/hostage.mdl
 %%HLDSDIR%%cstrike/models/hostage01.mdl
@@ -172,9 +117,11 @@
 %%HLDSDIR%%cstrike/models/p_c4.mdl
 %%HLDSDIR%%cstrike/models/p_deagle.mdl
 %%HLDSDIR%%cstrike/models/p_elite.mdl
+%%HLDSDIR%%cstrike/models/p_famas.mdl
 %%HLDSDIR%%cstrike/models/p_fiveseven.mdl
 %%HLDSDIR%%cstrike/models/p_flashbang.mdl
 %%HLDSDIR%%cstrike/models/p_g3sg1.mdl
+%%HLDSDIR%%cstrike/models/p_galil.mdl
 %%HLDSDIR%%cstrike/models/p_glock18.mdl
 %%HLDSDIR%%cstrike/models/p_hegrenade.mdl
 %%HLDSDIR%%cstrike/models/p_knife.mdl
@@ -195,6 +142,21 @@
 %%HLDSDIR%%cstrike/models/p_ump45.mdl
 %%HLDSDIR%%cstrike/models/p_usp.mdl
 %%HLDSDIR%%cstrike/models/p_xm1014.mdl
+%%HLDSDIR%%cstrike/models/pallet.mdl
+%%HLDSDIR%%cstrike/models/pallet_with_bags.mdl
+%%HLDSDIR%%cstrike/models/pallet_with_bags2.mdl
+%%HLDSDIR%%cstrike/models/palmtree.mdl
+%%HLDSDIR%%cstrike/models/pi_bush.mdl
+%%HLDSDIR%%cstrike/models/pi_fern.mdl
+%%HLDSDIR%%cstrike/models/pi_outlamp1.mdl
+%%HLDSDIR%%cstrike/models/pi_shrub.mdl
+%%HLDSDIR%%cstrike/models/pi_stlamp.mdl
+%%HLDSDIR%%cstrike/models/pi_tree.mdl
+%%HLDSDIR%%cstrike/models/pi_tree1.mdl
+%%HLDSDIR%%cstrike/models/pi_tree2.mdl
+%%HLDSDIR%%cstrike/models/pi_tree3.mdl
+%%HLDSDIR%%cstrike/models/pi_treeb.mdl
+%%HLDSDIR%%cstrike/models/pi_twig.mdl
 %%HLDSDIR%%cstrike/models/player.mdl
 %%HLDSDIR%%cstrike/models/player/arctic/arctic.mdl
 %%HLDSDIR%%cstrike/models/player/gign/gign.mdl
@@ -205,64 +167,65 @@
 %%HLDSDIR%%cstrike/models/player/terror/terror.mdl
 %%HLDSDIR%%cstrike/models/player/urban/urban.mdl
 %%HLDSDIR%%cstrike/models/player/vip/vip.mdl
+%%HLDSDIR%%cstrike/models/pred_plant.mdl
 %%HLDSDIR%%cstrike/models/pshell.mdl
+%%HLDSDIR%%cstrike/models/qloader.mdl
+%%HLDSDIR%%cstrike/models/qtruck.mdl
 %%HLDSDIR%%cstrike/models/rshell.mdl
 %%HLDSDIR%%cstrike/models/rshell_big.mdl
-%%HLDSDIR%%cstrike/models/scientist.mdl
-%%HLDSDIR%%cstrike/models/shrapnel.mdl
-%%HLDSDIR%%cstrike/models/skeleton.mdl
+%%HLDSDIR%%cstrike/models/shield/p_shield_deagle.mdl
+%%HLDSDIR%%cstrike/models/shield/p_shield_fiveseven.mdl
+%%HLDSDIR%%cstrike/models/shield/p_shield_flashbang.mdl
+%%HLDSDIR%%cstrike/models/shield/p_shield_glock18.mdl
+%%HLDSDIR%%cstrike/models/shield/p_shield_hegrenade.mdl
+%%HLDSDIR%%cstrike/models/shield/p_shield_knife.mdl
+%%HLDSDIR%%cstrike/models/shield/p_shield_p228.mdl
+%%HLDSDIR%%cstrike/models/shield/p_shield_smokegrenade.mdl
+%%HLDSDIR%%cstrike/models/shield/p_shield_usp.mdl
+%%HLDSDIR%%cstrike/models/shield/v_shield_deagle.mdl
+%%HLDSDIR%%cstrike/models/shield/v_shield_fiveseven.mdl
+%%HLDSDIR%%cstrike/models/shield/v_shield_flashbang.mdl
+%%HLDSDIR%%cstrike/models/shield/v_shield_glock18.mdl
+%%HLDSDIR%%cstrike/models/shield/v_shield_hegrenade.mdl
+%%HLDSDIR%%cstrike/models/shield/v_shield_knife.mdl
+%%HLDSDIR%%cstrike/models/shield/v_shield_p228.mdl
+%%HLDSDIR%%cstrike/models/shield/v_shield_smokegrenade.mdl
+%%HLDSDIR%%cstrike/models/shield/v_shield_usp.mdl
+%%HLDSDIR%%cstrike/models/support1.mdl
+%%HLDSDIR%%cstrike/models/support2.mdl
+%%HLDSDIR%%cstrike/models/support3.mdl
+%%HLDSDIR%%cstrike/models/truck.mdl
 %%HLDSDIR%%cstrike/models/v_ak47.mdl
-%%HLDSDIR%%cstrike/models/v_ak47_r.mdl
 %%HLDSDIR%%cstrike/models/v_aug.mdl
-%%HLDSDIR%%cstrike/models/v_aug_r.mdl
 %%HLDSDIR%%cstrike/models/v_awp.mdl
-%%HLDSDIR%%cstrike/models/v_awp_r.mdl
 %%HLDSDIR%%cstrike/models/v_c4.mdl
 %%HLDSDIR%%cstrike/models/v_deagle.mdl
-%%HLDSDIR%%cstrike/models/v_deagle_r.mdl
 %%HLDSDIR%%cstrike/models/v_elite.mdl
+%%HLDSDIR%%cstrike/models/v_famas.mdl
 %%HLDSDIR%%cstrike/models/v_fiveseven.mdl
-%%HLDSDIR%%cstrike/models/v_fiveseven_r.mdl
 %%HLDSDIR%%cstrike/models/v_flashbang.mdl
-%%HLDSDIR%%cstrike/models/v_flashbang_r.mdl
 %%HLDSDIR%%cstrike/models/v_g3sg1.mdl
-%%HLDSDIR%%cstrike/models/v_g3sg1_r.mdl
+%%HLDSDIR%%cstrike/models/v_galil.mdl
 %%HLDSDIR%%cstrike/models/v_glock18.mdl
-%%HLDSDIR%%cstrike/models/v_glock18_r.mdl
 %%HLDSDIR%%cstrike/models/v_hegrenade.mdl
-%%HLDSDIR%%cstrike/models/v_hegrenade_r.mdl
 %%HLDSDIR%%cstrike/models/v_knife.mdl
 %%HLDSDIR%%cstrike/models/v_knife_r.mdl
 %%HLDSDIR%%cstrike/models/v_m249.mdl
-%%HLDSDIR%%cstrike/models/v_m249_r.mdl
 %%HLDSDIR%%cstrike/models/v_m3.mdl
-%%HLDSDIR%%cstrike/models/v_m3_r.mdl
 %%HLDSDIR%%cstrike/models/v_m4a1.mdl
-%%HLDSDIR%%cstrike/models/v_m4a1_r.mdl
 %%HLDSDIR%%cstrike/models/v_mac10.mdl
-%%HLDSDIR%%cstrike/models/v_mac10_r.mdl
 %%HLDSDIR%%cstrike/models/v_mp5.mdl
-%%HLDSDIR%%cstrike/models/v_mp5_r.mdl
 %%HLDSDIR%%cstrike/models/v_p228.mdl
-%%HLDSDIR%%cstrike/models/v_p228_r.mdl
 %%HLDSDIR%%cstrike/models/v_p90.mdl
-%%HLDSDIR%%cstrike/models/v_p90_r.mdl
 %%HLDSDIR%%cstrike/models/v_scout.mdl
-%%HLDSDIR%%cstrike/models/v_scout_r.mdl
 %%HLDSDIR%%cstrike/models/v_sg550.mdl
-%%HLDSDIR%%cstrike/models/v_sg550_r.mdl
 %%HLDSDIR%%cstrike/models/v_sg552.mdl
-%%HLDSDIR%%cstrike/models/v_sg552_r.mdl
+%%HLDSDIR%%cstrike/models/v_shield_r.mdl
 %%HLDSDIR%%cstrike/models/v_smokegrenade.mdl
-%%HLDSDIR%%cstrike/models/v_smokegrenade_r.mdl
 %%HLDSDIR%%cstrike/models/v_tmp.mdl
-%%HLDSDIR%%cstrike/models/v_tmp_r.mdl
 %%HLDSDIR%%cstrike/models/v_ump45.mdl
-%%HLDSDIR%%cstrike/models/v_ump45_r.mdl
 %%HLDSDIR%%cstrike/models/v_usp.mdl
-%%HLDSDIR%%cstrike/models/v_usp_r.mdl
 %%HLDSDIR%%cstrike/models/v_xm1014.mdl
-%%HLDSDIR%%cstrike/models/v_xm1014_r.mdl
 %%HLDSDIR%%cstrike/models/w_ak47.mdl
 %%HLDSDIR%%cstrike/models/w_assault.mdl
 %%HLDSDIR%%cstrike/models/w_aug.mdl
@@ -271,9 +234,11 @@
 %%HLDSDIR%%cstrike/models/w_c4.mdl
 %%HLDSDIR%%cstrike/models/w_deagle.mdl
 %%HLDSDIR%%cstrike/models/w_elite.mdl
+%%HLDSDIR%%cstrike/models/w_famas.mdl
 %%HLDSDIR%%cstrike/models/w_fiveseven.mdl
 %%HLDSDIR%%cstrike/models/w_flashbang.mdl
 %%HLDSDIR%%cstrike/models/w_g3sg1.mdl
+%%HLDSDIR%%cstrike/models/w_galil.mdl
 %%HLDSDIR%%cstrike/models/w_glock18.mdl
 %%HLDSDIR%%cstrike/models/w_hegrenade.mdl
 %%HLDSDIR%%cstrike/models/w_kevlar.mdl
@@ -288,6 +253,7 @@
 %%HLDSDIR%%cstrike/models/w_scout.mdl
 %%HLDSDIR%%cstrike/models/w_sg550.mdl
 %%HLDSDIR%%cstrike/models/w_sg552.mdl
+%%HLDSDIR%%cstrike/models/w_shield.mdl
 %%HLDSDIR%%cstrike/models/w_smokegrenade.mdl
 %%HLDSDIR%%cstrike/models/w_thighpack.mdl
 %%HLDSDIR%%cstrike/models/w_tmp.mdl
@@ -298,23 +264,24 @@
 %%HLDSDIR%%cstrike/motd.txt
 %%HLDSDIR%%cstrike/n0th1ng.wad
 %%HLDSDIR%%cstrike/prodigy.wad
-%%PORTDOCS%%%%HLDSDIR%%cstrike/readme.txt
+%%HLDSDIR%%cstrike/readme.txt
 %%HLDSDIR%%cstrike/server.cfg
 %%HLDSDIR%%cstrike/sound/ambience/3dmbridge.wav
 %%HLDSDIR%%cstrike/sound/ambience/3dmeagle.wav
 %%HLDSDIR%%cstrike/sound/ambience/3dmstart.wav
 %%HLDSDIR%%cstrike/sound/ambience/3dmthrill.wav
+%%HLDSDIR%%cstrike/sound/ambience/Birds1.wav
+%%HLDSDIR%%cstrike/sound/ambience/Birds2.wav
+%%HLDSDIR%%cstrike/sound/ambience/Birds3.wav
+%%HLDSDIR%%cstrike/sound/ambience/Birds4.wav
+%%HLDSDIR%%cstrike/sound/ambience/Birds5.wav
+%%HLDSDIR%%cstrike/sound/ambience/Birds6.wav
+%%HLDSDIR%%cstrike/sound/ambience/Birds7.wav
+%%HLDSDIR%%cstrike/sound/ambience/Birds8.wav
+%%HLDSDIR%%cstrike/sound/ambience/Birds9.wav
+%%HLDSDIR%%cstrike/sound/ambience/Opera.wav
 %%HLDSDIR%%cstrike/sound/ambience/alarm1.wav
 %%HLDSDIR%%cstrike/sound/ambience/arabmusic.wav
-%%HLDSDIR%%cstrike/sound/ambience/birds1.wav
-%%HLDSDIR%%cstrike/sound/ambience/birds2.wav
-%%HLDSDIR%%cstrike/sound/ambience/birds3.wav
-%%HLDSDIR%%cstrike/sound/ambience/birds4.wav
-%%HLDSDIR%%cstrike/sound/ambience/birds5.wav
-%%HLDSDIR%%cstrike/sound/ambience/birds6.wav
-%%HLDSDIR%%cstrike/sound/ambience/birds7.wav
-%%HLDSDIR%%cstrike/sound/ambience/birds8.wav
-%%HLDSDIR%%cstrike/sound/ambience/birds9.wav
 %%HLDSDIR%%cstrike/sound/ambience/car1.wav
 %%HLDSDIR%%cstrike/sound/ambience/car2.wav
 %%HLDSDIR%%cstrike/sound/ambience/cat1.wav
@@ -332,7 +299,6 @@
 %%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
@@ -347,7 +313,7 @@
 %%HLDSDIR%%cstrike/sound/ambience/lv_fruitwin.wav
 %%HLDSDIR%%cstrike/sound/ambience/lv_jubilee.wav
 %%HLDSDIR%%cstrike/sound/ambience/lv_neon.wav
-%%HLDSDIR%%cstrike/sound/ambience/opera.wav
+%%HLDSDIR%%cstrike/sound/ambience/rain.wav
 %%HLDSDIR%%cstrike/sound/ambience/ratchant.wav
 %%HLDSDIR%%cstrike/sound/ambience/rd_shipshorn.wav
 %%HLDSDIR%%cstrike/sound/ambience/rd_waves.wav
@@ -380,7 +346,7 @@
 %%HLDSDIR%%cstrike/sound/items/tr_kevlar.wav
 %%HLDSDIR%%cstrike/sound/materials.txt
 %%HLDSDIR%%cstrike/sound/misc/cow.wav
-%%HLDSDIR%%cstrike/sound/misc/killchicken.wav
+%%HLDSDIR%%cstrike/sound/misc/killChicken.wav
 %%HLDSDIR%%cstrike/sound/misc/plane_drone.wav
 %%HLDSDIR%%cstrike/sound/misc/sheep.wav
 %%HLDSDIR%%cstrike/sound/misc/talk.wav
@@ -407,7 +373,6 @@
 %%HLDSDIR%%cstrike/sound/player/headshot1.wav
 %%HLDSDIR%%cstrike/sound/player/headshot2.wav
 %%HLDSDIR%%cstrike/sound/player/headshot3.wav
-%%HLDSDIR%%cstrike/sound/player/heartbeat1.wav
 %%HLDSDIR%%cstrike/sound/player/pl_die1.wav
 %%HLDSDIR%%cstrike/sound/player/pl_dirt1.wav
 %%HLDSDIR%%cstrike/sound/player/pl_dirt2.wav
@@ -426,7 +391,6 @@
 %%HLDSDIR%%cstrike/sound/player/pl_grate4.wav
 %%HLDSDIR%%cstrike/sound/player/pl_jump1.wav
 %%HLDSDIR%%cstrike/sound/player/pl_jump2.wav
-%%HLDSDIR%%cstrike/sound/player/pl_jumpland2.wav
 %%HLDSDIR%%cstrike/sound/player/pl_ladder1.wav
 %%HLDSDIR%%cstrike/sound/player/pl_ladder2.wav
 %%HLDSDIR%%cstrike/sound/player/pl_ladder3.wav
@@ -441,8 +405,6 @@
 %%HLDSDIR%%cstrike/sound/player/pl_pain6.wav
 %%HLDSDIR%%cstrike/sound/player/pl_pain7.wav
 %%HLDSDIR%%cstrike/sound/player/pl_shell1.wav
-%%HLDSDIR%%cstrike/sound/player/pl_shell2.wav
-%%HLDSDIR%%cstrike/sound/player/pl_shell3.wav
 %%HLDSDIR%%cstrike/sound/player/pl_shot1.wav
 %%HLDSDIR%%cstrike/sound/player/pl_slosh1.wav
 %%HLDSDIR%%cstrike/sound/player/pl_slosh2.wav
@@ -491,9 +453,11 @@
 %%HLDSDIR%%cstrike/sound/radio/ct_point.wav
 %%HLDSDIR%%cstrike/sound/radio/ct_reportingin.wav
 %%HLDSDIR%%cstrike/sound/radio/ctwin.wav
+%%HLDSDIR%%cstrike/sound/radio/elim.wav
 %%HLDSDIR%%cstrike/sound/radio/enemydown.wav
 %%HLDSDIR%%cstrike/sound/radio/fallback.wav
 %%HLDSDIR%%cstrike/sound/radio/fireassis.wav
+%%HLDSDIR%%cstrike/sound/radio/flankthem.wav
 %%HLDSDIR%%cstrike/sound/radio/followme.wav
 %%HLDSDIR%%cstrike/sound/radio/getout.wav
 %%HLDSDIR%%cstrike/sound/radio/go.wav
@@ -562,6 +526,14 @@
 %%HLDSDIR%%cstrike/sound/weapons/elite_rightclipin.wav
 %%HLDSDIR%%cstrike/sound/weapons/elite_sliderelease.wav
 %%HLDSDIR%%cstrike/sound/weapons/elite_twirl.wav
+%%HLDSDIR%%cstrike/sound/weapons/famas-1.wav
+%%HLDSDIR%%cstrike/sound/weapons/famas-2.wav
+%%HLDSDIR%%cstrike/sound/weapons/famas-burst.wav
+%%HLDSDIR%%cstrike/sound/weapons/famas_boltpull.wav
+%%HLDSDIR%%cstrike/sound/weapons/famas_boltslap.wav
+%%HLDSDIR%%cstrike/sound/weapons/famas_clipin.wav
+%%HLDSDIR%%cstrike/sound/weapons/famas_clipout.wav
+%%HLDSDIR%%cstrike/sound/weapons/famas_forearm.wav
 %%HLDSDIR%%cstrike/sound/weapons/fiveseven-1.wav
 %%HLDSDIR%%cstrike/sound/weapons/fiveseven_clipin.wav
 %%HLDSDIR%%cstrike/sound/weapons/fiveseven_clipout.wav
@@ -573,6 +545,11 @@
 %%HLDSDIR%%cstrike/sound/weapons/g3sg1_clipin.wav
 %%HLDSDIR%%cstrike/sound/weapons/g3sg1_clipout.wav
 %%HLDSDIR%%cstrike/sound/weapons/g3sg1_slide.wav
+%%HLDSDIR%%cstrike/sound/weapons/galil-1.wav
+%%HLDSDIR%%cstrike/sound/weapons/galil-2.wav
+%%HLDSDIR%%cstrike/sound/weapons/galil_boltpull.wav
+%%HLDSDIR%%cstrike/sound/weapons/galil_clipin.wav
+%%HLDSDIR%%cstrike/sound/weapons/galil_clipout.wav
 %%HLDSDIR%%cstrike/sound/weapons/generic_reload.wav
 %%HLDSDIR%%cstrike/sound/weapons/generic_shot_reload.wav
 %%HLDSDIR%%cstrike/sound/weapons/glock18-1.wav
@@ -632,11 +609,6 @@
 %%HLDSDIR%%cstrike/sound/weapons/p90_clipout.wav
 %%HLDSDIR%%cstrike/sound/weapons/p90_cliprelease.wav
 %%HLDSDIR%%cstrike/sound/weapons/pinpull.wav
-%%HLDSDIR%%cstrike/sound/weapons/ric1.wav
-%%HLDSDIR%%cstrike/sound/weapons/ric2.wav
-%%HLDSDIR%%cstrike/sound/weapons/ric3.wav
-%%HLDSDIR%%cstrike/sound/weapons/ric4.wav
-%%HLDSDIR%%cstrike/sound/weapons/ric5.wav
 %%HLDSDIR%%cstrike/sound/weapons/ric_conc-1.wav
 %%HLDSDIR%%cstrike/sound/weapons/ric_conc-2.wav
 %%HLDSDIR%%cstrike/sound/weapons/ric_metal-1.wav
@@ -674,9 +646,6 @@
 %%HLDSDIR%%cstrike/sound/weapons/usp_unsil-1.wav
 %%HLDSDIR%%cstrike/sound/weapons/xm1014-1.wav
 %%HLDSDIR%%cstrike/sound/weapons/zoom.wav
-%%HLDSDIR%%cstrike/sprites/320hud1.spr
-%%HLDSDIR%%cstrike/sprites/320hud2.spr
-%%HLDSDIR%%cstrike/sprites/320hud3.spr
 %%HLDSDIR%%cstrike/sprites/3dmflaora.spr
 %%HLDSDIR%%cstrike/sprites/3dmflared.spr
 %%HLDSDIR%%cstrike/sprites/640hud1.spr
@@ -687,53 +656,49 @@
 %%HLDSDIR%%cstrike/sprites/640hud14.spr
 %%HLDSDIR%%cstrike/sprites/640hud15.spr
 %%HLDSDIR%%cstrike/sprites/640hud16.spr
+%%HLDSDIR%%cstrike/sprites/640hud17.spr
+%%HLDSDIR%%cstrike/sprites/640hud18.spr
+%%HLDSDIR%%cstrike/sprites/640hud19.spr
 %%HLDSDIR%%cstrike/sprites/640hud2.spr
+%%HLDSDIR%%cstrike/sprites/640hud20.spr
 %%HLDSDIR%%cstrike/sprites/640hud3.spr
 %%HLDSDIR%%cstrike/sprites/640hud4.spr
 %%HLDSDIR%%cstrike/sprites/640hud5.spr
 %%HLDSDIR%%cstrike/sprites/640hud6.spr
 %%HLDSDIR%%cstrike/sprites/640hud7.spr
-%%HLDSDIR%%cstrike/sprites/640hud8.spr
-%%HLDSDIR%%cstrike/sprites/640hud9.spr
 %%HLDSDIR%%cstrike/sprites/black_smoke1.spr
 %%HLDSDIR%%cstrike/sprites/black_smoke2.spr
 %%HLDSDIR%%cstrike/sprites/black_smoke3.spr
 %%HLDSDIR%%cstrike/sprites/black_smoke4.spr
-%%HLDSDIR%%cstrike/sprites/bottom.spr
-%%HLDSDIR%%cstrike/sprites/bottom2.spr
-%%HLDSDIR%%cstrike/sprites/bottom3.spr
-%%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
 %%HLDSDIR%%cstrike/sprites/defuser.spr
-%%HLDSDIR%%cstrike/sprites/eexplo.spr
+%%HLDSDIR%%cstrike/sprites/effects/rain.spr
+%%HLDSDIR%%cstrike/sprites/effects/rainsplash.spr
+%%HLDSDIR%%cstrike/sprites/effects/ripple.spr
+%%HLDSDIR%%cstrike/sprites/effects/snowflake.spr
 %%HLDSDIR%%cstrike/sprites/fast_wallpuff1.spr
-%%HLDSDIR%%cstrike/sprites/fexplo.spr
-%%HLDSDIR%%cstrike/sprites/fexplo1.spr
-%%HLDSDIR%%cstrike/sprites/horizontal.spr
-%%HLDSDIR%%cstrike/sprites/hud.txt
+%%HLDSDIR%%cstrike/sprites/gas_puff_01.spr
+%%HLDSDIR%%cstrike/sprites/grass_01.spr
+%%HLDSDIR%%cstrike/sprites/grass_03.spr
 %%HLDSDIR%%cstrike/sprites/ibackpack.spr
 %%HLDSDIR%%cstrike/sprites/ic4.spr
 %%HLDSDIR%%cstrike/sprites/ihostage.spr
+%%HLDSDIR%%cstrike/sprites/ikgrass1.spr
+%%HLDSDIR%%cstrike/sprites/ikgrass2.spr
+%%HLDSDIR%%cstrike/sprites/ikgrass3.spr
+%%HLDSDIR%%cstrike/sprites/ikgrass4.spr
+%%HLDSDIR%%cstrike/sprites/ikgrass5.spr
 %%HLDSDIR%%cstrike/sprites/iplayerc4.spr
 %%HLDSDIR%%cstrike/sprites/iplayervip.spr
 %%HLDSDIR%%cstrike/sprites/ledglow.spr
 %%HLDSDIR%%cstrike/sprites/left.spr
 %%HLDSDIR%%cstrike/sprites/left2.spr
-%%HLDSDIR%%cstrike/sprites/left3.spr
 %%HLDSDIR%%cstrike/sprites/muzzleflash1.spr
 %%HLDSDIR%%cstrike/sprites/muzzleflash2.spr
 %%HLDSDIR%%cstrike/sprites/muzzleflash3.spr
 %%HLDSDIR%%cstrike/sprites/muzzleflash4.spr
-%%HLDSDIR%%cstrike/sprites/observer.txt
 %%HLDSDIR%%cstrike/sprites/pistol_smoke1.spr
 %%HLDSDIR%%cstrike/sprites/pistol_smoke2.spr
 %%HLDSDIR%%cstrike/sprites/radar320.spr
@@ -742,59 +707,19 @@
 %%HLDSDIR%%cstrike/sprites/rifle_smoke1.spr
 %%HLDSDIR%%cstrike/sprites/rifle_smoke2.spr
 %%HLDSDIR%%cstrike/sprites/rifle_smoke3.spr
-%%HLDSDIR%%cstrike/sprites/right.spr
-%%HLDSDIR%%cstrike/sprites/right2.spr
-%%HLDSDIR%%cstrike/sprites/right3.spr
+%%HLDSDIR%%cstrike/sprites/scope_arc.tga
 %%HLDSDIR%%cstrike/sprites/smokepuff.spr
 %%HLDSDIR%%cstrike/sprites/sniper_scope.spr
 %%HLDSDIR%%cstrike/sprites/snow.spr
-%%HLDSDIR%%cstrike/sprites/top.spr
-%%HLDSDIR%%cstrike/sprites/top2.spr
-%%HLDSDIR%%cstrike/sprites/top3.spr
-%%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
 %%HLDSDIR%%cstrike/sprites/wall_puff3.spr
 %%HLDSDIR%%cstrike/sprites/wall_puff4.spr
-%%HLDSDIR%%cstrike/sprites/weapon_ak47.txt
-%%HLDSDIR%%cstrike/sprites/weapon_aug.txt
-%%HLDSDIR%%cstrike/sprites/weapon_awp.txt
-%%HLDSDIR%%cstrike/sprites/weapon_c4.txt
-%%HLDSDIR%%cstrike/sprites/weapon_deagle.txt
-%%HLDSDIR%%cstrike/sprites/weapon_elite.txt
-%%HLDSDIR%%cstrike/sprites/weapon_fiveseven.txt
-%%HLDSDIR%%cstrike/sprites/weapon_flashbang.txt
-%%HLDSDIR%%cstrike/sprites/weapon_g3sg1.txt
-%%HLDSDIR%%cstrike/sprites/weapon_glock18.txt
-%%HLDSDIR%%cstrike/sprites/weapon_hegrenade.txt
-%%HLDSDIR%%cstrike/sprites/weapon_knife.txt
-%%HLDSDIR%%cstrike/sprites/weapon_m249.txt
-%%HLDSDIR%%cstrike/sprites/weapon_m3.txt
-%%HLDSDIR%%cstrike/sprites/weapon_m4a1.txt
-%%HLDSDIR%%cstrike/sprites/weapon_mac10.txt
-%%HLDSDIR%%cstrike/sprites/weapon_mp5navy.txt
-%%HLDSDIR%%cstrike/sprites/weapon_p228.txt
-%%HLDSDIR%%cstrike/sprites/weapon_p90.txt
-%%HLDSDIR%%cstrike/sprites/weapon_scout.txt
-%%HLDSDIR%%cstrike/sprites/weapon_sg550.txt
-%%HLDSDIR%%cstrike/sprites/weapon_sg552.txt
-%%HLDSDIR%%cstrike/sprites/weapon_shield.txt
-%%HLDSDIR%%cstrike/sprites/weapon_smokegrenade.txt
-%%HLDSDIR%%cstrike/sprites/weapon_tmp.txt
-%%HLDSDIR%%cstrike/sprites/weapon_ump45.txt
-%%HLDSDIR%%cstrike/sprites/weapon_usp.txt
-%%HLDSDIR%%cstrike/sprites/weapon_xm1014.txt
+%%HLDSDIR%%cstrike/steam.inf
 %%HLDSDIR%%cstrike/titles.txt
 %%HLDSDIR%%cstrike/torntextures.wad
 %%HLDSDIR%%cstrike/tswad.wad
+@dirrm %%HLDSDIR%%cstrike/sprites/effects
 @dirrm %%HLDSDIR%%cstrike/sprites
 @dirrm %%HLDSDIR%%cstrike/sound/weapons
 @dirrm %%HLDSDIR%%cstrike/sound/storm
@@ -807,10 +732,13 @@
 @dirrm %%HLDSDIR%%cstrike/sound/de_torn
 @dirrm %%HLDSDIR%%cstrike/sound/ambience
 @dirrm %%HLDSDIR%%cstrike/sound
+@dirrm %%HLDSDIR%%cstrike/models/shield
 @dirrm %%HLDSDIR%%cstrike/models/player/vip
 @dirrm %%HLDSDIR%%cstrike/models/player/urban
 @dirrm %%HLDSDIR%%cstrike/models/player/terror
+@dirrm %%HLDSDIR%%cstrike/models/player/spetsnaz
 @dirrm %%HLDSDIR%%cstrike/models/player/sas
+@dirrm %%HLDSDIR%%cstrike/models/player/militia
 @dirrm %%HLDSDIR%%cstrike/models/player/leet
 @dirrm %%HLDSDIR%%cstrike/models/player/guerilla
 @dirrm %%HLDSDIR%%cstrike/models/player/gsg9
@@ -818,11 +746,10 @@
 @dirrm %%HLDSDIR%%cstrike/models/player/arctic
 @dirrm %%HLDSDIR%%cstrike/models/player
 @dirrm %%HLDSDIR%%cstrike/models
-@dirrm %%HLDSDIR%%cstrike/media
 @dirrm %%HLDSDIR%%cstrike/maps
-%%PORTDOCS%%@dirrm %%HLDSDIR%%cstrike/manual
+@dirrm %%HLDSDIR%%cstrike/manual
+@dirrm %%HLDSDIR%%cstrike/gfx
 @dirrm %%HLDSDIR%%cstrike/events
-@dirrm %%HLDSDIR%%cstrike/classes
+@dirrm %%HLDSDIR%%cstrike/dlls
 @dirrm %%HLDSDIR%%cstrike/cl_dlls
-@unexec rmdir %D/%%HLDSDIR%%cstrike/SAVE 2>/dev/null || true
-@unexec rmdir %D/%%HLDSDIR%%cstrike/logs 2>/dev/null || true
+@unexec rmdir %D/%%HLDSDIR%%cstrike 2>/dev/null || echo "If you are permanently removing this port, you should do a ``rm -rf ${PKG_PREFIX}/%%HLDSDIR%%cstrike`` to remove any configuration files and logs left." | fmt