19 files changed, 290 insertions, 466 deletions

diff --git a/MOVED b/MOVED
index a9b7b3d11ae7..0ec33a47ed38 100644
--- a/MOVED
+++ b/MOVED
@@ -6407,3 +6407,6 @@ devel/rubygem-foreman_api||2014-08-11|Removed: Deprecated by upstream
 security/termlog||2014-08-11|Has expired: Fails to build with new utmpx, unstaged, maintainer timeout
 games/linux-americasarmy||2014-08-13|Removed: Unsupported by upstream, distfile unavailable
 net/rsmb|net/mosquitto|2014-08-13|Superseded by net/mosquitto
+devel/kyua-atf-compat|devel/kyua|2014-08-14|Upstream merged all components into devel/kyua
+devel/kyua-cli|devel/kyua|2014-08-14|Upstream merged all components into devel/kyua
+devel/kyua-testers|devel/kyua|2014-08-14|Upstream merged all components into devel/kyua
diff --git a/devel/Makefile b/devel/Makefile
index 18acf26324c4..4e98c44e1cf0 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -945,9 +945,6 @@
     SUBDIR += kimwitu
     SUBDIR += kyra
     SUBDIR += kyua
-    SUBDIR += kyua-atf-compat
-    SUBDIR += kyua-cli
-    SUBDIR += kyua-testers
     SUBDIR += lasi
     SUBDIR += lcov
     SUBDIR += leaktracer
diff --git a/devel/kyua-atf-compat/Makefile b/devel/kyua-atf-compat/Makefile
deleted file mode 100644
index c505c81872fd..000000000000
--- a/devel/kyua-atf-compat/Makefile
+++ /dev/null
@@ -1,37 +0,0 @@
-# Created by: Alan Somers <asomers@FreeBSD.org>
-# $FreeBSD$
-
-PORTNAME=	kyua-atf-compat
-PORTVERSION=	0.2
-PORTREVISION=	2
-CATEGORIES=	devel
-MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
-PROJECTHOST=	kyua
-
-MAINTAINER=	jmmv@FreeBSD.org
-COMMENT=	Kyua (automated testing framework) - ATF compatibility tools
-
-LICENSE=	BSD
-
-RUN_DEPENDS+=	${LOCALBASE}/bin/kyua:${PORTSDIR}/devel/kyua-cli
-
-GNU_CONFIGURE=	yes
-USES=		pkgconfig
-
-OPTIONS_DEFINE=	DOCS TEST
-OPTIONS_DEFAULT=TEST
-
-OPTIONS_SUB=		yes
-TEST_CONFIGURE_WITH=	atf
-TEST_BUILD_DEPENDS=	atf>=0.20:${PORTSDIR}/devel/atf
-TEST_RUN_DEPENDS=	atf>=0.20:${PORTSDIR}/devel/atf
-
-.include <bsd.port.options.mk>
-
-CONFIGURE_ARGS+=	--docdir=${DOCSDIR}
-
-.if ! ${PORT_OPTIONS:MDOCS}
-MAKE_FLAGS+=	doc_DATA=
-.endif
-
-.include <bsd.port.mk>
diff --git a/devel/kyua-atf-compat/distinfo b/devel/kyua-atf-compat/distinfo
deleted file mode 100644
index 6b7c4ec16cb0..000000000000
--- a/devel/kyua-atf-compat/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (kyua-atf-compat-0.2.tar.gz) = 66cb5961e03c715bcb3c797942257d65950f7f0fe3f2b31fb874b73c36a5b5be
-SIZE (kyua-atf-compat-0.2.tar.gz) = 75121
diff --git a/devel/kyua-atf-compat/pkg-descr b/devel/kyua-atf-compat/pkg-descr
deleted file mode 100644
index 5ad70acb7a4c..000000000000
--- a/devel/kyua-atf-compat/pkg-descr
+++ /dev/null
@@ -1,12 +0,0 @@
-Kyua (pronounced Q.A.) is a testing framework for both developers and
-users.  Kyua is different from most other testing frameworks in that it
-puts the end user experience before anything else.  There are multiple
-reasons for users to run the tests themselves, and Kyua ensures that
-they can do so in the most convenient way.
-
-This module, kyua-atf-compat, provides tools to ease the transition from
-ATF to Kyua.  In particular, this includes is a tool to convert Atffile
-files to Kyuafile files in an automated manner, and drop-in replacement
-wrappers for atf-run and atf-report.
-
-WWW: https://code.google.com/p/kyua/
diff --git a/devel/kyua-atf-compat/pkg-plist b/devel/kyua-atf-compat/pkg-plist
deleted file mode 100644
index 7c0349d3dcb2..000000000000
--- a/devel/kyua-atf-compat/pkg-plist
+++ /dev/null
@@ -1,20 +0,0 @@
-bin/atf-report
-bin/atf-run
-bin/atf2kyua
-man/man1/atf-report.1.gz
-man/man1/atf-run.1.gz
-man/man1/atf2kyua.1.gz
-%%DATADIR%%/lib.subr
-%%DATADIR%%/tests_lib.subr
-%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
-%%PORTDOCS%%%%DOCSDIR%%/COPYING
-%%PORTDOCS%%%%DOCSDIR%%/NEWS
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-%%TEST%%tests/kyua-atf-compat/Kyuafile
-%%TEST%%tests/kyua-atf-compat/atf-run_test
-%%TEST%%tests/kyua-atf-compat/atf-report_test
-%%TEST%%tests/kyua-atf-compat/atf2kyua_test
-%%TEST%%tests/kyua-atf-compat/helpers
-%%TEST%%@dirrm tests/kyua-atf-compat
-@dirrm %%DATADIR%%
diff --git a/devel/kyua-cli/Makefile b/devel/kyua-cli/Makefile
deleted file mode 100644
index 3d7bc9f320d9..000000000000
--- a/devel/kyua-cli/Makefile
+++ /dev/null
@@ -1,56 +0,0 @@
-# Created by: Alan Somers <asomers@FreeBSD.org>
-# $FreeBSD$
-
-PORTNAME=	kyua-cli
-PORTVERSION=	0.9
-CATEGORIES=	devel
-MASTER_SITES=	https://github.com/jmmv/kyua/releases/download/${PORTNAME}-${PORTVERSION}/ \
-		LOCAL/jmmv
-
-MAINTAINER=	jmmv@FreeBSD.org
-COMMENT=	Kyua (automated testing framework) - Command line interface
-
-LICENSE=	BSD3CLAUSE
-
-LIB_DEPENDS=	liblutok.so:${PORTSDIR}/devel/lutok
-LIB_DEPENDS+=	libsqlite3.so:${PORTSDIR}/databases/sqlite3
-BUILD_DEPENDS=	kyua-testers>=0.2:${PORTSDIR}/devel/kyua-testers
-RUN_DEPENDS:=	${BUILD_DEPENDS}
-
-GNU_CONFIGURE=	yes
-USES=		pkgconfig
-
-TESTS_USER=	tests
-USERS=		${TESTS_USER}
-SUB_FILES=	kyua.conf
-SUB_LIST=	TESTS_USER=${TESTS_USER}
-
-OPTIONS_DEFINE=	DOCS EXAMPLES TEST
-OPTIONS_DEFAULT=TEST
-
-OPTIONS_SUB=		yes
-TEST_CONFIGURE_WITH=	atf
-TEST_BUILD_DEPENDS=	atf>=0.20:${PORTSDIR}/devel/atf
-TEST_RUN_DEPENDS=	atf>=0.20:${PORTSDIR}/devel/atf
-
-.include <bsd.port.options.mk>
-
-CONFIGURE_ARGS+=	--without-doxygen
-CONFIGURE_ARGS+=	--docdir=${DOCSDIR}
-MAKE_FLAGS+=	examplesdir=${EXAMPLESDIR}
-MAKE_FLAGS+=	pkgdatadir=${DATADIR}
-
-.if ! ${PORT_OPTIONS:MDOCS}
-MAKE_FLAGS+=	doc_DATA=
-.endif
-.if ! ${PORT_OPTIONS:MEXAMPLES}
-MAKE_FLAGS+=	dist_examples_DATA=
-.endif
-
-post-install:
-	${MKDIR} ${STAGEDIR}${PREFIX}/etc/kyua/
-	${INSTALL_DATA} ${WRKDIR}/kyua.conf ${STAGEDIR}${PREFIX}/etc/kyua/
-	${INSTALL_DATA} ${WRKSRC}/examples/Kyuafile.top \
-		${STAGEDIR}${PREFIX}/tests/Kyuafile
-
-.include <bsd.port.mk>
diff --git a/devel/kyua-cli/distinfo b/devel/kyua-cli/distinfo
deleted file mode 100644
index 4633ded2726d..000000000000
--- a/devel/kyua-cli/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (kyua-cli-0.9.tar.gz) = 9c8c27904a8f851fe0c287c2789b4d4f504d44edf3f71b01b5f76158d6037f10
-SIZE (kyua-cli-0.9.tar.gz) = 516505
diff --git a/devel/kyua-cli/pkg-descr b/devel/kyua-cli/pkg-descr
deleted file mode 100644
index d19eadef8a15..000000000000
--- a/devel/kyua-cli/pkg-descr
+++ /dev/null
@@ -1,15 +0,0 @@
-Kyua (pronounced Q.A.) is a testing framework for both developers and
-users.  Kyua is different from most other testing frameworks in that it
-puts the end user experience before anything else.  There are multiple
-reasons for users to run the tests themselves, and Kyua ensures that
-they can do so in the most convenient way.
-
-At the moment, Kyua is focused on implementing a solid foundation and a
-powerful command-line tool to run tests implemented with the Automated
-Testing Framework (ATF).  Later on, Kyua will also provide a set of
-language bindings (C, C++ and shell, at the least) to ease the
-implementation of test cases in a variety of programming languages.
-
-In effect, Kyua is intended to be a replacement for ATF.
-
-WWW: https://github.com/jmmv/kyua/
diff --git a/devel/kyua-cli/pkg-plist b/devel/kyua-cli/pkg-plist
deleted file mode 100644
index 1b965a0b579c..000000000000
--- a/devel/kyua-cli/pkg-plist
+++ /dev/null
@@ -1,197 +0,0 @@
-bin/kyua
-etc/kyua/kyua.conf
-man/man1/kyua-about.1.gz
-man/man1/kyua-config.1.gz
-man/man1/kyua-db-exec.1.gz
-man/man1/kyua-db-migrate.1.gz
-man/man1/kyua-debug.1.gz
-man/man1/kyua-help.1.gz
-man/man1/kyua-list.1.gz
-man/man1/kyua-report-html.1.gz
-man/man1/kyua-report-junit.1.gz
-man/man1/kyua-report.1.gz
-man/man1/kyua-test.1.gz
-man/man1/kyua.1.gz
-man/man5/kyua.conf.5.gz
-man/man5/kyuafile.5.gz
-man/man7/kyua-build-root.7.gz
-man/man7/kyua-results-files.7.gz
-man/man7/kyua-test-filters.7.gz
-%%DATADIR%%/misc/context.html
-%%DATADIR%%/misc/index.html
-%%DATADIR%%/misc/report.css
-%%DATADIR%%/misc/test_result.html
-%%DATADIR%%/store/migrate_v1_v2.sql
-%%DATADIR%%/store/migrate_v2_v3.sql
-%%DATADIR%%/store/schema_v3.sql
-%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
-%%PORTDOCS%%%%DOCSDIR%%/COPYING
-%%PORTDOCS%%%%DOCSDIR%%/NEWS
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Kyuafile.top
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/kyua.conf
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
-%%TEST%%tests/Kyuafile
-%%TEST%%tests/kyua-cli/Kyuafile
-%%TEST%%tests/kyua-cli/bootstrap/Kyuafile
-%%TEST%%tests/kyua-cli/bootstrap/atf_helpers
-%%TEST%%tests/kyua-cli/bootstrap/plain_helpers
-%%TEST%%tests/kyua-cli/bootstrap/testsuite
-%%TEST%%tests/kyua-cli/cli/Kyuafile
-%%TEST%%tests/kyua-cli/cli/cmd_about_test
-%%TEST%%tests/kyua-cli/cli/cmd_config_test
-%%TEST%%tests/kyua-cli/cli/cmd_db_exec_test
-%%TEST%%tests/kyua-cli/cli/cmd_debug_test
-%%TEST%%tests/kyua-cli/cli/cmd_help_test
-%%TEST%%tests/kyua-cli/cli/cmd_list_test
-%%TEST%%tests/kyua-cli/cli/cmd_test_test
-%%TEST%%tests/kyua-cli/cli/common_test
-%%TEST%%tests/kyua-cli/cli/config_test
-%%TEST%%tests/kyua-cli/cli/main_test
-%%TEST%%tests/kyua-cli/engine/Kyuafile
-%%TEST%%tests/kyua-cli/engine/config_test
-%%TEST%%tests/kyua-cli/engine/context_test
-%%TEST%%tests/kyua-cli/engine/drivers/Kyuafile
-%%TEST%%tests/kyua-cli/engine/drivers/list_tests_helpers
-%%TEST%%tests/kyua-cli/engine/drivers/list_tests_test
-%%TEST%%tests/kyua-cli/engine/drivers/scan_results_test
-%%TEST%%tests/kyua-cli/engine/exceptions_test
-%%TEST%%tests/kyua-cli/engine/filters_test
-%%TEST%%tests/kyua-cli/engine/kyuafile_test
-%%TEST%%tests/kyua-cli/engine/metadata_test
-%%TEST%%tests/kyua-cli/engine/report_junit_test
-%%TEST%%tests/kyua-cli/engine/test_case_atf_helpers
-%%TEST%%tests/kyua-cli/engine/test_case_plain_helpers
-%%TEST%%tests/kyua-cli/engine/test_case_test
-%%TEST%%tests/kyua-cli/engine/test_program_test
-%%TEST%%tests/kyua-cli/engine/test_result_test
-%%TEST%%tests/kyua-cli/engine/testers_test
-%%TEST%%tests/kyua-cli/examples/Kyuafile
-%%TEST%%tests/kyua-cli/examples/syntax_test
-%%TEST%%tests/kyua-cli/integration/Kyuafile
-%%TEST%%tests/kyua-cli/integration/cmd_about_test
-%%TEST%%tests/kyua-cli/integration/cmd_config_test
-%%TEST%%tests/kyua-cli/integration/cmd_db_exec_test
-%%TEST%%tests/kyua-cli/integration/cmd_db_migrate_test
-%%TEST%%tests/kyua-cli/integration/cmd_debug_test
-%%TEST%%tests/kyua-cli/integration/cmd_help_test
-%%TEST%%tests/kyua-cli/integration/cmd_list_test
-%%TEST%%tests/kyua-cli/integration/cmd_report_html_test
-%%TEST%%tests/kyua-cli/integration/cmd_report_junit_test
-%%TEST%%tests/kyua-cli/integration/cmd_report_test
-%%TEST%%tests/kyua-cli/integration/cmd_test_test
-%%TEST%%tests/kyua-cli/integration/global_test
-%%TEST%%tests/kyua-cli/integration/helpers/bad_test_program
-%%TEST%%tests/kyua-cli/integration/helpers/bogus_test_cases
-%%TEST%%tests/kyua-cli/integration/helpers/config
-%%TEST%%tests/kyua-cli/integration/helpers/expect_all_pass
-%%TEST%%tests/kyua-cli/integration/helpers/expect_some_fail
-%%TEST%%tests/kyua-cli/integration/helpers/interrupts
-%%TEST%%tests/kyua-cli/integration/helpers/metadata
-%%TEST%%tests/kyua-cli/integration/helpers/simple_all_pass
-%%TEST%%tests/kyua-cli/integration/helpers/simple_some_fail
-%%TEST%%tests/kyua-cli/store/Kyuafile
-%%TEST%%tests/kyua-cli/store/dbtypes_test
-%%TEST%%tests/kyua-cli/store/exceptions_test
-%%TEST%%tests/kyua-cli/store/layout_test
-%%TEST%%tests/kyua-cli/store/metadata_test
-%%TEST%%tests/kyua-cli/store/migrate_test
-%%TEST%%tests/kyua-cli/store/read_backend_test
-%%TEST%%tests/kyua-cli/store/read_transaction_test
-%%TEST%%tests/kyua-cli/store/schema_inttest
-%%TEST%%tests/kyua-cli/store/schema_v1.sql
-%%TEST%%tests/kyua-cli/store/schema_v2.sql
-%%TEST%%tests/kyua-cli/store/testdata_v1.sql
-%%TEST%%tests/kyua-cli/store/testdata_v2.sql
-%%TEST%%tests/kyua-cli/store/testdata_v3_1.sql
-%%TEST%%tests/kyua-cli/store/testdata_v3_2.sql
-%%TEST%%tests/kyua-cli/store/testdata_v3_3.sql
-%%TEST%%tests/kyua-cli/store/testdata_v3_4.sql
-%%TEST%%tests/kyua-cli/store/transaction_test
-%%TEST%%tests/kyua-cli/store/write_backend_test
-%%TEST%%tests/kyua-cli/store/write_transaction_test
-%%TEST%%tests/kyua-cli/utils/Kyuafile
-%%TEST%%tests/kyua-cli/utils/auto_array_test
-%%TEST%%tests/kyua-cli/utils/cmdline/Kyuafile
-%%TEST%%tests/kyua-cli/utils/cmdline/base_command_test
-%%TEST%%tests/kyua-cli/utils/cmdline/commands_map_test
-%%TEST%%tests/kyua-cli/utils/cmdline/exceptions_test
-%%TEST%%tests/kyua-cli/utils/cmdline/globals_test
-%%TEST%%tests/kyua-cli/utils/cmdline/options_test
-%%TEST%%tests/kyua-cli/utils/cmdline/parser_test
-%%TEST%%tests/kyua-cli/utils/cmdline/ui_test
-%%TEST%%tests/kyua-cli/utils/config/Kyuafile
-%%TEST%%tests/kyua-cli/utils/config/exceptions_test
-%%TEST%%tests/kyua-cli/utils/config/keys_test
-%%TEST%%tests/kyua-cli/utils/config/lua_module_test
-%%TEST%%tests/kyua-cli/utils/config/nodes_test
-%%TEST%%tests/kyua-cli/utils/config/parser_test
-%%TEST%%tests/kyua-cli/utils/config/tree_test
-%%TEST%%tests/kyua-cli/utils/datetime_test
-%%TEST%%tests/kyua-cli/utils/env_test
-%%TEST%%tests/kyua-cli/utils/format/Kyuafile
-%%TEST%%tests/kyua-cli/utils/format/exceptions_test
-%%TEST%%tests/kyua-cli/utils/format/formatter_test
-%%TEST%%tests/kyua-cli/utils/fs/Kyuafile
-%%TEST%%tests/kyua-cli/utils/fs/auto_cleaners_test
-%%TEST%%tests/kyua-cli/utils/fs/exceptions_test
-%%TEST%%tests/kyua-cli/utils/fs/lua_module_test
-%%TEST%%tests/kyua-cli/utils/fs/operations_test
-%%TEST%%tests/kyua-cli/utils/fs/path_test
-%%TEST%%tests/kyua-cli/utils/logging/Kyuafile
-%%TEST%%tests/kyua-cli/utils/logging/macros_test
-%%TEST%%tests/kyua-cli/utils/logging/operations_test
-%%TEST%%tests/kyua-cli/utils/memory_test
-%%TEST%%tests/kyua-cli/utils/optional_test
-%%TEST%%tests/kyua-cli/utils/passwd_test
-%%TEST%%tests/kyua-cli/utils/process/Kyuafile
-%%TEST%%tests/kyua-cli/utils/process/child_test
-%%TEST%%tests/kyua-cli/utils/process/exceptions_test
-%%TEST%%tests/kyua-cli/utils/process/fdstream_test
-%%TEST%%tests/kyua-cli/utils/process/helpers
-%%TEST%%tests/kyua-cli/utils/process/status_test
-%%TEST%%tests/kyua-cli/utils/process/systembuf_test
-%%TEST%%tests/kyua-cli/utils/releaser_test
-%%TEST%%tests/kyua-cli/utils/sanity_test
-%%TEST%%tests/kyua-cli/utils/signals/Kyuafile
-%%TEST%%tests/kyua-cli/utils/signals/exceptions_test
-%%TEST%%tests/kyua-cli/utils/signals/interrupts_test
-%%TEST%%tests/kyua-cli/utils/signals/misc_test
-%%TEST%%tests/kyua-cli/utils/signals/programmer_test
-%%TEST%%tests/kyua-cli/utils/sqlite/Kyuafile
-%%TEST%%tests/kyua-cli/utils/sqlite/c_gate_test
-%%TEST%%tests/kyua-cli/utils/sqlite/database_test
-%%TEST%%tests/kyua-cli/utils/sqlite/exceptions_test
-%%TEST%%tests/kyua-cli/utils/sqlite/statement_test
-%%TEST%%tests/kyua-cli/utils/sqlite/transaction_test
-%%TEST%%tests/kyua-cli/utils/stream_test
-%%TEST%%tests/kyua-cli/utils/text/Kyuafile
-%%TEST%%tests/kyua-cli/utils/text/exceptions_test
-%%TEST%%tests/kyua-cli/utils/text/operations_test
-%%TEST%%tests/kyua-cli/utils/text/table_test
-%%TEST%%tests/kyua-cli/utils/text/templates_test
-%%TEST%%tests/kyua-cli/utils/units_test
-%%TEST%%@dirrm tests/kyua-cli/utils/text
-%%TEST%%@dirrm tests/kyua-cli/utils/sqlite
-%%TEST%%@dirrm tests/kyua-cli/utils/signals
-%%TEST%%@dirrm tests/kyua-cli/utils/process
-%%TEST%%@dirrm tests/kyua-cli/utils/logging
-%%TEST%%@dirrm tests/kyua-cli/utils/fs
-%%TEST%%@dirrm tests/kyua-cli/utils/format
-%%TEST%%@dirrm tests/kyua-cli/utils/config
-%%TEST%%@dirrm tests/kyua-cli/utils/cmdline
-%%TEST%%@dirrm tests/kyua-cli/utils
-%%TEST%%@dirrm tests/kyua-cli/store
-%%TEST%%@dirrm tests/kyua-cli/integration/helpers
-%%TEST%%@dirrm tests/kyua-cli/integration
-%%TEST%%@dirrm tests/kyua-cli/examples
-%%TEST%%@dirrm tests/kyua-cli/engine/drivers
-%%TEST%%@dirrm tests/kyua-cli/engine
-%%TEST%%@dirrm tests/kyua-cli/cli
-%%TEST%%@dirrm tests/kyua-cli/bootstrap
-%%TEST%%@dirrm tests/kyua-cli
-@dirrm %%DATADIR%%/store
-@dirrm %%DATADIR%%/misc
-@dirrm %%DATADIR%%
-@dirrm etc/kyua
diff --git a/devel/kyua-testers/Makefile b/devel/kyua-testers/Makefile
deleted file mode 100644
index a2fd49111691..000000000000
--- a/devel/kyua-testers/Makefile
+++ /dev/null
@@ -1,36 +0,0 @@
-# Created by: Alan Somers <asomers@FreeBSD.org>
-# $FreeBSD$
-
-PORTNAME=	kyua-testers
-PORTVERSION=	0.3
-CATEGORIES=	devel
-MASTER_SITES=	https://github.com/jmmv/kyua/releases/download/${PORTNAME}-${PORTVERSION}/ \
-		LOCAL/jmmv
-
-MAINTAINER=	jmmv@FreeBSD.org
-COMMENT=	Kyua (automated testing framework) - Testers
-
-LICENSE=	BSD3CLAUSE
-
-GNU_CONFIGURE=	yes
-
-OPTIONS_DEFINE=	DOCS TEST
-OPTIONS_DEFAULT=TEST
-
-OPTIONS_SUB=		yes
-TEST_CONFIGURE_WITH=	atf
-TEST_BUILD_DEPENDS=	atf>=0.20:${PORTSDIR}/devel/atf
-TEST_RUN_DEPENDS=	atf>=0.20:${PORTSDIR}/devel/atf
-TEST_USES=		pkgconfig
-
-.include <bsd.port.options.mk>
-
-CONFIGURE_ARGS+=	--docdir=${DOCSDIR}
-
-MAKE_FLAGS+=	pkgconfigdir=${PREFIX}/libdata/pkgconfig
-
-.if ! ${PORT_OPTIONS:MDOCS}
-MAKE_FLAGS+=	doc_DATA=
-.endif
-
-.include <bsd.port.mk>
diff --git a/devel/kyua-testers/distinfo b/devel/kyua-testers/distinfo
deleted file mode 100644
index 8f73dc5d55a8..000000000000
--- a/devel/kyua-testers/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (kyua-testers-0.3.tar.gz) = b9848d965e09fcbc0b42c3a8fa025611d81c7b238bdb5da20aa760908eebb9db
-SIZE (kyua-testers-0.3.tar.gz) = 185769
diff --git a/devel/kyua-testers/pkg-descr b/devel/kyua-testers/pkg-descr
deleted file mode 100644
index f28a51b2255f..000000000000
--- a/devel/kyua-testers/pkg-descr
+++ /dev/null
@@ -1,12 +0,0 @@
-Kyua (pronounced Q.A.) is a testing framework for both developers and
-users.  Kyua is different from most other testing frameworks in that it
-puts the end user experience before anything else.  There are multiple
-reasons for users to run the tests themselves, and Kyua ensures that
-they can do so in the most convenient way.
-
-This module, kyua-testers, provides scriptable interfaces to interact
-with test programs of various kinds.  The interface of such testers
-allows the caller to execute a single test case of a single test program
-in a controlled and homogeneous manner.
-
-WWW: https://github.com/jmmv/kyua/
diff --git a/devel/kyua-testers/pkg-plist b/devel/kyua-testers/pkg-plist
deleted file mode 100644
index 767120a35fc4..000000000000
--- a/devel/kyua-testers/pkg-plist
+++ /dev/null
@@ -1,38 +0,0 @@
-libdata/pkgconfig/kyua-testers.pc
-libexec/kyua-atf-tester
-libexec/kyua-plain-tester
-libexec/kyua-tap-tester
-man/man1/kyua-atf-tester.1.gz
-man/man1/kyua-plain-tester.1.gz
-man/man1/kyua-tap-tester.1.gz
-man/man1/kyua-tester.1.gz
-man/man5/kyua-tester-list.5.gz
-man/man5/kyua-tester-result.5.gz
-man/man7/kyua-atf-interface.7.gz
-man/man7/kyua-plain-interface.7.gz
-man/man7/kyua-tap-interface.7.gz
-%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
-%%PORTDOCS%%%%DOCSDIR%%/COPYING
-%%PORTDOCS%%%%DOCSDIR%%/NEWS
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-%%TEST%%tests/kyua-testers/Kyuafile
-%%TEST%%tests/kyua-testers/atf_helpers
-%%TEST%%tests/kyua-testers/atf_inttest
-%%TEST%%tests/kyua-testers/atf_list_test
-%%TEST%%tests/kyua-testers/atf_result_test
-%%TEST%%tests/kyua-testers/cli_test
-%%TEST%%tests/kyua-testers/env_test
-%%TEST%%tests/kyua-testers/error_test
-%%TEST%%tests/kyua-testers/fs_test
-%%TEST%%tests/kyua-testers/plain_helpers
-%%TEST%%tests/kyua-testers/plain_inttest
-%%TEST%%tests/kyua-testers/result_test
-%%TEST%%tests/kyua-testers/run_test
-%%TEST%%tests/kyua-testers/stacktrace_helper
-%%TEST%%tests/kyua-testers/stacktrace_test
-%%TEST%%tests/kyua-testers/tap_helpers
-%%TEST%%tests/kyua-testers/tap_inttest
-%%TEST%%tests/kyua-testers/tap_parser_test
-%%TEST%%tests/kyua-testers/text_test
-%%TEST%%@dirrm tests/kyua-testers
diff --git a/devel/kyua/Makefile b/devel/kyua/Makefile
index fc01b3a12ee5..8ff64951b7f2 100644
--- a/devel/kyua/Makefile
+++ b/devel/kyua/Makefile
@@ -1,37 +1,57 @@
 # $FreeBSD$
 
 PORTNAME=	kyua
-PORTVERSION=	20140215
-PORTEPOCH=	1
+PORTVERSION=	0.10
+PORTEPOCH=	2
 CATEGORIES=	devel
-MASTER_SITES=	# none
-DISTFILES=	# none
-EXTRACT_ONLY=	# none
+MASTER_SITES=	https://github.com/jmmv/kyua/releases/download/${PORTNAME}-${PORTVERSION}/ \
+		LOCAL/jmmv
 
 MAINTAINER=	jmmv@FreeBSD.org
-COMMENT=	Kyua (automated testing framework) - Meta-port
+COMMENT=	Testing framework for infrastructure software
 
-LICENSE=	BSD
+LICENSE=	BSD3CLAUSE
 
-RUN_DEPENDS+=	${LOCALBASE}/bin/atf2kyua:${PORTSDIR}/devel/kyua-atf-compat
-RUN_DEPENDS+=	${LOCALBASE}/bin/kyua:${PORTSDIR}/devel/kyua-cli
-RUN_DEPENDS+=	${LOCALBASE}/libexec/kyua-atf-tester:${PORTSDIR}/devel/kyua-testers
+LIB_DEPENDS=	liblutok.so:${PORTSDIR}/devel/lutok
+LIB_DEPENDS+=	libsqlite3.so:${PORTSDIR}/databases/sqlite3
+RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-NO_BUILD=	yes
-NO_MTREE=	yes
+CONFLICTS=	kyua-atf-compat-[0-9]* kyua-cli-[0-9]* kyua-testers-[0-9]*
 
-do-install:	# empty
+GNU_CONFIGURE=	yes
+USES=		pkgconfig
 
-pre-everything::
-	@${ECHO_MSG} "This is a meta-port, meaning that it just depends on its subparts of the port."
-	@${ECHO_MSG} "It won't build and install all the parts until you have typed make install"
+TESTS_USER=	tests
+USERS=		${TESTS_USER}
+SUB_FILES=	kyua.conf
+SUB_LIST=	TESTS_USER=${TESTS_USER}
 
-.include <bsd.port.pre.mk>
+OPTIONS_DEFINE=	DOCS EXAMPLES TEST
+OPTIONS_DEFAULT=TEST
 
-.if make(package)
-.if !defined(DEPENDS_TARGET:Mpackage) || empty(DEPENDS_TARGET:Mpackage)
-DEPENDS_TARGET="package"
+OPTIONS_SUB=		yes
+TEST_CONFIGURE_WITH=	atf
+TEST_BUILD_DEPENDS=	atf>=0.20:${PORTSDIR}/devel/atf
+TEST_RUN_DEPENDS=	atf>=0.20:${PORTSDIR}/devel/atf
+
+.include <bsd.port.options.mk>
+
+CONFIGURE_ARGS+=	--without-doxygen
+CONFIGURE_ARGS+=	--docdir=${DOCSDIR}
+MAKE_FLAGS+=	examplesdir=${EXAMPLESDIR}
+MAKE_FLAGS+=	pkgdatadir=${DATADIR}
+
+.if ! ${PORT_OPTIONS:MDOCS}
+MAKE_FLAGS+=	doc_DATA=
 .endif
+.if ! ${PORT_OPTIONS:MEXAMPLES}
+MAKE_FLAGS+=	dist_examples_DATA=
 .endif
 
-.include <bsd.port.post.mk>
+post-install:
+	${MKDIR} ${STAGEDIR}${PREFIX}/etc/kyua/
+	${INSTALL_DATA} ${WRKDIR}/kyua.conf ${STAGEDIR}${PREFIX}/etc/kyua/
+	${INSTALL_DATA} ${WRKSRC}/examples/Kyuafile.top \
+		${STAGEDIR}${PREFIX}/tests/Kyuafile
+
+.include <bsd.port.mk>
diff --git a/devel/kyua/distinfo b/devel/kyua/distinfo
new file mode 100644
index 000000000000..cf5937e31b9b
--- /dev/null
+++ b/devel/kyua/distinfo
@@ -0,0 +1,2 @@
+SHA256 (kyua-0.10.tar.gz) = d9497e92d8ff70e6a346c42e9b2c0b66127a418295097d0bcd61721020055783
+SIZE (kyua-0.10.tar.gz) = 596671
diff --git a/devel/kyua-cli/files/kyua.conf.in b/devel/kyua/files/kyua.conf.in
index e09018346c54..e09018346c54 100644
--- a/devel/kyua-cli/files/kyua.conf.in
+++ b/devel/kyua/files/kyua.conf.in
diff --git a/devel/kyua/pkg-descr b/devel/kyua/pkg-descr
index f74649395608..3b885d29a7f6 100644
--- a/devel/kyua/pkg-descr
+++ b/devel/kyua/pkg-descr
@@ -1,15 +1,18 @@
-Kyua (pronounced Q.A.) is a testing framework for both developers and
-users.  Kyua is different from most other testing frameworks in that it
-puts the end user experience before anything else.  There are multiple
-reasons for users to run the tests themselves, and Kyua ensures that
-they can do so in the most convenient way.
+Kyua is a testing framework for infrastructure software, originally
+designed to equip BSD-based operating systems with a test suite.  This
+means that Kyua is lightweight and simple, and that Kyua integrates well
+with various build systems and continuous integration frameworks.
 
-At the moment, Kyua is focused on implementing a solid foundation and a
-powerful command-line tool to run tests implemented with the Automated
-Testing Framework (ATF).  Later on, Kyua will also provide a set of
-language bindings (C, C++ and shell, at the least) to ease the
-implementation of test cases in a variety of programming languages.
+Kyua features an expressive test suite definition language, a safe
+runtime engine for test suites and a powerful report generation engine.
 
-In effect, Kyua is intended to be a replacement for ATF.
+Kyua is for both developers and users, from the developer applying a
+simple fix to a library to the system administrator deploying a new
+release on a production machine.
 
-WWW: https://code.google.com/p/kyua/
+Kyua is able to execute test programs written with a plethora of testing
+libraries and languages.  The library of choice is ATF, for which Kyua
+was originally designed, but simple, framework-less test programs and
+TAP-compliant test programs can also be executed through Kyua.
+
+WWW: https://github.com/jmmv/kyua/
diff --git a/devel/kyua/pkg-plist b/devel/kyua/pkg-plist
index 0337a60dac25..321f9ba2810f 100644
--- a/devel/kyua/pkg-plist
+++ b/devel/kyua/pkg-plist
@@ -1 +1,229 @@
-@comment This packing list left intentionally empty
+bin/kyua
+etc/kyua/kyua.conf
+libexec/kyua-atf-tester
+libexec/kyua-plain-tester
+libexec/kyua-tap-tester
+man/man1/kyua-about.1.gz
+man/man1/kyua-atf-tester.1.gz
+man/man1/kyua-config.1.gz
+man/man1/kyua-db-exec.1.gz
+man/man1/kyua-db-migrate.1.gz
+man/man1/kyua-debug.1.gz
+man/man1/kyua-help.1.gz
+man/man1/kyua-list.1.gz
+man/man1/kyua-plain-tester.1.gz
+man/man1/kyua-report-html.1.gz
+man/man1/kyua-report-junit.1.gz
+man/man1/kyua-report.1.gz
+man/man1/kyua-tap-tester.1.gz
+man/man1/kyua-test.1.gz
+man/man1/kyua-tester.1.gz
+man/man1/kyua.1.gz
+man/man5/kyua-tester-list.5.gz
+man/man5/kyua-tester-result.5.gz
+man/man5/kyua.conf.5.gz
+man/man5/kyuafile.5.gz
+man/man7/kyua-atf-interface.7.gz
+man/man7/kyua-build-root.7.gz
+man/man7/kyua-plain-interface.7.gz
+man/man7/kyua-results-files.7.gz
+man/man7/kyua-tap-interface.7.gz
+man/man7/kyua-test-filters.7.gz
+%%DATADIR%%/misc/context.html
+%%DATADIR%%/misc/index.html
+%%DATADIR%%/misc/report.css
+%%DATADIR%%/misc/test_result.html
+%%DATADIR%%/store/migrate_v1_v2.sql
+%%DATADIR%%/store/migrate_v2_v3.sql
+%%DATADIR%%/store/schema_v3.sql
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Kyuafile.top
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/kyua.conf
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
+%%TEST%%tests/Kyuafile
+%%TEST%%tests/kyua/Kyuafile
+%%TEST%%tests/kyua/bootstrap/Kyuafile
+%%TEST%%tests/kyua/bootstrap/atf_helpers
+%%TEST%%tests/kyua/bootstrap/plain_helpers
+%%TEST%%tests/kyua/bootstrap/testsuite
+%%TEST%%tests/kyua/cli/Kyuafile
+%%TEST%%tests/kyua/cli/cmd_about_test
+%%TEST%%tests/kyua/cli/cmd_config_test
+%%TEST%%tests/kyua/cli/cmd_db_exec_test
+%%TEST%%tests/kyua/cli/cmd_debug_test
+%%TEST%%tests/kyua/cli/cmd_help_test
+%%TEST%%tests/kyua/cli/cmd_list_test
+%%TEST%%tests/kyua/cli/cmd_test_test
+%%TEST%%tests/kyua/cli/common_test
+%%TEST%%tests/kyua/cli/config_test
+%%TEST%%tests/kyua/cli/main_test
+%%TEST%%tests/kyua/engine/Kyuafile
+%%TEST%%tests/kyua/engine/config_test
+%%TEST%%tests/kyua/engine/context_test
+%%TEST%%tests/kyua/engine/drivers/Kyuafile
+%%TEST%%tests/kyua/engine/drivers/list_tests_helpers
+%%TEST%%tests/kyua/engine/drivers/list_tests_test
+%%TEST%%tests/kyua/engine/drivers/scan_results_test
+%%TEST%%tests/kyua/engine/exceptions_test
+%%TEST%%tests/kyua/engine/filters_test
+%%TEST%%tests/kyua/engine/kyuafile_test
+%%TEST%%tests/kyua/engine/metadata_test
+%%TEST%%tests/kyua/engine/report_junit_test
+%%TEST%%tests/kyua/engine/test_case_atf_helpers
+%%TEST%%tests/kyua/engine/test_case_plain_helpers
+%%TEST%%tests/kyua/engine/test_case_test
+%%TEST%%tests/kyua/engine/test_program_test
+%%TEST%%tests/kyua/engine/test_result_test
+%%TEST%%tests/kyua/engine/testers_test
+%%TEST%%tests/kyua/examples/Kyuafile
+%%TEST%%tests/kyua/examples/syntax_test
+%%TEST%%tests/kyua/integration/Kyuafile
+%%TEST%%tests/kyua/integration/cmd_about_test
+%%TEST%%tests/kyua/integration/cmd_config_test
+%%TEST%%tests/kyua/integration/cmd_db_exec_test
+%%TEST%%tests/kyua/integration/cmd_db_migrate_test
+%%TEST%%tests/kyua/integration/cmd_debug_test
+%%TEST%%tests/kyua/integration/cmd_help_test
+%%TEST%%tests/kyua/integration/cmd_list_test
+%%TEST%%tests/kyua/integration/cmd_report_html_test
+%%TEST%%tests/kyua/integration/cmd_report_junit_test
+%%TEST%%tests/kyua/integration/cmd_report_test
+%%TEST%%tests/kyua/integration/cmd_test_test
+%%TEST%%tests/kyua/integration/global_test
+%%TEST%%tests/kyua/integration/helpers/bad_test_program
+%%TEST%%tests/kyua/integration/helpers/bogus_test_cases
+%%TEST%%tests/kyua/integration/helpers/config
+%%TEST%%tests/kyua/integration/helpers/expect_all_pass
+%%TEST%%tests/kyua/integration/helpers/expect_some_fail
+%%TEST%%tests/kyua/integration/helpers/interrupts
+%%TEST%%tests/kyua/integration/helpers/metadata
+%%TEST%%tests/kyua/integration/helpers/simple_all_pass
+%%TEST%%tests/kyua/integration/helpers/simple_some_fail
+%%TEST%%tests/kyua/store/Kyuafile
+%%TEST%%tests/kyua/store/dbtypes_test
+%%TEST%%tests/kyua/store/exceptions_test
+%%TEST%%tests/kyua/store/layout_test
+%%TEST%%tests/kyua/store/metadata_test
+%%TEST%%tests/kyua/store/migrate_test
+%%TEST%%tests/kyua/store/read_backend_test
+%%TEST%%tests/kyua/store/read_transaction_test
+%%TEST%%tests/kyua/store/schema_inttest
+%%TEST%%tests/kyua/store/schema_v1.sql
+%%TEST%%tests/kyua/store/schema_v2.sql
+%%TEST%%tests/kyua/store/testdata_v1.sql
+%%TEST%%tests/kyua/store/testdata_v2.sql
+%%TEST%%tests/kyua/store/testdata_v3_1.sql
+%%TEST%%tests/kyua/store/testdata_v3_2.sql
+%%TEST%%tests/kyua/store/testdata_v3_3.sql
+%%TEST%%tests/kyua/store/testdata_v3_4.sql
+%%TEST%%tests/kyua/store/transaction_test
+%%TEST%%tests/kyua/store/write_backend_test
+%%TEST%%tests/kyua/store/write_transaction_test
+%%TEST%%tests/kyua/testers/Kyuafile
+%%TEST%%tests/kyua/testers/atf_helpers
+%%TEST%%tests/kyua/testers/atf_inttest
+%%TEST%%tests/kyua/testers/atf_list_test
+%%TEST%%tests/kyua/testers/atf_result_test
+%%TEST%%tests/kyua/testers/cli_test
+%%TEST%%tests/kyua/testers/env_test
+%%TEST%%tests/kyua/testers/error_test
+%%TEST%%tests/kyua/testers/fs_test
+%%TEST%%tests/kyua/testers/plain_helpers
+%%TEST%%tests/kyua/testers/plain_inttest
+%%TEST%%tests/kyua/testers/result_test
+%%TEST%%tests/kyua/testers/run_test
+%%TEST%%tests/kyua/testers/stacktrace_helper
+%%TEST%%tests/kyua/testers/stacktrace_test
+%%TEST%%tests/kyua/testers/tap_helpers
+%%TEST%%tests/kyua/testers/tap_inttest
+%%TEST%%tests/kyua/testers/tap_parser_test
+%%TEST%%tests/kyua/testers/text_test
+%%TEST%%tests/kyua/utils/Kyuafile
+%%TEST%%tests/kyua/utils/auto_array_test
+%%TEST%%tests/kyua/utils/cmdline/Kyuafile
+%%TEST%%tests/kyua/utils/cmdline/base_command_test
+%%TEST%%tests/kyua/utils/cmdline/commands_map_test
+%%TEST%%tests/kyua/utils/cmdline/exceptions_test
+%%TEST%%tests/kyua/utils/cmdline/globals_test
+%%TEST%%tests/kyua/utils/cmdline/options_test
+%%TEST%%tests/kyua/utils/cmdline/parser_test
+%%TEST%%tests/kyua/utils/cmdline/ui_test
+%%TEST%%tests/kyua/utils/config/Kyuafile
+%%TEST%%tests/kyua/utils/config/exceptions_test
+%%TEST%%tests/kyua/utils/config/keys_test
+%%TEST%%tests/kyua/utils/config/lua_module_test
+%%TEST%%tests/kyua/utils/config/nodes_test
+%%TEST%%tests/kyua/utils/config/parser_test
+%%TEST%%tests/kyua/utils/config/tree_test
+%%TEST%%tests/kyua/utils/datetime_test
+%%TEST%%tests/kyua/utils/env_test
+%%TEST%%tests/kyua/utils/format/Kyuafile
+%%TEST%%tests/kyua/utils/format/exceptions_test
+%%TEST%%tests/kyua/utils/format/formatter_test
+%%TEST%%tests/kyua/utils/fs/Kyuafile
+%%TEST%%tests/kyua/utils/fs/auto_cleaners_test
+%%TEST%%tests/kyua/utils/fs/exceptions_test
+%%TEST%%tests/kyua/utils/fs/lua_module_test
+%%TEST%%tests/kyua/utils/fs/operations_test
+%%TEST%%tests/kyua/utils/fs/path_test
+%%TEST%%tests/kyua/utils/logging/Kyuafile
+%%TEST%%tests/kyua/utils/logging/macros_test
+%%TEST%%tests/kyua/utils/logging/operations_test
+%%TEST%%tests/kyua/utils/memory_test
+%%TEST%%tests/kyua/utils/optional_test
+%%TEST%%tests/kyua/utils/passwd_test
+%%TEST%%tests/kyua/utils/process/Kyuafile
+%%TEST%%tests/kyua/utils/process/child_test
+%%TEST%%tests/kyua/utils/process/exceptions_test
+%%TEST%%tests/kyua/utils/process/fdstream_test
+%%TEST%%tests/kyua/utils/process/helpers
+%%TEST%%tests/kyua/utils/process/status_test
+%%TEST%%tests/kyua/utils/process/systembuf_test
+%%TEST%%tests/kyua/utils/releaser_test
+%%TEST%%tests/kyua/utils/sanity_test
+%%TEST%%tests/kyua/utils/signals/Kyuafile
+%%TEST%%tests/kyua/utils/signals/exceptions_test
+%%TEST%%tests/kyua/utils/signals/interrupts_test
+%%TEST%%tests/kyua/utils/signals/misc_test
+%%TEST%%tests/kyua/utils/signals/programmer_test
+%%TEST%%tests/kyua/utils/sqlite/Kyuafile
+%%TEST%%tests/kyua/utils/sqlite/c_gate_test
+%%TEST%%tests/kyua/utils/sqlite/database_test
+%%TEST%%tests/kyua/utils/sqlite/exceptions_test
+%%TEST%%tests/kyua/utils/sqlite/statement_test
+%%TEST%%tests/kyua/utils/sqlite/transaction_test
+%%TEST%%tests/kyua/utils/stream_test
+%%TEST%%tests/kyua/utils/text/Kyuafile
+%%TEST%%tests/kyua/utils/text/exceptions_test
+%%TEST%%tests/kyua/utils/text/operations_test
+%%TEST%%tests/kyua/utils/text/table_test
+%%TEST%%tests/kyua/utils/text/templates_test
+%%TEST%%tests/kyua/utils/units_test
+%%TEST%%@dirrm tests/kyua/utils/text
+%%TEST%%@dirrm tests/kyua/utils/sqlite
+%%TEST%%@dirrm tests/kyua/utils/signals
+%%TEST%%@dirrm tests/kyua/utils/process
+%%TEST%%@dirrm tests/kyua/utils/logging
+%%TEST%%@dirrm tests/kyua/utils/fs
+%%TEST%%@dirrm tests/kyua/utils/format
+%%TEST%%@dirrm tests/kyua/utils/config
+%%TEST%%@dirrm tests/kyua/utils/cmdline
+%%TEST%%@dirrm tests/kyua/utils
+%%TEST%%@dirrm tests/kyua/store
+%%TEST%%@dirrm tests/kyua/testers
+%%TEST%%@dirrm tests/kyua/integration/helpers
+%%TEST%%@dirrm tests/kyua/integration
+%%TEST%%@dirrm tests/kyua/examples
+%%TEST%%@dirrm tests/kyua/engine/drivers
+%%TEST%%@dirrm tests/kyua/engine
+%%TEST%%@dirrm tests/kyua/cli
+%%TEST%%@dirrm tests/kyua/bootstrap
+%%TEST%%@dirrm tests/kyua
+@dirrm %%DATADIR%%/store
+@dirrm %%DATADIR%%/misc
+@dirrm %%DATADIR%%
+@dirrm etc/kyua