diff --git a/devel/pcsc-cyberjack/Makefile b/devel/pcsc-cyberjack/Makefile index 32d8f684c458..de3c963727f7 100644 --- a/devel/pcsc-cyberjack/Makefile +++ b/devel/pcsc-cyberjack/Makefile @@ -1,29 +1,29 @@ PORTNAME= pcsc-cyberjack -DISTVERSION= 3.99.5final.SP16 +DISTVERSION= 3.99.5final.SP17 CATEGORIES= devel security -MASTER_SITES= https://support.reiner-sct.de/downloads/LINUX/V3.99.5_SP16/ +MASTER_SITES= https://support.reiner-sct.de/downloads/LINUX/V3.99.5_SP17/ MAINTAINER= fuz@FreeBSD.org COMMENT= Reiner SCT cyberJack card reader PCSC driver WWW= https://www.reiner-sct.com/ LICENSE= GPLv2 LGPL20 LICENSE_COMB= dual LICENSE_FILE_GPLv2= ${WRKSRC}/COPYRIGHT.GPL LICENSE_FILE_LGPL20= ${WRKSRC}/COPYRIGHT.LGPL LIB_DEPENDS= libpcsclite.so:devel/pcsc-lite USES= autoreconf dos2unix gnome libtool localbase pkgconfig tar:bzip2 USE_GNOME= libxml2 USE_LDCONFIG= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-release --with-usbdropdir=${PREFIX}/lib/pcsc/drivers DOS2UNIX_FILES= cjeca32/Debug.cpp \ cjeca32/RSCTCriticalSection.cpp \ cjeca32/RSCTCriticalSection.h INSTALL_TARGET= install-strip WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION} .include diff --git a/devel/pcsc-cyberjack/distinfo b/devel/pcsc-cyberjack/distinfo index 959fc07d49fe..c2d6efffb54a 100644 --- a/devel/pcsc-cyberjack/distinfo +++ b/devel/pcsc-cyberjack/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1728227015 -SHA256 (pcsc-cyberjack-3.99.5final.SP16.tar.bz2) = 141489261c0d436be4b92f78faf240c32694426685413d9d50e3585feba5eb79 -SIZE (pcsc-cyberjack-3.99.5final.SP16.tar.bz2) = 1787299 +TIMESTAMP = 1776510478 +SHA256 (pcsc-cyberjack-3.99.5final.SP17.tar.bz2) = f1a8e15db3a4268b0d79c32a76195b34d79518bb891685443e253311f9e9d30a +SIZE (pcsc-cyberjack-3.99.5final.SP17.tar.bz2) = 1734172 diff --git a/devel/pcsc-cyberjack/files/patch-cjeca32_Debug.cpp b/devel/pcsc-cyberjack/files/patch-cjeca32_Debug.cpp index 05e4113b67fb..c3711b3d2edb 100644 --- a/devel/pcsc-cyberjack/files/patch-cjeca32_Debug.cpp +++ b/devel/pcsc-cyberjack/files/patch-cjeca32_Debug.cpp @@ -1,11 +1,11 @@ ---- cjeca32/Debug.cpp.orig 2024-10-06 15:03:41 UTC +--- cjeca32/Debug.cpp.orig 2026-04-18 11:08:45 UTC +++ cjeca32/Debug.cpp -@@ -141,7 +141,7 @@ CDebug Debug(0xffffffff); +@@ -165,7 +165,7 @@ CDebug Debug(0xffffffff); -#elif defined(OS_LINUX) || defined(OS_DARWIN) +#elif defined(OS_LINUX) || defined(OS_DARWIN) || defined(OS_FREEBSD) #if defined(OS_DARWIN) # define DEBUG_DEFAULT_LOGFILE "/Library/Logs/cj.log" diff --git a/devel/pcsc-cyberjack/files/patch-cjeca32_RSCTCriticalSection.h b/devel/pcsc-cyberjack/files/patch-cjeca32_RSCTCriticalSection.h index 81b1df4c2d41..2d860bfe85f9 100644 --- a/devel/pcsc-cyberjack/files/patch-cjeca32_RSCTCriticalSection.h +++ b/devel/pcsc-cyberjack/files/patch-cjeca32_RSCTCriticalSection.h @@ -1,53 +1,11 @@ ---- cjeca32/RSCTCriticalSection.h.orig 2024-10-06 15:04:53 UTC +--- cjeca32/RSCTCriticalSection.h.orig 2026-04-18 11:08:45 UTC +++ cjeca32/RSCTCriticalSection.h -@@ -1,27 +1,27 @@ - #ifndef ECA_RSCTCRITICAL_H - #define ECA_RSCTCRITICAL_H -- --#ifdef _WINDOWS --#include --#endif -- --class CJECA32_PRIVATE_CLASS CRSCTCriticalSection --{ --public: -- CRSCTCriticalSection(void); --public: -- virtual ~CRSCTCriticalSection(void); --protected: --#ifdef _WINDOWS -- CRITICAL_SECTION m_hCritSec; +@@ -14,7 +14,7 @@ class CJECA32_PRIVATE_CLASS CRSCTCriticalSection (prot + protected: + #ifdef _WINDOWS + CRITICAL_SECTION m_hCritSec; -#elif defined(OS_LINUX) --#elif defined(OS_DARWIN) --// MPCriticalRegionID m_CriticalRegionID; --#endif --public: -- void Enter(void); --public: -- void Leave(void); --}; -+ -+#ifdef _WINDOWS -+#include -+#endif -+ -+class CJECA32_PRIVATE_CLASS CRSCTCriticalSection -+{ -+public: -+ CRSCTCriticalSection(void); -+public: -+ virtual ~CRSCTCriticalSection(void); -+protected: -+#ifdef _WINDOWS -+ CRITICAL_SECTION m_hCritSec; +#elif defined(OS_LINUX) || defined(OS_FREEBSD) -+#elif defined(OS_DARWIN) -+// MPCriticalRegionID m_CriticalRegionID; -+#endif -+public: -+ void Enter(void); -+public: -+ void Leave(void); -+}; - + #elif defined(OS_DARWIN) + // MPCriticalRegionID m_CriticalRegionID; #endif diff --git a/devel/pcsc-cyberjack/files/patch-cjeca32_stdafx.h b/devel/pcsc-cyberjack/files/patch-cjeca32_stdafx.h index 03baea477aa8..0eef03aaea37 100644 --- a/devel/pcsc-cyberjack/files/patch-cjeca32_stdafx.h +++ b/devel/pcsc-cyberjack/files/patch-cjeca32_stdafx.h @@ -1,11 +1,11 @@ ---- cjeca32/stdafx.h.orig 2024-10-06 15:05:20 UTC +--- cjeca32/stdafx.h.orig 2026-04-18 11:09:46 UTC +++ cjeca32/stdafx.h -@@ -59,7 +59,7 @@ - #include "ntstatus.h" +@@ -60,7 +60,7 @@ #include "cjeca32.h" + -#ifdef OS_LINUX +#if defined(OS_LINUX) || defined(OS_FREEBSD) #include - #endif - + #else + #include "PCSC10.h" diff --git a/devel/pcsc-cyberjack/files/patch-include_driver_Debug.h b/devel/pcsc-cyberjack/files/patch-include_driver_Debug.h index 701743a0990b..07cc3c86357b 100644 --- a/devel/pcsc-cyberjack/files/patch-include_driver_Debug.h +++ b/devel/pcsc-cyberjack/files/patch-include_driver_Debug.h @@ -1,19 +1,20 @@ ---- include/driver/Debug.h.orig 2021-11-03 13:00:16 UTC +--- include/driver/Debug.h.orig 2026-04-18 11:10:29 UTC +++ include/driver/Debug.h -@@ -42,14 +42,14 @@ class CJECA32_PRIVATE_CLASS CDebug (public) - public: - ~CDebug(void); +@@ -47,7 +47,7 @@ class CJECA32_PRIVATE_CLASS CDebug (public) + void SetLoggerCallback(void *p_pcUmdfCallBack); + #endif -#if defined(OS_LINUX) || defined(OS_DARWIN) +#if defined(OS_LINUX) || defined(OS_DARWIN) || defined(OS_FREEBSD) void setLevelMask(unsigned int nLevelMask); void setLogFileName(const char *fname); #endif - - private: +@@ -56,7 +56,7 @@ class CJECA32_PRIVATE_CLASS CDebug (public) unsigned int m_nLevelMask; + void* m_pcUmdfCallBack_1; + -#if defined(OS_LINUX) || defined(OS_DARWIN) +#if defined(OS_LINUX) || defined(OS_DARWIN) || defined(OS_FREEBSD) char *m_logFileName; #endif };