Changes 7.0.1:

New features:
* Added a bluegene-osmesa build config
Bug fixes:
* Added a few missing OpenGL 2.0 API entrypoints
* Fixed glDrawPixels(GL_STENCIL_INDEX) pixel transfer
* GLSL bug fix: added vec2(vec4) constructor
* GLSL bug fix: .strq and .rgba writemasks didn't always work
* Stencil pixel map didn't always work for glDrawPixels
* Fixed polygon stipple bug in i915 driver
* Binding a zero-sized texture didn't disable texturing
* Queries of GL_INFO_LOG_LENGTH, GL_SHADER_SOURCE_LENGTH didn't include
  the terminating zero
* glXChooseFBConfig() in Xlib driver didn't handle GLX_STEREO flag properly
* Fixed a GLSL function call bug
* glPointParameteriv(GL_DISTANCE_ATTENUATION_EXT) didn't work
* glGetAttribLocation() always returned 1
* Fixed a few memory-related bugs in GLU library

Changes 7.0.0:
New features:
* OpenGL 2.0 and 2.1 API support.
Bug fixes:
* Fixed a few fog-related bugs.
* Fixed broken GLSL mix() function.
* Fixed broken GLSL exp() functions.
* Fixed GLSL mod4(vec4, vec4) bug.
* Implemented GLSL asin(), acos(), atan() functions.
* Fixed an R300 driver bug that caused Xorg composite manager to crash
* Fixed R300 vertex program/matrix bug
* GLSL dFdx() and dFdy() work for fragment program inputs now (texcoords)
* Specifying an invalid texture unit as a sampler could lead to a crash
* The GLX protocol request for glXDestroyPBuffer() was incorrect
* ARB vp state.light[n].half value was incorrect
* Fixed a positional light source bug
* Fixed point size attenuation problem
* glPopAttrib didn't restore texture object's LOD bias
* Fixed a TLS / TEXTREL problem

24 files changed, 310 insertions, 273 deletions

diff --git a/graphics/Mesa/Makefile.common b/graphics/Mesa/Makefile.common
index ba74cad4e2e..acc3072636a 100644
--- a/graphics/Mesa/Makefile.common
+++ b/graphics/Mesa/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.55 2007/02/22 19:26:32 wiz Exp $
+# $NetBSD: Makefile.common,v 1.56 2007/08/12 15:14:46 adam Exp $
 #
 # This Makefile fragment is included either directly or indirectly (through
 # Makefile.lib) by all packages that are built from the Mesa sources.
@@ -11,12 +11,11 @@ EXTRACT_SUFX=	.tar.bz2
 
 # When changing this version, please run "make distinfo" in the following
 # package directories:
-#
 #	graphics/MesaLib
 #	graphics/MesaDemos
 #	graphics/glx-utils
 #
-MESA_VERSION=	6.4.2
+MESA_VERSION=	7.0.1
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.mesa3d.org/
diff --git a/graphics/Mesa/Makefile.lib b/graphics/Mesa/Makefile.lib
index a03e8d5c4c5..9bd044aa05a 100644
--- a/graphics/Mesa/Makefile.lib
+++ b/graphics/Mesa/Makefile.lib
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.lib,v 1.4 2007/03/19 16:47:43 reed Exp $
+# $NetBSD: Makefile.lib,v 1.5 2007/08/12 15:14:47 adam Exp $
 #
 # This Makefile fragment is included by all packages that build libraries
 # from the Mesa sources.
@@ -45,7 +45,7 @@ BUILD_TARGET=		pkgsrc
 .PHONY: Mesa-install-libs
 pre-install: Mesa-install-libs
 Mesa-install-libs:
-	@${TEST} -z ${INSTLIBS:M*:Q}"" || ${ECHO_MSG} "Installing libraries."
+	${TEST} -z ${INSTLIBS:M*:Q}"" || ${ECHO_MSG} "Installing libraries."
 	@for lib in "" ${INSTLIBS}; do					\
 		${TEST} -n "$$lib" || continue;				\
 		${SETENV} ${MAKE_ENV}					\
diff --git a/graphics/MesaDemos/Makefile b/graphics/MesaDemos/Makefile
index 1337e7ea21b..5c9867e67d1 100644
--- a/graphics/MesaDemos/Makefile
+++ b/graphics/MesaDemos/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2006/12/27 13:37:38 joerg Exp $
+# $NetBSD: Makefile,v 1.30 2007/08/12 15:14:47 adam Exp $
 
 PKGNAME=	MesaDemos-${MESA_VERSION}
 COMMENT=	OpenGL examples and Demos
@@ -18,19 +18,19 @@ MAKE_FLAGS+=	LIB_DEP=""
 .include "../../graphics/Mesa/buildlink3.mk"
 
 pre-build:
-	cd ${WRKSRC} && ${RM} -fr src
+	cd ${WRKSRC} && rm -fr src
 
 do-install:
 	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/examples/${PKGNAME_NOREV}/${dir}
-	cd ${WRKSRC}/progs && ${PAX}		\
+	cd ${WRKSRC}/progs && pax	\
 		-s ',^./.*Makefile.*,,'	\
-		-s ',^./CVS.*,,'		\
-		-s ',^./.*\.o$$,,'		\
-		-s ',^./\.libs.*,,'		\
-		-s ',^./\.deps.*,,'		\
-		-s ',^./.*\.orig$$,,'		\
+		-s ',^./CVS.*,,'	\
+		-s ',^./.*\.o$$,,'	\
+		-s ',^./\.libs.*,,'	\
+		-s ',^./\.deps.*,,'	\
+		-s ',^./.*\.orig$$,,'	\
 		-rw . ${DESTDIR}${PREFIX}/share/examples/${PKGNAME_NOREV}/${dir}
-	${CHMOD} -R a+rX ${DESTDIR}${PREFIX}/share/examples/${PKGNAME_NOREV}
+	chmod -R a+rX ${DESTDIR}${PREFIX}/share/examples/${PKGNAME_NOREV}
 
 .include "../../x11/libXi/buildlink3.mk"
 .include "../../x11/libXmu/buildlink3.mk"
diff --git a/graphics/MesaDemos/PLIST b/graphics/MesaDemos/PLIST
index 99772df5f63..68f248a55b2 100644
--- a/graphics/MesaDemos/PLIST
+++ b/graphics/MesaDemos/PLIST
@@ -1,10 +1,12 @@
-@comment $NetBSD: PLIST,v 1.8 2006/01/19 12:53:17 adam Exp $
+@comment $NetBSD: PLIST,v 1.9 2007/08/12 15:14:47 adam Exp $
 share/examples/${PKGNAME}/beos/GLInfo.cpp
 share/examples/${PKGNAME}/beos/demo.cpp
 share/examples/${PKGNAME}/beos/sample.cpp
 share/examples/${PKGNAME}/demos/README
 share/examples/${PKGNAME}/demos/arbfplight
 share/examples/${PKGNAME}/demos/arbfplight.c
+share/examples/${PKGNAME}/demos/arbfslight
+share/examples/${PKGNAME}/demos/arbfslight.c
 share/examples/${PKGNAME}/demos/arbocclude
 share/examples/${PKGNAME}/demos/arbocclude.c
 share/examples/${PKGNAME}/demos/bounce
@@ -16,14 +18,21 @@ share/examples/${PKGNAME}/demos/cubemap.c
 share/examples/${PKGNAME}/demos/descrip.mms
 share/examples/${PKGNAME}/demos/drawpix
 share/examples/${PKGNAME}/demos/drawpix.c
+share/examples/${PKGNAME}/demos/engine
+share/examples/${PKGNAME}/demos/engine.c
+share/examples/${PKGNAME}/demos/extfuncs.h
 share/examples/${PKGNAME}/demos/fire
 share/examples/${PKGNAME}/demos/fire.c
 share/examples/${PKGNAME}/demos/fogcoord
 share/examples/${PKGNAME}/demos/fogcoord.c
 share/examples/${PKGNAME}/demos/fplight
 share/examples/${PKGNAME}/demos/fplight.c
+share/examples/${PKGNAME}/demos/fslight
+share/examples/${PKGNAME}/demos/fslight.c
 share/examples/${PKGNAME}/demos/gamma
 share/examples/${PKGNAME}/demos/gamma.c
+share/examples/${PKGNAME}/demos/gearbox
+share/examples/${PKGNAME}/demos/gearbox.c
 share/examples/${PKGNAME}/demos/gears
 share/examples/${PKGNAME}/demos/gears.c
 share/examples/${PKGNAME}/demos/geartrain
@@ -33,6 +42,8 @@ share/examples/${PKGNAME}/demos/glinfo
 share/examples/${PKGNAME}/demos/glinfo.c
 share/examples/${PKGNAME}/demos/gloss
 share/examples/${PKGNAME}/demos/gloss.c
+share/examples/${PKGNAME}/demos/glslnoise
+share/examples/${PKGNAME}/demos/glslnoise.c
 share/examples/${PKGNAME}/demos/gltestperf
 share/examples/${PKGNAME}/demos/gltestperf.c
 share/examples/${PKGNAME}/demos/glutfx
@@ -48,14 +59,11 @@ share/examples/${PKGNAME}/demos/morph3d
 share/examples/${PKGNAME}/demos/morph3d.c
 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/paltex
 share/examples/${PKGNAME}/demos/paltex.c
 share/examples/${PKGNAME}/demos/particles.cxx
 share/examples/${PKGNAME}/demos/particles.h
-share/examples/${PKGNAME}/demos/pixeltex
-share/examples/${PKGNAME}/demos/pixeltex.c
 share/examples/${PKGNAME}/demos/pointblast
 share/examples/${PKGNAME}/demos/pointblast.c
 share/examples/${PKGNAME}/demos/rain.cxx
@@ -73,12 +81,16 @@ share/examples/${PKGNAME}/demos/shadowtex
 share/examples/${PKGNAME}/demos/shadowtex.c
 share/examples/${PKGNAME}/demos/showbuffer.c
 share/examples/${PKGNAME}/demos/showbuffer.h
+share/examples/${PKGNAME}/demos/singlebuffer
+share/examples/${PKGNAME}/demos/singlebuffer.c
 share/examples/${PKGNAME}/demos/spectex
 share/examples/${PKGNAME}/demos/spectex.c
 share/examples/${PKGNAME}/demos/spriteblast
 share/examples/${PKGNAME}/demos/spriteblast.c
 share/examples/${PKGNAME}/demos/stex3d
 share/examples/${PKGNAME}/demos/stex3d.c
+share/examples/${PKGNAME}/demos/streaming_rect
+share/examples/${PKGNAME}/demos/streaming_rect.c
 share/examples/${PKGNAME}/demos/teapot
 share/examples/${PKGNAME}/demos/teapot.c
 share/examples/${PKGNAME}/demos/terrain
@@ -94,6 +106,8 @@ share/examples/${PKGNAME}/demos/texenv
 share/examples/${PKGNAME}/demos/texenv.c
 share/examples/${PKGNAME}/demos/texobj
 share/examples/${PKGNAME}/demos/texobj.c
+share/examples/${PKGNAME}/demos/trackball.c
+share/examples/${PKGNAME}/demos/trackball.h
 share/examples/${PKGNAME}/demos/trispd
 share/examples/${PKGNAME}/demos/trispd.c
 share/examples/${PKGNAME}/demos/tunnel
@@ -101,11 +115,44 @@ share/examples/${PKGNAME}/demos/tunnel.c
 share/examples/${PKGNAME}/demos/tunnel2
 share/examples/${PKGNAME}/demos/tunnel2.c
 share/examples/${PKGNAME}/demos/tunneldat.h
+share/examples/${PKGNAME}/demos/vao_demo
+share/examples/${PKGNAME}/demos/vao_demo.c
 share/examples/${PKGNAME}/demos/winpos
 share/examples/${PKGNAME}/demos/winpos.c
+share/examples/${PKGNAME}/fbdev/glfbdevtest.c
 share/examples/${PKGNAME}/ggi/asc-view.c
 share/examples/${PKGNAME}/ggi/gears.c
 share/examples/${PKGNAME}/ggi/gears2.c
+share/examples/${PKGNAME}/glsl/CH06-brick.frag.txt
+share/examples/${PKGNAME}/glsl/CH06-brick.vert.txt
+share/examples/${PKGNAME}/glsl/CH11-bumpmap.frag.txt
+share/examples/${PKGNAME}/glsl/CH11-bumpmap.vert.txt
+share/examples/${PKGNAME}/glsl/CH11-toyball.frag.txt
+share/examples/${PKGNAME}/glsl/CH11-toyball.vert.txt
+share/examples/${PKGNAME}/glsl/CH18-mandel.frag.txt
+share/examples/${PKGNAME}/glsl/CH18-mandel.vert.txt
+share/examples/${PKGNAME}/glsl/brick
+share/examples/${PKGNAME}/glsl/brick.c
+share/examples/${PKGNAME}/glsl/bump
+share/examples/${PKGNAME}/glsl/bump.c
+share/examples/${PKGNAME}/glsl/cubemap.frag.txt
+share/examples/${PKGNAME}/glsl/deriv
+share/examples/${PKGNAME}/glsl/deriv.c
+share/examples/${PKGNAME}/glsl/extfuncs.h
+share/examples/${PKGNAME}/glsl/mandelbrot
+share/examples/${PKGNAME}/glsl/mandelbrot.c
+share/examples/${PKGNAME}/glsl/noise
+share/examples/${PKGNAME}/glsl/noise.c
+share/examples/${PKGNAME}/glsl/readtex.c
+share/examples/${PKGNAME}/glsl/readtex.h
+share/examples/${PKGNAME}/glsl/reflect.vert.txt
+share/examples/${PKGNAME}/glsl/shadowtex.frag.txt
+share/examples/${PKGNAME}/glsl/simple.vert.txt
+share/examples/${PKGNAME}/glsl/texdemo1
+share/examples/${PKGNAME}/glsl/texdemo1.c
+share/examples/${PKGNAME}/glsl/toyball
+share/examples/${PKGNAME}/glsl/toyball.c
+share/examples/${PKGNAME}/images/arch.rgb
 share/examples/${PKGNAME}/images/bw.rgb
 share/examples/${PKGNAME}/images/girl.rgb
 share/examples/${PKGNAME}/images/girl2.rgb
@@ -118,6 +165,8 @@ share/examples/${PKGNAME}/images/wrs_logo.rgb
 share/examples/${PKGNAME}/osdemos/osdemo.c
 share/examples/${PKGNAME}/osdemos/osdemo16.c
 share/examples/${PKGNAME}/osdemos/osdemo32.c
+share/examples/${PKGNAME}/osdemos/ostest1.c
+share/examples/${PKGNAME}/osdemos/readtex.c
 share/examples/${PKGNAME}/redbook/README
 share/examples/${PKGNAME}/redbook/aaindex
 share/examples/${PKGNAME}/redbook/aaindex.c
@@ -312,6 +361,7 @@ share/examples/${PKGNAME}/samples/wave.c
 share/examples/${PKGNAME}/util/README
 share/examples/${PKGNAME}/util/dumpstate.c
 share/examples/${PKGNAME}/util/errcheck.c
+share/examples/${PKGNAME}/util/extfuncs.h
 share/examples/${PKGNAME}/util/glstate.c
 share/examples/${PKGNAME}/util/glstate.h
 share/examples/${PKGNAME}/util/glutskel.c
@@ -323,6 +373,8 @@ share/examples/${PKGNAME}/util/readtex.c
 share/examples/${PKGNAME}/util/readtex.h
 share/examples/${PKGNAME}/util/showbuffer.c
 share/examples/${PKGNAME}/util/showbuffer.h
+share/examples/${PKGNAME}/util/trackball.c
+share/examples/${PKGNAME}/util/trackball.h
 share/examples/${PKGNAME}/util/winpos.c
 share/examples/${PKGNAME}/windml/readtex.c
 share/examples/${PKGNAME}/windml/uglaccum.c
@@ -344,7 +396,6 @@ share/examples/${PKGNAME}/windml/wrs_logo.bmp
 share/examples/${PKGNAME}/xdemos/descrip.mms
 share/examples/${PKGNAME}/xdemos/glthreads
 share/examples/${PKGNAME}/xdemos/glthreads.c
-share/examples/${PKGNAME}/xdemos/glwdemo.c
 share/examples/${PKGNAME}/xdemos/glxcontexts
 share/examples/${PKGNAME}/xdemos/glxcontexts.c
 share/examples/${PKGNAME}/xdemos/glxdemo
@@ -382,7 +433,6 @@ share/examples/${PKGNAME}/xdemos/vindex.c
 share/examples/${PKGNAME}/xdemos/vtest.c
 share/examples/${PKGNAME}/xdemos/wincopy
 share/examples/${PKGNAME}/xdemos/wincopy.c
-share/examples/${PKGNAME}/xdemos/xdemo
 share/examples/${PKGNAME}/xdemos/xdemo.c
 share/examples/${PKGNAME}/xdemos/xfont
 share/examples/${PKGNAME}/xdemos/xfont.c
diff --git a/graphics/MesaDemos/distinfo b/graphics/MesaDemos/distinfo
index 887985b53bc..de702470690 100644
--- a/graphics/MesaDemos/distinfo
+++ b/graphics/MesaDemos/distinfo
@@ -1,17 +1,17 @@
-$NetBSD: distinfo,v 1.16 2006/07/06 22:23:21 markd Exp $
+$NetBSD: distinfo,v 1.17 2007/08/12 15:14:47 adam Exp $
 
-SHA1 (Mesa-6.4.2/MesaLib-6.4.2.tar.bz2) = 4f042bdf38c9eb62e04660bd18566e7ca50d8640
-RMD160 (Mesa-6.4.2/MesaLib-6.4.2.tar.bz2) = 6bf1afc0d3bd3f5e3b5c1a019838f40603446509
-Size (Mesa-6.4.2/MesaLib-6.4.2.tar.bz2) = 2913009 bytes
-SHA1 (Mesa-6.4.2/MesaGLUT-6.4.2.tar.bz2) = f136387c3076cfb24a40a7e41cacc43359493771
-RMD160 (Mesa-6.4.2/MesaGLUT-6.4.2.tar.bz2) = 46ab4c40107ba2765bc944b026ed9f584f8c432e
-Size (Mesa-6.4.2/MesaGLUT-6.4.2.tar.bz2) = 270291 bytes
-SHA1 (Mesa-6.4.2/MesaDemos-6.4.2.tar.bz2) = 35b1ff78fc1bd1c303be754ad2ff4252ad6c0258
-RMD160 (Mesa-6.4.2/MesaDemos-6.4.2.tar.bz2) = 82e1dafd39abbe1c0e1de49adcff00dec19c6c1a
-Size (Mesa-6.4.2/MesaDemos-6.4.2.tar.bz2) = 814178 bytes
+SHA1 (Mesa-7.0.1/MesaDemos-7.0.1.tar.bz2) = 4d6cb158b58dbda9411d00e99a01031e13cae2ec
+RMD160 (Mesa-7.0.1/MesaDemos-7.0.1.tar.bz2) = 58537c690d811da09f788bf9b5b5bd999e5445c6
+Size (Mesa-7.0.1/MesaDemos-7.0.1.tar.bz2) = 1340949 bytes
+SHA1 (Mesa-7.0.1/MesaGLUT-7.0.1.tar.bz2) = ee63b2b1804106a05efaffd3da2dee7637d0eecb
+RMD160 (Mesa-7.0.1/MesaGLUT-7.0.1.tar.bz2) = 1c84391874e013145529fee43763ff9f57a88dc9
+Size (Mesa-7.0.1/MesaGLUT-7.0.1.tar.bz2) = 315599 bytes
+SHA1 (Mesa-7.0.1/MesaLib-7.0.1.tar.bz2) = deb1002cf377ba8bd9407bd3cf573f8c8be31671
+RMD160 (Mesa-7.0.1/MesaLib-7.0.1.tar.bz2) = b44fd8ebffd17aa72c3b6cca1c2924e66787aa78
+Size (Mesa-7.0.1/MesaLib-7.0.1.tar.bz2) = 3343538 bytes
 SHA1 (patch-aa) = 4be9b5fadff758d3bcaea22abc5a61e89ccadbe0
 SHA1 (patch-ab) = 50050f26563f739a54173ab75b2d24b4ca4529f4
-SHA1 (patch-ac) = ebaaf755d35bd7f82fe93cff9bb98abee6bbf415
+SHA1 (patch-ac) = 946aa52c85556440b4dc2ff99a6807c3c036c01e
 SHA1 (patch-af) = a66af6ebab7569d85693a9fa58b2d8f9b35149c1
-SHA1 (patch-ah) = 02f1c4ac8a41999454cbebe5d91167fafc7f554e
-SHA1 (patch-ai) = 9738bb842646980fccfd7f9eb5f830d1dc994c8c
+SHA1 (patch-ah) = 7ea6281c244a6329f83d4e137c015e3f4c259ff8
+SHA1 (patch-ai) = b51a6d1ee028120db5b791f0f65c4eb67558b4ee
diff --git a/graphics/MesaDemos/patches/patch-ac b/graphics/MesaDemos/patches/patch-ac
index d22115836b3..c977be22e51 100644
--- a/graphics/MesaDemos/patches/patch-ac
+++ b/graphics/MesaDemos/patches/patch-ac
@@ -1,8 +1,12 @@
-$NetBSD: patch-ac,v 1.9 2006/01/19 12:53:17 adam Exp $
+$NetBSD: patch-ac,v 1.10 2007/08/12 15:14:47 adam Exp $
 
---- Makefile.orig	2005-11-29 23:38:49.000000000 +0100
+--- Makefile.orig	2007-08-03 21:31:28.000000000 +0200
 +++ Makefile
-@@ -2,7 +2,7 @@
+@@ -1,10 +1,10 @@
+ # Top-level Mesa makefile
+ 
+-SHELL = /bin/bash
++SHELL = /bin/sh
  
  TOP = .
  
@@ -11,11 +15,11 @@ $NetBSD: patch-ac,v 1.9 2006/01/19 12:53:17 adam Exp $
  
  
  default: $(TOP)/configs/current
-@@ -117,6 +117,7 @@ linux-x86-xcb \
+@@ -137,6 +137,7 @@ linux-x86-64-static \
  linux-x86-glide \
  linux-x86-static \
  netbsd \
 +pkgsrc \
  openbsd \
  osf1 \
- solaris-x86 \
+ osf1-static \
diff --git a/graphics/MesaDemos/patches/patch-ah b/graphics/MesaDemos/patches/patch-ah
index fabbcd5ca9d..5174043c869 100644
--- a/graphics/MesaDemos/patches/patch-ah
+++ b/graphics/MesaDemos/patches/patch-ah
@@ -1,8 +1,8 @@
-$NetBSD: patch-ah,v 1.3 2006/01/19 12:53:17 adam Exp $
+$NetBSD: patch-ah,v 1.4 2007/08/12 15:14:47 adam Exp $
 
---- configs/default.orig	2005-10-25 01:35:14.000000000 +0200
+--- configs/default.orig	2007-08-01 23:49:59.000000000 +0200
 +++ configs/default
-@@ -14,10 +14,6 @@ MESA_TINY=1
+@@ -16,10 +16,6 @@ MESA_TINY=1
  DRM_SOURCE_PATH=$(TOP)/../drm
  
  # Compiler and flags
@@ -13,12 +13,12 @@ $NetBSD: patch-ah,v 1.3 2006/01/19 12:53:17 adam Exp $
  GLU_CFLAGS = 
  
  # Misc tools and flags
-@@ -56,7 +52,7 @@ GLW_SOURCES = GLwDrawA.c
+@@ -78,7 +74,7 @@ APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(G
  
- # Directories
- LIB_DIR = $(TOP)/lib
--INSTALL_PREFIX = /usr/local
-+INSTALL_PREFIX = ${PREFIX}
- SRC_DIRS = mesa glu glut/glx glw
- GLU_DIRS = sgi
- DRIVER_DIRS = x11 osmesa
+ 
+ # Installation directories (for make install)
+-INSTALL_DIR = /usr/local
++INSTALL_DIR = ${PREFIX}
+ DRI_DRIVER_INSTALL_DIR = /usr/X11R6/lib/modules/dri
+ 
+ # Where libGL will look for DRI hardware drivers
diff --git a/graphics/MesaDemos/patches/patch-ai b/graphics/MesaDemos/patches/patch-ai
index 7d1eb814974..1e07e61c857 100644
--- a/graphics/MesaDemos/patches/patch-ai
+++ b/graphics/MesaDemos/patches/patch-ai
@@ -1,13 +1,13 @@
-$NetBSD: patch-ai,v 1.3 2006/07/06 22:23:21 markd Exp $
+$NetBSD: patch-ai,v 1.4 2007/08/12 15:14:47 adam Exp $
 
---- include/GL/glxext.h.orig	2005-11-08 10:20:29.000000000 +1300
+--- include/GL/glxext.h.orig	2007-06-22 00:10:53.000000000 +0200
 +++ include/GL/glxext.h
-@@ -334,7 +334,7 @@ typedef struct {
- #if defined(__sun__)
+@@ -389,7 +389,7 @@ typedef struct {
+ #elif defined(__sun__) || defined(__digital__)
  #include <inttypes.h>
  #if defined(__STDC__)
 -#if defined(__arch64__)
 +#if defined(__arch64__) || defined(_LP64)
  typedef long int int64_t;
+ typedef unsigned long int uint64_t;
  #else
- typedef long long int int64_t;   
diff --git a/graphics/MesaLib/Makefile b/graphics/MesaLib/Makefile
index 03adb6e8c2c..9feccface79 100644
--- a/graphics/MesaLib/Makefile
+++ b/graphics/MesaLib/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.52 2007/01/24 19:55:01 tv Exp $
+# $NetBSD: Makefile,v 1.53 2007/08/12 15:14:47 adam Exp $
 
 PKGNAME=	MesaLib-${MESA_VERSION}
-PKGREVISION=	3
 COMMENT=	Graphics library similar to SGI's OpenGL
 
 .include "../../graphics/Mesa/Makefile.lib"
@@ -26,7 +25,7 @@ PTHREAD_STUBLIB= # provided by libc
 PKGSRC_MAKE_ENV+=	PTHREAD_STUBLIB=${PTHREAD_STUBLIB}
 
 pre-build:
-	cd ${WRKSRC} && ${RM} -fr src/glu src/glut progs
+	cd ${WRKSRC} && rm -fr src/glu src/glut progs
 
 do-install:
 	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/include/GL
diff --git a/graphics/MesaLib/buildlink3.mk b/graphics/MesaLib/buildlink3.mk
index 326b5398df0..090c7790c8b 100644
--- a/graphics/MesaLib/buildlink3.mk
+++ b/graphics/MesaLib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.38 2007/02/02 17:41:36 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.39 2007/08/12 15:14:47 adam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 MESALIB_BUILDLINK3_MK:=	${MESALIB_BUILDLINK3_MK}+
@@ -16,9 +16,9 @@ BUILDLINK_API_DEPENDS.MesaLib+=	MesaLib>=3.4.2
 BUILDLINK_ABI_DEPENDS.MesaLib+=	MesaLib>=6.4.1nb1
 BUILDLINK_PKGSRCDIR.MesaLib?=	../../graphics/MesaLib
 
-.if !defined(BUILDING_MESA)
+.  if !defined(BUILDING_MESA)
 BUILDLINK_CPPFLAGS.MesaLib=	-DGLX_GLXEXT_LEGACY
-.endif
+.  endif
 
 BUILDLINK_TRANSFORM+=		l:MesaGL:GL
 
diff --git a/graphics/MesaLib/distinfo b/graphics/MesaLib/distinfo
index db951ea781a..592717a4fb2 100644
--- a/graphics/MesaLib/distinfo
+++ b/graphics/MesaLib/distinfo
@@ -1,26 +1,26 @@
-$NetBSD: distinfo,v 1.46 2007/08/06 13:47:38 joerg Exp $
+$NetBSD: distinfo,v 1.47 2007/08/12 15:14:48 adam Exp $
 
-SHA1 (Mesa-6.4.2/MesaDemos-6.4.2.tar.bz2) = 35b1ff78fc1bd1c303be754ad2ff4252ad6c0258
-RMD160 (Mesa-6.4.2/MesaDemos-6.4.2.tar.bz2) = 82e1dafd39abbe1c0e1de49adcff00dec19c6c1a
-Size (Mesa-6.4.2/MesaDemos-6.4.2.tar.bz2) = 814178 bytes
-SHA1 (Mesa-6.4.2/MesaGLUT-6.4.2.tar.bz2) = f136387c3076cfb24a40a7e41cacc43359493771
-RMD160 (Mesa-6.4.2/MesaGLUT-6.4.2.tar.bz2) = 46ab4c40107ba2765bc944b026ed9f584f8c432e
-Size (Mesa-6.4.2/MesaGLUT-6.4.2.tar.bz2) = 270291 bytes
-SHA1 (Mesa-6.4.2/MesaLib-6.4.2.tar.bz2) = 4f042bdf38c9eb62e04660bd18566e7ca50d8640
-RMD160 (Mesa-6.4.2/MesaLib-6.4.2.tar.bz2) = 6bf1afc0d3bd3f5e3b5c1a019838f40603446509
-Size (Mesa-6.4.2/MesaLib-6.4.2.tar.bz2) = 2913009 bytes
+SHA1 (Mesa-7.0.1/MesaDemos-7.0.1.tar.bz2) = 4d6cb158b58dbda9411d00e99a01031e13cae2ec
+RMD160 (Mesa-7.0.1/MesaDemos-7.0.1.tar.bz2) = 58537c690d811da09f788bf9b5b5bd999e5445c6
+Size (Mesa-7.0.1/MesaDemos-7.0.1.tar.bz2) = 1340949 bytes
+SHA1 (Mesa-7.0.1/MesaGLUT-7.0.1.tar.bz2) = ee63b2b1804106a05efaffd3da2dee7637d0eecb
+RMD160 (Mesa-7.0.1/MesaGLUT-7.0.1.tar.bz2) = 1c84391874e013145529fee43763ff9f57a88dc9
+Size (Mesa-7.0.1/MesaGLUT-7.0.1.tar.bz2) = 315599 bytes
+SHA1 (Mesa-7.0.1/MesaLib-7.0.1.tar.bz2) = deb1002cf377ba8bd9407bd3cf573f8c8be31671
+RMD160 (Mesa-7.0.1/MesaLib-7.0.1.tar.bz2) = b44fd8ebffd17aa72c3b6cca1c2924e66787aa78
+Size (Mesa-7.0.1/MesaLib-7.0.1.tar.bz2) = 3343538 bytes
 SHA1 (patch-aa) = 90457ea124a42150e3a37b48e1e0691597668606
 SHA1 (patch-ab) = c257a57d4570576f160e9a4c029384718402c1bd
-SHA1 (patch-ac) = a12c3538907aaa63184371037c0f70924861fbe4
-SHA1 (patch-ad) = e926180243a180bc80b0332f2bcacc14b7c1f13b
-SHA1 (patch-ae) = c7dd8f4b9db5241acdd0f850162b8b4116cd93bd
-SHA1 (patch-af) = e3daa689966c27c32ddb0060a0910d2e5d063555
-SHA1 (patch-ag) = 722234c02093e0d3b10659fa83bb14c7f2e7a8ac
-SHA1 (patch-ah) = 94faa48a6945aa6e7a0fc8806129a463d99d4338
+SHA1 (patch-ac) = 8f3a7279f79ffa95902b12cec9e63cd43993adbd
+SHA1 (patch-ad) = cfa22d638c973fa5b80162447c13205dac34b3e6
+SHA1 (patch-ae) = f75748f523d211273fd02a971b59b29efee5be80
+SHA1 (patch-af) = 9d74d25ab6ebd49282fbfc1af7dfb77e6fa3ced3
+SHA1 (patch-ag) = 6c42ffbdb11e1c241e4bece89188b752103dc19f
+SHA1 (patch-ah) = 699d1d1d43b62eb53c0508087439fa2632ea4e02
 SHA1 (patch-ai) = 3c5e4cc1e054514111d50c1d01257f4647b14558
-SHA1 (patch-aj) = a805947e1aaf73a798fd3a8c6e39bf1bd62afc3a
+SHA1 (patch-aj) = 5155723f61ed5288c763da8c0e4645e8b9f19807
 SHA1 (patch-ak) = 9f3480d08d2b6b7048b018956c57ad6e5d253174
-SHA1 (patch-al) = 8ccbc370bc52882ee72ba76b72a99f163f7b89a7
-SHA1 (patch-am) = a7a40d0d1f371cfa312ae504582ce0521172f85c
+SHA1 (patch-al) = be55e752fb12c10593d4adb75e11593081ee13fd
+SHA1 (patch-am) = 81ab11fba15b20adb88d4fc987f63b5a127e1cbf
 SHA1 (patch-ca) = 5a40dba087b59711778f499b084a2b818b779320
 SHA1 (patch-cb) = 31b4358e171042608a017f4dc98d44f35fcdce70
diff --git a/graphics/MesaLib/hacks.mk b/graphics/MesaLib/hacks.mk
index 355e1b8cc28..3b8cefe41e7 100644
--- a/graphics/MesaLib/hacks.mk
+++ b/graphics/MesaLib/hacks.mk
@@ -1,4 +1,4 @@
-# $NetBSD: hacks.mk,v 1.1 2006/10/01 20:31:13 schwarz Exp $
+# $NetBSD: hacks.mk,v 1.2 2007/08/12 15:14:48 adam Exp $
 
 .if !defined(MESALIBS_HACKS_MK)
 MESALIBS_HACKS_MK=	# defined
@@ -10,7 +10,7 @@ MESALIBS_HACKS_MK=	# defined
 .if ${LOWER_OPSYS} == "irix5.3"
 PKG_HACKS+=		sys_types_h-inttypes_h-conflict
 post-wrapper:
-		${MKDIR} ${BUILDLINK_DIR}/include/sys && ${GREP} -v '^typedef.*[^u_]int[12368]*_t;' /usr/include/sys/types.h > ${BUILDLINK_DIR}/include/sys/types.h
+		mkdir ${BUILDLINK_DIR}/include/sys && grep -v '^typedef.*[^u_]int[12368]*_t;' /usr/include/sys/types.h > ${BUILDLINK_DIR}/include/sys/types.h
 # should match int8_t, int16_t, and int32_t (only)
 .endif
 
diff --git a/graphics/MesaLib/patches/patch-ac b/graphics/MesaLib/patches/patch-ac
index 085728c0a71..c19f413439b 100644
--- a/graphics/MesaLib/patches/patch-ac
+++ b/graphics/MesaLib/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.9 2006/01/19 12:53:17 adam Exp $
+$NetBSD: patch-ac,v 1.10 2007/08/12 15:14:48 adam Exp $
 
---- Makefile.orig	2005-11-29 23:38:49.000000000 +0100
+--- Makefile.orig	2007-08-03 21:31:28.000000000 +0200
 +++ Makefile
-@@ -2,7 +2,7 @@
+@@ -4,7 +4,7 @@ SHELL = /bin/bash
  
  TOP = .
  
@@ -11,19 +11,19 @@ $NetBSD: patch-ac,v 1.9 2006/01/19 12:53:17 adam Exp $
  
  
  default: $(TOP)/configs/current
-@@ -74,6 +74,7 @@ hpux11-64 \
- hpux11-64-static \
+@@ -90,6 +90,7 @@ hpux11-ia64 \
+ hpux11-ia64-static \
  hpux9 \
  hpux9-gcc \
 +interix3 \
  irix6-64 \
  irix6-64-static \
  irix6-n32 \
-@@ -117,6 +118,7 @@ linux-x86-xcb \
+@@ -137,6 +138,7 @@ linux-x86-64-static \
  linux-x86-glide \
  linux-x86-static \
  netbsd \
 +pkgsrc \
  openbsd \
  osf1 \
- solaris-x86 \
+ osf1-static \
diff --git a/graphics/MesaLib/patches/patch-ad b/graphics/MesaLib/patches/patch-ad
index a0cf00284f1..cccca1cd450 100644
--- a/graphics/MesaLib/patches/patch-ad
+++ b/graphics/MesaLib/patches/patch-ad
@@ -1,6 +1,6 @@
-$NetBSD: patch-ad,v 1.8 2006/01/19 12:53:17 adam Exp $
+$NetBSD: patch-ad,v 1.9 2007/08/12 15:14:48 adam Exp $
 
---- src/mesa/Makefile.orig	2005-07-26 07:55:56.000000000 +0200
+--- src/mesa/Makefile.orig	2007-08-01 23:50:00.000000000 +0200
 +++ src/mesa/Makefile
 @@ -14,13 +14,13 @@ GL_TINY = 0$(MESA_MAJOR)0$(MESA_MINOR)0$
  .SUFFIXES : .cpp
@@ -19,13 +19,13 @@ $NetBSD: patch-ad,v 1.8 2006/01/19 12:53:17 adam Exp $
  
  
  # Figure out what to make here
-@@ -150,25 +150,23 @@ subdirs:
+@@ -111,24 +111,24 @@ osmesa-only: depend subdirs $(TOP)/$(LIB
  
  # Make the GL library
- $(LIB_DIR)/$(GL_LIB_NAME): $(STAND_ALONE_OBJECTS)
+ $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME): $(STAND_ALONE_OBJECTS)
 -	@ $(TOP)/bin/mklib -o $(GL_LIB) -linker '$(CC)' \
 -		-major $(GL_MAJOR) -minor $(GL_MINOR) -patch $(GL_TINY) \
--		-install $(LIB_DIR) \
+-		-install $(TOP)/$(LIB_DIR) \
 -		$(MKLIB_OPTIONS) $(GL_LIB_DEPS) $(STAND_ALONE_OBJECTS)
 +	${LIBTOOL} --mode=link ${CC} -o ${GL_LIB_NAME:.so=.la} \
 +		${STAND_ALONE_OBJECTS:.o=.lo} \
@@ -33,12 +33,12 @@ $NetBSD: patch-ad,v 1.8 2006/01/19 12:53:17 adam Exp $
 +		-L${X11BASE}/lib -Wl,-R${X11BASE}/lib ${GL_LIB_DEPS}
  
  # Make the OSMesa library
- $(LIB_DIR)/$(OSMESA_LIB_NAME): $(OSMESA_DRIVER_OBJECTS) $(OSMESA16_OBJECTS)
+ # Note: version is kept at 6.5.3 to simplify app/linking issues
+ $(TOP)/$(LIB_DIR)/$(OSMESA_LIB_NAME): $(OSMESA_DRIVER_OBJECTS) $(OSMESA16_OBJECTS)
  	@ if [ "${DRIVER_DIRS}" = "osmesa" ] ; then \
 -		$(TOP)/bin/mklib -o $(OSMESA_LIB) -linker '$(CC)' \
--			-major $(MESA_MAJOR) \
--			-minor $(MESA_MINOR) -patch $(MESA_TINY) \
--			-install $(LIB_DIR) $(MKLIB_OPTIONS) \
+-			-major 6 -minor 5 -patch 3 \
+-			-install $(TOP)/$(LIB_DIR) $(MKLIB_OPTIONS) \
 -			$(OSMESA_LIB_DEPS) $(OSMESA16_OBJECTS) ; \
 +		${LIBTOOL} --mode=link ${CC} -o ${OSMESA_LIB_NAME:.so=.la} \
 +			${OSMESA16_OBJECTS:.o=.lo} -rpath ${PREFIX}/lib \
@@ -46,9 +46,8 @@ $NetBSD: patch-ad,v 1.8 2006/01/19 12:53:17 adam Exp $
 +			${OSMESA_LIB_DEPS:S|-lGL|libGL.la|} ; \
  	else \
 -		$(TOP)/bin/mklib -o $(OSMESA_LIB) -linker '$(CC)' \
--			-major $(MESA_MAJOR) \
--			-minor $(MESA_MINOR) -patch $(GL_TINY) \
--			-install $(LIB_DIR) $(MKLIB_OPTIONS) \
+-			-major 6 -minor 5 -patch 3 \
+-			-install $(TOP)/$(LIB_DIR) $(MKLIB_OPTIONS) \
 -			$(OSMESA_LIB_DEPS) $(OSMESA_DRIVER_OBJECTS) ; \
 +		${LIBTOOL} --mode=link ${CC} -o ${OSMESA_LIB_NAME:.so=.la} \
 +			${OSMESA_DRIVER_OBJECTS:.o=.lo} -rpath ${PREFIX}/lib \
diff --git a/graphics/MesaLib/patches/patch-ae b/graphics/MesaLib/patches/patch-ae
index e57ff89be2f..e4a0d0195b2 100644
--- a/graphics/MesaLib/patches/patch-ae
+++ b/graphics/MesaLib/patches/patch-ae
@@ -1,6 +1,6 @@
-$NetBSD: patch-ae,v 1.7 2006/01/19 12:53:17 adam Exp $
+$NetBSD: patch-ae,v 1.8 2007/08/12 15:14:48 adam Exp $
 
---- src/glw/Makefile.orig	2005-07-26 07:55:56.000000000 +0200
+--- src/glw/Makefile.orig	2007-06-22 00:10:54.000000000 +0200
 +++ src/glw/Makefile
 @@ -17,7 +17,7 @@ OBJECTS = $(GLW_SOURCES:.c=.o)
  ##### RULES #####
@@ -11,13 +11,13 @@ $NetBSD: patch-ae,v 1.7 2006/01/19 12:53:17 adam Exp $
  
  
  
-@@ -33,10 +33,10 @@ clean:
+@@ -38,10 +38,10 @@ clean:
  
  # Make the library
- $(LIB_DIR)/$(GLW_LIB_NAME): $(OBJECTS)
+ $(TOP)/$(LIB_DIR)/$(GLW_LIB_NAME): $(OBJECTS)
 -	$(TOP)/bin/mklib -o $(GLW_LIB) -linker '$(CC)' \
 -		-major $(MAJOR) -minor $(MINOR) -patch $(TINY) \
--		$(MKLIB_OPTIONS) -install $(LIB_DIR) \
+-		$(MKLIB_OPTIONS) -install $(TOP)/$(LIB_DIR) \
 -		$(GLW_LIB_DEPS) $(OBJECTS)
 +	${LIBTOOL} --mode=link ${CC} -o ${GLW_LIB_NAME:.so=.la} \
 +		${OBJECTS:.o=.lo} -rpath ${PREFIX}/lib \
diff --git a/graphics/MesaLib/patches/patch-af b/graphics/MesaLib/patches/patch-af
index dd38a52a402..24006913dba 100644
--- a/graphics/MesaLib/patches/patch-af
+++ b/graphics/MesaLib/patches/patch-af
@@ -1,6 +1,6 @@
-$NetBSD: patch-af,v 1.6 2006/06/01 12:56:41 joerg Exp $
+$NetBSD: patch-af,v 1.7 2007/08/12 15:14:48 adam Exp $
 
---- src/glu/sgi/Makefile.orig	2005-07-26 07:55:56.000000000 +0200
+--- src/glu/sgi/Makefile.orig	2007-06-22 00:10:54.000000000 +0200
 +++ src/glu/sgi/Makefile
 @@ -115,9 +115,11 @@ OBJECTS = $(C_OBJECTS) $(CC_OBJECTS)
  ##### RULES #####
@@ -14,13 +14,13 @@ $NetBSD: patch-af,v 1.6 2006/06/01 12:56:41 joerg Exp $
  	$(CXX) -c $(INCDIRS) $(CXXFLAGS) -DNDEBUG -DLIBRARYBUILD $< -o $@
  
  
-@@ -136,10 +138,9 @@ $(LIB_DIR):
+@@ -136,10 +138,9 @@ $(TOP)/$(LIB_DIR):
  
  # Make the library:
- $(LIB_DIR)/$(GLU_LIB_NAME): $(OBJECTS)
+ $(TOP)/$(LIB_DIR)/$(GLU_LIB_NAME): $(OBJECTS)
 -	$(TOP)/bin/mklib -o $(GLU_LIB) -linker '$(CXX)' \
 -		-major $(GLU_MAJOR) -minor $(GLU_MINOR) -patch $(GLU_TINY) \
--		-cplusplus $(MKLIB_OPTIONS) -install $(LIB_DIR) \
+-		-cplusplus $(MKLIB_OPTIONS) -install $(TOP)/$(LIB_DIR) \
 -		$(GLU_LIB_DEPS) $(OBJECTS)
 +	${LIBTOOL} --tag=CXX --mode=link ${CXX} -o ${GLU_LIB_NAME:.so=.la} \
 +		${OBJECTS:.o=.lo} -rpath ${PREFIX}/lib \
diff --git a/graphics/MesaLib/patches/patch-ag b/graphics/MesaLib/patches/patch-ag
index 88b473a4c04..8df032734e7 100644
--- a/graphics/MesaLib/patches/patch-ag
+++ b/graphics/MesaLib/patches/patch-ag
@@ -1,22 +1,22 @@
-$NetBSD: patch-ag,v 1.8 2006/01/19 12:53:17 adam Exp $
+$NetBSD: patch-ag,v 1.9 2007/08/12 15:14:48 adam Exp $
 
---- src/glut/glx/Makefile.orig	2005-07-26 07:55:56.000000000 +0200
+--- src/glut/glx/Makefile.orig	2007-06-22 00:10:54.000000000 +0200
 +++ src/glut/glx/Makefile
 @@ -79,6 +79,7 @@ OBJECTS = $(SOURCES:.c=.o)
  ##### RULES #####
  
  .c.o:
 +	${LIBTOOL} --mode=compile \
- 	$(CC) -c -I$(TOP)/include $(CFLAGS) $(GLUT_CFLAGS) $<
+ 	$(CC) -c -I$(TOP)/include $(X11_INCLUDES) $(CFLAGS) $(GLUT_CFLAGS) $<
  
  
-@@ -90,10 +91,10 @@ default: $(LIB_DIR)/$(GLUT_LIB_NAME)
+@@ -90,10 +91,10 @@ default: $(TOP)/$(LIB_DIR)/$(GLUT_LIB_NA
  
  # Make the library
- $(LIB_DIR)/$(GLUT_LIB_NAME): depend $(OBJECTS)
+ $(TOP)/$(LIB_DIR)/$(GLUT_LIB_NAME): depend $(OBJECTS)
 -	$(TOP)/bin/mklib -o $(GLUT_LIB) -linker '$(CC)' \
 -		-major $(GLUT_MAJOR) -minor $(GLUT_MINOR) -patch $(GLUT_TINY) \
--		$(MKLIB_OPTIONS) -install $(LIB_DIR) \
+-		$(MKLIB_OPTIONS) -install $(TOP)/$(LIB_DIR) \
 -		$(GLUT_LIB_DEPS) $(OBJECTS)
 +	${LIBTOOL} --mode=link ${CC} -o ${GLUT_LIB_NAME:.so=.la} \
 +		${OBJECTS:.o=.lo} -rpath ${PREFIX}/lib \
@@ -24,4 +24,4 @@ $NetBSD: patch-ag,v 1.8 2006/01/19 12:53:17 adam Exp $
 +		-L${X11BASE}/lib -Wl,-R${X11BASE}/lib ${GLUT_LIB_DEPS}
  
  
- clean:
+ install:
diff --git a/graphics/MesaLib/patches/patch-ah b/graphics/MesaLib/patches/patch-ah
index 0f696ae88c8..f20dc7d30f1 100644
--- a/graphics/MesaLib/patches/patch-ah
+++ b/graphics/MesaLib/patches/patch-ah
@@ -1,8 +1,8 @@
-$NetBSD: patch-ah,v 1.5 2006/03/21 19:26:32 drochner Exp $
+$NetBSD: patch-ah,v 1.6 2007/08/12 15:14:48 adam Exp $
 
---- configs/default.orig	2005-10-25 01:35:14.000000000 +0200
+--- configs/default.orig	2007-08-01 23:49:59.000000000 +0200
 +++ configs/default
-@@ -14,10 +14,6 @@ MESA_TINY=1
+@@ -16,10 +16,6 @@ MESA_TINY=1
  DRM_SOURCE_PATH=$(TOP)/../drm
  
  # Compiler and flags
@@ -13,21 +13,23 @@ $NetBSD: patch-ah,v 1.5 2006/03/21 19:26:32 drochner Exp $
  GLU_CFLAGS = 
  
  # Misc tools and flags
-@@ -56,7 +52,7 @@ GLW_SOURCES = GLwDrawA.c
- 
- # Directories
- LIB_DIR = $(TOP)/lib
--INSTALL_PREFIX = /usr/local
-+INSTALL_PREFIX = ${PREFIX}
- SRC_DIRS = mesa glu glut/glx glw
- GLU_DIRS = sgi
- DRIVER_DIRS = x11 osmesa
-@@ -66,7 +62,7 @@ PROGRAM_DIRS = demos redbook samples xde
+@@ -68,7 +64,7 @@ PROGRAM_DIRS = demos redbook samples gls
  
  # Library/program dependencies
- EXTRA_LIB_PATH ?=
+ #EXTRA_LIB_PATH ?=
 -GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXext -lm -lpthread
 +GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXext -lm ${PTHREAD_STUBLIB}
- OSMESA_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB)
- GLU_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -lm
- GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) $(EXTRA_LIB_PATH) -lX11 -lXmu -lXt -lXi -lm
+ OSMESA_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB)
+ GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -lm
+ GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) $(EXTRA_LIB_PATH) -lX11 -lXmu -lXt -lXi -lm
+@@ -78,8 +74,8 @@ APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(G
+ 
+ 
+ # Installation directories (for make install)
+-INSTALL_DIR = /usr/local
+-DRI_DRIVER_INSTALL_DIR = /usr/X11R6/lib/modules/dri
++INSTALL_DIR = ${PREFIX}
++DRI_DRIVER_INSTALL_DIR = ${PREFIX}/lib/modules/dri
+ 
+ # Where libGL will look for DRI hardware drivers
+ DRI_DRIVER_SEARCH_DIR = $(DRI_DRIVER_INSTALL_DIR)
diff --git a/graphics/MesaLib/patches/patch-aj b/graphics/MesaLib/patches/patch-aj
index 4511df2cebd..deff57b5b60 100644
--- a/graphics/MesaLib/patches/patch-aj
+++ b/graphics/MesaLib/patches/patch-aj
@@ -1,22 +1,13 @@
-$NetBSD: patch-aj,v 1.2 2006/01/19 12:53:17 adam Exp $
+$NetBSD: patch-aj,v 1.3 2007/08/12 15:14:48 adam Exp $
 
---- src/mesa/drivers/x11/xmesaP.h.orig	2005-10-04 23:00:36.000000000 +0200
+--- src/mesa/drivers/x11/xmesaP.h.orig	2007-08-01 23:50:00.000000000 +0200
 +++ src/mesa/drivers/x11/xmesaP.h
-@@ -30,7 +30,7 @@
- #ifdef XFree86Server
- # include "GL/xf86glx.h"
- # include "xf86glx_util.h"
--#elif defined(USE_XSHM)
-+#elif defined(USE_XSHM) || defined(USE_XSHM_HDRONLY)
- # include <X11/extensions/XShm.h>
- #endif
- #include "GL/xmesa.h"
-@@ -218,7 +218,7 @@ struct xmesa_buffer {
+@@ -228,7 +228,7 @@ struct xmesa_buffer {
  				/*    0 = not available			*/
  				/*    1 = XImage support available	*/
  				/*    2 = Pixmap support available too	*/
--#ifdef USE_XSHM
-+#if defined(USE_XSHM) || defined(USE_XSHM_HDRONLY)
+-#if defined(USE_XSHM) && !defined(XFree86Server)
++#if (defined(USE_XSHM) || defined(USE_XSHM_HDRONLY)) && !defined(XFree86Server)
     XShmSegmentInfo shminfo;
  #endif
- #endif
+ 
diff --git a/graphics/MesaLib/patches/patch-al b/graphics/MesaLib/patches/patch-al
index 15f9935563f..461ad3ec460 100644
--- a/graphics/MesaLib/patches/patch-al
+++ b/graphics/MesaLib/patches/patch-al
@@ -1,11 +1,8 @@
-$NetBSD: patch-al,v 1.1 2006/01/31 21:44:31 kristerw Exp $
+$NetBSD: patch-al,v 1.2 2007/08/12 15:14:48 adam Exp $
 
-Declarations inside of macros are evil. Even more if they are not preceded
-by an additional opening brace.
-
---- src/mesa/drivers/x11/xm_tri.c.orig	Tue Jan 31 22:16:56 2006
-+++ src/mesa/drivers/x11/xm_tri.c	Tue Jan 31 22:30:15 2006
-@@ -64,7 +64,7 @@
+--- src/mesa/drivers/x11/xm_tri.c.orig	2007-06-22 00:10:54.000000000 +0200
++++ src/mesa/drivers/x11/xm_tri.c
+@@ -66,7 +66,7 @@
     XMesaContext xmesa = XMESA_CONTEXT(ctx);			\
     GET_XRB(xrb);
  
@@ -14,7 +11,7 @@ by an additional opening brace.
     GLint x = span.x, y = YFLIP(xrb, span.y);			\
     GLuint i;							\
     for (i = 0; i < span.end; i++, x++) {			\
-@@ -80,7 +80,7 @@
+@@ -82,7 +82,7 @@
        span.green += span.greenStep;				\
        span.blue += span.blueStep;				\
        span.z += span.zStep;					\
@@ -23,7 +20,7 @@ by an additional opening brace.
  
  #include "swrast/s_tritemp.h"
  
-@@ -99,7 +99,7 @@
+@@ -102,7 +102,7 @@
  #define BYTES_PER_ROW (xrb->ximage->bytes_per_line)
  #define SETUP_CODE						\
     GET_XRB(xrb);
@@ -32,16 +29,16 @@ by an additional opening brace.
     GLuint i;							\
     for (i = 0; i < span.end; i++) {				\
        const DEPTH_TYPE z = FixedToDepth(span.z);		\
-@@ -112,7 +112,7 @@
-       span.green += span.greenStep;				\
+@@ -117,7 +117,7 @@
        span.blue += span.blueStep;				\
+       span.alpha += span.alphaStep;				\
        span.z += span.zStep;					\
 -   }
 +   } }
  
  #include "swrast/s_tritemp.h"
  
-@@ -131,7 +131,7 @@
+@@ -137,7 +137,7 @@
  #define SETUP_CODE						\
     GET_XRB(xrb);
  
@@ -50,16 +47,16 @@ by an additional opening brace.
     GLuint i;							\
     for (i = 0; i < span.end; i++) {				\
        const DEPTH_TYPE z = FixedToDepth(span.z);		\
-@@ -144,7 +144,7 @@
-       span.green += span.greenStep;				\
+@@ -152,7 +152,7 @@
        span.blue += span.blueStep;				\
+       span.alpha += span.alphaStep;				\
        span.z += span.zStep;					\
 -   }
 +   } }
  
  #include "swrast/s_tritemp.h"
  
-@@ -163,7 +163,7 @@
+@@ -171,7 +171,7 @@
  #define SETUP_CODE						\
     GET_XRB(xrb);
  
@@ -68,7 +65,7 @@ by an additional opening brace.
     GLuint i;							\
     for (i = 0; i < span.end; i++) {				\
        const DEPTH_TYPE z = FixedToDepth(span.z);		\
-@@ -176,7 +176,7 @@
+@@ -184,7 +184,7 @@
        span.green += span.greenStep;				\
        span.blue += span.blueStep;				\
        span.z += span.zStep;					\
@@ -77,16 +74,16 @@ by an additional opening brace.
  
  #include "swrast/s_tritemp.h"
  
-@@ -194,7 +194,7 @@
+@@ -202,7 +202,7 @@
  #define BYTES_PER_ROW (xrb->ximage->bytes_per_line)
  #define SETUP_CODE						\
     GET_XRB(xrb);
 -#define RENDER_SPAN( span ) 					\
-+#define RENDER_SPAN( span )  {					\
++#define RENDER_SPAN( span ) {					\
     GLuint i;							\
     for (i = 0; i < span.end; i++) {				\
        const DEPTH_TYPE z = FixedToDepth(span.z);		\
-@@ -209,7 +209,7 @@
+@@ -217,7 +217,7 @@
        span.green += span.greenStep;				\
        span.blue += span.blueStep;				\
        span.z += span.zStep;					\
@@ -95,7 +92,7 @@ by an additional opening brace.
  #include "swrast/s_tritemp.h"
  
  
-@@ -224,7 +224,7 @@
+@@ -232,7 +232,7 @@
  #define SETUP_CODE						\
     XMesaContext xmesa = XMESA_CONTEXT(ctx);			\
     GET_XRB(xrb);
@@ -104,7 +101,7 @@ by an additional opening brace.
     GLuint i;							\
     GLint x = span.x, y = YFLIP(xrb, span.y);			\
     for (i = 0; i < span.end; i++, x++) {			\
-@@ -240,7 +240,7 @@
+@@ -248,7 +248,7 @@
        span.green += span.greenStep;				\
        span.blue += span.blueStep;				\
        span.z += span.zStep;					\
@@ -113,7 +110,7 @@ by an additional opening brace.
  #include "swrast/s_tritemp.h"
  
  
-@@ -257,7 +257,7 @@
+@@ -265,7 +265,7 @@
  #define BYTES_PER_ROW (xrb->ximage->bytes_per_line)
  #define SETUP_CODE						\
     GET_XRB(xrb);
@@ -122,7 +119,7 @@ by an additional opening brace.
     GLuint i;							\
     for (i = 0; i < span.end; i++) {				\
        const DEPTH_TYPE z = FixedToDepth(span.z);		\
-@@ -270,7 +270,7 @@
+@@ -278,7 +278,7 @@
        span.green += span.greenStep;				\
        span.blue += span.blueStep;				\
        span.z += span.zStep;					\
@@ -131,7 +128,7 @@ by an additional opening brace.
  #include "swrast/s_tritemp.h"
  
  
-@@ -288,7 +288,7 @@
+@@ -296,7 +296,7 @@
  #define SETUP_CODE						\
     XMesaContext xmesa = XMESA_CONTEXT(ctx);			\
     GET_XRB(xrb);
@@ -140,7 +137,7 @@ by an additional opening brace.
     GLuint i;							\
     GLint x = span.x, y = YFLIP(xrb, span.y);			\
     for (i = 0; i < span.end; i++, x++) {			\
-@@ -302,7 +302,7 @@
+@@ -310,7 +310,7 @@
        span.green += span.greenStep;				\
        span.blue += span.blueStep;				\
        span.z += span.zStep;					\
@@ -149,7 +146,7 @@ by an additional opening brace.
  #include "swrast/s_tritemp.h"
  
  
-@@ -319,7 +319,7 @@
+@@ -327,7 +327,7 @@
  #define BYTES_PER_ROW (xrb->ximage->bytes_per_line)
  #define SETUP_CODE						\
     GET_XRB(xrb);
@@ -158,7 +155,7 @@ by an additional opening brace.
     GLuint i;							\
     GLint x = span.x, y = YFLIP(xrb, span.y);			\
     XDITHER_SETUP(y);						\
-@@ -334,7 +334,7 @@
+@@ -342,7 +342,7 @@
        span.green += span.greenStep;				\
        span.blue += span.blueStep;				\
        span.z += span.zStep;					\
@@ -167,7 +164,7 @@ by an additional opening brace.
  #include "swrast/s_tritemp.h"
  
  
-@@ -349,7 +349,7 @@
+@@ -357,7 +357,7 @@
  #define SETUP_CODE						\
     GET_XRB(xrb);						\
     XMesaImage *img = xrb->ximage;
@@ -176,7 +173,7 @@ by an additional opening brace.
     GLuint i;							\
     GLint x = span.x, y = YFLIP(xrb, span.y);			\
     XDITHER_SETUP(y);						\
-@@ -365,7 +365,7 @@
+@@ -373,7 +373,7 @@
        span.green += span.greenStep;				\
        span.blue += span.blueStep;				\
        span.z += span.zStep;					\
@@ -185,7 +182,7 @@ by an additional opening brace.
  #include "swrast/s_tritemp.h"
  
  
-@@ -382,7 +382,7 @@
+@@ -390,7 +390,7 @@
  #define BYTES_PER_ROW (xrb->ximage->bytes_per_line)
  #define SETUP_CODE						\
     GET_XRB(xrb);
@@ -194,7 +191,7 @@ by an additional opening brace.
     GLuint i;							\
     LOOKUP_SETUP;						\
     for (i = 0; i < span.end; i++) {				\
-@@ -396,7 +396,7 @@
+@@ -404,7 +404,7 @@
        span.green += span.greenStep;				\
        span.blue += span.blueStep;				\
        span.z += span.zStep;					\
@@ -203,7 +200,7 @@ by an additional opening brace.
  #include "swrast/s_tritemp.h"
  
  
-@@ -414,7 +414,7 @@
+@@ -422,7 +422,7 @@
  #define SETUP_CODE						\
     XMesaContext xmesa = XMESA_CONTEXT(ctx);			\
     GET_XRB(xrb);
@@ -212,7 +209,7 @@ by an additional opening brace.
     GLuint i;							\
     GLint x = span.x, y = YFLIP(xrb, span.y);			\
     for (i = 0; i < span.end; i++, x++) {			\
-@@ -428,7 +428,7 @@
+@@ -436,7 +436,7 @@
        span.green += span.greenStep;				\
        span.blue += span.blueStep;				\
        span.z += span.zStep;					\
@@ -221,7 +218,7 @@ by an additional opening brace.
  #include "swrast/s_tritemp.h"
  
  
-@@ -445,7 +445,7 @@
+@@ -453,7 +453,7 @@
     XMesaImage *img = xrb->ximage;				\
     unsigned long pixel;						\
     PACK_TRUECOLOR(pixel, v2->color[0], v2->color[1], v2->color[2]);
@@ -230,7 +227,7 @@ by an additional opening brace.
     GLuint i;							\
     GLint x = span.x, y = YFLIP(xrb, span.y);			\
     for (i = 0; i < span.end; i++, x++) {			\
-@@ -455,7 +455,7 @@
+@@ -463,7 +463,7 @@
           zRow[i] = z;						\
        }								\
        span.z += span.zStep;					\
@@ -239,16 +236,16 @@ by an additional opening brace.
  #include "swrast/s_tritemp.h"
  
  
-@@ -472,7 +472,7 @@
- #define SETUP_CODE					\
+@@ -481,7 +481,7 @@
     GET_XRB(xrb);					\
-    GLuint p = PACK_8B8G8R( v2->color[0], v2->color[1], v2->color[2] );
+    GLuint p = PACK_8A8B8G8R( v2->color[0], v2->color[1],\
+                              v2->color[2], v2->color[3]);
 -#define RENDER_SPAN( span )				\
 +#define RENDER_SPAN( span ) {				\
     GLuint i;						\
     for (i = 0; i < span.end; i++) {			\
        const DEPTH_TYPE z = FixedToDepth(span.z);	\
-@@ -481,7 +481,7 @@
+@@ -490,7 +490,7 @@
           zRow[i] = z;					\
        }							\
        span.z += span.zStep;				\
@@ -257,16 +254,16 @@ by an additional opening brace.
  #include "swrast/s_tritemp.h"
  
  
-@@ -498,7 +498,7 @@
- #define SETUP_CODE					\
+@@ -508,7 +508,7 @@
     GET_XRB(xrb);					\
-    GLuint p = PACK_8R8G8B( v2->color[0], v2->color[1], v2->color[2] );
+    GLuint p = PACK_8A8R8G8B(v2->color[0], v2->color[1],	\
+                             v2->color[2], v2->color[3]);
 -#define RENDER_SPAN( span )				\
 +#define RENDER_SPAN( span ) {				\
     GLuint i;						\
     for (i = 0; i < span.end; i++) {			\
        const DEPTH_TYPE z = FixedToDepth(span.z);	\
-@@ -507,7 +507,7 @@
+@@ -517,7 +517,7 @@
           zRow[i] = z;					\
        }							\
        span.z += span.zStep;				\
@@ -275,7 +272,7 @@ by an additional opening brace.
  #include "swrast/s_tritemp.h"
  
  
-@@ -524,7 +524,7 @@
+@@ -534,7 +534,7 @@
  #define SETUP_CODE					\
     GET_XRB(xrb);					\
     GLuint p = PACK_8R8G8B( v2->color[0], v2->color[1], v2->color[2] );
@@ -284,7 +281,7 @@ by an additional opening brace.
     GLuint i;					\
     for (i = 0; i < span.end; i++) {		\
        DEPTH_TYPE z = FixedToDepth(span.z);	\
-@@ -533,7 +533,7 @@
+@@ -543,7 +543,7 @@
           zRow[i] = z;				\
        }						\
        span.z += span.zStep;			\
@@ -293,7 +290,7 @@ by an additional opening brace.
  
  #include "swrast/s_tritemp.h"
  
-@@ -551,7 +551,7 @@
+@@ -561,7 +561,7 @@
  #define SETUP_CODE					\
     GET_XRB(xrb);					\
     const GLubyte *color = v2->color;
@@ -302,7 +299,7 @@ by an additional opening brace.
     GLuint i;						\
     for (i = 0; i < span.end; i++) {			\
        const DEPTH_TYPE z = FixedToDepth(span.z);	\
-@@ -563,7 +563,7 @@
+@@ -573,7 +573,7 @@
           zRow[i] = z;					\
        }							\
        span.z += span.zStep;				\
@@ -311,7 +308,7 @@ by an additional opening brace.
  #include "swrast/s_tritemp.h"
  
  
-@@ -578,7 +578,7 @@
+@@ -588,7 +588,7 @@
     XMesaContext xmesa = XMESA_CONTEXT(ctx);			\
     GET_XRB(xrb);						\
     XMesaImage *img = xrb->ximage;
@@ -320,7 +317,7 @@ by an additional opening brace.
     GLuint i;							\
     GLint x = span.x, y = YFLIP(xrb, span.y);			\
     for (i = 0; i < span.end; i++, x++) {			\
-@@ -591,7 +591,7 @@
+@@ -601,7 +601,7 @@
           zRow[i] = z;						\
        }								\
        span.z += span.zStep;					\
@@ -329,7 +326,7 @@ by an additional opening brace.
  #include "swrast/s_tritemp.h"
  
  
-@@ -608,7 +608,7 @@
+@@ -618,7 +618,7 @@
  #define SETUP_CODE					\
     GET_XRB(xrb);					\
     GLushort p = PACK_5R6G5B( v2->color[0], v2->color[1], v2->color[2] );
@@ -338,7 +335,7 @@ by an additional opening brace.
     GLuint i;						\
     for (i = 0; i < span.end; i++) {			\
        const DEPTH_TYPE z = FixedToDepth(span.z);	\
-@@ -617,7 +617,7 @@
+@@ -627,7 +627,7 @@
           zRow[i] = z;					\
        }							\
        span.z += span.zStep;				\
@@ -347,7 +344,7 @@ by an additional opening brace.
  #include "swrast/s_tritemp.h"
  
  
-@@ -635,7 +635,7 @@
+@@ -645,7 +645,7 @@
     XMesaContext xmesa = XMESA_CONTEXT(ctx);			\
     GET_XRB(xrb);						\
     const GLubyte *color = v2->color;
@@ -356,7 +353,7 @@ by an additional opening brace.
     GLuint i;							\
     GLint x = span.x, y = YFLIP(xrb, span.y);			\
     for (i = 0; i < span.end; i++, x++) {			\
-@@ -646,7 +646,7 @@
+@@ -656,7 +656,7 @@
           zRow[i] = z;						\
        }								\
        span.z += span.zStep;					\
@@ -365,7 +362,7 @@ by an additional opening brace.
  #include "swrast/s_tritemp.h"
  
  
-@@ -663,7 +663,7 @@
+@@ -673,7 +673,7 @@
  #define SETUP_CODE						\
     GET_XRB(xrb);						\
     FLAT_DITHER_SETUP( v2->color[0], v2->color[1], v2->color[2] );
@@ -374,7 +371,7 @@ by an additional opening brace.
     GLuint i;							\
     GLint x = span.x, y = YFLIP(xrb, span.y);			\
     FLAT_DITHER_ROW_SETUP(YFLIP(xrb, y));			\
-@@ -674,7 +674,7 @@
+@@ -684,7 +684,7 @@
           zRow[i] = z;						\
        }								\
        span.z += span.zStep;					\
@@ -383,7 +380,7 @@ by an additional opening brace.
  #include "swrast/s_tritemp.h"
  
  
-@@ -689,7 +689,7 @@
+@@ -699,7 +699,7 @@
     GET_XRB(xrb);					\
     XMesaImage *img = xrb->ximage;		\
     FLAT_DITHER_SETUP( v2->color[0], v2->color[1], v2->color[2] );
@@ -392,7 +389,7 @@ by an additional opening brace.
     GLuint i;							\
     GLint x = span.x, y = YFLIP(xrb, span.y);	\
     FLAT_DITHER_ROW_SETUP(y);					\
-@@ -701,7 +701,7 @@
+@@ -711,7 +711,7 @@
           zRow[i] = z;						\
        }								\
        span.z += span.zStep;					\
@@ -401,7 +398,7 @@ by an additional opening brace.
  #include "swrast/s_tritemp.h"
  
  
-@@ -721,7 +721,7 @@
+@@ -731,7 +731,7 @@
     GLubyte r = v2->color[0];					\
     GLubyte g = v2->color[1];					\
     GLubyte b = v2->color[2];
@@ -410,7 +407,7 @@ by an additional opening brace.
     GLuint i;							\
     GLint x = span.x, y = YFLIP(xrb, span.y);	\
     for (i = 0; i < span.end; i++, x++) {			\
-@@ -731,7 +731,7 @@
+@@ -741,7 +741,7 @@
           zRow[i] = z;						\
        }								\
        span.z += span.zStep;					\
@@ -419,7 +416,7 @@ by an additional opening brace.
  #include "swrast/s_tritemp.h"
  
  
-@@ -752,7 +752,7 @@
+@@ -762,7 +762,7 @@
     GLubyte g = v2->color[1];				\
     GLubyte b = v2->color[2];				\
     GLubyte p = LOOKUP(r,g,b);
@@ -428,7 +425,7 @@ by an additional opening brace.
     GLuint i;						\
     for (i = 0; i < span.end; i++) {			\
        const DEPTH_TYPE z = FixedToDepth(span.z);	\
-@@ -761,7 +761,7 @@
+@@ -771,7 +771,7 @@
           zRow[i] = z;					\
        }							\
        span.z += span.zStep;				\
@@ -437,7 +434,7 @@ by an additional opening brace.
  #include "swrast/s_tritemp.h"
  
  
-@@ -775,7 +775,7 @@
+@@ -785,7 +785,7 @@
     XMesaContext xmesa = XMESA_CONTEXT(ctx);			\
     GET_XRB(xrb);						\
     XMesaImage *img = xrb->ximage;
@@ -446,7 +443,7 @@ by an additional opening brace.
     GLuint i;							\
     GLint x = span.x, y = YFLIP(xrb, span.y);	\
     for (i = 0; i < span.end; i++, x++) {			\
-@@ -786,7 +786,7 @@
+@@ -796,7 +796,7 @@
        span.red += span.redStep;					\
        span.green += span.greenStep;				\
        span.blue += span.blueStep;				\
@@ -455,7 +452,7 @@ by an additional opening brace.
  #include "swrast/s_tritemp.h"
  
  
-@@ -801,7 +801,7 @@
+@@ -812,7 +812,7 @@
  #define BYTES_PER_ROW (xrb->ximage->bytes_per_line)
  #define SETUP_CODE						\
     GET_XRB(xrb);
@@ -463,17 +460,17 @@ by an additional opening brace.
 +#define RENDER_SPAN( span ) {					\
     GLuint i;							\
     for (i = 0; i < span.end; i++) {				\
-       pRow[i] = PACK_8B8G8R(FixedToInt(span.red),		\
-@@ -809,7 +809,7 @@
-       span.red += span.redStep;					\
+       pRow[i] = PACK_8A8B8G8R(FixedToInt(span.red),		\
+@@ -822,7 +822,7 @@
        span.green += span.greenStep;				\
        span.blue += span.blueStep;				\
+       span.alpha += span.alphaStep;				\
 -   }
 +   } }
  #include "swrast/s_tritemp.h"
  
  
-@@ -824,7 +824,7 @@
+@@ -838,7 +838,7 @@
  #define BYTES_PER_ROW (xrb->ximage->bytes_per_line)
  #define SETUP_CODE						\
     GET_XRB(xrb);
@@ -481,17 +478,17 @@ by an additional opening brace.
 +#define RENDER_SPAN( span ) {					\
     GLuint i;							\
     for (i = 0; i < span.end; i++) {				\
-       pRow[i] = PACK_8R8G8B(FixedToInt(span.red),		\
-@@ -832,7 +832,7 @@
-       span.red += span.redStep;					\
+       pRow[i] = PACK_8A8R8G8B(FixedToInt(span.red),		\
+@@ -848,7 +848,7 @@
        span.green += span.greenStep;				\
        span.blue += span.blueStep;				\
+       span.alpha += span.alphaStep;				\
 -   }
 +   } }
  #include "swrast/s_tritemp.h"
  
  
-@@ -847,7 +847,7 @@
+@@ -863,7 +863,7 @@
  #define BYTES_PER_ROW (xrb->ximage->bytes_per_line)
  #define SETUP_CODE						\
     GET_XRB(xrb);
@@ -500,7 +497,7 @@ by an additional opening brace.
     GLuint i;							\
     for (i = 0; i < span.end; i++) {				\
        pRow[i] = PACK_8R8G8B(FixedToInt(span.red),		\
-@@ -855,7 +855,7 @@
+@@ -871,7 +871,7 @@
        span.red += span.redStep;					\
        span.green += span.greenStep;				\
        span.blue += span.blueStep;				\
@@ -509,7 +506,7 @@ by an additional opening brace.
  #include "swrast/s_tritemp.h"
  
  
-@@ -870,7 +870,7 @@
+@@ -886,7 +886,7 @@
  #define BYTES_PER_ROW (xrb->ximage->bytes_per_line)
  #define SETUP_CODE					\
     GET_XRB(xrb);
@@ -518,7 +515,7 @@ by an additional opening brace.
     GLuint i;						\
     PIXEL_TYPE *pixel = pRow;				\
     for (i = 0; i < span.end; i++, pixel++) {		\
-@@ -880,7 +880,7 @@
+@@ -896,7 +896,7 @@
        span.red += span.redStep;				\
        span.green += span.greenStep;			\
        span.blue += span.blueStep;			\
@@ -527,7 +524,7 @@ by an additional opening brace.
  #include "swrast/s_tritemp.h"
  
  
-@@ -894,7 +894,7 @@
+@@ -910,7 +910,7 @@
     XMesaContext xmesa = XMESA_CONTEXT(ctx);			\
     GET_XRB(xrb);						\
     XMesaImage *img = xrb->ximage;
@@ -536,7 +533,7 @@ by an additional opening brace.
     GLuint i;							\
     GLint x = span.x, y = YFLIP(xrb, span.y);	\
     for (i = 0; i < span.end; i++, x++) {			\
-@@ -905,7 +905,7 @@
+@@ -921,7 +921,7 @@
        span.red += span.redStep;					\
        span.green += span.greenStep;				\
        span.blue += span.blueStep;				\
@@ -545,7 +542,7 @@ by an additional opening brace.
  #include "swrast/s_tritemp.h"
  
  
-@@ -920,7 +920,7 @@
+@@ -936,7 +936,7 @@
  #define BYTES_PER_ROW (xrb->ximage->bytes_per_line)
  #define SETUP_CODE						\
     GET_XRB(xrb);
@@ -554,7 +551,7 @@ by an additional opening brace.
     GLuint i;							\
     for (i = 0; i < span.end; i++) {				\
        pRow[i] = (PIXEL_TYPE) PACK_5R6G5B(FixedToInt(span.red),	\
-@@ -928,7 +928,7 @@
+@@ -944,7 +944,7 @@
        span.red += span.redStep;					\
        span.green += span.greenStep;				\
        span.blue += span.blueStep;				\
@@ -563,7 +560,7 @@ by an additional opening brace.
  #include "swrast/s_tritemp.h"
  
  
-@@ -944,7 +944,7 @@
+@@ -960,7 +960,7 @@
  #define SETUP_CODE						\
     XMesaContext xmesa = XMESA_CONTEXT(ctx);			\
     GET_XRB(xrb);
@@ -572,7 +569,7 @@ by an additional opening brace.
     GLuint i;							\
     GLint x = span.x, y = YFLIP(xrb, span.y);	\
     for (i = 0; i < span.end; i++, x++) {			\
-@@ -953,7 +953,7 @@
+@@ -969,7 +969,7 @@
        span.red += span.redStep;					\
        span.green += span.greenStep;				\
        span.blue += span.blueStep;				\
@@ -581,7 +578,7 @@ by an additional opening brace.
  #include "swrast/s_tritemp.h"
  
  
-@@ -968,7 +968,7 @@
+@@ -984,7 +984,7 @@
  #define BYTES_PER_ROW (xrb->ximage->bytes_per_line)
  #define SETUP_CODE						\
     GET_XRB(xrb);
@@ -590,7 +587,7 @@ by an additional opening brace.
     GLuint i;							\
     GLint x = span.x, y = YFLIP(xrb, span.y);	\
     XDITHER_SETUP(y);						\
-@@ -978,7 +978,7 @@
+@@ -994,7 +994,7 @@
        span.red += span.redStep;					\
        span.green += span.greenStep;				\
        span.blue += span.blueStep;				\
@@ -599,7 +596,7 @@ by an additional opening brace.
  #include "swrast/s_tritemp.h"
  
  
-@@ -991,7 +991,7 @@
+@@ -1007,7 +1007,7 @@
  #define SETUP_CODE						\
     GET_XRB(xrb);						\
     XMesaImage *img = xrb->ximage;
@@ -608,7 +605,7 @@ by an additional opening brace.
     GLuint i;							\
     GLint x = span.x, y = YFLIP(xrb, span.y);	\
     XDITHER_SETUP(y);						\
-@@ -1002,7 +1002,7 @@
+@@ -1018,7 +1018,7 @@
        span.red += span.redStep;					\
        span.green += span.greenStep;				\
        span.blue += span.blueStep;				\
@@ -617,7 +614,7 @@ by an additional opening brace.
  #include "swrast/s_tritemp.h"
  
  
-@@ -1017,7 +1017,7 @@
+@@ -1033,7 +1033,7 @@
  #define BYTES_PER_ROW (xrb->ximage->bytes_per_line)
  #define SETUP_CODE						\
     GET_XRB(xrb);
@@ -626,7 +623,7 @@ by an additional opening brace.
     GLuint i;							\
     LOOKUP_SETUP;						\
     for (i = 0; i < span.end; i++) {				\
-@@ -1026,7 +1026,7 @@
+@@ -1042,7 +1042,7 @@
        span.red += span.redStep;					\
        span.green += span.greenStep;				\
        span.blue += span.blueStep;				\
@@ -635,7 +632,7 @@ by an additional opening brace.
  #include "swrast/s_tritemp.h"
  
  
-@@ -1042,7 +1042,7 @@
+@@ -1058,7 +1058,7 @@
  #define SETUP_CODE						\
     XMesaContext xmesa = XMESA_CONTEXT(ctx);			\
     GET_XRB(xrb);
@@ -644,7 +641,7 @@ by an additional opening brace.
     GLuint i;							\
     GLint x = span.x, y = YFLIP(xrb, span.y);	\
     for (i = 0; i < span.end; i++, x++) {			\
-@@ -1051,7 +1051,7 @@
+@@ -1067,7 +1067,7 @@
        span.red += span.redStep;					\
        span.green += span.greenStep;				\
        span.blue += span.blueStep;				\
@@ -653,7 +650,7 @@ by an additional opening brace.
  #include "swrast/s_tritemp.h"
  
  
-@@ -1066,12 +1066,12 @@
+@@ -1082,12 +1082,12 @@
     XMesaImage *img = xrb->ximage;				\
     unsigned long pixel;						\
     PACK_TRUECOLOR(pixel, v2->color[0], v2->color[1], v2->color[2]);
@@ -668,7 +665,7 @@ by an additional opening brace.
  #include "swrast/s_tritemp.h"
  
  
-@@ -1087,11 +1087,11 @@
+@@ -1103,11 +1103,11 @@
     GET_XRB(xrb);					\
     unsigned long p = PACK_8B8G8R( v2->color[0],		\
  		 v2->color[1], v2->color[2] );
@@ -682,7 +679,7 @@ by an additional opening brace.
  #include "swrast/s_tritemp.h"
  
  
-@@ -1107,11 +1107,11 @@
+@@ -1123,11 +1123,11 @@
     GET_XRB(xrb);					\
     unsigned long p = PACK_8R8G8B( v2->color[0],		\
  		 v2->color[1], v2->color[2] );
@@ -696,7 +693,7 @@ by an additional opening brace.
  #include "swrast/s_tritemp.h"
  
  
-@@ -1127,11 +1127,11 @@
+@@ -1143,11 +1143,11 @@
     GET_XRB(xrb);					\
     unsigned long p = PACK_8R8G8B( v2->color[0],		\
  		 v2->color[1], v2->color[2] );
@@ -710,7 +707,7 @@ by an additional opening brace.
  #include "swrast/s_tritemp.h"
  
  
-@@ -1146,14 +1146,14 @@
+@@ -1162,14 +1162,14 @@
  #define SETUP_CODE					\
     GET_XRB(xrb);					\
     const GLubyte *color = v2->color;
@@ -727,7 +724,7 @@ by an additional opening brace.
  #include "swrast/s_tritemp.h"
  
  
-@@ -1166,7 +1166,7 @@
+@@ -1182,7 +1182,7 @@
     XMesaContext xmesa = XMESA_CONTEXT(ctx);			\
     GET_XRB(xrb);						\
     XMesaImage *img = xrb->ximage;
@@ -736,7 +733,7 @@ by an additional opening brace.
     GLuint i;							\
     GLint x = span.x, y = YFLIP(xrb, span.y);	\
     for (i = 0; i < span.end; i++, x++) {			\
-@@ -1174,7 +1174,7 @@
+@@ -1190,7 +1190,7 @@
        PACK_TRUEDITHER(p, x, y, v2->color[0],			\
                 v2->color[1], v2->color[2] );			\
        XMesaPutPixel(img, x, y, p);				\
@@ -745,7 +742,7 @@ by an additional opening brace.
  #include "swrast/s_tritemp.h"
  
  
-@@ -1190,11 +1190,11 @@
+@@ -1206,11 +1206,11 @@
     GET_XRB(xrb);					\
     unsigned long p = PACK_5R6G5B( v2->color[0],		\
  		 v2->color[1], v2->color[2] );
@@ -759,7 +756,7 @@ by an additional opening brace.
  #include "swrast/s_tritemp.h"
  
  
-@@ -1210,13 +1210,13 @@
+@@ -1226,13 +1226,13 @@
     XMesaContext xmesa = XMESA_CONTEXT(ctx);			\
     GET_XRB(xrb);						\
     const GLubyte *color = v2->color;
@@ -775,7 +772,7 @@ by an additional opening brace.
  #include "swrast/s_tritemp.h"
  
  
-@@ -1231,13 +1231,13 @@
+@@ -1247,13 +1247,13 @@
  #define SETUP_CODE						\
     GET_XRB(xrb);						\
     FLAT_DITHER_SETUP( v2->color[0], v2->color[1], v2->color[2] );
@@ -791,7 +788,7 @@ by an additional opening brace.
  #include "swrast/s_tritemp.h"
  
  
-@@ -1250,14 +1250,14 @@
+@@ -1266,14 +1266,14 @@
     GET_XRB(xrb);						\
     XMesaImage *img = xrb->ximage;				\
     FLAT_DITHER_SETUP( v2->color[0], v2->color[1], v2->color[2] );
@@ -808,7 +805,7 @@ by an additional opening brace.
  #include "swrast/s_tritemp.h"
  
  
-@@ -1275,12 +1275,12 @@
+@@ -1291,12 +1291,12 @@
     GLubyte r = v2->color[0];					\
     GLubyte g = v2->color[1];					\
     GLubyte b = v2->color[2];
@@ -823,12 +820,12 @@ by an additional opening brace.
  #include "swrast/s_tritemp.h"
  
  
-@@ -1299,11 +1299,11 @@
+@@ -1315,11 +1315,11 @@
     GLubyte g = v2->color[1];				\
     GLubyte b = v2->color[2];				\
     GLubyte p = LOOKUP(r,g,b);
 -#define RENDER_SPAN( span )         	 		\
-+#define RENDER_SPAN( span ) {        	 		\
++#define RENDER_SPAN( span ) {         	 		\
     GLuint i;						\
     for (i = 0; i < span.end; i++) {			\
        pRow[i] = (PIXEL_TYPE) p;				\
diff --git a/graphics/MesaLib/patches/patch-am b/graphics/MesaLib/patches/patch-am
index f881f15896f..44f8fc2354d 100644
--- a/graphics/MesaLib/patches/patch-am
+++ b/graphics/MesaLib/patches/patch-am
@@ -1,24 +1,20 @@
-$NetBSD: patch-am,v 1.5 2007/04/13 09:12:02 tnn Exp $
+$NetBSD: patch-am,v 1.6 2007/08/12 15:14:48 adam Exp $
 
---- include/GL/glxext.h.orig	2005-11-07 22:20:29.000000000 +0100
+--- include/GL/glxext.h.orig	2007-06-22 00:10:53.000000000 +0200
 +++ include/GL/glxext.h
-@@ -331,10 +331,10 @@ typedef struct {
- } GLXBufferClobberEventSGIX;
- #endif
- 
--#if defined(__sun__)
-+#if defined(__sun__) || defined(__digital__)
+@@ -389,7 +389,7 @@ typedef struct {
+ #elif defined(__sun__) || defined(__digital__)
  #include <inttypes.h>
  #if defined(__STDC__)
 -#if defined(__arch64__)
 +#if defined(__arch64__) || defined(_LP64)
  typedef long int int64_t;
+ typedef unsigned long int uint64_t;
  #else
- typedef long long int int64_t;   
-@@ -343,7 +343,7 @@ typedef long long int int64_t;   
- #elif defined(__UNIXOS2__) || defined(__SOL64__)
- typedef long int int32_t;
- typedef long long int int64_t;
+@@ -397,7 +397,7 @@ typedef long long int int64_t;
+ typedef unsigned long long int uint64_t;
+ #endif /* __arch64__ */
+ #endif /* __STDC__ */
 -#elif defined( __VMS )
 +#elif defined( __VMS ) || defined(__sgi)
  #include <inttypes.h>
diff --git a/graphics/glu/Makefile b/graphics/glu/Makefile
index 628f703ae8b..6b000e2b37a 100644
--- a/graphics/glu/Makefile
+++ b/graphics/glu/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.48 2006/11/03 08:40:36 joerg Exp $
+# $NetBSD: Makefile,v 1.49 2007/08/12 15:14:48 adam Exp $
 
 PKGNAME=	glu-${MESA_VERSION}
 COMMENT=	GLU polygon tessellation facility for Mesa
@@ -14,7 +14,7 @@ BUILDLINK_API_DEPENDS.MesaLib+=	MesaLib>=${MESA_VERSION}
 .include "../../graphics/MesaLib/buildlink3.mk"
 
 pre-build:
-	cd ${WRKSRC} && ${RM} -fr src/mesa src/glut src/glw progs
+	cd ${WRKSRC} && rm -fr src/mesa src/glut src/glw progs
 
 do-install:
 	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/include/GL
diff --git a/graphics/glut/Makefile b/graphics/glut/Makefile
index 6cfb1484b5b..0cbf4d6e11b 100644
--- a/graphics/glut/Makefile
+++ b/graphics/glut/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.47 2006/12/15 18:41:16 joerg Exp $
+# $NetBSD: Makefile,v 1.48 2007/08/12 15:14:49 adam Exp $
 
 PKGNAME=	glut-${MESA_VERSION}
 COMMENT=	GLUT Graphics library similar to SGI's OpenGL
@@ -19,7 +19,7 @@ INSTLIBS=	${WRKSRC}/src/glut/glx/libglut.la
 .include "../../graphics/glu/buildlink3.mk"
 
 pre-build:
-	cd ${WRKSRC} && ${RM} -fr src/mesa src/glu src/glw progs
+	cd ${WRKSRC} && rm -fr src/mesa src/glu src/glw progs
 
 do-install:
 	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/include/GL
diff --git a/graphics/glx-utils/distinfo b/graphics/glx-utils/distinfo
index a02f537583b..7f01f3c5d2c 100644
--- a/graphics/glx-utils/distinfo
+++ b/graphics/glx-utils/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2006/06/13 23:44:09 reed Exp $
+$NetBSD: distinfo,v 1.2 2007/08/12 15:14:49 adam Exp $
 
-SHA1 (Mesa-6.4.2/MesaDemos-6.4.2.tar.bz2) = 35b1ff78fc1bd1c303be754ad2ff4252ad6c0258
-RMD160 (Mesa-6.4.2/MesaDemos-6.4.2.tar.bz2) = 82e1dafd39abbe1c0e1de49adcff00dec19c6c1a
-Size (Mesa-6.4.2/MesaDemos-6.4.2.tar.bz2) = 814178 bytes
+SHA1 (Mesa-7.0.1/MesaDemos-7.0.1.tar.bz2) = 4d6cb158b58dbda9411d00e99a01031e13cae2ec
+RMD160 (Mesa-7.0.1/MesaDemos-7.0.1.tar.bz2) = 58537c690d811da09f788bf9b5b5bd999e5445c6
+Size (Mesa-7.0.1/MesaDemos-7.0.1.tar.bz2) = 1340949 bytes