[pkgsrc/trunk]: pkgsrc/security security: Use hacks.mk to avoid NetBSD msgfmt...

[nia <nia%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/f9d8cf811be9
branches:  trunk
changeset: 375317:f9d8cf811be9
user:      nia <nia%pkgsrc.org@localhost>
date:      Sat Mar 12 07:28:19 2022 +0000

description:
security: Use hacks.mk to avoid NetBSD msgfmt on NetBSD only.

diffstat:

 security/gcr/Makefile      |   9 +--------
 security/gcr/hacks.mk      |  13 +++++++++++++
 security/polkit/Makefile   |   5 +----
 security/polkit/hacks.mk   |  13 +++++++++++++
 security/seahorse/Makefile |   9 +--------
 security/seahorse/hacks.mk |  13 +++++++++++++
 6 files changed, 42 insertions(+), 20 deletions(-)

diffs (116 lines):

diff -r 70936225ed06 -r f9d8cf811be9 security/gcr/Makefile
--- a/security/gcr/Makefile     Sat Mar 12 07:19:24 2022 +0000
+++ b/security/gcr/Makefile     Sat Mar 12 07:28:19 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2022/01/13 08:02:29 adam Exp $
+# $NetBSD: Makefile,v 1.22 2022/03/12 07:28:19 nia Exp $
 
 DISTNAME=      gcr-3.38.1
 CATEGORIES=    security
@@ -20,13 +20,6 @@
 CONFIGURE_ARGS+=       --enable-gtk-doc
 CONFIGURE_ARGS+=       --enable-vala
 
-.include "../../mk/bsd.prefs.mk"
-
-# To avoid msgfmt: unknown option -- desktop
-.if ${OPSYS} == "NetBSD"
-TOOLS_PLATFORM.msgfmt=
-.endif
-
 PKGCONFIG_OVERRIDE+=   gck-1.pc.in
 PKGCONFIG_OVERRIDE+=   gcr-base-3.pc.in
 PKGCONFIG_OVERRIDE+=   gcr-ui.pc.in
diff -r 70936225ed06 -r f9d8cf811be9 security/gcr/hacks.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/security/gcr/hacks.mk     Sat Mar 12 07:28:19 2022 +0000
@@ -0,0 +1,13 @@
+# $NetBSD: hacks.mk,v 1.1 2022/03/12 07:28:19 nia Exp $
+
+.if !defined(GCR_HACKS_MK)
+GCR_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 # GCR_HACKS_MK
diff -r 70936225ed06 -r f9d8cf811be9 security/polkit/Makefile
--- a/security/polkit/Makefile  Sat Mar 12 07:19:24 2022 +0000
+++ b/security/polkit/Makefile  Sat Mar 12 07:28:19 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2022/01/25 19:40:46 wiz Exp $
+# $NetBSD: Makefile,v 1.40 2022/03/12 07:28:19 nia Exp $
 
 DISTNAME=      polkit-0.120
 PKGREVISION=   2
@@ -28,9 +28,6 @@
 USE_TOOLS+=            intltool msgfmt msgmerge xgettext
 USE_TOOLS+=            autoconf autoreconf automake
 
-# XXX msgfmt: unknown option -- xml
-_TOOLS_USE_PKGSRC.msgfmt=      yes
-
 # configure: error: *** A compiler with support for C++17 language features is required.
 GCC_REQD+=     7
 
diff -r 70936225ed06 -r f9d8cf811be9 security/polkit/hacks.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/security/polkit/hacks.mk  Sat Mar 12 07:28:19 2022 +0000
@@ -0,0 +1,13 @@
+# $NetBSD: hacks.mk,v 1.1 2022/03/12 07:28:19 nia Exp $
+
+.if !defined(POLKIT_HACKS_MK)
+POLKIT_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 # POLKIT_HACKS_MK
diff -r 70936225ed06 -r f9d8cf811be9 security/seahorse/Makefile
--- a/security/seahorse/Makefile        Sat Mar 12 07:19:24 2022 +0000
+++ b/security/seahorse/Makefile        Sat Mar 12 07:28:19 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.169 2021/12/08 16:06:24 adam Exp $
+# $NetBSD: Makefile,v 1.170 2022/03/12 07:28:19 nia Exp $
 
 DISTNAME=      seahorse-3.38.0.1
 MASTER_SITES=  ${MASTER_SITE_GNOME:=sources/${PKGBASE}/3.38/}
@@ -17,13 +17,6 @@
 # Why does it want specific point releases?
 MESON_ARGS+=   -Dcheck-compatible-gpg=false
 
-.include "../../mk/bsd.prefs.mk"
-
-# msgfmt: unknown option -- xml
-.if ${OPSYS} == "NetBSD"
-TOOLS_PLATFORM.msgfmt=
-.endif
-
 PYTHON_FOR_BUILD_ONLY= tool
 
 .include "../../devel/meson/build.mk"
diff -r 70936225ed06 -r f9d8cf811be9 security/seahorse/hacks.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/security/seahorse/hacks.mk        Sat Mar 12 07:28:19 2022 +0000
@@ -0,0 +1,13 @@
+# $NetBSD: hacks.mk,v 1.1 2022/03/12 07:28:19 nia Exp $
+
+.if !defined(SEAHORSE_HACKS_MK)
+SEAHORSE_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 # SEAHORSE_HACKS_MK