From owner-svn-src-projects@FreeBSD.ORG  Wed Nov 23 03:20:45 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 3F3FD106566B;
	Wed, 23 Nov 2011 03:20:45 +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 2F2FB8FC13;
	Wed, 23 Nov 2011 03:20:45 +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 pAN3KjKJ022768;
	Wed, 23 Nov 2011 03:20:45 GMT (envelope-from linimon@svn.freebsd.org)
Received: (from linimon@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id pAN3KjJx022766;
	Wed, 23 Nov 2011 03:20:45 GMT (envelope-from linimon@svn.freebsd.org)
Message-Id: <201111230320.pAN3KjJx022766@svn.freebsd.org>
From: Mark Linimon <linimon@FreeBSD.org>
Date: Wed, 23 Nov 2011 03:20:45 +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: r227862 - 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:20:45 -0000

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

Log:
  Make the ARCHS_REQUIRING_LINPROCFS logic common to server and client.
  
  Add OVERRIDE_LINUX_NONBASE_PORTS logic common to server and client.
  
  Comment out the ${pbd}/${arch}/make.conf logic as obsolete.

Modified:
  projects/portbuild/scripts/buildenv

Modified: projects/portbuild/scripts/buildenv
==============================================================================
--- projects/portbuild/scripts/buildenv	Wed Nov 23 03:18:20 2011	(r227861)
+++ projects/portbuild/scripts/buildenv	Wed Nov 23 03:20:44 2011	(r227862)
@@ -117,12 +117,6 @@ buildenv () {
 	    break
 	fi
     done
-    for i in ${ARCHS_REQUIRING_LINPROCFS}; do
-	if [ ${i} = ${arch} ]; then
-	    export LINUX_OSRELEASE=${DEFAULT_LINUX_OSRELEASE}
-	    break
-	fi
-    done
 
     buildenv.common
 
@@ -138,8 +132,8 @@ buildenv () {
 	export INDEXFILE=INDEX-${branchbase}
     fi
 
-    # probably only used in mkbindist
-    export __MAKE_CONF=${pbd}/${arch}/make.conf
+    # probably only used in mkbindist XXX MCL probably not even there
+    # XXX MCL 20111117 export __MAKE_CONF=${pbd}/${arch}/make.conf
 }
 
 #
@@ -167,4 +161,15 @@ buildenv.common() {
 
     export BATCH=1
     export PACKAGE_BUILDING=1
+
+    for i in ${ARCHS_REQUIRING_LINPROCFS}; do
+	if [ ${i} = ${arch} ]; then
+	    export LINUX_OSRELEASE=${DEFAULT_LINUX_OSRELEASE}
+	    break
+	fi
+    done
+
+    if [ ! -z "${OVERRIDE_LINUX_NONBASE_PORTS}" ]; then
+	export OVERRIDE_LINUX_NONBASE_PORTS
+    fi
 }