update to pcsc-lite-1.9.5

security/pcsc-lite/Makefile

@@ -1,7 +1,6 @@
 COMMENT=	resource manager for PC/SC
 
-V=		1.8.26
-REVISION=	2
+V=		1.9.5
 DISTNAME=	pcsc-lite-${V}
 CATEGORIES=	security
 
@@ -40,7 +39,8 @@ CONFIGURE_ARGS=	--disable-libudev \
 		--disable-libsystemd \
 		--without-systemdsystemunitdir \
 		--enable-libusb \
-		--enable-confdir=${SYSCONFDIR}/ccid
+		--enable-confdir=${SYSCONFDIR}/ccid \
+		--enable-ipcdir=/var/run/pcscd
 
 CONFIGURE_ENV=	ac_cv_lib_lex='none needed'
 
@@ -53,4 +53,8 @@ TEST_IS_INTERACTIVE= Yes
 do-test:
 	${WRKBUILD}/src/testpcsc
 
+post-install:
+	rm ${PREFIX}/share/doc/pcsc-lite/README.polkit
+	rmdir ${PREFIX}/share/doc/pcsc-lite
+
 .include <bsd.port.mk>

security/pcsc-lite/distinfo

@@ -1,2 +1,2 @@
-SHA256 (pcsc-lite-1.8.26.tar.bz2) = Pre+fW72GMCkRDFs9cHy+dcieu26ehkvOJ/j58Dfu9k=
-SIZE (pcsc-lite-1.8.26.tar.bz2) = 754838
+SHA256 (pcsc-lite-1.9.5.tar.bz2) = nuP5szNTdWIXeJNVmtT3uNXCPr6Cju9TBWwC2xQEnQg=
+SIZE (pcsc-lite-1.9.5.tar.bz2) = 775736

security/pcsc-lite/patches/patch-src_debug_c

@@ -3,7 +3,7 @@ Disable colors by default.
 Index: src/debug.c
 --- src/debug.c.orig
 +++ src/debug.c
-@@ -76,6 +76,7 @@ static void log_init(void)
+@@ -72,6 +72,7 @@ static void log_init(void)
  	if (e)
  		LogLevel = atoi(e);
  
@@ -11,7 +11,7 @@ Index: src/debug.c
  	/* log to stderr and stderr is a tty? */
  	if (isatty(fileno(stderr)))
  	{
-@@ -99,6 +100,7 @@ static void log_init(void)
+@@ -95,6 +96,7 @@ static void log_init(void)
  			}
  		}
  	}

security/pcsc-lite/patches/patch-src_debuglog_c

@@ -3,6 +3,15 @@ Disable colors by default.
 Index: src/debuglog.c
 --- src/debuglog.c.orig
 +++ src/debuglog.c
+@@ -187,7 +187,7 @@ static void log_line(const int priority, const char *D
+ 					break;
+ 			}
+ 
+-#ifdef __APPLE__
++#if defined(__APPLE__) || defined (__OpenBSD__)
+ #define THREAD_FORMAT "%p"
+ #else
+ #define THREAD_FORMAT "%lu"
 @@ -255,6 +255,9 @@ void DebugLogSetLogType(const int dbgtype)
  			LogMsgType = DEBUGLOG_STDOUT_DEBUG;
  	}

security/pcsc-lite/patches/patch-src_spy_libpcscspy_c

@@ -1,5 +1,6 @@
---- src/spy/libpcscspy.c.orig	Fri Nov  6 09:39:51 2015
-+++ src/spy/libpcscspy.c	Sun Dec 27 18:52:28 2015
+Index: src/spy/libpcscspy.c
+--- src/spy/libpcscspy.c.orig
++++ src/spy/libpcscspy.c
 @@ -26,6 +26,7 @@
  #include <unistd.h>
  #include <sys/time.h>
@@ -8,7 +9,7 @@
  
  #include "misc.h"
  #include <winscard.h>
-@@ -167,7 +168,7 @@ static void spy_line_direct(char *line)
+@@ -162,7 +163,7 @@ static void spy_line_direct(char *line)
  	if (Log_fd < 0)
  		return;
  
@@ -17,7 +18,7 @@
  	pthread_mutex_lock(&Log_fd_mutex);
  	r = write(Log_fd, threadid, strlen(threadid));
  	r = write(Log_fd, line, strlen(line));
-@@ -196,7 +197,7 @@ static void spy_line(const char *fmt, ...)
+@@ -191,7 +192,7 @@ static void spy_line(const char *fmt, ...)
  		printf("libpcsc-spy: Buffer is too small!\n");
  		return;
  	}

security/pcsc-lite/pkg/PLIST

@@ -7,10 +7,10 @@ include/PCSC/pcsclite.h
 include/PCSC/reader.h
 include/PCSC/winscard.h
 include/PCSC/wintypes.h
-lib/libpcsclite.a
+@static-lib lib/libpcsclite.a
 lib/libpcsclite.la
 @lib lib/libpcsclite.so.${LIBpcsclite_VERSION}
-lib/libpcscspy.a
+@static-lib lib/libpcscspy.a
 lib/libpcscspy.la
 @lib lib/libpcscspy.so.${LIBpcscspy_VERSION}
 lib/pkgconfig/libpcsclite.pc
@@ -18,6 +18,3 @@ lib/pkgconfig/libpcsclite.pc
 @man man/man5/reader.conf.5
 @man man/man8/pcscd.8
 @bin sbin/pcscd
-@comment share/doc/pcsc-lite/
-@comment share/doc/pcsc-lite/README.DAEMON
-@comment share/doc/pcsc-lite/README.polkit