From owner-svn-src-projects@FreeBSD.ORG  Mon Dec 17 00:22:48 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id DA709563;
 Mon, 17 Dec 2012 00:22:48 +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 A5B5F8FC13;
 Mon, 17 Dec 2012 00:22:48 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBH0Mmqu080987;
 Mon, 17 Dec 2012 00:22:48 GMT (envelope-from linimon@svn.freebsd.org)
Received: (from linimon@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBH0Mmtk080986;
 Mon, 17 Dec 2012 00:22:48 GMT (envelope-from linimon@svn.freebsd.org)
Message-Id: <201212170022.qBH0Mmtk080986@svn.freebsd.org>
From: Mark Linimon <linimon@FreeBSD.org>
Date: Mon, 17 Dec 2012 00:22:48 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r244330 - projects/portbuild/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, 17 Dec 2012 00:22:48 -0000

Author: linimon (doc,ports committer)
Date: Mon Dec 17 00:22:48 2012
New Revision: 244330
URL: http://svnweb.freebsd.org/changeset/base/244330

Log:
  Fix default location of various subdirs (clients/ and so forth).  Turn
  off the creation of the .ssh directory; it is in the wrong place.

Modified:
  projects/portbuild/scripts/build

Modified: projects/portbuild/scripts/build
==============================================================================
--- projects/portbuild/scripts/build	Mon Dec 17 00:17:18 2012	(r244329)
+++ projects/portbuild/scripts/build	Mon Dec 17 00:22:48 2012	(r244330)
@@ -70,13 +70,13 @@ do_create() {
       chmod -R g+w ${archdir}
     fi
 
-    # create .ssh/ directory if it does not already exist 
-    sshdir=${pbd}/${arch}/.ssh
-    if [ ! -d ${sshdir} ]; then
-	mkdir -p ${sshdir} || exit 1
-	chown -R ${uid}:${gid} ${sshdir}
-	chmod 700 ${sshdir}
-    fi
+#    # create .ssh/ directory if it does not already exist 
+#    sshdir=${pbd}/${arch}/.ssh
+#    if [ ! -d ${sshdir} ]; then
+#	mkdir -p ${sshdir} || exit 1
+#	chown -R ${uid}:${gid} ${sshdir}
+#	chmod 700 ${sshdir}
+#    fi
 
     # create overall archive directory if it does not already exist 
     archivedir=${pbd}/${arch}/archive
@@ -134,7 +134,7 @@ do_create() {
     ln -sf ${builddir} ${pbab}/builds/latest
 
     # create clients/ directory if it does not already exist 
-    clientsdir=${pbab}/clients
+    clientsdir=${pbd}/${arch}/clients
     if [ ! -d ${clientsdir} ]; then
 	mkdir -p ${clientsdir} || exit 1
 	chown -R ${uid}:${gid} ${clientsdir}
@@ -142,7 +142,7 @@ do_create() {
     fi
 
     # create loads/ directory if it does not already exist 
-    loadsdir=${pbab}/loads
+    loadsdir=${pbd}/${arch}/loads
     if [ ! -d ${loadsdir} ]; then
 	mkdir -p ${loadsdir} || exit 1
 	chown -R ${uid}:${gid} ${loadsdir}
@@ -150,7 +150,7 @@ do_create() {
     fi
 
     # create lockfiles/ directory if it does not already exist 
-    lockfiles=${pbab}/lockfiles
+    lockfiles=${pbd}/${arch}/lockfiles
     if [ ! -d ${lockfiles} ]; then
         mkdir -p ${lockfiles} || exit 1
         chown -R ${uid}:${gid} ${lockfiles}
@@ -158,7 +158,7 @@ do_create() {
     fi
 
     # create empty mlist file if it does not already exist 
-    mlist=${pbab}/mlist
+    mlist=${pbd}/${arch}/mlist
     if [ ! -d ${mlist} ]; then
 	touch ${mlist} || exit 1
 	chown -R ${uid}:${gid} ${mlist}