Sun Jan 14 10:47:43 2018 UTC ()
Add missing empty TEST_DEPENDS for the bootstrap case.


(joerg)
diff -r1.6 -r1.7 pkgsrc/mk/pkgformat/pkg/depends.mk

cvs diff -r1.6 -r1.7 pkgsrc/mk/pkgformat/pkg/depends.mk (expand / switch to unified diff)

--- pkgsrc/mk/pkgformat/pkg/depends.mk 2018/01/13 12:48:57 1.6
+++ pkgsrc/mk/pkgformat/pkg/depends.mk 2018/01/14 10:47:43 1.7
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: depends.mk,v 1.6 2018/01/13 12:48:57 joerg Exp $ 1# $NetBSD: depends.mk,v 1.7 2018/01/14 10:47:43 joerg Exp $
2 2
3# This command prints out the dependency patterns for all full (run-time) 3# This command prints out the dependency patterns for all full (run-time)
4# dependencies of the package. 4# dependencies of the package.
5# 5#
6# This is used in install.mk and metadata.mk. 6# This is used in install.mk and metadata.mk.
7# 7#
8 8
9# ${_DEPENDS_FILE} contains all the dependency information 9# ${_DEPENDS_FILE} contains all the dependency information
10# for the package. The format of each line of the file is: 10# for the package. The format of each line of the file is:
11# 11#
12# <depends_type> <pattern> <directory> 12# <depends_type> <pattern> <directory>
13# 13#
14# Valid dependency types are "bootstrap", "build", "test" and "full". 14# Valid dependency types are "bootstrap", "build", "test" and "full".
@@ -61,27 +61,27 @@ _LIST_DEPENDS_CMD= \ @@ -61,27 +61,27 @@ _LIST_DEPENDS_CMD= \
61 ${PKGSRC_SETENV} AWK=${AWK:Q} PKG_ADMIN=${PKG_ADMIN:Q} \ 61 ${PKGSRC_SETENV} AWK=${AWK:Q} PKG_ADMIN=${PKG_ADMIN:Q} \
62 PKGSRCDIR=${PKGSRCDIR:Q} PWD_CMD=${PWD_CMD:Q} SED=${SED:Q} \ 62 PKGSRCDIR=${PKGSRCDIR:Q} PWD_CMD=${PWD_CMD:Q} SED=${SED:Q} \
63 ${SH} ${PKGSRCDIR}/mk/pkgformat/pkg/list-dependencies \ 63 ${SH} ${PKGSRCDIR}/mk/pkgformat/pkg/list-dependencies \
64 " "${BOOTSTRAP_DEPENDS:Q} \ 64 " "${BOOTSTRAP_DEPENDS:Q} \
65 " "${TEST_DEPENDS:Q} \ 65 " "${TEST_DEPENDS:Q} \
66 " "${TOOL_DEPENDS:Q} \ 66 " "${TOOL_DEPENDS:Q} \
67 " "${BUILD_DEPENDS:Q} \ 67 " "${BUILD_DEPENDS:Q} \
68 " "${DEPENDS:Q} 68 " "${DEPENDS:Q}
69 69
70_LIST_DEPENDS_CMD.bootstrap= \ 70_LIST_DEPENDS_CMD.bootstrap= \
71 ${PKGSRC_SETENV} AWK=${AWK:Q} PKG_ADMIN=${PKG_ADMIN:Q} \ 71 ${PKGSRC_SETENV} AWK=${AWK:Q} PKG_ADMIN=${PKG_ADMIN:Q} \
72 PKGSRCDIR=${PKGSRCDIR:Q} PWD_CMD=${PWD_CMD:Q} SED=${SED:Q} \ 72 PKGSRCDIR=${PKGSRCDIR:Q} PWD_CMD=${PWD_CMD:Q} SED=${SED:Q} \
73 ${SH} ${PKGSRCDIR}/mk/pkgformat/pkg/list-dependencies \ 73 ${SH} ${PKGSRCDIR}/mk/pkgformat/pkg/list-dependencies \
74 " "${BOOTSTRAP_DEPENDS:Q} " " " " " " 74 " "${BOOTSTRAP_DEPENDS:Q} " " " " " " " "
75 75
76_LIST_DEPENDS_CMD.test= \ 76_LIST_DEPENDS_CMD.test= \
77 ${PKGSRC_SETENV} AWK=${AWK:Q} PKG_ADMIN=${PKG_ADMIN:Q} \ 77 ${PKGSRC_SETENV} AWK=${AWK:Q} PKG_ADMIN=${PKG_ADMIN:Q} \
78 PKGSRCDIR=${PKGSRCDIR:Q} PWD_CMD=${PWD_CMD:Q} SED=${SED:Q} \ 78 PKGSRCDIR=${PKGSRCDIR:Q} PWD_CMD=${PWD_CMD:Q} SED=${SED:Q} \
79 ${SH} ${PKGSRCDIR}/mk/pkgformat/pkg/list-dependencies \ 79 ${SH} ${PKGSRCDIR}/mk/pkgformat/pkg/list-dependencies \
80 " " " "${TEST_DEPENDS:Q} " " " " " " 80 " " " "${TEST_DEPENDS:Q} " " " " " "
81 81
82_RESOLVE_DEPENDS_CMD= \ 82_RESOLVE_DEPENDS_CMD= \
83 ${PKGSRC_SETENV} _PKG_DBDIR=${_PKG_DBDIR:Q} PKG_INFO=${PKG_INFO:Q} \ 83 ${PKGSRC_SETENV} _PKG_DBDIR=${_PKG_DBDIR:Q} PKG_INFO=${PKG_INFO:Q} \
84 HOST_PKG_INFO=${HOST_PKG_INFO:Q} \ 84 HOST_PKG_INFO=${HOST_PKG_INFO:Q} \
85 _DEPENDS_FILE=${_DEPENDS_FILE:Q} \ 85 _DEPENDS_FILE=${_DEPENDS_FILE:Q} \
86 ${SH} ${PKGSRCDIR}/mk/pkgformat/pkg/resolve-dependencies \ 86 ${SH} ${PKGSRCDIR}/mk/pkgformat/pkg/resolve-dependencies \
87 " "${BOOTSTRAP_DEPENDS:Q} \ 87 " "${BOOTSTRAP_DEPENDS:Q} \