diff options
| author | rillig <rillig> | 2009-03-17 22:13:36 +0000 |
|---|---|---|
| committer | rillig <rillig> | 2009-03-17 22:13:36 +0000 |
| commit | 086a36a95f0a7faf00ab3adcc58e36973658cf47 (patch) | |
| tree | c5bfefb9f4e5413721bf7ce328e51684838cf5bd /mk/flavor | |
| parent | 2211de3412af04e1f5c98c88a55a829c5907a8d3 (diff) | |
| download | pkgsrc-086a36a95f0a7faf00ab3adcc58e36973658cf47.tar.gz | |
Replaced _PKG_SILENT and _PKG_DEBUG with RUN.
Diffstat (limited to 'mk/flavor')
| -rw-r--r-- | mk/flavor/pkg/check.mk | 11 | ||||
| -rw-r--r-- | mk/flavor/pkg/views.mk | 6 |
2 files changed, 7 insertions, 10 deletions
diff --git a/mk/flavor/pkg/check.mk b/mk/flavor/pkg/check.mk index ec2bec21110..52cf51da8a4 100644 --- a/mk/flavor/pkg/check.mk +++ b/mk/flavor/pkg/check.mk @@ -1,4 +1,4 @@ -# $NetBSD: check.mk,v 1.10 2009/02/11 14:34:36 joerg Exp $ +# $NetBSD: check.mk,v 1.11 2009/03/17 22:13:36 rillig Exp $ # # _flavor-check-vulnerable: @@ -6,7 +6,7 @@ # file exists. # _flavor-check-vulnerable: .PHONY - ${_PKG_SILENT}${_PKG_DEBUG} \ + ${RUN}\ _PKGVULNDIR=`${_EXTRACT_PKGVULNDIR}`; \ vulnfile=$$_PKGVULNDIR/pkg-vulnerabilities; \ if ${TEST} ! -f "$$vulnfile"; then \ @@ -16,8 +16,5 @@ _flavor-check-vulnerable: .PHONY exit 0; \ fi; \ ${PHASE_MSG} "Checking for vulnerabilities in ${PKGNAME}"; \ - ${AUDIT_PACKAGES} ${_AUDIT_PACKAGES_CMD} ${AUDIT_PACKAGES_FLAGS} ${PKGNAME}; \ - if ${TEST} "$$?" -ne 0; then \ - ${ERROR_MSG} "Define ALLOW_VULNERABLE_PACKAGES in mk.conf or IGNORE_URLS in audit-packages.conf(5) if this package is absolutely essential."; \ - ${FALSE}; \ - fi + ${AUDIT_PACKAGES} ${_AUDIT_PACKAGES_CMD} ${AUDIT_PACKAGES_FLAGS} ${PKGNAME} \ + || ${FAIL_MSG} "Define ALLOW_VULNERABLE_PACKAGES in mk.conf or IGNORE_URLS in audit-packages.conf(5) if this package is absolutely essential." diff --git a/mk/flavor/pkg/views.mk b/mk/flavor/pkg/views.mk index a7739fd66c5..64af105986c 100644 --- a/mk/flavor/pkg/views.mk +++ b/mk/flavor/pkg/views.mk @@ -1,4 +1,4 @@ -# $NetBSD: views.mk,v 1.5 2007/01/05 18:52:08 rillig Exp $ +# $NetBSD: views.mk,v 1.6 2009/03/17 22:13:36 rillig Exp $ # By default, all packages attempt to link into the views. .if ${PKG_INSTALLATION_TYPE} == "pkgviews" @@ -36,7 +36,7 @@ build-views: su-target @${STEP_MSG} "Building views for ${PKGNAME}" su-build-views: - ${_PKG_SILENT}${_PKG_DEBUG} \ + ${RUN} \ ${MKDIR} ${LOCALBASE}; \ for v in ${PKGVIEWS}; do \ case "$$v" in \ @@ -78,7 +78,7 @@ remove-views: su-target @${STEP_MSG} "Removing ${PKGNAME} from views" su-remove-views: - ${_PKG_SILENT}${_PKG_DEBUG} \ + ${RUN} \ for v in "" ${PKGVIEWS}; do \ ${TEST} -n "$$v" || continue; \ case "$$v" in \ |