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.

5 files changed, 21 insertions, 18 deletions

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)