Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1503102595278290"
MIME-Version: 1.0
Date: Sat, 19 Aug 2017 00:29:55 +0000
From: "Johnny C. Lam" <jlam@netbsd.org>
Subject: CVS commit: pkgsrc/mk/pkgtasks
To: pkgsrc-changes@NetBSD.org
Reply-To: jlam@netbsd.org
Message-Id: <20170819002955.E58D5FAD0@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_1503102595278290
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	jlam
Date:		Sat Aug 19 00:29:55 UTC 2017

Modified Files:
	pkgsrc/mk/pkgtasks: fonts.mk

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 pkgsrc/mk/pkgtasks/fonts.mk

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


--_----------=_1503102595278290
Content-Disposition: inline
Content-Length: 1980
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/mk/pkgtasks/fonts.mk
diff -u pkgsrc/mk/pkgtasks/fonts.mk:1.2 pkgsrc/mk/pkgtasks/fonts.mk:1.3
--- pkgsrc/mk/pkgtasks/fonts.mk:1.2	Wed Jun  7 20:24:27 2017
+++ pkgsrc/mk/pkgtasks/fonts.mk	Sat Aug 19 00:29:55 2017
@@ -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,36 +64,39 @@ _FONTS_DIRS.x11=	# empty
 .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
-FILES_SUBST+=		X11_ENCODINGSDIR=${X11_ENCODINGSDIR:Q}
 .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}
+
 _PKGTASKS_DATA.fonts=	${_PKGTASKS_DIR}/fonts
 _PKGTASKS_DATAFILES+=	${_PKGTASKS_DATA.fonts}
 

--_----------=_1503102595278290--