From owner-svn-ports-head@freebsd.org  Sat Mar  3 01:18:51 2018
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 2F450F346A7;
 Sat,  3 Mar 2018 01:18:51 +0000 (UTC)
 (envelope-from bdrewery@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id CC7528480D;
 Sat,  3 Mar 2018 01:18:50 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id C53451F418;
 Sat,  3 Mar 2018 01:18:50 +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 w231IooC050464;
 Sat, 3 Mar 2018 01:18:50 GMT (envelope-from bdrewery@FreeBSD.org)
Received: (from bdrewery@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w231IodD050463;
 Sat, 3 Mar 2018 01:18:50 GMT (envelope-from bdrewery@FreeBSD.org)
Message-Id: <201803030118.w231IodD050463@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: Sat, 3 Mar 2018 01:18:50 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r463460 - head/Mk/Scripts
X-SVN-Group: ports-head
X-SVN-Commit-Author: bdrewery
X-SVN-Commit-Paths: head/Mk/Scripts
X-SVN-Commit-Revision: 463460
X-SVN-Commit-Repository: ports
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 03 Mar 2018 01:18:51 -0000

Author: bdrewery
Date: Sat Mar  3 01:18:50 2018
New Revision: 463460
URL: https://svnweb.freebsd.org/changeset/ports/463460

Log:
  Avoid double exporting PORTS_ENV.
  
  Approved by:	portmgr (implicit)

Modified:
  head/Mk/Scripts/functions.sh

Modified: head/Mk/Scripts/functions.sh
==============================================================================
--- head/Mk/Scripts/functions.sh	Sat Mar  3 00:55:57 2018	(r463459)
+++ head/Mk/Scripts/functions.sh	Sat Mar  3 01:18:50 2018	(r463460)
@@ -162,6 +162,10 @@ validate_env() {
 export_ports_env() {
 	local export_vars make_cmd make_env var results value uses
 
+	if [ -n "${HAVE_PORTS_ENV:-}" ]; then
+		return 0
+	fi
+
 	validate_env MAKE PORTSDIR
 
 	uses="python compiler:features"
@@ -197,6 +201,8 @@ export_ports_env() {
 			echo "export ${var}=\"${value}\""
 		fi
 	done
+	export HAVE_PORTS_ENV=1
+	echo "export HAVE_PORTS_ENV=1"
 }
 
 distinfo_data() {