Update Mesa and friends to version 5.0, using patches provided in PR pkg/19302.

At the same time, move Mesa and friends to LOCALBASE rather than X11BASE, so
that they can be installed regardless of XF version.  Introduce MESA_REQD variable
that can be set to 5.0, thus allowing systems with XF4 to indicate that the
provided version is not good enough.

All packages using Mesa, MesaLib, glu or glut will get a PKGREVISION bump
over the next few days.

22 files changed, 126 insertions, 120 deletions

diff --git a/graphics/Mesa/Makefile b/graphics/Mesa/Makefile
index 06341c1ebb5..fc5946f2769 100644
--- a/graphics/Mesa/Makefile
+++ b/graphics/Mesa/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.45 2002/11/18 07:49:24 jlam Exp $
+# $NetBSD: Makefile,v 1.46 2003/03/09 19:04:52 jschauma Exp $
 #
 
 PKGNAME=	Mesa-${MESA_VERSION}
-PKGREVISION=	1
 MASTER_SITES= 	# empty
 DISTFILES=	# empty
 
@@ -24,6 +23,8 @@ NO_CONFIGURE=	yes
 NO_BUILD=	yes
 EXTRACT_ONLY=	# empty
 
+MAKEFLAGS+=	MESA_REQD=${MESA_REQD}
+
 do-install:	# empty
 
 .include "../../graphics/MesaLib/buildlink2.mk"
diff --git a/graphics/Mesa/Makefile.common b/graphics/Mesa/Makefile.common
index 974fddb06c5..c4c2fedb0b4 100644
--- a/graphics/Mesa/Makefile.common
+++ b/graphics/Mesa/Makefile.common
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile.common,v 1.5 2002/12/06 17:03:23 jschauma Exp $
+# $NetBSD: Makefile.common,v 1.6 2003/03/09 19:04:52 jschauma Exp $
 
-MESA_VERSION=		3.4.2
+MESA_VERSION=		5.0
 DISTNAME?=		MesaLib-${MESA_VERSION}
 CATEGORIES?=		graphics
 MASTER_SITES?= 		${MASTER_SITE_SOURCEFORGE:=mesa3d/}
diff --git a/graphics/MesaDemos/Makefile b/graphics/MesaDemos/Makefile
index ebddfd3b1f8..900b865b919 100644
--- a/graphics/MesaDemos/Makefile
+++ b/graphics/MesaDemos/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2002/12/18 20:54:39 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2003/03/09 19:04:52 jschauma Exp $
 
 PKGNAME=		MesaDemos-${MESA_VERSION}
 DISTFILES=		${DISTNAME}${EXTRACT_SUFX}
@@ -7,8 +7,7 @@ WRKSRC=			${WRKDIR}/${DISTNAME:S/Lib//}
 MAINTAINER=		jschauma@netbsd.org
 COMMENT=		OpenGL examples and Demos
 
-# XXX:
-BROKEN=			"This package not available until Mesa is updated to 5.0!"
+MESA_REQD=		5.0
 
 .include "../Mesa/Makefile.common"
 
diff --git a/graphics/MesaDemos/distinfo b/graphics/MesaDemos/distinfo
index ac18a31ba80..af254a9077f 100644
--- a/graphics/MesaDemos/distinfo
+++ b/graphics/MesaDemos/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.1.1.1 2002/12/05 15:20:22 jschauma Exp $
+$NetBSD: distinfo,v 1.2 2003/03/09 19:04:53 jschauma Exp $
 
 SHA1 (MesaLib-5.0.tar.bz2) = 098260c89c4109a8823c76a2c4d75cef8484819d
 Size (MesaLib-5.0.tar.bz2) = 1645037 bytes
 SHA1 (MesaDemos-5.0.tar.bz2) = b487c94daa2d19060c40b0ae46869c28c883b6e8
 Size (MesaDemos-5.0.tar.bz2) = 894069 bytes
-SHA1 (patch-aa) = 4163060a486cead1862d5fb903d5820969db076b
-SHA1 (patch-ab) = 9722b62a6e4628f99ea53c91ea3eb67ae240e5f4
-SHA1 (patch-ac) = a27d8d99bbc12baebe0d13f0daccd26707b364ae
+SHA1 (patch-aa) = 97abd719eb38d141af1c7a12c22fe24f98a1fdf7
+SHA1 (patch-ab) = 5e0c15740eeedc173d70f166354f31c278af36c8
+SHA1 (patch-ac) = 79166ebd1f425ba592d9a62bccd47533c89f9807
diff --git a/graphics/MesaDemos/patches/patch-aa b/graphics/MesaDemos/patches/patch-aa
index 8920fddfc12..e4dc7964c57 100644
--- a/graphics/MesaDemos/patches/patch-aa
+++ b/graphics/MesaDemos/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/12/05 15:20:22 jschauma Exp $
+$NetBSD: patch-aa,v 1.2 2003/03/09 19:04:53 jschauma Exp $
 
---- book/Makefile.X11.orig	Thu Nov 21 12:25:24 2002
-+++ book/Makefile.X11	Thu Nov 21 12:25:44 2002
-@@ -9,8 +9,8 @@
+--- book/Makefile.X11.orig	Tue Feb 15 20:09:06 2000
++++ book/Makefile.X11	Sat Mar  8 18:59:50 2003
+@@ -9,10 +9,10 @@
  
  ##### MACROS #####
  
@@ -11,7 +11,10 @@ $NetBSD: patch-aa,v 1.1.1.1 2002/12/05 15:20:22 jschauma Exp $
 +INCDIR = ${X11PREFIX}/include
 +LIBDIR = ${X11PREFIX}/lib
  
- GL_LIBS = -L$(LIBDIR) -lglut -lGLU -lGL $(APP_LIB_DEPS)
+-GL_LIBS = -L$(LIBDIR) -lglut -lGLU -lGL $(APP_LIB_DEPS)
++GL_LIBS = ${LDFLAGS} -L$(LIBDIR) -lglut -lGLU -lGL $(APP_LIB_DEPS)
+ 
+ LIB_DEP = $(LIBDIR)/$(GL_LIB) $(LIBDIR)/$(GLU_LIB) $(LIBDIR)/$(GLUT_LIB)
  
 @@ -22,7 +22,7 @@
  	lines list material mipmap model movelight nurbs pickdepth \
diff --git a/graphics/MesaDemos/patches/patch-ab b/graphics/MesaDemos/patches/patch-ab
index 19d5d87c12d..9305ef26465 100644
--- a/graphics/MesaDemos/patches/patch-ab
+++ b/graphics/MesaDemos/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.1.1.1 2002/12/05 15:20:22 jschauma Exp $
+$NetBSD: patch-ab,v 1.2 2003/03/09 19:04:53 jschauma Exp $
 
 --- demos/Makefile.X11.orig	Tue Aug 21 01:42:11 2001
 +++ demos/Makefile.X11	Thu Nov 21 14:42:39 2002
@@ -34,12 +34,12 @@ $NetBSD: patch-ab,v 1.1.1.1 2002/12/05 15:20:22 jschauma Exp $
  # make executable from .c file:
  .c: $(LIB_DEP)
 -	$(CC) -I$(INCDIR) -I../util $(CFLAGS) $< $(GL_LIBS) -o $@
-+	$(CC) -I$(INCDIR) $(CFLAGS) -Wl,-R${LIBDIR} $< $(GL_LIBS) -o $@
++	$(CC) -I$(INCDIR) $(CFLAGS) ${LDFLAGS} $< $(GL_LIBS) -o $@
  
  # special case: need the -lOSMesa library:
  osdemo: osdemo.c
 -	$(CC) -I$(INCDIR) $(CFLAGS) osdemo.c $(OSMESA_LIBS) -o $@
-+	$(CC) -I$(INCDIR) $(CFLAGS) -Wl,-R${LIBDIR} osdemo.c $(OSMESA_LIBS) -o $@
++	$(CC) -I$(INCDIR) $(CFLAGS) ${LDFLAGS} osdemo.c $(OSMESA_LIBS) -o $@
  
  
  ##### TARGETS #####
diff --git a/graphics/MesaDemos/patches/patch-ac b/graphics/MesaDemos/patches/patch-ac
index 7140f86cd31..6c94502a861 100644
--- a/graphics/MesaDemos/patches/patch-ac
+++ b/graphics/MesaDemos/patches/patch-ac
@@ -1,7 +1,7 @@
-$NetBSD: patch-ac,v 1.1.1.1 2002/12/05 15:20:22 jschauma Exp $
+$NetBSD: patch-ac,v 1.2 2003/03/09 19:04:53 jschauma Exp $
 
 --- samples/Makefile.X11.orig	Tue Feb 15 20:09:06 2000
-+++ samples/Makefile.X11	Thu Nov 21 14:49:47 2002
++++ samples/Makefile.X11	Sat Mar  8 19:00:44 2003
 @@ -9,15 +9,15 @@
  
  ##### MACROS #####
@@ -11,7 +11,8 @@ $NetBSD: patch-ac,v 1.1.1.1 2002/12/05 15:20:22 jschauma Exp $
 +INCDIR = ${X11PREFIX}/include
 +LIBDIR = ${X11PREFIX}/lib
  
- GL_LIBS = -L$(LIBDIR) -lglut -lGLU -lGL $(APP_LIB_DEPS)
+-GL_LIBS = -L$(LIBDIR) -lglut -lGLU -lGL $(APP_LIB_DEPS)
++GL_LIBS = ${LDFLAGS} -L$(LIBDIR) -lglut -lGLU -lGL $(APP_LIB_DEPS)
  
  LIB_DEP = $(LIBDIR)/$(GL_LIB) $(LIBDIR)/$(GLU_LIB) $(LIBDIR)/$(GLUT_LIB)
  
diff --git a/graphics/MesaLib/Makefile b/graphics/MesaLib/Makefile
index fb78d52cbed..21f114b0c7d 100644
--- a/graphics/MesaLib/Makefile
+++ b/graphics/MesaLib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2002/12/07 02:38:56 schmonz Exp $
+# $NetBSD: Makefile,v 1.15 2003/03/09 19:04:53 jschauma Exp $
 
 PKGNAME=		MesaLib-${MESA_VERSION}
 WRKSRC=			${WRKDIR}/${DISTNAME:S/Lib//}
@@ -14,6 +14,10 @@ BUILD_DIRS=		${WRKSRC}/src
 
 .include "../../mk/bsd.prefs.mk"
 
+# XXX should be >= 3.4.2
+.if empty(MESA_REQD:M5.[0-9]*)
+#MESA_VERSION=		3.4.2
+
 # Check if we got Mesa distributed with XFree86 4.x.
 .if exists(${X11BASE}/include/GL/glx.h) && \
     exists(${X11BASE}/lib/X11/config/X11.tmpl)
@@ -26,6 +30,8 @@ _IS_BUILTIN_MESA=	0
 PKG_SKIP_REASON= "${PKGNAME} is part of your X11 distribution"
 .endif
 
+.endif  # MESA_REQD
+
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/include/GL
 	cd ${WRKSRC}/include/GL; for hdr in				\
@@ -36,3 +42,7 @@ post-install:
 	done
 
 .include "../../mk/bsd.pkg.mk"
+
+# must be below bsd.pkg.mk to overwrite values
+PREFIX=		${LOCALBASE}
+X11PREFIX=	${LOCALBASE}
diff --git a/graphics/MesaLib/PLIST b/graphics/MesaLib/PLIST
index b1d5e8835dc..d61962bd7f8 100644
--- a/graphics/MesaLib/PLIST
+++ b/graphics/MesaLib/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2002/12/06 17:03:24 jschauma Exp $
+@comment $NetBSD: PLIST,v 1.6 2003/03/09 19:04:53 jschauma Exp $
 etc/mesa.conf
 include/GL/gl.h
 include/GL/gl_mangle.h
@@ -9,9 +9,14 @@ include/GL/osmesa.h
 include/GL/xmesa.h
 include/GL/xmesa_x.h
 include/GL/xmesa_xf86.h
-lib/libGL.so
-lib/libGL.so.3
-lib/libGL.so.3.4
 lib/libGL.a
 lib/libGL.la
+lib/libGL.so
+lib/libGL.so.5
+lib/libGL.so.5.500
+lib/libOSMesa.a
+lib/libOSMesa.la
+lib/libOSMesa.so
+lib/libOSMesa.so.4
+lib/libOSMesa.so.4.500
 @unexec ${RMDIR} %D/include/GL >/dev/null 2>&1 || ${TRUE}
diff --git a/graphics/MesaLib/buildlink2.mk b/graphics/MesaLib/buildlink2.mk
index 5c3b63669fe..c4958ccde95 100644
--- a/graphics/MesaLib/buildlink2.mk
+++ b/graphics/MesaLib/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.7 2002/11/20 22:13:22 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.8 2003/03/09 19:04:53 jschauma Exp $
 
 .if !defined(MESALIB_BUILDLINK2_MK)
 MESALIB_BUILDLINK2_MK=	# defined
@@ -9,6 +9,13 @@ MESA_REQD?=			3.4.2
 BUILDLINK_DEPENDS.MesaLib?=	MesaLib>=${MESA_REQD}
 BUILDLINK_PKGSRCDIR.MesaLib?=	../../graphics/MesaLib
 
+# XXX should be >= 3.4.2
+.if !empty(MESA_REQD:M5.[0-9]*)
+_NEED_MESALIB=		YES
+CPPFLAGS+=              -DGLX_GLXEXT_LEGACY
+CFLAGS+=		-DGLX_GLXEXT_LEGACY
+.else
+
 # Check if we got Mesa distributed with XFree86 4.x or if we need to
 # depend on the Mesa package.
 #
@@ -46,10 +53,12 @@ _NEED_MESALIB!= \
 .  endif
 .endif
 
+.endif  # MESA_REQD
+
 .if ${_NEED_MESALIB} == "YES"
 BUILDLINK_PACKAGES+=		MesaLib
 EVAL_PREFIX+=			BUILDLINK_PREFIX.MesaLib=MesaLib
-BUILDLINK_PREFIX.MesaLib_DEFAULT=	${X11PREFIX}
+BUILDLINK_PREFIX.MesaLib_DEFAULT=	${LOCALBASE}
 .else
 BUILDLINK_PREFIX.MesaLib=	${X11BASE}
 .endif
diff --git a/graphics/MesaLib/distinfo b/graphics/MesaLib/distinfo
index d41e7ae9e71..1d21bd80a4b 100644
--- a/graphics/MesaLib/distinfo
+++ b/graphics/MesaLib/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.6 2002/12/06 17:03:24 jschauma Exp $
+$NetBSD: distinfo,v 1.7 2003/03/09 19:04:53 jschauma Exp $
 
-SHA1 (MesaLib-3.4.2.tar.bz2) = 1a41b61a29538127dbb0ab2882ac69554a0e9e37
-Size (MesaLib-3.4.2.tar.bz2) = 1380805 bytes
-SHA1 (patch-aa) = f8e311944bbd80bf3939196dbbe993f78b2f8c50
-SHA1 (patch-ab) = 8cf672d645f9681b0987e94d3692903a5314173e
+SHA1 (MesaLib-5.0.tar.bz2) = 098260c89c4109a8823c76a2c4d75cef8484819d
+Size (MesaLib-5.0.tar.bz2) = 1645037 bytes
+SHA1 (patch-aa) = 7fa63dca0edfc41812b5432cbabd861ec52cec33
+SHA1 (patch-ab) = 17d8f0508710fc03a75e736a3298ede72b953af7
diff --git a/graphics/MesaLib/patches/patch-aa b/graphics/MesaLib/patches/patch-aa
index 0aed774904c..7474cf7a9e9 100644
--- a/graphics/MesaLib/patches/patch-aa
+++ b/graphics/MesaLib/patches/patch-aa
@@ -1,14 +1,14 @@
-$NetBSD: patch-aa,v 1.4 2002/12/06 17:03:24 jschauma Exp $
+$NetBSD: patch-aa,v 1.5 2003/03/09 19:04:53 jschauma Exp $
 
---- src/X86/assyntax.h.orig	Mon Sep 25 17:12:01 2000
-+++ src/X86/assyntax.h	Sun Dec 10 23:45:34 2000
-@@ -954,7 +954,8 @@
+--- src/X86/assyntax.h.orig	Tue Nov 19 15:17:48 2002
++++ src/X86/assyntax.h	Tue Nov 19 15:18:34 2002
+@@ -965,7 +965,8 @@
  
  #if defined(Lynx) || (defined(SYSV) || defined(SVR4)) \
-  || (defined(linux) || defined(__OS2ELF__)) && defined(__ELF__) \
+  || (defined(__linux__) || defined(__OS2ELF__)) && defined(__ELF__) \
 - || defined(__FreeBSD__) && __FreeBSD__ >= 3
 + || defined(__FreeBSD__) && __FreeBSD__ >= 3 \
 + || defined(__NetBSD__) && defined(__ELF__)
  #define GLNAME(a)	a
  #else
- #define GLNAME(a)	_ ## a
+ #define GLNAME(a)	CONCAT(_, a)
diff --git a/graphics/MesaLib/patches/patch-ab b/graphics/MesaLib/patches/patch-ab
index 4e3bd4ae2a9..1234ebf718e 100644
--- a/graphics/MesaLib/patches/patch-ab
+++ b/graphics/MesaLib/patches/patch-ab
@@ -1,33 +1,13 @@
-$NetBSD: patch-ab,v 1.6 2002/12/06 17:03:24 jschauma Exp $
+$NetBSD: patch-ab,v 1.7 2003/03/09 19:04:53 jschauma Exp $
 
---- configure.orig	Thu May 17 00:28:58 2001
-+++ configure	Fri May 18 14:16:44 2001
-@@ -823,8 +823,8 @@
- MESA_MAJOR=3
- MESA_MINOR=4
- MESA_TINY=2
--LIBGL_VERSION=1:2:0${MESA_MAJOR}0${MESA_MINOR}0${MESA_TINY}
--LIBGLU_VERSION=1:1:0${MESA_MAJOR}0${MESA_MINOR}0${MESA_TINY}
-+LIBGL_VERSION=${MESA_MAJOR}:${MESA_MINOR}:${MESA_TINY}
-+LIBGLU_VERSION=${MESA_MAJOR}:${MESA_MINOR}:${MESA_TINY}
- LIBGLUT_VERSION=3:7:0
- 
- 
-@@ -4635,7 +4635,7 @@
- if test -d $srcdir/src-glut; then
-   have_glut_source=yes
- else
--  { echo "configure: error: GLUT sources missing; that is not supported at this point." 1>&2; exit 1; }
-+  { echo "configure: error: GLUT sources missing; that is not supported at this point." 1>&2; }
- fi
- echo "$ac_t""$have_glut_source" 1>&6
- need_glut=no
-@@ -4673,7 +4673,7 @@
- done
- echo "$ac_t""$have_demo_source" 1>&6
- if test "x$have_demo_source" != xyes; then
--  { echo "configure: error: Demo sources missing; that is not supported at this point." 1>&2; exit 1; }
-+  { echo "configure: error: Demo sources missing; that is not supported at this point." 1>&2; }
+--- configure.orig	Wed Nov 13 22:18:19 2002
++++ configure	Tue Nov 19 15:52:05 2002
+@@ -1532,7 +1532,7 @@
  fi
+   MAINT=$MAINTAINER_MODE_TRUE
  
+-ac_config_files="$ac_config_files Makefile include/Makefile include/GL/Makefile src/Makefile src/array_cache/Makefile src/math/Makefile src/swrast/Makefile src/swrast_setup/Makefile src/tnl/Makefile src/Trace/Makefile src/FX/Makefile src/FX/X86/Makefile src/GGI/Makefile src/GGI/include/Makefile src/GGI/include/ggi/Makefile src/GGI/include/ggi/mesa/Makefile src/GGI/ggimesa.conf src/GGI/default/Makefile src/GGI/default/genkgi.conf src/GGI/display/Makefile src/GGI/display/fbdev.conf src/OSmesa/Makefile src/SVGA/Makefile src/X/Makefile src/X86/Makefile src/SPARC/Makefile util/Makefile ggi/demos/Makefile ggi/ggiglut/Makefile src-glu/Makefile si-glu/Makefile si-glu/include/Makefile si-glu/libnurbs/Makefile si-glu/libnurbs/interface/Makefile si-glu/libnurbs/internals/Makefile si-glu/libnurbs/nurbtess/Makefile si-glu/libtess/Makefile si-glu/libutil/Makefile"
++ac_config_files="$ac_config_files Makefile include/Makefile include/GL/Makefile src/Makefile src/array_cache/Makefile src/math/Makefile src/swrast/Makefile src/swrast_setup/Makefile src/tnl/Makefile src/Trace/Makefile src/FX/Makefile src/FX/X86/Makefile src/GGI/Makefile src/GGI/include/Makefile src/GGI/include/ggi/Makefile src/GGI/include/ggi/mesa/Makefile src/GGI/ggimesa.conf src/GGI/default/Makefile src/GGI/default/genkgi.conf src/GGI/display/Makefile src/GGI/display/fbdev.conf src/OSmesa/Makefile src/SVGA/Makefile src/X/Makefile src/X86/Makefile src/SPARC/Makefile util/Makefile src-glu/Makefile si-glu/Makefile si-glu/include/Makefile si-glu/libnurbs/Makefile si-glu/libnurbs/interface/Makefile si-glu/libnurbs/internals/Makefile si-glu/libnurbs/nurbtess/Makefile si-glu/libtess/Makefile si-glu/libutil/Makefile"
  
+ ac_ext=c
+ ac_cpp='$CPP $CPPFLAGS'
diff --git a/graphics/glu/Makefile b/graphics/glu/Makefile
index aa2b38bfdc6..7cc104cc2c8 100644
--- a/graphics/glu/Makefile
+++ b/graphics/glu/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2002/12/07 02:38:56 schmonz Exp $
+# $NetBSD: Makefile,v 1.16 2003/03/09 19:04:54 jschauma Exp $
 
 PKGNAME=		${DISTNAME:C/MesaLib/glu/}
 WRKSRC=			${WRKDIR}/${DISTNAME:C/Lib//}
@@ -16,6 +16,9 @@ BUILD_DIRS=		${WRKSRC}/src-glu
 
 .include "../../mk/bsd.prefs.mk"
 
+# XXX should be >= 3.4.2
+.if empty(MESA_REQD:M5.[0-9]*)
+
 # Check if we got libGLU distributed with XFree86 4.x.
 .if exists(${X11BASE}/include/GL/glu.h) && \
     exists(${X11BASE}/lib/X11/config/X11.tmpl)
@@ -28,6 +31,8 @@ _IS_BUILTIN_GLU=	0
 PKG_SKIP_REASON= "${PKGNAME} is part of your X11 distribution"
 .endif
 
+.endif  # MESA_REQD
+
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/include/GL
 	cd ${WRKSRC}/include/GL; for hdr in				\
@@ -38,3 +43,7 @@ post-install:
 
 .include "../../graphics/MesaLib/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
+
+# must be below bsd.pkg.mk to overwrite values
+PREFIX=		${LOCALBASE}
+X11PREFIX=	${LOCALBASE}
diff --git a/graphics/glu/PLIST b/graphics/glu/PLIST
index 92d560b3302..bbe94c3d55f 100644
--- a/graphics/glu/PLIST
+++ b/graphics/glu/PLIST
@@ -1,9 +1,9 @@
-@comment $NetBSD: PLIST,v 1.5 2002/12/06 17:03:24 jschauma Exp $
+@comment $NetBSD: PLIST,v 1.6 2003/03/09 19:04:54 jschauma Exp $
 include/GL/glu.h
 include/GL/glu_mangle.h
 lib/libGLU.so
-lib/libGLU.so.3
-lib/libGLU.so.3.4
+lib/libGLU.so.2
+lib/libGLU.so.2.500
 lib/libGLU.a
 lib/libGLU.la
 @unexec ${RMDIR} %D/include/GL >/dev/null 2>&1 || ${TRUE}
diff --git a/graphics/glu/buildlink2.mk b/graphics/glu/buildlink2.mk
index f46a2784a74..3c11dc57db4 100644
--- a/graphics/glu/buildlink2.mk
+++ b/graphics/glu/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.7 2002/11/20 22:13:22 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.8 2003/03/09 19:04:54 jschauma Exp $
 
 .if !defined(GLU_BUILDLINK2_MK)
 GLU_BUILDLINK2_MK=	# defined
@@ -9,6 +9,11 @@ MESA_REQD?=			3.4.2
 BUILDLINK_DEPENDS.glu?=		glu>=${MESA_REQD}
 BUILDLINK_PKGSRCDIR.glu?=	../../graphics/glu
 
+# XXX should be >= 3.4.2
+.if !empty(MESA_REQD:M5.[0-9]*)
+_NEED_GLU=		YES
+.else
+
 # Check if we got libGLU distributed with XFree86 4.x or if we need to
 # depend on the glu package.
 #
@@ -46,10 +51,12 @@ _NEED_GLU!= \
 .  endif
 .endif
 
+.endif  # MESA_REQD
+
 .if ${_NEED_GLU} == "YES"
 BUILDLINK_PACKAGES+=		glu
 EVAL_PREFIX+=			BUILDLINK_PREFIX.glu=glu
-BUILDLINK_PREFIX.glu_DEFAULT=	${X11PREFIX}
+BUILDLINK_PREFIX.glu_DEFAULT=	${LOCALBASE}
 .else
 BUILDLINK_PREFIX.glu=		${X11BASE}
 .endif
diff --git a/graphics/glu/distinfo b/graphics/glu/distinfo
index 855566356f6..48a07e528e0 100644
--- a/graphics/glu/distinfo
+++ b/graphics/glu/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.6 2002/12/06 17:03:24 jschauma Exp $
+$NetBSD: distinfo,v 1.7 2003/03/09 19:04:54 jschauma Exp $
 
-SHA1 (MesaLib-3.4.2.tar.bz2) = 1a41b61a29538127dbb0ab2882ac69554a0e9e37
-Size (MesaLib-3.4.2.tar.bz2) = 1380805 bytes
-SHA1 (patch-aa) = 8cf672d645f9681b0987e94d3692903a5314173e
+SHA1 (MesaLib-5.0.tar.bz2) = 098260c89c4109a8823c76a2c4d75cef8484819d
+Size (MesaLib-5.0.tar.bz2) = 1645037 bytes
+SHA1 (patch-aa) = 3006b3f1fece24ded6edc046d7bff439f181cd47
diff --git a/graphics/glu/patches/patch-aa b/graphics/glu/patches/patch-aa
index 4d4dc3e7df8..b42b2862185 100644
--- a/graphics/glu/patches/patch-aa
+++ b/graphics/glu/patches/patch-aa
@@ -1,33 +1,11 @@
-$NetBSD: patch-aa,v 1.6 2002/12/06 17:03:24 jschauma Exp $
-
---- configure.orig	Thu May 17 00:28:58 2001
-+++ configure	Fri May 18 14:16:44 2001
-@@ -823,8 +823,8 @@
- MESA_MAJOR=3
- MESA_MINOR=4
- MESA_TINY=2
--LIBGL_VERSION=1:2:0${MESA_MAJOR}0${MESA_MINOR}0${MESA_TINY}
--LIBGLU_VERSION=1:1:0${MESA_MAJOR}0${MESA_MINOR}0${MESA_TINY}
-+LIBGL_VERSION=${MESA_MAJOR}:${MESA_MINOR}:${MESA_TINY}
-+LIBGLU_VERSION=${MESA_MAJOR}:${MESA_MINOR}:${MESA_TINY}
- LIBGLUT_VERSION=3:7:0
- 
- 
-@@ -4635,7 +4635,7 @@
- if test -d $srcdir/src-glut; then
-   have_glut_source=yes
- else
--  { echo "configure: error: GLUT sources missing; that is not supported at this point." 1>&2; exit 1; }
-+  { echo "configure: error: GLUT sources missing; that is not supported at this point." 1>&2; }
- fi
- echo "$ac_t""$have_glut_source" 1>&6
- need_glut=no
-@@ -4673,7 +4673,7 @@
- done
- echo "$ac_t""$have_demo_source" 1>&6
- if test "x$have_demo_source" != xyes; then
--  { echo "configure: error: Demo sources missing; that is not supported at this point." 1>&2; exit 1; }
-+  { echo "configure: error: Demo sources missing; that is not supported at this point." 1>&2; }
+--- configure.orig	Wed Nov 20 17:45:32 2002
++++ configure	Wed Nov 20 17:45:43 2002
+@@ -1532,7 +1532,7 @@
  fi
+   MAINT=$MAINTAINER_MODE_TRUE
  
+-ac_config_files="$ac_config_files Makefile include/Makefile include/GL/Makefile src/Makefile src/array_cache/Makefile src/math/Makefile src/swrast/Makefile src/swrast_setup/Makefile src/tnl/Makefile src/Trace/Makefile src/FX/Makefile src/FX/X86/Makefile src/GGI/Makefile src/GGI/include/Makefile src/GGI/include/ggi/Makefile src/GGI/include/ggi/mesa/Makefile src/GGI/ggimesa.conf src/GGI/default/Makefile src/GGI/default/genkgi.conf src/GGI/display/Makefile src/GGI/display/fbdev.conf src/OSmesa/Makefile src/SVGA/Makefile src/X/Makefile src/X86/Makefile src/SPARC/Makefile util/Makefile ggi/demos/Makefile ggi/ggiglut/Makefile src-glu/Makefile si-glu/Makefile si-glu/include/Makefile si-glu/libnurbs/Makefile si-glu/libnurbs/interface/Makefile si-glu/libnurbs/internals/Makefile si-glu/libnurbs/nurbtess/Makefile si-glu/libtess/Makefile si-glu/libutil/Makefile"
++ac_config_files="$ac_config_files Makefile include/Makefile include/GL/Makefile src/Makefile src/array_cache/Makefile src/math/Makefile src/swrast/Makefile src/swrast_setup/Makefile src/tnl/Makefile src/Trace/Makefile src/FX/Makefile src/FX/X86/Makefile src/GGI/Makefile src/GGI/include/Makefile src/GGI/include/ggi/Makefile src/GGI/include/ggi/mesa/Makefile src/GGI/ggimesa.conf src/GGI/default/Makefile src/GGI/default/genkgi.conf src/GGI/display/Makefile src/GGI/display/fbdev.conf src/OSmesa/Makefile src/SVGA/Makefile src/X/Makefile src/X86/Makefile src/SPARC/Makefile util/Makefile src-glu/Makefile si-glu/Makefile si-glu/include/Makefile si-glu/libnurbs/Makefile si-glu/libnurbs/interface/Makefile si-glu/libnurbs/internals/Makefile si-glu/libnurbs/nurbtess/Makefile si-glu/libtess/Makefile si-glu/libutil/Makefile"
  
+ ac_ext=c
+ ac_cpp='$CPP $CPPFLAGS'
diff --git a/graphics/glut/Makefile b/graphics/glut/Makefile
index a95151955c2..54f25d3885c 100644
--- a/graphics/glut/Makefile
+++ b/graphics/glut/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2002/11/17 08:37:20 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2003/03/09 19:04:54 jschauma Exp $
 
 PKGNAME=		${DISTNAME:S/MesaLib/glut/}
 DISTFILES=		${DISTNAME}${EXTRACT_SUFX}
@@ -27,3 +27,7 @@ post-install:
 
 .include "../../graphics/MesaLib/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
+
+# must be below bsd.pkg.mk to overwrite values
+PREFIX=		${LOCALBASE}
+X11PREFIX=	${LOCALBASE}
diff --git a/graphics/glut/PLIST b/graphics/glut/PLIST
index a9fccf4ea38..6718d295695 100644
--- a/graphics/glut/PLIST
+++ b/graphics/glut/PLIST
@@ -1,9 +1,9 @@
-@comment $NetBSD: PLIST,v 1.5 2002/12/06 17:03:25 jschauma Exp $
+@comment $NetBSD: PLIST,v 1.6 2003/03/09 19:04:54 jschauma Exp $
 include/GL/glut.h
 include/GL/glutf90.h
 lib/libglut.so
-lib/libglut.so.3
-lib/libglut.so.3.7
+lib/libglut.so.10
+lib/libglut.so.10.1
 lib/libglut.a
 lib/libglut.la
 @unexec ${RMDIR} %D/include/GL >/dev/null 2>&1 || ${TRUE}
diff --git a/graphics/glut/buildlink2.mk b/graphics/glut/buildlink2.mk
index dae5d429522..59690b7004e 100644
--- a/graphics/glut/buildlink2.mk
+++ b/graphics/glut/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.4 2002/11/18 07:49:26 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.5 2003/03/09 19:04:54 jschauma Exp $
 
 .if !defined(GLUT_BUILDLINK2_MK)
 GLUT_BUILDLINK2_MK=	# defined
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS.glut?=	glut>=${MESA_REQD}
 BUILDLINK_PKGSRCDIR.glut?=	../../graphics/glut
 
 EVAL_PREFIX+=		BUILDLINK_PREFIX.glut=glut
-BUILDLINK_PREFIX.glut_DEFAULT=	${X11PREFIX}
+BUILDLINK_PREFIX.glut_DEFAULT=	${LOCALBASE}
 BUILDLINK_FILES.glut=	include/GL/glut.h
 BUILDLINK_FILES.glut+=	include/GL/glutf90.h
 BUILDLINK_FILES.glut+=	lib/libglut.*
diff --git a/graphics/glut/distinfo b/graphics/glut/distinfo
index 41db10bd94c..56c9e6b1c4c 100644
--- a/graphics/glut/distinfo
+++ b/graphics/glut/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.6 2002/12/06 17:03:25 jschauma Exp $
+$NetBSD: distinfo,v 1.7 2003/03/09 19:04:54 jschauma Exp $
 
-SHA1 (MesaLib-3.4.2.tar.bz2) = 1a41b61a29538127dbb0ab2882ac69554a0e9e37
-Size (MesaLib-3.4.2.tar.bz2) = 1380805 bytes
-SHA1 (MesaDemos-3.4.2.tar.bz2) = b291eb70c07ad2e12122e53039bf6d36c061a914
-Size (MesaDemos-3.4.2.tar.bz2) = 854130 bytes
+SHA1 (MesaLib-5.0.tar.bz2) = 098260c89c4109a8823c76a2c4d75cef8484819d
+Size (MesaLib-5.0.tar.bz2) = 1645037 bytes
+SHA1 (MesaDemos-5.0.tar.bz2) = b487c94daa2d19060c40b0ae46869c28c883b6e8
+Size (MesaDemos-5.0.tar.bz2) = 894069 bytes