Update Mesa and friends to version 6.0:

Changes since 5.2:
New:
- full OpenGL 1.5 support
- updated GL/glext.h file to version 21
Changes:
- changed max framebuffer size to 4Kx4K (MAX_WIDTH/HEIGHT in config.h)
Bug fixes:
- fixed bug in UNCLAMPED_FLOAT_TO_UBYTE macro; solves a color
clamping issue
- updated suno5-gcc configs
- glColor3 functions sometimes resulted in undefined alpha values
- fixed FP divide by zero error seen on VMS with xlockmore, others
- fixed vertex/fragment program debug problem (bug 873011)
- building on AIX with gcc works now
- glDeleteProgramsARB failed for ARB fragment programs (bug 876160)
- glDrawRangeElements tried to modify potentially read-only storage
- updated files for building on Windows

Changes since 5.0.2:
New features:
- reorganized directory tree
- GL_ARB_vertex/fragment_program extensions (Michal Krol & Karl Rasche)
- GL_ATI_texture_env_combine3 extension (Ian Romanick)
- GL_SGI_texture_color_table extension (Eric Plante)
- GL_NV_fragment_program extension
- GL_NV_light_max_exponent extension
- GL_EXT_texture_rectangle (identical to GL_NV_texture_rectangle)
- GL_ARB_occlusion_query extension
- GL_ARB_point_sprite extension
- GL_ARB_texture_non_power_of_two extension
- GL_IBM_multimode_draw_arrays extension
- GL_EXT_texture_mirror_clamp extension (Ian Romanick)
- GL_ARB_vertex_buffer_object extension
- new X86 feature detection code (Petr Sebor)
- less memory used for display lists and vertex buffers
- demo of per-pixel lighting with a fragment program (demos/fplight.c)
- new version (18) of glext.h header
- new spriteblast.c demo of GL_ARB_point_sprite
- faster glDrawPixels in X11 driver in some cases (see RELNOTES-5.1)
- faster glCopyPixels in X11 driver in some cases (see RELNOTES-5.1)
Bug fixes:
- really enable OpenGL 1.4 features in DOS driver.
- fixed issues in glDrawPixels and glCopyPixels for very wide images
- glPixelMapf/ui/usv()'s size parameter is GLsizei, not GLint
- fixed some texgen bugs reported by Daniel Borca
- fixed wglMakeCurrent(NULL, NULL) bug (#835861)
- fixed glTexSubImage3D z-offset bug (Cedric Gautier)
- fixed RGBA blend enable bug (Ville Syrjala)
- glAccum is supposed to be a no-op in selection/feedback mode
- fixed texgen bug #597589 (John Popplewell)
Changes:
- dropped API trace feature (src/Trace/)
- documentation overhaul.  merged with website content.  more html.
- glxgears.c demo updated to use GLX swap rate extensions
- glTexImage1/2/3D now allows width/height/depth = 0
- disable SPARC asm code on Linux (bug 852204)

3 files changed, 27 insertions, 21 deletions

diff --git a/graphics/Mesa/Makefile b/graphics/Mesa/Makefile
index 1555a490989..276678634ec 100644
--- a/graphics/Mesa/Makefile
+++ b/graphics/Mesa/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.54 2003/11/30 22:58:41 jschauma Exp $
+# $NetBSD: Makefile,v 1.55 2004/01/20 02:48:33 jschauma Exp $
 #
 
 PKGNAME=	Mesa-${MESA_VERSION}
-PKGREVISION=	1
 MASTER_SITES= 	# empty
 DISTFILES=	# empty
 
@@ -11,17 +10,17 @@ COMMENT=	Graphics library meta package, similar to SGI's OpenGL
 
 CONFLICTS=	Mesa-glx-[0-9]*
 
-pre-patch:	# empty
-
 USE_BUILDLINK2=	yes
 
-USE_X11BASE=	yes
+USE_X11=	yes
 NO_CHECKSUM=	yes
 NO_CONFIGURE=	yes
 NO_BUILD=	yes
+NO_PATCH=	yes
 EXTRACT_ONLY=	# empty
 
-post-patch:	# empty
+do-patch:	# empty
+do-buildlink:	# empty
 do-install:	# empty
 
 .include "Makefile.common"
diff --git a/graphics/Mesa/Makefile.common b/graphics/Mesa/Makefile.common
index 3857950ef64..f4fe30f61a3 100644
--- a/graphics/Mesa/Makefile.common
+++ b/graphics/Mesa/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.20 2003/11/18 16:10:55 jschauma Exp $
+# $NetBSD: Makefile.common,v 1.21 2004/01/20 02:48:33 jschauma Exp $
 
 DISTNAME?=		MesaLib-${MESA_VERSION}
 CATEGORIES?=		graphics
@@ -8,20 +8,24 @@ EXTRACT_SUFX?=		.tar.bz2
 MAINTAINER?=		tech-pkg@NetBSD.org
 HOMEPAGE?=		http://www.mesa3d.org/
 
-AUTOMAKE_REQD=		1.7
-USE_GMAKE=		yes
+ALL_TARGET=             pkgsrc
 USE_LIBTOOL=		yes
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 
-GNU_CONFIGURE?=		yes
-CONFIGURE_ARGS+=	--enable-static
+NO_CONFIGURE?=		yes
 DIST_SUBDIR=		Mesa-${MESA_VERSION}
+PATCHDIR?=		${.CURDIR}/../../graphics/MesaLib/patches
+DISTINFO_FILE?=		${.CURDIR}/../../graphics/MesaLib/distinfo
 
-.if !target(post-patch)
-post-patch:
-	cd ${WRKSRC} && ${ACLOCAL} && ${AUTOMAKE}
-.endif
+pre-install:
+	for lib in ${INSTLIBS}; do					\
+		${INSTALL_DATA} ${WRKSRC}/lib/$${lib} ${PREFIX}/lib/;	\
+		cd ${PREFIX}/lib && ${LN} -s $${lib} $${lib%%.[0-9]};	\
+		cd ${PREFIX}/lib && ${LN} -s $${lib%%.[0-9]}		\
+						$${lib%%.[0-9].[0-9]};	\
+		${INSTALL_DATA} ${WRKSRC}/lib/$${lib%%.*}_pic.a		\
+					${PREFIX}/lib/;			\
+	done;
 
 .include "../../graphics/Mesa/version.mk"
-.include "../../mk/automake.mk"
 .include "../../mk/bsd.prefs.mk"
diff --git a/graphics/Mesa/version.mk b/graphics/Mesa/version.mk
index 35fa4e05449..47de70594db 100644
--- a/graphics/Mesa/version.mk
+++ b/graphics/Mesa/version.mk
@@ -1,4 +1,4 @@
-# $NetBSD: version.mk,v 1.5 2004/01/05 06:32:40 jlam Exp $
+# $NetBSD: version.mk,v 1.6 2004/01/20 02:48:33 jschauma Exp $
 #
 # This file computes the version number of the Mesa distributed with
 # XFree86 and stores it in ${_MESA_VERSION}.
@@ -8,12 +8,12 @@
 .if !defined(MESA_VERSION_MK)
 MESA_VERSION_MK=	# defined
 
-MESA_VERSION=		5.0.2
+MESA_VERSION=		6.0
 
 .include "../../mk/bsd.prefs.mk"
 
 _GL_GL_H=		${X11BASE}/include/GL/gl.h
-_MESA_GL_VERSIONS=	1.2 1.3 1.4
+_MESA_GL_VERSIONS=	1.2 1.3 1.4 1.5
 .for _glvers_ in ${_MESA_GL_VERSIONS}
 .  if !exists(${_GL_GL_H})
 _MESA_GL_VERSION_${_glvers_}=	NO
@@ -29,11 +29,14 @@ _MESA_GL_VERSION_${_glvers_}!= \
 #
 # According to the Mesa documentation, for stable releases:
 #
+#	Mesa-5.0 implements OpenGL 1.5,
 #	Mesa-5.0 implements OpenGL 1.4,
-#	Mesa-4.0.4 implements OpenGL 1.3
+#	Mesa-4.0.4 implements OpenGL 1.3,
 #	Mesa-3.4.2 implements OpenGL 1.2.
 #
-.if ${_MESA_GL_VERSION_1.4} == "YES"
+.if ${_MESA_GL_VERSION_1.5} == "YES"
+_MESA_VERSION?=		6.0
+.elif ${_MESA_GL_VERSION_1.4} == "YES"
 _MESA_VERSION?=		5.0
 .elif ${_MESA_GL_VERSION_1.3} == "YES"
 _MESA_VERSION?=		4.0.4