From owner-svn-ports-head@FreeBSD.ORG  Fri Dec 26 12:43:46 2014
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.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 0732A46D;
 Fri, 26 Dec 2014 12:43:46 +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 CE1A866ADF;
 Fri, 26 Dec 2014 12:43:45 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sBQChjKA085992;
 Fri, 26 Dec 2014 12:43:45 GMT (envelope-from bapt@FreeBSD.org)
Received: (from bapt@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id sBQChjNQ085989;
 Fri, 26 Dec 2014 12:43:45 GMT (envelope-from bapt@FreeBSD.org)
Message-Id: <201412261243.sBQChjNQ085989@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: bapt set sender to bapt@FreeBSD.org
 using -f
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Fri, 26 Dec 2014 12:43:45 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r375621 - in head: Keywords 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.18-1
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, 26 Dec 2014 12:43:46 -0000

Author: bapt
Date: Fri Dec 26 12:43:44 2014
New Revision: 375621
URL: https://svnweb.freebsd.org/changeset/ports/375621
QAT: https://qat.redports.org/buildarchive/r375621/

Log:
  Use a custom keyword for kldxref, that allows to control exactly when it is run
  and work nicer with automatic directly support from pkg
  
  Differential Revision:	https://reviews.freebsd.org/D1377
  Reviewed by:	rene, antoine
  Approved by:	rene

Added:
  head/Keywords/kld.ucl   (contents, props changed)
Modified:
  head/Mk/Uses/kmod.mk

Added: head/Keywords/kld.ucl
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/Keywords/kld.ucl	Fri Dec 26 12:43:44 2014	(r375621)
@@ -0,0 +1,24 @@
+# $FreeBSD$
+#
+# MAINTAINER: rene@FreeBSD.org
+
+actions: []
+post-install: <<EOD
+  case "%@" in
+  /*) kmoddir="%@" ;;
+  *) kmoddir="%D/%@" ;;
+  esac
+  /usr/sbin/kldxref ${kmoddir}
+EOD
+post-deinstall: <<EOD
+  case "%@" in
+  /*) kmoddir="%@" ;;
+  *) kmoddir="%D/%@" ;;
+  esac
+  /usr/sbin/kldxref ${kmoddir}
+  case "${kmoddir}" in
+  %D/*) ;;
+  /boot/modules) ;;
+  *) rmdir -p ${kmoddir} 2>/dev/null || true ;;
+  esac
+EOD

Modified: head/Mk/Uses/kmod.mk
==============================================================================
--- head/Mk/Uses/kmod.mk	Fri Dec 26 12:42:28 2014	(r375620)
+++ head/Mk/Uses/kmod.mk	Fri Dec 26 12:43:44 2014	(r375621)
@@ -31,6 +31,7 @@ KMODDIR=	/boot/modules
 .endif
 PLIST_SUB+=	KMODDIR="${KMODDIR:C,^/,,}"
 MAKE_ENV+=	KMODDIR="${KMODDIR}" SYSDIR="${SRC_BASE}/sys" NO_XREF=yes
+PLIST_FILES+=	"@kld ${KMODDIR}"
 
 STRIP_CMD+=	--strip-debug # do not strip kernel symbols
 .endif
@@ -42,12 +43,4 @@ pre-install: ${STAGEDIR}${KMODDIR}
 ${STAGEDIR}${KMODDIR}:
 	@${MKDIR} ${.TARGET}
 
-kmod-post-install:
-	@${ECHO_CMD} "@exec /usr/sbin/kldxref ${KMODDIR}" >> ${TMPPLIST}
-	@${ECHO_CMD} "@unexec /usr/sbin/kldxref ${KMODDIR}" >> ${TMPPLIST}
-.if ${KMODDIR} != /boot/modules
-	@${ECHO_CMD} "@unexec rmdir -p ${KMODDIR} 2>/dev/null || true" \
-		>> ${TMPPLIST}
-.endif
-
 .endif