Module Name:    src
Committed By:   nia
Date:           Wed May 25 20:44:02 UTC 2022

Modified Files:
        src/distrib/sets/lists/base: mi
        src/distrib/sets/lists/debug: mi
        src/distrib/sets/lists/man: mi
        src/distrib/sets/lists/misc: mi
        src/etc/mtree: Makefile NetBSD.dist.base special
        src/external/mpl: Makefile
        src/share/man/man5: mk.conf.5
        src/share/mk: bsd.README bsd.own.mk
Added Files:
        src/etc/mtree: NetBSD.dist.dhcpd

Log Message:
mk: Allow setting MKDHCPD=no to build base without the ISC DHCP server,
useful for embedded images that don't need to act as one.


To generate a diff of this commit:
cvs rdiff -u -r1.1299 -r1.1300 src/distrib/sets/lists/base/mi
cvs rdiff -u -r1.378 -r1.379 src/distrib/sets/lists/debug/mi
cvs rdiff -u -r1.1740 -r1.1741 src/distrib/sets/lists/man/mi
cvs rdiff -u -r1.219 -r1.220 src/distrib/sets/lists/misc/mi
cvs rdiff -u -r1.45 -r1.46 src/etc/mtree/Makefile
cvs rdiff -u -r1.243 -r1.244 src/etc/mtree/NetBSD.dist.base
cvs rdiff -u -r0 -r1.1 src/etc/mtree/NetBSD.dist.dhcpd
cvs rdiff -u -r1.173 -r1.174 src/etc/mtree/special
cvs rdiff -u -r1.2 -r1.3 src/external/mpl/Makefile
cvs rdiff -u -r1.86 -r1.87 src/share/man/man5/mk.conf.5
cvs rdiff -u -r1.430 -r1.431 src/share/mk/bsd.README
cvs rdiff -u -r1.1277 -r1.1278 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.1299 src/distrib/sets/lists/base/mi:1.1300
--- src/distrib/sets/lists/base/mi:1.1299	Wed May 25 10:18:29 2022
+++ src/distrib/sets/lists/base/mi	Wed May 25 20:44:01 2022
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1299 2022/05/25 10:18:29 nia Exp $
+# $NetBSD: mi,v 1.1300 2022/05/25 20:44:01 nia Exp $
 #
 # Note:	Don't delete entries from here - mark them as "obsolete" instead,
 #	unless otherwise stated below.
@@ -1457,8 +1457,8 @@
 ./usr/sbin/dbsym				base-sysutil-bin	binutils
 ./usr/sbin/ddns-confgen				base-bind-bin
 ./usr/sbin/dev_mkdb				base-sysutil-bin
-./usr/sbin/dhcpd				base-dhcpd-bin
-./usr/sbin/dhcrelay				base-dhcpd-bin
+./usr/sbin/dhcpd				base-dhcpd-bin		dhcpd
+./usr/sbin/dhcrelay				base-dhcpd-bin		dhcpd
 ./usr/sbin/dig					base-obsolete		obsolete
 ./usr/sbin/diskpart				base-sysutil-bin
 ./usr/sbin/dnsquery				base-obsolete		obsolete
@@ -1635,7 +1635,7 @@
 ./usr/sbin/ntptimeset				base-obsolete		obsolete
 ./usr/sbin/ntptrace				base-ntp-bin
 ./usr/sbin/nvmmctl				base-sysutil-bin	nvmm
-./usr/sbin/omshell				base-dhcpd-bin
+./usr/sbin/omshell				base-dhcpd-bin		dhcpd
 ./usr/sbin/opensnoop				base-debug-bin		dtrace
 ./usr/sbin/pac					base-sysutil-bin
 ./usr/sbin/paxctl				base-sysutil-bin
@@ -1867,8 +1867,8 @@
 ./usr/share/calendar/calendar.music		base-calendar-share	share
 ./usr/share/calendar/calendar.netbsd		base-calendar-share	share
 ./usr/share/calendar/calendar.usholiday		base-calendar-share	share
-./usr/share/dhcpd				base-dhcpd-bin
-./usr/share/dhcpd/pxe.defs			base-dhcpd-bin		share
+./usr/share/dhcpd				base-dhcpd-bin		dhcpd
+./usr/share/dhcpd/pxe.defs			base-dhcpd-bin		dhcpd,share
 ./usr/share/dict				base-reference-share
 ./usr/share/dict/papers				base-reference-share
 ./usr/share/dict/special			base-reference-share
@@ -2015,7 +2015,7 @@
 ./usr/share/examples/blocklist			base-sys-examples
 ./usr/share/examples/blocklist/blocklistd.conf	base-sys-examples
 ./usr/share/examples/blocklist/npf.conf		base-sys-examples
-./usr/share/examples/dhcp			base-dhcpd-examples
+./usr/share/examples/dhcp			base-dhcpd-examples	dhcpd
 ./usr/share/examples/dhcpcd			base-dhcpcd-examples
 ./usr/share/examples/dhcpcd/hooks		base-dhcpcd-examples
 ./usr/share/examples/disktab			base-sys-examples

Index: src/distrib/sets/lists/debug/mi
diff -u src/distrib/sets/lists/debug/mi:1.378 src/distrib/sets/lists/debug/mi:1.379
--- src/distrib/sets/lists/debug/mi:1.378	Wed May 25 12:47:40 2022
+++ src/distrib/sets/lists/debug/mi	Wed May 25 20:44:01 2022
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.378 2022/05/25 12:47:40 nia Exp $
+# $NetBSD: mi,v 1.379 2022/05/25 20:44:01 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
@@ -1088,8 +1088,8 @@
 ./usr/libdata/debug/usr/sbin/dbsym.debug	comp-sysutil-debug	binutils,debug
 ./usr/libdata/debug/usr/sbin/ddns-confgen.debug	comp-bind-bin		debug
 ./usr/libdata/debug/usr/sbin/dev_mkdb.debug	comp-sysutil-debug	debug
-./usr/libdata/debug/usr/sbin/dhcpd.debug	comp-dhcpd-debug	debug
-./usr/libdata/debug/usr/sbin/dhcrelay.debug	comp-dhcpd-debug	debug
+./usr/libdata/debug/usr/sbin/dhcpd.debug	comp-dhcpd-debug	dhcpd,debug
+./usr/libdata/debug/usr/sbin/dhcrelay.debug	comp-dhcpd-debug	dhcpd,debug
 ./usr/libdata/debug/usr/sbin/diskpart.debug	comp-sysutil-debug	debug
 ./usr/libdata/debug/usr/sbin/dnssec-dsfromkey.debug	comp-bind-debug		debug
 ./usr/libdata/debug/usr/sbin/dnssec-importkey.debug	comp-bind-debug		debug
@@ -1223,7 +1223,7 @@
 ./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/nvmmctl.debug	comp-sysutil-debug	debug,nvmm
-./usr/libdata/debug/usr/sbin/omshell.debug	comp-dhcpd-debug	debug
+./usr/libdata/debug/usr/sbin/omshell.debug	comp-dhcpd-debug	debug,dhcpd
 ./usr/libdata/debug/usr/sbin/pac.debug		comp-sysutil-debug	debug
 ./usr/libdata/debug/usr/sbin/paxctl.debug	comp-sysutil-debug	debug
 ./usr/libdata/debug/usr/sbin/pcictl.debug	comp-sysutil-debug	debug

Index: src/distrib/sets/lists/man/mi
diff -u src/distrib/sets/lists/man/mi:1.1740 src/distrib/sets/lists/man/mi:1.1741
--- src/distrib/sets/lists/man/mi:1.1740	Wed May 25 10:18:29 2022
+++ src/distrib/sets/lists/man/mi	Wed May 25 20:44:01 2022
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1740 2022/05/25 10:18:29 nia Exp $
+# $NetBSD: mi,v 1.1741 2022/05/25 20:44:01 nia Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -374,7 +374,7 @@
 ./usr/share/man/cat1/nvi.0			man-obsolete		obsolete
 ./usr/share/man/cat1/nview.0			man-obsolete		obsolete
 ./usr/share/man/cat1/od.0			man-util-catman		.cat
-./usr/share/man/cat1/omshell.0			man-dhcpd-catman	.cat
+./usr/share/man/cat1/omshell.0			man-dhcpd-catman	dhcpd,.cat
 ./usr/share/man/cat1/openpgp.0			man-obsolete		obsolete
 ./usr/share/man/cat1/openssl.0			man-crypto-catman	.cat
 ./usr/share/man/cat1/openssl_CA.pl.0		man-crypto-catman	.cat
@@ -2173,11 +2173,11 @@
 ./usr/share/man/cat5/daily.conf.0		man-sys-catman		.cat
 ./usr/share/man/cat5/dhclient.conf.0		man-obsolete		obsolete
 ./usr/share/man/cat5/dhclient.leases.0		man-obsolete		obsolete
-./usr/share/man/cat5/dhcp-eval.0		man-dhcpd-catman	.cat
-./usr/share/man/cat5/dhcp-options.0		man-dhcpd-catman	.cat
+./usr/share/man/cat5/dhcp-eval.0		man-dhcpd-catman	dhcpd,.cat
+./usr/share/man/cat5/dhcp-options.0		man-dhcpd-catman	dhcpd,.cat
 ./usr/share/man/cat5/dhcpcd.conf.0		man-dhcpcd-catman	.cat
-./usr/share/man/cat5/dhcpd.conf.0		man-dhcpd-catman	.cat
-./usr/share/man/cat5/dhcpd.leases.0		man-dhcpd-catman	.cat
+./usr/share/man/cat5/dhcpd.conf.0		man-dhcpd-catman	dhcpd,.cat
+./usr/share/man/cat5/dhcpd.leases.0		man-dhcpd-catman	dhcpd,.cat
 ./usr/share/man/cat5/dir.0			man-obsolete		obsolete
 ./usr/share/man/cat5/dirent.0			man-obsolete		obsolete
 ./usr/share/man/cat5/disklabel.0		man-sys-catman		.cat
@@ -2556,8 +2556,8 @@
 ./usr/share/man/cat8/dhclient.0			man-obsolete		obsolete
 ./usr/share/man/cat8/dhcpcd-run-hooks.0		man-dhcpcd-catman	.cat
 ./usr/share/man/cat8/dhcpcd.0			man-dhcpcd-catman	.cat
-./usr/share/man/cat8/dhcpd.0			man-dhcpd-catman	.cat
-./usr/share/man/cat8/dhcrelay.0			man-dhcpd-catman	.cat
+./usr/share/man/cat8/dhcpd.0			man-dhcpd-catman	dhcpd,.cat
+./usr/share/man/cat8/dhcrelay.0			man-dhcpd-catman	dhcpd,.cat
 ./usr/share/man/cat8/discard.0			man-postfix-catman	postfix,.cat
 ./usr/share/man/cat8/disklabel.0		man-sysutil-catman	.cat
 ./usr/share/man/cat8/diskless.0			man-sysutil-catman	.cat
@@ -3696,7 +3696,7 @@
 ./usr/share/man/html1/nvi.html			man-obsolete		obsolete
 ./usr/share/man/html1/nview.html		man-obsolete		obsolete
 ./usr/share/man/html1/od.html			man-util-htmlman	html
-./usr/share/man/html1/omshell.html		man-dhcpd-htmlman	html
+./usr/share/man/html1/omshell.html		man-dhcpd-htmlman	dhcpd,html
 ./usr/share/man/html1/openpgp.html		man-obsolete		obsolete
 ./usr/share/man/html1/openssl.html		man-crypto-htmlman	html
 ./usr/share/man/html1/openssl_CA.pl.html	man-crypto-htmlman	html
@@ -5349,11 +5349,11 @@
 ./usr/share/man/html5/daily.html		man-sys-htmlman		html
 ./usr/share/man/html5/dhclient.conf.html	man-obsolete		obsolete
 ./usr/share/man/html5/dhclient.leases.html	man-obsolete		obsolete
-./usr/share/man/html5/dhcp-eval.html		man-dhcpd-htmlman	html
-./usr/share/man/html5/dhcp-options.html		man-dhcpd-htmlman	html
+./usr/share/man/html5/dhcp-eval.html		man-dhcpd-htmlman	dhcpd,html
+./usr/share/man/html5/dhcp-options.html		man-dhcpd-htmlman	dhcpd,html
 ./usr/share/man/html5/dhcpcd.conf.html		man-dhcpcd-htmlman	html
-./usr/share/man/html5/dhcpd.conf.html		man-dhcpd-htmlman	html
-./usr/share/man/html5/dhcpd.leases.html		man-dhcpd-htmlman	html
+./usr/share/man/html5/dhcpd.conf.html		man-dhcpd-htmlman	dhcpd,html
+./usr/share/man/html5/dhcpd.leases.html		man-dhcpd-htmlman	dhcpd,html
 ./usr/share/man/html5/dir.html			man-obsolete		obsolete
 ./usr/share/man/html5/dirent.html		man-obsolete		obsolete
 ./usr/share/man/html5/disklabel.html		man-sys-htmlman		html
@@ -5672,8 +5672,8 @@
 ./usr/share/man/html8/dhclient.html		man-obsolete		obsolete
 ./usr/share/man/html8/dhcpcd-run-hooks.html	man-dhcpcd-htmlman	html
 ./usr/share/man/html8/dhcpcd.html		man-dhcpcd-htmlman	html
-./usr/share/man/html8/dhcpd.html		man-dhcpd-htmlman	html
-./usr/share/man/html8/dhcrelay.html		man-dhcpd-htmlman	html
+./usr/share/man/html8/dhcpd.html		man-dhcpd-htmlman	dhcpd,html
+./usr/share/man/html8/dhcrelay.html		man-dhcpd-htmlman	dhcpd,html
 ./usr/share/man/html8/discard.html		man-postfix-htmlman	postfix,html
 ./usr/share/man/html8/disklabel.html		man-sysutil-htmlman	html
 ./usr/share/man/html8/diskless.html		man-sysutil-htmlman	html
@@ -6660,7 +6660,7 @@
 ./usr/share/man/man1/nvi.1			man-obsolete		obsolete
 ./usr/share/man/man1/nview.1			man-obsolete		obsolete
 ./usr/share/man/man1/od.1			man-util-man		.man
-./usr/share/man/man1/omshell.1			man-dhcpd-man		.man
+./usr/share/man/man1/omshell.1			man-dhcpd-man		dhcpd,.man
 ./usr/share/man/man1/openpgp.1			man-obsolete		obsolete
 ./usr/share/man/man1/openssl.1			man-crypto-man		.man
 ./usr/share/man/man1/openssl_CA.pl.1		man-crypto-man		.man
@@ -8459,11 +8459,11 @@
 ./usr/share/man/man5/daily.conf.5		man-sys-man		.man
 ./usr/share/man/man5/dhclient.conf.5		man-obsolete		obsolete
 ./usr/share/man/man5/dhclient.leases.5		man-obsolete		obsolete
-./usr/share/man/man5/dhcp-eval.5		man-dhcpd-man		.man
-./usr/share/man/man5/dhcp-options.5		man-dhcpd-man		.man
+./usr/share/man/man5/dhcp-eval.5		man-dhcpd-man		dhcpd,.man
+./usr/share/man/man5/dhcp-options.5		man-dhcpd-man		dhcpd,.man
 ./usr/share/man/man5/dhcpcd.conf.5		man-dhcpcd-man		.man
-./usr/share/man/man5/dhcpd.conf.5		man-dhcpd-man		.man
-./usr/share/man/man5/dhcpd.leases.5		man-dhcpd-man		.man
+./usr/share/man/man5/dhcpd.conf.5		man-dhcpd-man		dhcpd,.man
+./usr/share/man/man5/dhcpd.leases.5		man-dhcpd-man		dhcpd,.man
 ./usr/share/man/man5/dir.5			man-obsolete		obsolete
 ./usr/share/man/man5/dirent.5			man-obsolete		obsolete
 ./usr/share/man/man5/disklabel.5		man-sys-man		.man
@@ -8841,8 +8841,8 @@
 ./usr/share/man/man8/dhclient.8			man-obsolete		obsolete
 ./usr/share/man/man8/dhcpcd-run-hooks.8		man-dhcpcd-man		.man
 ./usr/share/man/man8/dhcpcd.8			man-dhcpcd-man		.man
-./usr/share/man/man8/dhcpd.8			man-dhcpd-man		.man
-./usr/share/man/man8/dhcrelay.8			man-dhcpd-man		.man
+./usr/share/man/man8/dhcpd.8			man-dhcpd-man		dhcpd,.man
+./usr/share/man/man8/dhcrelay.8			man-dhcpd-man		dhcpd,.man
 ./usr/share/man/man8/discard.8			man-postfix-man		postfix,.man
 ./usr/share/man/man8/disklabel.8		man-sysutil-man		.man
 ./usr/share/man/man8/diskless.8			man-sysutil-man		.man

Index: src/distrib/sets/lists/misc/mi
diff -u src/distrib/sets/lists/misc/mi:1.219 src/distrib/sets/lists/misc/mi:1.220
--- src/distrib/sets/lists/misc/mi:1.219	Mon Aug  3 17:26:13 2020
+++ src/distrib/sets/lists/misc/mi	Wed May 25 20:44:01 2022
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.219 2020/08/03 17:26:13 christos Exp $
+# $NetBSD: mi,v 1.220 2022/05/25 20:44:01 nia Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -1362,7 +1362,7 @@
 ./usr/share/examples/atf/atf-run.hooks		misc-obsolete		share,kyua,obsolete
 ./usr/share/examples/atf/tests-results.css	misc-atf-examples	share,atf,!kyua
 ./usr/share/examples/atf/tests-results.css	misc-obsolete		share,kyua,obsolete
-./usr/share/examples/dhcp/dhcpd.conf		misc-dhcpd-examples	share
+./usr/share/examples/dhcp/dhcpd.conf		misc-dhcpd-examples	share,dhcpd
 ./usr/share/examples/dhcpcd/hooks/10-wpa_supplicant	misc-dhcpcd-examples	share
 ./usr/share/examples/dhcpcd/hooks/15-timezone	misc-dhcpcd-examples	share
 ./usr/share/examples/dhcpcd/hooks/29-lookup-hostname	misc-dhcpcd-examples	share

Index: src/etc/mtree/Makefile
diff -u src/etc/mtree/Makefile:1.45 src/etc/mtree/Makefile:1.46
--- src/etc/mtree/Makefile:1.45	Sun Apr 25 23:40:52 2021
+++ src/etc/mtree/Makefile	Wed May 25 20:44:01 2022
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.45 2021/04/25 23:40:52 christos Exp $
+#	$NetBSD: Makefile,v 1.46 2022/05/25 20:44:01 nia Exp $
 
 .include <bsd.own.mk>
 
@@ -57,6 +57,10 @@ EXTRA_DIST_FILES+=	NetBSD.dist.tests.com
 .endif
 .endif
 
+.if ${MKDHCPD} != "no"
+EXTRA_DIST_FILES+=	NetBSD.dist.dhcpd
+.endif
+
 .if ${MKDTB} != "no"
 EXTRA_DIST_FILES+=	NetBSD.dist.dtb
 .endif

Index: src/etc/mtree/NetBSD.dist.base
diff -u src/etc/mtree/NetBSD.dist.base:1.243 src/etc/mtree/NetBSD.dist.base:1.244
--- src/etc/mtree/NetBSD.dist.base:1.243	Sun May 15 21:41:56 2022
+++ src/etc/mtree/NetBSD.dist.base	Wed May 25 20:44:01 2022
@@ -1,4 +1,4 @@
-#	$NetBSD: NetBSD.dist.base,v 1.243 2022/05/15 21:41:56 mrg Exp $
+#	$NetBSD: NetBSD.dist.base,v 1.244 2022/05/25 20:44:01 nia Exp $
 #	@(#)4.4BSD.dist	8.1 (Berkeley) 6/13/93
 
 # Do not customize this file as it may be overwritten on upgrades.
@@ -395,7 +395,6 @@
 ./usr/share
 ./usr/share/atf
 ./usr/share/calendar
-./usr/share/dhcpd
 ./usr/share/dict
 ./usr/share/dict/papers
 ./usr/share/dict/special
@@ -469,7 +468,6 @@
 ./usr/share/examples/asm/hello
 ./usr/share/examples/atf
 ./usr/share/examples/blocklist
-./usr/share/examples/dhcp
 ./usr/share/examples/dhcpcd
 ./usr/share/examples/dhcpcd/hooks
 ./usr/share/examples/disktab

Index: src/etc/mtree/special
diff -u src/etc/mtree/special:1.173 src/etc/mtree/special:1.174
--- src/etc/mtree/special:1.173	Wed May 25 10:18:29 2022
+++ src/etc/mtree/special	Wed May 25 20:44:01 2022
@@ -1,4 +1,4 @@
-#	$NetBSD: special,v 1.173 2022/05/25 10:18:29 nia Exp $
+#	$NetBSD: special,v 1.174 2022/05/25 20:44:01 nia Exp $
 #	@(#)special	8.2 (Berkeley) 1/23/94
 #
 # This file may be overwritten on upgrades.
@@ -207,8 +207,8 @@
 ./etc/rc.d/cron			type=file mode=0555
 ./etc/rc.d/devpubd		type=file mode=0555
 ./etc/rc.d/dhcpcd		type=file mode=0555
-./etc/rc.d/dhcpd		type=file mode=0555
-./etc/rc.d/dhcpd6		type=file mode=0555
+./etc/rc.d/dhcpd		type=file mode=0555 optional
+./etc/rc.d/dhcpd6		type=file mode=0555 optional
 ./etc/rc.d/dhcrelay		type=file mode=0555
 ./etc/rc.d/dmesg		type=file mode=0555
 ./etc/rc.d/downinterfaces	type=file mode=0555

Index: src/external/mpl/Makefile
diff -u src/external/mpl/Makefile:1.2 src/external/mpl/Makefile:1.3
--- src/external/mpl/Makefile:1.2	Sun Aug 12 13:03:08 2018
+++ src/external/mpl/Makefile	Wed May 25 20:44:01 2022
@@ -1,7 +1,11 @@
-#	$NetBSD: Makefile,v 1.2 2018/08/12 13:03:08 christos Exp $
+#	$NetBSD: Makefile,v 1.3 2022/05/25 20:44:01 nia Exp $
 
 .include <bsd.own.mk>
 
-SUBDIR=	bind dhcp
+SUBDIR=	bind
+
+.if ${MKDHCPD} != "no"
+SUBDIR+=	dhcp
+.endif
 
 .include <bsd.subdir.mk>

Index: src/share/man/man5/mk.conf.5
diff -u src/share/man/man5/mk.conf.5:1.86 src/share/man/man5/mk.conf.5:1.87
--- src/share/man/man5/mk.conf.5:1.86	Wed May 25 10:18:29 2022
+++ src/share/man/man5/mk.conf.5	Wed May 25 20:44:01 2022
@@ -1,4 +1,4 @@
-.\"	$NetBSD: mk.conf.5,v 1.86 2022/05/25 10:18:29 nia Exp $
+.\"	$NetBSD: mk.conf.5,v 1.87 2022/05/25 20:44:01 nia Exp $
 .\"
 .\"  Copyright (c) 1999-2003 The NetBSD Foundation, Inc.
 .\"  All rights reserved.
@@ -404,6 +404,13 @@ Indicates whether debug information
 will be included in the build toolchain.
 .DFLTn
 .
+.It Sy MKDHCPD
+.YorN
+Indicates whether 
+.Xr dhcpd 8
+will be built and installed.
+.DFLTy
+.
 .It Sy MKDOC
 .YorN
 Indicates whether system documentation destined for

Index: src/share/mk/bsd.README
diff -u src/share/mk/bsd.README:1.430 src/share/mk/bsd.README:1.431
--- src/share/mk/bsd.README:1.430	Wed May 25 10:18:29 2022
+++ src/share/mk/bsd.README	Wed May 25 20:44:01 2022
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.README,v 1.430 2022/05/25 10:18:29 nia Exp $
+#	$NetBSD: bsd.README,v 1.431 2022/05/25 20:44:01 nia Exp $
 #	@(#)bsd.README	8.2 (Berkeley) 4/2/94
 
 This is the README file for the make "include" files for the NetBSD
@@ -201,6 +201,9 @@ MKDEPINCLUDES	If "yes" issue .include st
 		it is possibly slower.
 		Default "no"
 
+MKDHCPD		If "no", don't build or install dhcpd(8).
+		Default: yes
+
 MKDOC		If "no", don't build or install the documentation.
 		Default: yes
 

Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.1277 src/share/mk/bsd.own.mk:1.1278
--- src/share/mk/bsd.own.mk:1.1277	Wed May 25 10:18:29 2022
+++ src/share/mk/bsd.own.mk	Wed May 25 20:44:01 2022
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.own.mk,v 1.1277 2022/05/25 10:18:29 nia Exp $
+#	$NetBSD: bsd.own.mk,v 1.1278 2022/05/25 20:44:01 nia Exp $
 
 # This needs to be before bsd.init.mk
 .if defined(BSD_MK_COMPAT_FILE)
@@ -1150,6 +1150,7 @@ _MKVARS.yes= \
 	MKBINUTILS \
 	MKBSDTAR \
 	MKCOMPLEX MKCVS MKCXX \
+	MKDHCPD \
 	MKDOC MKDTC \
 	MKDYNAMICROOT \
 	MKGCC MKGDB MKGROFF \

Added files:

Index: src/etc/mtree/NetBSD.dist.dhcpd
diff -u /dev/null src/etc/mtree/NetBSD.dist.dhcpd:1.1
--- /dev/null	Wed May 25 20:44:02 2022
+++ src/etc/mtree/NetBSD.dist.dhcpd	Wed May 25 20:44:01 2022
@@ -0,0 +1,3 @@
+# $NetBSD: NetBSD.dist.dhcpd,v 1.1 2022/05/25 20:44:01 nia Exp $
+./usr/share/dhcpd
+./usr/share/examples/dhcp

Reply via email to