pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/mk/tools mk/: let fonts/mkfontscale provide mkfontdir



details:   https://anonhg.NetBSD.org/pkgsrc/rev/b5307aba0276
branches:  trunk
changeset: 392598:b5307aba0276
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Mon Mar 04 11:56:05 2019 +0000

description:
mk/: let fonts/mkfontscale provide mkfontdir

diffstat:

 mk/tools/replace.mk |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (26 lines):

diff -r 25c1207e4fc8 -r b5307aba0276 mk/tools/replace.mk
--- a/mk/tools/replace.mk       Mon Mar 04 11:47:34 2019 +0000
+++ b/mk/tools/replace.mk       Mon Mar 04 11:56:05 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: replace.mk,v 1.286 2019/01/29 22:41:00 leot Exp $
+# $NetBSD: replace.mk,v 1.287 2019/03/04 11:56:05 wiz Exp $
 #
 # Copyright (c) 2005 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -1135,14 +1135,14 @@
 .endif
 
 .if !defined(TOOLS_IGNORE.mkfontdir) && !empty(_USE_TOOLS:Mmkfontdir)
-.  if !empty(PKGPATH:Mfonts/mkfontdir)
+.  if !empty(PKGPATH:Mfonts/mkfontscale)
 MAKEFLAGS+=            TOOLS_IGNORE.mkfontdir=
 .  elif !empty(_TOOLS_USE_PKGSRC.mkfontdir:M[yY][eE][sS])
 TOOLS_CREATE+=                 mkfontdir
 .    if !empty(X11_TYPE:Mnative)
 TOOLS_PATH.mkfontdir=  ${X11BASE}/bin/mkfontdir
 .    else
-TOOLS_DEPENDS.mkfontdir?=      mkfontdir-[0-9]*:../../fonts/mkfontdir
+TOOLS_DEPENDS.mkfontdir?=      mkfontscale>=1.2:../../fonts/mkfontscale
 TOOLS_PATH.mkfontdir=          ${LOCALBASE}/bin/mkfontdir
 .    endif
 .  endif



Home | Main Index | Thread Index | Old Index