4 files changed, 19 insertions, 10 deletions

diff --git a/games/sampsvr/Makefile b/games/sampsvr/Makefile
index f81015f946ab..7bebfe63ff83 100644
--- a/games/sampsvr/Makefile
+++ b/games/sampsvr/Makefile
@@ -5,20 +5,23 @@
 # $FreeBSD$
 
 PORTNAME=	sampsvr
-DISTVERSION=	0.2.1.2
+DISTVERSION=	0.2.2
 CATEGORIES=	games linux
 MASTER_SITES=	http://www.sa-mp.com/files/ \
 		http://eu.littlewhitey.com/ \
 		http://dedi.azer.nl/upload/ \
-		http://www.kfcgang.com/files/
-DISTNAME=	samp021r2.svr
+		http://www.kfcgang.com/files/ \
+		http://files.gtanet.com/samp/ \
+		http://thegtaplanet.net/download/ \
+		http://sa-mp.popznet.com/files/
+DISTNAME=	samp022svr
 
 MAINTAINER=	ports@logvinov.com
 COMMENT=	Rockstar's GTA: San Andreas multiplayer modification dedicated server
 
 USE_LINUX=	yes
 NO_BUILD=	yes
-WRKSRC=		${WRKDIR}/samp02
+WRKSRC=		${WRKDIR}/samp022
 USE_DOS2UNIX=	server.cfg *.pwn
 USE_RC_SUBR=	sampd
 SAMPDIR=	${PREFIX}/lib/${PORTNAME}
@@ -36,7 +39,7 @@ SUB_LIST+=	NOTEWORK=""
 
 do-install:
 	${MKDIR} ${SAMPDIR}
-.for i in samp02svr announce
+.for i in samp022svr announce
 	${BRANDELF} -t Linux ${WRKSRC}/${i}
 	${INSTALL_PROGRAM} ${WRKSRC}/${i} ${SAMPDIR}
 .endfor
diff --git a/games/sampsvr/distinfo b/games/sampsvr/distinfo
index e7bc5a7fae57..7d80bb191207 100644
--- a/games/sampsvr/distinfo
+++ b/games/sampsvr/distinfo
@@ -1,3 +1,3 @@
-MD5 (samp021r2.svr.tar.gz) = fcc54c2fed50738f8a48e602f7922503
-SHA256 (samp021r2.svr.tar.gz) = 70e5ae5dfea5837b4e42d83d3a00811f48cbc26daf20bb87ddde4a4f73ed659b
-SIZE (samp021r2.svr.tar.gz) = 361617
+MD5 (samp022svr.tar.gz) = dea3b86a7303a6527912685635b46e60
+SHA256 (samp022svr.tar.gz) = 3864ec979421834e252df8ff98c03c31978c6e18805c13378cbcf2acfa761065
+SIZE (samp022svr.tar.gz) = 569540
diff --git a/games/sampsvr/files/sampd.in b/games/sampsvr/files/sampd.in
index adba228e400a..5346eb2c77a5 100644
--- a/games/sampsvr/files/sampd.in
+++ b/games/sampsvr/files/sampd.in
@@ -20,7 +20,7 @@ load_rc_config $name
 : ${sampd_enable="NO"}
 : ${sampd_chdir="%%SAMPDIR%%"}
 
-command="%%SAMPDIR%%/samp02svr"
+command="%%SAMPDIR%%/samp022svr"
 command_args="> /dev/null &"
 required_files="%%PREFIX%%/etc/sampsvr.cfg"
 start_precmd="sampd_prestart"
diff --git a/games/sampsvr/pkg-plist b/games/sampsvr/pkg-plist
index babbb91cfc37..97b70f63adea 100644
--- a/games/sampsvr/pkg-plist
+++ b/games/sampsvr/pkg-plist
@@ -1,16 +1,19 @@
 @unexec if cmp -s %D/etc/sampsvr.cfg %D/etc/sampsvr.cfg.dist; then rm -f %D/etc/sampsvr.cfg; fi
 etc/sampsvr.cfg.dist
 @exec [ -f %B/sampsvr.cfg ] || cp %B/%f %B/sampsvr.cfg
-%%SAMPDIR%%/samp02svr
+%%SAMPDIR%%/samp022svr
 %%SAMPDIR%%/announce
 %%SAMPDIR%%/server.cfg
 %%SAMPDIR%%/filterscripts
 %%SAMPDIR%%/gamemodes
+%%DATADIR%%/filterscripts/DEBUG_05.amx
 %%DATADIR%%/filterscripts/actions.amx
 %%DATADIR%%/filterscripts/actions.pwn
 %%DATADIR%%/filterscripts/adminspec.amx
 %%DATADIR%%/filterscripts/adminspec.pwn
 %%DATADIR%%/filterscripts/olddance.pwn
+%%DATADIR%%/filterscripts/vactions.pwn
+%%DATADIR%%/filterscripts/vactions.amx
 %%DATADIR%%/gamemodes/area51.amx
 %%DATADIR%%/gamemodes/area51.pwn
 %%DATADIR%%/gamemodes/barron.amx
@@ -33,10 +36,13 @@ etc/sampsvr.cfg.dist
 %%DATADIR%%/gamemodes/monster.pwn
 %%DATADIR%%/gamemodes/rivershell.amx
 %%DATADIR%%/gamemodes/rivershell.pwn
+%%DATADIR%%/gamemodes/rivershell2.amx
 %%DATADIR%%/gamemodes/sftdm.amx
 %%DATADIR%%/gamemodes/sftdm.pwn
 %%DATADIR%%/gamemodes/sniper.amx
 %%DATADIR%%/gamemodes/sniper.pwn
+%%DATADIR%%/gamemodes/timertest.pwn
+%%DATADIR%%/gamemodes/timertest.amx
 @dirrmtry %%DATADIR%%/gamemodes
 @dirrmtry %%DATADIR%%/filterscripts
 @dirrmtry %%DATADIR%%