Index: Makefile
===================================================================
--- Makefile	(revision 544908)
+++ Makefile	(working copy)
@@ -11,7 +11,12 @@
 LICENSE=	LGPL21+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-USES=		cmake cpe localbase pkgconfig python:build,test shebangfix
+TEST_DEPENDS=	autogen:devel/autogen
+
+USES=		autoreconf libtool cpe localbase pkgconfig python:build,test shebangfix
+USE_GITHUB=	yes
+USE_LDCONFIG=	yes
+
 SHEBANG_FILES=	programs/test-sndfile-metadata-set.py \
 		src/binheader_writef_check.py \
 		src/create_symbols_file.py
@@ -18,35 +23,23 @@
 
 CPE_VENDOR=	${CPE_PRODUCT}_project
 
-USE_GITHUB=	yes
 GH_ACCOUNT=	erikd
 GH_TAGNAME=	2ccb23f
 
-USE_LDCONFIG=	yes
+GNU_CONFIGURE=	yes
 
-OPTIONS_DEFINE=	DOCS EXTERNAL STATIC TEST
-OPTIONS_SUB=	yes
+OPTIONS_DEFINE=		DOCS EXTERNAL
 OPTIONS_DEFAULT=	EXTERNAL
+OPTIONS_SUB=		yes
+
 EXTERNAL_DESC=	Enable FLAC, Ogg Vorbis, Opus support
-TEST_IMPLIES=	STATIC
 
 EXTERNAL_LIB_DEPENDS=	libFLAC.so:audio/flac \
 			libogg.so:audio/libogg \
 			libopus.so:audio/opus \
 			libvorbis.so:audio/libvorbis
+EXTERNAL_VARS_OFF=	EXTRA_PATCHES=${FILESDIR}/extrapatch-cmake_SndFileChecks.cmake-disableexternallibs
 
-STATIC_CMAKE_OFF=	-DBUILD_SHARED_LIBS:BOOL=ON
+TEST_TARGET=	check
 
-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: pkg-plist
===================================================================
--- pkg-plist	(revision 544908)
+++ pkg-plist	(working copy)
@@ -14,10 +14,10 @@
 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.29
+lib/libsndfile.a
+lib/libsndfile.so
+lib/libsndfile.so.1
+lib/libsndfile.so.1.0.29
 libdata/pkgconfig/sndfile.pc
 man/man1/sndfile-cmp.1.gz
 man/man1/sndfile-concat.1.gz