From f993a371751f3aa30cf1cd218e8dc581aa005bd2 Mon Sep 17 00:00:00 2001
From: gdt <gdt@pkgsrc.org>
Date: Mon, 17 Mar 2014 18:21:42 +0000
Subject: Stop forcing pcsc-lite's library to be the libtool version.

opensc upstream has removed the use of ltdl.  Thus, it is not longer
reasonable to expect it to be able to dlopen a .la file.  So pass the
.so, not the .la, to configure, when using the pcsc-lite (default)
option.  Resolves a failure of pkcs15-init to load modules.
---
 security/opensc/Makefile   | 3 ++-
 security/opensc/options.mk | 6 ++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

(limited to 'security/opensc')

diff --git a/security/opensc/Makefile b/security/opensc/Makefile
index 05b3a6d2670..53f2af697c1 100644
--- a/security/opensc/Makefile
+++ b/security/opensc/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.19 2014/03/14 20:49:56 gdt Exp $
+# $NetBSD: Makefile,v 1.20 2014/03/17 18:21:42 gdt Exp $
 
 OPENSC_PKG_VERSION=	0.13.0
 DISTNAME=		opensc-${OPENSC_PKG_VERSION}
+PKGREVISION=		1
 CATEGORIES=		security
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=opensc/OpenSC/opensc-0.13.0/}
 
diff --git a/security/opensc/options.mk b/security/opensc/options.mk
index b653981d814..b336bad40b3 100644
--- a/security/opensc/options.mk
+++ b/security/opensc/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2012/12/03 20:23:15 gdt Exp $
+# $NetBSD: options.mk,v 1.4 2014/03/17 18:21:42 gdt Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.opensc
 
@@ -13,7 +13,9 @@ PKG_SUGGESTED_OPTIONS=	pcsc-lite
 .if !empty(PKG_OPTIONS:Mpcsc-lite)
 .include "../../security/pcsc-lite/buildlink3.mk"
 CONFIGURE_ARGS+=	--enable-pcsc
-CONFIGURE_ARGS+=	--with-pcsc-provider=${BUILDLINK_PREFIX.pcsc-lite}/lib/libpcsclite.la
+# While one might expect the libtool .la, ltdl support has been
+# removed from opensc.
+CONFIGURE_ARGS+=	--with-pcsc-provider=${BUILDLINK_PREFIX.pcsc-lite}/lib/libpcsclite.so
 .else
 CONFIGURE_ARGS+=	--disable-pcsc
 .endif
-- 
cgit v1.2.3