Update pcsc-lite to 1.8.10

Update libccid to 1.4.14
Support stagedir

6 files changed, 22 insertions, 33 deletions

diff --git a/devel/libccid/Makefile b/devel/libccid/Makefile
index 8e19856c9b65..f4bd427378d4 100644
--- a/devel/libccid/Makefile
+++ b/devel/libccid/Makefile
@@ -2,11 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	ccid
-PORTVERSION=	1.4.11
+PORTVERSION=	1.4.14
 CATEGORIES=	devel
-#MASTER_SITES=	https://alioth.debian.org/frs/download.php/3920/
-MASTER_SITES=	${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	arved
+MASTER_SITES=	https://alioth.debian.org/frs/download.php/file/3971/
 
 MAINTAINER=	arved@FreeBSD.org
 COMMENT=	Generic USB CCID (Chip/Smart Card Interface Devices) driver
@@ -28,9 +26,6 @@ CPPFLAGS+=	-I${LOCALBASE}/include
 
 PLIST_SUB=	VER=${PORTVERSION}
 
-MAN1=		RSA_SecurID_getpasswd.1
-
-NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} < 801000
@@ -47,8 +42,8 @@ post-patch:
 
 post-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/contrib/RSA_SecurID/RSA_SecurID_getpasswd \
-		${PREFIX}/bin
+		${STAGEDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/contrib/RSA_SecurID/RSA_SecurID_getpasswd.1 \
-		${MANPREFIX}/man/man1
+		${STAGEDIR}${MANPREFIX}/man/man1
 
 .include <bsd.port.post.mk>
diff --git a/devel/libccid/distinfo b/devel/libccid/distinfo
index db59128fb753..791f76a8f736 100644
--- a/devel/libccid/distinfo
+++ b/devel/libccid/distinfo
@@ -1,2 +1,2 @@
-SHA256 (ccid-1.4.11.tar.bz2) = 04ce7ebc7f591b7542e15d4dcd1c50900d0d86c0639893832f5d6144ffb3c369
-SIZE (ccid-1.4.11.tar.bz2) = 475901
+SHA256 (ccid-1.4.14.tar.bz2) = c50b04ac8e800a14246ea42cf37f73bd42fdb3645afb290b7af091f9e15cd146
+SIZE (ccid-1.4.14.tar.bz2) = 484659
diff --git a/devel/libccid/pkg-plist b/devel/libccid/pkg-plist
index 8ad2a7076e6b..a696d7a8db61 100644
--- a/devel/libccid/pkg-plist
+++ b/devel/libccid/pkg-plist
@@ -1,6 +1,7 @@
 bin/RSA_SecurID_getpasswd
 lib/pcsc/drivers/ifd-ccid.bundle/Contents/FreeBSD/libccid.so
 lib/pcsc/drivers/ifd-ccid.bundle/Contents/Info.plist
+man/man1/RSA_SecurID_getpasswd.1.gz
 @dirrm lib/pcsc/drivers/ifd-ccid.bundle/Contents/FreeBSD
 @dirrm lib/pcsc/drivers/ifd-ccid.bundle/Contents
 @dirrm lib/pcsc/drivers/ifd-ccid.bundle
diff --git a/devel/pcsc-lite/Makefile b/devel/pcsc-lite/Makefile
index ccfa5aa51ad5..768eaffe5ce8 100644
--- a/devel/pcsc-lite/Makefile
+++ b/devel/pcsc-lite/Makefile
@@ -2,12 +2,10 @@
 # $FreeBSD$
 
 PORTNAME=	pcsc-lite
-PORTVERSION=	1.8.8
+PORTVERSION=	1.8.10
 PORTEPOCH=	2
 CATEGORIES=	devel security
-#MASTER_SITES=	https://alioth.debian.org/frs/download.php/3862/
-MASTER_SITES=	${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	arved
+MASTER_SITES=	https://alioth.debian.org/frs/download.php/file/3963/
 
 MAINTAINER=	arved@FreeBSD.org
 COMMENT=	A smartcard development library
@@ -26,11 +24,6 @@ CONFIGURE_ARGS=	--enable-usbdropdir=${PREFIX}/lib/pcsc/drivers/
 
 PKGMESSAGE=	${WRKDIR}/pkg-message
 
-MAN1=		pcsc-spy.1
-MAN5=		reader.conf.5
-MAN8=		pcscd.8
-
-NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 
 .if !defined(WITHOUT_USB) && ${OSVERSION} >= 800069
@@ -60,18 +53,15 @@ pre-everything::
 .endif
 
 post-install:
-.if !defined(NOPORTEXAMPLES)
-	@${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}
-.endif
-	@${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} ${STAGEDIR}${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/example/Makefile.am ${STAGEDIR}${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/example/Makefile.in ${STAGEDIR}${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/example/pcsc_demo.c ${STAGEDIR}${EXAMPLESDIR}
+	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/pcsc/drivers
+	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/pcsc/services
+	${TOUCH} ${STAGEDIR}${PREFIX}/lib/pcsc/drivers/.keep_me
+	${TOUCH} ${STAGEDIR}${PREFIX}/lib/pcsc/services/.keep_me
 	@${SED} 's,%%PREFIX%%,${PREFIX},g' < ${FILESDIR}/pkg-message.in > \
 		${WRKDIR}/pkg-message
-	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>
diff --git a/devel/pcsc-lite/distinfo b/devel/pcsc-lite/distinfo
index 40c442b705ca..d6c4dab1b7c1 100644
--- a/devel/pcsc-lite/distinfo
+++ b/devel/pcsc-lite/distinfo
@@ -1,2 +1,2 @@
-SHA256 (pcsc-lite-1.8.8.tar.bz2) = fe66354a7e738d3ef8b4e572c7e447b85894da9262381fbf004e8abcc12885e7
-SIZE (pcsc-lite-1.8.8.tar.bz2) = 551751
+SHA256 (pcsc-lite-1.8.10.tar.bz2) = 607c4bd730526d282a63edb2ba4ee043f497877be642c5c647e37995e21f2612
+SIZE (pcsc-lite-1.8.10.tar.bz2) = 561707
diff --git a/devel/pcsc-lite/pkg-plist b/devel/pcsc-lite/pkg-plist
index fa05430df386..93667e2ed258 100644
--- a/devel/pcsc-lite/pkg-plist
+++ b/devel/pcsc-lite/pkg-plist
@@ -19,6 +19,9 @@ sbin/pcscd
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/pcsc_demo.c
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
+man/man1/pcsc-spy.1.gz
+man/man5/reader.conf.5.gz
+man/man8/pcscd.8.gz
 @dirrm lib/pcsc/services
 @dirrm lib/pcsc/drivers
 @dirrm lib/pcsc