Index: branches/2020Q3/audio/libsndfile/Makefile
===================================================================
--- branches/2020Q3/audio/libsndfile/Makefile	(revision 548198)
+++ branches/2020Q3/audio/libsndfile/Makefile	(revision 548199)
@@ -1,52 +1,56 @@
 # Created by: ijliao
 # $FreeBSD$
 
 PORTNAME=	libsndfile
-DISTVERSION=	1.0.29pre.20200620
+DISTVERSION=	1.0.29
 CATEGORIES=	audio
+MASTER_SITES=	https://github.com/erikd/${PORTNAME}/releases/download/v1.0.29/
 
 MAINTAINER=	multimedia@FreeBSD.org
 COMMENT=	Reading and writing files containing sampled sound (like WAV or AIFF)
 
 LICENSE=	LGPL21+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-USES=		cmake cpe localbase pkgconfig python:build,test shebangfix
+USES=		cmake cpe localbase pkgconfig python:build,test shebangfix \
+		tar:bz2
 SHEBANG_FILES=	programs/test-sndfile-metadata-set.py \
 		src/binheader_writef_check.py \
 		src/create_symbols_file.py
 
 CPE_VENDOR=	${CPE_PRODUCT}_project
 
-USE_GITHUB=	yes
-GH_ACCOUNT=	erikd
-GH_TAGNAME=	2ccb23f
-
 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 STATIC TEST
 OPTIONS_SUB=	yes
 OPTIONS_DEFAULT=	EXTERNAL
 EXTERNAL_DESC=	Enable FLAC, Ogg Vorbis, Opus support
+TEST_DESC=	Build tests (forces static library only)
 TEST_IMPLIES=	STATIC
 
 EXTERNAL_LIB_DEPENDS=	libFLAC.so:audio/flac \
 			libogg.so:audio/libogg \
 			libopus.so:audio/opus \
 			libvorbis.so:audio/libvorbis
 
 STATIC_CMAKE_OFF=	-DBUILD_SHARED_LIBS:BOOL=ON
 
 TEST_CMAKE_ON=	-DBUILD_TESTING:BOOL=ON
 TEST_CMAKE_OFF=	-DBUILD_TESTING:BOOL=OFF
 
 .include <bsd.port.options.mk>
 
 .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>
Index: branches/2020Q3/audio/libsndfile/distinfo
===================================================================
--- branches/2020Q3/audio/libsndfile/distinfo	(revision 548198)
+++ branches/2020Q3/audio/libsndfile/distinfo	(revision 548199)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1595853607
-SHA256 (erikd-libsndfile-1.0.29pre.20200620-2ccb23f_GH0.tar.gz) = 70fee769ab60c579090edf5a43a4959a71feb14f0e531394f4e1c1a9741258c3
-SIZE (erikd-libsndfile-1.0.29pre.20200620-2ccb23f_GH0.tar.gz) = 721895
+TIMESTAMP = 1598210411
+SHA256 (libsndfile-1.0.29.tar.bz2) = 2ba20d44817c8176f097ab25eff44ef0aeec9e00973def5a7174c5ae0764b22f
+SIZE (libsndfile-1.0.29.tar.bz2) = 831090
Index: branches/2020Q3/audio/libsndfile/files/patch-CMakeLists.txt
===================================================================
--- branches/2020Q3/audio/libsndfile/files/patch-CMakeLists.txt	(revision 548198)
+++ branches/2020Q3/audio/libsndfile/files/patch-CMakeLists.txt	(nonexistent)
@@ -1,13 +0,0 @@
---- CMakeLists.txt.orig	2020-07-23 12:41:43 UTC
-+++ CMakeLists.txt
-@@ -74,8 +74,8 @@ cmake_dependent_option (ENABLE_COMPATIBLE_LIBSNDFILE_N
- 
- set (HAVE_EXTERNAL_XIPH_LIBS ${ENABLE_EXTERNAL_LIBS})
- set (HAVE_SQLITE3 ${BUILD_REGTEST})
--set (HAVE_ALSA_ASOUNDLIB_H ${ALSA_FOUND})
--set (HAVE_SNDIO_H ${SNDIO_FOUND})
-+set (HAVE_ALSA_ASOUNDLIB_H 0)
-+set (HAVE_SNDIO_H 0)
- 
- set (ENABLE_EXPERIMENTAL_CODE ${ENABLE_EXPERIMENTAL})
- set (HAVE_SPEEX ${ENABLE_EXPERIMENTAL})

Property changes on: branches/2020Q3/audio/libsndfile/files/patch-CMakeLists.txt
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: branches/2020Q3/audio/libsndfile/files/patch-cmake_SndFileChecks.cmake
===================================================================
--- branches/2020Q3/audio/libsndfile/files/patch-cmake_SndFileChecks.cmake	(revision 548198)
+++ branches/2020Q3/audio/libsndfile/files/patch-cmake_SndFileChecks.cmake	(nonexistent)
@@ -1,14 +0,0 @@
---- cmake/SndFileChecks.cmake.orig	2020-06-20 08:18:11 UTC
-+++ cmake/SndFileChecks.cmake
-@@ -22,11 +22,6 @@ else ()
- endif ()
- set (SF_COUNT_MAX 0x7fffffffffffffffll)
- 
--if (NOT WIN32)
--	find_package (ALSA)
--	find_package (Sndio)
--endif ()
--
- if (VCPKG_TOOLCHAIN AND (NOT CMAKE_VERSION VERSION_LESS 3.15))
- 	set (CMAKE_FIND_PACKAGE_PREFER_CONFIG ON)
- endif ()

Property changes on: branches/2020Q3/audio/libsndfile/files/patch-cmake_SndFileChecks.cmake
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: branches/2020Q3
===================================================================
--- branches/2020Q3	(revision 548198)
+++ branches/2020Q3	(revision 548199)

Property changes on: branches/2020Q3
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r548196