Date: Thu, 21 Jan 2016 10:25:56 +0000 (UTC) From: Raphael Kubo da Costa <rakuco@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r406842 - head/Mk/Scripts Message-ID: <201601211025.u0LAPufi069384@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201601211025.u0LAPufi069384>