comms/fldigi: Update to 4.2.03

2023-10-31  dave-w1hkj  <w1hkj@bellsouth.net>

	2ba9f43d0: Version 4.2.03
	923ff32f6: FSQ sounding CR/LF

- removed a number patches that were there to comment out cmedia support
- removed FreeBSD 12 support due to no cmedia support

9 files changed, 31 insertions, 138 deletions

diff --git a/comms/fldigi/Makefile b/comms/fldigi/Makefile
index 8b588d8edf71..945dbe72e897 100644
--- a/comms/fldigi/Makefile
+++ b/comms/fldigi/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	fldigi
-DISTVERSION=	4.2.02
+DISTVERSION=	4.2.03
 CATEGORIES=	comms hamradio
 MASTER_SITES=	SF/fldigi/${PORTNAME} \
 		http://www.w1hkj.com/files/fldigi/
@@ -8,6 +8,8 @@ MAINTAINER=	hamradio@FreeBSD.org
 COMMENT=	Digital decoder for psk, cw, psk31, olivia
 WWW=		http://www.w1hkj.com
 
+BROKEN_FreeBSD_12=	no hid support
+
 LICENSE=	GPLv3
 
 BUILD_DEPENDS=	asciidoc:textproc/asciidoc \
@@ -19,7 +21,8 @@ LIB_DEPENDS=	libboost_system.so:devel/boost-libs \
 		libpng.so:graphics/png \
 		libportaudio.so:audio/portaudio \
 		libsamplerate.so:audio/libsamplerate \
-		libsndfile.so:audio/libsndfile
+		libsndfile.so:audio/libsndfile \
+		libudev.so:devel/libudev-devd
 
 USES=		autoreconf compiler:c++11-lib desktop-file-utils gmake jpeg \
 		perl5 pkgconfig shebangfix xorg
diff --git a/comms/fldigi/distinfo b/comms/fldigi/distinfo
index 730e92e75b8d..ba819b95159d 100644
--- a/comms/fldigi/distinfo
+++ b/comms/fldigi/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1698762993
-SHA256 (fldigi-4.2.02.tar.gz) = f50386f3c3bd063b4c34d01ac439ff8d41ec1b7c12e3c2c252f307ef3a5a6b9e
-SIZE (fldigi-4.2.02.tar.gz) = 4979638
+TIMESTAMP = 1698927901
+SHA256 (fldigi-4.2.03.tar.gz) = b5c258a487858280be8d721dbdcd62c7effabfda0f71c7f18106cbd3020829a6
+SIZE (fldigi-4.2.03.tar.gz) = 4979861
diff --git a/comms/fldigi/files/patch-configure.ac b/comms/fldigi/files/patch-configure.ac
deleted file mode 100644
index 316670368d4d..000000000000
--- a/comms/fldigi/files/patch-configure.ac
+++ /dev/null
@@ -1,14 +0,0 @@
---- configure.ac.orig	2021-07-01 20:36:20 UTC
-+++ configure.ac
-@@ -309,11 +309,6 @@ AC_FLDIGI_INTL
- # Set ac_cv_udev to yes/no
- # Define USE_LIBHID in config.h
- # Substitute LIBHID_CFLAGS and LIBHID_LIBS in Makefile
--#if test "x$ac_cv_want_fldigi" = "xyes"; then
--#AC_FLDIGI_PKG_CHECK([libhid], [libhid], [no], [no],
--#  [use udev libraries @<:@autodetect@:>@],
--#  [ENABLE_LIBHID])
--#fi
- 
- ### asciidoc
- # substitute ASCIIDOC and A2X in doc/Makefile
diff --git a/comms/fldigi/files/patch-m4_build.m4 b/comms/fldigi/files/patch-m4_build.m4
deleted file mode 100644
index 291239106a7a..000000000000
--- a/comms/fldigi/files/patch-m4_build.m4
+++ /dev/null
@@ -1,11 +0,0 @@
---- m4/build.m4.orig	2021-07-01 21:41:53 UTC
-+++ m4/build.m4
-@@ -94,7 +94,7 @@ $BFD_CFLAGS -pipe -Wall -fexceptions $OPT_CFLAGS $DEBU
-   else if test "x$target_mingw32" = "xyes"; then
-       FLDIGI_BUILD_LDADD="$FLDIGI_BUILD_LDADD -lsetupapi -lhid"
-     else
--      FLDIGI_BUILD_LDADD="$FLDIGI_BUILD_LDADD -ludev"
-+      FLDIGI_BUILD_LDADD="$FLDIGI_BUILD_LDADD"
-     fi
-   fi
- 
diff --git a/comms/fldigi/files/patch-src_Makefile.am b/comms/fldigi/files/patch-src_Makefile.am
deleted file mode 100644
index 93ec2bb71c05..000000000000
--- a/comms/fldigi/files/patch-src_Makefile.am
+++ /dev/null
@@ -1,29 +0,0 @@
---- src/Makefile.am.orig	2022-03-18 02:06:06 UTC
-+++ src/Makefile.am
-@@ -503,8 +503,6 @@ fldigi_SOURCES += \
- 
- # Sources that we build. It is OK to have headers here.
- fldigi_SOURCES += \
--	cmedia/cmedia.cxx \
--	cmedia/hid.cxx \
- 	combo/combo.cxx \
- 	config_script/create_default_script.cxx \
- 	config_script/run_script.h \
-@@ -709,9 +707,6 @@ EXTRA_fldigi_SOURCES += \
- EXTRA_fldigi_SOURCES += \
- 	blank/blank.cxx \
- 	blank/blank.h \
--	cmedia/hid_lin.cxx \
--	cmedia/hid_mac.cxx \
--	cmedia/hid_win.cxx \
- 	dialogs/fl_digi_main.cxx \
- 	dxcluster/arc-help.cxx \
- 	dxcluster/CCC_Commands.cxx \
-@@ -764,7 +759,6 @@ EXTRA_fldigi_SOURCES += \
- 	include/calendar.h \
- 	include/charsetdistiller.h \
- 	include/charsetlist.h \
--	include/cmedia.h \
- 	include/colorbox.h \
- 	include/combo.h \
- 	include/complex.h \
diff --git a/comms/fldigi/files/patch-src_cmedia_hid__lin.cxx b/comms/fldigi/files/patch-src_cmedia_hid__lin.cxx
new file mode 100644
index 000000000000..5ba53c2386b9
--- /dev/null
+++ b/comms/fldigi/files/patch-src_cmedia_hid__lin.cxx
@@ -0,0 +1,23 @@
+--- src/cmedia/hid_lin.cxx.orig	2023-08-04 01:13:37 UTC
++++ src/cmedia/hid_lin.cxx
+@@ -35,10 +35,20 @@
+ #include <fcntl.h>
+ #include <poll.h>
+ 
++#ifdef __FreeBSD__
++typedef unsigned short uint16_t;
++typedef unsigned char __u8;
++typedef unsigned long __u32;
++#include <dev/hid/hidraw.h>
++/* These are from linux */
++#define BUS_USB			0x03
++#define BUS_BLUETOOTH		0x05
++#else
+ /* Linux */
+ #include <linux/hidraw.h>
+ #include <linux/version.h>
+ #include <linux/input.h>
++#endif
+ #include <libudev.h>
+ 
+ #include "hidapi.h"
diff --git a/comms/fldigi/files/patch-src_dialogs_confdialog.cxx b/comms/fldigi/files/patch-src_dialogs_confdialog.cxx
deleted file mode 100644
index 2dea6c6b2339..000000000000
--- a/comms/fldigi/files/patch-src_dialogs_confdialog.cxx
+++ /dev/null
@@ -1,29 +0,0 @@
---- src/dialogs/confdialog.cxx.orig	2023-08-31 22:56:35 UTC
-+++ src/dialogs/confdialog.cxx
-@@ -7790,7 +7790,7 @@ progdefaults.cmedia_ptt = false;
- btn_init_cmedia_PTT->redraw();
- } else {
- progdefaults.cmedia_ptt = false;
--close_cmedia();
-+//close_cmedia();
- }
- progdefaults.changed = true;
- }
-@@ -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*) {
--  close_cmedia();
-+//  close_cmedia();
- progdefaults.cmedia_device = o->value();
- btn_init_cmedia_PTT->labelcolor(FL_RED);
- btn_init_cmedia_PTT->redraw();
-@@ -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*) {
--  test_hid_ptt();
-+//  test_hid_ptt();
- }
- 
- Fl_File_Input *inp_wav_fname_regex=(Fl_File_Input *)0;
diff --git a/comms/fldigi/files/patch-src_main.cxx b/comms/fldigi/files/patch-src_main.cxx
deleted file mode 100644
index e0bd90a1d528..000000000000
--- a/comms/fldigi/files/patch-src_main.cxx
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/main.cxx.orig	2023-08-24 15:22:40 UTC
-+++ src/main.cxx
-@@ -1182,7 +1182,7 @@ int main (int argc, char *argv[])
- 	setTabColors();
- 
- 	progdefaults.testCommPorts();
--	init_hids();
-+	//init_hids();
- 
- #if USE_HAMLIB
- 	xcvr = new Rig();
diff --git a/comms/fldigi/files/patch-src_rigcontrol_ptt.cxx b/comms/fldigi/files/patch-src_rigcontrol_ptt.cxx
deleted file mode 100644
index 027e74f580ff..000000000000
--- a/comms/fldigi/files/patch-src_rigcontrol_ptt.cxx
+++ /dev/null
@@ -1,39 +0,0 @@
---- src/rigcontrol/ptt.cxx.orig	2023-08-31 22:56:35 UTC
-+++ src/rigcontrol/ptt.cxx
-@@ -69,7 +69,7 @@
- 
- #include "n3fjp_logger.h"
- 
--#include "cmedia.h"
-+//#include "cmedia.h"
- 
- LOG_FILE_SOURCE(debug::LOG_RIGCONTROL);
- 
-@@ -114,9 +114,11 @@ void PTT::reset(ptt_t dev)
- 	case PTT_TTY:
- 		open_tty();
- 		break;
-+#if 0
- 	case PTT_CMEDIA:
- 		cmedia_fd = open_cmedia(progdefaults.cmedia_device);
- 		break;
-+#endif
- 	default:
- 		break; // nothing to open
- 	}
-@@ -178,6 +180,7 @@ void PTT::set(bool ptt)
- 		set_uhrouter(ptt);
- 		break;
- #endif
-+#if 0
- 	case PTT_CMEDIA:
- 		if (cmedia_fd != -1) {
- 			int bitnbr = 2;
-@@ -188,6 +191,7 @@ void PTT::set(bool ptt)
- 			set_cmedia(bitnbr, ptt);
- 		}
- 		break;
-+#endif
- 	default:
- 		break;
- 	}