git: cf4dac8d1d0a - main - comms/fldigi: Update to 4.2.00
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 22 Sep 2023 13:16:58 UTC
The branch main has been updated by db:
URL: https://cgit.FreeBSD.org/ports/commit/?id=cf4dac8d1d0a66ee79ca4f4ecc8c10d0de4c0a35
commit cf4dac8d1d0a66ee79ca4f4ecc8c10d0de4c0a35
Author: Diane Bruce <db@FreeBSD.org>
AuthorDate: 2023-09-22 13:14:05 +0000
Commit: Diane Bruce <db@FreeBSD.org>
CommitDate: 2023-09-22 13:14:05 +0000
comms/fldigi: Update to 4.2.00
- Makefile.am patch needed or the build fails due to extraneous -I subdir
- Numerous updates just a few listed
2023-08-30 dave-w1hkj <w1hkj@bellsouth.net>
65599e949: Version 4.2.00
d01751cce: TTY ptt dtr/rts
885ef1ff8: THOR56
12ed9b841: THOR 32/44
fd4388110: Waterfall cursor
5d4a6fa80: Revert "FSQ s/n"
b6d34d0f6: Version 4.1.27
24e8c0559: Macro <PAUSE>
2023-06-28 Rik van Riel <riel@surriel.com>
4ef76f9f4: navtex
2023-06-15 dave-w1hkj <w1hkj@bellsouth.net>
ec94e923a: TEN_TEN contest field
c928e86ad: Pause/Break
a29d78a42: FSQ s/n
e75f7293c: IFKP s/n evaluator
68b280058: EQSL submission
...
---
comms/fldigi/Makefile | 3 +-
comms/fldigi/distinfo | 6 ++--
comms/fldigi/files/patch-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_rigcontrol_ptt.cxx | 10 +++----
comms/fldigi/files/patch-src_rtty_fsk.cxx | 22 ++++++++++++++
8 files changed, 45 insertions(+), 50 deletions(-)
diff --git a/comms/fldigi/Makefile b/comms/fldigi/Makefile
index d34390654737..76c90ee26ff9 100644
--- a/comms/fldigi/Makefile
+++ b/comms/fldigi/Makefile
@@ -1,6 +1,5 @@
PORTNAME= fldigi
-DISTVERSION= 4.1.23
-PORTREVISION= 4
+DISTVERSION= 4.2.00
CATEGORIES= comms hamradio
MASTER_SITES= http://www.w1hkj.com/files/fldigi/
diff --git a/comms/fldigi/distinfo b/comms/fldigi/distinfo
index e740c80b713a..906a53b49834 100644
--- a/comms/fldigi/distinfo
+++ b/comms/fldigi/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1659707535
-SHA256 (fldigi-4.1.23.tar.gz) = e366e1fc9fc343f57d39128a6603a696f872351ed48dba8f3c3d168bda1fca8d
-SIZE (fldigi-4.1.23.tar.gz) = 4933875
+TIMESTAMP = 1694820666
+SHA256 (fldigi-4.2.00.tar.gz) = 174f42e91de6120615852eff32a1011737ea18a6f2ac07a6e7ff900e5c08fbd9
+SIZE (fldigi-4.2.00.tar.gz) = 4973115
diff --git a/comms/fldigi/files/patch-Makefile.am b/comms/fldigi/files/patch-Makefile.am
new file mode 100644
index 000000000000..9ae65494e960
--- /dev/null
+++ b/comms/fldigi/files/patch-Makefile.am
@@ -0,0 +1,8 @@
+--- Makefile.am.orig 2023-09-18 17:53:58 UTC
++++ Makefile.am
+@@ -1,4 +1,4 @@
+-ACLOCAL_AMFLAGS = -I m4 -I m4/intl
++ACLOCAL_AMFLAGS = -I m4
+ # AC_CONFIG_MACRO_DIR([m4])
+
+ SUBDIRS = po doc src
diff --git a/comms/fldigi/files/patch-src_cw__rtty_fsk.cxx b/comms/fldigi/files/patch-src_cw__rtty_fsk.cxx
deleted file mode 100644
index 641c408461e7..000000000000
--- a/comms/fldigi/files/patch-src_cw__rtty_fsk.cxx
+++ /dev/null
@@ -1,34 +0,0 @@
---- 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 d486c7c99b63..2dea6c6b2339 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 2022-03-20 23:28:57 UTC
+--- src/dialogs/confdialog.cxx.orig 2023-08-31 22:56:35 UTC
+++ src/dialogs/confdialog.cxx
-@@ -7689,7 +7689,7 @@ progdefaults.cmedia_ptt = false;
+@@ -7790,7 +7790,7 @@ progdefaults.cmedia_ptt = false;
btn_init_cmedia_PTT->redraw();
} else {
progdefaults.cmedia_ptt = false;
@@ -9,7 +9,7 @@
}
progdefaults.changed = true;
}
-@@ -7697,7 +7697,7 @@ static void cb_inp_cmedia_dev(Fl_ComboBox* o, void*) {
+@@ -7798,7 +7798,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();
-@@ -7721,7 +7721,7 @@ static void cb_btn_test_cmedia(Fl_Button*, void*) {
+@@ -7822,7 +7822,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 a5c4f14a3903..e0bd90a1d528 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 2022-03-18 02:06:06 UTC
+--- src/main.cxx.orig 2023-08-24 15:22:40 UTC
+++ src/main.cxx
-@@ -1174,7 +1174,7 @@ int main (int argc, char *argv[])
+@@ -1182,7 +1182,7 @@ int main (int argc, char *argv[])
setTabColors();
progdefaults.testCommPorts();
diff --git a/comms/fldigi/files/patch-src_rigcontrol_ptt.cxx b/comms/fldigi/files/patch-src_rigcontrol_ptt.cxx
index 344013ca5b84..027e74f580ff 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 2022-03-18 02:06:06 UTC
+--- src/rigcontrol/ptt.cxx.orig 2023-08-31 22:56:35 UTC
+++ src/rigcontrol/ptt.cxx
@@ -69,7 +69,7 @@
@@ -21,7 +21,7 @@
default:
break; // nothing to open
}
-@@ -175,6 +177,7 @@ void PTT::set(bool ptt)
+@@ -178,6 +180,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;
-@@ -185,6 +188,7 @@ void PTT::set(bool ptt)
+@@ -188,6 +191,7 @@ void PTT::set(bool ptt)
set_cmedia(bitnbr, ptt);
}
break;
+#endif
default:
- {
- nano_PTT(ptt);
+ break;
+ }
diff --git a/comms/fldigi/files/patch-src_rtty_fsk.cxx b/comms/fldigi/files/patch-src_rtty_fsk.cxx
new file mode 100644
index 000000000000..0abccff9a2ff
--- /dev/null
+++ b/comms/fldigi/files/patch-src_rtty_fsk.cxx
@@ -0,0 +1,22 @@
+--- src/rtty/fsk.cxx.orig 2023-08-04 01:13:40 UTC
++++ src/rtty/fsk.cxx
+@@ -50,10 +50,10 @@
+ # include <sys/time.h>
+ # endif
+ #endif
+-
+ #include <math.h>
+ #include <stdio.h>
+
++#ifndef __FreeBSD__
+ #ifdef __WIN32__
+ # include <windows.h>
+ //# include <chrono>
+@@ -67,6 +67,7 @@
+ //# include <chrono>
+ # include <sys/timerfd.h>
+ # endif
++#endif
+ #endif
+
+ #include "threads.h"