From ad86a6a8fd711f70b85b69bb8f9f2a938b879d63 Mon Sep 17 00:00:00 2001
From: minskim <minskim>
Date: Tue, 15 Jun 2004 02:33:26 +0000
Subject: 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.
---
 fonts/mkfontscale/Makefile | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'fonts')

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"
-- 
cgit v1.2.3