[pkgsrc/trunk]: pkgsrc/graphics/Mesa Move the MESA_VERSION definition from ve...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/0a2354182cd0
branches:  trunk
changeset: 466837:0a2354182cd0
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Fri Jan 23 19:37:18 2004 +0000

description:
Move the MESA_VERSION definition from version.mk into Makefile.common, and
don't include version.mk from Makefile.common.  version.mk's sole purpose
now is to figure out which version of the OpenGL specification is
implemented by the XFree86-provided Mesa and to deduce a likely version of
Mesa from the OpenGL specification implemented.

diffstat:

 graphics/Mesa/Makefile.common |   5 +++--
 graphics/Mesa/version.mk      |  11 +++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diffs (56 lines):

diff -r 757ec271060d -r 0a2354182cd0 graphics/Mesa/Makefile.common
--- a/graphics/Mesa/Makefile.common     Fri Jan 23 19:34:09 2004 +0000
+++ b/graphics/Mesa/Makefile.common     Fri Jan 23 19:37:18 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.22 2004/01/22 12:58:07 adam Exp $
+# $NetBSD: Makefile.common,v 1.23 2004/01/23 19:37:18 jlam Exp $
 #
 
 DISTNAME=      MesaLib-${MESA_VERSION}
@@ -9,6 +9,8 @@
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=mesa3d/}
 EXTRACT_SUFX=  .tar.bz2
 
+MESA_VERSION=  6.0
+
 MAINTAINER=    tech-pkg%NetBSD.org@localhost
 HOMEPAGE=      http://www.mesa3d.org/
 
@@ -26,5 +28,4 @@
            ${LIBTOOL} --mode=install ${INSTALL_DATA} $${lib} ${PREFIX}/lib ; \
        done;
 
-.include "../../graphics/Mesa/version.mk"
 .include "../../mk/bsd.prefs.mk"
diff -r 757ec271060d -r 0a2354182cd0 graphics/Mesa/version.mk
--- a/graphics/Mesa/version.mk  Fri Jan 23 19:34:09 2004 +0000
+++ b/graphics/Mesa/version.mk  Fri Jan 23 19:37:18 2004 +0000
@@ -1,15 +1,14 @@
-# $NetBSD: version.mk,v 1.6 2004/01/20 02:48:33 jschauma Exp $
+# $NetBSD: version.mk,v 1.7 2004/01/23 19:37:18 jlam Exp $
 #
 # This file computes the version number of the Mesa distributed with
 # XFree86 and stores it in ${_MESA_VERSION}.
 #
-# Note: This file should only be used by the Mesa-related packages.
-
+# NOTE: This file should only be used by the Mesa-related buildlink*.mk
+#      files.
+#
 .if !defined(MESA_VERSION_MK)
 MESA_VERSION_MK=       # defined
 
-MESA_VERSION=          6.0
-
 .include "../../mk/bsd.prefs.mk"
 
 _GL_GL_H=              ${X11BASE}/include/GL/gl.h
@@ -29,7 +28,7 @@
 #
 # According to the Mesa documentation, for stable releases:
 #
-#      Mesa-5.0 implements OpenGL 1.5,
+#      Mesa-6.0 implements OpenGL 1.5,
 #      Mesa-5.0 implements OpenGL 1.4,
 #      Mesa-4.0.4 implements OpenGL 1.3,
 #      Mesa-3.4.2 implements OpenGL 1.2.