Update "Mesa-glx" to "20000407" snapshot based on Mesa 3.1. It now supports

the following graphic chipsets:
- MGA (Matrox G200/G400)
- Mach64 (ATI Rage Pro)
- NVIDIA RIVA TNT/TNT2
- Intel i810
- S3 ViRGE DX/GX/GX2/MX (** EXPERIMENTAL **)
- SiS 6326 (** EXPERIMENTAL **)
The libraries must no longer be compiled for a certain chipset.

7 files changed, 210 insertions, 172 deletions

diff --git a/graphics/Mesa-glx/Makefile b/graphics/Mesa-glx/Makefile
index 58f8c007ade..ccaf94ea873 100644
--- a/graphics/Mesa-glx/Makefile
+++ b/graphics/Mesa-glx/Makefile
@@ -1,57 +1,67 @@
-# $NetBSD: Makefile,v 1.7 2000/04/05 21:08:14 tron Exp $
+# $NetBSD: Makefile,v 1.8 2000/04/11 22:36:04 tron Exp $
 
-DISTNAME=	glx-19990804
-PKGNAME=	Mesa-${DISTNAME:S/-/-${GLX_CHIPSET}-/}
+DISTNAME=	glx-20000407
+PKGNAME=	Mesa-${DISTNAME}
 CATEGORIES=	graphics
-MASTER_SITES=	http://glx.on.openprojects.net/
+MASTER_SITES=	http://snow.ashlu.bc.ca/glx/snapshots/
 EXTRACT_SUFX=	.tar.bz2
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
+		MesaLib-${MESA_VERSION}${EXTRACT_SUFX} \
+		MesaDemos-${MESA_VERSION}${EXTRACT_SUFX}		
 
-MAINTAINER=	packages@netbsd.org
+MAINTAINER=	tron@netbsd.org
 HOMEPAGE=	http://utah-glx.sourceforge.net/
 
-BROKEN=		update required for Mesa 3.1.
-
 BUILD_DEPENDS+=	${PERL}:../../lang/perl5
+BUILD_DEPENDS+=	${AUTOCONF}:../../devel/autoconf
 BUILD_DEPENDS+=	${TCLSH}:../../lang/tcl80
-BUILD_DEPENDS+=	${MESA_WRKSRC}/lib/libMesaGL.a:${MESA_PKGDIR}:build
 
 CONFLICTS+=		Mesa-*
 ONLY_FOR_PLATFORM=	NetBSD-*-i386
 
-# Either "mga" (Matrox MGA 200 and 400) or "tnt" (Riva TNT and TNT 2)
-GLX_CHIPSET?=	mga
-
 GNU_CONFIGURE=		yes
 USE_GMAKE=		yes
 USE_LIBTOOL=		yes
 USE_X11BASE=		yes
-CONFIGURE_ARGS+=	--with-mmx-asm=no --with-3dnow-asm=no \
-			--with-chipset=${GLX_CHIPSET} \
-			--with-mesa=${MESA_WRKSRC}
+CONFIGURE_ARGS+=	--enable-static --with-mesa=${MESA_WRKSRC}
 CONFIGURE_ENV+=		TCLSH=${TCLSH}
 
-BUILD_DEFS+=	GLX_CHIPSET
-MAKE_ENV+=		PERL=${PERL}
-MESA_PKGDIR=	../Mesa
-MESA_VERSION=	3.0
-MESA_WRKSRC=	${BUILD_ROOT}/graphics/Mesa/${WRKDIR:T}/Mesa-${MESA_VERSION}
+AUTOCONF=	${LOCALBASE}/bin/autoconf
+WRKSRCDIRS=	${MESA_WRKSRC} ${WRKSRC} ${WRKSRC}/docs
+MAKE_ENV+=	PERL=${PERL}
+MESA_VERSION=	3.1
+MESA_WRKSRC=	${WRKDIR}/Mesa-${MESA_VERSION}
 PERL=		${LOCALBASE}/bin/perl
-PLIST_SRC=	${WRKDIR}/PLIST
 TCLSH=		${LOCALBASE}/bin/tclsh8.0
 
-pre-install:
-	cd ${MESA_PKGDIR} && ${MAKE} do-install
+pre-configure:
+	@cd ${WRKSRC} && ${AUTOCONF} && cd docs && ${AUTOCONF}
 
-post-install:
-	cd ${PREFIX}/lib; \
-	for EXT in a so.${MESA_VERSION} ; do \
-	  ${LN} -fs libGL.$${EXT} libMesaGL.$${EXT}; \
-	  ${LN} -fs libGLU.$${EXT} libMesaGLU.$${EXT}; \
+do-configure:
+	@for DIR in ${WRKSRCDIRS}; do \
+	  cd $$DIR && \
+	  ${SETENV} CC="${CC}" ac_cv_path_CC="${CC}" \
+	    CFLAGS="${CFLAGS}" \
+	    INSTALL="`${TYPE} ${INSTALL} | ${AWK} '{ print $$NF }'` -c -o ${BINOWN} -g ${BINGRP}" \
+	    INSTALL_DATA="${INSTALL_DATA}" \
+	    INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
+	    INSTALL_SCRIPT="${INSTALL_SCRIPT}" \
+	    ${CONFIGURE_ENV} ${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS}; \
 	done
-	@${CP} ${MESA_PKGDIR}/pkg/PLIST ${PLIST_SRC}
-	@${ECHO} "lib/modules/glx.so" >> ${PLIST_SRC}
 
-pre-clean:
-	@cd ${MESA_PKGDIR} && ${MAKE} clean
+do-build:
+	@for DIR in ${WRKSRCDIRS}; do \
+	  cd $$DIR && \
+	  ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} -f ${MAKEFILE} \
+	    ${ALL_TARGET}; \
+	done
+
+do-install:
+	@for DIR in ${WRKSRCDIRS}; do \
+	  cd $$DIR && \
+	  ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} -f ${MAKEFILE} \
+	    ${INSTALL_TARGET}; \
+	done
+	${INSTALL_DATA} ${WRKSRC}/glx.conf ${PREFIX}/etc/glx.conf.default
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/Mesa-glx/files/md5 b/graphics/Mesa-glx/files/md5
index 4cfc98f5bc8..4b38b7dfef9 100644
--- a/graphics/Mesa-glx/files/md5
+++ b/graphics/Mesa-glx/files/md5
@@ -1,3 +1,5 @@
-$NetBSD: md5,v 1.1.1.1 1999/09/29 22:44:17 tron Exp $
+$NetBSD: md5,v 1.2 2000/04/11 22:36:04 tron Exp $
 
-MD5 (glx-19990804.tar.bz2) = 9aff5dcfa7d044a1a8d1b1fb898c56dc
+MD5 (glx-20000407.tar.bz2) = e822567d4f92a5f864b736f92df35d48
+MD5 (MesaLib-3.1.tar.bz2) = 58292669606fd6b06ee109b790c14c1c
+MD5 (MesaDemos-3.1.tar.bz2) = bf16132074cbd0b9f6ce211437966b51
diff --git a/graphics/Mesa-glx/files/patch-sum b/graphics/Mesa-glx/files/patch-sum
index 2628353445c..13031ad2a9d 100644
--- a/graphics/Mesa-glx/files/patch-sum
+++ b/graphics/Mesa-glx/files/patch-sum
@@ -1,5 +1,5 @@
-$NetBSD: patch-sum,v 1.4 1999/10/25 10:18:36 tron Exp $
+$NetBSD: patch-sum,v 1.5 2000/04/11 22:36:04 tron Exp $
 
-MD5 (patch-aa) = 4d3b5b65223089784b40564da47e7f24
-MD5 (patch-ab) = 5b2cae1a7ef546ebcd36a7d3e8f9fc4b
-MD5 (patch-ac) = 8f2c496ab99740e0d4987551c412f487
+MD5 (patch-aa) = 0aa834aea98b42c2a4e9f6a79483e246
+MD5 (patch-ab) = 1350d7fd3accf489cfa1fbf76f6e9238
+MD5 (patch-ac) = d46723fc65dd9a326f9c9e1c83d80054
diff --git a/graphics/Mesa-glx/patches/patch-aa b/graphics/Mesa-glx/patches/patch-aa
index 0932c7db785..4e8faf3daa2 100644
--- a/graphics/Mesa-glx/patches/patch-aa
+++ b/graphics/Mesa-glx/patches/patch-aa
@@ -1,88 +1,44 @@
-$NetBSD: patch-aa,v 1.1.1.1 1999/09/29 22:44:17 tron Exp $
+$NetBSD: patch-aa,v 1.2 2000/04/11 22:36:05 tron Exp $
 
---- libGL/Makefile.in.orig	Sun Jul  4 23:58:47 1999
-+++ libGL/Makefile.in	Wed Sep 29 19:06:23 1999
-@@ -7,7 +7,7 @@
- # These define the name/version of the shared library we're building
- # ------------------------------------------------------------------
- LIBNAME = GL
--SOGLREV = 1.0
-+SOGLREV = 3:0
- 
- # Source and Object files
- # -----------------------
-@@ -16,7 +16,6 @@
- 	map_points.c pointers.c glx_varray.c
- 
- OBJS = ${SRCS:.c=.o}
--UNSHARED_OBJS = unshared/*.o
- 
- 
- # Additional compiler rules
-@@ -34,22 +33,12 @@
- 	${CC} ${ALL_CFLAGS} -E $*.c > $@
- 
- .c.o:
--ifeq "${USE_DYNAMIC_MODULE}" "yes"
--	${RM} $@
--	${CC} ${ALL_CFLAGS} ${SHARED_CFLAGS} -c $<
--else
--	${RM} unshared/$@
--	${CC} ${ALL_CFLAGS} -c $< -o unshared/$@
--endif
-+	${LIBTOOL} ${CC} ${ALL_CFLAGS} -c $< 
- 
- # Main targets
- # ------------
- 
--ifeq "${USE_DYNAMIC_MODULE}" "yes"
--all : lib${LIBNAME}.so.${SOGLREV}
--else
--all : unshared-subdir lib${LIBNAME}.a
--endif
-+all : lib${LIBNAME}.la
- 
- clean :
- 	${RM} *.CKP *.ln *.BAK *.bak *.o core errs ,* *~ *.a .emacs_* tags TAGS make.log MakeOut  "#"*
-@@ -61,20 +50,8 @@
- 	${DEPEND} -f .deps -- ${ALL_CFLAGS} -- ${SRCS}
- 
- 
--ifeq "${USE_DYNAMIC_MODULE}" "yes"
--install: lib${LIBNAME}.so.${SOGLREV}
--	@if [ -d ${INSTALL_libdir} ]; then set +x; \
--	else (set -x; ${MKDIR} ${INSTALL_libdir}); fi
--	${INSTALL} ${INSTALLFLAGS} ${INSTBINFLAGS} lib${LIBNAME}.so.${SOGLREV} ${INSTALL_libdir}
--	@T=`echo ${INSTALL_libdir}/lib${LIBNAME}.so.${SOGLREV} | sed 's/\.[^\.]*$$//'`; set -x; ${RM} $$T && ${LN} lib${LIBNAME}.so.${SOGLREV} $$T
--	${RM} ${INSTALL_libdir}/lib${LIBNAME}.so
--	${LN} lib${LIBNAME}.so.${SOGLREV} ${INSTALL_libdir}/lib${LIBNAME}.so
--else
--install: lib${LIBNAME}.a
--	@if [ -d ${INSTALL_libdir} ]; then set +x; \
--	else (set -x; ${MKDIR} ${INSTALL_libdir}); fi
--	${INSTALL} ${INSTALLFLAGS} ${INSTBINFLAGS} lib${LIBNAME}.a ${INSTALL_libdir}
--endif
-+install: lib${LIBNAME}.la
-+	${LIBTOOL} ${BSD_INSTALL_DATA} $< ${INSTALL_libdir}
- 
- tags :
- 	${TAGS} -w *.[ch]
-@@ -92,15 +69,9 @@
- render.c: genlib.tcl genGL.tcl
- 	${TCLSH} genlib.tcl
- 
--lib${LIBNAME}.so.${SOGLREV} : render.c ${OBJS}
--	${RM} $@~
--	@SONAME=`echo $@ | sed 's/\.[^\.]*$$//'`; set -x; \
--	${CC} -o ./$@~ ${SHARED_LDFLAGS} -Wl,-soname,$$SONAME ${OBJS} ${XLIBDIR} -lX11 -lXi ${MATHLIBS}; \
--	${RM} $$SONAME; ${LN} $@ $$SONAME; \
--	${RM} $@
--	${MV} $@~ $@
--	${RM} lib${LIBNAME}.so
--	${LN} $@ lib${LIBNAME}.so
-+lib${LIBNAME}.la : render.c ${OBJS}
-+	${LIBTOOL} --mode=link ${CC} -rpath ${INSTALL_libdir} \
-+	  -version-info ${SOGLREV} -o $@ ${OBJS:.o=.lo}
- 
- lib${LIBNAME}.a : render.c ${UNSHARED_OBJS}
- 	${RM} $@~
+--- configure.in.orig	Fri Mar 31 06:26:15 2000
++++ configure.in	Wed Apr 12 00:05:05 2000
+@@ -933,39 +933,6 @@
+   xserver_flags="$xserver_flags -D_XSERVER64"
+ fi
+ 
+-dnl try to save some labor on the location of glx.conf
+-dnl we want it to be in the same place as XF86Config,
+-dnl so look in some common locations and hope for the best.
+-
+-which_sysconf=`echo $sysconfdir | grep "\$.prefix."`
+-if test -z "$which_sysconf"
+- then
+-  echo "sysconfdir not set"
+- else
+-  AC_MSG_CHECKING([XF86Config location])
+-  if test -f /etc/XF86Config
+-   then
+-    sysconfdir="/etc"
+-    AC_MSG_RESULT([$sysconfdir])
+-  elif test -f /etc/X11/XF86Config
+-   then
+-    sysconfdir="/etc/X11"
+-    AC_MSG_RESULT([$sysconfdir])
+-  elif test -f ${x_libraries}/X11/XF86Config
+-   then
+-    sysconfdir=${x_libraries}/X11/XF86Config
+-    AC_MSG_RESULT([${sysconfdir}])
+-  elif test -f /usr/X11R6/lib/X11/XF86Config
+-   then
+-    sysconfdir="/usr/X11R6/lib/X11/XF86Config"
+-    AC_MSG_RESULT([${sysconfdir}])
+-   else
+-    AC_MSG_RESULT([can't find it!])
+-    AC_MSG_WARN([defaulting to ${sysconfdir} for glx.conf])
+-  fi
+-fi
+-
+-
+ dnl
+ dnl Checks for library functions.
+ dnl
diff --git a/graphics/Mesa-glx/patches/patch-ab b/graphics/Mesa-glx/patches/patch-ab
index 84ec844d60e..049830eda26 100644
--- a/graphics/Mesa-glx/patches/patch-ab
+++ b/graphics/Mesa-glx/patches/patch-ab
@@ -1,13 +1,94 @@
-$NetBSD: patch-ab,v 1.1 1999/10/01 18:43:18 tron Exp $
+$NetBSD: patch-ab,v 1.2 2000/04/11 22:36:05 tron Exp $
 
---- servGL/hwglx/mga/Makefile.in.orig	Sat Jul 31 09:07:55 1999
-+++ servGL/hwglx/mga/Makefile.in	Fri Oct  1 19:43:02 1999
-@@ -80,7 +80,7 @@
- # -------------
+--- libGL/Makefile.in.orig	Sun Feb 27 13:52:53 2000
++++ libGL/Makefile.in	Thu Apr  6 23:29:08 2000
+@@ -14,7 +14,7 @@
+ # These define the name/version of the shared library we're building
+ # ------------------------------------------------------------------
+ LIBNAME = GL
+-SOGLREV = 1.0
++SOGLREV = 3:0
  
- mgaregs.h : mgaregs.pl
--	./mgaregs.pl
-+	${PERL} ./mgaregs.pl
+ # Source and Object files
+ # -----------------------
+@@ -23,7 +23,6 @@
+ 	map_points.c pointers.c glx_varray.c direct_protocol.c 
  
- #tritmpl.h : tmplgen.sh
- #	./tmplgen.sh triangle.tmpl
+ OBJS = ${SRCS:.c=.o}
+-UNSHARED_OBJS = unshared/*.o
+ 
+ 
+ # Additional compiler rules
+@@ -50,22 +49,12 @@
+ 	${CC} ${ALL_CFLAGS} -E $*.c > $@
+ 
+ .c.o:
+-ifeq "${USE_DYNAMIC_MODULE}" "yes"
+-	${RM} $@
+-	${CC} ${ALL_CFLAGS} ${SHARED_CFLAGS} -c $<
+-else
+-	${RM} unshared/$@
+-	${CC} ${ALL_CFLAGS} -c $< -o unshared/$@
+-endif
++	${LIBTOOL} ${CC} ${ALL_CFLAGS} -c $< 
+ 
+ # Main targets
+ # ------------
+ 
+-ifeq "${USE_DYNAMIC_MODULE}" "yes"
+-all : lib${LIBNAME}.so.${SOGLREV}
+-else
+-all : unshared-subdir lib${LIBNAME}.a
+-endif
++all : lib${LIBNAME}.la
+ 
+ 
+ clean :
+@@ -78,20 +67,8 @@
+ 	${DEPEND} -f .deps -- ${ALL_CFLAGS} -- ${SRCS}
+ 
+ 
+-ifeq "${USE_DYNAMIC_MODULE}" "yes"
+-install: lib${LIBNAME}.so.${SOGLREV}
+-	@if [ -d ${INSTALL_libdir} ]; then set +x; \
+-	else (set -x; ${MKDIR} ${INSTALL_libdir}); fi
+-	${INSTALL} ${INSTALLFLAGS} ${INSTBINFLAGS} lib${LIBNAME}.so.${SOGLREV} ${INSTALL_libdir}
+-	@T=`echo ${INSTALL_libdir}/lib${LIBNAME}.so.${SOGLREV} | sed 's/\.[^\.]*$$//'`; set -x; ${RM} $$T && ${LN} lib${LIBNAME}.so.${SOGLREV} $$T
+-	${RM} ${INSTALL_libdir}/lib${LIBNAME}.so
+-	${LN} lib${LIBNAME}.so.${SOGLREV} ${INSTALL_libdir}/lib${LIBNAME}.so
+-else
+-install: lib${LIBNAME}.a
+-	@if [ -d ${INSTALL_libdir} ]; then set +x; \
+-	else (set -x; ${MKDIR} ${INSTALL_libdir}); fi
+-	${INSTALL} ${INSTALLFLAGS} ${INSTBINFLAGS} lib${LIBNAME}.a ${INSTALL_libdir}
+-endif
++install: lib${LIBNAME}.la
++	${LIBTOOL} ${BSD_INSTALL_DATA} $< ${INSTALL_libdir}
+ 
+ tags :
+ 	${TAGS} -w *.[ch]
+@@ -109,21 +86,9 @@
+ render.c: genlib.tcl genGL.tcl
+ 	${TCLSH} genlib.tcl
+ 
+-lib${LIBNAME}.so.${SOGLREV} : render.c ${OBJS}
+-	${RM} $@~
+-	@SONAME=`echo $@ | sed 's/\.[^\.]*$$//'`; set -x; \
+-	if [ `uname` = "SunOS" ] ; then \
+-		${CC} -o ./$@~ ${SHARED_LDFLAGS} -Wl,-h,$$SONAME ${OBJS} \
+-		${XLIBDIR} ${XLIBS} ${LIBS} ${MATHLIBS}; \
+-	else \
+-		${CC} -o ./$@~ ${SHARED_LDFLAGS} -Wl,-soname,$$SONAME ${OBJS} \
+-		${XLIBDIR} ${XLIBS} ${LIBS} ${MATHLIBS}; \
+-	fi; \
+-	${RM} $$SONAME; ${LN} $@ $$SONAME; \
+-	${RM} $@
+-	${MV} $@~ $@
+-	${RM} lib${LIBNAME}.so
+-	${LN} $@ lib${LIBNAME}.so
++lib${LIBNAME}.la : render.c ${OBJS}
++	${LIBTOOL} --mode=link ${CC} -rpath ${INSTALL_libdir} \
++	  -version-info ${SOGLREV} -o $@ ${OBJS:.o=.lo}
+ 
+ lib${LIBNAME}.a : render.c ${UNSHARED_OBJS}
+ 	${RM} $@~
diff --git a/graphics/Mesa-glx/patches/patch-ac b/graphics/Mesa-glx/patches/patch-ac
deleted file mode 100644
index 5ff85211df3..00000000000
--- a/graphics/Mesa-glx/patches/patch-ac
+++ /dev/null
@@ -1,38 +0,0 @@
-$NetBSD: patch-ac,v 1.2 1999/10/25 10:18:37 tron Exp $
-
---- servGL/serverglx/glxmesa.c.orig	Mon Aug  2 20:37:13 1999
-+++ servGL/serverglx/glxmesa.c	Sun Oct 24 22:30:45 1999
-@@ -54,6 +54,7 @@
- #include "GL/xmesa.h"
- 
- #include <assert.h>
-+#include <paths.h>
- #include <signal.h>
- 
- #ifdef __FreeBSD__
-@@ -133,10 +134,10 @@
- glxInitLogs() {
-    fprintf(stderr, "Initializing logs\n");
-    
--   unlink("~/glx_debug.log");
-+   unlink(_PATH_TMP "glx_debug.log");
-    
-    /* set up logging capabilities */
--   if (set_log_file("~/glx_debug.log")) {
-+   if (set_log_file(_PATH_TMP "glx_debug.log")) {
-       fprintf(stderr, "glX Error: error setting log file\n");
-    }
-    log_initialize();
-@@ -269,9 +269,9 @@
-               hwInitVisuals = NULL;
- #endif
-            } else 
--           if ( (!strcmp("RIVA128", vga256InfoRec.chipset)) ||
--                (!strcmp("RIVATNT", vga256InfoRec.chipset)) ||
--                (!strcmp("RIVATNT2", vga256InfoRec.chipset)) )  {
-+           if ( (strncmp("RIVA", vga256InfoRec.chipset, 4) == 0) &&
-+                ((strstr(&vga256InfoRec.chipset[4], "128") != NULL) ||
-+                 (strstr(&vga256InfoRec.chipset[4], "TNT") != NULL)) ) {
-               hw_flag = GL_TRUE;
-               /* XXX - may need to select correct one */ 
-               glx_chipset = NV_RIVATNT; 
diff --git a/graphics/Mesa-glx/pkg/PLIST b/graphics/Mesa-glx/pkg/PLIST
new file mode 100644
index 00000000000..b2824160258
--- /dev/null
+++ b/graphics/Mesa-glx/pkg/PLIST
@@ -0,0 +1,27 @@
+@comment $NetBSD: PLIST,v 1.1 2000/04/11 22:36:39 tron Exp $
+etc/glx.conf.default
+@exec test -f %D/etc/glx.conf || cp %D/etc/glx.conf.default %D/etc/glx.conf
+etc/mesa.conf
+include/GL/gl.h
+include/GL/gl_mangle.h
+include/GL/glu.h
+include/GL/glu_mangle.h
+include/GL/glut.h
+include/GL/glutf90.h
+include/GL/glx.h
+include/GL/glx_mangle.h
+include/GL/osmesa.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/libGLU.la
+lib/libglut.so.10.0
+lib/libglut.a
+lib/libglut.la
+lib/modules/glx.so
+@dirrm include/GL