summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMathieu Arnold <mat@FreeBSD.org>2018-06-29 10:02:12 +0000
committerMathieu Arnold <mat@FreeBSD.org>2018-06-29 10:02:12 +0000
commite55560c172a34aefd73f5e8dc539643de07a92c6 (patch)
tree7b42ac6e01a0c2808bb3020dffe4d98d957da0fb
parent- Update WWW (diff)
Keep --forward when using PATCH_DEBUG.
Otherwise, when used with BATCH defined so as to not be bothered by config screen and all, it will almost silently reverse obsolete patches and make you wonder why something is now broken. Reviewed by: sbruno Sponsored by: Absolight Differential Revision: https://reviews.freebsd.org/D15804
Notes
Notes: svn path=/head/; revision=473538
-rw-r--r--Mk/bsd.port.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk
index 4b857c044e2b..31f7edb160e3 100644
--- a/Mk/bsd.port.mk
+++ b/Mk/bsd.port.mk
@@ -2125,8 +2125,8 @@ PATCH_STRIP?= -p0
PATCH_DIST_STRIP?= -p0
.if defined(PATCH_DEBUG)
PATCH_DEBUG_TMP= yes
-PATCH_ARGS?= -E ${PATCH_STRIP}
-PATCH_DIST_ARGS?= --suffix ${DISTORIG} -E ${PATCH_DIST_STRIP}
+PATCH_ARGS?= --forward -E ${PATCH_STRIP}
+PATCH_DIST_ARGS?= --suffix ${DISTORIG} --forward -E ${PATCH_DIST_STRIP}
.else
PATCH_ARGS?= --forward --quiet -E ${PATCH_STRIP}
PATCH_DIST_ARGS?= --suffix ${DISTORIG} --forward --quiet -E ${PATCH_DIST_STRIP}