pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/fonts/mkfontscale Add xpkgwedge to CONFLICT if ${X11BA...
details: https://anonhg.NetBSD.org/pkgsrc/rev/c845941328cd
branches: trunk
changeset: 476569:c845941328cd
user: minskim <minskim%pkgsrc.org@localhost>
date: Tue Jun 15 02:33:26 2004 +0000
description:
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:
fonts/mkfontscale/Makefile | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diffs (23 lines):
diff -r 68f62dfb031e -r c845941328cd fonts/mkfontscale/Makefile
--- a/fonts/mkfontscale/Makefile Tue Jun 15 02:27:10 2004 +0000
+++ b/fonts/mkfontscale/Makefile Tue Jun 15 02:33:26 2004 +0000
@@ -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 @@
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"
Home |
Main Index |
Thread Index |
Old Index