Update to 0.12.1 release.

4 files changed, 14 insertions, 21 deletions

diff --git a/security/opensc/Makefile b/security/opensc/Makefile
index 33ddc6143b64..4f25fd758333 100644
--- a/security/opensc/Makefile
+++ b/security/opensc/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	opensc
-PORTVERSION=	0.12.0
+PORTVERSION=	0.12.1
 CATEGORIES=	security devel
 MASTER_SITES=	http://www.opensc-project.org/files/${PORTNAME}/ \
 		http://www.opensc-project.org/files/${PORTNAME}/testing/
@@ -24,15 +24,13 @@ OPTIONS=	PCSC "Enable PC/SC backend support" on \
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-USE_AUTOTOOLS=	libltdl
 USE_OPENSSL=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 USE_GNOME=	pkgconfig
 USE_LDCONFIG=	yes
 
-CONFIGURE_ENV=	LTLIB_CFLAGS="-I${LOCALBASE}/include" \
-		LTLIB_LIBS="-L${LOCALBASE}/lib -lltdl" \
+CONFIGURE_ENV=	\
 		OPENSSL_CFLAGS="-I${OPENSSLINC}" \
 		OPENSSL_LIBS="-L${OPENSSLLIB} -lssl" \
 		XSLTPROC="${LOCALBASE}/bin/xsltproc"
@@ -42,8 +40,8 @@ CONFIGURE_ARGS=	--with-xsl-stylesheetsdir=${LOCALBASE}/share/xsl/docbook
 PORTDOCS=	*
 
 MANCOMPRESSED=	no
-MAN1=		cardos-tool.1 cryptoflex-tool.1 netkey-tool.1 \
-		opensc-explorer.1 opensc-tool.1 \
+MAN1=		cardos-tool.1 cryptoflex-tool.1 eidenv.1 netkey-tool.1 \
+		opensc-explorer.1 opensc-tool.1 piv-tool.1 \
 		pkcs11-tool.1 pkcs15-crypt.1 pkcs15-init.1 pkcs15-tool.1 \
 		westcos-tool.1
 MAN5=		pkcs15-profile.5
diff --git a/security/opensc/distinfo b/security/opensc/distinfo
index 85754f633b04..8f188809c603 100644
--- a/security/opensc/distinfo
+++ b/security/opensc/distinfo
@@ -1,2 +1,2 @@
-SHA256 (opensc-0.12.0.tar.gz) = 84f8a8e1825e487d321390f0650c590334c76f81291d2eb5a315ad73459d2f6f
-SIZE (opensc-0.12.0.tar.gz) = 1409151
+SHA256 (opensc-0.12.1.tar.gz) = e9b5812dd8024484c6bb7400fb3e638aca2e9b112a7ffb161c300fe2260b28c8
+SIZE (opensc-0.12.1.tar.gz) = 1579129
diff --git a/security/opensc/files/patch-src_libopensc_card-piv.c b/security/opensc/files/patch-src_libopensc_card-piv.c
deleted file mode 100644
index c95c863a0458..000000000000
--- a/security/opensc/files/patch-src_libopensc_card-piv.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/libopensc/card-piv.c.orig	2010-12-23 11:56:55.000000000 +0100
-+++ src/libopensc/card-piv.c	2010-12-23 11:57:17.000000000 +0100
-@@ -28,7 +28,7 @@
- #include <string.h>
- #include <fcntl.h>
- #include <limits.h>
--#ifndef __APPLE__
-+#ifdef HAVE_MALLOC_H
- #include <malloc.h>
- #endif
- #ifdef ENABLE_OPENSSL
diff --git a/security/opensc/pkg-plist b/security/opensc/pkg-plist
index cfd3fa780902..c467ec2487c9 100644
--- a/security/opensc/pkg-plist
+++ b/security/opensc/pkg-plist
@@ -9,7 +9,6 @@ bin/pkcs11-tool
 bin/pkcs15-crypt
 bin/pkcs15-init
 bin/pkcs15-tool
-bin/rutoken-tool
 bin/westcos-tool
 etc/opensc.conf-sample
 lib/libopensc.a
@@ -26,11 +25,19 @@ lib/pkcs11/onepin-opensc-pkcs11.so
 lib/pkcs11/opensc-pkcs11.so
 lib/pkcs11/pkcs11-spy.so
 %%DATADIR%%/asepcos.profile
+%%DATADIR%%/authentic.profile
 %%DATADIR%%/cardos.profile
 %%DATADIR%%/cyberflex.profile
 %%DATADIR%%/entersafe.profile
 %%DATADIR%%/flex.profile
 %%DATADIR%%/gpk.profile
+%%DATADIR%%/ias_adele_admin1.profile
+%%DATADIR%%/ias_adele_admin2.profile
+%%DATADIR%%/ias_adele_common.profile
+%%DATADIR%%/iasecc_admin_eid.profile
+%%DATADIR%%/iasecc_generic_oberthur.profile
+%%DATADIR%%/iasecc_generic_pki.profile
+%%DATADIR%%/iasecc.profile
 %%DATADIR%%/incrypto34.profile
 %%DATADIR%%/jcop.profile
 %%DATADIR%%/miocos.profile
@@ -43,6 +50,5 @@ lib/pkcs11/pkcs11-spy.so
 %%DATADIR%%/setcos.profile
 %%DATADIR%%/starcos.profile
 %%DATADIR%%/westcos.profile
-@dirrm include/opensc
 @dirrm lib/pkcs11
 @dirrm %%DATADIR%%