From e953c7f3fa6e05c9187b4fe3854f5e046b21c96d Mon Sep 17 00:00:00 2001
From: jschauma <jschauma>
Date: Tue, 18 Nov 2003 16:10:55 +0000
Subject: 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.
---
 graphics/glu/Makefile         |  4 ++--
 graphics/glu/PLIST            |  4 ++--
 graphics/glu/distinfo         |  7 ++++---
 graphics/glu/patches/patch-ae | 17 +++++++++++++++++
 4 files changed, 25 insertions(+), 7 deletions(-)
 create mode 100644 graphics/glu/patches/patch-ae

(limited to 'graphics/glu')

diff --git a/graphics/glu/Makefile b/graphics/glu/Makefile
index 859ab598eb5..d85378741f2 100644
--- a/graphics/glu/Makefile
+++ b/graphics/glu/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.20 2003/11/09 02:23:18 jschauma Exp $
+# $NetBSD: Makefile,v 1.21 2003/11/18 16:10:56 jschauma Exp $
 
 PKGNAME=		${DISTNAME:C/MesaLib/glu/}
-PKGREVISION=		1
+PKGREVISION=		2
 WRKSRC=			${WRKDIR}/${DISTNAME:C/Lib//}
 MAINTAINER=		rh@NetBSD.org
 COMMENT=		GLU polygon tesselation facility for Mesa
diff --git a/graphics/glu/PLIST b/graphics/glu/PLIST
index 80e5478474f..2182fa76400 100644
--- a/graphics/glu/PLIST
+++ b/graphics/glu/PLIST
@@ -1,9 +1,9 @@
-@comment $NetBSD: PLIST,v 1.7 2003/05/10 16:37:12 drochner Exp $
+@comment $NetBSD: PLIST,v 1.8 2003/11/18 16:10:56 jschauma Exp $
 include/GL/glu.h
 include/GL/glu_mangle.h
 lib/libGLU.so
 lib/libGLU.so.2
-lib/libGLU.so.2.501
+lib/libGLU.so.2.502
 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 2a97818deb4..ad06805b95b 100644
--- a/graphics/glu/distinfo
+++ b/graphics/glu/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.13 2003/11/09 02:23:18 jschauma Exp $
+$NetBSD: distinfo,v 1.14 2003/11/18 16:10:56 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) = 807b07b1505735f23dd4148c8c838df08af6333e
+SHA1 (patch-ae) = 58bb48fb84edae72ecfb62682061cf6d723fe100
diff --git a/graphics/glu/patches/patch-ae b/graphics/glu/patches/patch-ae
new file mode 100644
index 00000000000..d5f41da33a8
--- /dev/null
+++ b/graphics/glu/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.
-- 
cgit v1.2.3