From owner-svn-ports-head@freebsd.org Wed Feb 28 18:38:18 2018 Return-Path: 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 81E56F3BDEB; Wed, 28 Feb 2018 18:38:18 +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 2FAA286EB0; Wed, 28 Feb 2018 18:38:18 +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 25EE31D349; Wed, 28 Feb 2018 18:38:18 +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 w1SIcHpb074586; Wed, 28 Feb 2018 18:38:17 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w1SIcH6Z074584; Wed, 28 Feb 2018 18:38:17 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201802281838.w1SIcH6Z074584@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Wed, 28 Feb 2018 18:38:17 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r463257 - in head/Mk: . Scripts X-SVN-Group: ports-head X-SVN-Commit-Author: bdrewery X-SVN-Commit-Paths: in head/Mk: . Scripts X-SVN-Commit-Revision: 463257 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 28 Feb 2018 18:38:18 -0000 Author: bdrewery Date: Wed Feb 28 18:38:17 2018 New Revision: 463257 URL: https://svnweb.freebsd.org/changeset/ports/463257 Log: ports_env: Store list of variables to export in PORTS_ENV_VARS in mk files. This will avoid renamed/removed variables being orphaned, and allows for exporting variables in ports_env that are not wanted to be exported in sub-makes via _EXPORTED_VARS. Approved by: portmgr (implicit) Modified: head/Mk/Scripts/functions.sh head/Mk/bsd.port.mk Modified: head/Mk/Scripts/functions.sh ============================================================================== --- head/Mk/Scripts/functions.sh Wed Feb 28 18:34:31 2018 (r463256) +++ head/Mk/Scripts/functions.sh Wed Feb 28 18:38:17 2018 (r463257) @@ -176,24 +176,8 @@ export_ports_env() { make_cmd="${make_env}" - export_vars="\ - ARCH \ - CONFIGURE_MAX_CMD_LEN \ - HAVE_COMPAT_IA32_KERN \ - OPSYS \ - OSREL \ - OSVERSION \ - PYTHONBASE \ - UID \ - _JAVA_OS_LIST_REGEXP \ - _JAVA_PORTS_INSTALLED \ - _JAVA_VENDOR_LIST_REGEXP \ - _JAVA_VERSION_LIST_REGEXP \ - _OSRELEASE \ - _PERL5_FROM_BIN \ - _PKG_CHECKED \ - _SMP_CPUS \ - " + export_vars="$(${MAKE} -f ${PORTSDIR}/Mk/bsd.port.mk \ + -V PORTS_ENV_VARS ${make_env} USES="${uses}")" for var in ${export_vars}; do make_cmd="${make_cmd}${make_cmd:+ }-V ${var}=\${${var}:Q}" Modified: head/Mk/bsd.port.mk ============================================================================== --- head/Mk/bsd.port.mk Wed Feb 28 18:34:31 2018 (r463256) +++ head/Mk/bsd.port.mk Wed Feb 28 18:38:17 2018 (r463257) @@ -4719,6 +4719,7 @@ ${_t}: .endif .endfor .endif +PORTS_ENV_VARS+= ${_EXPORTED_VARS} .if !target(pre-check-config) pre-check-config: