svn commit: r355011 - in head: . share/mk

[Brooks Davis]

Author: brooks
Date: Fri Nov 22 18:41:09 2019
New Revision: 355011
URL: https://svnweb.freebsd.org/changeset/base/355011

Log:
  Revert r354909: Make the warning for deprecated NO_ variables an error.
  
  An unexpectidly large number of ports define NO_MAN (and sometimes the
  long-dead NOMAN).  I'll fix ports and then re-commit.

Modified:
  head/UPDATING
  head/share/mk/bsd.opts.mk

Modified: head/UPDATING
==============================================================================
--- head/UPDATING	Fri Nov 22 18:39:51 2019	(r355010)
+++ head/UPDATING	Fri Nov 22 18:41:09 2019	(r355011)
@@ -31,14 +31,6 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 13.x IS SLOW:
 	removed in the future.  As of FreeBSD 10.1 the autofs(5) is available
 	for automounting.
 
-20191120:
-	Defining the long deprecated NO_CTF, NO_DEBUG_FILES, NO_INSTALLLIB,
-	NO_MAN, NO_PROFILE, and NO_WARNS variables is now an error.  Update
-	your Makefiles and scripts to define MK_<var>=no instead as required.
-
-	One exception to this is that program or library Makefiles should
-	define MAN to empty rather than setting MK_MAN=no.
-
 20191107:
 	The nctgpio and wbwd drivers have been moved to the superio bus.
 	If you have one of these drivers in a kernel configuration, then

Modified: head/share/mk/bsd.opts.mk
==============================================================================
--- head/share/mk/bsd.opts.mk	Fri Nov 22 18:39:51 2019	(r355010)
+++ head/share/mk/bsd.opts.mk	Fri Nov 22 18:41:09 2019	(r355011)
@@ -100,7 +100,7 @@ __DEFAULT_DEPENDENT_OPTIONS = \
     PROFILE \
     WARNS
 .if defined(NO_${var})
-.error "NO_${var} is defined, but deprecated. Please use MK_${var}=no instead."
+.warning "NO_${var} is defined, but deprecated. Please use MK_${var}=no instead."
 MK_${var}:=no
 .endif
 .endfor