[UPDATE] games/q3server-wfa: integrate with "quake3-data", rename to "quake3-wfa", update to 3.5b

	Changes:
	* Update to version 3.5b.
	* Rename to "quake3-wfa" (also rename port directory).
	* Integrate with "quake3-data"

PR:		ports/86192
Submitted by:	Alejandro Pulver <alejandro@varnet.biz>
Approved by:	maitnainer timeout

4 files changed, 117 insertions, 75 deletions

diff --git a/games/quake3-wfa/Makefile b/games/quake3-wfa/Makefile
index 88c11b695a04..5eac5149b912 100644
--- a/games/quake3-wfa/Makefile
+++ b/games/quake3-wfa/Makefile
@@ -6,22 +6,35 @@
 #
 
 PORTNAME=	wfa
-PORTVERSION=	3.3
-MASTER_SITES=	ftp://ftp.ogl.org/pub/q3/wfa/ \
-		ftp://urgentfury.org/pub/quake3/ \
-		http://wfa.themelon.net/wfa/ \
-		ftp://mirror1.planetice.net/pub/wfa/ \
-		ftp://mirror2.planetice.net/pub/wfa/ \
-		http://www.quakeshit.com/files/ \
-		ftp://ftp2.extreme-players.de/q3/mod/wfa/
-DISTFILES=	WFA_Media_v33.zip WFA_MapPack1_v33.zip \
-		WFA_MapPack2_v33.zip
+PORTVERSION=	3.5b
+CATEGORIES=	games
+MASTER_SITES=	http://www.ijs.si/~lesi/distfiles/
+DISTFILES=	WFA35Engine.zip WFA35MapPack1.zip WFA35MapPack2.zip \
+		WFA_v35b.zip 35b_mappack1.zip
+DIST_SUBDIR=	${PORTNAME}
 
-COMMENT=	Quake III Arena Mod: Weapons Factory Arena for Linux
+MAINTAINER=	pat@FreeBSD.org
+COMMENT=	Quake III Arena Mod: Weapons Factory Arena
 
-EXTRACT_BEFORE_ARGS=	-o -qq
+USE_ZIP=	yes
+NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
 
-Q3_MOD_MASTER=	${.CURDIR}/../q3server-ra3
+post-extract:
+	@${RM} ${WRKSRC}/help/BobWFACfgV236.exe
 
-.include "${Q3_MOD_MASTER}/Makefile"
+do-install:
+	@${MKDIR} ${DATADIR}
+.for f in *.cfg *.pk3
+	@${INSTALL_DATA} ${WRKSRC}/${f} ${DATADIR}
+.endfor
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${DOCSDIR}
+.for f in EnglishRadioHelp help
+	@${CP} -R ${WRKSRC}/${f} ${DOCSDIR}
+.endfor
+.endif
+
+.include "${.CURDIR}/../quake3-data/Makefile.include"
+
+.include <bsd.port.mk>
diff --git a/games/quake3-wfa/distinfo b/games/quake3-wfa/distinfo
index 333b3425aca0..51c2dfa31c44 100644
--- a/games/quake3-wfa/distinfo
+++ b/games/quake3-wfa/distinfo
@@ -1,6 +1,15 @@
-MD5 (WFA_Media_v33.zip) = dee5b4d968754e7f0c96473227948406
-SIZE (WFA_Media_v33.zip) = 55262938
-MD5 (WFA_MapPack1_v33.zip) = 26f67ec4bc5bcc52cca264b6d0d04839
-SIZE (WFA_MapPack1_v33.zip) = 46541053
-MD5 (WFA_MapPack2_v33.zip) = 06b605ce4ab8b42da60895a32274490c
-SIZE (WFA_MapPack2_v33.zip) = 42265033
+MD5 (wfa/WFA35Engine.zip) = d0380443d5bc134310b2f954ed1a16c8
+SHA256 (wfa/WFA35Engine.zip) = a7d0e4814c04a22116168f5708cc85a27f630f8ca2028f010281ff09c8ab303f
+SIZE (wfa/WFA35Engine.zip) = 52853059
+MD5 (wfa/WFA35MapPack1.zip) = 4f0d0bea489a180bbf8f285732368e5d
+SHA256 (wfa/WFA35MapPack1.zip) = 7726747ca9078ad381ca5fa0d78155b2df3e04125dfd0fb3936a8b88969d83e3
+SIZE (wfa/WFA35MapPack1.zip) = 47132535
+MD5 (wfa/WFA35MapPack2.zip) = 9b802fd703c7062026463a36a0486bb0
+SHA256 (wfa/WFA35MapPack2.zip) = 6ff36aaf550b48a830367fcee004a6193e70a52837afdfefd21de4864842540a
+SIZE (wfa/WFA35MapPack2.zip) = 46639461
+MD5 (wfa/WFA_v35b.zip) = 05021ff35ca7c1065dacd9db3dd954bd
+SHA256 (wfa/WFA_v35b.zip) = ad47354603d2306a396bf973c9484b56a322bedcafdc17d77df5f6dbac73a443
+SIZE (wfa/WFA_v35b.zip) = 21659665
+MD5 (wfa/35b_mappack1.zip) = 152885ddf12722160fac797c5f333ce1
+SHA256 (wfa/35b_mappack1.zip) = 432f80deb5807e4254fc3d60df82368c2b111b8e990c933519ddf6e6677412fa
+SIZE (wfa/35b_mappack1.zip) = 41804635
diff --git a/games/quake3-wfa/pkg-descr b/games/quake3-wfa/pkg-descr
index e1cc1dbde95b..ceda99218c9d 100644
--- a/games/quake3-wfa/pkg-descr
+++ b/games/quake3-wfa/pkg-descr
@@ -1,6 +1,4 @@
-This package contains all of the items you'll need to run a
-Quake III Arena dedicated server with Weapons Factory Arena
-mod under FreeBSD with Linux emulation.
+Quake III Arena Mod: Weapons Factory Arena
 
 WWW: http://www.captured.com/weaponsfactory/quake3/
 
diff --git a/games/quake3-wfa/pkg-plist b/games/quake3-wfa/pkg-plist
index 733015992345..4f18e5edc087 100644
--- a/games/quake3-wfa/pkg-plist
+++ b/games/quake3-wfa/pkg-plist
@@ -1,52 +1,74 @@
-%%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/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-2fort2001-wfa.pk3
-%%Q3DIR%%map-2weak-wfa.pk3
-%%Q3DIR%%map-3level1-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-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
-%%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%%
+%%PORTDOCS%%%%DOCSDIR%%/EnglishRadioHelp/!English-Radio-FAQ.htm
+%%PORTDOCS%%%%DOCSDIR%%/EnglishRadioHelp/!English-Radio-Sounds-list.htm
+%%PORTDOCS%%%%DOCSDIR%%/EnglishRadioHelp/!English-Radio-Sounds-list.txt
+%%PORTDOCS%%%%DOCSDIR%%/EnglishRadioHelp/all.cfg
+%%PORTDOCS%%%%DOCSDIR%%/EnglishRadioHelp/arsonist.cfg
+%%PORTDOCS%%%%DOCSDIR%%/EnglishRadioHelp/assassin.cfg
+%%PORTDOCS%%%%DOCSDIR%%/EnglishRadioHelp/cyborg.cfg
+%%PORTDOCS%%%%DOCSDIR%%/EnglishRadioHelp/defense.cfg
+%%PORTDOCS%%%%DOCSDIR%%/EnglishRadioHelp/engineer.cfg
+%%PORTDOCS%%%%DOCSDIR%%/EnglishRadioHelp/female.cfg
+%%PORTDOCS%%%%DOCSDIR%%/EnglishRadioHelp/gunner.cfg
+%%PORTDOCS%%%%DOCSDIR%%/EnglishRadioHelp/male.cfg
+%%PORTDOCS%%%%DOCSDIR%%/EnglishRadioHelp/marine.cfg
+%%PORTDOCS%%%%DOCSDIR%%/EnglishRadioHelp/messages.cfg
+%%PORTDOCS%%%%DOCSDIR%%/EnglishRadioHelp/nurse.cfg
+%%PORTDOCS%%%%DOCSDIR%%/EnglishRadioHelp/offense.cfg
+%%PORTDOCS%%%%DOCSDIR%%/EnglishRadioHelp/recon.cfg
+%%PORTDOCS%%%%DOCSDIR%%/EnglishRadioHelp/sniper.cfg
+%%PORTDOCS%%%%DOCSDIR%%/help/!English-Radio-readme.txt
+%%PORTDOCS%%%%DOCSDIR%%/help/Linux_known_issues.htm
+%%PORTDOCS%%%%DOCSDIR%%/help/WFA-Class-Binds.html
+%%PORTDOCS%%%%DOCSDIR%%/help/WFA-Client-Binds.html
+%%PORTDOCS%%%%DOCSDIR%%/help/WFA-Client-Cmds.html
+%%PORTDOCS%%%%DOCSDIR%%/help/WFA-Community.url
+%%PORTDOCS%%%%DOCSDIR%%/help/WFA-FAQ-Version-35.html
+%%PORTDOCS%%%%DOCSDIR%%/help/WFA-Linux-Server-Docs.html
+%%PORTDOCS%%%%DOCSDIR%%/help/WFA-Server-Cmds.html
+%%PORTDOCS%%%%DOCSDIR%%/help/WFA-Website.url
+%%PORTDOCS%%%%DOCSDIR%%/help/WFA-Win32-Server-Docs.html
+%%PORTDOCS%%%%DOCSDIR%%/help/WFA.qst
+%%PORTDOCS%%%%DOCSDIR%%/help/changes.htm
+%%PORTDOCS%%%%DOCSDIR%%/help/maplist.cfg
+%%PORTDOCS%%%%DOCSDIR%%/help/question.ico
+%%PORTDOCS%%%%DOCSDIR%%/help/readme-client.html
+%%PORTDOCS%%%%DOCSDIR%%/help/readme-server.html
+%%PORTDOCS%%%%DOCSDIR%%/help/servercfg.cfg
+%%PORTDOCS%%%%DOCSDIR%%/help/wfa-client.cfg
+%%PORTDOCS%%%%DOCSDIR%%/help/wfa-server.cfg
+%%PORTDOCS%%%%DOCSDIR%%/help/wfa.ico
+%%PORTDOCS%%%%DOCSDIR%%/help/wfa_mapping_scripts.zip
+%%DATADIR%%/WFA-Media-!English-Radio.pk3
+%%DATADIR%%/map-2forttron-wfa.pk3
+%%DATADIR%%/map-3level2-wfa.pk3
+%%DATADIR%%/map-abyss2-wfa.pk3
+%%DATADIR%%/map-aggressor-wfa.pk3
+%%DATADIR%%/map-arctic-wfa.pk3
+%%DATADIR%%/map-bulfort2-wfa.pk3
+%%DATADIR%%/map-cancer3-wfa.pk3
+%%DATADIR%%/map-concrete-wfa.pk3
+%%DATADIR%%/map-control-wfa.pk3
+%%DATADIR%%/map-denali2-wfa.pk3
+%%DATADIR%%/map-elevate-wfa.pk3
+%%DATADIR%%/map-entropy-wfa.pk3
+%%DATADIR%%/map-goodspeed-wfa.pk3
+%%DATADIR%%/map-kheops-wfa.pk3
+%%DATADIR%%/map-monochrome-wfa.pk3
+%%DATADIR%%/map-sellout-wfa.pk3
+%%DATADIR%%/map-sky2-wfa.pk3
+%%DATADIR%%/map-slabrev-wfa.pk3
+%%DATADIR%%/map-space-wfa.pk3
+%%DATADIR%%/map-stronger-wfa.pk3
+%%DATADIR%%/map-temple-wfa.pk3
+%%DATADIR%%/map-thedark-wfa.pk3
+%%DATADIR%%/map-welt-wfa.pk3
+%%DATADIR%%/map-zero-wfa.pk3
+%%DATADIR%%/maplist.cfg
+%%DATADIR%%/pak35.pk3
+%%DATADIR%%/pak35b.pk3
+%%DATADIR%%/servercfg.cfg
+%%DATADIR%%/wfa-server.cfg
+@dirrm %%DATADIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/help
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/EnglishRadioHelp
+@dirrm %%DOCSDIR%%