Subject: pkg/22426: Linux/MASTER_SITES fixes for games/quake3arena-demo
To: None <gnats-bugs@gnats.netbsd.org>
From: None <soren@bob.blef.org>
List: netbsd-bugs
Date: 08/10/2003 00:42:08
>Number:         22426
>Category:       pkg
>Synopsis:       Linux/MASTER_SITES fixes for games/quake3arena-demo
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Sun Aug 10 07:43: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 sites listed in MASTER_SITES are not valid.
Seeing as this is a Linux binary, there's no need to depend on suse_*
if we're on a Linux machine.
>How-To-Repeat:
>Fix:

Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/games/quake3arena-demo/Makefile,v
retrieving revision 1.14
diff -u -r1.14 Makefile
--- Makefile	2003/07/17 21:39:18	1.14
+++ Makefile	2003/08/10 07:38:47
@@ -1,19 +1,28 @@
 # $NetBSD: Makefile,v 1.14 2003/07/17 21:39:18 grant Exp $
 
-DISTNAME=	linuxq3ademo-1_11-6_x86_gz
+DISTNAME=	linuxq3ademo-1.11-6.x86.gz
 PKGNAME=	quake3arena-demo-1.11.6
 WRKSRC=		${WRKDIR}
 CATEGORIES=	games x11
-MASTER_SITES=	http://download1.activision.com/activision/quake3/demo/ \
-		http://download2.activision.com/activision/quake3/demo/
+MASTER_SITES=	ftp://ftp.idsoftware.com/idstuff/quake3/linux/ \
+		ftp://mirrors.xmission.com/idsoftware/quake3/linux/
 EXTRACT_SUFX=	.sh
 
 MAINTAINER=	wiz@NetBSD.org
 HOMEPAGE=	http://www.quake3arena.com/
 COMMENT=	Quake 3 Arena -- first person shooter (linux demo)
 
+USE_X11=	#defined
+
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} != Linux
 DEPENDS+=	suse_linux>=6.3:../../emulators/${SUSE_DIR_PREFIX}_linux
 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-[0-9]*
 
@@ -55,5 +64,4 @@
 	cd ${WRKSRC} && ${PAX} -rw Help ${SHAREDIR}
 	${MV} ${SHAREDIR}/Help ${SHAREDIR}/quake3arena-Help
 
-.include "../../emulators/suse_linux/Makefile.application"
 .include "../../mk/bsd.pkg.mk"
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/games/quake3arena-demo/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:38:47
@@ -1,4 +1,4 @@
 $NetBSD: distinfo,v 1.2 2001/04/21 02:08:34 wiz Exp $
 
-SHA1 (lokigames/linuxq3ademo-1_11-6_x86_gz.sh) = 7d305eed3fc896c874697278ec0fb746690e04d0
-Size (lokigames/linuxq3ademo-1_11-6_x86_gz.sh) = 49289300 bytes
+SHA1 (lokigames/linuxq3ademo-1.11-6.x86.gz.sh) = 7d305eed3fc896c874697278ec0fb746690e04d0
+Size (lokigames/linuxq3ademo-1.11-6.x86.gz.sh) = 49289300 bytes
>Release-Note:
>Audit-Trail:
>Unformatted: