4 files changed, 34 insertions, 31 deletions
diff --git a/devel/libccid/Makefile b/devel/libccid/Makefile
index e41d92ba117e..25c001d4477a 100644
--- a/devel/libccid/Makefile
+++ b/devel/libccid/Makefile
@@ -1,42 +1,35 @@
 PORTNAME=	ccid
-PORTVERSION=	1.6.1
+PORTVERSION=	1.6.2
 CATEGORIES=	devel
 MASTER_SITES=	https://ccid.apdu.fr/files/
+PKGNAMEPREFIX=	lib
 
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Generic driver for USB CCID and ICCD
-WWW=		https://ccid.apdu.fr/
+MAINTAINER=	sunpoet@FreeBSD.org
+COMMENT=	Generic USB CCID and ICCD driver
+WWW=		https://ccid.apdu.fr/ \
+		https://github.com/LudovicRousseau/CCID
 
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libpcsclite.so:devel/pcsc-lite
 
-USES=		perl5 pkgconfig tar:xz meson
-USE_LDCONFIG=	yes
+USES=		meson perl5 pkgconfig tar:xz
 USE_PERL5=	build
 
-MESON_ARGS=	-Dpcsclite=true
-
-.include "../../devel/pcsc-lite/Makefile.common"
-
-BUNDLE_DIR=	${USBDROPDIR}/ifd-ccid.bundle
-PLIST_DIRS=	${USBDROPDIR}
-PLIST_FILES=	bin/RSA_SecurID_getpasswd \
-		bin/Kobil_mIDentity_switch \
-		${BUNDLE_DIR}/Contents/FreeBSD/libccid.so \
-		${BUNDLE_DIR}/Contents/Info.plist \
-		share/man/man1/RSA_SecurID_getpasswd.1.gz \
-		share/man/man8/Kobil_mIDentity_switch.8.gz
+MESON_ARGS=	-Dclass=false \
+		-Dcomposite-as-multislot=false \
+		-Dembedded=false \
+		-Denable-extras=true \
+		-Dos_log=false \
+		-Dpcsclite=true \
+		-Dserial=false \
+		-Dzlp=false
 
 post-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/${MESON_BUILD_DIR}/Kobil_mIDentity_switch \
-		${STAGEDIR}${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/contrib/Kobil_mIDentity_switch/Kobil_mIDentity_switch.8 \
-		${STAGEDIR}${PREFIX}/share/man/man8
-	${INSTALL_PROGRAM} ${WRKSRC}/${MESON_BUILD_DIR}/RSA_SecurID_getpasswd \
-		${STAGEDIR}${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/contrib/RSA_SecurID/RSA_SecurID_getpasswd.1 \
-		${STAGEDIR}${PREFIX}/share/man/man1
+	${INSTALL_PROGRAM} ${WRKSRC}/_build/Kobil_mIDentity_switch ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/_build/RSA_SecurID_getpasswd ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/contrib/RSA_SecurID/RSA_SecurID_getpasswd.1 ${STAGEDIR}${PREFIX}/share/man/man1
+	${INSTALL_MAN} ${WRKSRC}/contrib/Kobil_mIDentity_switch/Kobil_mIDentity_switch.8 ${STAGEDIR}${PREFIX}/share/man/man8
 
 .include <bsd.port.mk>
diff --git a/devel/libccid/distinfo b/devel/libccid/distinfo
index b4ccba61017f..3c9c272fe063 100644
--- a/devel/libccid/distinfo
+++ b/devel/libccid/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1723636201
-SHA256 (ccid-1.6.1.tar.xz) = 2eca8fb07e8fe7c0d39daeaca7b97cd73c40ed9b72738a24ad3dcbdfc918e1ea
-SIZE (ccid-1.6.1.tar.xz) = 195844
+TIMESTAMP = 1756528842
+SHA256 (ccid-1.6.2.tar.xz) = 41958410950157e622f9d91c9e78c7b708db74e22f71190c581d24d20564d449
+SIZE (ccid-1.6.2.tar.xz) = 197088
diff --git a/devel/libccid/pkg-descr b/devel/libccid/pkg-descr
index dbdc00f8fbd5..95daf7a40234 100644
--- a/devel/libccid/pkg-descr
+++ b/devel/libccid/pkg-descr
@@ -1,2 +1,6 @@
-Generic driver for USB CCID (Chip/Smart Card Interface Devices) and ICCD
-(Integrated Circuit(s) Card Devices).
+This package provides the source code for a generic USB CCID (Chip/Smart Card
+Interface Devices) and ICCD (Integrated Circuit(s) Card Devices) driver. See the
+USB CCID [1] and ICCD [2] specifications from the USB working group.
+
+[1] https://www.usb.org/sites/default/files/DWG_Smart-Card_CCID_Rev110.pdf
+[2] https://www.usb.org/sites/default/files/DWG_Smart-Card_USB-ICC_ICCD_rev10.pdf
diff --git a/devel/libccid/pkg-plist b/devel/libccid/pkg-plist
new file mode 100644
index 000000000000..1fe9d248b5ba
--- /dev/null
+++ b/devel/libccid/pkg-plist
@@ -0,0 +1,6 @@
+bin/Kobil_mIDentity_switch
+bin/RSA_SecurID_getpasswd
+lib/pcsc/drivers/ifd-ccid.bundle/Contents/FreeBSD/libccid.so
+lib/pcsc/drivers/ifd-ccid.bundle/Contents/Info.plist
+share/man/man1/RSA_SecurID_getpasswd.1.gz
+share/man/man8/Kobil_mIDentity_switch.8.gz