- Respect CFLAGS

- Adapt to new pcsc-lite infrastructure

PR:		76091
Submitted by:	Toni Andjelkovic <toni@soth.at>

4 files changed, 34 insertions, 25 deletions

diff --git a/security/ifd-slb_rf60/Makefile b/security/ifd-slb_rf60/Makefile
index f6d21fa3b084..cad1966a8fc5 100644
--- a/security/ifd-slb_rf60/Makefile
+++ b/security/ifd-slb_rf60/Makefile
@@ -18,17 +18,18 @@ COMMENT=	PC/SC Lite driver for the Reflex 62 serial smart card reader
 LIB_DEPENDS=	pcsclite.1:${PORTSDIR}/devel/pcsc-lite
 
 USE_GMAKE=	yes
+CFLAGS+=	-fPIC
 
 PKGMESSAGE=	${WRKDIR}/pkg-message
 WRKSRC=		${WRKDIR}/${PORTNAME:S/^ifd-//}
 
 PORTDOCS=	README
-PLIST_FILES=	pcsc/drivers/libslb_rf60.so
+PLIST_FILES=	lib/pcsc/drivers/libslb_rf60.so
 
 do-install:
-	test -f ${PREFIX}/pcsc/drivers/ || ${MKDIR} ${PREFIX}/pcsc/drivers/
+	${MKDIR} ${PREFIX}/lib/pcsc/drivers/
 	${INSTALL_DATA} ${WRKSRC}/libslb_rf60.so \
-		${PREFIX}/pcsc/drivers/libslb_rf60.so
+		${PREFIX}/lib/pcsc/drivers/libslb_rf60.so
 
 post-install:
 .if !defined(NOPORTDOCS)
diff --git a/security/ifd-slb_rf60/files/patch-Makefile b/security/ifd-slb_rf60/files/patch-Makefile
index 3abd5f01d900..10465f7b0906 100644
--- a/security/ifd-slb_rf60/files/patch-Makefile
+++ b/security/ifd-slb_rf60/files/patch-Makefile
@@ -1,14 +1,22 @@
-
-$FreeBSD$
-
---- 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
diff --git a/security/ifd-slb_rf60/files/patch-ctapi.c b/security/ifd-slb_rf60/files/patch-ctapi.c
index 3b723e099892..7b81749db4ed 100644
--- a/security/ifd-slb_rf60/files/patch-ctapi.c
+++ b/security/ifd-slb_rf60/files/patch-ctapi.c
@@ -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;
diff --git a/security/ifd-slb_rf60/files/pkg-message.in b/security/ifd-slb_rf60/files/pkg-message.in
index 61e8c7f76c02..5d631f5cb012 100644
--- a/security/ifd-slb_rf60/files/pkg-message.in
+++ b/security/ifd-slb_rf60/files/pkg-message.in
@@ -1,11 +1,11 @@
 ------------------------------------------------------------------------
 
-You can activate the driver on /dev/cuaa0 by adding the following
-lines to %%PREFIX%%/etc/reader.conf:
+You can activate the driver on /dev/cuad0 by adding the following
+lines to %%PREFIX%%/etc/reader.conf.d/reader.conf:
 
 FRIENDLYNAME     "Reflex 62"
-DEVICENAME       GEN_SMART_RDR
-LIBPATH          %%PREFIX%%/pcsc/drivers/libslb_rf60.so
+DEVICENAME       /dev/cuad0
+LIBPATH          %%PREFIX%%/lib/pcsc/drivers/libslb_rf60.so
 CHANNELID        0x0103F8
 
 ------------------------------------------------------------------------