Restore opensc-pkcs11.so functionnality on NetBSD-6.0. libpthread shall

not be loaded by dlopen(), therefore we remove the useless dependency on
-lpthread

5 files changed, 103 insertions, 3 deletions

diff --git a/security/pcsc-lite/Makefile b/security/pcsc-lite/Makefile
index ca883c77f2f..ad85577eb78 100644
--- a/security/pcsc-lite/Makefile
+++ b/security/pcsc-lite/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2012/10/23 18:16:49 asau Exp $
+# $NetBSD: Makefile,v 1.11 2012/10/24 09:01:40 manu Exp $
 #
 
 DISTNAME=	pcsc-lite-1.5.5
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	security
 MASTER_SITES=	http://alioth.debian.org/frs/download.php/3082/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/security/pcsc-lite/distinfo b/security/pcsc-lite/distinfo
index bc85129a8a0..52ce32c4f5b 100644
--- a/security/pcsc-lite/distinfo
+++ b/security/pcsc-lite/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.9 2010/12/17 17:00:35 shannonjr Exp $
+$NetBSD: distinfo,v 1.10 2012/10/24 09:01:40 manu Exp $
 
 SHA1 (pcsc-lite-1.5.5.tar.bz2) = 6791a8bd07f69972f708d4bdd03d6b1056c7af3e
 RMD160 (pcsc-lite-1.5.5.tar.bz2) = 99f56839483d7364426e0d70ec6825f551b4c49e
@@ -6,3 +6,6 @@ Size (pcsc-lite-1.5.5.tar.bz2) = 465947 bytes
 SHA1 (patch-aa) = a30db3af5181f7d37d16c25d2679070e2fdf6652
 SHA1 (patch-ab) = 3fe33345975fcd61611dae8d7aaf9b6ee5329d9e
 SHA1 (patch-ac) = 1abf0c4bb7199998fb8d81ef8514f8f80f460ccc
+SHA1 (patch-configure) = 6b7f6b9333a93b731822456cec980c11bba27ba6
+SHA1 (patch-src_Makefile.in) = daa2dd2e1fc1a901df782654300a8277b5a4b4cd
+SHA1 (patch-src_thread_unix.c) = 6d5576db605cfe6d430c96101774736b30d0c9e7
diff --git a/security/pcsc-lite/patches/patch-configure b/security/pcsc-lite/patches/patch-configure
new file mode 100644
index 00000000000..66bd108178c
--- /dev/null
+++ b/security/pcsc-lite/patches/patch-configure
@@ -0,0 +1,38 @@
+$NetBSD: patch-configure,v 1.1 2012/10/24 09:01:40 manu Exp $
+
+Make sure libpscslite.so is not linked against -lphtread on NetBSD, as
+loading libpthread.so through dlopen() is now forbidden
+
+
+--- ./configure.orig	2012-10-24 06:24:27.000000000 +0200
++++ ./configure	2012-10-24 06:39:49.000000000 +0200
+@@ -823,8 +823,10 @@
+ LIBTOOL
+ PTHREAD_CFLAGS
+ PTHREAD_LIBS
+ PTHREAD_CC
++LIBPCSC_PTHREAD_CFLAGS
++LIBPCSC_PTHREAD_LIBS
+ acx_pthread_config
+ PKG_CONFIG
+ LEXLIB
+ LEX_OUTPUT_ROOT
+@@ -6135,8 +6137,18 @@
+ 
+ 
+ CC="$PTHREAD_CC"
+ 
++case `uname` in
++NetBSD)
++	LIBPCSC_PTHREAD_LIBS=''
++	LIBPCSC_PTHREAD_CFLAGS=''
++	;;
++*)
++	LIBPCSC_PTHREAD_LIBS=$PTHREAD_LIBS
++	LIBPCSC_PTHREAD_CFLAGS=$PTHREAD_CFLAGS
++	;;
++esac
+ 
+ 
+ 
+ # Add libtool support
diff --git a/security/pcsc-lite/patches/patch-src_Makefile.in b/security/pcsc-lite/patches/patch-src_Makefile.in
new file mode 100644
index 00000000000..61cfbc83ff8
--- /dev/null
+++ b/security/pcsc-lite/patches/patch-src_Makefile.in
@@ -0,0 +1,33 @@
+$NetBSD: patch-src_Makefile.in,v 1.1 2012/10/24 09:01:41 manu Exp $
+
+Make sure libpscslite.so is not linked against -lphtread on NetBSD, as
+loading libpthread.so through dlopen() is now forbidden
+
+
+--- ./src/Makefile.in.orig	2012-10-24 06:31:51.000000000 +0200
++++ ./src/Makefile.in	2012-10-24 06:33:06.000000000 +0200
+@@ -220,8 +220,10 @@
+ PKG_CONFIG = @PKG_CONFIG@
+ PTHREAD_CC = @PTHREAD_CC@
+ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
+ PTHREAD_LIBS = @PTHREAD_LIBS@
++LIBPCSC_PTHREAD_CFLAGS = @LIBPCSC_PTHREAD_CFLAGS@
++LIBPCSC_PTHREAD_LIBS = @LIBPCSC_PTHREAD_LIBS@
+ RANLIB = @RANLIB@
+ SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+@@ -311,11 +313,11 @@
+ 	utils.c \
+ 	winscard_msg.c
+ 
+ libpcsclite_la_LDFLAGS = -version-info 1:0:0
+-libpcsclite_la_CFLAGS = $(CFLAGS) $(PTHREAD_CFLAGS) -DLIBPCSCLITE
++libpcsclite_la_CFLAGS = $(CFLAGS) $(LIBPCSC_PTHREAD_CFLAGS) -DLIBPCSCLITE
+ libpcsclite_la_LIBADD = $(COREFOUNDATION) $(LIBSMARTCARD) $(LIBDL) \
+-	$(PTHREAD_CFLAGS) $(PTHREAD_LIBS)
++	$(LIBPCSC_PTHREAD_CFLAGS) $(LIBPCSC_PTHREAD_LIBS)
+ 
+ pcscd_SOURCES = \
+ 	atrhandler.c \
+ 	atrhandler.h \
diff --git a/security/pcsc-lite/patches/patch-src_thread_unix.c b/security/pcsc-lite/patches/patch-src_thread_unix.c
new file mode 100644
index 00000000000..05a1d9084a3
--- /dev/null
+++ b/security/pcsc-lite/patches/patch-src_thread_unix.c
@@ -0,0 +1,26 @@
+$NetBSD: patch-src_thread_unix.c,v 1.1 2012/10/24 09:01:41 manu Exp $
+
+Make sure libpscslite.so is not linked against -lphtread on NetBSD, as
+loading libpthread.so through dlopen() is now forbidden
+
+
+--- ./src/thread_unix.c.orig	2012-10-24 06:22:45.000000000 +0200
++++ ./src/thread_unix.c	2012-10-24 06:23:57.000000000 +0200
+@@ -58,9 +58,9 @@
+ 		return pthread_mutex_unlock(mMutex);
+ 	else
+ 		return -1;
+ }
+-
++#ifndef LIBPCSCLITE
+ INTERNAL int SYS_ThreadCreate(PCSCLITE_THREAD_T * pthThread, int attributes,
+ 	PCSCLITE_THREAD_FUNCTION(pvFunction), LPVOID pvArg)
+ {
+ 	pthread_attr_t attr;
+@@ -120,5 +120,5 @@
+ INTERNAL int SYS_ThreadSetCancelType(int type, int *oldtype)
+ {
+ 	return pthread_setcanceltype(type, oldtype);
+ }
+-
++#endif /* LIBPCSCLITE */