add new build knobs and jigger some existing controls to improve

control over the result of buildworld and installworld; this especially
helps packaging systems such as nanobsd

Reviewed by:	various (posted to arch)
MFC after:	1 month

5 files changed, 134 insertions, 36 deletions

diff --git a/etc/Makefile b/etc/Makefile
index 29e72aa..859ceed 100644
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -7,22 +7,19 @@
 SUBDIR=	sendmail
 .endif
 
-BIN1=	amd.map apmd.conf auth.conf \
+BIN1=	auth.conf \
 	crontab csh.cshrc csh.login csh.logout devd.conf devfs.conf \
-	ddb.conf dhclient.conf disktab fbtab freebsd-update.conf \
+	ddb.conf dhclient.conf disktab fbtab \
 	ftpusers gettytab group \
-	hosts hosts.allow hosts.equiv hosts.lpd \
+	hosts hosts.allow hosts.equiv \
 	inetd.conf libalias.conf login.access login.conf mac.conf motd \
 	netconfig network.subr networks newsyslog.conf nsswitch.conf \
-	portsnap.conf pf.os phones profile protocols \
+	phones profile protocols \
 	rc rc.bsdextended rc.firewall rc.firewall6 rc.initdiskless \
 	rc.sendmail rc.shutdown \
-	rc.subr regdomain.xml remote rpc services shells \
-	snmpd.config sysctl.conf syslog.conf \
-	etc.${MACHINE_ARCH}/ttys \
-	${.CURDIR}/../gnu/usr.bin/man/manpath/manpath.config \
-	${.CURDIR}/../usr.bin/mail/misc/mail.rc \
-	${.CURDIR}/../usr.bin/locate/locate/locate.rc
+	rc.subr remote rpc services shells \
+	sysctl.conf syslog.conf \
+	etc.${MACHINE_ARCH}/ttys
 
 OPENBSMDIR=			${.CURDIR}/../contrib/openbsm
 BSM_ETC_OPEN_FILES=		${OPENBSMDIR}/etc/audit_class \
@@ -32,12 +29,38 @@ BSM_ETC_RESTRICTED_FILES=	${OPENBSMDIR}/etc/audit_control \
 BSM_ETC_EXEC_FILES=		${OPENBSMDIR}/etc/audit_warn
 BSM_ETC_DIR=			${DESTDIR}/etc/security
 
+# NB: keep these sorted by MK_* knobs
+
+.if ${MK_AMD} != "no"
+BIN1+= amd.map
+.endif
+
+.if ${MK_APM} != "no"
+BIN1+= apmd.conf
+.endif
+
+.if ${MK_BSNMP} != "no"
+BIN1+= snmpd.config
+.endif
+
+.if ${MK_FREEBSD_UPDATE} != "no"
+BIN1+= freebsd-update.conf
+.endif
+
+.if ${MK_LOCATE} != "no"
+BIN1+=	${.CURDIR}/../usr.bin/locate/locate/locate.rc
+.endif
+
 .if ${MK_LPR} != "no"
-BIN1+=	printcap
+BIN1+=	hosts.lpd printcap
 .endif
 
-.if ${MK_NS_CACHING} != "no"
-BIN1+= nscd.conf
+.if ${MK_MAIL} != "no"
+BIN1+=	${.CURDIR}/../usr.bin/mail/misc/mail.rc
+.endif
+
+.if ${MK_MAN} != "no"
+BIN1+=	${.CURDIR}/../gnu/usr.bin/man/manpath/manpath.config
 .endif
 
 .if ${MK_OPENSSH} != "no"
@@ -49,6 +72,18 @@ SSH=	${.CURDIR}/../crypto/openssh/ssh_config \
 SSL=	${.CURDIR}/../crypto/openssl/apps/openssl.cnf
 .endif
 
+.if ${MK_NS_CACHING} != "no"
+BIN1+= nscd.conf
+.endif
+
+.if ${MK_PORTSNAP} != "no"
+BIN1+= portsnap.conf
+.endif
+
+.if ${MK_PF} != "no"
+BIN1+= pf.os
+.endif
+
 # -rwxr-xr-x root:wheel, for the new cron root:wheel
 BIN2=	netstart pccard_ether rc.suspend rc.resume
 
@@ -112,7 +147,9 @@ distribution:
 		master.passwd nsmb.conf opieaccess ${DESTDIR}/etc; \
 	    pwd_mkdb ${PWD_MKDB_ENDIAN} -i -p -d ${DESTDIR}/etc \
 		${DESTDIR}/etc/master.passwd
+.if ${MK_BLUETOOTH} != "no"
 	${_+_}cd ${.CURDIR}/bluetooth; ${MAKE} install
+.endif
 	${_+_}cd ${.CURDIR}/defaults; ${MAKE} install
 	${_+_}cd ${.CURDIR}/gss; ${MAKE} install
 	${_+_}cd ${.CURDIR}/periodic; ${MAKE} install
@@ -164,8 +201,11 @@ distribution:
 	    ln ${DESTDIR}/root/.profile ${DESTDIR}/.profile
 	cd ${.CURDIR}/mtree; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 \
 	    ${MTREE} ${DESTDIR}/etc/mtree
+.if ${MK_PPP} != "no"
 	cd ${.CURDIR}/ppp; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 600 \
 	    ${PPPCNF} ${DESTDIR}/etc/ppp
+.endif
+.if ${MK_MAIL} != "no"
 	cd ${.CURDIR}/mail; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \
 	    ${ETCMAIL} ${DESTDIR}/etc/mail
 	@if [ -d ${DESTDIR}/etc/mail -a -f ${DESTDIR}/etc/mail/aliases -a \
@@ -173,6 +213,7 @@ distribution:
 		set -x; \
 		ln -s mail/aliases ${DESTDIR}/etc/aliases; \
 	fi
+.endif
 	${INSTALL} -o ${BINOWN} -g operator -m 664 /dev/null \
 	    ${DESTDIR}/etc/dumpdates
 	${INSTALL} -o nobody -g ${BINGRP} -m 644 /dev/null \
diff --git a/etc/periodic/daily/Makefile b/etc/periodic/daily/Makefile
index 5e25f90..80583a1 100644
--- a/etc/periodic/daily/Makefile
+++ b/etc/periodic/daily/Makefile
@@ -1,15 +1,11 @@
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 FILES=	100.clean-disks \
 	110.clean-tmps \
 	120.clean-preserve \
-	130.clean-msgs \
-	140.clean-rwho \
-	150.clean-hoststat \
 	200.backup-passwd \
-	210.backup-aliases \
-	300.calendar \
-	310.accounting \
 	330.news \
 	400.status-disks \
 	404.status-zfs \
@@ -19,13 +15,42 @@ FILES=	100.clean-disks \
 	408.status-gstripe \
 	409.status-gconcat \
 	420.status-network \
-	430.status-rwho \
-	440.status-mailq \
 	450.status-security \
-	460.status-mail-rejects \
-	470.status-named \
-	480.status-ntpd \
-	500.queuerun \
 	999.local
 
+# NB: keep these sorted by MK_* knobs
+
+.if ${MK_ACCT} != "no"
+FILES+=	310.accounting
+.endif
+
+.if ${MK_BIND_NAMED} != "no"
+FILES+=	470.status-named
+.endif
+
+.if ${MK_CALENDAR} != "no"
+FILES+=	300.calendar
+.endif
+
+.if ${MK_MAIL} != "no"
+FILES+=	130.clean-msgs
+.endif
+
+.if ${MK_NTP} != "no"
+FILES+=	480.status-ntpd
+.endif
+
+.if ${MK_RCMDS} != "no"
+FILES+=	140.clean-rwho \
+	430.status-rwho
+.endif
+
+.if ${MK_SENDMAIL} != "no"
+FILES+=	150.clean-hoststat \
+	210.backup-aliases \
+	440.status-mailq \
+	460.status-mail-rejects \
+	500.queuerun
+.endif
+
 .include <bsd.prog.mk>
diff --git a/etc/periodic/monthly/Makefile b/etc/periodic/monthly/Makefile
index c213230..1e71afd 100644
--- a/etc/periodic/monthly/Makefile
+++ b/etc/periodic/monthly/Makefile
@@ -1,6 +1,13 @@
 # $FreeBSD$
 
-FILES=	200.accounting \
-	999.local
+.include <bsd.own.mk>
+
+FILES=	999.local
+
+# NB: keep these sorted by MK_* knobs
+
+.if ${MK_ACCT} != "no"
+FILES+=	200.accounting
+.endif
 
 .include <bsd.prog.mk>
diff --git a/etc/periodic/security/Makefile b/etc/periodic/security/Makefile
index c7a9b2b..e1d6dfd 100644
--- a/etc/periodic/security/Makefile
+++ b/etc/periodic/security/Makefile
@@ -1,17 +1,30 @@
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 FILES=	100.chksetuid \
 	200.chkmounts \
 	300.chkuid0 \
 	400.passwdless \
 	410.logincheck \
-	500.ipfwdenied \
-	510.ipfdenied \
-	520.pfdenied \
-	550.ipfwlimit \
 	700.kernelmsg \
 	800.loginfail \
 	900.tcpwrap \
 	security.functions
 
+# NB: keep these sorted by MK_* knobs
+
+.if ${MK_IPFILTER} != "no"
+FILES+=	510.ipfdenied
+.endif
+
+.if ${MK_IPFW} != "no"
+FILES+=	500.ipfwdenied \
+	550.ipfwlimit
+.endif
+
+.if ${MK_PF} != "no"
+FILES+=	520.pfdenied
+.endif
+
 .include <bsd.prog.mk>
diff --git a/etc/periodic/weekly/Makefile b/etc/periodic/weekly/Makefile
index bc97fa9..463520f 100644
--- a/etc/periodic/weekly/Makefile
+++ b/etc/periodic/weekly/Makefile
@@ -1,10 +1,22 @@
 # $FreeBSD$
 
-FILES=	310.locate \
-	320.whatis \
-	330.catman \
-	340.noid \
-	400.status-pkg \
+.include <bsd.own.mk>
+
+FILES=	340.noid \
 	999.local
 
+# NB: keep these sorted by MK_* knobs
+
+.if ${MK_LOCATE} != "no"
+FILES+=	310.locate
+.endif
+
+.if ${MK_MAN} != "no"
+FILES+=	320.whatis 330.catman
+.endif
+
+.if ${MK_PKGTOOLS} != "no"
+FLES+=	400.status-pkg
+.endif
+
 .include <bsd.prog.mk>