4 files changed, 23 insertions, 8 deletions

diff --git a/devel/pcsc-lite/Makefile b/devel/pcsc-lite/Makefile
index 2847eabfe97f..d6973a6a23c7 100644
--- a/devel/pcsc-lite/Makefile
+++ b/devel/pcsc-lite/Makefile
@@ -8,6 +8,7 @@
 PORTNAME=	pcsc-lite
 PORTVERSION=	1.2.9.b.9
 PORTEPOCH=	2
+PORTREVISION=	1
 CATEGORIES=	devel security
 MASTER_SITES=	http://alioth.debian.org/download.php/1289/
 DISTNAME=	pcsc-lite-${PORTVERSION:S/.b./-beta/}
@@ -38,7 +39,7 @@ USE_GETOPT_LONG=yes
 PKGMESSAGE=	${WRKDIR}/pkg-message
 MAN1=		formaticc.1
 MAN5=		reader.conf.5
-MAN8=		pcscd.8
+MAN8=		pcscd.8 bundleTool.8
 
 .if !defined(WITHOUT_USB)
 LIB_DEPENDS+=	usb-0.1.8:${PORTSDIR}/devel/libusb
@@ -72,9 +73,8 @@ post-install:
 	@${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.d/reader.conf.sample
+		${PREFIX}/etc/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/files/patch-libmusclecard-doc-Makefile.in b/devel/pcsc-lite/files/patch-libmusclecard-doc-Makefile.in
new file mode 100644
index 000000000000..cdb629025a29
--- /dev/null
+++ b/devel/pcsc-lite/files/patch-libmusclecard-doc-Makefile.in
@@ -0,0 +1,11 @@
+--- 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/files/pkg-message.in b/devel/pcsc-lite/files/pkg-message.in
index bdef6edf7383..24066a47a245 100644
--- a/devel/pcsc-lite/files/pkg-message.in
+++ b/devel/pcsc-lite/files/pkg-message.in
@@ -2,9 +2,14 @@
 
 PC/SC-Lite has been installed.
 You can fetch drivers from http://www.linuxnet.com/sourcedrivers.html
+or install one of the following ports:
+devel/libccid
+security/ifd-gempc410
+security/ifd-gpr400
+security/ifd-slb_rf60
 
 After installing the driver, please update the pcscd configuration file
-%%PREFIX%%/etc/reader.conf.d/reader.conf by using the default
-%%PREFIX%%/etc/reader.conf.d/reader.conf.sample
+%%PREFIX%%/etc/reader.conf by using the default
+%%PREFIX%%/etc/reader.conf.sample
 
 ------------------------------------------------------------------------
diff --git a/devel/pcsc-lite/pkg-plist b/devel/pcsc-lite/pkg-plist
index a63ac204b4bb..23d0b58101b4 100644
--- a/devel/pcsc-lite/pkg-plist
+++ b/devel/pcsc-lite/pkg-plist
@@ -1,6 +1,5 @@
 bin/formaticc
-etc/rc.d/pcscd.sh.sample
-etc/reader.conf.d/reader.conf.sample
+etc/reader.conf.sample
 include/PCSC/debuglog.h
 include/PCSC/ifdhandler.h
 include/PCSC/mscdefines.h
@@ -26,10 +25,10 @@ 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
-@dirrm etc/reader.conf.d
 @dirrm include/PCSC
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm %%EXAMPLESDIR%%