This kills both the generation and copying of $OpenBSD$ lines in update-patches.

Main question is: are we okay generatin patches starting with Index: or
do we want to leave an empty line (or something) reminding people to add
an actual comment 

(that's the first chunk of the patch)

Index: update-patches
===================================================================
RCS file: /cvs/ports/infrastructure/bin/update-patches,v
retrieving revision 1.21
diff -u -p -r1.21 update-patches
--- update-patches      9 Feb 2021 17:34:40 -0000       1.21
+++ update-patches      28 Feb 2022 18:00:37 -0000
@@ -206,12 +206,10 @@ sub create_patch
                        die "diff exited with an error";
                }
        }
-       my $comment = "!OpenBSD!\n";
-       $comment =~ tr/!/$/;
        may_fuzz_patch($stem, \@lines);
        return {stem => $stem, patch => \@lines, 
                filename => patch_name($stem),
-               comment => [$comment, "\n"] };
+               comment => [] };
 }
 
 sub parse_existing_patch
@@ -238,6 +236,7 @@ sub parse_existing_patch
                        }
                        last;
                }
+               next if $_ =~ m/^|^\$OpenBSD?/ and $. == 1;
                push(@comment, $_);
        }
        return {stem => $src, filename => $filename, 

Reply via email to