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.

8 files changed, 107 insertions, 31 deletions

diff --git a/graphics/MesaDemos/Makefile b/graphics/MesaDemos/Makefile
index f6c4c912d9d..da05847871f 100644
--- a/graphics/MesaDemos/Makefile
+++ b/graphics/MesaDemos/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2003/08/26 01:43:51 jschauma Exp $
+# $NetBSD: Makefile,v 1.9 2003/11/18 16:10:55 jschauma Exp $
 
 PKGNAME=		MesaDemos-${MESA_VERSION}
+PKGREVISION=		1
 DISTFILES=		${DISTNAME}${EXTRACT_SUFX}
 DISTFILES+=		${DISTNAME:S/MesaLib/MesaDemos/}${EXTRACT_SUFX}
 WRKSRC=			${WRKDIR}/${DISTNAME:S/Lib//}
@@ -11,18 +12,21 @@ COMMENT=		OpenGL examples and Demos
 
 USE_BUILDLINK2=		yes
 USE_X11BASE=		yes
+
 BUILD_DIRS=		${WRKSRC}/book ${WRKSRC}/demos ${WRKSRC}/samples
-MAKEFILE=		Makefile.X11
-ALL_TARGET=		netbsd
+ALL_TARGET=		check
+CONFIGURE_ARGS+=	--with-glut=${X11PREFIX}
+CONFIGURE_ENV+=		ac_cv_lib_glut_main=yes
 MAKE_ENV+=		X11PREFIX=${X11PREFIX}
 
 do-install:
 .for dir in book demos images samples
-	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/${PKGNAME}/${dir}
+	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/${PKGNAME_NOREV}/${dir}
 	cd ${WRKSRC}/${dir} && ${PAX} -s ,^./.*Makefile.*,, -s ,^./CVS.*,, \
-		-rw . ${PREFIX}/share/examples/${PKGNAME}/${dir}
+		-s ,^./.*\\.o$$,, -s ,^./\\.libs.*,, -s ,^./\\.deps.*,,	   \
+		-rw . ${PREFIX}/share/examples/${PKGNAME_NOREV}/${dir}
 .endfor
-	${CHMOD} -R a+rX ${PREFIX}/share/examples/${PKGNAME}
+	${CHMOD} -R a+rX ${PREFIX}/share/examples/${PKGNAME_NOREV}
 
 .include "../../graphics/Mesa/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/MesaDemos/PLIST b/graphics/MesaDemos/PLIST
index 1d6b1e481c0..c03330cc07b 100644
--- a/graphics/MesaDemos/PLIST
+++ b/graphics/MesaDemos/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2003/09/29 21:30:28 jschauma Exp $
+@comment $NetBSD: PLIST,v 1.3 2003/11/18 16:10:55 jschauma Exp $
 share/examples/${PKGNAME}/book/README
 share/examples/${PKGNAME}/book/aaindex
 share/examples/${PKGNAME}/book/aaindex.c
@@ -135,6 +135,7 @@ share/examples/${PKGNAME}/demos/cubemap.c
 share/examples/${PKGNAME}/demos/descrip.mms
 share/examples/${PKGNAME}/demos/drawpix
 share/examples/${PKGNAME}/demos/drawpix.c
+share/examples/${PKGNAME}/demos/example.c
 share/examples/${PKGNAME}/demos/fire
 share/examples/${PKGNAME}/demos/fire.c
 share/examples/${PKGNAME}/demos/gamma
diff --git a/graphics/MesaDemos/distinfo b/graphics/MesaDemos/distinfo
index f76e47c14d1..5225c63de7d 100644
--- a/graphics/MesaDemos/distinfo
+++ b/graphics/MesaDemos/distinfo
@@ -1,7 +1,11 @@
-$NetBSD: distinfo,v 1.4 2003/09/29 21:30:28 jschauma Exp $
+$NetBSD: distinfo,v 1.5 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 (MesaDemos-5.0.2.tar.bz2) = 012d635c3e39dfa391b1183425f0630b1f428985
-Size (MesaDemos-5.0.2.tar.bz2) = 896368 bytes
-SHA1 (patch-aa) = 97abd719eb38d141af1c7a12c22fe24f98a1fdf7
+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 (Mesa-5.0.2/MesaDemos-5.0.2.tar.bz2) = 3c6f948023f5f41b8d5bd308076e9d8cfd194115
+Size (Mesa-5.0.2/MesaDemos-5.0.2.tar.bz2) = 901632 bytes
+SHA1 (patch-aa) = b5fa5d77d3b0cf7906f28408e7dec20e9c696276
+SHA1 (patch-ab) = 8750d7a8c476c85823c0c56bb9b6f8323019a1f0
+SHA1 (patch-ac) = 38da6ec05805eab6c93431e7e977e38b33f83860
+SHA1 (patch-ad) = 807b07b1505735f23dd4148c8c838df08af6333e
+SHA1 (patch-ae) = 58bb48fb84edae72ecfb62682061cf6d723fe100
diff --git a/graphics/MesaDemos/patches/patch-aa b/graphics/MesaDemos/patches/patch-aa
index e4dc7964c57..8c43aefbcc1 100644
--- a/graphics/MesaDemos/patches/patch-aa
+++ b/graphics/MesaDemos/patches/patch-aa
@@ -1,22 +1,8 @@
-$NetBSD: patch-aa,v 1.2 2003/03/09 19:04:53 jschauma Exp $
+$NetBSD: patch-aa,v 1.3 2003/11/18 16:10:55 jschauma Exp $
 
---- 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 #####
- 
--INCDIR = ../include
--LIBDIR = ../lib
-+INCDIR = ${X11PREFIX}/include
-+LIBDIR = ${X11PREFIX}/lib
- 
--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 @@
+--- book/Makefile.am.orig	2003-11-07 08:32:07.000000000 -0600
++++ book/Makefile.am	2003-11-17 20:50:19.000000000 -0600
+@@ -10,13 +10,12 @@
  	lines list material mipmap model movelight nurbs pickdepth \
  	picksquare plane planet polyoff polys quadric robot sccolorlight \
  	scene scenebamb sceneflat select smooth stencil stroke surface \
@@ -24,4 +10,11 @@ $NetBSD: patch-aa,v 1.2 2003/03/09 19:04:53 jschauma Exp $
 +	teaambient teapots texbind texgen texprox texsub \
  	texturesurf torus trim unproject varray wrap 
  
+ EXTRA_DIST = jitter.h
+ 
+-LDADD = $(GLUT_LIBS) $(top_builddir)/$(GLU_DIR)/libGLU.la \
+-	$(top_builddir)/src/libGL.la -lm
++LDADD = $(GLUT_LIBS) -lGLU -lGL -lm
+ #LDFLAGS = -no-install
  
+ # execute all programs
diff --git a/graphics/MesaDemos/patches/patch-ab b/graphics/MesaDemos/patches/patch-ab
new file mode 100644
index 00000000000..dd50836e88e
--- /dev/null
+++ b/graphics/MesaDemos/patches/patch-ab
@@ -0,0 +1,30 @@
+$NetBSD: patch-ab,v 1.5 2003/11/18 16:10:55 jschauma Exp $
+
+--- demos/Makefile.am.orig	2003-11-07 10:57:52.000000000 -0600
++++ demos/Makefile.am	2003-11-17 21:26:50.000000000 -0600
+@@ -22,6 +22,7 @@
+ 	morph3d \
+ 	multiarb \
+ 	occlude \
++	osdemo \
+ 	paltex \
+ 	pixeltex \
+ 	pointblast \
+@@ -47,14 +48,14 @@
+ 
+ CLEANFILES = test.ppm
+ 
+-LDADD = $(GLUT_LIBS) \
+-	$(top_builddir)/$(GLU_DIR)/libGLU.la \
+-	$(top_builddir)/src/libGL.la -lm
++LDADD = $(GLUT_LIBS) -lGLU -lGL -lm
+ 
+ #LDFLAGS = -no-install
+ 
+ EXTRA_DIST = isosurf.dat particles.cxx particles.h tunneldat.h
+ 
++osdemo_LDADD = $(LDADD) -lOSMesa
++
+ # use double buffering if possible
+ BUFFER = -db
+ 
diff --git a/graphics/MesaDemos/patches/patch-ac b/graphics/MesaDemos/patches/patch-ac
new file mode 100644
index 00000000000..e68d5551e88
--- /dev/null
+++ b/graphics/MesaDemos/patches/patch-ac
@@ -0,0 +1,14 @@
+$NetBSD: patch-ac,v 1.4 2003/11/18 16:10:55 jschauma Exp $
+
+--- samples/Makefile.am.orig	2003-11-07 08:32:08.000000000 -0600
++++ samples/Makefile.am	2003-11-17 20:51:29.000000000 -0600
+@@ -12,8 +12,7 @@
+ 
+ EXTRA_DIST = tkmap.c loadppm.c
+ 
+-LDADD = $(GLUT_LIBS) $(top_builddir)/$(GLU_DIR)/libGLU.la \
+-	$(top_builddir)/src/libGL.la -lm
++LDADD = $(GLUT_LIBS) -lGLU -lGL -lm
+ #LDFLAGS = -no-install
+ 
+ # default image
diff --git a/graphics/MesaDemos/patches/patch-ad b/graphics/MesaDemos/patches/patch-ad
new file mode 100644
index 00000000000..41d0161d4c5
--- /dev/null
+++ b/graphics/MesaDemos/patches/patch-ad
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.1 2003/11/18 16:10:55 jschauma Exp $
+
+--- configure.orig	2003-11-08 19:10:36.000000000 -0500
++++ configure	2003-11-08 19:10:53.000000000 -0500
+@@ -7121,7 +7121,7 @@
+ if test "x$enable_optim" = xyes; then
+     if test "x$enable_debug" = xno && test "x$enable_prof" = xno; then
+     if test "x$GCC" = xyes; then
+-      CFLAGS="$CFLAGS -fomit-frame-pointer -ffast-math -fexpensive-optimizations -fstrict-aliasing"
++      CFLAGS="$CFLAGS -fomit-frame-pointer -ffast-math -fexpensive-optimizations -fno-strict-aliasing"
+       case "$host" in
+       i*86-*-*) CFLAGS="$CFLAGS -malign-loops=2 -malign-jumps=2 -malign-functions=2";;
+       esac
diff --git a/graphics/MesaDemos/patches/patch-ae b/graphics/MesaDemos/patches/patch-ae
new file mode 100644
index 00000000000..db53c3b642d
--- /dev/null
+++ b/graphics/MesaDemos/patches/patch-ae
@@ -0,0 +1,17 @@
+$NetBSD: patch-ae,v 1.1 2003/11/18 16:10:55 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.