diff options
| author | jlam <jlam@pkgsrc.org> | 2006-07-19 16:01:40 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2006-07-19 16:01:40 +0000 |
| commit | c88a32be7d0b64ef4e2d2508a36cd1e8b486f30b (patch) | |
| tree | 28a3917150eb70d36ea453af60a3f0ffa4e04d04 /mk | |
| parent | 79d62b7bc13ae35246abd7aad981caff114c48dd (diff) | |
| download | pkgsrc-c88a32be7d0b64ef4e2d2508a36cd1e8b486f30b.tar.gz | |
Make "mirror-distfiles" less verbose by not printing out anything if no
bootstrap dependencies need to be built and installed.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/fetch/bsd.fetch-vars.mk | 8 | ||||
| -rw-r--r-- | mk/flavor/pkg/depends.mk | 8 |
2 files changed, 11 insertions, 5 deletions
diff --git a/mk/fetch/bsd.fetch-vars.mk b/mk/fetch/bsd.fetch-vars.mk index c9d59f56d37..e66ab5c0dfa 100644 --- a/mk/fetch/bsd.fetch-vars.mk +++ b/mk/fetch/bsd.fetch-vars.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.fetch-vars.mk,v 1.4 2006/07/18 22:41:06 jlam Exp $ +# $NetBSD: bsd.fetch-vars.mk,v 1.5 2006/07/19 16:01:40 jlam Exp $ # # This Makefile fragment is included separately by bsd.pkg.mk and # defines some variables which must be defined earlier than where @@ -29,8 +29,10 @@ DISTFILES?= ${DISTNAME}${EXTRACT_SUFX} USE_TOOLS+= ${FAILOVER_FETCH:Ddigest\:bootstrap} # When mirroring distfiles which others may fetch, only fetch the -# distfiles if it is allowed to be re-distributed freely. +# distfiles if it is allowed to be re-distributed freely. Also, +# suppress some bootstrap-depends output. # .if make(mirror-distfiles) -NO_SKIP= # defined +NO_SKIP= # defined +_BOOTSTRAP_VERBOSE= # defined .endif diff --git a/mk/flavor/pkg/depends.mk b/mk/flavor/pkg/depends.mk index 37c1a51cb63..34e1094e819 100644 --- a/mk/flavor/pkg/depends.mk +++ b/mk/flavor/pkg/depends.mk @@ -1,4 +1,4 @@ -# $NetBSD: depends.mk,v 1.10 2006/07/13 14:02:34 jlam Exp $ +# $NetBSD: depends.mk,v 1.11 2006/07/19 16:01:41 jlam Exp $ _DEPENDS_FILE= ${WRKDIR}/.depends _REDUCE_DEPENDS_CMD= ${SETENV} CAT=${CAT:Q} \ @@ -72,6 +72,7 @@ depends-install: ${_DEPENDS_FILE} set -- dummy `${CAT} ${_DEPENDS_FILE}`; shift; \ while ${TEST} $$# -gt 0; do \ type="$$1"; pattern="$$2"; dir="$$3"; shift 3; \ + silent=; \ ${_DEPENDS_INSTALL_CMD}; \ done @@ -89,6 +90,7 @@ bootstrap-depends: set -- dummy $$args; shift; \ while ${TEST} $$# -gt 0; do \ pattern="$$1"; dir="$$2"; shift 2; \ + silent=${_BOOTSTRAP_VERBOSE:Dyes}; \ ${_DEPENDS_INSTALL_CMD}; \ done @@ -129,6 +131,8 @@ _DEPENDS_INSTALL_CMD= \ exit 1; \ ;; \ esac; \ - ${STEP_MSG} "Required installed package $$pattern: $$pkg found"; \ + if ${TEST} -z "$$silent"; then \ + ${STEP_MSG} "Required installed package $$pattern: $$pkg found"; \ + fi; \ ;; \ esac |