From owner-svn-src-projects@FreeBSD.ORG  Wed Dec 14 04:12:13 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 BE1E81065675;
	Wed, 14 Dec 2011 04:12:13 +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 AD7108FC14;
	Wed, 14 Dec 2011 04:12:13 +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 pBE4CDq9081282;
	Wed, 14 Dec 2011 04:12:13 GMT (envelope-from linimon@svn.freebsd.org)
Received: (from linimon@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id pBE4CD4W081280;
	Wed, 14 Dec 2011 04:12:13 GMT (envelope-from linimon@svn.freebsd.org)
Message-Id: <201112140412.pBE4CD4W081280@svn.freebsd.org>
From: Mark Linimon <linimon@FreeBSD.org>
Date: Wed, 14 Dec 2011 04:12:13 +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: r228490 - 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, 14 Dec 2011 04:12:13 -0000

Author: linimon (doc,ports committer)
Date: Wed Dec 14 04:12:13 2011
New Revision: 228490
URL: http://svn.freebsd.org/changeset/base/228490

Log:
  Pass arch as parameter to buildenv.common and buildenv.client
  to try to unbreak things.

Modified:
  projects/portbuild/scripts/buildenv

Modified: projects/portbuild/scripts/buildenv
==============================================================================
--- projects/portbuild/scripts/buildenv	Wed Dec 14 04:11:11 2011	(r228489)
+++ projects/portbuild/scripts/buildenv	Wed Dec 14 04:12:13 2011	(r228490)
@@ -118,7 +118,7 @@ buildenv () {
 	fi
     done
 
-    buildenv.common
+    buildenv.common ${arch}
 
     # override things destined for bsd.port.mk
     export DISTDIR=${builddir}/distfiles
@@ -151,13 +151,16 @@ buildenv () {
 # establish commonly-used environment variables (client-side)
 #
 buildenv.client() {
+    arch=$1
+    src_base=$2
+
     # derive OSREL, OSVERSION, and BRANCH
-    export_src_metadata $1
+    export_src_metadata ${src_base}
 
     # manually override results of uname(1)
-    export UNAME_m=${ARCH}
+    export UNAME_m=${arch}
     export UNAME_n=freebsd.org
-    export UNAME_p=${ARCH}
+    export UNAME_p=${arch}
     export UNAME_r=${OSREL}-${BRANCH}
     export UNAME_s=FreeBSD
     export UNAME_v="FreeBSD ${OSREL}-${BRANCH} #0: $(date)     portmgr@freebsd.org:/usr/src/sys/magic/kernel/path"
@@ -167,6 +170,8 @@ buildenv.client() {
 # establish commonly-used environment variables (common to clients and server)
 #
 buildenv.common() {
+    arch=$1
+
     export ARCH=${arch}
     export MACHINE_ARCH=${arch}