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.

23 files changed, 220 insertions, 72 deletions

diff --git a/graphics/Mesa/Makefile b/graphics/Mesa/Makefile
index bab6c4d83ac..aaca98fc55b 100644
--- a/graphics/Mesa/Makefile
+++ b/graphics/Mesa/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.52 2003/09/29 21:30:28 jschauma Exp $
+# $NetBSD: Makefile,v 1.53 2003/11/18 16:10:55 jschauma Exp $
 #
 
 PKGNAME=	Mesa-${MESA_VERSION}
@@ -12,8 +12,6 @@ CONFLICTS=	Mesa-glx-[0-9]*
 
 pre-patch:	# empty
 
-.include "Makefile.common"
-
 USE_BUILDLINK2=	yes
 
 USE_X11BASE=	yes
@@ -22,8 +20,11 @@ NO_CONFIGURE=	yes
 NO_BUILD=	yes
 EXTRACT_ONLY=	# empty
 
+post-patch:	# empty
 do-install:	# empty
 
+.include "Makefile.common"
+
 .include "../../graphics/MesaLib/buildlink2.mk"
 .include "../../graphics/glu/buildlink2.mk"
 .include "../../graphics/glut/buildlink2.mk"
diff --git a/graphics/Mesa/Makefile.common b/graphics/Mesa/Makefile.common
index 54b6faa165b..3857950ef64 100644
--- a/graphics/Mesa/Makefile.common
+++ b/graphics/Mesa/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.19 2003/09/29 21:30:28 jschauma Exp $
+# $NetBSD: Makefile.common,v 1.20 2003/11/18 16:10:55 jschauma Exp $
 
 DISTNAME?=		MesaLib-${MESA_VERSION}
 CATEGORIES?=		graphics
@@ -8,16 +8,17 @@ EXTRACT_SUFX?=		.tar.bz2
 MAINTAINER?=		tech-pkg@NetBSD.org
 HOMEPAGE?=		http://www.mesa3d.org/
 
-AUTOMAKE_REQD=		1.4
+AUTOMAKE_REQD=		1.7
 USE_GMAKE=		yes
 USE_LIBTOOL=		yes
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 
 GNU_CONFIGURE?=		yes
 CONFIGURE_ARGS+=	--enable-static
+DIST_SUBDIR=		Mesa-${MESA_VERSION}
 
-.if !target(pre-patch)
-pre-patch:
+.if !target(post-patch)
+post-patch:
 	cd ${WRKSRC} && ${ACLOCAL} && ${AUTOMAKE}
 .endif
 
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.
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.
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.
diff --git a/graphics/glut/Makefile b/graphics/glut/Makefile
index 2040843cbfc..6692bac31d1 100644
--- a/graphics/glut/Makefile
+++ b/graphics/glut/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.21 2003/11/09 02:23:18 jschauma Exp $
+# $NetBSD: Makefile,v 1.22 2003/11/18 16:10:56 jschauma Exp $
 
 PKGNAME=		${DISTNAME:S/MesaLib/glut/}
-PKGREVISION=		1
+PKGREVISION=		2
 DISTFILES=		${DISTNAME}${EXTRACT_SUFX}
 DISTFILES+=		${DISTNAME:S/MesaLib/MesaDemos/}${EXTRACT_SUFX}
 WRKSRC=			${WRKDIR}/${DISTNAME:S/Lib//}
@@ -17,6 +17,8 @@ USE_BUILDLINK2=		yes
 USE_X11BASE=		yes
 CONFIGURE_DIRS=		${WRKSRC}
 BUILD_DIRS=		${WRKSRC}/src-glut
+USE_LIBTOOL=		yes
+LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/include/GL
@@ -27,6 +29,7 @@ post-install:
 	done
 
 .include "../../graphics/MesaLib/buildlink2.mk"
+.include "../../graphics/glu/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
 
 # must be below bsd.pkg.mk to overwrite values
diff --git a/graphics/glut/distinfo b/graphics/glut/distinfo
index c6d6dba5a15..347c94fadd3 100644
--- a/graphics/glut/distinfo
+++ b/graphics/glut/distinfo
@@ -1,8 +1,10 @@
-$NetBSD: distinfo,v 1.16 2003/11/09 02:23:18 jschauma Exp $
+$NetBSD: distinfo,v 1.17 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 (MesaDemos-5.0.2.tar.bz2) = 012d635c3e39dfa391b1183425f0630b1f428985
-Size (MesaDemos-5.0.2.tar.bz2) = 896368 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 (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) = d7a7dab7da7068c814a28b996bb3af6c24b48801
 SHA1 (patch-ab) = 807b07b1505735f23dd4148c8c838df08af6333e
+SHA1 (patch-ad) = 4fac0779bb50f90b3f9bf2c0a73d7ff485a3db9e
+SHA1 (patch-ae) = 58bb48fb84edae72ecfb62682061cf6d723fe100
diff --git a/graphics/glut/patches/patch-ad b/graphics/glut/patches/patch-ad
new file mode 100644
index 00000000000..345892d2e74
--- /dev/null
+++ b/graphics/glut/patches/patch-ad
@@ -0,0 +1,14 @@
+$NetBSD: patch-ad,v 1.1 2003/11/18 16:10:56 jschauma Exp $
+
+--- src-glut/Makefile.am.orig	2003-11-07 11:36:19.000000000 -0500
++++ src-glut/Makefile.am	2003-11-17 23:48:12.000000000 -0500
+@@ -8,8 +8,7 @@
+ lib_LTLIBRARIES = libglut.la
+ EXTRA_PROGRAMS = capturexfont
+ 
+-#libglut_la_LDFLAGS = -version-info @LIBGLUT_VERSION_INFO@ -L../@GLU_DIR@
+-libglut_la_LDFLAGS = -L../@GLU_DIR@
++libglut_la_LDFLAGS = -version-info @LIBGLUT_VERSION_INFO@ -L../@GLU_DIR@
+ libglut_la_LIBADD = -lGLU
+ libglut_la_SOURCES = \
+ 	glutwin32.h \
diff --git a/graphics/glut/patches/patch-ae b/graphics/glut/patches/patch-ae
new file mode 100644
index 00000000000..d5f41da33a8
--- /dev/null
+++ b/graphics/glut/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.