diff options
| author | asami <asami@FreeBSD.org> | 1995-09-13 18:14:31 +0800 |
|---|---|---|
| committer | asami <asami@FreeBSD.org> | 1995-09-13 18:14:31 +0800 |
| commit | 6ccf410de51f67214e35c069e92d816c85d5d44b (patch) | |
| tree | 19964dc77478f5ed8e82614b0322c61e89ee659d /Mk | |
| parent | 3f59790fec46ddd8eae66433a9a6d1cb146e2a85 (diff) | |
| download | freebsd-ports-gnome-6ccf410de51f67214e35c069e92d816c85d5d44b.tar.gz freebsd-ports-gnome-6ccf410de51f67214e35c069e92d816c85d5d44b.tar.zst freebsd-ports-gnome-6ccf410de51f67214e35c069e92d816c85d5d44b.zip | |
Ignore patchfiles that end with ".orig" or "~".
Suggested by: paul, joerg among others
Diffstat (limited to 'Mk')
| -rw-r--r-- | Mk/bsd.port.mk | 24 |
1 files changed, 19 insertions, 5 deletions
diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index 312c0a482e9a..8a5fc4c8f6c6 100644 --- a/Mk/bsd.port.mk +++ b/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 |