Use new USE_MESA variable to depend on the correct Mesa packages

19 files changed, 48 insertions, 46 deletions

diff --git a/audio/xmms/Makefile b/audio/xmms/Makefile
index 692a7c7d895..c8a63467c86 100644
--- a/audio/xmms/Makefile
+++ b/audio/xmms/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2000/08/14 14:20:55 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2000/10/15 12:06:32 rh Exp $
 # FreeBSD: ports/audio/xmms/Makefile,v 1.9 2000/02/11 01:46:12 cpiazza Exp
 
 DISTNAME=	xmms-1.0.1
@@ -14,13 +14,13 @@ MASTER_SITES=	ftp://ftp.xmms.org/xmms/1.0/ \
 MAINTAINER=	tron@netbsd.org
 HOMEPAGE=	http://www.xmms.org/
 
-DEPENDS+=	Mesa-*:../../graphics/Mesa
 DEPENDS+=	gtk+>=1.2.7:../../x11/gtk
 DEPENDS+=	libmikmod>=3.1.7:../libmikmod
 DEPENDS+=	libxml>=1.8.5:../../textproc/libxml
 
 USE_LIBTOOL=	yes
 USE_X11=	yes
+USE_MESA=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+= --without-gnome
 CPPFLAGS=	-I${LOCALBASE}/include
diff --git a/devel/SDL/Makefile b/devel/SDL/Makefile
index 1bc9a5dd816..6ce79427551 100644
--- a/devel/SDL/Makefile
+++ b/devel/SDL/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2000/10/15 07:39:43 wulf Exp $
+# $NetBSD: Makefile,v 1.3 2000/10/15 12:06:34 rh Exp $
 #
 
 DISTNAME=	SDL-1.1.5
@@ -12,11 +12,11 @@ BUILD_DEPENDS+= ${LOCALBASE}/bin/autoconf:../../devel/autoconf
 BUILD_DEPENDS+= ${LOCALBASE}/bin/automake:../../devel/automake
 DEPENDS+=	pth>=1.3.5:../../devel/pth
 #DEPENDS+=	unproven-pthreads>=0.16
-DEPENDS+=	Mesa-*:../../graphics/Mesa
 DEPENDS+=	esound>=0.2.18:../../audio/esound
 
 GNU_CONFIGURE=	YES
 USE_GMAKE=	YES
+USE_MESA=	YES
 USE_X11=	YES
 USE_LIBTOOL=	YES
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
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
diff --git a/graphics/clanlib/Makefile b/graphics/clanlib/Makefile
index 221df526636..7c5960606f3 100644
--- a/graphics/clanlib/Makefile
+++ b/graphics/clanlib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2000/03/21 22:40:52 tron Exp $
+# $NetBSD: Makefile,v 1.11 2000/10/15 12:06:35 rh Exp $
 
 DISTNAME=		ClanLib-0.2.2
 CATEGORIES=		graphics games devel x11
@@ -8,11 +8,11 @@ MAINTAINER=		root@garbled.net
 HOMEPAGE=		http://www.clanlib.org/
 
 DEPENDS+=		Hermes-1.2.6*:../../graphics/hermes
-DEPENDS+=		Mesa-*:../../graphics/Mesa
 DEPENDS+=		png>=1.0.6:../../graphics/png
 DEPENDS+=		pth-*:../../devel/pth
 
 USE_X11BASE=		yes
+USE_MESA=		yes
 GNU_CONFIGURE=		yes
 USE_GMAKE=		yes
 USE_PERL5=		yes
diff --git a/graphics/dx/Makefile b/graphics/dx/Makefile
index 96901fa156a..579bc33567b 100644
--- a/graphics/dx/Makefile
+++ b/graphics/dx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2000/04/28 15:27:00 drochner Exp $
+# $NetBSD: Makefile,v 1.6 2000/10/15 12:06:36 rh Exp $
 
 DISTNAME=	dx-4.1.0
 CATEGORIES=	graphics
@@ -7,10 +7,10 @@ MASTER_SITES=	http://www.research.ibm.com/dx/srcDownload/srcArchive/
 MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.research.ibm.com/dx/
 
-DEPENDS+=	Mesa-*:../../graphics/Mesa
 DEPENDS+=	jpeg-6b:../../graphics/jpeg
 
 USE_MOTIF=	yes
+USE_MESA=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 
diff --git a/graphics/giram/Makefile b/graphics/giram/Makefile
index 094a7c1e115..9436024e229 100644
--- a/graphics/giram/Makefile
+++ b/graphics/giram/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2000/07/15 20:39:20 agc Exp $
+# $NetBSD: Makefile,v 1.13 2000/10/15 12:06:41 rh Exp $
 # FreeBSD Id: Makefile,v 1.1.1.1 1999/06/19 17:38:24 cpiazza Exp $
 
 DISTNAME=	Giram-0.1.2
@@ -9,12 +9,12 @@ MASTER_SITES=	ftp://ftp.minet.net/pub/giram/
 MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.minet.net/giram/
 
-DEPENDS+=	Mesa-*:../../graphics/Mesa
 DEPENDS+=	esound-*:../../audio/esound
 DEPENDS+=	gnome-libs-*:../../x11/gnome-libs
 DEPENDS+=	povray-*:../../graphics/povray
 
 USE_X11=	yes
+USE_MESA=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 
diff --git a/graphics/ruby-gl/Makefile b/graphics/ruby-gl/Makefile
index abd7e209490..66e06834c18 100644
--- a/graphics/ruby-gl/Makefile
+++ b/graphics/ruby-gl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2000/04/03 15:35:40 sakamoto Exp $
+# $NetBSD: Makefile,v 1.2 2000/10/15 12:06:42 rh Exp $
 #
 
 DISTNAME=	rbogl
@@ -11,9 +11,9 @@ MAINTAINER=	sakamoto@netbsd.org
 HOMEPAGE=	http://www2.giganet.net/~yoshi/
 
 DEPENDS+=	ruby-1.4.*:../../lang/ruby
-DEPENDS+=	Mesa-*:../../graphics/Mesa
 
 USE_X11=	yes
+USE_MESA=	yes
 WRKSRC=		${WRKDIR}/ruby-gl
 RUBY_VERSION=	1.4
 PLIST_SUBST=	RUBY_VERSION=${RUBY_VERSION}
diff --git a/net/xtraceroute/Makefile b/net/xtraceroute/Makefile
index 887c70066bd..93172f23584 100644
--- a/net/xtraceroute/Makefile
+++ b/net/xtraceroute/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2000/07/15 20:39:24 agc Exp $
+# $NetBSD: Makefile,v 1.15 2000/10/15 12:06:42 rh Exp $
 #
 
 DISTNAME=	xtraceroute-0.8.14
@@ -14,6 +14,7 @@ DEPENDS+=	gtkglarea-1.2.1:../../x11/gtkglarea
 DEPENDS+=	tiff-*:../../graphics/tiff
 
 USE_X11=	yes
+USE_MESA=	yes
 GNU_CONFIGURE=	yes
 
 EVAL_PREFIX+=	GTKDIR=gtk+
diff --git a/x11/fltk/Makefile b/x11/fltk/Makefile
index 5a443020206..eabb876a610 100644
--- a/x11/fltk/Makefile
+++ b/x11/fltk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2000/08/28 13:38:56 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2000/10/15 12:06:42 rh Exp $
 #
 
 DISTNAME=	fltk-1.0.9-source
@@ -17,9 +17,8 @@ EXTRACT_SUFX=	.tar.bz2
 MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.fltk.org/
 
-DEPENDS+=	Mesa-*:../../graphics/Mesa
-
 USE_X11BASE=	# defined
+USE_MESA=	# defined
 USE_GMAKE=	# defined
 USE_LIBTOOL=	# defined
 
diff --git a/x11/glclock/Makefile b/x11/glclock/Makefile
index 9a237fb1ed4..6d1e4088724 100644
--- a/x11/glclock/Makefile
+++ b/x11/glclock/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2000/05/30 07:13:03 tron Exp $
+# $NetBSD: Makefile,v 1.4 2000/10/15 12:06:43 rh Exp $
 
 DISTNAME=		glclock-4.6
 CATEGORIES=		x11 graphics
@@ -7,9 +7,8 @@ MASTER_SITES=		http://www.daionet.gr.jp/~masa/archives/
 MAINTAINER=		packages@netbsd.org
 HOMEPAGE=		http://www.daionet.gr.jp/~masa/glclock
 
-DEPENDS=		Mesa-*:../../graphics/Mesa
-
 USE_X11BASE=		yes
+USE_MESA=		yes
 MAKEFILE=		makefile
 ALL_TARGET=		glclock
 
diff --git a/x11/gtkglarea/Makefile b/x11/gtkglarea/Makefile
index d58e1ceda95..e7551153363 100644
--- a/x11/gtkglarea/Makefile
+++ b/x11/gtkglarea/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2000/07/18 15:21:00 agc Exp $
+# $NetBSD: Makefile,v 1.21 2000/10/15 12:06:43 rh Exp $
 
 DISTNAME=		gtkglarea-1.2.1
 CATEGORIES=		x11 graphics
@@ -7,10 +7,10 @@ MASTER_SITES=		http://www.student.oulu.fi/~jlof/gtkglarea/download/
 MAINTAINER=		hubertf@netbsd.org
 HOMEPAGE=		http://www.student.oulu.fi/~jlof/gtkglarea/
 
-DEPENDS+=		Mesa-*:../../graphics/Mesa
 DEPENDS+=		gtk+-1.2.*:../../x11/gtk
 
 USE_X11BASE=		# defined
+USE_MESA=		# defined
 USE_LIBTOOL=		# defined
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 
diff --git a/x11/kdebase/Makefile b/x11/kdebase/Makefile
index ff75c5eb34b..beae6918045 100644
--- a/x11/kdebase/Makefile
+++ b/x11/kdebase/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.71 2000/09/09 01:07:59 hubertf Exp $
+# $NetBSD: Makefile,v 1.72 2000/10/15 12:06:43 rh Exp $
 # FreeBSD Id: Makefile,v 1.6 1997/11/27 00:35:27 se Exp
 
 DISTNAME=	kdebase-1.1.2
@@ -13,19 +13,26 @@ MAINTAINER=	tron@netbsd.org
 HOMEPAGE=       http://www.kde.org/
 
 BUILD_DEPENDS+=	${LOCALBASE}/bin/msgfmt:../../devel/gettext
-DEPENDS+=	Mesa-*:../../graphics/Mesa
 DEPENDS+=	kdelibs-1.1.2:../../x11/kdelibs
 # kdebase doesn't manipulate GIFs, but KDE packages depending on kdebase
 # often do, so put the dependency here.
 #
 DEPENDS+=	libungif-*:../../graphics/libungif
 
+<<<<<<< Makefile
+USE_X11BASE=	YES
+USE_MESA=	YES
+USE_XPM=	YES
+USE_GMAKE=	YES
+GNU_CONFIGURE=	YES
+=======
 USE_X11BASE=		YES
 USE_XPM=		YES
 USE_GMAKE=		YES
 USE_LIBTOOL=		YES
 LTCONFIG_OVERRIDE=	${WRKSRC}/admin/ltconfig
 GNU_CONFIGURE=		YES
+>>>>>>> 1.70
 
 EVAL_PREFIX+=	QT1DIR=qt1
 CONFIGURE_ARGS=	"--datadir=${PREFIX}/share/kde" \
diff --git a/x11/qt/Makefile b/x11/qt/Makefile
index 2541a227745..ec73ff755df 100644
--- a/x11/qt/Makefile
+++ b/x11/qt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2000/08/16 01:52:14 wiz Exp $
+# $NetBSD: Makefile,v 1.36 2000/10/15 12:06:44 rh Exp $
 #
 
 DISTNAME=	qt-2.0.2
@@ -10,13 +10,13 @@ MASTER_SITES=	ftp://ftp.troll.no/qt/source/ \
 MAINTAINER=	tron@netbsd.org
 HOMEPAGE=	http://www.troll.no/products/qt.html
 
-DEPENDS+=	Mesa-*:../../graphics/Mesa
 DEPENDS+=	png-*:../../graphics/png
 
 NOT_FOR_PLATFORM=    *-*-alpha	# builds, but programs linked to qt crash
 
 HAS_CONFIGURE=		yes
 USE_X11BASE=		yes
+USE_MESA=		yes
 USE_GMAKE=		yes
 USE_LIBTOOL=		yes
 CONFIGURE_ENV+=		QTDIR=${WRKSRC}
diff --git a/x11/qt21/Makefile b/x11/qt21/Makefile
index e6ffa04627f..41157d89c4f 100644
--- a/x11/qt21/Makefile
+++ b/x11/qt21/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2000/07/21 09:10:17 agc Exp $
+# $NetBSD: Makefile,v 1.7 2000/10/15 12:06:44 rh Exp $
 #
 
 DISTNAME=	qt-x11-2.1.1
@@ -11,7 +11,6 @@ MASTER_SITES=	ftp://ftp.troll.no/qt/source/ \
 MAINTAINER=	drochner@netbsd.org
 HOMEPAGE=	http://www.troll.no/products/qt.html
 
-DEPENDS+=	Mesa-*:../../graphics/Mesa
 DEPENDS+=	png-*:../../graphics/png
 DEPENDS+=	jpeg-*:../../graphics/jpeg
 
@@ -19,6 +18,7 @@ NOT_FOR_PLATFORM=    *-*-alpha	# builds, but programs linked to qt crash
 
 HAS_CONFIGURE=		yes
 USE_X11BASE=		yes
+USE_MESA=		yes
 USE_GMAKE=		yes
 USE_LIBTOOL=		yes
 CONFIGURE_ENV+=		QTDIR=${WRKSRC}
diff --git a/x11/xlockmore/Makefile b/x11/xlockmore/Makefile
index 1473496112c..2e134704263 100644
--- a/x11/xlockmore/Makefile
+++ b/x11/xlockmore/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2000/08/31 03:38:46 itohy Exp $
+# $NetBSD: Makefile,v 1.36 2000/10/15 12:06:44 rh Exp $
 # FreeBSD Id: Makefile,v 1.23 1997/10/10 09:24:38 tg Exp
 #
 
@@ -13,7 +13,7 @@ HOMEPAGE=	http://www.tux.org/~bagleyd/xlockmore.html
 .include "../../mk/bsd.prefs.mk"
 
 .if !defined(XLOCK_LIGHT)
-DEPENDS+=	Mesa-*:../../graphics/Mesa
+USE_MESA=	YES
 .endif
 
 GNU_CONFIGURE=	YES