- Update to 1.0.6

- Install into X11BASE
- Cleanup
- Take over maintainership

PR:		ports/92383
Submitted by:	Jose Alonso Cardenas Marquez <acardenas@bsd.org.pe>
Approved by:	Andrew Pantyukhin <infofarmer@gmail.com> (maintainer)

4 files changed, 34 insertions, 65 deletions

diff --git a/games/linux-quake4/Makefile b/games/linux-quake4/Makefile
index b10b5c1dde27..03df1aacd091 100644
--- a/games/linux-quake4/Makefile
+++ b/games/linux-quake4/Makefile
@@ -6,30 +6,28 @@
 #
 
 PORTNAME=	quake4
-PORTVERSION=	1.0.5
+PORTVERSION=	1.0.6
 PORTEPOCH=	1
 CATEGORIES=	games linux
-MASTER_SITES=	http://proxy.gubkin.ru/myports/ \
-		http://bsd.gubkin.ru/myports/ \
-		ftp://ftp.dvo.ru/pub/distfiles/ \
-		ftp://ftp.amfodent.ru/pub/FreeBSD/distfiles/ \
-		ftp://ftp.idsoftware.com/idstuff/quake4/linux/
+MASTER_SITES=	ftp://ftp.idsoftware.com/idstuff/quake4/linux/old/ \
+		${MASTER_SITE_GENTOO}
+MASTER_SITE_SUBDIR=	distfiles
 PKGNAMEPREFIX=	linux-
 DISTNAME=	${PORTNAME}-${PKGNAMEPREFIX}${PORTVERSION}.x86
 EXTRACT_SUFX=	.run
 
-MAINTAINER=	infofarmer@gmail.com
+MAINTAINER=	acardenas@bsd.org.pe
 COMMENT=	Quake 4 for Linux
 
 RUN_DEPENDS=	${LINUXBASE}/usr/lib/libSDL-1.2.so.0:${PORTSDIR}/devel/linux-sdl12
 
-ONLY_FOR_ARCHS=	i386
+ONLY_FOR_ARCHS=	i386 amd64
+USE_X_PREFIX=	yes
 USE_LINUX=	yes
-
 NO_WRKSUBDIR=	yes
-
 Q4DIR=		lib/${PORTNAME}/
 PLIST_SUB+=	Q4DIR="${Q4DIR}"
+SUB_FILES=	pkg-message
 
 do-extract:
 	@${RM} -rf ${WRKDIR}
@@ -58,63 +56,28 @@ do-install:
 
 	# Punkbuster
 	@${MKDIR} ${PREFIX}/${Q4DIR}/pb/htm
-.for i in ag ags cl cls sv
-	${INSTALL_DATA} ${WRKSRC}/pb/pb$i.so ${PREFIX}/${Q4DIR}/pb/
-.endfor
-.for i in l m w
-	${INSTALL_DATA} ${WRKSRC}/pb/htm/$ia001307.htm ${PREFIX}/${Q4DIR}/pb/htm/
-	${INSTALL_DATA} ${WRKSRC}/pb/htm/$ic001095.htm ${PREFIX}/${Q4DIR}/pb/htm/
-.endfor
-
-	# Q4base
 	@${MKDIR} ${PREFIX}/${Q4DIR}/q4base
-.for i in \
-	arena_ctf.cfg ctf.cfg dm.cfg game100.pk4 \
-	mapcycle.scriptcfg teamdm.cfg tourney.cfg
-
-	${INSTALL_DATA} ${WRKSRC}/q4base/$i ${PREFIX}/${Q4DIR}/q4base/
-.endfor
+	@cd ${WRKSRC} && \
+		${FIND} -E pb -type f -iregex ".*\.(so)" \
+			-exec ${INSTALL_DATA} "{}" "${PREFIX}/${Q4DIR}/{}" \; && \
+		${FIND} -E pb/htm -type f -iregex ".*\.(htm)" \
+			-exec ${INSTALL_DATA} "{}" "${PREFIX}/${Q4DIR}/{}" \;
+	# Q4base
+	 @cd ${WRKSRC} && \
+		${FIND} -E q4base -type f -iregex ".*\.(cfg|scriptcfg|pk4)" \
+			-exec ${INSTALL_DATA} "{}" "${PREFIX}/${Q4DIR}/{}" \;
 
 	# Documentation
 .if !defined (NOPORTDOCS)
-. for i in ENG ENU ESP FRA ITA
-	@${MKDIR} ${DOCSDIR}/$i/images
-	@${MKDIR} ${DOCSDIR}/$i/htm
-
-.  for j in \
-	License.txt MSR.txt PBEULA.txt help.htm htm/Default.htm \
-	htm/credits.htm htm/cs.htm htm/left.htm htm/man_def.htm \
-	htm/man_left.htm htm/man_top.htm htm/readme.htm \
-	htm/side_ie.css htm/style_ie.css htm/techhelp.htm htm/top.htm \
-	images/ATVIsmall.gif images/ATVIsmaller.jpg \
-	images/Bink_Video_4c_rev.png images/ammo_regen.png \
-	images/armor.png images/blaster.png images/doubler.png \
-	images/guard.png images/h01.gif images/h02.gif images/h03.gif \
-	images/h04.gif images/h05.gif images/h06.gif images/h07.gif \
-	images/h08.gif images/h09.gif images/h10.gif images/h17a.gif \
-	images/h17b.gif images/h26.gif images/h27.gif images/h28a.gif \
-	images/h28b.gif images/h28c.gif images/h_def.gif \
-	images/h_sup.gif images/h_tec.gif images/h_top.gif \
-	images/haste.png images/health.png images/health_pack.png \
-	images/id_logo_small.jpg images/ingamedisplay.png \
-	images/invisibility.png images/line1.gif images/line1_b.gif \
-	images/line2.gif images/line2_b.gif images/machinegun.png \
-	images/mega_health.png images/mpbrowser.png images/mssLogo.png \
-	images/pad.gif images/q4_logo_small.jpg images/quad_damage.png \
-	images/raven.gif images/regeneration.png images/save.png \
-	images/scout.png images/shotgun.png images/watermark.gif \
-	manual.htm readme.txt
-
-	${INSTALL_DATA} ${WRKSRC}/Docs/$i/$j ${DOCSDIR}/$i/$j
-.  endfor
-. endfor
-
-	${INSTALL_DATA} ${WRKSRC}/License.txt ${DOCSDIR}/LICENSE
-	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}/README
+	@cd ${WRKSRC}/Docs && \
+		${FIND} * -type d -exec ${MKDIR} "${DOCSDIR}/{}" \; && \
+		${FIND} * -type f -exec ${INSTALL_DATA} "{}" "${DOCSDIR}/{}" \;
+	${INSTALL_DATA} ${WRKSRC}/License.txt ${DOCSDIR}/LICENSE && \
+	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}/README && \
 	${INSTALL_DATA} ${WRKSRC}/pb/PBEULA.txt ${DOCSDIR}/PBEULA
 .endif
 
 post-install:
-	@${SED} 's|@DOCSDIR@|${DOCSDIR}|' ${PKGMESSAGE}
+	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/games/linux-quake4/distinfo b/games/linux-quake4/distinfo
index c805f883e7c6..ac442e35d902 100644
--- a/games/linux-quake4/distinfo
+++ b/games/linux-quake4/distinfo
@@ -1,3 +1,3 @@
-MD5 (quake4-linux-1.0.5.x86.run) = c5b418e1f13baac0751861a1a65b30fe
-SHA256 (quake4-linux-1.0.5.x86.run) = ba2ea81548959a8a77fe2bc15a0e3480b82cb4676ca7b6007d99c773ac904423
-SIZE (quake4-linux-1.0.5.x86.run) = 19253288
+MD5 (quake4-linux-1.0.6.x86.run) = 8d5c51ea773b81e5a0efebed712198c2
+SHA256 (quake4-linux-1.0.6.x86.run) = c9bd6c463558f7370f6e24a1bf4df509b47068f66d048db9f3e8f7b448316b99
+SIZE (quake4-linux-1.0.6.x86.run) = 19257935
diff --git a/games/linux-quake4/pkg-message b/games/linux-quake4/files/pkg-message.in
index 6e3219bbd146..e77d702c78fb 100644
--- a/games/linux-quake4/pkg-message
+++ b/games/linux-quake4/files/pkg-message.in
@@ -1,10 +1,12 @@
 ------------------------------------------------------------
 
-In order to play Quake 4, you need to copy some data files
+1) In order to play Quake 4, you need to copy some data files
 from the Quake 4 DVD or CD's. Please read the following
 file:
 
-@DOCSDIR@/README
+%%DOCSDIR%%/README
+
+2) Need minimal 24bits resolution in your desktop for to play it.
 
 Have fun!
 
diff --git a/games/linux-quake4/pkg-plist b/games/linux-quake4/pkg-plist
index 1468116d1ef9..d6baba255c9e 100644
--- a/games/linux-quake4/pkg-plist
+++ b/games/linux-quake4/pkg-plist
@@ -18,6 +18,10 @@ bin/quake4
 %%Q4DIR%%q4base/mapcycle.scriptcfg
 %%Q4DIR%%q4base/teamdm.cfg
 %%Q4DIR%%q4base/tourney.cfg
+%%Q4DIR%%q4base/zpak_english_01.pk4
+%%Q4DIR%%q4base/zpak_french_01.pk4
+%%Q4DIR%%q4base/zpak_italian_01.pk4
+%%Q4DIR%%q4base/zpak_spanish_01.pk4
 %%Q4DIR%%q4ded.x86
 %%Q4DIR%%quake4.x86
 %%PORTDOCS%%%%DOCSDIR%%/ENG/License.txt