From owner-svn-ports-all@FreeBSD.ORG  Mon Nov  4 09:30:23 2013
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@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 7F24131B;
 Mon,  4 Nov 2013 09:30:23 +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 6B19F26F2;
 Mon,  4 Nov 2013 09:30:23 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rA49UNaA097726;
 Mon, 4 Nov 2013 09:30:23 GMT (envelope-from rene@svn.freebsd.org)
Received: (from rene@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id rA49UNCg097725;
 Mon, 4 Nov 2013 09:30:23 GMT (envelope-from rene@svn.freebsd.org)
Message-Id: <201311040930.rA49UNCg097725@svn.freebsd.org>
From: Rene Ladan <rene@FreeBSD.org>
Date: Mon, 4 Nov 2013 09:30:23 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r332674 - 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-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 04 Nov 2013 09:30:23 -0000

Author: rene
Date: Mon Nov  4 09:30:22 2013
New Revision: 332674
URL: http://svnweb.freebsd.org/changeset/ports/332674

Log:
  Using stage does not magically enforce the use of sane package tools, so
  always use the "@unexec rmdir" form in TMPPLIST.  @dirrmtry lines are
  substituted with this in bsd.port.mk, but only when generating TMPPLIST.
  
  While here update the description in the header.
  
  Submitted by:	QAT for commit r332642 (8.4-QAT/i386)

Modified:
  head/Mk/Uses/kmod.mk

Modified: head/Mk/Uses/kmod.mk
==============================================================================
--- head/Mk/Uses/kmod.mk	Mon Nov  4 08:57:06 2013	(r332673)
+++ head/Mk/Uses/kmod.mk	Mon Nov  4 09:30:22 2013	(r332674)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 #
-# Handles dependency on kernel sources
+# Handles common items for kernel module ports.
 #
 # MAINTAINER: rene@FreeBSD.org
 #
@@ -43,10 +43,8 @@ kmod-post-install:
 	${ECHO_CMD} "@exec /usr/sbin/kldxref ${KMODDIR}"  >> ${TMPPLIST}
 	${ECHO_CMD} "@unexec /usr/sbin/kldxref ${KMODDIR}" >> ${TMPPLIST}
 .if defined(NO_STAGE)
-	${ECHO_CMD} "@unexec rmdir ${KMODDIR} 2>/dev/null || true" >> ${TMPPLIST}
 	/usr/sbin/kldxref ${KMODDIR}
-.else
-	${ECHO_CMD} "@dirrmtry ${KMODDIR}" >> ${TMPPLIST}
 .endif
+	${ECHO_CMD} "@unexec rmdir ${KMODDIR} 2>/dev/null || true" >> ${TMPPLIST}
 
 .endif