further cleanup of handling the .broken.files and .make.files

- set BROKENF and BLDLOG in the 'build' script and pass those variables
  down to {pre,post}-build in the environment to make sure we only set them
  in one place.  The values are determined by a
      make show-var VARNAME=BROKENFILE
  This causes the default (set in bsd.bulk-pkg.mk) or the user overridden
  value from /etc/mk.conf or the environment to be correctly determined.  This
  is more robust that relying on a build.conf setting which may or may not be
  correctly set.

- have pre-build only clean up BROKENF and BLDLOG files instead of
  .broken* and .make*
  This avoids conflicts when pkgsrc is shared among different machines.

1 files changed, 7 insertions, 2 deletions

diff --git a/mk/bulk/post-build b/mk/bulk/post-build
index b2e5f3b884f..33e4db51616 100644
--- a/mk/bulk/post-build
+++ b/mk/bulk/post-build
@@ -1,5 +1,5 @@
 #!/usr/pkg/bin/perl
-# $NetBSD: post-build,v 1.6 2000/12/30 13:05:37 hubertf Exp $
+# $NetBSD: post-build,v 1.7 2000/12/30 14:53:28 dmcmahill Exp $
 #
 # Collect stuff after a pkg bulk build
 #
@@ -16,6 +16,12 @@ if (-f $ENV{"BULK_BUILD_CONF"}) {
     $BULK_BUILD_CONF=dirname("$0")."/build.conf";
 }
 
+# read the setting for the .broken.file from the environment (it gets put there by the
+# build script).
+$BROKENFILE=$ENV{"BROKENF"} or 
+die "Error:  BROKENF must be set to the name of the .broken.files\n        This should have happened in the top level build script\n";
+chomp($BROKENFILE);
+
 # Dig given variable out of config file, and set it
 sub getconf
 {
@@ -34,7 +40,6 @@ getconf("REPORT");		# "broken.html"
 getconf("USR_PKGSRC");		# "/usr/pkgsrc"
 getconf("osrev");	       	# `uname -r`
 getconf("arch"); 		# `uname -m`
-getconf("BROKENFILE");		# ".broken.file"
 chomp($date=`date`);
 
 $verbose=1;