Date: Fri, 19 Sep 2014 00:50:38 +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: r368535 - head/Mk Message-ID: <201409190050.s8J0ocDJ072400@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bdrewery Date: Fri Sep 19 00:50:37 2014 New Revision: 368535 URL: http://svnweb.freebsd.org/changeset/ports/368535 QAT: https://qat.redports.org/buildarchive/r368535/ Log: - Fix minimum pkg version check when using pkg from git. Strip out everything after '-' as it is a hash. It is not strictly newer than the implicit 0. - Reword msg [1] Submitted by: adamw [1] With hat: portmgr Modified: head/Mk/bsd.port.mk Modified: head/Mk/bsd.port.mk ============================================================================== --- head/Mk/bsd.port.mk Thu Sep 18 22:16:11 2014 (r368534) +++ head/Mk/bsd.port.mk Fri Sep 19 00:50:37 2014 (r368535) @@ -1223,9 +1223,9 @@ WITH_NEW_XORG?= yes .if !defined(_PKG_VERSION) _PKG_VERSION!= ${PKG_BIN} -v .endif -_PKG_STATUS!= ${PKG_BIN} version -t ${_PKG_VERSION:S/-/\./g} ${MINIMAL_PKG_VERSION} +_PKG_STATUS!= ${PKG_BIN} version -t ${_PKG_VERSION:C/-.*//g} ${MINIMAL_PKG_VERSION} .if ${_PKG_STATUS} == "<" -IGNORE= You need pkg(8) at least version ${MINIMAL_PKG_VERSION} and you have ${_PKG_VERSION} please consider upgrading pkg(8) first +IGNORE= pkg(8) must be version ${MINIMAL_PKG_VERSION} or greater, but you have ${_PKG_VERSION}. You must upgrade pkg(8) first .endif .endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201409190050.s8J0ocDJ072400>