Update for Mesa 2.6.

4 files changed, 124 insertions, 65 deletions

diff --git a/graphics/Mesa/Makefile b/graphics/Mesa/Makefile
index c739fa72128..27cd58711da 100644
--- a/graphics/Mesa/Makefile
+++ b/graphics/Mesa/Makefile
@@ -3,38 +3,45 @@
 # Date created:         Tue Feb  7 12:02:49  1995
 # Whom:                 hsu
 #
-# $NetBSD: Makefile,v 1.9 1998/02/25 02:35:35 tron Exp $
+# $NetBSD: Makefile,v 1.10 1998/03/05 20:56:25 mycroft Exp $
 # FreeBSD Id: Makefile,v 1.19 1997/09/30 19:21:40 max Exp
 #
 
-DISTNAME=       MesaLib-2.4
-PKGNAME=	Mesa-2.4
+DISTNAME=       MesaLib-2.6
+PKGNAME=	Mesa-2.6
 CATEGORIES=	graphics
 MASTER_SITES= 	ftp://iris.ssec.wisc.edu/pub/Mesa/ \
 		ftp://iris.ssec.wisc.edu/pub/Mesa/old-versions/
-DISTFILES=	MesaLib-${SHLIB_VERSION}${EXTRACT_SUFX} \
-		MesaDemos-${SHLIB_VERSION}${EXTRACT_SUFX}
+DISTFILES=	MesaLib-${MESA_VERSION}${EXTRACT_SUFX} \
+		MesaDemos-${MESA_VERSION}${EXTRACT_SUFX}
 
 MAINTAINER=	ports@FreeBSD.ORG
 
 WRKSRC=         ${WRKDIR}/${PKGNAME}
 ALL_TARGET=	netbsd
 USE_X11=	yes
-LIBS=		libMesaGL libMesaGLU libMesaaux libMesatk
-SHLIB_VERSION=	2.4
+MESA_LIBS=	libMesaGL libMesaGLU libMesaaux libMesatk
+MESA_VERSION=	2.6
+GLUT_LIBS=	libglut
+GLUT_VERSION=	3.6
 
 post-extract:
 	chmod +r ${WRKSRC}/demos/*
 
 do-install:
-.for file in ${LIBS}
-	${INSTALL_DATA} ${WRKSRC}/lib/${file}_pic.a ${PREFIX}/lib
-	ranlib ${PREFIX}/lib/${file}_pic.a
-	${INSTALL_DATA} ${WRKSRC}/lib/${file}.so.${SHLIB_VERSION} ${PREFIX}/lib
+.for file in ${MESA_LIBS}
+	${INSTALL_DATA} ${WRKSRC}/lib/${file}.a ${PREFIX}/lib
+	ranlib ${PREFIX}/lib/${file}.a
+	${INSTALL_DATA} ${WRKSRC}/lib/${file}.so.${MESA_VERSION} ${PREFIX}/lib
+.endfor
+.for file in ${GLUT_LIBS}
+	${INSTALL_DATA} ${WRKSRC}/lib/${file}.a ${PREFIX}/lib
+	ranlib ${PREFIX}/lib/${file}.a
+	${INSTALL_DATA} ${WRKSRC}/lib/${file}.so.${GLUT_VERSION} ${PREFIX}/lib
 .endfor
 .for file in GL GLU
-	@ln -fs ${PREFIX}/lib/libMesa${file}_pic.a ${PREFIX}/lib/lib${file}_pic.a
-	@ln -fs ${PREFIX}/lib/libMesa${file}.so.${SHLIB_VERSION} ${PREFIX}/lib/lib${file}.so.${SHLIB_VERSION}
+	@ln -fs ${PREFIX}/lib/libMesa${file}.a ${PREFIX}/lib/lib${file}.a
+	@ln -fs ${PREFIX}/lib/libMesa${file}.so.${MESA_VERSION} ${PREFIX}/lib/lib${file}.so.${MESA_VERSION}
 .endfor
 	@${MKDIR} ${PREFIX}/include/GL
 	${INSTALL_DATA} ${WRKSRC}/include/GL/* ${PREFIX}/include/GL
diff --git a/graphics/Mesa/files/md5 b/graphics/Mesa/files/md5
index 414e6705a1b..661b7cf5c6f 100644
--- a/graphics/Mesa/files/md5
+++ b/graphics/Mesa/files/md5
@@ -1,2 +1,2 @@
-MD5 (MesaLib-2.4.tar.gz) = f7dde6a4f9b41439316a632b12ce2b06
-MD5 (MesaDemos-2.4.tar.gz) = f38d5eedf88b8cc85334d929d906386b
+MD5 (MesaLib-2.6.tar.gz) = ee27bf2548dbc2031974c33ee6226c0c
+MD5 (MesaDemos-2.6.tar.gz) = 6eef61e387f71a76b855ab6b3d2c89e5
diff --git a/graphics/Mesa/patches/patch-aa b/graphics/Mesa/patches/patch-aa
index cfe1e14d13c..1297a587d3b 100644
--- a/graphics/Mesa/patches/patch-aa
+++ b/graphics/Mesa/patches/patch-aa
@@ -1,11 +1,57 @@
---- Make-config.BAK	Sun Nov  2 04:30:16 1997
-+++ Make-config	Sun Nov  2 04:30:34 1997
-@@ -590,7 +590,7 @@
- 	"TK_LIB = libMesatk.so.$(VERSION)" \
- 	"AUX_LIB = libMesaaux.so.$(VERSION)" \
- 	"CC = gcc" \
--	"CFLAGS = -O2 -m486 -fPIC -I/usr/X11R6/include -DHZ=100"  \
-+	"CFLAGS = -O2 -fPIC -I/usr/X11R6/include -DHZ=100"  \
- 	"MAKELIB = ../mklib.netbsd" \
- 	"RANLIB = true" \
- 	"XLIBS = -L/usr/X11R6/lib -lX11"
+*** Make-config~	Sat Feb  7 09:17:53 1998
+--- Make-config	Thu Mar  5 15:27:14 1998
+***************
+*** 688,696 ****
+  netbsd:
+  	$(MAKE) $(MFLAGS) targets \
+! 	"GL_LIB = libMesaGL.so" \
+! 	"GLU_LIB = libMesaGLU.so" \
+! 	"GLUT_LIB = libglut.so" \
+! 	"TK_LIB = libMesatk.so" \
+! 	"AUX_LIB = libMesaaux.so" \
+  	"CC = gcc" \
+  	"CFLAGS = -O2 -fPIC -DSHM -I/usr/X11R6/include -DHZ=100"  \
+--- 688,696 ----
+  netbsd:
+  	$(MAKE) $(MFLAGS) targets \
+! 	"GL_LIB = libMesaGL.a" \
+! 	"GLU_LIB = libMesaGLU.a" \
+! 	"GLUT_LIB = libglut.a" \
+! 	"TK_LIB = libMesatk.a" \
+! 	"AUX_LIB = libMesaaux.a" \
+  	"CC = gcc" \
+  	"CFLAGS = -O2 -fPIC -DSHM -I/usr/X11R6/include -DHZ=100"  \
+*** mklib.netbsd~	Mon Nov  3 21:55:42 1997
+--- mklib.netbsd	Thu Mar  5 15:29:05 1998
+***************
+*** 41,54 ****
+  set -x
+  
+! LIBRARY=`basename ${LIBRARY} .so`
+  
+! VERSION="${MAJOR}.${MINOR}"
+  
+! echo "Building PIC library $LIBRARY"
+! rm -f ${LIBRARY}_pic.a ${LIBRARY}.so.${VERSION}
+! ar cq ${LIBRARY}_pic.a ${OBJECTS}
+! ranlib ${LIBRARY}_pic.a
+  
+! ld -x -Bshareable -Bforcearchive -o ${LIBRARY}.so.${VERSION} ${LIBRARY}_pic.a
+  
+! cp ${LIBRARY}_pic.a ${LIBRARY}.so.${VERSION} ../lib
+--- 41,55 ----
+  set -x
+  
+! VERSION=$MAJOR.$MINOR
+  
+! BASENAME=`echo ${LIBRARY} | sed "s/\.a//g"`
+! SHLIB=${BASENAME}.so.${VERSION}
+! STLIB=${BASENAME}.a
+  
+! rm -f ${SHLIB} ${STLIB}
+  
+! ar cq ${STLIB} ${OBJECTS}
+! ranlib ${STLIB}
+! ld -Bshareable -o ${SHLIB} ${OBJECTS}
+  
+! mv ${SHLIB} ../lib
diff --git a/graphics/Mesa/pkg/PLIST b/graphics/Mesa/pkg/PLIST
index b99895683ca..8c87953c998 100644
--- a/graphics/Mesa/pkg/PLIST
+++ b/graphics/Mesa/pkg/PLIST
@@ -1,39 +1,43 @@
-@comment $NetBSD: PLIST,v 1.6 1998/02/02 08:59:56 hubertf Exp $
+@comment $NetBSD: PLIST,v 1.7 1998/03/05 20:56:26 mycroft Exp $
 include/GL/FooMesa.h
 include/GL/dosmesa.h
+include/GL/fxmesa.h
 include/GL/gl.h
 include/GL/gl_mangle.h
 include/GL/glu.h
 include/GL/glu_mangle.h
+include/GL/glut.h
 include/GL/glx.h
 include/GL/glx_mangle.h
 include/GL/gmesa.h
+include/GL/mglmesa.h
 include/GL/osmesa.h
 include/GL/svgamesa.h
 include/GL/wmesa.h
 include/GL/xmesa.h
-include/GL/fxmesa.h
-include/GL/mglmesa.h
-lib/libMesaGL.so.2.4
-@exec ln %D/%F %D/lib/libGL.so.2.4
-@unexec rm %D/lib/libGL.so.2.4
-lib/libMesaGLU.so.2.4
-@exec ln %D/%F %D/lib/libGLU.so.2.4
-@unexec rm %D/lib/libGLU.so.2.4
-lib/libMesaGL_pic.a
-@exec ln %D/%F %D/lib/libGL_pic.a
-@unexec rm %D/lib/libGL_pic.a
-lib/libMesaGLU_pic.a
-@exec ln %D/%F %D/lib/libGLU_pic.a
-@unexec rm %D/lib/libGLU_pic.a
-lib/libMesaaux.so.2.4
-lib/libMesaaux_pic.a
-lib/libMesatk.so.2.4
-lib/libMesatk_pic.a
+lib/libMesaGL.so.2.6
+@exec ln %D/%F %D/lib/libGL.so.2.6
+@unexec rm %D/lib/libGL.so.2.6
+lib/libMesaGLU.so.2.6
+@exec ln %D/%F %D/lib/libGLU.so.2.6
+@unexec rm %D/lib/libGLU.so.2.6
+lib/libMesaGL.a
+@exec ln %D/%F %D/lib/libGL.a
+@unexec rm %D/lib/libGL.a
+lib/libMesaGLU.a
+@exec ln %D/%F %D/lib/libGLU.a
+@unexec rm %D/lib/libGLU.a
+lib/libMesaaux.so.2.6
+lib/libMesaaux.a
+lib/libMesatk.so.2.6
+lib/libMesatk.a
+lib/libglut.so.3.6
+lib/libglut.a
 @exec ldconfig || /usr/bin/true
 @unexec ldconfig || /usr/bin/true
 share/examples/Mesa/book/Imakefile
 share/examples/Mesa/book/Makefile
+share/examples/Mesa/book/Makefile.win
 share/examples/Mesa/book/README
 share/examples/Mesa/book/accanti
 share/examples/Mesa/book/accanti.c
@@ -175,55 +179,54 @@ 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/Makefile.DJ
 share/examples/Mesa/demos/Makefile.cygnus
+share/examples/Mesa/demos/Makefile.win
 share/examples/Mesa/demos/bounce
 share/examples/Mesa/demos/bounce.c
+share/examples/Mesa/demos/clearspd
 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/drawpix
+share/examples/Mesa/demos/drawpix.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/girl.rgb
+share/examples/Mesa/demos/glinfo
+share/examples/Mesa/demos/glinfo.c
+share/examples/Mesa/demos/glutfx
+share/examples/Mesa/demos/glutfx.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/paltex
+share/examples/Mesa/demos/paltex.c
+share/examples/Mesa/demos/pointblast
+share/examples/Mesa/demos/pointblast.c
 share/examples/Mesa/demos/reflect
 share/examples/Mesa/demos/reflect.c
-share/examples/Mesa/demos/shape.c
+share/examples/Mesa/demos/reflect.rgb
+share/examples/Mesa/demos/spectex
 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/tessdemo
+share/examples/Mesa/demos/tessdemo.c
+share/examples/Mesa/demos/texcyl
 share/examples/Mesa/demos/texcyl.c
 share/examples/Mesa/demos/texobj
 share/examples/Mesa/demos/texobj.c
+share/examples/Mesa/demos/trispd
 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
@@ -231,6 +234,7 @@ share/examples/Mesa/samples/4.rgb
 share/examples/Mesa/samples/Imakefile
 share/examples/Mesa/samples/Makefile
 share/examples/Mesa/samples/Makefile.DJ
+share/examples/Mesa/samples/Makefile.win
 share/examples/Mesa/samples/README
 share/examples/Mesa/samples/accum
 share/examples/Mesa/samples/accum.c
@@ -299,7 +303,9 @@ 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/Makefile~
 share/examples/Mesa/widgets-sgi/README
+share/examples/Mesa/widgets-sgi/README~
 share/examples/Mesa/widgets-sgi/boilerplate.c
 share/examples/Mesa/widgets-sgi/depend
 @dirrm share/examples/Mesa/samples