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 | 7657096bbc4103f6b7d83b9c84d9e8ace48f4616 (patch) | |
| tree | b8d86f8ab6750a32ef28c407db6160c2eb65c232 /graphics/Mesa | |
| parent | a1d0b1b68bd07bf5c704b4c64294efa8c21449fe (diff) | |
| download | pkgsrc-7657096bbc4103f6b7d83b9c84d9e8ace48f4616.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')
| -rw-r--r-- | graphics/Mesa/Makefile | 11 | ||||
| -rw-r--r-- | graphics/Mesa/buildlink3.mk | 9 |
2 files changed, 12 insertions, 8 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" diff --git a/graphics/Mesa/buildlink3.mk b/graphics/Mesa/buildlink3.mk index f6ae8dd1892..e3275b94128 100644 --- a/graphics/Mesa/buildlink3.mk +++ b/graphics/Mesa/buildlink3.mk @@ -1,12 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.1 2004/02/01 10:01:08 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2004/02/11 02:03:41 jlam Exp $ .if !defined(MESA_BUILDLINK3_MK) MESA_BUILDLINK3_MK= defined BUILDLINK_PREFIX.Mesa= ${BUILDLINK_PREFIX.MesaLib} -.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" .endif # MESA_BUILDLINK3_MK |