CVS commit: pkgsrc/security

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

Module Name:    pkgsrc
Committed By:   nia
Date:           Sat Mar 12 07:28:20 UTC 2022

Modified Files:
        pkgsrc/security/gcr: Makefile
        pkgsrc/security/polkit: Makefile
        pkgsrc/security/seahorse: Makefile
Added Files:
        pkgsrc/security/gcr: hacks.mk
        pkgsrc/security/polkit: hacks.mk
        pkgsrc/security/seahorse: hacks.mk

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


To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 pkgsrc/security/gcr/Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/security/gcr/hacks.mk
cvs rdiff -u -r1.39 -r1.40 pkgsrc/security/polkit/Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/security/polkit/hacks.mk
cvs rdiff -u -r1.169 -r1.170 pkgsrc/security/seahorse/Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/security/seahorse/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/security/gcr/Makefile
diff -u pkgsrc/security/gcr/Makefile:1.21 pkgsrc/security/gcr/Makefile:1.22
--- pkgsrc/security/gcr/Makefile:1.21   Thu Jan 13 08:02:29 2022
+++ pkgsrc/security/gcr/Makefile        Sat Mar 12 07:28:19 2022
@@ -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 @@ GNU_CONFIGURE=               yes
 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

Index: pkgsrc/security/polkit/Makefile
diff -u pkgsrc/security/polkit/Makefile:1.39 pkgsrc/security/polkit/Makefile:1.40
--- pkgsrc/security/polkit/Makefile:1.39        Tue Jan 25 19:40:46 2022
+++ pkgsrc/security/polkit/Makefile     Sat Mar 12 07:28:19 2022
@@ -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+=           pkg-config gmake perl
 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
 

Index: pkgsrc/security/seahorse/Makefile
diff -u pkgsrc/security/seahorse/Makefile:1.169 pkgsrc/security/seahorse/Makefile:1.170
--- pkgsrc/security/seahorse/Makefile:1.169     Wed Dec  8 16:06:24 2021
+++ pkgsrc/security/seahorse/Makefile   Sat Mar 12 07:28:19 2022
@@ -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 @@ USE_TOOLS+=  gdbus-codegen
 # 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"

Added files:

Index: pkgsrc/security/gcr/hacks.mk
diff -u /dev/null pkgsrc/security/gcr/hacks.mk:1.1
--- /dev/null   Sat Mar 12 07:28:20 2022
+++ pkgsrc/security/gcr/hacks.mk        Sat Mar 12 07:28:19 2022
@@ -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

Index: pkgsrc/security/polkit/hacks.mk
diff -u /dev/null pkgsrc/security/polkit/hacks.mk:1.1
--- /dev/null   Sat Mar 12 07:28:20 2022
+++ pkgsrc/security/polkit/hacks.mk     Sat Mar 12 07:28:19 2022
@@ -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

Index: pkgsrc/security/seahorse/hacks.mk
diff -u /dev/null pkgsrc/security/seahorse/hacks.mk:1.1
--- /dev/null   Sat Mar 12 07:28:20 2022
+++ pkgsrc/security/seahorse/hacks.mk   Sat Mar 12 07:28:19 2022
@@ -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