diff options
| author | rakuco <rakuco@FreeBSD.org> | 2016-01-21 18:25:56 +0800 |
|---|---|---|
| committer | rakuco <rakuco@FreeBSD.org> | 2016-01-21 18:25:56 +0800 |
| commit | 7f04116bfe196330d0d42fa58f33d5600655493a (patch) | |
| tree | 18c9f06108f213da2a695209de22ea38e6883ab3 /Mk | |
| parent | 29f5148f57bd59491a908b2b3177a16eee5fa5e7 (diff) | |
| download | freebsd-ports-gnome-7f04116bfe196330d0d42fa58f33d5600655493a.tar.gz freebsd-ports-gnome-7f04116bfe196330d0d42fa58f33d5600655493a.tar.zst freebsd-ports-gnome-7f04116bfe196330d0d42fa58f33d5600655493a.zip | |
smart_makepatch: Quote PATCH_WRKSRC when regenerating patches.
Put ${PATCH_WRSKRC} within quotes so that expanding it works properly when it
contains spaces. This is required for `make makepatch' to work with
audio/quimup or any other port that has WRKSRC with spaces. Before the patch:
% make -dl makepatch
cd: too many arguments
cd: too many arguments
and the port would be left with an empty files/ directory.
Reviewed by: marino
Approved by: portmgr (mat)
Differential Revision: https://reviews.freebsd.org/D5011
Diffstat (limited to 'Mk')
| -rw-r--r-- | Mk/Scripts/smart_makepatch.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Mk/Scripts/smart_makepatch.sh b/Mk/Scripts/smart_makepatch.sh index 7c0bf8da5613..cd95503a856b 100644 --- a/Mk/Scripts/smart_makepatch.sh +++ b/Mk/Scripts/smart_makepatch.sh @@ -184,9 +184,9 @@ regenerate_patches() { local OUT local ORIG local new_list - new_list=$(cd ${PATCH_WRKSRC} && \ + new_list=$(cd "${PATCH_WRKSRC}" && \ find -s * -type f -name '*.orig' 2>/dev/null) - (cd ${PATCH_WRKSRC} && for F in ${new_list}; do + (cd "${PATCH_WRKSRC}" && for F in ${new_list}; do ORIG=${F#./} NEW=${ORIG%.orig} cmp -s ${ORIG} ${NEW} && continue |