Sat Mar 12 07:28:20 2022 UTC ()
security: Use hacks.mk to avoid NetBSD msgfmt on NetBSD only.


(nia)
diff -r1.21 -r1.22 pkgsrc/security/gcr/Makefile
diff -r0 -r1.1 pkgsrc/security/gcr/hacks.mk
diff -r1.39 -r1.40 pkgsrc/security/polkit/Makefile
diff -r0 -r1.1 pkgsrc/security/polkit/hacks.mk
diff -r1.169 -r1.170 pkgsrc/security/seahorse/Makefile
diff -r0 -r1.1 pkgsrc/security/seahorse/hacks.mk
cvs diff -r1.21 -r1.22 pkgsrc/security/gcr/Makefile (expand / switch to unified diff)

--- pkgsrc/security/gcr/Makefile 2022/01/13 08:02:29 1.21
+++ pkgsrc/security/gcr/Makefile 2022/03/12 07:28:19 1.22
@@ -1,42 +1,35 @@ @@ -1,42 +1,35 @@
1# $NetBSD: Makefile,v 1.21 2022/01/13 08:02:29 adam Exp $ 1# $NetBSD: Makefile,v 1.22 2022/03/12 07:28:19 nia Exp $
2 2
3DISTNAME= gcr-3.38.1 3DISTNAME= gcr-3.38.1
4CATEGORIES= security 4CATEGORIES= security
5MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gcr/${PKGVERSION_NOREV:R}/} 5MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gcr/${PKGVERSION_NOREV:R}/}
6EXTRACT_SUFX= .tar.xz 6EXTRACT_SUFX= .tar.xz
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= https://www.gnome.org/ 9HOMEPAGE= https://www.gnome.org/
10COMMENT= Library for crypto UI and related tasks 10COMMENT= Library for crypto UI and related tasks
11LICENSE= gnu-gpl-v2 11LICENSE= gnu-gpl-v2
12 12
13BUILD_DEPENDS+= gettext-m4-[0-9]*:../../devel/gettext-m4 13BUILD_DEPENDS+= gettext-m4-[0-9]*:../../devel/gettext-m4
14 14
15USE_LIBTOOL= yes 15USE_LIBTOOL= yes
16USE_TOOLS+= gmake intltool msgfmt perl pkg-config 16USE_TOOLS+= gmake intltool msgfmt perl pkg-config
17USE_TOOLS+= aclocal autoconf automake autopoint 17USE_TOOLS+= aclocal autoconf automake autopoint
18USE_TOOLS+= gdbus-codegen readlink 18USE_TOOLS+= gdbus-codegen readlink
19GNU_CONFIGURE= yes 19GNU_CONFIGURE= yes
20CONFIGURE_ARGS+= --enable-gtk-doc 20CONFIGURE_ARGS+= --enable-gtk-doc
21CONFIGURE_ARGS+= --enable-vala 21CONFIGURE_ARGS+= --enable-vala
22 22
23.include "../../mk/bsd.prefs.mk" 
24 
25# To avoid msgfmt: unknown option -- desktop 
26.if ${OPSYS} == "NetBSD" 
27TOOLS_PLATFORM.msgfmt= 
28.endif 
29 
30PKGCONFIG_OVERRIDE+= gck-1.pc.in 23PKGCONFIG_OVERRIDE+= gck-1.pc.in
31PKGCONFIG_OVERRIDE+= gcr-base-3.pc.in 24PKGCONFIG_OVERRIDE+= gcr-base-3.pc.in
32PKGCONFIG_OVERRIDE+= gcr-ui.pc.in 25PKGCONFIG_OVERRIDE+= gcr-ui.pc.in
33PKGCONFIG_OVERRIDE+= gcr-3.pc.in 26PKGCONFIG_OVERRIDE+= gcr-3.pc.in
34 27
35TEST_TARGET= check 28TEST_TARGET= check
36 29
37pre-configure: 30pre-configure:
38 cd ${WRKSRC} && NOCONFIGURE=1 ./autogen.sh 31 cd ${WRKSRC} && NOCONFIGURE=1 ./autogen.sh
39 32
40BUILDLINK_API_DEPENDS.glib2+= glib2>=2.38 33BUILDLINK_API_DEPENDS.glib2+= glib2>=2.38
41.include "../../devel/glib2/buildlink3.mk" 34.include "../../devel/glib2/buildlink3.mk"
42.include "../../devel/gobject-introspection/buildlink3.mk" 35.include "../../devel/gobject-introspection/buildlink3.mk"
File Added: pkgsrc/security/gcr/Attic/hacks.mk
# $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
cvs diff -r1.39 -r1.40 pkgsrc/security/polkit/Makefile (expand / switch to unified diff)

--- pkgsrc/security/polkit/Makefile 2022/01/25 19:40:46 1.39
+++ pkgsrc/security/polkit/Makefile 2022/03/12 07:28:19 1.40
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.39 2022/01/25 19:40:46 wiz Exp $ 1# $NetBSD: Makefile,v 1.40 2022/03/12 07:28:19 nia Exp $
2 2
3DISTNAME= polkit-0.120 3DISTNAME= polkit-0.120
4PKGREVISION= 2 4PKGREVISION= 2
5CATEGORIES= security 5CATEGORIES= security
6MASTER_SITES= http://www.freedesktop.org/software/polkit/releases/ 6MASTER_SITES= http://www.freedesktop.org/software/polkit/releases/
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= https://www.freedesktop.org/wiki/Software/polkit 9HOMEPAGE= https://www.freedesktop.org/wiki/Software/polkit
10COMMENT= Authorization Manager 10COMMENT= Authorization Manager
11LICENSE= gnu-lgpl-v2 11LICENSE= gnu-lgpl-v2
12 12
13TOOL_DEPENDS+= gettext-m4-[0-9]*:../../devel/gettext-m4 13TOOL_DEPENDS+= gettext-m4-[0-9]*:../../devel/gettext-m4
14TOOL_DEPENDS+= gettext-tools-[0-9]*:../../devel/gettext-tools 14TOOL_DEPENDS+= gettext-tools-[0-9]*:../../devel/gettext-tools
@@ -18,29 +18,26 @@ TOOL_DEPENDS+= docbook-xsl-[0-9]*:../.. @@ -18,29 +18,26 @@ TOOL_DEPENDS+= docbook-xsl-[0-9]*:../..
18TOOL_DEPENDS+= gtk-doc-[0-9]*:../../textproc/gtk-doc 18TOOL_DEPENDS+= gtk-doc-[0-9]*:../../textproc/gtk-doc
19 19
20NOT_PAX_MPROTECT_SAFE= lib/polkit-1/polkitd 20NOT_PAX_MPROTECT_SAFE= lib/polkit-1/polkitd
21 21
22GNU_CONFIGURE= yes 22GNU_CONFIGURE= yes
23GNU_CONFIGURE_STRICT= no # has sub-configures 23GNU_CONFIGURE_STRICT= no # has sub-configures
24USE_LANGUAGES= c c++14 24USE_LANGUAGES= c c++14
25USE_LIBTOOL= yes 25USE_LIBTOOL= yes
26USE_PKGLOCALEDIR= yes 26USE_PKGLOCALEDIR= yes
27USE_TOOLS+= pkg-config gmake perl 27USE_TOOLS+= pkg-config gmake perl
28USE_TOOLS+= intltool msgfmt msgmerge xgettext 28USE_TOOLS+= intltool msgfmt msgmerge xgettext
29USE_TOOLS+= autoconf autoreconf automake 29USE_TOOLS+= autoconf autoreconf automake
30 30
31# XXX msgfmt: unknown option -- xml 
32_TOOLS_USE_PKGSRC.msgfmt= yes 
33 
34# configure: error: *** A compiler with support for C++17 language features is required. 31# configure: error: *** A compiler with support for C++17 language features is required.
35GCC_REQD+= 7 32GCC_REQD+= 7
36 33
37PKGCONFIG_OVERRIDE+= data/polkit-gobject-1.pc.in 34PKGCONFIG_OVERRIDE+= data/polkit-gobject-1.pc.in
38PKGCONFIG_OVERRIDE+= data/polkit-agent-1.pc.in 35PKGCONFIG_OVERRIDE+= data/polkit-agent-1.pc.in
39 36
40CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} 37CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
41CONFIGURE_ARGS+= --with-polkitd-user=${POLKITD_USER} 38CONFIGURE_ARGS+= --with-polkitd-user=${POLKITD_USER}
42CONFIGURE_ARGS+= --disable-libsystemd-login 39CONFIGURE_ARGS+= --disable-libsystemd-login
43CONFIGURE_ARGS+= --disable-libelogind 40CONFIGURE_ARGS+= --disable-libelogind
44CONFIGURE_ARGS+= --with-duktape 41CONFIGURE_ARGS+= --with-duktape
45 42
46.include "../../mk/bsd.prefs.mk" 43.include "../../mk/bsd.prefs.mk"
File Added: pkgsrc/security/polkit/Attic/hacks.mk
# $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
cvs diff -r1.169 -r1.170 pkgsrc/security/seahorse/Makefile (expand / switch to unified diff)

--- pkgsrc/security/seahorse/Makefile 2021/12/08 16:06:24 1.169
+++ pkgsrc/security/seahorse/Makefile 2022/03/12 07:28:19 1.170
@@ -1,39 +1,32 @@ @@ -1,39 +1,32 @@
1# $NetBSD: Makefile,v 1.169 2021/12/08 16:06:24 adam Exp $ 1# $NetBSD: Makefile,v 1.170 2022/03/12 07:28:19 nia Exp $
2 2
3DISTNAME= seahorse-3.38.0.1 3DISTNAME= seahorse-3.38.0.1
4MASTER_SITES= ${MASTER_SITE_GNOME:=sources/${PKGBASE}/3.38/} 4MASTER_SITES= ${MASTER_SITE_GNOME:=sources/${PKGBASE}/3.38/}
5PKGREVISION= 4 5PKGREVISION= 4
6CATEGORIES= security gnome 6CATEGORIES= security 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/Seahorse 10HOMEPAGE= https://wiki.gnome.org/Apps/Seahorse
11COMMENT= GNOME encryption interface 11COMMENT= GNOME encryption interface
12LICENSE= gnu-gpl-v2 12LICENSE= gnu-gpl-v2
13 13
14USE_TOOLS+= pkg-config msgfmt xgettext itstool 14USE_TOOLS+= pkg-config msgfmt xgettext itstool
15USE_TOOLS+= gdbus-codegen 15USE_TOOLS+= gdbus-codegen
16 16
17# Why does it want specific point releases? 17# Why does it want specific point releases?
18MESON_ARGS+= -Dcheck-compatible-gpg=false 18MESON_ARGS+= -Dcheck-compatible-gpg=false
19 19
20.include "../../mk/bsd.prefs.mk" 
21 
22# msgfmt: unknown option -- xml 
23.if ${OPSYS} == "NetBSD" 
24TOOLS_PLATFORM.msgfmt= 
25.endif 
26 
27PYTHON_FOR_BUILD_ONLY= tool 20PYTHON_FOR_BUILD_ONLY= tool
28 21
29.include "../../devel/meson/build.mk" 22.include "../../devel/meson/build.mk"
30.include "../../devel/glib2/schemas.mk" 23.include "../../devel/glib2/schemas.mk"
31.include "../../devel/gobject-introspection/buildlink3.mk" 24.include "../../devel/gobject-introspection/buildlink3.mk"
32.include "../../devel/libhandy1/buildlink3.mk" 25.include "../../devel/libhandy1/buildlink3.mk"
33.include "../../graphics/hicolor-icon-theme/buildlink3.mk" 26.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
34.include "../../lang/python/tool.mk" 27.include "../../lang/python/tool.mk"
35.include "../../lang/vala/buildlink3.mk" 28.include "../../lang/vala/buildlink3.mk"
36.include "../../net/avahi/buildlink3.mk" 29.include "../../net/avahi/buildlink3.mk"
37.include "../../net/libsoup/buildlink3.mk" 30.include "../../net/libsoup/buildlink3.mk"
38.include "../../security/gcr/buildlink3.mk" 31.include "../../security/gcr/buildlink3.mk"
39.include "../../security/gpgme/buildlink3.mk" 32.include "../../security/gpgme/buildlink3.mk"
File Added: pkgsrc/security/seahorse/Attic/hacks.mk
# $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