From owner-svn-src-head@FreeBSD.ORG Thu Jan 10 22:44:20 2013 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 803DE179; Thu, 10 Jan 2013 22:44:20 +0000 (UTC) (envelope-from des@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 64C7EE68; Thu, 10 Jan 2013 22:44:20 +0000 (UTC) Received: from svn.freebsd.org (svn.FreeBSD.org [8.8.178.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0AMiKHM059600; Thu, 10 Jan 2013 22:44:20 GMT (envelope-from des@svn.freebsd.org) Received: (from des@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0AMiJ1k059594; Thu, 10 Jan 2013 22:44:19 GMT (envelope-from des@svn.freebsd.org) Message-Id: <201301102244.r0AMiJ1k059594@svn.freebsd.org> From: Dag-Erling Smørgrav Date: Thu, 10 Jan 2013 22:44:19 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r245269 - head/share/mk X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 10 Jan 2013 22:44:20 -0000 Author: des Date: Thu Jan 10 22:44:19 2013 New Revision: 245269 URL: http://svnweb.freebsd.org/changeset/base/245269 Log: Remove all support for legacy NOFOO and NO_FOO build options. Deleted: head/share/mk/bsd.compat.mk Modified: head/share/mk/Makefile head/share/mk/bsd.init.mk head/share/mk/bsd.own.mk head/share/mk/sys.mk Modified: head/share/mk/Makefile ============================================================================== --- head/share/mk/Makefile Thu Jan 10 22:36:30 2013 (r245268) +++ head/share/mk/Makefile Thu Jan 10 22:44:19 2013 (r245269) @@ -6,7 +6,6 @@ FILES= \ bsd.README \ bsd.arch.inc.mk \ - bsd.compat.mk \ bsd.compiler.mk \ bsd.cpu.mk \ bsd.crunchgen.mk \ Modified: head/share/mk/bsd.init.mk ============================================================================== --- head/share/mk/bsd.init.mk Thu Jan 10 22:36:30 2013 (r245268) +++ head/share/mk/bsd.init.mk Thu Jan 10 22:44:19 2013 (r245269) @@ -9,7 +9,6 @@ ____: .if exists(${.CURDIR}/../Makefile.inc) .include "${.CURDIR}/../Makefile.inc" .endif -.include .include .MAIN: all .endif # !target(____) Modified: head/share/mk/bsd.own.mk ============================================================================== --- head/share/mk/bsd.own.mk Thu Jan 10 22:36:30 2013 (r245268) +++ head/share/mk/bsd.own.mk Thu Jan 10 22:44:19 2013 (r245269) @@ -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) Modified: head/share/mk/sys.mk ============================================================================== --- head/share/mk/sys.mk Thu Jan 10 22:36:30 2013 (r245268) +++ head/share/mk/sys.mk Thu Jan 10 22:44:19 2013 (r245269) @@ -346,5 +346,4 @@ OBJFORMAT?= elf .endif -.include .include