From owner-svn-ports-branches@freebsd.org  Fri Feb 17 22:24:34 2017
Return-Path: <owner-svn-ports-branches@freebsd.org>
Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5F0BECE234D;
 Fri, 17 Feb 2017 22:24:34 +0000 (UTC)
 (envelope-from bdrewery@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 2E0B211B5;
 Fri, 17 Feb 2017 22:24:34 +0000 (UTC)
 (envelope-from bdrewery@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1HMOXvq045591;
 Fri, 17 Feb 2017 22:24:33 GMT (envelope-from bdrewery@FreeBSD.org)
Received: (from bdrewery@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1HMOX2v045590;
 Fri, 17 Feb 2017 22:24:33 GMT (envelope-from bdrewery@FreeBSD.org)
Message-Id: <201702172224.v1HMOX2v045590@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to
 bdrewery@FreeBSD.org using -f
From: Bryan Drewery <bdrewery@FreeBSD.org>
Date: Fri, 17 Feb 2017 22:24:33 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-branches@freebsd.org
Subject: svn commit: r434317 - branches/2017Q1/Mk/Scripts
X-SVN-Group: ports-branches
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-branches@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for all the branches of the ports tree
 <svn-ports-branches.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-branches>, 
 <mailto:svn-ports-branches-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-branches/>
List-Post: <mailto:svn-ports-branches@freebsd.org>
List-Help: <mailto:svn-ports-branches-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-branches>, 
 <mailto:svn-ports-branches-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 17 Feb 2017 22:24:34 -0000

Author: bdrewery
Date: Fri Feb 17 22:24:33 2017
New Revision: 434317
URL: https://svnweb.freebsd.org/changeset/ports/434317

Log:
  MFH: r434316
  
  ports_env: Fix OPSYS not being exported.
  
  This was causing excessive 'uname -s' executions during Poudriere dependency
  calculations.  The reasoning is due to HAVE_COMPAT_IA32_KERN having a newline
  quoted at the end of it as '\ ' by bmake:
  
    # make -f Mk/bsd.port.mk -V 'HAVE_COMPAT_IA32_KERN=${HAVE_COMPAT_IA32_KERN:Q}' | cat -v
    HAVE_COMPAT_IA32_KERN=YES\
  
  This resulted in the following being executed:
  
    export HAVE_COMPAT_IA32_KERN="YES OPSYS=FreeBSD"
  
  With hat:	portmgr
  Approved by:	portmgr (implicit)

Modified:
  branches/2017Q1/Mk/Scripts/functions.sh
Directory Properties:
  branches/2017Q1/   (props changed)

Modified: branches/2017Q1/Mk/Scripts/functions.sh
==============================================================================
--- branches/2017Q1/Mk/Scripts/functions.sh	Fri Feb 17 22:22:27 2017	(r434316)
+++ branches/2017Q1/Mk/Scripts/functions.sh	Fri Feb 17 22:24:33 2017	(r434317)
@@ -202,7 +202,7 @@ export_ports_env() {
 
 	# Bring in all the vars, but not empty ones.
 	eval $(${MAKE} -f ${PORTSDIR}/Mk/bsd.port.mk ${make_cmd} \
-	    USES="${uses}" | grep -v '=$')
+	    USES="${uses}" | grep -v '=$' | sed -e 's,\\ $,,')
 	for var in ${export_vars}; do
 		# Export and display non-empty ones.  This is not redundant
 		# with above since we're looping on all vars here; do not