git: 5842b9081bc0 - main - comms/fldigi: Update to 4.1.21
- Reply: Charlie Li : "Re: git: 5842b9081bc0 - main - comms/fldigi: Update to 4.1.21"
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 05 May 2022 23:46:07 UTC
The branch main has been updated by db: URL: https://cgit.FreeBSD.org/ports/commit/?id=5842b9081bc00b7c21fdec3496baf66cdc37e98c commit 5842b9081bc00b7c21fdec3496baf66cdc37e98c Author: Diane Bruce <db@FreeBSD.org> AuthorDate: 2022-05-05 23:41:03 +0000 Commit: Diane Bruce <db@FreeBSD.org> CommitDate: 2022-05-05 23:45:55 +0000 comms/fldigi: Update to 4.1.21 Version 4.1.21 * Maintenance release . many changes, refer to git log IPC log report * change logging date report to date ON vice date OFF xmlrpc methods * add new methods all data in ADIF 3.1.2 compliant format . logbook.last_record . logbook.all_records * add new methods as ADIF 3.1.2 compliant strings . modem.get_mode . modem.get_submode * add new date-time methods . log.get_time_on . log.get_date_on . log.get_time_off . log.get_date_off date-time correctly synchronized and in ZULU time --- comms/fldigi/Makefile | 3 +- comms/fldigi/distinfo | 6 ++-- comms/fldigi/files/patch-src_Makefile.am | 8 ++--- comms/fldigi/files/patch-src_cw__rtty_fsk.cxx | 34 ++++++++++++++++++++++ .../fldigi/files/patch-src_dialogs_confdialog.cxx | 8 ++--- comms/fldigi/files/patch-src_main.cxx | 4 +-- comms/fldigi/files/patch-src_misc_newinstall.cxx | 4 +-- comms/fldigi/files/patch-src_rigcontrol_ptt.cxx | 10 +++---- 8 files changed, 55 insertions(+), 22 deletions(-) diff --git a/comms/fldigi/Makefile b/comms/fldigi/Makefile index 8b8d1e1eb7de..85e68ad4f05a 100644 --- a/comms/fldigi/Makefile +++ b/comms/fldigi/Makefile @@ -1,6 +1,5 @@ PORTNAME= fldigi -DISTVERSION= 4.1.20 -PORTREVISION= 1 +DISTVERSION= 4.1.21 CATEGORIES= comms hamradio MASTER_SITES= http://www.w1hkj.com/files/fldigi/ diff --git a/comms/fldigi/distinfo b/comms/fldigi/distinfo index 314280bf2327..2463e37321c7 100644 --- a/comms/fldigi/distinfo +++ b/comms/fldigi/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1628191896 -SHA256 (fldigi-4.1.20.tar.gz) = 5030900a0f6905eb86dbe68e41fff0be781eecee6d42007675540e2a23bec438 -SIZE (fldigi-4.1.20.tar.gz) = 4906451 +TIMESTAMP = 1651702389 +SHA256 (fldigi-4.1.21.tar.gz) = 43a8768c0f8fcffe5509eede1f7e95f18ed6290de3e46573424019a8fb8f8d70 +SIZE (fldigi-4.1.21.tar.gz) = 4931218 diff --git a/comms/fldigi/files/patch-src_Makefile.am b/comms/fldigi/files/patch-src_Makefile.am index 57de2fd01802..93ec2bb71c05 100644 --- a/comms/fldigi/files/patch-src_Makefile.am +++ b/comms/fldigi/files/patch-src_Makefile.am @@ -1,6 +1,6 @@ ---- src/Makefile.am.orig 2021-06-24 11:46:05 UTC +--- src/Makefile.am.orig 2022-03-18 02:06:06 UTC +++ src/Makefile.am -@@ -503,8 +503,6 @@ clean-local: +@@ -503,8 +503,6 @@ fldigi_SOURCES += \ # Sources that we build. It is OK to have headers here. fldigi_SOURCES += \ @@ -9,7 +9,7 @@ combo/combo.cxx \ config_script/create_default_script.cxx \ config_script/run_script.h \ -@@ -707,9 +705,6 @@ fldigi_SOURCES += \ +@@ -709,9 +707,6 @@ EXTRA_fldigi_SOURCES += \ EXTRA_fldigi_SOURCES += \ blank/blank.cxx \ blank/blank.h \ @@ -19,7 +19,7 @@ dialogs/fl_digi_main.cxx \ dxcluster/arc-help.cxx \ dxcluster/CCC_Commands.cxx \ -@@ -762,7 +757,6 @@ EXTRA_fldigi_SOURCES += \ +@@ -764,7 +759,6 @@ EXTRA_fldigi_SOURCES += \ include/calendar.h \ include/charsetdistiller.h \ include/charsetlist.h \ diff --git a/comms/fldigi/files/patch-src_cw__rtty_fsk.cxx b/comms/fldigi/files/patch-src_cw__rtty_fsk.cxx new file mode 100644 index 000000000000..641c408461e7 --- /dev/null +++ b/comms/fldigi/files/patch-src_cw__rtty_fsk.cxx @@ -0,0 +1,34 @@ +--- src/cw_rtty/fsk.cxx.orig 2022-05-04 22:44:19 UTC ++++ src/cw_rtty/fsk.cxx +@@ -39,7 +39,9 @@ + #include <string.h> + #include <unistd.h> + +-//#include <time.h> ++#ifdef __FreeBSD__ ++#include <time.h> ++#else + #if !HAVE_CLOCK_GETTIME + # ifdef __APPLE__ + # include <mach/mach_time.h> +@@ -50,10 +52,12 @@ + # include <sys/time.h> + # endif + #endif ++#endif + + #include <math.h> + #include <stdio.h> + ++#ifndef __FreeBSD__ + #ifdef __WIN32__ + # include <windows.h> + //# include <chrono> +@@ -67,6 +71,7 @@ + //# include <chrono> + # include <sys/timerfd.h> + # endif ++#endif + #endif + + #include "threads.h" diff --git a/comms/fldigi/files/patch-src_dialogs_confdialog.cxx b/comms/fldigi/files/patch-src_dialogs_confdialog.cxx index 97362944904d..d486c7c99b63 100644 --- a/comms/fldigi/files/patch-src_dialogs_confdialog.cxx +++ b/comms/fldigi/files/patch-src_dialogs_confdialog.cxx @@ -1,6 +1,6 @@ ---- src/dialogs/confdialog.cxx.orig 2021-06-24 11:46:05 UTC +--- src/dialogs/confdialog.cxx.orig 2022-03-20 23:28:57 UTC +++ src/dialogs/confdialog.cxx -@@ -7447,7 +7447,7 @@ btn_init_cmedia_PTT->labelcolor(FL_RED); +@@ -7689,7 +7689,7 @@ progdefaults.cmedia_ptt = false; btn_init_cmedia_PTT->redraw(); } else { progdefaults.cmedia_ptt = false; @@ -9,7 +9,7 @@ } progdefaults.changed = true; } -@@ -7455,7 +7455,7 @@ progdefaults.changed = true; +@@ -7697,7 +7697,7 @@ static void cb_inp_cmedia_dev(Fl_ComboBox* o, void*) { Fl_ComboBox *inp_cmedia_dev=(Fl_ComboBox *)0; static void cb_inp_cmedia_dev(Fl_ComboBox* o, void*) { @@ -18,7 +18,7 @@ progdefaults.cmedia_device = o->value(); btn_init_cmedia_PTT->labelcolor(FL_RED); btn_init_cmedia_PTT->redraw(); -@@ -7479,7 +7479,7 @@ progdefaults.changed = true; +@@ -7721,7 +7721,7 @@ static void cb_btn_test_cmedia(Fl_Button*, void*) { Fl_Button *btn_test_cmedia=(Fl_Button *)0; static void cb_btn_test_cmedia(Fl_Button*, void*) { diff --git a/comms/fldigi/files/patch-src_main.cxx b/comms/fldigi/files/patch-src_main.cxx index 0faba0d046a0..a5c4f14a3903 100644 --- a/comms/fldigi/files/patch-src_main.cxx +++ b/comms/fldigi/files/patch-src_main.cxx @@ -1,6 +1,6 @@ ---- src/main.cxx.orig 2021-07-01 19:46:20 UTC +--- src/main.cxx.orig 2022-03-18 02:06:06 UTC +++ src/main.cxx -@@ -1165,7 +1165,7 @@ int main(int argc, char ** argv) +@@ -1174,7 +1174,7 @@ int main (int argc, char *argv[]) setTabColors(); progdefaults.testCommPorts(); diff --git a/comms/fldigi/files/patch-src_misc_newinstall.cxx b/comms/fldigi/files/patch-src_misc_newinstall.cxx index 66ba847483df..2c36e0a3a5a7 100644 --- a/comms/fldigi/files/patch-src_misc_newinstall.cxx +++ b/comms/fldigi/files/patch-src_misc_newinstall.cxx @@ -1,6 +1,6 @@ ---- src/misc/newinstall.cxx.orig 2020-08-10 09:49:03 UTC +--- src/misc/newinstall.cxx.orig 2022-04-30 02:29:49 UTC +++ src/misc/newinstall.cxx -@@ -69,7 +69,7 @@ text[3] = " btu <NAME> <CALL> de <MYCALL> k\n\ +@@ -67,7 +67,7 @@ text[4] = "\n\ label[4] = "SK @||"; text[4] = "\n\ diff --git a/comms/fldigi/files/patch-src_rigcontrol_ptt.cxx b/comms/fldigi/files/patch-src_rigcontrol_ptt.cxx index 8f9a5288e8d1..344013ca5b84 100644 --- a/comms/fldigi/files/patch-src_rigcontrol_ptt.cxx +++ b/comms/fldigi/files/patch-src_rigcontrol_ptt.cxx @@ -1,4 +1,4 @@ ---- src/rigcontrol/ptt.cxx.orig 2021-07-01 19:51:31 UTC +--- src/rigcontrol/ptt.cxx.orig 2022-03-18 02:06:06 UTC +++ src/rigcontrol/ptt.cxx @@ -69,7 +69,7 @@ @@ -9,7 +9,7 @@ LOG_FILE_SOURCE(debug::LOG_RIGCONTROL); -@@ -116,9 +116,11 @@ void PTT::reset(ptt_t dev) +@@ -114,9 +114,11 @@ void PTT::reset(ptt_t dev) case PTT_TTY: open_tty(); break; @@ -21,7 +21,7 @@ default: break; // nothing to open } -@@ -174,6 +176,7 @@ void PTT::set(bool ptt) +@@ -175,6 +177,7 @@ void PTT::set(bool ptt) set_uhrouter(ptt); break; #endif @@ -29,11 +29,11 @@ case PTT_CMEDIA: if (cmedia_fd != -1) { int bitnbr = 2; -@@ -184,6 +187,7 @@ void PTT::set(bool ptt) +@@ -185,6 +188,7 @@ void PTT::set(bool ptt) set_cmedia(bitnbr, ptt); } break; +#endif default: { - set_gpio(ptt); + nano_PTT(ptt);