Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 29 Sep 2013 17:17:57 +0000 (UTC)
From:      Koop Mast <kwm@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r328714 - head/Mk/Uses
Message-ID:  <201309291717.r8THHvR0029478@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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}; \



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201309291717.r8THHvR0029478>