Copy head@r302406 to stable/11 as part of the 11.0-RELEASE cycle.
Prune svn:mergeinfo from the new branch, as nothing has been merged
here.

Additional commits post-branch will follow.

Approved by: re (implicit)
Sponsored by: The FreeBSD Foundation

Install old texinfo pages in the form of mdoc(7) pages

Remove gnu/ info pages to unbreak the build with MK_GCC != no, etc

Reported by: Ivan Klymenko <fidaj@ukr.net>
Reviewed by: bapt
Differential Revision: D1412

Convert to LIBADD
Reduce overlinking

Integrate usr.bin/diff/tests from NetBSD into atf/kyua at gnu/usr.bin/diff/tests

Sponsored by: EMC / Isilon Storage Division

Adjust CFLAGS to pick up correct regex.h and posix/regex.h. Note this
actually reverts r250860 and r250861.

Reported by: gjb, tinderbox

Connect libgnuregex 2.17 to the build.

Don't look for headers outside of the source or object directories. In
particular, don't use DESTDIR. Such creates an unnecessary dependency
on the build machine.

Obtained from: Juniper Networks, Inc.

Catch up with the subversion conversion and apply these build-time patches.

POSIX patch(1) would treat -b as different meaning (the functionality
is to be provided by --suffix). Looking at the usage here in diffutils,
it seems that we can just get rid of the -b .orig stuff. This resolves
a problem that can triggered if we move toward to a more permissively
licensed patch(1) program.

style.Makefile(5)

Update build skeleton after diffutils 2.8.7 update.

Oops, use -I${DESTDIR}/usr/include/gnu instead of ... /../../include/gnu

Remove files no longer needed
Switch back to regex.h

Fixed style of DPADD and LDADD assignments as per style.Makefile(5).

s/dir.h/dir.c/

Style changes -- whitespace and sorting.

* Support the environtmental var "DIFF_OPTIONS". Which can hold a set of
default options for diff. These options are interpreted first and can be
overwritten by explicit command line parameters.
* Add the "-o" option to specify old-traditional output style.
* Add utility functions for env vars obtained from GNU Grep 2.3h.

$Id$ -> $FreeBSD$

Define PR_PROGRAM properly

Switch to contrib version

Revert $FreeBSD$ to $Id$

Make the long-awaited change from $Id$ to $FreeBSD$

This will make a number of things easier in the future, as well as (finally!)
avoiding the Id-smashing problem which has plagued developers for so long.

Boy, I'm glad we're not using sup anymore. This update would have been
insane otherwise.

Build and install diff.info..

As Bruce said, this is a little bogus, it'd be nice if bsd.prog.mk knew
about .texi in the same way as it does man pages..

Submitted by: bde

Use -lgnuregex

Updated to GNU diffutils 2.6

From: Larry Jones <scjones@thor.sdrc.com>
Subject: man pages for diff et al.

I finally got tired of not having man pages for diff and friends, so I
edited the appropriate sections of the texinfo manual into man format.

This commit was generated by cvs2svn to compensate for changes in r67,
which included commits to RCS files with non-trunk default branches.

GNU Diff 2.3