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

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

Module Name:    pkgsrc
Committed By:   abs
Date:           Thu Dec  7 22:28:44 UTC 2023

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

Log Message:
Fix FILES_SUBST for APPLICATIONS_PATH & UPDATE_DESKTOPDB

Was broken in earlier change to allow apps to include desktopdb.mk
without buildlink3.mk to avoid always pulling in a full dependency

Thanks to Mark Davies for picking up the issue

Bump PKGREVISION


To generate a diff of this commit:
cvs rdiff -u -r1.50 -r1.51 pkgsrc/sysutils/desktop-file-utils/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/sysutils/desktop-file-utils/desktopdb.mk

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.50 pkgsrc/sysutils/desktop-file-utils/Makefile:1.51
--- pkgsrc/sysutils/desktop-file-utils/Makefile:1.50    Mon Aug 14 05:25:14 2023
+++ pkgsrc/sysutils/desktop-file-utils/Makefile Thu Dec  7 22:28:43 2023
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.50 2023/08/14 05:25:14 wiz Exp $
+# $NetBSD: Makefile,v 1.51 2023/12/07 22:28:43 abs Exp $
 
 DISTNAME=      desktop-file-utils-0.26
-PKGREVISION=   3
+PKGREVISION=   4
 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.6 pkgsrc/sysutils/desktop-file-utils/desktopdb.mk:1.7
--- pkgsrc/sysutils/desktop-file-utils/desktopdb.mk:1.6 Fri Aug 19 22:05:10 2022
+++ pkgsrc/sysutils/desktop-file-utils/desktopdb.mk     Thu Dec  7 22:28:43 2023
@@ -1,4 +1,4 @@
-# $NetBSD: desktopdb.mk,v 1.6 2022/08/19 22:05:10 abs Exp $
+# $NetBSD: desktopdb.mk,v 1.7 2023/12/07 22:28:43 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
@@ -12,8 +12,8 @@ DESKTOP_FILE_UTILS_MIMEDB_MK= # defined
 INSTALL_TEMPLATES+=    ${.CURDIR}/../../sysutils/desktop-file-utils/files/install.tmpl
 DEINSTALL_TEMPLATES+=  ${.CURDIR}/../../sysutils/desktop-file-utils/files/install.tmpl
 
-FILES_SUBST+=          APPLICATIONS_PATH="${BUILDLINK_PREFIX.desktop-file-utils}/share/applications"
-FILES_SUBST+=          UPDATE_DESKTOPDB="${BUILDLINK_PREFIX.desktop-file-utils}/bin/update-desktop-database"
+FILES_SUBST+=          APPLICATIONS_PATH="${PREFIX}/share/applications"
+FILES_SUBST+=          UPDATE_DESKTOPDB="${PREFIX}/bin/update-desktop-database"
 
 PRINT_PLIST_AWK+=      /^share\/applications\/mimeinfo.cache$$/ { next }