Build fix for a more modern pcsc-lite.

4 files changed, 81 insertions, 2 deletions

diff --git a/security/CoolKey/Makefile b/security/CoolKey/Makefile
index 56cf2545906..62f64ce8023 100644
--- a/security/CoolKey/Makefile
+++ b/security/CoolKey/Makefile
@@ -1,13 +1,15 @@
-# $NetBSD: Makefile,v 1.4 2012/10/23 18:16:20 asau Exp $
+# $NetBSD: Makefile,v 1.5 2012/12/15 01:07:17 pettai Exp $
 #
 
 DISTNAME=	coolkey-1.1.0
+PKGREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	http://directory.fedora.redhat.com/download/coolkey/
 
 MAINTAINER=	shannonjr@NetBSD.org
 HOMEPAGE=	http://directory.fedora.redhat.com/wiki/CoolKey
 COMMENT=	Driver support for the CoolKey and CAC products
+LICENSE=	gnu-lgpl-v2
 
 # Only for NetBSD>=4.99.0
 NOT_FOR_PLATFORM=	NetBSD-[0-3].*-* NetBSD-4.[0-9].*-*
@@ -15,6 +17,8 @@ NOT_FOR_PLATFORM+=	NetBSD-4.[0-8]*.*-* NetBSD-4.9[0-8].*-*
 
 .include "../../mk/bsd.prefs.mk"
 
+BUILD_DEFS=	VARBASE
+
 GNU_CONFIGURE=	yes
 USE_LIBTOOL=	yes
 USE_TOOLS+=	pkg-config
diff --git a/security/CoolKey/distinfo b/security/CoolKey/distinfo
index 463f47a24c4..d254661cd22 100644
--- a/security/CoolKey/distinfo
+++ b/security/CoolKey/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2011/11/25 22:17:48 joerg Exp $
+$NetBSD: distinfo,v 1.3 2012/12/15 01:07:17 pettai Exp $
 
 SHA1 (coolkey-1.1.0.tar.gz) = 54136decf9dfd091c8b231cb77dac97db95e1866
 RMD160 (coolkey-1.1.0.tar.gz) = 1873e85aecb30c5311444c76fd85ba79633dce23
@@ -9,3 +9,5 @@ SHA1 (patch-ac) = 8b7604ea677471a7ee5c1d7c9f4f6f4c03468350
 SHA1 (patch-src_coolkey_log.cpp) = 2e9fe538236496a924eb3a12a43a4336e814aabb
 SHA1 (patch-src_coolkey_object.cpp) = a28c9a56e4a184bcdf73be9d64ef133b691ccf0e
 SHA1 (patch-src_coolkey_slot.cpp) = a797e9e2dcc04598fb3e322fe7f78326c9ea1de6
+SHA1 (patch-src_libckyapplet_cky_card.c) = 7c662083d622b464a74322aef883f211b8ac9420
+SHA1 (patch-src_libckyapplet_cky_card.h) = 94067de1f656ef85eec7f13614f55760bf5fe338
diff --git a/security/CoolKey/patches/patch-src_libckyapplet_cky_card.c b/security/CoolKey/patches/patch-src_libckyapplet_cky_card.c
new file mode 100644
index 00000000000..a78f014d565
--- /dev/null
+++ b/security/CoolKey/patches/patch-src_libckyapplet_cky_card.c
@@ -0,0 +1,23 @@
+$NetBSD: patch-src_libckyapplet_cky_card.c,v 1.1 2012/12/15 01:07:17 pettai Exp $
+
+Build fix for a more modern pcsc-lite.
+
+--- src/libckyapplet/cky_card.c.orig	2012-12-11 21:28:26.000000000 +0000
++++ src/libckyapplet/cky_card.c
+@@ -27,7 +27,6 @@
+ 
+ #ifndef WINAPI
+ #define WINAPI
+-typedef SCARD_READERSTATE *LPSCARD_READERSTATE;
+ #endif
+ 
+ #ifndef SCARD_E_NO_READERS_AVAILABLE
+@@ -108,7 +107,7 @@ typedef long (WINAPI * SCardGetAttribFn)
+ typedef long (WINAPI * SCardGetStatusChangeFn) (
+     SCARDCONTEXT hContext,
+     unsigned long dwTimeout,
+-    LPSCARD_READERSTATE rgReaderStates,
++    SCARD_READERSTATE *rgReaderStates,
+     unsigned long cReaders);
+ 
+ typedef long (WINAPI * SCardCancelFn) (
diff --git a/security/CoolKey/patches/patch-src_libckyapplet_cky_card.h b/security/CoolKey/patches/patch-src_libckyapplet_cky_card.h
new file mode 100644
index 00000000000..83f1950f709
--- /dev/null
+++ b/security/CoolKey/patches/patch-src_libckyapplet_cky_card.h
@@ -0,0 +1,50 @@
+$NetBSD: patch-src_libckyapplet_cky_card.h,v 1.1 2012/12/15 01:07:17 pettai Exp $
+
+Build fix for a more modern pcsc-lite.
+
+--- src/libckyapplet/cky_card.h.orig	2012-12-11 21:28:32.000000000 +0000
++++ src/libckyapplet/cky_card.h
+@@ -41,23 +41,23 @@ CKYLIST_DECLARE(CKYReaderName, char *)
+ CKYLIST_DECLARE(CKYCardConnection, CKYCardConnection *)
+ 
+ CKY_BEGIN_PROTOS
+-void CKYReader_Init(SCARD_READERSTATE_A *reader);
+-void CKYReader_FreeData(SCARD_READERSTATE_A *reader);
++void CKYReader_Init(SCARD_READERSTATE *reader);
++void CKYReader_FreeData(SCARD_READERSTATE *reader);
+ 
+ /*
+- * "Accessors": for SCARD_READERSTATE_A structure as a class.
+- * These functions take an SCARD_READERSTATE_A which can also be referenced
++ * "Accessors": for SCARD_READERSTATE structure as a class.
++ * These functions take an SCARD_READERSTATE which can also be referenced
+  * directly.
+  */
+-CKYStatus CKYReader_SetReaderName(SCARD_READERSTATE_A *reader, const char *name);
+-const char *CKYReader_GetReaderName(const SCARD_READERSTATE_A *reader);
+-CKYStatus CKYReader_SetKnownState(SCARD_READERSTATE_A *reader, 
++CKYStatus CKYReader_SetReaderName(SCARD_READERSTATE *reader, const char *name);
++const char *CKYReader_GetReaderName(const SCARD_READERSTATE *reader);
++CKYStatus CKYReader_SetKnownState(SCARD_READERSTATE *reader, 
+ 						unsigned long state);
+-unsigned long CKYReader_GetKnownState(const SCARD_READERSTATE_A *reader);
+-unsigned long CKYReader_GetEventState(const SCARD_READERSTATE_A *reader);
+-CKYStatus CKYReader_GetATR(const SCARD_READERSTATE_A *reader, CKYBuffer *buf);
++unsigned long CKYReader_GetKnownState(const SCARD_READERSTATE *reader);
++unsigned long CKYReader_GetEventState(const SCARD_READERSTATE *reader);
++CKYStatus CKYReader_GetATR(const SCARD_READERSTATE *reader, CKYBuffer *buf);
+ /* create an array of READERSTATEs from a LIST of Readers */
+-SCARD_READERSTATE_A *CKYReader_CreateArray(const CKYReaderNameList readerNames, 
++SCARD_READERSTATE *CKYReader_CreateArray(const CKYReaderNameList readerNames, 
+ 					  unsigned long *readerCount);
+ /* frees the reader, then the full array */
+ void CKYReader_DestroyArray(SCARD_READERSTATE *reader, unsigned long count);
+@@ -88,7 +88,7 @@ CKYStatus CKYCardContext_FindReadersByAT
+ 				const CKYBuffer *targetATR);
+ /* return if any of the readers in our array has changed in status */
+ CKYStatus CKYCardContext_WaitForStatusChange(CKYCardContext *context,
+-				SCARD_READERSTATE_A *readers,
++				SCARD_READERSTATE *readers,
+ 				unsigned long readerCount,
+ 				unsigned long timeout);
+ /* cancel any current operation (such as wait for status change) on this