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, 11 insertions, 20 deletions

diff --git a/graphics/glut/Makefile b/graphics/glut/Makefile
index 648e7378da7..6788c6fee34 100644
--- a/graphics/glut/Makefile
+++ b/graphics/glut/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.24 2004/01/05 11:47:33 jlam Exp $
+# $NetBSD: Makefile,v 1.25 2004/01/20 02:48:33 jschauma Exp $
 
 PKGNAME=		${DISTNAME:S/MesaLib/glut/}
-PKGREVISION=		3
 DISTFILES=		${DISTNAME}${EXTRACT_SUFX}
 DISTFILES+=		${DISTNAME:S/MesaLib/MesaDemos/}${EXTRACT_SUFX}
 WRKSRC=			${WRKDIR}/${DISTNAME:S/Lib//}
@@ -17,12 +16,15 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 USE_BUILDLINK3=		yes
 USE_X11=		yes
-CONFIGURE_DIRS=		${WRKSRC}
-BUILD_DIRS=		${WRKSRC}/src-glut
 USE_LIBTOOL=		yes
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
+INSTLIBS=		libglut.so.3.7
 
-post-install:
+pre-build:
+	${RM} -fr ${WRKSRC}/src/mesa ${WRKSRC}/src/glw 			\
+		${WRKSRC}/src/glu ${WRKSRC}/progs
+
+do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/include/GL
 	cd ${WRKSRC}/include/GL; for hdr in				\
 		glut.h glutf90.h;					\
diff --git a/graphics/glut/PLIST b/graphics/glut/PLIST
index a2c32125aa4..5ecb6ba2ee4 100644
--- a/graphics/glut/PLIST
+++ b/graphics/glut/PLIST
@@ -1,9 +1,8 @@
-@comment $NetBSD: PLIST,v 1.8 2003/08/26 01:43:50 jschauma Exp $
+@comment $NetBSD: PLIST,v 1.9 2004/01/20 02:48:33 jschauma Exp $
 include/GL/glut.h
 include/GL/glutf90.h
 lib/libglut.so
-lib/libglut.so.10
-lib/libglut.so.10.1
-lib/libglut.a
-lib/libglut.la
+lib/libglut.so.3
+lib/libglut.so.3.7
+lib/libglut_pic.a
 @unexec ${RMDIR} %D/include/GL >/dev/null 2>&1 || ${TRUE}
diff --git a/graphics/glut/distinfo b/graphics/glut/distinfo
deleted file mode 100644
index 347c94fadd3..00000000000
--- a/graphics/glut/distinfo
+++ /dev/null
@@ -1,10 +0,0 @@
-$NetBSD: distinfo,v 1.17 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 (Mesa-5.0.2/MesaDemos-5.0.2.tar.bz2) = 3c6f948023f5f41b8d5bd308076e9d8cfd194115
-Size (Mesa-5.0.2/MesaDemos-5.0.2.tar.bz2) = 901632 bytes
-SHA1 (patch-aa) = d7a7dab7da7068c814a28b996bb3af6c24b48801
-SHA1 (patch-ab) = 807b07b1505735f23dd4148c8c838df08af6333e
-SHA1 (patch-ad) = 4fac0779bb50f90b3f9bf2c0a73d7ff485a3db9e
-SHA1 (patch-ae) = 58bb48fb84edae72ecfb62682061cf6d723fe100