From owner-svn-ports-head@freebsd.org Thu Jan 21 10:25:57 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 8FAF7A88AF9; Thu, 21 Jan 2016 10:25:57 +0000 (UTC) (envelope-from rakuco@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 611151968; Thu, 21 Jan 2016 10:25:57 +0000 (UTC) (envelope-from rakuco@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0LAPudh069385; Thu, 21 Jan 2016 10:25:56 GMT (envelope-from rakuco@FreeBSD.org) Received: (from rakuco@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0LAPufi069384; Thu, 21 Jan 2016 10:25:56 GMT (envelope-from rakuco@FreeBSD.org) Message-Id: <201601211025.u0LAPufi069384@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rakuco set sender to rakuco@FreeBSD.org using -f From: Raphael Kubo da Costa Date: Thu, 21 Jan 2016 10:25:56 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r406842 - head/Mk/Scripts X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 21 Jan 2016 10:25:57 -0000 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