[pkgsrc/trunk]: pkgsrc/x11/XFree86-libs CONFLICTS with xorg-libs.

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/9a926c8e0a20
branches:  trunk
changeset: 478745:9a926c8e0a20
user:      xtraeme <xtraeme%pkgsrc.org@localhost>
date:      Thu Jul 29 05:39:19 2004 +0000

description:
CONFLICTS with xorg-libs.

diffstat:

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

diffs (17 lines):

diff -r f52d65fb5684 -r 9a926c8e0a20 x11/XFree86-libs/Makefile
--- a/x11/XFree86-libs/Makefile Thu Jul 29 05:37:36 2004 +0000
+++ b/x11/XFree86-libs/Makefile Thu Jul 29 05:39:19 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2004/07/21 23:55:19 xtraeme Exp $
+# $NetBSD: Makefile,v 1.13 2004/07/29 05:39:19 xtraeme Exp $
 
 DISTNAME=              ${DISTFILES}
 PKGNAME=               XFree86-libs-${XF_VER}
@@ -15,6 +15,7 @@
 CONFLICTS+=            xextensions-[0-9]*
 CONFLICTS+=            libX11-[0-9]*
 CONFLICTS+=            libXau-[0-9]*
+CONFLICTS+=            xorg-libs-[0-9]*
 
 BUILD_DEPENDS=         imake>=4.4.0:../../x11/imake