diff options
author | xtraeme <xtraeme@pkgsrc.org> | 2004-07-29 06:36:32 +0000 |
---|---|---|
committer | xtraeme <xtraeme@pkgsrc.org> | 2004-07-29 06:36:32 +0000 |
commit | 69c871c44879613395742f6172695959b5e30dae (patch) | |
tree | 6e4eadfeefda4ef4c7226ca902410714de716947 /fonts/XFree86-fontsCyrillic/Makefile | |
parent | fb9e5350b4f9427f6335c69dd0be411d6aae71c7 (diff) | |
download | pkgsrc-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-fontsCyrillic/Makefile')
-rw-r--r-- | fonts/XFree86-fontsCyrillic/Makefile | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/fonts/XFree86-fontsCyrillic/Makefile b/fonts/XFree86-fontsCyrillic/Makefile index aa57e5da467..ea944ad3030 100644 --- a/fonts/XFree86-fontsCyrillic/Makefile +++ b/fonts/XFree86-fontsCyrillic/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2004/07/29 05:54:11 xtraeme Exp $ +# $NetBSD: Makefile,v 1.6 2004/07/29 06:36:33 xtraeme Exp $ DISTNAME= XFree86-4.4.0-src-4 PKGNAME= XFree86-fontsCyrillic-${XF_VER} @@ -13,8 +13,6 @@ COMMENT= XFree86 Cyrillic fonts NO_XFREE86_TARGETS= # defined WRKSRC= ${WRKDIR}/xc/fonts/bdf/cyrillic -CONFLICTS= xorg-fontsCyrillic-[0-9]* - .include "../../fonts/XFree86-fontsEncodings/Makefile.common" .include "../../meta-pkgs/XFree86/Makefile.common" .include "../../mk/bsd.pkg.mk" |