mk/pkgtasks: Add additional variables used by package tasks.

These should be explicitly set in the scripts, otherwise, the
pkgtasks defaults are used by locating programs in the $PATH
or are hardcoded defaults used for testing pkgtasks.

1 files changed, 10 insertions, 1 deletions

diff --git a/mk/pkgformat/pkg/templates/header b/mk/pkgformat/pkg/templates/header
index 92cc258a1fd..7f5924635f5 100644
--- a/mk/pkgformat/pkg/templates/header
+++ b/mk/pkgformat/pkg/templates/header
@@ -29,7 +29,7 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 #
-# $NetBSD: header,v 1.3 2017/06/07 20:24:19 jlam Exp $
+# $NetBSD: header,v 1.4 2017/08/10 05:38:00 jlam Exp $
 
 # Package task loader.
 : ${TASK_MODULE_DIR:=@LOCALBASE@/share/pkgtasks-1}
@@ -69,10 +69,13 @@ CP="@CP@"
 DATE="@DATE@"
 FIND="@FIND@"
 ID="@ID@"
+INSTALL_INFO="@INSTALL_INFO@"
 LDCONFIG="@LDCONFIG@"
 LN="@LN@"
 LS="@LS@"
 MKDIR="@MKDIR@"
+MKFONTDIR="@MKFONTDIR@"
+MKFONTSCALE="@MKFONTSCALE@"
 MKTEMP="@MKTEMP@"
 MV="@MV@"
 PRINTF="@PRINTF@"
@@ -80,6 +83,8 @@ RM="@RM@"
 RMDIR="@RMDIR@"
 SED="@SED@"
 SORT="@SORT@"
+TTMKFDIR="@TTMKFDIR@"
+TYPE1INST="@TYPE1INST@"
 UNAME="@UNAME@"
 
 # Variables for addgroup/adduser programs used by pkgtasks.
@@ -112,6 +117,10 @@ TR="@TR@"
 TRUE="@TRUE@"
 XARGS="@XARGS@"
 
+# Path variables used by package tasks.
+OCAML_SITELIB="@OCAML_SITELIB@"
+X11_ENCODINGSDIR="@X11_ENCODINGSDIR@"
+
 # Variables for the pkg_install package tools.
 PKG_ADMIN="@PKG_ADMIN@"
 PKG_INFO="@PKG_INFO@"