[pkgsrc/trunk]: pkgsrc/x11/xorg-libs The CONFLICTS lines for xextensions, lib...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/07c389b31119
branches:  trunk
changeset: 482208:07c389b31119
user:      xtraeme <xtraeme%pkgsrc.org@localhost>
date:      Fri Oct 22 06:31:42 2004 +0000

description:
The CONFLICTS lines for xextensions, libx11 and libXaw should be
only when X11BASE = LOCALBASE, otherwise they are useless, because
the xorg packages install the files into ${X11ROOT} aka ${PREFIX}/xorg
and not ${PREFIX}.

Bump PKGREVISION because the binary has been modified.

diffstat:

 x11/xorg-libs/Makefile |  11 +++++------
 1 files changed, 5 insertions(+), 6 deletions(-)

diffs (35 lines):

diff -r a9faf0de7367 -r 07c389b31119 x11/xorg-libs/Makefile
--- a/x11/xorg-libs/Makefile    Fri Oct 22 05:43:28 2004 +0000
+++ b/x11/xorg-libs/Makefile    Fri Oct 22 06:31:42 2004 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2004/10/09 09:32:19 xtraeme Exp $
+# $NetBSD: Makefile,v 1.9 2004/10/22 06:31:42 xtraeme Exp $
 
 DISTNAME=              ${DISTFILES}
 PKGNAME=               xorg-libs-${XORG_VER}
-PKGREVISION=           2
+PKGREVISION=           3
 CATEGORIES=            x11
 MASTER_SITES=          ${MASTER_SITE_XORG}
 DISTFILES=             X11R${XORG_VER}-src1.tar.gz X11R${XORG_VER}-src2.tar.gz \
@@ -12,10 +12,6 @@
 HOMEPAGE=              http://www.x.org/
 COMMENT=               X.org Libraries
 
-CONFLICTS+=            xextensions-[0-9]*
-CONFLICTS+=            libX11-[0-9]*
-CONFLICTS+=            libXau-[0-9]*
-
 BUILD_DEPENDS=         xorg-imake>=${XORG_VER}:../../x11/xorg-imake
 
 .include "../../mk/bsd.prefs.mk"
@@ -24,6 +20,9 @@
 
 .if ${X11ROOT} == ${LOCALBASE}
 CONFLICTS+=            MesaLib-[0-9]* glu-[0-9]*
+CONFLICTS+=            xextensions-[0-9]*
+CONFLICTS+=            libX11-[0-9]*
+CONFLICTS+=            libXau-[0-9]*
 .endif
 
 USE_BUILDLINK3=                        yes