CVS commit: pkgsrc/mk/pkgformat/pkg

["Joerg Sonnenberger" <joerg%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   joerg
Date:           Tue Apr  6 18:46:06 UTC 2021

Modified Files:
        pkgsrc/mk/pkgformat/pkg: depends.mk

Log Message:
Preserve stdin for the bootstrap and dependency handling like done for
normal dependencies.


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 pkgsrc/mk/pkgformat/pkg/depends.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/mk/pkgformat/pkg/depends.mk
diff -u pkgsrc/mk/pkgformat/pkg/depends.mk:1.12 pkgsrc/mk/pkgformat/pkg/depends.mk:1.13
--- pkgsrc/mk/pkgformat/pkg/depends.mk:1.12     Wed Dec  2 10:22:39 2020
+++ pkgsrc/mk/pkgformat/pkg/depends.mk  Tue Apr  6 18:46:06 2021
@@ -1,4 +1,4 @@
-# $NetBSD: depends.mk,v 1.12 2020/12/02 10:22:39 wiz Exp $
+# $NetBSD: depends.mk,v 1.13 2021/04/06 18:46:06 joerg Exp $
 
 # This command prints out the dependency patterns for all full (run-time)
 # dependencies of the package.
@@ -241,10 +241,11 @@ bootstrap-depends: ${_BOOTSTRAP_DEPENDS_
 .PHONY: _pkgformat-bootstrap-depends
 .if empty(PKG_FAIL_REASON)
 _pkgformat-bootstrap-depends:
-       ${RUN}${_LIST_DEPENDS_CMD.bootstrap} |                          \
+       ${RUN}exec 3<&0;                                                \
+       ${_LIST_DEPENDS_CMD.bootstrap} |                                \
        while read type pattern dir; do                                 \
                ${TEST} "$$type" = "bootstrap" || continue;             \
-               ${_DEPENDS_INSTALL_CMD};                                \
+               ${_DEPENDS_INSTALL_CMD} 0<&3;                           \
        done
 .else
 _pkgformat-bootstrap-depends:
@@ -270,10 +271,11 @@ _TEST_DEPENDS_TARGETS+=   release-test-dep
 test-depends: ${_TEST_DEPENDS_TARGETS}
 
 _pkgformat-test-depends:
-       ${RUN}${_LIST_DEPENDS_CMD.test} |                               \
+       ${RUN}exec 3<&0;                                                \
+       ${_LIST_DEPENDS_CMD.test} |                                     \
        while read type pattern dir; do                                 \
-               ${TEST} "$$type" = "test" || continue;          \
-               ${_DEPENDS_INSTALL_CMD};                                \
+               ${TEST} "$$type" = "test" || continue;                  \
+               ${_DEPENDS_INSTALL_CMD} 0<&3;                           \
        done
 
 .PHONY: