diff --git a/audio/libsndfile/Makefile b/audio/libsndfile/Makefile
index 20ce566f8010..ed5b9952909e 100644
--- a/audio/libsndfile/Makefile
+++ b/audio/libsndfile/Makefile
@@ -1,57 +1,58 @@
 PORTNAME=	libsndfile
-DISTVERSION=	1.0.31
-PORTREVISION=	2
+DISTVERSION=	1.2.0
 CATEGORIES=	audio
 MASTER_SITES=	https://github.com/${PORTNAME}/${PORTNAME}/releases/download/${DISTVERSION}/
 
-PATCH_SITES=	https://github.com/${PORTNAME}/${PORTNAME}/commit/
-PATCHFILES=	cc342f9e45315f9f3de12ae493bc6b3a2bd0a0b1.patch:-p1
-
 MAINTAINER=	multimedia@FreeBSD.org
 COMMENT=	Reading and writing files containing sampled sound (like WAV or AIFF)
 WWW=		http://www.mega-nerd.com/libsndfile/
 
 LICENSE=	LGPL21+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-USES=		cmake cpe localbase pkgconfig python:build,test shebangfix \
-		tar:bz2
+USES=		cmake cpe localbase pathfix pkgconfig python:build,test \
+		shebangfix tar:xz
 SHEBANG_FILES=	programs/test-sndfile-metadata-set.py \
 		src/binheader_writef_check.py \
 		src/create_symbols_file.py
 
 CPE_VENDOR=	${CPE_PRODUCT}_project
 
 USE_LDCONFIG=	yes
 
 CMAKE_ARGS=	-DCMAKE_DISABLE_FIND_PACKAGE_ALSA:BOOL=True \
 		-DCMAKE_DISABLE_FIND_PACKAGE_Sndio:BOOL=True \
 		-DCMAKE_DISABLE_FIND_PACKAGE_Speex:BOOL=True \
 		-DCMAKE_DISABLE_FIND_PACKAGE_SQLite3:BOOL=True
 
 OPTIONS_DEFINE=	DOCS EXTERNAL MANPAGES STATIC TEST
 OPTIONS_SUB=	yes
 OPTIONS_DEFAULT=	EXTERNAL
-EXTERNAL_DESC=	Enable FLAC, Ogg Vorbis, Opus support
+EXTERNAL_DESC=	Enable FLAC, MP3, Ogg Vorbis, Opus support
 TEST_DESC=	Build tests (forces static library only)
 TEST_IMPLIES=	STATIC
 
 EXTERNAL_LIB_DEPENDS=	libFLAC.so:audio/flac \
+			libmp3lame.so:audio/lame \
+			libmpg123.so:audio/mpg123 \
 			libogg.so:audio/libogg \
 			libopus.so:audio/opus \
 			libvorbis.so:audio/libvorbis
-
+EXTERNAL_CMAKE_OFF=	-DCMAKE_DISABLE_FIND_PACKAGE_mp3lame:BOOL=True \
+			-DCMAKE_DISABLE_FIND_PACKAGE_Mpg123:BOOL=True \
 MANPAGES_CMAKE_BOOL=	INSTALL_MANPAGES
 STATIC_CMAKE_OFF=	-DBUILD_SHARED_LIBS:BOOL=ON
 TEST_CMAKE_BOOL=	BUILD_TESTING
 
 .include <bsd.port.options.mk>
 
+# Disables external libs except mp3, as this is handled
+# differently in the cmake files
 .if ! ${PORT_OPTIONS:MEXTERNAL}
 EXTRA_PATCHES=	${FILESDIR}/extrapatch-cmake_SndFileChecks.cmake-disableexternallibs
 .endif
 
 do-test:
 	(cd ${TEST_WRKSRC} && CTEST_OUTPUT_ON_FAILURE=1 ctest -V)
 
 .include <bsd.port.mk>
diff --git a/audio/libsndfile/distinfo b/audio/libsndfile/distinfo
index 00e9b34e060c..6196ab82a801 100644
--- a/audio/libsndfile/distinfo
+++ b/audio/libsndfile/distinfo
@@ -1,5 +1,3 @@
-TIMESTAMP = 1632130804
-SHA256 (libsndfile-1.0.31.tar.bz2) = a8cfb1c09ea6e90eff4ca87322d4168cdbe5035cb48717b40bf77e751cc02163
-SIZE (libsndfile-1.0.31.tar.bz2) = 875335
-SHA256 (cc342f9e45315f9f3de12ae493bc6b3a2bd0a0b1.patch) = 51607b67698d0427ef03488c1486e40a0da61e91f6404fa876c1776b197b9c44
-SIZE (cc342f9e45315f9f3de12ae493bc6b3a2bd0a0b1.patch) = 793
+TIMESTAMP = 1672007310
+SHA256 (libsndfile-1.2.0.tar.xz) = 0e30e7072f83dc84863e2e55f299175c7e04a5902ae79cfb99d4249ee8f6d60a
+SIZE (libsndfile-1.2.0.tar.xz) = 730268
diff --git a/audio/libsndfile/pkg-plist b/audio/libsndfile/pkg-plist
index e5e271f60967..cc5a30bc50f4 100644
--- a/audio/libsndfile/pkg-plist
+++ b/audio/libsndfile/pkg-plist
@@ -1,47 +1,47 @@
 bin/sndfile-cmp
 bin/sndfile-concat
 bin/sndfile-convert
 bin/sndfile-deinterleave
 bin/sndfile-info
 bin/sndfile-interleave
 bin/sndfile-metadata-get
 bin/sndfile-metadata-set
 bin/sndfile-play
 bin/sndfile-salvage
 include/sndfile.h
 include/sndfile.hh
 lib/cmake/SndFile/SndFileConfig.cmake
 lib/cmake/SndFile/SndFileConfigVersion.cmake
 lib/cmake/SndFile/SndFileTargets-%%CMAKE_BUILD_TYPE%%.cmake
 lib/cmake/SndFile/SndFileTargets.cmake
 %%STATIC%%lib/libsndfile.a
 %%NO_STATIC%%lib/libsndfile.so
 %%NO_STATIC%%lib/libsndfile.so.1
-%%NO_STATIC%%lib/libsndfile.so.1.0.31
+%%NO_STATIC%%lib/libsndfile.so.1.0.35
 libdata/pkgconfig/sndfile.pc
 %%MANPAGES%%share/man/man1/sndfile-cmp.1.gz
 %%MANPAGES%%share/man/man1/sndfile-concat.1.gz
 %%MANPAGES%%share/man/man1/sndfile-convert.1.gz
 %%MANPAGES%%share/man/man1/sndfile-deinterleave.1.gz
 %%MANPAGES%%share/man/man1/sndfile-info.1.gz
 %%MANPAGES%%share/man/man1/sndfile-interleave.1.gz
 %%MANPAGES%%share/man/man1/sndfile-metadata-get.1.gz
 %%MANPAGES%%share/man/man1/sndfile-metadata-set.1.gz
 %%MANPAGES%%share/man/man1/sndfile-play.1.gz
 %%MANPAGES%%share/man/man1/sndfile-salvage.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/FAQ.md
 %%PORTDOCS%%%%DOCSDIR%%/api.md
 %%PORTDOCS%%%%DOCSDIR%%/bugs.md
 %%PORTDOCS%%%%DOCSDIR%%/command.md
 %%PORTDOCS%%%%DOCSDIR%%/embedded_files.md
 %%PORTDOCS%%%%DOCSDIR%%/formats.md
 %%PORTDOCS%%%%DOCSDIR%%/index.md
 %%PORTDOCS%%%%DOCSDIR%%/libsndfile.css
 %%PORTDOCS%%%%DOCSDIR%%/libsndfile.jpg
 %%PORTDOCS%%%%DOCSDIR%%/lists.md
 %%PORTDOCS%%%%DOCSDIR%%/new_file_type_howto.md
 %%PORTDOCS%%%%DOCSDIR%%/octave.md
 %%PORTDOCS%%%%DOCSDIR%%/print.css
 %%PORTDOCS%%%%DOCSDIR%%/sndfile_info.md
 %%PORTDOCS%%%%DOCSDIR%%/tutorial.md
 %%PORTDOCS%%%%DOCSDIR%%/win32.md