From owner-svn-src-projects@FreeBSD.ORG  Mon Feb 11 12:10:25 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 44018AF0;
 Mon, 11 Feb 2013 12:10:25 +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 36F862C6;
 Mon, 11 Feb 2013 12:10:25 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1BCAPkP083703;
 Mon, 11 Feb 2013 12:10:25 GMT (envelope-from linimon@svn.freebsd.org)
Received: (from linimon@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1BCAOtR083647;
 Mon, 11 Feb 2013 12:10:24 GMT (envelope-from linimon@svn.freebsd.org)
Message-Id: <201302111210.r1BCAOtR083647@svn.freebsd.org>
From: Mark Linimon <linimon@FreeBSD.org>
Date: Mon, 11 Feb 2013 12:10:24 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r246662 - projects/portbuild/admin/etc/rc.d
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 12:10:25 -0000

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

Log:
  Suggested bugfixes from crees.

Modified:
  projects/portbuild/admin/etc/rc.d/pollmachine
  projects/portbuild/admin/etc/rc.d/qmanager

Modified: projects/portbuild/admin/etc/rc.d/pollmachine
==============================================================================
--- projects/portbuild/admin/etc/rc.d/pollmachine	Mon Feb 11 11:33:56 2013	(r246661)
+++ projects/portbuild/admin/etc/rc.d/pollmachine	Mon Feb 11 12:10:24 2013	(r246662)
@@ -8,20 +8,21 @@
 
 export PATH=/usr/local/bin:${PATH}
 
-pb=/var/portbuild
+pb=${portbuild_base:-/a/portbuild}
 config_file=${pb}/conf/server.conf
 
 if [ ! -f ${config_file} ]; then
   echo "$0: ${config_file} must exist!"
   exit 1
 fi
+
+. ${config_file}
+
 if [ -z "${PORTBUILD_USER}" ]; then
   echo "$0: You must define PORTBUILD_USER in ${config_file}."
   exit 1
 fi
 
-. ${config_file}
-
 case $1 in
     start)
         s=${pb}/scripts/pollmachine

Modified: projects/portbuild/admin/etc/rc.d/qmanager
==============================================================================
--- projects/portbuild/admin/etc/rc.d/qmanager	Mon Feb 11 11:33:56 2013	(r246661)
+++ projects/portbuild/admin/etc/rc.d/qmanager	Mon Feb 11 12:10:24 2013	(r246662)
@@ -8,20 +8,21 @@
 
 export PATH=/usr/local/bin:${PATH}
 
-pb=/var/portbuild
+pb=${portbuild_base:-/a/portbuild}
 config_file=${pb}/conf/server.conf
 
 if [ ! -f ${config_file} ]; then
   echo "$0: ${config_file} must exist!"
   exit 1
 fi
+
+. ${config_file}
+
 if [ -z "${PORTBUILD_USER}" ]; then
   echo "$0: You must define PORTBUILD_USER in ${config_file}."
   exit 1
 fi
 
-. ${config_file}
-
 case $1 in
     start)
         s=${pb}/qmanager/qmanager.py