don't include Mesa's bl3 directly. It needs to come in via xorg-server's

bl3 since that decides which mesa version to use.

12 files changed, 12 insertions, 25 deletions

diff --git a/x11/xf86-video-ati6/Makefile b/x11/xf86-video-ati6/Makefile
index 16f50b79c01..15a76a62a5a 100644
--- a/x11/xf86-video-ati6/Makefile
+++ b/x11/xf86-video-ati6/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2015/04/25 14:25:21 tnn Exp $
+# $NetBSD: Makefile,v 1.11 2015/09/25 00:44:44 tnn Exp $
 
 DISTNAME=	xf86-video-ati-6.14.6
 PKGNAME=	${DISTNAME:S/ati/ati6/}
@@ -33,7 +33,6 @@ pre-configure:
 
 .include "../../devel/xorg-util-macros/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
-.include "../../graphics/MesaLib/buildlink3.mk"
 .include "../../x11/fontsproto/buildlink3.mk"
 .include "../../x11/glproto/buildlink3.mk"
 .include "../../x11/libdrm/buildlink3.mk"
diff --git a/x11/xf86-video-glint/Makefile b/x11/xf86-video-glint/Makefile
index f2f2d79a80f..19880467176 100644
--- a/x11/xf86-video-glint/Makefile
+++ b/x11/xf86-video-glint/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2015/04/25 14:25:22 tnn Exp $
+# $NetBSD: Makefile,v 1.17 2015/09/25 00:44:44 tnn Exp $
 #
 
 DISTNAME=	xf86-video-glint-1.2.8
@@ -23,7 +23,6 @@ USE_TOOLS+=	pkg-config
 CONFIGURE_ENV+=	DRIVER_MAN_SUFFIX=4
 .endif
 
-.include "../../graphics/MesaLib/buildlink3.mk"
 .include "../../x11/modular-xorg-server/buildlink3.mk"
 .include "../../x11/randrproto/buildlink3.mk"
 .include "../../x11/renderproto/buildlink3.mk"
diff --git a/x11/xf86-video-intel/Makefile b/x11/xf86-video-intel/Makefile
index f6faebf5397..ce2f24d317d 100644
--- a/x11/xf86-video-intel/Makefile
+++ b/x11/xf86-video-intel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2015/04/25 14:25:22 tnn Exp $
+# $NetBSD: Makefile,v 1.36 2015/09/25 00:44:44 tnn Exp $
 
 DISTNAME=	xf86-video-intel-2.99.917
 PKGREVISION=	3
@@ -27,7 +27,6 @@ CONFIGURE_ENV+=	DRIVER_MAN_SUFFIX=4
 BUILDLINK_API_DEPENDS.libdrm+=	libdrm>=2.4.7
 
 .include "../../x11/modular-xorg-server/buildlink3.mk"
-.include "../../graphics/MesaLib/buildlink3.mk"
 .include "../../x11/libXvMC/buildlink3.mk"
 .include "../../x11/libdrm/buildlink3.mk"
 .include "../../x11/xineramaproto/buildlink3.mk"
diff --git a/x11/xf86-video-mach64/Makefile b/x11/xf86-video-mach64/Makefile
index b4da80589e9..a49dc9b6a1d 100644
--- a/x11/xf86-video-mach64/Makefile
+++ b/x11/xf86-video-mach64/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2015/05/21 20:44:06 richard Exp $
+# $NetBSD: Makefile,v 1.16 2015/09/25 00:44:44 tnn Exp $
 
 DISTNAME=	xf86-video-mach64-6.9.5
 CATEGORIES=	x11
@@ -25,8 +25,6 @@ CONFIGURE_ENV+=	DRIVER_MAN_SUFFIX=4
 .endif
 
 .include "../../x11/modular-xorg-server/buildlink3.mk"
-
-.include "../../graphics/MesaLib/buildlink3.mk"
 .include "../../x11/fontsproto/buildlink3.mk"
 .include "../../x11/glproto/buildlink3.mk"
 .include "../../x11/libdrm/buildlink3.mk"
diff --git a/x11/xf86-video-mga/Makefile b/x11/xf86-video-mga/Makefile
index dbe112b65cf..f8c1b9fd748 100644
--- a/x11/xf86-video-mga/Makefile
+++ b/x11/xf86-video-mga/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2015/04/25 14:25:22 tnn Exp $
+# $NetBSD: Makefile,v 1.20 2015/09/25 00:44:44 tnn Exp $
 
 DISTNAME=	xf86-video-mga-1.6.4
 PKGREVISION=	2
@@ -22,7 +22,6 @@ USE_TOOLS+=	pkg-config
 CONFIGURE_ENV+=	DRIVER_MAN_SUFFIX=4
 .endif
 
-.include "../../graphics/MesaLib/buildlink3.mk"
 .include "../../x11/modular-xorg-server/buildlink3.mk"
 .include "../../x11/randrproto/buildlink3.mk"
 .include "../../x11/renderproto/buildlink3.mk"
diff --git a/x11/xf86-video-nouveau/Makefile b/x11/xf86-video-nouveau/Makefile
index eb069fcbda7..336333e555b 100644
--- a/x11/xf86-video-nouveau/Makefile
+++ b/x11/xf86-video-nouveau/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2015/07/10 13:46:36 richard Exp $
+# $NetBSD: Makefile,v 1.3 2015/09/25 00:44:44 tnn Exp $
 
 DISTNAME=	xf86-video-nouveau-1.0.11
 CATEGORIES=	x11
@@ -21,7 +21,6 @@ CONFIGURE_ENV+=	DRIVER_MAN_SUFFIX=4
 .endif
 
 .include "../../x11/modular-xorg-server/buildlink3.mk"
-.include "../../graphics/MesaLib/buildlink3.mk"
 .include "../../x11/libdrm/buildlink3.mk"
 .include "../../x11/xextproto/buildlink3.mk"
 .include "../../x11/videoproto/buildlink3.mk"
diff --git a/x11/xf86-video-nv/Makefile b/x11/xf86-video-nv/Makefile
index c03123ac163..fa2e632b716 100644
--- a/x11/xf86-video-nv/Makefile
+++ b/x11/xf86-video-nv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2015/04/25 14:25:22 tnn Exp $
+# $NetBSD: Makefile,v 1.28 2015/09/25 00:44:44 tnn Exp $
 
 DISTNAME=	xf86-video-nv-2.1.20
 PKGREVISION=	3
@@ -23,7 +23,6 @@ CONFIGURE_ENV+=	DRIVER_MAN_SUFFIX=4
 
 .include "../../x11/modular-xorg-server/buildlink3.mk"
 
-.include "../../graphics/MesaLib/buildlink3.mk"
 .include "../../x11/fontsproto/buildlink3.mk"
 .include "../../x11/glproto/buildlink3.mk"
 .include "../../x11/libdrm/buildlink3.mk"
diff --git a/x11/xf86-video-openchrome/Makefile b/x11/xf86-video-openchrome/Makefile
index 50e3b16c59e..30a3408e915 100644
--- a/x11/xf86-video-openchrome/Makefile
+++ b/x11/xf86-video-openchrome/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2015/04/28 09:34:56 jperkin Exp $
+# $NetBSD: Makefile,v 1.16 2015/09/25 00:44:45 tnn Exp $
 
 DISTNAME=	xf86-video-openchrome-0.3.3
 PKGREVISION=	3
@@ -30,7 +30,6 @@ CONFIGURE_ENV+=	DRIVER_MAN_SUFFIX=4
 .endif
 
 .include "../../x11/modular-xorg-server/buildlink3.mk"
-.include "../../graphics/MesaLib/buildlink3.mk"
 .include "../../x11/libXvMC/buildlink3.mk"
 .include "../../x11/randrproto/buildlink3.mk"
 .include "../../x11/renderproto/buildlink3.mk"
diff --git a/x11/xf86-video-r128/Makefile b/x11/xf86-video-r128/Makefile
index ab4969c09bc..a7872422d0b 100644
--- a/x11/xf86-video-r128/Makefile
+++ b/x11/xf86-video-r128/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2015/05/02 08:00:30 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2015/09/25 00:44:45 tnn Exp $
 
 DISTNAME=	xf86-video-r128-6.10.0
 CATEGORIES=	x11
@@ -25,7 +25,6 @@ CONFIGURE_ENV+=	DRIVER_MAN_SUFFIX=4
 
 .include "../../x11/modular-xorg-server/buildlink3.mk"
 
-.include "../../graphics/MesaLib/buildlink3.mk"
 .include "../../x11/fontsproto/buildlink3.mk"
 .include "../../x11/glproto/buildlink3.mk"
 .include "../../x11/libdrm/buildlink3.mk"
diff --git a/x11/xf86-video-savage/Makefile b/x11/xf86-video-savage/Makefile
index 614762ceec1..10a0abdddba 100644
--- a/x11/xf86-video-savage/Makefile
+++ b/x11/xf86-video-savage/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2015/05/08 11:45:20 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2015/09/25 00:44:45 tnn Exp $
 
 DISTNAME=	xf86-video-savage-2.3.8
 CATEGORIES=	x11
@@ -21,7 +21,6 @@ USE_TOOLS+=	pkg-config
 CONFIGURE_ENV+=	DRIVER_MAN_SUFFIX=4
 .endif
 
-.include "../../graphics/MesaLib/buildlink3.mk"
 .include "../../x11/modular-xorg-server/buildlink3.mk"
 .include "../../x11/randrproto/buildlink3.mk"
 .include "../../x11/renderproto/buildlink3.mk"
diff --git a/x11/xf86-video-sis/Makefile b/x11/xf86-video-sis/Makefile
index 3555eab7777..000c9a124b9 100644
--- a/x11/xf86-video-sis/Makefile
+++ b/x11/xf86-video-sis/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2015/08/30 14:28:14 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2015/09/25 00:44:45 tnn Exp $
 
 DISTNAME=	xf86-video-sis-0.10.8
 CATEGORIES=	x11
@@ -24,7 +24,6 @@ CONFIGURE_ENV+=		ac_cv_path_RAWCPP="${PREFIX}/bin/tradcpp -Uunix"
 CONFIGURE_ENV+=	DRIVER_MAN_SUFFIX=4
 .endif
 
-.include "../../graphics/MesaLib/buildlink3.mk"
 .include "../../x11/modular-xorg-server/buildlink3.mk"
 .include "../../x11/randrproto/buildlink3.mk"
 .include "../../x11/renderproto/buildlink3.mk"
diff --git a/x11/xf86-video-tdfx/Makefile b/x11/xf86-video-tdfx/Makefile
index 9d32b9373e0..a933c648c4a 100644
--- a/x11/xf86-video-tdfx/Makefile
+++ b/x11/xf86-video-tdfx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2015/04/25 14:25:23 tnn Exp $
+# $NetBSD: Makefile,v 1.18 2015/09/25 00:44:45 tnn Exp $
 
 DISTNAME=	xf86-video-tdfx-1.4.6
 PKGREVISION=	2
@@ -28,5 +28,4 @@ CONFIGURE_ENV+=	DRIVER_MAN_SUFFIX=4
 .include "../../x11/videoproto/buildlink3.mk"
 .include "../../x11/xextproto/buildlink3.mk"
 .include "../../x11/glproto/buildlink3.mk"
-.include "../../graphics/MesaLib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"