>Number:         22427
>Category:       pkg
>Synopsis:       games/quake3arena update to 1.32b plus Linux fixes
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Sun Aug 10 07:47:00 UTC 2003
>Closed-Date:
>Last-Modified:
>Originator:     Soren Jacobsen
>Release:        NetBSD 1.6.1
>Organization:
>Environment:
pkgsrc as of 8/9/2003.
>Description:
The present MASTER_SITES are no longer valid.
USE_X11 should be defined.
Since this package installs Linux binaries, we shouldn't depend on suse_*
if we're using Linux.
>How-To-Repeat:
>Fix:

Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/games/quake3arena/Makefile,v
retrieving revision 1.12
diff -u -r1.12 Makefile
--- Makefile	2003/04/10 01:28:18	1.12
+++ Makefile	2003/08/10 07:42:23
@@ -1,21 +1,29 @@
 # $NetBSD: Makefile,v 1.12 2003/04/10 01:28:18 grant Exp $
 
-DISTNAME=	linuxq3apoint-1.17.x86
-PKGNAME=	quake3arena-1.17
+DISTNAME=	linuxq3apoint-1.32b.x86
+PKGNAME=	quake3arena-1.32b
 WRKSRC=		${WRKDIR}
 CATEGORIES=	games x11
-MASTER_SITES=	ftp://ftp.idsoftware.com/idstuff/quake3/linux/old/ \
-		ftp://ftp.uni-klu.ac.at/pub/linux/games/quake3/ \
-		ftp://ftp.mirrors.degnet.de/pub/misc/idsoftware/quake3/linux/old/
+MASTER_SITES=	ftp://ftp.idsoftware.com/idstuff/quake3/linux/ \
+		ftp://mirrors.xmission.com/idsoftware/quake3/linux/
 EXTRACT_SUFX=	.run
 
 MAINTAINER=	jmcneill@invisible.yi.org
 HOMEPAGE=	http://www.quake3arena.com/
 COMMENT=	Quake 3 Arena -- first person shooter (binary only, no data files)
 
+USE_X11=	#defined
+
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} != Linux
 DEPENDS+=	suse_base>=6.3:../../emulators/${SUSE_DIR_PREFIX}_base
 DEPENDS+=	suse_x11>=6.3:../../emulators/${SUSE_DIR_PREFIX}_x11
 DEPENDS+=	suse_glx>=6.4:../../emulators/${SUSE_DIR_PREFIX}_glx
+.include "../../emulators/suse_linux/Makefile.application"
+.else
+.include "../../graphics/MesaLib/buildlink2.mk"
+.endif
 
 CONFLICTS=	quake3arena-demo-[0-9]*
 
@@ -23,8 +31,7 @@
 NO_BIN_ON_FTP=	no
 
 NO_CONFIGURE=	yes
-EXTRACT_CMD=	${SED} '1,/^END_OF_STUB$$/d' ${DOWNLOADED_DISTFILE} | \
-								${GTAR} xzf -
+EXTRACT_CMD=	${SED} '1,265d' ${DOWNLOADED_DISTFILE} | ${GTAR} xzf -
 
 .if !make(fetch)
 ONLY_FOR_PLATFORM=*-*-i386
@@ -47,19 +54,10 @@
 	${INSTALL_PROGRAM_DIR} ${LIBDIR}
 	${INSTALL_DATA_DIR} ${SHAREDIR}
 	${INSTALL_SCRIPT} ${WRKDIR}/${BINNAME}.sh ${PREFIX}/bin/${BINNAME}
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/x86/glibc-2.1/${DISTBINNAME} \
+	${INSTALL_PROGRAM} ${WRKSRC}/bin/x86/${DISTBINNAME} \
 		${LIBDIR}/${BINNAME}
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/x86/glibc-2.1/q3ded ${LIBDIR}
-	${INSTALL_DATA} ${WRKSRC}/bin/x86/glibc-2.1/libMesaVoodooGL.so.3.2 \
-		${LIBDIR}
-	${LN} -s ${LIBDIR}/libMesaVoodooGL.so.3.2 \
-		${LIBDIR}/libMesaVoodooGL.so.3
-	${LN} -s ${LIBDIR}/libMesaVoodooGL.so.3.2 \
-		${LIBDIR}/libMesaVoodooGL.so
-	${INSTALL_DATA} ${WRKSRC}/README ${SHAREDIR}/${BINNAME}-README
+	${INSTALL_PROGRAM} ${WRKSRC}/bin/x86/q3ded ${LIBDIR}
+	${INSTALL_DATA} ${WRKSRC}/README-linux.txt ${SHAREDIR}/${BINNAME}-README
 	cd ${WRKSRC} && ${PAX} -rw baseq3 ${LIBDIR}
-	cd ${WRKSRC} && ${PAX} -rw Help ${SHAREDIR}
-	${MV} ${SHAREDIR}/Help ${SHAREDIR}/quake3arena-Help
 
-.include "../../emulators/suse_linux/Makefile.application"
 .include "../../mk/bsd.pkg.mk"
Index: PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/games/quake3arena/PLIST,v
retrieving revision 1.3
diff -u -r1.3 PLIST
--- PLIST	2002/12/09 16:01:26	1.3
+++ PLIST	2003/08/10 07:42:23
@@ -1,18 +1,16 @@
 @comment $NetBSD: PLIST,v 1.3 2002/12/09 16:01:26 tron Exp $
 bin/quake3arena
-lib/lokigames/quake3arena/libMesaVoodooGL.so
-lib/lokigames/quake3arena/libMesaVoodooGL.so.3
-lib/lokigames/quake3arena/libMesaVoodooGL.so.3.2
 lib/lokigames/quake3arena/q3ded
 lib/lokigames/quake3arena/quake3arena
 lib/lokigames/quake3arena/baseq3/pak1.pk3
 lib/lokigames/quake3arena/baseq3/pak2.pk3
 lib/lokigames/quake3arena/baseq3/pak3.pk3
-share/doc/lokigames/quake3arena-Help/Q3A_EULA.html
-share/doc/lokigames/quake3arena-Help/Q3A_EULA.txt
-share/doc/lokigames/quake3arena-Help/Q3A_FAQ.html
+lib/lokigames/quake3arena/baseq3/pak4.pk3
+lib/lokigames/quake3arena/baseq3/pak5.pk3
+lib/lokigames/quake3arena/baseq3/pak6.pk3
+lib/lokigames/quake3arena/baseq3/pak7.pk3
+lib/lokigames/quake3arena/baseq3/pak8.pk3
 share/doc/lokigames/quake3arena-README
-@dirrm share/doc/lokigames/quake3arena-Help
 @unexec ${RMDIR} -p %D/share/doc/lokigames 2>/dev/null || ${TRUE}
 @comment next dir not necessarily empty, since the game data file could
 @comment be there
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/games/quake3arena/distinfo,v
retrieving revision 1.2
diff -u -r1.2 distinfo
--- distinfo	2001/04/21 02:08:34	1.2
+++ distinfo	2003/08/10 07:42:23
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2001/04/21 02:08:34 wiz Exp $
+$NetBSD$
 
-SHA1 (linuxq3apoint-1.17.x86.run) = b0dcf5c12621d15c6a417cb1e1dc4e6da4aa8801
-Size (linuxq3apoint-1.17.x86.run) = 9845235 bytes
+SHA1 (linuxq3apoint-1.32b.x86.run) = df0616a0fc113686deebe003f419a6a77caaf0d1
+Size (linuxq3apoint-1.32b.x86.run) = 31478345 bytes
>Release-Note:
>Audit-Trail:
>Unformatted: