From 84f54c4fd716c3676486f082850fcf1a57d6e111 Mon Sep 17 00:00:00 2001
From: Cy Schubert <cy@FreeBSD.org>
Date: Wed, 4 Oct 2017 03:35:23 +0000
Subject: [PATCH] Revert r324246. This is not exactly what was intended.

---
 Makefile.inc1 | 13 +++++++++++++
 UPDATING      |  7 -------
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/Makefile.inc1 b/Makefile.inc1
index fb0ae5e5daa6..1c6582d9d76d 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -1914,6 +1914,18 @@ _dtc= usr.bin/dtc
 _dtc= gnu/usr.bin/dtc
 .endif
 
+.if ${MK_KERBEROS} != "no"
+_kerberos5_bootstrap_tools= \
+	kerberos5/tools/make-roken \
+	kerberos5/lib/libroken \
+	kerberos5/lib/libvers \
+	kerberos5/tools/asn1_compile \
+	kerberos5/tools/slc \
+	usr.bin/compile_et
+
+.ORDER: ${_kerberos5_bootstrap_tools:C/^/${_bt}-/g}
+.endif
+
 # r283777 makewhatis(1) replaced with mandoc version which builds a database.
 _libopenbsd?=	lib/libopenbsd
 _makewhatis=	usr.bin/mandoc
@@ -1926,6 +1938,7 @@ bootstrap-tools: .PHONY
 #	FreeBSD versions that need the tool built at this stage of the build.
 .for _tool in \
     ${_clang_tblgen} \
+    ${_kerberos5_bootstrap_tools} \
     ${_strfile} \
     ${_gperf} \
     ${_dtc} \
diff --git a/UPDATING b/UPDATING
index 02384ebb6af3..69f9c7cbfd17 100644
--- a/UPDATING
+++ b/UPDATING
@@ -51,13 +51,6 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 12.x IS SLOW:
 
 ****************************** SPECIAL WARNING: ******************************
 
-+20160714:
-	When building multiple kernels using KERNCONF, non-existent KERNCONF
-	files will produce an error and buildkernel will fail. Previously
-	missing KERNCONF files silently failed giving no indication as to
-	why, only to subsequently discover during installkernel that the
-	desired kernel was never built in the first place.
-
 20170912:
 	The default serial number format for CTL LUNs has changed.  This will
 	affect users who use /dev/diskid/* device nodes, or whose FibreChannel