From owner-svn-ports-head@freebsd.org Tue Jan 21 20:36:15 2020 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 6A7F122219B; Tue, 21 Jan 2020 20:36:15 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 482L0b2BFFz41ZM; Tue, 21 Jan 2020 20:36:15 +0000 (UTC) (envelope-from bdrewery@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 41E101A599; Tue, 21 Jan 2020 20:36:15 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 00LKaFTk076284; Tue, 21 Jan 2020 20:36:15 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 00LKaEwl076283; Tue, 21 Jan 2020 20:36:15 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <202001212036.00LKaEwl076283@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Tue, 21 Jan 2020 20:36:14 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r523738 - head/Mk/Scripts X-SVN-Group: ports-head X-SVN-Commit-Author: bdrewery X-SVN-Commit-Paths: head/Mk/Scripts X-SVN-Commit-Revision: 523738 X-SVN-Commit-Repository: ports 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.29 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: Tue, 21 Jan 2020 20:36:15 -0000 Author: bdrewery Date: Tue Jan 21 20:36:14 2020 New Revision: 523738 URL: https://svnweb.freebsd.org/changeset/ports/523738 Log: find(1) doesn't need a glob to search for patches. This change also avoids cmdline length errors and other subst parsing issues that were previously targeted. Sponsored by: DellEMC Modified: head/Mk/Scripts/smart_makepatch.sh Modified: head/Mk/Scripts/smart_makepatch.sh ============================================================================== --- head/Mk/Scripts/smart_makepatch.sh Tue Jan 21 19:57:24 2020 (r523737) +++ head/Mk/Scripts/smart_makepatch.sh Tue Jan 21 20:36:14 2020 (r523738) @@ -69,7 +69,7 @@ std_patch_filename() { patchdir_files_list() { if [ -d "${PATCHDIR}" ]; then (cd ${PATCHDIR} && \ - find ./* -type f -name "patch-*" -maxdepth 0 \ + find . -type f -name "patch-*" -maxdepth 0 \ 2>/dev/null | sed -e 's,^\./,,; /\.orig$/d' ) fi; @@ -186,7 +186,7 @@ regenerate_patches() { local ORIG local new_list new_list=$(cd "${PATCH_WRKSRC}" && \ - find -s ./* -type f -name '*.orig' 2>/dev/null) + find -s . -type f -name '*.orig' 2>/dev/null) (cd "${PATCH_WRKSRC}" && for F in ${new_list}; do ORIG=${F#./} NEW=${ORIG%.orig} @@ -216,7 +216,7 @@ stage_patches() { local P local name local patch_list - patch_list=$(cd ${REGENNED} && find ./* -name "patch-*" 2>/dev/null) + patch_list=$(cd ${REGENNED} && find . -name "patch-*" 2>/dev/null) for P in ${patch_list}; do P=${P#./} name=$(get_patch_name ${P})