On 2012-Oct-31, 15:25, Chris Rees wrote:
> On 31 Oct 2012 15:21, "Pietro Cerutti" <g...@freebsd.org> wrote:
> >
> > On 2012-Oct-31, 09:14, Joseph a Nagy Jr wrote:
> > > On 10/31/12 08:57, Pietro Cerutti wrote:
> > > > On 2012-Oct-31, 08:03, Joseph a Nagy Jr wrote:
> > > >> Hi All,
> > > >>
> > > >> I'd like to volunteer to maintain the tk85 port. I've already begun
> > > >> making updates to the Makefile[0] in a workbench directory and have a
> > > >> working update to it. All changes were due to feedback from portlint.
> > > >> Any and all feedback would be appreciated.
> > > >>
> > > >> [0]: http://pastebin.com/6DuzdAzv
> > > >
> > > > Ehm, your diff fails to apply here..
> > > >
> > >
> > > What's the issue?
> >
> > > patch < tk85.diff
> > Hmm...  Looks like a unified diff to me...
> > The text leading up to this was:
> > --------------------------
> > |--- Makefile.orig       2012-10-26 19:47:37.000000000 -0500
> > |+++ Makefile       2012-10-29 20:16:13.000000000 -0500
> > --------------------------
> > Patching file Makefile using Plan A...
> > Reversed (or previously applied) patch detected!  Assume -R? [y]
> > Hunk #1 succeeded at 1 with fuzz 2.
> > Hunk #2 failed at 12.
> > Hunk #3 failed at 42.
> > Hunk #4 failed at 61.
> > Hunk #5 failed at 423.
> > 4 out of 5 hunks failed--saving rejects to Makefile.rej
> > done
> >
> 
> Say no to -r detected; it's noticed the maintainer change.

> patch < tk85.diff
Hmm...  Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|--- Makefile.orig       2012-10-26 19:47:37.000000000 -0500
|+++ Makefile       2012-10-29 20:16:13.000000000 -0500
--------------------------
Patching file Makefile using Plan A...
Reversed (or previously applied) patch detected!  Assume -R? [y] n
Apply anyway? [n] y
Hunk #1 failed at 1.
Hunk #2 failed at 7.
Hunk #3 failed at 40.
Hunk #4 failed at 58.
Hunk #5 failed at 420.
5 out of 5 hunks failed--saving rejects to Makefile.rej
done

-- 
Pietro Cerutti
The FreeBSD Project
g...@freebsd.org

PGP Public Key:
http://gahr.ch/pgp

Attachment: pgp80x5kbhkEQ.pgp
Description: PGP signature

Reply via email to