[pkgsrc/trunk]: pkgsrc/mk/flavor/pkg Fix a small logic bug. When running inst...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/186bc8af8f68
branches:  trunk
changeset: 529002:186bc8af8f68
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Tue May 22 17:30:54 2007 +0000

description:
Fix a small logic bug. When running install-dependencies for the first
time for bootstrap-dependencies, only really only look at the bootstrap
dependencies. Skip them in the second run.

Confusion reported by xtraeme@

diffstat:

 mk/flavor/pkg/depends.mk           |   6 ++----
 mk/flavor/pkg/install-dependencies |  12 +++++-------
 2 files changed, 7 insertions(+), 11 deletions(-)

diffs (56 lines):

diff -r 5a8192f1fbb1 -r 186bc8af8f68 mk/flavor/pkg/depends.mk
--- a/mk/flavor/pkg/depends.mk  Tue May 22 16:59:16 2007 +0000
+++ b/mk/flavor/pkg/depends.mk  Tue May 22 17:30:54 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: depends.mk,v 1.27 2007/05/22 16:17:16 joerg Exp $
+# $NetBSD: depends.mk,v 1.28 2007/05/22 17:30:54 joerg Exp $
 
 # This command prints out the dependency patterns for all full (run-time)
 # dependencies of the package.
@@ -64,8 +64,6 @@
                SETENV=${SETENV:Q} \
                ${SH} ${PKGSRCDIR}/mk/flavor/pkg/install-dependencies
 
-bootstrap-depends: ${_DEPENDS_FILE}
-
 ${_DEPENDS_FILE}:
        ${RUN} ${MKDIR} ${.TARGET:H}
        ${RUN} ${_LIST_DEPENDS_CMD} > ${.TARGET}
@@ -82,7 +80,7 @@
 #      Installs any missing dependencies.
 #
 _flavor-install-dependencies: .PHONY ${_DEPENDS_FILE}
-       ${RUN}${_INSTALL_DEPENDS_CMD}
+       ${RUN}${_INSTALL_DEPENDS_CMD} no-bootstrap
 
 # _flavor-post-install-dependencies:
 #      Targets after installing all dependencies.
diff -r 5a8192f1fbb1 -r 186bc8af8f68 mk/flavor/pkg/install-dependencies
--- a/mk/flavor/pkg/install-dependencies        Tue May 22 16:59:16 2007 +0000
+++ b/mk/flavor/pkg/install-dependencies        Tue May 22 17:30:54 2007 +0000
@@ -27,12 +27,6 @@
 PKGNAME=${_PKGNAME}
 unset _PKGNAME
 
-if [ $# = 1 ]; then
-       type_filter=$1
-else
-       type_filter=all
-fi
-
 error_msg() {
        ${ECHO} "ERROR:" "$*" 1>&2
 }
@@ -46,7 +40,11 @@
 }
 
 ${CAT} ${DEPENDS_FILE} | while read type pattern dir; do
-       [ $type_filter != all ] && [ $type_filter = "$filter" ] && continue
+       if $TEST "$1" = "bootstrap"; then
+               $TEST "$type" != "bootstrap" && continue
+       else
+               $TEST "$type" = "bootstrap" && continue
+       fi
        pkg=`find_best "$pattern"`
        case "$pkg" in
        "")