From owner-svn-ports-all@freebsd.org Mon May 20 13:04:04 2019 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5963B15ACCE1; Mon, 20 May 2019 13:04:04 +0000 (UTC) (envelope-from mat@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 EFAAA756CA; Mon, 20 May 2019 13:04:03 +0000 (UTC) (envelope-from mat@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 C9D8F1EA8D; Mon, 20 May 2019 13:04:03 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x4KD43kn011476; Mon, 20 May 2019 13:04:03 GMT (envelope-from mat@FreeBSD.org) Received: (from mat@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x4KD433E011475; Mon, 20 May 2019 13:04:03 GMT (envelope-from mat@FreeBSD.org) Message-Id: <201905201304.x4KD433E011475@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mat set sender to mat@FreeBSD.org using -f From: Mathieu Arnold Date: Mon, 20 May 2019 13:04:03 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r502102 - head/Mk/Scripts X-SVN-Group: ports-head X-SVN-Commit-Author: mat X-SVN-Commit-Paths: head/Mk/Scripts X-SVN-Commit-Revision: 502102 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: EFAAA756CA X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.96 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.97)[-0.965,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 20 May 2019 13:04:04 -0000 Author: mat Date: Mon May 20 13:04:03 2019 New Revision: 502102 URL: https://svnweb.freebsd.org/changeset/ports/502102 Log: Have makepatch ignore "C function prototype". This will reduce the churn when base system diff subtly changes what is put in that field. Modified: head/Mk/Scripts/smart_makepatch.sh (contents, props changed) Modified: head/Mk/Scripts/smart_makepatch.sh ============================================================================== --- head/Mk/Scripts/smart_makepatch.sh Mon May 20 12:52:42 2019 (r502101) +++ head/Mk/Scripts/smart_makepatch.sh Mon May 20 13:04:03 2019 (r502102) @@ -245,10 +245,10 @@ compare_common_patches() { cpatch=${DESTDIR}/${P} ppatch_stripped=$(mktemp -t portpatch) cpatch_stripped=$(mktemp -t portpatch) - egrep -v -- '--- .+ UTC$' ${ppatch} \ - > ${ppatch_stripped} - egrep -v -- '--- .+ UTC$' ${cpatch} \ - > ${cpatch_stripped} + sed -E -e '/^--- .+ UTC$/d; s/^(@@ [^@]* @@).*/\1/' \ + ${ppatch} > ${ppatch_stripped} + sed -E -e '/^--- .+ UTC$/d; s/^(@@ [^@]* @@).*/\1/' \ + ${cpatch} > ${cpatch_stripped} # Don't replace patches with only metadata changes if ! cmp -s ${ppatch_stripped} ${cpatch_stripped}; then archive_patch_list="${archive_patch_list} ${P}"