Finally update Mesa and friends after the distfile changed on the website

without a version bump.  Changes made, according to the website, for
libtool/autofoo fixes.

Some changes from Ron Roskens:
glut depends upon graphics/glu (otherwise its linked against X11R6 libs)

MesaDemos:
 rather than using the pre-built distribution makefiles,
 use the automake/configure built makefiles which have
 the build dependencies all setup.

This closes PR pkg/23476.

5 files changed, 36 insertions, 20 deletions

diff --git a/graphics/MesaLib/Makefile b/graphics/MesaLib/Makefile
index 68aa9730e83..a1ae76f0e5f 100644
--- a/graphics/MesaLib/Makefile
+++ b/graphics/MesaLib/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.25 2003/11/09 02:23:18 jschauma Exp $
+# $NetBSD: Makefile,v 1.26 2003/11/18 16:10:55 jschauma Exp $
 
 PKGNAME=		MesaLib-${MESA_VERSION}
-PKGREVISION=		1
+PKGREVISION=		2
 WRKSRC=			${WRKDIR}/${DISTNAME:S/Lib//}
 MAINTAINER=		rh@NetBSD.org
 COMMENT=		Graphics library similar to SGI's OpenGL
diff --git a/graphics/MesaLib/PLIST b/graphics/MesaLib/PLIST
index 40f6889394f..71fb5e6a317 100644
--- a/graphics/MesaLib/PLIST
+++ b/graphics/MesaLib/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2003/09/29 21:30:28 jschauma Exp $
+@comment $NetBSD: PLIST,v 1.11 2003/11/18 16:10:55 jschauma Exp $
 include/GL/gl.h
 include/GL/gl_mangle.h
 include/GL/glext.h
@@ -13,12 +13,10 @@ lib/libGL.a
 lib/libGL.la
 lib/libGL.so
 lib/libGL.so.5
-lib/libGL.so.5.501
+lib/libGL.so.5.502
 lib/libOSMesa.a
 lib/libOSMesa.la
 lib/libOSMesa.so
 lib/libOSMesa.so.4
-lib/libOSMesa.so.4.501
-share/examples/mesa/mesa.conf
-@dirrm share/examples/mesa
+lib/libOSMesa.so.4.502
 @unexec ${RMDIR} %D/include/GL >/dev/null 2>&1 || ${TRUE}
diff --git a/graphics/MesaLib/distinfo b/graphics/MesaLib/distinfo
index 64fcda34a1e..d7331859abb 100644
--- a/graphics/MesaLib/distinfo
+++ b/graphics/MesaLib/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.14 2003/11/09 02:23:18 jschauma Exp $
+$NetBSD: distinfo,v 1.15 2003/11/18 16:10:55 jschauma Exp $
 
-SHA1 (MesaLib-5.0.2.tar.bz2) = 948b9e1b11d1341a4230a081469f4636f702ebdc
-Size (MesaLib-5.0.2.tar.bz2) = 1704278 bytes
+SHA1 (Mesa-5.0.2/MesaLib-5.0.2.tar.bz2) = a49234ad74d6c67b2727c1dd8a8c8e1ed7f63192
+Size (Mesa-5.0.2/MesaLib-5.0.2.tar.bz2) = 1719544 bytes
 SHA1 (patch-aa) = 7fa63dca0edfc41812b5432cbabd861ec52cec33
-SHA1 (patch-ac) = 30d3f08c2d9bbfe648a2ed2cbfade6c30a7413fe
+SHA1 (patch-ac) = 723c70827840465f3b7f07e0852107ddcdc0c0c1
 SHA1 (patch-ad) = 807b07b1505735f23dd4148c8c838df08af6333e
+SHA1 (patch-ae) = 58bb48fb84edae72ecfb62682061cf6d723fe100
diff --git a/graphics/MesaLib/patches/patch-ac b/graphics/MesaLib/patches/patch-ac
index f17516d0e53..10b2f43ba88 100644
--- a/graphics/MesaLib/patches/patch-ac
+++ b/graphics/MesaLib/patches/patch-ac
@@ -1,13 +1,13 @@
-$NetBSD: patch-ac,v 1.2 2003/09/29 21:30:28 jschauma Exp $
+$NetBSD: patch-ac,v 1.3 2003/11/18 16:10:56 jschauma Exp $
 
---- src/Makefile.in.orig	2003-09-29 13:14:27.000000000 -0400
-+++ src/Makefile.in	2003-09-29 13:14:55.000000000 -0400
-@@ -25,7 +25,7 @@
+--- src/Makefile.in.orig	2003-11-07 11:58:20.000000000 -0500
++++ src/Makefile.in	2003-11-13 21:45:41.000000000 -0500
+@@ -187,7 +187,7 @@
+ program_transform_name = @program_transform_name@
  sbindir = @sbindir@
- libexecdir = @libexecdir@
- datadir = @datadir@
+ sharedstatedir = @sharedstatedir@
 -sysconfdir = @sysconfdir@
 +sysconfdir = @datadir@/examples/mesa
- sharedstatedir = @sharedstatedir@
- localstatedir = @localstatedir@
- libdir = @libdir@
+ target_alias = @target_alias@
+ use_si_glu = @use_si_glu@
+ 
diff --git a/graphics/MesaLib/patches/patch-ae b/graphics/MesaLib/patches/patch-ae
new file mode 100644
index 00000000000..d5f41da33a8
--- /dev/null
+++ b/graphics/MesaLib/patches/patch-ae
@@ -0,0 +1,17 @@
+$NetBSD: patch-ae,v 1.1 2003/11/18 16:10:56 jschauma Exp $
+
+--- src/GGI/Makefile.am.orig	2003-11-13 21:47:55.000000000 -0500
++++ src/GGI/Makefile.am	2003-11-13 21:48:04.000000000 -0500
+@@ -7,10 +7,10 @@
+ ggimesaconfdatadir = ${sysconfdir}/ggi
+ ggimesaconfdata_DATA = ggimesa.conf
+ 
+-INCLUDES += -I$(top_srcdir)/include -I$(top_srcdir)/src/GGI/include \
++INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/src/GGI/include \
+ 	-I$(top_srcdir)/src $(GGI_CFLAGS)
+ 
+-DEFS += -DGGIMESACONFFILE=\"$(ggimesaconfdatadir)/ggimesa.conf\"
++DEFS = -DGGIMESACONFFILE=\"$(ggimesaconfdatadir)/ggimesa.conf\"
+ 
+ if HAVE_GGI
+ # Build a libtool convenience library.