diff options
| author | Baptiste Daroussin <bapt@FreeBSD.org> | 2013-06-13 18:56:24 +0000 |
|---|---|---|
| committer | Baptiste Daroussin <bapt@FreeBSD.org> | 2013-06-13 18:56:24 +0000 |
| commit | 29aea2e3ae567dcb4eb78230ae1cc4de051e6eee (patch) | |
| tree | a50744fed4ea521dd6e41dc5819b9f7aa085de01 /Mk | |
| parent | 771c6bdb37122e963e13dde2246a2d9a2f089716 (diff) | |
Notes
Diffstat (limited to 'Mk')
| -rw-r--r-- | Mk/bsd.port.mk | 45 |
1 files changed, 23 insertions, 22 deletions
diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index d8dd2ca11123..e43081557a04 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -3591,30 +3591,31 @@ patch-dos2unix: do-patch: .if defined(PATCHFILES) @${ECHO_MSG} "===> Applying distribution patches for ${PKGNAME}" -.for i in ${_PATCHFILES} -. if defined(PATCH_DEBUG_TMP) && ${PATCH_DEBUG_TMP} == yes - @${ECHO_MSG} "===> Applying distribution patch $i" -. endif - @(cd ${_DISTDIR}; \ - case $i in \ - *.Z|*.gz) ${GZCAT} $i ;; \ - *.bz2) ${BZCAT} $i ;; \ - *.xz) ${XZCAT} $i ;; \ - *) ${CAT} $i ;; \ - esac | ${PATCH} ${PATCH_DIST_ARGS} ) -. endfor + @set -e ; \ + (cd ${_DISTDIR} ; \ + for i in ${_PATCHFILES}; do \ + if [ ${PATCH_DEBUG_TMP} = yes ]; then \ + @${ECHO_MSG} "===> Applying distribution patch $$i" ; \ + fi ; \ + case $$i in \ + *.Z|*.gz) ${GZCAT} $$i ;; \ + *.bz2) ${BZCAT} $$i ;; \ + *.xz) ${XZCAT} $$i ;; \ + *) ${CAT} $$i ;; \ + esac | ${PATCH} ${PATCH_DIST_ARGS} ; \ + done ) .endif .if defined(EXTRA_PATCHES) -. for i in ${EXTRA_PATCHES} - @${ECHO_MSG} "===> Applying extra patch $i" - @(cd ${_DISTDIR}; \ - case $i in \ - *.Z|*.gz) ${GZCAT} $i ;; \ - *.bz2) ${BZCAT} $i ;; \ - *.xz) ${XZCAT} $i ;; \ - *) ${CAT} $i ;; \ - esac | ${PATCH} ${PATCH_DIST_ARGS} ) -. endfor + @set -e ; \ + for i in ${EXTRA_PATCHES}; do \ + ${ECHO_MSG} "===> Applying extra patch $$i" ; \ + case $$i in \ + *.Z|*.gz) ${GZCAT} $$i ;; \ + *.bz2) ${BZCAT} $$i ;; \ + *.xz) ${XZCAT} $$i ;; \ + *) ${CAT} $$i ;; \ + esac | ${PATCH} ${PATCH_ARGS} ; \ + done .endif @set -e ;\ if [ -d ${PATCHDIR} ]; then \ |