svn commit: r315051 - in head: . gnu/usr.bin gnu/usr.bin/diff usr.bin usr.bin/diff usr.bin/diff/tests

[Rodney W. Grimes]

> Author: bapt
> Date: Sat Mar 11 05:01:29 2017
> New Revision: 315051
> URL: https://svnweb.freebsd.org/changeset/base/315051
> 
> Log:
>   Import diff from OpenBSD and remove GNU diff
>   
>   Some of the modifications from the previous summer of code has been integrated
>   Modification for compatibility with GNU diff output has been added
>   
>   Main difference with OpenBSD:
>   Implement multiple GNU diff options:
>   * --ignore-file-name-case
>   * --no-ignore-file-name-case
>   * --normal
>   * --tabsize
>   * --strip-trailing-cr
>   Make diff -p compatible with GNU diff
>   Implement diff -l
>   Make diff -r compatible with GNU diff
>   
>   Capsicumize diffing 2 regular files
>   Add a simple test suite
>   
>   Approved by:	AsiaBSDcon devsummit
>   Obtained from:	OpenBSD, GSoC
>   Relnotes:	yes
...

> Added: head/usr.bin/diff/diff.1
> ==============================================================================
> --- /dev/null	00:00:00 1970	(empty, because file is newly added)
> +++ head/usr.bin/diff/diff.1	Sat Mar 11 05:01:29 2017	(r315051)
> @@ -0,0 +1,506 @@
> +.\" $OpenBSD: diff.1,v 1.47 2015/11/24 19:35:41 jmc Exp $
> +.\"
> +.\" Copyright (c) 1980, 1990, 1993
> +.\"	The Regents of the University of California.  All rights reserved.
> +.\"
> +.\" Redistribution and use in source and binary forms, with or without
> +.\" modification, are permitted provided that the following conditions
> +.\" are met:
> +.\" 1. Redistributions of source code must retain the above copyright
> +.\"    notice, this list of conditions and the following disclaimer.
> +.\" 2. Redistributions in binary form must reproduce the above copyright
> +.\"    notice, this list of conditions and the following disclaimer in the
> +.\"    documentation and/or other materials provided with the distribution.
> +.\" 3. Neither the name of the University nor the names of its contributors
> +.\"    may be used to endorse or promote products derived from this software
> +.\"    without specific prior written permission.
> +.\"
> +.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
> +.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
> +.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
> +.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
> +.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
> +.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
> +.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
> +.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
> +.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
> +.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
> +.\" SUCH DAMAGE.
> +.\"
> +.\"     @(#)diff.1	8.1 (Berkeley) 6/30/93
> +.\" $FreeBSD$
> +.\"
> +.Dd Septembr 03, 2017

Time warp?   6 months into the future.  September  miss spelled.

-- 
Rod Grimes                                                 rgrimes at freebsd.org