[pkgsrc/trunk]: pkgsrc/mk/pkgtasks mk/pkgtasks: Substitute for variables unco...

[jlam <jlam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/d447e9dad0aa
branches:  trunk
changeset: 366910:d447e9dad0aa
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Sat Aug 19 00:29:55 2017 +0000

description:
mk/pkgtasks: Substitute for variables unconditionally in scripts.

Replace @VAR@ with ${VAR} unconditionally in scripts, even if they
values are empty.  This will allow for fall-through to using the
pkgtasks hard-coded defaults, usually found by searching the PATH
contents, and it avoids having ugly "@VAR@" in the generated
scripts.

diffstat:

 mk/pkgtasks/fonts.mk |  17 ++++++++++-------
 1 files changed, 10 insertions(+), 7 deletions(-)

diffs (54 lines):

diff -r ac0994adde8f -r d447e9dad0aa mk/pkgtasks/fonts.mk
--- a/mk/pkgtasks/fonts.mk      Sat Aug 19 00:29:45 2017 +0000
+++ b/mk/pkgtasks/fonts.mk      Sat Aug 19 00:29:55 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: fonts.mk,v 1.2 2017/06/07 20:24:27 jlam Exp $
+# $NetBSD: fonts.mk,v 1.3 2017/08/19 00:29:55 jlam Exp $
 #
 # Copyright (c) 2017 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -64,35 +64,38 @@
 .if !empty(FONTS_DIRS.ttf:M*)
 .  if ${X11_TYPE} == "modular"
 USE_TOOLS+=            mkfontscale:run
-FILES_SUBST+=          MKFONTSCALE=${TOOLS_PATH.mkfontscale:Q}
 .  else
 USE_TOOLS+=            ttmkfdir:run
-FILES_SUBST+=          TTMKFDIR=${TOOLS_PATH.ttmkfdir:Q}
 .  endif
 _FONTS_DIRS.x11+=      ${FONTS_DIRS.ttf}
 .endif
 .if !empty(FONTS_DIRS.type1:M*)
 .  if ${X11_TYPE} == "modular"
 USE_TOOLS+=            mkfontscale:run
-FILES_SUBST+=          MKFONTSCALE=${TOOLS_PATH.mkfontscale:Q}
 .  else
 USE_TOOLS+=            type1inst:run
-FILES_SUBST+=          TYPE1INST=${TOOLS_PATH.type1inst:Q}
 .  endif
 _FONTS_DIRS.x11+=      ${FONTS_DIRS.type1}
 .endif
 _FONTS_DIRS.x11+=      ${FONTS_DIRS.x11}
 .if !empty(_FONTS_DIRS.x11:M*)
 USE_TOOLS+=            mkfontdir:run
-FILES_SUBST+=          MKFONTDIR=${TOOLS_PATH:mkfontdir:Q}
 .  if ${X11_TYPE} == "modular"
 DEPENDS+=              encodings-[0-9]*:../../fonts/encodings
 X11_ENCODINGSDIR?=     ${X11BASE}/share/fonts/X11/encodings
 .  else
 X11_ENCODINGSDIR?=     ${X11BASE}/lib/fonts/X11/encodings
 .  endif
+.endif
+
+# Variables for programs used by "fonts" package task.
+FILES_SUBST+=          MKFONTDIR=${TOOLS_PATH:mkfontdir:Q}
+FILES_SUBST+=          MKFONTSCALE=${TOOLS_PATH.mkfontscale:Q}
+FILES_SUBST+=          TTMKFDIR=${TOOLS_PATH.ttmkfdir:Q}
+FILES_SUBST+=          TYPE1INST=${TOOLS_PATH.type1inst:Q}
+
+# Path variables used by "fonts" package task.
 FILES_SUBST+=          X11_ENCODINGSDIR=${X11_ENCODINGSDIR:Q}
-.endif
 
 _PKGTASKS_DATA.fonts=  ${_PKGTASKS_DIR}/fonts
 _PKGTASKS_DATAFILES+=  ${_PKGTASKS_DATA.fonts}