Use new USE_MESA variable to depend on the correct Mesa packages

5 files changed, 13 insertions, 17 deletions

diff --git a/games/battalion/Makefile b/games/battalion/Makefile
index 72f03991cac..712bac5a89a 100644
--- a/games/battalion/Makefile
+++ b/games/battalion/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2000/01/02 03:20:07 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2000/10/15 12:06:34 rh Exp $
 #
 
 DISTNAME=		battalion
@@ -11,12 +11,11 @@ DISTFILES=		battalionSource1.4.tar.Z battalionSUN4.tar.gz
 MAINTAINER=		root@garbled.net
 HOMEPAGE=		http://www.evl.uic.edu/aej/AndyBattalion.html
 
-DEPENDS=		Mesa-*:../../graphics/Mesa
-
 NOT_FOR_PLATFORM=	*-*-alpha	# relies on Mesa (gcc)
 
 EXTRACT_ONLY=		battalionSource1.4.tar.Z
 USE_X11BASE=		yes
+USE_MESA=		yes
 
 do-install:
 	${INSTALL} -c -s -o root -g games -m 2755 ${WRKSRC}/battalion ${PREFIX}/bin
diff --git a/games/battleball/Makefile b/games/battleball/Makefile
index 10231e18509..06d33d245c9 100644
--- a/games/battleball/Makefile
+++ b/games/battleball/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2000/01/06 19:10:31 fredb Exp $
+# $NetBSD: Makefile,v 1.5 2000/10/15 12:06:34 rh Exp $
 
 DISTNAME=	battleball.21.src
 PKGNAME=	battleball-2.1
@@ -23,13 +23,11 @@ do-install:
 
 .include "../../mk/bsd.prefs.mk"
 
-.if !defined(USE_MESA)
+.if defined(BATTLEBALL_USE_MESA)
+USE_MESA=	YES
+.else
 CPPFLAGS+=	-DNO_OPENGL
 SED_CMDS+=	-e '/^GLINCS/s|^|\#|' -e '/^GLLIBS/s|^|\#|'
-.else
-# Note to Maintainers: Wildcard needs to match all possible Mesa-glx
-# variations, so the build doesn't fail if Mesa-glx is already installed.
-DEPENDS+=	Mesa-*:../../graphics/Mesa
 .endif
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/plib/Makefile b/games/plib/Makefile
index b380180cc85..a21be3e46cb 100644
--- a/games/plib/Makefile
+++ b/games/plib/Makefile
@@ -1,16 +1,15 @@
-# $NetBSD: Makefile,v 1.2 2000/08/04 01:58:36 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2000/10/15 12:06:35 rh Exp $
 #
 
-DISTNAME=	plib-1.0.20
+DISTNAME=	plib-1.2.0
 CATEGORIES=	games x11
 MASTER_SITES=	http://plib.sourceforge.net/dist/
 
 MAINTAINER=	rh@netbsd.org
 HOMEPAGE=	http://plib.sourceforge.net/
 
-DEPENDS+=	Mesa-*:../../graphics/Mesa
-
 USE_X11=	YES
+USE_MESA=	YES
 GNU_CONFIGURE=	YES
 CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}"
 CPPFLAGS+=	-Dunix=1 -I${X11PREFIX}/include -I${X11BASE}/include
diff --git a/games/quake/Makefile b/games/quake/Makefile
index ba50b80ff90..2729da3d517 100644
--- a/games/quake/Makefile
+++ b/games/quake/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2000/10/05 05:53:35 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2000/10/15 12:06:35 rh Exp $
 
 DISTNAME=	q1source
 PKGNAME=	quake-2.30
@@ -11,7 +11,6 @@ EXTRACT_SUFX=	.zip
 MAINTAINER=	tron@netbsd.org
 HOMEPAGE=	http://www.idsoftware.com/
 
-DEPENDS+=	Mesa-*:../../graphics/Mesa
 DEPENDS+=	quakedata-*:../../games/quakedata
 
 EXTRACT_CMD=	unzip -q ${DOWNLOADED_DISTFILE}
@@ -21,6 +20,7 @@ MAKE_ENV+=	MAINDIR=${WRKSRC}
 
 NO_WRKSUBDIR=	yes
 USE_X11BASE=	yes
+USE_MESA=	yes
 
 EVAL_PREFIX+=	MESA_DIR=Mesa
 MAKE_ENV+=	MESA_DIR=${MESA_DIR}
diff --git a/games/xracer/Makefile b/games/xracer/Makefile
index ba1afccbd77..94feaf64deb 100644
--- a/games/xracer/Makefile
+++ b/games/xracer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2000/08/27 07:11:11 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2000/10/15 12:06:35 rh Exp $
 #
 
 DISTNAME=		xracer-0.96.9
@@ -8,11 +8,11 @@ MASTER_SITES=		http://xracer.annexia.org/files/
 MAINTAINER=		bsieker@freenet.de
 HOMEPAGE=		http://xracer.annexia.org/
 
-DEPENDS+=		Mesa-*:../../graphics/Mesa
 DEPENDS+=		jpeg-*:../../graphics/jpeg
 DEPENDS+=		gettext>=0.10.35nb1:../../devel/gettext
 
 USE_X11=		# defined
+USE_MESA=		# defined
 USE_GMAKE=		# defined
 USE_PERL5=		# defined
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/XRacer/.packlist