summaryrefslogtreecommitdiff
path: root/fonts/XFree86-fontsScalable
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-fontsScalable
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-fontsScalable')
-rw-r--r--fonts/XFree86-fontsScalable/Makefile5
1 files changed, 1 insertions, 4 deletions
diff --git a/fonts/XFree86-fontsScalable/Makefile b/fonts/XFree86-fontsScalable/Makefile
index 9c1f686e0e9..f926de2683c 100644
--- a/fonts/XFree86-fontsScalable/Makefile
+++ b/fonts/XFree86-fontsScalable/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2004/07/29 05:54:11 xtraeme Exp $
+# $NetBSD: Makefile,v 1.7 2004/07/29 06:36:33 xtraeme Exp $
DISTNAME= ${DISTFILES}
PKGNAME= XFree86-fontsScalable-${XF_VER}
@@ -12,9 +12,6 @@ COMMENT= XFree86 scalable fonts
DEPENDS+= XFree86-fontsEncodings>=4.4.0:../XFree86-fontsEncodings
-CONFLICTS= xorg-fontsTruetype-[0-9]*
-CONFLICTS+= xorg-fontsType1-[0-9]*
-
NO_BUILD= yes
NO_BUILDLINK= # defined
USE_LANGUAGES= # empty