diff options
-rw-r--r-- | graphics/Mesa/Makefile | 10 | ||||
-rw-r--r-- | graphics/MesaLib/Makefile | 4 | ||||
-rw-r--r-- | graphics/MesaLib/files/md5 | 4 | ||||
-rw-r--r-- | graphics/MesaLib/files/patch-sum | 6 | ||||
-rw-r--r-- | graphics/MesaLib/patches/patch-aa | 12 | ||||
-rw-r--r-- | graphics/MesaLib/patches/patch-ab | 12 | ||||
-rw-r--r-- | graphics/MesaLib/pkg/PLIST | 4 | ||||
-rw-r--r-- | graphics/glu/Makefile | 4 | ||||
-rw-r--r-- | graphics/glu/files/md5 | 4 | ||||
-rw-r--r-- | graphics/glu/files/patch-sum | 4 | ||||
-rw-r--r-- | graphics/glu/patches/patch-aa | 12 | ||||
-rw-r--r-- | graphics/glu/pkg/PLIST | 4 | ||||
-rw-r--r-- | graphics/glut/Makefile | 4 | ||||
-rw-r--r-- | graphics/glut/files/md5 | 6 |
14 files changed, 45 insertions, 45 deletions
diff --git a/graphics/Mesa/Makefile b/graphics/Mesa/Makefile index 4aa086df5ba..9ed2d1c1e2a 100644 --- a/graphics/Mesa/Makefile +++ b/graphics/Mesa/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.35 2000/10/15 11:57:17 rh Exp $ +# $NetBSD: Makefile,v 1.36 2000/12/12 17:22:38 drochner Exp $ # -DISTNAME= Mesa-3.2.1 +DISTNAME= Mesa-3.4 CATEGORIES= graphics MASTER_SITES= # empty DISTFILES= # empty @@ -9,8 +9,8 @@ DISTFILES= # empty MAINTAINER= packages@netbsd.org HOMEPAGE= http://www.ssec.wisc.edu/~brianp/Mesa.html -DEPENDS+= glu-3.2.1:../../graphics/glu -DEPENDS+= glut-3.2.1:../../graphics/glut +DEPENDS+= glu-3.4:../../graphics/glu +DEPENDS+= glut-3.4:../../graphics/glut CONFLICTS= Mesa-glx-* @@ -18,7 +18,7 @@ CHECK_MESA= yes .include "../../mk/bsd.prefs.mk" .if ${HAVE_BUILTIN_MESA} == "NO" -DEPENDS+= MesaLib-3.2.1:../../graphics/MesaLib +DEPENDS+= MesaLib-3.4:../../graphics/MesaLib .endif USE_X11BASE= yes diff --git a/graphics/MesaLib/Makefile b/graphics/MesaLib/Makefile index 029c1092902..8ed1080b608 100644 --- a/graphics/MesaLib/Makefile +++ b/graphics/MesaLib/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.2 2000/11/11 17:49:26 tron Exp $ +# $NetBSD: Makefile,v 1.3 2000/12/12 17:22:38 drochner Exp $ # -DISTNAME= MesaLib-3.2.1 +DISTNAME= MesaLib-3.4 WRKSRC= ${WRKDIR}/${DISTNAME:S/Lib//} CATEGORIES= graphics MASTER_SITES= ftp://ftp.mesa3d.org/mesa/ \ diff --git a/graphics/MesaLib/files/md5 b/graphics/MesaLib/files/md5 index 374902bf7c2..6377a2ff979 100644 --- a/graphics/MesaLib/files/md5 +++ b/graphics/MesaLib/files/md5 @@ -1,3 +1,3 @@ -$NetBSD: md5,v 1.1.1.1 2000/10/15 11:41:17 rh Exp $ +$NetBSD: md5,v 1.2 2000/12/12 17:22:38 drochner Exp $ -MD5 (MesaLib-3.2.1.tar.bz2) = dcd5a6aa77b3bdb400c8179419473e58 +MD5 (MesaLib-3.4.tar.bz2) = 6817ac3667aec85ab4c64ad8116867b7 diff --git a/graphics/MesaLib/files/patch-sum b/graphics/MesaLib/files/patch-sum index feb11f0a805..c5ab1f0dbcd 100644 --- a/graphics/MesaLib/files/patch-sum +++ b/graphics/MesaLib/files/patch-sum @@ -1,4 +1,4 @@ -$NetBSD: patch-sum,v 1.1.1.1 2000/10/15 11:41:17 rh Exp $ +$NetBSD: patch-sum,v 1.2 2000/12/12 17:22:38 drochner Exp $ -MD5 (patch-aa) = 18cbd350a347af4bd5e455b1733a19d8 -MD5 (patch-ab) = 001debf3952eb11c1b152b85e3243ffb +MD5 (patch-aa) = 95180ae89aa01383d0dd647ded6f6d6c +MD5 (patch-ab) = c514339a69a904add8a58e9c0a50e97c diff --git a/graphics/MesaLib/patches/patch-aa b/graphics/MesaLib/patches/patch-aa index ef4d55c7998..46fc86c23c3 100644 --- a/graphics/MesaLib/patches/patch-aa +++ b/graphics/MesaLib/patches/patch-aa @@ -1,14 +1,14 @@ -$NetBSD: patch-aa,v 1.1.1.1 2000/10/15 11:41:17 rh Exp $ +$NetBSD: patch-aa,v 1.2 2000/12/12 17:22:39 drochner Exp $ ---- src/X86/assyntax.h.orig Thu Apr 6 23:59:24 2000 -+++ src/X86/assyntax.h -@@ -948,7 +948,8 @@ +--- src/X86/assyntax.h.orig Mon Sep 25 17:12:01 2000 ++++ src/X86/assyntax.h Sun Dec 10 23:45:34 2000 +@@ -954,7 +954,8 @@ #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 + #define GLNAME(a) a #else - #define GLNAME(a) _ ## a + #define GLNAME(a) _ ## a diff --git a/graphics/MesaLib/patches/patch-ab b/graphics/MesaLib/patches/patch-ab index 999bc8ddd33..628066cbf88 100644 --- a/graphics/MesaLib/patches/patch-ab +++ b/graphics/MesaLib/patches/patch-ab @@ -1,11 +1,11 @@ -$NetBSD: patch-ab,v 1.1.1.1 2000/10/15 11:41:17 rh Exp $ +$NetBSD: patch-ab,v 1.2 2000/12/12 17:22:39 drochner Exp $ ---- configure.orig Sat Sep 2 12:42:26 2000 -+++ configure -@@ -822,8 +822,8 @@ +--- configure.orig Thu Nov 2 19:09:25 2000 ++++ configure Sun Dec 10 23:49:29 2000 +@@ -823,8 +823,8 @@ MESA_MAJOR=3 - MESA_MINOR=2 - MESA_TINY=1 + MESA_MINOR=4 + MESA_TINY=0 -LIBGL_VERSION=1:2:0${MESA_MAJOR}0${MESA_MINOR}0${MESA_TINY} -LIBGLU_VERSION=1:1:0${MESA_MAJOR}0${MESA_MINOR}0${MESA_TINY} +LIBGL_VERSION=${MESA_MAJOR}:${MESA_MINOR}:${MESA_TINY} diff --git a/graphics/MesaLib/pkg/PLIST b/graphics/MesaLib/pkg/PLIST index 2f4ab2dda0e..bb819f4a899 100644 --- a/graphics/MesaLib/pkg/PLIST +++ b/graphics/MesaLib/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2000/10/15 11:41:17 rh Exp $ +@comment $NetBSD: PLIST,v 1.2 2000/12/12 17:22:39 drochner Exp $ etc/mesa.conf include/GL/gl.h include/GL/gl_mangle.h @@ -8,7 +8,7 @@ include/GL/osmesa.h include/GL/xmesa.h include/GL/xmesa_x.h include/GL/xmesa_xf86.h -lib/libGL.so.3.2 +lib/libGL.so.3.4 lib/libGL.a lib/libGL.la @unexec rmdir %D/include/GL >/dev/null 2>&1 || true diff --git a/graphics/glu/Makefile b/graphics/glu/Makefile index bfc161a1d31..1b70f4fa214 100644 --- a/graphics/glu/Makefile +++ b/graphics/glu/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.3 2000/11/11 17:49:26 tron Exp $ +# $NetBSD: Makefile,v 1.4 2000/12/12 17:22:39 drochner Exp $ # -DISTNAME= MesaLib-3.2.1 +DISTNAME= MesaLib-3.4 PKGNAME= ${DISTNAME:C/MesaLib/glu/} CATEGORIES= graphics MASTER_SITES= ftp://ftp.mesa3d.org/mesa/ \ diff --git a/graphics/glu/files/md5 b/graphics/glu/files/md5 index 08f582993f9..bae41dd5d25 100644 --- a/graphics/glu/files/md5 +++ b/graphics/glu/files/md5 @@ -1,3 +1,3 @@ -$NetBSD: md5,v 1.1.1.1 2000/10/15 11:45:21 rh Exp $ +$NetBSD: md5,v 1.2 2000/12/12 17:22:39 drochner Exp $ -MD5 (MesaLib-3.2.1.tar.bz2) = dcd5a6aa77b3bdb400c8179419473e58 +MD5 (MesaLib-3.4.tar.bz2) = 6817ac3667aec85ab4c64ad8116867b7 diff --git a/graphics/glu/files/patch-sum b/graphics/glu/files/patch-sum index f9f6c4a5dd4..55b33fa5195 100644 --- a/graphics/glu/files/patch-sum +++ b/graphics/glu/files/patch-sum @@ -1,3 +1,3 @@ -$NetBSD: patch-sum,v 1.1.1.1 2000/10/15 11:45:21 rh Exp $ +$NetBSD: patch-sum,v 1.2 2000/12/12 17:22:39 drochner Exp $ -MD5 (patch-aa) = 001debf3952eb11c1b152b85e3243ffb +MD5 (patch-aa) = 617155a88565f7059be8bd8e1880e2ba diff --git a/graphics/glu/patches/patch-aa b/graphics/glu/patches/patch-aa index 1c0feb12a63..d6f901c6e09 100644 --- a/graphics/glu/patches/patch-aa +++ b/graphics/glu/patches/patch-aa @@ -1,11 +1,11 @@ -$NetBSD: patch-aa,v 1.1.1.1 2000/10/15 11:45:21 rh Exp $ +$NetBSD: patch-aa,v 1.2 2000/12/12 17:22:39 drochner Exp $ ---- configure.orig Sat Sep 2 12:42:26 2000 -+++ configure -@@ -822,8 +822,8 @@ +--- configure.orig Thu Nov 2 19:09:25 2000 ++++ configure Mon Dec 11 00:17:01 2000 +@@ -823,8 +823,8 @@ MESA_MAJOR=3 - MESA_MINOR=2 - MESA_TINY=1 + MESA_MINOR=4 + MESA_TINY=0 -LIBGL_VERSION=1:2:0${MESA_MAJOR}0${MESA_MINOR}0${MESA_TINY} -LIBGLU_VERSION=1:1:0${MESA_MAJOR}0${MESA_MINOR}0${MESA_TINY} +LIBGL_VERSION=${MESA_MAJOR}:${MESA_MINOR}:${MESA_TINY} diff --git a/graphics/glu/pkg/PLIST b/graphics/glu/pkg/PLIST index 10f9f45f5fe..a4ea4faaea4 100644 --- a/graphics/glu/pkg/PLIST +++ b/graphics/glu/pkg/PLIST @@ -1,7 +1,7 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2000/10/15 11:45:21 rh Exp $ +@comment $NetBSD: PLIST,v 1.2 2000/12/12 17:22:40 drochner Exp $ include/GL/glu.h include/GL/glu_mangle.h -lib/libGLU.so.3.2 +lib/libGLU.so.3.4 lib/libGLU.a lib/libGLU.la @unexec rmdir %D/include/GL >/dev/null 2>&1 || true diff --git a/graphics/glut/Makefile b/graphics/glut/Makefile index c5198da8181..93492248c05 100644 --- a/graphics/glut/Makefile +++ b/graphics/glut/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.2 2000/11/11 17:49:26 tron Exp $ +# $NetBSD: Makefile,v 1.3 2000/12/12 17:22:40 drochner Exp $ # -DISTNAME= Mesa-3.2.1 +DISTNAME= Mesa-3.4 PKGNAME= ${DISTNAME:S/Mesa/glut/} CATEGORIES= graphics MASTER_SITES= ftp://ftp.mesa3d.org/mesa/ \ diff --git a/graphics/glut/files/md5 b/graphics/glut/files/md5 index 10507712af4..8f3171b6a34 100644 --- a/graphics/glut/files/md5 +++ b/graphics/glut/files/md5 @@ -1,4 +1,4 @@ -$NetBSD: md5,v 1.1.1.1 2000/10/15 11:48:44 rh Exp $ +$NetBSD: md5,v 1.2 2000/12/12 17:22:40 drochner Exp $ -MD5 (MesaLib-3.2.1.tar.bz2) = dcd5a6aa77b3bdb400c8179419473e58 -MD5 (MesaDemos-3.2.1.tar.bz2) = 621bd95ed9f93467f4dfa615e2f27c16 +MD5 (MesaLib-3.4.tar.bz2) = 6817ac3667aec85ab4c64ad8116867b7 +MD5 (MesaDemos-3.4.tar.bz2) = 27f7c8e143e2412e75ef7a3cd2313e0b |