[pkgsrc/trunk]: pkgsrc/mk Print the full path to broken or modified patches t...

[jlam <jlam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/d3c56f769cc7
branches:  trunk
changeset: 495408:d3c56f769cc7
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Wed Jun 08 17:52:50 2005 +0000

description:
Print the full path to broken or modified patches that aren't applied.
This also fixes the problem where the names of broken local patches
(in ${LOCALPATCHES}) weren't printed correctly in the error message.

diffstat:

 mk/bsd.pkg.patch.mk |  10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diffs (34 lines):

diff -r b3d1aca07d30 -r d3c56f769cc7 mk/bsd.pkg.patch.mk
--- a/mk/bsd.pkg.patch.mk       Wed Jun 08 16:22:50 2005 +0000
+++ b/mk/bsd.pkg.patch.mk       Wed Jun 08 17:52:50 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.patch.mk,v 1.12 2005/06/04 20:56:47 rillig Exp $
+# $NetBSD: bsd.pkg.patch.mk,v 1.13 2005/06/08 17:52:50 jlam Exp $
 #
 # This Makefile fragment is included by bsd.pkg.mk and defines the
 # relevant variables and targets for the "patch" phase.
@@ -241,7 +241,7 @@
                                ${ECHO_MSG} "**************************************"; \
                                ${ECHO_MSG} "Patch file $$i has been modified"; \
                                ${ECHO_MSG} "**************************************"; \
-                               fail="$$fail $$filename";               \
+                               fail="$$fail $$i";                      \
                                continue;                               \
                          fi; };                                        \
                        ;;                                              \
@@ -255,11 +255,13 @@
                        ${ECHO} "$$i" >> ${_PATCH_COOKIE_TMP:Q};        \
                else                                                    \
                        ${ECHO_MSG} "Patch $$i failed";                 \
-                       fail="$$fail $$filename";                       \
+                       fail="$$fail $$i";                              \
                fi;                                                     \
        done;                                                           \
        if ${TEST} -n "$$fail"; then                                    \
                ${ECHO_MSG} "Patching failed due to modified or broken patch file(s):"; \
-               ${ECHO_MSG} "   $$fail";                                \
+               for i in $$fail; do                                     \
+                       ${ECHO_MSG} "   $$i";                           \
+               done;                                                   \
                ${_PKGSRC_PATCH_FAIL};                                  \
        fi