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

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/f003ed6a9069
branches:  trunk
changeset: 478747:f003ed6a9069
user:      xtraeme <xtraeme%pkgsrc.org@localhost>
date:      Thu Jul 29 05:44:48 2004 +0000

description:
CONFLICTS with xorg-server.

diffstat:

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

diffs (18 lines):

diff -r 804e1310bc3b -r f003ed6a9069 x11/XFree86-server/Makefile
--- a/x11/XFree86-server/Makefile       Thu Jul 29 05:41:12 2004 +0000
+++ b/x11/XFree86-server/Makefile       Thu Jul 29 05:44:48 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2004/05/07 15:25:14 cjep Exp $
+# $NetBSD: Makefile,v 1.9 2004/07/29 05:44:48 xtraeme Exp $
 
 DISTNAME=              ${DISTFILES}
 PKGNAME=               XFree86-server-${XF_VER}
@@ -11,6 +11,8 @@
 HOMEPAGE=              http://www.xfree86.org/
 COMMENT=               XFree86 X server and related programs
 
+CONFLICTS=             xorg-server-[0-9]*
+
 USE_X11=               yes
 USE_BUILDLINK3=                yes
 CHECK_X11_TYPE=                # defined