3 files changed, 280 insertions, 57 deletions

diff --git a/games/hlserver-si/Makefile b/games/hlserver-si/Makefile
index 9152bde9c3cc..1bd183b42dd5 100644
--- a/games/hlserver-si/Makefile
+++ b/games/hlserver-si/Makefile
@@ -6,16 +6,23 @@
 #
 
 PORTNAME=	si
-PORTVERSION=	0.97.0p5
-MASTER_SITES=	http://fileplanet.games-world.net/dl/ftp1.gamespy.com/fpnew/action/half-life/modifications/si/ \
-		http://www.lysator.liu.se/amiga/si/ \
-		ftp://212.177.107.155/halflifeitalia/mod/
-#DISTNAME=	${PORTNAME}-${PORTVERSION:S/.//g}-linux
+PORTVERSION=	0.97.0ra
+DISTNAME=	${PORTNAME}-${PORTVERSION:S/.//g:S/0r//}-linux
 
 MAINTAINER=	lioux@FreeBSD.org
 
-DISTFILES=	si-097-linux.tar.gz si-097-097pl5-linux-patch.tar.gz
+_DONT_INCLUDE_MK_=yes
 
 HALFLIFE_COUNTERSTRIKE_MASTER=	${.CURDIR}/../hlserver-cs
 
 .include "${HALFLIFE_COUNTERSTRIKE_MASTER}/Makefile"
+
+.include <bsd.port.pre.mk>
+
+.if !exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX})
+IGNORE=		You must manually fetch the Linux Port distfile\
+		(${DISTFILES}) from http://www.fileplanet.com/dl/dl.asp?/planethalflife/si/${DISTFILES},\
+		place it in ${DISTDIR} and then run make again
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/games/hlserver-si/distinfo b/games/hlserver-si/distinfo
index 8ed80b2ee4b0..6e51261db401 100644
--- a/games/hlserver-si/distinfo
+++ b/games/hlserver-si/distinfo
@@ -1,2 +1 @@
-MD5 (si-097-linux.tar.gz) = 8114978ef4405967c0438b8455340356
-MD5 (si-097-097pl5-linux-patch.tar.gz) = d3130a2ffbec66e68506bd43786fbb9b
+MD5 (si-097a-linux.tar.gz) = 43a638d5a92f85f1eddec9d9c672278f
diff --git a/games/hlserver-si/pkg-plist b/games/hlserver-si/pkg-plist
index 7fcde0a8de6a..9f06714b75cc 100644
--- a/games/hlserver-si/pkg-plist
+++ b/games/hlserver-si/pkg-plist
@@ -15,10 +15,13 @@
 %%HLDSDIR%%si/delta.lst
 %%HLDSDIR%%si/dlls/si.dll
 %%HLDSDIR%%si/dlls/si_i386.so
+%%HLDSDIR%%si/events/briefcase.sc
 %%HLDSDIR%%si/events/cloakidl.sc
 %%HLDSDIR%%si/events/cloakstp.sc
 %%HLDSDIR%%si/events/cloakwrm.sc
 %%HLDSDIR%%si/events/colt.sc
+%%HLDSDIR%%si/events/mindray_fire.sc
+%%HLDSDIR%%si/events/mindray_stop.sc
 %%HLDSDIR%%si/events/snUZI.sc
 %%HLDSDIR%%si/events/tommygun.sc
 %%HLDSDIR%%si/events/vomit.sc
@@ -113,6 +116,7 @@
 %%HLDSDIR%%si/gfx/shell/head_lan.bmp
 %%HLDSDIR%%si/gfx/shell/head_multi.bmp
 %%HLDSDIR%%si/gfx/shell/head_readme.bmp
+%%HLDSDIR%%si/gfx/shell/head_specgames.bmp
 %%HLDSDIR%%si/gfx/shell/head_video.bmp
 %%HLDSDIR%%si/gfx/shell/head_vidmodes.bmp
 %%HLDSDIR%%si/gfx/shell/head_vidoptions.BMP
@@ -146,19 +150,60 @@
 %%HLDSDIR%%si/gfx/shell/uparrowp.bmp
 %%HLDSDIR%%si/gfx/shell/windows.bmp
 %%HLDSDIR%%si/gfx/shell/won_logo.bmp
+%%HLDSDIR%%si/gfx/vgui/320_arrow.tga
+%%HLDSDIR%%si/gfx/vgui/320_arrowdn.tga
+%%HLDSDIR%%si/gfx/vgui/320_arrowlt.tga
+%%HLDSDIR%%si/gfx/vgui/320_arrowrt.tga
+%%HLDSDIR%%si/gfx/vgui/320_arrowup.tga
+%%HLDSDIR%%si/gfx/vgui/640_admin_sighted.tga
 %%HLDSDIR%%si/gfx/vgui/640_afd_logo.tga
 %%HLDSDIR%%si/gfx/vgui/640_afd_smlogo.tga
 %%HLDSDIR%%si/gfx/vgui/640_afdd.tga
+%%HLDSDIR%%si/gfx/vgui/640_afddl.tga
+%%HLDSDIR%%si/gfx/vgui/640_afddr.tga
 %%HLDSDIR%%si/gfx/vgui/640_afdv.tga
+%%HLDSDIR%%si/gfx/vgui/640_afdvl.tga
+%%HLDSDIR%%si/gfx/vgui/640_afdvr.tga
+%%HLDSDIR%%si/gfx/vgui/640_arrow.tga
+%%HLDSDIR%%si/gfx/vgui/640_arrowdn.tga
+%%HLDSDIR%%si/gfx/vgui/640_arrowlt.tga
+%%HLDSDIR%%si/gfx/vgui/640_arrowrt.tga
+%%HLDSDIR%%si/gfx/vgui/640_arrowup.tga
 %%HLDSDIR%%si/gfx/vgui/640_butchAFD.tga
 %%HLDSDIR%%si/gfx/vgui/640_butchMCL.tga
 %%HLDSDIR%%si/gfx/vgui/640_charlieAFD.tga
 %%HLDSDIR%%si/gfx/vgui/640_charlieMCL.tga
+%%HLDSDIR%%si/gfx/vgui/640_eotm.tga
+%%HLDSDIR%%si/gfx/vgui/640_hint_brk_destroyed.tga
+%%HLDSDIR%%si/gfx/vgui/640_hint_brk_sighted.tga
+%%HLDSDIR%%si/gfx/vgui/640_hint_cloak.tga
+%%HLDSDIR%%si/gfx/vgui/640_hint_mindray.tga
+%%HLDSDIR%%si/gfx/vgui/640_hint_no_armor.tga
+%%HLDSDIR%%si/gfx/vgui/640_hint_place_radio.tga
+%%HLDSDIR%%si/gfx/vgui/640_hint_radio.tga
+%%HLDSDIR%%si/gfx/vgui/640_hint_res_delivered.tga
+%%HLDSDIR%%si/gfx/vgui/640_hint_res_pickup.tga
+%%HLDSDIR%%si/gfx/vgui/640_hint_res_sighted.tga
+%%HLDSDIR%%si/gfx/vgui/640_hint_sci_defend.tga
+%%HLDSDIR%%si/gfx/vgui/640_hint_sci_delivered.tga
+%%HLDSDIR%%si/gfx/vgui/640_hint_sci_disturbed.tga
+%%HLDSDIR%%si/gfx/vgui/640_hint_sci_dropped.tga
+%%HLDSDIR%%si/gfx/vgui/640_hint_sci_killed.tga
+%%HLDSDIR%%si/gfx/vgui/640_hint_sci_pickup.tga
+%%HLDSDIR%%si/gfx/vgui/640_hint_sci_sighted.tga
+%%HLDSDIR%%si/gfx/vgui/640_hint_tech_pickup.tga
+%%HLDSDIR%%si/gfx/vgui/640_hint_vomit.tga
+%%HLDSDIR%%si/gfx/vgui/640_hint_vote.tga
+%%HLDSDIR%%si/gfx/vgui/640_hint_vote_vgui.tga
 %%HLDSDIR%%si/gfx/vgui/640_logo.tga
 %%HLDSDIR%%si/gfx/vgui/640_mcl_logo.tga
 %%HLDSDIR%%si/gfx/vgui/640_mcl_smlogo.tga
 %%HLDSDIR%%si/gfx/vgui/640_mcld.tga
+%%HLDSDIR%%si/gfx/vgui/640_mcldl.tga
+%%HLDSDIR%%si/gfx/vgui/640_mcldr.tga
 %%HLDSDIR%%si/gfx/vgui/640_mclv.tga
+%%HLDSDIR%%si/gfx/vgui/640_mclvl.tga
+%%HLDSDIR%%si/gfx/vgui/640_mclvr.tga
 %%HLDSDIR%%si/gfx/vgui/640_portrait1AFD.tga
 %%HLDSDIR%%si/gfx/vgui/640_portrait1MCL.tga
 %%HLDSDIR%%si/gfx/vgui/640_portrait2AFD.tga
@@ -177,11 +222,52 @@
 %%HLDSDIR%%si/gfx/vgui/640_portrait8MCL.tga
 %%HLDSDIR%%si/gfx/vgui/640_portrait9AFD.tga
 %%HLDSDIR%%si/gfx/vgui/640_portrait9MCL.tga
+%%HLDSDIR%%si/gfx/vgui/640_r_a_regen.tga
+%%HLDSDIR%%si/gfx/vgui/640_r_a_regen2.tga
+%%HLDSDIR%%si/gfx/vgui/640_r_ammo_replicate.tga
+%%HLDSDIR%%si/gfx/vgui/640_r_ammo_replicate2.tga
+%%HLDSDIR%%si/gfx/vgui/640_r_armor_100.tga
+%%HLDSDIR%%si/gfx/vgui/640_r_armor_25.tga
+%%HLDSDIR%%si/gfx/vgui/640_r_armor_50.tga
+%%HLDSDIR%%si/gfx/vgui/640_r_armor_75.tga
+%%HLDSDIR%%si/gfx/vgui/640_r_briefcase.tga
+%%HLDSDIR%%si/gfx/vgui/640_r_cloaking.tga
+%%HLDSDIR%%si/gfx/vgui/640_r_cloning.tga
+%%HLDSDIR%%si/gfx/vgui/640_r_coffee.tga
+%%HLDSDIR%%si/gfx/vgui/640_r_colt.tga
+%%HLDSDIR%%si/gfx/vgui/640_r_crossbow.tga
+%%HLDSDIR%%si/gfx/vgui/640_r_fev.tga
+%%HLDSDIR%%si/gfx/vgui/640_r_gauss.tga
+%%HLDSDIR%%si/gfx/vgui/640_r_gi.tga
+%%HLDSDIR%%si/gfx/vgui/640_r_grenade.tga
+%%HLDSDIR%%si/gfx/vgui/640_r_h_regen.tga
+%%HLDSDIR%%si/gfx/vgui/640_r_h_regen2.tga
+%%HLDSDIR%%si/gfx/vgui/640_r_legs_1.tga
+%%HLDSDIR%%si/gfx/vgui/640_r_legs_2.tga
+%%HLDSDIR%%si/gfx/vgui/640_r_manufacturing.tga
+%%HLDSDIR%%si/gfx/vgui/640_r_mindray.tga
+%%HLDSDIR%%si/gfx/vgui/640_r_optics.tga
+%%HLDSDIR%%si/gfx/vgui/640_r_production.tga
+%%HLDSDIR%%si/gfx/vgui/640_r_radio.tga
+%%HLDSDIR%%si/gfx/vgui/640_r_rocket_pistol.tga
+%%HLDSDIR%%si/gfx/vgui/640_r_rpg.tga
+%%HLDSDIR%%si/gfx/vgui/640_r_satchel.tga
+%%HLDSDIR%%si/gfx/vgui/640_r_shotgun.tga
+%%HLDSDIR%%si/gfx/vgui/640_r_snuzi.tga
+%%HLDSDIR%%si/gfx/vgui/640_r_strength.tga
+%%HLDSDIR%%si/gfx/vgui/640_r_strength2.tga
+%%HLDSDIR%%si/gfx/vgui/640_r_tommygun.tga
+%%HLDSDIR%%si/gfx/vgui/640_r_tripmine.tga
+%%HLDSDIR%%si/gfx/vgui/640_r_vomit.tga
 %%HLDSDIR%%si/gfx/vgui/640_randomAFD.tga
 %%HLDSDIR%%si/gfx/vgui/640_randomMCL.tga
 %%HLDSDIR%%si/gfx/vgui/640_smadmin.tga
+%%HLDSDIR%%si/gfx/vgui/640_stolen.tga
 %%HLDSDIR%%si/gfx/vgui/640_vinnieAFD.tga
 %%HLDSDIR%%si/gfx/vgui/640_vinnieMCL.tga
+%%HLDSDIR%%si/gfx/vgui/eotm.tga
+%%HLDSDIR%%si/gfx/vgui/icntlk_pl.tga
+%%HLDSDIR%%si/gfx/vgui/llama.tga
 %%HLDSDIR%%si/liblist.gam
 %%HLDSDIR%%si/listenserver.cfg
 %%PORTDOCS%%%%HLDSDIR%%si/manual.html
@@ -282,6 +368,9 @@
 %%PORTDOCS%%%%HLDSDIR%%si/manual/si_ammo.jpg
 %%PORTDOCS%%%%HLDSDIR%%si/manual/si_argrenades.jpg
 %%PORTDOCS%%%%HLDSDIR%%si/manual/si_battery.jpg
+%%PORTDOCS%%%%HLDSDIR%%si/manual/si_battery2.jpg
+%%PORTDOCS%%%%HLDSDIR%%si/manual/si_battery3.jpg
+%%PORTDOCS%%%%HLDSDIR%%si/manual/si_battery4.jpg
 %%PORTDOCS%%%%HLDSDIR%%si/manual/si_beans.jpg
 %%PORTDOCS%%%%HLDSDIR%%si/manual/si_briefcase.jpg
 %%PORTDOCS%%%%HLDSDIR%%si/manual/si_cap.jpg
@@ -311,7 +400,9 @@
 %%PORTDOCS%%%%HLDSDIR%%si/manual/si_shotgun.jpg
 %%PORTDOCS%%%%HLDSDIR%%si/manual/si_snuzis.jpg
 %%PORTDOCS%%%%HLDSDIR%%si/manual/si_suit.jpg
+%%PORTDOCS%%%%HLDSDIR%%si/manual/si_suit2.jpg
 %%PORTDOCS%%%%HLDSDIR%%si/manual/si_tissue.jpg
+%%PORTDOCS%%%%HLDSDIR%%si/manual/si_tissue2.jpg
 %%PORTDOCS%%%%HLDSDIR%%si/manual/si_tommygun.jpg
 %%PORTDOCS%%%%HLDSDIR%%si/manual/si_tripmine.jpg
 %%PORTDOCS%%%%HLDSDIR%%si/manual/si_virus.jpg
@@ -350,55 +441,65 @@
 %%HLDSDIR%%si/maps/graphs/si_urban.nod
 %%HLDSDIR%%si/maps/graphs/si_urban.nrp
 %%HLDSDIR%%si/maps/si_alley.bsp
-%%PORTDOCS%%%%HLDSDIR%%si/maps/si_alley.txt
+%%HLDSDIR%%si/maps/si_alley.txt
 %%HLDSDIR%%si/maps/si_daybreak.bsp
-%%PORTDOCS%%%%HLDSDIR%%si/maps/si_daybreak.txt
+%%HLDSDIR%%si/maps/si_daybreak.txt
 %%HLDSDIR%%si/maps/si_early.bsp
-%%PORTDOCS%%%%HLDSDIR%%si/maps/si_early.txt
+%%HLDSDIR%%si/maps/si_early.txt
 %%HLDSDIR%%si/maps/si_hirise.bsp
-%%PORTDOCS%%%%HLDSDIR%%si/maps/si_hirise.txt
+%%HLDSDIR%%si/maps/si_hirise.txt
 %%HLDSDIR%%si/maps/si_laser.bsp
-%%PORTDOCS%%%%HLDSDIR%%si/maps/si_laser.txt
+%%HLDSDIR%%si/maps/si_laser.txt
 %%HLDSDIR%%si/maps/si_mercato.bsp
-%%PORTDOCS%%%%HLDSDIR%%si/maps/si_mercato.txt
+%%HLDSDIR%%si/maps/si_mercato.txt
 %%HLDSDIR%%si/maps/si_metropolis.bsp
-%%PORTDOCS%%%%HLDSDIR%%si/maps/si_metropolis.txt
+%%HLDSDIR%%si/maps/si_metropolis.txt
 %%HLDSDIR%%si/maps/si_military.bsp
-%%PORTDOCS%%%%HLDSDIR%%si/maps/si_military.txt
+%%HLDSDIR%%si/maps/si_military.txt
 %%HLDSDIR%%si/maps/si_mill.bsp
-%%PORTDOCS%%%%HLDSDIR%%si/maps/si_mill.txt
+%%HLDSDIR%%si/maps/si_mill.txt
+%%HLDSDIR%%si/maps/si_mtg.bsp
+%%HLDSDIR%%si/maps/si_mtg.txt
 %%HLDSDIR%%si/maps/si_overtime.bsp
-%%PORTDOCS%%%%HLDSDIR%%si/maps/si_overtime.txt
+%%HLDSDIR%%si/maps/si_overtime.txt
 %%HLDSDIR%%si/maps/si_rush.bsp
-%%PORTDOCS%%%%HLDSDIR%%si/maps/si_rush.txt
+%%HLDSDIR%%si/maps/si_rush.txt
 %%HLDSDIR%%si/maps/si_sewers.bsp
-%%PORTDOCS%%%%HLDSDIR%%si/maps/si_sewers.txt
+%%HLDSDIR%%si/maps/si_sewers.txt
 %%HLDSDIR%%si/maps/si_tundra.bsp
-%%PORTDOCS%%%%HLDSDIR%%si/maps/si_tundra.txt
+%%HLDSDIR%%si/maps/si_tundra.txt
 %%HLDSDIR%%si/maps/si_urban.bsp
-%%PORTDOCS%%%%HLDSDIR%%si/maps/si_urban.txt
+%%HLDSDIR%%si/maps/si_urban.txt
+%%HLDSDIR%%si/maps/si_virus.bsp
+%%HLDSDIR%%si/maps/si_virus.txt
 %%HLDSDIR%%si/media/logo.avi
 %%HLDSDIR%%si/models/admin.mdl
+%%HLDSDIR%%si/models/butch_dead.mdl
 %%HLDSDIR%%si/models/carryresource.mdl
 %%HLDSDIR%%si/models/carryscientist.mdl
 %%HLDSDIR%%si/models/colt_shell.mdl
 %%HLDSDIR%%si/models/dog.mdl
 %%HLDSDIR%%si/models/fev_gibs.mdl
 %%HLDSDIR%%si/models/grapple_hook.mdl
+%%HLDSDIR%%si/models/lab_medical.mdl
 %%HLDSDIR%%si/models/leech.mdl
 %%HLDSDIR%%si/models/p_briefcase.mdl
 %%HLDSDIR%%si/models/p_cloak.mdl
 %%HLDSDIR%%si/models/p_colt.mdl
+%%HLDSDIR%%si/models/p_crossbow.mdl
 %%HLDSDIR%%si/models/p_fev.mdl
 %%HLDSDIR%%si/models/p_gauss.mdl
 %%HLDSDIR%%si/models/p_gi.mdl
 %%HLDSDIR%%si/models/p_grapple.mdl
 %%HLDSDIR%%si/models/p_mindray.mdl
 %%HLDSDIR%%si/models/p_rpistol.mdl
+%%HLDSDIR%%si/models/p_satchel.mdl
+%%HLDSDIR%%si/models/p_satchel_radio.mdl
 %%HLDSDIR%%si/models/p_shotgun.mdl
 %%HLDSDIR%%si/models/p_snUZI.mdl
 %%HLDSDIR%%si/models/p_tommygun.mdl
 %%HLDSDIR%%si/models/p_transistor.mdl
+%%HLDSDIR%%si/models/p_tripmine.mdl
 %%HLDSDIR%%si/models/player/butch/butch.mdl
 %%HLDSDIR%%si/models/player/butch/butch2.mdl
 %%HLDSDIR%%si/models/player/charlie/charlie.mdl
@@ -413,8 +514,10 @@
 %%HLDSDIR%%si/models/resource_documents.mdl
 %%HLDSDIR%%si/models/resource_gunkcan.mdl
 %%HLDSDIR%%si/models/resource_specimencan.mdl
+%%HLDSDIR%%si/models/rpgrocket.mdl
 %%HLDSDIR%%si/models/rprocket.mdl
 %%HLDSDIR%%si/models/scientist.mdl
+%%HLDSDIR%%si/models/shotgunshell.mdl
 %%HLDSDIR%%si/models/snuzi_shell.mdl
 %%HLDSDIR%%si/models/tommy_shell.mdl
 %%HLDSDIR%%si/models/v_briefcase.mdl
@@ -443,6 +546,7 @@
 %%HLDSDIR%%si/models/w_chromebox.mdl
 %%HLDSDIR%%si/models/w_cloak.mdl
 %%HLDSDIR%%si/models/w_colt.mdl
+%%HLDSDIR%%si/models/w_crossbow.mdl
 %%HLDSDIR%%si/models/w_fev.mdl
 %%HLDSDIR%%si/models/w_fevbox.mdl
 %%HLDSDIR%%si/models/w_gauss.mdl
@@ -451,8 +555,10 @@
 %%HLDSDIR%%si/models/w_labtransistorT.mdl
 %%HLDSDIR%%si/models/w_mindray.mdl
 %%HLDSDIR%%si/models/w_mindrayt.mdl
+%%HLDSDIR%%si/models/w_rpg.mdl
 %%HLDSDIR%%si/models/w_rpistol.mdl
 %%HLDSDIR%%si/models/w_rpistolclip.mdl
+%%HLDSDIR%%si/models/w_satchel.mdl
 %%HLDSDIR%%si/models/w_shotgun.mdl
 %%HLDSDIR%%si/models/w_snUZI.mdl
 %%HLDSDIR%%si/models/w_snUZIammo.mdl
@@ -462,7 +568,40 @@
 %%HLDSDIR%%si/models/w_tripmine.mdl
 %%HLDSDIR%%si/models/w_woodbox.mdl
 %%HLDSDIR%%si/motd.txt
+%%HLDSDIR%%si/overviews/si_alley.bmp
+%%HLDSDIR%%si/overviews/si_alley.txt
+%%HLDSDIR%%si/overviews/si_daybreak.bmp
+%%HLDSDIR%%si/overviews/si_daybreak.txt
+%%HLDSDIR%%si/overviews/si_early.bmp
+%%HLDSDIR%%si/overviews/si_early.txt
+%%HLDSDIR%%si/overviews/si_hirise.bmp
+%%HLDSDIR%%si/overviews/si_hirise.txt
+%%HLDSDIR%%si/overviews/si_laser.bmp
+%%HLDSDIR%%si/overviews/si_laser.txt
+%%HLDSDIR%%si/overviews/si_mercato.bmp
+%%HLDSDIR%%si/overviews/si_mercato.txt
+%%HLDSDIR%%si/overviews/si_metropolis.bmp
+%%HLDSDIR%%si/overviews/si_metropolis.txt
+%%HLDSDIR%%si/overviews/si_military.bmp
+%%HLDSDIR%%si/overviews/si_military.txt
+%%HLDSDIR%%si/overviews/si_mill.bmp
+%%HLDSDIR%%si/overviews/si_mill.txt
+%%HLDSDIR%%si/overviews/si_mtg.bmp
+%%HLDSDIR%%si/overviews/si_mtg.txt
+%%HLDSDIR%%si/overviews/si_overtime.bmp
+%%HLDSDIR%%si/overviews/si_overtime.txt
+%%HLDSDIR%%si/overviews/si_rush.bmp
+%%HLDSDIR%%si/overviews/si_rush.txt
+%%HLDSDIR%%si/overviews/si_sewers.bmp
+%%HLDSDIR%%si/overviews/si_sewers.txt
+%%HLDSDIR%%si/overviews/si_tundra.bmp
+%%HLDSDIR%%si/overviews/si_tundra.txt
+%%HLDSDIR%%si/overviews/si_urban.bmp
+%%HLDSDIR%%si/overviews/si_urban.txt
+%%HLDSDIR%%si/overviews/si_virus.bmp
+%%HLDSDIR%%si/overviews/si_virus.txt
 %%HLDSDIR%%si/pldecal.wad
+%%PORTDOCS%%%%HLDSDIR%%si/readme97a.txt
 %%HLDSDIR%%si/server.cfg
 %%HLDSDIR%%si/settings.scr
 %%HLDSDIR%%si/si.wad
@@ -473,15 +612,18 @@
 %%HLDSDIR%%si/si_daybreak.wad
 %%HLDSDIR%%si/si_early.wad
 %%HLDSDIR%%si/si_hirise.wad
+%%HLDSDIR%%si/si_icons.icl
 %%HLDSDIR%%si/si_mercato.wad
 %%HLDSDIR%%si/si_metropolis.wad
 %%HLDSDIR%%si/si_military.wad
 %%HLDSDIR%%si/si_mill.wad
+%%HLDSDIR%%si/si_mindthegap.wad
 %%HLDSDIR%%si/si_mno4.wad
 %%HLDSDIR%%si/si_overtime.wad
 %%HLDSDIR%%si/si_sewers.wad
 %%HLDSDIR%%si/si_tundra.wad
 %%HLDSDIR%%si/si_urban.wad
+%%HLDSDIR%%si/si_virus.wad
 %%HLDSDIR%%si/si_wolf.wad
 %%HLDSDIR%%si/skill.cfg
 %%HLDSDIR%%si/sound/ambience/fallscream.wav
@@ -489,8 +631,10 @@
 %%HLDSDIR%%si/sound/ambience/ie_traffic01.wav
 %%HLDSDIR%%si/sound/ambience/ie_traffic02.wav
 %%HLDSDIR%%si/sound/ambience/medium_dog.wav
+%%HLDSDIR%%si/sound/ambience/mindthegap2.wav
 %%HLDSDIR%%si/sound/ambience/rabiddingo1.wav
 %%HLDSDIR%%si/sound/ambience/ringring1.wav
+%%HLDSDIR%%si/sound/ambience/smdm.wav
 %%HLDSDIR%%si/sound/ambience/swralarm.wav
 %%PORTDOCS%%%%HLDSDIR%%si/sound/materials.txt
 %%HLDSDIR%%si/sound/misc/talk.wav
@@ -545,6 +689,7 @@
 %%HLDSDIR%%si/sound/weapons/colt_reload1.wav
 %%HLDSDIR%%si/sound/weapons/colt_shot1.wav
 %%HLDSDIR%%si/sound/weapons/colt_shot2.wav
+%%HLDSDIR%%si/sound/weapons/dbarrel1.wav
 %%HLDSDIR%%si/sound/weapons/fev_die1.wav
 %%HLDSDIR%%si/sound/weapons/fev_escape1.wav
 %%HLDSDIR%%si/sound/weapons/grapple_inwall.wav
@@ -559,11 +704,15 @@
 %%HLDSDIR%%si/sound/weapons/radio_idle5.wav
 %%HLDSDIR%%si/sound/weapons/radio_idle6.wav
 %%HLDSDIR%%si/sound/weapons/radio_idle7.wav
+%%HLDSDIR%%si/sound/weapons/reload1.wav
+%%HLDSDIR%%si/sound/weapons/reload3.wav
 %%HLDSDIR%%si/sound/weapons/rp_reload.wav
 %%HLDSDIR%%si/sound/weapons/rp_shot1.wav
 %%HLDSDIR%%si/sound/weapons/rp_shot2.wav
 %%HLDSDIR%%si/sound/weapons/rp_shot3.wav
 %%HLDSDIR%%si/sound/weapons/rp_shot4.wav
+%%HLDSDIR%%si/sound/weapons/sbarrel1.wav
+%%HLDSDIR%%si/sound/weapons/scock1.wav
 %%HLDSDIR%%si/sound/weapons/sn_hks1.wav
 %%HLDSDIR%%si/sound/weapons/sn_hks2.wav
 %%HLDSDIR%%si/sound/weapons/t_hks1.wav
@@ -580,6 +729,7 @@
 %%HLDSDIR%%si/sprites/640hud12.spr
 %%HLDSDIR%%si/sprites/640hud2.spr
 %%HLDSDIR%%si/sprites/640hud3.spr
+%%HLDSDIR%%si/sprites/640hud4.SPR
 %%HLDSDIR%%si/sprites/640hud4.spr
 %%HLDSDIR%%si/sprites/640hud5.spr
 %%HLDSDIR%%si/sprites/640hud6.spr
@@ -587,45 +737,111 @@
 %%HLDSDIR%%si/sprites/640si1.spr
 %%HLDSDIR%%si/sprites/640si2.spr
 %%HLDSDIR%%si/sprites/640si3.spr
+%%HLDSDIR%%si/sprites/640si4.spr
 %%HLDSDIR%%si/sprites/crosshairs.spr
-%%PORTDOCS%%%%HLDSDIR%%si/sprites/hud.txt
+%%HLDSDIR%%si/sprites/hud.txt
+%%HLDSDIR%%si/sprites/iplayerafd.spr
+%%HLDSDIR%%si/sprites/iplayermcl.spr
+%%HLDSDIR%%si/sprites/iscientistafd.spr
+%%HLDSDIR%%si/sprites/iscientistmcl.spr
 %%HLDSDIR%%si/sprites/muzzleflash1.spr
 %%HLDSDIR%%si/sprites/toxic.spr
-%%PORTDOCS%%%%HLDSDIR%%si/sprites/weapon_357.txt
-%%PORTDOCS%%%%HLDSDIR%%si/sprites/weapon_9mmar.txt
-%%PORTDOCS%%%%HLDSDIR%%si/sprites/weapon_briefcase.txt
-%%PORTDOCS%%%%HLDSDIR%%si/sprites/weapon_cloak.txt
-%%PORTDOCS%%%%HLDSDIR%%si/sprites/weapon_colt.txt
-%%PORTDOCS%%%%HLDSDIR%%si/sprites/weapon_crossbow.txt
-%%PORTDOCS%%%%HLDSDIR%%si/sprites/weapon_crowbar.txt
-%%PORTDOCS%%%%HLDSDIR%%si/sprites/weapon_fleshgrenade.txt
-%%PORTDOCS%%%%HLDSDIR%%si/sprites/weapon_gauss.txt
-%%PORTDOCS%%%%HLDSDIR%%si/sprites/weapon_grapple.txt
-%%PORTDOCS%%%%HLDSDIR%%si/sprites/weapon_handgrenade.txt
-%%PORTDOCS%%%%HLDSDIR%%si/sprites/weapon_hornetgun.txt
-%%PORTDOCS%%%%HLDSDIR%%si/sprites/weapon_mindray.txt
-%%PORTDOCS%%%%HLDSDIR%%si/sprites/weapon_question.txt
-%%PORTDOCS%%%%HLDSDIR%%si/sprites/weapon_radio.txt
-%%PORTDOCS%%%%HLDSDIR%%si/sprites/weapon_rocketpistol.txt
-%%PORTDOCS%%%%HLDSDIR%%si/sprites/weapon_rpg.txt
-%%PORTDOCS%%%%HLDSDIR%%si/sprites/weapon_satchel.txt
-%%PORTDOCS%%%%HLDSDIR%%si/sprites/weapon_shotgun.txt
-%%PORTDOCS%%%%HLDSDIR%%si/sprites/weapon_snUZI.txt
-%%PORTDOCS%%%%HLDSDIR%%si/sprites/weapon_snark.txt
-%%PORTDOCS%%%%HLDSDIR%%si/sprites/weapon_tommygun.txt
-%%PORTDOCS%%%%HLDSDIR%%si/sprites/weapon_transistor.txt
-%%PORTDOCS%%%%HLDSDIR%%si/sprites/weapon_tripmine.txt
-%%PORTDOCS%%%%HLDSDIR%%si/sprites/weapon_vomit.txt
-%%PORTDOCS%%%%HLDSDIR%%si/titles.txt
+%%HLDSDIR%%si/sprites/weapon_357.txt
+%%HLDSDIR%%si/sprites/weapon_9mmar.txt
+%%HLDSDIR%%si/sprites/weapon_briefcase.txt
+%%HLDSDIR%%si/sprites/weapon_cloak.txt
+%%HLDSDIR%%si/sprites/weapon_colt.txt
+%%HLDSDIR%%si/sprites/weapon_crossbow.txt
+%%HLDSDIR%%si/sprites/weapon_crowbar.txt
+%%HLDSDIR%%si/sprites/weapon_fleshgrenade.txt
+%%HLDSDIR%%si/sprites/weapon_gauss.txt
+%%HLDSDIR%%si/sprites/weapon_grapple.txt
+%%HLDSDIR%%si/sprites/weapon_handgrenade.txt
+%%HLDSDIR%%si/sprites/weapon_hornetgun.txt
+%%HLDSDIR%%si/sprites/weapon_mindray.txt
+%%HLDSDIR%%si/sprites/weapon_question.txt
+%%HLDSDIR%%si/sprites/weapon_radio.txt
+%%HLDSDIR%%si/sprites/weapon_rocketpistol.txt
+%%HLDSDIR%%si/sprites/weapon_rpg.txt
+%%HLDSDIR%%si/sprites/weapon_satchel.txt
+%%HLDSDIR%%si/sprites/weapon_shotgun.txt
+%%HLDSDIR%%si/sprites/weapon_snUZI.txt
+%%HLDSDIR%%si/sprites/weapon_snark.txt
+%%HLDSDIR%%si/sprites/weapon_tommygun.txt
+%%HLDSDIR%%si/sprites/weapon_transistor.txt
+%%HLDSDIR%%si/sprites/weapon_tripmine.txt
+%%HLDSDIR%%si/sprites/weapon_vomit.txt
+%%HLDSDIR%%si/titles.txt
 %%HLDSDIR%%si/user.scr
-%%PORTDOCS%%%%HLDSDIR%%si/vgui/short_butchAFD.txt
-%%PORTDOCS%%%%HLDSDIR%%si/vgui/short_butchMCL.txt
-%%PORTDOCS%%%%HLDSDIR%%si/vgui/short_charlieAFD.txt
-%%PORTDOCS%%%%HLDSDIR%%si/vgui/short_charlieMCL.txt
-%%PORTDOCS%%%%HLDSDIR%%si/vgui/short_randomAFD.txt
-%%PORTDOCS%%%%HLDSDIR%%si/vgui/short_randomMCL.txt
-%%PORTDOCS%%%%HLDSDIR%%si/vgui/short_vinnieAFD.txt
-%%PORTDOCS%%%%HLDSDIR%%si/vgui/short_vinnieMCL.txt
+%%HLDSDIR%%si/vgui/hint_admin_sighted.txt
+%%HLDSDIR%%si/vgui/hint_brk_destroyed.txt
+%%HLDSDIR%%si/vgui/hint_brk_sighted.txt
+%%HLDSDIR%%si/vgui/hint_cloak.txt
+%%HLDSDIR%%si/vgui/hint_mindray.txt
+%%HLDSDIR%%si/vgui/hint_no_armor.txt
+%%HLDSDIR%%si/vgui/hint_place_radio.txt
+%%HLDSDIR%%si/vgui/hint_radio.txt
+%%HLDSDIR%%si/vgui/hint_res_delivered.txt
+%%HLDSDIR%%si/vgui/hint_res_pickup.txt
+%%HLDSDIR%%si/vgui/hint_res_sighted.txt
+%%HLDSDIR%%si/vgui/hint_sci_defend.txt
+%%HLDSDIR%%si/vgui/hint_sci_delivered.txt
+%%HLDSDIR%%si/vgui/hint_sci_disturbed.txt
+%%HLDSDIR%%si/vgui/hint_sci_dropped.txt
+%%HLDSDIR%%si/vgui/hint_sci_killed.txt
+%%HLDSDIR%%si/vgui/hint_sci_pickup.txt
+%%HLDSDIR%%si/vgui/hint_sci_sighted.txt
+%%HLDSDIR%%si/vgui/hint_tech_pickup.txt
+%%HLDSDIR%%si/vgui/hint_vomit.txt
+%%HLDSDIR%%si/vgui/hint_vote.txt
+%%HLDSDIR%%si/vgui/hint_vote_vgui.txt
+%%HLDSDIR%%si/vgui/r_a_regen.txt
+%%HLDSDIR%%si/vgui/r_a_regen2.txt
+%%HLDSDIR%%si/vgui/r_ammo_replicate.txt
+%%HLDSDIR%%si/vgui/r_ammo_replicate2.txt
+%%HLDSDIR%%si/vgui/r_armor_100.txt
+%%HLDSDIR%%si/vgui/r_armor_25.txt
+%%HLDSDIR%%si/vgui/r_armor_50.txt
+%%HLDSDIR%%si/vgui/r_armor_75.txt
+%%HLDSDIR%%si/vgui/r_briefcase.txt
+%%HLDSDIR%%si/vgui/r_cloaking.txt
+%%HLDSDIR%%si/vgui/r_cloning.txt
+%%HLDSDIR%%si/vgui/r_coffee.txt
+%%HLDSDIR%%si/vgui/r_colt.txt
+%%HLDSDIR%%si/vgui/r_crossbow.txt
+%%HLDSDIR%%si/vgui/r_fev.txt
+%%HLDSDIR%%si/vgui/r_gauss.txt
+%%HLDSDIR%%si/vgui/r_grapple.txt
+%%HLDSDIR%%si/vgui/r_grenade.txt
+%%HLDSDIR%%si/vgui/r_h_regen.txt
+%%HLDSDIR%%si/vgui/r_h_regen2.txt
+%%HLDSDIR%%si/vgui/r_legs_1.txt
+%%HLDSDIR%%si/vgui/r_legs_2.txt
+%%HLDSDIR%%si/vgui/r_manufacturing.txt
+%%HLDSDIR%%si/vgui/r_mindray.txt
+%%HLDSDIR%%si/vgui/r_null.txt
+%%HLDSDIR%%si/vgui/r_optics.txt
+%%HLDSDIR%%si/vgui/r_production.txt
+%%HLDSDIR%%si/vgui/r_radio.txt
+%%HLDSDIR%%si/vgui/r_rocket_pistol.txt
+%%HLDSDIR%%si/vgui/r_rocketpistol.txt
+%%HLDSDIR%%si/vgui/r_rpg.txt
+%%HLDSDIR%%si/vgui/r_satchel.txt
+%%HLDSDIR%%si/vgui/r_shotgun.txt
+%%HLDSDIR%%si/vgui/r_snuzi.txt
+%%HLDSDIR%%si/vgui/r_strength.txt
+%%HLDSDIR%%si/vgui/r_strength2.txt
+%%HLDSDIR%%si/vgui/r_tommygun.txt
+%%HLDSDIR%%si/vgui/r_tripmine.txt
+%%HLDSDIR%%si/vgui/r_vomit.txt
+%%HLDSDIR%%si/vgui/short_butchAFD.txt
+%%HLDSDIR%%si/vgui/short_butchMCL.txt
+%%HLDSDIR%%si/vgui/short_charlieAFD.txt
+%%HLDSDIR%%si/vgui/short_charlieMCL.txt
+%%HLDSDIR%%si/vgui/short_randomAFD.txt
+%%HLDSDIR%%si/vgui/short_randomMCL.txt
+%%HLDSDIR%%si/vgui/short_vinnieAFD.txt
+%%HLDSDIR%%si/vgui/short_vinnieMCL.txt
 @dirrm %%HLDSDIR%%si/vgui
 @dirrm %%HLDSDIR%%si/sprites
 @dirrm %%HLDSDIR%%si/sound/ws
@@ -636,6 +852,7 @@
 @dirrm %%HLDSDIR%%si/sound/misc
 @dirrm %%HLDSDIR%%si/sound/ambience
 @dirrm %%HLDSDIR%%si/sound
+@dirrm %%HLDSDIR%%si/overviews
 @dirrm %%HLDSDIR%%si/models/player/vinnie
 @dirrm %%HLDSDIR%%si/models/player/charlie
 @dirrm %%HLDSDIR%%si/models/player/butch