CVS commit: pkgsrc/security/p11-kit

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Wed Nov 15 20:46:28 UTC 2023

Modified Files:
        pkgsrc/security/p11-kit: Makefile PLIST

Log Message:
p11-kit: convert to meson

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 pkgsrc/security/p11-kit/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/security/p11-kit/PLIST

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/Makefile
diff -u pkgsrc/security/p11-kit/Makefile:1.28 pkgsrc/security/p11-kit/Makefile:1.29
--- pkgsrc/security/p11-kit/Makefile:1.28       Thu Nov  9 19:45:46 2023
+++ pkgsrc/security/p11-kit/Makefile    Wed Nov 15 20:46:28 2023
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.28 2023/11/09 19:45:46 nia Exp $
+# $NetBSD: Makefile,v 1.29 2023/11/15 20:46:28 wiz Exp $
 
 DISTNAME=      p11-kit-0.25.0
+PKGREVISION=   1
 CATEGORIES=    security
 #MASTER_SITES= http://p11-glue.freedesktop.org/releases/
 MASTER_SITES+= ${MASTER_SITE_GITHUB:=p11-glue/}
@@ -14,15 +15,12 @@ LICENSE=    modified-bsd
 
 DEPENDS+=      mozilla-rootcerts>=1.0.20150804nb1:../../security/mozilla-rootcerts
 
-CONFIGURE_ARGS+=       --with-trust-paths=${PREFIX}/share/mozilla-rootcerts/cacert.pem
+MESON_ARGS+=   -Dtrust_paths=${PREFIX}/share/mozilla-rootcerts/cacert.pem
 
-GNU_CONFIGURE= yes
-USE_LANGUAGES= c99
-USE_LIBTOOL=   yes
-USE_TOOLS+=    pkg-config readlink
-USE_FEATURES+= strndup strnlen
-
-TEST_TARGET=   check
+USE_LANGUAGES=         c
+USE_CC_FEATURES=       c99
+USE_TOOLS+=            pkg-config readlink
+USE_FEATURES+=         strndup strnlen
 
 # dirfd(3)
 CFLAGS.NetBSD+=        -D_NETBSD_SOURCE
@@ -37,9 +35,10 @@ DLEXT.dylib= dylib
 DLEXT=         ${DLEXT.${SHLIB_TYPE}:Uso}
 PLIST_SUBST+=  DLEXT=${DLEXT:Q}
 
+TEST_ENV+=     LD_LIBRARY_PATH=${WRKSRC}/output/p11-kit:${WRKSRC}/output/trust
+
 PKGCONFIG_OVERRIDE+=   p11-kit/p11-kit-1.pc.in
 
-PKG_SYSCONFSUBDIR=     pkcs11
 CONF_FILES+=           share/examples/p11-kit/pkcs11.conf.example \
                        ${PKG_SYSCONFDIR}/pkcs11.conf
 
@@ -50,6 +49,7 @@ post-install:
                ${DESTDIR}${PREFIX}/share/examples/p11-kit
 
 .include "../../devel/libffi/buildlink3.mk"
+.include "../../devel/meson/build.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../security/libtasn1/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/security/p11-kit/PLIST
diff -u pkgsrc/security/p11-kit/PLIST:1.4 pkgsrc/security/p11-kit/PLIST:1.5
--- pkgsrc/security/p11-kit/PLIST:1.4   Wed Apr 18 00:46:25 2018
+++ pkgsrc/security/p11-kit/PLIST       Wed Nov 15 20:46:28 2023
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2018/04/18 00:46:25 schmonz Exp $
+@comment $NetBSD: PLIST,v 1.5 2023/11/15 20:46:28 wiz Exp $
 bin/p11-kit
 bin/trust
 include/p11-kit-1/p11-kit/deprecated.h
@@ -9,52 +9,86 @@ include/p11-kit-1/p11-kit/pkcs11.h
 include/p11-kit-1/p11-kit/pkcs11x.h
 include/p11-kit-1/p11-kit/remote.h
 include/p11-kit-1/p11-kit/uri.h
-lib/libp11-kit.la
+lib/libp11-kit.so
+lib/libp11-kit.so.0
+lib/libp11-kit.so.0.3.0
 lib/p11-kit-proxy.${DLEXT}
-lib/pkcs11/p11-kit-client.la
-lib/pkcs11/p11-kit-trust.la
+lib/pkcs11/p11-kit-client.so
+lib/pkcs11/p11-kit-trust.so
 lib/pkgconfig/p11-kit-1.pc
 libexec/p11-kit/p11-kit-remote
 libexec/p11-kit/p11-kit-server
 libexec/p11-kit/trust-extract-compat
 share/examples/p11-kit/pkcs11.conf.example
-share/gtk-doc/html/p11-kit/config-example.html
-share/gtk-doc/html/p11-kit/config-files.html
-share/gtk-doc/html/p11-kit/config.html
-share/gtk-doc/html/p11-kit/devel-building-style.html
-share/gtk-doc/html/p11-kit/devel-building.html
-share/gtk-doc/html/p11-kit/devel-commands.html
-share/gtk-doc/html/p11-kit/devel-debugging.html
-share/gtk-doc/html/p11-kit/devel-paths.html
-share/gtk-doc/html/p11-kit/devel-testing.html
-share/gtk-doc/html/p11-kit/devel.html
-share/gtk-doc/html/p11-kit/gtk-doc.css
-share/gtk-doc/html/p11-kit/home.png
-share/gtk-doc/html/p11-kit/index.html
-share/gtk-doc/html/p11-kit/left-insensitive.png
-share/gtk-doc/html/p11-kit/left.png
-share/gtk-doc/html/p11-kit/p11-kit-Deprecated.html
-share/gtk-doc/html/p11-kit/p11-kit-Future.html
-share/gtk-doc/html/p11-kit/p11-kit-Modules.html
-share/gtk-doc/html/p11-kit/p11-kit-PIN-Callbacks.html
-share/gtk-doc/html/p11-kit/p11-kit-URIs.html
-share/gtk-doc/html/p11-kit/p11-kit-Utilities.html
-share/gtk-doc/html/p11-kit/p11-kit.devhelp2
-share/gtk-doc/html/p11-kit/p11-kit.html
-share/gtk-doc/html/p11-kit/pkcs11-conf.html
-share/gtk-doc/html/p11-kit/reference.html
-share/gtk-doc/html/p11-kit/remoting.html
-share/gtk-doc/html/p11-kit/right-insensitive.png
-share/gtk-doc/html/p11-kit/right.png
-share/gtk-doc/html/p11-kit/sharing-managed.html
-share/gtk-doc/html/p11-kit/sharing.html
-share/gtk-doc/html/p11-kit/style.css
-share/gtk-doc/html/p11-kit/tools.html
-share/gtk-doc/html/p11-kit/trust-disable.html
-share/gtk-doc/html/p11-kit/trust-glib-networking.html
-share/gtk-doc/html/p11-kit/trust-module.html
-share/gtk-doc/html/p11-kit/trust-nss.html
-share/gtk-doc/html/p11-kit/trust.html
-share/gtk-doc/html/p11-kit/up-insensitive.png
-share/gtk-doc/html/p11-kit/up.png
+share/locale/ar/LC_MESSAGES/p11-kit.mo
+share/locale/as/LC_MESSAGES/p11-kit.mo
+share/locale/ast/LC_MESSAGES/p11-kit.mo
+share/locale/az/LC_MESSAGES/p11-kit.mo
+share/locale/bg/LC_MESSAGES/p11-kit.mo
+share/locale/bn_IN/LC_MESSAGES/p11-kit.mo
+share/locale/ca/LC_MESSAGES/p11-kit.mo
+share/locale/ca@valencia/LC_MESSAGES/p11-kit.mo
+share/locale/cs/LC_MESSAGES/p11-kit.mo
+share/locale/cy/LC_MESSAGES/p11-kit.mo
+share/locale/da/LC_MESSAGES/p11-kit.mo
+share/locale/de/LC_MESSAGES/p11-kit.mo
+share/locale/el/LC_MESSAGES/p11-kit.mo
+share/locale/en_GB/LC_MESSAGES/p11-kit.mo
+share/locale/eo/LC_MESSAGES/p11-kit.mo
+share/locale/es/LC_MESSAGES/p11-kit.mo
+share/locale/et/LC_MESSAGES/p11-kit.mo
+share/locale/eu/LC_MESSAGES/p11-kit.mo
+share/locale/fa/LC_MESSAGES/p11-kit.mo
+share/locale/fi/LC_MESSAGES/p11-kit.mo
+share/locale/fo/LC_MESSAGES/p11-kit.mo
+share/locale/fr/LC_MESSAGES/p11-kit.mo
+share/locale/fur/LC_MESSAGES/p11-kit.mo
+share/locale/ga/LC_MESSAGES/p11-kit.mo
+share/locale/gl/LC_MESSAGES/p11-kit.mo
+share/locale/gu/LC_MESSAGES/p11-kit.mo
+share/locale/he/LC_MESSAGES/p11-kit.mo
+share/locale/hi/LC_MESSAGES/p11-kit.mo
+share/locale/hr/LC_MESSAGES/p11-kit.mo
+share/locale/hu/LC_MESSAGES/p11-kit.mo
+share/locale/ia/LC_MESSAGES/p11-kit.mo
+share/locale/id/LC_MESSAGES/p11-kit.mo
+share/locale/it/LC_MESSAGES/p11-kit.mo
+share/locale/ja/LC_MESSAGES/p11-kit.mo
+share/locale/ka/LC_MESSAGES/p11-kit.mo
+share/locale/kk/LC_MESSAGES/p11-kit.mo
+share/locale/kn/LC_MESSAGES/p11-kit.mo
+share/locale/ko/LC_MESSAGES/p11-kit.mo
+share/locale/lt/LC_MESSAGES/p11-kit.mo
+share/locale/lv/LC_MESSAGES/p11-kit.mo
+share/locale/ml/LC_MESSAGES/p11-kit.mo
+share/locale/mr/LC_MESSAGES/p11-kit.mo
+share/locale/ms/LC_MESSAGES/p11-kit.mo
+share/locale/nb/LC_MESSAGES/p11-kit.mo
+share/locale/nl/LC_MESSAGES/p11-kit.mo
+share/locale/nn/LC_MESSAGES/p11-kit.mo
+share/locale/oc/LC_MESSAGES/p11-kit.mo
+share/locale/or/LC_MESSAGES/p11-kit.mo
+share/locale/pa/LC_MESSAGES/p11-kit.mo
+share/locale/pl/LC_MESSAGES/p11-kit.mo
+share/locale/pt/LC_MESSAGES/p11-kit.mo
+share/locale/pt_BR/LC_MESSAGES/p11-kit.mo
+share/locale/ro/LC_MESSAGES/p11-kit.mo
+share/locale/ru/LC_MESSAGES/p11-kit.mo
+share/locale/si/LC_MESSAGES/p11-kit.mo
+share/locale/sk/LC_MESSAGES/p11-kit.mo
+share/locale/sl/LC_MESSAGES/p11-kit.mo
+share/locale/sq/LC_MESSAGES/p11-kit.mo
+share/locale/sr/LC_MESSAGES/p11-kit.mo
+share/locale/sr@latin/LC_MESSAGES/p11-kit.mo
+share/locale/sv/LC_MESSAGES/p11-kit.mo
+share/locale/ta/LC_MESSAGES/p11-kit.mo
+share/locale/te/LC_MESSAGES/p11-kit.mo
+share/locale/th/LC_MESSAGES/p11-kit.mo
+share/locale/tr/LC_MESSAGES/p11-kit.mo
+share/locale/uk/LC_MESSAGES/p11-kit.mo
+share/locale/vi/LC_MESSAGES/p11-kit.mo
+share/locale/wa/LC_MESSAGES/p11-kit.mo
+share/locale/zh_CN/LC_MESSAGES/p11-kit.mo
+share/locale/zh_HK/LC_MESSAGES/p11-kit.mo
+share/locale/zh_TW/LC_MESSAGES/p11-kit.mo
 share/p11-kit/modules/p11-kit-trust.module