Re: pkg/39314 (security/ccid update to 1.3.8)

Update to 1.3.8

5 files changed, 16 insertions, 44 deletions

diff --git a/security/ccid/Makefile b/security/ccid/Makefile
index 4c84bb8e6b5..a1442006b78 100644
--- a/security/ccid/Makefile
+++ b/security/ccid/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.2 2008/06/20 01:09:33 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2008/08/08 21:27:24 shannonjr Exp $
 #
 
-DISTNAME=	ccid-1.3.5
+DISTNAME=	ccid-1.3.8
 CATEGORIES=	security
-MASTER_SITES=	http://alioth.debian.org/frs/download.php/2330/
+MASTER_SITES=	http://alioth.debian.org/frs/download.php/2482/
+EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	shannonjr@NetBSD.org
 HOMEPAGE=	http://pcsclite.alioth.debian.org/ccid.html
@@ -17,7 +18,7 @@ GNU_CONFIGURE=	yes
 USE_LIBTOOL=	yes
 USE_TOOLS+=	pkg-config
 USE_TOOLS+=	autoconf automake aclocal autoheader
-USE_TOOLS+=	flex
+USE_TOOLS+=	flex perl
 USE_LANGUAGES=	c c++
 
 CONFIGURE_ARGS+=        --sharedstatedir=${VARBASE:Q}
diff --git a/security/ccid/PLIST b/security/ccid/PLIST
index d2fb4259e00..a62888c31aa 100644
--- a/security/ccid/PLIST
+++ b/security/ccid/PLIST
@@ -1,9 +1,10 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2008/03/04 11:30:08 shannonjr Exp $
+@comment $NetBSD: PLIST,v 1.2 2008/08/08 21:27:24 shannonjr Exp $
 bin/RSA_SecurID_getpasswd
 man/man1/RSA_SecurID_getpasswd.1
 man/man8/Kobil_mIDentity_switch.8
 lib/pcsc-lite/drivers/ifd-ccid.bundle/Contents/Info.plist
 lib/pcsc-lite/drivers/ifd-ccid.bundle/Contents/${OPSYS}/libccid.so.${PKGVERSION}
+lib/pcsc-lite/drivers/ifd-ccid.bundle/Contents/NetBSD/libccid.so
 sbin/Kobil_mIDentity_switch
 share/doc/ccid/README_Kobil_mIDentity_switch.txt
 share/doc/ccid/README
diff --git a/security/ccid/distinfo b/security/ccid/distinfo
index 9453aed61a3..7841e9f38d4 100644
--- a/security/ccid/distinfo
+++ b/security/ccid/distinfo
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.2 2008/04/30 13:32:21 shannonjr Exp $
+$NetBSD: distinfo,v 1.3 2008/08/08 21:27:24 shannonjr Exp $
 
-SHA1 (ccid-1.3.5.tar.gz) = feb59183184203eda8d86f39f8f283954c0d05da
-RMD160 (ccid-1.3.5.tar.gz) = dd163b4ec702fbd2c57b14f6392452232fcea543
-Size (ccid-1.3.5.tar.gz) = 593801 bytes
-SHA1 (patch-aa) = 7f04127d300d94b9c7a326301425bfcf5a8c4a7d
+SHA1 (ccid-1.3.8.tar.bz2) = ee8a1e328d2ff286a953877f6da8c063b8438f04
+RMD160 (ccid-1.3.8.tar.bz2) = d616cf788e0d71358998ecd5c08e3f363a83d97b
+Size (ccid-1.3.8.tar.bz2) = 436222 bytes
+SHA1 (patch-aa) = 288ff7c1547de172995dd68c818528eb117aaa75
 SHA1 (patch-ab) = 13db7c54d6c45aa1cb61489a7f2b38f4155793cd
-SHA1 (patch-ac) = 8c6f47d173ccf3b7794e828b9f7887bf26920f44
 SHA1 (patch-ad) = 1eaae5649357cafbb7b612d45d4522bce7148f55
diff --git a/security/ccid/patches/patch-aa b/security/ccid/patches/patch-aa
index d1bb281a224..ad995ec84bb 100644
--- a/security/ccid/patches/patch-aa
+++ b/security/ccid/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.2 2008/04/30 13:32:21 shannonjr Exp $
+$NetBSD: patch-aa,v 1.3 2008/08/08 21:27:25 shannonjr Exp $
 
---- configure.in.orig	2008-02-22 06:42:28.000000000 -0700
+--- configure.in.orig	2008-06-27 03:47:16.000000000 -0600
 +++ configure.in
 @@ -94,6 +94,10 @@ case "$host" in
  	BUNDLE_HOST="FreeBSD"
@@ -13,8 +13,8 @@ $NetBSD: patch-aa,v 1.2 2008/04/30 13:32:21 shannonjr Exp $
  *-*-openbsd*)
  	BUNDLE_HOST="OpenBSD"
  	DYN_LIB_EXT="so.0.0"
-@@ -102,6 +106,10 @@ case "$host" in
- 	BUNDLE_HOST="Solaris"
+@@ -106,6 +110,10 @@ case "$host" in
+ 	BUNDLE_HOST="DragonFly"
  	DYN_LIB_EXT="so"
  	;;
 +*-*-dragonfly*)
@@ -24,19 +24,3 @@ $NetBSD: patch-aa,v 1.2 2008/04/30 13:32:21 shannonjr Exp $
  *)
  	BUNDLE_HOST="Linux"
  	DYN_LIB_EXT="so"
-@@ -251,12 +259,15 @@ AC_ARG_ENABLE(pcsclite,
- if test "${pcsclite}" != no ; then
- 	# check that pcsc-lite is installed
- 	OLD_LIBS="$LIBS"
-+	OLD_CFLAGS="$CFLAGS"
- 	LIBS="$LIBS $PCSC_LIBS"
-+	CFLAGS="$CFLAGS $PCSC_CFLAGS"
- 	AC_MSG_CHECKING([for SCardEstablishContext])
- 	AC_TRY_LINK_FUNC(SCardEstablishContext,
- 	    [ AC_MSG_RESULT([yes]) ],
- 		[ AC_MSG_ERROR([SCardEstablishContext() not found, install pcsc-lite 1.2.9-beta9 or later,or use PCSC_LIBS=...  ./configure]) ])
- 	LIBS="$OLD_LIBS"
-+	CFLAGS"$OLD_CFLAGS"
- 
- 	pcsclite=yes
- fi
diff --git a/security/ccid/patches/patch-ac b/security/ccid/patches/patch-ac
deleted file mode 100644
index 556456114d2..00000000000
--- a/security/ccid/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 2008/03/04 11:30:08 shannonjr Exp $
-
---- src/parse.c.orig	2008-02-06 01:26:23.000000000 -0700
-+++ src/parse.c
-@@ -151,7 +151,7 @@ static int ccid_parse_interface_descript
- {
- 	struct usb_interface_descriptor *usb_interface;
- 	unsigned char *extra;
--	unsigned char buffer[256*sizeof(int)];  /* maximum is 256 records */
-+	char buffer[256*sizeof(int)];  /* maximum is 256 records */
- 
- 	/*
- 	 * Vendor/model name