Back out update of Mesa, MesaLib, glu and glut to Mesa version 5.0,

until we figure out how to properly solve the conflict of XF4.x's own
GL.  As discussed with tron.

10 files changed, 91 insertions, 54 deletions

diff --git a/graphics/Mesa/Makefile.common b/graphics/Mesa/Makefile.common
index 9b0a683be62..974fddb06c5 100644
--- a/graphics/Mesa/Makefile.common
+++ b/graphics/Mesa/Makefile.common
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile.common,v 1.4 2002/12/05 15:11:48 jschauma Exp $
+# $NetBSD: Makefile.common,v 1.5 2002/12/06 17:03:23 jschauma Exp $
 
-MESA_VERSION=		5.0
+MESA_VERSION=		3.4.2
 DISTNAME?=		MesaLib-${MESA_VERSION}
 CATEGORIES?=		graphics
 MASTER_SITES?= 		${MASTER_SITE_SOURCEFORGE:=mesa3d/}
diff --git a/graphics/MesaLib/PLIST b/graphics/MesaLib/PLIST
index 9c7c372e5d5..b1d5e8835dc 100644
--- a/graphics/MesaLib/PLIST
+++ b/graphics/MesaLib/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2002/12/05 15:11:49 jschauma Exp $
+@comment $NetBSD: PLIST,v 1.5 2002/12/06 17:03:24 jschauma Exp $
 etc/mesa.conf
 include/GL/gl.h
 include/GL/gl_mangle.h
@@ -9,14 +9,9 @@ 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/distinfo b/graphics/MesaLib/distinfo
index eab1632076d..d41e7ae9e71 100644
--- a/graphics/MesaLib/distinfo
+++ b/graphics/MesaLib/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.5 2002/12/05 15:11:49 jschauma Exp $
+$NetBSD: distinfo,v 1.6 2002/12/06 17:03:24 jschauma Exp $
 
-SHA1 (MesaLib-5.0.tar.bz2) = 098260c89c4109a8823c76a2c4d75cef8484819d
-Size (MesaLib-5.0.tar.bz2) = 1645037 bytes
-SHA1 (patch-aa) = 7fa63dca0edfc41812b5432cbabd861ec52cec33
-SHA1 (patch-ab) = 17d8f0508710fc03a75e736a3298ede72b953af7
+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
diff --git a/graphics/MesaLib/patches/patch-aa b/graphics/MesaLib/patches/patch-aa
index 23449707905..0aed774904c 100644
--- a/graphics/MesaLib/patches/patch-aa
+++ b/graphics/MesaLib/patches/patch-aa
@@ -1,14 +1,14 @@
-$NetBSD: patch-aa,v 1.3 2002/12/05 15:11:50 jschauma Exp $
+$NetBSD: patch-aa,v 1.4 2002/12/06 17:03:24 jschauma Exp $
 
---- 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 @@
+--- 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 @@
  
  #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)	CONCAT(_, a)
+ #define GLNAME(a)	_ ## a
diff --git a/graphics/MesaLib/patches/patch-ab b/graphics/MesaLib/patches/patch-ab
index 4f6e7185b0c..4e3bd4ae2a9 100644
--- a/graphics/MesaLib/patches/patch-ab
+++ b/graphics/MesaLib/patches/patch-ab
@@ -1,13 +1,33 @@
-$NetBSD: patch-ab,v 1.5 2002/12/05 15:11:50 jschauma Exp $
+$NetBSD: patch-ab,v 1.6 2002/12/06 17:03:24 jschauma Exp $
 
---- configure.orig	Wed Nov 13 22:18:19 2002
-+++ configure	Tue Nov 19 15:52:05 2002
-@@ -1532,7 +1532,7 @@
+--- 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; }
  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/PLIST b/graphics/glu/PLIST
index 4d8e77b09cd..92d560b3302 100644
--- a/graphics/glu/PLIST
+++ b/graphics/glu/PLIST
@@ -1,9 +1,9 @@
-@comment $NetBSD: PLIST,v 1.4 2002/12/06 15:47:23 jschauma Exp $
+@comment $NetBSD: PLIST,v 1.5 2002/12/06 17:03:24 jschauma Exp $
 include/GL/glu.h
 include/GL/glu_mangle.h
 lib/libGLU.so
-lib/libGLU.so.2
-lib/libGLU.so.2.500
+lib/libGLU.so.3
+lib/libGLU.so.3.4
 lib/libGLU.a
 lib/libGLU.la
 @unexec ${RMDIR} %D/include/GL >/dev/null 2>&1 || ${TRUE}
diff --git a/graphics/glu/distinfo b/graphics/glu/distinfo
index bbfdd7a483e..855566356f6 100644
--- a/graphics/glu/distinfo
+++ b/graphics/glu/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.5 2002/12/05 15:11:50 jschauma Exp $
+$NetBSD: distinfo,v 1.6 2002/12/06 17:03:24 jschauma Exp $
 
-SHA1 (MesaLib-5.0.tar.bz2) = 098260c89c4109a8823c76a2c4d75cef8484819d
-Size (MesaLib-5.0.tar.bz2) = 1645037 bytes
-SHA1 (patch-aa) = 3006b3f1fece24ded6edc046d7bff439f181cd47
+SHA1 (MesaLib-3.4.2.tar.bz2) = 1a41b61a29538127dbb0ab2882ac69554a0e9e37
+Size (MesaLib-3.4.2.tar.bz2) = 1380805 bytes
+SHA1 (patch-aa) = 8cf672d645f9681b0987e94d3692903a5314173e
diff --git a/graphics/glu/patches/patch-aa b/graphics/glu/patches/patch-aa
index b42b2862185..4d4dc3e7df8 100644
--- a/graphics/glu/patches/patch-aa
+++ b/graphics/glu/patches/patch-aa
@@ -1,11 +1,33 @@
---- configure.orig	Wed Nov 20 17:45:32 2002
-+++ configure	Wed Nov 20 17:45:43 2002
-@@ -1532,7 +1532,7 @@
+$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; }
  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/PLIST b/graphics/glut/PLIST
index 4d474f0e894..a9fccf4ea38 100644
--- a/graphics/glut/PLIST
+++ b/graphics/glut/PLIST
@@ -1,9 +1,9 @@
-@comment $NetBSD: PLIST,v 1.4 2002/12/06 15:23:12 jschauma Exp $
+@comment $NetBSD: PLIST,v 1.5 2002/12/06 17:03:25 jschauma Exp $
 include/GL/glut.h
 include/GL/glutf90.h
 lib/libglut.so
-lib/libglut.so.10
-lib/libglut.so.10.1
+lib/libglut.so.3
+lib/libglut.so.3.7
 lib/libglut.a
 lib/libglut.la
 @unexec ${RMDIR} %D/include/GL >/dev/null 2>&1 || ${TRUE}
diff --git a/graphics/glut/distinfo b/graphics/glut/distinfo
index 66deb4d0875..41db10bd94c 100644
--- a/graphics/glut/distinfo
+++ b/graphics/glut/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.5 2002/12/05 15:11:51 jschauma Exp $
+$NetBSD: distinfo,v 1.6 2002/12/06 17:03:25 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 (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