Update to 3.3

6 files changed, 92 insertions, 82 deletions

diff --git a/games/q3server-wfa/Makefile b/games/q3server-wfa/Makefile
index 3a82ffc31fd2..f9fccbe268df 100644
--- a/games/q3server-wfa/Makefile
+++ b/games/q3server-wfa/Makefile
@@ -6,15 +6,15 @@
 #
 
 PORTNAME=	wfa
-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-v30b.zip \
-		WFA-f30bMaps.zip
+PORTVERSION=	3.3
+MASTER_SITES=	ftp://flanders.worldogl.com/wfa/ \
+		ftp://urgentfury.org/pub/quake3/ \
+		http://www.thunderdome.ws/files/quake3/mods/wfa_33/linux-mac/
+DISTFILES=	WFA_Media_v33.zip WFA_MapPack1_v33.zip \
+		WFA_MapPack2_v33.zip
 
 EXTRACT_BEFORE_ARGS=	-o -qq
+NO_WRKSUBDIR=	yes
 
 Q3_MOD_MASTER=	${.CURDIR}/../q3server-ra3
 
diff --git a/games/q3server-wfa/distinfo b/games/q3server-wfa/distinfo
index ae900355e75a..25b87e82c2e0 100644
--- a/games/q3server-wfa/distinfo
+++ b/games/q3server-wfa/distinfo
@@ -1,2 +1,3 @@
-MD5 (WFA-fSetup-v30b.zip) = a21e3ccea9d4f90025b40891347a296a
-MD5 (WFA-f30bMaps.zip) = 6ce30eba06e99e3b1df5f0d24936a555
+MD5 (WFA_Media_v33.zip) = dee5b4d968754e7f0c96473227948406
+MD5 (WFA_MapPack1_v33.zip) = 26f67ec4bc5bcc52cca264b6d0d04839
+MD5 (WFA_MapPack2_v33.zip) = 06b605ce4ab8b42da60895a32274490c
diff --git a/games/q3server-wfa/pkg-plist b/games/q3server-wfa/pkg-plist
index c15049fd35b3..733015992345 100644
--- a/games/q3server-wfa/pkg-plist
+++ b/games/q3server-wfa/pkg-plist
@@ -1,48 +1,52 @@
-%%PORTDOCS%%%%Q3DIR%%Q3-WFA.qst
-%%PORTDOCS%%%%Q3DIR%%WFA EULA.doc
-%%PORTDOCS%%%%Q3DIR%%WFA Version 3.0 Changes.doc
-%%PORTDOCS%%%%Q3DIR%%WFA Version 3.0b Changes.doc
-%%Q3DIR%%WFA-Media-Hud.pk3
-%%Q3DIR%%WFA-Media-Models.pk3
-%%Q3DIR%%WFA-Media-Players.pk3
-%%Q3DIR%%WFA-Media-Radio.pk3
-%%Q3DIR%%WFA-Media-Scripts.pk3
-%%Q3DIR%%WFA-Media-Sound.pk3
-%%Q3DIR%%WFA-Media-Taunts.pk3
-%%Q3DIR%%WFA-Media-Textures.pk3
-%%Q3DIR%%WFA-Media-VM.pk3
-%%PORTDOCS%%%%Q3DIR%%help/Binds.doc
-%%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%%Changes for WFA v3.3.txt
+%%PORTDOCS%%%%Q3DIR%%Description.txt
+%%Q3DIR%%WFA-Media-!English-Radio.pk3
+%%PORTDOCS%%%%Q3DIR%%help/!English-Radio-readme.txt
+%%PORTDOCS%%%%Q3DIR%%help/Example-Configs-!English-Radio.zip
+%%PORTDOCS%%%%Q3DIR%%help/Linux_known_issues.htm
+%%PORTDOCS%%%%Q3DIR%%help/WFA-Class-Binds.html
+%%PORTDOCS%%%%Q3DIR%%help/WFA-Client-Binds.html
+%%PORTDOCS%%%%Q3DIR%%help/WFA-Client-Cmds.html
+%%PORTDOCS%%%%Q3DIR%%help/WFA-Community.url
+%%PORTDOCS%%%%Q3DIR%%help/WFA-FAQ-Version-33.html
+%%PORTDOCS%%%%Q3DIR%%help/WFA-Linux-Server-Docs.html
+%%PORTDOCS%%%%Q3DIR%%help/WFA-Server-Cmds.html
+%%PORTDOCS%%%%Q3DIR%%help/WFA-Website.url
+%%PORTDOCS%%%%Q3DIR%%help/WFA-Win32-Server-Docs.html
+%%PORTDOCS%%%%Q3DIR%%help/WFA.qst
+%%PORTDOCS%%%%Q3DIR%%help/maplist.cfg
 %%PORTDOCS%%%%Q3DIR%%help/question.ico
-%%PORTDOCS%%%%Q3DIR%%help/readme-client.html
-%%PORTDOCS%%%%Q3DIR%%help/readme-server.html
-%%PORTDOCS%%%%Q3DIR%%help/website.url
+%%PORTDOCS%%%%Q3DIR%%help/servercfg.cfg
+%%PORTDOCS%%%%Q3DIR%%help/wfa-client.cfg
+%%PORTDOCS%%%%Q3DIR%%help/wfa-server.cfg
+%%PORTDOCS%%%%Q3DIR%%help/wfa.ico
 %%Q3DIR%%map-0fear-wfa.pk3
-%%Q3DIR%%map-2castles-wfa.pk3
 %%Q3DIR%%map-2fort2001-wfa.pk3
+%%Q3DIR%%map-2weak-wfa.pk3
 %%Q3DIR%%map-3level1-wfa.pk3
-%%Q3DIR%%map-acid-wfa.pk3
-%%Q3DIR%%map-cancer1-wfa.pk3
+%%Q3DIR%%map-cancer2-wfa.pk3
+%%Q3DIR%%map-cbases-wfa.pk3
+%%Q3DIR%%map-courts-wfa.pk3
+%%Q3DIR%%map-cruel3-wfa.pk3
 %%Q3DIR%%map-denali-wfa.pk3
+%%Q3DIR%%map-element-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-entropy-wfa.pk3
+%%Q3DIR%%map-fallout3-wfa.pk3
+%%Q3DIR%%map-ravfort-wfa.pk3
 %%Q3DIR%%map-sat2-wfa.pk3
 %%Q3DIR%%map-sky-wfa.pk3
+%%Q3DIR%%map-spbite-wfa.pk3
 %%Q3DIR%%map-tcf-wfa.pk3
 %%Q3DIR%%map-theslab-wfa.pk3
+%%Q3DIR%%map-torrent-wfa.pk3
 %%Q3DIR%%map-zardoz-wfa.pk3
 %%Q3DIR%%maplist.cfg
-%%PORTDOCS%%%%Q3DIR%%readme.txt
+%%Q3DIR%%pak33.pk3
+%%PORTDOCS%%%%Q3DIR%%readme-client.html
+%%PORTDOCS%%%%Q3DIR%%readme-server.html
 %%Q3DIR%%servercfg.cfg
+%%Q3DIR%%wfa-client.cfg
 %%Q3DIR%%wfa-server.cfg
 %%PORTDOCS%%@dirrm %%Q3DIR%%help
 @dirrm %%Q3DIR%%
diff --git a/games/quake3-wfa/Makefile b/games/quake3-wfa/Makefile
index 3a82ffc31fd2..f9fccbe268df 100644
--- a/games/quake3-wfa/Makefile
+++ b/games/quake3-wfa/Makefile
@@ -6,15 +6,15 @@
 #
 
 PORTNAME=	wfa
-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-v30b.zip \
-		WFA-f30bMaps.zip
+PORTVERSION=	3.3
+MASTER_SITES=	ftp://flanders.worldogl.com/wfa/ \
+		ftp://urgentfury.org/pub/quake3/ \
+		http://www.thunderdome.ws/files/quake3/mods/wfa_33/linux-mac/
+DISTFILES=	WFA_Media_v33.zip WFA_MapPack1_v33.zip \
+		WFA_MapPack2_v33.zip
 
 EXTRACT_BEFORE_ARGS=	-o -qq
+NO_WRKSUBDIR=	yes
 
 Q3_MOD_MASTER=	${.CURDIR}/../q3server-ra3
 
diff --git a/games/quake3-wfa/distinfo b/games/quake3-wfa/distinfo
index ae900355e75a..25b87e82c2e0 100644
--- a/games/quake3-wfa/distinfo
+++ b/games/quake3-wfa/distinfo
@@ -1,2 +1,3 @@
-MD5 (WFA-fSetup-v30b.zip) = a21e3ccea9d4f90025b40891347a296a
-MD5 (WFA-f30bMaps.zip) = 6ce30eba06e99e3b1df5f0d24936a555
+MD5 (WFA_Media_v33.zip) = dee5b4d968754e7f0c96473227948406
+MD5 (WFA_MapPack1_v33.zip) = 26f67ec4bc5bcc52cca264b6d0d04839
+MD5 (WFA_MapPack2_v33.zip) = 06b605ce4ab8b42da60895a32274490c
diff --git a/games/quake3-wfa/pkg-plist b/games/quake3-wfa/pkg-plist
index c15049fd35b3..733015992345 100644
--- a/games/quake3-wfa/pkg-plist
+++ b/games/quake3-wfa/pkg-plist
@@ -1,48 +1,52 @@
-%%PORTDOCS%%%%Q3DIR%%Q3-WFA.qst
-%%PORTDOCS%%%%Q3DIR%%WFA EULA.doc
-%%PORTDOCS%%%%Q3DIR%%WFA Version 3.0 Changes.doc
-%%PORTDOCS%%%%Q3DIR%%WFA Version 3.0b Changes.doc
-%%Q3DIR%%WFA-Media-Hud.pk3
-%%Q3DIR%%WFA-Media-Models.pk3
-%%Q3DIR%%WFA-Media-Players.pk3
-%%Q3DIR%%WFA-Media-Radio.pk3
-%%Q3DIR%%WFA-Media-Scripts.pk3
-%%Q3DIR%%WFA-Media-Sound.pk3
-%%Q3DIR%%WFA-Media-Taunts.pk3
-%%Q3DIR%%WFA-Media-Textures.pk3
-%%Q3DIR%%WFA-Media-VM.pk3
-%%PORTDOCS%%%%Q3DIR%%help/Binds.doc
-%%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%%Changes for WFA v3.3.txt
+%%PORTDOCS%%%%Q3DIR%%Description.txt
+%%Q3DIR%%WFA-Media-!English-Radio.pk3
+%%PORTDOCS%%%%Q3DIR%%help/!English-Radio-readme.txt
+%%PORTDOCS%%%%Q3DIR%%help/Example-Configs-!English-Radio.zip
+%%PORTDOCS%%%%Q3DIR%%help/Linux_known_issues.htm
+%%PORTDOCS%%%%Q3DIR%%help/WFA-Class-Binds.html
+%%PORTDOCS%%%%Q3DIR%%help/WFA-Client-Binds.html
+%%PORTDOCS%%%%Q3DIR%%help/WFA-Client-Cmds.html
+%%PORTDOCS%%%%Q3DIR%%help/WFA-Community.url
+%%PORTDOCS%%%%Q3DIR%%help/WFA-FAQ-Version-33.html
+%%PORTDOCS%%%%Q3DIR%%help/WFA-Linux-Server-Docs.html
+%%PORTDOCS%%%%Q3DIR%%help/WFA-Server-Cmds.html
+%%PORTDOCS%%%%Q3DIR%%help/WFA-Website.url
+%%PORTDOCS%%%%Q3DIR%%help/WFA-Win32-Server-Docs.html
+%%PORTDOCS%%%%Q3DIR%%help/WFA.qst
+%%PORTDOCS%%%%Q3DIR%%help/maplist.cfg
 %%PORTDOCS%%%%Q3DIR%%help/question.ico
-%%PORTDOCS%%%%Q3DIR%%help/readme-client.html
-%%PORTDOCS%%%%Q3DIR%%help/readme-server.html
-%%PORTDOCS%%%%Q3DIR%%help/website.url
+%%PORTDOCS%%%%Q3DIR%%help/servercfg.cfg
+%%PORTDOCS%%%%Q3DIR%%help/wfa-client.cfg
+%%PORTDOCS%%%%Q3DIR%%help/wfa-server.cfg
+%%PORTDOCS%%%%Q3DIR%%help/wfa.ico
 %%Q3DIR%%map-0fear-wfa.pk3
-%%Q3DIR%%map-2castles-wfa.pk3
 %%Q3DIR%%map-2fort2001-wfa.pk3
+%%Q3DIR%%map-2weak-wfa.pk3
 %%Q3DIR%%map-3level1-wfa.pk3
-%%Q3DIR%%map-acid-wfa.pk3
-%%Q3DIR%%map-cancer1-wfa.pk3
+%%Q3DIR%%map-cancer2-wfa.pk3
+%%Q3DIR%%map-cbases-wfa.pk3
+%%Q3DIR%%map-courts-wfa.pk3
+%%Q3DIR%%map-cruel3-wfa.pk3
 %%Q3DIR%%map-denali-wfa.pk3
+%%Q3DIR%%map-element-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-entropy-wfa.pk3
+%%Q3DIR%%map-fallout3-wfa.pk3
+%%Q3DIR%%map-ravfort-wfa.pk3
 %%Q3DIR%%map-sat2-wfa.pk3
 %%Q3DIR%%map-sky-wfa.pk3
+%%Q3DIR%%map-spbite-wfa.pk3
 %%Q3DIR%%map-tcf-wfa.pk3
 %%Q3DIR%%map-theslab-wfa.pk3
+%%Q3DIR%%map-torrent-wfa.pk3
 %%Q3DIR%%map-zardoz-wfa.pk3
 %%Q3DIR%%maplist.cfg
-%%PORTDOCS%%%%Q3DIR%%readme.txt
+%%Q3DIR%%pak33.pk3
+%%PORTDOCS%%%%Q3DIR%%readme-client.html
+%%PORTDOCS%%%%Q3DIR%%readme-server.html
 %%Q3DIR%%servercfg.cfg
+%%Q3DIR%%wfa-client.cfg
 %%Q3DIR%%wfa-server.cfg
 %%PORTDOCS%%@dirrm %%Q3DIR%%help
 @dirrm %%Q3DIR%%