From owner-svn-ports-head@FreeBSD.ORG  Sun Sep 29 17:17:58 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 428D91A0;
 Sun, 29 Sep 2013 17:17:58 +0000 (UTC) (envelope-from kwm@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 2FBC42F21;
 Sun, 29 Sep 2013 17:17:58 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r8THHwo9029480;
 Sun, 29 Sep 2013 17:17:58 GMT (envelope-from kwm@svn.freebsd.org)
Received: (from kwm@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r8THHvR0029478;
 Sun, 29 Sep 2013 17:17:57 GMT (envelope-from kwm@svn.freebsd.org)
Message-Id: <201309291717.r8THHvR0029478@svn.freebsd.org>
From: Koop Mast <kwm@FreeBSD.org>
Date: Sun, 29 Sep 2013 17:17:57 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r328714 - 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: Sun, 29 Sep 2013 17:17:58 -0000

Author: kwm
Date: Sun Sep 29 17:17:57 2013
New Revision: 328714
URL: http://svnweb.freebsd.org/changeset/ports/328714

Log:
  Don't exec programs in post-install when STAGE mode is enabled.
  
  Noticed by:	antoine (on #poudriere)
  Reviewed by:	bapt@

Modified:
  head/Mk/Uses/desktop-file-utils.mk
  head/Mk/Uses/shared-mime-info.mk

Modified: head/Mk/Uses/desktop-file-utils.mk
==============================================================================
--- head/Mk/Uses/desktop-file-utils.mk	Sun Sep 29 17:09:48 2013	(r328713)
+++ head/Mk/Uses/desktop-file-utils.mk	Sun Sep 29 17:17:57 2013	(r328714)
@@ -23,8 +23,10 @@ RUN_DEPENDS+=	update-desktop-database:${
 post-install: desktop-file-post-install
 
 desktop-file-post-install:
+.if defined(NO_STAGE)
 # run for port post-install
 	@-update-desktop-database -q
+.endif
 # plist entries for packages.
 	@${ECHO_CMD} "@exec ${LOCALBASE}/bin/update-desktop-database -q > /dev/null || /usr/bin/true" \
 		>> ${TMPPLIST}; \

Modified: head/Mk/Uses/shared-mime-info.mk
==============================================================================
--- head/Mk/Uses/shared-mime-info.mk	Sun Sep 29 17:09:48 2013	(r328713)
+++ head/Mk/Uses/shared-mime-info.mk	Sun Sep 29 17:17:57 2013	(r328714)
@@ -23,8 +23,10 @@ RUN_DEPENDS+=	update-mime-database:${POR
 post-install: shared-mime-post-install
 
 shared-mime-post-install:
+.if defined(NO_STAGE)
 # run for port post-install
 	@-update-mime-database ${PREFIX}/share/mime
+.endif
 # plist entries for packages.
 	@${ECHO_CMD} "@exec ${LOCALBASE}/bin/update-mime-database %D/share/mime" \
 		>> ${TMPPLIST}; \