From owner-dev-commits-ports-main@freebsd.org Thu Aug 5 20:28:22 2021 Return-Path: Delivered-To: dev-commits-ports-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 31E7C669A6E; Thu, 5 Aug 2021 20:28:22 +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 4GggD60mKDz4THT; Thu, 5 Aug 2021 20:28:22 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 00D9C20BAB; Thu, 5 Aug 2021 20:28:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 175KSLGi092456; Thu, 5 Aug 2021 20:28:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 175KSLs4092455; Thu, 5 Aug 2021 20:28:21 GMT (envelope-from git) Date: Thu, 5 Aug 2021 20:28:21 GMT Message-Id: <202108052028.175KSLs4092455@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yuri Victorovich Subject: git: 4aea30608867 - main - comms/flamp: Update 2.2.05 -> 2.2.06 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4aea30608867a640e2986998451a4653caa591e1 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the main branch of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Aug 2021 20:28:22 -0000 The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=4aea30608867a640e2986998451a4653caa591e1 commit 4aea30608867a640e2986998451a4653caa591e1 Author: Yuri Victorovich AuthorDate: 2021-08-05 19:40:21 +0000 Commit: Yuri Victorovich CommitDate: 2021-08-05 20:10:24 +0000 comms/flamp: Update 2.2.05 -> 2.2.06 Reported by: portscout --- comms/flamp/Makefile | 2 +- comms/flamp/distinfo | 6 ++--- comms/flamp/files/patch-src_flamp.cxx | 29 ---------------------- .../flamp/files/patch-src_utils_transmit__camp.cxx | 11 -------- 4 files changed, 4 insertions(+), 44 deletions(-) diff --git a/comms/flamp/Makefile b/comms/flamp/Makefile index c3cf97ee041b..9b393e0d8f3b 100644 --- a/comms/flamp/Makefile +++ b/comms/flamp/Makefile @@ -1,5 +1,5 @@ PORTNAME= flamp -DISTVERSION= 2.2.05 +DISTVERSION= 2.2.06 CATEGORIES= comms hamradio MASTER_SITES= SF/fldigi/flamp/ diff --git a/comms/flamp/distinfo b/comms/flamp/distinfo index cab3dec618cd..ccf579a5f3f3 100644 --- a/comms/flamp/distinfo +++ b/comms/flamp/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1581130407 -SHA256 (flamp-2.2.05.tar.gz) = 64b2c13d4053571b471fc2a840dfb0175a6135fd154811a1c1ebb806e19be1a7 -SIZE (flamp-2.2.05.tar.gz) = 518900 +TIMESTAMP = 1628190315 +SHA256 (flamp-2.2.06.tar.gz) = 6600283edf53c785cafdaa1285b3d356d9963fdb15d0fa13eb812851a21c3099 +SIZE (flamp-2.2.06.tar.gz) = 518414 diff --git a/comms/flamp/files/patch-src_flamp.cxx b/comms/flamp/files/patch-src_flamp.cxx deleted file mode 100644 index 50fc8fb8949f..000000000000 --- a/comms/flamp/files/patch-src_flamp.cxx +++ /dev/null @@ -1,29 +0,0 @@ ---- src/flamp.cxx.orig 2020-02-08 03:11:19 UTC -+++ src/flamp.cxx -@@ -838,7 +838,7 @@ void addfile(std::string xmtfname, void *rx, bool useC - int use_comp_on_file = 0; - int use_forced_comp_on_file = 0; - -- if(rx > 0 && !rAmp->rx_completed()) { -+ if(rx != nullptr && !rAmp->rx_completed()) { - fl_alert2("Only completed files can be transfered"); - return; - } -@@ -934,7 +934,7 @@ void addfile(std::string xmtfname, void *rx, bool useC - - LOG_INFO("File added to transmit queue: %s", xmtfname.c_str()); - -- if(rx > 0) { -+ if(rx != nullptr) { - cAmp *rAmp = (cAmp *) rx; - int xfrBlockSize = rAmp->rx_blocksize_int(); - -@@ -2649,7 +2649,7 @@ int parse_args(int argc, char **argv, int& idx) - - - if (strcasecmp(argv[idx], "--version") == 0) { -- printf("Version: "VERSION"\n"); -+ printf("Version: " VERSION "\n"); - exit (0); - } - return 0; diff --git a/comms/flamp/files/patch-src_utils_transmit__camp.cxx b/comms/flamp/files/patch-src_utils_transmit__camp.cxx deleted file mode 100644 index 2e1df66065d7..000000000000 --- a/comms/flamp/files/patch-src_utils_transmit__camp.cxx +++ /dev/null @@ -1,11 +0,0 @@ ---- src/utils/transmit_camp.cxx.orig 2020-02-08 03:12:42 UTC -+++ src/utils/transmit_camp.cxx -@@ -285,7 +285,7 @@ void * create_tx_table(void *ptr) - - LOG_DEBUG("Mode %s overhead=%f", mode_name.c_str(), overhead); - -- fprintf(fd, "\t{\n\t\t(char *) \"%s\", 1.0, "P_RELSOL2", \n\t\t{\n\t\t\t", mode_name.c_str(), overhead); -+ fprintf(fd, "\t{\n\t\t(char *) \"%s\", 1.0, " P_RELSOL2 ", \n\t\t{\n\t\t\t", mode_name.c_str(), overhead); - fflush(fd); - - if(mode_name.find("Olivia") != string::npos || mode_name.find("MT63") != string::npos) {