diff --git a/audio/carla/Makefile b/audio/carla/Makefile
index b8f21318a7c0..328e9ebb1411 100644
--- a/audio/carla/Makefile
+++ b/audio/carla/Makefile
@@ -1,85 +1,82 @@
 PORTNAME=	Carla
 DISTVERSIONPREFIX=	v
-DISTVERSION=	2.5.0
+DISTVERSION=	2.5.1
 CATEGORIES=	audio
 
-PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
-PATCHFILES=	5aba957f3cf0fb4dcef4d2add679603e6c048fb4.diff:-p1
-
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Audio plugin host for Jack and PulseAudio
 WWW=		https://kx.studio/Applications:Carla
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/doc/GPL.txt
 
 LIB_DEPENDS=	liblo.so:audio/liblo \
 		libsndfile.so:audio/libsndfile
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyliblo>0:audio/py-pyliblo@${PY_FLAVOR}
 
 USES=		compiler:c++11-lib desktop-file-utils gl gmake gnome localbase \
 		pkgconfig pyqt:5 python:3.4+ qt:5 sdl shared-mime-info shebangfix \
 		tar:bz2 xorg
 USE_PYQT=	pyqt5 sip
 USE_GNOME=	gtk20 gtk30
 USE_QT=		core gui widgets buildtools:build
 USE_GL=		gl
 USE_XORG=	x11
 USE_SDL=	sdl2
 USE_LDCONFIG=	${PREFIX}/lib/carla
 
 CONFLICTS_BUILD=	rtaudio rtmidi
 
 SHEBANG_FILES=	data/carla-single data/carla-bridge-lv2-modgui source/native-plugins/resources/* source/frontend/*
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	falkTX
 
 MAKE_ARGS=	HAVE_QT4=false \
 		EXTERNAL_PLUGINS=false \
 		PREFIX=${LOCALBASE}
 # Give the Makefile the proper versioned binaries of PyQt
 BINARY_ALIAS=	pyuic5=${LOCALBASE}/bin/pyuic5-${PYTHON_VER} \
 		pyrcc5=${LOCALBASE}/bin/pyrcc5-${PYTHON_VER}
 
 OPTIONS_DEFINE=		FFMPEG FLUIDSYNTH LINUXSAMPLER
 OPTIONS_DEFAULT=	FFMPEG FLUIDSYNTH JACK
 OPTIONS_DEFAULT_amd64=	LINUXSAMPLER
 OPTIONS_DEFAULT_i386=	LINUXSAMPLER
 OPTIONS_MULTI=		BACKEND
 OPTIONS_MULTI_BACKEND=	JACK PULSEAUDIO
 BACKEND_DESC=		Audio backend
 
 FFMPEG_LIB_DEPENDS=		libavutil.so:multimedia/ffmpeg
 FFMPEG_MAKE_ARGS_OFF=		HAVE_FFMPEG=false
 
 FLUIDSYNTH_LIB_DEPENDS=		libfluidsynth.so:audio/fluidsynth
 FLUIDSYNTH_MAKE_ARGS_OFF=	HAVE_FLUIDSYNTH=false
 
 LINUXSAMPLER_DESC=		Use LinuxSampler: a software audio sampler
 LINUXSAMPLER_LIB_DEPENDS=	liblinuxsampler.so:audio/linuxsampler
 LINUXSAMPLER_MAKE_ARGS_OFF=	HAVE_LINUXSAMPLER=false
 
 JACK_BUILD_DEPENDS=		jackit>0:audio/jack
 JACK_RUN_DEPENDS=		${LOCALBASE}/lib/libjack.so:audio/jack
 JACK_MAKE_ARGS_OFF=		HAVE_JACK=false
 
 PULSEAUDIO_LIB_DEPENDS=		libpulse-simple.so:audio/pulseaudio
 PULSEAUDIO_MAKE_ARGS_OFF=	HAVE_PULSEAUDIO=false
 
 CFLAGS_powerpc64le=	-DEEL_TARGET_PORTABLE
 CFLAGS_powerpc64=	-DEEL_TARGET_PORTABLE
 CFLAGS_powerpc=	-DEEL_TARGET_PORTABLE
 
 post-install:
 	@${REINPLACE_CMD} -i '' -e ' \
 		s|^PYTHON=.*|PYTHON=${PYTHON_CMD}|; \
 		s|#!/bin/bash|#!/bin/sh|' \
 		${STAGEDIR}${PREFIX}/bin/carla*
 	${RMDIR} ${STAGEDIR}${PREFIX}/share/carla/resources/translations
 
 devel-features: patch
 	@${ECHO} "Developer command: show build features"
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} features
 
 .include <bsd.port.mk>
diff --git a/audio/carla/distinfo b/audio/carla/distinfo
index 67cfdc2f7a76..c755525d456e 100644
--- a/audio/carla/distinfo
+++ b/audio/carla/distinfo
@@ -1,5 +1,3 @@
-TIMESTAMP = 1658075318
-SHA256 (falkTX-Carla-v2.5.0_GH0.tar.gz) = f1077caa97b52fedc0d567f7f0e561b466031b5b34b760cd68efe836e19d408d
-SIZE (falkTX-Carla-v2.5.0_GH0.tar.gz) = 11533773
-SHA256 (5aba957f3cf0fb4dcef4d2add679603e6c048fb4.diff) = 1709d27634fc68794b72a200905e1cb6b2dd35aa0df16a9fd3fe7926cfb7d91a
-SIZE (5aba957f3cf0fb4dcef4d2add679603e6c048fb4.diff) = 432
+TIMESTAMP = 1664658145
+SHA256 (falkTX-Carla-v2.5.1_GH0.tar.gz) = c47eea999b2880bde035fbc30d7b42b49234a81327127048a56967ec884dfdba
+SIZE (falkTX-Carla-v2.5.1_GH0.tar.gz) = 11531860
diff --git a/audio/carla/files/patch-source_modules_ysfx_sources_ysfx__utils__fts.cpp b/audio/carla/files/patch-source_modules_ysfx_sources_ysfx__utils__fts.cpp
deleted file mode 100644
index ece3249b2fa1..000000000000
--- a/audio/carla/files/patch-source_modules_ysfx_sources_ysfx__utils__fts.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-- workaround for https://github.com/jpcima/ysfx/issues/61
-
---- source/modules/ysfx/sources/ysfx_utils_fts.cpp.orig	2022-07-17 16:50:07 UTC
-+++ source/modules/ysfx/sources/ysfx_utils_fts.cpp
-@@ -36,7 +36,7 @@ void visit_directories(const char *rootpath, bool (*vi
- #ifndef __EMSCRIPTEN__
-     char *argv[] = {(char *)rootpath, nullptr};
- 
--    auto compar = [](const FTSENT **a, const FTSENT **b) -> int {
-+    auto compar = [](const FTSENT * const *a, const FTSENT * const *b) -> int {
-         return strcmp((*a)->fts_name, (*b)->fts_name);
-     };
-