diff options
| author | Satoshi Asami <asami@FreeBSD.org> | 1996-12-23 02:53:12 +0000 |
|---|---|---|
| committer | Satoshi Asami <asami@FreeBSD.org> | 1996-12-23 02:53:12 +0000 |
| commit | 6e7b0e5485921c1dbc2668f2501c25e78e12dd0c (patch) | |
| tree | 06091108474a103c5d1883516914b86b19d93dbf | |
| parent | 19414a272c2397cbc0a3dd74e9857ad10e8900c5 (diff) | |
| download | ports-6e7b0e5485921c1dbc2668f2501c25e78e12dd0c.tar.gz ports-6e7b0e5485921c1dbc2668f2501c25e78e12dd0c.zip | |
Merge from 1.241: checksum code improvements.
Notes
Notes:
svn path=/branches/RELENG_2_1_0/; revision=5065
| -rw-r--r-- | Mk/bsd.port.mk | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index eae17d6ff7cf..34790f4e84a8 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -6,7 +6,7 @@ # bsd.port.mk - 940820 Jordan K. Hubbard. # This file is in the public domain. # -# $Id: bsd.port.mk,v 1.165.2.17 1996/12/17 12:24:44 asami Exp $ +# $Id: bsd.port.mk,v 1.165.2.18 1996/12/18 02:29:17 asami Exp $ # # Please view me with 4 column tabs! @@ -1237,7 +1237,7 @@ checksum: fetch (cd ${DISTDIR}; OK="true"; \ for file in ${_CKSUMFILES}; do \ CKSUM=`${MD5} < $$file`; \ - CKSUM2=`${GREP} "($$file)" ${MD5_FILE} | ${AWK} '{print $$4}'`; \ + CKSUM2=`${GREP} "^MD5 ($$file)" ${MD5_FILE} | ${AWK} '{print $$4}'`; \ if [ "$$CKSUM2" = "" ]; then \ ${ECHO_MSG} ">> No checksum recorded for $$file."; \ OK="false"; \ @@ -1245,9 +1245,11 @@ checksum: fetch ${ECHO_MSG} ">> Checksum for $$file is set to IGNORE in md5 file even though"; \ ${ECHO_MSG} " the file is not in the "'$$'"{IGNOREFILES} list."; \ OK="false"; \ - elif [ "$$CKSUM" != "$$CKSUM2" ]; then \ + elif [ "$$CKSUM" = "$$CKSUM2" ]; then \ + ${ECHO_MSG} ">> Checksum OK for $$file."; \ + else \ ${ECHO_MSG} ">> Checksum mismatch for $$file."; \ - exit 1; \ + OK="false"; \ fi; \ done; \ for file in ${_IGNOREFILES}; do \ @@ -1261,11 +1263,11 @@ checksum: fetch OK="false"; \ fi; \ done; \ - if [ "$$OK" = "true" ]; then \ - ${ECHO_MSG} "Checksums OK."; \ - else \ - ${ECHO_MSG} "There may be some inconsistencies, make sure the Makefile and md5 file"; \ - ${ECHO_MSG} "(\"${MD5_FILE}\") are up to date."; \ + if [ "$$OK" != "true" ]; then \ + ${ECHO_MSG} "Make sure the Makefile and md5 file (${MD5_FILE})"; \ + ${ECHO_MSG} "are up to date. If you want to override this check, type"; \ + ${ECHO_MSG} "\"make NO_CHECKSUM=yes [other args]\"."; \ + exit 1; \ fi) ; \ fi .endif |