From owner-svn-src-projects@FreeBSD.ORG  Thu Dec 22 16:36:09 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 28630106566C;
	Thu, 22 Dec 2011 16:36:09 +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 183218FC12;
	Thu, 22 Dec 2011 16:36:09 +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 pBMGa8gb025076;
	Thu, 22 Dec 2011 16:36:08 GMT (envelope-from linimon@svn.freebsd.org)
Received: (from linimon@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id pBMGa83O025074;
	Thu, 22 Dec 2011 16:36:08 GMT (envelope-from linimon@svn.freebsd.org)
Message-Id: <201112221636.pBMGa83O025074@svn.freebsd.org>
From: Mark Linimon <linimon@FreeBSD.org>
Date: Thu, 22 Dec 2011 16:36:08 +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: r228807 - 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: Thu, 22 Dec 2011 16:36:09 -0000

Author: linimon (doc,ports committer)
Date: Thu Dec 22 16:36:08 2011
New Revision: 228807
URL: http://svn.freebsd.org/changeset/base/228807

Log:
  We never wound up using specialize portbuild.conf files at the branch/builds/
  directory, but instead at branch/builds/buildid.  Reflect that.

Modified:
  projects/portbuild/scripts/dopackages

Modified: projects/portbuild/scripts/dopackages
==============================================================================
--- projects/portbuild/scripts/dopackages	Thu Dec 22 16:19:51 2011	(r228806)
+++ projects/portbuild/scripts/dopackages	Thu Dec 22 16:36:08 2011	(r228807)
@@ -459,11 +459,8 @@ touch ${builddir}/.active
 ln -sf ${pbd}/${arch}/archive/buildlogs/log.${branch}.${datestamp} \
     ${builddir}/build.log
 
-# Update build-specific portbuild.conf.
-if [ -f ${pbd}/${arch}/${branch}/portbuild.conf ]; then
-    ln -sf ${pbd}/${arch}/${branch}/portbuild.conf ${builddir}/portbuild.conf
-    . ${builddir}/portbuild.conf
-fi
+# Use build-specific portbuild.conf
+test -f ${builddir}/portbuild.conf && . ${builddir}/portbuild.conf
 
 if [ "$skipstart" = 0 ]; then