CVS commit: pkgsrc/sysutils/desktop-file-utils

["David Brownlee" <abs%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   abs
Date:           Fri Aug 19 22:05:10 UTC 2022

Modified Files:
        pkgsrc/sysutils/desktop-file-utils: Makefile desktopdb.mk
        pkgsrc/sysutils/desktop-file-utils/files: install.tmpl

Log Message:
Switch desktopdb.mk to not depend on desktop-file-utils

Consumers of desktop entries still register a full dependency
on desktop-file-utils, but apps that install a .desktop file
in share/applications do not. They still have a POST-INSTALL
step to call UPDATE_DESKTOPDB, but only if it is already
installed.

Should be not functional difference for any system with a
consumer of desktop entries installed, but for an app
with a .desktop entry the build of python, meson & glib2
may be deferred. Helpful for small apps and lower power
systems


To generate a diff of this commit:
cvs rdiff -u -r1.47 -r1.48 pkgsrc/sysutils/desktop-file-utils/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/sysutils/desktop-file-utils/desktopdb.mk
cvs rdiff -u -r1.1.1.1 -r1.2 \
    pkgsrc/sysutils/desktop-file-utils/files/install.tmpl

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/sysutils/desktop-file-utils/Makefile
diff -u pkgsrc/sysutils/desktop-file-utils/Makefile:1.47 pkgsrc/sysutils/desktop-file-utils/Makefile:1.48
--- pkgsrc/sysutils/desktop-file-utils/Makefile:1.47    Tue Aug  9 12:08:33 2022
+++ pkgsrc/sysutils/desktop-file-utils/Makefile Fri Aug 19 22:05:10 2022
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.47 2022/08/09 12:08:33 jperkin Exp $
+# $NetBSD: Makefile,v 1.48 2022/08/19 22:05:10 abs Exp $
 
 DISTNAME=      desktop-file-utils-0.26
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    sysutils gnome
 MASTER_SITES=  http://freedesktop.org/software/desktop-file-utils/releases/
 EXTRACT_SUFX=  .tar.xz

Index: pkgsrc/sysutils/desktop-file-utils/desktopdb.mk
diff -u pkgsrc/sysutils/desktop-file-utils/desktopdb.mk:1.5 pkgsrc/sysutils/desktop-file-utils/desktopdb.mk:1.6
--- pkgsrc/sysutils/desktop-file-utils/desktopdb.mk:1.5 Thu Jun 15 22:13:59 2006
+++ pkgsrc/sysutils/desktop-file-utils/desktopdb.mk     Fri Aug 19 22:05:10 2022
@@ -1,8 +1,8 @@
-# $NetBSD: desktopdb.mk,v 1.5 2006/06/15 22:13:59 jlam Exp $
+# $NetBSD: desktopdb.mk,v 1.6 2022/08/19 22:05:10 abs Exp $
 #
 # This Makefile fragment is intended to be included by packages that install
-# desktop entries.  It takes care of registering them in the global database.
-#
+# desktop entries.  It takes care of registering them in the global database
+# if desktop-file-utils is installed. It does not add a dependency.
 
 .if !defined(DESKTOP_FILE_UTILS_MIMEDB_MK)
 DESKTOP_FILE_UTILS_MIMEDB_MK=  # defined
@@ -17,6 +17,4 @@ FILES_SUBST+=         UPDATE_DESKTOPDB="${BUILD
 
 PRINT_PLIST_AWK+=      /^share\/applications\/mimeinfo.cache$$/ { next }
 
-.include "../../sysutils/desktop-file-utils/buildlink3.mk"
-
 .endif # DESKTOP_FILE_UTILS_MIMEDB_MK

Index: pkgsrc/sysutils/desktop-file-utils/files/install.tmpl
diff -u pkgsrc/sysutils/desktop-file-utils/files/install.tmpl:1.1.1.1 pkgsrc/sysutils/desktop-file-utils/files/install.tmpl:1.2
--- pkgsrc/sysutils/desktop-file-utils/files/install.tmpl:1.1.1.1       Tue Sep 21 17:03:54 2004
+++ pkgsrc/sysutils/desktop-file-utils/files/install.tmpl       Fri Aug 19 22:05:10 2022
@@ -1,10 +1,13 @@
-# $NetBSD: install.tmpl,v 1.1.1.1 2004/09/21 17:03:54 jmmv Exp $
+# $NetBSD: install.tmpl,v 1.2 2022/08/19 22:05:10 abs Exp $
 
 APPLICATIONS_PATH="@APPLICATIONS_PATH@"
 UPDATE_DESKTOPDB="@UPDATE_DESKTOPDB@"
 
 case ${STAGE} in
 POST-INSTALL|DEINSTALL)
-       ${UPDATE_DESKTOPDB} ${APPLICATIONS_PATH}
+        # desktop-file-utils may not be installed
+        if [ -x ${UPDATE_DESKTOPDB} ] ; then
+                ${UPDATE_DESKTOPDB} ${APPLICATIONS_PATH}
+        fi
        ;;
 esac