Module Name: src
Committed By: nia
Date: Sat May 28 11:17:36 UTC 2022
Modified Files:
src/distrib/sets/lists/base: mi
src/distrib/sets/lists/debug: mi
src/distrib/sets/lists/etc: mi
src/distrib/sets/lists/man: mi
src/distrib/sets/lists/misc: mi
src/etc: Makefile
src/etc/rc.d: Makefile
src/external/bsd: Makefile
src/share/man/man5: mk.conf.5
src/share/mk: bsd.README bsd.own.mk
Log Message:
mk: Add MKNTP, MKTCPDUMP knobs.
To generate a diff of this commit:
cvs rdiff -u -r1.1302 -r1.1303 src/distrib/sets/lists/base/mi
cvs rdiff -u -r1.381 -r1.382 src/distrib/sets/lists/debug/mi
cvs rdiff -u -r1.267 -r1.268 src/distrib/sets/lists/etc/mi
cvs rdiff -u -r1.1743 -r1.1744 src/distrib/sets/lists/man/mi
cvs rdiff -u -r1.220 -r1.221 src/distrib/sets/lists/misc/mi
cvs rdiff -u -r1.460 -r1.461 src/etc/Makefile
cvs rdiff -u -r1.113 -r1.114 src/etc/rc.d/Makefile
cvs rdiff -u -r1.72 -r1.73 src/external/bsd/Makefile
cvs rdiff -u -r1.91 -r1.92 src/share/man/man5/mk.conf.5
cvs rdiff -u -r1.434 -r1.435 src/share/mk/bsd.README
cvs rdiff -u -r1.1280 -r1.1281 src/share/mk/bsd.own.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/base/mi
diff -u src/distrib/sets/lists/base/mi:1.1302 src/distrib/sets/lists/base/mi:1.1303
--- src/distrib/sets/lists/base/mi:1.1302 Fri May 27 07:28:21 2022
+++ src/distrib/sets/lists/base/mi Sat May 28 11:17:36 2022
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1302 2022/05/27 07:28:21 nia Exp $
+# $NetBSD: mi,v 1.1303 2022/05/28 11:17:36 nia Exp $
#
# Note: Don't delete entries from here - mark them as "obsolete" instead,
# unless otherwise stated below.
@@ -1626,14 +1626,14 @@
./usr/sbin/nslookup base-obsolete obsolete
./usr/sbin/nsquery base-obsolete obsolete
./usr/sbin/nstest base-obsolete obsolete
-./usr/sbin/ntp-keygen base-ntp-bin
-./usr/sbin/ntpd base-ntp-bin
-./usr/sbin/ntpdate base-ntp-bin
-./usr/sbin/ntpdc base-ntp-bin
-./usr/sbin/ntpq base-ntp-bin
-./usr/sbin/ntptime base-ntp-bin
+./usr/sbin/ntp-keygen base-ntp-bin ntp
+./usr/sbin/ntpd base-ntp-bin ntp
+./usr/sbin/ntpdate base-ntp-bin ntp
+./usr/sbin/ntpdc base-ntp-bin ntp
+./usr/sbin/ntpq base-ntp-bin ntp
+./usr/sbin/ntptime base-ntp-bin ntp
./usr/sbin/ntptimeset base-obsolete obsolete
-./usr/sbin/ntptrace base-ntp-bin
+./usr/sbin/ntptrace base-ntp-bin ntp
./usr/sbin/nvmmctl base-sysutil-bin nvmm
./usr/sbin/omshell base-dhcpd-bin dhcpd
./usr/sbin/opensnoop base-debug-bin dtrace
@@ -1747,7 +1747,7 @@
./usr/sbin/sliplogin base-slip-bin
./usr/sbin/slstats base-slip-bin
./usr/sbin/smrsh base-obsolete obsolete
-./usr/sbin/sntp base-ntp-bin
+./usr/sbin/sntp base-ntp-bin ntp
./usr/sbin/spamdb base-obsolete obsolete
./usr/sbin/spawn base-obsolete obsolete
./usr/sbin/spray base-rpcutil-bin
@@ -1770,7 +1770,7 @@
./usr/sbin/tcpdchk base-netutil-bin
./usr/sbin/tcpdmatch base-netutil-bin
./usr/sbin/tcpdrop base-netutil-bin
-./usr/sbin/tcpdump base-netutil-bin
+./usr/sbin/tcpdump base-netutil-bin tcpdump
./usr/sbin/tcsd base-tpm-bin tpm
./usr/sbin/timed base-timed-bin
./usr/sbin/timedc base-timed-bin
Index: src/distrib/sets/lists/debug/mi
diff -u src/distrib/sets/lists/debug/mi:1.381 src/distrib/sets/lists/debug/mi:1.382
--- src/distrib/sets/lists/debug/mi:1.381 Fri May 27 07:28:22 2022
+++ src/distrib/sets/lists/debug/mi Sat May 28 11:17:36 2022
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.381 2022/05/27 07:28:22 nia Exp $
+# $NetBSD: mi,v 1.382 2022/05/28 11:17:36 nia Exp $
./etc/mtree/set.debug comp-sys-root
./usr/lib comp-sys-usr compatdir
./usr/lib/i18n/libBIG5_g.a comp-c-debuglib debuglib,compatfile
@@ -1216,12 +1216,12 @@
./usr/libdata/debug/usr/sbin/nsd-control.debug comp-nsd-debug nsd
./usr/libdata/debug/usr/sbin/nsd.debug comp-nsd-debug nsd
./usr/libdata/debug/usr/sbin/nsec3hash.debug comp-bind-debug debug
-./usr/libdata/debug/usr/sbin/ntp-keygen.debug comp-ntp-debug debug
-./usr/libdata/debug/usr/sbin/ntpd.debug comp-ntp-debug debug
-./usr/libdata/debug/usr/sbin/ntpdate.debug comp-ntp-debug debug
-./usr/libdata/debug/usr/sbin/ntpdc.debug comp-ntp-debug debug
-./usr/libdata/debug/usr/sbin/ntpq.debug comp-ntp-debug debug
-./usr/libdata/debug/usr/sbin/ntptime.debug comp-ntp-debug debug
+./usr/libdata/debug/usr/sbin/ntp-keygen.debug comp-ntp-debug ntp,debug
+./usr/libdata/debug/usr/sbin/ntpd.debug comp-ntp-debug ntp,debug
+./usr/libdata/debug/usr/sbin/ntpdate.debug comp-ntp-debug ntp,debug
+./usr/libdata/debug/usr/sbin/ntpdc.debug comp-ntp-debug ntp,debug
+./usr/libdata/debug/usr/sbin/ntpq.debug comp-ntp-debug ntp,debug
+./usr/libdata/debug/usr/sbin/ntptime.debug comp-ntp-debug ntp,debug
./usr/libdata/debug/usr/sbin/nvmmctl.debug comp-sysutil-debug debug,nvmm
./usr/libdata/debug/usr/sbin/omshell.debug comp-dhcpd-debug debug,dhcpd
./usr/libdata/debug/usr/sbin/pac.debug comp-sysutil-debug debug
@@ -1315,7 +1315,7 @@
./usr/libdata/debug/usr/sbin/setencstat.debug comp-sysutil-debug debug
./usr/libdata/debug/usr/sbin/setobjstat.debug comp-sysutil-debug debug
./usr/libdata/debug/usr/sbin/sliplogin.debug comp-slip-debug debug
-./usr/libdata/debug/usr/sbin/sntp.debug comp-ntp-debug debug
+./usr/libdata/debug/usr/sbin/sntp.debug comp-ntp-debug ntp,debug
./usr/libdata/debug/usr/sbin/spray.debug comp-rpcutil-debug debug
./usr/libdata/debug/usr/sbin/srtconfig.debug comp-netutil-debug debug
./usr/libdata/debug/usr/sbin/sshd.debug comp-secsh-debug debug
@@ -1331,7 +1331,7 @@
./usr/libdata/debug/usr/sbin/tcpdchk.debug comp-netutil-debug debug
./usr/libdata/debug/usr/sbin/tcpdmatch.debug comp-netutil-debug debug
./usr/libdata/debug/usr/sbin/tcpdrop.debug comp-netutil-debug debug
-./usr/libdata/debug/usr/sbin/tcpdump.debug comp-netutil-debug debug
+./usr/libdata/debug/usr/sbin/tcpdump.debug comp-netutil-debug tcpdump,debug
./usr/libdata/debug/usr/sbin/tcsd.debug comp-tpm-debug tpm,debug
./usr/libdata/debug/usr/sbin/timed.debug comp-timed-debug debug
./usr/libdata/debug/usr/sbin/timedc.debug comp-timed-debug debug
Index: src/distrib/sets/lists/etc/mi
diff -u src/distrib/sets/lists/etc/mi:1.267 src/distrib/sets/lists/etc/mi:1.268
--- src/distrib/sets/lists/etc/mi:1.267 Wed May 25 21:25:46 2022
+++ src/distrib/sets/lists/etc/mi Sat May 28 11:17:36 2022
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.267 2022/05/25 21:25:46 nia Exp $
+# $NetBSD: mi,v 1.268 2022/05/28 11:17:36 nia Exp $
#
# Note: end-user configuration files that are moved to another location
# should not be marked "obsolete"; they should just be removed from
@@ -111,7 +111,7 @@
./etc/networks etc-net-etc
./etc/newsyslog.conf etc-sysutil-etc
./etc/nsswitch.conf etc-net-etc
-./etc/ntp.conf etc-ntp-etc
+./etc/ntp.conf etc-ntp-etc ntp
./etc/obsolete/base etc-obsolete obsolete
./etc/obsolete/comp etc-obsolete obsolete
./etc/obsolete/etc etc-obsolete obsolete
@@ -274,8 +274,8 @@
./etc/rc.d/npf_boot etc-npf-rc
./etc/rc.d/npfd etc-npf-rc
./etc/rc.d/nsd etc-nsd-rc nsd
-./etc/rc.d/ntpd etc-ntp-rc
-./etc/rc.d/ntpdate etc-ntp-rc
+./etc/rc.d/ntpd etc-ntp-rc ntp
+./etc/rc.d/ntpdate etc-ntp-rc ntp
./etc/rc.d/perusertmp etc-sys-rc
./etc/rc.d/pf etc-net-rc
./etc/rc.d/pf_boot etc-net-rc
Index: src/distrib/sets/lists/man/mi
diff -u src/distrib/sets/lists/man/mi:1.1743 src/distrib/sets/lists/man/mi:1.1744
--- src/distrib/sets/lists/man/mi:1.1743 Fri May 27 07:28:22 2022
+++ src/distrib/sets/lists/man/mi Sat May 28 11:17:36 2022
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1743 2022/05/27 07:28:22 nia Exp $
+# $NetBSD: mi,v 1.1744 2022/05/28 11:17:36 nia Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -543,7 +543,7 @@
./usr/share/man/cat1/sleep.0 man-util-catman .cat
./usr/share/man/cat1/slogin.0 man-secsh-catman .cat
./usr/share/man/cat1/smbutil.0 man-obsolete obsolete
-./usr/share/man/cat1/sntp.0 man-ntp-catman .cat
+./usr/share/man/cat1/sntp.0 man-ntp-catman ntp,.cat
./usr/share/man/cat1/sockstat.0 man-util-catman .cat
./usr/share/man/cat1/sort.0 man-util-catman .cat
./usr/share/man/cat1/sortinfo.0 man-texinfo-catman .cat
@@ -2277,8 +2277,8 @@
./usr/share/man/cat5/npf.conf.0 man-npf-catman .cat,npf
./usr/share/man/cat5/nsd.conf.0 man-nsd-catman .cat,nsd
./usr/share/man/cat5/nsswitch.conf.0 man-net-catman .cat
-./usr/share/man/cat5/ntp.conf.0 man-ntp-catman .cat
-./usr/share/man/cat5/ntp.keys.0 man-ntp-catman .cat
+./usr/share/man/cat5/ntp.conf.0 man-ntp-catman ntp,.cat
+./usr/share/man/cat5/ntp.keys.0 man-ntp-catman ntp,.cat
./usr/share/man/cat5/openssl.cnf.0 man-crypto-catman .cat
./usr/share/man/cat5/pam.conf.0 man-sys-catman pam,.cat
./usr/share/man/cat5/passwd.0 man-sys-catman .cat
@@ -2937,13 +2937,13 @@
./usr/share/man/cat8/nslookup.0 man-netutil-catman .cat
./usr/share/man/cat8/nsupdate.0 man-obsolete obsolete
./usr/share/man/cat8/ntalkd.0 man-netutil-catman .cat
-./usr/share/man/cat8/ntp-keygen.0 man-ntp-catman .cat
-./usr/share/man/cat8/ntpd.0 man-ntp-catman .cat
-./usr/share/man/cat8/ntpdate.0 man-ntp-catman .cat
-./usr/share/man/cat8/ntpdc.0 man-ntp-catman .cat
-./usr/share/man/cat8/ntpq.0 man-ntp-catman .cat
-./usr/share/man/cat8/ntptime.0 man-ntp-catman .cat
-./usr/share/man/cat8/ntptrace.0 man-ntp-catman .cat
+./usr/share/man/cat8/ntp-keygen.0 man-ntp-catman ntp,.cat
+./usr/share/man/cat8/ntpd.0 man-ntp-catman ntp,.cat
+./usr/share/man/cat8/ntpdate.0 man-ntp-catman ntp,.cat
+./usr/share/man/cat8/ntpdc.0 man-ntp-catman ntp,.cat
+./usr/share/man/cat8/ntpq.0 man-ntp-catman ntp,.cat
+./usr/share/man/cat8/ntptime.0 man-ntp-catman ntp,.cat
+./usr/share/man/cat8/ntptrace.0 man-ntp-catman ntp,.cat
./usr/share/man/cat8/nvmectl.0 man-sysutil-catman .cat
./usr/share/man/cat8/nvmmctl.0 man-sysutil-catman .cat
./usr/share/man/cat8/ofctl.0 man-sysutil-catman .cat
@@ -3216,7 +3216,7 @@
./usr/share/man/cat8/tcpdchk.0 man-netutil-catman .cat
./usr/share/man/cat8/tcpdmatch.0 man-netutil-catman .cat
./usr/share/man/cat8/tcpdrop.0 man-netutil-catman .cat
-./usr/share/man/cat8/tcpdump.0 man-netutil-catman .cat
+./usr/share/man/cat8/tcpdump.0 man-netutil-catman tcpdump,.cat
./usr/share/man/cat8/telnetd.0 man-netutil-catman .cat
./usr/share/man/cat8/tftp-proxy.0 man-pf-catman pf,.cat
./usr/share/man/cat8/tftpd.0 man-netutil-catman .cat
@@ -3860,7 +3860,7 @@
./usr/share/man/html1/sleep.html man-util-htmlman html
./usr/share/man/html1/slogin.html man-secsh-htmlman html
./usr/share/man/html1/smbutil.html man-obsolete obsolete
-./usr/share/man/html1/sntp.html man-ntp-htmlman html
+./usr/share/man/html1/sntp.html man-ntp-htmlman ntp,html
./usr/share/man/html1/sockstat.html man-util-htmlman html
./usr/share/man/html1/sort.html man-util-htmlman html
./usr/share/man/html1/sortinfo.html man-texinfo-htmlman html
@@ -5446,8 +5446,8 @@
./usr/share/man/html5/npf.conf.html man-npf-htmlman html,npf
./usr/share/man/html5/nsd.conf.html man-nsd-htmlman html,nsd
./usr/share/man/html5/nsswitch.conf.html man-net-htmlman html
-./usr/share/man/html5/ntp.conf.html man-ntp-htmlman html
-./usr/share/man/html5/ntp.keys.html man-ntp-htmlman html
+./usr/share/man/html5/ntp.conf.html man-ntp-htmlman ntp,html
+./usr/share/man/html5/ntp.keys.html man-ntp-htmlman ntp,html
./usr/share/man/html5/openssl.cnf.html man-crypto-htmlman html
./usr/share/man/html5/pam.conf.html man-sys-htmlman pam,html
./usr/share/man/html5/passwd.conf.html man-sys-htmlman html
@@ -5968,13 +5968,13 @@
./usr/share/man/html8/nslookup.html man-netutil-htmlman html
./usr/share/man/html8/nsupdate.html man-obsolete obsolete
./usr/share/man/html8/ntalkd.html man-netutil-htmlman html
-./usr/share/man/html8/ntp-keygen.html man-ntp-htmlman html
-./usr/share/man/html8/ntpd.html man-ntp-htmlman html
-./usr/share/man/html8/ntpdate.html man-ntp-htmlman html
-./usr/share/man/html8/ntpdc.html man-ntp-htmlman html
-./usr/share/man/html8/ntpq.html man-ntp-htmlman html
-./usr/share/man/html8/ntptime.html man-ntp-htmlman html
-./usr/share/man/html8/ntptrace.html man-ntp-htmlman html
+./usr/share/man/html8/ntp-keygen.html man-ntp-htmlman ntp,html
+./usr/share/man/html8/ntpd.html man-ntp-htmlman ntp,html
+./usr/share/man/html8/ntpdate.html man-ntp-htmlman ntp,html
+./usr/share/man/html8/ntpdc.html man-ntp-htmlman ntp,html
+./usr/share/man/html8/ntpq.html man-ntp-htmlman ntp,html
+./usr/share/man/html8/ntptime.html man-ntp-htmlman ntp,html
+./usr/share/man/html8/ntptrace.html man-ntp-htmlman ntp,html
./usr/share/man/html8/nvmectl.html man-sysutil-htmlman html
./usr/share/man/html8/nvmmctl.html man-sysutil-htmlman html
./usr/share/man/html8/ofctl.html man-sysutil-htmlman html
@@ -6188,7 +6188,7 @@
./usr/share/man/html8/tcpdchk.html man-netutil-htmlman html
./usr/share/man/html8/tcpdmatch.html man-netutil-htmlman html
./usr/share/man/html8/tcpdrop.html man-netutil-htmlman html
-./usr/share/man/html8/tcpdump.html man-netutil-htmlman html
+./usr/share/man/html8/tcpdump.html man-netutil-htmlman tcpdump,html
./usr/share/man/html8/telnetd.html man-netutil-htmlman html
./usr/share/man/html8/tftp-proxy.html man-pf-htmlman pf,html
./usr/share/man/html8/tftpd.html man-netutil-htmlman html
@@ -6829,7 +6829,7 @@
./usr/share/man/man1/sleep.1 man-util-man .man
./usr/share/man/man1/slogin.1 man-secsh-man .man
./usr/share/man/man1/smbutil.1 man-obsolete obsolete
-./usr/share/man/man1/sntp.1 man-ntp-man .man
+./usr/share/man/man1/sntp.1 man-ntp-man ntp,.man
./usr/share/man/man1/sockstat.1 man-util-man .man
./usr/share/man/man1/sort.1 man-util-man .man
./usr/share/man/man1/sortinfo.1 man-texinfo-man .man
@@ -8563,8 +8563,8 @@
./usr/share/man/man5/npf.conf.5 man-npf-man .man,npf
./usr/share/man/man5/nsd.conf.5 man-nsd-man .man,nsd
./usr/share/man/man5/nsswitch.conf.5 man-net-man .man
-./usr/share/man/man5/ntp.conf.5 man-ntp-man .man
-./usr/share/man/man5/ntp.keys.5 man-ntp-man .man
+./usr/share/man/man5/ntp.conf.5 man-ntp-man ntp,.man
+./usr/share/man/man5/ntp.keys.5 man-ntp-man ntp,.man
./usr/share/man/man5/openssl.cnf.5 man-crypto-man .man
./usr/share/man/man5/pam.conf.5 man-sys-man pam,.man
./usr/share/man/man5/passwd.5 man-sys-man .man
@@ -9223,13 +9223,13 @@
./usr/share/man/man8/nslookup.8 man-netutil-man .man
./usr/share/man/man8/nsupdate.8 man-obsolete obsolete
./usr/share/man/man8/ntalkd.8 man-netutil-man .man
-./usr/share/man/man8/ntp-keygen.8 man-ntp-man .man
-./usr/share/man/man8/ntpd.8 man-ntp-man .man
-./usr/share/man/man8/ntpdate.8 man-ntp-man .man
-./usr/share/man/man8/ntpdc.8 man-ntp-man .man
-./usr/share/man/man8/ntpq.8 man-ntp-man .man
-./usr/share/man/man8/ntptime.8 man-ntp-man .man
-./usr/share/man/man8/ntptrace.8 man-ntp-man .man
+./usr/share/man/man8/ntp-keygen.8 man-ntp-man ntp,.man
+./usr/share/man/man8/ntpd.8 man-ntp-man ntp,.man
+./usr/share/man/man8/ntpdate.8 man-ntp-man ntp,.man
+./usr/share/man/man8/ntpdc.8 man-ntp-man ntp,.man
+./usr/share/man/man8/ntpq.8 man-ntp-man ntp,.man
+./usr/share/man/man8/ntptime.8 man-ntp-man ntp,.man
+./usr/share/man/man8/ntptrace.8 man-ntp-man ntp,.man
./usr/share/man/man8/nvmectl.8 man-sysutil-man .man
./usr/share/man/man8/nvmmctl.8 man-sysutil-man .man
./usr/share/man/man8/ofctl.8 man-sysutil-man .man
@@ -9502,7 +9502,7 @@
./usr/share/man/man8/tcpdchk.8 man-netutil-man .man
./usr/share/man/man8/tcpdmatch.8 man-netutil-man .man
./usr/share/man/man8/tcpdrop.8 man-netutil-man .man
-./usr/share/man/man8/tcpdump.8 man-netutil-man .man
+./usr/share/man/man8/tcpdump.8 man-netutil-man tcpdump,.man
./usr/share/man/man8/telnetd.8 man-netutil-man .man
./usr/share/man/man8/tftp-proxy.8 man-pf-man pf,.man
./usr/share/man/man8/tftpd.8 man-netutil-man .man
Index: src/distrib/sets/lists/misc/mi
diff -u src/distrib/sets/lists/misc/mi:1.220 src/distrib/sets/lists/misc/mi:1.221
--- src/distrib/sets/lists/misc/mi:1.220 Wed May 25 20:44:01 2022
+++ src/distrib/sets/lists/misc/mi Sat May 28 11:17:36 2022
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.220 2022/05/25 20:44:01 nia Exp $
+# $NetBSD: mi,v 1.221 2022/05/28 11:17:36 nia Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -796,109 +796,109 @@
./usr/share/doc/reference/ref8/lpd/lpd2.png misc-smm-doc doc,html,groffhtmldoc
./usr/share/doc/reference/ref8/lpd/lpd3.png misc-smm-doc doc,html,groffhtmldoc
./usr/share/doc/reference/ref8/ntp misc-ntp-htmldoc
-./usr/share/doc/reference/ref8/ntp/accopt.html misc-ntp-htmldoc doc
-./usr/share/doc/reference/ref8/ntp/assoc.html misc-ntp-htmldoc doc
-./usr/share/doc/reference/ref8/ntp/audio.html misc-ntp-htmldoc doc
-./usr/share/doc/reference/ref8/ntp/authopt.html misc-ntp-htmldoc doc
-./usr/share/doc/reference/ref8/ntp/bugs.html misc-ntp-htmldoc doc
-./usr/share/doc/reference/ref8/ntp/build.html misc-ntp-htmldoc doc
-./usr/share/doc/reference/ref8/ntp/clockopt.html misc-ntp-htmldoc doc
-./usr/share/doc/reference/ref8/ntp/comdex.html misc-ntp-htmldoc doc
-./usr/share/doc/reference/ref8/ntp/config.html misc-ntp-htmldoc doc
-./usr/share/doc/reference/ref8/ntp/confopt.html misc-ntp-htmldoc doc
-./usr/share/doc/reference/ref8/ntp/copyright.html misc-ntp-htmldoc doc
-./usr/share/doc/reference/ref8/ntp/debug.html misc-ntp-htmldoc doc
-./usr/share/doc/reference/ref8/ntp/decode.html misc-ntp-htmldoc doc
+./usr/share/doc/reference/ref8/ntp/accopt.html misc-ntp-htmldoc doc,ntp
+./usr/share/doc/reference/ref8/ntp/assoc.html misc-ntp-htmldoc doc,ntp
+./usr/share/doc/reference/ref8/ntp/audio.html misc-ntp-htmldoc doc,ntp
+./usr/share/doc/reference/ref8/ntp/authopt.html misc-ntp-htmldoc doc,ntp
+./usr/share/doc/reference/ref8/ntp/bugs.html misc-ntp-htmldoc doc,ntp
+./usr/share/doc/reference/ref8/ntp/build.html misc-ntp-htmldoc doc,ntp
+./usr/share/doc/reference/ref8/ntp/clockopt.html misc-ntp-htmldoc doc,ntp
+./usr/share/doc/reference/ref8/ntp/comdex.html misc-ntp-htmldoc doc,ntp
+./usr/share/doc/reference/ref8/ntp/config.html misc-ntp-htmldoc doc,ntp
+./usr/share/doc/reference/ref8/ntp/confopt.html misc-ntp-htmldoc doc,ntp
+./usr/share/doc/reference/ref8/ntp/copyright.html misc-ntp-htmldoc doc,ntp
+./usr/share/doc/reference/ref8/ntp/debug.html misc-ntp-htmldoc doc,ntp
+./usr/share/doc/reference/ref8/ntp/decode.html misc-ntp-htmldoc doc,ntp
./usr/share/doc/reference/ref8/ntp/drivers misc-ntp-htmldoc
-./usr/share/doc/reference/ref8/ntp/drivers/driver1.html misc-ntp-htmldoc doc
-./usr/share/doc/reference/ref8/ntp/drivers/driver10.html misc-ntp-htmldoc doc
-./usr/share/doc/reference/ref8/ntp/drivers/driver11.html misc-ntp-htmldoc doc
-./usr/share/doc/reference/ref8/ntp/drivers/driver12.html misc-ntp-htmldoc doc
-./usr/share/doc/reference/ref8/ntp/drivers/driver16.html misc-ntp-htmldoc doc
-./usr/share/doc/reference/ref8/ntp/drivers/driver18.html misc-ntp-htmldoc doc
-./usr/share/doc/reference/ref8/ntp/drivers/driver19.html misc-ntp-htmldoc doc
-./usr/share/doc/reference/ref8/ntp/drivers/driver20.html misc-ntp-htmldoc doc
-./usr/share/doc/reference/ref8/ntp/drivers/driver22.html misc-ntp-htmldoc doc
-./usr/share/doc/reference/ref8/ntp/drivers/driver26.html misc-ntp-htmldoc doc
-./usr/share/doc/reference/ref8/ntp/drivers/driver27.html misc-ntp-htmldoc doc
-./usr/share/doc/reference/ref8/ntp/drivers/driver28.html misc-ntp-htmldoc doc
-./usr/share/doc/reference/ref8/ntp/drivers/driver29.html misc-ntp-htmldoc doc
-./usr/share/doc/reference/ref8/ntp/drivers/driver3.html misc-ntp-htmldoc doc
-./usr/share/doc/reference/ref8/ntp/drivers/driver30.html misc-ntp-htmldoc doc
-./usr/share/doc/reference/ref8/ntp/drivers/driver31.html misc-ntp-htmldoc doc
-./usr/share/doc/reference/ref8/ntp/drivers/driver32.html misc-ntp-htmldoc doc
-./usr/share/doc/reference/ref8/ntp/drivers/driver33.html misc-ntp-htmldoc doc
-./usr/share/doc/reference/ref8/ntp/drivers/driver34.html misc-ntp-htmldoc doc
-./usr/share/doc/reference/ref8/ntp/drivers/driver35.html misc-ntp-htmldoc doc
-./usr/share/doc/reference/ref8/ntp/drivers/driver36.html misc-ntp-htmldoc doc
-./usr/share/doc/reference/ref8/ntp/drivers/driver37.html misc-ntp-htmldoc doc
-./usr/share/doc/reference/ref8/ntp/drivers/driver38.html misc-ntp-htmldoc doc
-./usr/share/doc/reference/ref8/ntp/drivers/driver39.html misc-ntp-htmldoc doc
-./usr/share/doc/reference/ref8/ntp/drivers/driver4.html misc-ntp-htmldoc doc
-./usr/share/doc/reference/ref8/ntp/drivers/driver40.html misc-ntp-htmldoc doc
-./usr/share/doc/reference/ref8/ntp/drivers/driver42.html misc-ntp-htmldoc doc
-./usr/share/doc/reference/ref8/ntp/drivers/driver43.html misc-ntp-htmldoc doc
-./usr/share/doc/reference/ref8/ntp/drivers/driver44.html misc-ntp-htmldoc doc
-./usr/share/doc/reference/ref8/ntp/drivers/driver5.html misc-ntp-htmldoc doc
-./usr/share/doc/reference/ref8/ntp/drivers/driver6.html misc-ntp-htmldoc doc
-./usr/share/doc/reference/ref8/ntp/drivers/driver7.html misc-ntp-htmldoc doc
-./usr/share/doc/reference/ref8/ntp/drivers/driver8.html misc-ntp-htmldoc doc
-./usr/share/doc/reference/ref8/ntp/drivers/driver9.html misc-ntp-htmldoc doc
-./usr/share/doc/reference/ref8/ntp/drivers/mx4200data.html misc-ntp-htmldoc doc
-./usr/share/doc/reference/ref8/ntp/drivers/oncore-shmem.html misc-ntp-htmldoc doc
+./usr/share/doc/reference/ref8/ntp/drivers/driver1.html misc-ntp-htmldoc doc,ntp
+./usr/share/doc/reference/ref8/ntp/drivers/driver10.html misc-ntp-htmldoc doc,ntp
+./usr/share/doc/reference/ref8/ntp/drivers/driver11.html misc-ntp-htmldoc doc,ntp
+./usr/share/doc/reference/ref8/ntp/drivers/driver12.html misc-ntp-htmldoc doc,ntp
+./usr/share/doc/reference/ref8/ntp/drivers/driver16.html misc-ntp-htmldoc doc,ntp
+./usr/share/doc/reference/ref8/ntp/drivers/driver18.html misc-ntp-htmldoc doc,ntp
+./usr/share/doc/reference/ref8/ntp/drivers/driver19.html misc-ntp-htmldoc doc,ntp
+./usr/share/doc/reference/ref8/ntp/drivers/driver20.html misc-ntp-htmldoc doc,ntp
+./usr/share/doc/reference/ref8/ntp/drivers/driver22.html misc-ntp-htmldoc doc,ntp
+./usr/share/doc/reference/ref8/ntp/drivers/driver26.html misc-ntp-htmldoc doc,ntp
+./usr/share/doc/reference/ref8/ntp/drivers/driver27.html misc-ntp-htmldoc doc,ntp
+./usr/share/doc/reference/ref8/ntp/drivers/driver28.html misc-ntp-htmldoc doc,ntp
+./usr/share/doc/reference/ref8/ntp/drivers/driver29.html misc-ntp-htmldoc doc,ntp
+./usr/share/doc/reference/ref8/ntp/drivers/driver3.html misc-ntp-htmldoc doc,ntp
+./usr/share/doc/reference/ref8/ntp/drivers/driver30.html misc-ntp-htmldoc doc,ntp
+./usr/share/doc/reference/ref8/ntp/drivers/driver31.html misc-ntp-htmldoc doc,ntp
+./usr/share/doc/reference/ref8/ntp/drivers/driver32.html misc-ntp-htmldoc doc,ntp
+./usr/share/doc/reference/ref8/ntp/drivers/driver33.html misc-ntp-htmldoc doc,ntp
+./usr/share/doc/reference/ref8/ntp/drivers/driver34.html misc-ntp-htmldoc doc,ntp
+./usr/share/doc/reference/ref8/ntp/drivers/driver35.html misc-ntp-htmldoc doc,ntp
+./usr/share/doc/reference/ref8/ntp/drivers/driver36.html misc-ntp-htmldoc doc,ntp
+./usr/share/doc/reference/ref8/ntp/drivers/driver37.html misc-ntp-htmldoc doc,ntp
+./usr/share/doc/reference/ref8/ntp/drivers/driver38.html misc-ntp-htmldoc doc,ntp
+./usr/share/doc/reference/ref8/ntp/drivers/driver39.html misc-ntp-htmldoc doc,ntp
+./usr/share/doc/reference/ref8/ntp/drivers/driver4.html misc-ntp-htmldoc doc,ntp
+./usr/share/doc/reference/ref8/ntp/drivers/driver40.html misc-ntp-htmldoc doc,ntp
+./usr/share/doc/reference/ref8/ntp/drivers/driver42.html misc-ntp-htmldoc doc,ntp
+./usr/share/doc/reference/ref8/ntp/drivers/driver43.html misc-ntp-htmldoc doc,ntp
+./usr/share/doc/reference/ref8/ntp/drivers/driver44.html misc-ntp-htmldoc doc,ntp
+./usr/share/doc/reference/ref8/ntp/drivers/driver5.html misc-ntp-htmldoc doc,ntp
+./usr/share/doc/reference/ref8/ntp/drivers/driver6.html misc-ntp-htmldoc doc,ntp
+./usr/share/doc/reference/ref8/ntp/drivers/driver7.html misc-ntp-htmldoc doc,ntp
+./usr/share/doc/reference/ref8/ntp/drivers/driver8.html misc-ntp-htmldoc doc,ntp
+./usr/share/doc/reference/ref8/ntp/drivers/driver9.html misc-ntp-htmldoc doc,ntp
+./usr/share/doc/reference/ref8/ntp/drivers/mx4200data.html misc-ntp-htmldoc doc,ntp
+./usr/share/doc/reference/ref8/ntp/drivers/oncore-shmem.html misc-ntp-htmldoc doc,ntp
./usr/share/doc/reference/ref8/ntp/drivers/scripts misc-ntp-htmldoc
-./usr/share/doc/reference/ref8/ntp/drivers/scripts/footer.txt misc-ntp-htmldoc doc
-./usr/share/doc/reference/ref8/ntp/drivers/scripts/style.css misc-ntp-htmldoc doc
-./usr/share/doc/reference/ref8/ntp/drivers/tf582_4.html misc-ntp-htmldoc doc
-./usr/share/doc/reference/ref8/ntp/extern.html misc-ntp-htmldoc doc
-./usr/share/doc/reference/ref8/ntp/hints.html misc-ntp-htmldoc doc
-./usr/share/doc/reference/ref8/ntp/howto.html misc-ntp-htmldoc doc
-./usr/share/doc/reference/ref8/ntp/index.html misc-ntp-htmldoc doc
-./usr/share/doc/reference/ref8/ntp/kern.html misc-ntp-htmldoc doc
-./usr/share/doc/reference/ref8/ntp/kernpps.html misc-ntp-htmldoc doc
-./usr/share/doc/reference/ref8/ntp/keygen.html misc-ntp-htmldoc doc
-./usr/share/doc/reference/ref8/ntp/miscopt.html misc-ntp-htmldoc doc
-./usr/share/doc/reference/ref8/ntp/monopt.html misc-ntp-htmldoc doc
-./usr/share/doc/reference/ref8/ntp/msyslog.html misc-ntp-htmldoc doc
-./usr/share/doc/reference/ref8/ntp/ntp_conf.html misc-ntp-htmldoc doc
-./usr/share/doc/reference/ref8/ntp/ntpd.html misc-ntp-htmldoc doc
-./usr/share/doc/reference/ref8/ntp/ntpdate.html misc-ntp-htmldoc doc
-./usr/share/doc/reference/ref8/ntp/ntpdc.html misc-ntp-htmldoc doc
-./usr/share/doc/reference/ref8/ntp/ntpdsim.html misc-ntp-htmldoc doc
-./usr/share/doc/reference/ref8/ntp/ntpdsim_new.html misc-ntp-htmldoc doc
-./usr/share/doc/reference/ref8/ntp/ntpq.html misc-ntp-htmldoc doc
-./usr/share/doc/reference/ref8/ntp/ntptime.html misc-ntp-htmldoc doc
-./usr/share/doc/reference/ref8/ntp/ntptrace.html misc-ntp-htmldoc doc
-./usr/share/doc/reference/ref8/ntp/parsedata.html misc-ntp-htmldoc doc
-./usr/share/doc/reference/ref8/ntp/parsenew.html misc-ntp-htmldoc doc
-./usr/share/doc/reference/ref8/ntp/pps.html misc-ntp-htmldoc doc
-./usr/share/doc/reference/ref8/ntp/prefer.html misc-ntp-htmldoc doc
-./usr/share/doc/reference/ref8/ntp/quick.html misc-ntp-htmldoc doc
-./usr/share/doc/reference/ref8/ntp/rate.html misc-ntp-htmldoc doc
-./usr/share/doc/reference/ref8/ntp/rdebug.html misc-ntp-htmldoc doc
-./usr/share/doc/reference/ref8/ntp/refclock.html misc-ntp-htmldoc doc
-./usr/share/doc/reference/ref8/ntp/release.html misc-ntp-htmldoc doc
+./usr/share/doc/reference/ref8/ntp/drivers/scripts/footer.txt misc-ntp-htmldoc doc,ntp
+./usr/share/doc/reference/ref8/ntp/drivers/scripts/style.css misc-ntp-htmldoc doc,ntp
+./usr/share/doc/reference/ref8/ntp/drivers/tf582_4.html misc-ntp-htmldoc doc,ntp
+./usr/share/doc/reference/ref8/ntp/extern.html misc-ntp-htmldoc doc,ntp
+./usr/share/doc/reference/ref8/ntp/hints.html misc-ntp-htmldoc doc,ntp
+./usr/share/doc/reference/ref8/ntp/howto.html misc-ntp-htmldoc doc,ntp
+./usr/share/doc/reference/ref8/ntp/index.html misc-ntp-htmldoc doc,ntp
+./usr/share/doc/reference/ref8/ntp/kern.html misc-ntp-htmldoc doc,ntp
+./usr/share/doc/reference/ref8/ntp/kernpps.html misc-ntp-htmldoc doc,ntp
+./usr/share/doc/reference/ref8/ntp/keygen.html misc-ntp-htmldoc doc,ntp
+./usr/share/doc/reference/ref8/ntp/miscopt.html misc-ntp-htmldoc doc,ntp
+./usr/share/doc/reference/ref8/ntp/monopt.html misc-ntp-htmldoc doc,ntp
+./usr/share/doc/reference/ref8/ntp/msyslog.html misc-ntp-htmldoc doc,ntp
+./usr/share/doc/reference/ref8/ntp/ntp_conf.html misc-ntp-htmldoc doc,ntp
+./usr/share/doc/reference/ref8/ntp/ntpd.html misc-ntp-htmldoc doc,ntp
+./usr/share/doc/reference/ref8/ntp/ntpdate.html misc-ntp-htmldoc doc,ntp
+./usr/share/doc/reference/ref8/ntp/ntpdc.html misc-ntp-htmldoc doc,ntp
+./usr/share/doc/reference/ref8/ntp/ntpdsim.html misc-ntp-htmldoc doc,ntp
+./usr/share/doc/reference/ref8/ntp/ntpdsim_new.html misc-ntp-htmldoc doc,ntp
+./usr/share/doc/reference/ref8/ntp/ntpq.html misc-ntp-htmldoc doc,ntp
+./usr/share/doc/reference/ref8/ntp/ntptime.html misc-ntp-htmldoc doc,ntp
+./usr/share/doc/reference/ref8/ntp/ntptrace.html misc-ntp-htmldoc doc,ntp
+./usr/share/doc/reference/ref8/ntp/parsedata.html misc-ntp-htmldoc doc,ntp
+./usr/share/doc/reference/ref8/ntp/parsenew.html misc-ntp-htmldoc doc,ntp
+./usr/share/doc/reference/ref8/ntp/pps.html misc-ntp-htmldoc doc,ntp
+./usr/share/doc/reference/ref8/ntp/prefer.html misc-ntp-htmldoc doc,ntp
+./usr/share/doc/reference/ref8/ntp/quick.html misc-ntp-htmldoc doc,ntp
+./usr/share/doc/reference/ref8/ntp/rate.html misc-ntp-htmldoc doc,ntp
+./usr/share/doc/reference/ref8/ntp/rdebug.html misc-ntp-htmldoc doc,ntp
+./usr/share/doc/reference/ref8/ntp/refclock.html misc-ntp-htmldoc doc,ntp
+./usr/share/doc/reference/ref8/ntp/release.html misc-ntp-htmldoc doc,ntp
./usr/share/doc/reference/ref8/ntp/scripts misc-ntp-htmldoc
-./usr/share/doc/reference/ref8/ntp/scripts/accopt.txt misc-ntp-htmldoc doc
-./usr/share/doc/reference/ref8/ntp/scripts/audio.txt misc-ntp-htmldoc doc
-./usr/share/doc/reference/ref8/ntp/scripts/authopt.txt misc-ntp-htmldoc doc
-./usr/share/doc/reference/ref8/ntp/scripts/clockopt.txt misc-ntp-htmldoc doc
-./usr/share/doc/reference/ref8/ntp/scripts/command.txt misc-ntp-htmldoc doc
-./usr/share/doc/reference/ref8/ntp/scripts/config.txt misc-ntp-htmldoc doc
-./usr/share/doc/reference/ref8/ntp/scripts/confopt.txt misc-ntp-htmldoc doc
-./usr/share/doc/reference/ref8/ntp/scripts/external.txt misc-ntp-htmldoc doc
-./usr/share/doc/reference/ref8/ntp/scripts/footer.txt misc-ntp-htmldoc doc
-./usr/share/doc/reference/ref8/ntp/scripts/install.txt misc-ntp-htmldoc doc
-./usr/share/doc/reference/ref8/ntp/scripts/manual.txt misc-ntp-htmldoc doc
-./usr/share/doc/reference/ref8/ntp/scripts/misc.txt misc-ntp-htmldoc doc
-./usr/share/doc/reference/ref8/ntp/scripts/miscopt.txt misc-ntp-htmldoc doc
-./usr/share/doc/reference/ref8/ntp/scripts/monopt.txt misc-ntp-htmldoc doc
-./usr/share/doc/reference/ref8/ntp/scripts/refclock.txt misc-ntp-htmldoc doc
-./usr/share/doc/reference/ref8/ntp/scripts/style.css misc-ntp-htmldoc doc
-./usr/share/doc/reference/ref8/ntp/sitemap.html misc-ntp-htmldoc doc
-./usr/share/doc/reference/ref8/ntp/sntp.html misc-ntp-htmldoc doc
-./usr/share/doc/reference/ref8/ntp/tickadj.html misc-ntp-htmldoc doc
-./usr/share/doc/reference/ref8/ntp/xleave.html misc-ntp-htmldoc doc
+./usr/share/doc/reference/ref8/ntp/scripts/accopt.txt misc-ntp-htmldoc doc,ntp
+./usr/share/doc/reference/ref8/ntp/scripts/audio.txt misc-ntp-htmldoc doc,ntp
+./usr/share/doc/reference/ref8/ntp/scripts/authopt.txt misc-ntp-htmldoc doc,ntp
+./usr/share/doc/reference/ref8/ntp/scripts/clockopt.txt misc-ntp-htmldoc doc,ntp
+./usr/share/doc/reference/ref8/ntp/scripts/command.txt misc-ntp-htmldoc doc,ntp
+./usr/share/doc/reference/ref8/ntp/scripts/config.txt misc-ntp-htmldoc doc,ntp
+./usr/share/doc/reference/ref8/ntp/scripts/confopt.txt misc-ntp-htmldoc doc,ntp
+./usr/share/doc/reference/ref8/ntp/scripts/external.txt misc-ntp-htmldoc doc,ntp
+./usr/share/doc/reference/ref8/ntp/scripts/footer.txt misc-ntp-htmldoc doc,ntp
+./usr/share/doc/reference/ref8/ntp/scripts/install.txt misc-ntp-htmldoc doc,ntp
+./usr/share/doc/reference/ref8/ntp/scripts/manual.txt misc-ntp-htmldoc doc,ntp
+./usr/share/doc/reference/ref8/ntp/scripts/misc.txt misc-ntp-htmldoc doc,ntp
+./usr/share/doc/reference/ref8/ntp/scripts/miscopt.txt misc-ntp-htmldoc doc,ntp
+./usr/share/doc/reference/ref8/ntp/scripts/monopt.txt misc-ntp-htmldoc doc,ntp
+./usr/share/doc/reference/ref8/ntp/scripts/refclock.txt misc-ntp-htmldoc doc,ntp
+./usr/share/doc/reference/ref8/ntp/scripts/style.css misc-ntp-htmldoc doc,ntp
+./usr/share/doc/reference/ref8/ntp/sitemap.html misc-ntp-htmldoc doc,ntp
+./usr/share/doc/reference/ref8/ntp/sntp.html misc-ntp-htmldoc doc,ntp
+./usr/share/doc/reference/ref8/ntp/tickadj.html misc-ntp-htmldoc doc,ntp
+./usr/share/doc/reference/ref8/ntp/xleave.html misc-ntp-htmldoc doc,ntp
./usr/share/doc/reference/ref8/postfix/ADDRESS_CLASS_README.html misc-postfix-htmldoc postfix,doc
./usr/share/doc/reference/ref8/postfix/ADDRESS_REWRITING_README.html misc-postfix-htmldoc postfix,doc
./usr/share/doc/reference/ref8/postfix/ADDRESS_VERIFICATION_README.html misc-postfix-htmldoc postfix,doc
Index: src/etc/Makefile
diff -u src/etc/Makefile:1.460 src/etc/Makefile:1.461
--- src/etc/Makefile:1.460 Wed May 25 21:25:46 2022
+++ src/etc/Makefile Sat May 28 11:17:35 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.460 2022/05/25 21:25:46 nia Exp $
+# $NetBSD: Makefile,v 1.461 2022/05/28 11:17:35 nia Exp $
# from: @(#)Makefile 8.7 (Berkeley) 5/25/95
# Environment variables without default values:
@@ -106,7 +106,7 @@ BIN1+= auto_master bootptab changelist c
ftpusers gettytab gpio.conf group hosts hosts.lpd inetd.conf \
locate.conf login.conf mailer.conf man.conf monthly monthly.conf \
named.conf netconfig networks newsyslog.conf \
- nsswitch.conf ntp.conf passwd.conf pkgpath.conf phones printcap \
+ nsswitch.conf passwd.conf pkgpath.conf phones printcap \
profile protocols rbootd.conf rc rc.conf rc.local rc.subr \
rc.shutdown remote rpc security security.conf services shells \
shrc sysctl.conf syslog.conf weekly weekly.conf wscons.conf
@@ -115,6 +115,10 @@ BIN1+= auto_master bootptab changelist c
BIN1+= mrouted.conf
.endif
+.if ${MKNTP} != "no"
+BIN1+= ntpd.conf
+.endif
+
# Use machine-specific disktab if it exists, or the MI one otherwise
.if exists(etc.${MACHINE}/disktab)
BIN1+= etc.${MACHINE}/disktab
Index: src/etc/rc.d/Makefile
diff -u src/etc/rc.d/Makefile:1.113 src/etc/rc.d/Makefile:1.114
--- src/etc/rc.d/Makefile:1.113 Wed May 25 21:25:47 2022
+++ src/etc/rc.d/Makefile Sat May 28 11:17:35 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.113 2022/05/25 21:25:47 nia Exp $
+# $NetBSD: Makefile,v 1.114 2022/05/28 11:17:35 nia Exp $
.include <bsd.own.mk>
@@ -31,7 +31,7 @@ CONFIGFILES=\
makemandb mdnsd mixerctl modules mopd motd mountall \
mountcritlocal mountcritremote mountd moused \
named ndbootd network newsyslog nfsd nfslocking npf npf_boot \
- npfd ntpd ntpdate \
+ npfd \
perusertmp pf pf_boot pflogd postfix powerd ppp pwcheck \
quota \
racoon rpcbind raidframe raidframeparity random_seed rarpd \
@@ -48,6 +48,10 @@ FILESMODE= ${BINMODE}
CONFIGFILES+= mrouted
.endif
+.if ${MKNTP} != "no"
+CONFIGFILES+= ntpd ntpdate
+.endif
+
.if ${MKYP} != "no"
CONFIGFILES+= ypbind yppasswdd ypserv
.endif
Index: src/external/bsd/Makefile
diff -u src/external/bsd/Makefile:1.72 src/external/bsd/Makefile:1.73
--- src/external/bsd/Makefile:1.72 Fri Apr 9 20:49:05 2021
+++ src/external/bsd/Makefile Sat May 28 11:17:35 2022
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.72 2021/04/09 20:49:05 jkoshy Exp $
+# $NetBSD: Makefile,v 1.73 2022/05/28 11:17:35 nia Exp $
.include <bsd.own.mk>
SUBDIR= acpica am-utils bc byacc cron dhcpcd elftoolchain/common \
ekermit elftosb fetch file flex jemalloc less \
libarchive libevent libfido2 liblzf libpcap mdocml \
- ntp openresolv tcpdump tmux top tre wpa
+ openresolv tmux top tre wpa
.if (${MKATF} != "no")
SUBDIR+= atf
@@ -30,6 +30,9 @@ SUBDIR+= libc++
.if (${MKNSD} != "no")
SUBDIR+= nsd
.endif
+.if (${MKNTP} != "no")
+SUBDIR+= ntp
+.endif
.if ${MKPAM} != "no"
SUBDIR+= pam-u2f
.endif
@@ -40,6 +43,9 @@ SUBDIR+= pcc
SUBDIR+= libproc
SUBDIR+= librtld_db
.endif
+.if ${MKTCPDUMP} != "no"
+SUBDIR+= tcpdump
+.endif
.if ${MKUNBOUND} != "no"
SUBDIR+= unbound
.endif
Index: src/share/man/man5/mk.conf.5
diff -u src/share/man/man5/mk.conf.5:1.91 src/share/man/man5/mk.conf.5:1.92
--- src/share/man/man5/mk.conf.5:1.91 Fri May 27 09:25:08 2022
+++ src/share/man/man5/mk.conf.5 Sat May 28 11:17:35 2022
@@ -1,4 +1,4 @@
-.\" $NetBSD: mk.conf.5,v 1.91 2022/05/27 09:25:08 nia Exp $
+.\" $NetBSD: mk.conf.5,v 1.92 2022/05/28 11:17:35 nia Exp $
.\"
.\" Copyright (c) 1999-2003 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -27,7 +27,7 @@
.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
.\" POSSIBILITY OF SUCH DAMAGE.
.\"
-.Dd May 26, 2022
+.Dd May 27, 2022
.Dt MK.CONF 5
.Os
.\" turn off hyphenation
@@ -684,6 +684,15 @@ Platform dependent.
Indicates whether the NPF packet filter is to be built and installed.
.DFLTy
.
+.It Sy MKNTP
+.YorN
+Indicates whether
+.Xr ntpd 8
+and
+.Xr ntpdate 8
+are to be built and installed.
+.DFLTy
+.
.It Sy MKOBJ
.YorN
Indicates whether object directories will be created when running
@@ -895,6 +904,13 @@ userland libraries and getting a backtra
loading shared libraries.
.DFLTy
.
+.It Sy MKTCPDUMP
+.YorN
+Indicates whether
+.Xr tcpdump 8
+is to be built and installed.
+.DFLTy
+.
.It Sy MKUNPRIVED
.YorN
Indicates whether an unprivileged install will occur.
Index: src/share/mk/bsd.README
diff -u src/share/mk/bsd.README:1.434 src/share/mk/bsd.README:1.435
--- src/share/mk/bsd.README:1.434 Fri May 27 07:28:21 2022
+++ src/share/mk/bsd.README Sat May 28 11:17:35 2022
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.README,v 1.434 2022/05/27 07:28:21 nia Exp $
+# $NetBSD: bsd.README,v 1.435 2022/05/28 11:17:35 nia Exp $
# @(#)bsd.README 8.2 (Berkeley) 4/2/94
This is the README file for the make "include" files for the NetBSD
@@ -401,6 +401,9 @@ MKNSD If "no", don't build or install t
server.
Default: no
+MKNTP If "no", don't build or install ntpd(8) or ntpdate(8).
+ Default: yes
+
MKOBJ If "no", don't enable the rule which creates objdirs,
and also acts as "MKOBJDIRS=no".
Default: yes
@@ -521,6 +524,9 @@ MKSTRIPSYM If "yes", strip all local sym
loading shared libraries.
Default: yes
+MKTCPDUMP If "no" then don't build tcpdump(8).
+ Default: yes
+
MKTEGRAFIRMWARE If "no", install the /libdata/firmware/nvidia directory,
which is necessary for the NVIDIA Tegra XHCI driver.
Default: yes on evbarm, no elsewhere.
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.1280 src/share/mk/bsd.own.mk:1.1281
--- src/share/mk/bsd.own.mk:1.1280 Fri May 27 07:28:21 2022
+++ src/share/mk/bsd.own.mk Sat May 28 11:17:35 2022
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1280 2022/05/27 07:28:21 nia Exp $
+# $NetBSD: bsd.own.mk,v 1.1281 2022/05/28 11:17:35 nia Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -1166,11 +1166,13 @@ _MKVARS.yes= \
MKMAKEMANDB \
MKNLS \
MKNPF \
+ MKNTP \
MKOBJ \
MKPAM MKPERFUSE \
MKPF MKPIC MKPICLIB MKPOSTFIX MKPROFILE \
MKRUMP \
MKSHARE MKSKEY MKSTATICLIB \
+ MKTCPDUMP \
MKUNBOUND \
MKX11FONTS \
MKYP
