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)

4 files changed, 12 insertions, 17 deletions

diff --git a/graphics/glu/Makefile b/graphics/glu/Makefile
index f9553b1967e..96fdb8850cf 100644
--- a/graphics/glu/Makefile
+++ b/graphics/glu/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.23 2004/01/05 11:47:33 jlam Exp $
+# $NetBSD: Makefile,v 1.24 2004/01/20 02:48:33 jschauma Exp $
 
 PKGNAME=		${DISTNAME:C/MesaLib/glu/}
-PKGREVISION=		3
 WRKSRC=			${WRKDIR}/${DISTNAME:C/Lib//}
 MAINTAINER=		rh@NetBSD.org
 COMMENT=		GLU polygon tesselation facility for Mesa
@@ -15,11 +14,14 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 USE_BUILDLINK3=		yes
 USE_X11=		yes
-BUILD_DIRS=		${WRKSRC}/si-glu
+INSTLIBS=		libGLU.so.1.3
 
 .include "../../mk/bsd.prefs.mk"
 
-post-install:
+pre-build:
+	${RM} -fr ${WRKSRC}/src/mesa ${WRKSRC}/src/glw
+
+do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/include/GL
 	cd ${WRKSRC}/include/GL; for hdr in				\
 		glu.h glu_mangle.h;					\
diff --git a/graphics/glu/PLIST b/graphics/glu/PLIST
index 407d185715d..ddefdf21819 100644
--- a/graphics/glu/PLIST
+++ b/graphics/glu/PLIST
@@ -1,9 +1,8 @@
-@comment $NetBSD: PLIST,v 1.10 2004/01/05 11:47:33 jlam Exp $
+@comment $NetBSD: PLIST,v 1.11 2004/01/20 02:48:33 jschauma Exp $
 include/GL/glu.h
 include/GL/glu_mangle.h
-lib/libGLU.a
-lib/libGLU.la
+lib/libGLU_pic.a
 lib/libGLU.so
-lib/libGLU.so.4
-lib/libGLU.so.4.502
+lib/libGLU.so.1
+lib/libGLU.so.1.3
 @unexec ${RMDIR} %D/include/GL >/dev/null 2>&1 || ${TRUE}
diff --git a/graphics/glu/buildlink2.mk b/graphics/glu/buildlink2.mk
index d7cb0b67c1d..c3f282b41d2 100644
--- a/graphics/glu/buildlink2.mk
+++ b/graphics/glu/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.13 2003/11/30 22:57:40 jschauma Exp $
+# $NetBSD: buildlink2.mk,v 1.14 2004/01/20 02:48:33 jschauma Exp $
 
 .if !defined(GLU_BUILDLINK2_MK)
 GLU_BUILDLINK2_MK=	# defined
@@ -6,7 +6,7 @@ GLU_BUILDLINK2_MK=	# defined
 .include "../../mk/bsd.prefs.mk"
 
 BUILDLINK_PACKAGES+=		glu
-BUILDLINK_DEPENDS.glu?=		glu>=${MESA_VERSION}nb3
+BUILDLINK_DEPENDS.glu?=		glu>=${MESA_VERSION}
 BUILDLINK_PKGSRCDIR.glu?=	../../graphics/glu
 EVAL_PREFIX+=			BUILDLINK_PREFIX.glu=glu
 BUILDLINK_PREFIX.glu_DEFAULT=	${LOCALBASE}
diff --git a/graphics/glu/distinfo b/graphics/glu/distinfo
deleted file mode 100644
index ad06805b95b..00000000000
--- a/graphics/glu/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.14 2003/11/18 16:10:56 jschauma Exp $
-
-SHA1 (Mesa-5.0.2/MesaLib-5.0.2.tar.bz2) = a49234ad74d6c67b2727c1dd8a8c8e1ed7f63192
-Size (Mesa-5.0.2/MesaLib-5.0.2.tar.bz2) = 1719544 bytes
-SHA1 (patch-aa) = 807b07b1505735f23dd4148c8c838df08af6333e
-SHA1 (patch-ae) = 58bb48fb84edae72ecfb62682061cf6d723fe100