Date: Tue, 23 Jan 2024 12:48:03 GMT From: Alexey Dokuchaev <danfe@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 37fed8066f09 - main - devel/pcsc-cyberjack: the port had been improved (+) Message-ID: <202401231248.40NCm3aX064447@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=37fed8066f0919c491069d3c13cbb9aad9f06c1e commit 37fed8066f0919c491069d3c13cbb9aad9f06c1e Author: Alexey Dokuchaev <danfe@FreeBSD.org> AuthorDate: 2024-01-23 12:46:56 +0000 Commit: Alexey Dokuchaev <danfe@FreeBSD.org> CommitDate: 2024-01-23 12:46:56 +0000 devel/pcsc-cyberjack: the port had been improved (+) - Chase HTTP/1.1 redirections in MASTER_SITES and WWW line - Tame dos2unix(1) to not touch every file, cleanup Makefile - No longer needlessly depends on GNU libstdc++ and make(1) PR: 273675 (inspired by) --- devel/pcsc-cyberjack/Makefile | 25 ++++++++---------------- devel/pcsc-cyberjack/files/patch-ifd-Makefile.am | 5 ++++- 2 files changed, 12 insertions(+), 18 deletions(-) diff --git a/devel/pcsc-cyberjack/Makefile b/devel/pcsc-cyberjack/Makefile index 505679c4c362..54fd78927ec6 100644 --- a/devel/pcsc-cyberjack/Makefile +++ b/devel/pcsc-cyberjack/Makefile @@ -1,13 +1,13 @@ PORTNAME= pcsc-cyberjack DISTVERSION= 3.99.5final.SP15 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel security -MASTER_SITES= https://support.reiner-sct.de/downloads/LINUX/V3.99.5_SP15/ +MASTER_SITES= https://downloads.reiner-sct.de/LINUX/V3.99.5_SP15/ DISTNAME= ${PORTNAME}_${DISTVERSION} MAINTAINER= tm@NetBSD.org -COMMENT= Reiner SCT cyberJack card reader pcsc driver -WWW= https://www.reiner-sct.de +COMMENT= Reiner SCT cyberJack card reader PCSC driver +WWW= https://www.reiner-sct.com/ LICENSE= GPLv2 LGPL20 LICENSE_COMB= dual @@ -17,22 +17,13 @@ LICENSE_FILE_LGPL20= ${WRKSRC}/COPYRIGHT.LGPL LIB_DEPENDS= libpcsclite.so:devel/pcsc-lite \ libxml2.so:textproc/libxml2 -USES= autoreconf compiler:c++11-lib dos2unix gmake libtool pkgconfig \ - tar:bzip2 - -USE_GCC= 12 +USES= autoreconf dos2unix libtool localbase pkgconfig tar:bzip2 USE_LDCONFIG= yes GNU_CONFIGURE= yes - -WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION} - CONFIGURE_ARGS= --enable-release --with-usbdropdir=${PREFIX}/lib/pcsc/drivers -CONFIGURE_ENV= LIBUSB_CFLAGS="-I${LOCALBASE}/include" \ - LIBUSB_LIBS="-L${LOCALBASE}/lib -lusb" -CXXFLAGS+= -Wno-c++11-narrowing -CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} -LDFLAGS+= ${PTHREAD_LIBS} +DOS2UNIX_FILES= cjeca32/Debug.cpp cjeca32/RSCTCriticalSection.cpp +INSTALL_TARGET= install-strip -PLIST_SUB= VER=${PORTVERSION} +WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION} .include <bsd.port.mk> diff --git a/devel/pcsc-cyberjack/files/patch-ifd-Makefile.am b/devel/pcsc-cyberjack/files/patch-ifd-Makefile.am index 710b72b046b1..dd5464dfe15b 100644 --- a/devel/pcsc-cyberjack/files/patch-ifd-Makefile.am +++ b/devel/pcsc-cyberjack/files/patch-ifd-Makefile.am @@ -1,6 +1,6 @@ --- ifd/Makefile.am.orig 2021-11-03 13:00:16 UTC +++ ifd/Makefile.am -@@ -23,6 +23,11 @@ bundleosxdir=$(usbdropdir)/libifd-cyberjack.bundle/Con +@@ -23,8 +23,13 @@ bundleosxdir=$(usbdropdir)/libifd-cyberjack.bundle/Con bundleosx_LTLIBRARIES=libifd-cyberjack.la endif @@ -12,3 +12,6 @@ libifd_cyberjack_la_SOURCES=ifd.cpp libifd_cyberjack_la_LDFLAGS=-version-info @CYBERJACK_SO_CURRENT@:@CYBERJACK_SO_REVISION@:@CYBERJACK_SO_AGE@ -no-undefined #libifd_cyberjack_la_LIBADD=$(top_builddir)/cjeca32/libeca.la $(top_builddir)/cjeca32/ausb/libausb.la +-libifd_cyberjack_la_LIBADD=$(top_builddir)/cjeca32/libeca.la -lstdc++ ++libifd_cyberjack_la_LIBADD=$(top_builddir)/cjeca32/libeca.la +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202401231248.40NCm3aX064447>