MFC r289172,r290254:

r289172:

Refactor the test/ Makefiles after recent changes to bsd.test.mk (r289158) and
netbsd-tests.test.mk (r289151)

- Eliminate explicit OBJTOP/SRCTOP setting
- Convert all ad hoc NetBSD test integration over to netbsd-tests.test.mk
- Remove unnecessary TESTSDIR setting
- Use SRCTOP where possible for clarity

r290254:

Remove unused variable (SRCDIR)

MFC r272777,r272779,r272780,r272781,r272782,r272783,r272784,r272787,r272788:

r272777:

Integrate usr.sbin/nmtree/tests from NetBSD into atf/kyua

In collaboration with: pho
Sponsored by: EMC / Isilon Storage Division

r272779:

Integrate usr.sbin/basename/tests from NetBSD into atf/kyua

In collaboration with: pho
Sponsored by: EMC / Isilon Storage Division

r272780:

Integrate usr.bin/cmp/tests from NetBSD into atf/kyua

In collaboration with: sjg
Sponsored by: EMC / Isilon Storage Division

r272781:

Integrate usr.bin/dirname/tests from NetBSD into atf/kyua

In collaboration with: pho, sjg
Sponsored by: EMC / Isilon Storage Division

r272782:

Integrate bin/sleep/tests from NetBSD into atf/kyua

Sponsored by: EMC / Isilon Storage Division

r272783:

Integrate usr.bin/cut/tests from NetBSD into atf/kyua

Sponsored by: EMC / Isilon Storage Division

r272784:

Integrate usr.bin/grep/tests from NetBSD into atf/kyua

Sponsored by: EMC / Isilon Storage Division

r272787:

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

Sponsored by: EMC / Isilon Storage Division

r272788:

Integrate usr.bin/gzip/tests from NetBSD into atf/kyua

Sponsored by: EMC / Isilon Storage Division

Copy head (r256279) to stable/10 as part of the 10.0-RELEASE cycle.

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

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.

Change all our own code to use st_*tim instead of st_*timespec.

Also remove some local patches to diff(1) which are now unneeded.

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)

Fix build on arm: time_t on arm is 64 bits while long is
32 bits, so subsequent compile time assertion:

sizeof inf->stat.st_mtime <= sizeof sec

Would fail because of that. This change is suitable for
general consumption as well, but fix it in our local
patchset as we are near a code freeze.

Submitted by: cognet

Update build skeleton after diffutils 2.8.7 update.

Suggest the user to use 'diff -urN' instead of 'diff -crN'.

Submitted by: Jimmie James <jimmiejaz@gmail.com>
PR: docs/88427

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).

Add a section documenting the return values from diff.

PR: docs/59991
Submitted by: keramida,Erik Greenwald <erik@smluc.org>
MFC After: 1 week

Document -p option of diff.

PR: docs/41887
Submitted by: tobez

Add note about the info documentation of diff(1).
It contains a detailed description of the =format option part.

PR: docs/36464
Submitted by: Gary W. Swearingen <swear@blarg.net>

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$

Clarify that "-w" ignores horizontal white space changes.

Add an example for folks who can never remember how to generate a
recursive diff for use with send-pr(1).

PR: 12440
Requested by: David Kelly <dkelly@hiwaay.net>

Define PR_PROGRAM properly

Switch to contrib version

Add (unsigned char) cast to ctype macros

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.

Make this (hopefully) build now. There was no dir entry.

Pick collate info fo ranges

There's no -p flag to our diff.

Fix some argument ordering and redundancy bogons.

Correct the path used to invoke "pr" if the "-l" option to diff is
specified. Also invoke "pr" with "-F" instead of the invalid "-f"
option.

Obtained from: NetBSD-bugs mailing list (PR# 1896)

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

recording cvs-1.6 file death

Add setlocale LC_CTYPE

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

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

Merge in/out comflicts caused by Diffutils-2.7 import...

In future, it should be as easy as "update -j ....", but this time I had to
go over it by hand. Not nice..

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

Remove trailing whitespace.

Fixed non-conflict errors that occur when changes made to the local files are
the same as the changes made in the repository. This is often seen by
people with remote CVS trees that have applied their local patches to the
master site. a 'cvs update' will show bogus conflicts.

Obtained from: CVS mailing list, Stig<stig@inse.com>

In diffutils 2.6 and 2.7, diff3 -A complains about identical overlapping
changes. They're different from the ancestor but not from each other...
Why bother? The patch below fixes this nonsense and preserves [B]ackwards
compatiblity with the -B flag (also --show-bogus-conflicts).

Party on...
Stig

Use -lgnuregex

Update to GNU diffutils 2.6
(Forgot to cvs add them)

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 r67,
which included commits to RCS files with non-trunk default branches.