pcsc-lite:

- Upgrade to 1.2.9.b.7
- Use libtool15
- make hier(7)-compliant by moving the pcsc/drivers to lib/pcsc/drivers
- Compile with USB support per default. Use WITHOUT_USB to disable usb
  support
- Chase libusb shared library version (Forgotten by leeym)

Based on:	PR 76068
Reviewed by:	maintainer, sem (earlier patch)

ifd-devkit:
- Chase pcsclite sharedlibrary version

ifd-gempc410:
- Unbreak by updating to 0.9.3
- Move library to lib/pcsc/drivers
- Chase pcsclite sharedlibrary version
  NOTE: This was not tested, I don't own the specific hardware

ifd-gpr400:
- Chase pcsclite sharedlibrary version
- Fix build with new pcsc-lite
- Chase new pcsclite drivers location

ifd-slb_rf60:
- Chase pcsclite sharedlibrary version

ifd-test:
- Chase pcsclite sharedlibrary version
- Fix build with new pcsclite

libchipcard:
- Update to 0.9.1[1]
- Chase pcsclite shared library version
- Fix build with new pcsclite

[1]PR:			78815
[1]Submitted by:	lofi

opensc:
- Chase pcsclite shared library version
- Fix build on CURRENT

opensc-esteid
- Chase pcsclite shared library version
- Fix build with new pcsclite

p5-PCSC-Card:
- Update to 1.4.2
- Chase pcsclite shared library version
- Fix build with new pcsclite

ruby-pcsc-lite
- Mark broken, does not compile with new pcsc-lite
  Maintainer will work on new version

Submitted by:	maintainer

11 files changed, 79 insertions, 64 deletions

diff --git a/security/ifd-devkit/Makefile b/security/ifd-devkit/Makefile
index 3dd96c6ef6c3..f3dad41219eb 100644
--- a/security/ifd-devkit/Makefile
+++ b/security/ifd-devkit/Makefile
@@ -7,13 +7,14 @@
 
 PORTNAME=	ifd-devkit
 PORTVERSION=	1.0.0
+PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	http://www.linuxnet.com/drivers/readers/files/
 
 MAINTAINER=	bms@FreeBSD.org
 COMMENT=	IFD Handler Developer's Kit for MUSCLE PC/SC Lite
 
-LIB_DEPENDS=	pcsclite.0:${PORTSDIR}/devel/pcsc-lite
+LIB_DEPENDS=	pcsclite.1:${PORTSDIR}/devel/pcsc-lite
 
 INSTALLS_SHLIB= yes
 
diff --git a/security/ifd-gempc410/Makefile b/security/ifd-gempc410/Makefile
index ef59cc040603..964d8326178c 100644
--- a/security/ifd-gempc410/Makefile
+++ b/security/ifd-gempc410/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	ifd-gempc410
-PORTVERSION=	0.8.2
-PORTREVISION=	1
+PORTVERSION=	0.9.3
 CATEGORIES=	security
 MASTER_SITES=	http://ludovic.rousseau.free.fr/softwares/ifd-GemPC/
 DISTNAME=	ifd-gempc-${PORTVERSION}
@@ -16,9 +15,7 @@ MAINTAINER=	des@freebsd.org
 COMMENT=	PC/SC Lite driver for the GemPC 410 serial smart card reader
 
 BUILD_DEPENDS=	${LOCALBASE}/include/ifdhandler.h:${PORTSDIR}/security/ifd-devkit
-LIB_DEPENDS=	pcsclite.0:${PORTSDIR}/devel/pcsc-lite
-
-BROKEN=		"Does not fetch"
+LIB_DEPENDS=	pcsclite.1:${PORTSDIR}/devel/pcsc-lite
 
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
@@ -38,6 +35,11 @@ post-configure:
 	${SED} -e 's|%%PREFIX%%|${PREFIX}|g' <${FILESDIR}/message >${PKGMESSAGE}
 	${TOUCH} ${WRKSRC}/GemPC410/dep_stamp ${WRKSRC}/common/dep_stamp
 
+do-install:
+	${MKDIR} ${PREFIX}/lib/pcsc/drivers/serial
+	${INSTALL_DATA} ${WRKSRC}/GemPC410/libGemPC410.so* \
+		${PREFIX}/lib/pcsc/drivers/serial
+
 post-install:
 	@${CAT} ${PKGMESSAGE}
 
diff --git a/security/ifd-gempc410/distinfo b/security/ifd-gempc410/distinfo
index 4b68e086004a..d377f1c7021c 100644
--- a/security/ifd-gempc410/distinfo
+++ b/security/ifd-gempc410/distinfo
@@ -1,2 +1,2 @@
-MD5 (ifd-gempc-0.8.2.tar.gz) = 4d8789efb4dfab288bd1be5e82c7da42
-SIZE (ifd-gempc-0.8.2.tar.gz) = 301986
+MD5 (ifd-gempc-0.9.3.tar.gz) = 4ec32085972f365b1a115e653b04bcf6
+SIZE (ifd-gempc-0.9.3.tar.gz) = 301817
diff --git a/security/ifd-gempc410/files/patch-GemPC410::gbpserial.c b/security/ifd-gempc410/files/patch-GemPC410::gbpserial.c
deleted file mode 100644
index 7e90bd73b5b2..000000000000
--- a/security/ifd-gempc410/files/patch-GemPC410::gbpserial.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- GemPC410/gbpserial.c.orig	Tue May 13 16:49:38 2003
-+++ GemPC410/gbpserial.c	Tue May 13 16:53:04 2003
-@@ -410,7 +410,7 @@
- 		return STATUS_UNSUCCESSFUL;
- 	}
- 
--	sprintf(dev_name, "/dev/pcsc/%d", (int) channel);
-+	sprintf(dev_name, "/dev/cuaa%d", (int) channel);
- 
- 	/* check if the same channel is not already used */
- 	for (i=0; i<PCSCLITE_MAX_CHANNELS; i++)
diff --git a/security/ifd-gempc410/pkg-plist b/security/ifd-gempc410/pkg-plist
index 6a3448fb96c6..882423e2d78d 100644
--- a/security/ifd-gempc410/pkg-plist
+++ b/security/ifd-gempc410/pkg-plist
@@ -1,3 +1,4 @@
-lib/libGemPC410.so
-lib/libGemPC410.so.0
-lib/libGemPC410.so.0.8.2
+lib/pcsc/drivers/serial/libGemPC410.so
+lib/pcsc/drivers/serial/libGemPC410.so.0
+lib/pcsc/drivers/serial/libGemPC410.so.0.9.3
+@dirrm lib/pcsc/drivers/serial
diff --git a/security/ifd-gpr400/Makefile b/security/ifd-gpr400/Makefile
index c130e86d696f..a3268b384adc 100644
--- a/security/ifd-gpr400/Makefile
+++ b/security/ifd-gpr400/Makefile
@@ -14,7 +14,7 @@ MAINTAINER=	bms@FreeBSD.org
 COMMENT=	PC/SC Lite driver for Gemplus GPR400 PCMCIA Smart Card Readers
 
 BUILD_DEPENDS=	${LOCALBASE}/include/ifdhandler.h:${PORTSDIR}/security/ifd-devkit
-LIB_DEPENDS=	pcsclite.0:${PORTSDIR}/devel/pcsc-lite
+LIB_DEPENDS=	pcsclite.1:${PORTSDIR}/devel/pcsc-lite
 
 MAKE_ENV+=	DESTDIR="${PREFIX}"
 
diff --git a/security/ifd-gpr400/files/patch-Makefile b/security/ifd-gpr400/files/patch-Makefile
index 08bead01bc8f..2fe1fd689fe1 100644
--- a/security/ifd-gpr400/files/patch-Makefile
+++ b/security/ifd-gpr400/files/patch-Makefile
@@ -1,6 +1,6 @@
---- Makefile.orig	Thu Aug  9 06:14:42 2001
-+++ Makefile	Sun Sep  8 18:11:11 2002
-@@ -1,36 +1,41 @@
+--- Makefile.orig	Thu Aug  9 07:14:42 2001
++++ Makefile	Mon Apr 11 21:07:03 2005
+@@ -1,36 +1,39 @@
 -# GPR400 IFD Handler Makefile
 -# 
 -# Author: Joe Phillips <joe.phillips@innovationsw.com>
@@ -16,32 +16,43 @@
 -LEX      = flex
 -OBJ     := $(filter-out test.o, $(patsubst %.c,%.o,$(wildcard *.c)))
 -INCLUDE  = -I.
-+#XXX
-+PREFIX?=	/usr/local
 +DESTDIR?=	${PREFIX}
-+
+ 
+-MAKEXE   = make
+-LIBNAME  = libgpr400_ifd.so
+-PREFIX   = /usr/local/pcsc
 +# XXX
 +LIBDIR=		/lib
 +#LIBDIR=		/pcsc
 +INCSDIR=	/include
-+
+ 
+-DEFS     = -DPCSC_DEBUG=1 #-DATR_DEBUG=1
 +SHLIB_NAME=	libgpr400_ifd.so
 +SHLIB_MAJOR=	0
 +SHLIB_MINOR=	3
-+
+ 
+-all: unix
 +NOMAN=		1
 +NOPROFILE=	1
-+
+ 
+-clean:
+-	rm -f *.o $(LIBNAME) core
 +.if !defined(NO_DEBUG)
 +CFLAGS+=	-g -Wall
 +.endif
-+
+ 
+-osx: $(OBJ)
+-	$(CC) -dynamiclib $(OBJ) -o $(LIBNAME)
 +GPRDEVNAME?=	/dev/gprsc0
-+
-+CFLAGS+=	-I. -I${DESTDIR}${INCSDIR} -DGPRDEVNAME=\"${GPRDEVNAME}\"
+ 
+-unix: $(OBJ)
+-	$(LD) -shared $(OBJ) -o $(LIBNAME)
++CFLAGS+=	-I. -I${DESTDIR}${INCSDIR}/PCSC -I${DESTDIR}${INCSDIR} -DGPRDEVNAME=\"${GPRDEVNAME}\"
 +LDFLAGS+=	-L${DESTDIR}/lib
 +LDADD+=		-lpcsclite
-+
+ 
+-$(patsubst %.c,%.o,$(wildcard *.c)) : %.o : %.c
+-	$(CC) $(CFLAGS) -c $< $(INCLUDE) $(DEFS)
 +.if !defined(NO_PCSC_DEBUG)
 +CFLAGS+=	-DPCSC_DEBUG=1
 +.if defined(PCSC_ATR_DEBUG)
@@ -49,27 +60,8 @@
 +.endif
 +.endif
  
--MAKEXE   = make
--LIBNAME  = libgpr400_ifd.so
--PREFIX   = /usr/local/pcsc
+-##
 +SRCS=	gpr400_ifd.c
 +INCS=	gpr400.h
- 
--DEFS     = -DPCSC_DEBUG=1 #-DATR_DEBUG=1
--
--all: unix
--
--clean:
--	rm -f *.o $(LIBNAME) core
--
--osx: $(OBJ)
--	$(CC) -dynamiclib $(OBJ) -o $(LIBNAME)
--
--unix: $(OBJ)
--	$(LD) -shared $(OBJ) -o $(LIBNAME)
--
--$(patsubst %.c,%.o,$(wildcard *.c)) : %.o : %.c
--	$(CC) $(CFLAGS) -c $< $(INCLUDE) $(DEFS)
--
--##
++
 +.include <bsd.lib.mk>
diff --git a/security/ifd-gpr400/files/patch-gpr400_ifd.c b/security/ifd-gpr400/files/patch-gpr400_ifd.c
index ff08a8b8f152..eab88a809cfc 100644
--- a/security/ifd-gpr400/files/patch-gpr400_ifd.c
+++ b/security/ifd-gpr400/files/patch-gpr400_ifd.c
@@ -1,5 +1,5 @@
---- gpr400_ifd.c.orig	Wed Aug 22 03:21:43 2001
-+++ gpr400_ifd.c	Sun Sep  8 18:10:47 2002
+--- gpr400_ifd.c.orig	Wed Aug 22 04:21:43 2001
++++ gpr400_ifd.c	Mon Apr 11 21:09:23 2005
 @@ -77,7 +77,7 @@
  	printf("IFDHCreateChannel:\n");
  #endif
@@ -9,3 +9,20 @@
          if(gpr_fd < 0){
              return IFD_COMMUNICATION_ERROR;
          }
+@@ -597,16 +597,6 @@
+      RxLength should be zero on error.
+  *
+  **/
+-RESPONSECODE IFDHControl ( DWORD Lun, PUCHAR TxBuffer, 
+-			 DWORD TxLength, PUCHAR RxBuffer, 
+-			 PDWORD RxLength ) 
+-{
+-#ifdef PCSC_DEBUG
+-	printf("IFDHControl:\n");
+-#endif
+-    return IFD_NOT_SUPPORTED;
+-
+-}/* IFDHControl */
+ 
+ /**
+  * check if there is a smartcard in the reader
diff --git a/security/ifd-slb_rf60/Makefile b/security/ifd-slb_rf60/Makefile
index 8bc90ff510e8..f6d21fa3b084 100644
--- a/security/ifd-slb_rf60/Makefile
+++ b/security/ifd-slb_rf60/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	ifd-slb_rf60
 PORTVERSION=	2.2.0
+PORTREVISION=	1
 CATEGORIES=	security devel
 MASTER_SITES=	http://www.linuxnet.com/drivers/readers/files/
 DISTNAME=	${PORTNAME:S/^ifd-//}-drv-${PORTVERSION}
@@ -14,7 +15,7 @@ DISTNAME=	${PORTNAME:S/^ifd-//}-drv-${PORTVERSION}
 MAINTAINER=	toni@soth.at
 COMMENT=	PC/SC Lite driver for the Reflex 62 serial smart card reader
 
-LIB_DEPENDS=	pcsclite.0:${PORTSDIR}/devel/pcsc-lite
+LIB_DEPENDS=	pcsclite.1:${PORTSDIR}/devel/pcsc-lite
 
 USE_GMAKE=	yes
 
diff --git a/security/opensc-esteid/Makefile b/security/opensc-esteid/Makefile
index a218c86ba699..b3bced8a409b 100644
--- a/security/opensc-esteid/Makefile
+++ b/security/opensc-esteid/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	esteid
 PORTVERSION=	0.7.0.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security devel
 MASTER_SITES=	http://marie.vtl.ee/esteid/
 PKGNAMEPREFIX=	opensc-
@@ -16,7 +16,7 @@ DISTNAME=	opensc-esteid-0.7.0-1
 MAINTAINER=	hadara@bsd.ee
 COMMENT=	ISO 7816 Smartcard API Library (OpenSSH Compatible)
 
-LIB_DEPENDS=	pcsclite.0:${PORTSDIR}/devel/pcsc-lite
+LIB_DEPENDS=	pcsclite.1:${PORTSDIR}/devel/pcsc-lite
 
 USE_OPENLDAP=	yes
 INSTALLS_SHLIB=	yes
@@ -28,16 +28,21 @@ CONFIGURE_ARGS=	--with-pcsclite=${LOCALBASE}    \
 		--with-ldap-lib=openldap        \
 		--with-ldap-dir=${LOCALBASE}    \
 		--with-plugin-dir=${LOCALBASE}/share/opensc/plugins
+CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include/PCSC"
+USE_REINPLACE=	yes
 
 MAN1=		pkcs15-crypt.1 pkcs15-init.1 pkcs15-tool.1 \
 		cryptoflex-tool.1 \
 		opensc-config.1 opensc-explorer.1 opensc-tool.1
 MAN5=		pkcs15-profile.5
 MAN7=		pkcs15.7 opensc.7
+
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "amd64"
 BROKEN=		"Does not compile on amd64 (missing -fPIC)"
 .endif
 
+post-patch:
+	${REINPLACE_CMD} -e "s,LPCSTR,LPCTSTR," ${WRKSRC}/src/libopensc/reader-pcsc.c
 .include <bsd.port.post.mk>
diff --git a/security/opensc/Makefile b/security/opensc/Makefile
index 5327e279d234..fd51ad1aa2c9 100644
--- a/security/opensc/Makefile
+++ b/security/opensc/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	opensc
 PORTVERSION=	0.9.4
+PORTREVSION=	1
 CATEGORIES=	security devel
 MASTER_SITES=	http://www.opensc.org/files/
 
@@ -19,6 +20,7 @@ USE_OPENSSL=	yes
 USE_GMAKE=	yes
 USE_LIBTOOL_VER=	15
 GNU_CONFIGURE=	yes
+USE_REINPLACE=	yes
 
 MANCOMPRESSED=	no
 MAN1=	pkcs15-crypt.1 pkcs15-init.1 pkcs15-tool.1 opensc-tool.1 \
@@ -47,7 +49,7 @@ CONFIGURE_ARGS+=	--with-pam
 .endif
 
 .if !defined(WITHOUT_PCSC_LITE)
-LIB_DEPENDS+=		pcsclite.0:${PORTSDIR}/devel/pcsc-lite
+LIB_DEPENDS+=		pcsclite.1:${PORTSDIR}/devel/pcsc-lite
 CONFIGURE_ARGS+=	--with-pcsclite=${LOCALBASE}
 .endif
 
@@ -84,4 +86,9 @@ CONFIGURE_ARGS+=	--without-docbook
 CONFIGURE_ARGS+=	--with-openct=${LOCALBASE}
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+post-patch:
+	${REINPLACE_CMD} -e "s,ulong,u_long," ${WRKSRC}/src/openscd/openscd.c
+
+.include <bsd.port.post.mk>