diff options
| author | bdrewery <bdrewery@FreeBSD.org> | 2015-10-13 06:14:45 +0800 |
|---|---|---|
| committer | bdrewery <bdrewery@FreeBSD.org> | 2015-10-13 06:14:45 +0800 |
| commit | f06aeb5983df61457aa4f7732dfe18f42f127bbe (patch) | |
| tree | 3692613d0c5014dc7f5dca298150724a394145c1 /Mk | |
| parent | f4fadb9974489101f78135be6f2219d1216223c2 (diff) | |
| download | freebsd-ports-gnome-f06aeb5983df61457aa4f7732dfe18f42f127bbe.tar.gz freebsd-ports-gnome-f06aeb5983df61457aa4f7732dfe18f42f127bbe.tar.zst freebsd-ports-gnome-f06aeb5983df61457aa4f7732dfe18f42f127bbe.zip | |
Don't check for minimal pkg version in sub-makes.
With hat: portmgr
Diffstat (limited to 'Mk')
| -rw-r--r-- | Mk/bsd.port.mk | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index 0da68c7f8539..74ab4436eada 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -1205,7 +1205,7 @@ _OSVERSION_MAJOR= ${OSVERSION:C/([0-9]?[0-9])([0-9][0-9])[0-9]{3}/\1/} # 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 ${_PKG_VERSION:C/-.*//g} ${MINIMAL_PKG_VERSI .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} |