diff options
| author | jlam <jlam> | 2004-02-11 02:03:41 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2004-02-11 02:03:41 +0000 |
| commit | 8d4f3c23bd219ddc39f87b7a83948e6d832703b3 (patch) | |
| tree | b8d86f8ab6750a32ef28c407db6160c2eb65c232 /graphics/glut | |
| parent | f20d8254df87fff94f4a3105bfe2c2a9a5a44f0f (diff) | |
| download | pkgsrc-8d4f3c23bd219ddc39f87b7a83948e6d832703b3.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/glut')
| -rw-r--r-- | graphics/glut/Makefile | 4 | ||||
| -rw-r--r-- | graphics/glut/buildlink3.mk | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/graphics/glut/Makefile b/graphics/glut/Makefile index b545f10b5e9..807e79bdcfd 100644 --- a/graphics/glut/Makefile +++ b/graphics/glut/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.28 2004/02/10 23:25:19 jlam Exp $ +# $NetBSD: Makefile,v 1.29 2004/02/11 02:03:41 jlam Exp $ # PKGNAME= ${DISTNAME:S/MesaLib/glut/} @@ -12,7 +12,7 @@ CONFLICTS+= Mesa<3.2.1 PKG_INSTALLATION_TYPES= overwrite pkgviews USE_BUILDLINK3= yes -_MESA_REQD= ${MESA_VERSION} +MESA_REQD+= ${MESA_VERSION} INSTLIBS= ${WRKSRC}/src/glut/glx/libglut.la diff --git a/graphics/glut/buildlink3.mk b/graphics/glut/buildlink3.mk index fb23956ac26..d52ca6af6f7 100644 --- a/graphics/glut/buildlink3.mk +++ b/graphics/glut/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.4 2004/01/24 03:26:47 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.5 2004/02/11 02:03:41 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ GLUT_BUILDLINK3_MK:= ${GLUT_BUILDLINK3_MK}+ @@ -9,9 +9,11 @@ BUILDLINK_DEPENDS+= glut .if !empty(GLUT_BUILDLINK3_MK:M+) BUILDLINK_PACKAGES+= glut -BUILDLINK_DEPENDS.glut+= glut>=${MESA_VERSION} +BUILDLINK_DEPENDS.glut+= glut>=${_MESA_REQD} BUILDLINK_PKGSRCDIR.glut?= ../../graphics/glut +MESA_REQD+= 6.0 + . include "../../graphics/MesaLib/buildlink3.mk" .endif # GLUT_BUILDLINK3_MK |