summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--graphics/Mesa/Makefile11
-rw-r--r--graphics/Mesa/buildlink3.mk9
-rw-r--r--graphics/MesaDemos/Makefile6
-rw-r--r--graphics/MesaLib/buildlink3.mk30
-rw-r--r--graphics/glu/Makefile4
-rw-r--r--graphics/glu/buildlink3.mk4
-rw-r--r--graphics/glut/Makefile4
-rw-r--r--graphics/glut/buildlink3.mk6
8 files changed, 53 insertions, 21 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
diff --git a/graphics/MesaDemos/Makefile b/graphics/MesaDemos/Makefile
index 1ec38edf56b..3382efba4e9 100644
--- a/graphics/MesaDemos/Makefile
+++ b/graphics/MesaDemos/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2004/01/22 13:02:33 adam Exp $
+# $NetBSD: Makefile,v 1.14 2004/02/11 02:03:41 jlam Exp $
#
PKGNAME= MesaDemos-${MESA_VERSION}
@@ -9,7 +9,7 @@ DISTINFO_FILE= ${.CURDIR}/distinfo
.include "../Mesa/Makefile.common"
-USE_BUILDLINK2= yes
+USE_BUILDLINK3= yes
MAKE_FLAGS+= LIB_DEP=""
@@ -24,5 +24,5 @@ do-install:
-rw . ${PREFIX}/share/examples/${PKGNAME_NOREV}/${dir}
${CHMOD} -R a+rX ${PREFIX}/share/examples/${PKGNAME_NOREV}
-.include "../../graphics/Mesa/buildlink2.mk"
+.include "../../graphics/Mesa/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/MesaLib/buildlink3.mk b/graphics/MesaLib/buildlink3.mk
index 239219c88d0..d4bceb7fbb7 100644
--- a/graphics/MesaLib/buildlink3.mk
+++ b/graphics/MesaLib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.21 2004/02/10 23:23:02 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.22 2004/02/11 02:03:41 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
MESALIB_BUILDLINK3_MK:= ${MESALIB_BUILDLINK3_MK}+
@@ -6,7 +6,33 @@ MESALIB_BUILDLINK3_MK:= ${MESALIB_BUILDLINK3_MK}+
.include "../../mk/bsd.prefs.mk"
.if !empty(MESALIB_BUILDLINK3_MK:M+)
-_MESA_REQD?= 3.4.2
+MESA_REQD+= 3.4.2
+
+# Distill the MESA_REQD list into a single _MESA_REQD value that is the
+# highest version of MESA required.
+#
+_MESA_STRICTEST_REQD?= none
+. for _version_ in ${MESA_REQD}
+. for _pkg_ in gcc-${_version_}
+. if ${_MESA_STRICTEST_REQD} == "none"
+_MESA_PKG_SATISFIES_DEP= YES
+. for _vers_ in ${MESA_REQD}
+. if !empty(_MESA_PKG_SATISFIES_DEP:M[yY][eE][sS])
+_MESA_PKG_SATISFIES_DEP!= \
+ if ${PKG_ADMIN} pmatch 'gcc>=${_vers_}' ${_pkg_}; then \
+ ${ECHO} "YES"; \
+ else \
+ ${ECHO} "NO"; \
+ fi
+. endif
+. endfor
+. if !empty(_MESA_PKG_SATISFIES_DEP:M[yY][eE][sS])
+_MESA_STRICTEST_REQD= ${_version_}
+. endif
+. endif
+. endfor
+. endfor
+_MESA_REQD= ${_MESA_STRICTEST_REQD}
BUILDLINK_PACKAGES+= MesaLib
BUILDLINK_DEPENDS.MesaLib+= MesaLib>=${_MESA_REQD}
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}
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
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-02 05:13:41 +0000