Update to 1.32 point release

3 files changed, 132 insertions, 24 deletions

diff --git a/games/q3server/Makefile b/games/q3server/Makefile
index 4b4d608cc3be..c4112d55bc3c 100644
--- a/games/q3server/Makefile
+++ b/games/q3server/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	q3ded
-PORTVERSION=	1.31
+PORTVERSION=	1.32
 CATEGORIES=	games linux
-MASTER_SITES=	http://fileplanet.games-world.net/dl/ftp1.gamespy.com/fpnew/action/quake3/official/ \
-		ftp://ftp.idsoftware.com/idstuff/quake3/linux/ \
-		ftp://ftp.bluesnews.com/idstuff/quake3/linux/
+MASTER_SITES=	ftp://ftp.bluesnews.com/idstuff/quake3/linux/ \
+		ftp://ftp.idsoftware.com/idstuff/quake3/linux/
 DISTNAME=	linuxq3apoint-${PORTVERSION}.x86
 EXTRACT_SUFX=	.run
 
@@ -29,37 +28,70 @@ INSTALL_DIR=	${INSTALL} -d -o ${BINOWN} -g ${BINGRP} -m 755
 do-extract:
 	@${RM} -rf ${WRKDIR}
 	@${MKDIR} ${WRKDIR}
-	@cd ${WRKDIR} && tail +175 ${_DISTDIR}/${DISTNAME}${EXTRACT_SUFX} | \
+	@cd ${WRKDIR} && ${TAIL} +179 ${_DISTDIR}/${DISTNAME}${EXTRACT_SUFX} | \
 		${TAR} zxvf - >/dev/null
 
 pre-patch:
 # remove trailing ^M
-	@find -E ${WRKSRC} -type f \
+	@${FIND} -E ${WRKSRC} -type f \
 		-iregex ".*\.(bat|cfg|gam|htm|html|inf|ini|lst|sc|scr|txt|url)" \
 		-exec ${PERL} -pi -ne 's!\r\n!\n!' {} 1>/dev/null 2>&1 \;
 
 do-install:
-	@${INSTALL_DIR} ${PREFIX}/${Q3DIR}
-	@${INSTALL_DIR} ${PREFIX}/${Q3DIR}baseq3
-	@${INSTALL_DIR} ${PREFIX}/${Q3DIR}missionpack
-.for basepak in 1 2 3 4 5 6 7
-	@${INSTALL_DATA} ${WRKSRC}/baseq3/pak${basepak}.pk3 \
-		${PREFIX}/${Q3DIR}baseq3
+	@${INSTALL_DIR} ${PREFIX}/${Q3DIR}/pb ${PREFIX}/${Q3DIR}/baseq3 \
+		${PREFIX}/${Q3DIR}/missionpack
+.for bpak in 1 2 3 4 5 6 7 8
+	@${INSTALL_DATA} ${WRKSRC}/baseq3/pak${bpak}.pk3 \
+		${PREFIX}/${Q3DIR}/baseq3
 .endfor
-.for mpak in 1 2
+.for mpak in 1 2 3
 	@${INSTALL_DATA} ${WRKSRC}/missionpack/pak${mpak}.pk3 \
-		${PREFIX}/${Q3DIR}missionpack
+		${PREFIX}/${Q3DIR}/missionpack
+.endfor
+	@${INSTALL} -c -o nobody -g nogroup -m 500 ${WRKSRC}/bin/x86/q3ded \
+		${PREFIX}/${Q3DIR}
+	@${INSTALL} -c -o nobody -g nogroup -m 500 \
+		${WRKSRC}/bin/x86/quake3.x86 ${PREFIX}/${Q3DIR}
+.for pb in pbag.so pbcl.so pbsv.so
+	@${INSTALL_DATA} ${WRKSRC}/pb/${pb} ${PREFIX}/${Q3DIR}/pb
 .endfor
-	@${INSTALL} -c -o nobody -g nogroup -m 500 ${WRKSRC}/bin/x86/q3ded ${PREFIX}/${Q3DIR}
-	@${INSTALL} -c -o nobody -g nogroup -m 500 ${WRKSRC}/bin/x86/quake3.x86 ${PREFIX}/${Q3DIR}
 
 post-install:
-.ifndef(NOPORTDOCS)
-	@${INSTALL_DIR} ${PREFIX}/${Q3DIR}Help
-	@${INSTALL_DATA} ${WRKSRC}/Help/Q3A_FAQ.html ${PREFIX}/${Q3DIR}Help
-.for docs in INSTALL Q3A_EULA.txt README-Id-7-26-01.html README-linux.txt
+.if !defined(NOPORTDOCS)
+	@${INSTALL_DIR} ${PREFIX}/${Q3DIR}/Docs/LinuxFAQ \
+		${PREFIX}/${Q3DIR}/Docs/PunkBuster/admins \
+		${PREFIX}/${Q3DIR}/Docs/PunkBuster/players \
+		${PREFIX}/${Q3DIR}/pb/htm
+.for docs in CHANGES-1.32.txt INSTALL Q3A_EULA.txt README-Id-7-26-01.html \
+	README-linux.txt quake3.xpm
 	@${INSTALL_DATA} ${WRKSRC}/${docs} ${PREFIX}/${Q3DIR}
 .endfor
+.for faq in INSTALL index.html udp_wide_README.txt udp_wide_broadcast.patch
+	@${INSTALL_DATA} ${WRKSRC}/Docs/LinuxFAQ/${faq} \
+		${PREFIX}/${Q3DIR}/Docs/LinuxFAQ
+.endfor
+.for admins in index.htm tabout1.gif tadvanced1.gif tbasics1.gif \
+	tcommands1.gif tcommands2.gif tenabling1.gif tfaq1.gif tgame1.gif \
+	tintro1.gif tlogo.gif tmonitoring1.gif tpbint1.gif tpbsub1.gif \
+	tplayer1.gif tquick1.gif tremote1.gif tscreen1.gif tsettings1.gif \
+	ttitle1.gif ttoc1.gif tupdating1.gif
+	@${INSTALL_DATA} ${WRKSRC}/Docs/PunkBuster/admins/${admins} \
+		${PREFIX}/${Q3DIR}/Docs/PunkBuster/admins
+.endfor
+.for players in index.htm sbrowser1.jpg skeyboard1.gif stilde1.gif tabout1.gif \
+	tbasics1.gif tbutton1.gif tbutton2.gif tcommands1.gif tcommands2.gif \
+	tenabling1.gif tfaq1.gif tfinding1.gif tgame1.gif tintro1.gif \
+	tlogo.gif tmonitoring1.gif tname1.gif tpbint1.gif tpbsub1.gif \
+	tquick1.gif tremote1.gif tscreen1.gif tsettings1.gif ttaking1.gif \
+	ttitle1.gif ttoc1.gif tupdating1.gif tusing1.gif
+	@${INSTALL_DATA} ${WRKSRC}/Docs/PunkBuster/players/${players} \
+		${PREFIX}/${Q3DIR}/Docs/PunkBuster/players
+.endfor
+.for pbhtm in la001293.htm lc000993.htm ls000993.htm ma001293.htm mc000993.htm \
+	ms000993.htm wa001293.htm wc000993.htm ws000993.htm
+	@${INSTALL_DATA} ${WRKSRC}/pb/htm/${pbhtm} ${PREFIX}/${Q3DIR}/pb/htm
+.endfor
+	@${INSTALL_DATA} ${WRKSRC}/pb/PB_EULA.txt ${PREFIX}/${Q3DIR}/pb
 .endif
 	@${CAT} ${PKGMESSAGE}
 
diff --git a/games/q3server/distinfo b/games/q3server/distinfo
index ab14b69d422b..6b91f78306ee 100644
--- a/games/q3server/distinfo
+++ b/games/q3server/distinfo
@@ -1 +1 @@
-MD5 (linuxq3apoint-1.31.x86.run) = 2620b9eefb6d0775f766b6570870157a
+MD5 (linuxq3apoint-1.32.x86.run) = 5c4853976224e6f3d1c815075392f3d9
diff --git a/games/q3server/pkg-plist b/games/q3server/pkg-plist
index 996479e2ddee..cc4202b74b93 100644
--- a/games/q3server/pkg-plist
+++ b/games/q3server/pkg-plist
@@ -1,4 +1,59 @@
-%%PORTDOCS%%%%Q3DIR%%Help/Q3A_FAQ.html
+%%PORTDOCS%%%%Q3DIR%%CHANGES-1.32.txt
+%%PORTDOCS%%%%Q3DIR%%Docs/LinuxFAQ/INSTALL
+%%PORTDOCS%%%%Q3DIR%%Docs/LinuxFAQ/index.html
+%%PORTDOCS%%%%Q3DIR%%Docs/LinuxFAQ/udp_wide_README.txt
+%%PORTDOCS%%%%Q3DIR%%Docs/LinuxFAQ/udp_wide_broadcast.patch
+%%PORTDOCS%%%%Q3DIR%%Docs/PunkBuster/admins/index.htm
+%%PORTDOCS%%%%Q3DIR%%Docs/PunkBuster/admins/tabout1.gif
+%%PORTDOCS%%%%Q3DIR%%Docs/PunkBuster/admins/tadvanced1.gif
+%%PORTDOCS%%%%Q3DIR%%Docs/PunkBuster/admins/tbasics1.gif
+%%PORTDOCS%%%%Q3DIR%%Docs/PunkBuster/admins/tcommands1.gif
+%%PORTDOCS%%%%Q3DIR%%Docs/PunkBuster/admins/tcommands2.gif
+%%PORTDOCS%%%%Q3DIR%%Docs/PunkBuster/admins/tenabling1.gif
+%%PORTDOCS%%%%Q3DIR%%Docs/PunkBuster/admins/tfaq1.gif
+%%PORTDOCS%%%%Q3DIR%%Docs/PunkBuster/admins/tgame1.gif
+%%PORTDOCS%%%%Q3DIR%%Docs/PunkBuster/admins/tintro1.gif
+%%PORTDOCS%%%%Q3DIR%%Docs/PunkBuster/admins/tlogo.gif
+%%PORTDOCS%%%%Q3DIR%%Docs/PunkBuster/admins/tmonitoring1.gif
+%%PORTDOCS%%%%Q3DIR%%Docs/PunkBuster/admins/tpbint1.gif
+%%PORTDOCS%%%%Q3DIR%%Docs/PunkBuster/admins/tpbsub1.gif
+%%PORTDOCS%%%%Q3DIR%%Docs/PunkBuster/admins/tplayer1.gif
+%%PORTDOCS%%%%Q3DIR%%Docs/PunkBuster/admins/tquick1.gif
+%%PORTDOCS%%%%Q3DIR%%Docs/PunkBuster/admins/tremote1.gif
+%%PORTDOCS%%%%Q3DIR%%Docs/PunkBuster/admins/tscreen1.gif
+%%PORTDOCS%%%%Q3DIR%%Docs/PunkBuster/admins/tsettings1.gif
+%%PORTDOCS%%%%Q3DIR%%Docs/PunkBuster/admins/ttitle1.gif
+%%PORTDOCS%%%%Q3DIR%%Docs/PunkBuster/admins/ttoc1.gif
+%%PORTDOCS%%%%Q3DIR%%Docs/PunkBuster/admins/tupdating1.gif
+%%PORTDOCS%%%%Q3DIR%%Docs/PunkBuster/players/index.htm
+%%PORTDOCS%%%%Q3DIR%%Docs/PunkBuster/players/sbrowser1.jpg
+%%PORTDOCS%%%%Q3DIR%%Docs/PunkBuster/players/skeyboard1.gif
+%%PORTDOCS%%%%Q3DIR%%Docs/PunkBuster/players/stilde1.gif
+%%PORTDOCS%%%%Q3DIR%%Docs/PunkBuster/players/tabout1.gif
+%%PORTDOCS%%%%Q3DIR%%Docs/PunkBuster/players/tbasics1.gif
+%%PORTDOCS%%%%Q3DIR%%Docs/PunkBuster/players/tbutton1.gif
+%%PORTDOCS%%%%Q3DIR%%Docs/PunkBuster/players/tbutton2.gif
+%%PORTDOCS%%%%Q3DIR%%Docs/PunkBuster/players/tcommands1.gif
+%%PORTDOCS%%%%Q3DIR%%Docs/PunkBuster/players/tcommands2.gif
+%%PORTDOCS%%%%Q3DIR%%Docs/PunkBuster/players/tenabling1.gif
+%%PORTDOCS%%%%Q3DIR%%Docs/PunkBuster/players/tfaq1.gif
+%%PORTDOCS%%%%Q3DIR%%Docs/PunkBuster/players/tfinding1.gif
+%%PORTDOCS%%%%Q3DIR%%Docs/PunkBuster/players/tgame1.gif
+%%PORTDOCS%%%%Q3DIR%%Docs/PunkBuster/players/tintro1.gif
+%%PORTDOCS%%%%Q3DIR%%Docs/PunkBuster/players/tlogo.gif
+%%PORTDOCS%%%%Q3DIR%%Docs/PunkBuster/players/tmonitoring1.gif
+%%PORTDOCS%%%%Q3DIR%%Docs/PunkBuster/players/tname1.gif
+%%PORTDOCS%%%%Q3DIR%%Docs/PunkBuster/players/tpbint1.gif
+%%PORTDOCS%%%%Q3DIR%%Docs/PunkBuster/players/tpbsub1.gif
+%%PORTDOCS%%%%Q3DIR%%Docs/PunkBuster/players/tquick1.gif
+%%PORTDOCS%%%%Q3DIR%%Docs/PunkBuster/players/tremote1.gif
+%%PORTDOCS%%%%Q3DIR%%Docs/PunkBuster/players/tscreen1.gif
+%%PORTDOCS%%%%Q3DIR%%Docs/PunkBuster/players/tsettings1.gif
+%%PORTDOCS%%%%Q3DIR%%Docs/PunkBuster/players/ttaking1.gif
+%%PORTDOCS%%%%Q3DIR%%Docs/PunkBuster/players/ttitle1.gif
+%%PORTDOCS%%%%Q3DIR%%Docs/PunkBuster/players/ttoc1.gif
+%%PORTDOCS%%%%Q3DIR%%Docs/PunkBuster/players/tupdating1.gif
+%%PORTDOCS%%%%Q3DIR%%Docs/PunkBuster/players/tusing1.gif
 %%PORTDOCS%%%%Q3DIR%%INSTALL
 %%PORTDOCS%%%%Q3DIR%%Q3A_EULA.txt
 %%PORTDOCS%%%%Q3DIR%%README-Id-7-26-01.html
@@ -10,12 +65,33 @@
 %%Q3DIR%%baseq3/pak5.pk3
 %%Q3DIR%%baseq3/pak6.pk3
 %%Q3DIR%%baseq3/pak7.pk3
+%%Q3DIR%%baseq3/pak8.pk3
 %%Q3DIR%%missionpack/pak1.pk3
 %%Q3DIR%%missionpack/pak2.pk3
+%%Q3DIR%%missionpack/pak3.pk3
+%%PORTDOCS%%%%Q3DIR%%pb/PB_EULA.txt
+%%PORTDOCS%%%%Q3DIR%%pb/htm/la001293.htm
+%%PORTDOCS%%%%Q3DIR%%pb/htm/lc000993.htm
+%%PORTDOCS%%%%Q3DIR%%pb/htm/ls000993.htm
+%%PORTDOCS%%%%Q3DIR%%pb/htm/ma001293.htm
+%%PORTDOCS%%%%Q3DIR%%pb/htm/mc000993.htm
+%%PORTDOCS%%%%Q3DIR%%pb/htm/ms000993.htm
+%%PORTDOCS%%%%Q3DIR%%pb/htm/wa001293.htm
+%%PORTDOCS%%%%Q3DIR%%pb/htm/wc000993.htm
+%%PORTDOCS%%%%Q3DIR%%pb/htm/ws000993.htm
+%%Q3DIR%%pb/pbag.so
+%%Q3DIR%%pb/pbcl.so
+%%Q3DIR%%pb/pbsv.so
 %%Q3DIR%%q3ded
 %%Q3DIR%%quake3.x86
+%%PORTDOCS%%%%Q3DIR%%quake3.xpm
+%%PORTDOCS%%@dirrm %%Q3DIR%%pb/htm
+@dirrm %%Q3DIR%%pb
 @dirrm %%Q3DIR%%missionpack
 @dirrm %%Q3DIR%%baseq3
-%%PORTDOCS%%@dirrm %%Q3DIR%%Help
-@unexec rmdir %D/%%Q3DIR%%baseq3 2>/dev/null || true
+%%PORTDOCS%%@dirrm %%Q3DIR%%Docs/PunkBuster/players
+%%PORTDOCS%%@dirrm %%Q3DIR%%Docs/PunkBuster/admins
+%%PORTDOCS%%@dirrm %%Q3DIR%%Docs/PunkBuster
+%%PORTDOCS%%@dirrm %%Q3DIR%%Docs/LinuxFAQ
+%%PORTDOCS%%@dirrm %%Q3DIR%%Docs
 @unexec rmdir %D/%%Q3DIR%% 2>/dev/null || echo "If you are permanently removing this port, you should do a ``rm -Rf ${PKG_PREFIX}/%%Q3DIR%%`` to remove any configuration files, *.pk3 files, and mods left." | fmt