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/glu | |
| 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/glu')
| -rw-r--r-- | graphics/glu/Makefile | 4 | ||||
| -rw-r--r-- | graphics/glu/buildlink3.mk | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/graphics/glu/Makefile b/graphics/glu/Makefile index 84e37877b1c..16e9fd0258b 100644 --- a/graphics/glu/Makefile +++ b/graphics/glu/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.28 2004/02/10 23:10:38 jlam Exp $ +# $NetBSD: Makefile,v 1.29 2004/02/11 02:03:41 jlam Exp $ # PKGNAME= ${DISTNAME:C/MesaLib/glu/} @@ -13,7 +13,7 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews USE_BUILDLINK3= yes USE_LANGUAGES= c c++ -_MESA_REQD= ${MESA_VERSION} +MESA_REQD+= ${MESA_VERSION} INSTLIBS= ${WRKSRC}/src/glu/sgi/libGLU.la diff --git a/graphics/glu/buildlink3.mk b/graphics/glu/buildlink3.mk index aaad1075f9a..451c36a0dc7 100644 --- a/graphics/glu/buildlink3.mk +++ b/graphics/glu/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.18 2004/02/10 22:42:56 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.19 2004/02/11 02:03:41 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ GLU_BUILDLINK3_MK:= ${GLU_BUILDLINK3_MK}+ @@ -6,7 +6,7 @@ GLU_BUILDLINK3_MK:= ${GLU_BUILDLINK3_MK}+ .include "../../mk/bsd.prefs.mk" .if !empty(GLU_BUILDLINK3_MK:M+) -_MESA_REQD?= 3.4.2 +. include "../../graphics/MesaLib/buildlink3.mk" BUILDLINK_PACKAGES+= glu BUILDLINK_DEPENDS.glu+= glu>=${_MESA_REQD} |