Update "Mesa-glx" package to version 20000813. Most of the work was done

by Thomas Klausner. A change list is not available unfortunately.

4 files changed, 24 insertions, 23 deletions

diff --git a/graphics/Mesa-glx/Makefile b/graphics/Mesa-glx/Makefile
index 98e7874613a..e6eb8b4d9ef 100644
--- a/graphics/Mesa-glx/Makefile
+++ b/graphics/Mesa-glx/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.9 2000/06/01 11:23:26 rh Exp $
+# $NetBSD: Makefile,v 1.10 2000/08/14 07:27:39 tron Exp $
 
-DISTNAME=	glx-20000407
+DISTNAME=	glx-20000813
 PKGNAME=	Mesa-${DISTNAME}
 CATEGORIES=	graphics
 MASTER_SITES=	http://snow.ashlu.bc.ca/glx/snapshots/
@@ -21,9 +21,10 @@ ONLY_FOR_PLATFORM=	NetBSD-*-i386
 
 GNU_CONFIGURE=		yes
 USE_GMAKE=		yes
-USE_PKGLIBTOOL=		yes
+USE_LIBTOOL=		yes
 USE_X11BASE=		yes
 CONFIGURE_ARGS+=	--enable-static --with-mesa=${MESA_WRKSRC}
+CONFIGURE_ARGS+=	--with-moduledir=${PREFIX}/lib/modules
 CONFIGURE_ENV+=		TCLSH=${TCLSH}
 
 AUTOCONF=	${LOCALBASE}/bin/autoconf
diff --git a/graphics/Mesa-glx/files/md5 b/graphics/Mesa-glx/files/md5
index 4b38b7dfef9..237856fde01 100644
--- a/graphics/Mesa-glx/files/md5
+++ b/graphics/Mesa-glx/files/md5
@@ -1,5 +1,5 @@
-$NetBSD: md5,v 1.2 2000/04/11 22:36:04 tron Exp $
+$NetBSD: md5,v 1.3 2000/08/14 07:27:39 tron Exp $
 
-MD5 (glx-20000407.tar.bz2) = e822567d4f92a5f864b736f92df35d48
+MD5 (glx-20000813.tar.bz2) = eed031eabbf3c9c1cd7fe56a440360d9
 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 13031ad2a9d..fbb59a2f889 100644
--- a/graphics/Mesa-glx/files/patch-sum
+++ b/graphics/Mesa-glx/files/patch-sum
@@ -1,5 +1,5 @@
-$NetBSD: patch-sum,v 1.5 2000/04/11 22:36:04 tron Exp $
+$NetBSD: patch-sum,v 1.6 2000/08/14 07:27:39 tron Exp $
 
 MD5 (patch-aa) = 0aa834aea98b42c2a4e9f6a79483e246
-MD5 (patch-ab) = 1350d7fd3accf489cfa1fbf76f6e9238
+MD5 (patch-ab) = 1e7c2f95758fef4c6aafd03cae5816b0
 MD5 (patch-ac) = d46723fc65dd9a326f9c9e1c83d80054
diff --git a/graphics/Mesa-glx/patches/patch-ab b/graphics/Mesa-glx/patches/patch-ab
index 049830eda26..a06785de6ec 100644
--- a/graphics/Mesa-glx/patches/patch-ab
+++ b/graphics/Mesa-glx/patches/patch-ab
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.2 2000/04/11 22:36:05 tron Exp $
+$NetBSD: patch-ab,v 1.3 2000/08/14 07:27:39 tron Exp $
 
---- libGL/Makefile.in.orig	Sun Feb 27 13:52:53 2000
-+++ libGL/Makefile.in	Thu Apr  6 23:29:08 2000
+--- libGL/Makefile.in.orig	Sat Jun  3 10:16:36 2000
++++ libGL/Makefile.in	Sun Aug 13 23:46:13 2000
 @@ -14,7 +14,7 @@
  # These define the name/version of the shared library we're building
  # ------------------------------------------------------------------
@@ -44,30 +44,30 @@ $NetBSD: patch-ab,v 1.2 2000/04/11 22:36:05 tron Exp $
  
  
  clean :
-@@ -78,20 +67,8 @@
+@@ -79,20 +68,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
+-	@if [ -d ${DESTDIR}${INSTALL_libdir} ]; then set +x; \
+-	else (set -x; ${MKDIR} ${DESTDIR}${INSTALL_libdir}); fi
+-	${INSTALL} ${INSTALLFLAGS} ${INSTBINFLAGS} lib${LIBNAME}.so.${SOGLREV} ${DESTDIR}${INSTALL_libdir}
+-	@T=`echo ${DESTDIR}${INSTALL_libdir}/lib${LIBNAME}.so.${SOGLREV} | sed 's/\.[^\.]*$$//'`; set -x; ${RM} $$T && ${LN} lib${LIBNAME}.so.${SOGLREV} $$T
+-	${RM} ${DESTDIR}${INSTALL_libdir}/lib${LIBNAME}.so
+-	${LN} lib${LIBNAME}.so.${SOGLREV} ${DESTDIR}${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}
+-	@if [ -d ${DESTDIR}${INSTALL_libdir} ]; then set +x; \
+-	else (set -x; ${MKDIR} ${DESTDIR}${INSTALL_libdir}); fi
+-	${INSTALL} ${INSTALLFLAGS} ${INSTBINFLAGS} lib${LIBNAME}.a ${DESTDIR}${INSTALL_libdir}
 -endif
 +install: lib${LIBNAME}.la
-+	${LIBTOOL} ${BSD_INSTALL_DATA} $< ${INSTALL_libdir}
++	${LIBTOOL} ${BSD_INSTALL_DATA} $< ${DESTDIR}${INSTALL_libdir}
  
  tags :
  	${TAGS} -w *.[ch]
-@@ -109,21 +86,9 @@
+@@ -110,21 +87,9 @@
  render.c: genlib.tcl genGL.tcl
  	${TCLSH} genlib.tcl
  
@@ -87,7 +87,7 @@ $NetBSD: patch-ab,v 1.2 2000/04/11 22:36:05 tron Exp $
 -	${RM} lib${LIBNAME}.so
 -	${LN} $@ lib${LIBNAME}.so
 +lib${LIBNAME}.la : render.c ${OBJS}
-+	${LIBTOOL} --mode=link ${CC} -rpath ${INSTALL_libdir} \
++	${LIBTOOL} --mode=link ${CC} -rpath ${DESTDIR}${INSTALL_libdir} \
 +	  -version-info ${SOGLREV} -o $@ ${OBJS:.o=.lo}
  
  lib${LIBNAME}.a : render.c ${UNSHARED_OBJS}