svn commit: r406842 - head/Mk/Scripts
Raphael Kubo da Costa
rakuco at FreeBSD.org
Thu Jan 21 10:25:57 UTC 2016
Author: rakuco
Date: Thu Jan 21 10:25:56 2016
New Revision: 406842
URL: https://svnweb.freebsd.org/changeset/ports/406842
Log:
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
Modified:
head/Mk/Scripts/smart_makepatch.sh
Modified: head/Mk/Scripts/smart_makepatch.sh
==============================================================================
--- head/Mk/Scripts/smart_makepatch.sh Thu Jan 21 10:09:41 2016 (r406841)
+++ head/Mk/Scripts/smart_makepatch.sh Thu Jan 21 10:25:56 2016 (r406842)
@@ -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
More information about the svn-ports-head
mailing list