Upgrade, 2.1 -> 2.2.

10 files changed, 648 insertions, 640 deletions

diff --git a/graphics/Mesa3/Makefile b/graphics/Mesa3/Makefile
index 5b77cd41299..b188a55059f 100644
--- a/graphics/Mesa3/Makefile
+++ b/graphics/Mesa3/Makefile
@@ -1,18 +1,40 @@
 # New ports collection makefile for:    Mesa
-# Version required:     2.1
-# Date created:         3 Feb 1997
-# Whom:                 paulo@isr.uc.pt
+# Version required:     2.2
+# Date created:         Tue Feb  7 12:02:49  1995
+# Whom:                 hsu
 #
-# $Id: Makefile,v 1.16 1997/02/13 14:57:10 tg Exp $
+# $Id: Makefile,v 1.17 1997/02/14 14:18:06 tg Exp $
 #
 
-DISTNAME=       Mesa-2.1
+DISTNAME=       Mesa-2.2
 CATEGORIES=	graphics
 MASTER_SITES= 	ftp://iris.ssec.wisc.edu/pub/Mesa/
 
-MAINTAINER=	ports@freebsd.org
+MAINTAINER=	ports@FreeBSD.ORG
 
 ALL_TARGET=	freebsd
 USE_X11=	yes
+LIBS=		libMesaGL libMesaGLU libMesaaux libMesatk 
+SHLIB_VERSION=	13.2
+
+do-install:
+.for file in ${LIBS}
+	${INSTALL_DATA} ${WRKSRC}/lib/${file}.a ${PREFIX}/lib
+	ranlib ${PREFIX}/lib/${file}.a
+	${INSTALL_DATA} ${WRKSRC}/lib/${file}.so.${SHLIB_VERSION} ${PREFIX}/lib
+.endfor
+.for file in GL GLU
+	@ln -fs ${PREFIX}/lib/libMesa${file}.a ${PREFIX}/lib/lib${file}.a
+	@ln -fs ${PREFIX}/lib/libMesa${file}.so.${SHLIB_VERSION} ${PREFIX}/lib/lib${file}.so.${SHLIB_VERSION}
+.endfor
+	@${MKDIR} ${PREFIX}/include/GL
+	${INSTALL_DATA} ${WRKSRC}/include/GL/* ${PREFIX}/include/GL
+	@${MKDIR} ${PREFIX}/share/examples/Mesa
+	${CP} -Rp ${WRKSRC}/samples ${PREFIX}/share/examples/Mesa
+	${CP} -Rp ${WRKSRC}/demos ${PREFIX}/share/examples/Mesa
+	${CP} -Rp ${WRKSRC}/book ${PREFIX}/share/examples/Mesa
+	${CP} -Rp ${WRKSRC}/widgets-sgi ${PREFIX}/share/examples/Mesa
+	@${RM} -f ${PREFIX}/share/examples/Mesa/widgets-sgi/Makefile~
+	${LDCONFIG} -m ${PREFIX}/lib
 
 .include <bsd.port.mk>
diff --git a/graphics/Mesa3/distinfo b/graphics/Mesa3/distinfo
index 2609b26891b..bf22cc3e41b 100644
--- a/graphics/Mesa3/distinfo
+++ b/graphics/Mesa3/distinfo
@@ -1 +1 @@
-MD5 (Mesa-2.1.tar.gz) = f28336225b75782cdbee9bf8406d12e3
+MD5 (Mesa-2.2.tar.gz) = 6606b168dfcb15fdde7de1076d9adfa9
diff --git a/graphics/Mesa3/files/patch-aa b/graphics/Mesa3/files/patch-aa
deleted file mode 100644
index c5ec0c8de97..00000000000
--- a/graphics/Mesa3/files/patch-aa
+++ /dev/null
@@ -1,33 +0,0 @@
---- Makefile.orig	Sat Nov 30 15:35:50 1996
-+++ Makefile	Fri Feb 14 12:15:16 1997
-@@ -289,3 +289,30 @@
- 	tar -cvf src.tar $(SRC_FILES) ; \
- 	gzip src.tar
- 
-+install:
-+	install -c -m 444 lib/libMesaGL.a ${X11BASE}/lib
-+	install -c -m 444 lib/libMesaGL.so.13.1 ${X11BASE}/lib
-+	install -c -m 444 lib/libMesaGLU.a ${X11BASE}/lib
-+	install -c -m 444 lib/libMesaGLU.so.13.1 ${X11BASE}/lib
-+	install -c -m 444 lib/libMesaaux.a ${X11BASE}/lib
-+	install -c -m 444 lib/libMesaaux.so.13.1 ${X11BASE}/lib
-+	install -c -m 444 lib/libMesatk.a ${X11BASE}/lib
-+	install -c -m 444 lib/libMesatk.so.13.1 ${X11BASE}/lib
-+	mkdir -p -m 0775 ${X11BASE}/include/Mesa/GL
-+	install -c include/glaux.h ${X11BASE}/include/Mesa
-+	install -c include/gltk.h ${X11BASE}/include/Mesa
-+	install -c include/GL/gmesa.h ${X11BASE}/include/Mesa/GL
-+	install -c include/GL/fgl.h ${X11BASE}/include/Mesa/GL
-+	install -c include/GL/gl.h ${X11BASE}/include/Mesa/GL
-+	install -c include/GL/glu.h ${X11BASE}/include/Mesa/GL
-+	install -c include/GL/glx.h ${X11BASE}/include/Mesa/GL
-+	install -c include/GL/osmesa.h ${X11BASE}/include/Mesa/GL
-+	install -c include/GL/svgamesa.h ${X11BASE}/include/Mesa/GL
-+	install -c include/GL/wmesa.h ${X11BASE}/include/Mesa/GL
-+	install -c include/GL/xmesa.h ${X11BASE}/include/Mesa/GL
-+	mkdir -p -m 0775 ${PREFIX}/share/Mesa
-+	cp -rp samples ${PREFIX}/share/Mesa
-+	cp -rp demos ${PREFIX}/share/Mesa
-+	cp -rp book ${PREFIX}/share/Mesa
-+	cp -rp widgets-sgi ${PREFIX}/share/Mesa
-+	ldconfig -m ${X11BASE}/lib
diff --git a/graphics/Mesa3/pkg-descr b/graphics/Mesa3/pkg-descr
index c0a0efe6fe3..5bca26de4ef 100644
--- a/graphics/Mesa3/pkg-descr
+++ b/graphics/Mesa3/pkg-descr
@@ -7,6 +7,6 @@ Those who want a licensed implementation of OpenGL should contact a licensed
 vendor.  This software is distributed under the terms of the GNU Library
 General Public License, see the LICENSE file for details.
 
-Note: Some examples are available under /usr/X11R6/share/Mesa.
+Note: Some examples are available under /usr/X11R6/share/examples/Mesa.
 
 paulo@isr.uc.pt
diff --git a/graphics/Mesa3/pkg-plist b/graphics/Mesa3/pkg-plist
index 86108de44ea..0a9832d9281 100644
--- a/graphics/Mesa3/pkg-plist
+++ b/graphics/Mesa3/pkg-plist
@@ -1,284 +1,299 @@
+include/GL/FooMesa.h
+include/GL/dosmesa.h
+include/GL/gl.h
+include/GL/gl_mangle.h
+include/GL/glu.h
+include/GL/glu_mangle.h
+include/GL/glx.h
+include/GL/glx_mangle.h
+include/GL/gmesa.h
+include/GL/osmesa.h
+include/GL/svgamesa.h
+include/GL/wmesa.h
+include/GL/xmesa.h
+lib/libGL.a
+lib/libGL.so.13.2
+lib/libGLU.a
+lib/libGLU.so.13.2
 lib/libMesaGL.a
-@exec ranlib %D/%F
-lib/libMesaGL.so.13.1
+lib/libMesaGL.so.13.2
 lib/libMesaGLU.a
-@exec ranlib %D/%F
-lib/libMesaGLU.so.13.1
+lib/libMesaGLU.so.13.2
 lib/libMesaaux.a
-@exec ranlib %D/%F
-lib/libMesaaux.so.13.1
+lib/libMesaaux.so.13.2
 lib/libMesatk.a
-@exec ranlib %D/%F
-lib/libMesatk.so.13.1
+lib/libMesatk.so.13.2
 @exec ldconfig -m %B
-include/Mesa/glaux.h
-include/Mesa/gltk.h
-include/Mesa/GL/fgl.h
-include/Mesa/GL/gl.h
-include/Mesa/GL/glu.h
-include/Mesa/GL/glx.h
-include/Mesa/GL/gmesa.h
-include/Mesa/GL/osmesa.h
-include/Mesa/GL/svgamesa.h
-include/Mesa/GL/wmesa.h
-include/Mesa/GL/xmesa.h
-share/Mesa/samples/wave
-share/Mesa/samples/Imakefile
-share/Mesa/samples/NOTES
-share/Mesa/samples/README
-share/Mesa/samples/1.rgb
-share/Mesa/samples/2.rgb
-share/Mesa/samples/3.rgb
-share/Mesa/samples/4.rgb
-share/Mesa/samples/accum.c
-share/Mesa/samples/bitmap1.c
-share/Mesa/samples/bitmap2.c
-share/Mesa/samples/blendeq.c
-share/Mesa/samples/blendxor.c
-share/Mesa/samples/copy.c
-share/Mesa/samples/cursor.c
-share/Mesa/samples/depth.c
-share/Mesa/samples/eval.c
-share/Mesa/samples/fog.c
-share/Mesa/samples/font.c
-share/Mesa/samples/line.c
-share/Mesa/samples/logo.c
-share/Mesa/samples/nurb.c
-share/Mesa/samples/oglinfo.c
-share/Mesa/samples/olympic.c
-share/Mesa/samples/overlay.c
-share/Mesa/samples/point.c
-share/Mesa/samples/prim.c
-share/Mesa/samples/quad.c
-share/Mesa/samples/select.c
-share/Mesa/samples/shape.c
-share/Mesa/samples/speed.c
-share/Mesa/samples/sphere.c
-share/Mesa/samples/star.c
-share/Mesa/samples/stencil.c
-share/Mesa/samples/stretch.c
-share/Mesa/samples/texture.c
-share/Mesa/samples/tri.c
-share/Mesa/samples/wave.c
-share/Mesa/samples/accum
-share/Mesa/samples/bitmap1
-share/Mesa/samples/bitmap2
-share/Mesa/samples/blendeq
-share/Mesa/samples/blendxor
-share/Mesa/samples/copy
-share/Mesa/samples/cursor
-share/Mesa/samples/depth
-share/Mesa/samples/eval
-share/Mesa/samples/fog
-share/Mesa/samples/font
-share/Mesa/samples/line
-share/Mesa/samples/logo
-share/Mesa/samples/nurb
-share/Mesa/samples/oglinfo
-share/Mesa/samples/olympic
-share/Mesa/samples/overlay
-share/Mesa/samples/point
-share/Mesa/samples/prim
-share/Mesa/samples/quad
-share/Mesa/samples/tri
-share/Mesa/samples/select
-share/Mesa/samples/shape
-share/Mesa/samples/speed
-share/Mesa/samples/sphere
-share/Mesa/samples/star
-share/Mesa/samples/stencil
-share/Mesa/samples/stretch
-share/Mesa/samples/texture
-share/Mesa/samples/Makefile
-share/Mesa/demos/winpos
-share/Mesa/demos/Imakefile
-share/Mesa/demos/descrip.mms
-share/Mesa/demos/bounce.c
-share/Mesa/demos/fdraw.f
-share/Mesa/demos/ftest.c
-share/Mesa/demos/gamma.c
-share/Mesa/demos/gears.c
-share/Mesa/demos/glxdemo.c
-share/Mesa/demos/glxpixmap.c
-share/Mesa/demos/isosurf.c
-share/Mesa/demos/offset.c
-share/Mesa/demos/osdemo.c
-share/Mesa/demos/reflect.c
-share/Mesa/demos/spin.c
-share/Mesa/demos/tess_demo.c
-share/Mesa/demos/test0.c
-share/Mesa/demos/texobj.c
-share/Mesa/demos/vgears.c
-share/Mesa/demos/vindex.c
-share/Mesa/demos/vtest.c
-share/Mesa/demos/winpos.c
-share/Mesa/demos/xdemo.c
-share/Mesa/demos/isosurf.dat
-share/Mesa/demos/bounce
-share/Mesa/demos/gamma
-share/Mesa/demos/gears
-share/Mesa/demos/glxdemo
-share/Mesa/demos/glxpixmap
-share/Mesa/demos/isosurf
-share/Mesa/demos/offset
-share/Mesa/demos/osdemo
-share/Mesa/demos/spin
-share/Mesa/demos/test0
-share/Mesa/demos/texobj
-share/Mesa/demos/xdemo
-share/Mesa/demos/reflect
-share/Mesa/demos/Makefile
-share/Mesa/book/xfont
-share/Mesa/book/Imakefile
-share/Mesa/book/NOTES
-share/Mesa/book/README
-share/Mesa/book/accanti.c
-share/Mesa/book/accnot.c
-share/Mesa/book/accpersp.c
-share/Mesa/book/accum.c
-share/Mesa/book/aim.c
-share/Mesa/book/alpha.c
-share/Mesa/book/alpha3D.c
-share/Mesa/book/anti.c
-share/Mesa/book/antiindex.c
-share/Mesa/book/antipindex.c
-share/Mesa/book/antipoint.c
-share/Mesa/book/antipoly.c
-share/Mesa/book/bezcurve.c
-share/Mesa/book/bezmesh.c
-share/Mesa/book/bezsurf.c
-share/Mesa/book/checker.c
-share/Mesa/book/checker2.c
-share/Mesa/book/chess.c
-share/Mesa/book/clip.c
-share/Mesa/book/colormat.c
-share/Mesa/book/cone.c
-share/Mesa/book/cube.c
-share/Mesa/book/curve.c
-share/Mesa/book/depthcue.c
-share/Mesa/book/disk.c
-share/Mesa/book/dof.c
-share/Mesa/book/dofnot.c
-share/Mesa/book/double.c
-share/Mesa/book/drawf.c
-share/Mesa/book/feedback.c
-share/Mesa/book/fog.c
-share/Mesa/book/fogindex.c
-share/Mesa/book/font.c
-share/Mesa/book/jitter.h
-share/Mesa/book/light.c
-share/Mesa/book/linelist.c
-share/Mesa/book/lines.c
-share/Mesa/book/list.c
-share/Mesa/book/list2.c
-share/Mesa/book/maplight.c
-share/Mesa/book/material.c
-share/Mesa/book/mipmap.c
-share/Mesa/book/model.c
-share/Mesa/book/movelight.c
-share/Mesa/book/nurbs.c
-share/Mesa/book/pickdepth.c
-share/Mesa/book/pickline.c
-share/Mesa/book/picksquare.c
-share/Mesa/book/plane.c
-share/Mesa/book/planet.c
-share/Mesa/book/planetup.c
-share/Mesa/book/polys.c
-share/Mesa/book/robot.c
-share/Mesa/book/sccolorlight.c
-share/Mesa/book/scene.c
-share/Mesa/book/scenebamb.c
-share/Mesa/book/sceneflat.c
-share/Mesa/book/select.c
-share/Mesa/book/simple.c
-share/Mesa/book/smooth.c
-share/Mesa/book/sphere.c
-share/Mesa/book/stencil.c
-share/Mesa/book/stroke.c
-share/Mesa/book/surface.c
-share/Mesa/book/tea.c
-share/Mesa/book/teaambient.c
-share/Mesa/book/teapots.c
-share/Mesa/book/texgen.c
-share/Mesa/book/texturesurf.c
-share/Mesa/book/trim.c
-share/Mesa/book/xfont.c
-share/Mesa/book/robot
-share/Mesa/book/accanti
-share/Mesa/book/accnot
-share/Mesa/book/accpersp
-share/Mesa/book/accum
-share/Mesa/book/aim
-share/Mesa/book/alpha
-share/Mesa/book/alpha3D
-share/Mesa/book/anti
-share/Mesa/book/antiindex
-share/Mesa/book/antipindex
-share/Mesa/book/antipoint
-share/Mesa/book/antipoly
-share/Mesa/book/bezcurve
-share/Mesa/book/bezmesh
-share/Mesa/book/bezsurf
-share/Mesa/book/checker
-share/Mesa/book/checker2
-share/Mesa/book/chess
-share/Mesa/book/clip
-share/Mesa/book/colormat
-share/Mesa/book/cone
-share/Mesa/book/cube
-share/Mesa/book/curve
-share/Mesa/book/depthcue
-share/Mesa/book/disk
-share/Mesa/book/dof
-share/Mesa/book/dofnot
-share/Mesa/book/double
-share/Mesa/book/drawf
-share/Mesa/book/feedback
-share/Mesa/book/fog
-share/Mesa/book/fogindex
-share/Mesa/book/font
-share/Mesa/book/light
-share/Mesa/book/lines
-share/Mesa/book/linelist
-share/Mesa/book/list
-share/Mesa/book/list2
-share/Mesa/book/maplight
-share/Mesa/book/material
-share/Mesa/book/mipmap
-share/Mesa/book/model
-share/Mesa/book/movelight
-share/Mesa/book/nurbs
-share/Mesa/book/pickdepth
-share/Mesa/book/pickline
-share/Mesa/book/picksquare
-share/Mesa/book/plane
-share/Mesa/book/planet
-share/Mesa/book/planetup
-share/Mesa/book/polys
-share/Mesa/book/sccolorlight
-share/Mesa/book/scene
-share/Mesa/book/scenebamb
-share/Mesa/book/sceneflat
-share/Mesa/book/select
-share/Mesa/book/simple
-share/Mesa/book/smooth
-share/Mesa/book/sphere
-share/Mesa/book/stencil
-share/Mesa/book/stroke
-share/Mesa/book/surface
-share/Mesa/book/tea
-share/Mesa/book/teaambient
-share/Mesa/book/teapots
-share/Mesa/book/texgen
-share/Mesa/book/texturesurf
-share/Mesa/book/Makefile
-share/Mesa/widgets-sgi/depend
-share/Mesa/widgets-sgi/GLwDrawA.h
-share/Mesa/widgets-sgi/GLwDrawAP.h
-share/Mesa/widgets-sgi/GLwMDrawA.c
-share/Mesa/widgets-sgi/GLwMDrawA.h
-share/Mesa/widgets-sgi/GLwMDrawAP.h
-share/Mesa/widgets-sgi/Makefile
-share/Mesa/widgets-sgi/README
-share/Mesa/widgets-sgi/boilerplate.c
-share/Mesa/widgets-sgi/GLwDrawA.c
+share/examples/Mesa/book/Imakefile
+share/examples/Mesa/book/Makefile
+share/examples/Mesa/book/NOTES
+share/examples/Mesa/book/README
+share/examples/Mesa/book/accanti
+share/examples/Mesa/book/accanti.c
+share/examples/Mesa/book/accnot
+share/examples/Mesa/book/accnot.c
+share/examples/Mesa/book/accpersp
+share/examples/Mesa/book/accpersp.c
+share/examples/Mesa/book/accum
+share/examples/Mesa/book/accum.c
+share/examples/Mesa/book/aim
+share/examples/Mesa/book/aim.c
+share/examples/Mesa/book/alpha
+share/examples/Mesa/book/alpha.c
+share/examples/Mesa/book/alpha3D
+share/examples/Mesa/book/alpha3D.c
+share/examples/Mesa/book/anti
+share/examples/Mesa/book/anti.c
+share/examples/Mesa/book/antiindex
+share/examples/Mesa/book/antiindex.c
+share/examples/Mesa/book/antipindex
+share/examples/Mesa/book/antipindex.c
+share/examples/Mesa/book/antipoint
+share/examples/Mesa/book/antipoint.c
+share/examples/Mesa/book/antipoly
+share/examples/Mesa/book/antipoly.c
+share/examples/Mesa/book/bezcurve
+share/examples/Mesa/book/bezcurve.c
+share/examples/Mesa/book/bezmesh
+share/examples/Mesa/book/bezmesh.c
+share/examples/Mesa/book/bezsurf
+share/examples/Mesa/book/bezsurf.c
+share/examples/Mesa/book/checker
+share/examples/Mesa/book/checker.c
+share/examples/Mesa/book/checker2
+share/examples/Mesa/book/checker2.c
+share/examples/Mesa/book/chess
+share/examples/Mesa/book/chess.c
+share/examples/Mesa/book/clip
+share/examples/Mesa/book/clip.c
+share/examples/Mesa/book/colormat
+share/examples/Mesa/book/colormat.c
+share/examples/Mesa/book/cone
+share/examples/Mesa/book/cone.c
+share/examples/Mesa/book/cube
+share/examples/Mesa/book/cube.c
+share/examples/Mesa/book/curve
+share/examples/Mesa/book/curve.c
+share/examples/Mesa/book/depthcue
+share/examples/Mesa/book/depthcue.c
+share/examples/Mesa/book/disk
+share/examples/Mesa/book/disk.c
+share/examples/Mesa/book/dof
+share/examples/Mesa/book/dof.c
+share/examples/Mesa/book/dofnot
+share/examples/Mesa/book/dofnot.c
+share/examples/Mesa/book/double
+share/examples/Mesa/book/double.c
+share/examples/Mesa/book/drawf
+share/examples/Mesa/book/drawf.c
+share/examples/Mesa/book/feedback
+share/examples/Mesa/book/feedback.c
+share/examples/Mesa/book/fog
+share/examples/Mesa/book/fog.c
+share/examples/Mesa/book/fogindex
+share/examples/Mesa/book/fogindex.c
+share/examples/Mesa/book/font
+share/examples/Mesa/book/font.c
+share/examples/Mesa/book/jitter.h
+share/examples/Mesa/book/light
+share/examples/Mesa/book/light.c
+share/examples/Mesa/book/linelist
+share/examples/Mesa/book/linelist.c
+share/examples/Mesa/book/lines
+share/examples/Mesa/book/lines.c
+share/examples/Mesa/book/list
+share/examples/Mesa/book/list.c
+share/examples/Mesa/book/list2
+share/examples/Mesa/book/list2.c
+share/examples/Mesa/book/maplight
+share/examples/Mesa/book/maplight.c
+share/examples/Mesa/book/material
+share/examples/Mesa/book/material.c
+share/examples/Mesa/book/mipmap
+share/examples/Mesa/book/mipmap.c
+share/examples/Mesa/book/model
+share/examples/Mesa/book/model.c
+share/examples/Mesa/book/movelight
+share/examples/Mesa/book/movelight.c
+share/examples/Mesa/book/nurbs
+share/examples/Mesa/book/nurbs.c
+share/examples/Mesa/book/pickdepth
+share/examples/Mesa/book/pickdepth.c
+share/examples/Mesa/book/pickline
+share/examples/Mesa/book/pickline.c
+share/examples/Mesa/book/picksquare
+share/examples/Mesa/book/picksquare.c
+share/examples/Mesa/book/plane
+share/examples/Mesa/book/plane.c
+share/examples/Mesa/book/planet
+share/examples/Mesa/book/planet.c
+share/examples/Mesa/book/planetup
+share/examples/Mesa/book/planetup.c
+share/examples/Mesa/book/polys
+share/examples/Mesa/book/polys.c
+share/examples/Mesa/book/robot
+share/examples/Mesa/book/robot.c
+share/examples/Mesa/book/sccolorlight
+share/examples/Mesa/book/sccolorlight.c
+share/examples/Mesa/book/scene
+share/examples/Mesa/book/scene.c
+share/examples/Mesa/book/scenebamb
+share/examples/Mesa/book/scenebamb.c
+share/examples/Mesa/book/sceneflat
+share/examples/Mesa/book/sceneflat.c
+share/examples/Mesa/book/select
+share/examples/Mesa/book/select.c
+share/examples/Mesa/book/simple
+share/examples/Mesa/book/simple.c
+share/examples/Mesa/book/smooth
+share/examples/Mesa/book/smooth.c
+share/examples/Mesa/book/sphere
+share/examples/Mesa/book/sphere.c
+share/examples/Mesa/book/stencil
+share/examples/Mesa/book/stencil.c
+share/examples/Mesa/book/stroke
+share/examples/Mesa/book/stroke.c
+share/examples/Mesa/book/surface
+share/examples/Mesa/book/surface.c
+share/examples/Mesa/book/tea
+share/examples/Mesa/book/tea.c
+share/examples/Mesa/book/teaambient
+share/examples/Mesa/book/teaambient.c
+share/examples/Mesa/book/teapots
+share/examples/Mesa/book/teapots.c
+share/examples/Mesa/book/texgen
+share/examples/Mesa/book/texgen.c
+share/examples/Mesa/book/texturesurf
+share/examples/Mesa/book/texturesurf.c
+share/examples/Mesa/book/trim.c
+share/examples/Mesa/book/xfont
+share/examples/Mesa/book/xfont.c
+share/examples/Mesa/demos/Imakefile
+share/examples/Mesa/demos/Makefile
+share/examples/Mesa/demos/bounce
+share/examples/Mesa/demos/bounce.c
+share/examples/Mesa/demos/clearspd.c
+share/examples/Mesa/demos/descrip.mms
+share/examples/Mesa/demos/fdraw.f
+share/examples/Mesa/demos/ftest.c
+share/examples/Mesa/demos/gamma
+share/examples/Mesa/demos/gamma.c
+share/examples/Mesa/demos/gears
+share/examples/Mesa/demos/gears.c
+share/examples/Mesa/demos/glxdemo
+share/examples/Mesa/demos/glxdemo.c
+share/examples/Mesa/demos/glxpixmap
+share/examples/Mesa/demos/glxpixmap.c
+share/examples/Mesa/demos/isosurf
+share/examples/Mesa/demos/isosurf.c
+share/examples/Mesa/demos/isosurf.dat
+share/examples/Mesa/demos/morph3d
+share/examples/Mesa/demos/morph3d.c
+share/examples/Mesa/demos/offset
+share/examples/Mesa/demos/offset.c
+share/examples/Mesa/demos/osdemo
+share/examples/Mesa/demos/osdemo.c
+share/examples/Mesa/demos/reflect
+share/examples/Mesa/demos/reflect.c
+share/examples/Mesa/demos/spectex.c
+share/examples/Mesa/demos/spin
+share/examples/Mesa/demos/spin.c
+share/examples/Mesa/demos/stex3d
+share/examples/Mesa/demos/stex3d.c
+share/examples/Mesa/demos/tess_demo.c
+share/examples/Mesa/demos/test0
+share/examples/Mesa/demos/test0.c
+share/examples/Mesa/demos/texobj
+share/examples/Mesa/demos/texobj.c
+share/examples/Mesa/demos/trispd.c
+share/examples/Mesa/demos/vgears.c
+share/examples/Mesa/demos/vindex.c
+share/examples/Mesa/demos/vtest.c
+share/examples/Mesa/demos/winpos
+share/examples/Mesa/demos/winpos.c
+share/examples/Mesa/demos/xdemo
+share/examples/Mesa/demos/xdemo.c
+share/examples/Mesa/samples/1.rgb
+share/examples/Mesa/samples/2.rgb
+share/examples/Mesa/samples/3.rgb
+share/examples/Mesa/samples/4.rgb
+share/examples/Mesa/samples/Imakefile
+share/examples/Mesa/samples/Makefile
+share/examples/Mesa/samples/NOTES
+share/examples/Mesa/samples/README
+share/examples/Mesa/samples/accum
+share/examples/Mesa/samples/accum.c
+share/examples/Mesa/samples/bitmap1
+share/examples/Mesa/samples/bitmap1.c
+share/examples/Mesa/samples/bitmap2
+share/examples/Mesa/samples/bitmap2.c
+share/examples/Mesa/samples/blendeq
+share/examples/Mesa/samples/blendeq.c
+share/examples/Mesa/samples/blendxor
+share/examples/Mesa/samples/blendxor.c
+share/examples/Mesa/samples/copy
+share/examples/Mesa/samples/copy.c
+share/examples/Mesa/samples/cursor
+share/examples/Mesa/samples/cursor.c
+share/examples/Mesa/samples/depth
+share/examples/Mesa/samples/depth.c
+share/examples/Mesa/samples/eval
+share/examples/Mesa/samples/eval.c
+share/examples/Mesa/samples/fog
+share/examples/Mesa/samples/fog.c
+share/examples/Mesa/samples/font
+share/examples/Mesa/samples/font.c
+share/examples/Mesa/samples/line
+share/examples/Mesa/samples/line.c
+share/examples/Mesa/samples/logo
+share/examples/Mesa/samples/logo.c
+share/examples/Mesa/samples/nurb
+share/examples/Mesa/samples/nurb.c
+share/examples/Mesa/samples/oglinfo
+share/examples/Mesa/samples/oglinfo.c
+share/examples/Mesa/samples/olympic
+share/examples/Mesa/samples/olympic.c
+share/examples/Mesa/samples/overlay
+share/examples/Mesa/samples/overlay.c
+share/examples/Mesa/samples/point
+share/examples/Mesa/samples/point.c
+share/examples/Mesa/samples/prim
+share/examples/Mesa/samples/prim.c
+share/examples/Mesa/samples/quad
+share/examples/Mesa/samples/quad.c
+share/examples/Mesa/samples/select
+share/examples/Mesa/samples/select.c
+share/examples/Mesa/samples/shape
+share/examples/Mesa/samples/shape.c
+share/examples/Mesa/samples/speed
+share/examples/Mesa/samples/speed.c
+share/examples/Mesa/samples/sphere
+share/examples/Mesa/samples/sphere.c
+share/examples/Mesa/samples/star
+share/examples/Mesa/samples/star.c
+share/examples/Mesa/samples/stencil
+share/examples/Mesa/samples/stencil.c
+share/examples/Mesa/samples/stretch
+share/examples/Mesa/samples/stretch.c
+share/examples/Mesa/samples/texture
+share/examples/Mesa/samples/texture.c
+share/examples/Mesa/samples/tri
+share/examples/Mesa/samples/tri.c
+share/examples/Mesa/samples/wave
+share/examples/Mesa/samples/wave.c
+share/examples/Mesa/widgets-sgi/GLwDrawA.c
+share/examples/Mesa/widgets-sgi/GLwDrawA.h
+share/examples/Mesa/widgets-sgi/GLwDrawAP.h
+share/examples/Mesa/widgets-sgi/GLwMDrawA.c
+share/examples/Mesa/widgets-sgi/GLwMDrawA.h
+share/examples/Mesa/widgets-sgi/GLwMDrawAP.h
+share/examples/Mesa/widgets-sgi/Makefile
+share/examples/Mesa/widgets-sgi/README
+share/examples/Mesa/widgets-sgi/boilerplate.c
+share/examples/Mesa/widgets-sgi/depend
+@dirrm share/examples/Mesa/samples
+@dirrm share/examples/Mesa/book
+@dirrm share/examples/Mesa/demos
+@dirrm share/examples/Mesa/widgets-sgi
+@dirrm share/examples/Mesa
+@dirrm include/GL
diff --git a/graphics/mesagl/Makefile b/graphics/mesagl/Makefile
index 5b77cd41299..b188a55059f 100644
--- a/graphics/mesagl/Makefile
+++ b/graphics/mesagl/Makefile
@@ -1,18 +1,40 @@
 # New ports collection makefile for:    Mesa
-# Version required:     2.1
-# Date created:         3 Feb 1997
-# Whom:                 paulo@isr.uc.pt
+# Version required:     2.2
+# Date created:         Tue Feb  7 12:02:49  1995
+# Whom:                 hsu
 #
-# $Id: Makefile,v 1.16 1997/02/13 14:57:10 tg Exp $
+# $Id: Makefile,v 1.17 1997/02/14 14:18:06 tg Exp $
 #
 
-DISTNAME=       Mesa-2.1
+DISTNAME=       Mesa-2.2
 CATEGORIES=	graphics
 MASTER_SITES= 	ftp://iris.ssec.wisc.edu/pub/Mesa/
 
-MAINTAINER=	ports@freebsd.org
+MAINTAINER=	ports@FreeBSD.ORG
 
 ALL_TARGET=	freebsd
 USE_X11=	yes
+LIBS=		libMesaGL libMesaGLU libMesaaux libMesatk 
+SHLIB_VERSION=	13.2
+
+do-install:
+.for file in ${LIBS}
+	${INSTALL_DATA} ${WRKSRC}/lib/${file}.a ${PREFIX}/lib
+	ranlib ${PREFIX}/lib/${file}.a
+	${INSTALL_DATA} ${WRKSRC}/lib/${file}.so.${SHLIB_VERSION} ${PREFIX}/lib
+.endfor
+.for file in GL GLU
+	@ln -fs ${PREFIX}/lib/libMesa${file}.a ${PREFIX}/lib/lib${file}.a
+	@ln -fs ${PREFIX}/lib/libMesa${file}.so.${SHLIB_VERSION} ${PREFIX}/lib/lib${file}.so.${SHLIB_VERSION}
+.endfor
+	@${MKDIR} ${PREFIX}/include/GL
+	${INSTALL_DATA} ${WRKSRC}/include/GL/* ${PREFIX}/include/GL
+	@${MKDIR} ${PREFIX}/share/examples/Mesa
+	${CP} -Rp ${WRKSRC}/samples ${PREFIX}/share/examples/Mesa
+	${CP} -Rp ${WRKSRC}/demos ${PREFIX}/share/examples/Mesa
+	${CP} -Rp ${WRKSRC}/book ${PREFIX}/share/examples/Mesa
+	${CP} -Rp ${WRKSRC}/widgets-sgi ${PREFIX}/share/examples/Mesa
+	@${RM} -f ${PREFIX}/share/examples/Mesa/widgets-sgi/Makefile~
+	${LDCONFIG} -m ${PREFIX}/lib
 
 .include <bsd.port.mk>
diff --git a/graphics/mesagl/distinfo b/graphics/mesagl/distinfo
index 2609b26891b..bf22cc3e41b 100644
--- a/graphics/mesagl/distinfo
+++ b/graphics/mesagl/distinfo
@@ -1 +1 @@
-MD5 (Mesa-2.1.tar.gz) = f28336225b75782cdbee9bf8406d12e3
+MD5 (Mesa-2.2.tar.gz) = 6606b168dfcb15fdde7de1076d9adfa9
diff --git a/graphics/mesagl/files/patch-aa b/graphics/mesagl/files/patch-aa
deleted file mode 100644
index c5ec0c8de97..00000000000
--- a/graphics/mesagl/files/patch-aa
+++ /dev/null
@@ -1,33 +0,0 @@
---- Makefile.orig	Sat Nov 30 15:35:50 1996
-+++ Makefile	Fri Feb 14 12:15:16 1997
-@@ -289,3 +289,30 @@
- 	tar -cvf src.tar $(SRC_FILES) ; \
- 	gzip src.tar
- 
-+install:
-+	install -c -m 444 lib/libMesaGL.a ${X11BASE}/lib
-+	install -c -m 444 lib/libMesaGL.so.13.1 ${X11BASE}/lib
-+	install -c -m 444 lib/libMesaGLU.a ${X11BASE}/lib
-+	install -c -m 444 lib/libMesaGLU.so.13.1 ${X11BASE}/lib
-+	install -c -m 444 lib/libMesaaux.a ${X11BASE}/lib
-+	install -c -m 444 lib/libMesaaux.so.13.1 ${X11BASE}/lib
-+	install -c -m 444 lib/libMesatk.a ${X11BASE}/lib
-+	install -c -m 444 lib/libMesatk.so.13.1 ${X11BASE}/lib
-+	mkdir -p -m 0775 ${X11BASE}/include/Mesa/GL
-+	install -c include/glaux.h ${X11BASE}/include/Mesa
-+	install -c include/gltk.h ${X11BASE}/include/Mesa
-+	install -c include/GL/gmesa.h ${X11BASE}/include/Mesa/GL
-+	install -c include/GL/fgl.h ${X11BASE}/include/Mesa/GL
-+	install -c include/GL/gl.h ${X11BASE}/include/Mesa/GL
-+	install -c include/GL/glu.h ${X11BASE}/include/Mesa/GL
-+	install -c include/GL/glx.h ${X11BASE}/include/Mesa/GL
-+	install -c include/GL/osmesa.h ${X11BASE}/include/Mesa/GL
-+	install -c include/GL/svgamesa.h ${X11BASE}/include/Mesa/GL
-+	install -c include/GL/wmesa.h ${X11BASE}/include/Mesa/GL
-+	install -c include/GL/xmesa.h ${X11BASE}/include/Mesa/GL
-+	mkdir -p -m 0775 ${PREFIX}/share/Mesa
-+	cp -rp samples ${PREFIX}/share/Mesa
-+	cp -rp demos ${PREFIX}/share/Mesa
-+	cp -rp book ${PREFIX}/share/Mesa
-+	cp -rp widgets-sgi ${PREFIX}/share/Mesa
-+	ldconfig -m ${X11BASE}/lib
diff --git a/graphics/mesagl/pkg-descr b/graphics/mesagl/pkg-descr
index c0a0efe6fe3..5bca26de4ef 100644
--- a/graphics/mesagl/pkg-descr
+++ b/graphics/mesagl/pkg-descr
@@ -7,6 +7,6 @@ Those who want a licensed implementation of OpenGL should contact a licensed
 vendor.  This software is distributed under the terms of the GNU Library
 General Public License, see the LICENSE file for details.
 
-Note: Some examples are available under /usr/X11R6/share/Mesa.
+Note: Some examples are available under /usr/X11R6/share/examples/Mesa.
 
 paulo@isr.uc.pt
diff --git a/graphics/mesagl/pkg-plist b/graphics/mesagl/pkg-plist
index 86108de44ea..0a9832d9281 100644
--- a/graphics/mesagl/pkg-plist
+++ b/graphics/mesagl/pkg-plist
@@ -1,284 +1,299 @@
+include/GL/FooMesa.h
+include/GL/dosmesa.h
+include/GL/gl.h
+include/GL/gl_mangle.h
+include/GL/glu.h
+include/GL/glu_mangle.h
+include/GL/glx.h
+include/GL/glx_mangle.h
+include/GL/gmesa.h
+include/GL/osmesa.h
+include/GL/svgamesa.h
+include/GL/wmesa.h
+include/GL/xmesa.h
+lib/libGL.a
+lib/libGL.so.13.2
+lib/libGLU.a
+lib/libGLU.so.13.2
 lib/libMesaGL.a
-@exec ranlib %D/%F
-lib/libMesaGL.so.13.1
+lib/libMesaGL.so.13.2
 lib/libMesaGLU.a
-@exec ranlib %D/%F
-lib/libMesaGLU.so.13.1
+lib/libMesaGLU.so.13.2
 lib/libMesaaux.a
-@exec ranlib %D/%F
-lib/libMesaaux.so.13.1
+lib/libMesaaux.so.13.2
 lib/libMesatk.a
-@exec ranlib %D/%F
-lib/libMesatk.so.13.1
+lib/libMesatk.so.13.2
 @exec ldconfig -m %B
-include/Mesa/glaux.h
-include/Mesa/gltk.h
-include/Mesa/GL/fgl.h
-include/Mesa/GL/gl.h
-include/Mesa/GL/glu.h
-include/Mesa/GL/glx.h
-include/Mesa/GL/gmesa.h
-include/Mesa/GL/osmesa.h
-include/Mesa/GL/svgamesa.h
-include/Mesa/GL/wmesa.h
-include/Mesa/GL/xmesa.h
-share/Mesa/samples/wave
-share/Mesa/samples/Imakefile
-share/Mesa/samples/NOTES
-share/Mesa/samples/README
-share/Mesa/samples/1.rgb
-share/Mesa/samples/2.rgb
-share/Mesa/samples/3.rgb
-share/Mesa/samples/4.rgb
-share/Mesa/samples/accum.c
-share/Mesa/samples/bitmap1.c
-share/Mesa/samples/bitmap2.c
-share/Mesa/samples/blendeq.c
-share/Mesa/samples/blendxor.c
-share/Mesa/samples/copy.c
-share/Mesa/samples/cursor.c
-share/Mesa/samples/depth.c
-share/Mesa/samples/eval.c
-share/Mesa/samples/fog.c
-share/Mesa/samples/font.c
-share/Mesa/samples/line.c
-share/Mesa/samples/logo.c
-share/Mesa/samples/nurb.c
-share/Mesa/samples/oglinfo.c
-share/Mesa/samples/olympic.c
-share/Mesa/samples/overlay.c
-share/Mesa/samples/point.c
-share/Mesa/samples/prim.c
-share/Mesa/samples/quad.c
-share/Mesa/samples/select.c
-share/Mesa/samples/shape.c
-share/Mesa/samples/speed.c
-share/Mesa/samples/sphere.c
-share/Mesa/samples/star.c
-share/Mesa/samples/stencil.c
-share/Mesa/samples/stretch.c
-share/Mesa/samples/texture.c
-share/Mesa/samples/tri.c
-share/Mesa/samples/wave.c
-share/Mesa/samples/accum
-share/Mesa/samples/bitmap1
-share/Mesa/samples/bitmap2
-share/Mesa/samples/blendeq
-share/Mesa/samples/blendxor
-share/Mesa/samples/copy
-share/Mesa/samples/cursor
-share/Mesa/samples/depth
-share/Mesa/samples/eval
-share/Mesa/samples/fog
-share/Mesa/samples/font
-share/Mesa/samples/line
-share/Mesa/samples/logo
-share/Mesa/samples/nurb
-share/Mesa/samples/oglinfo
-share/Mesa/samples/olympic
-share/Mesa/samples/overlay
-share/Mesa/samples/point
-share/Mesa/samples/prim
-share/Mesa/samples/quad
-share/Mesa/samples/tri
-share/Mesa/samples/select
-share/Mesa/samples/shape
-share/Mesa/samples/speed
-share/Mesa/samples/sphere
-share/Mesa/samples/star
-share/Mesa/samples/stencil
-share/Mesa/samples/stretch
-share/Mesa/samples/texture
-share/Mesa/samples/Makefile
-share/Mesa/demos/winpos
-share/Mesa/demos/Imakefile
-share/Mesa/demos/descrip.mms
-share/Mesa/demos/bounce.c
-share/Mesa/demos/fdraw.f
-share/Mesa/demos/ftest.c
-share/Mesa/demos/gamma.c
-share/Mesa/demos/gears.c
-share/Mesa/demos/glxdemo.c
-share/Mesa/demos/glxpixmap.c
-share/Mesa/demos/isosurf.c
-share/Mesa/demos/offset.c
-share/Mesa/demos/osdemo.c
-share/Mesa/demos/reflect.c
-share/Mesa/demos/spin.c
-share/Mesa/demos/tess_demo.c
-share/Mesa/demos/test0.c
-share/Mesa/demos/texobj.c
-share/Mesa/demos/vgears.c
-share/Mesa/demos/vindex.c
-share/Mesa/demos/vtest.c
-share/Mesa/demos/winpos.c
-share/Mesa/demos/xdemo.c
-share/Mesa/demos/isosurf.dat
-share/Mesa/demos/bounce
-share/Mesa/demos/gamma
-share/Mesa/demos/gears
-share/Mesa/demos/glxdemo
-share/Mesa/demos/glxpixmap
-share/Mesa/demos/isosurf
-share/Mesa/demos/offset
-share/Mesa/demos/osdemo
-share/Mesa/demos/spin
-share/Mesa/demos/test0
-share/Mesa/demos/texobj
-share/Mesa/demos/xdemo
-share/Mesa/demos/reflect
-share/Mesa/demos/Makefile
-share/Mesa/book/xfont
-share/Mesa/book/Imakefile
-share/Mesa/book/NOTES
-share/Mesa/book/README
-share/Mesa/book/accanti.c
-share/Mesa/book/accnot.c
-share/Mesa/book/accpersp.c
-share/Mesa/book/accum.c
-share/Mesa/book/aim.c
-share/Mesa/book/alpha.c
-share/Mesa/book/alpha3D.c
-share/Mesa/book/anti.c
-share/Mesa/book/antiindex.c
-share/Mesa/book/antipindex.c
-share/Mesa/book/antipoint.c
-share/Mesa/book/antipoly.c
-share/Mesa/book/bezcurve.c
-share/Mesa/book/bezmesh.c
-share/Mesa/book/bezsurf.c
-share/Mesa/book/checker.c
-share/Mesa/book/checker2.c
-share/Mesa/book/chess.c
-share/Mesa/book/clip.c
-share/Mesa/book/colormat.c
-share/Mesa/book/cone.c
-share/Mesa/book/cube.c
-share/Mesa/book/curve.c
-share/Mesa/book/depthcue.c
-share/Mesa/book/disk.c
-share/Mesa/book/dof.c
-share/Mesa/book/dofnot.c
-share/Mesa/book/double.c
-share/Mesa/book/drawf.c
-share/Mesa/book/feedback.c
-share/Mesa/book/fog.c
-share/Mesa/book/fogindex.c
-share/Mesa/book/font.c
-share/Mesa/book/jitter.h
-share/Mesa/book/light.c
-share/Mesa/book/linelist.c
-share/Mesa/book/lines.c
-share/Mesa/book/list.c
-share/Mesa/book/list2.c
-share/Mesa/book/maplight.c
-share/Mesa/book/material.c
-share/Mesa/book/mipmap.c
-share/Mesa/book/model.c
-share/Mesa/book/movelight.c
-share/Mesa/book/nurbs.c
-share/Mesa/book/pickdepth.c
-share/Mesa/book/pickline.c
-share/Mesa/book/picksquare.c
-share/Mesa/book/plane.c
-share/Mesa/book/planet.c
-share/Mesa/book/planetup.c
-share/Mesa/book/polys.c
-share/Mesa/book/robot.c
-share/Mesa/book/sccolorlight.c
-share/Mesa/book/scene.c
-share/Mesa/book/scenebamb.c
-share/Mesa/book/sceneflat.c
-share/Mesa/book/select.c
-share/Mesa/book/simple.c
-share/Mesa/book/smooth.c
-share/Mesa/book/sphere.c
-share/Mesa/book/stencil.c
-share/Mesa/book/stroke.c
-share/Mesa/book/surface.c
-share/Mesa/book/tea.c
-share/Mesa/book/teaambient.c
-share/Mesa/book/teapots.c
-share/Mesa/book/texgen.c
-share/Mesa/book/texturesurf.c
-share/Mesa/book/trim.c
-share/Mesa/book/xfont.c
-share/Mesa/book/robot
-share/Mesa/book/accanti
-share/Mesa/book/accnot
-share/Mesa/book/accpersp
-share/Mesa/book/accum
-share/Mesa/book/aim
-share/Mesa/book/alpha
-share/Mesa/book/alpha3D
-share/Mesa/book/anti
-share/Mesa/book/antiindex
-share/Mesa/book/antipindex
-share/Mesa/book/antipoint
-share/Mesa/book/antipoly
-share/Mesa/book/bezcurve
-share/Mesa/book/bezmesh
-share/Mesa/book/bezsurf
-share/Mesa/book/checker
-share/Mesa/book/checker2
-share/Mesa/book/chess
-share/Mesa/book/clip
-share/Mesa/book/colormat
-share/Mesa/book/cone
-share/Mesa/book/cube
-share/Mesa/book/curve
-share/Mesa/book/depthcue
-share/Mesa/book/disk
-share/Mesa/book/dof
-share/Mesa/book/dofnot
-share/Mesa/book/double
-share/Mesa/book/drawf
-share/Mesa/book/feedback
-share/Mesa/book/fog
-share/Mesa/book/fogindex
-share/Mesa/book/font
-share/Mesa/book/light
-share/Mesa/book/lines
-share/Mesa/book/linelist
-share/Mesa/book/list
-share/Mesa/book/list2
-share/Mesa/book/maplight
-share/Mesa/book/material
-share/Mesa/book/mipmap
-share/Mesa/book/model
-share/Mesa/book/movelight
-share/Mesa/book/nurbs
-share/Mesa/book/pickdepth
-share/Mesa/book/pickline
-share/Mesa/book/picksquare
-share/Mesa/book/plane
-share/Mesa/book/planet
-share/Mesa/book/planetup
-share/Mesa/book/polys
-share/Mesa/book/sccolorlight
-share/Mesa/book/scene
-share/Mesa/book/scenebamb
-share/Mesa/book/sceneflat
-share/Mesa/book/select
-share/Mesa/book/simple
-share/Mesa/book/smooth
-share/Mesa/book/sphere
-share/Mesa/book/stencil
-share/Mesa/book/stroke
-share/Mesa/book/surface
-share/Mesa/book/tea
-share/Mesa/book/teaambient
-share/Mesa/book/teapots
-share/Mesa/book/texgen
-share/Mesa/book/texturesurf
-share/Mesa/book/Makefile
-share/Mesa/widgets-sgi/depend
-share/Mesa/widgets-sgi/GLwDrawA.h
-share/Mesa/widgets-sgi/GLwDrawAP.h
-share/Mesa/widgets-sgi/GLwMDrawA.c
-share/Mesa/widgets-sgi/GLwMDrawA.h
-share/Mesa/widgets-sgi/GLwMDrawAP.h
-share/Mesa/widgets-sgi/Makefile
-share/Mesa/widgets-sgi/README
-share/Mesa/widgets-sgi/boilerplate.c
-share/Mesa/widgets-sgi/GLwDrawA.c
+share/examples/Mesa/book/Imakefile
+share/examples/Mesa/book/Makefile
+share/examples/Mesa/book/NOTES
+share/examples/Mesa/book/README
+share/examples/Mesa/book/accanti
+share/examples/Mesa/book/accanti.c
+share/examples/Mesa/book/accnot
+share/examples/Mesa/book/accnot.c
+share/examples/Mesa/book/accpersp
+share/examples/Mesa/book/accpersp.c
+share/examples/Mesa/book/accum
+share/examples/Mesa/book/accum.c
+share/examples/Mesa/book/aim
+share/examples/Mesa/book/aim.c
+share/examples/Mesa/book/alpha
+share/examples/Mesa/book/alpha.c
+share/examples/Mesa/book/alpha3D
+share/examples/Mesa/book/alpha3D.c
+share/examples/Mesa/book/anti
+share/examples/Mesa/book/anti.c
+share/examples/Mesa/book/antiindex
+share/examples/Mesa/book/antiindex.c
+share/examples/Mesa/book/antipindex
+share/examples/Mesa/book/antipindex.c
+share/examples/Mesa/book/antipoint
+share/examples/Mesa/book/antipoint.c
+share/examples/Mesa/book/antipoly
+share/examples/Mesa/book/antipoly.c
+share/examples/Mesa/book/bezcurve
+share/examples/Mesa/book/bezcurve.c
+share/examples/Mesa/book/bezmesh
+share/examples/Mesa/book/bezmesh.c
+share/examples/Mesa/book/bezsurf
+share/examples/Mesa/book/bezsurf.c
+share/examples/Mesa/book/checker
+share/examples/Mesa/book/checker.c
+share/examples/Mesa/book/checker2
+share/examples/Mesa/book/checker2.c
+share/examples/Mesa/book/chess
+share/examples/Mesa/book/chess.c
+share/examples/Mesa/book/clip
+share/examples/Mesa/book/clip.c
+share/examples/Mesa/book/colormat
+share/examples/Mesa/book/colormat.c
+share/examples/Mesa/book/cone
+share/examples/Mesa/book/cone.c
+share/examples/Mesa/book/cube
+share/examples/Mesa/book/cube.c
+share/examples/Mesa/book/curve
+share/examples/Mesa/book/curve.c
+share/examples/Mesa/book/depthcue
+share/examples/Mesa/book/depthcue.c
+share/examples/Mesa/book/disk
+share/examples/Mesa/book/disk.c
+share/examples/Mesa/book/dof
+share/examples/Mesa/book/dof.c
+share/examples/Mesa/book/dofnot
+share/examples/Mesa/book/dofnot.c
+share/examples/Mesa/book/double
+share/examples/Mesa/book/double.c
+share/examples/Mesa/book/drawf
+share/examples/Mesa/book/drawf.c
+share/examples/Mesa/book/feedback
+share/examples/Mesa/book/feedback.c
+share/examples/Mesa/book/fog
+share/examples/Mesa/book/fog.c
+share/examples/Mesa/book/fogindex
+share/examples/Mesa/book/fogindex.c
+share/examples/Mesa/book/font
+share/examples/Mesa/book/font.c
+share/examples/Mesa/book/jitter.h
+share/examples/Mesa/book/light
+share/examples/Mesa/book/light.c
+share/examples/Mesa/book/linelist
+share/examples/Mesa/book/linelist.c
+share/examples/Mesa/book/lines
+share/examples/Mesa/book/lines.c
+share/examples/Mesa/book/list
+share/examples/Mesa/book/list.c
+share/examples/Mesa/book/list2
+share/examples/Mesa/book/list2.c
+share/examples/Mesa/book/maplight
+share/examples/Mesa/book/maplight.c
+share/examples/Mesa/book/material
+share/examples/Mesa/book/material.c
+share/examples/Mesa/book/mipmap
+share/examples/Mesa/book/mipmap.c
+share/examples/Mesa/book/model
+share/examples/Mesa/book/model.c
+share/examples/Mesa/book/movelight
+share/examples/Mesa/book/movelight.c
+share/examples/Mesa/book/nurbs
+share/examples/Mesa/book/nurbs.c
+share/examples/Mesa/book/pickdepth
+share/examples/Mesa/book/pickdepth.c
+share/examples/Mesa/book/pickline
+share/examples/Mesa/book/pickline.c
+share/examples/Mesa/book/picksquare
+share/examples/Mesa/book/picksquare.c
+share/examples/Mesa/book/plane
+share/examples/Mesa/book/plane.c
+share/examples/Mesa/book/planet
+share/examples/Mesa/book/planet.c
+share/examples/Mesa/book/planetup
+share/examples/Mesa/book/planetup.c
+share/examples/Mesa/book/polys
+share/examples/Mesa/book/polys.c
+share/examples/Mesa/book/robot
+share/examples/Mesa/book/robot.c
+share/examples/Mesa/book/sccolorlight
+share/examples/Mesa/book/sccolorlight.c
+share/examples/Mesa/book/scene
+share/examples/Mesa/book/scene.c
+share/examples/Mesa/book/scenebamb
+share/examples/Mesa/book/scenebamb.c
+share/examples/Mesa/book/sceneflat
+share/examples/Mesa/book/sceneflat.c
+share/examples/Mesa/book/select
+share/examples/Mesa/book/select.c
+share/examples/Mesa/book/simple
+share/examples/Mesa/book/simple.c
+share/examples/Mesa/book/smooth
+share/examples/Mesa/book/smooth.c
+share/examples/Mesa/book/sphere
+share/examples/Mesa/book/sphere.c
+share/examples/Mesa/book/stencil
+share/examples/Mesa/book/stencil.c
+share/examples/Mesa/book/stroke
+share/examples/Mesa/book/stroke.c
+share/examples/Mesa/book/surface
+share/examples/Mesa/book/surface.c
+share/examples/Mesa/book/tea
+share/examples/Mesa/book/tea.c
+share/examples/Mesa/book/teaambient
+share/examples/Mesa/book/teaambient.c
+share/examples/Mesa/book/teapots
+share/examples/Mesa/book/teapots.c
+share/examples/Mesa/book/texgen
+share/examples/Mesa/book/texgen.c
+share/examples/Mesa/book/texturesurf
+share/examples/Mesa/book/texturesurf.c
+share/examples/Mesa/book/trim.c
+share/examples/Mesa/book/xfont
+share/examples/Mesa/book/xfont.c
+share/examples/Mesa/demos/Imakefile
+share/examples/Mesa/demos/Makefile
+share/examples/Mesa/demos/bounce
+share/examples/Mesa/demos/bounce.c
+share/examples/Mesa/demos/clearspd.c
+share/examples/Mesa/demos/descrip.mms
+share/examples/Mesa/demos/fdraw.f
+share/examples/Mesa/demos/ftest.c
+share/examples/Mesa/demos/gamma
+share/examples/Mesa/demos/gamma.c
+share/examples/Mesa/demos/gears
+share/examples/Mesa/demos/gears.c
+share/examples/Mesa/demos/glxdemo
+share/examples/Mesa/demos/glxdemo.c
+share/examples/Mesa/demos/glxpixmap
+share/examples/Mesa/demos/glxpixmap.c
+share/examples/Mesa/demos/isosurf
+share/examples/Mesa/demos/isosurf.c
+share/examples/Mesa/demos/isosurf.dat
+share/examples/Mesa/demos/morph3d
+share/examples/Mesa/demos/morph3d.c
+share/examples/Mesa/demos/offset
+share/examples/Mesa/demos/offset.c
+share/examples/Mesa/demos/osdemo
+share/examples/Mesa/demos/osdemo.c
+share/examples/Mesa/demos/reflect
+share/examples/Mesa/demos/reflect.c
+share/examples/Mesa/demos/spectex.c
+share/examples/Mesa/demos/spin
+share/examples/Mesa/demos/spin.c
+share/examples/Mesa/demos/stex3d
+share/examples/Mesa/demos/stex3d.c
+share/examples/Mesa/demos/tess_demo.c
+share/examples/Mesa/demos/test0
+share/examples/Mesa/demos/test0.c
+share/examples/Mesa/demos/texobj
+share/examples/Mesa/demos/texobj.c
+share/examples/Mesa/demos/trispd.c
+share/examples/Mesa/demos/vgears.c
+share/examples/Mesa/demos/vindex.c
+share/examples/Mesa/demos/vtest.c
+share/examples/Mesa/demos/winpos
+share/examples/Mesa/demos/winpos.c
+share/examples/Mesa/demos/xdemo
+share/examples/Mesa/demos/xdemo.c
+share/examples/Mesa/samples/1.rgb
+share/examples/Mesa/samples/2.rgb
+share/examples/Mesa/samples/3.rgb
+share/examples/Mesa/samples/4.rgb
+share/examples/Mesa/samples/Imakefile
+share/examples/Mesa/samples/Makefile
+share/examples/Mesa/samples/NOTES
+share/examples/Mesa/samples/README
+share/examples/Mesa/samples/accum
+share/examples/Mesa/samples/accum.c
+share/examples/Mesa/samples/bitmap1
+share/examples/Mesa/samples/bitmap1.c
+share/examples/Mesa/samples/bitmap2
+share/examples/Mesa/samples/bitmap2.c
+share/examples/Mesa/samples/blendeq
+share/examples/Mesa/samples/blendeq.c
+share/examples/Mesa/samples/blendxor
+share/examples/Mesa/samples/blendxor.c
+share/examples/Mesa/samples/copy
+share/examples/Mesa/samples/copy.c
+share/examples/Mesa/samples/cursor
+share/examples/Mesa/samples/cursor.c
+share/examples/Mesa/samples/depth
+share/examples/Mesa/samples/depth.c
+share/examples/Mesa/samples/eval
+share/examples/Mesa/samples/eval.c
+share/examples/Mesa/samples/fog
+share/examples/Mesa/samples/fog.c
+share/examples/Mesa/samples/font
+share/examples/Mesa/samples/font.c
+share/examples/Mesa/samples/line
+share/examples/Mesa/samples/line.c
+share/examples/Mesa/samples/logo
+share/examples/Mesa/samples/logo.c
+share/examples/Mesa/samples/nurb
+share/examples/Mesa/samples/nurb.c
+share/examples/Mesa/samples/oglinfo
+share/examples/Mesa/samples/oglinfo.c
+share/examples/Mesa/samples/olympic
+share/examples/Mesa/samples/olympic.c
+share/examples/Mesa/samples/overlay
+share/examples/Mesa/samples/overlay.c
+share/examples/Mesa/samples/point
+share/examples/Mesa/samples/point.c
+share/examples/Mesa/samples/prim
+share/examples/Mesa/samples/prim.c
+share/examples/Mesa/samples/quad
+share/examples/Mesa/samples/quad.c
+share/examples/Mesa/samples/select
+share/examples/Mesa/samples/select.c
+share/examples/Mesa/samples/shape
+share/examples/Mesa/samples/shape.c
+share/examples/Mesa/samples/speed
+share/examples/Mesa/samples/speed.c
+share/examples/Mesa/samples/sphere
+share/examples/Mesa/samples/sphere.c
+share/examples/Mesa/samples/star
+share/examples/Mesa/samples/star.c
+share/examples/Mesa/samples/stencil
+share/examples/Mesa/samples/stencil.c
+share/examples/Mesa/samples/stretch
+share/examples/Mesa/samples/stretch.c
+share/examples/Mesa/samples/texture
+share/examples/Mesa/samples/texture.c
+share/examples/Mesa/samples/tri
+share/examples/Mesa/samples/tri.c
+share/examples/Mesa/samples/wave
+share/examples/Mesa/samples/wave.c
+share/examples/Mesa/widgets-sgi/GLwDrawA.c
+share/examples/Mesa/widgets-sgi/GLwDrawA.h
+share/examples/Mesa/widgets-sgi/GLwDrawAP.h
+share/examples/Mesa/widgets-sgi/GLwMDrawA.c
+share/examples/Mesa/widgets-sgi/GLwMDrawA.h
+share/examples/Mesa/widgets-sgi/GLwMDrawAP.h
+share/examples/Mesa/widgets-sgi/Makefile
+share/examples/Mesa/widgets-sgi/README
+share/examples/Mesa/widgets-sgi/boilerplate.c
+share/examples/Mesa/widgets-sgi/depend
+@dirrm share/examples/Mesa/samples
+@dirrm share/examples/Mesa/book
+@dirrm share/examples/Mesa/demos
+@dirrm share/examples/Mesa/widgets-sgi
+@dirrm share/examples/Mesa
+@dirrm include/GL