diff --git a/audio/libsndfile/Makefile b/audio/libsndfile/Makefile
index c45bc38f4a19..8399eb1e767c 100644
--- a/audio/libsndfile/Makefile
+++ b/audio/libsndfile/Makefile
@@ -1,53 +1,62 @@
 PORTNAME=	libsndfile
-DISTVERSION=	1.2.2
-PORTREVISION=	2
+DISTVERSION=	1.2.2.20251216
 CATEGORIES=	audio
-MASTER_SITES=	https://github.com/${PORTNAME}/${PORTNAME}/releases/download/${DISTVERSION}/
+#MASTER_SITES=	https://github.com/${PORTNAME}/${PORTNAME}/releases/download/${DISTVERSION}/
 
-PATCH_SITES=	https://github.com/${PORTNAME}/${PORTNAME}/commit/
-PATCHFILES=	0754562e13d2e63a248a1c82f90b30bc0ffe307c.patch:-p1
+PATCH_SITES=   https://github.com/${PORTNAME}/${PORTNAME}/commit/
+PATCHFILES=    f8cc69656cf401cc33e4e380dfb972c9fdca0750.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 \
+USES=		cmake:testing cpe localbase pkgconfig python:build,test \
 		shebangfix tar:xz
+CPE_VENDOR=	${CPE_PRODUCT}_project
 SHEBANG_FILES=	programs/test-sndfile-metadata-set.py \
 		src/binheader_writef_check.py \
 		src/create_symbols_file.py
+USE_LDCONFIG=	yes
 
-CPE_VENDOR=	${CPE_PRODUCT}_project
+USE_GITHUB=	yes
+GH_TAGNAME=	68f6c16
 
-USE_LDCONFIG=	yes
+.if make(test)
+# Tests only works with STATIC lib so don't pollute default build dir
+BUILD_WRKSRC=	${WRKDIR}/.build-testing
+INSTALL_WRKSRC=	${WRKDIR}/.build-testing
+TEST_WRKSRC=	${WRKDIR}/.build-testing
+.endif
 
-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
+CMAKE_TESTING_OFF=	BUILD_SHARED_LIBS
 
-OPTIONS_DEFINE=	DOCS EXTERNAL MANPAGES STATIC TEST
+CMAKE_ON=	BUILD_SHARED_LIBS \
+		CMAKE_DISABLE_FIND_PACKAGE_ALSA \
+		CMAKE_DISABLE_FIND_PACKAGE_Sndio \
+		CMAKE_DISABLE_FIND_PACKAGE_Speex \
+		CMAKE_DISABLE_FIND_PACKAGE_SQLite3
+CMAKE_ARGS=	-DCMAKE_CTEST_ARGUMENTS="-E;lossy_comp_test_ogg_opus"
+
+OPTIONS_DEFINE=	DOCS EXTERNAL MANPAGES TEST
 OPTIONS_SUB=	yes
 OPTIONS_DEFAULT=	EXTERNAL
+
 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_BOOL=	ENABLE_EXTERNAL_LIBS ENABLE_MPEG
+
 MANPAGES_CMAKE_BOOL=	INSTALL_MANPAGES
-STATIC_CMAKE_OFF=	-DBUILD_SHARED_LIBS:BOOL=ON
-TEST_CMAKE_BOOL=	BUILD_TESTING
 
-do-test:
-	(cd ${TEST_WRKSRC} && CTEST_OUTPUT_ON_FAILURE=1 ctest -V)
+pre-test:
+	${MKDIR} ${EXTRACT_WRKDIR}/.build-testing
 
 .include <bsd.port.mk>
diff --git a/audio/libsndfile/distinfo b/audio/libsndfile/distinfo
index 510494b71533..7354b6cfcbae 100644
--- a/audio/libsndfile/distinfo
+++ b/audio/libsndfile/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1699480963
-SHA256 (libsndfile-1.2.2.tar.xz) = 3799ca9924d3125038880367bf1468e53a1b7e3686a934f098b7e1d286cdb80e
-SIZE (libsndfile-1.2.2.tar.xz) = 730760
-SHA256 (0754562e13d2e63a248a1c82f90b30bc0ffe307c.patch) = f42720a0307a5d3785c2719729d0eeaa0f15e6fe1c3645f5028fef89a35d7bd2
-SIZE (0754562e13d2e63a248a1c82f90b30bc0ffe307c.patch) = 1722
+TIMESTAMP = 1776595646
+SHA256 (libsndfile-libsndfile-1.2.2.20251216-68f6c16_GH0.tar.gz) = f5f9de38b23b7c69d31c2fc083ab1e1edfb2026f0785bef4e38bca8b3b7e1c03
+SIZE (libsndfile-libsndfile-1.2.2.20251216-68f6c16_GH0.tar.gz) = 684377
+SHA256 (f8cc69656cf401cc33e4e380dfb972c9fdca0750.patch) = 867136ffe7968d08eb6fcf2f7d21098699a5fe82dc5296af3db91a355fde4727
+SIZE (f8cc69656cf401cc33e4e380dfb972c9fdca0750.patch) = 967
diff --git a/audio/libsndfile/pkg-plist b/audio/libsndfile/pkg-plist
index 8e757bfdc730..feace83e2f42 100644
--- a/audio/libsndfile/pkg-plist
+++ b/audio/libsndfile/pkg-plist
@@ -1,47 +1,46 @@
 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.37
+lib/libsndfile.so
+lib/libsndfile.so.1
+lib/libsndfile.so.1.0.37
 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