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

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.

Update build skeleton after diffutils 2.8.7 update.

Remove getopt*.c, we already have compatible getopt_long() in libc

$Id$ -> $FreeBSD$

Switch to contrib version

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.

Update diff, diff3, and sdiff's makefiles to use .PATH: instead of
copying the same files to multiple directories. This should make
things easier when it comes time to update to a newer version of
diffutils.

With this checkin, this brings the netbsd and freebsd diff dists
into sync.

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

GNU3 Diff 2.3