pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/mk Make "mirror-distfiles" less verbose by not printin...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/411540624f7f
branches:  trunk
changeset: 516336:411540624f7f
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Wed Jul 19 16:01:40 2006 +0000

description:
Make "mirror-distfiles" less verbose by not printing out anything if no
bootstrap dependencies need to be built and installed.

diffstat:

 mk/fetch/bsd.fetch-vars.mk |  8 +++++---
 mk/flavor/pkg/depends.mk   |  8 ++++++--
 2 files changed, 11 insertions(+), 5 deletions(-)

diffs (57 lines):

diff -r 8b579cd27260 -r 411540624f7f mk/fetch/bsd.fetch-vars.mk
--- a/mk/fetch/bsd.fetch-vars.mk        Wed Jul 19 15:27:37 2006 +0000
+++ b/mk/fetch/bsd.fetch-vars.mk        Wed Jul 19 16:01:40 2006 +0000
@@ -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 @@
 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 -r 8b579cd27260 -r 411540624f7f mk/flavor/pkg/depends.mk
--- a/mk/flavor/pkg/depends.mk  Wed Jul 19 15:27:37 2006 +0000
+++ b/mk/flavor/pkg/depends.mk  Wed Jul 19 16:01:40 2006 +0000
@@ -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 @@
        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 @@
        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 @@
                        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



Home | Main Index | Thread Index | Old Index