Date: Mon, 12 Oct 2015 22:14:45 +0000 (UTC) From: Bryan Drewery <bdrewery@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r399157 - head/Mk Message-ID: <201510122214.t9CMEjOo059094@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bdrewery Date: Mon Oct 12 22:14:45 2015 New Revision: 399157 URL: https://svnweb.freebsd.org/changeset/ports/399157 Log: Don't check for minimal pkg version in sub-makes. With hat: portmgr Modified: head/Mk/bsd.port.mk Modified: head/Mk/bsd.port.mk ============================================================================== --- head/Mk/bsd.port.mk Mon Oct 12 22:13:21 2015 (r399156) +++ head/Mk/bsd.port.mk Mon Oct 12 22:14:45 2015 (r399157) @@ -1205,7 +1205,7 @@ _OSVERSION_MAJOR= ${OSVERSION:C/([0-9]?[ # Only define tools here (for transition period with between pkg tools) .include "${PORTSDIR}/Mk/bsd.commands.mk" -.if exists(${PKG_BIN}) +.if !defined(_PKG_CHECKED) && exists(${PKG_BIN}) .if !defined(_PKG_VERSION) _PKG_VERSION!= ${PKG_BIN} -v .endif @@ -1213,6 +1213,7 @@ _PKG_STATUS!= ${PKG_BIN} version -t ${_P .if ${_PKG_STATUS} == "<" IGNORE= pkg(8) must be version ${MINIMAL_PKG_VERSION} or greater, but you have ${_PKG_VERSION}. You must upgrade the ${PKG_ORIGIN} port first .endif +_PKG_CHECKED= 1 .endif MASTERDIR?= ${.CURDIR} @@ -5053,7 +5054,7 @@ ${_t}: .if !defined(NOPRECIOUSMAKEVARS) # These won't change, so we can pass them through the environment -_EXPORTED_VARS= ARCH OPSYS OPREL OSVERSION UNAMER +_EXPORTED_VARS= ARCH OPSYS OPREL OSVERSION UNAMER _PKG_CHECKED .for var in ${_EXPORTED_VARS} .if empty(.MAKEFLAGS:M${var}=*) .MAKEFLAGS: ${var}=${${var}:Q}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201510122214.t9CMEjOo059094>