Sat Mar 12 07:42:32 2022 UTC ()
time: Use hacks.mk to avoid NetBSD msgfmt on NetBSD only.


(nia)
diff -r1.11 -r1.12 pkgsrc/time/gnome-calendar/Makefile
diff -r0 -r1.1 pkgsrc/time/gnome-calendar/hacks.mk
diff -r1.6 -r1.7 pkgsrc/time/gnome-pomodoro/Makefile
diff -r0 -r1.1 pkgsrc/time/gnome-pomodoro/hacks.mk
cvs diff -r1.11 -r1.12 pkgsrc/time/gnome-calendar/Makefile (expand / switch to unified diff)

--- pkgsrc/time/gnome-calendar/Makefile 2022/01/03 08:23:59 1.11
+++ pkgsrc/time/gnome-calendar/Makefile 2022/03/12 07:42:32 1.12
@@ -1,36 +1,29 @@ @@ -1,36 +1,29 @@
1# $NetBSD: Makefile,v 1.11 2022/01/03 08:23:59 cirnatdan Exp $ 1# $NetBSD: Makefile,v 1.12 2022/03/12 07:42:32 nia Exp $
2 2
3DISTNAME= gnome-calendar-40.0 3DISTNAME= gnome-calendar-40.0
4MASTER_SITES= ${MASTER_SITE_GNOME:=sources/${PKGBASE}/${PKGVERSION_NOREV:R}/} 4MASTER_SITES= ${MASTER_SITE_GNOME:=sources/${PKGBASE}/${PKGVERSION_NOREV:R}/}
5PKGREVISION= 6 5PKGREVISION= 6
6CATEGORIES= time gnome 6CATEGORIES= time gnome
7EXTRACT_SUFX= .tar.xz 7EXTRACT_SUFX= .tar.xz
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= https://wiki.gnome.org/Apps/Calendar/ 10HOMEPAGE= https://wiki.gnome.org/Apps/Calendar/
11COMMENT= Calendar application for GNOME 11COMMENT= Calendar application for GNOME
12LICENSE= gnu-gpl-v3 12LICENSE= gnu-gpl-v3
13 13
14USE_TOOLS+= pkg-config msgfmt xgettext 14USE_TOOLS+= pkg-config msgfmt xgettext
15USE_TOOLS+= gdbus-codegen 15USE_TOOLS+= gdbus-codegen
16 16
17.include "../../mk/bsd.prefs.mk" 
18 
19# msgfmt: unknown option -- desktop 
20.if ${OPSYS} == "NetBSD" 
21TOOLS_PLATFORM.msgfmt= 
22.endif 
23 
24PYTHON_FOR_BUILD_ONLY= tool 17PYTHON_FOR_BUILD_ONLY= tool
25 18
26.include "../../devel/meson/build.mk" 19.include "../../devel/meson/build.mk"
27.include "../../devel/glib2/schemas.mk" 20.include "../../devel/glib2/schemas.mk"
28.include "../../devel/libdazzle/buildlink3.mk" 21.include "../../devel/libdazzle/buildlink3.mk"
29.include "../../devel/libgweather/buildlink3.mk" 22.include "../../devel/libgweather/buildlink3.mk"
30.include "../../devel/libhandy1/buildlink3.mk" 23.include "../../devel/libhandy1/buildlink3.mk"
31.include "../../geography/geoclue/buildlink3.mk" 24.include "../../geography/geoclue/buildlink3.mk"
32.include "../../graphics/hicolor-icon-theme/buildlink3.mk" 25.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
33.include "../../mail/evolution-data-server/buildlink3.mk" 26.include "../../mail/evolution-data-server/buildlink3.mk"
34.include "../../time/libical/buildlink3.mk" 27.include "../../time/libical/buildlink3.mk"
35.include "../../net/gnome-online-accounts/buildlink3.mk" 28.include "../../net/gnome-online-accounts/buildlink3.mk"
36.include "../../net/libsoup/buildlink3.mk" 29.include "../../net/libsoup/buildlink3.mk"
File Added: pkgsrc/time/gnome-calendar/Attic/hacks.mk
# $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
cvs diff -r1.6 -r1.7 pkgsrc/time/gnome-pomodoro/Makefile (expand / switch to unified diff)

--- pkgsrc/time/gnome-pomodoro/Makefile 2021/12/08 16:06:48 1.6
+++ pkgsrc/time/gnome-pomodoro/Makefile 2022/03/12 07:42:32 1.7
@@ -1,33 +1,30 @@ @@ -1,33 +1,30 @@
1# $NetBSD: Makefile,v 1.6 2021/12/08 16:06:48 adam Exp $ 1# $NetBSD: Makefile,v 1.7 2022/03/12 07:42:32 nia Exp $
2 2
3DISTNAME= gnome-pomodoro-0.17.0 3DISTNAME= gnome-pomodoro-0.17.0
4PKGREVISION= 3 4PKGREVISION= 3
5CATEGORIES= time 5CATEGORIES= time
6MASTER_SITES= ${MASTER_SITE_GITHUB:=codito/} 6MASTER_SITES= ${MASTER_SITE_GITHUB:=codito/}
7GITHUB_PROJECT= gnome-pomodoro 7GITHUB_PROJECT= gnome-pomodoro
8GITHUB_TAG= ${PKGVERSION_NOREV} 8GITHUB_TAG= ${PKGVERSION_NOREV}
9 9
10MAINTAINER= ryoon@NetBSD.org 10MAINTAINER= ryoon@NetBSD.org
11HOMEPAGE= https://gnomepomodoro.org/ 11HOMEPAGE= https://gnomepomodoro.org/
12COMMENT= Pomodoro timer for Gnome 12COMMENT= Pomodoro timer for Gnome
13LICENSE= gnu-gpl-v3 13LICENSE= gnu-gpl-v3
14 14
15TOOL_DEPENDS+= autoconf-archive-[0-9]*:../../devel/autoconf-archive 15TOOL_DEPENDS+= autoconf-archive-[0-9]*:../../devel/autoconf-archive
16BUILD_DEPENDS+= vala-[0-9]*:../../lang/vala 16BUILD_DEPENDS+= vala-[0-9]*:../../lang/vala
17 17
18# Requires --desktop in msgfmt. 
19_TOOLS_USE_PKGSRC.msgfmt= yes 
20 
21# Broken generated code uses g_return_if_fail when g_return_val_if_fail 18# Broken generated code uses g_return_if_fail when g_return_val_if_fail
22# is necessary 19# is necessary
23CFLAGS+= -Wno-return-type 20CFLAGS+= -Wno-return-type
24 21
25USE_LIBTOOL= yes 22USE_LIBTOOL= yes
26USE_PKGLOCALEDIR= yes 23USE_PKGLOCALEDIR= yes
27USE_LANGUAGES= c 24USE_LANGUAGES= c
28 25
29USE_TOOLS+= automake autopoint gmake pkg-config 26USE_TOOLS+= automake autopoint gmake pkg-config
30GNU_CONFIGURE= yes 27GNU_CONFIGURE= yes
31CONFIGURE_SCRIPT= autogen.sh 28CONFIGURE_SCRIPT= autogen.sh
32 29
33.include "../../audio/libcanberra/buildlink3.mk" 30.include "../../audio/libcanberra/buildlink3.mk"
File Added: pkgsrc/time/gnome-pomodoro/Attic/hacks.mk
# $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