Hi Ian, Em qui., 28 de nov. de 2019 às 01:50, Ian McWilliam <i.mcwill...@westernsydney.edu.au> escreveu: > > > On Wed, 27 Nov 2019 20:44:30 -0300 > Adriano Barbosa <barbosa....@gmail.com> 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` > > Your trying to apply a patch destined for current against the 6.6-stable > ports tree.
It's supposed to work on updated 6.6 ports tree as stated by Gonzalo: https://marc.info/?l=openbsd-ports&m=157487738810755&w=2 > > > Ian McWilliam > ________________________________ > From: owner-po...@openbsd.org <owner-po...@openbsd.org> on behalf of George > Koehler <kern...@gmail.com> > Sent: Thursday, 28 November 2019 2:12 PM > To: Adriano Barbosa <barbosa....@gmail.com> > Cc: Gonzalo L. Rodriguez <gonz...@x61.sh>; ports@openbsd.org > <ports@openbsd.org> > Subject: Re: UPDATE: Nextcloud-17.0.1 > > On Wed, 27 Nov 2019 20:44:30 -0300 > Adriano Barbosa <barbosa....@gmail.com> 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: > > 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 > > This hunk would change the "V= 17.0.0" line to say "V= 17.0.1", but > failed to find the "V= 17.0.0" line. Your Makefile might differ from > the one in cvs, and these differences might conflict with the patch. > Try to revert your local modifications, then apply the patch again. > > You might have modifications if you patched nextcloud in the past, and > didn't undo the patch before cvs update. > > You can check for local modifications with > $ cd /usr/ports/www/nextcloud > $ cvs -nq up -Pd > > It might show lines like: > M Makefile > C distinfo > > Those files have 'M' local modification or 'C' conflict. To revert > them, you might rm(1) those files, then do another cvs update. > > -- > George Koehler <kern...@gmail.com> > -- Adriano Barbosa
