Index: Keywords/desktop-file-utils.ucl
===================================================================
--- Keywords/desktop-file-utils.ucl
+++ /dev/null
@@ -1,9 +0,0 @@
-# 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
Index: Mk/Uses/desktop-file-utils.mk
===================================================================
--- Mk/Uses/desktop-file-utils.mk
+++ Mk/Uses/desktop-file-utils.mk
@@ -15,6 +15,5 @@
 
 BUILD_DEPENDS+=	update-desktop-database:devel/desktop-file-utils
 RUN_DEPENDS+=	update-desktop-database:devel/desktop-file-utils
-PLIST_FILES+=	"@desktop-file-utils"
 
 .endif
Index: devel/desktop-file-utils/Makefile
===================================================================
--- devel/desktop-file-utils/Makefile
+++ devel/desktop-file-utils/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	desktop-file-utils
 PORTVERSION=	0.26
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://freedesktop.org/software/${PORTNAME}/releases/
 
@@ -11,18 +12,13 @@
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-USES=		compiler:c11 gettext meson gnome pkgconfig tar:xz
+USES=		compiler:c11 gettext meson gnome pkgconfig trigger tar:xz
 USE_GNOME=	glib20
 
-PKGINSTALL=	${WRKDIR}/pkg-install
-PKGDEINSTALL=	${WRKDIR}/pkg-deinstall
-
-PORT_MIMEDIRS=	${LOCALBASE}/share/applications
-
-MIMEDIRS=	${PORT_MIMEDIRS}
-
-SUB_FILES=	pkg-deinstall pkg-install
+MIMEDIRS=	share/applications
 SUB_LIST=	MIMEDIRS="${MIMEDIRS}"
+PKGPOSTINSTALL=	${WRKDIR}/pkg-post-install
+SUB_FILES=	pkg-post-install.lua
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/misc/desktop-entry-mode.el \
Index: devel/desktop-file-utils/files/desktop-file-utils.ucl.in
===================================================================
--- /dev/null
+++ devel/desktop-file-utils/files/desktop-file-utils.ucl.in
@@ -0,0 +1,24 @@
+path_glob: "*%%MIMEDIRS%%*"
+cleanup: {
+	type: lua
+	script: <<EOS
+local mimedir = "%%PREFIX%%/%%MIMEDIRS%%/"
+local cache = mimedir .. "mimeinfo.cache"
+local st = pkg.stat(cache)
+if st then
+	os.remove(cache)
+end
+local res = pkg.readdir(mimedir)
+if #res == 0 then
+	os.remove(mimrdir)
+end
+EOS
+}
+trigger: {
+	type: lua
+	sandbox: false
+	script: <<EOS
+print("Building cache database of MIME types")
+pkg.exec({"%%PREFIX%%/bin/update-desktop-database","-q"})
+EOS
+}
Index: devel/desktop-file-utils/files/pkg-deinstall.in
===================================================================
--- devel/desktop-file-utils/files/pkg-deinstall.in
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-#
-# Remove leftover mimeinfo.cache files.
-
-if [ "$2" != "POST-DEINSTALL" ]; then
-    exit 0
-fi
-
-for mdir in %%MIMEDIRS%%; do
-    if [ -f ${mdir}/mimeinfo.cache ]; then
-	rm -f ${mdir}/mimeinfo.cache
-    fi
-done
-
-exit 0
Index: devel/desktop-file-utils/files/pkg-install.in
===================================================================
--- devel/desktop-file-utils/files/pkg-install.in
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-#
-# Initialize the desktop directories and MIME cache.
-
-if [ "$2" != "POST-INSTALL" ]; then
-    exit 0
-fi
-
-${PKG_PREFIX}/bin/update-desktop-database -q
-
-exit 0
Index: devel/desktop-file-utils/files/pkg-post-install.lua.in
===================================================================
--- /dev/null
+++ devel/desktop-file-utils/files/pkg-post-install.lua.in
@@ -0,0 +1,2 @@
+print("Building cache database of MIME types")
+pkg.exec({"%%PREFIX%%/bin/update-desktop-database", "-q"})