Index: user/nwhitehorn/condorports/stagebuildfiles.sh
===================================================================
--- user/nwhitehorn/condorports/stagebuildfiles.sh	(revision 267307)
+++ user/nwhitehorn/condorports/stagebuildfiles.sh	(revision 267308)
@@ -1,56 +1,55 @@
 #!/bin/sh
 
 # Build tarball of interesting subset of ports tree, relevant distfiles,
 # dependent packages?
 
 mkdir -p $(dirname $5)
 exec 2>&1
 exec 1>$5.log
 
 set -e
 export UNAME_p=$3
 export __MAKE_CONF=/dev/null
 export OSVERSION=$4
 DISTHORDE=$6
 
 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, 
 # relevant sections of the ports tree, all dependent packages
 # Need POST script to clean up
 
 TARBALL=$5
 mkdir -p $(dirname $TARBALL)
 
 # Find distfiles
 DIST_SUBDIR=$DISTHORDE/$(make -V DIST_SUBDIR)
 ALLFILES=$(for f in `make -V ALLFILES`; do echo $DIST_SUBDIR/$f; done)
 
 # Find packages
 DEPENDS=`make all-depends-list`
 PKGLIST=$(for x in $DEPENDS; do make -C $x PACKAGES=$2 -V PKGFILE; done)
 
 rm -rf $TARBALL-dir
 mkdir -p $TARBALL-dir/packages $TARBALL-dir/distfiles/$(make -V DIST_SUBDIR)
 if [ -n "$ALLFILES" ]; then
 	ln -s $ALLFILES $TARBALL-dir/distfiles/$(make -V DIST_SUBDIR)
 fi
 if [ -n "$PKGLIST" ]; then
 	ln -s $PKGLIST $TARBALL-dir/packages
 fi
 echo 'Building tarball'
 tar -c -C $TARBALL-dir -v -L -f $TARBALL distfiles packages
 rm -rf $TARBALL-dir
 set +e
 
 rm $5.log