diff options
| author | jlam <jlam@pkgsrc.org> | 2004-04-28 01:34:47 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2004-04-28 01:34:47 +0000 |
| commit | 8d2a4f1ec7a94931c76c98d8e540ba3228a01024 (patch) | |
| tree | fd9e109b6dd928c1a54fef09949394e047858703 | |
| parent | 0158813661c877257a0a3025b260784c43a49819 (diff) | |
| download | pkgsrc-8d2a4f1ec7a94931c76c98d8e540ba3228a01024.tar.gz | |
If ${X11ROOT} == ${LOCALBASE}, then we also conflict with the pkgsrc glu
package for the same reason as for MesaLib.
| -rw-r--r-- | x11/XFree86-libs/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/x11/XFree86-libs/Makefile b/x11/XFree86-libs/Makefile index 362d4f83fd8..69f2f3f9099 100644 --- a/x11/XFree86-libs/Makefile +++ b/x11/XFree86-libs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2004/04/27 22:30:01 reed Exp $ +# $NetBSD: Makefile,v 1.9 2004/04/28 01:34:47 jlam Exp $ DISTNAME= ${DISTFILES} PKGNAME= XFree86-libs-${XF_VER} @@ -23,7 +23,7 @@ BUILD_DEPENDS= imake>=4.4.0:../../x11/imake .include "../../meta-pkgs/XFree86/Makefile.common" .if ${X11ROOT} == ${LOCALBASE} -CONFLICTS+= MesaLib-[0-9]* +CONFLICTS+= MesaLib-[0-9]* glu-[0-9]* .endif USE_BUILDLINK3= yes |