diff options
| author | asami <asami@FreeBSD.org> | 1995-09-13 10:14:31 +0000 |
|---|---|---|
| committer | asami <asami@FreeBSD.org> | 1995-09-13 10:14:31 +0000 |
| commit | 051b650295b1cc8a598379e637a5d2d0972e9f25 (patch) | |
| tree | e45602b5ba647ee07af64ff73d601de2e8a5e7c0 | |
| parent | 2c2abd6c04afd68099fe0ec5ad3db333d1bbf39f (diff) | |
| download | FreeBSD-src-051b650295b1cc8a598379e637a5d2d0972e9f25.zip FreeBSD-src-051b650295b1cc8a598379e637a5d2d0972e9f25.tar.gz | |
Ignore patchfiles that end with ".orig" or "~".
Suggested by: paul, joerg among others
| -rw-r--r-- | share/mk/bsd.port.mk | 24 |
1 files changed, 19 insertions, 5 deletions
diff --git a/share/mk/bsd.port.mk b/share/mk/bsd.port.mk index 312c0a4..8a5fc4c 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.175 1995/08/18 10:06:28 asami Exp $ +# $Id: bsd.port.mk,v 1.177 1995/08/29 11:57:40 asami Exp $ # # Please view me with 4 column tabs! @@ -538,15 +538,29 @@ do-patch: @if [ -d ${PATCHDIR} ]; then \ ${ECHO_MSG} "===> Applying FreeBSD patches for ${PKGNAME}" ; \ for i in ${PATCHDIR}/patch-*; do \ - ${ECHO_MSG} "===> Applying FreeBSD patch $$i" ; \ - ${PATCH} ${PATCH_ARGS} < $$i; \ + case $$i in \ + *.orig|*~) \ + ${ECHO_MSG} "===> Ignoring patchfile $$i" ; \ + ;; \ + *) \ + ${ECHO_MSG} "===> Applying FreeBSD patch $$i" ; \ + ${PATCH} ${PATCH_ARGS} < $$i; \ + ;; \ + esac; \ done; \ fi .else @if [ -d ${PATCHDIR} ]; then \ ${ECHO_MSG} "===> Applying FreeBSD patches for ${PKGNAME}" ; \ - for i in ${PATCHDIR}/patch-*; \ - do ${PATCH} ${PATCH_ARGS} < $$i; \ + for i in ${PATCHDIR}/patch-*; do \ + case $$i in \ + *.orig|*~) \ + ${ECHO_MSG} "===> Ignoring patchfile $$i" ; \ + ;; \ + *) \ + ${PATCH} ${PATCH_ARGS} < $$i; \ + ;; \ + esac; \ done;\ fi .endif |
