From owner-svn-src-head@FreeBSD.ORG  Sat May 10 16:39:16 2014
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id B0B73972;
 Sat, 10 May 2014 16:39:16 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 9E179224;
 Sat, 10 May 2014 16:39:16 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4AGdGcw007279;
 Sat, 10 May 2014 16:39:16 GMT (envelope-from imp@svn.freebsd.org)
Received: (from imp@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4AGdGRl007277;
 Sat, 10 May 2014 16:39:16 GMT (envelope-from imp@svn.freebsd.org)
Message-Id: <201405101639.s4AGdGRl007277@svn.freebsd.org>
From: Warner Losh <imp@FreeBSD.org>
Date: Sat, 10 May 2014 16:39:16 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r265841 - head/sys/conf
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.18
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 10 May 2014 16:39:16 -0000

Author: imp
Date: Sat May 10 16:39:15 2014
New Revision: 265841
URL: http://svnweb.freebsd.org/changeset/base/265841

Log:
  bitrotted compat cruft removal:
  o KMODDEPS warning is 15 years stale. Remove it.
  o MK_CTF will always be defined now, so no need to test to see if it
    is defined.
  o no need to define MK_FORMAT_EXTENTIONS if undefined anymore.

Modified:
  head/sys/conf/kern.mk
  head/sys/conf/kmod.mk

Modified: head/sys/conf/kern.mk
==============================================================================
--- head/sys/conf/kern.mk	Sat May 10 16:39:08 2014	(r265840)
+++ head/sys/conf/kern.mk	Sat May 10 16:39:15 2014	(r265841)
@@ -1,8 +1,5 @@
 # $FreeBSD$
 
-# Compat
-MK_FORMAT_EXTENSIONS?=no
-
 #
 # Warning flags for compiling the kernel and components of the kernel:
 #

Modified: head/sys/conf/kmod.mk
==============================================================================
--- head/sys/conf/kmod.mk	Sat May 10 16:39:08 2014	(r265840)
+++ head/sys/conf/kmod.mk	Sat May 10 16:39:15 2014	(r265841)
@@ -65,10 +65,6 @@ KMODLOAD?=	/sbin/kldload
 KMODUNLOAD?=	/sbin/kldunload
 OBJCOPY?=	objcopy
 
-.if defined(KMODDEPS)
-.error "Do not use KMODDEPS on 5.0+; use MODULE_VERSION/MODULE_DEPEND"
-.endif
-
 # Note: we're really bsd.kmod.mk, so we have to allow src.opts.mk to be
 # optional. Include it if we can so we can get /etc/src.conf changes,
 # if we're in the tree. If we can't include it that's OK. kern.opts.mk
@@ -204,7 +200,7 @@ ${KMOD}.kld: ${OBJS}
 ${FULLPROG}: ${OBJS}
 .endif
 	${LD} ${LDFLAGS} -r -d -o ${.TARGET} ${OBJS}
-.if defined(MK_CTF) && ${MK_CTF} != "no"
+.if ${MK_CTF} != "no"
 	${CTFMERGE} ${CTFFLAGS} -o ${.TARGET} ${OBJS}
 .endif
 .if defined(EXPORT_SYMS)