CVS commit: pkgsrc/mk/tools

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Mon Mar  4 11:56:05 UTC 2019

Modified Files:
        pkgsrc/mk/tools: replace.mk

Log Message:
mk/: let fonts/mkfontscale provide mkfontdir


To generate a diff of this commit:
cvs rdiff -u -r1.286 -r1.287 pkgsrc/mk/tools/replace.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/mk/tools/replace.mk
diff -u pkgsrc/mk/tools/replace.mk:1.286 pkgsrc/mk/tools/replace.mk:1.287
--- pkgsrc/mk/tools/replace.mk:1.286    Tue Jan 29 22:41:00 2019
+++ pkgsrc/mk/tools/replace.mk  Mon Mar  4 11:56:05 2019
@@ -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 @@ TOOLS_PATH.iceauth=             ${LOCALBASE}/bin/ic
 .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