summaryrefslogtreecommitdiff
path: root/fonts/xorg-fontsEncodings
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/xorg-fontsEncodings
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/xorg-fontsEncodings')
-rw-r--r--fonts/xorg-fontsEncodings/Makefile5
1 files changed, 1 insertions, 4 deletions
diff --git a/fonts/xorg-fontsEncodings/Makefile b/fonts/xorg-fontsEncodings/Makefile
index bce4793e798..48a66dbf45c 100644
--- a/fonts/xorg-fontsEncodings/Makefile
+++ b/fonts/xorg-fontsEncodings/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/07/29 04:57:51 xtraeme Exp $
+# $NetBSD: Makefile,v 1.2 2004/07/29 06:36:33 xtraeme Exp $
DISTNAME= X11R6.7.0-src1
PKGNAME= xorg-fontsEncodings-${XORG_VER}
@@ -11,9 +11,6 @@ COMMENT= X.org Encoding fonts
BUILD_DEPENDS= xorg-clients>=6.7.0:../../x11/xorg-clients
-CONFLICTS= XFree86-fontsEncodings-[0-9]*
-
-NO_XFREE86_TARGETS= # defined
CHECK_X11_TYPE= # defined
XBUILD_DIRS= fonts/encodings