diff --git a/security/p11-kit/Makefile b/security/p11-kit/Makefile index bc5e6887964b..3782a4fa7b7c 100644 --- a/security/p11-kit/Makefile +++ b/security/p11-kit/Makefile @@ -1,17 +1,21 @@ -# $NetBSD: Makefile,v 1.2 2012/10/23 18:16:39 asau Exp $ +# $NetBSD: Makefile,v 1.3 2016/03/13 03:10:36 ryoon Exp $ # -DISTNAME= p11-kit-0.10 +DISTNAME= p11-kit-0.22.1 CATEGORIES= security MASTER_SITES= http://p11-glue.freedesktop.org/releases/ MAINTAINER= pkgsrc-users@NetBSD.org -HOMEPAGE= http://p11-glue.freedesktop.org/ +HOMEPAGE= https://p11-glue.freedesktop.org/p11-kit.html COMMENT= PKCS#11 module manager LICENSE= modified-bsd GNU_CONFIGURE= yes USE_LIBTOOL= yes +USE_TOOLS+= pkg-config + +# dirfd(3) +CFLAGS.NetBSD+= -D_NETBSD_SOURCE PKGCONFIG_OVERRIDE+= p11-kit/p11-kit-1.pc.in @@ -19,4 +23,6 @@ PKG_SYSCONFSUBDIR= pkcs11 CONF_FILES+= share/examples/p11-kit/pkcs11.conf.example \ ${PKG_SYSCONFDIR}/pkcs11.conf +.include "../../devel/libffi/buildlink3.mk" +.include "../../security/libtasn1/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/security/p11-kit/PLIST b/security/p11-kit/PLIST index 89874a4bdaaf..ef43083d55b6 100644 --- a/security/p11-kit/PLIST +++ b/security/p11-kit/PLIST @@ -1,35 +1,58 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2012/02/03 14:43:12 drochner Exp $ +@comment $NetBSD: PLIST,v 1.2 2016/03/13 03:10:36 ryoon Exp $ bin/p11-kit +bin/trust +include/p11-kit-1/p11-kit/deprecated.h +include/p11-kit-1/p11-kit/iter.h include/p11-kit-1/p11-kit/p11-kit.h include/p11-kit-1/p11-kit/pin.h 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/p11-kit-proxy.so +lib/p11-kit/p11-kit-remote +lib/p11-kit/trust-extract-compat +lib/pkcs11/p11-kit-trust.la lib/pkgconfig/p11-kit-1.pc share/examples/p11-kit/pkcs11.conf.example -share/gtk-doc/html/p11-kit/api-index-full.html share/gtk-doc/html/p11-kit/config-example.html -share/gtk-doc/html/p11-kit/config-format.html -share/gtk-doc/html/p11-kit/config-global.html -share/gtk-doc/html/p11-kit/config-locations.html -share/gtk-doc/html/p11-kit/config-module.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/index.sgml +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/right-insensitive.png share/gtk-doc/html/p11-kit/right.png -share/gtk-doc/html/p11-kit/sharing-initialize.html -share/gtk-doc/html/p11-kit/sharing-module.html +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/p11-kit/modules/p11-kit-trust.module diff --git a/security/p11-kit/distinfo b/security/p11-kit/distinfo index 1502055d8f22..d97f0b4d265a 100644 --- a/security/p11-kit/distinfo +++ b/security/p11-kit/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.2 2015/11/04 01:17:53 agc Exp $ +$NetBSD: distinfo,v 1.3 2016/03/13 03:10:36 ryoon Exp $ -SHA1 (p11-kit-0.10.tar.gz) = 861e8d19a2c578ef8009c8ac93975db9884bb002 -RMD160 (p11-kit-0.10.tar.gz) = f305a865b4d267b79abb183965704ae406e357ae -SHA512 (p11-kit-0.10.tar.gz) = 28f027e2604265a97a587743752c47fc19412dfea9ed0af89418bcf27eddd871b6cf12ea394d8a086df5d02f14a03ba1377a4560f0a2baf038cd8e66254c8004 -Size (p11-kit-0.10.tar.gz) = 528279 bytes -SHA1 (patch-aa) = 16b1ed56c062ed5fe3227489e8d44071882ac1df +SHA1 (p11-kit-0.22.1.tar.gz) = f92e357ab9bdb27a5a22daa99d738e278f03c947 +RMD160 (p11-kit-0.22.1.tar.gz) = 6e14580a0d81c9e41f9ff9f95a6f78c58102f8cf +SHA512 (p11-kit-0.22.1.tar.gz) = 500b0c922e98ed2d28133f93629bf762b873c8f6c638ccb4ba2b4f2df548c519f8ce27f1efae66193f88027d1b548908dbe3f5e84106a52ab972e29771c1d37b +Size (p11-kit-0.22.1.tar.gz) = 992099 bytes +SHA1 (patch-Makefile.in) = 1db1ed011c07bf7ac3022249e0f3b80630a6034e diff --git a/security/p11-kit/patches/patch-Makefile.in b/security/p11-kit/patches/patch-Makefile.in new file mode 100644 index 000000000000..73c7632ca3c0 --- /dev/null +++ b/security/p11-kit/patches/patch-Makefile.in @@ -0,0 +1,13 @@ +$NetBSD: patch-Makefile.in,v 1.1 2016/03/13 03:10:36 ryoon Exp $ + +--- Makefile.in.orig 2015-12-07 13:51:02.000000000 +0000 ++++ Makefile.in +@@ -1355,7 +1355,7 @@ libp11_kit_testable_la_LIBADD = $(libp11 + + pkgconfigdir = $(libdir)/pkgconfig + pkgconfig_DATA = p11-kit/p11-kit-1.pc +-exampledir = $(p11_system_config) ++exampledir = $(prefix)/share/examples/p11-kit + example_DATA = p11-kit/pkcs11.conf.example + p11_kit_p11_kit_SOURCES = \ + p11-kit/lists.c \ diff --git a/security/p11-kit/patches/patch-aa b/security/p11-kit/patches/patch-aa deleted file mode 100644 index 3a1b5e69613a..000000000000 --- a/security/p11-kit/patches/patch-aa +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-aa,v 1.1.1.1 2012/02/03 14:43:12 drochner Exp $ - ---- p11-kit/Makefile.in.orig 2012-01-03 16:00:59.000000000 +0000 -+++ p11-kit/Makefile.in -@@ -334,7 +334,7 @@ libp11_kit_testable_la_LDFLAGS = \ - libp11_kit_testable_la_SOURCES = $(MODULE_SRCS) - pkgconfigdir = $(libdir)/pkgconfig - pkgconfig_DATA = p11-kit-1.pc --exampledir = $(p11_system_config) -+exampledir = $(prefix)/share/examples/p11-kit - example_DATA = pkcs11.conf.example - EXTRA_DIST = \ - p11-kit-1.pc.in \