From 27fb6c1d00773c416e127f65eaa45b054eb7ff6f Mon Sep 17 00:00:00 2001
From: jlam <jlam>
Date: Sat, 21 May 2005 21:40:45 +0000
Subject: Make a bad patch cause a fatal error again.  This fixes a bug
 introduced in revision 1.5 and fixes PR pkg/30297.

---
 mk/bsd.pkg.patch.mk | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/mk/bsd.pkg.patch.mk b/mk/bsd.pkg.patch.mk
index 8d28488c100..03be1718940 100644
--- a/mk/bsd.pkg.patch.mk
+++ b/mk/bsd.pkg.patch.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.patch.mk,v 1.9 2005/05/17 19:11:02 jlam Exp $
+# $NetBSD: bsd.pkg.patch.mk,v 1.10 2005/05/21 21:40:45 jlam Exp $
 #
 # This Makefile fragment is included by bsd.pkg.mk and defines the
 # relevant variables and targets for the "patch" phase.
@@ -262,11 +262,15 @@ apply-pkgsrc-patches:
 		if ${PATCH} -v >/dev/null 2>&1; then			\
 			fuzz_flags=${PATCH_FUZZ_FACTOR:Q};		\
 		fi;							\
-		${PATCH} $$fuzz_flags ${PATCH_ARGS} < $$i ||		\
+		if ${PATCH} $$fuzz_flags ${PATCH_ARGS} < $$i; then	\
+			${ECHO} "$$i" >> ${_PATCH_COOKIE_TMP:Q};	\
+		else							\
 			${ECHO_MSG} "Patch $$i failed";			\
-		${ECHO} "$$i" >> ${_PATCH_COOKIE_TMP:Q};		\
+			fail="$$fail $$filename";			\
+		fi;							\
 	done;								\
 	if ${TEST} -n "$$fail"; then					\
-		${ECHO_MSG} "Patching failed due to modified patch file(s): $$fail"; \
+		${ECHO_MSG} "Patching failed due to modified or broken patch file(s):"; \
+		${ECHO_MSG} "	$$fail";				\
 		${_PKGSRC_PATCH_FAIL};					\
 	fi
-- 
cgit v1.2.3