Update to version 2.0

Submitted-By:Paulo Menezes <paulo@lapa.isr.uc.pt>

8 files changed, 102 insertions, 94 deletions

diff --git a/graphics/Mesa3/Makefile b/graphics/Mesa3/Makefile
index cae56d17efc9..e9d1ef0fa455 100644
--- a/graphics/Mesa3/Makefile
+++ b/graphics/Mesa3/Makefile
@@ -1,16 +1,18 @@
 # New ports collection makefile for:    Mesa
-# Version required:     1.2.7
-# Date created:         Tue Feb  7 12:02:49  1995
-# Whom:                 hsu
+# Version required:     2.0
+# Date created:         3 Dec 1996
+# Whom:                 paulo@isr.uc.pt
 #
-# $Id: Makefile,v 1.10 1996/05/16 06:19:11 asami Exp $
+# $Id$
 #
-
-DISTNAME=       Mesa-1.2.7
+DISTNAME=       Mesa-2.0
+PKGNAME=	mesa-2.0
 CATEGORIES=	graphics
-MASTER_SITES=   ftp://iris.ssec.wisc.edu/pub/Mesa/
-
-ALL_TARGET=     freebsd
+MASTER_SITES= 	ftp://iris.ssec.wisc.edu/pub/Mesa/
+DISTFILES=      Mesa-2.0.tar.gz
+ALL_TARGET=	freebsd
 USE_X11=	yes
 
 .include <bsd.port.mk>
+
+
diff --git a/graphics/Mesa3/distinfo b/graphics/Mesa3/distinfo
index 8bb9c4c61cd2..3f3b8e551f3d 100644
--- a/graphics/Mesa3/distinfo
+++ b/graphics/Mesa3/distinfo
@@ -1 +1 @@
-MD5 (Mesa-1.2.7.tar.gz) = 58a39f8da88fe17815a9ca71fe1c22df
+MD5 (Mesa-2.0.tar.gz) = 96584e8809906a903ca714ae941a8423
diff --git a/graphics/Mesa3/files/patch-aa b/graphics/Mesa3/files/patch-aa
index c3b71d97e9c9..d6d6a83c9aef 100644
--- a/graphics/Mesa3/files/patch-aa
+++ b/graphics/Mesa3/files/patch-aa
@@ -1,32 +1,34 @@
---- Makefile.orig	Wed May  8 21:34:09 1996
-+++ Makefile	Wed May  8 21:44:14 1996
-@@ -178,6 +178,29 @@
- 	cd samples ; $(MAKE) $@
- 	cd book ; $(MAKE) $@
- 
-+install:
-+	install -c -m 444 lib/libMesaGL.a ${X11BASE}/lib
-+	install -c -m 444 lib/libMesaGL.so.12.7 ${X11BASE}/lib
-+	install -c -m 444 lib/libMesaGLU.a ${X11BASE}/lib
-+	install -c -m 444 lib/libMesaGLU.so.12.7 ${X11BASE}/lib
-+	install -c -m 444 lib/libMesaaux.a ${X11BASE}/lib
-+	install -c -m 444 lib/libMesaaux.so.12.7 ${X11BASE}/lib
-+	install -c -m 444 lib/libMesatk.a ${X11BASE}/lib
-+	install -c -m 444 lib/libMesatk.so.12.7 ${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/amesa.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
-+	ldconfig -m ${X11BASE}/lib
-+
- next:
- 	-mkdir lib
- 	cd src ; $(MAKE) -f Makefile.NeXT $@
+*** Makefile.old	Wed Dec  4 01:51:17 1996
+--- Makefile	Wed Dec  4 01:53:57 1996
+***************
+*** 118,123 ****
+--- 118,146 ----
+  	cd samples ; $(MAKE) $@
+  	cd book ; $(MAKE) $@
+  
++ install:
++ 	install -c -m 444 lib/libMesaGL.a ${X11BASE}/lib
++ 	install -c -m 444 lib/libMesaGL.so.2.0 ${X11BASE}/lib
++ 	install -c -m 444 lib/libMesaGLU.a ${X11BASE}/lib
++ 	install -c -m 444 lib/libMesaGLU.so.2.0 ${X11BASE}/lib
++ 	install -c -m 444 lib/libMesaaux.a ${X11BASE}/lib
++ 	install -c -m 444 lib/libMesaaux.so.2.0 ${X11BASE}/lib
++ 	install -c -m 444 lib/libMesatk.a ${X11BASE}/lib
++ 	install -c -m 444 lib/libMesatk.so.2.0 ${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
++ 	ldconfig -m ${X11BASE}/lib
++ 
+  amiga:
+  	@echo "See the README.AMIGA file for installation information"
+  
diff --git a/graphics/Mesa3/pkg-plist b/graphics/Mesa3/pkg-plist
index 2f5e1434a9ee..a0218efef7af 100644
--- a/graphics/Mesa3/pkg-plist
+++ b/graphics/Mesa3/pkg-plist
@@ -1,18 +1,18 @@
 lib/libMesaGL.a
-lib/libMesaGL.so.12.7
+lib/libMesaGL.so.2.0
 lib/libMesaGLU.a
-lib/libMesaGLU.so.12.7
+lib/libMesaGLU.so.2.0
 lib/libMesaaux.a
-lib/libMesaaux.so.12.7
+lib/libMesaaux.so.2.0
 lib/libMesatk.a
-lib/libMesatk.so.12.7
+lib/libMesatk.so.2.0
 include/Mesa/glaux.h
 include/Mesa/gltk.h
-include/Mesa/GL/amesa.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
diff --git a/graphics/mesagl/Makefile b/graphics/mesagl/Makefile
index cae56d17efc9..e9d1ef0fa455 100644
--- a/graphics/mesagl/Makefile
+++ b/graphics/mesagl/Makefile
@@ -1,16 +1,18 @@
 # New ports collection makefile for:    Mesa
-# Version required:     1.2.7
-# Date created:         Tue Feb  7 12:02:49  1995
-# Whom:                 hsu
+# Version required:     2.0
+# Date created:         3 Dec 1996
+# Whom:                 paulo@isr.uc.pt
 #
-# $Id: Makefile,v 1.10 1996/05/16 06:19:11 asami Exp $
+# $Id$
 #
-
-DISTNAME=       Mesa-1.2.7
+DISTNAME=       Mesa-2.0
+PKGNAME=	mesa-2.0
 CATEGORIES=	graphics
-MASTER_SITES=   ftp://iris.ssec.wisc.edu/pub/Mesa/
-
-ALL_TARGET=     freebsd
+MASTER_SITES= 	ftp://iris.ssec.wisc.edu/pub/Mesa/
+DISTFILES=      Mesa-2.0.tar.gz
+ALL_TARGET=	freebsd
 USE_X11=	yes
 
 .include <bsd.port.mk>
+
+
diff --git a/graphics/mesagl/distinfo b/graphics/mesagl/distinfo
index 8bb9c4c61cd2..3f3b8e551f3d 100644
--- a/graphics/mesagl/distinfo
+++ b/graphics/mesagl/distinfo
@@ -1 +1 @@
-MD5 (Mesa-1.2.7.tar.gz) = 58a39f8da88fe17815a9ca71fe1c22df
+MD5 (Mesa-2.0.tar.gz) = 96584e8809906a903ca714ae941a8423
diff --git a/graphics/mesagl/files/patch-aa b/graphics/mesagl/files/patch-aa
index c3b71d97e9c9..d6d6a83c9aef 100644
--- a/graphics/mesagl/files/patch-aa
+++ b/graphics/mesagl/files/patch-aa
@@ -1,32 +1,34 @@
---- Makefile.orig	Wed May  8 21:34:09 1996
-+++ Makefile	Wed May  8 21:44:14 1996
-@@ -178,6 +178,29 @@
- 	cd samples ; $(MAKE) $@
- 	cd book ; $(MAKE) $@
- 
-+install:
-+	install -c -m 444 lib/libMesaGL.a ${X11BASE}/lib
-+	install -c -m 444 lib/libMesaGL.so.12.7 ${X11BASE}/lib
-+	install -c -m 444 lib/libMesaGLU.a ${X11BASE}/lib
-+	install -c -m 444 lib/libMesaGLU.so.12.7 ${X11BASE}/lib
-+	install -c -m 444 lib/libMesaaux.a ${X11BASE}/lib
-+	install -c -m 444 lib/libMesaaux.so.12.7 ${X11BASE}/lib
-+	install -c -m 444 lib/libMesatk.a ${X11BASE}/lib
-+	install -c -m 444 lib/libMesatk.so.12.7 ${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/amesa.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
-+	ldconfig -m ${X11BASE}/lib
-+
- next:
- 	-mkdir lib
- 	cd src ; $(MAKE) -f Makefile.NeXT $@
+*** Makefile.old	Wed Dec  4 01:51:17 1996
+--- Makefile	Wed Dec  4 01:53:57 1996
+***************
+*** 118,123 ****
+--- 118,146 ----
+  	cd samples ; $(MAKE) $@
+  	cd book ; $(MAKE) $@
+  
++ install:
++ 	install -c -m 444 lib/libMesaGL.a ${X11BASE}/lib
++ 	install -c -m 444 lib/libMesaGL.so.2.0 ${X11BASE}/lib
++ 	install -c -m 444 lib/libMesaGLU.a ${X11BASE}/lib
++ 	install -c -m 444 lib/libMesaGLU.so.2.0 ${X11BASE}/lib
++ 	install -c -m 444 lib/libMesaaux.a ${X11BASE}/lib
++ 	install -c -m 444 lib/libMesaaux.so.2.0 ${X11BASE}/lib
++ 	install -c -m 444 lib/libMesatk.a ${X11BASE}/lib
++ 	install -c -m 444 lib/libMesatk.so.2.0 ${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
++ 	ldconfig -m ${X11BASE}/lib
++ 
+  amiga:
+  	@echo "See the README.AMIGA file for installation information"
+  
diff --git a/graphics/mesagl/pkg-plist b/graphics/mesagl/pkg-plist
index 2f5e1434a9ee..a0218efef7af 100644
--- a/graphics/mesagl/pkg-plist
+++ b/graphics/mesagl/pkg-plist
@@ -1,18 +1,18 @@
 lib/libMesaGL.a
-lib/libMesaGL.so.12.7
+lib/libMesaGL.so.2.0
 lib/libMesaGLU.a
-lib/libMesaGLU.so.12.7
+lib/libMesaGLU.so.2.0
 lib/libMesaaux.a
-lib/libMesaaux.so.12.7
+lib/libMesaaux.so.2.0
 lib/libMesatk.a
-lib/libMesatk.so.12.7
+lib/libMesatk.so.2.0
 include/Mesa/glaux.h
 include/Mesa/gltk.h
-include/Mesa/GL/amesa.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