Update to 0.20.1.

4 files changed, 26 insertions, 12 deletions

diff --git a/security/p11-kit/Makefile b/security/p11-kit/Makefile
index e93a3f4f8e4d..b7caa3cfe2f5 100644
--- a/security/p11-kit/Makefile
+++ b/security/p11-kit/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	p11-kit
-PORTVERSION=	0.16.3
+PORTVERSION=	0.20.1
 CATEGORIES=	security devel
 MASTER_SITES=	http://p11-glue.freedesktop.org/releases/
 
@@ -11,12 +11,13 @@ COMMENT=	Library for loading and enumerating of PKCS\#11 modules
 
 RUN_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss
 BUILD_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss
-LIB_DEPENDS=	tasn1:${PORTSDIR}/security/libtasn1
+LIB_DEPENDS=	tasn1:${PORTSDIR}/security/libtasn1 \
+		ffi:${PORTSDIR}/devel/libffi
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-nls --enable-debug=no \
-		--with-system-anchors=${LOCALBASE}/share/certs/ca-root-nss.crt
-MAKE_ENV=	exampledir=${EXAMPLESDIR}
+		--with-trust-paths=${LOCALBASE}/share/certs/ca-root-nss.crt
+MAKE_ENV=	exampledir=${STAGEDIR}${EXAMPLESDIR}
 
 USES=		pkgconfig
 USE_AUTOTOOLS=	libtool
@@ -24,7 +25,6 @@ USE_GNOME=	ltverhack gnomehack
 USE_LDCONFIG=	yes
 USE_GMAKE=	yes
 
-NO_STAGE=	yes
 pre-configure:
 	@${REINPLACE_CMD} -e \
 	's|exampledir = $$(p11_system_config)|exampledir = ${EXAMPLESDIR}|' \
diff --git a/security/p11-kit/distinfo b/security/p11-kit/distinfo
index 4062dd4385f2..aefc46c8b8bd 100644
--- a/security/p11-kit/distinfo
+++ b/security/p11-kit/distinfo
@@ -1,2 +1,2 @@
-SHA256 (p11-kit-0.16.3.tar.gz) = 0812077ed026a5476d06ddc6a6443b1d1ce4783722235ed9ed251a11761e3198
-SIZE (p11-kit-0.16.3.tar.gz) = 895370
+SHA256 (p11-kit-0.20.1.tar.gz) = 524548f0a3bfa1b5712721165b49f0300fb244c907533677e88a9c9743eb4a53
+SIZE (p11-kit-0.20.1.tar.gz) = 1175729
diff --git a/security/p11-kit/files/patch-common-tests-Makefile.in b/security/p11-kit/files/patch-common-tests-Makefile.in
new file mode 100644
index 000000000000..fef71b85bdcc
--- /dev/null
+++ b/security/p11-kit/files/patch-common-tests-Makefile.in
@@ -0,0 +1,10 @@
+--- common/tests/Makefile.in.orig	2013-11-03 13:55:44.000000000 +0400
++++ common/tests/Makefile.in	2013-11-03 13:55:44.000000000 +0400
+@@ -457,6 +457,7 @@
+ 	-I$(srcdir)/.. \
+ 	-I$(COMMON) \
+ 	-DBUILDDIR=\"$(abs_builddir)\" \
++	$(LIBTASN1_CFLAGS) \
+ 	$(TEST_CFLAGS)
+ 
+ LDADD = $(NULL) $(top_builddir)/common/libp11-test.la \
diff --git a/security/p11-kit/pkg-plist b/security/p11-kit/pkg-plist
index f4940de078d4..71cf31b02d78 100644
--- a/security/p11-kit/pkg-plist
+++ b/security/p11-kit/pkg-plist
@@ -1,4 +1,6 @@
 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
@@ -9,12 +11,13 @@ lib/libp11-kit.la
 lib/libp11-kit.so
 lib/libp11-kit.so.0
 lib/p11-kit-proxy.so
+lib/p11-kit/trust-extract-compat
 lib/pkcs11/p11-kit-trust.a
 lib/pkcs11/p11-kit-trust.la
 lib/pkcs11/p11-kit-trust.so
 libdata/pkgconfig/p11-kit-1.pc
-share/gtk-doc/html/p11-kit/ch01s03.html
 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
@@ -28,6 +31,7 @@ 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.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
@@ -35,21 +39,20 @@ 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/pkcs11-conf.html
 share/gtk-doc/html/p11-kit/reference.html
 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.png
 %%DATADIR%%/modules/p11-kit-trust.module
-%%DATADIR%%/p11-kit-extract-trust
 %%EXAMPLESDIR%%/pkcs11.conf.example
 @dirrm share/gtk-doc/html/p11-kit
 @dirrmtry share/gtk-doc/html
@@ -59,4 +62,5 @@ share/gtk-doc/html/p11-kit/up.png
 @dirrm %%EXAMPLESDIR%%
 @dirrm include/p11-kit-1/p11-kit
 @dirrm include/p11-kit-1
+@dirrm lib/p11-kit
 @dirrm lib/pkcs11