git: 0d17e7fbddbc - main - devel/pcsc-cyberjack: update to 3.99.5final.SP16
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sun, 06 Oct 2024 16:16:52 UTC
The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=0d17e7fbddbcc0503e28ec4029c4c4e78eefddd4 commit 0d17e7fbddbcc0503e28ec4029c4c4e78eefddd4 Author: Robert Clausecker <fuz@FreeBSD.org> AuthorDate: 2024-10-06 15:15:01 +0000 Commit: Robert Clausecker <fuz@FreeBSD.org> CommitDate: 2024-10-06 16:16:18 +0000 devel/pcsc-cyberjack: update to 3.99.5final.SP16 - update adds support for the REINER SCT cyberJack RFID standard EN - grab maintainership; tm@ no longer runs any FreeBSD gear and can thus no longer take care of the port (cf PR 273675) --- devel/pcsc-cyberjack/Makefile | 12 ++--- devel/pcsc-cyberjack/distinfo | 6 +-- devel/pcsc-cyberjack/files/patch-cjeca32_Debug.cpp | 10 ++-- .../files/patch-cjeca32_RSCTCriticalSection.h | 53 ++++++++++++++++++++++ devel/pcsc-cyberjack/files/patch-cjeca32_stdafx.h | 11 +++++ 5 files changed, 78 insertions(+), 14 deletions(-) diff --git a/devel/pcsc-cyberjack/Makefile b/devel/pcsc-cyberjack/Makefile index 54fd78927ec6..d6e574a664bf 100644 --- a/devel/pcsc-cyberjack/Makefile +++ b/devel/pcsc-cyberjack/Makefile @@ -1,11 +1,9 @@ PORTNAME= pcsc-cyberjack -DISTVERSION= 3.99.5final.SP15 -PORTREVISION= 3 +DISTVERSION= 3.99.5final.SP16 CATEGORIES= devel security -MASTER_SITES= https://downloads.reiner-sct.de/LINUX/V3.99.5_SP15/ -DISTNAME= ${PORTNAME}_${DISTVERSION} +MASTER_SITES= https://support.reiner-sct.de/downloads/LINUX/V3.99.5_SP16/ -MAINTAINER= tm@NetBSD.org +MAINTAINER= fuz@FreeBSD.org COMMENT= Reiner SCT cyberJack card reader PCSC driver WWW= https://www.reiner-sct.com/ @@ -21,7 +19,9 @@ USES= autoreconf dos2unix libtool localbase pkgconfig tar:bzip2 USE_LDCONFIG= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-release --with-usbdropdir=${PREFIX}/lib/pcsc/drivers -DOS2UNIX_FILES= cjeca32/Debug.cpp cjeca32/RSCTCriticalSection.cpp +DOS2UNIX_FILES= cjeca32/Debug.cpp \ + cjeca32/RSCTCriticalSection.cpp \ + cjeca32/RSCTCriticalSection.h INSTALL_TARGET= install-strip WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION} diff --git a/devel/pcsc-cyberjack/distinfo b/devel/pcsc-cyberjack/distinfo index 8f6e4218e79b..959fc07d49fe 100644 --- a/devel/pcsc-cyberjack/distinfo +++ b/devel/pcsc-cyberjack/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1667424080 -SHA256 (pcsc-cyberjack_3.99.5final.SP15.tar.bz2) = acb7c2832450718756713767c4b3ef500832d652ed51b35110b910b11ebd467a -SIZE (pcsc-cyberjack_3.99.5final.SP15.tar.bz2) = 1681827 +TIMESTAMP = 1728227015 +SHA256 (pcsc-cyberjack-3.99.5final.SP16.tar.bz2) = 141489261c0d436be4b92f78faf240c32694426685413d9d50e3585feba5eb79 +SIZE (pcsc-cyberjack-3.99.5final.SP16.tar.bz2) = 1787299 diff --git a/devel/pcsc-cyberjack/files/patch-cjeca32_Debug.cpp b/devel/pcsc-cyberjack/files/patch-cjeca32_Debug.cpp index c5b6b960ed66..05e4113b67fb 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 2021-11-03 13:00:16 UTC +--- cjeca32/Debug.cpp.orig 2024-10-06 15:03:41 UTC +++ cjeca32/Debug.cpp @@ -141,7 +141,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 new file mode 100644 index 000000000000..81b1df4c2d41 --- /dev/null +++ b/devel/pcsc-cyberjack/files/patch-cjeca32_RSCTCriticalSection.h @@ -0,0 +1,53 @@ +--- cjeca32/RSCTCriticalSection.h.orig 2024-10-06 15:04:53 UTC ++++ cjeca32/RSCTCriticalSection.h +@@ -1,27 +1,27 @@ + #ifndef ECA_RSCTCRITICAL_H + #define ECA_RSCTCRITICAL_H +- +-#ifdef _WINDOWS +-#include <windows.h> +-#endif +- +-class CJECA32_PRIVATE_CLASS CRSCTCriticalSection +-{ +-public: +- CRSCTCriticalSection(void); +-public: +- virtual ~CRSCTCriticalSection(void); +-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 <windows.h> ++#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); ++}; + + #endif diff --git a/devel/pcsc-cyberjack/files/patch-cjeca32_stdafx.h b/devel/pcsc-cyberjack/files/patch-cjeca32_stdafx.h new file mode 100644 index 000000000000..03baea477aa8 --- /dev/null +++ b/devel/pcsc-cyberjack/files/patch-cjeca32_stdafx.h @@ -0,0 +1,11 @@ +--- cjeca32/stdafx.h.orig 2024-10-06 15:05:20 UTC ++++ cjeca32/stdafx.h +@@ -59,7 +59,7 @@ + #include "ntstatus.h" + + #include "cjeca32.h" +-#ifdef OS_LINUX ++#if defined(OS_LINUX) || defined(OS_FREEBSD) + #include <PCSC/reader.h> + #endif +