Oops. Fix up the checksum routine - my last commit broke it slightly.

This commit is contained in:
gpalmer 1995-01-22 20:40:48 +00:00
parent c853578861
commit e0eb6081ea

View File

@ -3,7 +3,7 @@
# bsd.port.mk - 940820 Jordan K. Hubbard.
# This file is in the public domain.
#
# $Id: bsd.port.mk,v 1.103 1995/01/16 23:33:08 gpalmer Exp $
# $Id: bsd.port.mk,v 1.5 1995/01/22 20:37:25 gary Exp $
#
# Please view me with 4 column tabs!
@ -517,23 +517,23 @@ checksum: fetch
@if [ ! -f ${MD5_FILE} ]; then \
echo ">> No MD5 checksum file."; \
else \
(cd ${DISTDIR}; OK="true"; \
for file in ${DISTFILES}; do \
CKSUM=`${MD5} $$file | awk '{print $$4}'`; \
CKSUM2=`grep "($$file)" ${MD5_FILE} | awk '{print $$4}'`; \
if [ "$$CKSUM2" = "" ]; then \
echo ">> No checksum recorded for $$file"; \
OK="false"; \
elif [ "$$CKSUM" != "$$CKSUM2" ]; then \
echo ">> Checksum mismatch for $$file"; \
exit 1; \
fi; \
done); \
if [ "$$OK" = "true" ]; then \
echo "Checksums OK."; \
else \
echo "Checksums OK for files that have them."; \
fi; \
(cd ${DISTDIR}; OK=""; \
for file in ${DISTFILES}; do \
CKSUM=`${MD5} $$file | awk '{print $$4}'`; \
CKSUM2=`grep "($$file)" ${MD5_FILE} | awk '{print $$4}'`; \
if [ "$$CKSUM2" = "" ]; then \
echo ">> No checksum recorded for $$file"; \
OK="false"; \
elif [ "$$CKSUM" != "$$CKSUM2" ]; then \
echo ">> Checksum mismatch for $$file"; \
exit 1; \
fi; \
done; \
if [ "$$OK" = "" ]; then \
echo "Checksums OK."; \
else \
echo "Checksums OK for files that have them."; \
fi) ; \
fi
.endif
@ -556,13 +556,13 @@ ${EXTRACT_COOKIE}:
@mkdir -p ${WRKDIR}
.if defined(EXTRACT_ONLY)
@for file in ${EXTRACT_ONLY}; do \
if ! (${EXTRACT_CMD} ${EXTRACT_ARGS} ${DISTDIR}/$$file); then \
if ! ${EXTRACT_CMD} ${EXTRACT_ARGS} ${DISTDIR}/$$file; then \
exit 1; \
fi \
done
.else
@for file in ${DISTFILES}; do \
if ! (${EXTRACT_CMD} ${EXTRACT_ARGS} ${DISTDIR}/$$file); then \
if ! ${EXTRACT_CMD} ${EXTRACT_ARGS} ${DISTDIR}/$$file; then \
exit 1; \
fi \
done