diff --git a/comms/fldigi/Makefile b/comms/fldigi/Makefile
index 8b8d1e1eb7de..85e68ad4f05a 100644
--- a/comms/fldigi/Makefile
+++ b/comms/fldigi/Makefile
@@ -1,68 +1,67 @@
 PORTNAME=	fldigi
-DISTVERSION=	4.1.20
-PORTREVISION=	1
+DISTVERSION=	4.1.21
 CATEGORIES=	comms hamradio
 MASTER_SITES=	http://www.w1hkj.com/files/fldigi/
 
 MAINTAINER=	hamradio@FreeBSD.org
 COMMENT=	Digital decoder for psk, cw, psk31, olivia
 
 LICENSE=	GPLv3
 
 BUILD_DEPENDS=	asciidoc:textproc/asciidoc\
 		docbook-xsl>=1.0:textproc/docbook-xsl\
 		xsltproc:textproc/libxslt
 LIB_DEPENDS=	libboost_system.so:devel/boost-libs\
 		libpng.so:graphics/png \
 		libfltk.so:x11-toolkits/fltk \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libportaudio.so:audio/portaudio \
 		libsndfile.so:audio/libsndfile \
 		libsamplerate.so:audio/libsamplerate
 
 USES=		autoreconf compiler:c++11-lib jpeg gmake perl5 pkgconfig \
 		shebangfix xorg
 
 USE_CXXSTD=	gnu++0x
 GNU_CONFIGURE=	yes
 USE_XORG=	x11 xft xext xfixes xcursor xinerama xrender
 CONFIGURE_ENV=	FLTK_CONFIG="${LOCALBASE}/bin/fltk-config" \
 		    EXTRA_LIBS="-lexecinfo"
 
 OPTIONS_DEFINE=	FLARQ OSS PULSEAUDIO HAMLIB NLS DOCS
 
 NATIVE_OPT_DESC=	Enable Native Optimizations
 FLARQ_DESC=		Compile flarq
 OSS_DESC=		Support OSS
 PULSEAUDIO_DESC=	PulseAudio support
 HAMLIB_DESC=		Support rig control via hamlib
 
 OPTIONS_DEFAULT=	FLARQ OSS HAMLIB
 OPTIONS_SUB=		yes
 
 NATIVE_OPT_CONFIGURE_ON=	--enable-optimizations=native
 NATIVE_OPT_CONFIGURE_OFF=	--enable-optimizations=none
 FLARQ_CONFIGURE_ENABLE=		flarq
 OSS_CONFIGURE_ENABLE=		oss
 PULSEAUDIO_CONFIGURE_WITH=	pulseaudio
 PULSEAUDIO_LIB_DEPENDS=		libpulse.so:audio/pulseaudio
 HAMLIB_CONFIGURE_WITH=		hamlib
 HAMLIB_LIB_DEPENDS=		libhamlib.so:comms/hamlib
 NLS_CONFIGURE_ENABLE=		nls
 NLS_USES=			gettext
 
 # Always need asciidoc for man pages
 CONFIGURE_ARGS+=--with-asciidoc
 # Always need soundfile
 CONFIGURE_ARGS+=--with-sndfile
 
 post-configure:
 # force rebuild of man pages
 	${RM} ${WRKSRC}/doc/*.1
 
 post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/guide.html ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
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,29 +1,29 @@
---- 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 += \
 -	cmedia/cmedia.cxx \
 -	cmedia/hid.cxx \
  	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 \
 -	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 \
-@@ -762,7 +757,6 @@ EXTRA_fldigi_SOURCES += \
+@@ -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_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,29 +1,29 @@
---- 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;
 -close_cmedia();
 +//close_cmedia();
  }
  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*) {
 -  close_cmedia();
 +//  close_cmedia();
  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*) {
 -  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
index 0faba0d046a0..a5c4f14a3903 100644
--- a/comms/fldigi/files/patch-src_main.cxx
+++ b/comms/fldigi/files/patch-src_main.cxx
@@ -1,11 +1,11 @@
---- 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();
 -	init_hids();
 +	//init_hids();
  
  #if USE_HAMLIB
  	xcvr = new Rig();
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,11 +1,11 @@
---- 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\
 -tnx fer QSO <NAME>, 73, God bless.\n\
 +tnx fer QSO <NAME>, 73.\n\
  <ZDT> <CALL> de <MYCALL> sk\n\
  <RX>";
  
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,39 +1,39 @@
---- 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 @@
  
  #include "n3fjp_logger.h"
  
 -#include "cmedia.h"
 +//#include "cmedia.h"
  
  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;
 +#if 0
  	case PTT_CMEDIA:
  		cmedia_fd = open_cmedia(progdefaults.cmedia_device);
  		break;
 +#endif
  	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
 +#if 0
  	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);