diff options
| author | jlam <jlam@pkgsrc.org> | 2004-02-11 02:03:41 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2004-02-11 02:03:41 +0000 |
| commit | 07f9638b8bfe243c2fb44cdfe599697b7236bb20 (patch) | |
| tree | b8d86f8ab6750a32ef28c407db6160c2eb65c232 /graphics/Mesa/Makefile | |
| parent | 370309dfdca228db0b0aedb3046ec0e00a5de324 (diff) | |
| download | pkgsrc-07f9638b8bfe243c2fb44cdfe599697b7236bb20.tar.gz | |
Turn MESA_REQD back into a public variable, and make it take a list of
values that MesaLib/buildlink3.mk converts into a single _MESA_REQD that
is the highest version required. If including the Mesa/buildlink3.mk
file, then require the same version of Mesa as required by glut.
Diffstat (limited to 'graphics/Mesa/Makefile')
| -rw-r--r-- | graphics/Mesa/Makefile | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/graphics/Mesa/Makefile b/graphics/Mesa/Makefile index ff9249a077d..bc5992e3241 100644 --- a/graphics/Mesa/Makefile +++ b/graphics/Mesa/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.57 2004/02/10 23:31:38 jlam Exp $ +# $NetBSD: Makefile,v 1.58 2004/02/11 02:03:41 jlam Exp $ PKGNAME= Mesa-${MESA_VERSION} MASTER_SITES= # empty @@ -23,10 +23,11 @@ do-install: # empty .include "Makefile.common" -_MESA_REQD= ${MESA_VERSION} - -.include "../../graphics/MesaLib/buildlink3.mk" -.include "../../graphics/glu/buildlink3.mk" +# The ordering is important here as glut/buildlink3.mk sets the version +# of Mesa required. +# .include "../../graphics/glut/buildlink3.mk" +.include "../../graphics/glu/buildlink3.mk" +.include "../../graphics/MesaLib/buildlink3.mk" .include "../../mk/bsd.pkg.mk" |