- update to 3.0 beta

- add more MASTER_SITES
- include the map pack

PR:		29990
Submitted by:	maintainer
Reviewed by:	ade

6 files changed, 50 insertions, 18 deletions

diff --git a/games/q3server-wfa/Makefile b/games/q3server-wfa/Makefile
index ac2e1a18c356..3a82ffc31fd2 100644
--- a/games/q3server-wfa/Makefile
+++ b/games/q3server-wfa/Makefile
@@ -6,11 +6,13 @@
 #
 
 PORTNAME=	wfa
-PORTVERSION=	3.0a
-MASTER_SITES=	ftp://fileplanet.ngi.it/fileplanet2/captured/weaponsfactory/quake3/ \
+PORTVERSION=	3.0b
+MASTER_SITES=	ftp://mirror1.planetice.net/pub/wfa/ \
+		ftp://mirror2.planetice.net/pub/wfa/ \
+		http://www.webplusdesign.com/downloads/ \
 		ftp://ftp.planet-multiplayer.de/pub/gamesmania/pm/q3a/win32/mods/weapon_factory/
-DISTFILES=	WFA-fSetup-v30.zip \
-		WFA-v30a-patch.zip
+DISTFILES=	WFA-fSetup-v30b.zip \
+		WFA-f30bMaps.zip
 
 EXTRACT_BEFORE_ARGS=	-o -qq
 
diff --git a/games/q3server-wfa/distinfo b/games/q3server-wfa/distinfo
index 93d86e1fab84..ae900355e75a 100644
--- a/games/q3server-wfa/distinfo
+++ b/games/q3server-wfa/distinfo
@@ -1,2 +1,2 @@
-MD5 (WFA-fSetup-v30.zip) = 59c2d6509ce14e123cd1befb59ecbfcb
-MD5 (WFA-v30a-patch.zip) = ff6824e412b650ea10bfcc0939765752
+MD5 (WFA-fSetup-v30b.zip) = a21e3ccea9d4f90025b40891347a296a
+MD5 (WFA-f30bMaps.zip) = 6ce30eba06e99e3b1df5f0d24936a555
diff --git a/games/q3server-wfa/pkg-plist b/games/q3server-wfa/pkg-plist
index 6323a4f062de..c15049fd35b3 100644
--- a/games/q3server-wfa/pkg-plist
+++ b/games/q3server-wfa/pkg-plist
@@ -1,7 +1,7 @@
 %%PORTDOCS%%%%Q3DIR%%Q3-WFA.qst
 %%PORTDOCS%%%%Q3DIR%%WFA EULA.doc
 %%PORTDOCS%%%%Q3DIR%%WFA Version 3.0 Changes.doc
-%%Q3DIR%%WFA-Media-ClanTags.pk3
+%%PORTDOCS%%%%Q3DIR%%WFA Version 3.0b Changes.doc
 %%Q3DIR%%WFA-Media-Hud.pk3
 %%Q3DIR%%WFA-Media-Models.pk3
 %%Q3DIR%%WFA-Media-Players.pk3
@@ -12,23 +12,37 @@
 %%Q3DIR%%WFA-Media-Textures.pk3
 %%Q3DIR%%WFA-Media-VM.pk3
 %%PORTDOCS%%%%Q3DIR%%help/Binds.doc
-%%PORTDOCS%%%%Q3DIR%%help/BobWFACfgV230.exe
 %%PORTDOCS%%%%Q3DIR%%help/ClassBinds.doc
 %%PORTDOCS%%%%Q3DIR%%help/ClientCmds.doc
 %%PORTDOCS%%%%Q3DIR%%help/ServerCmds.doc
 %%PORTDOCS%%%%Q3DIR%%help/WFA-FAQ-Version-29.html
 %%PORTDOCS%%%%Q3DIR%%help/WFA-Linux-Server-Docs.htm
 %%PORTDOCS%%%%Q3DIR%%help/WFA-Win32-Server-Docs.htm
+%%PORTDOCS%%%%Q3DIR%%help/q3map.zip
 %%PORTDOCS%%%%Q3DIR%%help/question.ico
 %%PORTDOCS%%%%Q3DIR%%help/readme-client.html
 %%PORTDOCS%%%%Q3DIR%%help/readme-server.html
 %%PORTDOCS%%%%Q3DIR%%help/website.url
+%%Q3DIR%%map-0fear-wfa.pk3
+%%Q3DIR%%map-2castles-wfa.pk3
+%%Q3DIR%%map-2fort2001-wfa.pk3
+%%Q3DIR%%map-3level1-wfa.pk3
+%%Q3DIR%%map-acid-wfa.pk3
+%%Q3DIR%%map-cancer1-wfa.pk3
+%%Q3DIR%%map-denali-wfa.pk3
+%%Q3DIR%%map-elevate2-wfa.pk3
+%%Q3DIR%%map-elguapodos-wfa.pk3
+%%Q3DIR%%map-fallout2-wfa.pk3
+%%Q3DIR%%map-gensurf-wfa.pk3
+%%Q3DIR%%map-map9-wfa.pk3
 %%Q3DIR%%map-sat2-wfa.pk3
 %%Q3DIR%%map-sky-wfa.pk3
+%%Q3DIR%%map-tcf-wfa.pk3
+%%Q3DIR%%map-theslab-wfa.pk3
+%%Q3DIR%%map-zardoz-wfa.pk3
 %%Q3DIR%%maplist.cfg
 %%PORTDOCS%%%%Q3DIR%%readme.txt
 %%Q3DIR%%servercfg.cfg
 %%Q3DIR%%wfa-server.cfg
-%%PORTDOCS%%%%Q3DIR%%wfa.ico
 %%PORTDOCS%%@dirrm %%Q3DIR%%help
 @dirrm %%Q3DIR%%
diff --git a/games/quake3-wfa/Makefile b/games/quake3-wfa/Makefile
index ac2e1a18c356..3a82ffc31fd2 100644
--- a/games/quake3-wfa/Makefile
+++ b/games/quake3-wfa/Makefile
@@ -6,11 +6,13 @@
 #
 
 PORTNAME=	wfa
-PORTVERSION=	3.0a
-MASTER_SITES=	ftp://fileplanet.ngi.it/fileplanet2/captured/weaponsfactory/quake3/ \
+PORTVERSION=	3.0b
+MASTER_SITES=	ftp://mirror1.planetice.net/pub/wfa/ \
+		ftp://mirror2.planetice.net/pub/wfa/ \
+		http://www.webplusdesign.com/downloads/ \
 		ftp://ftp.planet-multiplayer.de/pub/gamesmania/pm/q3a/win32/mods/weapon_factory/
-DISTFILES=	WFA-fSetup-v30.zip \
-		WFA-v30a-patch.zip
+DISTFILES=	WFA-fSetup-v30b.zip \
+		WFA-f30bMaps.zip
 
 EXTRACT_BEFORE_ARGS=	-o -qq
 
diff --git a/games/quake3-wfa/distinfo b/games/quake3-wfa/distinfo
index 93d86e1fab84..ae900355e75a 100644
--- a/games/quake3-wfa/distinfo
+++ b/games/quake3-wfa/distinfo
@@ -1,2 +1,2 @@
-MD5 (WFA-fSetup-v30.zip) = 59c2d6509ce14e123cd1befb59ecbfcb
-MD5 (WFA-v30a-patch.zip) = ff6824e412b650ea10bfcc0939765752
+MD5 (WFA-fSetup-v30b.zip) = a21e3ccea9d4f90025b40891347a296a
+MD5 (WFA-f30bMaps.zip) = 6ce30eba06e99e3b1df5f0d24936a555
diff --git a/games/quake3-wfa/pkg-plist b/games/quake3-wfa/pkg-plist
index 6323a4f062de..c15049fd35b3 100644
--- a/games/quake3-wfa/pkg-plist
+++ b/games/quake3-wfa/pkg-plist
@@ -1,7 +1,7 @@
 %%PORTDOCS%%%%Q3DIR%%Q3-WFA.qst
 %%PORTDOCS%%%%Q3DIR%%WFA EULA.doc
 %%PORTDOCS%%%%Q3DIR%%WFA Version 3.0 Changes.doc
-%%Q3DIR%%WFA-Media-ClanTags.pk3
+%%PORTDOCS%%%%Q3DIR%%WFA Version 3.0b Changes.doc
 %%Q3DIR%%WFA-Media-Hud.pk3
 %%Q3DIR%%WFA-Media-Models.pk3
 %%Q3DIR%%WFA-Media-Players.pk3
@@ -12,23 +12,37 @@
 %%Q3DIR%%WFA-Media-Textures.pk3
 %%Q3DIR%%WFA-Media-VM.pk3
 %%PORTDOCS%%%%Q3DIR%%help/Binds.doc
-%%PORTDOCS%%%%Q3DIR%%help/BobWFACfgV230.exe
 %%PORTDOCS%%%%Q3DIR%%help/ClassBinds.doc
 %%PORTDOCS%%%%Q3DIR%%help/ClientCmds.doc
 %%PORTDOCS%%%%Q3DIR%%help/ServerCmds.doc
 %%PORTDOCS%%%%Q3DIR%%help/WFA-FAQ-Version-29.html
 %%PORTDOCS%%%%Q3DIR%%help/WFA-Linux-Server-Docs.htm
 %%PORTDOCS%%%%Q3DIR%%help/WFA-Win32-Server-Docs.htm
+%%PORTDOCS%%%%Q3DIR%%help/q3map.zip
 %%PORTDOCS%%%%Q3DIR%%help/question.ico
 %%PORTDOCS%%%%Q3DIR%%help/readme-client.html
 %%PORTDOCS%%%%Q3DIR%%help/readme-server.html
 %%PORTDOCS%%%%Q3DIR%%help/website.url
+%%Q3DIR%%map-0fear-wfa.pk3
+%%Q3DIR%%map-2castles-wfa.pk3
+%%Q3DIR%%map-2fort2001-wfa.pk3
+%%Q3DIR%%map-3level1-wfa.pk3
+%%Q3DIR%%map-acid-wfa.pk3
+%%Q3DIR%%map-cancer1-wfa.pk3
+%%Q3DIR%%map-denali-wfa.pk3
+%%Q3DIR%%map-elevate2-wfa.pk3
+%%Q3DIR%%map-elguapodos-wfa.pk3
+%%Q3DIR%%map-fallout2-wfa.pk3
+%%Q3DIR%%map-gensurf-wfa.pk3
+%%Q3DIR%%map-map9-wfa.pk3
 %%Q3DIR%%map-sat2-wfa.pk3
 %%Q3DIR%%map-sky-wfa.pk3
+%%Q3DIR%%map-tcf-wfa.pk3
+%%Q3DIR%%map-theslab-wfa.pk3
+%%Q3DIR%%map-zardoz-wfa.pk3
 %%Q3DIR%%maplist.cfg
 %%PORTDOCS%%%%Q3DIR%%readme.txt
 %%Q3DIR%%servercfg.cfg
 %%Q3DIR%%wfa-server.cfg
-%%PORTDOCS%%%%Q3DIR%%wfa.ico
 %%PORTDOCS%%@dirrm %%Q3DIR%%help
 @dirrm %%Q3DIR%%