From owner-svn-src-projects@FreeBSD.ORG  Sat Apr 30 02:44:15 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 C80BD106566B;
	Sat, 30 Apr 2011 02:44:15 +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 B83958FC08;
	Sat, 30 Apr 2011 02:44:15 +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 p3U2iFm3026143;
	Sat, 30 Apr 2011 02:44:15 GMT (envelope-from linimon@svn.freebsd.org)
Received: (from linimon@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p3U2iFRm026141;
	Sat, 30 Apr 2011 02:44:15 GMT (envelope-from linimon@svn.freebsd.org)
Message-Id: <201104300244.p3U2iFRm026141@svn.freebsd.org>
From: Mark Linimon <linimon@FreeBSD.org>
Date: Sat, 30 Apr 2011 02:44:15 +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: r221241 - 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: Sat, 30 Apr 2011 02:44:15 -0000

Author: linimon (doc,ports committer)
Date: Sat Apr 30 02:44:15 2011
New Revision: 221241
URL: http://svn.freebsd.org/changeset/base/221241

Log:
  Bomb out if there are no bindist files.
  
  While here, remove an antique line.

Modified:
  projects/portbuild/scripts/dopackages

Modified: projects/portbuild/scripts/dopackages
==============================================================================
--- projects/portbuild/scripts/dopackages	Sat Apr 30 02:31:56 2011	(r221240)
+++ projects/portbuild/scripts/dopackages	Sat Apr 30 02:44:15 2011	(r221241)
@@ -403,6 +403,14 @@ if [ "$trybroken" = 1 ]; then
     export TRYBROKEN=1
 fi
 
+builddir=${pbab}/builds/${buildid}
+
+# bomb out if there are no bindist files
+if [ ! -f ${builddir}/bindist.tbz -o ! -f ${builddir}/bindist.tbz.md5 ]; then
+    echo "missing bindist.tbz and/or bindist.tbz.md5; exiting script at $(date)."
+    mailexit 1
+fi
+
 # Start setting up build environment
 
 if [ "${skipstart}" -eq 0 ]; then
@@ -413,10 +421,9 @@ if [ "${skipstart}" -eq 0 ]; then
     # MCL dopackages: "build create arch branch"
     build clone ${arch} ${branch} ${buildid} ${newbuildid}
     buildid=${newbuildid}
+    builddir=${pbab}/builds/${buildid}
 fi
 
-builddir=${pbab}/builds/${buildid}
-
 # bomb out if build clone failed
 if [ ! -d ${builddir} ]; then
     mailexit 1
@@ -692,8 +699,6 @@ fi
 
 cd ${builddir}/packages/All
 if [ "$nofinish" = 0 ]; then
-    rm -f Makefile
-    
     if [ "$norestr" = 0 ]; then
         # Before deleting restricted packages, save a copy so we don't
         # have to rebuild them next time