From owner-svn-src-projects@FreeBSD.ORG  Wed Nov 23 03:17:59 2011
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 81A8E106566B;
	Wed, 23 Nov 2011 03:17:59 +0000 (UTC)
	(envelope-from linimon@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 71C598FC15;
	Wed, 23 Nov 2011 03:17:59 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id pAN3HxxB022613;
	Wed, 23 Nov 2011 03:17:59 GMT (envelope-from linimon@svn.freebsd.org)
Received: (from linimon@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id pAN3HxST022611;
	Wed, 23 Nov 2011 03:17:59 GMT (envelope-from linimon@svn.freebsd.org)
Message-Id: <201111230317.pAN3HxST022611@svn.freebsd.org>
From: Mark Linimon <linimon@FreeBSD.org>
Date: Wed, 23 Nov 2011 03:17:59 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r227860 - projects/portbuild/scripts
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
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/listinfo/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: Wed, 23 Nov 2011 03:17:59 -0000

Author: linimon (doc,ports committer)
Date: Wed Nov 23 03:17:59 2011
New Revision: 227860
URL: http://svn.freebsd.org/changeset/base/227860

Log:
  Allow for a per-build make.conf called make.conf.server.  Unlike
  make.conf.client, it is a complete make.conf file (since it does
  not need to be specific per-host).

Modified:
  projects/portbuild/scripts/makeworld

Modified: projects/portbuild/scripts/makeworld
==============================================================================
--- projects/portbuild/scripts/makeworld	Wed Nov 23 03:16:29 2011	(r227859)
+++ projects/portbuild/scripts/makeworld	Wed Nov 23 03:17:59 2011	(r227860)
@@ -51,13 +51,18 @@ while [ $# -gt 0 ]; do
   shift
 done
 
-# XXX MCL I don't know what this is supposed to do.
+# XXX MCL I don't know what -client is supposed to do.
 if [ "$client" = "1" ]; then
 	SRC_BASE=${pbd}/${arch}/src-client
 	shift 1
 else
 	SRC_BASE=${builddir}/src
-	export __MAKE_CONF=/dev/null
+	# XXX MCL 20110912 allow for per-build make.conf
+	if [ -f ${builddir}/make.conf.server ]; then
+	    export __MAKE_CONF=${builddir}/make.conf.server
+	else
+	    export __MAKE_CONF=/dev/null
+	fi
 fi
 cd ${SRC_BASE}