svn commit: r502102 - head/Mk/Scripts
Mathieu Arnold
mat at FreeBSD.org
Mon May 20 13:04:04 UTC 2019
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}"
More information about the svn-ports-all
mailing list