Copy stable/11@r303970 to releng/11.0 as part of the 11.0-RELEASE
cycle.

Prune svn:mergeinfo from the new branch, and rename it to RC1.

Update __FreeBSD_version.

Use the quarterly branch for the default FreeBSD.conf pkg(8) repo and
the dvd1.iso packages population.

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

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

Cleanup unnecessary semicolons from utilities we all love.

Fix some mdoc(7) issues

Obtained from: DragonflyBSD

-C and -c allow at most one input file. Ensure this is the case when the
input files are specified through --files0-from.

Submitted by: tim@OpenBSD
Obtained from: OpenBSD
MFC after: 1 week

new depends

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

Remove custom getdelim(3) and fix a small memory leak.

Originally from Andre Smagin.

Obtained from: OpenBSD
MFC after: 1 week

sort(1): Cleanups and a small memory leak.

Remove useless check for leading blanks in the month name. The
code didn't adjust len after stripping blanks so even if a month
*did* start with a blank we'd end up copying garbage at the end.
Also convert a malloc + memcpy to strdup and fix a memory leak in
the wide char version if mbstowcs() fails.
Originally from Andre Smagin.

Obtained from: OpenBSD (CVS rev. 1.2, 1.3)
MFC after: 1 week

sort: style knits / cleanups.

Minor cleanups that got accidentally reverted.

Obtained from: OpenBSD

Revert (partial) r281123, r281125:
sort: style knits / cleanups.

Our style guide(9) specifies that in absence of local variables
an empty line must be inserted.

Pointed out by: eadler

sort: style knits / cleanups.

Obtained from: OpenBSD

sort: Fix a comment.

Obtained from: OpenBSD

sort: Cleanup small issues with spaces.

Obtained from: OpenBSD

mdoc: use An macro.

Convert to usr.bin/ to LIBADD
Reduce overlinking

Change LDFLAGS to LDADD in order to allow static builds. This is more
proper way to ensure that the command line compile works the way we intend.

Add explicity DPADD statemens on LIBMD and LIBPTHREAD depending on which
options are used in the build.

Reviewed by: andrew
MFC after: 2 weeks

Make sure to not skip any argument when converting from deprecated
+POS1, -POS2 to -kPOS1,POS2, so that sort +0n gets translated to sort -k1,1n
as it is expected

PR: 193994
Submitted by: rodrigo
MFC after: 3 days

Remove trailing '.' from See Also section.

MFC after: 3 days
Sponsored by: The FreeBSD Foundation

Use src.opts.mk in preference to bsd.own.mk except where we need stuff
from the latter.

Fix spelling error.

MFC after: 3 days

Various style(9) fixes and typos in grep, sort and patch.

MFC after: 3 days

Convert sort to using newer MK_ convention.

In usr.bin/sort/radixsort.c, pop_ls_mt() is only referenced if
SORT_THREADS is defined, so make the whole function conditional, instead
of just the pthread calls in it.

MFC after: 3 days

Fix header guards.

This was ready about the same time as r251862 so just make one final cleanup

Submitted by: dt71@gmx.com

Clean up -Wheader-guard warnings.

Submitted by: <dt71@gmx.com>
MFC after: 3 days
X-MFC with: r251848

- Update Oleg Moskalenko's email address

Requested by: Oleg Moskalenko <mom040267@gmail.com>

- Remove forgotten commented out debug code

Submitted by: Christoph Mallon <christoph.mallon@gmx.de>
Reviewed by: Oleg Moskalenko <oleg.moskalenko@citrix.com>

- Simplify and unify diagnostic and error message handling

Submitted by: Christoph Mallon <christoph.mallon@gmx.de>
Reviewed by: Oleg Moskalenko <oleg.moskalenko@citrix.com>

- Change the memory heuristics to an actually working one

Submitted by: Oleg Moskalenko <oleg.moskalenko@citrix.com>
Prodded by: kib

- Use unsigned int for values obtained with sysctlbyname(). This fixes
sparc64 performance problems.

Submitted by: Oleg Moskalenko <oleg.moskalenko@citrix.com>
Tested by: trasz

- Portability changes for ARM
- Allow larger sort memory on 64-bit platforms

Submitted by: Oleg Moskalenko <oleg.moskalenko@citrix.com>

More -Wmissing-variable-declarations fixes.

In addition to adding `static' where possible:

- bin/date: Move `retval' into extern.h to make it visible to date.c.
- bin/ed: Move globally used variables into ed.h.
- sbin/camcontrol: Move `verbose' into camcontrol.h and fix shadow warnings.
- usr.bin/calendar: Remove unneeded variables.
- usr.bin/chat: Make `line' local instead of global.
- usr.bin/elfdump: Comment out unneeded function.
- usr.bin/rlogin: Use _Noreturn instead of __dead2.
- usr.bin/tset: Pull `Ospeed' into extern.h.
- usr.sbin/mfiutil: Put global variables in mfiutil.h.
- usr.sbin/pkg: Remove unused `os_corres'.
- usr.sbin/quotaon, usr.sbin/repquota: Remove unused `qfname'.

Remove WARNS=6 lines.

WARNS=6 is already implied at this point.

- Remove GNU sort and the WITH_GNU_SORT knob

Remove trailing whitespace.

- Change --nthreads parameter to --parallel for GNU compatibility
- Change default sort method to mergesort, which has a better worst case
performance than qsort

Submitted by: Oleg Moskalenko <oleg.moskalenko@citrix.com>

- Switch to BSD sort as default sort. GNU sort will still be installed as
"gnusort". Most of the BSD sort development work was done by
Oleg Moskalenko <oleg.moskalenko@citrix.com>.
- GNU grep can be set to default by setting WITH_GNU_GREP. It will cause
BSD sort to be installed as "bsdsort".

Portbuild tested by: linimon

- Disable threaded sort by default
- Fix typo in the NLS support

- Remove the UNUSED_ARG macro and use __unused in argument lists

Reviewed by: dim
MFC after: 3 days

In usr.bin/sort, use another method of silencing warnings about unused
arguments, which does not trigger self-assignment warnings in certain
circumstances (for example, using clang with ccache).

MFC after: 3 days

mdoc: sort sections into conventional order.

- Only use multi-threading for large files
- Do not use mmap() by default; it can be enabled by --mmap
- Add some minor optimizations for -u
- Update manual page according to the changes

Submitted by: Oleg Moskalenko <oleg.moskalenko@citrix.com>

- Fix -o option that was broken by my clang compile fix

Submitted by: Oleg Moskalenko <oleg.moskalenko@citrix.com>

- Eliminate initializations if global variables. Compilers are not
required to optimize these so it may result in larger binary size.

Pointed out by: kib

- Update catalogs

- Fix build with clang

Add a BSD-licensed sort rewrite that was started by me and later completed
with the major functionality and optimizations by Oleg Moskalenko.
It is compatible with the latest version of POSIX and the current GNU sort
version that we have in base. Beside this, it implements all the
functionality introduced in later versions of GNU sort. For now, it will
be installed as "bsdsort", keeping GNU sort as the default sort
implementation.