Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 22 Sep 2014 12:48:27 +0000 (UTC)
From:      Baptiste Daroussin <bapt@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r368907 - in head: Keywords Mk/Uses
Message-ID:  <201409221248.s8MCmR9Y069723@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: bapt
Date: Mon Sep 22 12:48:27 2014
New Revision: 368907
URL: http://svnweb.freebsd.org/changeset/ports/368907
QAT: https://qat.redports.org/buildarchive/r368907/

Log:
  Use keywords to control exactly when is excutied
  the different database updates

Added:
  head/Keywords/desktop-file-utils.ucl   (contents, props changed)
  head/Keywords/shared-mime-info.ucl   (contents, props changed)
Modified:
  head/Mk/Uses/desktop-file-utils.mk
  head/Mk/Uses/shared-mime-info.mk

Added: head/Keywords/desktop-file-utils.ucl
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/Keywords/desktop-file-utils.ucl	Mon Sep 22 12:48:27 2014	(r368907)
@@ -0,0 +1,11 @@
+# $FreeBSD$
+#
+# MAINTAINER: gnome@FreeBSD.org
+
+actions: []
+post-install: <<EOD
+  update-desktop-database -q > /dev/null || true
+EOD
+post-deinstall: <<EOD
+  update-desktop-database -q > /dev/null || true
+EOD

Added: head/Keywords/shared-mime-info.ucl
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/Keywords/shared-mime-info.ucl	Mon Sep 22 12:48:27 2014	(r368907)
@@ -0,0 +1,11 @@
+# $FreeBSD$
+#
+# MAINTAINER: gnome@FreeBSD.org
+
+actions: []
+post-install: <<EOD
+  update-mime-database %D/%@ || true
+EOD
+post-deinstall: <<EOD
+  update-mime-database %D/%@ || true
+EOD

Modified: head/Mk/Uses/desktop-file-utils.mk
==============================================================================
--- head/Mk/Uses/desktop-file-utils.mk	Mon Sep 22 12:47:06 2014	(r368906)
+++ head/Mk/Uses/desktop-file-utils.mk	Mon Sep 22 12:48:27 2014	(r368907)
@@ -17,12 +17,6 @@ IGNORE=	USES=desktop-file-utils does not
 
 BUILD_DEPENDS+=	update-desktop-database:${PORTSDIR}/devel/desktop-file-utils
 RUN_DEPENDS+=	update-desktop-database:${PORTSDIR}/devel/desktop-file-utils
-
-desktop-file-post-install:
-# plist entries for packages.
-	@${ECHO_CMD} "@exec ${LOCALBASE}/bin/update-desktop-database -q > /dev/null || /usr/bin/true" \
-		>> ${TMPPLIST}; \
-	${ECHO_CMD} "@unexec ${LOCALBASE}/bin/update-desktop-database -q > /dev/null || /usr/bin/true" \
-		>> ${TMPPLIST}
+PLIST_FILES+=	"@desktop-file-utils"
 
 .endif

Modified: head/Mk/Uses/shared-mime-info.mk
==============================================================================
--- head/Mk/Uses/shared-mime-info.mk	Mon Sep 22 12:47:06 2014	(r368906)
+++ head/Mk/Uses/shared-mime-info.mk	Mon Sep 22 12:48:27 2014	(r368907)
@@ -17,12 +17,6 @@ IGNORE=	USES=shared-mime-info does not r
 
 BUILD_DEPENDS+=	update-mime-database:${PORTSDIR}/misc/shared-mime-info
 RUN_DEPENDS+=	update-mime-database:${PORTSDIR}/misc/shared-mime-info
-
-shared-mime-post-install:
-# plist entries for packages.
-	@${ECHO_CMD} "@exec ${LOCALBASE}/bin/update-mime-database %D/share/mime" \
-		>> ${TMPPLIST}; \
-	${ECHO_CMD} "@unexec ${LOCALBASE}/bin/update-mime-database %D/share/mime" \
-		>> ${TMPPLIST}
+PLIST_FILES+=	"@shared-mime-info share/mime"
 
 .endif



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