diff --git a/audio/zynaddsubfx/Makefile b/audio/zynaddsubfx/Makefile
index dae9ef544d75..4a1cd9c69b58 100644
--- a/audio/zynaddsubfx/Makefile
+++ b/audio/zynaddsubfx/Makefile
@@ -1,106 +1,106 @@
 PORTNAME=	zynaddsubfx
 DISTVERSION=	3.0.6
-PORTREVISION=	2
+PORTREVISION=	3
 PORTEPOCH=	2
 CATEGORIES=	audio
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Realtime software synthesizer
 WWW=		http://zynaddsubfx.sourceforge.net/
 
 LICENSE=	GPLv2
 
 BUILD_DEPENDS=	${LOCALBASE}/include/fftw3.h:math/fftw3
 
 LIB_DEPENDS=	libfftw3f.so:math/fftw3-float \
 		libmxml.so:textproc/mxml \
 		liblo.so:audio/liblo
 
 USES=		cmake:insource compiler:c++11-lang pkgconfig tar:bzip2
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_TUPLE=	DISTRHO:DPF:86a621bfd86922a49ce593fec2a618a1e0cc6ef3:d/DPF \
 		fundamental:rtosc:2aec26327e0139131c9bd7439c9928370fccf1ce:e/rtosc \
 		zynaddsubfx:instruments:c5c912131b31df5fdf372d2f06a25aaf2375837f:f/instruments
 
 OPTIONS_DEFINE=		BASH OSS JACK GUI PORTAUDIO SNDIO LASH DOCS EXAMPLES
 OPTIONS_DEFAULT=	OSS JACK GUI PORTAUDIO
 OPTIONS_RADIO=		AUDIO
 OPTIONS_RADIO_AUDIO=	ALSAMIDI DSSI
 OPTIONS_SUB=		yes
 
 ALSAMIDI_DESC=	MIDI input through ALSA
 DSSI_DESC=	DSSI Plugin
 
 ALSAMIDI_LIB_DEPENDS=		libasound.so:audio/alsa-lib
 ALSAMIDI_CMAKE_OFF=		-DAlsaEnable:BOOL=OFF
 
 BASH_DESC=			Support for bash auto-completion
 BASH_BUILD_DEPENDS=		bash-completion>=0:shells/bash-completion
 
 DSSI_LIB_DEPENDS=		libdssialsacompat.so:audio/libdssialsacompat
 DSSI_BUILD_DEPENDS=		dssi>0:audio/dssi
 DSSI_RUN_DEPENDS=		dssi>0:audio/dssi
 DSSI_CFLAGS=			-I${LOCALBASE}/include/dssi
 DSSI_CMAKE_OFF=			-DDssiEnable:BOOL=OFF
 
 GUI_LIB_DEPENDS=		libntk.so:x11-toolkits/ntk \
 				libpng.so:graphics/png \
 				libfontconfig.so:x11-fonts/fontconfig
 GUI_CMAKE_ON=			-DGuiModule:STRING=ntk
 GUI_CMAKE_OFF=			-DGuiModule:STRING=OFF
 GUI_USE+=			XORG=x11,xext,xfixes,xcursor,xrender,ice,sm,xpm,xinerama,xft
 GUI_USE+=			GL=gl,glu
 GUI_USES=			gl gnome jpeg xorg
 
 OSS_CMAKE_ON=			-DOssEnable:BOOL=ON
 OSS_CMAKE_OFF=			-DOssEnable:BOOL=OFF
 
 LASH_LIB_DEPENDS=		liblash.so:audio/lash
 LASH_CMAKE_OFF=			-DLashEnable:BOOL=OFF
 
 JACK_LIB_DEPENDS=		libjack.so:audio/jack
 JACK_CMAKE_OFF=			-DJackEnable:BOOL=OFF
 
 PORTAUDIO_LIB_DEPENDS=		libportaudio.so:audio/portaudio
 PORTAUDIO_CMAKE_OFF=		-DPaEnable:BOOL=OFF
 
 SNDIO_LIB_DEPENDS=		libsndio.so:audio/sndio
 SNDIO_CMAKE_OFF=		-DSndioEnable:BOOL=OFF
 
 PORTDOCS=	*
 
 DOCSRCDIR1=	${WRKSRC}
 DOC_FILES1=	AUTHORS.txt NEWS.txt
 
 DOCSRCDIR2=	${WRKSRC}/doc
 DOCSDIR2=	${DOCSDIR}/doc
 DOC_FILES2=	adsynth.txt controller.txt envelope.txt filter.txt intro.txt \
 		lfo.txt mididefaults.txt nrpn.txt saving.txt zynaddsubfx.txt
 
 DOCSRCDIR3=	${WRKSRC}/doc/images
 DOCSDIR3=	${DOCSDIR}/doc/images
 DOC_FILES3=	*.png *.jpg
 
 PORTEXAMPLES=	*
 
 CMAKE_ARGS+=	-DZYN_DATADIR:STRING=${DATADIR}
 CMAKE_ARGS+=	-DZYN_EXAMPLESDIR:STRING=${EXAMPLESDIR}
 
 .include <bsd.port.pre.mk>
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}/banks \
 		${STAGEDIR}${DOCSDIR} \
 		${STAGEDIR}${DOCSDIR2} \
 		${STAGEDIR}${DOCSDIR3} \
 		${STAGEDIR}${EXAMPLESDIR}
 
 	(cd ${WRKSRC}/instruments/banks && \
 		${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/banks)
 	${INSTALL_DATA} ${DOC_FILES1:S|^|${DOCSRCDIR1}/|} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${DOC_FILES2:S|^|${DOCSRCDIR2}/|} ${STAGEDIR}${DOCSDIR2}
 	${INSTALL_DATA} ${DOC_FILES3:S|^|${DOCSRCDIR3}/|} ${STAGEDIR}${DOCSDIR3}
 
 .include <bsd.port.post.mk>
diff --git a/audio/zynaddsubfx/files/patch-rtosc_src_cpp_savefile.cpp b/audio/zynaddsubfx/files/patch-rtosc_src_cpp_savefile.cpp
new file mode 100644
index 000000000000..96e760e7cdd7
--- /dev/null
+++ b/audio/zynaddsubfx/files/patch-rtosc_src_cpp_savefile.cpp
@@ -0,0 +1,11 @@
+--- rtosc/src/cpp/savefile.cpp.orig	2021-12-31 15:58:28 UTC
++++ rtosc/src/cpp/savefile.cpp
+@@ -534,7 +534,7 @@ int load_from_file(const char* file_content,
+     n = 0;
+ 
+     sscanf(file_content,
+-           "%% %128s v%u.%u.%u%n ", appbuf, &vma, &vmi, &vre, &n);
++           "%% %127s v%u.%u.%u%n ", appbuf, &vma, &vmi, &vre, &n);
+     if(n <= 0 || strcmp(appbuf, appname) || vma > 255 || vmi > 255 || vre > 255)
+         return -bytes_read-1;
+ 
diff --git a/audio/zynaddsubfx/files/patch-src_Effects_Distorsion.cpp b/audio/zynaddsubfx/files/patch-src_Effects_Distorsion.cpp
new file mode 100644
index 000000000000..f6b968afd117
--- /dev/null
+++ b/audio/zynaddsubfx/files/patch-src_Effects_Distorsion.cpp
@@ -0,0 +1,11 @@
+--- src/Effects/Distorsion.cpp.orig	2022-01-22 01:46:21 UTC
++++ src/Effects/Distorsion.cpp
+@@ -75,7 +75,7 @@ rtosc::Ports Distorsion::ports = {
+ 
+             for(int i=0; i<128; ++i)
+                 buffer[i] = 2*(i/128.0)-1;
+-            memcpy(orig, buffer, sizeof(float_t)*128);
++            memcpy(orig, buffer, sizeof(buffer));
+ 
+             waveShapeSmps(sizeof(buffer)/sizeof(buffer[0]), buffer,
+                     dd.Ptype + 1, dd.Pdrive, dd.Poffset, dd.Pfuncpar);
diff --git a/audio/zynaddsubfx/files/patch-src_Synth_ADnote.cpp b/audio/zynaddsubfx/files/patch-src_Synth_ADnote.cpp
new file mode 100644
index 000000000000..1b207bbcfdf8
--- /dev/null
+++ b/audio/zynaddsubfx/files/patch-src_Synth_ADnote.cpp
@@ -0,0 +1,11 @@
+--- src/Synth/ADnote.cpp.orig	2022-01-22 01:46:21 UTC
++++ src/Synth/ADnote.cpp
+@@ -1264,7 +1264,7 @@ inline void ADnote::ComputeVoiceOscillator_SincInterpo
+ inline void ADnote::ComputeVoiceOscillator_SincInterpolation(int nvoice)
+ {
+     // windowed sinc kernel factor Fs*0.3, rejection 80dB
+-    const float_t kernel[] = {
++    const float kernel[] = {
+         0.0010596256917418426f,
+         0.004273442181254887f,
+         0.0035466063043375785f,