Update to 0.11.3 release.

4 files changed, 17 insertions, 33 deletions

diff --git a/security/opensc/Makefile b/security/opensc/Makefile
index 9fd914caeeb6..36ab220e9d8e 100644
--- a/security/opensc/Makefile
+++ b/security/opensc/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	opensc
-DISTVERSION=	0.11.2-pre3
+DISTVERSION=	0.11.3
 CATEGORIES=	security devel
 MASTER_SITES=	http://www.opensc-project.org/files/${PORTNAME}/ \
 		http://www.opensc-project.org/files/${PORTNAME}/testing/
@@ -14,8 +14,8 @@ MASTER_SITES=	http://www.opensc-project.org/files/${PORTNAME}/ \
 MAINTAINER=	ale@FreeBSD.org
 COMMENT=	Libraries and utilities to access smart cards
 
-OPTIONS=	OPENCT "Install openct for direct OpenCT backend support" on \
-		PCSC "Install pcsc-lite for PC/SC backend support" off \
+OPTIONS=	OPENCT "Enable direct OpenCT backend support" on \
+		PCSC "Enable PC/SC backend support" off \
 		SIGNER "Install signer browser plugin" off
 
 USE_AUTOTOOLS=	libltdl:15
@@ -67,12 +67,16 @@ MAN5=		pkcs15-profile.5
 
 .include <bsd.port.pre.mk>
 
-.if !defined(WITHOUT_OPENCT) || exists(${LOCALBASE}/lib/libopenct.so)
+.if !defined(WITHOUT_OPENCT)
 LIB_DEPENDS+=	openct.1:${PORTSDIR}/security/openct
+.else
+CONFIGURE_ARGS+=--disable-openct
 .endif
 
-.if defined(WITH_PCSC) || exists(${LOCALBASE}/lib/libpcsclite.so)
+.if defined(WITH_PCSC)
 LIB_DEPENDS+=	pcsclite.1:${PORTSDIR}/devel/pcsc-lite
+.else
+CONFIGURE_ARGS+=--disable-pcsc-lite
 .endif
 
 .if defined(WITH_SIGNER) || exists(${LOCALBASE}/lib/libassuan.a)
diff --git a/security/opensc/distinfo b/security/opensc/distinfo
index 426250c6d1e3..60862e617197 100644
--- a/security/opensc/distinfo
+++ b/security/opensc/distinfo
@@ -1,3 +1,3 @@
-MD5 (opensc-0.11.2-pre3.tar.gz) = 46a5ea72b3cc447f970de0a103e479e4
-SHA256 (opensc-0.11.2-pre3.tar.gz) = e2f9c0427e60e5487cdcb4847d080fbee06dc9c2a67edc4b791c7bfd63b484fc
-SIZE (opensc-0.11.2-pre3.tar.gz) = 1302861
+MD5 (opensc-0.11.3.tar.gz) = 10897652e1f8d08d3c953982a4237f2e
+SHA256 (opensc-0.11.3.tar.gz) = 4ef75dee81a71470911eaca0e0fd3a761c8a16cb53759e443f835137d530f197
+SIZE (opensc-0.11.3.tar.gz) = 1414740
diff --git a/security/opensc/files/patch-src_libopensc_reader-pcsc.c b/security/opensc/files/patch-src_libopensc_reader-pcsc.c
deleted file mode 100644
index 5598836ac228..000000000000
--- a/security/opensc/files/patch-src_libopensc_reader-pcsc.c
+++ /dev/null
@@ -1,19 +0,0 @@
---- src/libopensc/reader-pcsc.c.orig	Fri Feb 23 22:13:56 2007
-+++ src/libopensc/reader-pcsc.c	Fri Feb 23 22:14:40 2007
-@@ -60,7 +60,6 @@
- #undef SCARD_PROTOCOL_ANY
- #define SCARD_PROTOCOL_ANY (SCARD_PROTOCOL_T0 | SCARD_PROTOCOL_T1)
- #ifdef _WIN32
--#define SCARD_SCOPE_GLOBAL SCARD_SCOPE_USER
- 
- /* Error printing */
- #define PCSC_ERROR(ctx, desc, rv) sc_error(ctx, desc ": %lx\n", rv);
-@@ -717,7 +716,7 @@
- 	struct pcsc_global_private_data *gpriv;
- 	scconf_block *conf_block;
- 
--	rv = SCardEstablishContext(SCARD_SCOPE_GLOBAL,
-+	rv = SCardEstablishContext(SCARD_SCOPE_USER,
-                               NULL, NULL, &pcsc_ctx);
- 	if (rv != SCARD_S_SUCCESS)
- 		return pcsc_ret_to_error(rv);
diff --git a/security/opensc/pkg-plist b/security/opensc/pkg-plist
index a5980ad9b72b..b37f66016263 100644
--- a/security/opensc/pkg-plist
+++ b/security/opensc/pkg-plist
@@ -13,6 +13,7 @@ bin/pkcs15-tool
 etc/opensc.conf-sample
 include/opensc/asn1.h
 include/opensc/cardctl.h
+include/opensc/compression.h
 include/opensc/emv.h
 include/opensc/errors.h
 include/opensc/log.h
@@ -20,11 +21,6 @@ include/opensc/opensc.h
 include/opensc/pkcs11.h
 include/opensc/pkcs15-init.h
 include/opensc/pkcs15.h
-include/opensc/rsaref/win32.h
-include/opensc/rsaref/unix.h
-include/opensc/rsaref/pkcs11t.h
-include/opensc/rsaref/pkcs11f.h
-include/opensc/rsaref/pkcs11.h
 include/opensc/scconf.h
 include/opensc/types.h
 include/opensc/ui.h
@@ -47,12 +43,16 @@ lib/libscconf.a
 lib/libscconf.la
 lib/libscconf.so
 lib/libscconf.so.2
+lib/onepin-opensc-pkcs11.a
+lib/onepin-opensc-pkcs11.la
+lib/onepin-opensc-pkcs11.so
 lib/opensc-pkcs11.a
 lib/opensc-pkcs11.la
 lib/opensc-pkcs11.so
 lib/pkcs11-spy.a
 lib/pkcs11-spy.la
 lib/pkcs11-spy.so
+%%DATADIR%%/asepcos.profile
 %%DATADIR%%/cardos.profile
 %%DATADIR%%/cyberflex.profile
 %%DATADIR%%/flex.profile
@@ -65,6 +65,5 @@ lib/pkcs11-spy.so
 %%DATADIR%%/pkcs15.profile
 %%DATADIR%%/setcos.profile
 %%DATADIR%%/starcos.profile
-@dirrm include/opensc/rsaref
 @dirrm include/opensc
 @dirrm %%DATADIR%%