conf/155738: [patch] reaper of the dead: time to BURN_BRIDGES and remove bsd.compat.mk

[Eitan Adler]

>Number:         155738
>Category:       conf
>Synopsis:       [patch] reaper of the dead: time to BURN_BRIDGES and remove bsd.compat.mk
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon Mar 21 01:20:01 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator:     Eitan Adler
>Release:        
>Organization:
>Environment:
>Description:
I'm a able to build world with the current sources and BURN_BRIDGES set (and the  .warn changed to .error) as well as the with the patch supplied.

The compatibility options described were initially committed by ru@ in r139103 (2004) and last touched in r172831 (2007).

It has been 4 years since these options have been deprecated so I think it would be a good time to remove these compatibility options. 
>How-To-Repeat:

>Fix:
$svn rm bsd.compat.mk





Index: bsd.own.mk
===================================================================
--- bsd.own.mk	(revision 219789)
+++ bsd.own.mk	(working copy)
@@ -198,80 +198,6 @@
 .endfor
 
 #
-# Compat NO_* options (same as above, except their use is deprecated).
-#
-.if !defined(BURN_BRIDGES)
-.for var in \
-    ACPI \
-    ATM \
-    AUDIT \
-    AUTHPF \
-    BIND \
-    BIND_DNSSEC \
-    BIND_ETC \
-    BIND_LIBS_LWRES \
-    BIND_MTREE \
-    BIND_NAMED \
-    BIND_UTILS \
-    BLUETOOTH \
-    BOOT \
-    CALENDAR \
-    CPP \
-    CRYPT \
-    CVS \
-    CXX \
-    DICT \
-    DYNAMICROOT \
-    EXAMPLES \
-    FORTH \
-    FP_LIBC \
-    GAMES \
-    GCOV \
-    GDB \
-    GNU \
-    GPIB \
-    GROFF \
-    HTML \
-    INET6 \
-    INFO \
-    IPFILTER \
-    IPX \
-    KERBEROS \
-    LIB32 \
-    LIBPTHREAD \
-    LIBTHR \
-    LOCALES \
-    LPR \
-    MAILWRAPPER \
-    NETCAT \
-    NIS \
-    NLS \
-    NLS_CATALOGS \
-    NS_CACHING \
-    OBJC \
-    OPENSSH \
-    OPENSSL \
-    PAM \
-    PF \
-    RCMDS \
-    RCS \
-    RESCUE \
-    SENDMAIL \
-    SETUID_LOGIN \
-    SHAREDOCS \
-    SYSCONS \
-    TCSH \
-    TOOLCHAIN \
-    USB \
-    WPA_SUPPLICANT_EAPOL
-.if defined(NO_${var})
-#.warning NO_${var} is deprecated in favour of WITHOUT_${var}=
-WITHOUT_${var}=
-.endif
-.endfor
-.endif # !defined(BURN_BRIDGES)
-
-#
 # Older-style variables that enabled behaviour when set.
 #
 .if defined(YES_HESIOD)
Index: sys.mk
===================================================================
--- sys.mk	(revision 219789)
+++ sys.mk	(working copy)
@@ -369,5 +369,4 @@
 
 .endif
 
-.include <bsd.compat.mk>
 .include <bsd.cpu.mk>
Index: Makefile
===================================================================
--- Makefile	(revision 219789)
+++ Makefile	(working copy)
@@ -3,7 +3,7 @@
 
 FILES=	bsd.README
 FILES+=	bsd.arch.inc.mk
-FILES+=	bsd.compat.mk bsd.cpu.mk bsd.dep.mk bsd.doc.mk bsd.dtrace.mk
+FILES+=	bsd.cpu.mk bsd.dep.mk bsd.doc.mk bsd.dtrace.mk
 FILES+=	bsd.endian.mk
 FILES+=	bsd.files.mk bsd.crunchgen.mk bsd.incs.mk bsd.info.mk bsd.init.mk
 FILES+=	bsd.kmod.mk
Index: bsd.init.mk
===================================================================
--- bsd.init.mk	(revision 219789)
+++ bsd.init.mk	(working copy)
@@ -9,7 +9,6 @@
 .if exists(${.CURDIR}/../Makefile.inc)
 .include "${.CURDIR}/../Makefile.inc"
 .endif
-.include <bsd.compat.mk>
 .include <bsd.own.mk>
 .MAIN: all
 .endif	# !target(__<bsd.init.mk>__)
Index: ObsoleteFiles.inc
===================================================================
--- ObsoleteFiles.inc	(revision 219789)
+++ ObsoleteFiles.inc	(working copy)
@@ -38,6 +38,9 @@
 #   xargs -n1 | sort | uniq -d;
 # done
 
+# ???????: remove old compatability options
+OLD_FILES+=share/mk/bsd.compat.mk
+
 # 20110224: sticky.8 -> sticky.7
 OLD_FILES+=usr/share/man/man8/sticky.8.gz
 # 20110220: new clang import which bumps version from 2.8 to 2.9


>Release-Note:
>Audit-Trail:
>Unformatted: