[pkgsrc/trunk]: pkgsrc/mk/flavor/pkg Use ${PKGTOOLS_VERSION} when detecting w...

[adrianp <adrianp%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/86a15e3e696e
branches:  trunk
changeset: 531670:86a15e3e696e
user:      adrianp <adrianp%pkgsrc.org@localhost>
date:      Sat Aug 04 11:21:08 2007 +0000

description:
Use ${PKGTOOLS_VERSION} when detecting which version of pkg_install is
installed.  Idea from one of joerg@'s patches.

diffstat:

 mk/flavor/pkg/check.mk |  5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diffs (19 lines):

diff -r 446834acb84b -r 86a15e3e696e mk/flavor/pkg/check.mk
--- a/mk/flavor/pkg/check.mk    Sat Aug 04 11:15:44 2007 +0000
+++ b/mk/flavor/pkg/check.mk    Sat Aug 04 11:21:08 2007 +0000
@@ -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.";  \