git: 4aea30608867 - main - comms/flamp: Update 2.2.05 -> 2.2.06

[Yuri Victorovich]

The branch main has been updated by yuri:

URL: https://cgit.FreeBSD.org/ports/commit/?id=4aea30608867a640e2986998451a4653caa591e1

commit 4aea30608867a640e2986998451a4653caa591e1
Author:     Yuri Victorovich <yuri at FreeBSD.org>
AuthorDate: 2021-08-05 19:40:21 +0000
Commit:     Yuri Victorovich <yuri at FreeBSD.org>
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) {