svn commit: r227857 - projects/portbuild/scripts

[Mark Linimon]

Author: linimon (doc,ports committer)
Date: Wed Nov 23 03:14:54 2011
New Revision: 227857
URL: http://svn.freebsd.org/changeset/base/227857

Log:
  Add an optional per-build make.conf.client line, whose lines will be
  *appended* to the per-host make.conf as specified in the per-client
  tarball.
  
  While here, add some more error handling.

Modified:
  projects/portbuild/scripts/portbuild

Modified: projects/portbuild/scripts/portbuild
==============================================================================
--- projects/portbuild/scripts/portbuild	Wed Nov 23 03:13:43 2011	(r227856)
+++ projects/portbuild/scripts/portbuild	Wed Nov 23 03:14:54 2011	(r227857)
@@ -74,7 +74,9 @@ if [ -f ${pbd}/${arch}/${branch}/builds/
     . ${pbd}/${arch}/${branch}/builds/${buildid}/portbuild.conf
 fi
 . ${pbd}/${arch}/portbuild.$(hostname)
-. ${pbd}/scripts/buildenv
+# if buildenv isn't there, then ${pbd} is probably the default, which for
+# some reason you have not populated.
+. ${pbd}/scripts/buildenv || bailout ${chroot} 0 255 ${pkgname}
 
 buildroot=${scratchdir}
 error=0
@@ -184,6 +186,10 @@ if [ -f ${chroot}/.notready ]; then
   if [ -f ${bindistlocal} ]; then
     tar -C ${chroot} -xpf ${bindistlocal}
   fi
+  # XXX MCL 20111117: allow additional (not replacement!) knobs for make.conf
+  if [ -f ${builddir}/make.conf.client ]; then
+      cat ${builddir}/make.conf.client >> ${chroot}/etc/make.conf
+  fi
 
   # to be able to run certain kernel-dependent binaries
   # inside the chroot area