Index: lib/Makefile
===================================================================
--- lib/Makefile
+++ lib/Makefile
@@ -49,7 +49,6 @@
 	libevent \
 	libexecinfo \
 	libexpat \
-	libfetch \
 	libfigpar \
 	libgeom \
 	libifconfig \
@@ -124,7 +123,9 @@
 SUBDIR_DEPEND_libsmb= libkiconv
 SUBDIR_DEPEND_libtacplus= libmd
 SUBDIR_DEPEND_libulog= libmd
+.if ${MK_OPENSSL} != "no"
 SUBDIR_DEPEND_libunbound= ${_libldns}
+.endif
 SUBDIR_DEPEND_liblzma= ${_libthr}
 .if ${MK_OFED} != "no"
 SUBDIR_DEPEND_libpcap= ofed
@@ -141,6 +142,12 @@
 SUBDIR.${MK_CLANG}+=	clang
 .endif
 
+.if ${MK_OPENSSL} != "no"
+SUBDIR+= 		libfetch
+.endif
+.if ${MK_OPENSSL} != "no"
+SUBDIR.${MK_LDNS}+=	libldns
+.endif
 SUBDIR.${MK_CUSE}+= 	libcuse
 SUBDIR.${MK_CXX}+=	libdevdctl
 SUBDIR.${MK_TOOLCHAIN}+=libpe
@@ -150,7 +157,6 @@
 SUBDIR.${MK_GSSAPI}+=	libgssapi librpcsec_gss
 SUBDIR.${MK_ICONV}+=	libiconv_modules
 SUBDIR.${MK_KERBEROS_SUPPORT}+=	libcom_err
-SUBDIR.${MK_LDNS}+=	libldns
 
 # The libraries under libclang_rt can only be built by clang, and only make
 # sense to build when clang is enabled at all.  Furthermore, they can only be
@@ -197,16 +203,20 @@
 _libdl=		libdl
 .endif
 
-SUBDIR.${MK_OPENSSL}+=	libmp
+SUBDIR.${MK_OPENSSL}+=	libmp libfetch
 .if (${COMPILER_TYPE} == "clang" || (${COMPILER_TYPE} == "gcc" && ${COMPILER_VERSION} >= 60100 && ${MACHINE_CPUARCH} != "riscv"))
 SUBDIR.${MK_PMC}+=	libpmc libpmcstat
 .endif
 SUBDIR.${MK_RADIUS_SUPPORT}+=	libradius
 SUBDIR.${MK_SENDMAIL}+=	libmilter libsm libsmdb libsmutil
+.if ${MK_CRYPT} != "no" && ${MK_OPENSSL} != "no"
 SUBDIR.${MK_TELNET}+=	libtelnet
+.endif
 SUBDIR.${MK_TESTS_SUPPORT}+=	atf
 SUBDIR.${MK_TESTS}+=	tests
+.if ${MK_OPENSSL} != "no"
 SUBDIR.${MK_UNBOUND}+=	libunbound
+.endif
 SUBDIR.${MK_USB}+=	libusbhid libusb
 SUBDIR.${MK_OFED}+=	ofed
 SUBDIR.${MK_ZFS}+=	libbe
Index: libexec/Makefile
===================================================================
--- libexec/Makefile
+++ libexec/Makefile
@@ -54,9 +54,11 @@
 _comsat=	comsat
 .endif
 
+.if ${MK_OPENSSL} != "no"
 .if ${MK_DMAGENT} != "no"
 _dma=		dma
 .endif
+.endif
 
 .if ${MK_NIS} != "no"
 _mknetid=	mknetid
@@ -96,9 +98,11 @@
 SUBDIR+=	tcpd
 .endif
 
+.if ${MK_OPENSSL} != "no"
 .if ${MK_TELNET} != "no"
 _telnetd=	telnetd
 .endif
+.endif
 
 .if ${MK_TFTP} != "no"
 SUBDIR+=	tftpd
Index: tests/sys/Makefile
===================================================================
--- tests/sys/Makefile
+++ tests/sys/Makefile
@@ -13,7 +13,9 @@
 TESTS_SUBDIRS+=		fifo
 TESTS_SUBDIRS+=		file
 TESTS_SUBDIRS+=		fs
+.if ${MK_OPENSSL} != "no"
 TESTS_SUBDIRS+=		geom
+.endif
 TESTS_SUBDIRS+=		kern
 TESTS_SUBDIRS+=		kqueue
 TESTS_SUBDIRS+=		mac
Index: usr.bin/Makefile
===================================================================
--- usr.bin/Makefile
+++ usr.bin/Makefile
@@ -39,7 +39,6 @@
 	etdump \
 	expand \
 	false \
-	fetch \
 	find \
 	fmt \
 	fold \
@@ -99,7 +98,6 @@
 	mkuzip \
 	mt \
 	ncal \
-	netstat \
 	newgrp \
 	nfsstat \
 	nice \
@@ -221,12 +219,19 @@
 SUBDIR.${MK_ICONV}+=	iconv
 SUBDIR.${MK_ICONV}+=	mkcsmapper
 SUBDIR.${MK_ICONV}+=	mkesdb
+.if ${MK_INET} != "no" && ${MK_INET_SUPPORT} != "no"
+SUBDIR+=	netstat
+.endif
 SUBDIR.${MK_ISCSI}+=	iscsictl
 SUBDIR.${MK_KDUMP}+=	kdump
 SUBDIR.${MK_KDUMP}+=	truss
+.if ${MK_OPENSSL} != "no"
 SUBDIR.${MK_KERBEROS_SUPPORT}+=	compile_et
+.endif
+.if ${MK_OPENSSL} != "no"
 SUBDIR.${MK_LDNS_UTILS}+=	drill
 SUBDIR.${MK_LDNS_UTILS}+=	host
+.endif
 SUBDIR.${MK_LOCATE}+=	locate
 # XXX msgs?
 SUBDIR.${MK_MAIL}+=	biff
@@ -243,11 +248,14 @@
 SUBDIR.${MK_OPENSSL}+=	bc
 SUBDIR.${MK_OPENSSL}+=	chkey
 SUBDIR.${MK_OPENSSL}+=	dc
+SUBDIR.${MK_OPENSSL}+=	fetch
 SUBDIR.${MK_OPENSSL}+=	newkey
 SUBDIR.${MK_QUOTAS}+=	quota
 SUBDIR.${MK_SENDMAIL}+=	vacation
 SUBDIR.${MK_TALK}+=	talk
+.if ${MK_OPENSSL} != "no"
 SUBDIR.${MK_TELNET}+=	telnet
+.endif
 SUBDIR.${MK_TESTS}+=	tests
 SUBDIR.${MK_TEXTPROC}+=	ul
 SUBDIR.${MK_TFTP}+=	tftp
@@ -283,8 +291,10 @@
 SUBDIR.${MK_UTMPX}+=	users
 .endif
 SUBDIR.${MK_UTMPX}+=	who
+.if ${MK_OPENSSL} != "no" && ${MK_FILE} != "no"
 SUBDIR.${MK_SVN}+=	svn
 SUBDIR.${MK_SVNLITE}+=	svn
+.endif
 SUBDIR.${MK_OFED}+=	ofed
 
 # These are normally only handled for build-tools.
Index: usr.sbin/Makefile
===================================================================
--- usr.sbin/Makefile
+++ usr.sbin/Makefile
@@ -86,7 +86,6 @@
 	snapinfo \
 	spi \
 	spray \
-	syslogd \
 	sysrc \
 	tcpdrop \
 	tcpdump \
@@ -120,7 +119,9 @@
 SUBDIR.${MK_BLACKLIST}+=	blacklistd
 SUBDIR.${MK_BLUETOOTH}+=	bluetooth
 SUBDIR.${MK_BOOTPARAMD}+=	bootparamd
+.if ${MK_OPENSSL} != "no"
 SUBDIR.${MK_BSDINSTALL}+=	bsdinstall
+.endif
 SUBDIR.${MK_BSNMP}+=	bsnmpd
 SUBDIR.${MK_CTM}+=	ctm
 SUBDIR.${MK_CXGBETOOL}+=	cxgbetool
@@ -147,6 +148,7 @@
 SUBDIR.${MK_INET6}+=	rtadvd
 SUBDIR.${MK_INET6}+=	rtsold
 SUBDIR.${MK_INET6}+=	traceroute6
+SUBDIR.${MK_INET6_SUPPORT}+=	syslogd
 SUBDIR.${MK_INETD}+=	inetd
 SUBDIR.${MK_IPFW}+=	ipfwpcap
 SUBDIR.${MK_ISCSI}+=	iscsid
@@ -180,11 +182,16 @@
 SUBDIR.${MK_NIS}+=	yppush
 SUBDIR.${MK_NIS}+=	ypserv
 SUBDIR.${MK_NIS}+=	ypset
+SUBDIR.${MK_PF}+=	ftp-proxy
+.if ${MK_OPENSSL} != "no"
 SUBDIR.${MK_NTP}+=	ntp
+.endif
 SUBDIR.${MK_OPENSSL}+=	keyserv
 SUBDIR.${MK_PC_SYSINSTALL}+=	pc-sysinstall
 SUBDIR.${MK_PF}+=	ftp-proxy
+.if ${MK_OPENSSL} != "no"
 SUBDIR.${MK_PKGBOOTSTRAP}+=	pkg
+.endif
 .if (${COMPILER_TYPE} == "clang" || (${COMPILER_TYPE} == "gcc" && ${COMPILER_VERSION} >= 60100 && ${MACHINE_CPUARCH} != "riscv"))
 SUBDIR.${MK_PMC}+=	pmc
 SUBDIR.${MK_PMC}+=	pmcannotate
@@ -207,7 +214,9 @@
 SUBDIR.${MK_TIMED}+=	timed
 SUBDIR.${MK_TOOLCHAIN}+=	config
 SUBDIR.${MK_TOOLCHAIN}+=	crunch
+.if ${MK_OPENSSL} != "no"
 SUBDIR.${MK_UNBOUND}+=	unbound
+.endif
 SUBDIR.${MK_USB}+=	uathload
 SUBDIR.${MK_USB}+=	uhsoctl
 SUBDIR.${MK_USB}+=	usbconfig
@@ -217,7 +226,9 @@
 SUBDIR.${MK_UTMPX}+=	utx
 SUBDIR.${MK_WIRELESS}+=	ancontrol
 SUBDIR.${MK_WIRELESS}+=	wlandebug
+.if ${MK_OPENSSL} != "no"
 SUBDIR.${MK_WIRELESS}+=	wpa
+.endif
 
 SUBDIR.${MK_TESTS}+=	tests
 
Index: usr.sbin/syslogd/Makefile
===================================================================
--- usr.sbin/syslogd/Makefile
+++ usr.sbin/syslogd/Makefile
@@ -13,10 +13,10 @@
 
 LIBADD=	util
 
-.if ${MK_INET_SUPPORT} != "no"
+.if (${MK_INET} != "no" && ${MK_INET_SUPPORT} != "no")
 CFLAGS+= -DINET
 .endif
-.if ${MK_INET6_SUPPORT} != "no"
+.if (${MK_INET6} != "no" && ${MK_INET6_SUPPORT} != "no")
 CFLAGS+= -DINET6
 .endif