diff options
81 files changed, 92 insertions, 541 deletions
diff --git a/audio/pulseaudio/Makefile b/audio/pulseaudio/Makefile index 985b3839f90..82064efecff 100644 --- a/audio/pulseaudio/Makefile +++ b/audio/pulseaudio/Makefile @@ -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,-version-script=${WRKSRC}/src/pulse/map-file .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" diff --git a/audio/pulseaudio/hacks.mk b/audio/pulseaudio/hacks.mk deleted file mode 100644 index b58d936a294..00000000000 --- a/audio/pulseaudio/hacks.mk +++ /dev/null @@ -1,13 +0,0 @@ -# $NetBSD: hacks.mk,v 1.1 2022/03/11 08:56:02 nia Exp $ - -.if !defined(PULSEAUDIO_HACKS_MK) -PULSEAUDIO_HACKS_MK:= - -.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 -PKG_HACKS+= avoid-gplv2-msgfmt -.endif -.endif # PULSEAUDIO_HACKS_MK diff --git a/audio/quodlibet/Makefile b/audio/quodlibet/Makefile index a22858fa4a9..26499bb88c2 100644 --- a/audio/quodlibet/Makefile +++ b/audio/quodlibet/Makefile @@ -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" diff --git a/audio/quodlibet/hacks.mk b/audio/quodlibet/hacks.mk deleted file mode 100644 index f6b55fab112..00000000000 --- a/audio/quodlibet/hacks.mk +++ /dev/null @@ -1,13 +0,0 @@ -# $NetBSD: hacks.mk,v 1.1 2022/03/11 08:56:02 nia Exp $ - -.if !defined(QUODLIBET_HACKS_MK) -QUODLIBET_HACKS_MK:= - -.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 -PKG_HACKS+= avoid-gplv2-msgfmt -.endif -.endif # QUODLIBET_HACKS_MK diff --git a/audio/sound-juicer/Makefile b/audio/sound-juicer/Makefile index bbd1955bff9..b8a9118f09a 100644 --- a/audio/sound-juicer/Makefile +++ b/audio/sound-juicer/Makefile @@ -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" diff --git a/audio/sound-juicer/hacks.mk b/audio/sound-juicer/hacks.mk deleted file mode 100644 index 06bf1701cdb..00000000000 --- a/audio/sound-juicer/hacks.mk +++ /dev/null @@ -1,13 +0,0 @@ -# $NetBSD: hacks.mk,v 1.1 2022/03/11 08:56:02 nia Exp $ - -.if !defined(SOUND_JUICER_HACKS_MK) -SOUND_JUICER_HACKS_MK:= - -.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 -PKG_HACKS+= avoid-gplv2-msgfmt -.endif -.endif # SOUND_JUICER_HACKS_MK diff --git a/audio/speech-dispatcher/Makefile b/audio/speech-dispatcher/Makefile index 0cda435d5c0..464afa58ac2 100644 --- a/audio/speech-dispatcher/Makefile +++ b/audio/speech-dispatcher/Makefile @@ -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.66.0 .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" diff --git a/chat/gajim/Makefile b/chat/gajim/Makefile index 17ffbd8a0ab..84607f369fa 100644 --- a/chat/gajim/Makefile +++ b/chat/gajim/Makefile @@ -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-9]*:../../textproc/py-precis-i18n 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" diff --git a/chat/hexchat/Makefile b/chat/hexchat/Makefile index 74002ee3fca..f29b7d29569 100644 --- a/chat/hexchat/Makefile +++ b/chat/hexchat/Makefile @@ -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 diff --git a/chat/srain/Makefile b/chat/srain/Makefile index c631cc1c355..d8a06c5c863 100644 --- a/chat/srain/Makefile +++ b/chat/srain/Makefile @@ -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" diff --git a/devel/devhelp/Makefile b/devel/devhelp/Makefile index 0504f836e57..c92bd4f3ae1 100644 --- a/devel/devhelp/Makefile +++ b/devel/devhelp/Makefile @@ -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}/output/devhelp 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" diff --git a/security/gcr/hacks.mk b/devel/gettext-tools/msgfmt-desktop.mk index e1a885f789f..ed95d04a0e9 100644 --- a/security/gcr/hacks.mk +++ b/devel/gettext-tools/msgfmt-desktop.mk @@ -1,13 +1,8 @@ -# $NetBSD: hacks.mk,v 1.1 2022/03/12 07:28:19 nia Exp $ - -.if !defined(GCR_HACKS_MK) -GCR_HACKS_MK:= +# $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 -PKG_HACKS+= avoid-gplv2-msgfmt .endif -.endif # GCR_HACKS_MK diff --git a/devel/glade/Makefile b/devel/glade/Makefile index 255fd7e1ede..d447832f072 100644 --- a/devel/glade/Makefile +++ b/devel/glade/Makefile @@ -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" diff --git a/devel/meld/Makefile b/devel/meld/Makefile index 8f79ef0b820..1a0289452e8 100644 --- a/devel/meld/Makefile +++ b/devel/meld/Makefile @@ -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 installation path. 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" diff --git a/editors/dasher/Makefile b/editors/dasher/Makefile index efba0cf9c9b..66b6534e1b2 100644 --- a/editors/dasher/Makefile +++ b/editors/dasher/Makefile @@ -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" diff --git a/editors/dasher/hacks.mk b/editors/dasher/hacks.mk deleted file mode 100644 index 2607c31fdba..00000000000 --- a/editors/dasher/hacks.mk +++ /dev/null @@ -1,13 +0,0 @@ -# $NetBSD: hacks.mk,v 1.1 2022/03/11 08:59:27 nia Exp $ - -.if !defined(DASHER_HACKS_MK) -DASHER_HACKS_MK:= - -.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 -PKG_HACKS+= avoid-gplv2-msgfmt -.endif -.endif # DASHER_HACKS_MK diff --git a/editors/gedit/Makefile b/editors/gedit/Makefile index 4787b207743..a7deccba85a 100644 --- a/editors/gedit/Makefile +++ b/editors/gedit/Makefile @@ -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 diff --git a/editors/gedit/hacks.mk b/editors/gedit/hacks.mk deleted file mode 100644 index 7b46608d072..00000000000 --- a/editors/gedit/hacks.mk +++ /dev/null @@ -1,13 +0,0 @@ -# $NetBSD: hacks.mk,v 1.1 2022/03/11 08:59:27 nia Exp $ - -.if !defined(GEDIT_HACKS_MK) -GEDIT_HACKS_MK:= - -.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 -PKG_HACKS+= avoid-gplv2-msgfmt -.endif -.endif # GEDIT_HACKS_MK diff --git a/editors/ghex/Makefile b/editors/ghex/Makefile index 398a491a68b..f22762db701 100644 --- a/editors/ghex/Makefile +++ b/editors/ghex/Makefile @@ -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" diff --git a/editors/ghex/hacks.mk b/editors/ghex/hacks.mk deleted file mode 100644 index e29d7eb81e7..00000000000 --- a/editors/ghex/hacks.mk +++ /dev/null @@ -1,13 +0,0 @@ -# $NetBSD: hacks.mk,v 1.1 2022/03/11 08:59:27 nia Exp $ - -.if !defined(GHEX_HACKS_MK) -GHEX_HACKS_MK:= - -.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 -PKG_HACKS+= avoid-gplv2-msgfmt -.endif -.endif # GHEX_HACKS_MK diff --git a/fonts/fontforge/Makefile b/fonts/fontforge/Makefile index 59fa7e9e89f..5e65eab4edc 100644 --- a/fonts/fontforge/Makefile +++ b/fonts/fontforge/Makefile @@ -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" diff --git a/fonts/fontforge/hacks.mk b/fonts/fontforge/hacks.mk deleted file mode 100644 index eafb6c92096..00000000000 --- a/fonts/fontforge/hacks.mk +++ /dev/null @@ -1,13 +0,0 @@ -# $NetBSD: hacks.mk,v 1.4 2022/03/11 09:01:02 nia Exp $ - -.if !defined(FONTFORGE_HACKS_MK) -FONTFORGE_HACKS_MK:= - -.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 -PKG_HACKS+= avoid-gplv2-msgfmt -.endif -.endif # FONTFORGE_HACKS_MK diff --git a/games/chromium-bsu/Makefile b/games/chromium-bsu/Makefile index ede182bf3e5..37af9e52f55 100644 --- a/games/chromium-bsu/Makefile +++ b/games/chromium-bsu/Makefile @@ -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" diff --git a/graphics/cheese/Makefile b/graphics/cheese/Makefile index 404d9c029a9..1833de9ff7d 100644 --- a/graphics/cheese/Makefile +++ b/graphics/cheese/Makefile @@ -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-private/cheese-gtk.pc .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" diff --git a/graphics/cheese/hacks.mk b/graphics/cheese/hacks.mk deleted file mode 100644 index cdd107ae271..00000000000 --- a/graphics/cheese/hacks.mk +++ /dev/null @@ -1,13 +0,0 @@ -# $NetBSD: hacks.mk,v 1.1 2022/03/12 07:06:26 nia Exp $ - -.if !defined(CHEESE_HACKS_MK) -CHEESE_HACKS_MK:= - -.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 -PKG_HACKS+= avoid-gplv2-msgfmt -.endif -.endif # CHEESE_HACKS_MK diff --git a/graphics/drawing/Makefile b/graphics/drawing/Makefile index bad54f8bc4b..bee52e6eb29 100644 --- a/graphics/drawing/Makefile +++ b/graphics/drawing/Makefile @@ -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" diff --git a/graphics/drawing/hacks.mk b/graphics/drawing/hacks.mk deleted file mode 100644 index 7a6a68c43ec..00000000000 --- a/graphics/drawing/hacks.mk +++ /dev/null @@ -1,13 +0,0 @@ -# $NetBSD: hacks.mk,v 1.1 2022/03/12 07:06:26 nia Exp $ - -.if !defined(DRAWING_HACKS_MK) -DRAWING_HACKS_MK:= - -.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 -PKG_HACKS+= avoid-gplv2-msgfmt -.endif -.endif # DRAWING_HACKS_MK diff --git a/graphics/eog/Makefile b/graphics/eog/Makefile index 2ad6b8ebe49..e16480a4cd4 100644 --- a/graphics/eog/Makefile +++ b/graphics/eog/Makefile @@ -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" diff --git a/graphics/eog/hacks.mk b/graphics/eog/hacks.mk deleted file mode 100644 index d7f2e832d49..00000000000 --- a/graphics/eog/hacks.mk +++ /dev/null @@ -1,13 +0,0 @@ -# $NetBSD: hacks.mk,v 1.1 2022/03/12 07:06:26 nia Exp $ - -.if !defined(EOG_HACKS_MK) -EOG_HACKS_MK:= - -.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 -PKG_HACKS+= avoid-gplv2-msgfmt -.endif -.endif # EOG_HACKS_MK diff --git a/graphics/gnome-screenshot/Makefile b/graphics/gnome-screenshot/Makefile index 03e90480257..813618f9103 100644 --- a/graphics/gnome-screenshot/Makefile +++ b/graphics/gnome-screenshot/Makefile @@ -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" diff --git a/graphics/gnome-screenshot/hacks.mk b/graphics/gnome-screenshot/hacks.mk deleted file mode 100644 index d7333b1d463..00000000000 --- a/graphics/gnome-screenshot/hacks.mk +++ /dev/null @@ -1,13 +0,0 @@ -# $NetBSD: hacks.mk,v 1.1 2022/03/12 07:06:26 nia Exp $ - -.if !defined(GNOME_SCREENSHOT_HACKS_MK) -GNOME_SCREENSHOT_HACKS_MK:= - -.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 -PKG_HACKS+= avoid-gplv2-msgfmt -.endif -.endif # GNOME_SCREENSHOT_HACKS_MK diff --git a/graphics/inkscape/Makefile b/graphics/inkscape/Makefile index e5de6c96b99..a7753fb0547 100644 --- a/graphics/inkscape/Makefile +++ b/graphics/inkscape/Makefile @@ -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-gc>=7.4 .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" diff --git a/graphics/inkscape/hacks.mk b/graphics/inkscape/hacks.mk deleted file mode 100644 index 40e8e0be50c..00000000000 --- a/graphics/inkscape/hacks.mk +++ /dev/null @@ -1,13 +0,0 @@ -# $NetBSD: hacks.mk,v 1.1 2022/03/12 07:06:26 nia Exp $ - -.if !defined(INKSCAPE_HACKS_MK) -INKSCAPE_HACKS_MK:= - -.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 -PKG_HACKS+= avoid-gplv2-msgfmt -.endif -.endif # INKSCAPE_HACKS_MK diff --git a/graphics/shotwell/Makefile b/graphics/shotwell/Makefile index b32a2f9de47..4be04dcc065 100644 --- a/graphics/shotwell/Makefile +++ b/graphics/shotwell/Makefile @@ -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" diff --git a/graphics/viewnior/Makefile b/graphics/viewnior/Makefile index 2e6d8875c63..91359e34c7a 100644 --- a/graphics/viewnior/Makefile +++ b/graphics/viewnior/Makefile @@ -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" diff --git a/graphics/viewnior/hacks.mk b/graphics/viewnior/hacks.mk deleted file mode 100644 index ee746213633..00000000000 --- a/graphics/viewnior/hacks.mk +++ /dev/null @@ -1,13 +0,0 @@ -# $NetBSD: hacks.mk,v 1.1 2022/03/12 07:06:26 nia Exp $ - -.if !defined(VIEWNIOR_HACKS_MK) -VIEWNIOR_HACKS_MK:= - -.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 -PKG_HACKS+= avoid-gplv2-msgfmt -.endif -.endif # VIEWNIOR_HACKS_MK diff --git a/inputmethod/ibus-libpinyin/Makefile b/inputmethod/ibus-libpinyin/Makefile index 04a8bb193cf..4a7bbdea77e 100644 --- a/inputmethod/ibus-libpinyin/Makefile +++ b/inputmethod/ibus-libpinyin/Makefile @@ -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=${BUILDLINK_PREFIX.boost-headers} .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" diff --git a/inputmethod/ibus-libpinyin/hacks.mk b/inputmethod/ibus-libpinyin/hacks.mk deleted file mode 100644 index cfaad028fb7..00000000000 --- a/inputmethod/ibus-libpinyin/hacks.mk +++ /dev/null @@ -1,13 +0,0 @@ -# $NetBSD: hacks.mk,v 1.1 2022/03/12 07:11:14 nia Exp $ - -.if !defined(IBUS_LIBPINYIN_HACKS_MK) -IBUS_LIBPINYIN_HACKS_MK:= - -.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 -PKG_HACKS+= avoid-gplv2-msgfmt -.endif -.endif # IBUS_LIBPINYIN_HACKS_MK diff --git a/inputmethod/ibus/Makefile b/inputmethod/ibus/Makefile index 0ba6f32309e..b719e680abf 100644 --- a/inputmethod/ibus/Makefile +++ b/inputmethod/ibus/Makefile @@ -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-set-variable .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" diff --git a/inputmethod/ibus/hacks.mk b/inputmethod/ibus/hacks.mk deleted file mode 100644 index 3b383216bfc..00000000000 --- a/inputmethod/ibus/hacks.mk +++ /dev/null @@ -1,13 +0,0 @@ -# $NetBSD: hacks.mk,v 1.1 2022/03/12 07:11:13 nia Exp $ - -.if !defined(IBUS_HACKS_MK) -IBUS_HACKS_MK:= - -.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 -PKG_HACKS+= avoid-gplv2-msgfmt -.endif -.endif # IBUS_HACKS_MK diff --git a/misc/orca/Makefile b/misc/orca/Makefile index 22a4a34d390..8ff625bab0e 100644 --- a/misc/orca/Makefile +++ b/misc/orca/Makefile @@ -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.in .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" diff --git a/misc/orca/hacks.mk b/misc/orca/hacks.mk deleted file mode 100644 index 8f3193f0b56..00000000000 --- a/misc/orca/hacks.mk +++ /dev/null @@ -1,13 +0,0 @@ -# $NetBSD: hacks.mk,v 1.1 2022/03/12 07:14:17 nia Exp $ - -.if !defined(ORCA_HACKS_MK) -ORCA_HACKS_MK:= - -.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 -PKG_HACKS+= avoid-gplv2-msgfmt -.endif -.endif # ORCA_HACKS_MK diff --git a/misc/yelp3/Makefile b/misc/yelp3/Makefile index 0370e488c2c..14204004abf 100644 --- a/misc/yelp3/Makefile +++ b/misc/yelp3/Makefile @@ -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.3 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>=1.1.4 .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" diff --git a/misc/yelp3/hacks.mk b/misc/yelp3/hacks.mk deleted file mode 100644 index 1a489be86ff..00000000000 --- a/misc/yelp3/hacks.mk +++ /dev/null @@ -1,13 +0,0 @@ -# $NetBSD: hacks.mk,v 1.1 2022/03/12 07:14:17 nia Exp $ - -.if !defined(YELP_HACKS_MK) -YELP_HACKS_MK:= - -.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 -PKG_HACKS+= avoid-gplv2-msgfmt -.endif -.endif # YELP_HACKS_MK diff --git a/multimedia/gnome-video-effects/Makefile b/multimedia/gnome-video-effects/Makefile index f641dba1155..b0b5042a5ea 100644 --- a/multimedia/gnome-video-effects/Makefile +++ b/multimedia/gnome-video-effects/Makefile @@ -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" diff --git a/multimedia/gnome-video-effects/hacks.mk b/multimedia/gnome-video-effects/hacks.mk deleted file mode 100644 index 74b0fe83d21..00000000000 --- a/multimedia/gnome-video-effects/hacks.mk +++ /dev/null @@ -1,13 +0,0 @@ -# $NetBSD: hacks.mk,v 1.1 2022/03/12 07:17:19 nia Exp $ - -.if !defined(GNOME_VIDEO_EFFECTS_HACKS_MK) -GNOME_VIDEO_EFFECTS_HACKS_MK:= - -.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 -PKG_HACKS+= avoid-gplv2-msgfmt -.endif -.endif # GNOME_VIDEO_EFFECTS_HACKS_MK diff --git a/multimedia/handbrake/Makefile b/multimedia/handbrake/Makefile index c1e91209ae0..0e0297f1eb7 100644 --- a/multimedia/handbrake/Makefile +++ b/multimedia/handbrake/Makefile @@ -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" diff --git a/multimedia/handbrake/hacks.mk b/multimedia/handbrake/hacks.mk deleted file mode 100644 index 55f136929d5..00000000000 --- a/multimedia/handbrake/hacks.mk +++ /dev/null @@ -1,13 +0,0 @@ -# $NetBSD: hacks.mk,v 1.1 2022/03/12 07:17:19 nia Exp $ - -.if !defined(HANDBRAKE_HACKS_MK) -HANDBRAKE_HACKS_MK:= - -.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 -PKG_HACKS+= avoid-gplv2-msgfmt -.endif -.endif # HANDBRAKE_HACKS_MK diff --git a/multimedia/totem/Makefile b/multimedia/totem/Makefile index 9eefb0e0c9c..6d7547da5d8 100644 --- a/multimedia/totem/Makefile +++ b/multimedia/totem/Makefile @@ -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" diff --git a/multimedia/totem/hacks.mk b/multimedia/totem/hacks.mk deleted file mode 100644 index f4032904fd4..00000000000 --- a/multimedia/totem/hacks.mk +++ /dev/null @@ -1,13 +0,0 @@ -# $NetBSD: hacks.mk,v 1.1 2022/03/12 07:17:19 nia Exp $ - -.if !defined(TOTEM_HACKS_MK) -TOTEM_HACKS_MK:= - -.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 -PKG_HACKS+= avoid-gplv2-msgfmt -.endif -.endif # TOTEM_HACKS_MK diff --git a/print/evince3/Makefile b/print/evince3/Makefile index efd3743ce70..af06b87e209 100644 --- a/print/evince3/Makefile +++ b/print/evince3/Makefile @@ -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-warnings BUILDLINK_DEPMETHOD.libXt= build .include "../../x11/libXt/buildlink3.mk" .include "../../x11/libSM/buildlink3.mk" - .include "../../mk/bsd.pkg.mk" diff --git a/print/evince3/hacks.mk b/print/evince3/hacks.mk deleted file mode 100644 index 0cebbd122d6..00000000000 --- a/print/evince3/hacks.mk +++ /dev/null @@ -1,13 +0,0 @@ -# $NetBSD: hacks.mk,v 1.1 2022/03/12 07:19:24 nia Exp $ - -.if !defined(EVINCE_HACKS_MK) -EVINCE_HACKS_MK:= - -.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 -PKG_HACKS+= avoid-gplv2-msgfmt -.endif -.endif # EVINCE_HACKS_MK diff --git a/security/gcr/Makefile b/security/gcr/Makefile index 6a4b2fe2d6e..ed4e283c2b9 100644 --- a/security/gcr/Makefile +++ b/security/gcr/Makefile @@ -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" diff --git a/security/polkit/Makefile b/security/polkit/Makefile index 43f435f25f2..27a7067363b 100644 --- a/security/polkit/Makefile +++ b/security/polkit/Makefile @@ -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" diff --git a/security/polkit/hacks.mk b/security/polkit/hacks.mk deleted file mode 100644 index 700da6e6ddf..00000000000 --- a/security/polkit/hacks.mk +++ /dev/null @@ -1,13 +0,0 @@ -# $NetBSD: hacks.mk,v 1.1 2022/03/12 07:28:19 nia Exp $ - -.if !defined(POLKIT_HACKS_MK) -POLKIT_HACKS_MK:= - -.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 -PKG_HACKS+= avoid-gplv2-msgfmt -.endif -.endif # POLKIT_HACKS_MK diff --git a/security/seahorse/Makefile b/security/seahorse/Makefile index f689176c395..d2dacf3a26a 100644 --- a/security/seahorse/Makefile +++ b/security/seahorse/Makefile @@ -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=false 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" diff --git a/security/seahorse/hacks.mk b/security/seahorse/hacks.mk deleted file mode 100644 index ef75e3367d7..00000000000 --- a/security/seahorse/hacks.mk +++ /dev/null @@ -1,13 +0,0 @@ -# $NetBSD: hacks.mk,v 1.1 2022/03/12 07:28:19 nia Exp $ - -.if !defined(SEAHORSE_HACKS_MK) -SEAHORSE_HACKS_MK:= - -.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 -PKG_HACKS+= avoid-gplv2-msgfmt -.endif -.endif # SEAHORSE_HACKS_MK diff --git a/sysutils/gnome-characters/Makefile b/sysutils/gnome-characters/Makefile index d35c491b630..782ea596b12 100644 --- a/sysutils/gnome-characters/Makefile +++ b/sysutils/gnome-characters/Makefile @@ -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" diff --git a/sysutils/gnome-characters/hacks.mk b/sysutils/gnome-characters/hacks.mk deleted file mode 100644 index 6182afd2cc5..00000000000 --- a/sysutils/gnome-characters/hacks.mk +++ /dev/null @@ -1,13 +0,0 @@ -# $NetBSD: hacks.mk,v 1.1 2022/03/12 07:37:42 nia Exp $ - -.if !defined(GNOME_CHARACTERS_HACKS_MK) -GNOME_CHARACTERS_HACKS_MK:= - -.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 -PKG_HACKS+= avoid-gplv2-msgfmt -.endif -.endif # GNOME_CHARACTERS_HACKS_MK diff --git a/sysutils/gnome-control-center/Makefile b/sysutils/gnome-control-center/Makefile index 5ff10e29eac..486b01d6184 100644 --- a/sysutils/gnome-control-center/Makefile +++ b/sysutils/gnome-control-center/Makefile @@ -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" diff --git a/sysutils/gnome-control-center/hacks.mk b/sysutils/gnome-control-center/hacks.mk deleted file mode 100644 index 57e32d56b44..00000000000 --- a/sysutils/gnome-control-center/hacks.mk +++ /dev/null @@ -1,13 +0,0 @@ -# $NetBSD: hacks.mk,v 1.1 2022/03/12 07:37:42 nia Exp $ - -.if !defined(GNOME_CONTROL_CENTER_HACKS_MK) -GNOME_CONTROL_CENTER_HACKS_MK:= - -.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 -PKG_HACKS+= avoid-gplv2-msgfmt -.endif -.endif # GNOME_CONTROL_CENTER_HACKS_MK diff --git a/sysutils/gnome-font-viewer/Makefile b/sysutils/gnome-font-viewer/Makefile index db0f6ff8742..4dafb7ddf3f 100644 --- a/sysutils/gnome-font-viewer/Makefile +++ b/sysutils/gnome-font-viewer/Makefile @@ -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" diff --git a/sysutils/gnome-font-viewer/hacks.mk b/sysutils/gnome-font-viewer/hacks.mk deleted file mode 100644 index bd3903eece6..00000000000 --- a/sysutils/gnome-font-viewer/hacks.mk +++ /dev/null @@ -1,13 +0,0 @@ -# $NetBSD: hacks.mk,v 1.1 2022/03/12 07:37:42 nia Exp $ - -.if !defined(GNOME_FONT_VIEWER_HACKS_MK) -GNOME_FONT_VIEWER_HACKS_MK:= - -.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 -PKG_HACKS+= avoid-gplv2-msgfmt -.endif -.endif # GNOME_FONT_VIEWER_HACKS_MK diff --git a/sysutils/nautilus/Makefile b/sysutils/nautilus/Makefile index e2f0a1e0613..4e40ed9c8f1 100644 --- a/sysutils/nautilus/Makefile +++ b/sysutils/nautilus/Makefile @@ -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-private/libnautilus-extension.pc .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" diff --git a/sysutils/nautilus/hacks.mk b/sysutils/nautilus/hacks.mk deleted file mode 100644 index 282d59d441f..00000000000 --- a/sysutils/nautilus/hacks.mk +++ /dev/null @@ -1,13 +0,0 @@ -# $NetBSD: hacks.mk,v 1.1 2022/03/12 07:37:42 nia Exp $ - -.if !defined(NAUTILUS_HACKS_MK) -NAUTILUS_HACKS_MK:= - -.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 -PKG_HACKS+= avoid-gplv2-msgfmt -.endif -.endif # NAUTILUS_HACKS_MK diff --git a/textproc/gnome-dictionary/Makefile b/textproc/gnome-dictionary/Makefile index 7a80dd6a74d..66e2888e3e6 100644 --- a/textproc/gnome-dictionary/Makefile +++ b/textproc/gnome-dictionary/Makefile @@ -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" diff --git a/textproc/gnome-dictionary/hacks.mk b/textproc/gnome-dictionary/hacks.mk deleted file mode 100644 index 294bad9c950..00000000000 --- a/textproc/gnome-dictionary/hacks.mk +++ /dev/null @@ -1,13 +0,0 @@ -# $NetBSD: hacks.mk,v 1.1 2022/03/12 07:40:48 nia Exp $ - -.if !defined(GNOME_DICTIONARY_HACKS_MK) -GNOME_DICTIONARY_HACKS_MK:= - -.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 -PKG_HACKS+= avoid-gplv2-msgfmt -.endif -.endif # GNOME_DICTIONARY_HACKS_MK diff --git a/time/gnome-calendar/Makefile b/time/gnome-calendar/Makefile index 7e794040494..b6f5fed3249 100644 --- a/time/gnome-calendar/Makefile +++ b/time/gnome-calendar/Makefile @@ -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" diff --git a/time/gnome-calendar/hacks.mk b/time/gnome-calendar/hacks.mk deleted file mode 100644 index 31a173f9f7e..00000000000 --- a/time/gnome-calendar/hacks.mk +++ /dev/null @@ -1,13 +0,0 @@ -# $NetBSD: hacks.mk,v 1.1 2022/03/12 07:42:32 nia Exp $ - -.if !defined(GNOME_CALENDAR_HACKS_MK) -GNOME_CALENDAR_HACKS_MK:= - -.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 -PKG_HACKS+= avoid-gplv2-msgfmt -.endif -.endif # GNOME_CALENDAR_HACKS_MK diff --git a/time/gnome-pomodoro/Makefile b/time/gnome-pomodoro/Makefile index 746bc4be533..7c509d386a7 100644 --- a/time/gnome-pomodoro/Makefile +++ b/time/gnome-pomodoro/Makefile @@ -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" diff --git a/time/gnome-pomodoro/hacks.mk b/time/gnome-pomodoro/hacks.mk deleted file mode 100644 index f9a4c0f7eef..00000000000 --- a/time/gnome-pomodoro/hacks.mk +++ /dev/null @@ -1,13 +0,0 @@ -# $NetBSD: hacks.mk,v 1.1 2022/03/12 07:42:32 nia Exp $ - -.if !defined(GNOME_POMODORO_HACKS_MK) -GNOME_POMODORO_HACKS_MK:= - -.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 -PKG_HACKS+= avoid-gplv2-msgfmt -.endif -.endif # GNOME_POMODORO_HACKS_MK diff --git a/www/epiphany/Makefile b/www/epiphany/Makefile index 975adea37a2..58bec75d394 100644 --- a/www/epiphany/Makefile +++ b/www/epiphany/Makefile @@ -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 diff --git a/www/epiphany/hacks.mk b/www/epiphany/hacks.mk deleted file mode 100644 index 64885ff87ba..00000000000 --- a/www/epiphany/hacks.mk +++ /dev/null @@ -1,13 +0,0 @@ -# $NetBSD: hacks.mk,v 1.1 2022/03/12 07:44:12 nia Exp $ - -.if !defined(EPIPHANY_HACKS_MK) -EPIPHANY_HACKS_MK:= - -.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 -PKG_HACKS+= avoid-gplv2-msgfmt -.endif -.endif # EPIPHANY_HACKS_MK diff --git a/x11/gnome-session/Makefile b/x11/gnome-session/Makefile index 13ff64b7002..148f16652ce 100644 --- a/x11/gnome-session/Makefile +++ b/x11/gnome-session/Makefile @@ -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" diff --git a/x11/gnome-session/hacks.mk b/x11/gnome-session/hacks.mk deleted file mode 100644 index 669228b9d95..00000000000 --- a/x11/gnome-session/hacks.mk +++ /dev/null @@ -1,13 +0,0 @@ -# $NetBSD: hacks.mk,v 1.1 2022/03/12 07:48:52 nia Exp $ - -.if !defined(GNOME_SESSION_HACKS_MK) -GNOME_SESSION_HACKS_MK:= - -.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 -PKG_HACKS+= avoid-gplv2-msgfmt -.endif -.endif # GNOME_SESSION_HACKS_MK diff --git a/x11/gnome-shell/Makefile b/x11/gnome-shell/Makefile index 8e21f7cc24c..5965465a47f 100644 --- a/x11/gnome-shell/Makefile +++ b/x11/gnome-shell/Makefile @@ -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+= libgweather>=40.0 .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" diff --git a/x11/gnome-shell/hacks.mk b/x11/gnome-shell/hacks.mk deleted file mode 100644 index 4437bc37ade..00000000000 --- a/x11/gnome-shell/hacks.mk +++ /dev/null @@ -1,13 +0,0 @@ -# $NetBSD: hacks.mk,v 1.1 2022/03/12 07:48:52 nia Exp $ - -.if !defined(GNOME_SHELL_HACKS_MK) -GNOME_SHELL_HACKS_MK:= - -.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 -PKG_HACKS+= avoid-gplv2-msgfmt -.endif -.endif # GNOME_SHELL_HACKS_MK diff --git a/x11/gnome-terminal/Makefile b/x11/gnome-terminal/Makefile index ef9db3f1359..2a7662f28f9 100644 --- a/x11/gnome-terminal/Makefile +++ b/x11/gnome-terminal/Makefile @@ -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" diff --git a/x11/gnome-terminal/hacks.mk b/x11/gnome-terminal/hacks.mk deleted file mode 100644 index a7f8b142933..00000000000 --- a/x11/gnome-terminal/hacks.mk +++ /dev/null @@ -1,13 +0,0 @@ -# $NetBSD: hacks.mk,v 1.1 2022/03/12 07:48:53 nia Exp $ - -.if !defined(GNOME_TERMINAL_HACKS_MK) -GNOME_TERMINAL_HACKS_MK:= - -.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 -PKG_HACKS+= avoid-gplv2-msgfmt -.endif -.endif # GNOME_TERMINAL_HACKS_MK diff --git a/x11/xfce4-whiskermenu-plugin/Makefile b/x11/xfce4-whiskermenu-plugin/Makefile index ae144b9fff8..73da9441878 100644 --- a/x11/xfce4-whiskermenu-plugin/Makefile +++ b/x11/xfce4-whiskermenu-plugin/Makefile @@ -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" diff --git a/x11/xfce4-whiskermenu-plugin/hacks.mk b/x11/xfce4-whiskermenu-plugin/hacks.mk deleted file mode 100644 index 4976143b8ca..00000000000 --- a/x11/xfce4-whiskermenu-plugin/hacks.mk +++ /dev/null @@ -1,13 +0,0 @@ -# $NetBSD: hacks.mk,v 1.1 2022/03/12 07:48:53 nia Exp $ - -.if !defined(XFCE4_WHISKERMENU_PLUGIN_HACKS_MK) -XFCE4_WHISKERMENU_PLUGIN_HACKS_MK:= - -.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 -PKG_HACKS+= avoid-gplv2-msgfmt -.endif -.endif # XFCE4_WHISKERMENU_PLUGIN_HACKS_MK |