diff options
| author | minskim <minskim> | 2004-06-15 02:33:26 +0000 |
|---|---|---|
| committer | minskim <minskim> | 2004-06-15 02:33:26 +0000 |
| commit | 046c285353b00bbf0de0fe57ee4f2e43b8df3b54 (patch) | |
| tree | 8c9d0b0ff372cb18c142cc770c589599afd81a2e /fonts/mkfontscale | |
| parent | d05464abde71b7e1f65c0164895397c6cc09014c (diff) | |
| download | pkgsrc-046c285353b00bbf0de0fe57ee4f2e43b8df3b54.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/Makefile | 8 |
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" |