summaryrefslogtreecommitdiff
path: root/graphics/glut
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2004-02-11 02:03:41 +0000
committerjlam <jlam@pkgsrc.org>2004-02-11 02:03:41 +0000
commit7657096bbc4103f6b7d83b9c84d9e8ace48f4616 (patch)
treeb8d86f8ab6750a32ef28c407db6160c2eb65c232 /graphics/glut
parenta1d0b1b68bd07bf5c704b4c64294efa8c21449fe (diff)
downloadpkgsrc-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/glut')
-rw-r--r--graphics/glut/Makefile4
-rw-r--r--graphics/glut/buildlink3.mk6
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