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

MFV ntp 4.2.8p1 (r258945, r275970, r276091, r276092, r276093, r278284)

Thanks to roberto for providing pointers to wedge this into HEAD.

Approved by: roberto

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

Complete ntptrace(8) removal:
- do not install man page
- update ObsoleteFiles.inc

Approved by: roberto@

Update the various files to sync with vendor import of 4.2.4p5.
sntp includes a copy of libopts in itself in vendor code, rewrite the
Makefile to compile and use only one copy. It is an internal library, not
installed.

MFC after: 2 weeks

- Update to ntp-4.2.0

PR: docs/79857
Submitted by: Tsurutani Naoki <turutani@scphys.kyoto-u.ac.jp>

Reimplementation of world/kernel build options. For details, see:

http://lists.freebsd.org/pipermail/freebsd-current/2006-March/061725.html

The src.conf(5) manpage is to follow in a few days.

Brought to you by: imp, jhb, kris, phk, ru (all bugs are mine)

If we don't want HTML docs, we might still want manpages.
If we don't want manpages, we might still want HTML docs.

Release maintainership. More ambitious minds have plans for the ntp
docs. Last I heard, Harlan Stenn was considering using FreeBSD's
pages as a starting point for the ISC NTP distribution's own pages.
If that happens, everyone wins and these can go away, to be replaced
by imported versions in contrib/ntp.

Update our ntpd to the long awaited 4.2.0 version.

This bring us several things:
- updated drivers
- IPv6 support at last
- ntp-genkeys is replaced by ntp-keygen
- ntptrace is now a script (courtesy of John Hay)
- lots of renamed files from .htm to .html (while I prefer .html, I
find the change a bit gratuitous)
- still no manpages :(

Please test and report.

Commit very much helped by: GNU arch (http://gnuarch.org/)

Update ntpd to 4.1.1a. This contains many bug fixes made on the STABLE
branch and a few new drivers. See contrib/ntp/ChangeLog for details.

Hide kernel header sys/lock.h from ntp [1]

PR: bin/33914
Submitted by: thomas, bde[1]
MFC after: 1 month

Install files via FILES.

Connect the new ntp-genkeys.8 page to the build.

- Backout botched attempt to introduce MANSECT feature.
- MAN[1-9] -> MAN.

Merge into the manual pages the changes from 4.0.99b:
ntpd.8:
add -gx to SYNOPSIS
clarify explanation of -g
ntp.conf.5:
add missing field description for rawstats lines

Install audio.htm, driver3[567].htm and qth.htm.

Add myself as ntp docs maintainer, with roberto's permission.

Abandon hope of keeping in line with the author's structure,
in favour of placing information in the correct sections.

The ntp_acc(8), ntp_auth(8), ntp_clock(8), ntp_conf(8),
ntp_misc(8) and ntp_mon(8) pages have been merged into
ntp.conf(5) and ntp.keys(5).

Requested by: rgrimes, wollman

Add selected manual pages transcribed from the HTML documentation.
Those pages which have not been transcribed are referenced as
gracefully as possible.

There is no perfect section for the ntp_* files, which document
configuration options for the NTP suite, so I'm putting them in
the same section as the pages for the utilities themselves.

Install ntp html docs as /usr/share/doc/ntp