Merging ^/head r278224 through r278297.

2 files changed, 67 insertions, 17 deletions

diff --git a/etc/Makefile b/etc/Makefile
index 4a13abe..79ffb99 100644
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -44,7 +44,6 @@ BIN1=	crontab \
 	rc.bsdextended \
 	rc.firewall \
 	rc.initdiskless \
-	rc.sendmail \
 	rc.shutdown \
 	rc.subr \
 	remote \
@@ -144,6 +143,10 @@ BIN1+= portsnap.conf
 BIN1+= pf.os
 .endif
 
+.if ${MK_SENDMAIL} != "no"
+BIN1+=	rc.sendmail
+.endif
+
 .if ${MK_TCSH} != "no"
 BIN1+= csh.cshrc csh.login csh.logout
 .endif
@@ -254,7 +257,9 @@ distribution:
 .endif
 	${_+_}cd ${.CURDIR}/gss; ${MAKE} install
 	${_+_}cd ${.CURDIR}/periodic; ${MAKE} install
+.if ${MK_PKGBOOTSTRAP} != "no"
 	${_+_}cd ${.CURDIR}/pkg; ${MAKE} install
+.endif
 	${_+_}cd ${.CURDIR}/rc.d; ${MAKE} install
 	${_+_}cd ${.CURDIR}/../share/termcap; ${MAKE} etc-termcap
 	${_+_}cd ${.CURDIR}/../usr.sbin/rmt; ${MAKE} etc-rmt
@@ -316,8 +321,10 @@ distribution:
 .endif
 	${INSTALL} -o ${BINOWN} -g operator -m 664 /dev/null \
 	    ${DESTDIR}/etc/dumpdates
+.if ${MK_LOCATE} != "no"
 	${INSTALL} -o nobody -g ${BINGRP} -m 644 /dev/null \
 	    ${DESTDIR}/var/db/locate.database
+.endif
 	${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 ${.CURDIR}/minfree \
 	    ${DESTDIR}/var/crash
 	cd ${.CURDIR}/..; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 \
@@ -385,6 +392,7 @@ distrib-dirs: ${MTREES:N/*}
 	done; true
 .endif
 	${INSTALL_SYMLINK} usr/src/sys ${DESTDIR}/sys
+.if ${MK_MAN} != "no"
 	cd ${DESTDIR}/usr/share/man; \
 	for mandir in man*; do \
 		${INSTALL_SYMLINK} ../$$mandir \
@@ -392,23 +400,30 @@ distrib-dirs: ${MTREES:N/*}
 		${INSTALL_SYMLINK} ../$$mandir \
 		    ${DESTDIR}/usr/share/man/en.UTF-8/; \
 	done
+.if ${MK_OPENSSL} != "no"
 	cd ${DESTDIR}/usr/share/openssl/man; \
 	for mandir in man*; do \
 		${INSTALL_SYMLINK} ../$$mandir \
 		    ${DESTDIR}/usr/share/openssl/man/en.ISO8859-1/; \
 	done
+.endif
 	set - `grep "^[a-zA-Z]" ${.CURDIR}/man.alias`; \
 	while [ $$# -gt 0 ] ; do \
 		${INSTALL_SYMLINK} "$$2" "${DESTDIR}/usr/share/man/$$1"; \
-		${INSTALL_SYMLINK} "$$2" \
-		    "${DESTDIR}/usr/share/openssl/man/$$1"; \
+		if [ "${MK_OPENSSL}" != "no" ]; then \
+			${INSTALL_SYMLINK} "$$2" \
+			    "${DESTDIR}/usr/share/openssl/man/$$1"; \
+		fi; \
 		shift; shift; \
 	done
+.endif
+.if ${MK_NLS} != "no"
 	set - `grep "^[a-zA-Z]" ${.CURDIR}/nls.alias`; \
 	while [ $$# -gt 0 ] ; do \
 		${INSTALL_SYMLINK} "$$2" "${DESTDIR}/usr/share/nls/$$1"; \
 		shift; shift; \
 	done
+.endif
 
 etc-examples:
 	cd ${.CURDIR}; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 \
diff --git a/etc/rc.d/Makefile b/etc/rc.d/Makefile
index 94e6721..8c37a30 100644
--- a/etc/rc.d/Makefile
+++ b/etc/rc.d/Makefile
@@ -19,7 +19,6 @@ FILES=	DAEMON \
 	auditdistd \
 	bgfsck \
 	${_bluetooth} \
-	bootparams \
 	bridge \
 	${_bthidd} \
 	${_casperd} \
@@ -35,7 +34,6 @@ FILES=	DAEMON \
 	dmesg \
 	dumpon \
 	fsck \
-	ftpd \
 	gbde \
 	geli \
 	geli2 \
@@ -46,7 +44,6 @@ FILES=	DAEMON \
 	hostid \
 	hostid_save \
 	hostname \
-	inetd \
 	ip6addrctl \
 	ipfilter \
 	ipfs \
@@ -72,7 +69,6 @@ FILES=	DAEMON \
 	mdconfig \
 	mdconfig2 \
 	mountd \
-	moused \
 	mroute6d \
 	msgs \
 	natd \
@@ -87,14 +83,11 @@ FILES=	DAEMON \
 	nisdomain \
 	${_nscd} \
 	nsswitch \
-	ntpd \
 	ntpdate \
 	${_opensm} \
-	othermta \
 	pf \
 	pflog \
 	pfsync \
-	powerd \
 	ppp \
 	pppoed \
 	pwcheck \
@@ -124,17 +117,14 @@ FILES=	DAEMON \
 	stf \
 	swap \
 	swaplate \
-	syscons \
 	sysctl \
 	syslogd \
-	timed \
 	tmp \
 	${_ubthidhci} \
 	ugidfw \
 	${_unbound} \
 	${_utx} \
 	var \
-	virecover \
 	watchdogd \
 	ypbind \
 	yppasswdd \
@@ -153,6 +143,10 @@ FILES+=		accounting
 FILES+=		power_profile
 .endif
 
+.if ${MK_ACPI} != "no" || ${MK_APM} != "no"
+FILES+=		powerd
+.endif
+
 .if ${MK_AMD} != "no"
 FILES+=		amd
 .endif
@@ -175,6 +169,10 @@ _hcsecd=	hcsecd
 _ubthidhci=	ubthidhci
 .endif
 
+.if ${MK_BOOTPARAMD} != "no"
+FILES+=		bootparams
+.endif
+
 .if ${MK_BSNMP} != "no"
 FILES+=		bsnmpd
 .endif
@@ -187,10 +185,18 @@ _casperd=	casperd
 FILES+=		ccd
 .endif
 
+.if ${MK_FTP} != "no"
+FILES+=		ftpd
+.endif
+
 .if ${MK_HAST} != "no"
 FILES+=		hastd
 .endif
 
+.if ${MK_INETD} != "no"
+FILES+=		inetd
+.endif
+
 .if ${MK_ISCSI} != "no"
 FILES+=		iscsictl
 FILES+=		iscsid
@@ -200,12 +206,13 @@ FILES+=		iscsid
 FILES+=	jail
 .endif
 
-.if ${MK_LPR} != "no"
-FILES+=		lpd
+.if ${MK_LEGACY_CONSOLE} != "no"
+FILES+=		moused
+FILES+=		syscons
 .endif
 
-.if ${MK_NS_CACHING} != "no"
-_nscd=		nscd
+.if ${MK_LPR} != "no"
+FILES+=		lpd
 .endif
 
 .if ${MK_KERBEROS} != "no"
@@ -217,6 +224,18 @@ _kfd=		kfd
 _kpasswdd=	kpasswdd
 .endif
 
+.if ${MK_MAIL} != "no"
+FILES+=		othermta
+.endif
+
+.if ${MK_NS_CACHING} != "no"
+_nscd=		nscd
+.endif
+
+.if ${MK_NTP} != "no"
+FILES+=		ntpd
+.endif
+
 .if ${MK_OFED} != "no"
 _opensm=	opensm
 .endif
@@ -237,6 +256,18 @@ FILES+=		ftp-proxy
 FILES+=		rwho
 .endif
 
+.if ${MK_ROUTED} != "no"
+FILES+=		routed
+.endif
+
+.if ${MK_SENDMAIL} != "no"
+FILES+=		sendmail
+.endif
+
+.if ${MK_TIMED} != "no"
+FILES+=		timed
+.endif
+
 .if ${MK_UNBOUND} != "no"
 _unbound=	local_unbound
 .endif
@@ -245,6 +276,10 @@ _unbound=	local_unbound
 _utx=		utx
 .endif
 
+.if ${MK_VI} != "no"
+FILES+=		virecover
+.endif
+
 .if ${MK_WIRELESS} != "no"
 FILES+=		hostapd
 FILES+=		wpa_supplicant