5 files changed, 8 insertions, 59 deletions

diff --git a/devel/pcsc-lite/Makefile b/devel/pcsc-lite/Makefile
index e7ac7f9712db..4f14ffe469b7 100644
--- a/devel/pcsc-lite/Makefile
+++ b/devel/pcsc-lite/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	pcsc-lite
-PORTVERSION=	1.2.9.b.9
+PORTVERSION=	1.3.0
 PORTEPOCH=	2
-PORTREVISION=	3
 CATEGORIES=	devel security
-MASTER_SITES=	http://alioth.debian.org/download.php/1289/
+MASTER_SITES=	http://alioth.debian.org/download.php/1472/
 DISTNAME=	pcsc-lite-${PORTVERSION:S/.b./-beta/}
 
 MAINTAINER=	arved@FreeBSD.org
@@ -20,9 +19,9 @@ GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack pkgconfig
 
-WRKSRC=		${WRKDIR}/pcsc-lite-1.2.9-beta9
 INSTALLS_SHLIB=	yes
-CONFIGURE_ENV+=	PTHREAD_LIBS="${PTHREAD_LIBS}"
+CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS} ${PTHREAD_LIBS}" \
+		CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}"
 CONFIGURE_ARGS+=--prefix=${PREFIX} \
 		--enable-debug \
 		--enable-syslog \
@@ -32,13 +31,12 @@ CONFIGURE_ARGS+=--prefix=${PREFIX} \
 		--enable-usbdropdir=${PREFIX}/lib/pcsc/drivers/ \
 		--enable-muscledropdir=${PREFIX}/lib/pcsc/services/ \
 		--enable-threadsafe
-USE_REINPLACE=	yes
 USE_GETOPT_LONG=yes
 
 PKGMESSAGE=	${WRKDIR}/pkg-message
 MAN1=		formaticc.1
 MAN5=		reader.conf.5
-MAN8=		pcscd.8 bundleTool.8
+MAN8=		pcscd.8
 
 .if !defined(WITHOUT_USB)
 LIB_DEPENDS+=	usb-0.1.8:${PORTSDIR}/devel/libusb
diff --git a/devel/pcsc-lite/distinfo b/devel/pcsc-lite/distinfo
index d6a099d0e41d..cf3179be9503 100644
--- a/devel/pcsc-lite/distinfo
+++ b/devel/pcsc-lite/distinfo
@@ -1,3 +1,3 @@
-MD5 (pcsc-lite-1.2.9-beta9.tar.gz) = 12742c0b06590a8fd20c357cc1483fbf
-SHA256 (pcsc-lite-1.2.9-beta9.tar.gz) = c0a035e437f2518382b9f4d41da938300548722876f098c4c3dccea4ad1995c0
-SIZE (pcsc-lite-1.2.9-beta9.tar.gz) = 1048891
+MD5 (pcsc-lite-1.3.0.tar.gz) = ccbb595be0e1d47c9f9f449f183bea6c
+SHA256 (pcsc-lite-1.3.0.tar.gz) = 64c505f214dd178a506fb6870b1675b8a2739546a6e6da9cd1900722047b8d42
+SIZE (pcsc-lite-1.3.0.tar.gz) = 836866
diff --git a/devel/pcsc-lite/files/patch-hotplug_generic.c b/devel/pcsc-lite/files/patch-hotplug_generic.c
deleted file mode 100644
index b22c7d0b3622..000000000000
--- a/devel/pcsc-lite/files/patch-hotplug_generic.c
+++ /dev/null
@@ -1,30 +0,0 @@
---- src/hotplug_generic.c.orig	Mon Aug  8 21:58:19 2005
-+++ src/hotplug_generic.c	Sun Jan  1 17:34:00 2006
-@@ -20,8 +20,15 @@
- #include "config.h"
- #include "pcsclite.h"
- 
-+#ifndef TRUE
-+#define TRUE 1
-+#define FALSE 0
-+#endif
-+
- #if !defined(__APPLE__) && !defined(HAVE_LIBUSB) && !defined(__linux__)
- 
-+char ReCheckSerialReaders = FALSE;
-+
- LONG HPSearchHotPluggables(void)
- {
- 	return 0;
-@@ -35,6 +42,11 @@
- LONG HPStopHotPluggables(void)
- {
- 	return 0;
-+}
-+
-+void HPReCheckSerialReaders(void)
-+{
-+	ReCheckSerialReaders = TRUE;
- }
- 
- #endif
diff --git a/devel/pcsc-lite/files/patch-libmusclecard-doc-Makefile.in b/devel/pcsc-lite/files/patch-libmusclecard-doc-Makefile.in
deleted file mode 100644
index cdb629025a29..000000000000
--- a/devel/pcsc-lite/files/patch-libmusclecard-doc-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- libmusclecard/doc/Makefile.in.orig	Sat Jan  7 16:39:29 2006
-+++ libmusclecard/doc/Makefile.in	Sat Jan  7 16:40:36 2006
-@@ -155,7 +155,7 @@
- build_vendor = @build_vendor@
- confdir = @confdir@
- confdir_exp = @confdir_exp@
--datadir = $(prefix)/doc
-+datadir = $(prefix)/share/doc/pcsc-lite
- exec_prefix = @exec_prefix@
- extended_apdu = @extended_apdu@
- host = @host@
diff --git a/devel/pcsc-lite/pkg-plist b/devel/pcsc-lite/pkg-plist
index e4d890fa4acf..e6ba29bb87cf 100644
--- a/devel/pcsc-lite/pkg-plist
+++ b/devel/pcsc-lite/pkg-plist
@@ -3,30 +3,22 @@ etc/rc.d/pcscd.sh.sample
 etc/reader.conf.sample
 include/PCSC/debuglog.h
 include/PCSC/ifdhandler.h
-include/PCSC/mscdefines.h
-include/PCSC/musclecard.h
 include/PCSC/pcsclite.h
 include/PCSC/reader.h
 include/PCSC/winscard.h
 include/PCSC/wintypes.h
-lib/libmusclecard.so.1
-lib/libmusclecard.so
-lib/libmusclecard.a
 lib/libpcsclite.a
 lib/libpcsclite.so
 lib/libpcsclite.so.1
 lib/pcsc/drivers/.keep_me
 lib/pcsc/services/.keep_me
 libdata/pkgconfig/libpcsclite.pc
-libdata/pkgconfig/libmusclecard.pc
-sbin/bundleTool
 sbin/installifd
 sbin/pcscd
 sbin/update-reader.conf
 %%PORTDOCS%%%%DOCSDIR%%/README.DAEMON
 %%PORTDOCS%%%%DOCSDIR%%/pcsc-lite.pdf
 %%PORTDOCS%%%%DOCSDIR%%/ifdhandler-3.pdf
-%%PORTDOCS%%%%DOCSDIR%%/muscle-api-1.3.0.pdf
 %%EXAMPLESDIR%%/Makefile.am
 %%EXAMPLESDIR%%/Makefile.in
 %%EXAMPLESDIR%%/pcsc_demo.c