CVS commit: pkgsrc/security/p11-kit

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Thu Nov 16 12:05:39 UTC 2023

Modified Files:
        pkgsrc/security/p11-kit: PLIST distinfo
Added Files:
        pkgsrc/security/p11-kit/patches: patch-meson.build

Log Message:
p11-kit: fix Darwin configure & PLIST errors


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 pkgsrc/security/p11-kit/PLIST
cvs rdiff -u -r1.22 -r1.23 pkgsrc/security/p11-kit/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/security/p11-kit/patches/patch-meson.build

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/security/p11-kit/PLIST
diff -u pkgsrc/security/p11-kit/PLIST:1.5 pkgsrc/security/p11-kit/PLIST:1.6
--- pkgsrc/security/p11-kit/PLIST:1.5   Wed Nov 15 20:46:28 2023
+++ pkgsrc/security/p11-kit/PLIST       Thu Nov 16 12:05:38 2023
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2023/11/15 20:46:28 wiz Exp $
+@comment $NetBSD: PLIST,v 1.6 2023/11/16 12:05:38 tnn Exp $
 bin/p11-kit
 bin/trust
 include/p11-kit-1/p11-kit/deprecated.h
@@ -14,7 +14,7 @@ lib/libp11-kit.so.0
 lib/libp11-kit.so.0.3.0
 lib/p11-kit-proxy.${DLEXT}
 lib/pkcs11/p11-kit-client.so
-lib/pkcs11/p11-kit-trust.so
+lib/pkcs11/p11-kit-trust.${DLEXT}
 lib/pkgconfig/p11-kit-1.pc
 libexec/p11-kit/p11-kit-remote
 libexec/p11-kit/p11-kit-server

Index: pkgsrc/security/p11-kit/distinfo
diff -u pkgsrc/security/p11-kit/distinfo:1.22 pkgsrc/security/p11-kit/distinfo:1.23
--- pkgsrc/security/p11-kit/distinfo:1.22       Wed Nov 15 20:47:45 2023
+++ pkgsrc/security/p11-kit/distinfo    Thu Nov 16 12:05:38 2023
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.22 2023/11/15 20:47:45 wiz Exp $
+$NetBSD: distinfo,v 1.23 2023/11/16 12:05:38 tnn Exp $
 
 BLAKE2s (p11-kit-0.25.2.tar.xz) = 63d4c490237f1e8341fa0bceb78fc2dddafd4990f5917663b85111a97cf636c4
 SHA512 (p11-kit-0.25.2.tar.xz) = 64df7600c1eedfba942a38eb32bda7fe869ed197449dff2b8470be37ba71f3eefc3990613d2f787d3300b18e87391cd8f8bb4b33277d51ec873548126137bd01
 Size (p11-kit-0.25.2.tar.xz) = 990488 bytes
 SHA1 (patch-common_compat.c) = bdcb10cebe5e7755c81f88ef033b9dfecd7a1aad
+SHA1 (patch-meson.build) = 1fa386e0ff6419dd90896ea57ef48fefe6a4da6c

Added files:

Index: pkgsrc/security/p11-kit/patches/patch-meson.build
diff -u /dev/null pkgsrc/security/p11-kit/patches/patch-meson.build:1.1
--- /dev/null   Thu Nov 16 12:05:39 2023
+++ pkgsrc/security/p11-kit/patches/patch-meson.build   Thu Nov 16 12:05:39 2023
@@ -0,0 +1,15 @@
+$NetBSD: patch-meson.build,v 1.1 2023/11/16 12:05:39 tnn Exp $
+
+Don't error if the appleframeworks dependency is not needed.
+
+--- meson.build.orig   2023-11-16 11:59:25
++++ meson.build
+@@ -67,7 +67,7 @@ if get_option('nls') and cc.has_header('libintl.h')
+     if cc.has_function('dgettext', dependencies : libintl)
+       libintl_deps += libintl
+       if ['darwin', 'ios'].contains(host_system)
+-        appleframeworks = dependency('appleframeworks', modules : 'foundation')
++        appleframeworks = dependency('appleframeworks', modules : 'foundation', required : false)
+         if appleframeworks.found()
+           libintl_deps += appleframeworks
+         endif