summaryrefslogtreecommitdiff
path: root/fonts/XFree86-fontserver
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 /fonts/XFree86-fontserver
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 'fonts/XFree86-fontserver')
-rw-r--r--fonts/XFree86-fontserver/Makefile4
1 files changed, 1 insertions, 3 deletions
diff --git a/fonts/XFree86-fontserver/Makefile b/fonts/XFree86-fontserver/Makefile
index aabfbca614c..3b731f6f2ff 100644
--- a/fonts/XFree86-fontserver/Makefile
+++ b/fonts/XFree86-fontserver/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2004/07/29 05:54:11 xtraeme Exp $
+# $NetBSD: Makefile,v 1.8 2004/07/29 06:36:33 xtraeme Exp $
DISTNAME= ${DISTFILES}
PKGNAME= XFree86-fontserver-${XF_VER}
@@ -11,8 +11,6 @@ MAINTAINER= xfree86@blef.org
HOMEPAGE= http://www.xfree86.org/
COMMENT= XFree86 font server
-CONFLICTS= xorg-fontserver-[0-9]*
-
USE_X11= yes
USE_BUILDLINK3= yes
DISTINFO_FILE= ${.CURDIR}/../../x11/XFree86-libs/distinfo