diff --git a/share/man/man5/src.conf.5 b/share/man/man5/src.conf.5
index 0bb83c7c6810..2fc7b4caa711 100644
--- a/share/man/man5/src.conf.5
+++ b/share/man/man5/src.conf.5
@@ -1,6 +1,6 @@
 .\" DO NOT EDIT-- this file is @generated by tools/build/options/makeman.
 .\" $FreeBSD$
-.Dd June 22, 2018
+.Dd June 27, 2018
 .Dt SRC.CONF 5
 .Os
 .Sh NAME
@@ -183,11 +183,13 @@ Set this if you do not want to build
 .Xr blacklistd 8
 and
 .Xr blacklistctl 8 .
-When set, it enforces these options:
+When set, these options are also in effect:
 .Pp
-.Bl -item -compact
-.It
-.Va WITHOUT_BLACKLIST_SUPPORT
+.Bl -inset -compact
+.It Va WITHOUT_BLACKLIST_SUPPORT
+(unless
+.Va WITH_BLACKLIST_SUPPORT
+is set explicitly)
 .El
 .It Va WITHOUT_BLACKLIST_SUPPORT
 Set to build some programs without
@@ -228,11 +230,13 @@ Set to not build contributed bzip2 software as a part of the base system.
 .Bf -symbolic
 The option has no effect yet.
 .Ef
-When set, it enforces these options:
+When set, these options are also in effect:
 .Pp
-.Bl -item -compact
-.It
-.Va WITHOUT_BZIP2_SUPPORT
+.Bl -inset -compact
+.It Va WITHOUT_BZIP2_SUPPORT
+(unless
+.Va WITH_BZIP2_SUPPORT
+is set explicitly)
 .El
 .It Va WITHOUT_BZIP2_SUPPORT
 Set to build some programs without optional bzip2 support.
@@ -317,6 +321,39 @@ When set, it enforces these options:
 .It
 .Va WITHOUT_LLVM_COV
 .El
+.Pp
+When set, these options are also in effect:
+.Pp
+.Bl -inset -compact
+.It Va WITHOUT_LLVM_TARGET_AARCH64
+(unless
+.Va WITH_LLVM_TARGET_AARCH64
+is set explicitly)
+.It Va WITHOUT_LLVM_TARGET_ALL
+(unless
+.Va WITH_LLVM_TARGET_ALL
+is set explicitly)
+.It Va WITHOUT_LLVM_TARGET_ARM
+(unless
+.Va WITH_LLVM_TARGET_ARM
+is set explicitly)
+.It Va WITHOUT_LLVM_TARGET_MIPS
+(unless
+.Va WITH_LLVM_TARGET_MIPS
+is set explicitly)
+.It Va WITHOUT_LLVM_TARGET_POWERPC
+(unless
+.Va WITH_LLVM_TARGET_POWERPC
+is set explicitly)
+.It Va WITHOUT_LLVM_TARGET_SPARC
+(unless
+.Va WITH_LLVM_TARGET_SPARC
+is set explicitly)
+.It Va WITHOUT_LLVM_TARGET_X86
+(unless
+.Va WITH_LLVM_TARGET_X86
+is set explicitly)
+.El
 .It Va WITH_CLANG
 Set to build the Clang C/C++ compiler during the normal phase of the build.
 .Pp
@@ -405,8 +442,6 @@ When set, it enforces these options:
 .It
 .Va WITHOUT_KERBEROS
 .It
-.Va WITHOUT_KERBEROS_SUPPORT
-.It
 .Va WITHOUT_OPENSSH
 .It
 .Va WITHOUT_OPENSSL
@@ -470,8 +505,6 @@ When set, it enforces these options:
 .Va WITHOUT_LLVM_COV
 .It
 .Va WITHOUT_TESTS
-.It
-.Va WITHOUT_TESTS_SUPPORT
 .El
 .It Va WITH_CXX
 Set to build
@@ -860,13 +893,6 @@ and
 .Xr truss 1 .
 .It Va WITHOUT_KERBEROS
 Set this to not build Kerberos 5 (KTH Heimdal).
-When set, it enforces these options:
-.Pp
-.Bl -item -compact
-.It
-.Va WITHOUT_KERBEROS_SUPPORT
-.El
-.Pp
 When set, these options are also in effect:
 .Pp
 .Bl -inset -compact
@@ -874,6 +900,10 @@ When set, these options are also in effect:
 (unless
 .Va WITH_GSSAPI
 is set explicitly)
+.It Va WITHOUT_KERBEROS_SUPPORT
+(unless
+.Va WITH_KERBEROS_SUPPORT
+is set explicitly)
 .El
 .It Va WITHOUT_KERBEROS_SUPPORT
 Set to build some programs without Kerberos support, like
@@ -897,11 +927,13 @@ library as a part of the base system.
 .Bf -symbolic
 The option has no effect yet.
 .Ef
-When set, it enforces these options:
+When set, these options are also in effect:
 .Pp
-.Bl -item -compact
-.It
-.Va WITHOUT_KVM_SUPPORT
+.Bl -inset -compact
+.It Va WITHOUT_KVM_SUPPORT
+(unless
+.Va WITH_KVM_SUPPORT
+is set explicitly)
 .El
 .It Va WITHOUT_KVM_SUPPORT
 Set to build some programs without optional
@@ -1021,61 +1053,134 @@ This is a default setting on
 amd64/amd64, arm64/aarch64, i386/i386, mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32, mips/mipselhf, mips/mipshf, mips/mips64elhf, mips/mips64hf, riscv/riscv64 and riscv/riscv64sf.
 .It Va WITHOUT_LLVM_TARGET_AARCH64
 Set to not build LLVM target support for AArch64.
+The
+.Va LLVM_TARGET_ALL
+option should be used rather than this in most cases.
 .Pp
 This is a default setting on
 riscv/riscv64, riscv/riscv64sf and sparc64/sparc64.
 .It Va WITH_LLVM_TARGET_AARCH64
 Set to build LLVM target support for AArch64.
+The
+.Va LLVM_TARGET_ALL
+option should be used rather than this in most cases.
+.Pp
+This is a default setting on
+amd64/amd64, arm/arm, arm/armeb, arm/armv6, arm/armv7, arm64/aarch64, i386/i386, mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32, mips/mipselhf, mips/mipshf, mips/mips64elhf, mips/mips64hf, powerpc/powerpc, powerpc/powerpc64 and powerpc/powerpcspe.
+.It Va WITHOUT_LLVM_TARGET_ALL
+Set to only build the required LLVM target support.
+This option is preferred to specific target support options.
+.Pp
+This is a default setting on
+riscv/riscv64, riscv/riscv64sf and sparc64/sparc64.
+When set, these options are also in effect:
+.Pp
+.Bl -inset -compact
+.It Va WITHOUT_LLVM_TARGET_AARCH64
+(unless
+.Va WITH_LLVM_TARGET_AARCH64
+is set explicitly)
+.It Va WITHOUT_LLVM_TARGET_ARM
+(unless
+.Va WITH_LLVM_TARGET_ARM
+is set explicitly)
+.It Va WITHOUT_LLVM_TARGET_MIPS
+(unless
+.Va WITH_LLVM_TARGET_MIPS
+is set explicitly)
+.It Va WITHOUT_LLVM_TARGET_POWERPC
+(unless
+.Va WITH_LLVM_TARGET_POWERPC
+is set explicitly)
+.It Va WITHOUT_LLVM_TARGET_SPARC
+(unless
+.Va WITH_LLVM_TARGET_SPARC
+is set explicitly)
+.El
+.It Va WITH_LLVM_TARGET_ALL
+Set to build support for all LLVM targets.
+This option is always applied to the bootstrap compiler for buildworld when
+LLVM is used.
 .Pp
 This is a default setting on
 amd64/amd64, arm/arm, arm/armeb, arm/armv6, arm/armv7, arm64/aarch64, i386/i386, mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32, mips/mipselhf, mips/mipshf, mips/mips64elhf, mips/mips64hf, powerpc/powerpc, powerpc/powerpc64 and powerpc/powerpcspe.
 .It Va WITHOUT_LLVM_TARGET_ARM
 Set to not build LLVM target support for ARM.
+The
+.Va LLVM_TARGET_ALL
+option should be used rather than this in most cases.
 .Pp
 This is a default setting on
 riscv/riscv64, riscv/riscv64sf and sparc64/sparc64.
 .It Va WITH_LLVM_TARGET_ARM
 Set to build LLVM target support for ARM.
+The
+.Va LLVM_TARGET_ALL
+option should be used rather than this in most cases.
 .Pp
 This is a default setting on
 amd64/amd64, arm/arm, arm/armeb, arm/armv6, arm/armv7, arm64/aarch64, i386/i386, mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32, mips/mipselhf, mips/mipshf, mips/mips64elhf, mips/mips64hf, powerpc/powerpc, powerpc/powerpc64 and powerpc/powerpcspe.
 .It Va WITHOUT_LLVM_TARGET_MIPS
 Set to not build LLVM target support for MIPS.
+The
+.Va LLVM_TARGET_ALL
+option should be used rather than this in most cases.
 .Pp
 This is a default setting on
 riscv/riscv64, riscv/riscv64sf and sparc64/sparc64.
 .It Va WITH_LLVM_TARGET_MIPS
 Set to build LLVM target support for MIPS.
+The
+.Va LLVM_TARGET_ALL
+option should be used rather than this in most cases.
 .Pp
 This is a default setting on
 amd64/amd64, arm/arm, arm/armeb, arm/armv6, arm/armv7, arm64/aarch64, i386/i386, mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32, mips/mipselhf, mips/mipshf, mips/mips64elhf, mips/mips64hf, powerpc/powerpc, powerpc/powerpc64 and powerpc/powerpcspe.
 .It Va WITHOUT_LLVM_TARGET_POWERPC
 Set to not build LLVM target support for PowerPC.
+The
+.Va LLVM_TARGET_ALL
+option should be used rather than this in most cases.
 .Pp
 This is a default setting on
 riscv/riscv64, riscv/riscv64sf and sparc64/sparc64.
 .It Va WITH_LLVM_TARGET_POWERPC
 Set to build LLVM target support for PowerPC.
+The
+.Va LLVM_TARGET_ALL
+option should be used rather than this in most cases.
 .Pp
 This is a default setting on
 amd64/amd64, arm/arm, arm/armeb, arm/armv6, arm/armv7, arm64/aarch64, i386/i386, mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32, mips/mipselhf, mips/mipshf, mips/mips64elhf, mips/mips64hf, powerpc/powerpc, powerpc/powerpc64 and powerpc/powerpcspe.
 .It Va WITHOUT_LLVM_TARGET_SPARC
 Set to not build LLVM target support for SPARC.
+The
+.Va LLVM_TARGET_ALL
+option should be used rather than this in most cases.
 .Pp
 This is a default setting on
 riscv/riscv64, riscv/riscv64sf and sparc64/sparc64.
 .It Va WITH_LLVM_TARGET_SPARC
 Set to build LLVM target support for SPARC.
+The
+.Va LLVM_TARGET_ALL
+option should be used rather than this in most cases.
 .Pp
 This is a default setting on
 amd64/amd64, arm/arm, arm/armeb, arm/armv6, arm/armv7, arm64/aarch64, i386/i386, mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32, mips/mipselhf, mips/mipshf, mips/mips64elhf, mips/mips64hf, powerpc/powerpc, powerpc/powerpc64 and powerpc/powerpcspe.
 .It Va WITHOUT_LLVM_TARGET_X86
 Set to not build LLVM target support for X86.
+The
+.Va LLVM_TARGET_ALL
+option should be used rather than this in most cases.
 .Pp
 This is a default setting on
 riscv/riscv64, riscv/riscv64sf and sparc64/sparc64.
 .It Va WITH_LLVM_TARGET_X86
 Set to build LLVM target support for X86.
+The
+.Va LLVM_TARGET_ALL
+option should be used rather than this in most cases.
 .Pp
 This is a default setting on
 amd64/amd64, arm/arm, arm/armeb, arm/armv6, arm/armv7, arm64/aarch64, i386/i386, mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32, mips/mipselhf, mips/mipshf, mips/mips64elhf, mips/mips64hf, powerpc/powerpc, powerpc/powerpc64 and powerpc/powerpcspe.
@@ -1264,8 +1369,15 @@ When set, it enforces these options:
 .Va WITHOUT_ATM
 .It
 .Va WITHOUT_BLUETOOTH
-.It
-.Va WITHOUT_NETGRAPH_SUPPORT
+.El
+.Pp
+When set, these options are also in effect:
+.Pp
+.Bl -inset -compact
+.It Va WITHOUT_NETGRAPH_SUPPORT
+(unless
+.Va WITH_NETGRAPH_SUPPORT
+is set explicitly)
 .El
 .It Va WITHOUT_NETGRAPH_SUPPORT
 Set to build libraries, programs, and kernel modules without netgraph support.
@@ -1316,8 +1428,6 @@ When set, it enforces these options:
 .It
 .Va WITHOUT_KERBEROS
 .It
-.Va WITHOUT_KERBEROS_SUPPORT
-.It
 .Va WITHOUT_OPENSSH
 .El
 .Pp
@@ -1334,11 +1444,13 @@ Set to not build PAM library and modules.
 .Bf -symbolic
 This option is deprecated and does nothing.
 .Ef
-When set, it enforces these options:
+When set, these options are also in effect:
 .Pp
-.Bl -item -compact
-.It
-.Va WITHOUT_PAM_SUPPORT
+.Bl -inset -compact
+.It Va WITHOUT_PAM_SUPPORT
+(unless
+.Va WITH_PAM_SUPPORT
+is set explicitly)
 .El
 .It Va WITHOUT_PAM_SUPPORT
 Set to build some programs without PAM support, particularly
@@ -1592,8 +1704,15 @@ When set, it enforces these options:
 .Bl -item -compact
 .It
 .Va WITHOUT_DTRACE_TESTS
-.It
-.Va WITHOUT_TESTS_SUPPORT
+.El
+.Pp
+When set, these options are also in effect:
+.Pp
+.Bl -inset -compact
+.It Va WITHOUT_TESTS_SUPPORT
+(unless
+.Va WITH_TESTS_SUPPORT
+is set explicitly)
 .El
 .It Va WITHOUT_TESTS_SUPPORT
 Set to disables the build of all test-related dependencies, including ATF.
@@ -1692,11 +1811,13 @@ Set to not build programs used for 802.11 wireless networks; especially
 .Xr wpa_supplicant 8
 and
 .Xr hostapd 8 .
-When set, it enforces these options:
+When set, these options are also in effect:
 .Pp
-.Bl -item -compact
-.It
-.Va WITHOUT_WIRELESS_SUPPORT
+.Bl -inset -compact
+.It Va WITHOUT_WIRELESS_SUPPORT
+(unless
+.Va WITH_WIRELESS_SUPPORT
+is set explicitly)
 .El
 .It Va WITHOUT_WIRELESS_SUPPORT
 Set to build libraries, programs, and kernel modules without