summaryrefslogtreecommitdiff
path: root/x11
diff options
context:
space:
mode:
authorxtraeme <xtraeme@pkgsrc.org>2004-07-29 05:44:48 +0000
committerxtraeme <xtraeme@pkgsrc.org>2004-07-29 05:44:48 +0000
commitabfc152a4e02ff23fd8b583e6d479103bc674f77 (patch)
tree4deb67b1741eea2c4e5447f79410572e87bbd2de /x11
parenta2e04b310b67d642584c0e7d6c1a81d896ac8465 (diff)
downloadpkgsrc-abfc152a4e02ff23fd8b583e6d479103bc674f77.tar.gz
CONFLICTS with xorg-server.
Diffstat (limited to 'x11')
-rw-r--r--x11/XFree86-server/Makefile4
1 files changed, 3 insertions, 1 deletions
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