summaryrefslogtreecommitdiff
path: root/fonts/mkfontscale
diff options
context:
space:
mode:
authorminskim <minskim@pkgsrc.org>2004-06-15 02:33:26 +0000
committerminskim <minskim@pkgsrc.org>2004-06-15 02:33:26 +0000
commitdbb26f0c5f82dce9228381ae7b044b2a49c5cab0 (patch)
tree8c9d0b0ff372cb18c142cc770c589599afd81a2e /fonts/mkfontscale
parentc1bfff64bbf805375f9a34c5c832a4aaaf13d60b (diff)
downloadpkgsrc-dbb26f0c5f82dce9228381ae7b044b2a49c5cab0.tar.gz
Add xpkgwedge to CONFLICT if ${X11BASE}/bin/mkfontscale is available,
because then xpkgwedge creates bin/mkfontscale, which is also installed by this package. Bump PKGREVISION.
Diffstat (limited to 'fonts/mkfontscale')
-rw-r--r--fonts/mkfontscale/Makefile8
1 files changed, 6 insertions, 2 deletions
diff --git a/fonts/mkfontscale/Makefile b/fonts/mkfontscale/Makefile
index 1a34562de35..8de3855a20a 100644
--- a/fonts/mkfontscale/Makefile
+++ b/fonts/mkfontscale/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2004/04/11 17:18:30 snj Exp $
+# $NetBSD: Makefile,v 1.14 2004/06/15 02:33:26 minskim Exp $
#
DISTNAME= mkfontscale-20020524
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= fonts
MASTER_SITES= http://www.pps.jussieu.fr/~jch/software/files/
@@ -20,4 +20,8 @@ USE_IMAKE= YES
PKG_FAIL_REASON= "Needs the fontenc.h header file, which comes with newer XFree versions."
.endif
+.if exists(${X11BASE}/bin/mkfontscale)
+CONFLICTS+= xpkgwedge>=1.11
+.endif
+
.include "../../mk/bsd.pkg.mk"