[pkgsrc/trunk]: pkgsrc/x11/XFree86-libs If ${X11ROOT} == ${LOCALBASE}, then w...

[jlam <jlam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/d1ea2aae2711
branches:  trunk
changeset: 474372:d1ea2aae2711
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Wed Apr 28 01:34:47 2004 +0000

description:
If ${X11ROOT} == ${LOCALBASE}, then we also conflict with the pkgsrc glu
package for the same reason as for MesaLib.

diffstat:

 x11/XFree86-libs/Makefile |  4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diffs (18 lines):

diff -r 2c4a79a3b3a5 -r d1ea2aae2711 x11/XFree86-libs/Makefile
--- a/x11/XFree86-libs/Makefile Wed Apr 28 00:28:18 2004 +0000
+++ b/x11/XFree86-libs/Makefile Wed Apr 28 01:34:47 2004 +0000
@@ -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 @@
 .include "../../meta-pkgs/XFree86/Makefile.common"
 
 .if ${X11ROOT} == ${LOCALBASE}
-CONFLICTS+=            MesaLib-[0-9]*
+CONFLICTS+=            MesaLib-[0-9]* glu-[0-9]*
 .endif
 
 USE_BUILDLINK3=                        yes