update to Mesa-3.1

changes:
many bugfixes, added support - see the changelog
core lib has X copyright now
libtoolized
installs as "libGL", not "libMesaGL" now
my change: don't install samples

9 files changed, 46 insertions, 558 deletions

diff --git a/graphics/Mesa/Makefile b/graphics/Mesa/Makefile
index ba2b3bda3f2..32860135732 100644
--- a/graphics/Mesa/Makefile
+++ b/graphics/Mesa/Makefile
@@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.29 2000/01/02 03:36:52 wiz Exp $
+# $NetBSD: Makefile,v 1.30 2000/04/03 11:15:00 drochner Exp $
 #
 
-DISTNAME=       MesaLib-3.0
-PKGNAME=	Mesa-3.0
+DISTNAME=       MesaLib-3.1
+PKGNAME=	Mesa-3.1
 CATEGORIES=	graphics
-MASTER_SITES= 	ftp://iris.ssec.wisc.edu/pub/Mesa/ \
-		ftp://ftp.fu-berlin.de/unix/X11/graphics/Mesa/ \
-		ftp://iris.ssec.wisc.edu/pub/Mesa/old-versions/
-DISTFILES=	MesaLib-${MESA_VERSION}${EXTRACT_SUFX} \
-		MesaDemos-${MESA_VERSION}${EXTRACT_SUFX}
+MASTER_SITES= 	ftp://ftp.mesa3d.org/mesa/ \
+		http://download.sourceforge.net/mesa3d/
+# MesaDemos is needed for glut
+DISTFILES=	MesaLib-3.1.tar.gz \
+		MesaDemos-3.1.tar.gz
 
 MAINTAINER=	mycroft@netbsd.org
 HOMEPAGE=	http://www.ssec.wisc.edu/~brianp/Mesa.html
@@ -16,49 +16,11 @@ HOMEPAGE=	http://www.ssec.wisc.edu/~brianp/Mesa.html
 CONFLICTS=	Mesa-glx-*
 
 WRKSRC=         ${WRKDIR}/${PKGNAME}
-ALL_TARGET=	${LOWER_OPSYS}
 USE_X11BASE=	yes
-MESA_LIBS=	libMesaGL libMesaGLU
-MESA_VERSION=	3.0
-GLUT_LIBS=	libglut
-GLUT_VERSION=	3.7
 
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "SunOS"
-ALL_TARGET=	sunos5-gcc
-.endif
-
-post-extract:
-	@${CHMOD} +r ${WRKSRC}/demos/*
-	@${FIND} ${WRKSRC} -type f -name "*~" | xargs ${RM} -f
-
-do-install:
-.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} -f -s ${PREFIX}/lib/libMesa${file}.a ${PREFIX}/lib/lib${file}.a
-	@${LN} -f -s ${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
-	@${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
-	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/examples/Mesa
-	${LN} -f ${PREFIX}/lib/libMesaGL.so.3.0 ${PREFIX}/lib/libGL.so.3.0
-	${LN} -f ${PREFIX}/lib/libMesaGLU.so.3.0 ${PREFIX}/lib/libGLU.so.3.0
-	${LN} -f ${PREFIX}/lib/libMesaGL.a ${PREFIX}/lib/libGL.a
-	${LN} -f ${PREFIX}/lib/libMesaGLU.a ${PREFIX}/lib/libGLU.a
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--enable-static
+# XXX our pkglibtool is too old
+#USE_LIBTOOL=	yes
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/Mesa/files/md5 b/graphics/Mesa/files/md5
index 44eb22874e8..f33b88dc94f 100644
--- a/graphics/Mesa/files/md5
+++ b/graphics/Mesa/files/md5
@@ -1,4 +1,4 @@
-$NetBSD: md5,v 1.7 1998/09/30 19:46:36 tron Exp $
+$NetBSD: md5,v 1.8 2000/04/03 11:15:01 drochner Exp $
 
-MD5 (MesaLib-3.0.tar.gz) = 34af82a8ab6b8283ea77855f3fdf7ef5
-MD5 (MesaDemos-3.0.tar.gz) = 6ec326092bf8f634a23f7203dc66baad
+MD5 (MesaLib-3.1.tar.gz) = 39af22bdf42f280f20afcacfa7ba4599
+MD5 (MesaDemos-3.1.tar.gz) = c788d5206acf290439f718d5f447724c
diff --git a/graphics/Mesa/files/patch-sum b/graphics/Mesa/files/patch-sum
index c33553a1498..4195a4427dd 100644
--- a/graphics/Mesa/files/patch-sum
+++ b/graphics/Mesa/files/patch-sum
@@ -1,7 +1,3 @@
-$NetBSD: patch-sum,v 1.3 1999/10/27 13:47:29 tron Exp $
+$NetBSD: patch-sum,v 1.4 2000/04/03 11:15:02 drochner Exp $
 
-MD5 (patch-aa) = cfe81c78d115480156c028305b7256d3
-MD5 (patch-ab) = c3385dd5619c0dd302be1049d80c9d6c
-MD5 (patch-ac) = 0baf7f6443f12759dba28d67fe61a426
-MD5 (patch-ad) = efea5edced1b2f572f79c267439849c4
-MD5 (patch-ae) = f3c8a1c36778bb211daa9dd77937c408
+MD5 (patch-aa) = f8df516f0a4941e5103027eead5adfe6
diff --git a/graphics/Mesa/patches/patch-aa b/graphics/Mesa/patches/patch-aa
index 7d510b25364..156e0cc98e2 100644
--- a/graphics/Mesa/patches/patch-aa
+++ b/graphics/Mesa/patches/patch-aa
@@ -1,51 +1,23 @@
-$NetBSD: patch-aa,v 1.6 1999/07/15 15:51:43 agc Exp $
-
-NetBSD mods to rely on X11BASE.
-Solaris mods to rely on X11BASE, and to add the libs that Solaris forgot.
-
---- Make-config.orig	Sun Aug 30 04:27:56 1998
-+++ Make-config	Thu Jul 15 16:37:26 1999
-@@ -773,13 +773,13 @@
+$NetBSD: patch-aa,v 1.7 2000/04/03 11:15:02 drochner Exp $
+--- src/X86/assyntax.h.orig	Tue Nov 16 00:22:22 1999
++++ src/X86/assyntax.h	Mon Apr  3 00:11:38 2000
+@@ -237,7 +237,8 @@
  
- netbsd:
- 	$(MAKE) $(MFLAGS) targets \
--	"GL_LIB = libMesaGL.so" \
--	"GLU_LIB = libMesaGLU.so" \
--	"GLUT_LIB = libglut.so" \
-+	"GL_LIB = libMesaGL.a" \
-+	"GLU_LIB = libMesaGLU.a" \
-+	"GLUT_LIB = libglut.a" \
- 	"CC = gcc" \
--	"CFLAGS = -O2 -fPIC -DSHM -I/usr/X11R6/include -DHZ=100"  \
-+	"CFLAGS = -O2 -fPIC -DSHM -I${X11BASE}/include -DHZ=100"  \
- 	"MAKELIB = ../mklib.netbsd" \
--	"XLIBS = -L/usr/X11R6/lib -lXext -lXmu -lXi -lX11"
-+	"XLIBS = -Wl,-R${X11BASE}/lib -L${X11BASE}/lib -lXext -lXmu -lXi -lSM -lICE -lXt -lX11"
+ #if defined(Lynx) || (defined(SYSV) || defined(SVR4)) && !defined(ACK_ASSEMBLER) \
+  || (defined(linux) || defined(__OS2ELF__)) && defined(__ELF__) \
+- || defined(__FreeBSD__) && __FreeBSD__ >= 3
++ || defined(__FreeBSD__) && __FreeBSD__ >= 3 \
++ || defined(__NetBSD__) && defined(__ELF__)
+ #define GLNAME(a)       a
+ #else
+ #define GLNAME(a)       CONCAT(_,a)
+@@ -932,7 +933,8 @@
  
- next:	
- 	$(MAKE)	-f Makefile.NeXT targets \
-@@ -1002,9 +1002,9 @@
- 	"GLU_LIB = libMesaGLU.a" \
- 	"GLUT_LIB = libglut.a" \
- 	"CC = gcc" \
--	"CFLAGS = -O3 -I/usr/openwin/include -DSHM -DSOLARIS_2_4_BUG" \
--	"MAKELIB = ../mklib.ar-ruv" \
--	"XLIBS = -L/usr/openwin/lib -lX11 -lXext -lXmu -lXi"
-+	"CFLAGS = -O3 -fPIC -I${X11BASE}/include -DSHM -DSOLARIS_2_4_BUG" \
-+	"MAKELIB = ../mklib.sunos5" \
-+	"XLIBS = -L${X11BASE}/lib -lX11 -lXext -lXmu -lXi -lsocket -lnsl"
- 
- sunos5-gcc-sl:
- 	$(MAKE) $(MFLAGS) targets \
-@@ -1012,9 +1012,9 @@
- 	"GLU_LIB = libMesaGLU.so" \
- 	"GLUT_LIB = libglut.so" \
- 	"CC = gcc" \
--	"CFLAGS = -fPIC -O3 -I/usr/openwin/include -DSHM -DSOLARIS_2_4_BUG" \
-+	"CFLAGS = -fPIC -O3 -I${X11BASE}/include -DSHM -DSOLARIS_2_4_BUG" \
- 	"MAKELIB = ../mklib.sunos5" \
--	"XLIBS = -L/usr/openwin/lib -R/usr/openwin/lib -lX11 -lXext -lXmu -lXi"
-+	"XLIBS = -L${X11BASE}/lib -R${X11BASE}/lib -lX11 -lXext -lXmu -lXi -lsocket -lnsl"
- 
- sunos5-x11r6-gcc-sl:
- 	$(MAKE) $(MFLAGS) targets \
+ #if defined(Lynx) || (defined(SYSV) || defined(SVR4)) \
+  || (defined(linux) || defined(__OS2ELF__)) && defined(__ELF__) \
+- || defined(__FreeBSD__) && __FreeBSD__ >= 3
++ || defined(__FreeBSD__) && __FreeBSD__ >= 3 \
++ || defined(__NetBSD__) && defined(__ELF__)
+ #define GLNAME(a) a
+ #else
+ #define GLNAME(a) _ ## a
diff --git a/graphics/Mesa/patches/patch-ab b/graphics/Mesa/patches/patch-ab
deleted file mode 100644
index 55f0bf0bee8..00000000000
--- a/graphics/Mesa/patches/patch-ab
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ab,v 1.5 1998/09/30 19:46:36 tron Exp $
-
---- Makefile.orig	Tue Sep  1 05:14:24 1998
-+++ Makefile	Wed Sep 30 20:34:36 1998
-@@ -234,10 +234,7 @@
- 	cd src ; $(MAKE) $@
- 	cd src-glu ; $(MAKE) $@
- 	if [ -d src-glut ] ; then cd src-glut ; $(MAKE) $@ ; fi
--	if [ -d demos ]    ; then cd demos    ; $(MAKE) $@ ; fi
- 	if [ -d xdemos ]   ; then cd xdemos   ; $(MAKE) $@ ; fi
--	if [ -d samples ]  ; then cd samples  ; $(MAKE) $@ ; fi
--	if [ -d book ]     ; then cd book     ; $(MAKE) $@ ; fi
- 
- 
- irix6-n32 irix6-n32-dso irix6-gcc-n32-sl:
diff --git a/graphics/Mesa/patches/patch-ac b/graphics/Mesa/patches/patch-ac
deleted file mode 100644
index 166f0c28799..00000000000
--- a/graphics/Mesa/patches/patch-ac
+++ /dev/null
@@ -1,36 +0,0 @@
-$NetBSD: patch-ac,v 1.1 1998/09/30 19:46:37 tron Exp $
-
-*** 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/patches/patch-ad b/graphics/Mesa/patches/patch-ad
deleted file mode 100644
index 9365b9b6ee9..00000000000
--- a/graphics/Mesa/patches/patch-ad
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-ad,v 1.1 1999/07/15 15:51:43 agc Exp $
-
-Make Solaris build shared and static libs.
-
---- mklib.sunos5	1999/07/15 15:15:20	1.1
-+++ mklib.sunos5	1999/07/15 15:15:32
-@@ -36,4 +33,19 @@
- 
- #--platform-------------------------------------------------------------
- 
--ld -G -o $LIBRARY $OBJECTS
-+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}
-+ld -G -o ${SHLIB} ${OBJECTS}
-+
-+mv ${SHLIB} ../lib
diff --git a/graphics/Mesa/patches/patch-ae b/graphics/Mesa/patches/patch-ae
deleted file mode 100644
index 8913c165a53..00000000000
--- a/graphics/Mesa/patches/patch-ae
+++ /dev/null
@@ -1,212 +0,0 @@
-$NetBSD: patch-ae,v 1.1 1999/10/27 13:47:30 tron Exp $
-
---- src/asm_386.S.orig	Wed Jul  8 22:50:13 1998
-+++ src/asm_386.S	Tue Oct 26 00:46:37 1999
-@@ -57,13 +57,17 @@
-  * Change this to .data if your system doesn't have .rodata
-  */
- #ifndef RODATA
--#if defined(FREEBSD) || defined(__EMX__)
-+#if defined(FREEBSD) || defined(__EMX__) || (defined(__NetBSD__) && !defined(__ELF__))
- #define RODATA .data
- #else
- #define RODATA 	.section .rodata
- #endif
- #endif
- 
-+#if defined(FREEBSD) || (defined(__NetBSD__) && !defined(__ELF__))
-+#define PREPEND_UNDERSCORE
-+#endif
-+
- #ifndef DATA
- #define DATA 	.data
- #endif
-@@ -81,7 +85,7 @@
-  * void asm_transform_points3_general( GLuint n, GLfloat d[][4],
-  *                                     GLfloat m[16], GLfloat s[][4] );
-  */
--#ifdef FREEBSD
-+#ifdef PREPEND_UNDERSCORE
- GLOBAL(_asm_transform_points3_general)
- ALIGN
- _asm_transform_points3_general:
-@@ -218,7 +222,7 @@
-  * void asm_transform_points3_identity( GLuint n, GLfloat d[][4],
-  *                                      GLfloat s[][4] );
-  */
--#ifdef FREEBSD
-+#ifdef PREPEND_UNDERSCORE
- GLOBAL(_asm_transform_points3_identity)
- ALIGN
- _asm_transform_points3_identity:
-@@ -264,7 +268,7 @@
-  * void asm_transform_points3_2d( GLuint n, GLfloat d[][4], GLfloat m[16],
-  *                                GLfloat s[][4] );
-  */
--#ifdef FREEBSD
-+#ifdef PREPEND_UNDERSCORE
- GLOBAL(_asm_transform_points3_2d)
- ALIGN
- _asm_transform_points3_2d:
-@@ -404,7 +408,7 @@
-  *                                       GLfloat m[16], GLfloat s[][4] );
-  *
-  */
--#ifdef FREEBSD
-+#ifdef PREPEND_UNDERSCORE
- GLOBAL(_asm_transform_points3_2d_no_rot)
- ALIGN
- _asm_transform_points3_2d_no_rot:
-@@ -459,7 +463,7 @@
-  * void asm_transform_points3_3d( GLuint n, GLfloat d[][4], GLfloat m[16],
-  *                                GLfloat s[][4] );
-  */
--#ifdef FREEBSD
-+#ifdef PREPEND_UNDERSCORE
- GLOBAL(_asm_transform_points3_3d)
- ALIGN
- _asm_transform_points3_3d:
-@@ -572,7 +576,7 @@
-  * void asm_transform_points4_general( GLuint n, GLfloat d[][4],
-  *                                     GLfloat m[16], GLfloat s[][4] );
-  */
--#ifdef FREEBSD
-+#ifdef PREPEND_UNDERSCORE
- GLOBAL(_asm_transform_points4_general)
- ALIGN
- _asm_transform_points4_general:
-@@ -728,7 +732,7 @@
-  * void asm_transform_points4_identity( GLuint n, GLfloat d[][4],
-  *                                      GLfloat s[][4] );
-  */
--#ifdef FREEBSD
-+#ifdef PREPEND_UNDERSCORE
- GLOBAL(_asm_transform_points4_identity)
- ALIGN
- _asm_transform_points4_identity:
-@@ -758,7 +762,7 @@
-  * void asm_transform_points4_2d( GLuint n, GLfloat d[][4], GLfloat m[16],
-  *                                GLfloat s[][4] );
-  */
--#ifdef FREEBSD
-+#ifdef PREPEND_UNDERSCORE
- GLOBAL(_asm_transform_points4_2d)
- ALIGN
- _asm_transform_points4_2d:
-@@ -829,7 +833,7 @@
-  * void asm_transform_points4_2d_no_rot( GLuint n, GLfloat d[][4],
-  *                                       GLfloat m[16], GLfloat s[][4] );
-  */
--#ifdef FREEBSD
-+#ifdef PREPEND_UNDERSCORE
- GLOBAL(_asm_transform_points4_2d_no_rot)
- ALIGN
- _asm_transform_points4_2d_no_rot:
-@@ -883,7 +887,7 @@
-  * void asm_transform_points4_3d( GLuint n, GLfloat d[][4], GLfloat m[16],
-  *                                GLfloat s[][4] );
-  */
--#ifdef FREEBSD
-+#ifdef PREPEND_UNDERSCORE
- GLOBAL(_asm_transform_points4_3d)
- ALIGN
- _asm_transform_points4_3d:
-@@ -1015,7 +1019,7 @@
-  * void asm_transform_points4_ortho( GLuint n, GLfloat d[][4],
-  *                                   GLfloat m[16], GLfloat s[][4] );
-  */
--#ifdef FREEBSD
-+#ifdef PREPEND_UNDERSCORE
- GLOBAL(_asm_transform_points4_ortho)
- ALIGN
- _asm_transform_points4_ortho:
-@@ -1073,7 +1077,7 @@
-  * void asm_transform_points4_perspective( GLuint n, GLfloat d[][4],
-  *                                         GLfloat m[16], GLfloat s[][4] );
-  */
--#ifdef FREEBSD
-+#ifdef PREPEND_UNDERSCORE
- GLOBAL(_asm_transform_points4_perspective)
- ALIGN
- _asm_transform_points4_perspective:
-@@ -1313,7 +1317,7 @@
-  *                                        GLfloat s[][4], GLubyte clipmask[],
-  *                                        GLubyte *ormask, GLubyte *andmask );
-  */
--#ifdef FREEBSD
-+#ifdef PREPEND_UNDERSCORE
- GLOBAL(_asm_project_and_cliptest_general)
- ALIGN
- _asm_project_and_cliptest_general:
-@@ -1333,7 +1337,7 @@
- 	pushl %edx
- 	pushl %edi
- 	pushl %ecx
--#ifdef FREEBSD
-+#ifdef PREPEND_UNDERSCORE
- 	call _asm_transform_points4_general
- #else
- 	call asm_transform_points4_general
-@@ -1366,7 +1370,7 @@
-  *                                         GLfloat s[][4], GLubyte clipmask[],
-  *                                         GLubyte *ormask, GLubyte *andmask );
-  */
--#ifdef FREEBSD
-+#ifdef PREPEND_UNDERSCORE
- GLOBAL(_asm_project_and_cliptest_identity)
- ALIGN
- _asm_project_and_cliptest_identity:
-@@ -1384,7 +1388,7 @@
- 	pushl %esi
- 	pushl %edi
- 	pushl %ecx
--#ifdef FREEBSD
-+#ifdef PREPEND_UNDERSCORE
- 	call _asm_transform_points4_identity
- #else
- 	call asm_transform_points4_identity
-@@ -1416,7 +1420,7 @@
-  *                                      GLfloat s[][4], GLubyte clipmask[],
-  *                                      GLubyte *ormask, GLubyte *andmask );
-  */
--#ifdef FREEBSD
-+#ifdef PREPEND_UNDERSCORE
- GLOBAL(_asm_project_and_cliptest_ortho)
- ALIGN
- _asm_project_and_cliptest_ortho:
-@@ -1436,7 +1440,7 @@
- 	pushl %edx
- 	pushl %edi
- 	pushl %ecx
--#ifdef FREEBSD
-+#ifdef PREPEND_UNDERSCORE
- 	call _asm_transform_points4_ortho
- #else
- 	call asm_transform_points4_ortho
-@@ -1468,7 +1472,7 @@
-  *                                            GLfloat s[][4], GLubyte clipmask[],
-  *                                            GLubyte *ormask, GLubyte *andmask );
-  */
--#ifdef FREEBSD
-+#ifdef PREPEND_UNDERSCORE
- GLOBAL(_asm_project_and_cliptest_perspective)
- ALIGN
- _asm_project_and_cliptest_perspective:
-@@ -1488,7 +1492,7 @@
- 	pushl %edx
- 	pushl %edi
- 	pushl %ecx
--#ifdef FREEBSD
-+#ifdef PREPEND_UNDERSCORE
- 	call _asm_transform_points4_perspective
- #else
- 	call asm_transform_points4_perspective
-@@ -1575,7 +1579,7 @@
-  *                            GLfloat s[][4], GLboolean normalize,
-  *                            GLboolean rescale );
-  */
--#ifdef FREEBSD
-+#ifdef PREPEND_UNDERSCORE
- GLOBAL(_gl_xform_normals_3fv)
- ALIGN
- _gl_xform_normals_3fv:
diff --git a/graphics/Mesa/pkg/PLIST b/graphics/Mesa/pkg/PLIST
index b0509fb6d38..0e9ad79cd53 100644
--- a/graphics/Mesa/pkg/PLIST
+++ b/graphics/Mesa/pkg/PLIST
@@ -1,9 +1,5 @@
-@comment $NetBSD: PLIST,v 1.11 1998/09/30 19:46:37 tron Exp $
-include/GL/foomesa.h
-include/GL/ggimesa.h
-include/GL/osmesa3.h
-include/GL/dosmesa.h
-include/GL/fxmesa.h
+@comment $NetBSD: PLIST,v 1.12 2000/04/03 11:15:05 drochner Exp $
+etc/mesa.conf
 include/GL/gl.h
 include/GL/gl_mangle.h
 include/GL/glu.h
@@ -11,165 +7,17 @@ include/GL/glu_mangle.h
 include/GL/glut.h
 include/GL/glx.h
 include/GL/glx_mangle.h
-include/GL/mglmesa.h
 include/GL/osmesa.h
-include/GL/svgamesa.h
-include/GL/wmesa.h
 include/GL/xmesa.h
+include/GL/xmesa_x.h
+include/GL/xmesa_xf86.h
 lib/libGL.so.3.0
 lib/libGL.a
+lib/libGL.la
 lib/libGLU.so.3.0
 lib/libGLU.a
-lib/libMesaGL.so.3.0
-lib/libMesaGL.a
-lib/libMesaGLU.so.3.0
-lib/libMesaGLU.a
-lib/libglut.so.3.7
+lib/libGLU.la
+lib/libglut.so.10.0
 lib/libglut.a
-share/examples/Mesa/book/aaindex.c
-share/examples/Mesa/book/aapoly.c
-share/examples/Mesa/book/aargb.c
-share/examples/Mesa/book/hello.c
-share/examples/Mesa/book/image.c
-share/examples/Mesa/book/polyoff.c
-share/examples/Mesa/book/quadric.c
-share/examples/Mesa/book/tess.c
-share/examples/Mesa/book/tesswind.c
-share/examples/Mesa/book/texbind.c
-share/examples/Mesa/book/texprox.c
-share/examples/Mesa/book/texsub.c
-share/examples/Mesa/book/torus.c
-share/examples/Mesa/book/unproject.c
-share/examples/Mesa/book/varray.c
-share/examples/Mesa/book/wrap.c
-share/examples/Mesa/book/Makefile
-share/examples/Mesa/book/Makefile.win
-share/examples/Mesa/book/README
-share/examples/Mesa/book/accanti.c
-share/examples/Mesa/book/accpersp.c
-share/examples/Mesa/book/alpha.c
-share/examples/Mesa/book/alpha3D.c
-share/examples/Mesa/book/anti.c
-share/examples/Mesa/book/bezcurve.c
-share/examples/Mesa/book/bezmesh.c
-share/examples/Mesa/book/checker.c
-share/examples/Mesa/book/clip.c
-share/examples/Mesa/book/colormat.c
-share/examples/Mesa/book/cube.c
-share/examples/Mesa/book/depthcue.c
-share/examples/Mesa/book/dof.c
-share/examples/Mesa/book/double.c
-share/examples/Mesa/book/drawf.c
-share/examples/Mesa/book/feedback.c
-share/examples/Mesa/book/fog.c
-share/examples/Mesa/book/fogindex.c
-share/examples/Mesa/book/font.c
-share/examples/Mesa/book/jitter.h
-share/examples/Mesa/book/light.c
-share/examples/Mesa/book/lines.c
-share/examples/Mesa/book/list.c
-share/examples/Mesa/book/material.c
-share/examples/Mesa/book/mipmap.c
-share/examples/Mesa/book/model.c
-share/examples/Mesa/book/movelight.c
-share/examples/Mesa/book/nurbs.c
-share/examples/Mesa/book/pickdepth.c
-share/examples/Mesa/book/picksquare.c
-share/examples/Mesa/book/plane.c
-share/examples/Mesa/book/planet.c
-share/examples/Mesa/book/polys.c
-share/examples/Mesa/book/robot.c
-share/examples/Mesa/book/sccolorlight.c
-share/examples/Mesa/book/scene.c
-share/examples/Mesa/book/scenebamb.c
-share/examples/Mesa/book/sceneflat.c
-share/examples/Mesa/book/select.c
-share/examples/Mesa/book/smooth.c
-share/examples/Mesa/book/stencil.c
-share/examples/Mesa/book/stroke.c
-share/examples/Mesa/book/surface.c
-share/examples/Mesa/book/teaambient.c
-share/examples/Mesa/book/teapots.c
-share/examples/Mesa/book/texgen.c
-share/examples/Mesa/book/texturesurf.c
-share/examples/Mesa/book/trim.c
-share/examples/Mesa/demos/multiext.c
-share/examples/Mesa/demos/multitex.c
-share/examples/Mesa/demos/renormal.c
-share/examples/Mesa/demos/Makefile
-share/examples/Mesa/demos/Makefile.cygnus
-share/examples/Mesa/demos/bounce.c
-share/examples/Mesa/demos/clearspd.c
-share/examples/Mesa/demos/descrip.mms
-share/examples/Mesa/demos/drawpix.c
-share/examples/Mesa/demos/gamma.c
-share/examples/Mesa/demos/gears.c
-share/examples/Mesa/demos/girl.rgb
-share/examples/Mesa/demos/glinfo.c
-share/examples/Mesa/demos/glutfx.c
-share/examples/Mesa/demos/isosurf.c
-share/examples/Mesa/demos/isosurf.dat
-share/examples/Mesa/demos/morph3d.c
-share/examples/Mesa/demos/osdemo.c
-share/examples/Mesa/demos/paltex.c
-share/examples/Mesa/demos/pointblast.c
-share/examples/Mesa/demos/reflect.c
-share/examples/Mesa/demos/reflect.rgb
-share/examples/Mesa/demos/spectex.c
-share/examples/Mesa/demos/stex3d.c
-share/examples/Mesa/demos/tessdemo.c
-share/examples/Mesa/demos/texcyl.c
-share/examples/Mesa/demos/texobj.c
-share/examples/Mesa/demos/trispd.c
-share/examples/Mesa/demos/winpos.c
-share/examples/Mesa/samples/Makefile
-share/examples/Mesa/samples/Makefile.DJ
-share/examples/Mesa/samples/README
-share/examples/Mesa/samples/accum.c
-share/examples/Mesa/samples/bitmap1.c
-share/examples/Mesa/samples/bitmap2.c
-share/examples/Mesa/samples/blendeq.c
-share/examples/Mesa/samples/blendxor.c
-share/examples/Mesa/samples/copy.c
-share/examples/Mesa/samples/cursor.c
-share/examples/Mesa/samples/depth.c
-share/examples/Mesa/samples/eval.c
-share/examples/Mesa/samples/fog.c
-share/examples/Mesa/samples/font.c
-share/examples/Mesa/samples/line.c
-share/examples/Mesa/samples/logo.c
-share/examples/Mesa/samples/nurb.c
-share/examples/Mesa/samples/oglinfo.c
-share/examples/Mesa/samples/olympic.c
-share/examples/Mesa/samples/overlay.c
-share/examples/Mesa/samples/point.c
-share/examples/Mesa/samples/prim.c
-share/examples/Mesa/samples/quad.c
-share/examples/Mesa/samples/select.c
-share/examples/Mesa/samples/shape.c
-share/examples/Mesa/samples/sphere.c
-share/examples/Mesa/samples/star.c
-share/examples/Mesa/samples/stencil.c
-share/examples/Mesa/samples/stretch.c
-share/examples/Mesa/samples/texture.c
-share/examples/Mesa/samples/tri.c
-share/examples/Mesa/samples/wave.c
-share/examples/Mesa/samples/loadppm.c
-share/examples/Mesa/samples/rgbtoppm.c
-share/examples/Mesa/samples/tkmap.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
+lib/libglut.la
 @dirrm include/GL