IFC @ r245509

5 files changed, 1 insertions, 118 deletions

diff --git a/share/mk/Makefile b/share/mk/Makefile
index 81f943c..2110b26 100644
--- a/share/mk/Makefile
+++ b/share/mk/Makefile
@@ -6,7 +6,6 @@
 FILES=	\
 	bsd.README \
 	bsd.arch.inc.mk \
-	bsd.compat.mk \
 	bsd.compiler.mk \
 	bsd.cpu.mk \
 	bsd.crunchgen.mk \
diff --git a/share/mk/bsd.compat.mk b/share/mk/bsd.compat.mk
deleted file mode 100644
index 6a86871..0000000
--- a/share/mk/bsd.compat.mk
+++ /dev/null
@@ -1,41 +0,0 @@
-# $FreeBSD$
-
-.if !defined(BURN_BRIDGES)
-.for oldnew in \
-	NOATM:NO_ATM \
-	NOCLEANDIR:NO_CLEANDIR \
-	NOCRYPT:NO_CRYPT \
-	NODOCCOMPRESS:NO_DOCCOMPRESS \
-	NOEXTRADEPEND:NO_EXTRADEPEND \
-	NOFORTH:NO_FORTH \
-	NOFSCHG:NO_FSCHG \
-	NOGAMES:NO_GAMES \
-	NOHTML:NO_HTML \
-	NOINET6:NO_INET6 \
-	NOINFO:NO_INFO \
-	NOINFOCOMPRESS:NO_INFOCOMPRESS \
-	NOINSTALLLIB:NO_INSTALLLIB \
-	NOLIBPTHREAD:NO_LIBPTHREAD \
-	NOLIBTHR:NO_LIBTHR \
-	NOLINT:NO_LINT \
-	NOMAN:NO_MAN \
-	NOMANCOMPRESS:NO_MANCOMPRESS \
-	NOMLINKS:NO_MLINKS \
-	NOOBJ:NO_OBJ \
-	NOPAM:NO_PAM \
-	NOPIC:NO_PIC \
-	NOPROFILE:NO_PROFILE \
-	NO_RCMNDS:NO_RCMDS \
-	NOSHARE:NO_SHARE \
-	NOSHARED:NO_SHARED \
-	NOTAGS:NO_TAGS
-.for old in ${oldnew:C/:.*//}
-.for new in ${oldnew:C/.*://}
-.if defined(${old}) && !defined(${new})
-.warning ${old} is deprecated in favour of ${new}
-${new}=	${${old}}
-.endif
-.endfor
-.endfor
-.endfor
-.endif
diff --git a/share/mk/bsd.init.mk b/share/mk/bsd.init.mk
index 72a6de0..f5f4c66 100644
--- a/share/mk/bsd.init.mk
+++ b/share/mk/bsd.init.mk
@@ -9,7 +9,6 @@ __<bsd.init.mk>__:
 .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>__)
diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk
index 78af8fb..24a0f92 100644
--- a/share/mk/bsd.own.mk
+++ b/share/mk/bsd.own.mk
@@ -216,80 +216,6 @@ WITHOUT_${var}=
 .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 \
-    KDUMP \
-    KERBEROS \
-    LIB32 \
-    LIBPTHREAD \
-    LIBTHR \
-    LOCALES \
-    LPR \
-    MAILWRAPPER \
-    NETCAT \
-    NIS \
-    NLS \
-    NLS_CATALOGS \
-    NS_CACHING \
-    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)
@@ -431,6 +357,7 @@ __DEFAULT_NO_OPTIONS = \
     ICONV \
     IDEA \
     INSTALL_AS_USER \
+    NMTREE \
     NAND \
     OFED \
     SHARED_TOOLCHAIN
diff --git a/share/mk/sys.mk b/share/mk/sys.mk
index 2f67903..8b8a5ce 100644
--- a/share/mk/sys.mk
+++ b/share/mk/sys.mk
@@ -346,5 +346,4 @@ OBJFORMAT?=	elf
 
 .endif
 
-.include <bsd.compat.mk>
 .include <bsd.cpu.mk>