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, 34 insertions, 40 deletions

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'