- Update to 3.11

- Upstream has accepted diffs.

6 files changed, 0 insertions, 86 deletions

diff --git a/comms/fldigi/files/patch-src_dialogs_fl_digi.cxx b/comms/fldigi/files/patch-src_dialogs_fl_digi.cxx
deleted file mode 100644
index 16ab9cb1514f..000000000000
--- a/comms/fldigi/files/patch-src_dialogs_fl_digi.cxx
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/dialogs/fl_digi.cxx.orig	2009-01-17 09:32:22.000000000 -0500
-+++ src/dialogs/fl_digi.cxx	2009-01-17 14:53:39.000000000 -0500
-@@ -1288,7 +1288,7 @@
- 	Fl::repeat_timeout(st, ztimer);
- 
- 	struct tm tm;
--	gmtime_r(&tv.tv_sec, &tm);
-+	gmtime_r((const time_t *)&tv.tv_sec, &tm);
- 	if (!strftime(ztbuf, sizeof(ztbuf), "%Y%m%d %H%M", &tm))
- 		memset(ztbuf, 0, sizeof(ztbuf));
- 	else
-@@ -2727,7 +2727,7 @@
- 
- #if defined (__CYGWIN__)
- 	fl_digi_main->icon((char*)LoadIcon(fl_display, MAKEINTRESOURCE(IDI_ICON)));
--#elif defined (__linux__)
-+#elif defined (__linux__) || defined (__FreeBSD__)
- 	make_pixmap(&fldigi_icon_pixmap, fldigi_icon);
- 	fl_digi_main->icon((char *)fldigi_icon_pixmap);
- #endif
diff --git a/comms/fldigi/files/patch-src_fileselector_fileselect.cxx b/comms/fldigi/files/patch-src_fileselector_fileselect.cxx
deleted file mode 100644
index 04f7edad883d..000000000000
--- a/comms/fldigi/files/patch-src_fileselector_fileselect.cxx
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/fileselector/fileselect.cxx.orig	2009-01-17 14:56:02.000000000 -0500
-+++ src/fileselector/fileselect.cxx	2009-01-17 15:04:34.000000000 -0500
-@@ -67,7 +67,7 @@
- const char* FSEL::get_file(void)
- {
- 	// Calling directory() is apparently not enough on Linux
--#ifdef __linux__
-+#if  defined(__linux__) || defined(__FreeBSD__)
- 	const char* preset = chooser->preset_file();
- 	if (preset && *preset != '/' && chooser->directory()) {
- 		filename = chooser->directory();
diff --git a/comms/fldigi/files/patch-src_include_configuration.h b/comms/fldigi/files/patch-src_include_configuration.h
deleted file mode 100644
index 7892e4afffc2..000000000000
--- a/comms/fldigi/files/patch-src_include_configuration.h
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/include/configuration.h.orig	2009-01-17 14:58:24.000000000 -0500
-+++ src/include/configuration.h	2009-01-17 14:59:32.000000000 -0500
-@@ -12,6 +12,10 @@
- #  define DEFAULT_PTTDEV "/dev/ttyS0"
- #  define DEFAULT_CWFSKPORT "/dev/ttyS1"
- #  define DEFAULT_HAMRIGDEVICE "/dev/ttyS0"
-+#elif defined(__FreeBSD__)
-+#  define DEFAULT_PTTDEV "/dev/ttyd0"
-+#  define DEFAULT_CWFSKPORT "/dev/ttyd1"
-+#  define DEFAULT_HAMRIGDEVICE "/dev/ttyd0"
- #elif defined(__CYGWIN__)
- #  define DEFAULT_PTTDEV "COM1"
- #  define DEFAULT_CWFSKPORT "COM2"
diff --git a/comms/fldigi/files/patch-src_include_threads.h b/comms/fldigi/files/patch-src_include_threads.h
deleted file mode 100644
index 0edca0862668..000000000000
--- a/comms/fldigi/files/patch-src_include_threads.h
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/include/threads.h.orig	2009-01-05 14:01:07.000000000 -0500
-+++ src/include/threads.h	2009-01-16 11:56:12.000000000 -0500
-@@ -4,6 +4,7 @@
- #include <config.h>
- 
- #include <pthread.h>
-+#include <stdint.h>
- 
- #include <semaphore.h>
- #if !HAVE_SEM_TIMEDWAIT
-@@ -32,7 +33,8 @@
- #       define THREAD_ID_TYPE pthread_key_t
- #	define CREATE_THREAD_ID() pthread_key_create(&thread_id_, 0)
- #	define SET_THREAD_ID(x)   pthread_setspecific(thread_id_, (void *)(x))
--#	define GET_THREAD_ID()    (int)pthread_getspecific(thread_id_)
-+//#	define GET_THREAD_ID()    (int)pthread_getspecific(thread_id_)
-+#	define GET_THREAD_ID()    (uintptr_t)pthread_getspecific(thread_id_)
- #endif // USE_TLS
- 
- 
diff --git a/comms/fldigi/files/patch-src_main.cxx b/comms/fldigi/files/patch-src_main.cxx
deleted file mode 100644
index 47de0114b2e2..000000000000
--- a/comms/fldigi/files/patch-src_main.cxx
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/main.cxx.orig	2009-01-17 14:54:56.000000000 -0500
-+++ src/main.cxx	2009-01-17 14:55:05.000000000 -0500
-@@ -723,7 +723,7 @@
- 
- void set_platform_ui(void)
- {
--#if defined (__linux__)
-+#if defined (__linux__) || defined(__FreeBSD__)
-        FL_NORMAL_SIZE = 12;
- #elif defined(__APPLE__)
-        FL_NORMAL_SIZE = 12;
diff --git a/comms/fldigi/files/patch-src_spot_pskrep.cxx b/comms/fldigi/files/patch-src_spot_pskrep.cxx
deleted file mode 100644
index 84d305a7104c..000000000000
--- a/comms/fldigi/files/patch-src_spot_pskrep.cxx
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/spot/pskrep.cxx.orig	2009-01-17 14:45:24.000000000 -0500
-+++ src/spot/pskrep.cxx	2009-01-17 14:50:02.000000000 -0500
-@@ -64,7 +64,7 @@
- // It must define at least two capturing groups, the second of which is the
- // spotted callsign.
- #define CALLSIGN_RE "[[:alnum:]]?[[:alpha:]/]+[[:digit:]]+[[:alnum:]/]+"
--#ifdef __linux__
-+#ifdef __linux__ || __FreeBSD__
- #  define PSKREP_RE "(de|cq|qrz)[^[:alnum:]/\n]+"  "(" CALLSIGN_RE ")"  " +(.* +)?\\2[^[:alnum:]]+$"
- #else
- #  define PSKREP_RE "(de|cq|qrz)[^[:alnum:]/\n]+"  "(" CALLSIGN_RE ")"  " +(.* +)?" \