From toni@babylon.soth.at  Tue Aug 26 15:54:14 2003
Return-Path: <toni@babylon.soth.at>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 566B616A4BF
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 26 Aug 2003 15:54:14 -0700 (PDT)
Received: from babylon.soth.at (door.soth.at [80.110.102.19])
	by mx1.FreeBSD.org (Postfix) with ESMTP id E619C43FB1
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 26 Aug 2003 15:54:12 -0700 (PDT)
	(envelope-from toni@babylon.soth.at)
Received: from babylon.soth.at (localhost [127.0.0.1])
	by babylon.soth.at (8.12.9/8.12.9) with ESMTP id h7QMsBie000911;
	Wed, 27 Aug 2003 00:54:11 +0200 (CEST)
	(envelope-from toni@babylon.soth.at)
Received: (from toni@localhost)
	by babylon.soth.at (8.12.9/8.12.9/Submit) id h7QMs67P000910;
	Wed, 27 Aug 2003 00:54:06 +0200 (CEST)
Message-Id: <200308262254.h7QMs67P000910@babylon.soth.at>
Date: Wed, 27 Aug 2003 00:54:06 +0200 (CEST)
From: Toni Andjelkovic <toni@soth.at>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: Update of devel/pcsc-lite
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         56019
>Category:       ports
>Synopsis:       Update of devel/pcsc-lite
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Aug 26 16:00:32 PDT 2003
>Closed-Date:    Thu Sep 25 23:48:50 PDT 2003
>Last-Modified:  Thu Sep 25 23:48:50 PDT 2003
>Originator:     Toni Andjelkovic
>Release:        FreeBSD 5.1-RELEASE i386
>Organization:
>Environment:
System: FreeBSD babylon.soth.at 5.1-RELEASE FreeBSD 5.1-RELEASE #0: Thu Jun 5 02:55:42 GMT 2003 root@wv1u.btc.adaptec.com:/usr/obj/usr/src/sys/GENERIC i386

	
>Description:
	

Update to 1.2.0-rc1.

Please remove files/patch-src::configfile.c and patch-src::tokenparser.c.

>How-To-Repeat:
	
>Fix:

Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/devel/pcsc-lite/Makefile,v
retrieving revision 1.9
diff -u -r1.9 Makefile
--- Makefile	23 Jun 2003 13:18:17 -0000	1.9
+++ Makefile	26 Aug 2003 22:37:33 -0000
@@ -6,22 +6,21 @@
 #
 
 PORTNAME=	pcsc-lite
-PORTVERSION=	1.1.2.b.5
+PORTVERSION=	1.2.0-rc1
 CATEGORIES=	devel security
-MASTER_SITES=	http://alioth.debian.org/download.php/160/
-DISTNAME=	${PORTNAME}-${PORTVERSION:S/.b./beta/}
+MASTER_SITES=	http://alioth.debian.org/download.php/373/
 
 MAINTAINER=	toni@soth.at
 COMMENT=	A smartcard development library
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:S/.b.5//}
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
 
 INSTALLS_SHLIB=	yes
 CONFIGURE_ENV+=	PTHREAD_LIBS="${PTHREAD_LIBS}"
-CONFIGURE_ARGS+=--enable-debug \
+CONFIGURE_ARGS+=--prefix=${PREFIX} \
+		--enable-debug \
 		--enable-syslog \
 		--enable-runpid=/var/run/pcscd.pid \
 		--enable-ipcdir=/var/tmp/ \
@@ -33,6 +32,17 @@
 MAN1=		formaticc.1
 MAN8=		bundleTool.8 pcscd.8
 
+.if defined(WITH_USB)
+LIB_DEPENDS+=	usb-0.1.7:${PORTSDIR}/devel/libusb
+CONFIGURE_ARGS+=--enable-libusb=${PREFIX}
+.endif
+
+pre-everything::
+	@${ECHO_MSG}
+	@${ECHO_MSG} "pcsc-lite has the following option(s):"
+	@${ECHO_MSG} "  WITH_USB=yes            Enable USB support"
+	@${ECHO_MSG}
+
 post-install:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
@@ -40,6 +50,10 @@
 	${INSTALL_DATA} ${WRKSRC}/doc/pcsc-lite-0.8.7.pdf ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/muscle-api-1.3.0.pdf ${DOCSDIR}
 .endif
+	@${MKDIR} ${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/example/Makefile.am ${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/example/Makefile.in ${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/example/pcsc_demo.c ${EXAMPLESDIR}
 	@${MKDIR} ${PREFIX}/pcsc/drivers
 	@${MKDIR} ${PREFIX}/pcsc/services
 	${INSTALL_DATA} ${WRKSRC}/etc/reader.conf \
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/devel/pcsc-lite/distinfo,v
retrieving revision 1.7
diff -u -r1.7 distinfo
--- distinfo	23 Jun 2003 13:18:17 -0000	1.7
+++ distinfo	26 Aug 2003 22:37:33 -0000
@@ -1 +1 @@
-MD5 (pcsc-lite-1.1.2beta5.tar.gz) = 38791ef76bd0c731d26893317d24fe3b
+MD5 (pcsc-lite-1.2.0-rc1.tar.gz) = 540fc780d948dfcc087b8e79ea9063f6
Index: pkg-descr
===================================================================
RCS file: /home/ncvs/ports/devel/pcsc-lite/pkg-descr,v
retrieving revision 1.2
diff -u -r1.2 pkg-descr
--- pkg-descr	22 Mar 2002 04:01:21 -0000	1.2
+++ pkg-descr	26 Aug 2003 22:37:33 -0000
@@ -3,7 +3,9 @@
 operating systems.  Supports many types of serial, PCMCIA,
 and USB smartcard readers and cryptographic tokens. 
 Tested under Linux, Solaris 8, HPUX 11, OS X (10.1),
-OpenBSD, FreeBSD 4.
+OpenBSD, FreeBSD.
 
-Author: David Corcoran <corcoran@linuxnet.com>
-WWW:    http://www.linuxnet.com/middle.html
+Authors:	David Corcoran <corcoran@linuxnet.com>,
+		Ludovic Rousseau <ludovic.rousseau@free.fr>
+
+WWW:		http://alioth.debian.org/projects/pcsclite/
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/devel/pcsc-lite/pkg-plist,v
retrieving revision 1.5
diff -u -r1.5 pkg-plist
--- pkg-plist	23 Jun 2003 13:18:17 -0000	1.5
+++ pkg-plist	26 Aug 2003 22:37:34 -0000
@@ -1,9 +1,13 @@
 bin/bundleTool
 bin/formaticc
 bin/installifd
+bin/pcsc_demo
 %%PORTDOCS%%share/doc/pcsc-lite/README.DAEMON
 %%PORTDOCS%%share/doc/pcsc-lite/pcsc-lite-0.8.7.pdf
 %%PORTDOCS%%share/doc/pcsc-lite/muscle-api-1.3.0.pdf
+share/examples/pcsc-lite/Makefile.am
+share/examples/pcsc-lite/Makefile.in
+share/examples/pcsc-lite/pcsc_demo.c
 etc/rc.d/pcscd.sh.sample
 etc/reader.conf.sample
 include/debuglog.h
@@ -15,8 +19,11 @@
 lib/libpcsclite.a
 lib/libpcsclite.so
 lib/libpcsclite.so.0
+lib/pkgconfig/libpcsclite.pc
 sbin/pcscd
 %%PORTDOCS%%@dirrm share/doc/pcsc-lite
+@dirrm share/examples/pcsc-lite
+@dirrm lib/pkgconfig
 @dirrm pcsc/drivers
 @dirrm pcsc/services
 @dirrm pcsc
Index: files/patch-ltmain.sh
===================================================================
RCS file: /home/ncvs/ports/devel/pcsc-lite/files/patch-ltmain.sh,v
retrieving revision 1.2
diff -u -r1.2 patch-ltmain.sh
--- files/patch-ltmain.sh	19 May 2003 01:36:53 -0000	1.2
+++ files/patch-ltmain.sh	26 Aug 2003 22:37:34 -0000
@@ -2,15 +2,15 @@
 
 --- build/ltmain.sh	2001/08/27 09:51:26	1.1
 +++ build/ltmain.sh	2001/08/27 09:51:42
-@@ -1072,7 +1072,7 @@
+@@ -1278,7 +1278,7 @@
  	  esac
- 	 elif test "X$arg" = "X-lc_r"; then
- 	  case $host in
+ 	elif test "X$arg" = "X-lc_r"; then
+ 	 case $host in
 -	 *-*-openbsd* | *-*-freebsd*)
 +	 *-*-openbsd*)
- 	    # Do not include libc_r directly, use -pthread flag.
- 	    continue
- 	    ;;
+ 	   # Do not include libc_r directly, use -pthread flag.
+ 	   continue
+ 	   ;;
 @@ -2408,6 +2408,9 @@
  	  *-*-netbsd*)
  	    # Don't link with libc until the a.out ld.so is fixed.
Index: files/patch-src::configfile.c
===================================================================
RCS file: /home/ncvs/ports/devel/pcsc-lite/files/patch-src::configfile.c,v
retrieving revision 1.1
diff -u -r1.1 patch-src::configfile.c
--- files/patch-src::configfile.c	24 Jun 2003 12:00:36 -0000	1.1
+++ files/patch-src::configfile.c	26 Aug 2003 22:37:34 -0000
@@ -1,12 +0,0 @@
---- src/configfile.c.bak	Sun Jun  1 23:43:39 2003
-+++ src/configfile.c	Sun Jun  1 23:43:59 2003
-@@ -20,7 +20,9 @@
- #include <string.h>
- #include <errno.h>
- #include <stdlib.h>
-+#ifdef HAVE_STDINT_H
- #include <stdint.h> /* May break IA64 test-noansi-r */
-+#endif
- 
- /* end standard C headers. */
- 
Index: files/patch-src::tokenparser.c
===================================================================
RCS file: /home/ncvs/ports/devel/pcsc-lite/files/patch-src::tokenparser.c,v
retrieving revision 1.1
diff -u -r1.1 patch-src::tokenparser.c
--- files/patch-src::tokenparser.c	24 Jun 2003 12:00:36 -0000	1.1
+++ files/patch-src::tokenparser.c	26 Aug 2003 22:37:34 -0000
@@ -1,12 +0,0 @@
---- src/tokenparser.c.bak	Sun Jun  1 23:44:13 2003
-+++ src/tokenparser.c	Sun Jun  1 23:44:31 2003
-@@ -20,7 +20,9 @@
- #include <string.h>
- #include <errno.h>
- #include <stdlib.h>
-+#ifdef HAVE_STDINT_H
- #include <stdint.h> /* May break IA64 test-noansi-r */
-+#endif
- 
- /* end standard C headers. */
- 
>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->closed 
State-Changed-By: daichi 
State-Changed-When: Thu Sep 25 23:48:41 PDT 2003 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=56019 
>Unformatted:
