Update to Mesa-7.0.4 (the head of the 7.0 branch in GIT). Basically,

lots of bug fixes; the intent of my update was mostly to fix
problems with i915 and r300 dri drivers and to provide the best environment
possible for the xorg server update to the 1.4 branch.

Morever, many of our patches from pkgsrc, i.e. those removed in this commit,
are now included upstream.

Additionally, MesaDemos now builds.

NOTES:

 - MesaLib now requires xf86driproto 2.0.4, as earlier versions install
   dri_interface.h, which is not correct.

 - glu now exports its symbols via libtool's -export-symfile.
   The symfile is generated pre-build--see glu/Makefile.

 - glxinfo/glxgears do not seem to need to be linked to libpthread, and this
   seems to cause problems on NetBSD with the new drm code.  If I am wrong
   about this, please let me know.  The only program that seems to need
   libpthread is glthreads in MesaDemos.

9 files changed, 82 insertions, 127 deletions

diff --git a/graphics/MesaDemos/Makefile b/graphics/MesaDemos/Makefile
index e5ac3529e83..7e3b164714d 100644
--- a/graphics/MesaDemos/Makefile
+++ b/graphics/MesaDemos/Makefile
@@ -1,27 +1,30 @@
-# $NetBSD: Makefile,v 1.32 2008/05/26 02:13:20 joerg Exp $
+# $NetBSD: Makefile,v 1.33 2008/07/27 00:03:42 bjs Exp $
 
 PKGNAME=	MesaDemos-${MESA_VERSION}
 COMMENT=	OpenGL examples and Demos
 
-# We include Makefile.lib instead of Makefile.common since we actually
-# build the Mesa libraries as part of the build process, even though we
-# don't install them.
+# We include Makefile.lib here to pull in the configuration machinery.
 #
 .include "../../graphics/Mesa/Makefile.lib"
 
-PATCHDIR=	${.CURDIR}/patches
-DISTINFO_FILE=	${.CURDIR}/distinfo
-
-USE_TOOLS+=	gmake pax
-MAKE_FLAGS+=	LIB_DEP=""
+USE_TOOLS+=	pax
+BUILD_DIRS=	progs
+BUILD_TARGET=	default
+EGDIR=		${PREFIX}/share/examples/${PKGNAME_NOREV}
 
 .include "../../graphics/Mesa/buildlink3.mk"
 
 pre-build:
 	cd ${WRKSRC} && ${RM} -fr src
+	${CP} ${WRKSRC}/configs/pkgsrc ${WRKSRC}/configs/current
+###
+### XXX remove this when it's unnecessary
+###
+pre-install:
+	${CHMOD} -x ${DESTDIR}${EGDIR}/demos/glslnoise.c
 
 do-install:
-	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/examples/${PKGNAME_NOREV}/${dir}
+	${INSTALL_DATA_DIR} ${DESTDIR}${EGDIR}/${dir}
 	cd ${WRKSRC}/progs && pax		\
 		-s ',^./.*Makefile.*,,'	\
 		-s ',^./CVS.*,,'		\
@@ -29,8 +32,8 @@ do-install:
 		-s ',^./\.libs.*,,'		\
 		-s ',^./\.deps.*,,'		\
 		-s ',^./.*\.orig$$,,'		\
-		-rw . ${DESTDIR}${PREFIX}/share/examples/${PKGNAME_NOREV}/${dir}
-	${CHMOD} -R a+rX ${DESTDIR}${PREFIX}/share/examples/${PKGNAME_NOREV}
+		-rw . ${DESTDIR}${EGDIR}/${PKGNAME_NOREV}/${dir}
+	${CHMOD} -R a+rX ${DESTDIR}${EGDIR}/${PKGNAME_NOREV}
 
 .include "../../x11/libXi/buildlink3.mk"
 .include "../../x11/libXmu/buildlink3.mk"
diff --git a/graphics/MesaDemos/PLIST b/graphics/MesaDemos/PLIST
index 5fcfe086c7b..55c27f9fdb6 100644
--- a/graphics/MesaDemos/PLIST
+++ b/graphics/MesaDemos/PLIST
@@ -1,10 +1,12 @@
-@comment $NetBSD: PLIST,v 1.10 2007/08/13 11:18:34 seb Exp $
+@comment $NetBSD: PLIST,v 1.11 2008/07/27 00:03:42 bjs 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,7 @@ 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}/redbook/README
 share/examples/${PKGNAME}/redbook/aaindex
 share/examples/${PKGNAME}/redbook/aaindex.c
@@ -312,6 +360,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 +372,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 +395,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 +432,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
@@ -390,7 +439,6 @@ share/examples/${PKGNAME}/xdemos/xrotfontdemo
 share/examples/${PKGNAME}/xdemos/xrotfontdemo.c
 share/examples/${PKGNAME}/xdemos/xuserotfont.c
 share/examples/${PKGNAME}/xdemos/xuserotfont.h
-share/examples/${PKGNAME}/xdemos/yuvrect_client
 share/examples/${PKGNAME}/xdemos/yuvrect_client.c
 @dirrm share/examples/${PKGNAME}/xdemos
 @dirrm share/examples/${PKGNAME}/windml
@@ -399,7 +447,9 @@ share/examples/${PKGNAME}/xdemos/yuvrect_client.c
 @dirrm share/examples/${PKGNAME}/redbook
 @dirrm share/examples/${PKGNAME}/osdemos
 @dirrm share/examples/${PKGNAME}/images
+@dirrm share/examples/${PKGNAME}/glsl
 @dirrm share/examples/${PKGNAME}/ggi
+@dirrm share/examples/${PKGNAME}/fbdev
 @dirrm share/examples/${PKGNAME}/demos
 @dirrm share/examples/${PKGNAME}/beos
 @dirrm share/examples/${PKGNAME}
diff --git a/graphics/MesaDemos/distinfo b/graphics/MesaDemos/distinfo
index cf3103d0d10..19ae4cbdd0a 100644
--- a/graphics/MesaDemos/distinfo
+++ b/graphics/MesaDemos/distinfo
@@ -1,14 +1,14 @@
-$NetBSD: distinfo,v 1.18 2007/08/13 11:18:35 seb Exp $
+$NetBSD: distinfo,v 1.19 2008/07/27 00:03:42 bjs 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.4/MesaDemos-7.0.4.tar.bz2) = 70e9b37120b978fda9cff8e1478e94cdc245b80f
+RMD160 (Mesa-7.0.4/MesaDemos-7.0.4.tar.bz2) = 1dd92b4260a32c30e9242a28fbb34178b24abf44
+Size (Mesa-7.0.4/MesaDemos-7.0.4.tar.bz2) = 1327557 bytes
+SHA1 (Mesa-7.0.4/MesaGLUT-7.0.4.tar.bz2) = 718a04690414720eabe5d15a14e0f7880aeafa5d
+RMD160 (Mesa-7.0.4/MesaGLUT-7.0.4.tar.bz2) = a34e94b27b6531c3c9833faaaf8cdff6b0aa7cf8
+Size (Mesa-7.0.4/MesaGLUT-7.0.4.tar.bz2) = 327581 bytes
+SHA1 (Mesa-7.0.4/MesaLib-7.0.4.tar.bz2) = 7f658fb2e8fa988d2c00aa63d9e4b834f96b67db
+RMD160 (Mesa-7.0.4/MesaLib-7.0.4.tar.bz2) = 7c3dff2b7eddcbd4974147dd0ae09a792d6d0765
+Size (Mesa-7.0.4/MesaLib-7.0.4.tar.bz2) = 3401051 bytes
 SHA1 (patch-aa) = 4be9b5fadff758d3bcaea22abc5a61e89ccadbe0
 SHA1 (patch-ab) = 50050f26563f739a54173ab75b2d24b4ca4529f4
 SHA1 (patch-ac) = ebaaf755d35bd7f82fe93cff9bb98abee6bbf415
diff --git a/graphics/MesaDemos/patches/patch-aa b/graphics/MesaDemos/patches/patch-aa
deleted file mode 100644
index c30c973cb4c..00000000000
--- a/graphics/MesaDemos/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.5 2004/01/20 02:48:33 jschauma Exp $
-
---- progs/demos/lodbias.c.orig	2004-01-19 20:06:16.000000000 -0500
-+++ progs/demos/lodbias.c	2004-01-19 20:06:28.000000000 -0500
-@@ -212,7 +212,7 @@
-       }
-       /* resize to 256 x 256 */
-       if (width != 256 || height != 256) {
--         GLubyte *newImage = malloc(256 * 256 * 4);
-+         GLubyte *newImage = (GLubyte *)malloc(256 * 256 * 4);
-          gluScaleImage(format, width, height, GL_UNSIGNED_BYTE, image,
-                        256, 256, GL_UNSIGNED_BYTE, newImage);
-          free(image);
diff --git a/graphics/MesaDemos/patches/patch-ab b/graphics/MesaDemos/patches/patch-ab
deleted file mode 100644
index c985bdf1a5a..00000000000
--- a/graphics/MesaDemos/patches/patch-ab
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ab,v 1.10 2004/10/26 13:57:47 adam Exp $
-
---- /dev/null	2004-10-25 16:57:21.000000000 +0000
-+++ configs/pkgsrc
-@@ -0,0 +1,9 @@
-+# Configuration for NetBSD
-+
-+include $(TOP)/configs/default
-+
-+CONFIG_NAME = pkgsrc
-+
-+# Compiler and flags
-+APP_LIB_DEPS = ${LDFLAGS} -lXext -lXmu -lXi -lX11 -lm -lGL -lGLU -lglut -lOSMesa
-+
diff --git a/graphics/MesaDemos/patches/patch-ac b/graphics/MesaDemos/patches/patch-ac
deleted file mode 100644
index 17737b17e2e..00000000000
--- a/graphics/MesaDemos/patches/patch-ac
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-ac,v 1.11 2007/08/13 11:18:36 seb Exp $
-
---- Makefile.orig	2005-11-29 23:38:49.000000000 +0100
-+++ Makefile
-@@ -2,7 +2,7 @@
- 
- TOP = .
- 
--SUBDIRS = src progs
-+SUBDIRS = progs
- 
- 
- default: $(TOP)/configs/current
-@@ -117,6 +117,7 @@ linux-x86-xcb \
- linux-x86-glide \
- linux-x86-static \
- netbsd \
-+pkgsrc \
- openbsd \
- osf1 \
- solaris-x86 \
diff --git a/graphics/MesaDemos/patches/patch-af b/graphics/MesaDemos/patches/patch-af
deleted file mode 100644
index ef9ae663b9c..00000000000
--- a/graphics/MesaDemos/patches/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-af,v 1.1 2004/01/20 02:48:33 jschauma Exp $
-
---- progs/xdemos/glxswapcontrol.c.orig	2004-01-19 20:16:07.000000000 -0500
-+++ progs/xdemos/glxswapcontrol.c	2004-01-19 20:16:26.000000000 -0500
-@@ -645,7 +645,7 @@
- 	  * other in the string.
- 	  */
- 
--	 string_tab[ idx ] = malloc( sizeof( char ) * (i + 1) );
-+	 string_tab[ idx ] = (char *)malloc( sizeof( char ) * (i + 1) );
- 	 if ( string_tab[ idx ] == NULL ) {
- 	    return;
- 	 }
diff --git a/graphics/MesaDemos/patches/patch-ah b/graphics/MesaDemos/patches/patch-ah
deleted file mode 100644
index bfa85b436f8..00000000000
--- a/graphics/MesaDemos/patches/patch-ah
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-ah,v 1.5 2007/08/13 11:18:38 seb Exp $
-
---- configs/default.orig	2005-10-25 01:35:14.000000000 +0200
-+++ configs/default
-@@ -14,10 +14,6 @@ MESA_TINY=1
- DRM_SOURCE_PATH=$(TOP)/../drm
- 
- # Compiler and flags
--CC = cc
--CXX = CC
--CFLAGS = -O
--CXXFLAGS = -O
- 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
diff --git a/graphics/MesaDemos/patches/patch-ai b/graphics/MesaDemos/patches/patch-ai
deleted file mode 100644
index 14eb9b16035..00000000000
--- a/graphics/MesaDemos/patches/patch-ai
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ai,v 1.5 2007/08/13 11:18:38 seb Exp $
-
---- include/GL/glxext.h.orig	2005-11-08 10:20:29.000000000 +1300
-+++ include/GL/glxext.h
-@@ -334,7 +334,7 @@ typedef struct {
- #if defined(__sun__)
- #include <inttypes.h>
- #if defined(__STDC__)
--#if defined(__arch64__)
-+#if defined(__arch64__) || defined(_LP64)
- typedef long int int64_t;
- #else
- typedef long long int int64_t;