[pkgsrc/trunk]: pkgsrc/graphics Turn MESA_REQD back into a public variable, a...

[jlam <jlam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/a7d93942cbc7
branches:  trunk
changeset: 468176:a7d93942cbc7
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Wed Feb 11 02:03:41 2004 +0000

description:
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:

 graphics/Mesa/Makefile         |  11 ++++++-----
 graphics/Mesa/buildlink3.mk    |   9 ++++++---
 graphics/MesaDemos/Makefile    |   6 +++---
 graphics/MesaLib/buildlink3.mk |  30 ++++++++++++++++++++++++++++--
 graphics/glu/Makefile          |   4 ++--
 graphics/glu/buildlink3.mk     |   4 ++--
 graphics/glut/Makefile         |   4 ++--
 graphics/glut/buildlink3.mk    |   6 ++++--
 8 files changed, 53 insertions(+), 21 deletions(-)

diffs (192 lines):

diff -r 8e6b0beb17ba -r a7d93942cbc7 graphics/Mesa/Makefile
--- a/graphics/Mesa/Makefile    Wed Feb 11 01:46:30 2004 +0000
+++ b/graphics/Mesa/Makefile    Wed Feb 11 02:03:41 2004 +0000
@@ -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 @@
 
 .include "Makefile.common"
 
-_MESA_REQD=    ${MESA_VERSION}
-
+# 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 "../../graphics/glu/buildlink3.mk"
-.include "../../graphics/glut/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff -r 8e6b0beb17ba -r a7d93942cbc7 graphics/Mesa/buildlink3.mk
--- a/graphics/Mesa/buildlink3.mk       Wed Feb 11 01:46:30 2004 +0000
+++ b/graphics/Mesa/buildlink3.mk       Wed Feb 11 02:03:41 2004 +0000
@@ -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"
+# 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/glut/buildlink3.mk"
+.include "../../graphics/MesaLib/buildlink3.mk"
 
 .endif # MESA_BUILDLINK3_MK
diff -r 8e6b0beb17ba -r a7d93942cbc7 graphics/MesaDemos/Makefile
--- a/graphics/MesaDemos/Makefile       Wed Feb 11 01:46:30 2004 +0000
+++ b/graphics/MesaDemos/Makefile       Wed Feb 11 02:03:41 2004 +0000
@@ -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 @@
 
 .include "../Mesa/Makefile.common"
 
-USE_BUILDLINK2=                yes
+USE_BUILDLINK3=                yes
 
 MAKE_FLAGS+=           LIB_DEP=""
 
@@ -24,5 +24,5 @@
                -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 -r 8e6b0beb17ba -r a7d93942cbc7 graphics/MesaLib/buildlink3.mk
--- a/graphics/MesaLib/buildlink3.mk    Wed Feb 11 01:46:30 2004 +0000
+++ b/graphics/MesaLib/buildlink3.mk    Wed Feb 11 02:03:41 2004 +0000
@@ -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 @@
 .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 -r 8e6b0beb17ba -r a7d93942cbc7 graphics/glu/Makefile
--- a/graphics/glu/Makefile     Wed Feb 11 01:46:30 2004 +0000
+++ b/graphics/glu/Makefile     Wed Feb 11 02:03:41 2004 +0000
@@ -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 @@
 
 USE_BUILDLINK3=                yes
 USE_LANGUAGES=         c c++
-_MESA_REQD=            ${MESA_VERSION}
+MESA_REQD+=            ${MESA_VERSION}
 
 INSTLIBS=      ${WRKSRC}/src/glu/sgi/libGLU.la
 
diff -r 8e6b0beb17ba -r a7d93942cbc7 graphics/glu/buildlink3.mk
--- a/graphics/glu/buildlink3.mk        Wed Feb 11 01:46:30 2004 +0000
+++ b/graphics/glu/buildlink3.mk        Wed Feb 11 02:03:41 2004 +0000
@@ -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 @@
 .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 -r 8e6b0beb17ba -r a7d93942cbc7 graphics/glut/Makefile
--- a/graphics/glut/Makefile    Wed Feb 11 01:46:30 2004 +0000
+++ b/graphics/glut/Makefile    Wed Feb 11 02:03:41 2004 +0000
@@ -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 @@
 PKG_INSTALLATION_TYPES=        overwrite pkgviews
 
 USE_BUILDLINK3=                yes
-_MESA_REQD=            ${MESA_VERSION}
+MESA_REQD+=            ${MESA_VERSION}
 
 INSTLIBS=      ${WRKSRC}/src/glut/glx/libglut.la
 
diff -r 8e6b0beb17ba -r a7d93942cbc7 graphics/glut/buildlink3.mk
--- a/graphics/glut/buildlink3.mk       Wed Feb 11 01:46:30 2004 +0000
+++ b/graphics/glut/buildlink3.mk       Wed Feb 11 02:03:41 2004 +0000
@@ -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 @@
 
 .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