From owner-svn-src-user@FreeBSD.ORG  Mon Jun  9 22:09:04 2014
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 1C406DFB;
 Mon,  9 Jun 2014 22:09:04 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 09D48279B;
 Mon,  9 Jun 2014 22:09:04 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s59M93QC062452;
 Mon, 9 Jun 2014 22:09:03 GMT
 (envelope-from nwhitehorn@svn.freebsd.org)
Received: (from nwhitehorn@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s59M93h3062451;
 Mon, 9 Jun 2014 22:09:03 GMT
 (envelope-from nwhitehorn@svn.freebsd.org)
Message-Id: <201406092209.s59M93h3062451@svn.freebsd.org>
From: Nathan Whitehorn <nwhitehorn@FreeBSD.org>
Date: Mon, 9 Jun 2014 22:09:03 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r267308 - user/nwhitehorn/condorports
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
 src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user/>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 09 Jun 2014 22:09:04 -0000

Author: nwhitehorn
Date: Mon Jun  9 22:09:03 2014
New Revision: 267308
URL: http://svnweb.freebsd.org/changeset/base/267308

Log:
  Reduce scope of CLEAN_FETCH_ENV so that pkg gets included in the
  dependency tree to ship with the build.

Modified:
  user/nwhitehorn/condorports/stagebuildfiles.sh

Modified: user/nwhitehorn/condorports/stagebuildfiles.sh
==============================================================================
--- user/nwhitehorn/condorports/stagebuildfiles.sh	Mon Jun  9 21:35:36 2014	(r267307)
+++ user/nwhitehorn/condorports/stagebuildfiles.sh	Mon Jun  9 22:09:03 2014	(r267308)
@@ -17,12 +17,11 @@ export PORT_DBDIR=/var/empty
 export PORTSDIR=$7
 export PACKAGE_BUILDING=1
 export LOCALBASE=/var/empty
-export CLEAN_FETCH_ENV=1
 
 # Fetch distfiles if unfetched
 cd $1
-make -d e -DBATCH checksum DISTDIR=$DISTHORDE
-make -d e -DBATCH package-links PACKAGES=$2
+make -d e -DBATCH checksum DISTDIR=$DISTHORDE CLEAN_FETCH_ENV=1
+make -d e -DBATCH package-links PACKAGES=$2 CLEAN_FETCH_ENV=1
 mkdir -p $2/All
 
 # Make a tarball containing all the bits we need to build: the distfiles,