diff options
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/Mesa/Makefile | 44 | ||||
| -rw-r--r-- | graphics/Mesa/files/md5 | 4 | ||||
| -rw-r--r-- | graphics/Mesa/files/patch-sum | 8 | ||||
| -rw-r--r-- | graphics/Mesa/patches/patch-aa | 23 | ||||
| -rw-r--r-- | graphics/Mesa/patches/patch-ab | 14 | ||||
| -rw-r--r-- | graphics/Mesa/pkg/COMMENT | 2 | ||||
| -rw-r--r-- | graphics/Mesa/pkg/DESCR | 2 | ||||
| -rw-r--r-- | graphics/Mesa/pkg/PLIST | 25 |
8 files changed, 33 insertions, 89 deletions
diff --git a/graphics/Mesa/Makefile b/graphics/Mesa/Makefile index 25bfbdf4cd1..4aa086df5ba 100644 --- a/graphics/Mesa/Makefile +++ b/graphics/Mesa/Makefile @@ -1,27 +1,33 @@ -# $NetBSD: Makefile,v 1.34 2000/06/21 02:24:22 jlam Exp $ +# $NetBSD: Makefile,v 1.35 2000/10/15 11:57:17 rh Exp $ # -DISTNAME= MesaLib-3.1 -PKGNAME= Mesa-3.1 -CATEGORIES= graphics -MASTER_SITES= ftp://ftp.mesa3d.org/mesa/ \ - http://download.sourceforge.net/mesa3d/ -EXTRACT_SUFX= .tar.bz2 -# MesaDemos is needed for glut -DISTFILES= MesaLib-3.1${EXTRACT_SUFX} \ - MesaDemos-3.1${EXTRACT_SUFX} +DISTNAME= Mesa-3.2.1 +CATEGORIES= graphics +MASTER_SITES= # empty +DISTFILES= # empty -MAINTAINER= mycroft@netbsd.org -HOMEPAGE= http://www.ssec.wisc.edu/~brianp/Mesa.html +MAINTAINER= packages@netbsd.org +HOMEPAGE= http://www.ssec.wisc.edu/~brianp/Mesa.html -CONFLICTS= Mesa-glx-* +DEPENDS+= glu-3.2.1:../../graphics/glu +DEPENDS+= glut-3.2.1:../../graphics/glut -WRKSRC= ${WRKDIR}/${PKGNAME} -USE_X11BASE= # defined -USE_LIBTOOL= # defined -LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig +CONFLICTS= Mesa-glx-* -GNU_CONFIGURE= # defined -CONFIGURE_ARGS= --enable-static +CHECK_MESA= yes +.include "../../mk/bsd.prefs.mk" + +.if ${HAVE_BUILTIN_MESA} == "NO" +DEPENDS+= MesaLib-3.2.1:../../graphics/MesaLib +.endif + +USE_X11BASE= yes +NO_CHECKSUM= yes +NO_PATCH= yes +NO_CONFIGURE= yes +NO_BUILD= yes +EXTRACT_ONLY= # empty + +do-install: # empty .include "../../mk/bsd.pkg.mk" diff --git a/graphics/Mesa/files/md5 b/graphics/Mesa/files/md5 deleted file mode 100644 index 8ff12b91adb..00000000000 --- a/graphics/Mesa/files/md5 +++ /dev/null @@ -1,4 +0,0 @@ -$NetBSD: md5,v 1.9 2000/04/04 07:59:49 tron Exp $ - -MD5 (MesaLib-3.1.tar.bz2) = 58292669606fd6b06ee109b790c14c1c -MD5 (MesaDemos-3.1.tar.bz2) = bf16132074cbd0b9f6ce211437966b51 diff --git a/graphics/Mesa/files/patch-sum b/graphics/Mesa/files/patch-sum index f583b774f87..36e8f967ca6 100644 --- a/graphics/Mesa/files/patch-sum +++ b/graphics/Mesa/files/patch-sum @@ -1,4 +1,6 @@ -$NetBSD: patch-sum,v 1.5 2000/09/21 14:40:11 tron Exp $ +$NetBSD: patch-sum,v 1.6 2000/10/15 11:57:19 rh Exp $ -MD5 (patch-aa) = f8df516f0a4941e5103027eead5adfe6 -MD5 (patch-ab) = 4483eaa45736e7658433a169f5982674 +This placeholder file is generated by the ``makepatchsum'' target +whenever the patches directory is empty or missing. Its purpose +is to ensure that the presence of any obsolete patches will cause +the proper error to be emitted at build time. diff --git a/graphics/Mesa/patches/patch-aa b/graphics/Mesa/patches/patch-aa deleted file mode 100644 index 156e0cc98e2..00000000000 --- a/graphics/Mesa/patches/patch-aa +++ /dev/null @@ -1,23 +0,0 @@ -$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 @@ - - #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 @@ - - #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 b4aee9ade4c..00000000000 --- a/graphics/Mesa/patches/patch-ab +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-ab,v 1.7 2000/09/21 14:40:11 tron Exp $ - ---- src/fog.c.orig Thu Sep 21 15:31:16 2000 -+++ src/fog.c Thu Sep 21 15:31:47 2000 -@@ -43,6 +43,9 @@ - #include "types.h" - #include "xform.h" - #endif -+#ifdef __NetBSD__ -+#include <float.h> -+#endif - - - diff --git a/graphics/Mesa/pkg/COMMENT b/graphics/Mesa/pkg/COMMENT index 650cafbd4da..4dbc2f61763 100644 --- a/graphics/Mesa/pkg/COMMENT +++ b/graphics/Mesa/pkg/COMMENT @@ -1 +1 @@ -Graphics library similar to SGI's OpenGL +Graphics library meta package, similar to SGI's OpenGL diff --git a/graphics/Mesa/pkg/DESCR b/graphics/Mesa/pkg/DESCR index 4d1cbc88011..2cc7b386c7d 100644 --- a/graphics/Mesa/pkg/DESCR +++ b/graphics/Mesa/pkg/DESCR @@ -6,5 +6,3 @@ compatible replacement for OpenGL or associated with Silicon Graphics, Inc. Those who want a licensed implementation of OpenGL should contact a licensed vendor. This software is distributed under the terms of the GNU Library General Public License, see the LICENSE file for details. - -Note: Some examples are available under /usr/X11R6/share/examples/Mesa. diff --git a/graphics/Mesa/pkg/PLIST b/graphics/Mesa/pkg/PLIST index 0e9ad79cd53..29b4f1ae20b 100644 --- a/graphics/Mesa/pkg/PLIST +++ b/graphics/Mesa/pkg/PLIST @@ -1,23 +1,2 @@ -@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 -include/GL/glu_mangle.h -include/GL/glut.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 -@dirrm include/GL +@comment $NetBSD: PLIST,v 1.13 2000/10/15 11:57:20 rh Exp $ +@comment this plist intentionally left empty |