From abfc152a4e02ff23fd8b583e6d479103bc674f77 Mon Sep 17 00:00:00 2001
From: xtraeme <xtraeme@pkgsrc.org>
Date: Thu, 29 Jul 2004 05:44:48 +0000
Subject: CONFLICTS with xorg-server.

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

diff --git a/x11/XFree86-server/Makefile b/x11/XFree86-server/Makefile
index 34644bbc2df..87875ec86fa 100644
--- a/x11/XFree86-server/Makefile
+++ b/x11/XFree86-server/Makefile
@@ -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 @@ MAINTAINER=		xfree86@blef.org
 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
-- 
cgit v1.2.3