diff options
| author | jschauma <jschauma> | 2003-08-26 01:43:48 +0000 |
|---|---|---|
| committer | jschauma <jschauma> | 2003-08-26 01:43:48 +0000 |
| commit | 25e3b096b85f6d1add11a3b32c5320b263251a24 (patch) | |
| tree | f140f06de4c7c70760a39202e8a58d32c2b1d16a /graphics/Mesa | |
| parent | 71e2b74454cfd7072f1332991a819eabc3cdca3f (diff) | |
| download | pkgsrc-25e3b096b85f6d1add11a3b32c5320b263251a24.tar.gz | |
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.
Diffstat (limited to 'graphics/Mesa')
| -rw-r--r-- | graphics/Mesa/Makefile | 4 | ||||
| -rw-r--r-- | graphics/Mesa/Makefile.common | 14 | ||||
| -rw-r--r-- | graphics/Mesa/buildlink2.mk | 5 |
3 files changed, 4 insertions, 19 deletions
diff --git a/graphics/Mesa/Makefile b/graphics/Mesa/Makefile index 841e75a3ad4..c00e8b49422 100644 --- a/graphics/Mesa/Makefile +++ b/graphics/Mesa/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.50 2003/07/17 21:39:58 grant Exp $ +# $NetBSD: Makefile,v 1.51 2003/08/26 01:43:51 jschauma Exp $ # PKGNAME= Mesa-${MESA_VERSION} @@ -20,8 +20,6 @@ NO_CONFIGURE= yes NO_BUILD= yes EXTRACT_ONLY= # empty -MAKEFLAGS+= MESA_REQD=${MESA_REQD} - do-install: # empty .include "../../graphics/MesaLib/buildlink2.mk" diff --git a/graphics/Mesa/Makefile.common b/graphics/Mesa/Makefile.common index 397715a6d48..5fcb0d3386b 100644 --- a/graphics/Mesa/Makefile.common +++ b/graphics/Mesa/Makefile.common @@ -1,10 +1,6 @@ -# $NetBSD: Makefile.common,v 1.17 2003/07/17 21:39:59 grant Exp $ +# $NetBSD: Makefile.common,v 1.18 2003/08/26 01:43:51 jschauma Exp $ -# Latest is: 5.0.1 -# Default is: 3.4.2 -MESA_REQD?= 3.4.2 - -MESA_VERSION= ${MESA_REQD} +MESA_VERSION= 5.0.1 DISTNAME?= MesaLib-${MESA_VERSION} CATEGORIES?= graphics MASTER_SITES?= ${MASTER_SITE_SOURCEFORGE:=mesa3d/} @@ -21,9 +17,3 @@ GNU_CONFIGURE?= yes CONFIGURE_ARGS+= --enable-static .include "../../mk/bsd.prefs.mk" - -.if exists(${LOCALBASE}/lib/libGL.so.5) && empty(MESA_REQD:M5.[0-9]*) -MESA_REQD= 5.0.1 -.endif - -MAKEFLAGS+= MESA_REQD="${MESA_REQD}" diff --git a/graphics/Mesa/buildlink2.mk b/graphics/Mesa/buildlink2.mk index ab448ef455f..fa1d35aaf1d 100644 --- a/graphics/Mesa/buildlink2.mk +++ b/graphics/Mesa/buildlink2.mk @@ -1,13 +1,10 @@ -# $NetBSD: buildlink2.mk,v 1.4 2003/07/15 23:31:22 jschauma Exp $ +# $NetBSD: buildlink2.mk,v 1.5 2003/08/26 01:43:51 jschauma Exp $ .if !defined(MESA_BUILDLINK2_MK) MESA_BUILDLINK2_MK= # defined -MESA_REQD?= 3.4.2 BUILDLINK_PREFIX.Mesa= ${BUILDLINK_PREFIX.MesaLib} -MAKEFLAGS+= MESA_REQD="${MESA_REQD}" - .include "../../graphics/MesaLib/buildlink2.mk" .include "../../graphics/glu/buildlink2.mk" .include "../../graphics/glut/buildlink2.mk" |