diff options
| author | adrianp <adrianp@pkgsrc.org> | 2007-08-04 11:23:56 +0000 |
|---|---|---|
| committer | adrianp <adrianp@pkgsrc.org> | 2007-08-04 11:23:56 +0000 |
| commit | 7bddba39aa854d7dd3f79977a2af542d1c196367 (patch) | |
| tree | 9247d767544afb2da167f80822be0f52147f1faf /mk | |
| parent | e5b4ad67842375612731788f7414918f8b2910ff (diff) | |
| download | pkgsrc-7bddba39aa854d7dd3f79977a2af542d1c196367.tar.gz | |
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 (limited to 'mk')
| -rw-r--r-- | mk/bsd.pkg.readme.mk | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/mk/bsd.pkg.readme.mk b/mk/bsd.pkg.readme.mk index 361eabcb754..a36d90631ef 100644 --- a/mk/bsd.pkg.readme.mk +++ b/mk/bsd.pkg.readme.mk @@ -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 @@ SED_HOMEPAGE_EXPR= -e 's|%%HOMEPAGE%%||' .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("\<", "\\<", $$1); \ gsub("\>", "\\>", $$1); \ @@ -280,6 +279,11 @@ README.html: .PRECIOUS 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 @@ README.html: .PRECIOUS 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} \ |