From owner-svn-src-projects@FreeBSD.ORG  Mon Feb 11 23:04:14 2013
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 5AE44AD3;
 Mon, 11 Feb 2013 23:04:14 +0000 (UTC)
 (envelope-from linimon@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 1F87F400;
 Mon, 11 Feb 2013 23:04:14 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1BN4ECF082041;
 Mon, 11 Feb 2013 23:04:14 GMT (envelope-from linimon@svn.freebsd.org)
Received: (from linimon@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1BN4DFF082036;
 Mon, 11 Feb 2013 23:04:13 GMT (envelope-from linimon@svn.freebsd.org)
Message-Id: <201302112304.r1BN4DFF082036@svn.freebsd.org>
From: Mark Linimon <linimon@FreeBSD.org>
Date: Mon, 11 Feb 2013 23:04:13 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r246695 - projects/portbuild/admin/scripts
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
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/options/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: Mon, 11 Feb 2013 23:04:14 -0000

Author: linimon (doc,ports committer)
Date: Mon Feb 11 23:04:12 2013
New Revision: 246695
URL: http://svnweb.freebsd.org/changeset/base/246695

Log:
  Make these more comfortable in the new world.

Modified:
  projects/portbuild/admin/scripts/makeworld
  projects/portbuild/admin/scripts/mkbindist
  projects/portbuild/admin/scripts/updatesnap
  projects/portbuild/admin/scripts/updatesnap.ports

Modified: projects/portbuild/admin/scripts/makeworld
==============================================================================
--- projects/portbuild/admin/scripts/makeworld	Mon Feb 11 22:59:10 2013	(r246694)
+++ projects/portbuild/admin/scripts/makeworld	Mon Feb 11 23:04:12 2013	(r246695)
@@ -27,8 +27,8 @@ if [ $# -gt 0 ]; then
   esac
 fi
 
-pbc=${PORTBUILD_CHECKOUT:-/var/portbuild}
-pbd=${PORTBUILD_DATA:-/var/portbuild}
+pbc=${PORTBUILD_CHECKOUT:-/a/portbuild}
+pbd=${PORTBUILD_DATA:-/a/portbuild}
 
 builddir=${pbd}/${arch}/${branch}/builds/${buildid}
 if [ ! -d ${builddir} ]; then
@@ -36,6 +36,7 @@ if [ ! -d ${builddir} ]; then
     exit 1
 fi
 
+. ${pbc}/admin/conf/admin.conf
 . ${pbc}/conf/server.conf
 . ${pbc}/conf/common.conf
 . ${pbd}/${arch}/portbuild.conf

Modified: projects/portbuild/admin/scripts/mkbindist
==============================================================================
--- projects/portbuild/admin/scripts/mkbindist	Mon Feb 11 22:59:10 2013	(r246694)
+++ projects/portbuild/admin/scripts/mkbindist	Mon Feb 11 23:04:12 2013	(r246695)
@@ -30,8 +30,8 @@ if [ $# -gt 0 ]; then
     shift
 fi
 
-pbc=${PORTBUILD_CHECKOUT:-/var/portbuild}
-pbd=${PORTBUILD_DATA:-/var/portbuild}
+pbc=${PORTBUILD_CHECKOUT:-/a/portbuild}
+pbd=${PORTBUILD_DATA:-/a/portbuild}
 
 builddir=${pbd}/${arch}/${branch}/builds/${buildid}
 if [ ! -d ${builddir} ]; then
@@ -39,6 +39,7 @@ if [ ! -d ${builddir} ]; then
     exit 1
 fi
  
+. ${pbc}/admin/conf/admin.conf
 . ${pbc}/conf/server.conf
 . ${pbd}/${arch}/portbuild.conf
 if [ -f ${builddir}/portbuild.conf ]; then

Modified: projects/portbuild/admin/scripts/updatesnap
==============================================================================
--- projects/portbuild/admin/scripts/updatesnap	Mon Feb 11 22:59:10 2013	(r246694)
+++ projects/portbuild/admin/scripts/updatesnap	Mon Feb 11 23:04:12 2013	(r246695)
@@ -5,6 +5,7 @@
 
 pbc=${PORTBUILD_CHECKOUT:-/a/portbuild}
 
+. ${pbc}/admin/conf/admin.conf
 . ${pbc}/conf/server.conf
 
 base=${ZFS_MOUNTPOINT}/${SNAP_DIRECTORY}

Modified: projects/portbuild/admin/scripts/updatesnap.ports
==============================================================================
--- projects/portbuild/admin/scripts/updatesnap.ports	Mon Feb 11 22:59:10 2013	(r246694)
+++ projects/portbuild/admin/scripts/updatesnap.ports	Mon Feb 11 23:04:12 2013	(r246695)
@@ -5,6 +5,7 @@
 
 pbc=${PORTBUILD_CHECKOUT:-/a/portbuild}
 
+. ${pbc}/admin/conf/admin.conf
 . ${pbc}/conf/server.conf
 
 base=${ZFS_MOUNTPOINT}/${SNAP_DIRECTORY}