diff options
| author | xtraeme <xtraeme@pkgsrc.org> | 2004-07-29 05:54:11 +0000 |
|---|---|---|
| committer | xtraeme <xtraeme@pkgsrc.org> | 2004-07-29 05:54:11 +0000 |
| commit | fb9e5350b4f9427f6335c69dd0be411d6aae71c7 (patch) | |
| tree | c2121db720d3a548de13c570b6a31b905f0cb129 /fonts/XFree86-fonts100dpi | |
| parent | 27ca0f685be154917af7f6fd59f918d58540662b (diff) | |
| download | pkgsrc-fb9e5350b4f9427f6335c69dd0be411d6aae71c7.tar.gz | |
CONFLICTS with XFree86*
Diffstat (limited to 'fonts/XFree86-fonts100dpi')
| -rw-r--r-- | fonts/XFree86-fonts100dpi/Makefile | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/fonts/XFree86-fonts100dpi/Makefile b/fonts/XFree86-fonts100dpi/Makefile index 5ed3ed470a0..dd310c2ef55 100644 --- a/fonts/XFree86-fonts100dpi/Makefile +++ b/fonts/XFree86-fonts100dpi/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2004/03/28 22:06:15 xtraeme Exp $ +# $NetBSD: Makefile,v 1.5 2004/07/29 05:54:11 xtraeme Exp $ DISTNAME= XFree86-4.4.0-src-4 PKGNAME= XFree86-fonts100dpi-${XF_VER} @@ -13,6 +13,8 @@ COMMENT= XFree86 bitmap 100dpi fonts NO_XFREE86_TARGETS= # defined WRKSRC= ${WRKDIR}/xc/fonts/bdf/100dpi +CONFLICTS= xorg-fonts100dpi-[0-9]* + .include "../../fonts/XFree86-fontsEncodings/Makefile.common" .include "../../meta-pkgs/XFree86/Makefile.common" .include "../../mk/bsd.pkg.mk" |