From: Douglas Silva Subject: Re: Upgrade net/syncthing to v2 To: Lydia Sobot Cc: ports@openbsd.org, "edd@openbsd.org" , "kn@openbsd.org" Date: Mon, 29 Dec 2025 21:40:01 +0000 One of the rejected patches, for example, only change those range numbers surrounded by @@. -@@ -549,7 +549,7 @@ func appendParameters(args []string, tags []string, pk +@@ -532,7 +532,7 @@ func appendParameters(args []string, tags []string, pk So I figured I could just edit the current file (the one without ".orig" or ".rej") using the ".rej" file merely as a reference of what needs to be done; then I could delete both of the extra files. It seems a bit error-prone, but I think it works :D On Monday, December 29th, 2025 at 18:17, Lydia Sobot wrote: > > > > > >I suppose I have to fix the ".rej" file and reapply it; but do you fix it with a text editor or by regenerating the patch with the `make update-patches` workflow? That's not clear to me. > > I'd assume you'd have to mv .orig and fix the patch file > > itself either with rediff(1) (from textproc/patchutils) or manually, > ditching the .rej file, however I'm not an expert either > > > Can you believe it's the first time I ever had to use patch(1) and diff(1)? I'll figure it out soon. > > There's a first time for everyone :)