From owner-svn-ports-all@freebsd.org Thu Jan 4 19:41:04 2018 Return-Path: Delivered-To: svn-ports-all@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 F3AB9EB13E3; Thu, 4 Jan 2018 19:41:03 +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 BDABB7BDDC; Thu, 4 Jan 2018 19:41:03 +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 w04Jf2HH039591; Thu, 4 Jan 2018 19:41:02 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w04Jf2Ru039590; Thu, 4 Jan 2018 19:41:02 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201801041941.w04Jf2Ru039590@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Thu, 4 Jan 2018 19:41:02 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r458052 - branches/2018Q1/Mk X-SVN-Group: ports-branches X-SVN-Commit-Author: bdrewery X-SVN-Commit-Paths: branches/2018Q1/Mk X-SVN-Commit-Revision: 458052 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 Jan 2018 19:41:04 -0000 Author: bdrewery Date: Thu Jan 4 19:41:02 2018 New Revision: 458052 URL: https://svnweb.freebsd.org/changeset/ports/458052 Log: MFH: r458050 Pass FLAVOR in enviroment to avoid forcing an empty value in some cases. Approved by: portmgr (implicit) Modified: branches/2018Q1/Mk/bsd.port.mk Directory Properties: branches/2018Q1/ (props changed) Modified: branches/2018Q1/Mk/bsd.port.mk ============================================================================== --- branches/2018Q1/Mk/bsd.port.mk Thu Jan 4 19:37:58 2018 (r458051) +++ branches/2018Q1/Mk/bsd.port.mk Thu Jan 4 19:41:02 2018 (r458052) @@ -3806,7 +3806,7 @@ CLEAN_DEPENDENCIES= .if !defined(NOCLEANDEPENDS) CLEAN_DEPENDENCIES+= limited-clean-depends-${_f} limited-clean-depends-${_f}: - @cd ${.CURDIR} && ${MAKE} FLAVOR=${_f} limited-clean-depends + @cd ${.CURDIR} && ${SETENV} FLAVOR=${_f} ${MAKE} limited-clean-depends .endif .if target(pre-clean) CLEAN_DEPENDENCIES+= pre-clean-${_f} @@ -4082,7 +4082,7 @@ fetch-specials: /*) ;; \ *) dir=${PORTSDIR}/$$dir ;; \ esac; \ - (cd $$dir; ${MAKE} FLAVOR=$${flavor} fetch); \ + (cd $$dir; ${SETENV} FLAVOR=$${flavor} ${MAKE} fetch); \ done .endif @@ -4225,7 +4225,7 @@ PACKAGE-DEPENDS-LIST?= \ case $$checked in \ $$dir|$$dir\ *|*\ $$dir|*\ $$dir\ *) continue;; \ esac; \ - childout=$$(cd $$dir; FLAVOR=$${flavor} ${MAKE} CHILD_DEPENDS=yes PARENT_CHECKED="$$checked" package-depends-list); \ + childout=$$(cd $$dir; ${SETENV} FLAVOR=$${flavor} ${MAKE} CHILD_DEPENDS=yes PARENT_CHECKED="$$checked" package-depends-list); \ set -- $$childout; \ childdir=""; \ while [ $$\# != 0 ]; do \ @@ -4375,7 +4375,7 @@ describe: describe: ${FLAVORS:S/^/describe-/} . for f in ${FLAVORS} describe-${f}: - @cd ${.CURDIR} && ${MAKE} -B FLAVOR=${f} -D_DESCRIBE_WITH_FLAVOR describe + @cd ${.CURDIR} && ${SETENV} FLAVOR=${f} ${MAKE} -B -D_DESCRIBE_WITH_FLAVOR describe . endfor . endif # empty(FLAVORS) . endif @@ -4665,7 +4665,7 @@ pretty-flavors-package-names: .PHONY .else .for f in ${FLAVORS} @${ECHO_CMD} -n "${f}: " - @cd ${.CURDIR} && ${MAKE} -B FLAVOR=${f} -V PKGNAME + @cd ${.CURDIR} && ${SETENV} FLAVOR=${f} ${MAKE} -B -V PKGNAME .endfor .endif @@ -4674,7 +4674,7 @@ flavors-package-names: .PHONY @${ECHO_CMD} "${PKGNAME}" .else .for f in ${FLAVORS} - @cd ${.CURDIR} && ${MAKE} -B FLAVOR=${f} -V PKGNAME + @cd ${.CURDIR} && ${SETENV} FLAVOR=${f} ${MAKE} -B -V PKGNAME .endfor .endif