ports/147001: Update port: devel/libccid

[Peter Thoenen]

>Number:         147001
>Category:       ports
>Synopsis:       Update port: devel/libccid
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Wed May 26 05:07:37 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator:     Peter Thoenen
>Release:        8.0-STABLE
>Organization:
>Environment:
FreeBSD PRH-W-PTHOENEN1 8.0-STABLE FreeBSD 8.0-STABLE #3: Mon May  3 17:25:33 HST 2010     peter.thoenen at PRH-W-PTHOENEN1:/usr/obj/usr/src/sys/NOAA  amd64
>Description:
Update port to 1.3.12.  Remove FreeBSD USB specific patches as this was fixed in 1.3.12.  Also going to update pcsc-lite to 1.6 (different PR) as it is required by 1.3.12.  Problem with submitted PR is not sure how to check for pcsc-lite >= 1.6 and ensure it's upgraded prior to libccid; might require a ports/UPDATING entry.
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -ruN libccid.orig/Makefile libccid/Makefile
--- libccid.orig/Makefile	2010-05-25 14:02:16.590099175 -1000
+++ libccid/Makefile	2010-05-25 15:05:20.759479641 -1000
@@ -5,9 +5,9 @@
 # $FreeBSD: ports/devel/libccid/Makefile,v 1.22 2009/10/17 12:49:38 arved Exp $
 
 PORTNAME=	ccid
-PORTVERSION=	1.3.11
+PORTVERSION=	1.3.12
 CATEGORIES=	devel
-MASTER_SITES=	http://alioth.debian.org/frs/download.php/3080/
+MASTER_SITES=	http://alioth.debian.org/frs/download.php/3281/
 
 MAINTAINER=	arved at FreeBSD.org
 COMMENT=	Generic USB CCID (Chip/Smart Card Interface Devices) driver
@@ -19,15 +19,17 @@
 USE_PERL5_BUILD=yes
 CONFIGURE_ARGS=	--enable-usbdropdir=${PREFIX}/lib/pcsc/drivers \
 		--enable-ccidtwindir=${PREFIX}/lib/pcsc/drivers/serial \
-		--enable-udev 
+		--enable-udev
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
 		LDFLAGS="${LDFLAGS} ${PTHREAD_LIBS}" \
 		LIBUSB_CFLAGS="-I${LOCALBASE}/include" \
 		LIBUSB_LIBS="-L${LOCALBASE}/lib -lusb"
 
 PLIST_SUB=	VER=${PORTVERSION}
+.if !defined(NOPORTDOCS)
 MAN1=		RSA_SecurID_getpasswd.1
 MAN8=		Kobil_mIDentity_switch.8
+.endif
 
 .include <bsd.port.pre.mk>
 
diff -ruN libccid.orig/distinfo libccid/distinfo
--- libccid.orig/distinfo	2010-05-25 14:02:16.590099175 -1000
+++ libccid/distinfo	2010-05-25 14:32:55.217771966 -1000
@@ -1,3 +1,3 @@
-MD5 (ccid-1.3.11.tar.bz2) = 727dc7eb4d560f81fe70a766a96de970
-SHA256 (ccid-1.3.11.tar.bz2) = f7bf5a82b02aff7d709a45dcc6109105508625caf92e34da4140b7c84d498906
-SIZE (ccid-1.3.11.tar.bz2) = 418017
+MD5 (ccid-1.3.12.tar.bz2) = 7fcdbacacd955659286f988fa9b6e0be
+SHA256 (ccid-1.3.12.tar.bz2) = caa1badbb530e109aa767c51d304659a510d427aaa26bd329bed693751b1e38b
+SIZE (ccid-1.3.12.tar.bz2) = 425496
diff -ruN libccid.orig/files/patch-src_ccid_usb.c libccid/files/patch-src_ccid_usb.c
--- libccid.orig/files/patch-src_ccid_usb.c	2010-05-25 14:02:16.590099175 -1000
+++ libccid/files/patch-src_ccid_usb.c	1969-12-31 14:00:00.000000000 -1000
@@ -1,11 +0,0 @@
---- src/ccid_usb.c.orig	2009-03-07 20:05:04.000000000 +0300
-+++ src/ccid_usb.c	2009-03-07 20:09:14.000000000 +0300
-@@ -56,6 +56,8 @@
- 
- #define BUS_DEVICE_STRSIZE 32
- 
-+EXTERNAL struct usb_interface * get_ccid_usb_interface(struct usb_device *dev, int *num);
-+
- typedef struct
- {
- 	usb_dev_handle *handle;
diff -ruN libccid.orig/files/patch-src_parse.c libccid/files/patch-src_parse.c
--- libccid.orig/files/patch-src_parse.c	2010-05-25 14:02:16.589098489 -1000
+++ libccid/files/patch-src_parse.c	1969-12-31 14:00:00.000000000 -1000
@@ -1,10 +0,0 @@
---- src/parse.c.orig	2009-04-02 17:52:07.000000000 +0200
-+++ src/parse.c	2009-10-17 13:17:25.000000000 +0200
-@@ -46,6 +46,7 @@
- 
- static int ccid_parse_interface_descriptor(usb_dev_handle *handle,
- 	struct usb_device *dev, int num);
-+struct usb_interface * get_ccid_usb_interface(struct usb_device *dev, int *num);
- 
- 
- /*****************************************************************************
diff -ruN libccid.orig/pkg-plist libccid/pkg-plist
--- libccid.orig/pkg-plist	2010-05-25 14:02:16.591099023 -1000
+++ libccid/pkg-plist	2010-05-25 14:59:53.879471148 -1000
@@ -1,11 +1,12 @@
 bin/RSA_SecurID_getpasswd
-sbin/Kobil_mIDentity_switch
-lib/pcsc/drivers/ifd-ccid.bundle/Contents/FreeBSD/libccid.so.%%VER%%
 lib/pcsc/drivers/ifd-ccid.bundle/Contents/FreeBSD/libccid.so
+lib/pcsc/drivers/ifd-ccid.bundle/Contents/FreeBSD/libccid.so.%%VER%%
 lib/pcsc/drivers/ifd-ccid.bundle/Contents/Info.plist
-share/doc/ccid/README_Kobil_mIDentity_switch.txt
- at dirrm share/doc/ccid
+sbin/Kobil_mIDentity_switch
+%%PORTDOCS%%%%DOCSDIR%%/README_Kobil_mIDentity_switch.txt
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm lib/pcsc/drivers/ifd-ccid.bundle/Contents/FreeBSD
 @dirrm lib/pcsc/drivers/ifd-ccid.bundle/Contents
 @dirrm lib/pcsc/drivers/ifd-ccid.bundle
- at dirrmtry lib/pcsc/drivers
+ at dirrm lib/pcsc/drivers
+ at dirrm lib/pcsc


>Release-Note:
>Audit-Trail:
>Unformatted: