Add the following options to enable/disable several features in the base system

WITHOUT_BOOTPARAMD - bootparamd
WITHOUT_BOOTPD - bootpd
WITHOUT_FINGER - finger, fingerd
WITHOUT_FTP - ftp, ftpd
WITHOUT_INETD - inetd
WITHOUT_RBOOTD - rbootd
WITHOUT_TCP_WRAPPERS - tcpd, et al
WITHOUT_TFTP - tftp, tftp-server
WITHOUT_TIMED - timed

MFC after: 2 weeks
Sponsored by: EMC / Isilon Storage Division

14 files changed, 104 insertions, 16 deletions

diff --git a/etc/Makefile b/etc/Makefile
index b27542a..4a13abe 100644
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -21,13 +21,11 @@ BIN1=	crontab \
 	dhclient.conf \
 	disktab \
 	fbtab \
-	ftpusers \
 	gettytab \
 	group \
 	hosts \
 	hosts.allow \
 	hosts.equiv \
-	inetd.conf \
 	libalias.conf \
 	libmap.conf \
 	login.access \
@@ -101,6 +99,14 @@ BIN1+= snmpd.config
 BIN1+= freebsd-update.conf
 .endif
 
+.if ${MK_FTP} != "no"
+BIN1+= ftpusers
+.endif
+
+.if ${MK_INETD} != "no"
+BIN1+= inetd.conf
+.endif
+
 .if ${MK_LOCATE} != "no"
 BIN1+=	${.CURDIR}/../usr.bin/locate/locate/locate.rc
 .endif
diff --git a/libexec/Makefile b/libexec/Makefile
index c8b5386..27d245e 100644
--- a/libexec/Makefile
+++ b/libexec/Makefile
@@ -5,18 +5,14 @@
 
 SUBDIR=	${_atf} \
 	${_atrun} \
-	bootpd \
 	${_casper} \
 	${_comsat} \
 	${_dma} \
 	${_dma-mbox-create} \
-	fingerd \
-	ftpd \
 	getty \
 	${_mail.local} \
 	${_mknetid} \
 	${_pppoed} \
-	rbootd \
 	revnetgroup \
 	${_rlogind} \
 	rpc.rquotad \
@@ -28,10 +24,8 @@ SUBDIR=	${_atf} \
 	${_rtld-elf} \
 	save-entropy \
 	${_smrsh} \
-	tcpd \
 	${_telnetd} \
 	${_tests} \
-	tftpd \
 	${_tftp-proxy} \
 	ulog-helper \
 	${_ypxfr}
@@ -40,10 +34,22 @@ SUBDIR=	${_atf} \
 _atrun=		atrun
 .endif
 
+.if ${MK_BOOTPD} != "no"
+SUBDIR+=	bootpd
+.endif
+
 .if ${MK_CASPER} != "no"
 _casper=	casper
 .endif
 
+.if ${MK_FINGER} != "no"
+SUBDIR+=	fingerd
+.endif
+
+.if ${MK_FTP} != "no"
+SUBDIR+=	ftpd
+.endif
+
 .if ${MK_MAIL} != "no"
 _comsat=	comsat
 .endif
@@ -70,6 +76,10 @@ _tftp-proxy=	tftp-proxy
 _rtld-elf=	rtld-elf
 .endif
 
+.if ${MK_RBOOTD} != "no"
+SUBDIR+=	rbootd
+.endif
+
 .if ${MK_RCMDS} != "no"
 _rlogind=	rlogind
 _rshd=		rshd
@@ -84,10 +94,18 @@ _smrsh=		smrsh
 SUBDIR+=	talkd
 .endif
 
+.if ${MK_TCP_WRAPPERS} != "no"
+SUBDIR+=	tcpd
+.endif
+
 .if ${MK_TELNET} != "no"
 _telnetd=	telnetd
 .endif
 
+.if ${MK_TFTP} != "no"
+SUBDIR+=	tftpd
+.endif
+
 .if ${MK_TESTS} != "no"
 _atf=		atf
 _tests=		tests
diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk
index a276475..d308c4d 100644
--- a/share/mk/src.opts.mk
+++ b/share/mk/src.opts.mk
@@ -58,6 +58,8 @@ __DEFAULT_YES_OPTIONS = \
     BINUTILS_BOOTSTRAP \
     BLUETOOTH \
     BOOT \
+    BOOTPARAMD \
+    BOOTPD \
     BSD_CPIO \
     BSDINSTALL \
     BSNMP \
@@ -81,11 +83,13 @@ __DEFAULT_YES_OPTIONS = \
     ELFTOOLCHAIN_TOOLS \
     EXAMPLES \
     FDT \
+    FINGER \
     FLOPPY \
     FMTREE \
     FORTH \
     FP_LIBC \
     FREEBSD_UPDATE \
+    FTP \
     GAMES \
     GCOV \
     GDB \
@@ -100,6 +104,7 @@ __DEFAULT_YES_OPTIONS = \
     ICONV \
     INET \
     INET6 \
+    INETD \
     IPFILTER \
     IPFW \
     ISCSI \
@@ -137,6 +142,7 @@ __DEFAULT_YES_OPTIONS = \
     QUOTAS \
     RADIUS_SUPPORT \
     RCMDS \
+    RBOOTD \
     RCS \
     RESCUE \
     ROUTED \
@@ -151,10 +157,13 @@ __DEFAULT_YES_OPTIONS = \
     SYSCONS \
     SYSINSTALL \
     TALK \
+    TCP_WRAPPERS \
     TCSH \
     TELNET \
     TESTS \
     TEXTPROC \
+    TFTP \
+    TIMED \
     UNBOUND \
     USB \
     UTMPX \
diff --git a/tools/build/options/WITHOUT_BOOTPARAMD b/tools/build/options/WITHOUT_BOOTPARAMD
new file mode 100644
index 0000000..f996083
--- /dev/null
+++ b/tools/build/options/WITHOUT_BOOTPARAMD
@@ -0,0 +1,3 @@
+.\" $FreeBSD$
+Set to not build or install
+.Xr bootparamd 8 .
diff --git a/tools/build/options/WITHOUT_BOOTPD b/tools/build/options/WITHOUT_BOOTPD
new file mode 100644
index 0000000..6733d5a
--- /dev/null
+++ b/tools/build/options/WITHOUT_BOOTPD
@@ -0,0 +1,3 @@
+.\" $FreeBSD$
+Set to not build or install
+.Xr bootpd 8 .
diff --git a/tools/build/options/WITHOUT_FINGER b/tools/build/options/WITHOUT_FINGER
new file mode 100644
index 0000000..7f65408
--- /dev/null
+++ b/tools/build/options/WITHOUT_FINGER
@@ -0,0 +1,5 @@
+.\" $FreeBSD$
+Set to not build or install
+.Xr finger 1
+and
+.Xr fingerd 8 .
diff --git a/tools/build/options/WITHOUT_FTP b/tools/build/options/WITHOUT_FTP
new file mode 100644
index 0000000..5e0fc8e
--- /dev/null
+++ b/tools/build/options/WITHOUT_FTP
@@ -0,0 +1,5 @@
+.\" $FreeBSD$
+Set to not build or install
+.Xr ftp 1
+and
+.Xr ftpd 8 .
diff --git a/tools/build/options/WITHOUT_INETD b/tools/build/options/WITHOUT_INETD
new file mode 100644
index 0000000..b4fe5dc
--- /dev/null
+++ b/tools/build/options/WITHOUT_INETD
@@ -0,0 +1,3 @@
+.\" $FreeBSD$
+Set to not build
+.Xr inetd 8 .
diff --git a/tools/build/options/WITHOUT_RBOOTD b/tools/build/options/WITHOUT_RBOOTD
new file mode 100644
index 0000000..f7c33e1
--- /dev/null
+++ b/tools/build/options/WITHOUT_RBOOTD
@@ -0,0 +1,3 @@
+.\" $FreeBSD$
+Set to not build or install
+.Xr rbootd 8 .
diff --git a/tools/build/options/WITHOUT_TCP_WRAPPERS b/tools/build/options/WITHOUT_TCP_WRAPPERS
new file mode 100644
index 0000000..7c41198
--- /dev/null
+++ b/tools/build/options/WITHOUT_TCP_WRAPPERS
@@ -0,0 +1,4 @@
+.\" $FreeBSD$
+Set to not build or install
+.Xr tcpd 8 ,
+and related utilities.
diff --git a/tools/build/options/WITHOUT_TFTP b/tools/build/options/WITHOUT_TFTP
new file mode 100644
index 0000000..bdb51ac
--- /dev/null
+++ b/tools/build/options/WITHOUT_TFTP
@@ -0,0 +1,5 @@
+.\" $FreeBSD$
+Set to not build or install
+.Xr tftp 1
+and
+.Xr tftpd 8 .
diff --git a/tools/build/options/WITHOUT_TIMED b/tools/build/options/WITHOUT_TIMED
new file mode 100644
index 0000000..a1f4c68
--- /dev/null
+++ b/tools/build/options/WITHOUT_TIMED
@@ -0,0 +1,3 @@
+.\" $FreeBSD$
+Set to not build or install
+.Xr timed 8 .
diff --git a/usr.bin/Makefile b/usr.bin/Makefile
index fbe87bd..70e1316 100644
--- a/usr.bin/Makefile
+++ b/usr.bin/Makefile
@@ -50,12 +50,10 @@ SUBDIR=	${_addr2line} \
 	fetch \
 	file \
 	find \
-	finger \
 	fmt \
 	fold \
 	fstat \
 	fsync \
-	ftp \
 	gcore \
 	gencat \
 	getconf \
@@ -166,7 +164,6 @@ SUBDIR=	${_addr2line} \
 	tcopy \
 	tee \
 	${_tests} \
-	tftp \
 	time \
 	timeout \
 	tip \
@@ -249,10 +246,18 @@ _size=		size
 _strings=	strings
 .endif
 
+.if ${MK_FINGER} != "no"
+SUBDIR+=	finger
+.endif
+
 .if ${MK_FMAKE} != "no"
 SUBDIR+=	make
 .endif
 
+.if ${MK_FTP} != "no"
+SUBDIR+=	ftp
+.endif
+
 .if ${MK_GPL_DTC} != "yes"
 SUBDIR+=	dtc
 .endif
@@ -365,6 +370,10 @@ SUBDIR+=	colcrt
 SUBDIR+=	ul
 .endif
 
+.if ${MK_TFTP} != "no"
+SUBDIR+=	tftp
+.endif
+
 .if ${MK_TOOLCHAIN} != "no"
 SUBDIR+=	ar
 SUBDIR+=	c89
diff --git a/usr.sbin/Makefile b/usr.sbin/Makefile
index 79e4909..918678b 100644
--- a/usr.sbin/Makefile
+++ b/usr.sbin/Makefile
@@ -6,7 +6,6 @@
 SUBDIR=	adduser \
 	arp \
 	binmiscctl \
-	bootparamd \
 	bsdconfig \
 	cdcontrol \
 	chkgrp \
@@ -34,7 +33,6 @@ SUBDIR=	adduser \
 	gstat \
 	i2c \
 	ifmcstat \
-	inetd \
 	iostat \
 	kldxref \
 	mailwrapper \
@@ -82,11 +80,8 @@ SUBDIR=	adduser \
 	spray \
 	syslogd \
 	sysrc \
-	tcpdchk \
-	tcpdmatch \
 	tcpdrop \
 	tcpdump \
-	timed \
 	traceroute \
 	trpt \
 	tzsetup \
@@ -131,6 +126,10 @@ SUBDIR+=	autofs
 SUBDIR+=	bluetooth
 .endif
 
+.if ${MK_BOOTPARAMD} != "no"
+SUBDIR+=	bootparamd
+.endif
+
 .if ${MK_BSDINSTALL} != "no"
 SUBDIR+=	bsdinstall
 .endif
@@ -179,6 +178,10 @@ SUBDIR+=	rtsold
 SUBDIR+=	traceroute6
 .endif
 
+.if ${MK_INETD} != "no"
+SUBDIR+=	inetd
+.endif
+
 .if ${MK_IPFW} != "no"
 SUBDIR+=	ipfwpcap
 .endif
@@ -300,10 +303,19 @@ SUBDIR+=	praliases
 SUBDIR+=	sendmail
 .endif
 
+.if ${MK_TCP_WRAPPERS} != "no"
+SUBDIR+=	tcpdchk
+SUBDIR+=	tcpdmatch
+.endif
+
 .if ${MK_TESTS} != "no"
 SUBDIR+=	tests
 .endif
 
+.if ${MK_TIMED} != "no"
+SUBDIR+=	timed
+.endif
+
 .if ${MK_TOOLCHAIN} != "no"
 SUBDIR+=	config
 SUBDIR+=	crunch