Bug 92383 - [PATCH] games/linux-quake4: update to 1.0.6
Summary: [PATCH] games/linux-quake4: update to 1.0.6
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: freebsd-ports-bugs (Nobody)
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2006-01-26 18:50 UTC by Jose Alonso Cardenas Marquez
Modified: 2006-03-26 22:59 UTC (History)
0 users

See Also:


Attachments
linux-quake4-1.0.6_1,1.patch (5.56 KB, patch)
2006-01-26 18:50 UTC, Jose Alonso Cardenas Marquez
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Jose Alonso Cardenas Marquez 2006-01-26 18:50:02 UTC
- Update to 1.0.6
- Clean port
- USE_X_PREFIX this port use X
- Can I take maintainership?
- Port maintainer (infofarmer@gmail.com) is cc'd.
Comment 1 Edwin Groothuis freebsd_committer freebsd_triage 2006-01-26 18:56:13 UTC
State Changed
From-To: open->feedback

Awaiting maintainers feedback
Comment 2 Andrew Pantyukhin 2006-01-26 19:14:29 UTC
I'm glad a worthy maintainer seems to be found :-)
Please, take maintainership.

There are some minor issues with your patch:

- Why portrevision?
- Please, place gentoo mirrors first, then the official site.
Remove the other mirrors.
- You can't use dirrmtry like that. Please, see bsd.port.mk

So, take maintainership and send a new patch as a
maintainer-update, please.

Thanks,
Andrew P.
Comment 3 Jose Alonso Cardenas Marquez 2006-01-27 15:57:57 UTC
On Thu, 26 Jan 2006 22:14:29 +0300
Andrew Pantyukhin <infofarmer@gmail.com> wrote:

> I'm glad a worthy maintainer seems to be found :-)
> Please, take maintainership.
> 
> There are some minor issues with your patch:
> 
> - Why portrevision?

Ops, tiny error :)

> - Please, place gentoo mirrors first, then the official site.
> Remove the other mirrors.

Done, I place official idsoftware mirror first.

> - You can't use dirrmtry like that. Please, see bsd.port.mk

Done

--- linux-quake4-1.0.6,1.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/games/linux-quake4/Makefile /usr/ports/games/linux-quake4-new/Makefile
--- /usr/ports/games/linux-quake4/Makefile	Fri Jan 20 00:03:07 2006
+++ /usr/ports/games/linux-quake4-new/Makefile	Fri Jan 27 09:54:12 2006
@@ -6,28 +6,25 @@
 #
 
 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/ \
+		${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
+USE_X_PREFIX=	yes
 USE_LINUX=	yes
-
 NO_WRKSUBDIR=	yes
-
 Q4DIR=		lib/${PORTNAME}/
 PLIST_SUB+=	Q4DIR="${Q4DIR}"
 
@@ -58,59 +55,24 @@
 
 	# 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
 
diff -ruN --exclude=CVS /usr/ports/games/linux-quake4/distinfo /usr/ports/games/linux-quake4-new/distinfo
--- /usr/ports/games/linux-quake4/distinfo	Thu Nov 17 16:21:09 2005
+++ /usr/ports/games/linux-quake4-new/distinfo	Thu Jan 26 10:34:00 2006
@@ -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 -ruN --exclude=CVS /usr/ports/games/linux-quake4/pkg-message /usr/ports/games/linux-quake4-new/pkg-message
--- /usr/ports/games/linux-quake4/pkg-message	Thu Nov 17 06:38:43 2005
+++ /usr/ports/games/linux-quake4-new/pkg-message	Fri Jan 27 09:40:55 2006
@@ -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
+
+2) Need minimal 24bits resolution in your desktop for to play it.
 
 Have fun!
 
diff -ruN --exclude=CVS /usr/ports/games/linux-quake4/pkg-plist /usr/ports/games/linux-quake4-new/pkg-plist
--- /usr/ports/games/linux-quake4/pkg-plist	Wed Jan 25 17:56:06 2006
+++ /usr/ports/games/linux-quake4-new/pkg-plist	Fri Jan 27 09:17:40 2006
@@ -18,6 +18,10 @@
 %%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
--- linux-quake4-1.0.6,1.patch ends here ---

Greetings
ACM
-- 
Grupo de Usuarios *BSD Peru - BSDPeru
http://www.bsd.org.pe
Comment 4 Jose Alonso Cardenas Marquez 2006-01-27 16:08:42 UTC
On Thu, 26 Jan 2006 22:14:29 +0300
Andrew Pantyukhin <infofarmer@gmail.com> wrote:

> I'm glad a worthy maintainer seems to be found :-)
> Please, take maintainership.
> 
> There are some minor issues with your patch:
> 
> - Why portrevision?

Ops, tiny error :)

> - Please, place gentoo mirrors first, then the official site.
> Remove the other mirrors.

Done, I place official idsoftware mirror first.

> - You can't use dirrmtry like that. Please, see bsd.port.mk

Done

--- linux-quake4-1.0.6,1.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/games/linux-quake4/Makefile /usr/ports/games/linux-quake4-new/Makefile
--- /usr/ports/games/linux-quake4/Makefile	Fri Jan 20 00:03:07 2006
+++ /usr/ports/games/linux-quake4-new/Makefile	Fri Jan 27 09:54:12 2006
@@ -6,28 +6,25 @@
 #
 
 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/ \
+		${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
+USE_X_PREFIX=	yes
 USE_LINUX=	yes
-
 NO_WRKSUBDIR=	yes
-
 Q4DIR=		lib/${PORTNAME}/
 PLIST_SUB+=	Q4DIR="${Q4DIR}"
 
@@ -58,59 +55,24 @@
 
 	# 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
 
diff -ruN --exclude=CVS /usr/ports/games/linux-quake4/distinfo /usr/ports/games/linux-quake4-new/distinfo
--- /usr/ports/games/linux-quake4/distinfo	Thu Nov 17 16:21:09 2005
+++ /usr/ports/games/linux-quake4-new/distinfo	Thu Jan 26 10:34:00 2006
@@ -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 -ruN --exclude=CVS /usr/ports/games/linux-quake4/pkg-message /usr/ports/games/linux-quake4-new/pkg-message
--- /usr/ports/games/linux-quake4/pkg-message	Thu Nov 17 06:38:43 2005
+++ /usr/ports/games/linux-quake4-new/pkg-message	Fri Jan 27 09:40:55 2006
@@ -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
+
+2) Need minimal 24bits resolution in your desktop for to play it.
 
 Have fun!
 
diff -ruN --exclude=CVS /usr/ports/games/linux-quake4/pkg-plist /usr/ports/games/linux-quake4-new/pkg-plist
--- /usr/ports/games/linux-quake4/pkg-plist	Wed Jan 25 17:56:06 2006
+++ /usr/ports/games/linux-quake4-new/pkg-plist	Fri Jan 27 09:17:40 2006
@@ -18,6 +18,10 @@
 %%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
--- linux-quake4-1.0.6,1.patch ends here ---

Greetings
ACM
-- 
Grupo de Usuarios *BSD Peru - BSDPeru
http://www.bsd.org.pe
Comment 5 Andrew Pantyukhin 2006-01-27 19:35:40 UTC
Thanks! Please commit and give maintainership.
Comment 6 Eddy 2006-03-18 10:35:44 UTC
Hi, all!

I have installed subject from ports on my FreeBSD 5.4-RELEASE box.

Quake4 won't start. It reports:

--------------- R_InitOpenGL ----------------
Initializing SDL subsystem
Loading GL driver 'libGL.so.1' through SDL
NVIDIA: failed to execute '/sbin/modprobe': No such file or directory.

What i'm wrong?

-- 
ïÔÐÒÁ×ÌÅÎÏ M2, ÒÅ×ÏÌÀÃÉÏÎÎÏÊ ÐÏÞÔÏ×ÏÊ ÐÒÏÇÒÁÍÍÏÊ Opera:  
http://www.opera.com/mail/
Comment 7 Jose Alonso Cardenas Marquez 2006-03-18 20:17:23 UTC
> Hi, all!
> 
> I have installed subject from ports on my FreeBSD 5.4-RELEASE box.
> 
> Quake4 won't start. It reports:
> 
> --------------- R_InitOpenGL ----------------
> Initializing SDL subsystem
> Loading GL driver 'libGL.so.1' through SDL
> NVIDIA: failed to execute '/sbin/modprobe': No such file or directory.
> 
> What i'm wrong?
> 
> -- 


1) Do you have nvidia-driver with linux support?

2) Are you running linux-quake4 using root user? Try using simple user

Greetings
ACM
-- 
Grupo de Usuarios *BSD Peru - BSDPeru
http://www.bsd.org.pe
Comment 8 Pav Lucistnik freebsd_committer freebsd_triage 2006-03-26 22:58:42 UTC
State Changed
From-To: feedback->closed

Committed, thanks! 

On top of your patch,I cleaned up pkg-message handling and allowed the port 
on amd64.