diff options
author | nia <nia@pkgsrc.org> | 2022-03-12 07:42:32 +0000 |
---|---|---|
committer | nia <nia@pkgsrc.org> | 2022-03-12 07:42:32 +0000 |
commit | 28aedc0451724f234c2d0d741c24f8516ba4211b (patch) | |
tree | bfd5a2bc9b392b1b5768fd193db4635e4e7543d1 | |
parent | ef48107061e306eb28c7548d8963a5ed9d95aa77 (diff) | |
download | pkgsrc-28aedc0451724f234c2d0d741c24f8516ba4211b.tar.gz |
time: Use hacks.mk to avoid NetBSD msgfmt on NetBSD only.
-rw-r--r-- | time/gnome-calendar/Makefile | 9 | ||||
-rw-r--r-- | time/gnome-calendar/hacks.mk | 13 | ||||
-rw-r--r-- | time/gnome-pomodoro/Makefile | 5 | ||||
-rw-r--r-- | time/gnome-pomodoro/hacks.mk | 13 |
4 files changed, 28 insertions, 12 deletions
diff --git a/time/gnome-calendar/Makefile b/time/gnome-calendar/Makefile index 8f898632103..7e794040494 100644 --- a/time/gnome-calendar/Makefile +++ b/time/gnome-calendar/Makefile @@ -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 @@ LICENSE= gnu-gpl-v3 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 --git a/time/gnome-calendar/hacks.mk b/time/gnome-calendar/hacks.mk new file mode 100644 index 00000000000..31a173f9f7e --- /dev/null +++ b/time/gnome-calendar/hacks.mk @@ -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 --git a/time/gnome-pomodoro/Makefile b/time/gnome-pomodoro/Makefile index feb5b4d4a77..746bc4be533 100644 --- a/time/gnome-pomodoro/Makefile +++ b/time/gnome-pomodoro/Makefile @@ -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 @@ LICENSE= gnu-gpl-v3 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 --git a/time/gnome-pomodoro/hacks.mk b/time/gnome-pomodoro/hacks.mk new file mode 100644 index 00000000000..f9a4c0f7eef --- /dev/null +++ b/time/gnome-pomodoro/hacks.mk @@ -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 |