Date: Mon, 20 May 2019 13:04:03 +0000 (UTC) From: Mathieu Arnold <mat@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r502102 - head/Mk/Scripts Message-ID: <201905201304.x4KD433E011475@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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}"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201905201304.x4KD433E011475>