diff --git a/comms/flrig/Makefile b/comms/flrig/Makefile
index a18daee579f5..5aed045a55fe 100644
--- a/comms/flrig/Makefile
+++ b/comms/flrig/Makefile
@@ -1,40 +1,39 @@
 PORTNAME=	flrig
-PORTVERSION=	2.0.04
-PORTREVISION=	1
+PORTVERSION=	2.0.05
 CATEGORIES=	comms hamradio
 MASTER_SITES=	SF/fldigi/${PORTNAME} \
 		http://www.w1hkj.com/files/fldigi/
 
 MAINTAINER=	hamradio@FreeBSD.org
 COMMENT=	Ham Radio rig control program, cooperates with fldigi
 WWW=		http://www.w1hkj.com/flrig-help/index.html
 
-IGNORE_FreeBSD_12=	no hid support
+BROKEN_FreeBSD_12=	no hid support
 
 LICENSE=	GPLv2
 
 LIB_DEPENDS=	libfltk.so:x11-toolkits/fltk \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libpng.so:graphics/png \
 		libudev.so:devel/libudev-devd
 
 USES=		desktop-file-utils gmake jpeg xorg
 USE_XORG=	x11 xcursor xext xfixes xft xinerama xrender
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	FLTK_CONFIG="${LOCALBASE}/bin/fltk-config"
 PLIST_FILES=	bin/flrig \
 		share/applications/flrig.desktop \
 		share/pixmaps/flrig.xpm
 OPTIONS_DEFINE=	NATIVE
 
 NATIVE_CONFIGURE_ON+=	--enable-optimizations=native
 NATIVE_CONFIGURE_OFF+=	--enable-optimizations=none
 
 .include <bsd.port.pre.mk>
 
 .if defined(PPC_ABI) && ${PPC_ABI} == ELFv1
 CFLAGS+=	-mminimal-toc
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/comms/flrig/distinfo b/comms/flrig/distinfo
index 8e1960a5c115..5fe54d681afb 100644
--- a/comms/flrig/distinfo
+++ b/comms/flrig/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1697039885
-SHA256 (flrig-2.0.04.tar.gz) = f80710ee5d515c50d556b698c9205413ff990b208e3223362f82f245716ab947
-SIZE (flrig-2.0.04.tar.gz) = 1108760
+TIMESTAMP = 1703941314
+SHA256 (flrig-2.0.05.tar.gz) = 31cdc025f05db489fd9ba087eb4d8c8f85168fc3aa9cf95fe488b02d780c62b0
+SIZE (flrig-2.0.05.tar.gz) = 1112204
diff --git a/comms/flrig/files/patch-src_cmedia_cmedia.cxx b/comms/flrig/files/patch-src_cmedia_cmedia.cxx
deleted file mode 100644
index 4e2e1b9b8583..000000000000
--- a/comms/flrig/files/patch-src_cmedia_cmedia.cxx
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/cmedia/cmedia.cxx.orig	2023-09-23 00:17:45 UTC
-+++ src/cmedia/cmedia.cxx
-@@ -42,7 +42,9 @@
- #include <termios.h>
- #include <glob.h>
- #  ifndef __APPLE__
--#    include <error.h>
-+#    ifndef __FreeBSD__
-+#      include <error.h>
-+#    endif
- #  endif
- #endif
- 
diff --git a/comms/flrig/files/patch-src_cmedia_hid__lin.cxx b/comms/flrig/files/patch-src_cmedia_hid__lin.cxx
deleted file mode 100644
index 20a1a5619c4e..000000000000
--- a/comms/flrig/files/patch-src_cmedia_hid__lin.cxx
+++ /dev/null
@@ -1,26 +0,0 @@
---- src/cmedia/hid_lin.cxx.orig	2023-10-05 17:27:21 UTC
-+++ src/cmedia/hid_lin.cxx
-@@ -35,12 +35,22 @@
- #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
-+#include <libudev.h>
-+#else
- /* Linux */
- #include <linux/hidraw.h>
- #include <linux/version.h>
- #include <linux/input.h>
- #include <libudev.h>
--
-+#endif
- #include "hidapi.h"
- 
- /* Definitions from linux/hidraw.h. Since these are new, some distros
diff --git a/comms/flrig/files/patch-src_cmedia_tmate2.cxx b/comms/flrig/files/patch-src_cmedia_tmate2.cxx
deleted file mode 100644
index f9526c9d4643..000000000000
--- a/comms/flrig/files/patch-src_cmedia_tmate2.cxx
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/cmedia/tmate2.cxx.orig	2022-03-21 23:27:19 UTC
-+++ src/cmedia/tmate2.cxx
-@@ -45,7 +45,9 @@
- #include <termios.h>
- #include <glob.h>
- #  ifndef __APPLE__
--#    include <error.h>
-+#    ifndef __FreeBSD__
-+#      include <error.h>
-+#    endif
- #  endif
- #endif
- 
diff --git a/comms/flrig/files/patch-src_support_dialogs.cxx b/comms/flrig/files/patch-src_support_dialogs.cxx
deleted file mode 100644
index ee0be91120f6..000000000000
--- a/comms/flrig/files/patch-src_support_dialogs.cxx
+++ /dev/null
@@ -1,37 +0,0 @@
---- src/support/dialogs.cxx.orig	2023-10-11 20:05:33 UTC
-+++ src/support/dialogs.cxx
-@@ -179,7 +179,7 @@ void init_port_combos()
- 			add_combos(gbuf.gl_pathv[j]);
- 	}
- 	globfree(&gbuf);
--
-+#ifndef __FreeBSD__
- 	glob("/dev/serial/by-id/*", 0, NULL, &gbuf);
- 	for (size_t j = 0; j < gbuf.gl_pathc; j++) {
- 		if ( !(stat(gbuf.gl_pathv[j], &st) == 0 && S_ISCHR(st.st_mode)) ||
-@@ -189,7 +189,7 @@ void init_port_combos()
- 			add_combos(gbuf.gl_pathv[j]);
- 	}
- 	globfree(&gbuf);
--
-+#endif
- 	glob("/dev/tty*", 0, NULL, &gbuf);
- 	for (size_t j = 0; j < gbuf.gl_pathc; j++) {
- 		if ( !(stat(gbuf.gl_pathv[j], &st) == 0 && S_ISCHR(st.st_mode)) ||
-@@ -296,9 +296,15 @@ out:
- 	}
- 
- 	const char* tty_fmt[] = {
--		"/dev/ttyS%u",
-+#ifndef __FreeBSD__
- 		"/dev/ttyUSB%u",
-+		"/dev/ttyS%u",
- 		"/dev/usb/ttyUSB%u"
-+#endif
-+#ifdef __FreeBSD__
-+		"/dev/cuau%u",
-+		"/dev/cuaU%u",
-+#endif
- 	};
- 	LOG_QUIET("%s", "Serial port discovery via 'stat'");
- 	for (size_t i = 0; i < sizeof(tty_fmt)/sizeof(*tty_fmt); i++) {