Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 13 Jan 2014 16:19:10 +0000
From:      Jamie Landeg Jones <jamie@dyslexicfish.net>
To:        wblock@wonkity.com, jamie@dyslexicfish.net
Cc:        freebsd-doc@FreeBSD.org, FreeBSD-gnats-submit@FreeBSD.org
Subject:   Re: docs/184791: [patch] man page for 'diff3' references 'info diff' instead of 'info diff3'
Message-ID:  <201401131619.s0DGJAK0002718@catnip.dyslexicfish.net>
In-Reply-To: <alpine.BSF.2.00.1401051611190.7466@wonkity.com>
References:  <201312160621.rBG6LOZ1070718@catnip.dyslexicfish.net> <alpine.BSF.2.00.1312161428240.51221@wonkity.com> <20131217083511.GA7989@straylight.m.ringlet.net> <201401031525.s03FPj2v046272@catnip.dyslexicfish.net> <alpine.BSF.2.00.1401051320460.6170@wonkity.com> <201401052228.s05MSFd6005930@catnip.dyslexicfish.net> <alpine.BSF.2.00.1401051611190.7466@wonkity.com>

next in thread | previous in thread | raw e-mail | index | archive | help
Warren Block <wblock@wonkity.com> wrote:

> I looked a bit more.  We currently have a fairly old version of 
> diffutils, 2.8.7.  It's unlikely that newer versions will be imported 
> because they are GPL: https://wiki.freebsd.org/GPLinBase
>
> Instead, there is a project to import the OpenBSD versions:
> https://wiki.freebsd.org/SummerOfCode2012/JesseHagewood
> Current status is not clear.
>
> Given that, I don't see why we can't make interim changes to the GNU 
> versions present now.  (And I'm sorry I didn't look at that earlier.)

Ahhh ok. Better to always get fixes made upstream, but in this case,
as we are no longer tracking the stream, may as well make the change
until BSD diffs come into play!

Cheers for your help, and sorry that something so trivial has become
the biggest bikeshed ever.....

For what it's worth, I'm now much clearer on the way we deal with contrib
code.

Cheers, Jamie




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201401131619.s0DGJAK0002718>