Wed Jun 7 20:24:27 2017 UTC ()
Fix the value being substituted for TTMKFDIR in install scripts.

@TYPE1INST@ should be replaced with ${TOOLS_PATH.type1inst}.
Before this change, the sed(1) script being generated was not
replaced @TYPE1INST@ at all, and instead generating a no-op
substitution pattern for TTMKFDIR.


(jlam)
diff -r1.1 -r1.2 pkgsrc/mk/pkgtasks/fonts.mk
cvs diff -r1.1 -r1.2 pkgsrc/mk/pkgtasks/fonts.mk (expand / switch to unified diff)

--- pkgsrc/mk/pkgtasks/fonts.mk 2017/06/01 02:06:04 1.1
+++ pkgsrc/mk/pkgtasks/fonts.mk 2017/06/07 20:24:27 1.2
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: fonts.mk,v 1.1 2017/06/01 02:06:04 jlam Exp $ 1# $NetBSD: fonts.mk,v 1.2 2017/06/07 20:24:27 jlam Exp $
2# 2#
3# Copyright (c) 2017 The NetBSD Foundation, Inc. 3# Copyright (c) 2017 The NetBSD Foundation, Inc.
4# All rights reserved. 4# All rights reserved.
5# 5#
6# This code is derived from software contributed to The NetBSD Foundation 6# This code is derived from software contributed to The NetBSD Foundation
7# by Johnny C. Lam. 7# by Johnny C. Lam.
8# 8#
9# Redistribution and use in source and binary forms, with or without 9# Redistribution and use in source and binary forms, with or without
10# modification, are permitted provided that the following conditions 10# modification, are permitted provided that the following conditions
11# are met: 11# are met:
12# 1. Redistributions of source code must retain the above copyright 12# 1. Redistributions of source code must retain the above copyright
13# notice, this list of conditions and the following disclaimer. 13# notice, this list of conditions and the following disclaimer.
14# 2. Redistributions in binary form must reproduce the above copyright 14# 2. Redistributions in binary form must reproduce the above copyright
@@ -67,27 +67,27 @@ USE_TOOLS+= mkfontscale:run @@ -67,27 +67,27 @@ USE_TOOLS+= mkfontscale:run
67FILES_SUBST+= MKFONTSCALE=${TOOLS_PATH.mkfontscale:Q} 67FILES_SUBST+= MKFONTSCALE=${TOOLS_PATH.mkfontscale:Q}
68. else 68. else
69USE_TOOLS+= ttmkfdir:run 69USE_TOOLS+= ttmkfdir:run
70FILES_SUBST+= TTMKFDIR=${TOOLS_PATH.ttmkfdir:Q} 70FILES_SUBST+= TTMKFDIR=${TOOLS_PATH.ttmkfdir:Q}
71. endif 71. endif
72_FONTS_DIRS.x11+= ${FONTS_DIRS.ttf} 72_FONTS_DIRS.x11+= ${FONTS_DIRS.ttf}
73.endif 73.endif
74.if !empty(FONTS_DIRS.type1:M*) 74.if !empty(FONTS_DIRS.type1:M*)
75. if ${X11_TYPE} == "modular" 75. if ${X11_TYPE} == "modular"
76USE_TOOLS+= mkfontscale:run 76USE_TOOLS+= mkfontscale:run
77FILES_SUBST+= MKFONTSCALE=${TOOLS_PATH.mkfontscale:Q} 77FILES_SUBST+= MKFONTSCALE=${TOOLS_PATH.mkfontscale:Q}
78. else 78. else
79USE_TOOLS+= type1inst:run 79USE_TOOLS+= type1inst:run
80FILES_SUBST+= TTMKFDIR=${TOOLS_PATH.type1inst:Q} 80FILES_SUBST+= TYPE1INST=${TOOLS_PATH.type1inst:Q}
81. endif 81. endif
82_FONTS_DIRS.x11+= ${FONTS_DIRS.type1} 82_FONTS_DIRS.x11+= ${FONTS_DIRS.type1}
83.endif 83.endif
84_FONTS_DIRS.x11+= ${FONTS_DIRS.x11} 84_FONTS_DIRS.x11+= ${FONTS_DIRS.x11}
85.if !empty(_FONTS_DIRS.x11:M*) 85.if !empty(_FONTS_DIRS.x11:M*)
86USE_TOOLS+= mkfontdir:run 86USE_TOOLS+= mkfontdir:run
87FILES_SUBST+= MKFONTDIR=${TOOLS_PATH:mkfontdir:Q} 87FILES_SUBST+= MKFONTDIR=${TOOLS_PATH:mkfontdir:Q}
88. if ${X11_TYPE} == "modular" 88. if ${X11_TYPE} == "modular"
89DEPENDS+= encodings-[0-9]*:../../fonts/encodings 89DEPENDS+= encodings-[0-9]*:../../fonts/encodings
90X11_ENCODINGSDIR?= ${X11BASE}/share/fonts/X11/encodings 90X11_ENCODINGSDIR?= ${X11BASE}/share/fonts/X11/encodings
91. else 91. else
92X11_ENCODINGSDIR?= ${X11BASE}/lib/fonts/X11/encodings 92X11_ENCODINGSDIR?= ${X11BASE}/lib/fonts/X11/encodings
93. endif 93. endif