diff --git a/comms/sdr++/Makefile b/comms/sdr++/Makefile
index 5e30e8c278a1..70037a94159c 100644
--- a/comms/sdr++/Makefile
+++ b/comms/sdr++/Makefile
@@ -1,32 +1,35 @@
 PORTNAME=	sdr++
 DISTVERSION=	1.0.4
+PORTREVISION=	1
 CATEGORIES=	comms hamradio
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Cross-Platform SDR Software
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/license
 
 LIB_DEPENDS=	libad9361.so:misc/libad9361-iio \
 		libairspy.so:comms/airspy \
+		libairspyhf.so:comms/airspyhf \
 		libfftw3f.so:math/fftw3-float \
 		libglfw.so:graphics/glfw \
 		libhackrf.so:comms/hackrf \
 		libiio.so:misc/libiio \
 		librtaudio.so:audio/rtaudio \
 		librtlsdr.so:comms/rtl-sdr \
 		libSoapySDR.so:misc/soapysdr \
 		libvolk.so:devel/volk
 
 USES=		cmake compiler:c++17-lang gl pkgconfig xorg
 USE_GL=		gl glew glu opengl
 USE_XORG=	x11
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	AlexandreRouma
 GH_PROJECT=	SDRPlusPlus
 
-CMAKE_OFF=	OPT_BUILD_AIRSPYHF_SOURCE # dependency isn't ported yet
+# Broken with clang 14
+CMAKE_OFF=	OPT_BUILD_DISCORD_PRESENCE
 
 .include <bsd.port.mk>
diff --git a/comms/sdr++/files/patch-CMakeLists.txt b/comms/sdr++/files/patch-CMakeLists.txt
index 479c84390851..d7694bd817f6 100644
--- a/comms/sdr++/files/patch-CMakeLists.txt
+++ b/comms/sdr++/files/patch-CMakeLists.txt
@@ -1,24 +1,29 @@
---- CMakeLists.txt.orig	2022-06-23 16:25:30 UTC
+--- CMakeLists.txt.orig	2021-10-17 22:38:02 UTC
 +++ CMakeLists.txt
-@@ -3,8 +3,8 @@ project(sdrpp)
+@@ -1,11 +1,11 @@ project(sdrpp)
+ cmake_minimum_required(VERSION 3.13)
+ project(sdrpp)
  
- if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+-if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
++#if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
      set(CMAKE_INSTALL_PREFIX "/usr/local")
 -else()
 -    set(CMAKE_INSTALL_PREFIX "/usr")
+-endif()
 +#else()
 +#    set(CMAKE_INSTALL_PREFIX "/usr")
- endif()
++#endif()
  
  # Compatibility Options
-@@ -206,8 +206,8 @@ install(DIRECTORY ${CMAKE_SOURCE_DIR}/root/res/icons D
+ option(OPT_OVERRIDE_STD_FILESYSTEM "Use a local version of std::filesystem on systems that don't have it yet" OFF)
+@@ -206,8 +206,8 @@ configure_file(${CMAKE_SOURCE_DIR}/sdrpp.desktop ${CMA
  install(DIRECTORY ${CMAKE_SOURCE_DIR}/root/res/themes DESTINATION share/sdrpp)
  configure_file(${CMAKE_SOURCE_DIR}/sdrpp.desktop ${CMAKE_CURRENT_BINARY_DIR}/sdrpp.desktop @ONLY)
  
 -if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
 -    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/sdrpp.desktop DESTINATION /usr/share/applications)
 +if (${CMAKE_SYSTEM_NAME} MATCHES "Linux" OR ${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
 +    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/sdrpp.desktop DESTINATION share/applications)
  endif ()
  
  # Create uninstall target
diff --git a/comms/sdr++/pkg-message b/comms/sdr++/pkg-message
new file mode 100644
index 000000000000..3e90c198aefc
--- /dev/null
+++ b/comms/sdr++/pkg-message
@@ -0,0 +1,8 @@
+[
+{ type: install
+  message: <<EOM
+This port requires audio/rtaudio built with PULSEAUDIO option.
+audio/rtaudio currently doesn't work with PCM devices directly.
+EOM
+}
+]
diff --git a/comms/sdr++/pkg-plist b/comms/sdr++/pkg-plist
index 92f3c356cb11..282d33da157e 100644
--- a/comms/sdr++/pkg-plist
+++ b/comms/sdr++/pkg-plist
@@ -1,59 +1,59 @@
 bin/sdrpp
 include/correct-sse.h
 include/correct.h
 lib/libcorrect.a
 lib/libcorrect.so
 lib/libsdrpp_core.so
 lib/sdrpp/plugins/airspy_source.so
+lib/sdrpp/plugins/airspyhf_source.so
 lib/sdrpp/plugins/audio_sink.so
-lib/sdrpp/plugins/discord_integration.so
 lib/sdrpp/plugins/file_source.so
 lib/sdrpp/plugins/frequency_manager.so
 lib/sdrpp/plugins/hackrf_source.so
 lib/sdrpp/plugins/meteor_demodulator.so
 lib/sdrpp/plugins/network_sink.so
 lib/sdrpp/plugins/plutosdr_source.so
 lib/sdrpp/plugins/radio.so
 lib/sdrpp/plugins/recorder.so
 lib/sdrpp/plugins/rigctl_server.so
 lib/sdrpp/plugins/rtl_sdr_source.so
 lib/sdrpp/plugins/rtl_tcp_source.so
 lib/sdrpp/plugins/soapy_source.so
 lib/sdrpp/plugins/spyserver_source.so
 lib/sdrpp/plugins/weather_sat_decoder.so
 share/applications/sdrpp.desktop
 share/sdrpp/bandplans/canada.json
 share/sdrpp/bandplans/china.json
 share/sdrpp/bandplans/france.json
 share/sdrpp/bandplans/general.json
 share/sdrpp/bandplans/germany-mobile-lte-bands.json
 share/sdrpp/bandplans/germany-mobile-networks.json
 share/sdrpp/bandplans/germany.json
 share/sdrpp/bandplans/russia.json
 share/sdrpp/bandplans/usa.json
 share/sdrpp/colormaps/classic.json
 share/sdrpp/colormaps/classic_green.json
 share/sdrpp/colormaps/electric.json
 share/sdrpp/colormaps/gqrx.json
 share/sdrpp/colormaps/greyscale.json
 share/sdrpp/colormaps/inferno.json
 share/sdrpp/colormaps/magma.json
 share/sdrpp/colormaps/plasma.json
 share/sdrpp/colormaps/turbo.json
 share/sdrpp/colormaps/viridis.json
 share/sdrpp/colormaps/websdr.json
 share/sdrpp/fonts/Roboto-Medium.ttf
 share/sdrpp/icons/center_tuning.png
 share/sdrpp/icons/menu.png
 share/sdrpp/icons/muted.png
 share/sdrpp/icons/normal_tuning.png
 share/sdrpp/icons/play.png
 share/sdrpp/icons/sdrpp.ico
 share/sdrpp/icons/sdrpp.png
 share/sdrpp/icons/stop.png
 share/sdrpp/icons/unmuted.png
 share/sdrpp/themes/army green.json
 share/sdrpp/themes/dark.json
 share/sdrpp/themes/deep blue.json
 share/sdrpp/themes/grey.json
 share/sdrpp/themes/light.json