Index: devel/atf/Makefile
===================================================================
--- devel/atf/Makefile
+++ devel/atf/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	atf
-PORTVERSION=	0.20
-PORTREVISION=	1
+PORTVERSION=	0.21
 CATEGORIES=	devel
 MASTER_SITES=	https://github.com/jmmv/${PORTNAME}/releases/download/${PORTNAME}-${PORTVERSION}/ \
 		LOCAL/jmmv
Index: devel/atf/distinfo
===================================================================
--- devel/atf/distinfo
+++ devel/atf/distinfo
@@ -1,2 +1,2 @@
-SHA256 (atf-0.20.tar.gz) = 9bc4ab004603331301410c293394b7e8b7341e59a528a4b51e16effeb1142cd9
-SIZE (atf-0.20.tar.gz) = 556370
+SHA256 (atf-0.21.tar.gz) = 92bc64180135eea8fe84c91c9f894e678767764f6dbc8482021d4dde09857505
+SIZE (atf-0.21.tar.gz) = 567791
Index: devel/atf/pkg-plist
===================================================================
--- devel/atf/pkg-plist
+++ devel/atf/pkg-plist
@@ -2,14 +2,12 @@
 include/atf-c++.hpp
 include/atf-c++/build.hpp
 include/atf-c++/check.hpp
-include/atf-c++/config.hpp
 include/atf-c++/macros.hpp
 include/atf-c++/tests.hpp
 include/atf-c++/utils.hpp
 include/atf-c.h
 include/atf-c/build.h
 include/atf-c/check.h
-include/atf-c/config.h
 include/atf-c/defs.h
 include/atf-c/error.h
 include/atf-c/error_fwd.h
@@ -19,12 +17,12 @@
 include/atf-c/utils.h
 lib/libatf-c++.a
 lib/libatf-c++.so
-lib/libatf-c++.so.1
-lib/libatf-c++.so.1.0.0
+lib/libatf-c++.so.2
+lib/libatf-c++.so.2.0.0
 lib/libatf-c.a
 lib/libatf-c.so
-lib/libatf-c.so.0
-lib/libatf-c.so.0.0.0
+lib/libatf-c.so.1
+lib/libatf-c.so.1.0.0
 libdata/pkgconfig/atf-c++.pc
 libdata/pkgconfig/atf-c.pc
 libdata/pkgconfig/atf-sh.pc
@@ -32,10 +30,14 @@
 man/man1/atf-check.1.gz
 man/man1/atf-sh.1.gz
 man/man1/atf-test-program.1.gz
-man/man3/atf-c-api.3.gz
 man/man3/atf-c++-api.3.gz
+man/man3/atf-c++.3.gz
+man/man3/atf-c-api.3.gz
+man/man3/atf-c.3.gz
 man/man3/atf-sh-api.3.gz
+man/man3/atf-sh.3.gz
 man/man4/atf-test-case.4.gz
+man/man7/atf.7.gz
 share/aclocal/atf-c++.m4
 share/aclocal/atf-c.m4
 share/aclocal/atf-common.m4
@@ -52,7 +54,6 @@
 %%TEST%%tests/atf/atf-c/atf_c_test
 %%TEST%%tests/atf/atf-c/build_test
 %%TEST%%tests/atf/atf-c/check_test
-%%TEST%%tests/atf/atf-c/config_test
 %%TEST%%tests/atf/atf-c/error_test
 %%TEST%%tests/atf/atf-c/macros_test
 %%TEST%%tests/atf/atf-c/tc_test
@@ -77,7 +78,6 @@
 %%TEST%%tests/atf/atf-c++/atf_c++_test
 %%TEST%%tests/atf/atf-c++/build_test
 %%TEST%%tests/atf/atf-c++/check_test
-%%TEST%%tests/atf/atf-c++/config_test
 %%TEST%%tests/atf/atf-c++/macros_test
 %%TEST%%tests/atf/atf-c++/tests_test
 %%TEST%%tests/atf/atf-c++/utils_test
@@ -89,7 +89,6 @@
 %%TEST%%tests/atf/atf-c++/detail/exceptions_test
 %%TEST%%tests/atf/atf-c++/detail/fs_test
 %%TEST%%tests/atf/atf-c++/detail/process_test
-%%TEST%%tests/atf/atf-c++/detail/sanity_test
 %%TEST%%tests/atf/atf-c++/detail/text_test
 %%TEST%%tests/atf/atf-c++/detail/version_helper
 %%TEST%%tests/atf/atf-sh/Kyuafile