summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authorsketch <sketch@pkgsrc.org>2008-06-13 21:52:16 +0000
committersketch <sketch@pkgsrc.org>2008-06-13 21:52:16 +0000
commita61cd42ace943d52dca6e700a5010e06673e0ff9 (patch)
treeed3c47b232d9c36cbe7cbe13bafab294d36d614d /mk
parente379ba85897f0ad7f0b0eb9d56fc207331106427 (diff)
downloadpkgsrc-a61cd42ace943d52dca6e700a5010e06673e0ff9.tar.gz
Make sure we pick up pax via USE_TOOLS.
Diffstat (limited to 'mk')
-rw-r--r--mk/bulk/build6
-rw-r--r--mk/bulk/post-build4
2 files changed, 5 insertions, 5 deletions
diff --git a/mk/bulk/build b/mk/bulk/build
index a0e8b52c43d..135dc8cf418 100644
--- a/mk/bulk/build
+++ b/mk/bulk/build
@@ -1,5 +1,5 @@
#!/bin/sh
-# $NetBSD: build,v 1.104 2008/06/08 21:04:30 he Exp $
+# $NetBSD: build,v 1.105 2008/06/13 21:52:16 sketch Exp $
#
# Copyright (c) 1999, 2000 Hubert Feyrer <hubertf@NetBSD.org>
@@ -260,10 +260,10 @@ load_vars () {
BULK_DBFILE DEPENDSFILE INDEXFILE ORDERFILE STARTFILE
SUPPORTSFILE BULK_BUILD_ID_FILE BUILDLOG BROKENFILE
BROKENWRKLOG
- AWK GREP MAIL_CMD MKDIR PERL5 SED
+ AWK GREP MAIL_CMD MKDIR PAX PERL5 SED
PKG_DELETE PKG_INFO PKGBASE"
- values=`cd "$lintpkgsrc_dir" && $BMAKE show-vars VARNAMES="$vars" USE_TOOLS="awk grep mail mkdir perl sed"`
+ values=`cd "$lintpkgsrc_dir" && $BMAKE show-vars VARNAMES="$vars" USE_TOOLS="awk grep mail mkdir pax perl sed"`
for v in $vars; do
eval "read $v" || die "Could not read value for $v"
diff --git a/mk/bulk/post-build b/mk/bulk/post-build
index f5a4a0bda3d..7007f670ac4 100644
--- a/mk/bulk/post-build
+++ b/mk/bulk/post-build
@@ -1,5 +1,5 @@
#!/usr/pkg/bin/perl
-# $NetBSD: post-build,v 1.70 2008/01/04 15:49:08 rillig Exp $
+# $NetBSD: post-build,v 1.71 2008/06/13 21:52:16 sketch Exp $
#
# Collect stuff after a pkg bulk build
#
@@ -137,7 +137,7 @@ my $BMAKE = $ENV{BMAKE} || pb_die(undef, "The BMAKE environment variable must be
sub get_mk_conf_vars (@) {
my ($rest);
- open(I, "set -e; . '$BULK_BUILD_CONF'; . '$vars{USR_PKGSRC}/mk/bulk/post-build-conf'; export_config_vars; cd $vars{USR_PKGSRC}/pkgtools/lintpkgsrc && $BMAKE show-vars BATCH=1 VARNAMES='".join(' ', @_)."' |")
+ open(I, "set -e; . '$BULK_BUILD_CONF'; . '$vars{USR_PKGSRC}/mk/bulk/post-build-conf'; export_config_vars; cd $vars{USR_PKGSRC}/pkgtools/lintpkgsrc && $BMAKE show-vars BATCH=1 VARNAMES='".join(' ', @_)."' USE_TOOLS=\"pax\" |")
or pb_die(undef, "Cannot get mk.conf variables.");
foreach my $var (@_) {