Re: pkg/39315

Update to 1.4.102. Patches ag and ah are deleted because they are no
longer required (change included in unmodified system).

6 files changed, 24 insertions, 49 deletions

diff --git a/security/pcsc-lite/Makefile b/security/pcsc-lite/Makefile
index 0325e076ae1..33c7356daad 100644
--- a/security/pcsc-lite/Makefile
+++ b/security/pcsc-lite/Makefile
@@ -1,12 +1,13 @@
-# $NetBSD: Makefile,v 1.2 2008/06/12 02:14:44 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2008/08/08 21:25:48 shannonjr Exp $
 #
 
-DISTNAME=	pcsc-lite-1.4.99
+DISTNAME=	pcsc-lite-1.4.102
 CATEGORIES=	security
-MASTER_SITES=	http://alioth.debian.org/frs/download.php/2257/
+MASTER_SITES=	http://alioth.debian.org/frs/download.php/2479/
+EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	shannonjr@NetBSD.org
-HOMEPAGE=	http://alioth.debian.org/frs/download.php/2257/
+HOMEPAGE=	http://pcsclite.alioth.debian.org/
 COMMENT=	Middleware to access a smart card using SCard API (PC/SC).
 
 PKG_DESTDIR_SUPPORT=	user-destdir
@@ -25,6 +26,7 @@ CONFIGURE_ARGS+=	--sharedstatedir=${VARBASE:Q}
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
 CONFIGURE_ARGS+=	--enable-ipcdir=${VARBASE}/pcsc-lite
 CONFIGURE_ARGS+=	--enable-usbdropdir=${PREFIX}/lib/pcsc-lite/drivers
+CONFIGURE_ARGS+=	--disable-libhal
 MAKE_DIRS+=		${VARBASE}/pcsc-lite
 MAKE_DIRS+=		${PREFIX}/lib/pcsc-lite
 MAKE_DIRS+=		${PREFIX}/lib/pcsc-lite/drivers
diff --git a/security/pcsc-lite/distinfo b/security/pcsc-lite/distinfo
index c5d585aed43..faa2ffe9597 100644
--- a/security/pcsc-lite/distinfo
+++ b/security/pcsc-lite/distinfo
@@ -1,13 +1,11 @@
-$NetBSD: distinfo,v 1.2 2008/04/30 13:34:28 shannonjr Exp $
+$NetBSD: distinfo,v 1.3 2008/08/08 21:25:48 shannonjr Exp $
 
-SHA1 (pcsc-lite-1.4.99.tar.gz) = 7f5ff7d8e187c1d46f3bc26567d393107ac0e362
-RMD160 (pcsc-lite-1.4.99.tar.gz) = 689d99ae26a13dc78856670b0deafbd5fed517ab
-Size (pcsc-lite-1.4.99.tar.gz) = 637727 bytes
+SHA1 (pcsc-lite-1.4.102.tar.bz2) = bd7cf389e99de0960cc0b21758a4ca65eb8b65ac
+RMD160 (pcsc-lite-1.4.102.tar.bz2) = a99730a937515885200f71d36cfdf1c2ff6768ce
+Size (pcsc-lite-1.4.102.tar.bz2) = 460324 bytes
 SHA1 (patch-aa) = d58fa48e3778f5dc07fcc8234c9b8aa064a498db
-SHA1 (patch-ab) = 61bf6dbc2b245e888cbb561dae0a380b14bb1700
-SHA1 (patch-ac) = 4404dec1418df59baafdc5c45fae9dc810418991
+SHA1 (patch-ab) = 40437e4db3295318942f292dcfc7dc7a59b5c77e
+SHA1 (patch-ac) = dfeb4bb8eef71e161ee5738d4640a00888a43b49
 SHA1 (patch-ad) = 3172e6063cc48b1302d08865cd8e9039b502a807
 SHA1 (patch-ae) = 79978e1a6e1b6cd11ba4411e69bbf6f7d83c90ae
 SHA1 (patch-af) = 931c031eba226336ceb1c12bc2ffd9193cb24e44
-SHA1 (patch-ag) = 3b404ecb91d976989969803577410f61d40aab73
-SHA1 (patch-ah) = 3335320a7005644baca1fbf58985e2e8099ef728
diff --git a/security/pcsc-lite/patches/patch-ab b/security/pcsc-lite/patches/patch-ab
index 191b7a3e729..302e7112419 100644
--- a/security/pcsc-lite/patches/patch-ab
+++ b/security/pcsc-lite/patches/patch-ab
@@ -1,10 +1,11 @@
-$NetBSD: patch-ab,v 1.1.1.1 2008/03/04 11:29:08 shannonjr Exp $
+$NetBSD: patch-ab,v 1.2 2008/08/08 21:25:49 shannonjr Exp $
 
---- src/Makefile.am.orig	2007-10-13 15:21:11.000000000 -0600
-+++ src/Makefile.am
-@@ -150,3 +150,5 @@ tokenparser.c: tokenparser.l
+--- src/Makefile.am.orig	2008-05-21 09:58:33 +0300
++++ src/Makefile.am	2008-08-07 22:16:36 +0300
+@@ -152,3 +152,6 @@ tokenparser.c: tokenparser.l
  
- EXTRA_DIST = README_INTERNALS.txt dyn_win32.c thread_win32.c winscard_scf.c
+ EXTRA_DIST = README_INTERNALS.txt winscard_scf.c
  
 +install-data-local:
 +	${INSTALL} -d ${DESTDIR}${includedir}/PCSC
++
diff --git a/security/pcsc-lite/patches/patch-ac b/security/pcsc-lite/patches/patch-ac
index 03330e43be1..614407a8e45 100644
--- a/security/pcsc-lite/patches/patch-ac
+++ b/security/pcsc-lite/patches/patch-ac
@@ -1,12 +1,12 @@
-$NetBSD: patch-ac,v 1.1.1.1 2008/03/04 11:29:08 shannonjr Exp $
+$NetBSD: patch-ac,v 1.2 2008/08/08 21:25:49 shannonjr Exp $
 
---- Makefile.am.orig	2007-10-13 15:21:11.000000000 -0600
-+++ Makefile.am
+--- Makefile.am.orig	2008-05-21 09:58:30 +0300
++++ Makefile.am	2008-08-07 22:20:34 +0300
 @@ -1,6 +1,6 @@
- # Process this file with automake to create Makefile.in.
+ AUTOMAKE_OPTIONS = dist-bzip2
  
--SUBDIRS = m4 win32 src etc doc
-+SUBDIRS = m4 win32 src doc
+-SUBDIRS = m4 src etc doc
++SUBDIRS = m4 src doc
  
  ACLOCAL_AMFLAGS = -I m4
  
diff --git a/security/pcsc-lite/patches/patch-ag b/security/pcsc-lite/patches/patch-ag
deleted file mode 100644
index f8489cc7d0a..00000000000
--- a/security/pcsc-lite/patches/patch-ag
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2008/04/30 13:34:28 shannonjr Exp $
-
---- src/hotplug_libusb.c.orig	2007-10-13 15:21:11.000000000 -0600
-+++ src/hotplug_libusb.c
-@@ -313,7 +313,7 @@ void HPRescanUsbBus(void)
- 	 */
- 	for (i=0; i<PCSCLITE_MAX_READERS_CONTEXTS; i++)
- 	{
--#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__)
-+#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
- 		int fd;
- 		char filename[BUS_DEVICE_STRSIZE];
- 
diff --git a/security/pcsc-lite/patches/patch-ah b/security/pcsc-lite/patches/patch-ah
deleted file mode 100644
index a708ad94a4a..00000000000
--- a/security/pcsc-lite/patches/patch-ah
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ah,v 1.1 2008/04/30 13:34:28 shannonjr Exp $
-
---- src/winscard_msg_srv.c.orig	2007-10-13 15:21:11.000000000 -0600
-+++ src/winscard_msg_srv.c
-@@ -165,7 +165,7 @@ INTERNAL int SHMInitializeCommonSegment(
-  * @retval -1 Can not set the connection to non-blocking mode.
-  * @retval 2 Timeout.
-  */
--#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__)
-+#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
- #define DO_TIMEOUT
- #endif
- INTERNAL int32_t SHMProcessEventsServer(uint32_t *pdwClientID, int32_t blocktime)