From 4301886de3cffb969e680a78a6ea0f376e2b6c2d Mon Sep 17 00:00:00 2001
From: Enji Cooper <ngie@FreeBSD.org>
Date: Mon, 2 Jan 2017 19:55:18 +0000
Subject: [PATCH] Move the "MK_* options..." section before the "...
 MK_*_SUPPORT..." section

For the case that someone set WITHOUT_GSSAPI=, now WITHOUT_KERBEROS_SUPPORT
will be properly set.

This will likely fix the issue for the default case noted in the PR I filed
back in 2011. I am trying to fix the less obvious case documented in the PR
still.

MFC after:	2 weeks
PR:		159745
---
 share/mk/src.opts.mk | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk
index ad686cc534a..9dfa03d5991 100644
--- a/share/mk/src.opts.mk
+++ b/share/mk/src.opts.mk
@@ -401,6 +401,21 @@ MK_CLANG_EXTRAS:= no
 MK_CLANG_FULL:= no
 .endif
 
+#
+# MK_* options whose default value depends on another option.
+#
+.for vv in \
+    GSSAPI/KERBEROS \
+    MAN_UTILS/MAN
+.if defined(WITH_${vv:H})
+MK_${vv:H}:=	yes
+.elif defined(WITHOUT_${vv:H})
+MK_${vv:H}:=	no
+.else
+MK_${vv:H}:=	${MK_${vv:T}}
+.endif
+.endfor
+
 #
 # Set defaults for the MK_*_SUPPORT variables.
 #
@@ -428,21 +443,6 @@ MK_${var}_SUPPORT:= yes
 .endif
 .endfor
 
-#
-# MK_* options whose default value depends on another option.
-#
-.for vv in \
-    GSSAPI/KERBEROS \
-    MAN_UTILS/MAN
-.if defined(WITH_${vv:H})
-MK_${vv:H}:=	yes
-.elif defined(WITHOUT_${vv:H})
-MK_${vv:H}:=	no
-.else
-MK_${vv:H}:=	${MK_${vv:T}}
-.endif
-.endfor
-
 .if !${COMPILER_FEATURES:Mc++11}
 MK_LLDB:=	no
 .endif