- Copy stable/10 (r259064) to releng/10.0 as part of the
10.0-RELEASE cycle.
- Update __FreeBSD_version [1]
- Set branch name to -RC1

[1] 10.0-CURRENT __FreeBSD_version value ended at '55', so
start releng/10.0 at '100' so the branch is started with
a value ending in zero.

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

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

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

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

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

Remove unused FSF source files.

Approved by: re (hrs)

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

Update instructions about upgrading.

Add a list of removed files during import

Remove files that were taken off vendor branch. Difference
against vendor branch is now maintained in patchsets.

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

Localized regeneration of config.h.

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

Make diff(1) follow traditional UNIX SOP of later options nullify earlier
options that are mutually exclusive.

Remove files no longer needed
Switch back to regex.h

Terminate the execl() argument list with (char *)NULL instead of 0.
The later is wrong and may fail on sizeof(char *) != sizeof(int)
machines. The patch has already been sent to and accepted by the
diffutils author, but the file is already off the vendor branch, so
correct it here in the meanwhile too.

Add #include "diff.h" in order to get the prototype for xmalloc().
The corresponding warning has been ignored for ages:
prepend_args.c:75: warning: initialization makes pointer from integer
without a cast
This is fatal on ia64. You cannot convert an implicit int return from
an undeclared function to a pointer as you've lost the upper 32 bits.
On ia64, the warning is "pointer from different sized integer".

(This file is not vendor branched)

Add back the "\ No newline at end of file" marker that is printed when
comparing two files, where only one file is missing the final newline
character. This undoes revisions 1.3 and 1.4, returning 'diff' to how
it behaved before July 2000. We can do this now because our version of
'patch' was modified (just before 4.6-release) to understand what to do
with that line. This marker is the same one generated by 'diff' under
netbsd, openbsd, darwin, and linux (and any OS with "gnu-diff" installed).

Reviewed by: imp freebsd-standards (back in april)
Approved by: re (bmah)
MFC after: 1 week

Fix essential typo in usage

Submitted by: Cyrille Lefevre <cyrille.lefevre@laposte.net>

*sigh* Misfire. Backout previous commit, as it was meant for
another branch.

FreeBSD 4.4 doesn't have __FBSDID. Do it the old-fashioned way instead.

Reported by: Steven Farmer <steve@geoenergycorp.com>
Pointy hat to: nectar

= Fix temporary file handling.

Obtained from: Immunix Linux

= Garbage collect now-unused temporary file handling functions.
= Add __FBSDID.

Also coerce diff(1) into working the other way (from no-\n to \n).
Taking out the evil warning fixed it one way, but didn't make the
other way any better, so replace it with printing a single \n.

Get rid of the stupid bug where diff sticks trash in your generated
diff output; there being no trailing newline caused it to bitch and
moan and ruin diffs. That's dumb, if I may say so myself.

Yes, this file is coming off the vendor branch. It hasn't been
updated in 6 years.

Approved by: peter

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

Some FreeBSD files to add...

Temp remove config.h, was imported to FSF branch

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

-f -> -F for pr

Localize diff

Include <gnuregex.h> for FreeBSD

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