diff options
| author | adrianp <adrianp@pkgsrc.org> | 2007-08-04 11:21:08 +0000 |
|---|---|---|
| committer | adrianp <adrianp@pkgsrc.org> | 2007-08-04 11:21:08 +0000 |
| commit | e67737df3aa7e74eb98afe556eb8f80f62df67f1 (patch) | |
| tree | 5be50cc6511e01d6966d33e8b6f619f9b263c416 /mk | |
| parent | f92c472b4fd8c51bb2598e6dcd5f0215ef03e8ed (diff) | |
| download | pkgsrc-e67737df3aa7e74eb98afe556eb8f80f62df67f1.tar.gz | |
Use ${PKGTOOLS_VERSION} when detecting which version of pkg_install is
installed. Idea from one of joerg@'s patches.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/flavor/pkg/check.mk | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/mk/flavor/pkg/check.mk b/mk/flavor/pkg/check.mk index ca24b87f0b4..bd555bcc90c 100644 --- a/mk/flavor/pkg/check.mk +++ b/mk/flavor/pkg/check.mk @@ -1,4 +1,4 @@ -# $NetBSD: check.mk,v 1.4 2007/07/14 17:17:46 adrianp Exp $ +# $NetBSD: check.mk,v 1.5 2007/08/04 11:21:08 adrianp Exp $ # # _flavor-check-vulnerable: @@ -11,8 +11,7 @@ # _flavor-check-vulnerable: .PHONY ${_PKG_SILENT}${_PKG_DEBUG} \ - _INFO_VER=`${PKG_INFO} -V`; \ - if ${PKG_ADMIN} pmatch 'pkg_install<20070714' pkg_install-$$_INFO_VER; then \ + if ${PKG_ADMIN} pmatch 'pkg_install<20070714' pkg_install-${PKGTOOLS_VERSION}; then \ vulnfile=${PKGVULNDIR:Q}/pkg-vulnerabilities; \ if ${TEST} ! -f "$$vulnfile"; then \ ${PHASE_MSG} "Skipping vulnerability checks."; \ |