Upgrade to 2.1.

Closes PR #2659.

Submitted by:	Paulo Menezes <paulo@isr.uc.pt>

5 files changed, 297 insertions, 36 deletions

diff --git a/graphics/Mesa3/Makefile b/graphics/Mesa3/Makefile
index 3aad1391d9c7..09dc123dade8 100644
--- a/graphics/Mesa3/Makefile
+++ b/graphics/Mesa3/Makefile
@@ -1,18 +1,20 @@
 # New ports collection makefile for:    Mesa
-# Version required:     2.0
-# Date created:         3 Dec 1996
+# Version required:     2.1
+# Date created:         3 Feb 1997
 # Whom:                 paulo@isr.uc.pt
 #
-# $Id: Makefile,v 1.14 1996/12/17 01:05:52 jkh Exp $
+# $Id$
 #
 
-DISTNAME=       Mesa-2.0
+DISTNAME=       Mesa-2.1
 CATEGORIES=	graphics
+
 MASTER_SITES= 	ftp://iris.ssec.wisc.edu/pub/Mesa/
 
 ALL_TARGET=	freebsd
 USE_X11=	yes
 
-.include <bsd.port.mk>
-
+pre-install:
+	$(FILESDIR)/INSTALL $(DISTNAME) PRE-INSTALL
 
+.include <bsd.port.mk>
diff --git a/graphics/Mesa3/distinfo b/graphics/Mesa3/distinfo
index 3f3b8e551f3d..2609b26891bd 100644
--- a/graphics/Mesa3/distinfo
+++ b/graphics/Mesa3/distinfo
@@ -1 +1 @@
-MD5 (Mesa-2.0.tar.gz) = 96584e8809906a903ca714ae941a8423
+MD5 (Mesa-2.1.tar.gz) = f28336225b75782cdbee9bf8406d12e3
diff --git a/graphics/Mesa3/files/patch-aa b/graphics/Mesa3/files/patch-aa
index fca00c048a52..1059c4e5417a 100644
--- a/graphics/Mesa3/files/patch-aa
+++ b/graphics/Mesa3/files/patch-aa
@@ -1,20 +1,20 @@
-*** Makefile.old	Wed Dec  4 01:51:17 1996
---- Makefile	Wed Dec  4 01:53:57 1996
+*** Makefile.old	Wed Jan 29 19:27:49 1997
+--- Makefile	Wed Jan 29 19:28:44 1997
 ***************
-*** 118,123 ****
---- 118,146 ----
-  	cd samples ; $(MAKE) $@
-  	cd book ; $(MAKE) $@
+*** 289,291 ****
+--- 289,318 ----
+  	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.0 ${X11BASE}/lib
++ 	install -c -m 444 lib/libMesaGL.so.2.1 ${X11BASE}/lib
 + 	install -c -m 444 lib/libMesaGLU.a ${X11BASE}/lib
-+ 	install -c -m 444 lib/libMesaGLU.so.13.0 ${X11BASE}/lib
++ 	install -c -m 444 lib/libMesaGLU.so.2.1 ${X11BASE}/lib
 + 	install -c -m 444 lib/libMesaaux.a ${X11BASE}/lib
-+ 	install -c -m 444 lib/libMesaaux.so.13.0 ${X11BASE}/lib
++ 	install -c -m 444 lib/libMesaaux.so.2.1 ${X11BASE}/lib
 + 	install -c -m 444 lib/libMesatk.a ${X11BASE}/lib
-+ 	install -c -m 444 lib/libMesatk.so.13.0 ${X11BASE}/lib
++ 	install -c -m 444 lib/libMesatk.so.2.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
@@ -27,19 +27,10 @@
 + 	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
-+ 
-  amiga:
-  	@echo "See the README.AMIGA file for installation information"
-  
---- ./mklib.freebsd.org	Tue Aug 13 19:56:47 1996
-+++ ./mklib.freebsd	Mon Dec 16 19:52:10 1996
-@@ -6,7 +6,7 @@
- # First argument is name of output library
- # Rest of arguments are object files
- 
--VERSION="2.0"
-+VERSION="13.0"
- 
- LIBRARY=$1
- shift 1
++  
diff --git a/graphics/Mesa3/pkg-descr b/graphics/Mesa3/pkg-descr
index df2b46cf017c..c0a0efe6fe3f 100644
--- a/graphics/Mesa3/pkg-descr
+++ b/graphics/Mesa3/pkg-descr
@@ -7,3 +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.
+
+paulo@isr.uc.pt
diff --git a/graphics/Mesa3/pkg-plist b/graphics/Mesa3/pkg-plist
index 19bfb115b2a2..d60443b87318 100644
--- a/graphics/Mesa3/pkg-plist
+++ b/graphics/Mesa3/pkg-plist
@@ -1,11 +1,16 @@
 lib/libMesaGL.a
-lib/libMesaGL.so.13.0
+@exec ranlib %D/%F
+lib/libMesaGL.so.2.1
 lib/libMesaGLU.a
-lib/libMesaGLU.so.13.0
+@exec ranlib %D/%F
+lib/libMesaGLU.so.2.1
 lib/libMesaaux.a
-lib/libMesaaux.so.13.0
+@exec ranlib %D/%F
+lib/libMesaaux.so.2.1
 lib/libMesatk.a
-lib/libMesatk.so.13.0
+@exec ranlib %D/%F
+lib/libMesatk.so.2.1
+@exec ldconfig -m %B
 include/Mesa/glaux.h
 include/Mesa/gltk.h
 include/Mesa/GL/fgl.h
@@ -17,3 +22,263 @@ 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