[pkgsrc/trunk]: pkgsrc/mk Use ${PKGTOOLS_VERSION} when detecting which versio...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/ad0cc2e6164a
branches:  trunk
changeset: 531672:ad0cc2e6164a
user:      adrianp <adrianp%pkgsrc.org@localhost>
date:      Sat Aug 04 11:23:56 2007 +0000

description:
Use ${PKGTOOLS_VERSION} when detecting which version of pkg_install is
installed.  Idea from one of joerg@'s patches.
Fix 'make readme' and make README.html' targets for individual packages.
Issue reported by Gary Thorpe and David Lord in pkgsrc-users@

diffstat:

 mk/bsd.pkg.readme.mk |  11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

diffs (39 lines):

diff -r e610d3698e1e -r ad0cc2e6164a mk/bsd.pkg.readme.mk
--- a/mk/bsd.pkg.readme.mk      Sat Aug 04 11:23:32 2007 +0000
+++ b/mk/bsd.pkg.readme.mk      Sat Aug 04 11:23:56 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.readme.mk,v 1.7 2007/07/14 17:17:45 adrianp Exp $
+# $NetBSD: bsd.pkg.readme.mk,v 1.8 2007/08/04 11:23:56 adrianp Exp $
 #
 # This Makefile fragment is included by bsd.pkg.mk and encapsulates the
 # code to produce README.html files in each package directory.
@@ -242,8 +242,7 @@
 .PHONY: show-vulnerabilities-html
 show-vulnerabilities-html:
        ${_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 \
                if [ -f ${PKGVULNDIR}/pkg-vulnerabilities ]; then       \
                        ${AWK} '/^${PKGBASE}[-<>=]+[0-9]/ { gsub("\<", "\\&lt;", $$1);  \
                                 gsub("\>", "\\&gt;", $$1);             \
@@ -280,6 +279,11 @@
                esac;                                                   \
                cd ${.CURDIR} ;                                         \
        fi;                                                             \
+       if ${PKG_ADMIN} pmatch 'pkg_install<20070714' pkg_install-${PKGTOOLS_VERSION}; then \
+               _PVDIR=${PKGVULNDIR};                                   \
+       else                                                            \
+               _PVDIR=`audit-packages ${AUDIT_PACKAGES_FLAGS} -Q PKGVULNDIR`; \
+       fi; \
        ${AWK} -f ../../mk/scripts/genreadme.awk \
                builddependsfile=/dev/null \
                dependsfile=/dev/null \
@@ -292,6 +296,7 @@
                PKG_SUFX=${PKG_SUFX:Q} \
                PKG_URL=${PKG_URL:Q} \
                PKGSRCDIR=${.CURDIR:C|/[^/]*/[^/]*$||:Q} \
+               PVDIR=$$_PVDIR \
                SED=${SED:Q} \
                SETENV=${SETENV:Q} \
                SORT=${SORT:Q} \