Update ATF to 0.20.

This change upgrades devel/atf to 0.20 and removes devel/atf-libs.  The
upstream atf distfile has dropped the code for the deprecated tools so
it makes little sense to keep the two packages any longer.

As a result of this, the devel/atf package is now much simplified as
there is no need for a Makefile.common any longer and matches exactly
what upstream ships.


Changes in version 0.20
***********************

Experimental version released on February 7th, 2014.

This is the first release without the code for the deprecated tools.  If
you require such code, please fetch a copy of the 0.19 release and extract
the 'tools' directory for your own consumption.

* Removed the deprecated tools.  This includes atf-config, atf-report,
  atf-run and atf-version.


Changes in version 0.19
***********************

Experimental version released on February 7th, 2014.

This is the last release to bundle the code for the deprecated tools.
The next release will drop their code and will stop worrying about
backwards compatibility between the ATF libraries and what the old tools
may or may not support.

If you still require the old tools for some reason, grab a copy of the
'tools' directory now.  The code in this directory is standalone and
does not depend on any internal details of atf-c++ any longer.

* Various fixes and improvements to support running as part of the FreeBSD
  test suite.

* Project hosting moved from Google Code (as a subproject of Kyua) to
  GitHub (as a first-class project).  The main reason for the change is
  the suppression of binary downloads in Google Code on Jan 15th, 2014.
  See https://github.com/jmmv/atf/

* Removed builtin help from atf-sh(1) and atf-check(1) for simplicity
  reasons.  In other words, their -h option is gone.

* Moved the code of the deprecated tools into a 'tools' directory and
  completely decoupled their code from the internals of atf-c++.  The
  reason for this is to painlessly allow a third-party to maintain a
  copy of these tools after we delete them because upcoming changes to
  atf-c++ would break the stale tools.

7 files changed, 154 insertions, 144 deletions

diff --git a/devel/atf/DESCR b/devel/atf/DESCR
index f2d98b381d0..ee1d031a16a 100644
--- a/devel/atf/DESCR
+++ b/devel/atf/DESCR
@@ -1,19 +1,13 @@
-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.
+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.
 
-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.
-
-This package provides the deprecated atf-run and atf-report tools; please
-use kyua-cli package instead.  If you need the ATF libraries only (not the
-tools), you can install the atf-libs package instead.
+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, which can be found in
+devel/kyua-cli.
diff --git a/devel/atf/MESSAGE b/devel/atf/MESSAGE
deleted file mode 100644
index aea5958321d..00000000000
--- a/devel/atf/MESSAGE
+++ /dev/null
@@ -1,10 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.1.1.1 2007/08/20 11:59:17 jmmv Exp $
-
-ATF has been successfully installed.  You can now proceed to ensure that it
-works properly in your system by running its automated test suite.  Do so
-with the following command:
-
-	cd ${PREFIX}/tests/atf && atf-run | atf-report
-
-===========================================================================
diff --git a/devel/atf/Makefile b/devel/atf/Makefile
index 41eba747688..2378bdcb55b 100644
--- a/devel/atf/Makefile
+++ b/devel/atf/Makefile
@@ -1,35 +1,27 @@
-# $NetBSD: Makefile,v 1.22 2013/02/14 18:36:12 jmmv Exp $
+# $NetBSD: Makefile,v 1.23 2014/02/08 15:54:58 jmmv Exp $
 #
 
-.include "Makefile.common"
-
-COMMENT:=	${COMMENT} - Runtime tools (deprecated; use kyua-cli)
-
-CONFIGURE_ARGS+=	--enable-tools
-
-XML_ENTRIES=	public "-//NetBSD//DTD ATF Tests Results 0.1//EN" \
-		${PREFIX}/share/xml/atf/tests-results.dtd
-
-post-install:
-.for file in bin/atf-sh \
-	     include/ \
-	     lib/ \
-	     libexec/ \
-	     ${PKGMANDIR}/man1/atf-check.1 \
-	     ${PKGMANDIR}/man1/atf-sh.1 \
-	     ${PKGMANDIR}/man1/atf-test-program.1 \
-	     ${PKGMANDIR}/man3/ \
-	     ${PKGMANDIR}/man4/ \
-	     share/aclocal/ \
-	     share/atf/libatf-sh.subr \
-	     tests/atf/atf-c++ \
-	     tests/atf/atf-c \
-	     tests/atf/atf-sh \
-	     tests/atf/test-programs
-	rm -rf ${DESTDIR}${PREFIX}/${file}
-.endfor
-
-BUILDLINK_API_DEPENDS.atf-libs+=	atf-libs>=${PKGVERSION_NOREV}
-.include "../../devel/atf-libs/buildlink3.mk"
-.include "../../textproc/xmlcatmgr/catalogs.mk"
+DISTNAME=	atf-0.20
+CATEGORIES=	devel
+MASTER_SITES=	https://github.com/jmmv/atf/releases/download/${DISTNAME}/
+
+MAINTAINER=	jmmv@NetBSD.org
+HOMEPAGE=	https://github.com/jmmv/atf/
+COMMENT=	Automated testing framework
+LICENSE=	2-clause-bsd
+
+CONFLICTS+=		atf-libs<0.20
+
+MAKE_JOBS_SAFE=		yes
+
+GNU_CONFIGURE=		yes
+USE_LANGUAGES=		c c++
+USE_LIBTOOL=		yes
+
+CONFIGURE_ARGS+=	ATF_SHELL=${SH:Q}
+
+PKGCONFIG_OVERRIDE=	atf-c/atf-c.pc.in
+PKGCONFIG_OVERRIDE+=	atf-c++/atf-c++.pc.in
+PKGCONFIG_OVERRIDE+=	atf-sh/atf-sh.pc.in
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/atf/Makefile.common b/devel/atf/Makefile.common
deleted file mode 100644
index 97831246eb4..00000000000
--- a/devel/atf/Makefile.common
+++ /dev/null
@@ -1,35 +0,0 @@
-# $NetBSD: Makefile.common,v 1.6 2013/11/16 20:26:54 jmmv Exp $
-#
-# used by devel/atf/Makefile
-# used by devel/atf-libs/Makefile
-
-DISTNAME=	atf-0.18
-CATEGORIES=	devel
-MASTER_SITES=	http://kyua.googlecode.com/files/
-
-MAINTAINER=	jmmv@NetBSD.org
-HOMEPAGE=	http://code.google.com/p/kyua/wiki/ATF
-COMMENT=	Automated testing framework
-LICENSE=	2-clause-bsd
-
-DISTINFO_FILE=		${.CURDIR}/../../devel/atf/distinfo
-PATCHDIR=		${.CURDIR}/../../devel/atf/patches
-
-MAKE_JOBS_SAFE=		yes
-
-GNU_CONFIGURE=		yes
-USE_LANGUAGES=		c c++
-USE_LIBTOOL=		yes
-
-CONFIGURE_ARGS+=	ATF_CONFSUBDIR=
-CONFIGURE_ARGS+=	ATF_SHELL=${SH:Q}
-CONFIGURE_ARGS+=	--enable-unstable-shared
-CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
-
-PKG_SYSCONFSUBDIR=	atf
-
-PKGCONFIG_OVERRIDE=	atf-c/atf-c.pc.in
-PKGCONFIG_OVERRIDE+=	atf-c++/atf-c++.pc.in
-PKGCONFIG_OVERRIDE+=	atf-sh/atf-sh.pc.in
-
-.include "../../mk/bsd.prefs.mk"
diff --git a/devel/atf/PLIST b/devel/atf/PLIST
index e0840455432..2aa145ed896 100644
--- a/devel/atf/PLIST
+++ b/devel/atf/PLIST
@@ -1,50 +1,107 @@
-@comment $NetBSD: PLIST,v 1.18 2012/07/01 15:27:43 jmmv Exp $
-bin/atf-config
-bin/atf-report
-bin/atf-run
-bin/atf-version
-man/man1/atf-config.1
-man/man1/atf-report.1
-man/man1/atf-run.1
-man/man1/atf-version.1
-man/man5/atf-formats.5
-man/man7/atf.7
-share/atf/atf-run.hooks
+@comment $NetBSD: PLIST,v 1.19 2014/02/08 15:54:58 jmmv Exp $
+bin/atf-sh
+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
+include/atf-c/macros.h
+include/atf-c/tc.h
+include/atf-c/tp.h
+include/atf-c/utils.h
+lib/libatf-c++.la
+lib/libatf-c.la
+lib/pkgconfig/atf-c++.pc
+lib/pkgconfig/atf-c.pc
+lib/pkgconfig/atf-sh.pc
+libexec/atf-check
+man/man1/atf-check.1
+man/man1/atf-sh.1
+man/man1/atf-test-program.1
+man/man3/atf-c++-api.3
+man/man3/atf-c-api.3
+man/man3/atf-sh-api.3
+man/man4/atf-test-case.4
+share/aclocal/atf-c++.m4
+share/aclocal/atf-c.m4
+share/aclocal/atf-common.m4
+share/aclocal/atf-sh.m4
+share/atf/libatf-sh.subr
 share/doc/atf/AUTHORS
 share/doc/atf/COPYING
 share/doc/atf/NEWS
 share/doc/atf/README
-share/examples/atf/atf-run.hooks
-share/examples/atf/common.conf
-share/examples/atf/tests-results.css
-share/xml/atf/tests-results.dtd
-share/xsl/atf/tests-results.xsl
-tests/atf/Atffile
 tests/atf/Kyuafile
-tests/atf/atf-config/Atffile
-tests/atf/atf-config/Kyuafile
-tests/atf/atf-config/integration_test
-tests/atf/atf-report/Atffile
-tests/atf/atf-report/Kyuafile
-tests/atf/atf-report/fail_helper
-tests/atf/atf-report/integration_test
-tests/atf/atf-report/misc_helpers
-tests/atf/atf-report/pass_helper
-tests/atf/atf-report/reader_test
-tests/atf/atf-run/Atffile
-tests/atf/atf-run/Kyuafile
-tests/atf/atf-run/atffile_test
-tests/atf/atf-run/bad_metadata_helper
-tests/atf/atf-run/config_test
-tests/atf/atf-run/expect_helpers
-tests/atf/atf-run/fs_test
-tests/atf/atf-run/integration_test
-tests/atf/atf-run/io_test
-tests/atf/atf-run/misc_helpers
-tests/atf/atf-run/pass_helper
-tests/atf/atf-run/requirements_test
-tests/atf/atf-run/several_tcs_helper
-tests/atf/atf-run/signals_test
-tests/atf/atf-run/test_program_test
-tests/atf/atf-run/user_test
-tests/atf/atf-run/zero_tcs_helper
+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/Kyuafile
+tests/atf/atf-c++/detail/application_test
+tests/atf/atf-c++/detail/auto_array_test
+tests/atf/atf-c++/detail/env_test
+tests/atf/atf-c++/detail/exceptions_test
+tests/atf/atf-c++/detail/fs_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/version_helper
+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/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/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/text_test
+tests/atf/atf-c/detail/user_test
+tests/atf/atf-c/detail/version_helper
+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
+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/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/meta_data_test
+tests/atf/test-programs/result_test
+tests/atf/test-programs/sh_helpers
+tests/atf/test-programs/srcdir_test
diff --git a/devel/atf/buildlink3.mk b/devel/atf/buildlink3.mk
new file mode 100644
index 00000000000..26666f470ba
--- /dev/null
+++ b/devel/atf/buildlink3.mk
@@ -0,0 +1,12 @@
+# $NetBSD: buildlink3.mk,v 1.3 2014/02/08 15:54:58 jmmv Exp $
+
+BUILDLINK_TREE+=	atf
+
+.if !defined(ATF_BUILDLINK3_MK)
+ATF_BUILDLINK3_MK:=
+
+BUILDLINK_API_DEPENDS.atf+=		atf>=0.20
+BUILDLINK_PKGSRCDIR.atf?=		../../devel/atf
+.endif	# ATF_BUILDLINK3_MK
+
+BUILDLINK_TREE+=	-atf
diff --git a/devel/atf/distinfo b/devel/atf/distinfo
index 4715cf1fb83..b48bd1b4904 100644
--- a/devel/atf/distinfo
+++ b/devel/atf/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.20 2013/11/16 20:26:54 jmmv Exp $
+$NetBSD: distinfo,v 1.21 2014/02/08 15:54:58 jmmv Exp $
 
-SHA1 (atf-0.18.tar.gz) = 2dedc4472e0cd8b30cb54d3c96984ed7a0a1c61c
-RMD160 (atf-0.18.tar.gz) = 004f6d37b3db1d2403a64bd67a2bde6d0a49acc7
-Size (atf-0.18.tar.gz) = 659698 bytes
+SHA1 (atf-0.20.tar.gz) = 398baa9733f9136bb78c27d10a8fffd7810e678a
+RMD160 (atf-0.20.tar.gz) = 0ccf52d1d46735beec32e527c80262ad743f9a27
+Size (atf-0.20.tar.gz) = 556370 bytes
 SHA1 (patch-atf-c_tp__test.c) = cfaa36a19ea9d39004c8d5b6099d3de1b2727baa