pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc *: Replace per-package msgfmt hacks with msgfmt-deskto...
details: https://anonhg.NetBSD.org/pkgsrc/rev/9bb91d20c05c
branches: trunk
changeset: 375326:9bb91d20c05c
user: nia <nia%pkgsrc.org@localhost>
date: Sat Mar 12 08:01:48 2022 +0000
description:
*: Replace per-package msgfmt hacks with msgfmt-desktop.mk
diffstat:
audio/pulseaudio/Makefile | 3 ++-
audio/pulseaudio/hacks.mk | 13 -------------
audio/quodlibet/Makefile | 3 ++-
audio/quodlibet/hacks.mk | 13 -------------
audio/sound-juicer/Makefile | 3 ++-
audio/sound-juicer/hacks.mk | 13 -------------
audio/speech-dispatcher/Makefile | 3 ++-
chat/gajim/Makefile | 11 +++--------
chat/hexchat/Makefile | 9 ++-------
chat/srain/Makefile | 10 ++--------
devel/devhelp/Makefile | 6 ++----
devel/gettext-tools/msgfmt-desktop.mk | 8 ++++++++
devel/glade/Makefile | 6 ++----
devel/meld/Makefile | 6 ++----
editors/dasher/Makefile | 3 ++-
editors/dasher/hacks.mk | 13 -------------
editors/gedit/Makefile | 3 ++-
editors/gedit/hacks.mk | 13 -------------
editors/ghex/Makefile | 3 ++-
editors/ghex/hacks.mk | 13 -------------
fonts/fontforge/Makefile | 3 ++-
fonts/fontforge/hacks.mk | 13 -------------
games/chromium-bsu/Makefile | 6 ++----
graphics/cheese/Makefile | 3 ++-
graphics/cheese/hacks.mk | 13 -------------
graphics/drawing/Makefile | 3 ++-
graphics/drawing/hacks.mk | 13 -------------
graphics/eog/Makefile | 3 ++-
graphics/eog/hacks.mk | 13 -------------
graphics/gnome-screenshot/Makefile | 3 ++-
graphics/gnome-screenshot/hacks.mk | 13 -------------
graphics/inkscape/Makefile | 3 ++-
graphics/inkscape/hacks.mk | 13 -------------
graphics/shotwell/Makefile | 3 ++-
graphics/viewnior/Makefile | 3 ++-
graphics/viewnior/hacks.mk | 13 -------------
inputmethod/ibus-libpinyin/Makefile | 3 ++-
inputmethod/ibus-libpinyin/hacks.mk | 13 -------------
inputmethod/ibus/Makefile | 3 ++-
inputmethod/ibus/hacks.mk | 13 -------------
misc/orca/Makefile | 3 ++-
misc/orca/hacks.mk | 13 -------------
misc/yelp3/Makefile | 5 ++---
misc/yelp3/hacks.mk | 13 -------------
multimedia/gnome-video-effects/Makefile | 3 ++-
multimedia/gnome-video-effects/hacks.mk | 13 -------------
multimedia/handbrake/Makefile | 3 ++-
multimedia/handbrake/hacks.mk | 13 -------------
multimedia/totem/Makefile | 3 ++-
multimedia/totem/hacks.mk | 13 -------------
print/evince3/Makefile | 4 ++--
print/evince3/hacks.mk | 13 -------------
security/gcr/Makefile | 3 ++-
security/gcr/hacks.mk | 13 -------------
security/polkit/Makefile | 3 ++-
security/polkit/hacks.mk | 13 -------------
security/seahorse/Makefile | 3 ++-
security/seahorse/hacks.mk | 13 -------------
sysutils/gnome-characters/Makefile | 3 ++-
sysutils/gnome-characters/hacks.mk | 13 -------------
sysutils/gnome-control-center/Makefile | 3 ++-
sysutils/gnome-control-center/hacks.mk | 13 -------------
sysutils/gnome-font-viewer/Makefile | 3 ++-
sysutils/gnome-font-viewer/hacks.mk | 13 -------------
sysutils/nautilus/Makefile | 3 ++-
sysutils/nautilus/hacks.mk | 13 -------------
textproc/gnome-dictionary/Makefile | 3 ++-
textproc/gnome-dictionary/hacks.mk | 13 -------------
time/gnome-calendar/Makefile | 3 ++-
time/gnome-calendar/hacks.mk | 13 -------------
time/gnome-pomodoro/Makefile | 3 ++-
time/gnome-pomodoro/hacks.mk | 13 -------------
www/epiphany/Makefile | 3 ++-
www/epiphany/hacks.mk | 13 -------------
x11/gnome-session/Makefile | 3 ++-
x11/gnome-session/hacks.mk | 13 -------------
x11/gnome-shell/Makefile | 3 ++-
x11/gnome-shell/hacks.mk | 13 -------------
x11/gnome-terminal/Makefile | 3 ++-
x11/gnome-terminal/hacks.mk | 13 -------------
x11/xfce4-whiskermenu-plugin/Makefile | 3 ++-
x11/xfce4-whiskermenu-plugin/hacks.mk | 13 -------------
82 files changed, 99 insertions(+), 548 deletions(-)
diffs (truncated from 1480 to 300 lines):
diff -r f5efb93fc73f -r 9bb91d20c05c audio/pulseaudio/Makefile
--- a/audio/pulseaudio/Makefile Sat Mar 12 07:48:52 2022 +0000
+++ b/audio/pulseaudio/Makefile Sat Mar 12 08:01:48 2022 +0000
@@ -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 @@
.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 -r f5efb93fc73f -r 9bb91d20c05c audio/pulseaudio/hacks.mk
--- a/audio/pulseaudio/hacks.mk Sat Mar 12 07:48:52 2022 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -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 -r f5efb93fc73f -r 9bb91d20c05c audio/quodlibet/Makefile
--- a/audio/quodlibet/Makefile Sat Mar 12 07:48:52 2022 +0000
+++ b/audio/quodlibet/Makefile Sat Mar 12 08:01:48 2022 +0000
@@ -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 @@
${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 -r f5efb93fc73f -r 9bb91d20c05c audio/quodlibet/hacks.mk
--- a/audio/quodlibet/hacks.mk Sat Mar 12 07:48:52 2022 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -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 -r f5efb93fc73f -r 9bb91d20c05c audio/sound-juicer/Makefile
--- a/audio/sound-juicer/Makefile Sat Mar 12 07:48:52 2022 +0000
+++ b/audio/sound-juicer/Makefile Sat Mar 12 08:01:48 2022 +0000
@@ -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 @@
.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 -r f5efb93fc73f -r 9bb91d20c05c audio/sound-juicer/hacks.mk
--- a/audio/sound-juicer/hacks.mk Sat Mar 12 07:48:52 2022 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -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 -r f5efb93fc73f -r 9bb91d20c05c audio/speech-dispatcher/Makefile
--- a/audio/speech-dispatcher/Makefile Sat Mar 12 07:48:52 2022 +0000
+++ b/audio/speech-dispatcher/Makefile Sat Mar 12 08:01:48 2022 +0000
@@ -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 @@
.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 -r f5efb93fc73f -r 9bb91d20c05c chat/gajim/Makefile
--- a/chat/gajim/Makefile Sat Mar 12 07:48:52 2022 +0000
+++ b/chat/gajim/Makefile Sat Mar 12 08:01:48 2022 +0000
@@ -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_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}-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 -r f5efb93fc73f -r 9bb91d20c05c chat/hexchat/Makefile
--- a/chat/hexchat/Makefile Sat Mar 12 07:48:52 2022 +0000
+++ b/chat/hexchat/Makefile Sat Mar 12 08:01:48 2022 +0000
@@ -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 @@
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 -r f5efb93fc73f -r 9bb91d20c05c chat/srain/Makefile
--- a/chat/srain/Makefile Sat Mar 12 07:48:52 2022 +0000
+++ b/chat/srain/Makefile Sat Mar 12 08:01:48 2022 +0000
@@ -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 @@
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 @@
${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 -r f5efb93fc73f -r 9bb91d20c05c devel/devhelp/Makefile
--- a/devel/devhelp/Makefile Sat Mar 12 07:48:52 2022 +0000
+++ b/devel/devhelp/Makefile Sat Mar 12 08:01:48 2022 +0000
@@ -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 @@
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 -r f5efb93fc73f -r 9bb91d20c05c devel/gettext-tools/msgfmt-desktop.mk
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/gettext-tools/msgfmt-desktop.mk Sat Mar 12 08:01:48 2022 +0000
@@ -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
diff -r f5efb93fc73f -r 9bb91d20c05c devel/glade/Makefile
--- a/devel/glade/Makefile Sat Mar 12 07:48:52 2022 +0000
+++ b/devel/glade/Makefile Sat Mar 12 08:01:48 2022 +0000
@@ -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_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 -r f5efb93fc73f -r 9bb91d20c05c devel/meld/Makefile
--- a/devel/meld/Makefile Sat Mar 12 07:48:52 2022 +0000
+++ b/devel/meld/Makefile Sat Mar 12 08:01:48 2022 +0000
@@ -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 @@
# 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 @@
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"
Home |
Main Index |
Thread Index |
Old Index