From nobody Tue Jan 23 12:48:03 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TK6M76zLbz580Gj; Tue, 23 Jan 2024 12:48:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TK6M75gkCz4Cf1; Tue, 23 Jan 2024 12:48:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706014083; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ozzdUdOLHkhfBG4c5Cq5c31ctQ9nrSo0T2AuWov7Deg=; b=Z47QJqZmZEQn2R4PEELtyAsmGUSiPnhBCLh46cBFbsXw8pmqNS6DcyICCDHOGnQLZu81ES BT44hOC283dFM2CLC2KL8y5acaE9CdAPrTItvWF80CdIyvJaM441NxbbYujrpV5+sNdjaP YhTtMAC5HA4CmlLGiI6MZQbPvwa+4EMOUDObWwhnoQ3Nfq0WVUXkW/N0JS2G/v4AC72oaX bDzpYz+lqVkkg95L5Uw74bigXco3ntkpzH9e80GEPOFVkTdXZtMgz4D8vTymvPZ595CeYv gOWbTFwPVMcSv4Afqlyei8niKG2jPqdNMZGbaCELyJYivB9yP35F51hBruNfqw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706014083; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ozzdUdOLHkhfBG4c5Cq5c31ctQ9nrSo0T2AuWov7Deg=; b=TEnuy7gjxpUX5DWD7a/CJq96wn07vTuoTNnI+14vFJ0DaJeLmFrEHQEEVulZL608BSj4Xi iIf9lcAa8qJdkf07uOfvwpvqZXl8KkEnkd77oimdTlRBvoEBas75ZDuhT5PtZJMjAoeN8v RPu0S+eZY74W4kZr6ciRyOZakHB490KrPbOPZfSPEKurnRtqrfL+4eNae5OdU/PUZEF3oI SfbBu71285cbswcUObjhCtmKfwYSThBdGsyAHwRFlx/HqzsUy1r7WpDI6g6tzvdGqNrY/W Ig1xJE9m8S9IZbqRMrEcvnG5q+xyPJwFPCjKusWsAXGxCI6Ic2Xmu4jpiVC2lw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706014083; a=rsa-sha256; cv=none; b=wXF2AU1P7HWn5yo3S2bm7VKeqHsNVGvaH/6Y/LUc4j6GNv1hCdZNQ9YIoZzdw/HOc3ZtIm pKURj1pCSFhoY4cjkDpI92r+z+xIHqu6pRlYLSpoJ0xPsxhZfWcAuSw/QPfKwX6RdqEGzj izT7bVootFdlAPM0JMtUfXw4kG36IzsWF7NJJDzEXAtBWeMBKa+h2XhnOu2E+QPBb0o7JV hKytSrcau9fGSpwJF/uT2wokpVOOUrU34iiYHWZVIVneE+Hjf8PD9SNbjb7gsEGM3RkmVV 6W1tJpNjf0KwSv3BjWoLvUsuQoB4/Qa48mcCmeqlTD3fUXmqNsdi2MDnDU8yaw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TK6M74nKdzWlZ; Tue, 23 Jan 2024 12:48:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 40NCm39O064450; Tue, 23 Jan 2024 12:48:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40NCm3aX064447; Tue, 23 Jan 2024 12:48:03 GMT (envelope-from git) Date: Tue, 23 Jan 2024 12:48:03 GMT Message-Id: <202401231248.40NCm3aX064447@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Alexey Dokuchaev Subject: git: 37fed8066f09 - main - devel/pcsc-cyberjack: the port had been improved (+) List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: danfe X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 37fed8066f0919c491069d3c13cbb9aad9f06c1e Auto-Submitted: auto-generated The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=37fed8066f0919c491069d3c13cbb9aad9f06c1e commit 37fed8066f0919c491069d3c13cbb9aad9f06c1e Author: Alexey Dokuchaev AuthorDate: 2024-01-23 12:46:56 +0000 Commit: Alexey Dokuchaev 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 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 +