From owner-svn-src-projects@FreeBSD.ORG  Sat Nov 26 06:50:12 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 0D1B7106566C;
	Sat, 26 Nov 2011 06:50:12 +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 F14258FC0C;
	Sat, 26 Nov 2011 06:50:11 +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 pAQ6oBvb078110;
	Sat, 26 Nov 2011 06:50:11 GMT (envelope-from linimon@svn.freebsd.org)
Received: (from linimon@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id pAQ6oB9J078108;
	Sat, 26 Nov 2011 06:50:11 GMT (envelope-from linimon@svn.freebsd.org)
Message-Id: <201111260650.pAQ6oB9J078108@svn.freebsd.org>
From: Mark Linimon <linimon@FreeBSD.org>
Date: Sat, 26 Nov 2011 06:50:11 +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: r227989 - 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: Sat, 26 Nov 2011 06:50:12 -0000

Author: linimon (doc,ports committer)
Date: Sat Nov 26 06:50:11 2011
New Revision: 227989
URL: http://svn.freebsd.org/changeset/base/227989

Log:
  Removed one too many lines, resulting in pointyhat itself's /etc/make.conf
  polluting INDEX.  No.

Modified:
  projects/portbuild/scripts/buildenv

Modified: projects/portbuild/scripts/buildenv
==============================================================================
--- projects/portbuild/scripts/buildenv	Sat Nov 26 05:47:21 2011	(r227988)
+++ projects/portbuild/scripts/buildenv	Sat Nov 26 06:50:11 2011	(r227989)
@@ -132,8 +132,19 @@ buildenv () {
 	export INDEXFILE=INDEX-${branchbase}
     fi
 
-    # probably only used in mkbindist XXX MCL probably not even there
-    # XXX MCL 20111117 export __MAKE_CONF=${pbd}/${arch}/make.conf
+    # set make.conf.  Consumed by both 'make index' and 'makeworld'.
+    # First, must explicitly _unset_ pointyhat's native one.
+    export __MAKE_CONF=/dev/null
+    # allow for per-build make.conf
+    if [ -f ${builddir}/make.conf.server ]; then
+	export __MAKE_CONF=${builddir}/make.conf.server
+    else
+	# allow for per-arch make.conf
+	# XXX MCL NOTYET the ones that are there are set up for pxeworld.  WRONG!
+#	if [ -f ${builddir}/make.conf ]; then
+#	    export __MAKE_CONF=${pbd}/${arch}/make.conf
+#	fi
+    fi
 }
 
 #