4 files changed, 163 insertions, 22 deletions

diff --git a/games/hlserver-fa/Makefile b/games/hlserver-fa/Makefile
index 2ace6a745edd..bcfaa1a6bcdb 100644
--- a/games/hlserver-fa/Makefile
+++ b/games/hlserver-fa/Makefile
@@ -6,12 +6,10 @@
 #
 
 PORTNAME=	firearms
-PORTVERSION=	2.6
-MASTER_SITES=	http://www.doomsdaywarriors.com/files/ \
-		ftp://ftp.nofrag.com/nofrag/ \
-		http://downloads.firearms-hl.com/ \
-		http://lamas.counter-strike.hu:8080/letolt/extra/firearms/
-DISTNAME=	firearms_rc${PORTVERSION}
+PORTVERSION=	2.65
+MASTER_SITES=	ftp://tdsfa.org/fafiles/ \
+		ftp://64.191.71.76/files/
+DISTNAME=	${PORTNAME}${PORTVERSION:S/.//}_linux_full
 
 HALFLIFE_COUNTERSTRIKE_MASTER=	${.CURDIR}/../hlserver-cs
 
diff --git a/games/hlserver-fa/distinfo b/games/hlserver-fa/distinfo
index aacca9175ec1..da7472371866 100644
--- a/games/hlserver-fa/distinfo
+++ b/games/hlserver-fa/distinfo
@@ -1 +1 @@
-MD5 (firearms_rc2.6.tar.gz) = f062be8ec71c9b61fd56be8262e92acb
+MD5 (firearms265_linux_full.tar.gz) = 91ebe51cbeba5d74a6191a2a577d2af9
diff --git a/games/hlserver-fa/pkg-descr b/games/hlserver-fa/pkg-descr
index 67384660e308..81da446881ab 100644
--- a/games/hlserver-fa/pkg-descr
+++ b/games/hlserver-fa/pkg-descr
@@ -1,9 +1,6 @@
 This package contains the files to run a FreeBSD Half-Life
-Firearms RC2.5 server under Linux emulation.
+Firearms server under Linux emulation.
 
 Visit these following web pages for more information:
 
 WWW: http://www.firearmsmod.com/
-
-- Patrick Li
-pat@databits.net
diff --git a/games/hlserver-fa/pkg-plist b/games/hlserver-fa/pkg-plist
index 9432aa4423e3..72b0b6d244b3 100644
--- a/games/hlserver-fa/pkg-plist
+++ b/games/hlserver-fa/pkg-plist
@@ -12,11 +12,9 @@
 %%HLDSDIR%%firearms/commandmenu.txt
 %%HLDSDIR%%firearms/commands.txt
 %%HLDSDIR%%firearms/config.cfg
-%%HLDSDIR%%firearms/custom.hpk
 %%HLDSDIR%%firearms/decals.wad
 %%HLDSDIR%%firearms/delta.lst
 %%HLDSDIR%%firearms/dlls/fa_i386.so
-%%HLDSDIR%%firearms/dlls/firearms.dll
 %%HLDSDIR%%firearms/events/ak47.sc
 %%HLDSDIR%%firearms/events/ak74.sc
 %%HLDSDIR%%firearms/events/anaconda.sc
@@ -28,8 +26,10 @@
 %%HLDSDIR%%firearms/events/clayexplode.sc
 %%HLDSDIR%%firearms/events/coltgov.sc
 %%HLDSDIR%%firearms/events/concexplode.sc
+%%HLDSDIR%%firearms/events/contactgren.sc
 %%HLDSDIR%%firearms/events/desert.sc
 %%HLDSDIR%%firearms/events/fa_logitek.ifr
+%%HLDSDIR%%firearms/events/fa_saitek.ifr
 %%HLDSDIR%%firearms/events/famas.sc
 %%HLDSDIR%%firearms/events/frag_explode.sc
 %%HLDSDIR%%firearms/events/g36e.sc
@@ -47,6 +47,7 @@
 %%HLDSDIR%%firearms/events/sterling.sc
 %%HLDSDIR%%firearms/events/svd.sc
 %%HLDSDIR%%firearms/events/tank.sc
+%%HLDSDIR%%firearms/events/trail.sc
 %%HLDSDIR%%firearms/events/uzi.sc
 %%HLDSDIR%%firearms/events/uzi_sil.sc
 %%PORTDOCS%%%%HLDSDIR%%firearms/fa16.ico
@@ -71,6 +72,18 @@
 %%HLDSDIR%%firearms/gfx/env/arcnrt.tga
 %%HLDSDIR%%firearms/gfx/env/arcnup.bmp
 %%HLDSDIR%%firearms/gfx/env/arcnup.tga
+%%HLDSDIR%%firearms/gfx/env/badlands_bk.bmp
+%%HLDSDIR%%firearms/gfx/env/badlands_bk.tga
+%%HLDSDIR%%firearms/gfx/env/badlands_dn.bmp
+%%HLDSDIR%%firearms/gfx/env/badlands_dn.tga
+%%HLDSDIR%%firearms/gfx/env/badlands_ft.bmp
+%%HLDSDIR%%firearms/gfx/env/badlands_ft.tga
+%%HLDSDIR%%firearms/gfx/env/badlands_lf.bmp
+%%HLDSDIR%%firearms/gfx/env/badlands_lf.tga
+%%HLDSDIR%%firearms/gfx/env/badlands_rt.bmp
+%%HLDSDIR%%firearms/gfx/env/badlands_rt.tga
+%%HLDSDIR%%firearms/gfx/env/badlands_up.bmp
+%%HLDSDIR%%firearms/gfx/env/badlands_up.tga
 %%HLDSDIR%%firearms/gfx/env/birdofprey256_bk.bmp
 %%HLDSDIR%%firearms/gfx/env/birdofprey256_bk.tga
 %%HLDSDIR%%firearms/gfx/env/birdofprey256_dn.bmp
@@ -239,6 +252,134 @@
 %%HLDSDIR%%firearms/gfx/env/valley256_rt.tga
 %%HLDSDIR%%firearms/gfx/env/valley256_up.bmp
 %%HLDSDIR%%firearms/gfx/env/valley256_up.tga
+%%HLDSDIR%%firearms/gfx/shell/btns_main.bmp
+%%HLDSDIR%%firearms/gfx/shell/cb_checked.bmp
+%%HLDSDIR%%firearms/gfx/shell/cb_disabled.bmp
+%%HLDSDIR%%firearms/gfx/shell/cb_down.bmp
+%%HLDSDIR%%firearms/gfx/shell/cb_empty.bmp
+%%HLDSDIR%%firearms/gfx/shell/cb_over.bmp
+%%HLDSDIR%%firearms/gfx/shell/cls_d.bmp
+%%HLDSDIR%%firearms/gfx/shell/cls_f.bmp
+%%HLDSDIR%%firearms/gfx/shell/cls_n.bmp
+%%HLDSDIR%%firearms/gfx/shell/colors.lst
+%%HLDSDIR%%firearms/gfx/shell/dedicate.bmp
+%%HLDSDIR%%firearms/gfx/shell/divider.bmp
+%%HLDSDIR%%firearms/gfx/shell/dnarrowd.bmp
+%%HLDSDIR%%firearms/gfx/shell/dnarrowf.bmp
+%%HLDSDIR%%firearms/gfx/shell/dnarrowp.bmp
+%%HLDSDIR%%firearms/gfx/shell/down.bmp
+%%HLDSDIR%%firearms/gfx/shell/favorite.bmp
+%%HLDSDIR%%firearms/gfx/shell/ff.bmp
+%%HLDSDIR%%firearms/gfx/shell/gamma.bmp
+%%HLDSDIR%%firearms/gfx/shell/head_advanced.bmp
+%%HLDSDIR%%firearms/gfx/shell/head_advoptions.bmp
+%%HLDSDIR%%firearms/gfx/shell/head_audio.bmp
+%%HLDSDIR%%firearms/gfx/shell/head_config.bmp
+%%HLDSDIR%%firearms/gfx/shell/head_controls.bmp
+%%HLDSDIR%%firearms/gfx/shell/head_creategame.bmp
+%%HLDSDIR%%firearms/gfx/shell/head_createroom.bmp
+%%HLDSDIR%%firearms/gfx/shell/head_custom.bmp
+%%HLDSDIR%%firearms/gfx/shell/head_customize.bmp
+%%HLDSDIR%%firearms/gfx/shell/head_filter.bmp
+%%HLDSDIR%%firearms/gfx/shell/head_gameopts.bmp
+%%HLDSDIR%%firearms/gfx/shell/head_gore.bmp
+%%HLDSDIR%%firearms/gfx/shell/head_inetgames.bmp
+%%HLDSDIR%%firearms/gfx/shell/head_keyboard.bmp
+%%HLDSDIR%%firearms/gfx/shell/head_lan.bmp
+%%HLDSDIR%%firearms/gfx/shell/head_load.bmp
+%%HLDSDIR%%firearms/gfx/shell/head_multi.bmp
+%%HLDSDIR%%firearms/gfx/shell/head_newgame.bmp
+%%HLDSDIR%%firearms/gfx/shell/head_readme.bmp
+%%HLDSDIR%%firearms/gfx/shell/head_room.bmp
+%%HLDSDIR%%firearms/gfx/shell/head_rooms.bmp
+%%HLDSDIR%%firearms/gfx/shell/head_save.bmp
+%%HLDSDIR%%firearms/gfx/shell/head_saveload.bmp
+%%HLDSDIR%%firearms/gfx/shell/head_single.bmp
+%%HLDSDIR%%firearms/gfx/shell/head_specgames.bmp
+%%HLDSDIR%%firearms/gfx/shell/head_video.bmp
+%%HLDSDIR%%firearms/gfx/shell/head_vidmodes.bmp
+%%HLDSDIR%%firearms/gfx/shell/head_vidoptions.bmp
+%%HLDSDIR%%firearms/gfx/shell/kb_act.lst
+%%HLDSDIR%%firearms/gfx/shell/kb_def.lst
+%%HLDSDIR%%firearms/gfx/shell/kb_keys.lst
+%%HLDSDIR%%firearms/gfx/shell/larrowdefault.bmp
+%%HLDSDIR%%firearms/gfx/shell/larrowflyover.bmp
+%%HLDSDIR%%firearms/gfx/shell/larrowpressed.bmp
+%%HLDSDIR%%firearms/gfx/shell/linux.bmp
+%%HLDSDIR%%firearms/gfx/shell/listen.bmp
+%%HLDSDIR%%firearms/gfx/shell/lock.bmp
+%%HLDSDIR%%firearms/gfx/shell/min_d.bmp
+%%HLDSDIR%%firearms/gfx/shell/min_f.bmp
+%%HLDSDIR%%firearms/gfx/shell/min_n.bmp
+%%HLDSDIR%%firearms/gfx/shell/nonfav.bmp
+%%HLDSDIR%%firearms/gfx/shell/notsecure.bmp
+%%HLDSDIR%%firearms/gfx/shell/pcg.bmp
+%%HLDSDIR%%firearms/gfx/shell/proxy.bmp
+%%HLDSDIR%%firearms/gfx/shell/rarrowdefault.bmp
+%%HLDSDIR%%firearms/gfx/shell/rarrowflyover.bmp
+%%HLDSDIR%%firearms/gfx/shell/rarrowpressed.bmp
+%%HLDSDIR%%firearms/gfx/shell/scrn.bmp
+%%HLDSDIR%%firearms/gfx/shell/secure.bmp
+%%HLDSDIR%%firearms/gfx/shell/slider.bmp
+%%HLDSDIR%%firearms/gfx/shell/sm_dnarf.bmp
+%%HLDSDIR%%firearms/gfx/shell/sm_dnarw.bmp
+%%HLDSDIR%%firearms/gfx/shell/splash.bmp
+%%HLDSDIR%%firearms/gfx/shell/splash8bit.bmp
+%%HLDSDIR%%firearms/gfx/shell/strings.lst
+%%HLDSDIR%%firearms/gfx/shell/thumb.bmp
+%%HLDSDIR%%firearms/gfx/shell/unlock.bmp
+%%HLDSDIR%%firearms/gfx/shell/up.bmp
+%%HLDSDIR%%firearms/gfx/shell/uparrowd.bmp
+%%HLDSDIR%%firearms/gfx/shell/uparrowf.bmp
+%%HLDSDIR%%firearms/gfx/shell/uparrowp.bmp
+%%HLDSDIR%%firearms/gfx/shell/windows.bmp
+%%HLDSDIR%%firearms/gfx/shell/won_logo.bmp
+%%HLDSDIR%%firearms/gfx/vgui/640_12k.tga
+%%HLDSDIR%%firearms/gfx/vgui/640_1911a1.tga
+%%HLDSDIR%%firearms/gfx/vgui/640_92f.tga
+%%HLDSDIR%%firearms/gfx/vgui/640_93r.tga
+%%HLDSDIR%%firearms/gfx/vgui/640_ak47.tga
+%%HLDSDIR%%firearms/gfx/vgui/640_ak74.tga
+%%HLDSDIR%%firearms/gfx/vgui/640_anaconda.tga
+%%HLDSDIR%%firearms/gfx/vgui/640_arms.tga
+%%HLDSDIR%%firearms/gfx/vgui/640_bandages.tga
+%%HLDSDIR%%firearms/gfx/vgui/640_bizon.tga
+%%HLDSDIR%%firearms/gfx/vgui/640_blue_m_01.tga
+%%HLDSDIR%%firearms/gfx/vgui/640_blue_m_02.tga
+%%HLDSDIR%%firearms/gfx/vgui/640_blue_m_03.tga
+%%HLDSDIR%%firearms/gfx/vgui/640_blue_m_04.tga
+%%HLDSDIR%%firearms/gfx/vgui/640_blue_m_05.tga
+%%HLDSDIR%%firearms/gfx/vgui/640_claymore.tga
+%%HLDSDIR%%firearms/gfx/vgui/640_conc.tga
+%%HLDSDIR%%firearms/gfx/vgui/640_deagle.tga
+%%HLDSDIR%%firearms/gfx/vgui/640_dragunov.tga
+%%HLDSDIR%%firearms/gfx/vgui/640_famas.tga
+%%HLDSDIR%%firearms/gfx/vgui/640_frag.tga
+%%HLDSDIR%%firearms/gfx/vgui/640_g36e.tga
+%%HLDSDIR%%firearms/gfx/vgui/640_g3a3.tga
+%%HLDSDIR%%firearms/gfx/vgui/640_heavy.tga
+%%HLDSDIR%%firearms/gfx/vgui/640_helmet.tga
+%%HLDSDIR%%firearms/gfx/vgui/640_knife.tga
+%%HLDSDIR%%firearms/gfx/vgui/640_legs.tga
+%%HLDSDIR%%firearms/gfx/vgui/640_light.tga
+%%HLDSDIR%%firearms/gfx/vgui/640_m16.tga
+%%HLDSDIR%%firearms/gfx/vgui/640_m3.tga
+%%HLDSDIR%%firearms/gfx/vgui/640_m60.tga
+%%HLDSDIR%%firearms/gfx/vgui/640_m79.tga
+%%HLDSDIR%%firearms/gfx/vgui/640_m82.tga
+%%HLDSDIR%%firearms/gfx/vgui/640_medium.tga
+%%HLDSDIR%%firearms/gfx/vgui/640_mp5.tga
+%%HLDSDIR%%firearms/gfx/vgui/640_pkm.tga
+%%HLDSDIR%%firearms/gfx/vgui/640_red_m_01.tga
+%%HLDSDIR%%firearms/gfx/vgui/640_red_m_02.tga
+%%HLDSDIR%%firearms/gfx/vgui/640_red_m_03.tga
+%%HLDSDIR%%firearms/gfx/vgui/640_red_m_04.tga
+%%HLDSDIR%%firearms/gfx/vgui/640_red_m_05.tga
+%%HLDSDIR%%firearms/gfx/vgui/640_ssg3000.tga
+%%HLDSDIR%%firearms/gfx/vgui/640_sterling.tga
+%%HLDSDIR%%firearms/gfx/vgui/640_stg24.tga
+%%HLDSDIR%%firearms/gfx/vgui/640_uzi.tga
+%%HLDSDIR%%firearms/gfx/vgui/mouse.tga
 %%HLDSDIR%%firearms/icon.ico
 %%HLDSDIR%%firearms/liblist.gam
 %%HLDSDIR%%firearms/listenserver.cfg
@@ -345,12 +486,6 @@
 %%PORTDOCS%%%%HLDSDIR%%firearms/maps/ps_coldwar.txt
 %%HLDSDIR%%firearms/maps/ps_crash.bsp
 %%PORTDOCS%%%%HLDSDIR%%firearms/maps/ps_crash.txt
-%%HLDSDIR%%firearms/maps/ps_deadline.bsp
-%%PORTDOCS%%%%HLDSDIR%%firearms/maps/ps_deadline.txt
-%%HLDSDIR%%firearms/maps/ps_greatoutdoors.bsp
-%%PORTDOCS%%%%HLDSDIR%%firearms/maps/ps_greatoutdoors.txt
-%%HLDSDIR%%firearms/maps/ps_inlands.bsp
-%%PORTDOCS%%%%HLDSDIR%%firearms/maps/ps_inlands.txt
 %%HLDSDIR%%firearms/maps/ps_marie.bsp
 %%PORTDOCS%%%%HLDSDIR%%firearms/maps/ps_marie.txt
 %%HLDSDIR%%firearms/maps/ps_river.bsp
@@ -374,6 +509,7 @@
 %%HLDSDIR%%firearms/media/launch_select1.wav
 %%HLDSDIR%%firearms/media/launch_select2.wav
 %%HLDSDIR%%firearms/media/launch_upmenu1.wav
+%%HLDSDIR%%firearms/media/logo.avi
 %%PORTDOCS%%%%HLDSDIR%%firearms/menus/12k.txt
 %%PORTDOCS%%%%HLDSDIR%%firearms/menus/1911a1.txt
 %%PORTDOCS%%%%HLDSDIR%%firearms/menus/92f.txt
@@ -437,12 +573,13 @@
 %%PORTDOCS%%%%HLDSDIR%%firearms/menus/stg24.txt
 %%PORTDOCS%%%%HLDSDIR%%firearms/menus/treat.txt
 %%PORTDOCS%%%%HLDSDIR%%firearms/menus/uzi.txt
-%%HLDSDIR%%firearms/models/REEDS.mdl
 %%HLDSDIR%%firearms/models/belt_link.mdl
+%%HLDSDIR%%firearms/models/boulders.mdl
 %%HLDSDIR%%firearms/models/case.mdl
 %%HLDSDIR%%firearms/models/clip_argl.mdl
 %%HLDSDIR%%firearms/models/faflag.mdl
 %%HLDSDIR%%firearms/models/grenade.mdl
+%%HLDSDIR%%firearms/models/h500.mdl
 %%HLDSDIR%%firearms/models/helmet_blue.mdl
 %%HLDSDIR%%firearms/models/helmet_red.mdl
 %%HLDSDIR%%firearms/models/lilly.mdl
@@ -495,6 +632,7 @@
 %%HLDSDIR%%firearms/models/parachute.mdl
 %%HLDSDIR%%firearms/models/player/blue1/blue1.mdl
 %%HLDSDIR%%firearms/models/player/red1/red1.mdl
+%%HLDSDIR%%firearms/models/reeds.mdl
 %%HLDSDIR%%firearms/models/scp_anaconda.mdl
 %%HLDSDIR%%firearms/models/scp_g36.mdl
 %%HLDSDIR%%firearms/models/scp_m82.mdl
@@ -628,12 +766,15 @@
 %%HLDSDIR%%firearms/sound/ambience/hwk11.wav
 %%HLDSDIR%%firearms/sound/ambience/lc_door.wav
 %%HLDSDIR%%firearms/sound/ambience/mechwine.wav
+%%HLDSDIR%%firearms/sound/ambience/medevac1.wav
+%%HLDSDIR%%firearms/sound/ambience/medevac2.wav
 %%HLDSDIR%%firearms/sound/ambience/mg42.wav
 %%HLDSDIR%%firearms/sound/ambience/mguns.wav
 %%HLDSDIR%%firearms/sound/ambience/nature1.wav
 %%HLDSDIR%%firearms/sound/ambience/nature2.wav
 %%HLDSDIR%%firearms/sound/ambience/obsricos.wav
 %%HLDSDIR%%firearms/sound/ambience/oktoberfest.wav
+%%HLDSDIR%%firearms/sound/ambience/shake.wav
 %%HLDSDIR%%firearms/sound/ambience/snow_hit.wav
 %%HLDSDIR%%firearms/sound/ambience/sp_cavedrips.wav
 %%HLDSDIR%%firearms/sound/ambience/sp_earlybirdies.wav
@@ -752,6 +893,10 @@
 %%HLDSDIR%%firearms/sound/player/pl_pain_5.wav
 %%HLDSDIR%%firearms/sound/player/pl_pain_6.wav
 %%HLDSDIR%%firearms/sound/player/pl_pain_7.wav
+%%HLDSDIR%%firearms/sound/player/pl_snow1.wav
+%%HLDSDIR%%firearms/sound/player/pl_snow2.wav
+%%HLDSDIR%%firearms/sound/player/pl_snow3.wav
+%%HLDSDIR%%firearms/sound/player/pl_snow4.wav
 %%HLDSDIR%%firearms/sound/player/pl_step1.wav
 %%HLDSDIR%%firearms/sound/player/pl_step2.wav
 %%HLDSDIR%%firearms/sound/player/pl_step3.wav
@@ -761,6 +906,7 @@
 %%HLDSDIR%%firearms/sound/player/pl_tile3.wav
 %%HLDSDIR%%firearms/sound/player/pl_tile4.wav
 %%HLDSDIR%%firearms/sound/player/pl_tile5.wav
+%%HLDSDIR%%firearms/sound/player/prone.wav
 %%HLDSDIR%%firearms/sound/player/ringingears.wav
 %%HLDSDIR%%firearms/sound/radio/radio_artreq.wav
 %%HLDSDIR%%firearms/sound/radio/radio_backup1.wav
@@ -896,6 +1042,7 @@
 %%HLDSDIR%%firearms/sound/weapons/m79_latch.wav
 %%HLDSDIR%%firearms/sound/weapons/m79_open.wav
 %%HLDSDIR%%firearms/sound/weapons/m82_cock.wav
+%%HLDSDIR%%firearms/sound/weapons/m82_fire1.sfk
 %%HLDSDIR%%firearms/sound/weapons/m82_fire1.wav
 %%HLDSDIR%%firearms/sound/weapons/m82_magin.wav
 %%HLDSDIR%%firearms/sound/weapons/m82_magout.wav
@@ -981,7 +1128,6 @@
 %%HLDSDIR%%firearms/sprites/640hud06.spr
 %%HLDSDIR%%firearms/sprites/640hud06_2.spr
 %%HLDSDIR%%firearms/sprites/blue.spr
-%%HLDSDIR%%firearms/sprites/blue_blowup.spr
 %%HLDSDIR%%firearms/sprites/camera.spr
 %%HLDSDIR%%firearms/sprites/compass_body03.spr
 %%HLDSDIR%%firearms/sprites/compass_flag.spr
@@ -1045,7 +1191,6 @@
 %%HLDSDIR%%firearms/sprites/rain.spr
 %%HLDSDIR%%firearms/sprites/ranks.spr
 %%HLDSDIR%%firearms/sprites/red.spr
-%%HLDSDIR%%firearms/sprites/red_blowup.spr
 %%HLDSDIR%%firearms/sprites/rein.spr
 %%HLDSDIR%%firearms/sprites/scp_anacond.spr
 %%HLDSDIR%%firearms/sprites/scp_g36.spr
@@ -1092,6 +1237,7 @@
 %%PORTDOCS%%%%HLDSDIR%%firearms/sprites/weapon_stg24.txt
 %%PORTDOCS%%%%HLDSDIR%%firearms/sprites/weapon_svd.txt
 %%PORTDOCS%%%%HLDSDIR%%firearms/sprites/weapon_uzi.txt
+%%PORTDOCS%%%%HLDSDIR%%firearms/titles.txt
 %%HLDSDIR%%firearms/user.scr
 @dirrm %%HLDSDIR%%firearms/sprites
 @dirrm %%HLDSDIR%%firearms/sound/weapons