6 files changed, 57 insertions, 67 deletions

diff --git a/devel/pcsc-lite/Makefile b/devel/pcsc-lite/Makefile
index 6c7bb612001c..b691a0f84ce6 100644
--- a/devel/pcsc-lite/Makefile
+++ b/devel/pcsc-lite/Makefile
@@ -6,10 +6,11 @@
 #
 
 PORTNAME=	pcsc-lite
-PORTVERSION=	1.2.0
+PORTVERSION=	1.2.9.b.7
 PORTEPOCH=	2
 CATEGORIES=	devel security
-MASTER_SITES=	http://alioth.debian.org/download.php/419/
+MASTER_SITES=	http://alioth.debian.org/download.php/975/
+DISTNAME=	pcsc-lite-${PORTVERSION:S/.b./-beta/}
 
 MAINTAINER=	toni@soth.at
 COMMENT=	A smartcard development library
@@ -17,8 +18,9 @@ COMMENT=	A smartcard development library
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack
-USE_INC_LIBTOOL_VER=	13
+USE_INC_LIBTOOL_VER=	15
 
+WRKSRC=		${WRKDIR}/pcsc-lite-1.2.9-beta7
 INSTALLS_SHLIB=	yes
 CONFIGURE_ENV+=	PTHREAD_LIBS="${PTHREAD_LIBS}"
 CONFIGURE_ARGS+=--prefix=${PREFIX} \
@@ -27,39 +29,50 @@ CONFIGURE_ARGS+=--prefix=${PREFIX} \
 		--enable-runpid=/var/run/pcscd.pid \
 		--enable-ipcdir=/var/tmp/ \
 		--enable-confdir=${PREFIX}/etc/ \
-		--enable-usbdropdir=${PREFIX}/pcsc/drivers/ \
-		--enable-muscledropdir=${PREFIX}/pcsc/services/ \
+		--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
-MAN8=		bundleTool.8 pcscd.8
+MAN5=		reader.conf.5
+MAN8=		pcscd.8
 
-.if defined(WITH_USB)
-LIB_DEPENDS+=	usb-0.1.7:${PORTSDIR}/devel/libusb
+.if !defined(WITHOUT_USB)
+LIB_DEPENDS+=	usb-0.1.8:${PORTSDIR}/devel/libusb
 CONFIGURE_ARGS+=--enable-libusb=${PREFIX}
 .endif
 
+post-patch:
+	${REINPLACE_CMD} -e "s,^datadir,#datadir,; s,^data_DATA,#data_DATA," ${WRKSRC}/doc/Makefile.in
+	${REINPLACE_CMD} -e "s,^confdir,#sysconfdir,; s,^conf_DATA,#sysconf_DATA,; s,^EXTRA_DIST,#EXTRA_DIST," ${WRKSRC}/etc/Makefile.in
+
 pre-everything::
 	@${ECHO_MSG}
 	@${ECHO_MSG} "pcsc-lite has the following option(s):"
-	@${ECHO_MSG} "  WITH_USB=yes            Enable USB support"
+	@${ECHO_MSG} "  WITHOUT_USB=yes            Disable USB support"
 	@${ECHO_MSG}
 
 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}
+	${INSTALL_DATA} ${WRKSRC}/doc/pcsc-lite.pdf ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/ifdhandler-3.pdf ${DOCSDIR}
 .endif
 	@${MKDIR} ${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/example/Makefile.am ${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/example/Makefile.in ${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/example/pcsc_demo.c ${EXAMPLESDIR}
-	@${MKDIR} ${PREFIX}/pcsc/drivers
-	@${MKDIR} ${PREFIX}/pcsc/services
+	@${MKDIR} ${PREFIX}/lib/pcsc/drivers
+	@${MKDIR} ${PREFIX}/lib/pcsc/services
+	${TOUCH} ${PREFIX}/lib/pcsc/drivers/.keep_me
+	${TOUCH} ${PREFIX}/lib/pcsc/services/.keep_me
+	${MKDIR} ${PREFIX}/etc/reader.conf.d
 	${INSTALL_DATA} ${WRKSRC}/etc/reader.conf \
-		${PREFIX}/etc/reader.conf.sample
+		${PREFIX}/etc/reader.conf.d/reader.conf.sample
 	${INSTALL_SCRIPT} ${FILESDIR}/pcscd.sh \
 		${PREFIX}/etc/rc.d/pcscd.sh.sample
 	@${SED} 's,%%PREFIX%%,${PREFIX},g' < ${FILESDIR}/pkg-message.in > \
diff --git a/devel/pcsc-lite/distinfo b/devel/pcsc-lite/distinfo
index 7da46d33c5bf..c97ed7d34576 100644
--- a/devel/pcsc-lite/distinfo
+++ b/devel/pcsc-lite/distinfo
@@ -1,2 +1,2 @@
-MD5 (pcsc-lite-1.2.0.tar.gz) = 98456d274b2f4bfe74c5ab59070f8d50
-SIZE (pcsc-lite-1.2.0.tar.gz) = 790384
+MD5 (pcsc-lite-1.2.9-beta7.tar.gz) = 6457f8070e8950e66952000142b1b3bf
+SIZE (pcsc-lite-1.2.9-beta7.tar.gz) = 771887
diff --git a/devel/pcsc-lite/files/patch-doc::Makefile.in b/devel/pcsc-lite/files/patch-doc::Makefile.in
deleted file mode 100644
index da1c6720c0cd..000000000000
--- a/devel/pcsc-lite/files/patch-doc::Makefile.in
+++ /dev/null
@@ -1,12 +0,0 @@
---- 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
-+#datadir = $(prefix)/doc
- 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
deleted file mode 100644
index 6cd5a8ea39df..000000000000
--- a/devel/pcsc-lite/files/patch-etc::Makefile.in
+++ /dev/null
@@ -1,12 +0,0 @@
---- 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 = reader.conf
-
diff --git a/devel/pcsc-lite/files/pkg-message.in b/devel/pcsc-lite/files/pkg-message.in
index a23e29abf5fa..bdef6edf7383 100644
--- a/devel/pcsc-lite/files/pkg-message.in
+++ b/devel/pcsc-lite/files/pkg-message.in
@@ -4,7 +4,7 @@ PC/SC-Lite has been installed.
 You can fetch drivers from http://www.linuxnet.com/sourcedrivers.html
 
 After installing the driver, please update the pcscd configuration file
-%%PREFIX%%/etc/reader.conf by using the default
-%%PREFIX%%/etc/reader.conf.sample
+%%PREFIX%%/etc/reader.conf.d/reader.conf by using the default
+%%PREFIX%%/etc/reader.conf.d/reader.conf.sample
 
 ------------------------------------------------------------------------
diff --git a/devel/pcsc-lite/pkg-plist b/devel/pcsc-lite/pkg-plist
index 6854e2061754..33c0781a8e3f 100644
--- a/devel/pcsc-lite/pkg-plist
+++ b/devel/pcsc-lite/pkg-plist
@@ -1,33 +1,34 @@
-bin/bundleTool
 bin/formaticc
-bin/installifd
-bin/pcsc_demo
-%%PORTDOCS%%%%DOCSDIR%%/README.DAEMON
-%%PORTDOCS%%%%DOCSDIR%%/pcsc-lite-0.8.7.pdf
-%%PORTDOCS%%%%DOCSDIR%%/muscle-api-1.3.0.pdf
-%%EXAMPLESDIR%%/Makefile.am
-%%EXAMPLESDIR%%/Makefile.in
-%%EXAMPLESDIR%%/pcsc_demo.c
 etc/rc.d/pcscd.sh.sample
-etc/reader.conf.sample
-include/debuglog.h
-include/mscdefines.h
-include/musclecard.h
-include/pcsclite.h
-include/winscard.h
-include/wintypes.h
+etc/reader.conf.d/reader.conf.sample
+include/PCSC/debuglog.h
+include/PCSC/dyn_generic.h
+include/PCSC/ifdhandler.h
+include/PCSC/parser.h
+include/PCSC/pcsclite.h
+include/PCSC/sys_generic.h
+include/PCSC/thread_generic.h
+include/PCSC/winscard.h
+include/PCSC/wintypes.h
 lib/libpcsclite.a
 lib/libpcsclite.so
-lib/libpcsclite.so.0
-lib/libmusclecard.a
-lib/libmusclecard.so
-lib/libmusclecard.so.0
+lib/libpcsclite.so.1
+lib/pcsc/drivers/.keep_me
+lib/pcsc/services/.keep_me
 libdata/pkgconfig/libpcsclite.pc
-libdata/pkgconfig/libmusclecard.pc
+sbin/installifd
 sbin/pcscd
+sbin/update-reader.conf
+%%PORTDOCS%%%%DOCSDIR%%/README.DAEMON
+%%PORTDOCS%%%%DOCSDIR%%/pcsc-lite.pdf
+%%PORTDOCS%%%%DOCSDIR%%/ifdhandler-3.pdf
+%%EXAMPLESDIR%%/Makefile.am
+%%EXAMPLESDIR%%/Makefile.in
+%%EXAMPLESDIR%%/pcsc_demo.c
+@dirrm etc/reader.conf.d
+@dirrm include/PCSC
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm %%EXAMPLESDIR%%
-@dirrm libdata/pkgconfig
-@dirrm pcsc/drivers
-@dirrm pcsc/services
-@dirrm pcsc
+@dirrm lib/pcsc/drivers
+@dirrm lib/pcsc/services
+@dirrm lib/pcsc