Update to 0.14.0 release.

4 files changed, 10 insertions, 41 deletions

diff --git a/security/opensc/Makefile b/security/opensc/Makefile
index 8e935825b506..36de7a4885e4 100644
--- a/security/opensc/Makefile
+++ b/security/opensc/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	opensc
-PORTVERSION=	0.13.0
+PORTVERSION=	0.14.0
 CATEGORIES=	security devel
 MASTER_SITES=	SF/${PORTNAME}/OpenSC/${DISTNAME}
 
@@ -17,17 +17,18 @@ BUILD_DEPENDS=	xsltproc:${PORTSDIR}/textproc/libxslt \
 OPTIONS_SINGLE=	BACKEND
 OPTIONS_SINGLE_BACKEND=PCSC OPENCT CTAPI
 OPTIONS_DEFINE=	SM DOCS
-OPTIONS_DEFAULT=PCSC
+OPTIONS_DEFAULT=PCSC SM
 
 PCSC_DESC=	Use PC/SC backend
 OPENCT_DESC=	Use OpenCT backend
 CTAPI_DESC=	Use CT-API backend
 SM_DESC=	Enable secure messaging support
 
-USES=		libtool:keepla pkgconfig gmake
+USES=		libtool pkgconfig gmake
 USE_OPENSSL=	yes
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
+INSTALL_TARGET=	install-strip
 
 CONFIGURE_ENV=	\
 		OPENSSL_CFLAGS="-I${OPENSSLINC}" \
@@ -56,9 +57,9 @@ CONFIGURE_ARGS+=--enable-ctapi
 .endif
 
 .if ${PORT_OPTIONS:MSM}
-CONFIGURE_ARGS+=--enable-sm
 PLIST_SUB+=	SM=""
 .else
+CONFIGURE_ARGS+=--disable-sm
 PLIST_SUB+=	SM="@comment "
 .endif
 
@@ -66,8 +67,4 @@ PLIST_SUB+=	SM="@comment "
 CONFIGURE_ARGS+=--enable-doc
 .endif
 
-post-patch:
-	@${REINPLACE_CMD} 's|(libdir)/pkgconfig|(prefix)/libdata/pkgconfig|' \
-		${WRKSRC}/configure
-
 .include <bsd.port.mk>
diff --git a/security/opensc/distinfo b/security/opensc/distinfo
index 748df68d0780..63a2adc55780 100644
--- a/security/opensc/distinfo
+++ b/security/opensc/distinfo
@@ -1,2 +1,2 @@
-SHA256 (opensc-0.13.0.tar.gz) = abde46ae53b12b3273e40c532ffd4f7d423a51e0919a5234761453c17c089b14
-SIZE (opensc-0.13.0.tar.gz) = 1946899
+SHA256 (opensc-0.14.0.tar.gz) = facdca215f74d999b286ae246ada8d8fcb97ce58f0a6dd30d8b1c180101e9bf0
+SIZE (opensc-0.14.0.tar.gz) = 2039158
diff --git a/security/opensc/files/patch-configure b/security/opensc/files/patch-configure
deleted file mode 100644
index 8135208e2a25..000000000000
--- a/security/opensc/files/patch-configure
+++ /dev/null
@@ -1,27 +0,0 @@
---- configure.orig	2012-12-05 10:09:59.000000000 +0100
-+++ configure	2012-12-05 10:13:45.000000000 +0100
-@@ -12867,13 +12867,13 @@
- 
- 
- if test "${WIN32}" = "no"; then
--		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
-+		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lc" >&5
- $as_echo_n "checking for dlopen in -ldl... " >&6; }
- if test "${ac_cv_lib_dl_dlopen+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-ldl  $LIBS"
-+LIBS="$LIBS"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
-@@ -12908,7 +12908,7 @@
- #define HAVE_LIBDL 1
- _ACEOF
- 
--  LIBS="-ldl $LIBS"
-+  LIBS="$LIBS"
- 
- else
-   as_fn_error $? "libdl required" "$LINENO" 5
diff --git a/security/opensc/pkg-plist b/security/opensc/pkg-plist
index 6fde7d65b286..86824f0e15f0 100644
--- a/security/opensc/pkg-plist
+++ b/security/opensc/pkg-plist
@@ -1,5 +1,6 @@
 bin/cardos-tool
 bin/cryptoflex-tool
+bin/dnie-tool
 bin/eidenv
 bin/iasecc-tool
 bin/netkey-tool
@@ -15,19 +16,17 @@ bin/sc-hsm-tool
 bin/westcos-tool
 etc/opensc.conf-sample
 lib/libopensc.a
-lib/libopensc.la
 lib/libopensc.so
 lib/libopensc.so.3
 lib/libopensc.so.3.0.0
 %%SM%%lib/libsmm-local.a
-%%SM%%lib/libsmm-local.la
 %%SM%%lib/libsmm-local.so
 %%SM%%lib/libsmm-local.so.3
 %%SM%%lib/libsmm-local.so.3.0.0
-lib/opensc-pkcs11.la
+lib/onepin-opensc-pkcs11.so
 lib/opensc-pkcs11.so
-lib/pkcs11-spy.la
 lib/pkcs11-spy.so
+lib/pkcs11/onepin-opensc-pkcs11.so
 lib/pkcs11/opensc-pkcs11.so
 lib/pkcs11/pkcs11-spy.so
 %%DATADIR%%/asepcos.profile