Update Mesa and friends to latest version 5.0.2:

- fixed texgen problem causing texcoord's Q to be zero (stex3d)
- default GL_TEXTURE_COMPARE_MODE_ARB was wrong
- GL_CURRENT_MATRIX_NV query was wrong
- GL_CURRENT_MATRIX_STACK_DEPTH_NV query was off by one
- GL_LIST_MODE query wasn't correct
- GL_FOG_COORDINATE_SOURCE_EXT query wasn't supported
- GL_SECONDARY_COLOR_ARRAY_SIZE_EXT query returned wrong value
- blended, wide lines didn't always work correctly
- glVertexAttrib4svNV w component was always 1
- fixed bug in GL_IBM_rasterpos_clip (missing return)
- GL_DEPTH_TEXTURE_MODE = GL_ALPHA didn't work correctly
- a few Solaris compilation fixes
- fixed glClear() problem for DRI drivers (non-existant stencil, etc)
- fixed int/REAL mixup in GLU NURBS curve evaluator (Eric Cazeaux)
- fixed delete [] bug in SI GLU (bug 721765) (Diego Santa Cruz)
- glFog() didn't clamp fog colors
- fixed bad float/int conversion for GL_TEXTURE_PRIORITY in the
  gl[Get]TexParameteri[v] functions
  - fixed invalid memory references in glTexGen functions (bug 781602)
  - integer-valued color arrays weren't handled correctly
- glDrawPixels(GL_DEPTH_COMPONENT) with glPixelZoom didn't work
- GL_EXT_texture_lod_bias is part of 1.4, overlooked in 5.0.1
- build GLUT with -fexceptions so C++ apps propogate exceptions

While here, fix PR pkg/23003 by moving the version number to version.mk
and including that in the buildlink.

14 files changed, 51 insertions, 113 deletions

diff --git a/graphics/Mesa/Makefile b/graphics/Mesa/Makefile
index c00e8b49422..bab6c4d83ac 100644
--- a/graphics/Mesa/Makefile
+++ b/graphics/Mesa/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.51 2003/08/26 01:43:51 jschauma Exp $
+# $NetBSD: Makefile,v 1.52 2003/09/29 21:30:28 jschauma Exp $
 #
 
 PKGNAME=	Mesa-${MESA_VERSION}
@@ -10,6 +10,8 @@ COMMENT=	Graphics library meta package, similar to SGI's OpenGL
 
 CONFLICTS=	Mesa-glx-[0-9]*
 
+pre-patch:	# empty
+
 .include "Makefile.common"
 
 USE_BUILDLINK2=	yes
diff --git a/graphics/Mesa/Makefile.common b/graphics/Mesa/Makefile.common
index 5fcb0d3386b..54b6faa165b 100644
--- a/graphics/Mesa/Makefile.common
+++ b/graphics/Mesa/Makefile.common
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile.common,v 1.18 2003/08/26 01:43:51 jschauma Exp $
+# $NetBSD: Makefile.common,v 1.19 2003/09/29 21:30:28 jschauma Exp $
 
-MESA_VERSION=		5.0.1
 DISTNAME?=		MesaLib-${MESA_VERSION}
 CATEGORIES?=		graphics
 MASTER_SITES?= 		${MASTER_SITE_SOURCEFORGE:=mesa3d/}
@@ -9,6 +8,7 @@ EXTRACT_SUFX?=		.tar.bz2
 MAINTAINER?=		tech-pkg@NetBSD.org
 HOMEPAGE?=		http://www.mesa3d.org/
 
+AUTOMAKE_REQD=		1.4
 USE_GMAKE=		yes
 USE_LIBTOOL=		yes
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
@@ -16,4 +16,11 @@ LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 GNU_CONFIGURE?=		yes
 CONFIGURE_ARGS+=	--enable-static
 
+.if !target(pre-patch)
+pre-patch:
+	cd ${WRKSRC} && ${ACLOCAL} && ${AUTOMAKE}
+.endif
+
+.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 7ac254c209d..857989c0a78 100644
--- a/graphics/Mesa/version.mk
+++ b/graphics/Mesa/version.mk
@@ -1,4 +1,4 @@
-# $NetBSD: version.mk,v 1.1 2002/11/20 22:13:21 jlam Exp $
+# $NetBSD: version.mk,v 1.2 2003/09/29 21:30:28 jschauma Exp $
 #
 # This file computes the version number of the Mesa distributed with
 # XFree86 and stores it in ${_MESA_VERSION}.
@@ -8,6 +8,8 @@
 .if !defined(MESA_VERSION_MK)
 MESA_VERSION_MK=	# defined
 
+MESA_VERSION=		5.0.2
+
 .include "../../mk/bsd.prefs.mk"
 
 _GL_GLEXT_H=		${X11BASE}/include/GL/glext.h
diff --git a/graphics/MesaDemos/PLIST b/graphics/MesaDemos/PLIST
index dcfa97b3248..1d6b1e481c0 100644
--- a/graphics/MesaDemos/PLIST
+++ b/graphics/MesaDemos/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/12/05 15:20:22 jschauma Exp $
+@comment $NetBSD: PLIST,v 1.2 2003/09/29 21:30:28 jschauma Exp $
 share/examples/${PKGNAME}/book/README
 share/examples/${PKGNAME}/book/aaindex
 share/examples/${PKGNAME}/book/aaindex.c
@@ -165,6 +165,7 @@ share/examples/${PKGNAME}/demos/multiarb
 share/examples/${PKGNAME}/demos/multiarb.c
 share/examples/${PKGNAME}/demos/occlude
 share/examples/${PKGNAME}/demos/occlude.c
+share/examples/${PKGNAME}/demos/osdemo
 share/examples/${PKGNAME}/demos/osdemo.c
 share/examples/${PKGNAME}/demos/paltex
 share/examples/${PKGNAME}/demos/paltex.c
@@ -185,6 +186,7 @@ share/examples/${PKGNAME}/demos/reflect
 share/examples/${PKGNAME}/demos/reflect.c
 share/examples/${PKGNAME}/demos/renormal
 share/examples/${PKGNAME}/demos/renormal.c
+share/examples/${PKGNAME}/demos/shadowtex
 share/examples/${PKGNAME}/demos/shadowtex.c
 share/examples/${PKGNAME}/demos/spectex
 share/examples/${PKGNAME}/demos/spectex.c
@@ -252,6 +254,7 @@ share/examples/${PKGNAME}/samples/logo
 share/examples/${PKGNAME}/samples/logo.c
 share/examples/${PKGNAME}/samples/nurb
 share/examples/${PKGNAME}/samples/nurb.c
+share/examples/${PKGNAME}/samples/oglinfo
 share/examples/${PKGNAME}/samples/oglinfo.c
 share/examples/${PKGNAME}/samples/olympic
 share/examples/${PKGNAME}/samples/olympic.c
diff --git a/graphics/MesaDemos/distinfo b/graphics/MesaDemos/distinfo
index 6c8eb7ae286..f76e47c14d1 100644
--- a/graphics/MesaDemos/distinfo
+++ b/graphics/MesaDemos/distinfo
@@ -1,9 +1,7 @@
-$NetBSD: distinfo,v 1.3 2003/05/10 16:37:11 drochner Exp $
+$NetBSD: distinfo,v 1.4 2003/09/29 21:30:28 jschauma Exp $
 
-SHA1 (MesaLib-5.0.1.tar.bz2) = efdda1b592065b714c4cc772d05f21f88b060799
-Size (MesaLib-5.0.1.tar.bz2) = 1661508 bytes
-SHA1 (MesaDemos-5.0.1.tar.bz2) = 7bc5c33e3799b9cd596311e8dde800800c68c938
-Size (MesaDemos-5.0.1.tar.bz2) = 889575 bytes
+SHA1 (MesaLib-5.0.2.tar.bz2) = 948b9e1b11d1341a4230a081469f4636f702ebdc
+Size (MesaLib-5.0.2.tar.bz2) = 1704278 bytes
+SHA1 (MesaDemos-5.0.2.tar.bz2) = 012d635c3e39dfa391b1183425f0630b1f428985
+Size (MesaDemos-5.0.2.tar.bz2) = 896368 bytes
 SHA1 (patch-aa) = 97abd719eb38d141af1c7a12c22fe24f98a1fdf7
-SHA1 (patch-ab) = 9b11eb413720f6a0863a15951dc23449ec25de2d
-SHA1 (patch-ac) = 79166ebd1f425ba592d9a62bccd47533c89f9807
diff --git a/graphics/MesaDemos/patches/patch-ab b/graphics/MesaDemos/patches/patch-ab
deleted file mode 100644
index f22e7d333c6..00000000000
--- a/graphics/MesaDemos/patches/patch-ab
+++ /dev/null
@@ -1,54 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2003/05/10 16:37:12 drochner Exp $
-
---- demos/Makefile.X11.orig	2001-08-21 07:42:11.000000000 +0200
-+++ demos/Makefile.X11	2003-05-10 18:23:01.000000000 +0200
-@@ -9,8 +9,8 @@
- 
- ##### MACROS #####
- 
--INCDIR = ../include
--LIBDIR = ../lib
-+INCDIR = ${X11PREFIX}/include
-+LIBDIR = ${X11PREFIX}/lib
- 
- GL_LIBS = -L$(LIBDIR) -lglut -lGLU -lGL $(APP_LIB_DEPS)
- 
-@@ -36,7 +36,6 @@
- 	morph3d \
- 	multiarb \
- 	occlude \
--	osdemo \
- 	paltex \
- 	pixeltex \
- 	pointblast \
-@@ -44,7 +43,6 @@
- 	readpix \
- 	reflect \
- 	renormal \
--	shadowtex \
- 	spectex \
- 	stex3d \
- 	teapot \
-@@ -68,11 +66,11 @@
- 
- # make executable from .c file:
- .c: $(LIB_DEP)
--	$(CC) -I$(INCDIR) -I../util $(CFLAGS) $< $(GL_LIBS) -o $@
-+	$(CC) -I$(INCDIR) $(CFLAGS) ${LDFLAGS} $< $(GL_LIBS) -o $@
- 
- # special case: need the -lOSMesa library:
- osdemo: osdemo.c
--	$(CC) -I$(INCDIR) $(CFLAGS) osdemo.c $(OSMESA_LIBS) -o $@
-+	$(CC) -I$(INCDIR) $(CFLAGS) ${LDFLAGS} osdemo.c $(OSMESA_LIBS) -o $@
- 
- 
- ##### TARGETS #####
-@@ -95,7 +93,7 @@
- 	cp ../util/readtex.c .
- 
- readtex.h:
--	cp ../util/readtex.c .
-+	cp ../util/readtex.h .
- 
- 
- # execute all programs
diff --git a/graphics/MesaDemos/patches/patch-ac b/graphics/MesaDemos/patches/patch-ac
deleted file mode 100644
index 6c94502a861..00000000000
--- a/graphics/MesaDemos/patches/patch-ac
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-ac,v 1.2 2003/03/09 19:04:53 jschauma Exp $
-
---- samples/Makefile.X11.orig	Tue Feb 15 20:09:06 2000
-+++ samples/Makefile.X11	Sat Mar  8 19:00:44 2003
-@@ -9,15 +9,15 @@
- 
- ##### MACROS #####
- 
--INCDIR = ../include
--LIBDIR = ../lib
-+INCDIR = ${X11PREFIX}/include
-+LIBDIR = ${X11PREFIX}/lib
- 
--GL_LIBS = -L$(LIBDIR) -lglut -lGLU -lGL $(APP_LIB_DEPS)
-+GL_LIBS = ${LDFLAGS} -L$(LIBDIR) -lglut -lGLU -lGL $(APP_LIB_DEPS)
- 
- LIB_DEP = $(LIBDIR)/$(GL_LIB) $(LIBDIR)/$(GLU_LIB) $(LIBDIR)/$(GLUT_LIB)
- 
- PROGS = accum bitmap1 bitmap2 blendeq blendxor copy cursor depth eval fog \
--	font line logo nurb oglinfo olympic overlay point prim quad select \
-+	font line logo nurb olympic overlay point prim quad select \
- 	shape sphere star stencil stretch texture tri wave
- 
- 
diff --git a/graphics/MesaLib/Makefile b/graphics/MesaLib/Makefile
index 4a0e768b9ff..3c779e09b36 100644
--- a/graphics/MesaLib/Makefile
+++ b/graphics/MesaLib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2003/09/18 16:25:08 jmmv Exp $
+# $NetBSD: Makefile,v 1.24 2003/09/29 21:30:28 jschauma Exp $
 
 PKGNAME=		MesaLib-${MESA_VERSION}
 WRKSRC=			${WRKDIR}/${DISTNAME:S/Lib//}
@@ -9,8 +9,11 @@ COMMENT=		Graphics library similar to SGI's OpenGL
 
 USE_BUILDLINK2=		yes
 USE_X11BASE=		yes
+USE_PKGINSTALL=		yes
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
 CONFIGURE_ARGS+=	--without-glut
+CONF_FILES=		${PREFIX}/share/examples/mesa/mesa.conf		\
+			${PKG_SYSCONFDIR}/mesa.conf
 BUILD_DIRS=		${WRKSRC}/src
 
 .include "../../mk/bsd.prefs.mk"
diff --git a/graphics/MesaLib/PLIST b/graphics/MesaLib/PLIST
index 49b78317e9e..40f6889394f 100644
--- a/graphics/MesaLib/PLIST
+++ b/graphics/MesaLib/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2003/05/10 16:37:12 drochner Exp $
+@comment $NetBSD: PLIST,v 1.10 2003/09/29 21:30:28 jschauma Exp $
 include/GL/gl.h
 include/GL/gl_mangle.h
 include/GL/glext.h
@@ -19,6 +19,6 @@ lib/libOSMesa.la
 lib/libOSMesa.so
 lib/libOSMesa.so.4
 lib/libOSMesa.so.4.501
-share/examples/MesaLib/mesa.conf
-@dirrm share/examples/MesaLib
+share/examples/mesa/mesa.conf
+@dirrm share/examples/mesa
 @unexec ${RMDIR} %D/include/GL >/dev/null 2>&1 || ${TRUE}
diff --git a/graphics/MesaLib/buildlink2.mk b/graphics/MesaLib/buildlink2.mk
index 602edcf1e79..51956ec1e90 100644
--- a/graphics/MesaLib/buildlink2.mk
+++ b/graphics/MesaLib/buildlink2.mk
@@ -1,9 +1,9 @@
-# $NetBSD: buildlink2.mk,v 1.15 2003/08/26 01:43:52 jschauma Exp $
+# $NetBSD: buildlink2.mk,v 1.16 2003/09/29 21:30:28 jschauma Exp $
 
 .if !defined(MESALIB_BUILDLINK2_MK)
 MESALIB_BUILDLINK2_MK=	# defined
 
-.include "../../mk/bsd.prefs.mk"
+.include "../../graphics/Mesa/version.mk"
 
 BUILDLINK_DEPENDS.MesaLib?=	MesaLib>=${MESA_VERSION}
 BUILDLINK_PKGSRCDIR.MesaLib?=	../../graphics/MesaLib
@@ -25,6 +25,7 @@ BUILDLINK_FILES.MesaLib+=	include/GL/xmesa.h
 BUILDLINK_FILES.MesaLib+=	include/GL/xmesa_x.h
 BUILDLINK_FILES.MesaLib+=	include/GL/xmesa_xf86.h
 BUILDLINK_FILES.MesaLib+=	lib/libGL.*
+BUILDLINK_FILES.MesaLib+=	lib/libOSMesa.*
 
 USE_X11=			# defined
 
diff --git a/graphics/MesaLib/distinfo b/graphics/MesaLib/distinfo
index 3bd4010f9da..ddb0997973f 100644
--- a/graphics/MesaLib/distinfo
+++ b/graphics/MesaLib/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.12 2003/08/26 01:43:52 jschauma Exp $
+$NetBSD: distinfo,v 1.13 2003/09/29 21:30:28 jschauma Exp $
 
-SHA1 (MesaLib-5.0.1.tar.bz2) = efdda1b592065b714c4cc772d05f21f88b060799
-Size (MesaLib-5.0.1.tar.bz2) = 1661508 bytes
+SHA1 (MesaLib-5.0.2.tar.bz2) = 948b9e1b11d1341a4230a081469f4636f702ebdc
+Size (MesaLib-5.0.2.tar.bz2) = 1704278 bytes
 SHA1 (patch-aa) = 7fa63dca0edfc41812b5432cbabd861ec52cec33
-SHA1 (patch-ac) = e4222d4a2f1cf6092cace568a2eff1aea7da581e
+SHA1 (patch-ac) = 30d3f08c2d9bbfe648a2ed2cbfade6c30a7413fe
diff --git a/graphics/MesaLib/patches/patch-ac b/graphics/MesaLib/patches/patch-ac
index 83d07ecc54e..f17516d0e53 100644
--- a/graphics/MesaLib/patches/patch-ac
+++ b/graphics/MesaLib/patches/patch-ac
@@ -1,13 +1,13 @@
-$NetBSD: patch-ac,v 1.1 2003/04/17 22:15:45 jmmv Exp $
+$NetBSD: patch-ac,v 1.2 2003/09/29 21:30:28 jschauma Exp $
 
---- src/Makefile.in.orig	2002-11-14 04:18:13.000000000 +0100
-+++ src/Makefile.in
-@@ -25,7 +25,7 @@ bindir = @bindir@
+--- src/Makefile.in.orig	2003-09-29 13:14:27.000000000 -0400
++++ src/Makefile.in	2003-09-29 13:14:55.000000000 -0400
+@@ -25,7 +25,7 @@
  sbindir = @sbindir@
  libexecdir = @libexecdir@
  datadir = @datadir@
 -sysconfdir = @sysconfdir@
-+sysconfdir = @datadir@/examples/MesaLib
++sysconfdir = @datadir@/examples/mesa
  sharedstatedir = @sharedstatedir@
  localstatedir = @localstatedir@
  libdir = @libdir@
diff --git a/graphics/glu/distinfo b/graphics/glu/distinfo
index fda715e2ab8..be18e85f458 100644
--- a/graphics/glu/distinfo
+++ b/graphics/glu/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.11 2003/08/26 01:43:49 jschauma Exp $
+$NetBSD: distinfo,v 1.12 2003/09/29 21:30:28 jschauma Exp $
 
-SHA1 (MesaLib-5.0.1.tar.bz2) = efdda1b592065b714c4cc772d05f21f88b060799
-Size (MesaLib-5.0.1.tar.bz2) = 1661508 bytes
+SHA1 (MesaLib-5.0.2.tar.bz2) = 948b9e1b11d1341a4230a081469f4636f702ebdc
+Size (MesaLib-5.0.2.tar.bz2) = 1704278 bytes
diff --git a/graphics/glut/distinfo b/graphics/glut/distinfo
index dccaf486665..2e3bf036810 100644
--- a/graphics/glut/distinfo
+++ b/graphics/glut/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.14 2003/08/26 01:43:50 jschauma Exp $
+$NetBSD: distinfo,v 1.15 2003/09/29 21:30:28 jschauma Exp $
 
-SHA1 (MesaLib-5.0.1.tar.bz2) = efdda1b592065b714c4cc772d05f21f88b060799
-Size (MesaLib-5.0.1.tar.bz2) = 1661508 bytes
-SHA1 (MesaDemos-5.0.1.tar.bz2) = 7bc5c33e3799b9cd596311e8dde800800c68c938
-Size (MesaDemos-5.0.1.tar.bz2) = 889575 bytes
+SHA1 (MesaLib-5.0.2.tar.bz2) = 948b9e1b11d1341a4230a081469f4636f702ebdc
+Size (MesaLib-5.0.2.tar.bz2) = 1704278 bytes
+SHA1 (MesaDemos-5.0.2.tar.bz2) = 012d635c3e39dfa391b1183425f0630b1f428985
+Size (MesaDemos-5.0.2.tar.bz2) = 896368 bytes
 SHA1 (patch-aa) = d7a7dab7da7068c814a28b996bb3af6c24b48801