Module Name: src
Committed By: nia
Date: Wed May 25 21:25:47 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/etc: Makefile
src/etc/rc.d: Makefile
src/share/man/man5: mk.conf.5
src/share/mk: bsd.README bsd.own.mk
src/usr.sbin: Makefile
Log Message:
mk: Rename the MKMBONE option to MKMROUTING for greater accuracy and
to match the related kernel config option.
To generate a diff of this commit:
cvs rdiff -u -r1.1300 -r1.1301 src/distrib/sets/lists/base/mi
cvs rdiff -u -r1.379 -r1.380 src/distrib/sets/lists/debug/mi
cvs rdiff -u -r1.266 -r1.267 src/distrib/sets/lists/etc/mi
cvs rdiff -u -r1.1741 -r1.1742 src/distrib/sets/lists/man/mi
cvs rdiff -u -r1.459 -r1.460 src/etc/Makefile
cvs rdiff -u -r1.112 -r1.113 src/etc/rc.d/Makefile
cvs rdiff -u -r1.87 -r1.88 src/share/man/man5/mk.conf.5
cvs rdiff -u -r1.431 -r1.432 src/share/mk/bsd.README
cvs rdiff -u -r1.1278 -r1.1279 src/share/mk/bsd.own.mk
cvs rdiff -u -r1.287 -r1.288 src/usr.sbin/Makefile
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.1300 src/distrib/sets/lists/base/mi:1.1301
--- src/distrib/sets/lists/base/mi:1.1300 Wed May 25 20:44:01 2022
+++ src/distrib/sets/lists/base/mi Wed May 25 21:25:46 2022
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1300 2022/05/25 20:44:01 nia Exp $
+# $NetBSD: mi,v 1.1301 2022/05/25 21:25:46 nia Exp $
#
# Note: Don't delete entries from here - mark them as "obsolete" instead,
# unless otherwise stated below.
@@ -1570,7 +1570,7 @@
./usr/sbin/makefs base-sysutil-bin
./usr/sbin/makemandb base-man-bin makemandb
./usr/sbin/makemap base-obsolete obsolete
-./usr/sbin/map-mbone base-netutil-bin mbone
+./usr/sbin/map-mbone base-netutil-bin mrouting
./usr/sbin/mbrlabel base-obsolete obsolete
./usr/sbin/mdconfig base-sysutil-bin
./usr/sbin/mdnsd base-mdns-bin mdns
@@ -1593,10 +1593,10 @@
./usr/sbin/mount_sysctlfs base-puffs-bin
./usr/sbin/mountd base-nfsserver-bin
./usr/sbin/moused base-sysutil-bin
-./usr/sbin/mrinfo base-router-bin mbone
-./usr/sbin/mrouted base-router-bin mbone
+./usr/sbin/mrinfo base-router-bin mrouting
+./usr/sbin/mrouted base-router-bin mrouting
./usr/sbin/mscdlabel base-sysutil-bin
-./usr/sbin/mtrace base-netutil-bin mbone
+./usr/sbin/mtrace base-netutil-bin mrouting
./usr/sbin/mtrace6 base-obsolete obsolete
./usr/sbin/mtree base-sysutil-bin
./usr/sbin/named base-bind-bin
Index: src/distrib/sets/lists/debug/mi
diff -u src/distrib/sets/lists/debug/mi:1.379 src/distrib/sets/lists/debug/mi:1.380
--- src/distrib/sets/lists/debug/mi:1.379 Wed May 25 20:44:01 2022
+++ src/distrib/sets/lists/debug/mi Wed May 25 21:25:46 2022
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.379 2022/05/25 20:44:01 nia Exp $
+# $NetBSD: mi,v 1.380 2022/05/25 21:25:46 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
@@ -1173,7 +1173,7 @@
./usr/libdata/debug/usr/sbin/makedbm.debug comp-nis-debug yp,debug
./usr/libdata/debug/usr/sbin/makefs.debug comp-sysutil-debug debug
./usr/libdata/debug/usr/sbin/makemandb.debug comp-makemandb-debug makemandb,debug
-./usr/libdata/debug/usr/sbin/map-mbone.debug comp-netutil-debug mbone,debug
+./usr/libdata/debug/usr/sbin/map-mbone.debug comp-netutil-debug mrouting,debug
./usr/libdata/debug/usr/sbin/mdconfig.debug comp-sysutil-debug debug
./usr/libdata/debug/usr/sbin/mdnsd.debug comp-mdns-debug mdns,debug
./usr/libdata/debug/usr/sbin/mdsetimage.debug comp-sysutil-debug binutils,debug
@@ -1194,10 +1194,10 @@
./usr/libdata/debug/usr/sbin/mount_sysctlfs.debug comp-puffs-debug debug
./usr/libdata/debug/usr/sbin/mountd.debug comp-nfsserver-debug debug
./usr/libdata/debug/usr/sbin/moused.debug comp-sysutil-debug debug
-./usr/libdata/debug/usr/sbin/mrinfo.debug comp-router-debug mbone,debug
-./usr/libdata/debug/usr/sbin/mrouted.debug comp-router-debug mbone,debug
+./usr/libdata/debug/usr/sbin/mrinfo.debug comp-router-debug mrouting,debug
+./usr/libdata/debug/usr/sbin/mrouted.debug comp-router-debug mrouting,debug
./usr/libdata/debug/usr/sbin/mscdlabel.debug comp-sysutil-debug debug
-./usr/libdata/debug/usr/sbin/mtrace.debug comp-netutil-debug mbone,debug
+./usr/libdata/debug/usr/sbin/mtrace.debug comp-netutil-debug mrouting,debug
./usr/libdata/debug/usr/sbin/mtree.debug comp-sysutil-debug debug
./usr/libdata/debug/usr/sbin/named-checkconf.debug comp-bind-bin debug
./usr/libdata/debug/usr/sbin/named-checkzone.debug comp-bind-bin debug
Index: src/distrib/sets/lists/etc/mi
diff -u src/distrib/sets/lists/etc/mi:1.266 src/distrib/sets/lists/etc/mi:1.267
--- src/distrib/sets/lists/etc/mi:1.266 Wed May 25 10:18:29 2022
+++ src/distrib/sets/lists/etc/mi Wed May 25 21:25:46 2022
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.266 2022/05/25 10:18:29 nia Exp $
+# $NetBSD: mi,v 1.267 2022/05/25 21:25:46 nia Exp $
#
# Note: end-user configuration files that are moved to another location
# should not be marked "obsolete"; they should just be removed from
@@ -97,7 +97,7 @@
./etc/monthly etc-sys-etc
./etc/monthly.conf etc-sys-etc
./etc/motd etc-sys-etc
-./etc/mrouted.conf etc-router-etc mbone
+./etc/mrouted.conf etc-router-etc mrouting
./etc/mtree/NetBSD.dist etc-sys-etc
./etc/mtree/set.etc etc-sys-etc
./etc/mtree/special etc-sys-etc
@@ -263,7 +263,7 @@
./etc/rc.d/mountcritremote etc-sys-rc
./etc/rc.d/mountd etc-nfsserver-rc
./etc/rc.d/moused etc-sysutil-rc
-./etc/rc.d/mrouted etc-router-rc mbone
+./etc/rc.d/mrouted etc-router-rc mrouting
./etc/rc.d/named etc-bind-rc
./etc/rc.d/ndbootd etc-bootserver-rc
./etc/rc.d/network etc-net-rc
Index: src/distrib/sets/lists/man/mi
diff -u src/distrib/sets/lists/man/mi:1.1741 src/distrib/sets/lists/man/mi:1.1742
--- src/distrib/sets/lists/man/mi:1.1741 Wed May 25 20:44:01 2022
+++ src/distrib/sets/lists/man/mi Wed May 25 21:25:46 2022
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1741 2022/05/25 20:44:01 nia Exp $
+# $NetBSD: mi,v 1.1742 2022/05/25 21:25:46 nia Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -2811,7 +2811,7 @@
./usr/share/man/cat8/makemandb.0 man-man-catman makemandb,.cat
./usr/share/man/cat8/makemap.0 man-obsolete obsolete
./usr/share/man/cat8/makewhatis.0 man-man-catman !makemandb,.cat
-./usr/share/man/cat8/map-mbone.0 man-netutil-catman mbone,.cat
+./usr/share/man/cat8/map-mbone.0 man-netutil-catman mrouting,.cat
./usr/share/man/cat8/master.0 man-postfix-catman postfix,.cat
./usr/share/man/cat8/mbr.0 man-obsolete obsolete
./usr/share/man/cat8/mbrlabel.0 man-sysutil-catman .cat
@@ -2874,10 +2874,10 @@
./usr/share/man/cat8/mount_zfs.0 man-sysutil-catman zfs,.cat
./usr/share/man/cat8/mountd.0 man-nfsserver-catman .cat
./usr/share/man/cat8/moused.0 man-sysutil-catman .cat
-./usr/share/man/cat8/mrinfo.0 man-netutil-catman mbone,.cat
-./usr/share/man/cat8/mrouted.0 man-router-catman mbone,.cat
+./usr/share/man/cat8/mrinfo.0 man-netutil-catman mrouting,.cat
+./usr/share/man/cat8/mrouted.0 man-router-catman mrouting,.cat
./usr/share/man/cat8/mscdlabel.0 man-sysutil-catman .cat
-./usr/share/man/cat8/mtrace.0 man-netutil-catman mbone,.cat
+./usr/share/man/cat8/mtrace.0 man-netutil-catman mrouting,.cat
./usr/share/man/cat8/mtrace6.0 man-obsolete obsolete
./usr/share/man/cat8/mtree.0 man-sysutil-catman .cat
./usr/share/man/cat8/mvme68k/MAKEDEV.0 man-obsolete obsolete
@@ -5869,7 +5869,7 @@
./usr/share/man/html8/makekey.html man-crypto-htmlman html
./usr/share/man/html8/makemandb.html man-man-htmlman makemandb,html
./usr/share/man/html8/makewhatis.html man-man-htmlman !makemandb,html
-./usr/share/man/html8/map-mbone.html man-netutil-htmlman mbone,html
+./usr/share/man/html8/map-mbone.html man-netutil-htmlman mrouting,html
./usr/share/man/html8/master.html man-postfix-htmlman postfix,html
./usr/share/man/html8/mbrlabel.html man-sysutil-htmlman html
./usr/share/man/html8/mdconfig.html man-sysutil-htmlman html
@@ -5926,10 +5926,10 @@
./usr/share/man/html8/mount_zfs.html man-sysutil-htmlman zfs,html
./usr/share/man/html8/mountd.html man-nfsserver-htmlman html
./usr/share/man/html8/moused.html man-sysutil-htmlman html
-./usr/share/man/html8/mrinfo.html man-netutil-htmlman mbone,html
-./usr/share/man/html8/mrouted.html man-router-htmlman mbone,html
+./usr/share/man/html8/mrinfo.html man-netutil-htmlman mrouting,html
+./usr/share/man/html8/mrouted.html man-router-htmlman mrouting,html
./usr/share/man/html8/mscdlabel.html man-sysutil-htmlman html
-./usr/share/man/html8/mtrace.html man-netutil-htmlman mbone,html
+./usr/share/man/html8/mtrace.html man-netutil-htmlman mrouting,html
./usr/share/man/html8/mtree.html man-sysutil-htmlman html
./usr/share/man/html8/mvme68k/boot.html man-sys-htmlman html
./usr/share/man/html8/mvme68k/installboot.html man-sysutil-htmlman html
@@ -9097,7 +9097,7 @@
./usr/share/man/man8/makemandb.8 man-man-man makemandb,.man
./usr/share/man/man8/makemap.8 man-obsolete obsolete
./usr/share/man/man8/makewhatis.8 man-man-man !makemandb,.man
-./usr/share/man/man8/map-mbone.8 man-netutil-man mbone,.man
+./usr/share/man/man8/map-mbone.8 man-netutil-man mrouting,.man
./usr/share/man/man8/master.8 man-postfix-man postfix,.man
./usr/share/man/man8/mbr.8 man-obsolete obsolete
./usr/share/man/man8/mbrlabel.8 man-sysutil-man .man
@@ -9160,10 +9160,10 @@
./usr/share/man/man8/mount_zfs.8 man-sysutil-man zfs,.man
./usr/share/man/man8/mountd.8 man-nfsserver-man .man
./usr/share/man/man8/moused.8 man-sysutil-man .man
-./usr/share/man/man8/mrinfo.8 man-netutil-man mbone,.man
-./usr/share/man/man8/mrouted.8 man-router-man mbone,.man
+./usr/share/man/man8/mrinfo.8 man-netutil-man mrouting,.man
+./usr/share/man/man8/mrouted.8 man-router-man mrouting,.man
./usr/share/man/man8/mscdlabel.8 man-sysutil-man .man
-./usr/share/man/man8/mtrace.8 man-netutil-man mbone,.man
+./usr/share/man/man8/mtrace.8 man-netutil-man mrouting,.man
./usr/share/man/man8/mtrace6.8 man-obsolete obsolete
./usr/share/man/man8/mtree.8 man-sysutil-man .man
./usr/share/man/man8/mvme68k/MAKEDEV.8 man-obsolete obsolete
Index: src/etc/Makefile
diff -u src/etc/Makefile:1.459 src/etc/Makefile:1.460
--- src/etc/Makefile:1.459 Wed May 25 10:18:29 2022
+++ src/etc/Makefile Wed May 25 21:25:46 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.459 2022/05/25 10:18:29 nia Exp $
+# $NetBSD: Makefile,v 1.460 2022/05/25 21:25:46 nia Exp $
# from: @(#)Makefile 8.7 (Berkeley) 5/25/95
# Environment variables without default values:
@@ -111,7 +111,7 @@ BIN1+= auto_master bootptab changelist c
rc.shutdown remote rpc security security.conf services shells \
shrc sysctl.conf syslog.conf weekly weekly.conf wscons.conf
-.if ${MKMBONE} != "no"
+.if ${MKMROUTING} != "no"
BIN1+= mrouted.conf
.endif
Index: src/etc/rc.d/Makefile
diff -u src/etc/rc.d/Makefile:1.112 src/etc/rc.d/Makefile:1.113
--- src/etc/rc.d/Makefile:1.112 Wed May 25 10:18:29 2022
+++ src/etc/rc.d/Makefile Wed May 25 21:25:47 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.112 2022/05/25 10:18:29 nia Exp $
+# $NetBSD: Makefile,v 1.113 2022/05/25 21:25:47 nia Exp $
.include <bsd.own.mk>
@@ -44,7 +44,7 @@ CONFIGFILES=\
FILESDIR= /etc/rc.d
FILESMODE= ${BINMODE}
-.if ${MKMBONE} != "no"
+.if ${MKMROUTING} != "no"
CONFIGFILES+= mrouted
.endif
Index: src/share/man/man5/mk.conf.5
diff -u src/share/man/man5/mk.conf.5:1.87 src/share/man/man5/mk.conf.5:1.88
--- src/share/man/man5/mk.conf.5:1.87 Wed May 25 20:44:01 2022
+++ src/share/man/man5/mk.conf.5 Wed May 25 21:25:47 2022
@@ -1,4 +1,4 @@
-.\" $NetBSD: mk.conf.5,v 1.87 2022/05/25 20:44:01 nia Exp $
+.\" $NetBSD: mk.conf.5,v 1.88 2022/05/25 21:25:47 nia Exp $
.\"
.\" Copyright (c) 1999-2003 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -634,21 +634,24 @@ Indicates whether manual pages should be
at installation time.
.DFLTn
.
-.It Sy MKMBONE
+.It Sy MKMDNS
+.YorN
+Indicates whether the mDNS (Multicast DNS) infrastructure
+(libraries and support programs) is built and installed.
+.DFLTy
+.
+.It Sy MKMROUITNG
.YorN
-Indicates whether Multicast Backbone applications will be built and
+Indicates whether multicast routing applications will be built and
installed, i.e.
.Xr map-mbone 8 ,
.Xr mrinfo 8 ,
.Xr mrouted 8 ,
and
.Xr mtrace 8 .
-.DFLTy
-.
-.It Sy MKMDNS
-.YorN
-Indicates whether the mDNS (Multicast DNS) infrastructure
-(libraries and support programs) is built and installed.
+These require the
+.Dv MROUTING
+kernel option to be enabled.
.DFLTy
.
.It Sy MKNLS
Index: src/share/mk/bsd.README
diff -u src/share/mk/bsd.README:1.431 src/share/mk/bsd.README:1.432
--- src/share/mk/bsd.README:1.431 Wed May 25 20:44:01 2022
+++ src/share/mk/bsd.README Wed May 25 21:25:47 2022
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.README,v 1.431 2022/05/25 20:44:01 nia Exp $
+# $NetBSD: bsd.README,v 1.432 2022/05/25 21:25:47 nia Exp $
# @(#)bsd.README 8.2 (Berkeley) 4/2/94
This is the README file for the make "include" files for the NetBSD
@@ -372,14 +372,15 @@ MKMANDOC If "yes", mandoc is built as to
MKMANZ If not "no", compress manual pages at installation time.
Default: no
-MKMBONE If "no", don't build or install Multicast Backbone
- applications.
- Default: yes
-
MKMDNS If "no", disables building of mDNS infrastructure
(libraries and support programs).
Default: yes
+MKMROUTING If "no", don't build or install the multicast routing
+ applications - map-mbone(8), mrinfo(8), mrouted(8), or
+ mtrace(8).
+ Default: yes
+
MKNLS If "no", don't build or install the NLS files and locale
definition files.
Default: yes
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.1278 src/share/mk/bsd.own.mk:1.1279
--- src/share/mk/bsd.own.mk:1.1278 Wed May 25 20:44:01 2022
+++ src/share/mk/bsd.own.mk Wed May 25 21:25:47 2022
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1278 2022/05/25 20:44:01 nia Exp $
+# $NetBSD: bsd.own.mk,v 1.1279 2022/05/25 21:25:47 nia Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -1160,7 +1160,7 @@ _MKVARS.yes= \
MKKMOD \
MKLDAP MKLIBSTDCXX MKLINKLIB MKLVM \
MKMAN MKMANDOC \
- MKMBONE \
+ MKMROUTING \
MKMDNS \
MKMAKEMANDB \
MKNLS \
Index: src/usr.sbin/Makefile
diff -u src/usr.sbin/Makefile:1.287 src/usr.sbin/Makefile:1.288
--- src/usr.sbin/Makefile:1.287 Wed May 25 10:18:28 2022
+++ src/usr.sbin/Makefile Wed May 25 21:25:47 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.287 2022/05/25 10:18:28 nia Exp $
+# $NetBSD: Makefile,v 1.288 2022/05/25 21:25:47 nia Exp $
# from: @(#)Makefile 5.20 (Berkeley) 6/12/93
.include <bsd.own.mk>
@@ -38,7 +38,7 @@ SUBDIR= ac accton acpitools altq apm apm
SUBDIR+= makemandb
.endif
-.if ${MKMBONE} != "no"
+.if ${MKMROUTING} != "no"
SUBDIR+= map-mbone mrinfo mrouted mtrace
.endif
