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

Merge ^/user/ngie/release-pkg-fix-tests to unbreak how test files are installed
after r298107

Summary of changes:

- Replace all instances of FILES/TESTS with ${PACKAGE}FILES. This ensures that
namespacing is kept with FILES appropriately, and that this shouldn't need
to be repeated if the namespace changes -- only the definition of PACKAGE
needs to be changed
- Allow PACKAGE to be overridden by callers instead of forcing it to always be
`tests`. In the event we get to the point where things can be split up
enough in the base system, it would make more sense to group the tests
with the blocks they're a part of, e.g. byacc with byacc-tests, etc
- Remove PACKAGE definitions where possible, i.e. where FILES wasn't used
previously.
- Remove unnecessary TESTSPACKAGE definitions; this has been elided into
bsd.tests.mk
- Remove unnecessary BINDIRs used previously with ${PACKAGE}FILES;
${PACKAGE}FILESDIR is now automatically defined in bsd.test.mk.
- Fix installation of files under data/ subdirectories in lib/libc/tests/hash
and lib/libc/tests/net/getaddrinfo
- Remove unnecessary .include <bsd.own.mk>s (some opportunistic cleanup)

Document the proposed changes in share/examples/tests/tests/... via examples
so it's clear that ${PACKAGES}FILES is the suggested way forward in terms of
replacing FILES. share/mk/bsd.README didn't seem like the appropriate method
of communicating that info.

MFC after: never probably
X-MFC with: r298107
PR: 209114
Relnotes: yes
Tested with: buildworld, installworld, checkworld; buildworld, packageworld
Sponsored by: EMC / Isilon Storage Division

Merge the projects/release-pkg branch to head.

This allows packaging the base system with pkg(8), including
but not limited to providing the ability to provide upstream
binary update possibilities for non-tier-1 architectures.

This merge is a requirement of the 11.0-RELEASE, and as such,
thank you to everyone that has tested the project branch.

Documentation in build(7) etc. is still somewhat sparse, but
updates to those parts will follow.

Sponsored by: The FreeBSD Foundation

DIRDEPS_BUILD: Connect MK_TESTS.

Sponsored by: EMC / Isilon Storage Division

META MODE: Update dependencies with 'the-lot' and add missing directories.

This is not properly respecting WITHOUT or ARCH dependencies in target/.
Doing so requires a massive effort to rework targets/ to do so. A
better approach will be to either include the SUBDIR Makefiles directly
and map to DIRDEPS or just dynamically lookup the SUBDIR. These lose
the benefit of having a userland/lib, userland/libexec, etc, though and
results in a massive package. The current implementation of targets/ is
very unmaintainable.

Currently rescue/rescue and sys/modules are still not connected.

Sponsored by: EMC / Isilon Storage Division

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

MFC after: 2 weeks
Sponsored by: EMC / Isilon Storage Divison

META_MODE: Remove DEP_MACHINE from Makefile.depend files.

This has not been needed since r246865 in projects/bmake.

Sponsored by: EMC / Isilon Storage Division

META_MODE: Remove DEP_RELDIR from Makefile.depend files.

This has not been needed since r284171 in projects/bmake.

Sponsored by: EMC / Isilon Storage Division

Add META_MODE support.

Off by default, build behaves normally.
WITH_META_MODE we get auto objdir creation, the ability to
start build from anywhere in the tree.

Still need to add real targets under targets/ to build packages.

Differential Revision: D2796
Reviewed by: brooks imp

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.

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.