Update to 0.18.0 release.

4 files changed, 32 insertions, 16 deletions

diff --git a/security/opensc/Makefile b/security/opensc/Makefile
index f523cba65181..e64fe47f86f5 100644
--- a/security/opensc/Makefile
+++ b/security/opensc/Makefile
@@ -2,16 +2,10 @@
 # $FreeBSD$
 
 PORTNAME=	opensc
-PORTVERSION=	0.17.0
-PORTREVISION=	2
+PORTVERSION=	0.18.0
 CATEGORIES=	security devel
 MASTER_SITES=	https://github.com/OpenSC/OpenSC/releases/download/${PORTVERSION}/
 
-PATCH_SITES=	https://github.com/OpenSC/OpenSC/commit/
-PATCHFILES=	8d7346406d166a9db4afd239e6669df3e3b99f79.patch \
-		def06389bfeec4eabfb88801c388ae30a6f7b693.patch
-PATCH_DIST_STRIP=	-p1
-
 MAINTAINER=	ale@FreeBSD.org
 COMMENT=	Libraries and utilities to access smart cards
 
@@ -19,14 +13,15 @@ LICENSE=	LGPL21
 
 OPTIONS_SINGLE=	BACKEND
 OPTIONS_SINGLE_BACKEND=PCSC OPENCT CTAPI
-OPTIONS_DEFINE=	SM DOCS MANPAGES
-OPTIONS_DEFAULT=PCSC SM MANPAGES
+OPTIONS_DEFINE=	SM NOTIFY DOCS MANPAGES
+OPTIONS_DEFAULT=PCSC SM NOTIFY MANPAGES
 OPTIONS_SUB=	yes
 
 PCSC_DESC=	Use PC/SC backend
 OPENCT_DESC=	Use OpenCT backend
 CTAPI_DESC=	Use CT-API backend
 SM_DESC=	Enable secure messaging support
+NOTIFY_DESC=	Enable notification support
 
 USES=		libtool pkgconfig gmake ssl
 GNU_CONFIGURE=	yes
@@ -51,6 +46,9 @@ CTAPI_CONFIGURE_ENABLE=		ctapi
 
 SM_CONFIGURE_ENABLE=		sm
 
+NOTIFY_USE=			GNOME=glib20
+NOTIFY_CONFIGURE_ENABLE=	notify
+
 DOCS_CONFIGURE_ENABLE=		doc
 
 .include <bsd.port.options.mk>
diff --git a/security/opensc/distinfo b/security/opensc/distinfo
index 161a9efce9d6..0a21d9a096df 100644
--- a/security/opensc/distinfo
+++ b/security/opensc/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1509698189
-SHA256 (opensc-0.17.0.tar.gz) = be73c6816867ab4721e6a9ae7dba8e890c5f169f0a2cbb4bf354e0f30a948300
-SIZE (opensc-0.17.0.tar.gz) = 1950547
+TIMESTAMP = 1530000626
+SHA256 (opensc-0.18.0.tar.gz) = 9bc0ff030dd1c10f646d54415eae1bb2b1c72dda710378343f027e17cd8c3757
+SIZE (opensc-0.18.0.tar.gz) = 2037073
 SHA256 (8d7346406d166a9db4afd239e6669df3e3b99f79.patch) = 50cbf9fcb75755407bf4bca01d143e85f3f8df1888ac7c9557a48935d6332573
 SIZE (8d7346406d166a9db4afd239e6669df3e3b99f79.patch) = 15954
 SHA256 (def06389bfeec4eabfb88801c388ae30a6f7b693.patch) = e9e413d9d11d65531d114354c40961e8420efd18704eb5dfa0c38d776df77573
diff --git a/security/opensc/files/patch-src_tools_pkcs15-tool.c b/security/opensc/files/patch-src_tools_pkcs15-tool.c
new file mode 100644
index 000000000000..a999061247f8
--- /dev/null
+++ b/security/opensc/files/patch-src_tools_pkcs15-tool.c
@@ -0,0 +1,11 @@
+--- src/tools/pkcs15-tool.c.orig	2018-01-31 08:43:55 UTC
++++ src/tools/pkcs15-tool.c
+@@ -20,7 +20,7 @@
+  */
+ #include "config.h"
+ 
+-#ifdef __APPLE__
++#if defined(__APPLE__) || defined(__FreeBSD__)
+ #define _XOPEN_SOURCE 600
+ #else
+ #define _XOPEN_SOURCE 500
diff --git a/security/opensc/pkg-plist b/security/opensc/pkg-plist
index 0501369beec3..edc2db5af019 100644
--- a/security/opensc/pkg-plist
+++ b/security/opensc/pkg-plist
@@ -1,13 +1,16 @@
 bin/cardos-tool
 bin/cryptoflex-tool
 bin/dnie-tool
+bin/egk-tool
 bin/eidenv
 bin/gids-tool
 bin/iasecc-tool
 bin/netkey-tool
 bin/npa-tool
 bin/openpgp-tool
+bin/opensc-asn1
 bin/opensc-explorer
+bin/opensc-notify
 bin/opensc-tool
 bin/piv-tool
 bin/pkcs11-tool
@@ -36,11 +39,11 @@ etc/bash_completion.d/westcos-tool
 @sample etc/opensc.conf.sample
 lib/libopensc.a
 lib/libopensc.so
-lib/libopensc.so.5
-lib/libopensc.so.5.0.0
+lib/libopensc.so.6
+lib/libopensc.so.6.0.0
 %%SM%%lib/libsmm-local.so
-%%SM%%lib/libsmm-local.so.5
-%%SM%%lib/libsmm-local.so.5.0.0
+%%SM%%lib/libsmm-local.so.6
+%%SM%%lib/libsmm-local.so.6.0.0
 lib/onepin-opensc-pkcs11.so
 lib/opensc-pkcs11.so
 lib/pkcs11-spy.so
@@ -48,6 +51,7 @@ lib/pkcs11/onepin-opensc-pkcs11.so
 lib/pkcs11/opensc-pkcs11.so
 lib/pkcs11/pkcs11-spy.so
 libdata/pkgconfig/opensc-pkcs11.pc
+share/applications/org.opensc.notify.desktop
 %%DATADIR%%/asepcos.profile
 %%DATADIR%%/authentic.profile
 %%DATADIR%%/cardos.profile
@@ -82,13 +86,16 @@ libdata/pkgconfig/opensc-pkcs11.pc
 %%MANPAGES%%man/man1/cardos-tool.1.gz
 %%MANPAGES%%man/man1/cryptoflex-tool.1.gz
 %%MANPAGES%%man/man1/dnie-tool.1.gz
+%%MANPAGES%%man/man1/egk-tool.1.gz
 %%MANPAGES%%man/man1/eidenv.1.gz
 %%MANPAGES%%man/man1/gids-tool.1.gz
 %%MANPAGES%%man/man1/iasecc-tool.1.gz
 %%MANPAGES%%man/man1/netkey-tool.1.gz
 %%MANPAGES%%man/man1/npa-tool.1.gz
 %%MANPAGES%%man/man1/openpgp-tool.1.gz
+%%MANPAGES%%man/man1/opensc-asn1.1.gz
 %%MANPAGES%%man/man1/opensc-explorer.1.gz
+%%MANPAGES%%man/man1/opensc-notify.1.gz
 %%MANPAGES%%man/man1/opensc-tool.1.gz
 %%MANPAGES%%man/man1/piv-tool.1.gz
 %%MANPAGES%%man/man1/pkcs11-tool.1.gz