ports/76091: Update of security/ifd-slb_60

[Toni Andjelkovic]

>Number:         76091
>Category:       ports
>Synopsis:       Update of security/ifd-slb_60
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Jan 11 10:20:14 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     Toni Andjelkovic
>Release:        FreeBSD 6.0-CURRENT i386
>Organization:
>Environment:

System: FreeBSD server.soth.at 6.0-CURRENT FreeBSD 6.0-CURRENT #0: Wed Dec 15 09:39:26 CET 2004 root at server.soth.at:/usr/obj/usr/src/sys/GENERIC i386

>Description:

Fix build on AMD64. Adapt to the recent pcsc-lite update.

>How-To-Repeat:

>Fix:

Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/security/ifd-slb_rf60/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- Makefile	21 Jul 2004 11:34:55 -0000	1.2
+++ Makefile	11 Jan 2005 10:03:49 -0000
@@ -14,9 +14,10 @@
 MAINTAINER=	toni at 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
+CFLAGS+=	-fPIC
 
 PKGMESSAGE=	${WRKDIR}/pkg-message
 WRKSRC=		${WRKDIR}/${PORTNAME:S/^ifd-//}
@@ -25,7 +26,7 @@
 PLIST_FILES=	pcsc/drivers/libslb_rf60.so
 
 do-install:
-	test -f ${PREFIX}/pcsc/drivers/ || ${MKDIR} ${PREFIX}/pcsc/drivers/
+	test -d ${PREFIX}/pcsc/drivers/ || ${MKDIR} ${PREFIX}/pcsc/drivers/
 	${INSTALL_DATA} ${WRKSRC}/libslb_rf60.so \
 		${PREFIX}/pcsc/drivers/libslb_rf60.so
 
Index: files/patch-Makefile
===================================================================
RCS file: /home/ncvs/ports/security/ifd-slb_rf60/files/patch-Makefile,v
retrieving revision 1.1
diff -u -r1.1 patch-Makefile
--- files/patch-Makefile	8 Jan 2005 11:11:18 -0000	1.1
+++ files/patch-Makefile	11 Jan 2005 10:03:49 -0000
@@ -1,14 +1,22 @@
-
-$FreeBSD: ports/security/ifd-slb_rf60/files/patch-Makefile,v 1.1 2005/01/08 11:11:18 krion Exp $
-
---- Makefile.orig
-+++ Makefile
-@@ -2,7 +2,7 @@
- # Linux Serial Driver
- # Implementation
- 
--CC   = gcc -DCPU_ICAP_PC=1
-+CC   = gcc -DCPU_ICAP_PC=1 -fPIC
- LD   = ld
- OBJS = serial.o ifdhandler.o ctapi.o AdmHndlr.o T1Hndlr.o
- LIBN = libslb_rf60.so
+--- Makefile.bak	Tue Jan 11 10:59:54 2005
++++ Makefile	Tue Jan 11 11:00:03 2005
+@@ -16,19 +16,13 @@
+ 	$(LD) -shared $(OBJS) -o $(LIBN)
+ 
+ test: test.c $(OBJS)
+-	$(CC) -o test test.c $(OBJS)
+ 
+ ifdhandler.o: ifdhandler.h ifdhandler.c
+-	$(CC) -c ifdhandler.c
+ 
+ T1Hndlr.o: T1Hndlr.h T1Hndlr.c
+-	$(CC) -c T1Hndlr.c
+ 
+ AdmHndlr.o: AdmHndlr.h AdmHndlr.c
+-	$(CC) -c AdmHndlr.c
+ 
+ ctapi.o: ctapi.h ctapi.c
+-	$(CC) -c ctapi.c
+ 
+ scio.o: serial.h serial.c
+-	$(CC) -c serial.c
Index: files/patch-ctapi.c
===================================================================
RCS file: /home/ncvs/ports/security/ifd-slb_rf60/files/patch-ctapi.c,v
retrieving revision 1.1
diff -u -r1.1 patch-ctapi.c
--- files/patch-ctapi.c	19 Jul 2004 06:04:16 -0000	1.1
+++ files/patch-ctapi.c	11 Jan 2005 10:03:49 -0000
@@ -5,7 +5,7 @@
  
      #ifndef SUN_SPARC
 -     BretVal = IO_InitializePort(9600,8,'E',"/dev/ttyS0");
-+     BretVal = IO_InitializePort(9600,8,'E',"/dev/cuaa0");
++     BretVal = IO_InitializePort(9600,8,'E',"/dev/cuad0");
      #endif
  
      break;
@@ -14,7 +14,7 @@
  
      #ifndef SUN_SPARC
 -     BretVal = IO_InitializePort(9600,8,'E',"/dev/ttyS1");
-+     BretVal = IO_InitializePort(9600,8,'E',"/dev/cuaa1");
++     BretVal = IO_InitializePort(9600,8,'E',"/dev/cuad1");
      #endif
  
      break;
@@ -23,7 +23,7 @@
  
      #ifndef SUN_SPARC
 -     BretVal = IO_InitializePort(9600,8,'E',"/dev/ttyS2");
-+     BretVal = IO_InitializePort(9600,8,'E',"/dev/cuaa2");
++     BretVal = IO_InitializePort(9600,8,'E',"/dev/cuad2");
      #endif
  
      break;
@@ -32,7 +32,7 @@
  
      #ifndef SUN_SPARC
 -     BretVal = IO_InitializePort(9600,8,'E',"/dev/ttyS3");
-+     BretVal = IO_InitializePort(9600,8,'E',"/dev/cuaa3");
++     BretVal = IO_InitializePort(9600,8,'E',"/dev/cuad3");
      #endif
  
      break;
Index: files/pkg-message.in
===================================================================
RCS file: /home/ncvs/ports/security/ifd-slb_rf60/files/pkg-message.in,v
retrieving revision 1.1
diff -u -r1.1 pkg-message.in
--- files/pkg-message.in	19 Jul 2004 06:04:16 -0000	1.1
+++ files/pkg-message.in	11 Jan 2005 10:03:49 -0000
@@ -1,10 +1,10 @@
 ------------------------------------------------------------------------
 
-You can activate the driver on /dev/cuaa0 by adding the following
+You can activate the driver on /dev/cuad0 by adding the following
 lines to %%PREFIX%%/etc/reader.conf:
 
 FRIENDLYNAME     "Reflex 62"
-DEVICENAME       GEN_SMART_RDR
+DEVICENAME       /dev/cuad0
 LIBPATH          %%PREFIX%%/pcsc/drivers/libslb_rf60.so
 CHANNELID        0x0103F8
 
>Release-Note:
>Audit-Trail:
>Unformatted: