summaryrefslogtreecommitdiff
path: root/x11/XFree86-server/Makefile
diff options
context:
space:
mode:
authorxtraeme <xtraeme@pkgsrc.org>2004-07-29 06:36:32 +0000
committerxtraeme <xtraeme@pkgsrc.org>2004-07-29 06:36:32 +0000
commit69c871c44879613395742f6172695959b5e30dae (patch)
tree6e4eadfeefda4ef4c7226ca902410714de716947 /x11/XFree86-server/Makefile
parentfb9e5350b4f9427f6335c69dd0be411d6aae71c7 (diff)
downloadpkgsrc-69c871c44879613395742f6172695959b5e30dae.tar.gz
xorg packages now will be installed into ${PREFIX}/xorg by default,
so we don't have to conflict between XFree86 and xorg. Suggested by grant@.
Diffstat (limited to 'x11/XFree86-server/Makefile')
-rw-r--r--x11/XFree86-server/Makefile4
1 files changed, 1 insertions, 3 deletions
diff --git a/x11/XFree86-server/Makefile b/x11/XFree86-server/Makefile
index 87875ec86fa..e4d6459afa6 100644
--- a/x11/XFree86-server/Makefile
+++ b/x11/XFree86-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2004/07/29 05:44:48 xtraeme Exp $
+# $NetBSD: Makefile,v 1.10 2004/07/29 06:36:33 xtraeme Exp $
DISTNAME= ${DISTFILES}
PKGNAME= XFree86-server-${XF_VER}
@@ -11,8 +11,6 @@ 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