From 3667ac6cc1adc95547ff74eca2b6b173708d1d55 Mon Sep 17 00:00:00 2001
From: imp <imp@FreeBSD.org>
Date: Wed, 7 May 2014 18:14:56 +0000
Subject: All the NO_foo options processed in src.opts.mk are really
 bsd.opts.mk options, so move their processing there. This fixes issues with
 Makefiles that define NO_MAN=t and only inlcude bsd.*.mk files. A few ports
 fell into this category, and they should be fixed by this change. Also, for
 now, disable the warning about NO_foo being deprecated. More work is needed
 than anticipated before we can do that, so kill the noise for now.

---
 share/mk/bsd.opts.mk | 19 +++++++++++++++++++
 share/mk/src.opts.mk | 18 ------------------
 2 files changed, 19 insertions(+), 18 deletions(-)

(limited to 'share')

diff --git a/share/mk/bsd.opts.mk b/share/mk/bsd.opts.mk
index 09b607e..805200b 100644
--- a/share/mk/bsd.opts.mk
+++ b/share/mk/bsd.opts.mk
@@ -65,6 +65,25 @@ __DEFAULT_NO_OPTIONS = \
 
 .include <bsd.mkopt.mk>
 
+#
+# Supported NO_* options (if defined, MK_* will be forced to "no",
+# regardless of user's setting).
+#
+# These are transitional and will disappaer in the FreeBSD 12.
+#
+.for var in \
+    CTF \
+    DEBUG_FILES \
+    INSTALLLIB \
+    MAN \
+    PROFILE
+.if defined(NO_${var})
+# This warning may be premature...
+#.warning "NO_${var} is defined, but deprecated. Please use MK_${var}=no instead."
+MK_${var}:=no
+.endif
+.endfor
+
 .endif # !_WITHOUT_SRCCONF
 
 .endif
diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk
index 1b36431..f82167b8 100644
--- a/share/mk/src.opts.mk
+++ b/share/mk/src.opts.mk
@@ -231,24 +231,6 @@ __DEFAULT_YES_OPTIONS+=GCC GNUCXX GCC_BOOTSTRAP
 .include <bsd.mkopt.mk>
 
 #
-# Supported NO_* options (if defined, MK_* will be forced to "no",
-# regardless of user's setting).
-#
-# These are transitional and will disappaer in the FreeBSD 12.
-#
-.for var in \
-    CTF \
-    DEBUG_FILES \
-    INSTALLLIB \
-    MAN \
-    PROFILE
-.if defined(NO_${var})
-.warning "NO_${var} is defined, but deprecated. Please use MK_${var}=no instead."
-MK_${var}:=no
-.endif
-.endfor
-
-#
 # MK_* options that default to "yes" if the compiler is a C++11 compiler.
 #
 .include <bsd.compiler.mk>
-- 
cgit v1.1