diff options
| author | jlam <jlam> | 2004-01-23 19:37:18 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2004-01-23 19:37:18 +0000 |
| commit | 5638a98427e2047b5d9e14ac48139614bc8e5360 (patch) | |
| tree | 1ce65ece9edc8fe8107c2410050baff6a8a6857a /graphics | |
| parent | 4d66ae9b523a698b00abd1e648eaaab32419686d (diff) | |
| download | pkgsrc-5638a98427e2047b5d9e14ac48139614bc8e5360.tar.gz | |
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 (limited to 'graphics')
| -rw-r--r-- | graphics/Mesa/Makefile.common | 5 | ||||
| -rw-r--r-- | graphics/Mesa/version.mk | 11 |
2 files changed, 8 insertions, 8 deletions
diff --git a/graphics/Mesa/Makefile.common b/graphics/Mesa/Makefile.common index a734b858a44..6a33736bf84 100644 --- a/graphics/Mesa/Makefile.common +++ b/graphics/Mesa/Makefile.common @@ -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 @@ CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=mesa3d/} EXTRACT_SUFX= .tar.bz2 +MESA_VERSION= 6.0 + MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://www.mesa3d.org/ @@ -26,5 +28,4 @@ pre-install: ${LIBTOOL} --mode=install ${INSTALL_DATA} $${lib} ${PREFIX}/lib ; \ done; -.include "../../graphics/Mesa/version.mk" .include "../../mk/bsd.prefs.mk" diff --git a/graphics/Mesa/version.mk b/graphics/Mesa/version.mk index 47de70594db..6c0aa7f2abc 100644 --- a/graphics/Mesa/version.mk +++ b/graphics/Mesa/version.mk @@ -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 @@ _MESA_GL_VERSION_${_glvers_}!= \ # # 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. |