From owner-svn-src-projects@FreeBSD.ORG  Wed Nov 23 03:14:54 2011
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id AAAD5106564A;
	Wed, 23 Nov 2011 03:14:54 +0000 (UTC)
	(envelope-from linimon@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 9A8408FC0A;
	Wed, 23 Nov 2011 03:14:54 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id pAN3EsEw022404;
	Wed, 23 Nov 2011 03:14:54 GMT (envelope-from linimon@svn.freebsd.org)
Received: (from linimon@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id pAN3EsO6022402;
	Wed, 23 Nov 2011 03:14:54 GMT (envelope-from linimon@svn.freebsd.org)
Message-Id: <201111230314.pAN3EsO6022402@svn.freebsd.org>
From: Mark Linimon <linimon@FreeBSD.org>
Date: Wed, 23 Nov 2011 03:14:54 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r227857 - projects/portbuild/scripts
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 23 Nov 2011 03:14:54 -0000

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