pkgsrc-Changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

CVS commit: pkgsrc



Module Name:    pkgsrc
Committed By:   nia
Date:           Sat Mar 12 08:01:53 UTC 2022

Modified Files:
        pkgsrc/audio/pulseaudio: Makefile
        pkgsrc/audio/quodlibet: Makefile
        pkgsrc/audio/sound-juicer: Makefile
        pkgsrc/audio/speech-dispatcher: Makefile
        pkgsrc/chat/gajim: Makefile
        pkgsrc/chat/hexchat: Makefile
        pkgsrc/chat/srain: Makefile
        pkgsrc/devel/devhelp: Makefile
        pkgsrc/devel/glade: Makefile
        pkgsrc/devel/meld: Makefile
        pkgsrc/editors/dasher: Makefile
        pkgsrc/editors/gedit: Makefile
        pkgsrc/editors/ghex: Makefile
        pkgsrc/fonts/fontforge: Makefile
        pkgsrc/games/chromium-bsu: Makefile
        pkgsrc/graphics/cheese: Makefile
        pkgsrc/graphics/drawing: Makefile
        pkgsrc/graphics/eog: Makefile
        pkgsrc/graphics/gnome-screenshot: Makefile
        pkgsrc/graphics/inkscape: Makefile
        pkgsrc/graphics/shotwell: Makefile
        pkgsrc/graphics/viewnior: Makefile
        pkgsrc/inputmethod/ibus: Makefile
        pkgsrc/inputmethod/ibus-libpinyin: Makefile
        pkgsrc/misc/orca: Makefile
        pkgsrc/misc/yelp3: Makefile
        pkgsrc/multimedia/gnome-video-effects: Makefile
        pkgsrc/multimedia/handbrake: Makefile
        pkgsrc/multimedia/totem: Makefile
        pkgsrc/print/evince3: Makefile
        pkgsrc/security/gcr: Makefile
        pkgsrc/security/polkit: Makefile
        pkgsrc/security/seahorse: Makefile
        pkgsrc/sysutils/gnome-characters: Makefile
        pkgsrc/sysutils/gnome-control-center: Makefile
        pkgsrc/sysutils/gnome-font-viewer: Makefile
        pkgsrc/sysutils/nautilus: Makefile
        pkgsrc/textproc/gnome-dictionary: Makefile
        pkgsrc/time/gnome-calendar: Makefile
        pkgsrc/time/gnome-pomodoro: Makefile
        pkgsrc/www/epiphany: Makefile
        pkgsrc/x11/gnome-session: Makefile
        pkgsrc/x11/gnome-shell: Makefile
        pkgsrc/x11/gnome-terminal: Makefile
        pkgsrc/x11/xfce4-whiskermenu-plugin: Makefile
Added Files:
        pkgsrc/devel/gettext-tools: msgfmt-desktop.mk
Removed Files:
        pkgsrc/audio/pulseaudio: hacks.mk
        pkgsrc/audio/quodlibet: hacks.mk
        pkgsrc/audio/sound-juicer: hacks.mk
        pkgsrc/editors/dasher: hacks.mk
        pkgsrc/editors/gedit: hacks.mk
        pkgsrc/editors/ghex: hacks.mk
        pkgsrc/fonts/fontforge: hacks.mk
        pkgsrc/graphics/cheese: hacks.mk
        pkgsrc/graphics/drawing: hacks.mk
        pkgsrc/graphics/eog: hacks.mk
        pkgsrc/graphics/gnome-screenshot: hacks.mk
        pkgsrc/graphics/inkscape: hacks.mk
        pkgsrc/graphics/viewnior: hacks.mk
        pkgsrc/inputmethod/ibus: hacks.mk
        pkgsrc/inputmethod/ibus-libpinyin: hacks.mk
        pkgsrc/misc/orca: hacks.mk
        pkgsrc/misc/yelp3: hacks.mk
        pkgsrc/multimedia/gnome-video-effects: hacks.mk
        pkgsrc/multimedia/handbrake: hacks.mk
        pkgsrc/multimedia/totem: hacks.mk
        pkgsrc/print/evince3: hacks.mk
        pkgsrc/security/gcr: hacks.mk
        pkgsrc/security/polkit: hacks.mk
        pkgsrc/security/seahorse: hacks.mk
        pkgsrc/sysutils/gnome-characters: hacks.mk
        pkgsrc/sysutils/gnome-control-center: hacks.mk
        pkgsrc/sysutils/gnome-font-viewer: hacks.mk
        pkgsrc/sysutils/nautilus: hacks.mk
        pkgsrc/textproc/gnome-dictionary: hacks.mk
        pkgsrc/time/gnome-calendar: hacks.mk
        pkgsrc/time/gnome-pomodoro: hacks.mk
        pkgsrc/www/epiphany: hacks.mk
        pkgsrc/x11/gnome-session: hacks.mk
        pkgsrc/x11/gnome-shell: hacks.mk
        pkgsrc/x11/gnome-terminal: hacks.mk
        pkgsrc/x11/xfce4-whiskermenu-plugin: hacks.mk

Log Message:
*: Replace per-package msgfmt hacks with msgfmt-desktop.mk


To generate a diff of this commit:
cvs rdiff -u -r1.167 -r1.168 pkgsrc/audio/pulseaudio/Makefile
cvs rdiff -u -r1.1 -r0 pkgsrc/audio/pulseaudio/hacks.mk
cvs rdiff -u -r1.16 -r1.17 pkgsrc/audio/quodlibet/Makefile
cvs rdiff -u -r1.1 -r0 pkgsrc/audio/quodlibet/hacks.mk
cvs rdiff -u -r1.122 -r1.123 pkgsrc/audio/sound-juicer/Makefile
cvs rdiff -u -r1.1 -r0 pkgsrc/audio/sound-juicer/hacks.mk
cvs rdiff -u -r1.23 -r1.24 pkgsrc/audio/speech-dispatcher/Makefile
cvs rdiff -u -r1.62 -r1.63 pkgsrc/chat/gajim/Makefile
cvs rdiff -u -r1.56 -r1.57 pkgsrc/chat/hexchat/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/chat/srain/Makefile
cvs rdiff -u -r1.144 -r1.145 pkgsrc/devel/devhelp/Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/devel/gettext-tools/msgfmt-desktop.mk
cvs rdiff -u -r1.103 -r1.104 pkgsrc/devel/glade/Makefile
cvs rdiff -u -r1.115 -r1.116 pkgsrc/devel/meld/Makefile
cvs rdiff -u -r1.109 -r1.110 pkgsrc/editors/dasher/Makefile
cvs rdiff -u -r1.1 -r0 pkgsrc/editors/dasher/hacks.mk
cvs rdiff -u -r1.164 -r1.165 pkgsrc/editors/gedit/Makefile
cvs rdiff -u -r1.1 -r0 pkgsrc/editors/gedit/hacks.mk
cvs rdiff -u -r1.64 -r1.65 pkgsrc/editors/ghex/Makefile
cvs rdiff -u -r1.1 -r0 pkgsrc/editors/ghex/hacks.mk
cvs rdiff -u -r1.124 -r1.125 pkgsrc/fonts/fontforge/Makefile
cvs rdiff -u -r1.4 -r0 pkgsrc/fonts/fontforge/hacks.mk
cvs rdiff -u -r1.23 -r1.24 pkgsrc/games/chromium-bsu/Makefile
cvs rdiff -u -r1.101 -r1.102 pkgsrc/graphics/cheese/Makefile
cvs rdiff -u -r1.1 -r0 pkgsrc/graphics/cheese/hacks.mk
cvs rdiff -u -r1.6 -r1.7 pkgsrc/graphics/drawing/Makefile
cvs rdiff -u -r1.1 -r0 pkgsrc/graphics/drawing/hacks.mk
cvs rdiff -u -r1.114 -r1.115 pkgsrc/graphics/eog/Makefile
cvs rdiff -u -r1.1 -r0 pkgsrc/graphics/eog/hacks.mk
cvs rdiff -u -r1.3 -r1.4 pkgsrc/graphics/gnome-screenshot/Makefile
cvs rdiff -u -r1.1 -r0 pkgsrc/graphics/gnome-screenshot/hacks.mk
cvs rdiff -u -r1.245 -r1.246 pkgsrc/graphics/inkscape/Makefile
cvs rdiff -u -r1.1 -r0 pkgsrc/graphics/inkscape/hacks.mk
cvs rdiff -u -r1.125 -r1.126 pkgsrc/graphics/shotwell/Makefile
cvs rdiff -u -r1.36 -r1.37 pkgsrc/graphics/viewnior/Makefile
cvs rdiff -u -r1.1 -r0 pkgsrc/graphics/viewnior/hacks.mk
cvs rdiff -u -r1.83 -r1.84 pkgsrc/inputmethod/ibus/Makefile
cvs rdiff -u -r1.1 -r0 pkgsrc/inputmethod/ibus/hacks.mk
cvs rdiff -u -r1.26 -r1.27 pkgsrc/inputmethod/ibus-libpinyin/Makefile
cvs rdiff -u -r1.1 -r0 pkgsrc/inputmethod/ibus-libpinyin/hacks.mk
cvs rdiff -u -r1.59 -r1.60 pkgsrc/misc/orca/Makefile
cvs rdiff -u -r1.1 -r0 pkgsrc/misc/orca/hacks.mk
cvs rdiff -u -r1.79 -r1.80 pkgsrc/misc/yelp3/Makefile
cvs rdiff -u -r1.1 -r0 pkgsrc/misc/yelp3/hacks.mk
cvs rdiff -u -r1.3 -r1.4 pkgsrc/multimedia/gnome-video-effects/Makefile
cvs rdiff -u -r1.1 -r0 pkgsrc/multimedia/gnome-video-effects/hacks.mk
cvs rdiff -u -r1.73 -r1.74 pkgsrc/multimedia/handbrake/Makefile
cvs rdiff -u -r1.1 -r0 pkgsrc/multimedia/handbrake/hacks.mk
cvs rdiff -u -r1.121 -r1.122 pkgsrc/multimedia/totem/Makefile
cvs rdiff -u -r1.1 -r0 pkgsrc/multimedia/totem/hacks.mk
cvs rdiff -u -r1.112 -r1.113 pkgsrc/print/evince3/Makefile
cvs rdiff -u -r1.1 -r0 pkgsrc/print/evince3/hacks.mk
cvs rdiff -u -r1.22 -r1.23 pkgsrc/security/gcr/Makefile
cvs rdiff -u -r1.1 -r0 pkgsrc/security/gcr/hacks.mk
cvs rdiff -u -r1.40 -r1.41 pkgsrc/security/polkit/Makefile
cvs rdiff -u -r1.1 -r0 pkgsrc/security/polkit/hacks.mk
cvs rdiff -u -r1.170 -r1.171 pkgsrc/security/seahorse/Makefile
cvs rdiff -u -r1.1 -r0 pkgsrc/security/seahorse/hacks.mk
cvs rdiff -u -r1.4 -r1.5 pkgsrc/sysutils/gnome-characters/Makefile
cvs rdiff -u -r1.1 -r0 pkgsrc/sysutils/gnome-characters/hacks.mk
cvs rdiff -u -r1.12 -r1.13 pkgsrc/sysutils/gnome-control-center/Makefile
cvs rdiff -u -r1.1 -r0 pkgsrc/sysutils/gnome-control-center/hacks.mk
cvs rdiff -u -r1.5 -r1.6 pkgsrc/sysutils/gnome-font-viewer/Makefile
cvs rdiff -u -r1.1 -r0 pkgsrc/sysutils/gnome-font-viewer/hacks.mk
cvs rdiff -u -r1.155 -r1.156 pkgsrc/sysutils/nautilus/Makefile
cvs rdiff -u -r1.1 -r0 pkgsrc/sysutils/nautilus/hacks.mk
cvs rdiff -u -r1.7 -r1.8 pkgsrc/textproc/gnome-dictionary/Makefile
cvs rdiff -u -r1.1 -r0 pkgsrc/textproc/gnome-dictionary/hacks.mk
cvs rdiff -u -r1.12 -r1.13 pkgsrc/time/gnome-calendar/Makefile
cvs rdiff -u -r1.1 -r0 pkgsrc/time/gnome-calendar/hacks.mk
cvs rdiff -u -r1.7 -r1.8 pkgsrc/time/gnome-pomodoro/Makefile
cvs rdiff -u -r1.1 -r0 pkgsrc/time/gnome-pomodoro/hacks.mk
cvs rdiff -u -r1.208 -r1.209 pkgsrc/www/epiphany/Makefile
cvs rdiff -u -r1.1 -r0 pkgsrc/www/epiphany/hacks.mk
cvs rdiff -u -r1.207 -r1.208 pkgsrc/x11/gnome-session/Makefile
cvs rdiff -u -r1.1 -r0 pkgsrc/x11/gnome-session/hacks.mk
cvs rdiff -u -r1.16 -r1.17 pkgsrc/x11/gnome-shell/Makefile
cvs rdiff -u -r1.1 -r0 pkgsrc/x11/gnome-shell/hacks.mk
cvs rdiff -u -r1.99 -r1.100 pkgsrc/x11/gnome-terminal/Makefile
cvs rdiff -u -r1.1 -r0 pkgsrc/x11/gnome-terminal/hacks.mk
cvs rdiff -u -r1.42 -r1.43 pkgsrc/x11/xfce4-whiskermenu-plugin/Makefile
cvs rdiff -u -r1.1 -r0 pkgsrc/x11/xfce4-whiskermenu-plugin/hacks.mk

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

Modified files:

Index: pkgsrc/audio/pulseaudio/Makefile
diff -u pkgsrc/audio/pulseaudio/Makefile:1.167 pkgsrc/audio/pulseaudio/Makefile:1.168
--- pkgsrc/audio/pulseaudio/Makefile:1.167      Fri Mar 11 08:56:02 2022
+++ pkgsrc/audio/pulseaudio/Makefile    Sat Mar 12 08:01:48 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.167 2022/03/11 08:56:02 nia Exp $
+# $NetBSD: Makefile,v 1.168 2022/03/12 08:01:48 nia Exp $
 
 DISTNAME=      pulseaudio-15.0
 PKGREVISION=   1
@@ -144,6 +144,7 @@ BUILDLINK_TRANSFORM.SunOS+= rm:-Wl,-vers
 .include "../../audio/speexdsp/buildlink3.mk"
 .include "../../databases/tdb/buildlink3.mk"
 .include "../../devel/check/buildlink3.mk"
+.include "../../devel/gettext-tools/msgfmt-desktop.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/libltdl/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"

Index: pkgsrc/audio/quodlibet/Makefile
diff -u pkgsrc/audio/quodlibet/Makefile:1.16 pkgsrc/audio/quodlibet/Makefile:1.17
--- pkgsrc/audio/quodlibet/Makefile:1.16        Fri Mar 11 08:56:02 2022
+++ pkgsrc/audio/quodlibet/Makefile     Sat Mar 12 08:01:48 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2022/03/11 08:56:02 nia Exp $
+# $NetBSD: Makefile,v 1.17 2022/03/12 08:01:48 nia Exp $
 
 DISTNAME=      quodlibet-4.4.0
 PKGREVISION=   4
@@ -43,6 +43,7 @@ post-install:
        ${MV} ${DESTDIR}${PREFIX}/share/man/man1/* ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 || ${TRUE}
 
 .include "../../lang/python/egg.mk"
+.include "../../devel/gettext-tools/msgfmt-desktop.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../multimedia/gst-plugins1-good/buildlink3.mk"
 .include "../../net/libsoup/buildlink3.mk"

Index: pkgsrc/audio/sound-juicer/Makefile
diff -u pkgsrc/audio/sound-juicer/Makefile:1.122 pkgsrc/audio/sound-juicer/Makefile:1.123
--- pkgsrc/audio/sound-juicer/Makefile:1.122    Fri Mar 11 08:56:02 2022
+++ pkgsrc/audio/sound-juicer/Makefile  Sat Mar 12 08:01:48 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.122 2022/03/11 08:56:02 nia Exp $
+# $NetBSD: Makefile,v 1.123 2022/03/12 08:01:48 nia Exp $
 
 DISTNAME=      sound-juicer-3.24.0
 PKGREVISION=   12
@@ -23,6 +23,7 @@ USE_TOOLS+=   gmake
 .include "../../audio/libdiscid/buildlink3.mk"
 .include "../../audio/libmusicbrainz5/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../devel/gettext-tools/msgfmt-desktop.mk"
 .include "../../devel/gobject-introspection/buildlink3.mk"
 .include "../../devel/glib2/schemas.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"

Index: pkgsrc/audio/speech-dispatcher/Makefile
diff -u pkgsrc/audio/speech-dispatcher/Makefile:1.23 pkgsrc/audio/speech-dispatcher/Makefile:1.24
--- pkgsrc/audio/speech-dispatcher/Makefile:1.23        Fri Mar 11 08:56:02 2022
+++ pkgsrc/audio/speech-dispatcher/Makefile     Sat Mar 12 08:01:52 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2022/03/11 08:56:02 nia Exp $
+# $NetBSD: Makefile,v 1.24 2022/03/12 08:01:52 nia Exp $
 
 DISTNAME=      speech-dispatcher-0.10.2
 PKGREVISION=   3
@@ -81,6 +81,7 @@ BUILDLINK_API_DEPENDS.glib2   +=      glib2>=2.
 .include "../../audio/libsndfile/buildlink3.mk"
 .include "../../devel/dotconf/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../devel/gettext-tools/msgfmt-desktop.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/libltdl/buildlink3.mk"
 .include "../../lang/python/application.mk"

Index: pkgsrc/chat/gajim/Makefile
diff -u pkgsrc/chat/gajim/Makefile:1.62 pkgsrc/chat/gajim/Makefile:1.63
--- pkgsrc/chat/gajim/Makefile:1.62     Fri Mar  4 09:34:29 2022
+++ pkgsrc/chat/gajim/Makefile  Sat Mar 12 08:01:53 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.62 2022/03/04 09:34:29 nia Exp $
+# $NetBSD: Makefile,v 1.63 2022/03/12 08:01:53 nia Exp $
 
 DISTNAME=      gajim-1.3.3
 CATEGORIES=    chat
@@ -15,13 +15,6 @@ USE_TOOLS+=  gettext
 
 USE_PKG_RESOURCES=     yes
 
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "NetBSD"
-# needs --desktop
-TOOLS_PLATFORM.msgfmt=
-.endif
-
 MANCOMPRESSED= yes
 MAKE_ENV+=     PKGMANDIR=${PKGMANDIR}
 
@@ -37,11 +30,13 @@ DEPENDS+=   ${PYPKGPREFIX}-precis-i18n-[0-
 DEPENDS+=      ${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3
 
 .include "../../mk/bsd.prefs.mk"
+
 .if ${OPSYS} == "Darwin"
 DEPENDS+=      ${PYPKGPREFIX}-pyobjc-framework-Cocoa-[0-9]*:../../devel/py-pyobjc-framework-Cocoa
 .endif
 
 .include "options.mk"
+.include "../../devel/gettext-tools/msgfmt-desktop.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../lang/python/egg.mk"
 .include "../../x11/gtk3/buildlink3.mk"

Index: pkgsrc/chat/hexchat/Makefile
diff -u pkgsrc/chat/hexchat/Makefile:1.56 pkgsrc/chat/hexchat/Makefile:1.57
--- pkgsrc/chat/hexchat/Makefile:1.56   Fri Mar  4 07:48:16 2022
+++ pkgsrc/chat/hexchat/Makefile        Sat Mar 12 08:01:53 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.56 2022/03/04 07:48:16 nia Exp $
+# $NetBSD: Makefile,v 1.57 2022/03/12 08:01:53 nia Exp $
 
 DISTNAME=      hexchat-2.16.1
 CATEGORIES=    chat
@@ -27,17 +27,12 @@ PLIST_SUBST+=               SOEXT=${SOEXT}
 
 LDFLAGS.SunOS+=                -lsocket -lnsl
 
-.include "../../mk/bsd.prefs.mk"
-.if ${OPSYS} == "NetBSD"
-# msgfmt: unknown option -- xml
-TOOLS_PLATFORM.msgfmt=
-.endif
-
 PKGCONFIG_OVERRIDE+=   data/pkgconfig/hexchat-plugin.pc.in
 
 .include "options.mk"
 .include "../../devel/meson/build.mk"
 .include "../../converters/libiconv/buildlink3.mk"
+.include "../../devel/gettext-tools/msgfmt-desktop.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/pango/buildlink3.mk"
 # Whether Python is required strictly as a build tool or also at runtime is

Index: pkgsrc/chat/srain/Makefile
diff -u pkgsrc/chat/srain/Makefile:1.15 pkgsrc/chat/srain/Makefile:1.16
--- pkgsrc/chat/srain/Makefile:1.15     Fri Mar  4 08:10:10 2022
+++ pkgsrc/chat/srain/Makefile  Sat Mar 12 08:01:53 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2022/03/04 08:10:10 nia Exp $
+# $NetBSD: Makefile,v 1.16 2022/03/12 08:01:53 nia Exp $
 
 DISTNAME=      srain-1.3.2
 CATEGORIES=    chat
@@ -19,13 +19,6 @@ OWN_DIRS+=   ${PKG_SYSCONFDIR}/srain
 EGDIR=         ${PREFIX}/share/examples/srain
 CONF_FILES=    ${EGDIR}/builtin.cfg ${PKG_SYSCONFDIR}/srain/builtin.cfg
 
-.include "../../mk/bsd.prefs.mk"
-
-# msgfmt: unknown option -- desktop
-.if ${OPSYS} == "NetBSD"
-TOOLS_PLATFORM.msgfmt=
-.endif
-
 SUBST_CLASSES+=                sphinx
 SUBST_STAGE.sphinx=    pre-configure
 SUBST_FILES.sphinx=    doc/meson.build
@@ -40,6 +33,7 @@ post-install:
        ${RM} -f ${DESTDIR}${PREFIX}/share/srain/themes/meson.build
 
 .include "../../devel/meson/build.mk"
+.include "../../devel/gettext-tools/msgfmt-desktop.mk"
 .include "../../devel/libconfig/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../lang/python/versioned_dependencies.mk"

Index: pkgsrc/devel/devhelp/Makefile
diff -u pkgsrc/devel/devhelp/Makefile:1.144 pkgsrc/devel/devhelp/Makefile:1.145
--- pkgsrc/devel/devhelp/Makefile:1.144 Wed Dec  8 16:03:55 2021
+++ pkgsrc/devel/devhelp/Makefile       Sat Mar 12 08:01:52 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.144 2021/12/08 16:03:55 adam Exp $
+# $NetBSD: Makefile,v 1.145 2022/03/12 08:01:52 nia Exp $
 
 DISTNAME=      devhelp-3.34.0
 PKGREVISION=   9
@@ -19,14 +19,12 @@ MAKE_ENV+=  LD_LIBRARY_PATH=${WRKSRC}/out
 
 PYTHON_FOR_BUILD_ONLY= tool
 
-# XXX msgfmt: unknown option -- xml
-_TOOLS_USE_PKGSRC.msgfmt=      yes
-
 PKGCONFIG_OVERRIDE_STAGE=      pre-install
 PKGCONFIG_OVERRIDE+=           output/meson-private/libdevhelp-3.0.pc
 
 .include "../../devel/meson/build.mk"
 .include "../../devel/amtk/buildlink3.mk"
+.include "../../devel/gettext-tools/msgfmt-desktop.mk"
 .include "../../devel/gobject-introspection/buildlink3.mk"
 .include "../../devel/glib2/schemas.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"

Index: pkgsrc/devel/glade/Makefile
diff -u pkgsrc/devel/glade/Makefile:1.103 pkgsrc/devel/glade/Makefile:1.104
--- pkgsrc/devel/glade/Makefile:1.103   Wed Dec  8 16:01:52 2021
+++ pkgsrc/devel/glade/Makefile Sat Mar 12 08:01:53 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.103 2021/12/08 16:01:52 adam Exp $
+# $NetBSD: Makefile,v 1.104 2022/03/12 08:01:53 nia Exp $
 
 DISTNAME=              glade-3.36.0
 PKGREVISION=           4
@@ -19,11 +19,9 @@ USE_LIBTOOL=         yes
 USE_TOOLS+=            pkg-config intltool gmake msgfmt
 USE_TOOLS+=            itstool
 
-# Requires --xml in msgfmt.
-_TOOLS_USE_PKGSRC.msgfmt=      yes
-
 PKGCONFIG_OVERRIDE+=   data/gladeui-2.0.pc.in
 
+.include "../../devel/gettext-tools/msgfmt-desktop.mk"
 .include "../../x11/gtk3/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"

Index: pkgsrc/devel/meld/Makefile
diff -u pkgsrc/devel/meld/Makefile:1.115 pkgsrc/devel/meld/Makefile:1.116
--- pkgsrc/devel/meld/Makefile:1.115    Mon Jan 10 08:21:09 2022
+++ pkgsrc/devel/meld/Makefile  Sat Mar 12 08:01:53 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.115 2022/01/10 08:21:09 wiz Exp $
+# $NetBSD: Makefile,v 1.116 2022/03/12 08:01:53 nia Exp $
 
 DISTNAME=              meld-3.21.1
 CATEGORIES=            devel
@@ -19,9 +19,6 @@ USE_TOOLS+=           msgfmt pkg-config itstool
 # only used when building the python way (not meson)
 USE_TOOLS+=            intltool
 
-# Requires --desktop in msgfmt.
-_TOOLS_USE_PKGSRC.msgfmt=      yes
-
 SUBST_CLASSES+=                python3
 SUBST_FILES.python3=   meson.build
 SUBST_SED.python3=     -e "s,python.find_installation('python3',python.find_installation('${PYTHONBIN}',"
@@ -51,6 +48,7 @@ SUBST_MESSAGE.man=    Fixing man page insta
 BUILDLINK_API_DEPENDS.py-cairo+=       ${PYPKGPREFIX}-cairo>=1.15.0
 .include "../../graphics/py-cairo/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
+.include "../../devel/gettext-tools/msgfmt-desktop.mk"
 BUILDLINK_API_DEPENDS.glib2+=  glib2>=2.48.0
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/glib2/schemas.mk"

Index: pkgsrc/editors/dasher/Makefile
diff -u pkgsrc/editors/dasher/Makefile:1.109 pkgsrc/editors/dasher/Makefile:1.110
--- pkgsrc/editors/dasher/Makefile:1.109        Fri Mar 11 08:59:27 2022
+++ pkgsrc/editors/dasher/Makefile      Sat Mar 12 08:01:48 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.109 2022/03/11 08:59:27 nia Exp $
+# $NetBSD: Makefile,v 1.110 2022/03/12 08:01:48 nia Exp $
 
 DISTNAME=      dasher-5.0.0.b20200225
 PKGREVISION=   2
@@ -29,6 +29,7 @@ pre-configure:
        cd ${WRKSRC} && autoreconf -fi
 
 .include "../../audio/speech-dispatcher/buildlink3.mk"
+.include "../../devel/gettext-tools/msgfmt-desktop.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/buildlink3.mk"
 .include "../../x11/gtk3/buildlink3.mk"

Index: pkgsrc/editors/gedit/Makefile
diff -u pkgsrc/editors/gedit/Makefile:1.164 pkgsrc/editors/gedit/Makefile:1.165
--- pkgsrc/editors/gedit/Makefile:1.164 Fri Mar 11 08:59:27 2022
+++ pkgsrc/editors/gedit/Makefile       Sat Mar 12 08:01:49 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.164 2022/03/11 08:59:27 nia Exp $
+# $NetBSD: Makefile,v 1.165 2022/03/12 08:01:49 nia Exp $
 
 DISTNAME=      gedit-3.36.2
 PKGREVISION=   7
@@ -32,6 +32,7 @@ pre-configure:
 
 
 .include "../../devel/gobject-introspection/buildlink3.mk"
+.include "../../devel/gettext-tools/msgfmt-desktop.mk"
 BUILDLINK_API_DEPENDS.libpeas+=        libpeas>=1.14.1
 .include "../../devel/libpeas/buildlink3.mk"
 BUILDLINK_API_DEPENDS.glib2+=  glib2>=2.52

Index: pkgsrc/editors/ghex/Makefile
diff -u pkgsrc/editors/ghex/Makefile:1.64 pkgsrc/editors/ghex/Makefile:1.65
--- pkgsrc/editors/ghex/Makefile:1.64   Fri Mar 11 08:59:27 2022
+++ pkgsrc/editors/ghex/Makefile        Sat Mar 12 08:01:49 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.64 2022/03/11 08:59:27 nia Exp $
+# $NetBSD: Makefile,v 1.65 2022/03/12 08:01:49 nia Exp $
 
 DISTNAME=      ghex-3.18.4
 PKGREVISION=   4
@@ -19,6 +19,7 @@ PKGCONFIG_OVERRIDE_STAGE=     pre-install
 PKGCONFIG_OVERRIDE+=           output/data/gtkhex-3.pc
 
 .include "../../devel/meson/build.mk"
+.include "../../devel/gettext-tools/msgfmt-desktop.mk"
 .include "../../devel/glib2/schemas.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"

Index: pkgsrc/fonts/fontforge/Makefile
diff -u pkgsrc/fonts/fontforge/Makefile:1.124 pkgsrc/fonts/fontforge/Makefile:1.125
--- pkgsrc/fonts/fontforge/Makefile:1.124       Fri Mar 11 09:01:02 2022
+++ pkgsrc/fonts/fontforge/Makefile     Sat Mar 12 08:01:49 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.124 2022/03/11 09:01:02 nia Exp $
+# $NetBSD: Makefile,v 1.125 2022/03/12 08:01:49 nia Exp $
 
 DISTNAME=      fontforge-20201107
 PKGREVISION=   3
@@ -37,6 +37,7 @@ pre-configure:
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../databases/shared-mime-info/mimedb.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../devel/gettext-tools/msgfmt-desktop.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/libltdl/buildlink3.mk"
 .include "../../devel/pango/buildlink3.mk"

Index: pkgsrc/games/chromium-bsu/Makefile
diff -u pkgsrc/games/chromium-bsu/Makefile:1.23 pkgsrc/games/chromium-bsu/Makefile:1.24
--- pkgsrc/games/chromium-bsu/Makefile:1.23     Wed Dec  8 16:04:26 2021
+++ pkgsrc/games/chromium-bsu/Makefile  Sat Mar 12 08:01:53 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2021/12/08 16:04:26 adam Exp $
+# $NetBSD: Makefile,v 1.24 2022/03/12 08:01:53 nia Exp $
 
 DISTNAME=              chromium-bsu-0.9.16.1
 PKGREVISION=           5
@@ -17,9 +17,6 @@ USE_TOOLS+=           gmake pkg-config
 USE_TOOLS+=            msgfmt msgmerge xgettext
 GNU_CONFIGURE=         yes
 
-# XXX needs gnu msgfmt for desktop file creation
-_TOOLS_USE_PKGSRC.msgfmt=      yes
-
 LDFLAGS+=              ${BUILDLINK_LDADD.gettext}
 LDFLAGS.DragonFly=     -lSDL2
 LDFLAGS.SunOS=         -lSDL2
@@ -39,6 +36,7 @@ CFLAGS+=              -DWITH_JOYSTICK
 .include "../../audio/SDL2_mixer/buildlink3.mk"
 .include "../../devel/SDL2/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../devel/gettext-tools/msgfmt-desktop.mk"
 .include "../../graphics/MesaLib/buildlink3.mk"
 .include "../../graphics/SDL2_image/buildlink3.mk"
 .include "../../graphics/glu/buildlink3.mk"

Index: pkgsrc/graphics/cheese/Makefile
diff -u pkgsrc/graphics/cheese/Makefile:1.101 pkgsrc/graphics/cheese/Makefile:1.102
--- pkgsrc/graphics/cheese/Makefile:1.101       Sat Mar 12 07:06:26 2022
+++ pkgsrc/graphics/cheese/Makefile     Sat Mar 12 08:01:49 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.101 2022/03/12 07:06:26 nia Exp $
+# $NetBSD: Makefile,v 1.102 2022/03/12 08:01:49 nia Exp $
 
 DISTNAME=      cheese-3.34.0
 PKGREVISION=   9
@@ -33,6 +33,7 @@ PKGCONFIG_OVERRIDE+=          output/meson-priva
 .include "../../devel/meson/build.mk"
 .include "../../devel/glib2/schemas.mk"
 .include "../../audio/libcanberra/buildlink3.mk"
+.include "../../devel/gettext-tools/msgfmt-desktop.mk"
 BUILDLINK_DEPMETHOD.gobject-introspection?=    build
 .include "../../devel/gobject-introspection/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"

Index: pkgsrc/graphics/drawing/Makefile
diff -u pkgsrc/graphics/drawing/Makefile:1.6 pkgsrc/graphics/drawing/Makefile:1.7
--- pkgsrc/graphics/drawing/Makefile:1.6        Sat Mar 12 07:06:26 2022
+++ pkgsrc/graphics/drawing/Makefile    Sat Mar 12 08:01:49 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2022/03/12 07:06:26 nia Exp $
+# $NetBSD: Makefile,v 1.7 2022/03/12 08:01:49 nia Exp $
 
 DISTNAME=      drawing-0.8.3
 CATEGORIES=    graphics gnome
@@ -19,6 +19,7 @@ USE_TOOLS+=   pkg-config msgfmt xgettext
 PYTHON_VERSIONS_INCOMPATIBLE=  27
 
 .include "../../devel/meson/build.mk"
+.include "../../devel/gettext-tools/msgfmt-desktop.mk"
 .include "../../devel/glib2/schemas.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../lang/python/tool.mk"

Index: pkgsrc/graphics/eog/Makefile
diff -u pkgsrc/graphics/eog/Makefile:1.114 pkgsrc/graphics/eog/Makefile:1.115
--- pkgsrc/graphics/eog/Makefile:1.114  Sat Mar 12 07:06:26 2022
+++ pkgsrc/graphics/eog/Makefile        Sat Mar 12 08:01:49 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.114 2022/03/12 07:06:26 nia Exp $
+# $NetBSD: Makefile,v 1.115 2022/03/12 08:01:49 nia Exp $
 
 DISTNAME=      eog-40.3
 CATEGORIES=    graphics gnome
@@ -25,6 +25,7 @@ PKGCONFIG_OVERRIDE_STAGE=     pre-install
 PKGCONFIG_OVERRIDE+=           output/meson-private/eog.pc
 
 .include "../../devel/meson/build.mk"
+.include "../../devel/gettext-tools/msgfmt-desktop.mk"
 BUILDLINK_API_DEPENDS.glib2+=  glib2>=2.42.0
 .include "../../devel/glib2/schemas.mk"
 .include "../../devel/gobject-introspection/buildlink3.mk"

Index: pkgsrc/graphics/gnome-screenshot/Makefile
diff -u pkgsrc/graphics/gnome-screenshot/Makefile:1.3 pkgsrc/graphics/gnome-screenshot/Makefile:1.4
--- pkgsrc/graphics/gnome-screenshot/Makefile:1.3       Sat Mar 12 07:06:26 2022
+++ pkgsrc/graphics/gnome-screenshot/Makefile   Sat Mar 12 08:01:49 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2022/03/12 07:06:26 nia Exp $
+# $NetBSD: Makefile,v 1.4 2022/03/12 08:01:49 nia Exp $
 
 DISTNAME=      gnome-screenshot-3.38.0
 MASTER_SITES=  ${MASTER_SITE_GNOME:=sources/${PKGBASE}/${PKGVERSION_NOREV:R}/}
@@ -16,6 +16,7 @@ USE_TOOLS+=   pkg-config msgfmt xgettext
 PYTHON_FOR_BUILD_ONLY= tool
 
 .include "../../devel/meson/build.mk"
+.include "../../devel/gettext-tools/msgfmt-desktop.mk"
 .include "../../devel/glib2/schemas.mk"
 .include "../../audio/libcanberra/buildlink3.mk"
 .include "../../devel/libhandy1/buildlink3.mk"

Index: pkgsrc/graphics/inkscape/Makefile
diff -u pkgsrc/graphics/inkscape/Makefile:1.245 pkgsrc/graphics/inkscape/Makefile:1.246
--- pkgsrc/graphics/inkscape/Makefile:1.245     Sat Mar 12 07:06:26 2022
+++ pkgsrc/graphics/inkscape/Makefile   Sat Mar 12 08:01:49 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.245 2022/03/12 07:06:26 nia Exp $
+# $NetBSD: Makefile,v 1.246 2022/03/12 08:01:49 nia Exp $
 
 DISTNAME=      inkscape-1.1.2
 CATEGORIES=    graphics
@@ -98,6 +98,7 @@ BUILDLINK_API_DEPENDS.boehm-gc+=      boehm-g
 .include "../../converters/libwpg/buildlink3.mk"
 .include "../../devel/boehm-gc/buildlink3.mk"
 .include "../../devel/boost-headers/buildlink3.mk"
+.include "../../devel/gettext-tools/msgfmt-desktop.mk"
 .include "../../devel/googletest/buildlink3.mk"
 BUILDLINK_API_DEPENDS.libsigcpp+=      libsigc++>=2.0.12
 .include "../../devel/libsigc++/buildlink3.mk"

Index: pkgsrc/graphics/shotwell/Makefile
diff -u pkgsrc/graphics/shotwell/Makefile:1.125 pkgsrc/graphics/shotwell/Makefile:1.126
--- pkgsrc/graphics/shotwell/Makefile:1.125     Wed Dec  8 16:05:06 2021
+++ pkgsrc/graphics/shotwell/Makefile   Sat Mar 12 08:01:53 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.125 2021/12/08 16:05:06 adam Exp $
+# $NetBSD: Makefile,v 1.126 2022/03/12 08:01:53 nia Exp $
 
 DISTNAME=      shotwell-0.30.8
 PKGREVISION=   18
@@ -22,6 +22,7 @@ PYTHON_VERSIONS_INCOMPATIBLE= 27
 _TOOLS_USE_PKGSRC.msgfmt=      yes
 
 .include "../../devel/meson/build.mk"
+.include "../../devel/gettext-tools/msgfmt-desktop.mk"
 .include "../../devel/glib2/schemas.mk"
 .include "../../devel/libgee/buildlink3.mk"
 .include "../../devel/libgphoto2/buildlink3.mk"

Index: pkgsrc/graphics/viewnior/Makefile
diff -u pkgsrc/graphics/viewnior/Makefile:1.36 pkgsrc/graphics/viewnior/Makefile:1.37
--- pkgsrc/graphics/viewnior/Makefile:1.36      Sat Mar 12 07:06:26 2022
+++ pkgsrc/graphics/viewnior/Makefile   Sat Mar 12 08:01:49 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2022/03/12 07:06:26 nia Exp $
+# $NetBSD: Makefile,v 1.37 2022/03/12 08:01:49 nia Exp $
 
 DISTNAME=      viewnior-1.7
 PKGREVISION=   2
@@ -20,6 +20,7 @@ USE_LANGUAGES=        c c++
 PYTHON_FOR_BUILD_ONLY= tool
 
 .include "../../devel/meson/build.mk"
+.include "../../devel/gettext-tools/msgfmt-desktop.mk"
 .include "../../databases/shared-mime-info/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../graphics/exiv2/buildlink3.mk"

Index: pkgsrc/inputmethod/ibus/Makefile
diff -u pkgsrc/inputmethod/ibus/Makefile:1.83 pkgsrc/inputmethod/ibus/Makefile:1.84
--- pkgsrc/inputmethod/ibus/Makefile:1.83       Sat Mar 12 07:11:13 2022
+++ pkgsrc/inputmethod/ibus/Makefile    Sat Mar 12 08:01:50 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.83 2022/03/12 07:11:13 nia Exp $
+# $NetBSD: Makefile,v 1.84 2022/03/12 08:01:50 nia Exp $
 
 PKGREVISION= 2
 .include "Makefile.common"
@@ -57,6 +57,7 @@ BUILDLINK_TRANSFORM+= rm:-Wno-unused-but
 .include "../../devel/glib2/schemas.mk"
 .include "../../devel/dconf/database.mk"
 .include "../../devel/dconf/buildlink3.mk"
+.include "../../devel/gettext-tools/msgfmt-desktop.mk"
 BUILDLINK_API_DEPENDS.gobject-introspection+=  gobject-introspection>=0.9.6
 BUILDLINK_DEPMETHOD.gobject-introspection+=    build
 .include "../../devel/gobject-introspection/buildlink3.mk"

Index: pkgsrc/inputmethod/ibus-libpinyin/Makefile
diff -u pkgsrc/inputmethod/ibus-libpinyin/Makefile:1.26 pkgsrc/inputmethod/ibus-libpinyin/Makefile:1.27
--- pkgsrc/inputmethod/ibus-libpinyin/Makefile:1.26     Sat Mar 12 07:11:14 2022
+++ pkgsrc/inputmethod/ibus-libpinyin/Makefile  Sat Mar 12 08:01:50 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2022/03/12 07:11:14 nia Exp $
+# $NetBSD: Makefile,v 1.27 2022/03/12 08:01:50 nia Exp $
 
 DISTNAME=      ibus-libpinyin-1.12.0
 PKGREVISION=   2
@@ -38,6 +38,7 @@ CONFIGURE_ARGS+=      --with-boost=${BUILDLIN
 
 .include "../../devel/glib2/schemas.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../devel/gettext-tools/msgfmt-desktop.mk"
 .include "../../databases/sqlite3/buildlink3.mk"
 .include "../../inputmethod/ibus/buildlink3.mk"
 .include "../../textproc/libpinyin/buildlink3.mk"

Index: pkgsrc/misc/orca/Makefile
diff -u pkgsrc/misc/orca/Makefile:1.59 pkgsrc/misc/orca/Makefile:1.60
--- pkgsrc/misc/orca/Makefile:1.59      Sat Mar 12 07:14:17 2022
+++ pkgsrc/misc/orca/Makefile   Sat Mar 12 08:01:50 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.59 2022/03/12 07:14:17 nia Exp $
+# $NetBSD: Makefile,v 1.60 2022/03/12 08:01:50 nia Exp $
 
 DISTNAME=      orca-3.34.1
 PKGREVISION=   6
@@ -29,6 +29,7 @@ CHECK_PORTABILITY_SKIP+=      run_pylint.sh.i
 
 .include "../../devel/glib2/schemas.mk"
 .include "../../audio/speech-dispatcher/buildlink3.mk"
+.include "../../devel/gettext-tools/msgfmt-desktop.mk"
 .include "../../devel/libwnck3/buildlink3.mk"
 .include "../../devel/py-gobject3-common/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"

Index: pkgsrc/misc/yelp3/Makefile
diff -u pkgsrc/misc/yelp3/Makefile:1.79 pkgsrc/misc/yelp3/Makefile:1.80
--- pkgsrc/misc/yelp3/Makefile:1.79     Sat Mar 12 07:14:17 2022
+++ pkgsrc/misc/yelp3/Makefile  Sat Mar 12 08:01:50 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.79 2022/03/12 07:14:17 nia Exp $
+# $NetBSD: Makefile,v 1.80 2022/03/12 08:01:50 nia Exp $
 
 DISTNAME=              yelp-3.32.0
 PKGREVISION=           11
@@ -21,6 +21,7 @@ BUILDLINK_API_DEPENDS.gtk3+=  gtk3+>=3.13
 BUILDLINK_API_DEPENDS.libxslt+=        libxslt>=1.1.4
 
 .include "../../archivers/bzip2/buildlink3.mk"
+.include "../../devel/gettext-tools/msgfmt-desktop.mk"
 .include "../../devel/glib2/schemas.mk"
 .include "../../x11/gtk3/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
@@ -28,7 +29,5 @@ BUILDLINK_API_DEPENDS.libxslt+=       libxslt>
 .include "../../databases/sqlite3/buildlink3.mk"
 .include "../../www/webkit-gtk/buildlink3.mk"
 .include "../../textproc/yelp-xsl/buildlink3.mk"
-
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
-
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/multimedia/gnome-video-effects/Makefile
diff -u pkgsrc/multimedia/gnome-video-effects/Makefile:1.3 pkgsrc/multimedia/gnome-video-effects/Makefile:1.4
--- pkgsrc/multimedia/gnome-video-effects/Makefile:1.3  Sat Mar 12 07:17:19 2022
+++ pkgsrc/multimedia/gnome-video-effects/Makefile      Sat Mar 12 08:01:50 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2022/03/12 07:17:19 nia Exp $
+# $NetBSD: Makefile,v 1.4 2022/03/12 08:01:50 nia Exp $
 
 DISTNAME=      gnome-video-effects-0.5.0
 PKGREVISION=   1
@@ -18,5 +18,6 @@ PYTHON_FOR_BUILD_ONLY=        tool
 PKGCONFIG_OVERRIDE+=   gnome-video-effects.pc.in
 
 .include "../../devel/meson/build.mk"
+.include "../../devel/gettext-tools/msgfmt-desktop.mk"
 .include "../../multimedia/frei0r/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/multimedia/handbrake/Makefile
diff -u pkgsrc/multimedia/handbrake/Makefile:1.73 pkgsrc/multimedia/handbrake/Makefile:1.74
--- pkgsrc/multimedia/handbrake/Makefile:1.73   Sat Mar 12 07:17:19 2022
+++ pkgsrc/multimedia/handbrake/Makefile        Sat Mar 12 08:01:50 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.73 2022/03/12 07:17:19 nia Exp $
+# $NetBSD: Makefile,v 1.74 2022/03/12 08:01:50 nia Exp $
 #
 
 DISTNAME=      HandBrake-1.3.3-source
@@ -85,6 +85,7 @@ post-extract:
 .include "../../audio/libsamplerate/buildlink3.mk"
 .include "../../audio/speex/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../devel/gettext-tools/msgfmt-desktop.mk"
 .include "../../multimedia/gstreamer1/buildlink3.mk"
 .include "../../multimedia/libass/buildlink3.mk"
 .include "../../multimedia/libtheora/buildlink3.mk"

Index: pkgsrc/multimedia/totem/Makefile
diff -u pkgsrc/multimedia/totem/Makefile:1.121 pkgsrc/multimedia/totem/Makefile:1.122
--- pkgsrc/multimedia/totem/Makefile:1.121      Sat Mar 12 07:17:19 2022
+++ pkgsrc/multimedia/totem/Makefile    Sat Mar 12 08:01:50 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.121 2022/03/12 07:17:19 nia Exp $
+# $NetBSD: Makefile,v 1.122 2022/03/12 08:01:50 nia Exp $
 
 DISTNAME=      totem-3.34.1
 PKGREVISION=   13
@@ -25,6 +25,7 @@ PKGCONFIG_OVERRIDE+=  data/totem.pc.in
 MAKE_ENV+=     LD_LIBRARY_PATH=${WRKSRC}/output/src
 
 .include "../../devel/meson/build.mk"
+.include "../../devel/gettext-tools/msgfmt-desktop.mk"
 .include "../../devel/glib2/schemas.mk"
 .include "../../devel/libpeas/buildlink3.mk"
 .include "../../graphics/clutter-gtk/buildlink3.mk"

Index: pkgsrc/print/evince3/Makefile
diff -u pkgsrc/print/evince3/Makefile:1.112 pkgsrc/print/evince3/Makefile:1.113
--- pkgsrc/print/evince3/Makefile:1.112 Wed Dec  8 16:02:32 2021
+++ pkgsrc/print/evince3/Makefile       Sat Mar 12 08:01:50 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.112 2021/12/08 16:02:32 adam Exp $
+# $NetBSD: Makefile,v 1.113 2022/03/12 08:01:50 nia Exp $
 
 PKGREVISION= 17
 .include "../../print/evince3/Makefile.common"
@@ -14,6 +14,7 @@ USE_TOOLS+=   gsed
 
 CONFIGURE_ARGS+=       --disable-compile-warnings
 
+.include "../../devel/gettext-tools/msgfmt-desktop.mk"
 .include "../../devel/glib2/schemas.mk"
 .include "../../graphics/librsvg/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
@@ -21,5 +22,4 @@ CONFIGURE_ARGS+=      --disable-compile-warni
 BUILDLINK_DEPMETHOD.libXt=     build
 .include "../../x11/libXt/buildlink3.mk"
 .include "../../x11/libSM/buildlink3.mk"
-
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/security/gcr/Makefile
diff -u pkgsrc/security/gcr/Makefile:1.22 pkgsrc/security/gcr/Makefile:1.23
--- pkgsrc/security/gcr/Makefile:1.22   Sat Mar 12 07:28:19 2022
+++ pkgsrc/security/gcr/Makefile        Sat Mar 12 08:01:51 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2022/03/12 07:28:19 nia Exp $
+# $NetBSD: Makefile,v 1.23 2022/03/12 08:01:51 nia Exp $
 
 DISTNAME=      gcr-3.38.1
 CATEGORIES=    security
@@ -30,6 +30,7 @@ TEST_TARGET=          check
 pre-configure:
        cd ${WRKSRC} && NOCONFIGURE=1 ./autogen.sh
 
+.include "../../devel/gettext-tools/msgfmt-desktop.mk"
 BUILDLINK_API_DEPENDS.glib2+=  glib2>=2.38
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/gobject-introspection/buildlink3.mk"

Index: pkgsrc/security/polkit/Makefile
diff -u pkgsrc/security/polkit/Makefile:1.40 pkgsrc/security/polkit/Makefile:1.41
--- pkgsrc/security/polkit/Makefile:1.40        Sat Mar 12 07:28:19 2022
+++ pkgsrc/security/polkit/Makefile     Sat Mar 12 08:01:51 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2022/03/12 07:28:19 nia Exp $
+# $NetBSD: Makefile,v 1.41 2022/03/12 08:01:51 nia Exp $
 
 DISTNAME=      polkit-0.120
 PKGREVISION=   2
@@ -82,6 +82,7 @@ pre-configure:
 
 .include "../../lang/libduktape/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../devel/gettext-tools/msgfmt-desktop.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../textproc/expat/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/security/seahorse/Makefile
diff -u pkgsrc/security/seahorse/Makefile:1.170 pkgsrc/security/seahorse/Makefile:1.171
--- pkgsrc/security/seahorse/Makefile:1.170     Sat Mar 12 07:28:19 2022
+++ pkgsrc/security/seahorse/Makefile   Sat Mar 12 08:01:51 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.170 2022/03/12 07:28:19 nia Exp $
+# $NetBSD: Makefile,v 1.171 2022/03/12 08:01:51 nia Exp $
 
 DISTNAME=      seahorse-3.38.0.1
 MASTER_SITES=  ${MASTER_SITE_GNOME:=sources/${PKGBASE}/3.38/}
@@ -20,6 +20,7 @@ MESON_ARGS+=  -Dcheck-compatible-gpg=fals
 PYTHON_FOR_BUILD_ONLY= tool
 
 .include "../../devel/meson/build.mk"
+.include "../../devel/gettext-tools/msgfmt-desktop.mk"
 .include "../../devel/glib2/schemas.mk"
 .include "../../devel/gobject-introspection/buildlink3.mk"
 .include "../../devel/libhandy1/buildlink3.mk"

Index: pkgsrc/sysutils/gnome-characters/Makefile
diff -u pkgsrc/sysutils/gnome-characters/Makefile:1.4 pkgsrc/sysutils/gnome-characters/Makefile:1.5
--- pkgsrc/sysutils/gnome-characters/Makefile:1.4       Sat Mar 12 07:37:42 2022
+++ pkgsrc/sysutils/gnome-characters/Makefile   Sat Mar 12 08:01:51 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2022/03/12 07:37:42 nia Exp $
+# $NetBSD: Makefile,v 1.5 2022/03/12 08:01:51 nia Exp $
 
 DISTNAME=      gnome-characters-3.34.0
 MASTER_SITES=  ${MASTER_SITE_GNOME:=sources/${PKGBASE}/${PKGVERSION_NOREV:R}/}
@@ -16,6 +16,7 @@ USE_TOOLS+=   pkg-config msgfmt xgettext
 PYTHON_FOR_BUILD_ONLY= tool
 
 .include "../../devel/meson/build.mk"
+.include "../../devel/gettext-tools/msgfmt-desktop.mk"
 .include "../../devel/glib2/schemas.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../lang/gjs/buildlink3.mk"

Index: pkgsrc/sysutils/gnome-control-center/Makefile
diff -u pkgsrc/sysutils/gnome-control-center/Makefile:1.12 pkgsrc/sysutils/gnome-control-center/Makefile:1.13
--- pkgsrc/sysutils/gnome-control-center/Makefile:1.12  Sat Mar 12 07:37:42 2022
+++ pkgsrc/sysutils/gnome-control-center/Makefile       Sat Mar 12 08:01:51 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2022/03/12 07:37:42 nia Exp $
+# $NetBSD: Makefile,v 1.13 2022/03/12 08:01:51 nia Exp $
 
 DISTNAME=      gnome-control-center-40.0
 MASTER_SITES=  ${MASTER_SITE_GNOME:=sources/${PKGBASE}/${PKGVERSION_NOREV:R}/}
@@ -24,6 +24,7 @@ PKGCONFIG_OVERRIDE_STAGE=     pre-install
 PKGCONFIG_OVERRIDE+=           output/panels/keyboard/gnome-keybindings.pc
 
 .include "../../devel/meson/build.mk"
+.include "../../devel/gettext-tools/msgfmt-desktop.mk"
 .include "../../devel/glib2/schemas.mk"
 .include "../../audio/gsound/buildlink3.mk"
 .include "../../audio/pulseaudio/buildlink3.mk"

Index: pkgsrc/sysutils/gnome-font-viewer/Makefile
diff -u pkgsrc/sysutils/gnome-font-viewer/Makefile:1.5 pkgsrc/sysutils/gnome-font-viewer/Makefile:1.6
--- pkgsrc/sysutils/gnome-font-viewer/Makefile:1.5      Sat Mar 12 07:37:42 2022
+++ pkgsrc/sysutils/gnome-font-viewer/Makefile  Sat Mar 12 08:01:51 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2022/03/12 07:37:42 nia Exp $
+# $NetBSD: Makefile,v 1.6 2022/03/12 08:01:51 nia Exp $
 
 DISTNAME=      gnome-font-viewer-3.34.0
 MASTER_SITES=  ${MASTER_SITE_GNOME:=sources/${PKGBASE}/${PKGVERSION_NOREV:R}/}
@@ -16,6 +16,7 @@ USE_TOOLS+=   pkg-config msgfmt xgettext
 PYTHON_FOR_BUILD_ONLY= tool
 
 .include "../../devel/meson/build.mk"
+.include "../../devel/gettext-tools/msgfmt-desktop.mk"
 .include "../../devel/glib2/schemas.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"

Index: pkgsrc/sysutils/nautilus/Makefile
diff -u pkgsrc/sysutils/nautilus/Makefile:1.155 pkgsrc/sysutils/nautilus/Makefile:1.156
--- pkgsrc/sysutils/nautilus/Makefile:1.155     Sat Mar 12 07:37:42 2022
+++ pkgsrc/sysutils/nautilus/Makefile   Sat Mar 12 08:01:51 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.155 2022/03/12 07:37:42 nia Exp $
+# $NetBSD: Makefile,v 1.156 2022/03/12 08:01:51 nia Exp $
 
 DISTNAME=      nautilus-3.38.1
 MASTER_SITES=  ${MASTER_SITE_GNOME:=sources/${PKGBASE}/${PKGVERSION_NOREV:R}/}
@@ -23,6 +23,7 @@ PKGCONFIG_OVERRIDE+=          output/meson-priva
 
 .include "../../devel/meson/build.mk"
 .include "../../archivers/gnome-autoar/buildlink3.mk"
+.include "../../devel/gettext-tools/msgfmt-desktop.mk"
 .include "../../devel/glib2/schemas.mk"
 .include "../../devel/gobject-introspection/buildlink3.mk"
 .include "../../graphics/gexiv2/buildlink3.mk"

Index: pkgsrc/textproc/gnome-dictionary/Makefile
diff -u pkgsrc/textproc/gnome-dictionary/Makefile:1.7 pkgsrc/textproc/gnome-dictionary/Makefile:1.8
--- pkgsrc/textproc/gnome-dictionary/Makefile:1.7       Sat Mar 12 07:40:48 2022
+++ pkgsrc/textproc/gnome-dictionary/Makefile   Sat Mar 12 08:01:51 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2022/03/12 07:40:48 nia Exp $
+# $NetBSD: Makefile,v 1.8 2022/03/12 08:01:51 nia Exp $
 
 DISTNAME=      gnome-dictionary-3.26.1
 MASTER_SITES=  ${MASTER_SITE_GNOME:=sources/${PKGBASE}/${PKGVERSION_NOREV:R}/}
@@ -21,6 +21,7 @@ PYTHON_FOR_BUILD_ONLY=        tool
 LDFLAGS.SunOS+=        -lnsl
 
 .include "../../devel/meson/build.mk"
+.include "../../devel/gettext-tools/msgfmt-desktop.mk"
 .include "../../devel/glib2/schemas.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../x11/gtk3/buildlink3.mk"

Index: pkgsrc/time/gnome-calendar/Makefile
diff -u pkgsrc/time/gnome-calendar/Makefile:1.12 pkgsrc/time/gnome-calendar/Makefile:1.13
--- pkgsrc/time/gnome-calendar/Makefile:1.12    Sat Mar 12 07:42:32 2022
+++ pkgsrc/time/gnome-calendar/Makefile Sat Mar 12 08:01:52 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2022/03/12 07:42:32 nia Exp $
+# $NetBSD: Makefile,v 1.13 2022/03/12 08:01:52 nia Exp $
 
 DISTNAME=      gnome-calendar-40.0
 MASTER_SITES=  ${MASTER_SITE_GNOME:=sources/${PKGBASE}/${PKGVERSION_NOREV:R}/}
@@ -17,6 +17,7 @@ USE_TOOLS+=   gdbus-codegen
 PYTHON_FOR_BUILD_ONLY= tool
 
 .include "../../devel/meson/build.mk"
+.include "../../devel/gettext-tools/msgfmt-desktop.mk"
 .include "../../devel/glib2/schemas.mk"
 .include "../../devel/libdazzle/buildlink3.mk"
 .include "../../devel/libgweather/buildlink3.mk"

Index: pkgsrc/time/gnome-pomodoro/Makefile
diff -u pkgsrc/time/gnome-pomodoro/Makefile:1.7 pkgsrc/time/gnome-pomodoro/Makefile:1.8
--- pkgsrc/time/gnome-pomodoro/Makefile:1.7     Sat Mar 12 07:42:32 2022
+++ pkgsrc/time/gnome-pomodoro/Makefile Sat Mar 12 08:01:52 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2022/03/12 07:42:32 nia Exp $
+# $NetBSD: Makefile,v 1.8 2022/03/12 08:01:52 nia Exp $
 
 DISTNAME=      gnome-pomodoro-0.17.0
 PKGREVISION=   3
@@ -31,6 +31,7 @@ CONFIGURE_SCRIPT=     autogen.sh
 .include "../../databases/gom/buildlink3.mk"
 .include "../../databases/sqlite3/buildlink3.mk"
 .include "../../devel/appstream-glib/buildlink3.mk"
+.include "../../devel/gettext-tools/msgfmt-desktop.mk"
 .include "../../devel/glib2/schemas.mk"
 .include "../../devel/gobject-introspection/buildlink3.mk"
 .include "../../devel/libpeas/buildlink3.mk"

Index: pkgsrc/www/epiphany/Makefile
diff -u pkgsrc/www/epiphany/Makefile:1.208 pkgsrc/www/epiphany/Makefile:1.209
--- pkgsrc/www/epiphany/Makefile:1.208  Sat Mar 12 07:44:12 2022
+++ pkgsrc/www/epiphany/Makefile        Sat Mar 12 08:01:52 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.208 2022/03/12 07:44:12 nia Exp $
+# $NetBSD: Makefile,v 1.209 2022/03/12 08:01:52 nia Exp $
 
 DISTNAME=      epiphany-40.6
 CATEGORIES=    www gnome
@@ -22,6 +22,7 @@ PYTHON_FOR_BUILD_ONLY=        tool
 
 .include "../../devel/meson/build.mk"
 .include "../../archivers/libarchive/buildlink3.mk"
+.include "../../devel/gettext-tools/msgfmt-desktop.mk"
 BUILDLINK_API_DEPENDS.glib2+=  glib2>=2.64.0
 .include "../../devel/glib2/schemas.mk"
 BUILDLINK_API_DEPENDS.libdazzle+=      libdazzle>=3.37.1

Index: pkgsrc/x11/gnome-session/Makefile
diff -u pkgsrc/x11/gnome-session/Makefile:1.207 pkgsrc/x11/gnome-session/Makefile:1.208
--- pkgsrc/x11/gnome-session/Makefile:1.207     Sat Mar 12 07:48:52 2022
+++ pkgsrc/x11/gnome-session/Makefile   Sat Mar 12 08:01:52 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.207 2022/03/12 07:48:52 nia Exp $
+# $NetBSD: Makefile,v 1.208 2022/03/12 08:01:52 nia Exp $
 
 DISTNAME=              gnome-session-40.1.1
 PKGREVISION=           1
@@ -36,6 +36,7 @@ PYTHON_FOR_BUILD_ONLY=        tool
 .include "../../devel/meson/build.mk"
 .include "../../graphics/MesaLib/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../devel/gettext-tools/msgfmt-desktop.mk"
 BUILDLINK_API_DEPENDS.glib2+=  glib2>=2.16.0
 .include "../../devel/glib2/schemas.mk"
 .include "../../devel/pango/buildlink3.mk"

Index: pkgsrc/x11/gnome-shell/Makefile
diff -u pkgsrc/x11/gnome-shell/Makefile:1.16 pkgsrc/x11/gnome-shell/Makefile:1.17
--- pkgsrc/x11/gnome-shell/Makefile:1.16        Sat Mar 12 07:48:52 2022
+++ pkgsrc/x11/gnome-shell/Makefile     Sat Mar 12 08:01:52 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2022/03/12 07:48:52 nia Exp $
+# $NetBSD: Makefile,v 1.17 2022/03/12 08:01:52 nia Exp $
 
 DISTNAME=      gnome-shell-40.2
 PKGREVISION=   4
@@ -43,6 +43,7 @@ BUILDLINK_API_DEPENDS.libgweather+=   libg
 .include "../../archivers/gnome-autoar/buildlink3.mk"
 .include "../../audio/pulseaudio/buildlink3.mk"
 .include "../../devel/at-spi2-atk/buildlink3.mk"
+.include "../../devel/gettext-tools/msgfmt-desktop.mk"
 .include "../../devel/glib2/schemas.mk"
 .include "../../devel/gobject-introspection/buildlink3.mk"
 .include "../../graphics/adwaita-icon-theme/buildlink3.mk"

Index: pkgsrc/x11/gnome-terminal/Makefile
diff -u pkgsrc/x11/gnome-terminal/Makefile:1.99 pkgsrc/x11/gnome-terminal/Makefile:1.100
--- pkgsrc/x11/gnome-terminal/Makefile:1.99     Sat Mar 12 07:48:53 2022
+++ pkgsrc/x11/gnome-terminal/Makefile  Sat Mar 12 08:01:52 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.99 2022/03/12 07:48:53 nia Exp $
+# $NetBSD: Makefile,v 1.100 2022/03/12 08:01:52 nia Exp $
 
 DISTNAME=      gnome-terminal-3.36.2
 MASTER_SITES=  ${MASTER_SITE_GNOME:=sources/gnome-terminal/${PKGVERSION_NOREV:R}/}
@@ -26,6 +26,7 @@ post-install:
        ${RM} -f ${DESTDIR}${PREFIX}/lib/systemd/user/gnome-terminal-server.service
 
 .include "../../devel/dconf/buildlink3.mk"
+.include "../../devel/gettext-tools/msgfmt-desktop.mk"
 .include "../../devel/glib2/schemas.mk"
 .include "../../devel/libuuid/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"

Index: pkgsrc/x11/xfce4-whiskermenu-plugin/Makefile
diff -u pkgsrc/x11/xfce4-whiskermenu-plugin/Makefile:1.42 pkgsrc/x11/xfce4-whiskermenu-plugin/Makefile:1.43
--- pkgsrc/x11/xfce4-whiskermenu-plugin/Makefile:1.42   Sat Mar 12 07:48:53 2022
+++ pkgsrc/x11/xfce4-whiskermenu-plugin/Makefile        Sat Mar 12 08:01:52 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2022/03/12 07:48:53 nia Exp $
+# $NetBSD: Makefile,v 1.43 2022/03/12 08:01:52 nia Exp $
 
 VERSION=       2.7.1
 DISTNAME=      xfce4-whiskermenu-plugin-${VERSION}
@@ -15,6 +15,7 @@ USE_CMAKE=    yes
 USE_LANGUAGES= c c++
 USE_TOOLS+=    gmake pkg-config msgfmt perl intltool
 
+.include "../../devel/gettext-tools/msgfmt-desktop.mk"
 .include "../../x11/xfce4-garcon/buildlink3.mk"
 .include "../../x11/xfce4-panel/buildlink3.mk"
 .include "../../x11/xfce4-exo/buildlink3.mk"

Added files:

Index: pkgsrc/devel/gettext-tools/msgfmt-desktop.mk
diff -u /dev/null pkgsrc/devel/gettext-tools/msgfmt-desktop.mk:1.1
--- /dev/null   Sat Mar 12 08:01:54 2022
+++ pkgsrc/devel/gettext-tools/msgfmt-desktop.mk        Sat Mar 12 08:01:48 2022
@@ -0,0 +1,8 @@
+# $NetBSD: msgfmt-desktop.mk,v 1.1 2022/03/12 08:01:48 nia Exp $
+
+.include "../../mk/bsd.fast.prefs.mk"
+
+.if ${OPSYS} == "NetBSD"
+# Old GPLv2 version of msgfmt in NetBSD does not support --desktop/--xml.
+TOOLS_PLATFORM.msgfmt= # none
+.endif



Home | Main Index | Thread Index | Old Index