summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2007-08-24 03:30:54 +0000
committerjlam <jlam@pkgsrc.org>2007-08-24 03:30:54 +0000
commit207a8ff447a457244896ba2911cbdcc62f1959ec (patch)
tree741cdf0cf19e357280b8a5d6161dcc5d279e21e9 /mk
parentba2e1cdc9e9fad7ec03a47ace037b180e9606a7e (diff)
downloadpkgsrc-207a8ff447a457244896ba2911cbdcc62f1959ec.tar.gz
When verifying checksums of distfiles, simply verify every checksum
provided in the distinfo file for those distfiles, rather than checking specifically for the ones listed in _DIGEST_ALGORITHMS. If a distinfo file actually provides checksums for other algorithms, e.g. TIGER, then go ahead and verify them too.
Diffstat (limited to 'mk')
-rw-r--r--mk/checksum/checksum.mk7
1 files changed, 2 insertions, 5 deletions
diff --git a/mk/checksum/checksum.mk b/mk/checksum/checksum.mk
index b7ce3b5c647..8b7e50f03b2 100644
--- a/mk/checksum/checksum.mk
+++ b/mk/checksum/checksum.mk
@@ -1,4 +1,4 @@
-# $NetBSD: checksum.mk,v 1.9 2007/08/24 03:12:33 jlam Exp $
+# $NetBSD: checksum.mk,v 1.10 2007/08/24 03:30:54 jlam Exp $
#
# See bsd.checksum.mk for helpful comments.
#
@@ -34,11 +34,9 @@ _COOKIE.checksum= ${_COOKIE.extract}
checksum: do-checksum
do-checksum:
-.for _alg_ in ${_DIGEST_ALGORITHMS}
${RUN} set -e; \
${TEST} ! -f ${_COOKIE.checksum} || exit 0; \
- if cd ${DISTDIR} && ${_CHECKSUM_CMD} -a ${_alg_:Q} \
- ${DISTINFO_FILE} ${_CKSUMFILES}; then \
+ if cd ${DISTDIR} && ${_CHECKSUM_CMD} ${DISTINFO_FILE} ${_CKSUMFILES}; then \
${TRUE}; \
else \
${ERROR_MSG} "Make sure the Makefile and checksum file (${DISTINFO_FILE})"; \
@@ -46,7 +44,6 @@ do-checksum:
${ERROR_MSG} "\"${MAKE} NO_CHECKSUM=yes [other args]\"."; \
exit 1; \
fi
-.endfor
_DISTINFO_CMD= ${SETENV} DIGEST=${TOOLS_DIGEST:Q} SED=${TOOLS_SED:Q} \
TEST=${TOOLS_TEST:Q} WC=${TOOLS_WC:Q} \