Use new USE_MESA variable to depend on the correct Mesa packages

7 files changed, 21 insertions, 16 deletions

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