svn commit: r227862 - projects/portbuild/scripts

[Mark Linimon]

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
 }