CVS commit: pkgsrc/time

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Sat Mar 12 07:42:32 UTC 2022

Modified Files:
        pkgsrc/time/gnome-calendar: Makefile
        pkgsrc/time/gnome-pomodoro: Makefile
Added Files:
        pkgsrc/time/gnome-calendar: hacks.mk
        pkgsrc/time/gnome-pomodoro: hacks.mk

Log Message:
time: Use hacks.mk to avoid NetBSD msgfmt on NetBSD only.


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 pkgsrc/time/gnome-calendar/Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/time/gnome-calendar/hacks.mk
cvs rdiff -u -r1.6 -r1.7 pkgsrc/time/gnome-pomodoro/Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/time/gnome-pomodoro/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/time/gnome-calendar/Makefile
diff -u pkgsrc/time/gnome-calendar/Makefile:1.11 pkgsrc/time/gnome-calendar/Makefile:1.12
--- pkgsrc/time/gnome-calendar/Makefile:1.11    Mon Jan  3 08:23:59 2022
+++ pkgsrc/time/gnome-calendar/Makefile Sat Mar 12 07:42:32 2022
@@ -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"

Index: pkgsrc/time/gnome-pomodoro/Makefile
diff -u pkgsrc/time/gnome-pomodoro/Makefile:1.6 pkgsrc/time/gnome-pomodoro/Makefile:1.7
--- pkgsrc/time/gnome-pomodoro/Makefile:1.6     Wed Dec  8 16:06:48 2021
+++ pkgsrc/time/gnome-pomodoro/Makefile Sat Mar 12 07:42:32 2022
@@ -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

Added files:

Index: pkgsrc/time/gnome-calendar/hacks.mk
diff -u /dev/null pkgsrc/time/gnome-calendar/hacks.mk:1.1
--- /dev/null   Sat Mar 12 07:42:32 2022
+++ pkgsrc/time/gnome-calendar/hacks.mk Sat Mar 12 07:42:32 2022
@@ -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

Index: pkgsrc/time/gnome-pomodoro/hacks.mk
diff -u /dev/null pkgsrc/time/gnome-pomodoro/hacks.mk:1.1
--- /dev/null   Sat Mar 12 07:42:32 2022
+++ pkgsrc/time/gnome-pomodoro/hacks.mk Sat Mar 12 07:42:32 2022
@@ -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