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: 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 failed at 2. 1 out of 1 hunks failed--saving rejects to Makefile.rej 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 with fuzz 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 failed at 5393. Hunk #2 failed at 5447. Hunk #3 failed at 6208. Hunk #4 failed at 9412. Hunk #5 failed at 10085. Hunk #6 failed at 10145. Hunk #7 failed at 10193. Hunk #8 failed at 10353. Hunk #9 failed at 11142. Hunk #10 failed at 12452. Hunk #11 failed at 12486. Hunk #12 failed at 13485. Hunk #13 failed at 13969. Hunk #14 failed at 14106. Hunk #15 failed at 14309. 15 out of 15 hunks failed--saving rejects to pkg/PLIST.rej done
Em qua., 27 de nov. de 2019 às 14:55, Gonzalo L. Rodriguez <gonz...@x61.sh> escreveu: > > On Tue, 26 Nov 2019 at 18:17:31 -0300, Adriano Barbosa wrote: > > Yes, my ports tree is updated, but its *6.6* tree. So, my Makefile, for > > example, is on version 1.44.2.1. > > > > -- > > Adriano Barbosa > > sent from my Android, sorry for typos > > > > Em ter, 26 de nov de 2019 16:37, Gonzalo L. Rodriguez <gonz...@x61.sh> > > escreveu: > > > > > > > > > > > > On 24. Nov 2019, at 02:27, Adriano Barbosa <barbosa....@gmail.com> > > > wrote: > > > > > > > > Hi Gonzalo, > > > > I'm getting the follow while trying to `patch < > > > > /tmp/nextcloud-17.0.1.diff` on 6.6. > > > > Am I doing anything wrong? > > > > > > Hello, do you have your cvs tree updated? Should be a clear path. > > > > > > > Best > > > > > > > > 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 failed at 2. > > > > 1 out of 1 hunks failed--saving rejects to Makefile.rej > > > > 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 with fuzz 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 failed at 5393. > > > > Hunk #2 failed at 5447. > > > > Hunk #3 failed at 6208. > > > > Hunk #4 failed at 9412. > > > > Hunk #5 failed at 10085. > > > > Hunk #6 failed at 10145. > > > > Hunk #7 failed at 10193. > > > > Hunk #8 failed at 10353. > > > > Hunk #9 failed at 11142. > > > > Hunk #10 failed at 12452. > > > > Hunk #11 failed at 12486. > > > > Hunk #12 failed at 13485. > > > > Hunk #13 failed at 13969. > > > > Hunk #14 failed at 14106. > > > > Hunk #15 failed at 14309. > > > > 15 out of 15 hunks failed--saving rejects to pkg/PLIST.rej > > > > done > > > > > > > > > > > >> Em ter., 19 de nov. de 2019 às 04:32, Gonzalo L. Rodriguez > > > >> <gonz...@x61.sh> escreveu: > > > >> > > > >> Hello, > > > >> > > > >> Update for Nextcloud to 17.0.1: > > > >> > > > >> https://nextcloud.com/changelog/ > > > >> > > > >> OK? Comments? > > > >> > > > >> Cheers.- > > > >> > > > >> -- > > > >> > > > >> - gonzalo > > > > > > > > > > > > > > > > -- > > > > Adriano > > > > > > > > > > > > Yes, but your *6.6* looks like not updated, I just tried on: > > Sticky Tag: OPENBSD_6_6 (branch: 1.44.2) > > and it works without problems. > > I usually commit nextcloud to the last -release and -current. > > Cheers.- > > -- > > - gonzalo -- Adriano Barbosa
