pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/time time: Use hacks.mk to avoid NetBSD msgfmt on NetB...
details: https://anonhg.NetBSD.org/pkgsrc/rev/484def0c494d
branches: trunk
changeset: 375323:484def0c494d
user: nia <nia%pkgsrc.org@localhost>
date: Sat Mar 12 07:42:32 2022 +0000
description:
time: Use hacks.mk to avoid NetBSD msgfmt on NetBSD only.
diffstat:
time/gnome-calendar/Makefile | 9 +--------
time/gnome-calendar/hacks.mk | 13 +++++++++++++
time/gnome-pomodoro/Makefile | 5 +----
time/gnome-pomodoro/hacks.mk | 13 +++++++++++++
4 files changed, 28 insertions(+), 12 deletions(-)
diffs (76 lines):
diff -r 85eadb2ff80f -r 484def0c494d time/gnome-calendar/Makefile
--- a/time/gnome-calendar/Makefile Sat Mar 12 07:40:48 2022 +0000
+++ b/time/gnome-calendar/Makefile Sat Mar 12 07:42:32 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2022/01/03 08:23:59 cirnatdan Exp $
+# $NetBSD: Makefile,v 1.12 2022/03/12 07:42:32 nia Exp $
DISTNAME= gnome-calendar-40.0
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/${PKGBASE}/${PKGVERSION_NOREV:R}/}
@@ -14,13 +14,6 @@
USE_TOOLS+= pkg-config msgfmt xgettext
USE_TOOLS+= gdbus-codegen
-.include "../../mk/bsd.prefs.mk"
-
-# msgfmt: unknown option -- desktop
-.if ${OPSYS} == "NetBSD"
-TOOLS_PLATFORM.msgfmt=
-.endif
-
PYTHON_FOR_BUILD_ONLY= tool
.include "../../devel/meson/build.mk"
diff -r 85eadb2ff80f -r 484def0c494d time/gnome-calendar/hacks.mk
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/time/gnome-calendar/hacks.mk Sat Mar 12 07:42:32 2022 +0000
@@ -0,0 +1,13 @@
+# $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 -r 85eadb2ff80f -r 484def0c494d time/gnome-pomodoro/Makefile
--- a/time/gnome-pomodoro/Makefile Sat Mar 12 07:40:48 2022 +0000
+++ b/time/gnome-pomodoro/Makefile Sat Mar 12 07:42:32 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2021/12/08 16:06:48 adam Exp $
+# $NetBSD: Makefile,v 1.7 2022/03/12 07:42:32 nia Exp $
DISTNAME= gnome-pomodoro-0.17.0
PKGREVISION= 3
@@ -15,9 +15,6 @@
TOOL_DEPENDS+= autoconf-archive-[0-9]*:../../devel/autoconf-archive
BUILD_DEPENDS+= vala-[0-9]*:../../lang/vala
-# Requires --desktop in msgfmt.
-_TOOLS_USE_PKGSRC.msgfmt= yes
-
# Broken generated code uses g_return_if_fail when g_return_val_if_fail
# is necessary
CFLAGS+= -Wno-return-type
diff -r 85eadb2ff80f -r 484def0c494d time/gnome-pomodoro/hacks.mk
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/time/gnome-pomodoro/hacks.mk Sat Mar 12 07:42:32 2022 +0000
@@ -0,0 +1,13 @@
+# $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
Home |
Main Index |
Thread Index |
Old Index