Thank you very much Stuart, Gonzalo and all other people for the help. For some reason, when I download the patch from Gmail, the file comes with ^M line breaks. After downloading the patch using curl from marc.info as Stuart did, the patch process works perfectly.
Sorry for all that noise! Update is ok here. Em qui., 28 de nov. de 2019 às 09:58, Stuart Henderson <s...@spacehopper.org> escreveu: > > On 2019/11/27 20:44, Adriano Barbosa wrote: > > Sorry for insisting, but I'm trying to figure out what I'm doing wrong. > > > > I update my ports tree with `cvs -qd > > anon...@anoncvs.usa.openbsd.org:/cvs up -Pd -rOPENBSD_6_6` > > I end up with Makefile with the following header: # $OpenBSD: > > Makefile,v 1.44.2.1 2019/10/29 07:27:41 gonzalo Exp $ > > Apply the diff you provided with `patch < /tmp/nextcloud-17.0.1.diff` > > while in /usr/ports/www/nextcloud directory > > I end up with the same errors: > > Either something strange is wrong with your tree, or with the patch you > have downloaded. > > > $ cd /usr/ports/www/nextcloud > $ acvs up -r OPENBSD_6_6 -Pd > [ no output; the tree is up to date and there are no local changes ] > $ curl -s 'https://marc.info/?l=openbsd-ports&m=157414828023645&q=p3' | patch > Hmm... Looks like a unified diff to me... > The text leading up to this was: > -------------------------- > |Index: Makefile > |=================================================================== > |RCS file: /cvs/ports/www/nextcloud/Makefile,v > |retrieving revision 1.45 > |diff -u -p -r1.45 Makefile > |--- Makefile 29 Oct 2019 07:24:03 -0000 1.45 > |+++ Makefile 19 Nov 2019 07:17:43 -0000 > -------------------------- > Patching file Makefile using Plan A... > Hunk #1 succeeded at 2. > Hmm... The next patch looks like a unified diff to me... > The text leading up to this was: > -------------------------- > |Index: distinfo > |=================================================================== > |RCS file: /cvs/ports/www/nextcloud/distinfo,v > |retrieving revision 1.29 > |diff -u -p -r1.29 distinfo > |--- distinfo 29 Oct 2019 07:24:03 -0000 1.29 > |+++ distinfo 19 Nov 2019 07:17:43 -0000 > -------------------------- > Patching file distinfo using Plan A... > Hunk #1 succeeded at 1. > Hmm... The next patch looks like a unified diff to me... > The text leading up to this was: > -------------------------- > |Index: pkg/PLIST > |=================================================================== > |RCS file: /cvs/ports/www/nextcloud/pkg/PLIST,v > |retrieving revision 1.32 > |diff -u -p -r1.32 PLIST > |--- pkg/PLIST 29 Oct 2019 07:24:03 -0000 1.32 > |+++ pkg/PLIST 19 Nov 2019 07:17:44 -0000 > -------------------------- > Patching file pkg/PLIST using Plan A... > Hunk #1 succeeded at 5393. > Hunk #2 succeeded at 5447. > Hunk #3 succeeded at 6208. > Hunk #4 succeeded at 9412. > Hunk #5 succeeded at 10085. > Hunk #6 succeeded at 10145. > Hunk #7 succeeded at 10193. > Hunk #8 succeeded at 10353. > Hunk #9 succeeded at 11142. > Hunk #10 succeeded at 12452. > Hunk #11 succeeded at 12486. > Hunk #12 succeeded at 13485. > Hunk #13 succeeded at 13969. > Hunk #14 succeeded at 14106. > Hunk #15 succeeded at 14309. > done -- Adriano Barbosa
