git: fc94b4e3dde6 - main - devel/libccid: Update to 1.6.1
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 14 Aug 2024 12:24:39 UTC
The branch main has been updated by arrowd:
URL: https://cgit.FreeBSD.org/ports/commit/?id=fc94b4e3dde63313c7f915630c496fe3d50e19a0
commit fc94b4e3dde63313c7f915630c496fe3d50e19a0
Author: Marcin Cieślak <saper@saper.info>
AuthorDate: 2024-08-14 12:00:31 +0000
Commit: Gleb Popov <arrowd@FreeBSD.org>
CommitDate: 2024-08-14 12:24:30 +0000
devel/libccid: Update to 1.6.1
Extract the common variable between this port and pcsc-lite into a separate
include.
Sponsored by: Serenity Cybersecurity, LLC
Co-authored-by: Gleb Popov <arrowd@FreeBSD.org>
Differential Revision: https://reviews.freebsd.org/D45456
---
devel/libccid/Makefile | 29 ++++++++++++++++-------------
devel/libccid/distinfo | 6 +++---
devel/pcsc-lite/Makefile | 4 +++-
devel/pcsc-lite/Makefile.common | 1 +
4 files changed, 23 insertions(+), 17 deletions(-)
diff --git a/devel/libccid/Makefile b/devel/libccid/Makefile
index 27164338b665..e41d92ba117e 100644
--- a/devel/libccid/Makefile
+++ b/devel/libccid/Makefile
@@ -1,6 +1,5 @@
PORTNAME= ccid
-PORTVERSION= 1.5.5
-PORTREVISION= 1
+PORTVERSION= 1.6.1
CATEGORIES= devel
MASTER_SITES= https://ccid.apdu.fr/files/
@@ -13,27 +12,31 @@ LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libpcsclite.so:devel/pcsc-lite
-USES= perl5 pkgconfig tar:bzip2
+USES= perl5 pkgconfig tar:xz meson
USE_LDCONFIG= yes
USE_PERL5= build
-GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --enable-usbdropdir=${PREFIX}/lib/pcsc/drivers \
- --enable-ccidtwindir=${PREFIX}/lib/pcsc/drivers/serial
+MESON_ARGS= -Dpcsclite=true
-LDFLAGS= -pthread
-INSTALL_TARGET= install-strip
+.include "../../devel/pcsc-lite/Makefile.common"
+BUNDLE_DIR= ${USBDROPDIR}/ifd-ccid.bundle
+PLIST_DIRS= ${USBDROPDIR}
PLIST_FILES= 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
+ 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
post-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/contrib/RSA_SecurID/RSA_SecurID_getpasswd \
+ ${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
- ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/pcsc/drivers/ifd-ccid.bundle/Contents/FreeBSD/libccid.so
.include <bsd.port.mk>
diff --git a/devel/libccid/distinfo b/devel/libccid/distinfo
index 745e909808c5..b4ccba61017f 100644
--- a/devel/libccid/distinfo
+++ b/devel/libccid/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1709534464
-SHA256 (ccid-1.5.5.tar.bz2) = 194708f75fe369d45dd7c15e8b3e8a7db8b49cfc5557574ca2a2e76ef12ca0ca
-SIZE (ccid-1.5.5.tar.bz2) = 708374
+TIMESTAMP = 1723636201
+SHA256 (ccid-1.6.1.tar.xz) = 2eca8fb07e8fe7c0d39daeaca7b97cd73c40ed9b72738a24ad3dcbdfc918e1ea
+SIZE (ccid-1.6.1.tar.xz) = 195844
diff --git a/devel/pcsc-lite/Makefile b/devel/pcsc-lite/Makefile
index 601309f9e0b9..18ec90600abd 100644
--- a/devel/pcsc-lite/Makefile
+++ b/devel/pcsc-lite/Makefile
@@ -19,11 +19,13 @@ USE_RC_SUBR= pcscd
SHEBANG_FILES= src/spy/pcsc-spy
+.include "Makefile.common"
+
MESON_ARGS= -Dlibsystemd=false \
-Dlibudev=false \
-Dlibusb=true \
-Dusb=true \
- -Dusbdropdir=${PREFIX}/lib/pcsc/drivers/ \
+ -Dusbdropdir=${USBDROPDIR}/ \
-Dipcdir=/var/run
SUB_FILES= pkg-message
diff --git a/devel/pcsc-lite/Makefile.common b/devel/pcsc-lite/Makefile.common
new file mode 100644
index 000000000000..d7c9761863f6
--- /dev/null
+++ b/devel/pcsc-lite/Makefile.common
@@ -0,0 +1 @@
+USBDROPDIR= ${PREFIX}/lib/pcsc/drivers