From aa0aa518ac14831c74a251ce2f29ab666a0ee437 Mon Sep 17 00:00:00 2001 From: jschauma Date: Tue, 26 Aug 2003 01:43:48 +0000 Subject: Finally remove support of Mesa 3.4.1 completely as discussed at length on tech-pkg@ at various times. This means that regardless of what kind of GL support comes with X11, if a package depends on GL, Mesa 5.0.1 (or higher) will be installed into ${LOCALBASE}. Some troubleshooting after the latest patches by Krister Walfridsson. --- pkgtools/x11-links/Makefile | 4 +--- pkgtools/x11-links/xfree.buildlink2.mk | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) (limited to 'pkgtools/x11-links') diff --git a/pkgtools/x11-links/Makefile b/pkgtools/x11-links/Makefile index 82b37e11a81..de80525b85f 100644 --- a/pkgtools/x11-links/Makefile +++ b/pkgtools/x11-links/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.34 2003/07/21 17:14:10 martti Exp $ +# $NetBSD: Makefile,v 1.35 2003/08/26 01:43:48 jschauma Exp $ # # NOTE: If you update this package, then you'll likely need to also update # the x11-links dependency in mk/buildlink2/bsd.buildlink2.mk to the @@ -22,8 +22,6 @@ NO_MTREE= # defined USE_X11= # defined USE_X11_LINKS= NO -_REQUIRE_BUILTIN_MESALIB= YES -_REQUIRE_BUILTIN_GLU= YES _REQUIRE_BUILTIN_FREETYPE2= YES _REQUIRE_BUILTIN_XPM= YES _REQUIRE_BUILTIN_XRENDER= YES diff --git a/pkgtools/x11-links/xfree.buildlink2.mk b/pkgtools/x11-links/xfree.buildlink2.mk index edeeb85db78..711795feac0 100644 --- a/pkgtools/x11-links/xfree.buildlink2.mk +++ b/pkgtools/x11-links/xfree.buildlink2.mk @@ -1,4 +1,4 @@ -# $NetBSD: xfree.buildlink2.mk,v 1.11 2003/01/14 09:31:20 jlam Exp $ +# $NetBSD: xfree.buildlink2.mk,v 1.12 2003/08/26 01:43:48 jschauma Exp $ .if !defined(XFREE_BUILDLINK2_MK) XFREE_BUILDLINK2_MK= # defined @@ -606,8 +606,6 @@ BUILDLINK_FILES.XFree+= lib/libxkbui.a BUILDLINK_TARGETS+= XFree-buildlink -.include "../../graphics/MesaLib/buildlink2.mk" -.include "../../graphics/glu/buildlink2.mk" .include "../../graphics/freetype2/buildlink2.mk" .include "../../graphics/xpm/buildlink2.mk" .include "../../x11/Xrender/buildlink2.mk" -- cgit v1.2.3