Sun Feb 12 04:13:33 2023 UTC ()
If a package has PBULK_WEIGHT set, include it in the pbulk-index output.


(joerg)
diff -r1.27 -r1.28 pkgsrc/mk/pbulk/pbulk-index.mk
cvs diff -r1.27 -r1.28 pkgsrc/mk/pbulk/pbulk-index.mk (expand / switch to unified diff)

--- pkgsrc/mk/pbulk/pbulk-index.mk 2022/11/23 10:22:40 1.27
+++ pkgsrc/mk/pbulk/pbulk-index.mk 2023/02/12 04:13:33 1.28
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: pbulk-index.mk,v 1.27 2022/11/23 10:22:40 jperkin Exp $ 1# $NetBSD: pbulk-index.mk,v 1.28 2023/02/12 04:13:33 joerg Exp $
2 2
3# This Makefile fragment is included by bsd.pkg.mk and provides all 3# This Makefile fragment is included by bsd.pkg.mk and provides all
4# variables and targets related to the parallel bulk build 4# variables and targets related to the parallel bulk build
5# tree-scanning code. 5# tree-scanning code.
6# 6#
7# The following are the "public" targets provided by this module: 7# The following are the "public" targets provided by this module:
8# 8#
9# pbulk-index 9# pbulk-index
10# pbulk-index-item 10# pbulk-index-item
11 11
12# 12#
13# _PBULK_MULTI lists the multi-package variable. 13# _PBULK_MULTI lists the multi-package variable.
14# For each class the following variables are provided: 14# For each class the following variables are provided:
@@ -115,26 +115,27 @@ pbulk-index-item: @@ -115,26 +115,27 @@ pbulk-index-item:
115 ${RUN} { \ 115 ${RUN} { \
116 echo "PKGNAME="${PKGNAME:Q}; \ 116 echo "PKGNAME="${PKGNAME:Q}; \
117 echo "ALL_DEPENDS="${_ALL_DEPENDS:Q}; \ 117 echo "ALL_DEPENDS="${_ALL_DEPENDS:Q}; \
118 echo "PKG_SKIP_REASON="${PKG_SKIP_REASON:Q}; \ 118 echo "PKG_SKIP_REASON="${PKG_SKIP_REASON:Q}; \
119 echo "PKG_FAIL_REASON="${PKG_FAIL_REASON:Q}; \ 119 echo "PKG_FAIL_REASON="${PKG_FAIL_REASON:Q}; \
120 echo "NO_BIN_ON_FTP="${NO_BIN_ON_FTP:Q}; \ 120 echo "NO_BIN_ON_FTP="${NO_BIN_ON_FTP:Q}; \
121 echo "RESTRICTED="${RESTRICTED:Q}; \ 121 echo "RESTRICTED="${RESTRICTED:Q}; \
122 echo "CATEGORIES="${CATEGORIES:Q}; \ 122 echo "CATEGORIES="${CATEGORIES:Q}; \
123 echo "MAINTAINER="${MAINTAINER:Q}; \ 123 echo "MAINTAINER="${MAINTAINER:Q}; \
124 echo "USE_DESTDIR="${_USE_DESTDIR:Q}; \ 124 echo "USE_DESTDIR="${_USE_DESTDIR:Q}; \
125 echo "BOOTSTRAP_PKG="${BOOTSTRAP_PKG}; \ 125 echo "BOOTSTRAP_PKG="${BOOTSTRAP_PKG}; \
126 echo "USERGROUP_PHASE="${USERGROUP_PHASE:Q}; \ 126 echo "USERGROUP_PHASE="${USERGROUP_PHASE:Q}; \
127 echo "SCAN_DEPENDS="${_PBULK_SCAN_DEPENDS:O:u:Q}; \ 127 echo "SCAN_DEPENDS="${_PBULK_SCAN_DEPENDS:O:u:Q}; \
 128 [ -z ${PBULK_WEIGHT:Q} ] || echo "PBULK_WEIGHT="${PBULK_WEIGHT:Q}; \
128 } 129 }
129.if defined(_PBULK_MULTI_NEEDED) 130.if defined(_PBULK_MULTI_NEEDED)
130 ${RUN} { \ 131 ${RUN} { \
131 printf "MULTI_VERSION="; \ 132 printf "MULTI_VERSION="; \
132 ${_PBULK_MULTI_NEEDED:@_t@ \ 133 ${_PBULK_MULTI_NEEDED:@_t@ \
133 printf " %s=%s" ${_PBULK_MULTI_VAR.${_t}:Q} ${_PBULK_MULTI_VALUE_${_t}:Q}; \ 134 printf " %s=%s" ${_PBULK_MULTI_VAR.${_t}:Q} ${_PBULK_MULTI_VALUE_${_t}:Q}; \
134 @} \ 135 @} \
135 printf "\n"; \ 136 printf "\n"; \
136 } 137 }
137.endif 138.endif
138 139
139pbulk-save-wrkdir: 140pbulk-save-wrkdir:
140 ${RUN} [ ! -d ${WRKDIR} ] || cd ${WRKDIR} && ${TAR} cfz ${INTO:Q} . 141 ${RUN} [ ! -d ${WRKDIR} ] || cd ${WRKDIR} && ${TAR} cfz ${INTO:Q} .