Sat Dec 15 01:07:17 2012 UTC ()
Build fix for a more modern pcsc-lite.


(pettai)
diff -r1.4 -r1.5 pkgsrc/security/CoolKey/Makefile
diff -r1.2 -r1.3 pkgsrc/security/CoolKey/distinfo
diff -r0 -r1.1 pkgsrc/security/CoolKey/patches/patch-src_libckyapplet_cky_card.c
diff -r0 -r1.1 pkgsrc/security/CoolKey/patches/patch-src_libckyapplet_cky_card.h
cvs diff -r1.4 -r1.5 pkgsrc/security/CoolKey/Makefile (expand / switch to unified diff)

--- pkgsrc/security/CoolKey/Makefile 2012/10/23 18:16:20 1.4
+++ pkgsrc/security/CoolKey/Makefile 2012/12/15 01:07:17 1.5
@@ -1,30 +1,34 @@ @@ -1,30 +1,34 @@
1# $NetBSD: Makefile,v 1.4 2012/10/23 18:16:20 asau Exp $ 1# $NetBSD: Makefile,v 1.5 2012/12/15 01:07:17 pettai Exp $
2# 2#
3 3
4DISTNAME= coolkey-1.1.0 4DISTNAME= coolkey-1.1.0
 5PKGREVISION= 1
5CATEGORIES= security 6CATEGORIES= security
6MASTER_SITES= http://directory.fedora.redhat.com/download/coolkey/ 7MASTER_SITES= http://directory.fedora.redhat.com/download/coolkey/
7 8
8MAINTAINER= shannonjr@NetBSD.org 9MAINTAINER= shannonjr@NetBSD.org
9HOMEPAGE= http://directory.fedora.redhat.com/wiki/CoolKey 10HOMEPAGE= http://directory.fedora.redhat.com/wiki/CoolKey
10COMMENT= Driver support for the CoolKey and CAC products 11COMMENT= Driver support for the CoolKey and CAC products
 12LICENSE= gnu-lgpl-v2
11 13
12# Only for NetBSD>=4.99.0 14# Only for NetBSD>=4.99.0
13NOT_FOR_PLATFORM= NetBSD-[0-3].*-* NetBSD-4.[0-9].*-* 15NOT_FOR_PLATFORM= NetBSD-[0-3].*-* NetBSD-4.[0-9].*-*
14NOT_FOR_PLATFORM+= NetBSD-4.[0-8]*.*-* NetBSD-4.9[0-8].*-* 16NOT_FOR_PLATFORM+= NetBSD-4.[0-8]*.*-* NetBSD-4.9[0-8].*-*
15 17
16.include "../../mk/bsd.prefs.mk" 18.include "../../mk/bsd.prefs.mk"
17 19
 20BUILD_DEFS= VARBASE
 21
18GNU_CONFIGURE= yes 22GNU_CONFIGURE= yes
19USE_LIBTOOL= yes 23USE_LIBTOOL= yes
20USE_TOOLS+= pkg-config 24USE_TOOLS+= pkg-config
21USE_TOOLS+= autoconf 25USE_TOOLS+= autoconf
22USE_TOOLS+= gmake 26USE_TOOLS+= gmake
23USE_TOOLS+= grep 27USE_TOOLS+= grep
24.if ${OPSYS} != "NetBSD" 28.if ${OPSYS} != "NetBSD"
25USE_TOOLS+= gsed 29USE_TOOLS+= gsed
26.endif 30.endif
27USE_LANGUAGES= c c++ 31USE_LANGUAGES= c c++
28AUTOCONF_REQD= 2.59 32AUTOCONF_REQD= 2.59
29 33
30CONFIGURE_ARGS+= --sharedstatedir=${VARBASE:Q} 34CONFIGURE_ARGS+= --sharedstatedir=${VARBASE:Q}
cvs diff -r1.2 -r1.3 pkgsrc/security/CoolKey/distinfo (expand / switch to unified diff)

--- pkgsrc/security/CoolKey/distinfo 2011/11/25 22:17:48 1.2
+++ pkgsrc/security/CoolKey/distinfo 2012/12/15 01:07:17 1.3
@@ -1,11 +1,13 @@ @@ -1,11 +1,13 @@
1$NetBSD: distinfo,v 1.2 2011/11/25 22:17:48 joerg Exp $ 1$NetBSD: distinfo,v 1.3 2012/12/15 01:07:17 pettai Exp $
2 2
3SHA1 (coolkey-1.1.0.tar.gz) = 54136decf9dfd091c8b231cb77dac97db95e1866 3SHA1 (coolkey-1.1.0.tar.gz) = 54136decf9dfd091c8b231cb77dac97db95e1866
4RMD160 (coolkey-1.1.0.tar.gz) = 1873e85aecb30c5311444c76fd85ba79633dce23 4RMD160 (coolkey-1.1.0.tar.gz) = 1873e85aecb30c5311444c76fd85ba79633dce23
5Size (coolkey-1.1.0.tar.gz) = 432808 bytes 5Size (coolkey-1.1.0.tar.gz) = 432808 bytes
6SHA1 (patch-aa) = f91d804c54540f45e7791b3ca9a1fb987bde0a72 6SHA1 (patch-aa) = f91d804c54540f45e7791b3ca9a1fb987bde0a72
7SHA1 (patch-ab) = 6aed241ec856b7b826e7c9953e286088d8960feb 7SHA1 (patch-ab) = 6aed241ec856b7b826e7c9953e286088d8960feb
8SHA1 (patch-ac) = 8b7604ea677471a7ee5c1d7c9f4f6f4c03468350 8SHA1 (patch-ac) = 8b7604ea677471a7ee5c1d7c9f4f6f4c03468350
9SHA1 (patch-src_coolkey_log.cpp) = 2e9fe538236496a924eb3a12a43a4336e814aabb 9SHA1 (patch-src_coolkey_log.cpp) = 2e9fe538236496a924eb3a12a43a4336e814aabb
10SHA1 (patch-src_coolkey_object.cpp) = a28c9a56e4a184bcdf73be9d64ef133b691ccf0e 10SHA1 (patch-src_coolkey_object.cpp) = a28c9a56e4a184bcdf73be9d64ef133b691ccf0e
11SHA1 (patch-src_coolkey_slot.cpp) = a797e9e2dcc04598fb3e322fe7f78326c9ea1de6 11SHA1 (patch-src_coolkey_slot.cpp) = a797e9e2dcc04598fb3e322fe7f78326c9ea1de6
 12SHA1 (patch-src_libckyapplet_cky_card.c) = 7c662083d622b464a74322aef883f211b8ac9420
 13SHA1 (patch-src_libckyapplet_cky_card.h) = 94067de1f656ef85eec7f13614f55760bf5fe338
File Added: pkgsrc/security/CoolKey/patches/patch-src_libckyapplet_cky_card.c
$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) (
File Added: pkgsrc/security/CoolKey/patches/patch-src_libckyapplet_cky_card.h
$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