Update to 1.1.2.b.3

PR:		50063
Submitted by:	maintainer

6 files changed, 35 insertions, 56 deletions

diff --git a/devel/pcsc-lite/Makefile b/devel/pcsc-lite/Makefile
index b406bf90e562..753d50ed4558 100644
--- a/devel/pcsc-lite/Makefile
+++ b/devel/pcsc-lite/Makefile
@@ -1,33 +1,35 @@
 # New ports collection makefile for:   pcsc-lite
 # Date created:                15 Oct 2001
-# Whom:                        Toni Andjelkovic <toni@ants.at>
+# Whom:                        Toni Andjelkovic <toni@soth.at>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	pcsc-lite
-PORTVERSION=	1.1.1
+PORTVERSION=	1.1.2.b.3
 CATEGORIES=	devel security
-MASTER_SITES=	http://www.linuxnet.com/middleware/files/
-DISTNAME=	${PORTNAME}-${PORTVERSION}
+MASTER_SITES=	http://ludovic.rousseau.free.fr/softwares/muscle/
+DISTNAME=	${PORTNAME}-${PORTVERSION:S/.b./beta/}
 
 MAINTAINER=	toni@soth.at
 COMMENT=	A smartcard development library
 
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:S/.b.3//}
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
 LIBTOOLFILES+=	build/aclocal.m4
 
 INSTALLS_SHLIB=	yes
-CONFIGURE_ARGS+=	--enable-debug \
-			--enable-syslog \
-			--enable-runpid=/var/run/pcscd.pid \
-			--enable-confdir=${PREFIX}/etc \
-			--disable-threadsafe
+CONFIGURE_ARGS+=--enable-debug \
+		--enable-syslog \
+		--enable-runpid=/var/run/pcscd.pid \
+		--enable-ipcdir=/var/tmp/ \
+		--enable-confdir=${PREFIX}/etc \
+		--enable-threadsafe
 PKGMESSAGE=	${WRKDIR}/pkg-message
-MAN1=		bundleTool.1
-MAN8=		pcscd.8
+MAN1=		formaticc.1
+MAN8=		bundleTool.8 pcscd.8
 
 post-install:
 .if !defined(NOPORTDOCS)
diff --git a/devel/pcsc-lite/distinfo b/devel/pcsc-lite/distinfo
index fa805b0aef06..2346ad8d2adb 100644
--- a/devel/pcsc-lite/distinfo
+++ b/devel/pcsc-lite/distinfo
@@ -1 +1 @@
-MD5 (pcsc-lite-1.1.1.tar.gz) = 3ccfe086128989e3a263810ab5327f79
+MD5 (pcsc-lite-1.1.2beta3.tar.gz) = d6b38581037a5836b54de6f3442d7980
diff --git a/devel/pcsc-lite/files/patch-doc::Makefile.in b/devel/pcsc-lite/files/patch-doc::Makefile.in
index 50e53ed592db..da1c6720c0cd 100644
--- a/devel/pcsc-lite/files/patch-doc::Makefile.in
+++ b/devel/pcsc-lite/files/patch-doc::Makefile.in
@@ -1,13 +1,12 @@
---- doc/Makefile.in.orig	Mon Jul  1 18:28:39 2002
-+++ doc/Makefile.in	Sat Feb 22 05:16:02 2003
-@@ -73,8 +73,8 @@
- RANLIB = @RANLIB@
- ac_aux_dir = @ac_aux_dir@
- 
+--- doc/Makefile.in.bak Mon Mar 17 03:44:22 2003
++++ doc/Makefile.in     Mon Mar 17 03:44:42 2003
+@@ -69,3 +69,3 @@
+
 -datadir = $(prefix)/doc
--data_DATA = pcsc-lite-0.8.7.pdf muscle-api-1.3.0.pdf README.DAEMON pcscd.startup
 +#datadir = $(prefix)/doc
-+#data_DATA = pcsc-lite-0.8.7.pdf muscle-api-1.3.0.pdf README.DAEMON pcscd.startup
- man_MANS = pcscd.8 bundleTool.1
- EXTRA_DIST = $(data_DATA) $(man_MANS)
- mkinstalldirs = $(SHELL) $(top_srcdir)/build/mkinstalldirs
+ AMTAR = @AMTAR@
+@@ -98,3 +98,3 @@
+ install_sh = @install_sh@
+-data_DATA = pcsc-lite-0.8.7.pdf muscle-api-1.3.0.pdf README.DAEMON
++#data_DATA = pcsc-lite-0.8.7.pdf muscle-api-1.3.0.pdf README.DAEMON
+ man_MANS = pcscd.8 bundleTool.8 formaticc.1
diff --git a/devel/pcsc-lite/files/patch-etc::Makefile.in b/devel/pcsc-lite/files/patch-etc::Makefile.in
index 23b47388ecf8..6cd5a8ea39df 100644
--- a/devel/pcsc-lite/files/patch-etc::Makefile.in
+++ b/devel/pcsc-lite/files/patch-etc::Makefile.in
@@ -1,11 +1,12 @@
---- 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@
- 
+--- etc/Makefile.in.bak Mon Mar 17 03:13:17 2003
++++ etc/Makefile.in     Mon Mar 17 03:14:27 2003
+@@ -27,3 +27,3 @@
+ datadir = @datadir@
+-sysconfdir = @sysconfdir@
++#sysconfdir = @sysconfdir@
+ sharedstatedir = @sharedstatedir@
+@@ -96,3 +96,3 @@
+
 -sysconf_DATA = reader.conf
-+sysconf_DATA =
- 
- EXTRA_DIST = reader.conf StartupParameters.plist SmartcardServices 
- mkinstalldirs = $(SHELL) $(top_srcdir)/build/mkinstalldirs
++#sysconf_DATA = reader.conf
+
diff --git a/devel/pcsc-lite/files/patch-src::Makefile.in b/devel/pcsc-lite/files/patch-src::Makefile.in
deleted file mode 100644
index ff28f24fb829..000000000000
--- a/devel/pcsc-lite/files/patch-src::Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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::musclecard.c b/devel/pcsc-lite/files/patch-src::musclecard.c
deleted file mode 100644
index 2efdd4f5e178..000000000000
--- a/devel/pcsc-lite/files/patch-src::musclecard.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- 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