From nobody Wed Nov 17 10:34:08 2021 X-Original-To: dev-commits-ports-all@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 196C61896DAA; Wed, 17 Nov 2021 10:34:13 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (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 "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4HvK6Y0Fcvz4S4V; Wed, 17 Nov 2021 10:34:13 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from aniel.nours.eu (nours.eu [176.31.115.77]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) (Authenticated sender: bapt) by smtp.freebsd.org (Postfix) with ESMTPSA id C6F8CAA28; Wed, 17 Nov 2021 10:34:12 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: by aniel.nours.eu (Postfix, from userid 1001) id CA91B1118CF; Wed, 17 Nov 2021 11:34:08 +0100 (CET) Date: Wed, 17 Nov 2021 11:34:08 +0100 From: Baptiste Daroussin To: =?utf-8?Q?T=C4=B3l?= Coosemans Cc: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: Re: git: 37c1a83366f0 - main - devel/desktop-file-utils: use trigger Message-ID: <20211117103408.pexdscfzu5rkgmdm@aniel.nours.eu> References: <202111170948.1AH9mGSU007317@gitrepo.freebsd.org> <20211117110802.70010dca@FreeBSD.org> List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20211117110802.70010dca@FreeBSD.org> X-ThisMailContainsUnwantedMimeParts: N On Wed, Nov 17, 2021 at 11:08:02AM +0100, Tijl Coosemans wrote: > On Wed, 17 Nov 2021 09:48:16 GMT Baptiste Daroussin > wrote: > > The branch main has been updated by bapt: > > > > URL: https://cgit.FreeBSD.org/ports/commit/?id=37c1a83366f02cdf76b850c630f79c275a418bea > > > > commit 37c1a83366f02cdf76b850c630f79c275a418bea > > Author: Baptiste Daroussin > > AuthorDate: 2021-10-11 07:46:55 +0000 > > Commit: Baptiste Daroussin > > CommitDate: 2021-11-17 09:47:29 +0000 > > > > devel/desktop-file-utils: use trigger > > > > Instead of polluting all files with a script to be executed post install > > convert the handling of mime database into a trigger > > > > This trigger will regenerate the db each time someone install a files > > into the concern directory > > > > On removal of the desktop-file-utils port, it will cleanup its cache. > > > > While here convert the post installation script into a lua script. > > Note the db is always run at post installation of the port, just to make > > sure the cache is up to date, in case the format changes in the futur > > --- > > devel/desktop-file-utils/Makefile | 14 +++++-------- > > .../files/desktop-file-utils.ucl.in | 24 ++++++++++++++++++++++ > > devel/desktop-file-utils/files/pkg-deinstall.in | 15 -------------- > > devel/desktop-file-utils/files/pkg-install.in | 11 ---------- > > .../files/pkg-post-install.lua.in | 2 ++ > > 5 files changed, 31 insertions(+), 35 deletions(-) > > > > diff --git a/devel/desktop-file-utils/Makefile b/devel/desktop-file-utils/Makefile > > index ff765677b064..4a83a8eab39a 100644 > > --- a/devel/desktop-file-utils/Makefile > > +++ b/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 @@ COMMENT= Couple of command line utilities for working with desktop entries > > 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 \ > > diff --git a/devel/desktop-file-utils/files/desktop-file-utils.ucl.in b/devel/desktop-file-utils/files/desktop-file-utils.ucl.in > > new file mode 100644 > > index 000000000000..ed07df4f223f > > --- /dev/null > > +++ b/devel/desktop-file-utils/files/desktop-file-utils.ucl.in > > @@ -0,0 +1,24 @@ > > +path: "%%PREFIX%%/%%MIMEDIRS%%" > > +cleanup: { > > + type: lua > > + script: < > +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) > > s/mimrdir/mimedir/ Good catch, thank you, fixed! Bapt