As suggested by Ron Roskens in PR pkg/23489 (closing that PR):

use si-glu sources to build a libGLU that includes GLU Polygon Tessellator
functions and use this new functionality in MesaDemos.

Bump PKGREVISIONs.

7 files changed, 19 insertions, 23 deletions

diff --git a/graphics/MesaDemos/Makefile b/graphics/MesaDemos/Makefile
index da05847871f..6f876b2a6be 100644
--- a/graphics/MesaDemos/Makefile
+++ b/graphics/MesaDemos/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2003/11/18 16:10:55 jschauma Exp $
+# $NetBSD: Makefile,v 1.10 2003/11/28 18:41:03 jschauma Exp $
 
 PKGNAME=		MesaDemos-${MESA_VERSION}
-PKGREVISION=		1
+PKGREVISION=		2
 DISTFILES=		${DISTNAME}${EXTRACT_SUFX}
 DISTFILES+=		${DISTNAME:S/MesaLib/MesaDemos/}${EXTRACT_SUFX}
 WRKSRC=			${WRKDIR}/${DISTNAME:S/Lib//}
diff --git a/graphics/MesaDemos/PLIST b/graphics/MesaDemos/PLIST
index c03330cc07b..5d7f1321ff1 100644
--- a/graphics/MesaDemos/PLIST
+++ b/graphics/MesaDemos/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2003/11/18 16:10:55 jschauma Exp $
+@comment $NetBSD: PLIST,v 1.4 2003/11/28 18:41:03 jschauma Exp $
 share/examples/${PKGNAME}/book/README
 share/examples/${PKGNAME}/book/aaindex
 share/examples/${PKGNAME}/book/aaindex.c
@@ -103,7 +103,9 @@ share/examples/${PKGNAME}/book/teaambient
 share/examples/${PKGNAME}/book/teaambient.c
 share/examples/${PKGNAME}/book/teapots
 share/examples/${PKGNAME}/book/teapots.c
+share/examples/${PKGNAME}/book/tess
 share/examples/${PKGNAME}/book/tess.c
+share/examples/${PKGNAME}/book/tesswind
 share/examples/${PKGNAME}/book/tesswind.c
 share/examples/${PKGNAME}/book/texbind
 share/examples/${PKGNAME}/book/texbind.c
diff --git a/graphics/MesaDemos/distinfo b/graphics/MesaDemos/distinfo
index 5225c63de7d..bf2f9e90f29 100644
--- a/graphics/MesaDemos/distinfo
+++ b/graphics/MesaDemos/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.5 2003/11/18 16:10:55 jschauma Exp $
+$NetBSD: distinfo,v 1.6 2003/11/28 18:41:03 jschauma Exp $
 
 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-aa) = 9e278446701ef6cd2b056b3c8f020f0d8befaf7a
 SHA1 (patch-ab) = 8750d7a8c476c85823c0c56bb9b6f8323019a1f0
 SHA1 (patch-ac) = 38da6ec05805eab6c93431e7e977e38b33f83860
 SHA1 (patch-ad) = 807b07b1505735f23dd4148c8c838df08af6333e
diff --git a/graphics/MesaDemos/patches/patch-aa b/graphics/MesaDemos/patches/patch-aa
index 8c43aefbcc1..af8b520242b 100644
--- a/graphics/MesaDemos/patches/patch-aa
+++ b/graphics/MesaDemos/patches/patch-aa
@@ -1,14 +1,8 @@
-$NetBSD: patch-aa,v 1.3 2003/11/18 16:10:55 jschauma Exp $
+$NetBSD: patch-aa,v 1.4 2003/11/28 18:41:03 jschauma Exp $
 
---- 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 \
--	teaambient teapots tess tesswind texbind texgen texprox texsub \
-+	teaambient teapots texbind texgen texprox texsub \
- 	texturesurf torus trim unproject varray wrap 
+--- book/Makefile.am.orig	2003-11-07 09:32:07.000000000 -0500
++++ book/Makefile.am	2003-11-28 12:47:45.000000000 -0500
+@@ -15,8 +15,7 @@
  
  EXTRA_DIST = jitter.h
  
diff --git a/graphics/glu/Makefile b/graphics/glu/Makefile
index d85378741f2..1dc8a22e965 100644
--- a/graphics/glu/Makefile
+++ b/graphics/glu/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.21 2003/11/18 16:10:56 jschauma Exp $
+# $NetBSD: Makefile,v 1.22 2003/11/28 18:41:03 jschauma Exp $
 
 PKGNAME=		${DISTNAME:C/MesaLib/glu/}
-PKGREVISION=		2
+PKGREVISION=		3
 WRKSRC=			${WRKDIR}/${DISTNAME:C/Lib//}
 MAINTAINER=		rh@NetBSD.org
 COMMENT=		GLU polygon tesselation facility for Mesa
@@ -13,7 +13,7 @@ CONFLICTS+=		Mesa<3.2.1
 
 USE_BUILDLINK2=		yes
 USE_X11BASE=		yes
-BUILD_DIRS=		${WRKSRC}/src-glu
+BUILD_DIRS=		${WRKSRC}/si-glu
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/graphics/glu/PLIST b/graphics/glu/PLIST
index 2182fa76400..6849717127e 100644
--- a/graphics/glu/PLIST
+++ b/graphics/glu/PLIST
@@ -1,9 +1,9 @@
-@comment $NetBSD: PLIST,v 1.8 2003/11/18 16:10:56 jschauma Exp $
+@comment $NetBSD: PLIST,v 1.9 2003/11/28 18:41:03 jschauma Exp $
 include/GL/glu.h
 include/GL/glu_mangle.h
 lib/libGLU.so
-lib/libGLU.so.2
-lib/libGLU.so.2.502
+lib/libGLU.so.4
+lib/libGLU.so.4.502
 lib/libGLU.a
 lib/libGLU.la
 @unexec ${RMDIR} %D/include/GL >/dev/null 2>&1 || ${TRUE}
diff --git a/graphics/glut/Makefile b/graphics/glut/Makefile
index 6692bac31d1..97c72f30e0c 100644
--- a/graphics/glut/Makefile
+++ b/graphics/glut/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.22 2003/11/18 16:10:56 jschauma Exp $
+# $NetBSD: Makefile,v 1.23 2003/11/28 18:41:03 jschauma Exp $
 
 PKGNAME=		${DISTNAME:S/MesaLib/glut/}
-PKGREVISION=		2
+PKGREVISION=		3
 DISTFILES=		${DISTNAME}${EXTRACT_SUFX}
 DISTFILES+=		${DISTNAME:S/MesaLib/MesaDemos/}${EXTRACT_SUFX}
 WRKSRC=			${WRKDIR}/${DISTNAME:S/Lib//}