7 files changed, 48 insertions, 30 deletions

diff --git a/devel/pcsc-lite/Makefile b/devel/pcsc-lite/Makefile
index 4ce446d8f854..2d948438c057 100644
--- a/devel/pcsc-lite/Makefile
+++ b/devel/pcsc-lite/Makefile
@@ -6,12 +6,12 @@
 #
 
 PORTNAME=	pcsc-lite
-PORTVERSION=	1.0.2.b5
+PORTVERSION=	1.1.1
 CATEGORIES=	devel security
 MASTER_SITES=	http://www.linuxnet.com/middleware/files/
-DISTNAME=	${PORTNAME}-${PORTVERSION:S/b/beta/}
+DISTNAME=	${PORTNAME}-${PORTVERSION}
 
-MAINTAINER=	toni@ants.at
+MAINTAINER=	toni@soth.at
 
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
@@ -19,19 +19,20 @@ USE_LIBTOOL=	yes
 LIBTOOLFILES+=	build/aclocal.m4
 
 INSTALLS_SHLIB=	yes
-CONFIGURE_ARGS+=	--enable-syslog --enable-daemon \
-			--enable-runpid=/var/run/pcscd.pid
+CONFIGURE_ARGS+=	--enable-debug \
+			--enable-syslog \
+			--enable-runpid=/var/run/pcscd.pid \
+			--enable-confdir=${PREFIX}/etc \
+			--disable-threadsafe
 PKGMESSAGE=	${WRKDIR}/pkg-message
-
-post-patch:
-	@${PERL} -pi -e 's,SUBDIRS = src etc doc,SUBDIRS = src,' \
-		${WRKSRC}/Makefile.in
+MAN8=		pcscd.8
 
 post-install:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/README.DAEMON ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/pcsc-lite-0.8.7.pdf ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/muscle-api-1.3.0.pdf ${DOCSDIR}
 .endif
 	${INSTALL_DATA} ${WRKSRC}/etc/reader.conf \
 		${PREFIX}/etc/reader.conf.sample
diff --git a/devel/pcsc-lite/distinfo b/devel/pcsc-lite/distinfo
index 77e3b823b9db..fa805b0aef06 100644
--- a/devel/pcsc-lite/distinfo
+++ b/devel/pcsc-lite/distinfo
@@ -1 +1 @@
-MD5 (pcsc-lite-1.0.2.beta5.tar.gz) = b8dff65833e0c949f7ee94a91ae2504c
+MD5 (pcsc-lite-1.1.1.tar.gz) = 3ccfe086128989e3a263810ab5327f79
diff --git a/devel/pcsc-lite/files/patch-etc::Makefile.in b/devel/pcsc-lite/files/patch-etc::Makefile.in
new file mode 100644
index 000000000000..23b47388ecf8
--- /dev/null
+++ b/devel/pcsc-lite/files/patch-etc::Makefile.in
@@ -0,0 +1,11 @@
+--- etc/Makefile.in.dist	Tue Jun  4 18:18:10 2002
++++ etc/Makefile.in	Tue Jun  4 18:18:25 2002
+@@ -72,7 +72,7 @@
+ RANLIB = @RANLIB@
+ ac_aux_dir = @ac_aux_dir@
+ 
+-sysconf_DATA = reader.conf
++sysconf_DATA =
+ 
+ EXTRA_DIST = reader.conf StartupParameters.plist SmartcardServices 
+ mkinstalldirs = $(SHELL) $(top_srcdir)/build/mkinstalldirs
diff --git a/devel/pcsc-lite/files/patch-src::Makefile.in b/devel/pcsc-lite/files/patch-src::Makefile.in
new file mode 100644
index 000000000000..ff28f24fb829
--- /dev/null
+++ b/devel/pcsc-lite/files/patch-src::Makefile.in
@@ -0,0 +1,11 @@
+--- src/Makefile.in.dist	Mon Jun  3 00:27:29 2002
++++ src/Makefile.in	Mon Jun  3 00:27:43 2002
+@@ -99,7 +99,7 @@
+ @PCSC_ARCH_LINUX_FALSE@@PCSC_ARCH_BSD_FALSE@@PCSC_ARCH_OSX_FALSE@@PCSC_ARCH_SOLARIS_FALSE@@PCSC_ARCH_HPUX_FALSE@@PCSC_ARCH_TRU64_TRUE@PCSC_INCLUDE_LIBS = -ll
+ @PCSC_ARCH_LINUX_TRUE@@PCSC_LINUX_USB_TRUE@PCSCD_INCLUDE_LIBS = -lfl -ldl -lpthread
+ @PCSC_ARCH_LINUX_TRUE@@PCSC_LINUX_USB_FALSE@PCSCD_INCLUDE_LIBS = -lfl -ldl -lpthread
+-@PCSC_ARCH_LINUX_FALSE@@PCSC_ARCH_BSD_TRUE@PCSCD_INCLUDE_LIBS = -lfl -lpthread
++@PCSC_ARCH_LINUX_FALSE@@PCSC_ARCH_BSD_TRUE@PCSCD_INCLUDE_LIBS = -lfl -lc_r
+ @PCSC_ARCH_LINUX_FALSE@@PCSC_ARCH_BSD_FALSE@@PCSC_ARCH_OSX_TRUE@PCSCD_INCLUDE_LIBS = -ll -lIOKit
+ @PCSC_ARCH_LINUX_FALSE@@PCSC_ARCH_BSD_FALSE@@PCSC_ARCH_OSX_FALSE@@PCSC_ARCH_SOLARIS_TRUE@PCSCD_INCLUDE_LIBS = -ll -ldl -lnsl -lsocket -lposix4 -lpthread
+ @PCSC_ARCH_LINUX_FALSE@@PCSC_ARCH_BSD_FALSE@@PCSC_ARCH_OSX_FALSE@@PCSC_ARCH_SOLARIS_FALSE@@PCSC_ARCH_HPUX_TRUE@PCSCD_INCLUDE_LIBS = -ll -lpthread
diff --git a/devel/pcsc-lite/files/patch-src::dyn_bsd.c b/devel/pcsc-lite/files/patch-src::dyn_bsd.c
deleted file mode 100644
index 0000a7a38cbd..000000000000
--- a/devel/pcsc-lite/files/patch-src::dyn_bsd.c
+++ /dev/null
@@ -1,7 +0,0 @@
---- src/dyn_bsd.c.dist	Wed Dec 26 06:37:11 2001
-+++ src/dyn_bsd.c	Wed Dec 26 06:39:24 2001
-@@ -77,3 +77,3 @@
-   *pvFHandle = 0;
--  *pvFHandle = dlsym( pvLHandle, pcFunctionName );
-+  *pvFHandle = dlsym( pvLHandle, pcFunction );
- 
diff --git a/devel/pcsc-lite/files/patch-src::musclecard.c b/devel/pcsc-lite/files/patch-src::musclecard.c
new file mode 100644
index 000000000000..2efdd4f5e178
--- /dev/null
+++ b/devel/pcsc-lite/files/patch-src::musclecard.c
@@ -0,0 +1,12 @@
+--- src/musclecard.c.dist  Sat Jul 13 03:43:40 2002
++++ src/musclecard.c       Sat Jul 13 03:43:59 2002
+@@ -43,7 +43,9 @@
+ 
+ static SCARDCONTEXT localHContext = 0;
+ static ULONG blockingContext      = MSC_BLOCKSTATUS_RESUME;
++#ifdef USE_THREAD_SAFETY
+ static PCSCLITE_THREAD_T callbackThread;
++#endif
+ 
+ /*
+  * internal function 
diff --git a/devel/pcsc-lite/pkg-plist b/devel/pcsc-lite/pkg-plist
index 6f0590f602b7..f791ea282664 100644
--- a/devel/pcsc-lite/pkg-plist
+++ b/devel/pcsc-lite/pkg-plist
@@ -2,24 +2,14 @@ bin/formaticc
 bin/installifd
 %%PORTDOCS%%share/doc/pcsc-lite/README.DAEMON
 %%PORTDOCS%%share/doc/pcsc-lite/pcsc-lite-0.8.7.pdf
+%%PORTDOCS%%share/doc/pcsc-lite/muscle-api-1.3.0.pdf
 etc/rc.d/pcscd.sh.sample
 etc/reader.conf.sample
-include/atrhandler.h
-include/configfile.h
 include/debuglog.h
-include/dyn_generic.h
-include/eventhandler.h
-include/hotplug.h
-include/ifdhandler.h
-include/ifdwrapper.h
+include/mscdefines.h
+include/musclecard.h
 include/pcsclite.h
-include/prothandler.h
-include/readerfactory.h
-include/sys_generic.h
-include/thread_generic.h
 include/winscard.h
-include/winscard_msg.h
-include/winscard_svc.h
 include/wintypes.h
 lib/libpcsclite.a
 lib/libpcsclite.so