From nobody Wed Oct 20 09:11:10 2021 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 9904C180919C; Wed, 20 Oct 2021 09:11:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4HZ4bf3zRbz3v7h; Wed, 20 Oct 2021 09:11:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 6883124AF0; Wed, 20 Oct 2021 09:11:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 19K9BAMV023742; Wed, 20 Oct 2021 09:11:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 19K9BAPe023741; Wed, 20 Oct 2021 09:11:10 GMT (envelope-from git) Date: Wed, 20 Oct 2021 09:11:10 GMT Message-Id: <202110200911.19K9BAPe023741@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Baptiste Daroussin Subject: git: ddacf99b4fc0 - main - shared-mime-info: use triggers List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ddacf99b4fc010511a09e1af376d0fca7399e208 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/ports/commit/?id=ddacf99b4fc010511a09e1af376d0fca7399e208 commit ddacf99b4fc010511a09e1af376d0fca7399e208 Author: Baptiste Daroussin AuthorDate: 2021-10-11 09:31:35 +0000 Commit: Baptiste Daroussin CommitDate: 2021-10-20 09:11:08 +0000 shared-mime-info: use triggers the rebuild of the database is now handled by a trigger and happen only once at the end of the transaction instead of after each package installation. While make shared-mime-info a runtime only dependency Reviewed by: manu, mat Differential Revision: https://reviews.freebsd.org/D32452 --- Keywords/shared-mime-info.ucl | 9 ------ Mk/Uses/shared-mime-info.mk | 2 -- misc/shared-mime-info/Makefile | 16 +++++----- misc/shared-mime-info/files/pkg-install.in | 12 -------- .../shared-mime-info/files/shared-mime-info.ucl.in | 27 ++++++++++++++++ misc/shared-mime-info/pkg-plist | 36 ++++++++-------------- 6 files changed, 48 insertions(+), 54 deletions(-) diff --git a/Keywords/shared-mime-info.ucl b/Keywords/shared-mime-info.ucl deleted file mode 100644 index 2fdc0a2ba4c4..000000000000 --- a/Keywords/shared-mime-info.ucl +++ /dev/null @@ -1,9 +0,0 @@ -# MAINTAINER: gnome@FreeBSD.org - -actions: [] -post-install: < diff --git a/misc/shared-mime-info/files/pkg-install.in b/misc/shared-mime-info/files/pkg-install.in deleted file mode 100644 index b2c3db6d3ca3..000000000000 --- a/misc/shared-mime-info/files/pkg-install.in +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh - -case $2 in -POST-INSTALL) - for mdir in %%MIMEDIRS%%; do - if [ -d ${mdir} ]; then - %%PREFIX%%/bin/update-mime-database ${mdir} - fi - done - exit 0 - ;; -esac diff --git a/misc/shared-mime-info/files/shared-mime-info.ucl.in b/misc/shared-mime-info/files/shared-mime-info.ucl.in new file mode 100644 index 000000000000..38d1d2cfec04 --- /dev/null +++ b/misc/shared-mime-info/files/shared-mime-info.ucl.in @@ -0,0 +1,27 @@ +path: "%%PREFIX%%/share/mime/packages" +cleanup: { + type: lua + script: </dev/null || true -@postunexec rm -fr %D/share/mime/x-content 2>/dev/null || true -@postunexec rm -fr %D/share/mime/video 2>/dev/null || true -@postunexec rm -fr %D/share/mime/text 2>/dev/null || true -@postunexec rm -fr %D/share/mime/multipart 2>/dev/null || true -@postunexec rm -fr %D/share/mime/model 2>/dev/null || true -@postunexec rm -fr %D/share/mime/message 2>/dev/null || true -@postunexec rm -fr %D/share/mime/inode 2>/dev/null || true -@postunexec rm -fr %D/share/mime/image 2>/dev/null || true -@postunexec rm -fr %D/share/mime/font 2>/dev/null || true -@postunexec rm -fr %D/share/mime/audio 2>/dev/null || true -@postunexec rm -fr %D/share/mime/application 2>/dev/null || true +@dir share/mime/x-epoc +@dir share/mime/x-content +@dir share/mime/video +@dir share/mime/text +@dir share/mime/multipart +@dir share/mime/model +@dir share/mime/message +@dir share/mime/inode +@dir share/mime/image +@dir share/mime/font +@dir share/mime/audio +@dir share/mime/application