Update devel/atf to 0.20 and modernize the port.

This includes:
- Taking ownership of the package (with ack from previous maintainer).
- Forcing all file registrations into pkg-plist.
- Fully dropping support for the deprecated tools.
- Adding support for the TEST option.
- Properly using libtool via USES.
- Not using OSREVISION to determine whether atf can or can't be installed.
- Avoiding Makefile.in hacks by just using MAKE_FLAGS.

... which basically means this really is a full rewrite of the port.

Approved by:	bapt, bdrewery

4 files changed, 122 insertions, 195 deletions

diff --git a/devel/atf/Makefile b/devel/atf/Makefile
index 5db82ff102ba..42b9d1fac52c 100644
--- a/devel/atf/Makefile
+++ b/devel/atf/Makefile
@@ -1,63 +1,42 @@
 # $FreeBSD$
 
 PORTNAME=	atf
-PORTVERSION=	0.16
-PORTREVISION=	2
+PORTVERSION=	0.20
 CATEGORIES=	devel
-MASTER_SITES=	GOOGLE_CODE
+MASTER_SITES=	https://github.com/jmmv/${PORTNAME}/releases/download/${PORTNAME}-${PORTVERSION}/ \
+		LOCAL/jmmv
 
-MAINTAINER=	namor@hemio.de
-COMMENT=	Automated Testing Framework
+MAINTAINER=	jmmv@FreeBSD.org
+COMMENT=	C, C++ and shell libraries to write ATF-compliant test programs
 
-LICENSE=	BSD
+LICENSE=	BSD3CLAUSE
 
+GNU_CONFIGURE=	yes
+INSTALL_TARGET=	install-strip
 USE_LDCONFIG=	yes
+USES=		libtool
 
-PROJECTHOST=	kyua
-
-MAN1=		atf-check.1 \
-		atf-sh.1 \
-		atf-test-program.1
-MAN3=		atf-c-api.3 \
-		atf-c++-api.3 \
-		atf-sh-api.3
-MAN4=		atf-test-case.4
-
-GNU_CONFIGURE=	yes
+.if exists(/usr/lib/libatf-c.a)
+IGNORE=	is already in the base system
+.endif
 
-OPTIONS_DEFINE=	TOOLS
-OPTIONS_DEFAULT=TOOLS
-TOOLS_DESC=	Enable deprecated tools
+OPTIONS_DEFINE=	DOCS TEST
 
-NO_STAGE=	yes
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if ${OSVERSION} >= 1000021
-IGNORE=	is already in the base system
+MAKE_FLAGS+=	atf_pkgconfigdir=${PREFIX}/libdata/pkgconfig
+.if empty(PORT_OPTIONS:MDOCS)
+MAKE_FLAGS+=	doc_DATA=
 .endif
-
-.if ${PORT_OPTIONS:MTOOLS}
-CONFIGURE_ARGS+=	--enable-tools
-PLIST_SUB+=		TOOLS=""
-MAN1+=			atf-config.1 \
-			atf-report.1 \
-			atf-run.1 \
-			atf-version.1
-MAN5+=			atf-formats.5
-MAN7+=			atf.7
+.if empty(PORT_OPTIONS:MTEST)
+PLIST_SUB+=	TEST="@comment "
 .else
-PLIST_SUB+=		TOOLS="@comment "
+PLIST_SUB+=	TEST=
 .endif
 
-post-patch:
-.if empty(PORT_OPTIONS:MDOCS)
-	@${REINPLACE_CMD} -e 's|install-docDATA[^:]||' ${WRKSRC}/Makefile.in
-.endif
-.if empty(PORT_OPTIONS:MEXAMPLES)
-	@${REINPLACE_CMD} -e 's|install-egDATA[^:]||' \
-			  -e 's|install-cssDATA[^:]||' ${WRKSRC}/Makefile.in
+post-install:
+.if empty(PORT_OPTIONS:MTEST)
+	@${RM} -rf ${STAGEDIR}${PREFIX}/tests
 .endif
-	@${REINPLACE_CMD} -e 's|@atf_pkgconfigdir@|${PREFIX}/libdata/pkgconfig|' \
-	  ${WRKSRC}/Makefile.in
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/atf/distinfo b/devel/atf/distinfo
index f95a0f117537..39a193f4fd37 100644
--- a/devel/atf/distinfo
+++ b/devel/atf/distinfo
@@ -1,2 +1,2 @@
-SHA256 (atf-0.16.tar.gz) = f33a85f4a0677f40be406baaf6a5a749ca02870af9707f7606a0f3fa613c8339
-SIZE (atf-0.16.tar.gz) = 662290
+SHA256 (atf-0.20.tar.gz) = 9bc4ab004603331301410c293394b7e8b7341e59a528a4b51e16effeb1142cd9
+SIZE (atf-0.20.tar.gz) = 556370
diff --git a/devel/atf/pkg-descr b/devel/atf/pkg-descr
index 8f22185ea8d1..dd5cdf7a9461 100644
--- a/devel/atf/pkg-descr
+++ b/devel/atf/pkg-descr
@@ -1,20 +1,14 @@
-The Automated Testing Framework (ATF) is a collection of libraries and
-utilities designed to ease unattended application testing in the hands of
-developers and end users of a specific piece of software.
-
-As regards developers, ATF provides the necessary means to easily create
-test suites composed of multiple test programs, which in turn are a
-collection of test cases.  It also attempts to simplify the debugging of
-problems when these test cases detect an error by providing as much
-information as possible about the failure.
-
-As regards users, it simplifies the process of running the test suites and,
-in special, encourages end users to run them often: they do not need to
-have source trees around nor any other development tools installed to be
-able to certify that a given piece of software works on their machine as
-advertised.
-
-Note that ATF is included in the base system since FreeBSD 10, so this
-port does not need to be installed on FreeBSD 10.
-
-WWW: http://code.google.com/p/kyua/wiki/ATF
+The Automated Testing Framework (ATF) is a collection of libraries to
+implement test programs in a variety of languages.  At the moment, ATF
+offers C, C++ and POSIX shell bindings with which to implement tests.
+These bindings all offer a similar set of functionality and any test
+program written with them exposes a consistent user interface.
+
+ATF-based test programs rely on a separate runtime engine to execute them.
+The runtime engine is in charge of isolating the test programs from the
+rest of the system to ensure that their results are deterministic and that
+they cannot affect the running system.  The runtime engine is also
+responsible for gathering the results of all tests and composing reports.
+The current runtime of choice is Kyua.
+
+WWW: http://github.com/jmmv/atf/
diff --git a/devel/atf/pkg-plist b/devel/atf/pkg-plist
index 5d59a452c99b..829913afd0fc 100644
--- a/devel/atf/pkg-plist
+++ b/devel/atf/pkg-plist
@@ -1,8 +1,4 @@
-%%TOOLS%%bin/atf-config
-%%TOOLS%%bin/atf-report
-%%TOOLS%%bin/atf-run
 bin/atf-sh
-%%TOOLS%%bin/atf-version
 include/atf-c++.hpp
 include/atf-c++/build.hpp
 include/atf-c++/check.hpp
@@ -22,147 +18,105 @@ include/atf-c/tc.h
 include/atf-c/tp.h
 include/atf-c/utils.h
 lib/libatf-c++.a
-lib/libatf-c++.la
 lib/libatf-c++.so
-lib/libatf-c++.so.0
+lib/libatf-c++.so.1
+lib/libatf-c++.so.1.0.0
 lib/libatf-c.a
-lib/libatf-c.la
 lib/libatf-c.so
 lib/libatf-c.so.0
+lib/libatf-c.so.0.0.0
 libdata/pkgconfig/atf-c++.pc
 libdata/pkgconfig/atf-c.pc
 libdata/pkgconfig/atf-sh.pc
 libexec/atf-check
+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-sh-api.3.gz
+man/man4/atf-test-case.4.gz
 share/aclocal/atf-c++.m4
 share/aclocal/atf-c.m4
 share/aclocal/atf-common.m4
 share/aclocal/atf-sh.m4
-%%TOOLS%%%%DATADIR%%/atf-run.hooks
 %%DATADIR%%/libatf-sh.subr
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
 %%PORTDOCS%%%%DOCSDIR%%/README
-%%TOOLS%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/atf-run.hooks
-%%TOOLS%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/common.conf
-%%TOOLS%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tests-results.css
-%%TOOLS%%share/xml/atf/tests-results.dtd
-%%TOOLS%%share/xsl/atf/tests-results.xsl
-%%TOOLS%%tests/atf/Atffile
-tests/atf/Kyuafile
-tests/atf/atf-c++/Atffile
-tests/atf/atf-c++/Kyuafile
-tests/atf/atf-c++/atf_c++_test
-tests/atf/atf-c++/build_test
-tests/atf/atf-c++/check_test
-tests/atf/atf-c++/config_test
-tests/atf/atf-c++/detail/Atffile
-tests/atf/atf-c++/detail/Kyuafile
-tests/atf/atf-c++/detail/application_test
-tests/atf/atf-c++/detail/env_test
-tests/atf/atf-c++/detail/exceptions_test
-tests/atf/atf-c++/detail/expand_test
-tests/atf/atf-c++/detail/fs_test
-tests/atf/atf-c++/detail/parser_test
-tests/atf/atf-c++/detail/process_test
-tests/atf/atf-c++/detail/sanity_test
-tests/atf/atf-c++/detail/text_test
-tests/atf/atf-c++/detail/ui_test
-tests/atf/atf-c++/macros_hpp_test.cpp
-tests/atf/atf-c++/macros_test
-tests/atf/atf-c++/pkg_config_test
-tests/atf/atf-c++/tests_test
-tests/atf/atf-c++/unused_test.cpp
-tests/atf/atf-c++/utils_test
-tests/atf/atf-c/Atffile
-tests/atf/atf-c/Kyuafile
-tests/atf/atf-c/atf_c_test
-tests/atf/atf-c/build_test
-tests/atf/atf-c/check_test
-tests/atf/atf-c/config_test
-tests/atf/atf-c/detail/Atffile
-tests/atf/atf-c/detail/Kyuafile
-tests/atf/atf-c/detail/dynstr_test
-tests/atf/atf-c/detail/env_test
-tests/atf/atf-c/detail/fs_test
-tests/atf/atf-c/detail/list_test
-tests/atf/atf-c/detail/map_test
-tests/atf/atf-c/detail/process_helpers
-tests/atf/atf-c/detail/process_test
-tests/atf/atf-c/detail/sanity_test
-tests/atf/atf-c/detail/test_helpers_test
-tests/atf/atf-c/detail/text_test
-tests/atf/atf-c/detail/user_test
-tests/atf/atf-c/error_test
-tests/atf/atf-c/macros_h_test.c
-tests/atf/atf-c/macros_test
-tests/atf/atf-c/pkg_config_test
-tests/atf/atf-c/tc_test
-tests/atf/atf-c/tp_test
-tests/atf/atf-c/unused_test.c
-tests/atf/atf-c/utils_test
-%%TOOLS%%tests/atf/atf-config/Atffile
-%%TOOLS%%tests/atf/atf-config/Kyuafile
-%%TOOLS%%tests/atf/atf-config/integration_test
-%%TOOLS%%tests/atf/atf-report/Atffile
-%%TOOLS%%tests/atf/atf-report/Kyuafile
-%%TOOLS%%tests/atf/atf-report/fail_helper
-%%TOOLS%%tests/atf/atf-report/integration_test
-%%TOOLS%%tests/atf/atf-report/misc_helpers
-%%TOOLS%%tests/atf/atf-report/pass_helper
-%%TOOLS%%tests/atf/atf-report/reader_test
-%%TOOLS%%tests/atf/atf-run/Atffile
-%%TOOLS%%tests/atf/atf-run/Kyuafile
-%%TOOLS%%tests/atf/atf-run/atffile_test
-%%TOOLS%%tests/atf/atf-run/bad_metadata_helper
-%%TOOLS%%tests/atf/atf-run/config_test
-%%TOOLS%%tests/atf/atf-run/expect_helpers
-%%TOOLS%%tests/atf/atf-run/fs_test
-%%TOOLS%%tests/atf/atf-run/integration_test
-%%TOOLS%%tests/atf/atf-run/io_test
-%%TOOLS%%tests/atf/atf-run/misc_helpers
-%%TOOLS%%tests/atf/atf-run/pass_helper
-%%TOOLS%%tests/atf/atf-run/requirements_test
-%%TOOLS%%tests/atf/atf-run/several_tcs_helper
-%%TOOLS%%tests/atf/atf-run/signals_test
-%%TOOLS%%tests/atf/atf-run/test_program_test
-%%TOOLS%%tests/atf/atf-run/user_test
-%%TOOLS%%tests/atf/atf-run/zero_tcs_helper
-tests/atf/atf-sh/Atffile
-tests/atf/atf-sh/Kyuafile
-tests/atf/atf-sh/atf-check_test
-tests/atf/atf-sh/atf_check_test
-tests/atf/atf-sh/config_test
-tests/atf/atf-sh/integration_test
-tests/atf/atf-sh/misc_helpers
-tests/atf/atf-sh/normalize_test
-tests/atf/atf-sh/tc_test
-tests/atf/atf-sh/tp_test
-tests/atf/test-programs/Atffile
-tests/atf/test-programs/Kyuafile
-tests/atf/test-programs/c_helpers
-tests/atf/test-programs/config_test
-tests/atf/test-programs/cpp_helpers
-tests/atf/test-programs/expect_test
-tests/atf/test-programs/fork_test
-tests/atf/test-programs/meta_data_test
-tests/atf/test-programs/result_test
-tests/atf/test-programs/sh_helpers
-tests/atf/test-programs/srcdir_test
-@dirrm tests/atf/test-programs
-@dirrm tests/atf/atf-sh
-%%TOOLS%%@dirrm tests/atf/atf-run
-%%TOOLS%%@dirrm tests/atf/atf-report
-%%TOOLS%%@dirrm tests/atf/atf-config
-@dirrm tests/atf/atf-c/detail
-@dirrm tests/atf/atf-c++/detail
-@dirrm tests/atf/atf-c++
-@dirrm tests/atf/atf-c
-@dirrm tests/atf
-%%TOOLS%%@dirrm share/xsl/atf
-%%TOOLS%%@dirrm share/xsl
-%%TOOLS%%@dirrm share/xml/atf
-%%TOOLS%%%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
+%%TEST%%tests/atf/Kyuafile
+%%TEST%%tests/atf/atf-c/Kyuafile
+%%TEST%%tests/atf/atf-c/macros_h_test.c
+%%TEST%%tests/atf/atf-c/unused_test.c
+%%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
+%%TEST%%tests/atf/atf-c/tp_test
+%%TEST%%tests/atf/atf-c/utils_test
+%%TEST%%tests/atf/atf-c/pkg_config_test
+%%TEST%%tests/atf/atf-c/detail/Kyuafile
+%%TEST%%tests/atf/atf-c/detail/dynstr_test
+%%TEST%%tests/atf/atf-c/detail/env_test
+%%TEST%%tests/atf/atf-c/detail/fs_test
+%%TEST%%tests/atf/atf-c/detail/list_test
+%%TEST%%tests/atf/atf-c/detail/map_test
+%%TEST%%tests/atf/atf-c/detail/process_helpers
+%%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/user_test
+%%TEST%%tests/atf/atf-c/detail/version_helper
+%%TEST%%tests/atf/atf-c++/Kyuafile
+%%TEST%%tests/atf/atf-c++/macros_hpp_test.cpp
+%%TEST%%tests/atf/atf-c++/unused_test.cpp
+%%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
+%%TEST%%tests/atf/atf-c++/pkg_config_test
+%%TEST%%tests/atf/atf-c++/detail/Kyuafile
+%%TEST%%tests/atf/atf-c++/detail/application_test
+%%TEST%%tests/atf/atf-c++/detail/auto_array_test
+%%TEST%%tests/atf/atf-c++/detail/env_test
+%%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
+%%TEST%%tests/atf/atf-sh/misc_helpers
+%%TEST%%tests/atf/atf-sh/atf_check_test
+%%TEST%%tests/atf/atf-sh/atf-check_test
+%%TEST%%tests/atf/atf-sh/config_test
+%%TEST%%tests/atf/atf-sh/integration_test
+%%TEST%%tests/atf/atf-sh/normalize_test
+%%TEST%%tests/atf/atf-sh/tc_test
+%%TEST%%tests/atf/atf-sh/tp_test
+%%TEST%%tests/atf/test-programs/Kyuafile
+%%TEST%%tests/atf/test-programs/c_helpers
+%%TEST%%tests/atf/test-programs/cpp_helpers
+%%TEST%%tests/atf/test-programs/sh_helpers
+%%TEST%%tests/atf/test-programs/config_test
+%%TEST%%tests/atf/test-programs/expect_test
+%%TEST%%tests/atf/test-programs/meta_data_test
+%%TEST%%tests/atf/test-programs/result_test
+%%TEST%%tests/atf/test-programs/srcdir_test
+%%TEST%%@dirrm tests/atf/test-programs
+%%TEST%%@dirrm tests/atf/atf-sh
+%%TEST%%@dirrm tests/atf/atf-c/detail
+%%TEST%%@dirrm tests/atf/atf-c++/detail
+%%TEST%%@dirrm tests/atf/atf-c++
+%%TEST%%@dirrm tests/atf/atf-c
+%%TEST%%@dirrm tests/atf
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm %%DATADIR%%
 @dirrm include/atf-c++