diff options
| author | hubertf <hubertf> | 1999-07-24 23:23:04 +0000 |
|---|---|---|
| committer | hubertf <hubertf> | 1999-07-24 23:23:04 +0000 |
| commit | 30e32c174779b755d14ae1c7688ba1ef0345d7cc (patch) | |
| tree | 666ce232da52cdb1b682499b9344379d65167b00 /mk/bsd.pkg.mk | |
| parent | 0d03a3604e0109f1b171c14eb694b8d141602bfa (diff) | |
| download | pkgsrc-30e32c174779b755d14ae1c7688ba1ef0345d7cc.tar.gz | |
If there's a discrepancy between files/patch-sum and patches/*,
this shouldn't be silently ignored. Tell the user instead.
Diffstat (limited to 'mk/bsd.pkg.mk')
| -rw-r--r-- | mk/bsd.pkg.mk | 24 |
1 files changed, 19 insertions, 5 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index a27f09e3da0..2ea134c1519 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.301 1999/07/23 21:35:20 tron Exp $ +# $NetBSD: bsd.pkg.mk,v 1.302 1999/07/24 23:23:04 hubertf Exp $ # # This file is in the public domain. # @@ -1007,12 +1007,26 @@ do-patch: calcsum=`${SED} -e '/\$$NetBSD.*/d' $$i | ${MD5}`; \ recorded=`${AWK} '$$1 == "MD5" && $$2 == "('$$filename')" { print $$4; }' ${PATCH_SUM_FILE} || ${TRUE}`; \ if [ "X$$recorded" = "X" ]; then \ - ${ECHO_MSG} ">> Ignoring \"unofficial\" patch file $$i"; \ - continue; \ + case "$$filename" in \ + patch-local-*) \ + ${ECHO_MSG} ">> Ignoring \"unofficial\" patch file $$i"; \ + continue \ + ;; \ + *) \ + ${ECHO_MSG} ">> Unknown patch file: $$i"; \ + ${ECHO_MSG} ">> If this is an obsolete patch, please delete it to build"; \ + ${ECHO_MSG} ">> this package (or run 'make makepatchsum' if you are working"; \ + ${ECHO_MSG} ">> on this package)."; \ + exit 1; \ + ;; \ + esac ; \ fi; \ if [ "X$$calcsum" != "X$$recorded" ]; then \ - ${ECHO_MSG} ">> Patch file $$i has been modified - ignoring it"; \ - continue; \ + ${ECHO_MSG} ">> Patch file $$i has been modified"; \ + ${ECHO_MSG} ">> If this is an obsolete patch, please delete it to build"; \ + ${ECHO_MSG} ">> this package (or run 'make makepatchsum' if you are working"; \ + ${ECHO_MSG} ">> on this package)."; \ + exit 1; \ fi; \ fi; \ if [ ${PATCH_DEBUG_TMP} = yes ]; then \ |