diff options
| author | reed <reed@pkgsrc.org> | 2010-05-05 18:33:30 +0000 |
|---|---|---|
| committer | reed <reed@pkgsrc.org> | 2010-05-05 18:33:30 +0000 |
| commit | fbb5a346cb5a67b7bfe711c5e92c77c5044b6422 (patch) | |
| tree | 853a860f9c7453865f6ca528814307ecf99d1311 /graphics | |
| parent | 920a45c396b325e51aa98eba3a299e587a722cf5 (diff) | |
| download | pkgsrc-fbb5a346cb5a67b7bfe711c5e92c77c5044b6422.tar.gz | |
The BUILDLINK API dependency should be for xf86driproto not
driproto. I noticed this when it built with old xf86driproto
that had conflicting file. So add a CONFLICTS too.
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/MesaLib/Makefile | 4 | ||||
| -rw-r--r-- | graphics/MesaLib/glx-config.mk | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/graphics/MesaLib/Makefile b/graphics/MesaLib/Makefile index 2980fb9b779..cb5aa2092b5 100644 --- a/graphics/MesaLib/Makefile +++ b/graphics/MesaLib/Makefile @@ -1,9 +1,11 @@ -# $NetBSD: Makefile,v 1.83 2010/04/16 13:50:51 tnn Exp $ +# $NetBSD: Makefile,v 1.84 2010/05/05 18:33:30 reed Exp $ PKGNAME= MesaLib-${MESA_PKGVERSION} PKGREVISION= 3 COMMENT= Graphics library similar to SGI's OpenGL +CONFLICTS+= xf86driproto<2.0.4 + MESA_HEADERS= gl.h gl_mangle.h glext.h glx.h glxext.h \ glx_mangle.h osmesa.h xmesa.h xmesa_x.h \ xmesa_xf86.h diff --git a/graphics/MesaLib/glx-config.mk b/graphics/MesaLib/glx-config.mk index ff5182c8f48..c9b8db4d4b2 100644 --- a/graphics/MesaLib/glx-config.mk +++ b/graphics/MesaLib/glx-config.mk @@ -1,4 +1,4 @@ -# $NetBSD: glx-config.mk,v 1.4 2009/02/28 01:22:07 bjs Exp $ +# $NetBSD: glx-config.mk,v 1.5 2010/05/05 18:33:30 reed Exp $ # # used by x11/modular-xorg-server/options.mk @@ -8,7 +8,7 @@ GLX_CONFIG_MK= # empty ### XXX Older versions of xf86driproto installed dri_interface.h, which ### is now installed by Mesa. ### -BUILDLINK_API_DEPENDS.driproto+= xf86driproto>=2.0.4 +BUILDLINK_API_DEPENDS.xf86driproto+= xf86driproto>=2.0.4 . include "../../mk/bsd.fast.prefs.mk" |