[pkgsrc/trunk]: pkgsrc/x11/XFree86-libs By default, it made an automatic CONF...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/793b946fdd07
branches:  trunk
changeset: 474352:793b946fdd07
user:      reed <reed%pkgsrc.org@localhost>
date:      Tue Apr 27 21:32:57 2004 +0000

description:
By default, it made an automatic CONFLICTS with MesaLibs [sic].
Fixed so now only CONFLICTS with MesaLib when X11ROOT (which is
${PREFIX}/${X11ROOT_PREFIX}) is same as LOCALBASE.
(Fixed typo there too.)

diffstat:

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

diffs (20 lines):

diff -r 97b97a6935f9 -r 793b946fdd07 x11/XFree86-libs/Makefile
--- a/x11/XFree86-libs/Makefile Tue Apr 27 21:26:08 2004 +0000
+++ b/x11/XFree86-libs/Makefile Tue Apr 27 21:32:57 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2004/03/28 22:06:15 xtraeme Exp $
+# $NetBSD: Makefile,v 1.6 2004/04/27 21:32:57 reed Exp $
 
 DISTNAME=              ${DISTFILES}
 PKGNAME=               XFree86-libs-${XF_VER}
@@ -19,8 +19,8 @@
 
 .include "../../mk/bsd.prefs.mk"
 
-.if ${X11PREFIX} == ${LOCALBASE}
-CONFLICTS+=            MesaLibs-[0-9]*
+.if ${X11ROOT} == ${LOCALBASE}
+CONFLICTS+=            MesaLib-[0-9]*
 .endif
 
 USE_BUILDLINK3=                        yes