diff options
| author | asami <asami@FreeBSD.org> | 1995-10-11 09:25:58 +0000 |
|---|---|---|
| committer | asami <asami@FreeBSD.org> | 1995-10-11 09:25:58 +0000 |
| commit | 52414d3c17f8eec482e1151faa36630f7f3c8815 (patch) | |
| tree | e28706d159de5da48d4dab9b0e7b6a62c052fdea | |
| parent | cf5bbfc223a980cf62154ed623d38ebe7765f540 (diff) | |
| download | FreeBSD-src-52414d3c17f8eec482e1151faa36630f7f3c8815.zip FreeBSD-src-52414d3c17f8eec482e1151faa36630f7f3c8815.tar.gz | |
Add "--batch" to PATCH_ARGS and PATCH_DIST_ARGS when ${BATCH} is set
to avoid an infinite loop in patch when the patch target is not found and
stdin is redirected from /dev/null (the "skip this patch? [n]" question).
| -rw-r--r-- | share/mk/bsd.port.mk | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/share/mk/bsd.port.mk b/share/mk/bsd.port.mk index 3685312..ae30160 100644 --- a/share/mk/bsd.port.mk +++ b/share/mk/bsd.port.mk @@ -3,7 +3,7 @@ # bsd.port.mk - 940820 Jordan K. Hubbard. # This file is in the public domain. # -# $Id: bsd.port.mk,v 1.181 1995/10/04 11:13:52 asami Exp $ +# $Id: bsd.port.mk,v 1.165.2.2 1995/10/05 20:58:10 davidg Exp $ # # Please view me with 4 column tabs! @@ -265,6 +265,10 @@ PATCH_DIST_ARGS?= -d ${WRKSRC} -E ${PATCH_DIST_STRIP} PATCH_ARGS?= -d ${WRKSRC} --forward --quiet -E ${PATCH_STRIP} PATCH_DIST_ARGS?= -d ${WRKSRC} --forward --quiet -E ${PATCH_DIST_STRIP} .endif +.if defined(BATCH) +PATCH_ARGS+= --batch +PATCH_DIST_ARGS+= --batch +.endif .if defined(PATCH_CHECK_ONLY) PATCH_ARGS+= -C |
