Update to version 3.0a

Submitted by:	maintainer

6 files changed, 26 insertions, 22 deletions

diff --git a/games/q3server-wfa/Makefile b/games/q3server-wfa/Makefile
index 480d1f7..ac2e1a1 100644
--- a/games/q3server-wfa/Makefile
+++ b/games/q3server-wfa/Makefile
@@ -6,14 +6,13 @@
 #
 
 PORTNAME=	wfa
-PORTVERSION=	2.9
-MASTER_SITES=	http://www2.qlabo.com/q3a/uac/mods/wfa/ \
-		http://www.q3wfa.com/ \
-		http://www.leftunsaid.com/ \
+PORTVERSION=	3.0a
+MASTER_SITES=	ftp://fileplanet.ngi.it/fileplanet2/captured/weaponsfactory/quake3/ \
 		ftp://ftp.planet-multiplayer.de/pub/gamesmania/pm/q3a/win32/mods/weapon_factory/
-DISTNAME=	WFA-Setup-v${PORTVERSION:S/.//}
+DISTFILES=	WFA-fSetup-v30.zip \
+		WFA-v30a-patch.zip
 
-NO_WRKSUBDIR=	yes
+EXTRACT_BEFORE_ARGS=	-o -qq
 
 Q3_MOD_MASTER=	${.CURDIR}/../q3server-ra3
 
diff --git a/games/q3server-wfa/distinfo b/games/q3server-wfa/distinfo
index b49c760..93d86e1 100644
--- a/games/q3server-wfa/distinfo
+++ b/games/q3server-wfa/distinfo
@@ -1 +1,2 @@
-MD5 (WFA-Setup-v29.zip) = fc1d27543aadb5ae8934b2fc91f9ee73
+MD5 (WFA-fSetup-v30.zip) = 59c2d6509ce14e123cd1befb59ecbfcb
+MD5 (WFA-v30a-patch.zip) = ff6824e412b650ea10bfcc0939765752
diff --git a/games/q3server-wfa/pkg-plist b/games/q3server-wfa/pkg-plist
index 4f504b7..6323a4f 100644
--- a/games/q3server-wfa/pkg-plist
+++ b/games/q3server-wfa/pkg-plist
@@ -1,7 +1,8 @@
 %%PORTDOCS%%%%Q3DIR%%Q3-WFA.qst
 %%PORTDOCS%%%%Q3DIR%%WFA EULA.doc
-%%PORTDOCS%%%%Q3DIR%%WFA Version 2.9 Changes.doc
+%%PORTDOCS%%%%Q3DIR%%WFA Version 3.0 Changes.doc
 %%Q3DIR%%WFA-Media-ClanTags.pk3
+%%Q3DIR%%WFA-Media-Hud.pk3
 %%Q3DIR%%WFA-Media-Models.pk3
 %%Q3DIR%%WFA-Media-Players.pk3
 %%Q3DIR%%WFA-Media-Radio.pk3
@@ -10,9 +11,8 @@
 %%Q3DIR%%WFA-Media-Taunts.pk3
 %%Q3DIR%%WFA-Media-Textures.pk3
 %%Q3DIR%%WFA-Media-VM.pk3
-%%Q3DIR%%WFA-Media-hud.pk3
 %%PORTDOCS%%%%Q3DIR%%help/Binds.doc
-%%PORTDOCS%%%%Q3DIR%%help/BobWFACfgV201.exe
+%%PORTDOCS%%%%Q3DIR%%help/BobWFACfgV230.exe
 %%PORTDOCS%%%%Q3DIR%%help/ClassBinds.doc
 %%PORTDOCS%%%%Q3DIR%%help/ClientCmds.doc
 %%PORTDOCS%%%%Q3DIR%%help/ServerCmds.doc
@@ -24,8 +24,10 @@
 %%PORTDOCS%%%%Q3DIR%%help/readme-server.html
 %%PORTDOCS%%%%Q3DIR%%help/website.url
 %%Q3DIR%%map-sat2-wfa.pk3
+%%Q3DIR%%map-sky-wfa.pk3
+%%Q3DIR%%maplist.cfg
 %%PORTDOCS%%%%Q3DIR%%readme.txt
-%%Q3DIR%%wfa-ini.cfg
+%%Q3DIR%%servercfg.cfg
 %%Q3DIR%%wfa-server.cfg
 %%PORTDOCS%%%%Q3DIR%%wfa.ico
 %%PORTDOCS%%@dirrm %%Q3DIR%%help
diff --git a/games/quake3-wfa/Makefile b/games/quake3-wfa/Makefile
index 480d1f7..ac2e1a1 100644
--- a/games/quake3-wfa/Makefile
+++ b/games/quake3-wfa/Makefile
@@ -6,14 +6,13 @@
 #
 
 PORTNAME=	wfa
-PORTVERSION=	2.9
-MASTER_SITES=	http://www2.qlabo.com/q3a/uac/mods/wfa/ \
-		http://www.q3wfa.com/ \
-		http://www.leftunsaid.com/ \
+PORTVERSION=	3.0a
+MASTER_SITES=	ftp://fileplanet.ngi.it/fileplanet2/captured/weaponsfactory/quake3/ \
 		ftp://ftp.planet-multiplayer.de/pub/gamesmania/pm/q3a/win32/mods/weapon_factory/
-DISTNAME=	WFA-Setup-v${PORTVERSION:S/.//}
+DISTFILES=	WFA-fSetup-v30.zip \
+		WFA-v30a-patch.zip
 
-NO_WRKSUBDIR=	yes
+EXTRACT_BEFORE_ARGS=	-o -qq
 
 Q3_MOD_MASTER=	${.CURDIR}/../q3server-ra3
 
diff --git a/games/quake3-wfa/distinfo b/games/quake3-wfa/distinfo
index b49c760..93d86e1 100644
--- a/games/quake3-wfa/distinfo
+++ b/games/quake3-wfa/distinfo
@@ -1 +1,2 @@
-MD5 (WFA-Setup-v29.zip) = fc1d27543aadb5ae8934b2fc91f9ee73
+MD5 (WFA-fSetup-v30.zip) = 59c2d6509ce14e123cd1befb59ecbfcb
+MD5 (WFA-v30a-patch.zip) = ff6824e412b650ea10bfcc0939765752
diff --git a/games/quake3-wfa/pkg-plist b/games/quake3-wfa/pkg-plist
index 4f504b7..6323a4f 100644
--- a/games/quake3-wfa/pkg-plist
+++ b/games/quake3-wfa/pkg-plist
@@ -1,7 +1,8 @@
 %%PORTDOCS%%%%Q3DIR%%Q3-WFA.qst
 %%PORTDOCS%%%%Q3DIR%%WFA EULA.doc
-%%PORTDOCS%%%%Q3DIR%%WFA Version 2.9 Changes.doc
+%%PORTDOCS%%%%Q3DIR%%WFA Version 3.0 Changes.doc
 %%Q3DIR%%WFA-Media-ClanTags.pk3
+%%Q3DIR%%WFA-Media-Hud.pk3
 %%Q3DIR%%WFA-Media-Models.pk3
 %%Q3DIR%%WFA-Media-Players.pk3
 %%Q3DIR%%WFA-Media-Radio.pk3
@@ -10,9 +11,8 @@
 %%Q3DIR%%WFA-Media-Taunts.pk3
 %%Q3DIR%%WFA-Media-Textures.pk3
 %%Q3DIR%%WFA-Media-VM.pk3
-%%Q3DIR%%WFA-Media-hud.pk3
 %%PORTDOCS%%%%Q3DIR%%help/Binds.doc
-%%PORTDOCS%%%%Q3DIR%%help/BobWFACfgV201.exe
+%%PORTDOCS%%%%Q3DIR%%help/BobWFACfgV230.exe
 %%PORTDOCS%%%%Q3DIR%%help/ClassBinds.doc
 %%PORTDOCS%%%%Q3DIR%%help/ClientCmds.doc
 %%PORTDOCS%%%%Q3DIR%%help/ServerCmds.doc
@@ -24,8 +24,10 @@
 %%PORTDOCS%%%%Q3DIR%%help/readme-server.html
 %%PORTDOCS%%%%Q3DIR%%help/website.url
 %%Q3DIR%%map-sat2-wfa.pk3
+%%Q3DIR%%map-sky-wfa.pk3
+%%Q3DIR%%maplist.cfg
 %%PORTDOCS%%%%Q3DIR%%readme.txt
-%%Q3DIR%%wfa-ini.cfg
+%%Q3DIR%%servercfg.cfg
 %%Q3DIR%%wfa-server.cfg
 %%PORTDOCS%%%%Q3DIR%%wfa.ico
 %%PORTDOCS%%@dirrm %%Q3DIR%%help