Changes 6.2:

New:
- enabled GL_ARB_texture_rectangle (same as GL_NV_texture_rectangle)
- updated Doxygen support (Jose Fonseca)
Changes:
- some GGI driver updates (Christoph Egger, bug 1025977)
Bug fixes:
- Omit GL_ARB_texture_non_power_of_two from list of OpenGL 1.5 features
- fixed a few compilation issues on IRIX
- fixed a matrix classification bug (reported by Wes Bethel)
- we weren't reseting the vertex/fragment program error state
  before parsing (Dave Reveman)
- adjust texcoords for sampling texture rectangles (Dave Reveman)
- glGet*(GL_MAX_VERTEX_ATTRIBS_ARB) wasn't implemented
- repeated calls to glDeleteTexture(t) could lead to a crash
- fixed potential ref count bugs in VBOs and vertex/fragment programs
- spriteblast demo didn't handle window size changes correctly
- glTexSubImage didn't handle pixels=NULL correctly for PBOs
- fixed color index mode glDrawPixels bug (Karl Schultz)

Changes 6.1:
New:
- Revamped Makefile system
- glXUseRotatedXFont() utility (see xdemos/xuserotfont.c)
- internal driver interface changes related to texture object
  allocation, vertex/fragment programs, BlendEquationSeparate, etc.
- option to walk triangle edges with double-precision floats
  (Justin Novosad of Discreet) (see config.h file)
- support for AUX buffers in software GLX driver
- updated glext.h to version 24 and glxext.h to version 6
- new MESA_GLX_FORCE_ALPHA and MESA_GLX_DEPTH_BITS env vars
- updated BeOS support (Philippe Houdoin)
Changes:
- fragment fog interpolation is perspective corrected now
- new glTexImage code, much cleaner, may be a bit faster
Bug fixes:
- glArrayElement in display lists didn't handle generic vertex attribs
- glFogCoord didn't always work properly
- ARB_fragment_program fog options didn't work
- frag prog TEX instruction no longer incorrectly divides s,t,r by q
- ARB frag prog TEX and TEXP instructions now use LOD=0
- glTexEnviv in display lists didn't work
- glRasterPos didn't do texgen or apply texture matrix
- GL_DOUBLE-valued vertex arrays were broken in some cases
- fixed texture rectangle edge/border sampling bugs
- sampling an incomplete texture in a fragment program would segfault
- glTexImage was missing a few error checks
- fixed some minor glGetTexParameter glitches
- GL_INTENSITY was mistakenly accepted as a  to glTexImage
- fragment program writes to RC/HC register were broken
- fixed a few glitches in GL_HP_occlusion_test extension
- glBeginQueryARB and glEndQueryARB didn't work inside display lists
- vertex program state references were broken
- fixed triangle color interpolation bug on AIX (Shane Blackett)
- fixed a number of minor memory leaks (bug #1002030)

22 files changed, 227 insertions, 293 deletions

diff --git a/graphics/Mesa/Makefile b/graphics/Mesa/Makefile
index 23deb46000e..d985bddeb66 100644
--- a/graphics/Mesa/Makefile
+++ b/graphics/Mesa/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.59 2004/10/03 00:14:48 tv Exp $
+# $NetBSD: Makefile,v 1.60 2004/10/26 13:55:17 adam Exp $
 
 PKGNAME=	Mesa-${MESA_VERSION}
-PKGREVISION=	1
 MASTER_SITES= 	# empty
 DISTFILES=	# empty
 
@@ -26,7 +25,6 @@ do-install:	# empty
 
 # The ordering is important here as glut/buildlink3.mk sets the version
 # of Mesa required.
-#
 .include "../../graphics/glut/buildlink3.mk"
 .include "../../graphics/glu/buildlink3.mk"
 .include "../../graphics/MesaLib/buildlink3.mk"
diff --git a/graphics/Mesa/Makefile.common b/graphics/Mesa/Makefile.common
index ddbf7e2ca7a..56d75439451 100644
--- a/graphics/Mesa/Makefile.common
+++ b/graphics/Mesa/Makefile.common
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile.common,v 1.31 2004/10/13 18:00:08 tv Exp $
-#
+# $NetBSD: Makefile.common,v 1.32 2004/10/26 13:55:17 adam Exp $
 
 DISTNAME=	MesaLib-${MESA_VERSION}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
@@ -9,7 +8,7 @@ CATEGORIES=	graphics
 MASTER_SITES= 	${MASTER_SITE_SOURCEFORGE:=mesa3d/}
 EXTRACT_SUFX=	.tar.bz2
 
-MESA_VERSION=	6.0.1
+MESA_VERSION=	6.2
 
 MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://www.mesa3d.org/
@@ -21,8 +20,8 @@ USE_X11=		yes
 BUILDING_MESA=		yes
 NO_CONFIGURE=		yes
 DIST_SUBDIR=		Mesa-${MESA_VERSION}
-PATCHDIR?=		${.CURDIR}/../../graphics/MesaLib/patches
-DISTINFO_FILE?=		${.CURDIR}/../../graphics/MesaLib/distinfo
+PATCHDIR?=		${.CURDIR}/../MesaLib/patches
+DISTINFO_FILE?=		${.CURDIR}/../MesaLib/distinfo
 
 INSTALLATION_DIRS+=	lib
 
diff --git a/graphics/MesaDemos/Makefile b/graphics/MesaDemos/Makefile
index c4d87ccea0d..a0793061af8 100644
--- a/graphics/MesaDemos/Makefile
+++ b/graphics/MesaDemos/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.19 2004/10/13 18:00:08 tv Exp $
+# $NetBSD: Makefile,v 1.20 2004/10/26 13:57:47 adam Exp $
 
 PKGNAME=	MesaDemos-${MESA_VERSION}
-PKGREVISION=	2
 COMMENT=	OpenGL examples and Demos
 
 PATCHDIR=		${.CURDIR}/patches
diff --git a/graphics/MesaDemos/PLIST b/graphics/MesaDemos/PLIST
index 87951832395..3bc401037b7 100644
--- a/graphics/MesaDemos/PLIST
+++ b/graphics/MesaDemos/PLIST
@@ -1,4 +1,7 @@
-@comment $NetBSD: PLIST,v 1.6 2004/04/09 13:08:20 adam Exp $
+@comment $NetBSD: PLIST,v 1.7 2004/10/26 13:57: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/Windows/all.dsp
 share/examples/${PKGNAME}/demos/Windows/bounce.dsp
@@ -58,6 +61,8 @@ share/examples/${PKGNAME}/demos/drawpix
 share/examples/${PKGNAME}/demos/drawpix.c
 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/gamma
@@ -90,6 +95,9 @@ 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/osdemo16.c
+share/examples/${PKGNAME}/demos/osdemo32.c
+share/examples/${PKGNAME}/demos/paltex
 share/examples/${PKGNAME}/demos/paltex.c
 share/examples/${PKGNAME}/demos/particles.cxx
 share/examples/${PKGNAME}/demos/particles.h
@@ -288,6 +296,7 @@ share/examples/${PKGNAME}/samples/bitmap2
 share/examples/${PKGNAME}/samples/bitmap2.c
 share/examples/${PKGNAME}/samples/blendeq
 share/examples/${PKGNAME}/samples/blendeq.c
+share/examples/${PKGNAME}/samples/blendxor
 share/examples/${PKGNAME}/samples/blendxor.c
 share/examples/${PKGNAME}/samples/copy
 share/examples/${PKGNAME}/samples/copy.c
@@ -308,7 +317,6 @@ 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
@@ -348,6 +356,7 @@ share/examples/${PKGNAME}/util/glstate.h
 share/examples/${PKGNAME}/util/glutskel.c
 share/examples/${PKGNAME}/util/idproj.c
 share/examples/${PKGNAME}/util/imagesgi.h
+share/examples/${PKGNAME}/util/matrix.c
 share/examples/${PKGNAME}/util/mwmborder.c
 share/examples/${PKGNAME}/util/readtex.c
 share/examples/${PKGNAME}/util/readtex.h
@@ -378,10 +387,13 @@ share/examples/${PKGNAME}/xdemos/glxdemo
 share/examples/${PKGNAME}/xdemos/glxdemo.c
 share/examples/${PKGNAME}/xdemos/glxgears
 share/examples/${PKGNAME}/xdemos/glxgears.c
+share/examples/${PKGNAME}/xdemos/glxgears_fbconfig.c
 share/examples/${PKGNAME}/xdemos/glxheads
 share/examples/${PKGNAME}/xdemos/glxheads.c
 share/examples/${PKGNAME}/xdemos/glxinfo
 share/examples/${PKGNAME}/xdemos/glxinfo.c
+share/examples/${PKGNAME}/xdemos/glxpbdemo
+share/examples/${PKGNAME}/xdemos/glxpbdemo.c
 share/examples/${PKGNAME}/xdemos/glxpixmap
 share/examples/${PKGNAME}/xdemos/glxpixmap.c
 share/examples/${PKGNAME}/xdemos/glxswapcontrol
@@ -390,12 +402,14 @@ share/examples/${PKGNAME}/xdemos/manywin
 share/examples/${PKGNAME}/xdemos/manywin.c
 share/examples/${PKGNAME}/xdemos/offset
 share/examples/${PKGNAME}/xdemos/offset.c
+share/examples/${PKGNAME}/xdemos/opencloseopen.c
+share/examples/${PKGNAME}/xdemos/pbdemo
 share/examples/${PKGNAME}/xdemos/pbdemo.c
+share/examples/${PKGNAME}/xdemos/pbinfo
 share/examples/${PKGNAME}/xdemos/pbinfo.c
 share/examples/${PKGNAME}/xdemos/pbutil.c
 share/examples/${PKGNAME}/xdemos/pbutil.h
 share/examples/${PKGNAME}/xdemos/shape.c
-share/examples/${PKGNAME}/xdemos/testgl5.c
 share/examples/${PKGNAME}/xdemos/vgears.c
 share/examples/${PKGNAME}/xdemos/vindex.c
 share/examples/${PKGNAME}/xdemos/vtest.c
@@ -405,6 +419,10 @@ share/examples/${PKGNAME}/xdemos/xdemo
 share/examples/${PKGNAME}/xdemos/xdemo.c
 share/examples/${PKGNAME}/xdemos/xfont
 share/examples/${PKGNAME}/xdemos/xfont.c
+share/examples/${PKGNAME}/xdemos/xrotfontdemo
+share/examples/${PKGNAME}/xdemos/xrotfontdemo.c
+share/examples/${PKGNAME}/xdemos/xuserotfont.c
+share/examples/${PKGNAME}/xdemos/xuserotfont.h
 @dirrm share/examples/${PKGNAME}/xdemos
 @dirrm share/examples/${PKGNAME}/windml
 @dirrm share/examples/${PKGNAME}/util
@@ -414,4 +432,5 @@ share/examples/${PKGNAME}/xdemos/xfont.c
 @dirrm share/examples/${PKGNAME}/ggi
 @dirrm share/examples/${PKGNAME}/demos/Windows
 @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 a1689391dc6..688ea5e5bf6 100644
--- a/graphics/MesaDemos/distinfo
+++ b/graphics/MesaDemos/distinfo
@@ -1,15 +1,12 @@
-$NetBSD: distinfo,v 1.10 2004/04/09 13:08:20 adam Exp $
+$NetBSD: distinfo,v 1.11 2004/10/26 13:57:47 adam Exp $
 
-SHA1 (Mesa-6.0.1/MesaLib-6.0.1.tar.bz2) = e396e28d693cd7abfe8e3d4d726dfc28b3b335a2
-Size (Mesa-6.0.1/MesaLib-6.0.1.tar.bz2) = 1496291 bytes
-SHA1 (Mesa-6.0.1/MesaDemos-6.0.1.tar.bz2) = 8831d9af0a1afbdee29838460d5340f4612d7cd6
-Size (Mesa-6.0.1/MesaDemos-6.0.1.tar.bz2) = 915558 bytes
+SHA1 (Mesa-6.2/MesaLib-6.2.tar.bz2) = dc8cc87138729ab6b5002c91e02f8c41a9dbdd35
+Size (Mesa-6.2/MesaLib-6.2.tar.bz2) = 1615788 bytes
+SHA1 (Mesa-6.2/MesaDemos-6.2.tar.bz2) = 10a3303093be1b69243e639377ecee299e34d98c
+Size (Mesa-6.2/MesaDemos-6.2.tar.bz2) = 1005757 bytes
 SHA1 (patch-aa) = 4be9b5fadff758d3bcaea22abc5a61e89ccadbe0
-SHA1 (patch-ab) = 15687f90c7727d8167ca829ffb185e457e87e5d7
-SHA1 (patch-ac) = 9c780cee963a99801b3a29176c00942fc5ef938f
+SHA1 (patch-ab) = 50050f26563f739a54173ab75b2d24b4ca4529f4
+SHA1 (patch-ac) = fb27a96d6932b8d3e3b2c57539c995322e7196c0
 SHA1 (patch-ad) = 41a417d37ad82a99a3b1e7ef4c54f052947a8a1b
-SHA1 (patch-ae) = 1cc774b4c012fa6a53b80968f94cc99780d5733b
 SHA1 (patch-af) = a66af6ebab7569d85693a9fa58b2d8f9b35149c1
-SHA1 (patch-ag) = 1aae03d6dfe080efacd306ac157231e2c72c13ea
-SHA1 (patch-ah) = b1c39f3b5e739dd14340b8b6c680a891e61c54e1
-SHA1 (patch-ai) = 9331e8e9a7f9dd044b10b62319f5eaaaddfe63d0
+SHA1 (patch-ah) = 8ccfd1734accf9ed3920d42e9208eef5a9d233cf
diff --git a/graphics/MesaDemos/patches/patch-ab b/graphics/MesaDemos/patches/patch-ab
index f885ef8608c..c985bdf1a5a 100644
--- a/graphics/MesaDemos/patches/patch-ab
+++ b/graphics/MesaDemos/patches/patch-ab
@@ -1,26 +1,14 @@
-$NetBSD: patch-ab,v 1.9 2004/04/09 13:08:20 adam Exp $
+$NetBSD: patch-ab,v 1.10 2004/10/26 13:57:47 adam Exp $
 
---- Make-config.orig	2004-03-30 14:47:13.000000000 +0000
-+++ Make-config
-@@ -1172,19 +1172,14 @@ mklinux:
- 	"GLUT_CFLAGS = -fexceptions" \
- 	"APP_LIB_DEPS = -lmoto -L/usr/X11/lib -lXmu -lX11 -lm"
- 
--netbsd:
-+pkgsrc:
- 	$(MAKE) $(MFLAGS) -f Makefile.X11 targets \
- 	"GL_LIB = libGL.so" \
- 	"GLU_LIB = libGLU.so" \
- 	"GLUT_LIB = libglut.so" \
- 	"GLW_LIB = libGLw.so" \
- 	"OSMESA_LIB = libOSMesa.so" \
--	"CC = gcc" \
--	"CXX = g++" \
--	"CFLAGS = -O2 -fPIC -DUSE_XSHM -I/usr/X11R6/include -DHZ=100"  \
--	"CXXFLAGS = -O2 -fPIC"  \
--	"GLUT_CFLAGS = -fexceptions" \
--	"APP_LIB_DEPS = -L/usr/X11R6/lib -lXext -lXmu -lXi -lX11 -lm"
-+	"APP_LIB_DEPS = ${LDFLAGS} -lXext -lXmu -lXi -lX11 -lm"
- 
- openbsd:
- 	$(MAKE) $(MFLAGS) -f Makefile.X11 targets \
+--- /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
index 7e8986b0141..670e951acff 100644
--- a/graphics/MesaDemos/patches/patch-ac
+++ b/graphics/MesaDemos/patches/patch-ac
@@ -1,22 +1,21 @@
-$NetBSD: patch-ac,v 1.6 2004/04/09 13:08:20 adam Exp $
+$NetBSD: patch-ac,v 1.7 2004/10/26 13:57:47 adam Exp $
 
---- Makefile.orig	2004-04-02 23:29:33.000000000 +0000
+--- Makefile.orig	2004-10-01 21:34:29.000000000 +0000
 +++ Makefile
-@@ -104,7 +104,7 @@ default:
- 	@echo "  make linux-ia64-ecc-static-nothreads  for Linux IA64 with the Intel C/C++ compiler, static, no threads"
- 	@echo "  make lynxos                for LynxOS systems with GCC"
- 	@echo "  make mklinux               for Linux on Power Macintosh"
--	@echo "  make netbsd                for NetBSD 1.0 systems with GCC"
-+	@echo "  make pkgsrc                for pkgsrc systems"
- 	@echo "  make openbsd               for OpenBSD systems"
- 	@echo "  make openstep              for OpenStep/MacOSX Server systems"
- 	@echo "  make osf1                  for DEC Alpha systems with OSF/1"
-@@ -152,7 +152,7 @@ linux-glide linux-x86-glide linux-glide-
- linux-alpha-static linux-alpha \
- linux-ppc-static linux-ppc \
- linux-sparc linux-sparc5 linux-sparc-ultra \
--mklinux netbsd osf1 osf1-nothreads openbsd qnx \
-+mklinux pkgsrc osf1 osf1-nothreads openbsd qnx \
- solaris-x86 solaris-x86-gcc \
- sunos4 sunos4-sl sunos4-gcc sunos4-gcc-sl sunos4-gcc-x11r6-sl \
- sunos5 sunos5-smp sunos5-gcc sunos5-gcc-debug \
+@@ -2,7 +2,7 @@
+ 
+ TOP = .
+ 
+-SUBDIRS = src progs
++SUBDIRS = progs
+ 
+ 
+ default: $(TOP)/configs/current
+@@ -98,6 +98,7 @@ linux-x86-64-static \
+ linux-x86-glide \
+ linux-x86-static \
+ netbsd \
++pkgsrc \
+ openbsd \
+ osf1 \
+ solaris-x86 \
diff --git a/graphics/MesaDemos/patches/patch-ag b/graphics/MesaDemos/patches/patch-ag
deleted file mode 100644
index 9a057842f88..00000000000
--- a/graphics/MesaDemos/patches/patch-ag
+++ /dev/null
@@ -1,53 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2004/01/20 02:48:33 jschauma Exp $
-
---- progs/xdemos/Makefile.X11.orig	2003-10-03 10:03:16.000000000 -0400
-+++ progs/xdemos/Makefile.X11	2004-01-19 20:48:04.000000000 -0500
-@@ -7,7 +7,7 @@
- INCDIR = $(TOP)/include
- LIBDIR = $(TOP)/lib
- 
--LIBS = -L$(LIBDIR) $(APP_LIB_DEPS)
-+LIBS+= -L$(LIBDIR) $(APP_LIB_DEPS)  -lGL -lGLU -lglut
- 
- LIB_DEP = $(LIBDIR)/$(GL_LIB) $(LIBDIR)/$(GLU_LIB)
- 
-@@ -20,8 +20,6 @@
- 	glxswapcontrol \
- 	manywin \
- 	offset \
--	pbinfo \
--	pbdemo \
- 	wincopy \
- 	xdemo \
- 	xfont
-@@ -34,24 +32,24 @@
- .SUFFIXES: .c
- 
- .c: $(LIB_DEP)
--	$(CC) -I$(INCDIR) $(CFLAGS) $< $(LIBS) -o $@
-+	$(CXX) -I$(INCDIR) $(CFLAGS) $< $(LIBS) -o $@
- 
- 
- # special cases
- pbinfo: pbinfo.o pbutil.o
--	$(CC) pbinfo.o pbutil.o $(LIBS) -o $@
-+	$(CXX) pbinfo.o pbutil.o $(LIBS) -o $@
- 
- pbdemo: pbdemo.o pbutil.o
--	$(CC) pbdemo.o pbutil.o $(LIBS) -o $@
-+	$(CXX) pbdemo.o pbutil.o $(LIBS) -o $@
- 
- pbinfo.o: pbinfo.c pbutil.h
--	$(CC) -c -I. -I$(INCDIR) $(CFLAGS) pbinfo.c
-+	$(CXX) -c -I. -I$(INCDIR) $(CFLAGS) pbinfo.c
- 
- pbdemo.o: pbdemo.c pbutil.h
--	$(CC) -c -I. -I$(INCDIR) $(CFLAGS) pbdemo.c
-+	$(CXX) -c -I. -I$(INCDIR) $(CFLAGS) pbdemo.c
- 
- pbutil.o: pbutil.c pbutil.h
--	$(CC) -c -I. -I$(INCDIR) $(CFLAGS) pbutil.c
-+	$(CXX) -c -I. -I$(INCDIR) $(CFLAGS) pbutil.c
- 
- 
- 
diff --git a/graphics/MesaDemos/patches/patch-ah b/graphics/MesaDemos/patches/patch-ah
index 4aad2cfc173..f922e0fb9ad 100644
--- a/graphics/MesaDemos/patches/patch-ah
+++ b/graphics/MesaDemos/patches/patch-ah
@@ -1,22 +1,24 @@
-$NetBSD: patch-ah,v 1.1 2004/01/20 02:48:33 jschauma Exp $
+$NetBSD: patch-ah,v 1.2 2004/10/26 13:57:47 adam Exp $
 
---- progs/redbook/Makefile.X11.orig	2003-10-03 10:03:15.000000000 -0400
-+++ progs/redbook/Makefile.X11	2004-01-19 20:47:35.000000000 -0500
-@@ -7,7 +7,7 @@
- INCDIR = $(TOP)/include
- LIBDIR = $(TOP)/lib
- 
--LIBS = -L$(LIBDIR) $(APP_LIB_DEPS)
-+LIBS+= -L$(LIBDIR) $(APP_LIB_DEPS) -lGL -lGLU -lglut
- 
- LIB_DEP = $(LIBDIR)/$(GL_LIB) $(LIBDIR)/$(GLU_LIB) $(LIBDIR)/$(GLUT_LIB)
- 
-@@ -28,7 +28,7 @@
- .SUFFIXES: .c
- 
- .c: $(LIB_DEP)
--	$(CC) -I$(INCDIR) $(CFLAGS) $< $(LIBS) -o $@
-+	$(CXX) -I$(INCDIR) $(CFLAGS) $< $(LIBS) -o $@
+--- configs/default.orig	2004-10-25 17:21:49.000000000 +0000
++++ configs/default
+@@ -14,10 +14,6 @@ MESA_TINY=0
+ DRM_SOURCE_PATH=$(TOP)/../drm
  
+ # Compiler and flags
+-CC = cc
+-CXX = CC
+-CFLAGS = -O
+-CXXFLAGS = -O
+ GLU_CFLAGS = 
  
+ # Misc tools and flags
+@@ -52,7 +48,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 905e45727c9..00000000000
--- a/graphics/MesaDemos/patches/patch-ai
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-ai,v 1.1 2004/01/20 02:48:33 jschauma Exp $
-
---- progs/samples/Makefile.X11.orig	2003-10-03 10:03:16.000000000 -0400
-+++ progs/samples/Makefile.X11	2004-01-19 20:53:56.000000000 -0500
-@@ -7,11 +7,11 @@
- INCDIR = $(TOP)/include
- LIBDIR = $(TOP)/lib
- 
--LIBS = -L$(LIBDIR) $(APP_LIB_DEPS)
-+LIBS+= -L$(LIBDIR) $(APP_LIB_DEPS) -lGL -lGLU -lglut
- 
- LIB_DEP = $(LIBDIR)/$(GL_LIB) $(LIBDIR)/$(GLU_LIB) $(LIBDIR)/$(GLUT_LIB)
- 
--PROGS = accum bitmap1 bitmap2 blendeq blendxor copy cursor depth eval fog \
-+PROGS = accum bitmap1 bitmap2 blendeq copy cursor depth eval fog \
- 	font line logo nurb oglinfo olympic overlay point prim quad select \
- 	shape sphere star stencil stretch texture tri wave
- 
-@@ -22,7 +22,7 @@
- .SUFFIXES: .c
- 
- .c: $(LIB_DEP)
--	$(CC) -I$(INCDIR) $(CFLAGS) $< $(LIBS) -o $@
-+	$(CXX) -I$(INCDIR) $(CFLAGS) $< $(LIBS) -o $@
- 
- 
- 
diff --git a/graphics/MesaLib/Makefile b/graphics/MesaLib/Makefile
index 03368486989..657fb44a087 100644
--- a/graphics/MesaLib/Makefile
+++ b/graphics/MesaLib/Makefile
@@ -1,17 +1,13 @@
-# $NetBSD: Makefile,v 1.34 2004/10/13 18:00:08 tv Exp $
-#
+# $NetBSD: Makefile,v 1.35 2004/10/26 13:55:37 adam Exp $
 
 PKGNAME=	MesaLib-${MESA_VERSION}
-PKGREVISION=	2
 COMMENT=	Graphics library similar to SGI's OpenGL
 
-.include "../../graphics/Mesa/Makefile.common"
+.include "../Mesa/Makefile.common"
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 USE_BUILDLINK3=		yes
-#CONF_FILES=		${PREFIX}/share/examples/mesa/mesa.conf		\
-#			${PKG_SYSCONFDIR}/mesa.conf
 
 INSTLIBS=	${WRKSRC}/src/mesa/libGL.la \
 		${WRKSRC}/src/glw/libGLw.la \
diff --git a/graphics/MesaLib/distinfo b/graphics/MesaLib/distinfo
index c0873df74e5..e55adeaeb8f 100644
--- a/graphics/MesaLib/distinfo
+++ b/graphics/MesaLib/distinfo
@@ -1,13 +1,14 @@
-$NetBSD: distinfo,v 1.19 2004/04/09 13:06:06 adam Exp $
+$NetBSD: distinfo,v 1.20 2004/10/26 13:55:37 adam Exp $
 
-SHA1 (Mesa-6.0.1/MesaLib-6.0.1.tar.bz2) = e396e28d693cd7abfe8e3d4d726dfc28b3b335a2
-Size (Mesa-6.0.1/MesaLib-6.0.1.tar.bz2) = 1496291 bytes
-SHA1 (Mesa-6.0.1/MesaDemos-6.0.1.tar.bz2) = 8831d9af0a1afbdee29838460d5340f4612d7cd6
-Size (Mesa-6.0.1/MesaDemos-6.0.1.tar.bz2) = 915558 bytes
-SHA1 (patch-aa) = fb0c20f46b1a060d559d7157c991ab1d10aac28a
-SHA1 (patch-ab) = 81919e13455eeacc8830869fc96e3e9379c2a559
-SHA1 (patch-ac) = 9c780cee963a99801b3a29176c00942fc5ef938f
-SHA1 (patch-ad) = 20f6f7eb1fc9b36d37e5aa147c3ed6914b365710
-SHA1 (patch-ae) = 21f1a8cfb13fca033196daf25e3d9183d74d6441
-SHA1 (patch-af) = c4f604ca18ead3aa0f55b68751ca6a870bfbdfe0
-SHA1 (patch-ag) = 8455363b6a7d94b43784209c21133b3015cfde70
+SHA1 (Mesa-6.2/MesaLib-6.2.tar.bz2) = dc8cc87138729ab6b5002c91e02f8c41a9dbdd35
+Size (Mesa-6.2/MesaLib-6.2.tar.bz2) = 1615788 bytes
+SHA1 (Mesa-6.2/MesaDemos-6.2.tar.bz2) = 10a3303093be1b69243e639377ecee299e34d98c
+Size (Mesa-6.2/MesaDemos-6.2.tar.bz2) = 1005757 bytes
+SHA1 (patch-aa) = 90457ea124a42150e3a37b48e1e0691597668606
+SHA1 (patch-ab) = c963edcd2deb5b0cc6bf79814b0c0c14ad2c5f12
+SHA1 (patch-ac) = b1ce4c041d07894817cf473f06b7caab5bb70cb2
+SHA1 (patch-ad) = 0d8bee8806d2c5c23acf2bf4744f64efc1c73d7d
+SHA1 (patch-ae) = b7fd3c2af1e40536f9e5a2b0409342aaee7fef1f
+SHA1 (patch-af) = fce796cba87fb5f1bab32bfd095dcb1d4320fdc8
+SHA1 (patch-ag) = 4026f44a2f0135e4d1800c689bf5805bc3a0fd48
+SHA1 (patch-ah) = 8ccfd1734accf9ed3920d42e9208eef5a9d233cf
diff --git a/graphics/MesaLib/patches/patch-aa b/graphics/MesaLib/patches/patch-aa
index 573eed573af..faffb125a1a 100644
--- a/graphics/MesaLib/patches/patch-aa
+++ b/graphics/MesaLib/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.6 2004/01/20 02:48:33 jschauma Exp $
+$NetBSD: patch-aa,v 1.7 2004/10/26 13:55:37 adam Exp $
 
---- ./src/mesa/x86/assyntax.h.orig	2004-01-19 15:28:07.000000000 -0500
-+++ ./src/mesa/x86/assyntax.h	2004-01-19 15:28:36.000000000 -0500
-@@ -967,7 +967,8 @@
+--- src/mesa/x86/assyntax.h.orig	2004-04-26 10:10:25.000000000 +0000
++++ src/mesa/x86/assyntax.h
+@@ -985,7 +985,8 @@ SECTION _DATA public align=16 class=DATA
  
  #if defined(Lynx) || (defined(SYSV) || defined(SVR4)) \
   || (defined(__linux__) || defined(__OS2ELF__)) && defined(__ELF__) \
diff --git a/graphics/MesaLib/patches/patch-ab b/graphics/MesaLib/patches/patch-ab
index ca93eb2f385..4b7715535a4 100644
--- a/graphics/MesaLib/patches/patch-ab
+++ b/graphics/MesaLib/patches/patch-ab
@@ -1,26 +1,14 @@
-$NetBSD: patch-ab,v 1.11 2004/04/09 13:06:06 adam Exp $
+$NetBSD: patch-ab,v 1.12 2004/10/26 13:55:37 adam Exp $
 
---- Make-config.orig	2004-03-30 14:47:13.000000000 +0000
-+++ Make-config
-@@ -1172,19 +1172,14 @@ mklinux:
- 	"GLUT_CFLAGS = -fexceptions" \
- 	"APP_LIB_DEPS = -lmoto -L/usr/X11/lib -lXmu -lX11 -lm"
- 
--netbsd:
-+pkgsrc:
- 	$(MAKE) $(MFLAGS) -f Makefile.X11 targets \
- 	"GL_LIB = libGL.so" \
- 	"GLU_LIB = libGLU.so" \
- 	"GLUT_LIB = libglut.so" \
- 	"GLW_LIB = libGLw.so" \
- 	"OSMESA_LIB = libOSMesa.so" \
--	"CC = gcc" \
--	"CXX = g++" \
--	"CFLAGS = -O2 -fPIC -DUSE_XSHM -I/usr/X11R6/include -DHZ=100"  \
--	"CXXFLAGS = -O2 -fPIC"  \
--	"GLUT_CFLAGS = -fexceptions" \
--	"APP_LIB_DEPS = -L/usr/X11R6/lib -lXext -lXmu -lXi -lX11 -lm"
-+	"APP_LIB_DEPS = -L${PREFIX}/lib -L${X11PREFIX}/lib -lXext -lXmu -lXi -lX11 -lm"
- 
- openbsd:
- 	$(MAKE) $(MFLAGS) -f Makefile.X11 targets \
+--- /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 = -L$(LIB_DIR) -L${PREFIX}/lib -L${X11PREFIX}/lib -lXext -lXmu -lXi -lX11 -lm
++
diff --git a/graphics/MesaLib/patches/patch-ac b/graphics/MesaLib/patches/patch-ac
index 4a51d050dbf..efe3ce9fbac 100644
--- a/graphics/MesaLib/patches/patch-ac
+++ b/graphics/MesaLib/patches/patch-ac
@@ -1,22 +1,21 @@
-$NetBSD: patch-ac,v 1.5 2004/04/09 13:06:06 adam Exp $
+$NetBSD: patch-ac,v 1.6 2004/10/26 13:55:37 adam Exp $
 
---- Makefile.orig	2004-04-02 23:29:33.000000000 +0000
+--- Makefile.orig	2004-10-01 21:34:29.000000000 +0000
 +++ Makefile
-@@ -104,7 +104,7 @@ default:
- 	@echo "  make linux-ia64-ecc-static-nothreads  for Linux IA64 with the Intel C/C++ compiler, static, no threads"
- 	@echo "  make lynxos                for LynxOS systems with GCC"
- 	@echo "  make mklinux               for Linux on Power Macintosh"
--	@echo "  make netbsd                for NetBSD 1.0 systems with GCC"
-+	@echo "  make pkgsrc                for pkgsrc systems"
- 	@echo "  make openbsd               for OpenBSD systems"
- 	@echo "  make openstep              for OpenStep/MacOSX Server systems"
- 	@echo "  make osf1                  for DEC Alpha systems with OSF/1"
-@@ -152,7 +152,7 @@ linux-glide linux-x86-glide linux-glide-
- linux-alpha-static linux-alpha \
- linux-ppc-static linux-ppc \
- linux-sparc linux-sparc5 linux-sparc-ultra \
--mklinux netbsd osf1 osf1-nothreads openbsd qnx \
-+mklinux pkgsrc osf1 osf1-nothreads openbsd qnx \
- solaris-x86 solaris-x86-gcc \
- sunos4 sunos4-sl sunos4-gcc sunos4-gcc-sl sunos4-gcc-x11r6-sl \
- sunos5 sunos5-smp sunos5-gcc sunos5-gcc-debug \
+@@ -2,7 +2,7 @@
+ 
+ TOP = .
+ 
+-SUBDIRS = src progs
++SUBDIRS = src
+ 
+ 
+ default: $(TOP)/configs/current
+@@ -98,6 +98,7 @@ linux-x86-64-static \
+ linux-x86-glide \
+ linux-x86-static \
+ netbsd \
++pkgsrc \
+ openbsd \
+ osf1 \
+ solaris-x86 \
diff --git a/graphics/MesaLib/patches/patch-ad b/graphics/MesaLib/patches/patch-ad
index e4263a04ed6..c0d5b338fed 100644
--- a/graphics/MesaLib/patches/patch-ad
+++ b/graphics/MesaLib/patches/patch-ad
@@ -1,9 +1,9 @@
-$NetBSD: patch-ad,v 1.4 2004/04/09 13:06:06 adam Exp $
+$NetBSD: patch-ad,v 1.5 2004/10/26 13:55:37 adam Exp $
 
---- src/mesa/Makefile.X11.orig	2004-03-24 19:27:19.000000000 +0000
-+++ src/mesa/Makefile.X11
-@@ -53,10 +53,10 @@ OBJECTS = \
- ##### RULES #####
+--- src/mesa/Makefile.orig	2004-08-16 17:11:10.000000000 +0000
++++ src/mesa/Makefile
+@@ -12,10 +12,10 @@ GL_TINY = 0$(MESA_MAJOR)0$(MESA_MINOR)0$
+ 
  
  .c.o:
 -	$(CC) -c $(INCLUDE_DIRS) $(CFLAGS) $< -o $@
@@ -14,27 +14,35 @@ $NetBSD: patch-ad,v 1.4 2004/04/09 13:06:06 adam Exp $
 +	${LIBTOOL} --mode=compile $(CC) -c $(INCLUDE_DIRS) $(CFLAGS) $< -o $@
  
  
- # need some special rules here, unfortunately
-@@ -95,18 +95,16 @@ targets: $(LIBDIR)/$(GL_LIB) $(LIBDIR)/$
+ # Figure out what to make here
+@@ -112,22 +112,20 @@ subdirs:
  
  # Make the GL library
- $(LIBDIR)/$(GL_LIB): $(OBJECTS)
--	$(TOP)/bin/mklib -o $(GL_LIB_NAME) -major $(GL_MAJOR) \
--		-minor $(GL_MINOR) -patch $(GL_TINY) -install $(LIBDIR) \
--		$(MKLIB_OPTIONS) $(GL_LIB_DEPS) $(OBJECTS)
-+	${LIBTOOL} --mode=link ${CC} -o ${GL_LIB:.so=.la} ${OBJECTS:.o=.lo} \
+ $(LIB_DIR)/$(GL_LIB_NAME): $(STAND_ALONE_OBJECTS)
+-	CC=$(CC) CXX=$(CXX) $(TOP)/bin/mklib -o $(GL_LIB) -major $(GL_MAJOR) \
+-		-minor $(GL_MINOR) -patch $(GL_TINY) -install $(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} \
 +		-rpath ${PREFIX}/lib -version-info ${GL_MAJOR}:${GL_MINOR}
  
- 
  # Make the OSMesa library
- $(LIBDIR)/$(OSMESA_LIB): $(OSMESA_OBJECTS)
- 	if [ ${OSMESA_LIB} ] ; then \
--		$(TOP)/bin/mklib -o $(OSMESA_LIB_NAME) -major $(MESA_MAJOR) \
+ $(LIB_DIR)/$(OSMESA_LIB_NAME): $(OSMESA_DRIVER_OBJECTS) $(OSMESA16_OBJECTS)
+ 	if [ "${DRIVER_DIRS}" = "osmesa" ] ; then \
+-		CC=$(CC) CXX=$(CXX) $(TOP)/bin/mklib -o $(OSMESA_LIB) -major $(MESA_MAJOR) \
+-			-minor $(MESA_MINOR) -patch $(MESA_TINY) \
+-			-install $(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 \
++		-version-info ${MESA_MAJOR}:${MESA_MINOR} ; \
+ 	else \
+-		CC=$(CC) CXX=$(CXX) $(TOP)/bin/mklib -o $(OSMESA_LIB) -major $(MESA_MAJOR) \
 -			-minor $(MESA_MINOR) -patch $(GL_TINY) \
--			$(MKLIB_OPTIONS) -install $(LIBDIR) \
--			$(OSMESA_LIB_DEPS) $(OSMESA_OBJECTS) ; \
-+	    ${LIBTOOL} --mode=link ${CC} -o ${OSMESA_LIB:.so=.la} \
-+		${OSMESA_OBJECTS:.o=.lo} -rpath ${PREFIX}/lib \
+-			-install $(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 \
 +		-version-info ${MESA_MAJOR}:${MESA_MINOR} ; \
  	fi
  
diff --git a/graphics/MesaLib/patches/patch-ae b/graphics/MesaLib/patches/patch-ae
index 672153c7bb8..d3f15db4b6c 100644
--- a/graphics/MesaLib/patches/patch-ae
+++ b/graphics/MesaLib/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.4 2004/04/09 13:06:06 adam Exp $
+$NetBSD: patch-ae,v 1.5 2004/10/26 13:55:37 adam Exp $
 
---- src/glw/Makefile.X11.orig	2004-03-24 20:04:30.000000000 +0000
-+++ src/glw/Makefile.X11
-@@ -28,7 +28,7 @@ OBJECTS = $(SOURCES:.c=.o)
+--- src/glw/Makefile.orig	2004-06-25 22:51:39.000000000 +0000
++++ src/glw/Makefile
+@@ -17,7 +17,7 @@ OBJECTS = $(GLW_SOURCES:.c=.o)
  ##### RULES #####
  
  .c.o:
@@ -11,15 +11,15 @@ $NetBSD: patch-ae,v 1.4 2004/04/09 13:06:06 adam Exp $
  
  
  
-@@ -45,9 +45,8 @@ targets: $(LIBDIR)/$(GLW_LIB) message
+@@ -33,9 +33,8 @@ clean:
  
  # Make the library
- $(LIBDIR)/$(GLW_LIB): $(OBJECTS)
--	$(TOP)/bin/mklib -o GLw -major $(MAJOR) -minor $(MINOR) \
--		-patch $(TINY) $(MKLIB_OPTIONS) -install $(LIBDIR) \
+ $(LIB_DIR)/$(GLW_LIB_NAME): $(OBJECTS)
+-	CC=$(CC) CXX=$(CXX) $(TOP)/bin/mklib -o $(GLW_LIB) -major $(MAJOR) -minor $(MINOR) \
+-		-patch $(TINY) $(MKLIB_OPTIONS) -install $(LIB_DIR) \
 -		$(GLW_LIB_DEPS) $(OBJECTS)
-+	${LIBTOOL} --mode=link ${CC} -o ${GLW_LIB:.so=.la} ${OBJECTS:.o=.lo} \
++	${LIBTOOL} --mode=link ${CC} -o ${GLW_LIB_NAME:.so=.la} ${OBJECTS:.o=.lo} \
 +		-rpath ${PREFIX}/lib -version-info ${MAJOR}:${MINOR}
  
  
- message:
+ #
diff --git a/graphics/MesaLib/patches/patch-af b/graphics/MesaLib/patches/patch-af
index 8c50001a4c4..e23126ff90a 100644
--- a/graphics/MesaLib/patches/patch-af
+++ b/graphics/MesaLib/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.2 2004/04/09 13:06:06 adam Exp $
+$NetBSD: patch-af,v 1.3 2004/10/26 13:55:37 adam Exp $
 
---- src/glu/sgi/Makefile.X11.orig	2004-03-24 20:02:03.000000000 +0000
-+++ src/glu/sgi/Makefile.X11
-@@ -119,9 +119,11 @@ OBJECTS = $(C_OBJECTS) $(CC_OBJECTS)
+--- src/glu/sgi/Makefile.orig	2004-08-16 07:46:28.000000000 +0000
++++ src/glu/sgi/Makefile
+@@ -115,9 +115,11 @@ OBJECTS = $(C_OBJECTS) $(CC_OBJECTS)
  ##### RULES #####
  
  .c.o:
@@ -14,16 +14,16 @@ $NetBSD: patch-af,v 1.2 2004/04/09 13:06:06 adam Exp $
  	$(CXX) -c $(INCDIRS) $(CXXFLAGS) -DNDEBUG -DLIBRARYBUILD $< -o $@
  
  
-@@ -140,10 +142,8 @@ targets: $(LIBDIR)/$(GLU_LIB)
+@@ -136,10 +138,8 @@ $(LIB_DIR):
  
  # Make the library:
- $(LIBDIR)/$(GLU_LIB): $(OBJECTS)
--	$(TOP)/bin/mklib -o $(GLU_LIB_NAME) -major $(GLU_MAJOR) \
+ $(LIB_DIR)/$(GLU_LIB_NAME): $(OBJECTS)
+-	CC=$(CC) CXX=$(CXX) $(TOP)/bin/mklib -o $(GLU_LIB) -major $(GLU_MAJOR) \
 -		-minor $(GLU_MINOR) -patch $(GLU_TINY) \
--		$(MKLIB_OPTIONS) -cplusplus -install $(LIBDIR) \
+-		-cplusplus $(MKLIB_OPTIONS) -install $(LIB_DIR) \
 -		$(GLU_LIB_DEPS) $(OBJECTS)
-+	${LIBTOOL} --mode=link ${CXX} -o ${GLU_LIB:.so=.la} ${OBJECTS:.o=.lo} \
++	${LIBTOOL} --mode=link ${CXX} -o ${GLU_LIB_NAME:.so=.la} ${OBJECTS:.o=.lo} \
 +		-rpath ${PREFIX}/lib -version-info ${GLU_MAJOR}:${GLU_MINOR}
  
  
- 
+ clean:
diff --git a/graphics/MesaLib/patches/patch-ag b/graphics/MesaLib/patches/patch-ag
index fb639ca10cf..f9b2ba0c78e 100644
--- a/graphics/MesaLib/patches/patch-ag
+++ b/graphics/MesaLib/patches/patch-ag
@@ -1,24 +1,25 @@
-$NetBSD: patch-ag,v 1.2 2004/04/09 13:06:06 adam Exp $
+$NetBSD: patch-ag,v 1.3 2004/10/26 13:55:37 adam Exp $
 
---- src/glut/glx/Makefile.X11.orig	2004-03-24 20:02:51.000000000 +0000
-+++ src/glut/glx/Makefile.X11
-@@ -82,6 +82,7 @@ OBJECTS = $(SOURCES:.c=.o)
+--- src/glut/glx/Makefile.orig	2004-06-25 22:51:39.000000000 +0000
++++ src/glut/glx/Makefile
+@@ -80,6 +80,7 @@ OBJECTS = $(SOURCES:.c=.o)
  ##### RULES #####
  
  .c.o:
 +	${LIBTOOL} --mode=compile \
- 	$(CC) -c -I$(INCDIR) $(CFLAGS) $(GLUT_CFLAGS) $<
+ 	$(CC) -c -I$(TOP)/include $(CFLAGS) $(GLUT_CFLAGS) $<
  
  
-@@ -101,9 +102,8 @@ targets: $(LIBDIR)/$(GLUT_LIB)
+@@ -91,10 +92,8 @@ default: $(LIB_DIR)/$(GLUT_LIB_NAME)
  
  # Make the library
- $(LIBDIR)/$(GLUT_LIB): $(OBJECTS)
--	$(TOP)/bin/mklib -o glut -major $(GLUT_MAJOR) -minor $(GLUT_MINOR) \
--		-patch $(GLUT_TINY) $(MKLIB_OPTIONS) -install $(LIBDIR) \
+ $(LIB_DIR)/$(GLUT_LIB_NAME): depend $(OBJECTS)
+-	CC=$(CC) CXX=$(CXX) $(TOP)/bin/mklib -o $(GLUT_LIB) \
+-		-major $(GLUT_MAJOR) -minor $(GLUT_MINOR) \
+-		-patch $(GLUT_TINY) $(MKLIB_OPTIONS) -install $(LIB_DIR) \
 -		$(GLUT_LIB_DEPS) $(OBJECTS)
-+	${LIBTOOL} --mode=link ${CC} -o ${GLUT_LIB:.so=.la} ${OBJECTS:.o=.lo} \
++	${LIBTOOL} --mode=link ${CC} -o ${GLUT_LIB_NAME:.so=.la} ${OBJECTS:.o=.lo} \
 +		-rpath ${PREFIX}/lib -version-info ${GLUT_MAJOR}:${GLUT_MINOR}
  
- include $(TOP)/Make-config
  
+ clean:
diff --git a/graphics/MesaLib/patches/patch-ah b/graphics/MesaLib/patches/patch-ah
new file mode 100644
index 00000000000..3f00083d244
--- /dev/null
+++ b/graphics/MesaLib/patches/patch-ah
@@ -0,0 +1,24 @@
+$NetBSD: patch-ah,v 1.1 2004/10/26 13:55:56 adam Exp $
+
+--- configs/default.orig	2004-10-25 17:21:49.000000000 +0000
++++ configs/default
+@@ -14,10 +14,6 @@ MESA_TINY=0
+ DRM_SOURCE_PATH=$(TOP)/../drm
+ 
+ # Compiler and flags
+-CC = cc
+-CXX = CC
+-CFLAGS = -O
+-CXXFLAGS = -O
+ GLU_CFLAGS = 
+ 
+ # Misc tools and flags
+@@ -52,7 +48,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/glu/Makefile b/graphics/glu/Makefile
index 27ee3a59ba5..65d3ea6b7b0 100644
--- a/graphics/glu/Makefile
+++ b/graphics/glu/Makefile
@@ -1,14 +1,12 @@
-# $NetBSD: Makefile,v 1.33 2004/10/13 18:00:08 tv Exp $
-#
+# $NetBSD: Makefile,v 1.34 2004/10/26 13:56:18 adam Exp $
 
 PKGNAME=	${DISTNAME:C/MesaLib/glu/}
-PKGREVISION=	3
 COMMENT=	GLU polygon tessellation facility for Mesa
 
 CONFLICTS+=	Mesa-glx-[0-9]*
 CONFLICTS+=	Mesa<3.2.1
 
-.include "../../graphics/Mesa/Makefile.common"
+.include "../Mesa/Makefile.common"
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
diff --git a/graphics/glut/Makefile b/graphics/glut/Makefile
index 94d9ae48fce..7a4cb947a3d 100644
--- a/graphics/glut/Makefile
+++ b/graphics/glut/Makefile
@@ -1,14 +1,12 @@
-# $NetBSD: Makefile,v 1.31 2004/10/13 18:00:08 tv Exp $
-#
+# $NetBSD: Makefile,v 1.32 2004/10/26 13:56:36 adam Exp $
 
 PKGNAME=	${DISTNAME:S/MesaLib/glut/}
-PKGREVISION=	2
 COMMENT=	GLUT Graphics library similar to SGI's OpenGL
 
 CONFLICTS+=	Mesa-glx-[0-9]*
 CONFLICTS+=	Mesa<3.2.1
 
-.include "../../graphics/Mesa/Makefile.common"
+.include "../Mesa/Makefile.common"
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews