From owner-svn-ports-head@FreeBSD.ORG  Fri Nov  8 09:44:25 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-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 ESMTP id 17FE6EE2;
 Fri,  8 Nov 2013 09:44:25 +0000 (UTC)
 (envelope-from rene@FreeBSD.org)
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))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 062E12CC1;
 Fri,  8 Nov 2013 09:44:25 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rA89iOnw017779;
 Fri, 8 Nov 2013 09:44:24 GMT (envelope-from rene@svn.freebsd.org)
Received: (from rene@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id rA89iOqx017778;
 Fri, 8 Nov 2013 09:44:24 GMT (envelope-from rene@svn.freebsd.org)
Message-Id: <201311080944.rA89iOqx017778@svn.freebsd.org>
From: Rene Ladan <rene@FreeBSD.org>
Date: Fri, 8 Nov 2013 09:44:24 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r333188 - head/Mk/Uses
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 08 Nov 2013 09:44:25 -0000

Author: rene
Date: Fri Nov  8 09:44:24 2013
New Revision: 333188
URL: http://svnweb.freebsd.org/changeset/ports/333188

Log:
  Change KMODDDIR to /boot/modules if it is set to /boot/kernel
  
  This allows upgrading a kernel without breaking any installed kernel ports
  because during the upgrade /boot/kernel is renamed to /boot/kernel.old ,
  resulting in moved files.
  
  While /boot/modules is the default, it might be overridden by bsd.own.mk to
  /boot/kernel before kmod is included, so setting MODULES_WITH_WORLD has no
  effect.

Modified:
  head/Mk/Uses/kmod.mk

Modified: head/Mk/Uses/kmod.mk
==============================================================================
--- head/Mk/Uses/kmod.mk	Fri Nov  8 07:40:50 2013	(r333187)
+++ head/Mk/Uses/kmod.mk	Fri Nov  8 09:44:24 2013	(r333188)
@@ -23,6 +23,9 @@ CATEGORIES+=	kld
 
 SSP_UNSAFE=	kernel module does not support SSP
 
+.if ${KMODDIR} == "/boot/kernel"
+KMODDIR=	/boot/modules
+.endif
 KMODDIR?=	/boot/modules
 PLIST_SUB+=	KMODDIR="${KMODDIR:C,^/,,}"
 MAKE_ENV+=	KMODDIR="${KMODDIR}" SYSDIR="${SRC_BASE}/sys"