From: Johannes Thyssen Tishman Subject: [update] devel/kyua 0.8 -> 0.14.1 (merge devel/kyua-{cli,testers}) To: ports@openbsd.org Cc: Sergey Bronnikov Date: Fri, 25 Sep 2026 14:48:35 +0000 Please find below an update for devel/kyua to version 0.14.1. Since version 0.10, devel/kyua-cli and devel/kyua-testers have been merged into one[0]. Cc'd MAINTAINER. I've haven't dealt with a port rename/removal yet, so I'd be grateful for some guidance. Changelog: https://github.com/freebsd/kyua/blob/master/NEWS Notes about this update: 1. Specifying -std in CXXFLAGS_base-clang doesn't seem necessary anymore. C++20 is required since last release. 2. devel/atf doesn't seem necessary in LIB_DEPENDS anymore 3. Use ${FULLPKGNAME}:${BUILD_PKGPATH} to avoid matching older port versions [0] https://github.com/freebsd/kyua/blob/33d348582c677ba63daa301d802aefea7aca52af/NEWS#L318 Index: devel/Makefile =================================================================== RCS file: /cvs/ports/devel/Makefile,v diff -u -p -r1.2616 Makefile --- devel/Makefile 23 Sep 2026 16:58:19 -0000 1.2616 +++ devel/Makefile 25 Sep 2026 14:21:34 -0000 @@ -271,8 +271,7 @@ SUBDIR += knfmt SUBDIR += kproperty SUBDIR += kreport - SUBDIR += kyua-cli - SUBDIR += kyua-testers + SUBDIR += kyua SUBDIR += lager SUBDIR += legit SUBDIR += leiningen Index: devel/kyua/Makefile =================================================================== RCS file: /cvs/ports/devel/kyua-cli/Makefile,v diff -u -p -r1.12 Makefile --- devel/kyua/Makefile 18 Nov 2023 18:53:30 -0000 1.12 +++ devel/kyua/Makefile 25 Sep 2026 14:21:34 -0000 @@ -1,40 +1,35 @@ COMMENT = testing framework -DISTNAME = kyua-cli-0.8 -REVISION = 3 +DISTNAME = kyua-0.14.1 CATEGORIES = devel -HOMEPAGE = https://github.com/jmmv/kyua +HOMEPAGE = https://github.com/freebsd/kyua MAINTAINER = Sergey Bronnikov # BSD PERMIT_PACKAGE = Yes -WANTLIB += ${MODLUA_WANTLIB} atf-c atf-c++ c lutok m pthread sqlite3 ${COMPILER_LIBCXX} +WANTLIB += ${COMPILER_LIBCXX} c ${MODLUA_WANTLIB} lutok m sqlite3 z -SITES = https://github.com/jmmv/kyua/releases/download/${DISTNAME}/ +SITES = ${HOMEPAGE}/releases/download/${DISTNAME}/ COMPILER = base-clang ports-gcc base-gcc -# auto_ptr -CXXFLAGS_base-clang = -std=gnu++14 MODULES = lang/lua +MODLUA_VERSION = 5.4 MODLUA_SA = Yes BUILD_DEPENDS = ${RUN_DEPENDS} -RUN_DEPENDS = devel/kyua-testers - -LIB_DEPENDS = devel/atf \ - databases/sqlite3 \ +LIB_DEPENDS = databases/sqlite3 \ devel/lutok -CONFIGURE_STYLE = gnu -CONFIGURE_ARGS = --without-doxygen +# Test if files are installed correctly +TEST_DEPENDS = ${FULLPKGNAME}:${BUILD_PKGPATH} +TEST_TARGET = installcheck -# Install the package and use the following TEST_TARGET if you want to -# perform the tests on the installed files. -#TEST_TARGET = installcheck +CONFIGURE_STYLE = gnu +CONFIGURE_ARGS = --with-doxygen=no PORTHOME = ${WRKDIR} Index: devel/kyua/distinfo =================================================================== RCS file: /cvs/ports/devel/kyua-cli/distinfo,v diff -u -p -r1.1.1.1 distinfo --- devel/kyua/distinfo 16 Mar 2014 11:28:11 -0000 1.1.1.1 +++ devel/kyua/distinfo 25 Sep 2026 14:21:34 -0000 @@ -1,2 +1,2 @@ -SHA256 (kyua-cli-0.8.tar.gz) = KPkJKeS3OVm90IodP1zn534OT8mXjRCxsHkWBCjXcLM= -SIZE (kyua-cli-0.8.tar.gz) = 496577 +SHA256 (kyua-0.14.1.tar.gz) = PK8wp+MW9PIcMuHEGeyANx/hE+Pu0Quh255u/H7hXss= +SIZE (kyua-0.14.1.tar.gz) = 996797 Index: devel/kyua/patches/patch-configure =================================================================== RCS file: /cvs/ports/devel/kyua-cli/patches/patch-configure,v diff -u -p -r1.2 patch-configure --- devel/kyua/patches/patch-configure 11 Mar 2022 18:50:27 -0000 1.2 +++ devel/kyua/patches/patch-configure 25 Sep 2026 14:21:34 -0000 @@ -1,7 +1,8 @@ Don't clutter build logs. ---- configure.orig Sat Dec 7 14:14:38 2013 -+++ configure Fri Jan 24 16:17:48 2014 -@@ -4582,7 +4582,6 @@ fi +Index: configure +--- configure.orig ++++ configure +@@ -6289,7 +6289,6 @@ fi -Wcast-qual \ -Wextra \ -Wpointer-arith \ @@ -9,3 +10,12 @@ Don't clutter build logs. -Wreturn-type \ -Wshadow \ -Wsign-compare \ +@@ -21020,7 +21019,7 @@ fi + + + +- if test "$(uname -o)" = "FreeBSD"; then ++ if test "$(uname -s)" = "FreeBSD"; then + FreeBSD_TRUE= + FreeBSD_FALSE='#' + else Index: devel/kyua/patches/patch-utils_datetime_test_cpp =================================================================== RCS file: devel/kyua/patches/patch-utils_datetime_test_cpp diff -N devel/kyua/patches/patch-utils_datetime_test_cpp --- devel/kyua/patches/patch-utils_datetime_test_cpp 11 Mar 2022 18:50:27 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,12 +0,0 @@ -Fix for archs with 32 bits long. ---- utils/datetime_test.cpp.orig Mon Dec 23 23:33:29 2013 -+++ utils/datetime_test.cpp Mon Dec 23 23:33:36 2013 -@@ -86,7 +86,7 @@ ATF_TEST_CASE_BODY(delta__from_microseconds) - } - { - const datetime::delta delta = datetime::delta::from_microseconds( -- 123456789123456); -+ 123456789123456LL); - ATF_REQUIRE_EQ(123456789, delta.seconds); - ATF_REQUIRE_EQ(123456, delta.useconds); - } Index: devel/kyua/pkg/PLIST =================================================================== RCS file: /cvs/ports/devel/kyua-cli/pkg/PLIST,v diff -u -p -r1.2 PLIST --- devel/kyua/pkg/PLIST 11 Mar 2022 18:50:27 -0000 1.2 +++ devel/kyua/pkg/PLIST 25 Sep 2026 14:21:34 -0000 @@ -7,178 +7,28 @@ @man man/man1/kyua-help.1 @man man/man1/kyua-list.1 @man man/man1/kyua-report-html.1 +@man man/man1/kyua-report-junit.1 @man man/man1/kyua-report.1 @man man/man1/kyua-test.1 @man man/man1/kyua.1 @man man/man5/kyua.conf.5 @man man/man5/kyuafile.5 -@man man/man7/kyua-build-root.7 -@man man/man7/kyua-test-filters.7 -share/doc/kyua-cli/ -share/doc/kyua-cli/AUTHORS -share/doc/kyua-cli/COPYING -share/doc/kyua-cli/NEWS -share/doc/kyua-cli/README -share/kyua-cli/ -share/kyua-cli/examples/ -share/kyua-cli/examples/Kyuafile.top -share/kyua-cli/examples/kyua.conf -share/kyua-cli/misc/ -share/kyua-cli/misc/context.html -share/kyua-cli/misc/index.html -share/kyua-cli/misc/report.css -share/kyua-cli/misc/test_result.html -share/kyua-cli/store/ -share/kyua-cli/store/migrate_v1_v2.sql -share/kyua-cli/store/schema_v2.sql -tests/kyua-cli/ -tests/kyua-cli/Kyuafile -tests/kyua-cli/bootstrap/ -tests/kyua-cli/bootstrap/Kyuafile -@bin tests/kyua-cli/bootstrap/atf_helpers -@bin tests/kyua-cli/bootstrap/plain_helpers -tests/kyua-cli/bootstrap/testsuite -tests/kyua-cli/cli/ -tests/kyua-cli/cli/Kyuafile -@bin tests/kyua-cli/cli/cmd_about_test -@bin tests/kyua-cli/cli/cmd_config_test -@bin tests/kyua-cli/cli/cmd_db_exec_test -@bin tests/kyua-cli/cli/cmd_db_migrate_test -@bin tests/kyua-cli/cli/cmd_debug_test -@bin tests/kyua-cli/cli/cmd_help_test -@bin tests/kyua-cli/cli/cmd_list_test -@bin tests/kyua-cli/cli/cmd_report_html_test -@bin tests/kyua-cli/cli/cmd_report_test -@bin tests/kyua-cli/cli/cmd_test_test -@bin tests/kyua-cli/cli/common_test -@bin tests/kyua-cli/cli/config_test -@bin tests/kyua-cli/cli/main_test -tests/kyua-cli/engine/ -tests/kyua-cli/engine/Kyuafile -@bin tests/kyua-cli/engine/action_test -@bin tests/kyua-cli/engine/config_test -@bin tests/kyua-cli/engine/context_test -tests/kyua-cli/engine/drivers/ -tests/kyua-cli/engine/drivers/Kyuafile -@bin tests/kyua-cli/engine/drivers/debug_test_test -@bin tests/kyua-cli/engine/drivers/list_tests_helpers -@bin tests/kyua-cli/engine/drivers/list_tests_test -@bin tests/kyua-cli/engine/drivers/run_tests_test -@bin tests/kyua-cli/engine/drivers/scan_action_test -@bin tests/kyua-cli/engine/exceptions_test -@bin tests/kyua-cli/engine/filters_test -@bin tests/kyua-cli/engine/kyuafile_test -@bin tests/kyua-cli/engine/metadata_test -@bin tests/kyua-cli/engine/test_case_atf_helpers -@bin tests/kyua-cli/engine/test_case_plain_helpers -@bin tests/kyua-cli/engine/test_case_test -@bin tests/kyua-cli/engine/test_program_test -@bin tests/kyua-cli/engine/test_result_test -@bin tests/kyua-cli/engine/testers_test -tests/kyua-cli/examples/ -tests/kyua-cli/examples/Kyuafile -@bin tests/kyua-cli/examples/syntax_test -tests/kyua-cli/integration/ -tests/kyua-cli/integration/Kyuafile -tests/kyua-cli/integration/cmd_about_test -tests/kyua-cli/integration/cmd_config_test -tests/kyua-cli/integration/cmd_db_exec_test -tests/kyua-cli/integration/cmd_db_migrate_test -tests/kyua-cli/integration/cmd_debug_test -tests/kyua-cli/integration/cmd_help_test -tests/kyua-cli/integration/cmd_list_test -tests/kyua-cli/integration/cmd_report_html_test -tests/kyua-cli/integration/cmd_report_test -tests/kyua-cli/integration/cmd_test_test -tests/kyua-cli/integration/global_test -tests/kyua-cli/integration/helpers/ -@bin tests/kyua-cli/integration/helpers/bad_test_program -@bin tests/kyua-cli/integration/helpers/bogus_test_cases -@bin tests/kyua-cli/integration/helpers/config -@bin tests/kyua-cli/integration/helpers/expect_all_pass -@bin tests/kyua-cli/integration/helpers/expect_some_fail -@bin tests/kyua-cli/integration/helpers/interrupts -@bin tests/kyua-cli/integration/helpers/metadata -@bin tests/kyua-cli/integration/helpers/simple_all_pass -@bin tests/kyua-cli/integration/helpers/simple_some_fail -tests/kyua-cli/store/ -tests/kyua-cli/store/Kyuafile -@bin tests/kyua-cli/store/backend_test -@bin tests/kyua-cli/store/dbtypes_test -@bin tests/kyua-cli/store/exceptions_test -@bin tests/kyua-cli/store/metadata_test -@bin tests/kyua-cli/store/schema_inttest -tests/kyua-cli/store/schema_v1.sql -tests/kyua-cli/store/testdata_v1.sql -tests/kyua-cli/store/testdata_v2.sql -@bin tests/kyua-cli/store/transaction_test -tests/kyua-cli/utils/ -tests/kyua-cli/utils/Kyuafile -@bin tests/kyua-cli/utils/auto_array_test -tests/kyua-cli/utils/cmdline/ -tests/kyua-cli/utils/cmdline/Kyuafile -@bin tests/kyua-cli/utils/cmdline/base_command_test -@bin tests/kyua-cli/utils/cmdline/commands_map_test -@bin tests/kyua-cli/utils/cmdline/exceptions_test -@bin tests/kyua-cli/utils/cmdline/globals_test -@bin tests/kyua-cli/utils/cmdline/options_test -@bin tests/kyua-cli/utils/cmdline/parser_test -@bin tests/kyua-cli/utils/cmdline/ui_test -tests/kyua-cli/utils/config/ -tests/kyua-cli/utils/config/Kyuafile -@bin tests/kyua-cli/utils/config/exceptions_test -@bin tests/kyua-cli/utils/config/keys_test -@bin tests/kyua-cli/utils/config/lua_module_test -@bin tests/kyua-cli/utils/config/nodes_test -@bin tests/kyua-cli/utils/config/parser_test -@bin tests/kyua-cli/utils/config/tree_test -@bin tests/kyua-cli/utils/datetime_test -@bin tests/kyua-cli/utils/env_test -tests/kyua-cli/utils/format/ -tests/kyua-cli/utils/format/Kyuafile -@bin tests/kyua-cli/utils/format/exceptions_test -@bin tests/kyua-cli/utils/format/formatter_test -tests/kyua-cli/utils/fs/ -tests/kyua-cli/utils/fs/Kyuafile -@bin tests/kyua-cli/utils/fs/auto_cleaners_test -@bin tests/kyua-cli/utils/fs/exceptions_test -@bin tests/kyua-cli/utils/fs/lua_module_test -@bin tests/kyua-cli/utils/fs/operations_test -@bin tests/kyua-cli/utils/fs/path_test -tests/kyua-cli/utils/logging/ -tests/kyua-cli/utils/logging/Kyuafile -@bin tests/kyua-cli/utils/logging/macros_test -@bin tests/kyua-cli/utils/logging/operations_test -@bin tests/kyua-cli/utils/memory_test -@bin tests/kyua-cli/utils/optional_test -@bin tests/kyua-cli/utils/passwd_test -tests/kyua-cli/utils/process/ -tests/kyua-cli/utils/process/Kyuafile -@bin tests/kyua-cli/utils/process/child_test -@bin tests/kyua-cli/utils/process/exceptions_test -@bin tests/kyua-cli/utils/process/fdstream_test -@bin tests/kyua-cli/utils/process/helpers -@bin tests/kyua-cli/utils/process/status_test -@bin tests/kyua-cli/utils/process/systembuf_test -@bin tests/kyua-cli/utils/sanity_test -tests/kyua-cli/utils/signals/ -tests/kyua-cli/utils/signals/Kyuafile -@bin tests/kyua-cli/utils/signals/exceptions_test -@bin tests/kyua-cli/utils/signals/interrupts_test -@bin tests/kyua-cli/utils/signals/misc_test -@bin tests/kyua-cli/utils/signals/programmer_test -tests/kyua-cli/utils/sqlite/ -tests/kyua-cli/utils/sqlite/Kyuafile -@bin tests/kyua-cli/utils/sqlite/c_gate_test -@bin tests/kyua-cli/utils/sqlite/database_test -@bin tests/kyua-cli/utils/sqlite/exceptions_test -@bin tests/kyua-cli/utils/sqlite/statement_test -@bin tests/kyua-cli/utils/sqlite/transaction_test -@bin tests/kyua-cli/utils/stream_test -tests/kyua-cli/utils/text/ -tests/kyua-cli/utils/text/Kyuafile -@bin tests/kyua-cli/utils/text/exceptions_test -@bin tests/kyua-cli/utils/text/operations_test -@bin tests/kyua-cli/utils/text/table_test -@bin tests/kyua-cli/utils/text/templates_test -@bin tests/kyua-cli/utils/units_test +share/doc/kyua/ +share/doc/kyua/AUTHORS +share/doc/kyua/CONTRIBUTING.md +share/doc/kyua/CONTRIBUTORS +share/doc/kyua/LICENSE +share/doc/kyua/NEWS +share/kyua/ +share/kyua/examples/ +share/kyua/examples/Kyuafile.top +share/kyua/examples/kyua.conf +share/kyua/misc/ +share/kyua/misc/context.html +share/kyua/misc/index.html +share/kyua/misc/report.css +share/kyua/misc/test_result.html +share/kyua/store/ +share/kyua/store/migrate_v1_v2.sql +share/kyua/store/migrate_v2_v3.sql +share/kyua/store/schema_v3.sql Index: devel/kyua-testers/Makefile =================================================================== RCS file: devel/kyua-testers/Makefile diff -N devel/kyua-testers/Makefile --- devel/kyua-testers/Makefile 21 Sep 2023 09:49:56 -0000 1.6 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,32 +0,0 @@ -COMMENT = scriptable interfaces to interact with test programs -DISTNAME = kyua-testers-0.2 -REVISION = 1 - -CATEGORIES = devel -HOMEPAGE = https://github.com/jmmv/kyua - -MAINTAINER = Sergey Bronnikov - -# BSD -PERMIT_PACKAGE = Yes - -WANTLIB += atf-c c - -SITES = https://github.com/jmmv/kyua/releases/download/${DISTNAME}/ - -LIB_DEPENDS = devel/atf - -TEST_DEPENDS = devel/kyua-cli - -TEST_FLAGS = KYUA=${LOCALBASE}/bin/kyua - -CONFIGURE_STYLE = gnu -CONFIGURE_ARGS = --without-doxygen - -# Install the package and use the following TEST_TARGET if you want to -# perform the tests on the installed files. -#TEST_TARGET = installcheck - -PORTHOME = ${WRKDIR} - -.include Index: devel/kyua-testers/distinfo =================================================================== RCS file: devel/kyua-testers/distinfo diff -N devel/kyua-testers/distinfo --- devel/kyua-testers/distinfo 16 Mar 2014 11:28:42 -0000 1.1.1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,2 +0,0 @@ -SHA256 (kyua-testers-0.2.tar.gz) = jniNn2obhrzztDbocMvIAc92UPo/D4LaiwJeNv/oT+s= -SIZE (kyua-testers-0.2.tar.gz) = 179731 Index: devel/kyua-testers/patches/patch-configure =================================================================== RCS file: devel/kyua-testers/patches/patch-configure diff -N devel/kyua-testers/patches/patch-configure --- devel/kyua-testers/patches/patch-configure 11 Mar 2022 18:50:27 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,11 +0,0 @@ -Don't clutter build logs. ---- configure.orig Tue Nov 26 18:17:38 2013 -+++ configure Fri Jan 24 16:18:30 2014 -@@ -3873,7 +3873,6 @@ fi - -Wcast-qual \ - -Wextra \ - -Wpointer-arith \ -- -Wredundant-decls \ - -Wreturn-type \ - -Wshadow \ - -Wsign-compare \ Index: devel/kyua-testers/patches/patch-fs_test_c =================================================================== RCS file: devel/kyua-testers/patches/patch-fs_test_c diff -N devel/kyua-testers/patches/patch-fs_test_c --- devel/kyua-testers/patches/patch-fs_test_c 11 Mar 2022 18:50:27 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,47 +0,0 @@ -- we have tmpfs -- but not lchmod ---- fs_test.c.orig Sun Mar 17 06:54:19 2013 -+++ fs_test.c Tue Dec 24 00:26:08 2013 -@@ -35,6 +35,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -55,6 +56,7 @@ enum os_type { - os_unsupported = 0, - os_freebsd, - os_linux, -+ os_openbsd, - os_netbsd, - os_sunos, - }; -@@ -66,6 +68,8 @@ static enum os_type current_os = - os_freebsd - #elif defined(__linux__) - os_linux -+#elif defined(__OpenBSD__) -+ os_openbsd - #elif defined(__NetBSD__) - os_netbsd - #elif defined(__SunOS__) -@@ -129,6 +133,7 @@ run_mount_tmpfs(const char* mount_point) - mount_args[last++] = mount_point; - break; - -+ case os_openbsd: - case os_netbsd: - mount_args[last++] = "mount"; - mount_args[last++] = "-ttmpfs"; -@@ -197,7 +202,8 @@ static bool - lchmod_fails(void) - { - ATF_REQUIRE(mkdir("test", 0755) != -1); -- return lchmod("test", 0700) == -1 && chmod("test", 0700) != -1; -+ return fchmodat(AT_FDCWD, "test", 0700, AT_SYMLINK_NOFOLLOW) != -1 && -+ chmod("test", 0700) != -1; - } - - Index: devel/kyua-testers/pkg/DESCR =================================================================== RCS file: devel/kyua-testers/pkg/DESCR diff -N devel/kyua-testers/pkg/DESCR --- devel/kyua-testers/pkg/DESCR 16 Mar 2014 11:28:42 -0000 1.1.1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,4 +0,0 @@ -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. Index: devel/kyua-testers/pkg/PLIST =================================================================== RCS file: devel/kyua-testers/pkg/PLIST diff -N devel/kyua-testers/pkg/PLIST --- devel/kyua-testers/pkg/PLIST 11 Mar 2022 18:50:27 -0000 1.4 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,38 +0,0 @@ -lib/pkgconfig/kyua-testers.pc -@bin libexec/kyua-atf-tester -@bin libexec/kyua-plain-tester -@bin libexec/kyua-tap-tester -@man man/man1/kyua-atf-tester.1 -@man man/man1/kyua-plain-tester.1 -@man man/man1/kyua-tap-tester.1 -@man man/man1/kyua-tester.1 -@man man/man5/kyua-tester-list.5 -@man man/man5/kyua-tester-result.5 -@man man/man7/kyua-atf-interface.7 -@man man/man7/kyua-plain-interface.7 -@man man/man7/kyua-tap-interface.7 -share/doc/kyua-testers/ -share/doc/kyua-testers/AUTHORS -share/doc/kyua-testers/COPYING -share/doc/kyua-testers/NEWS -share/doc/kyua-testers/README -tests/kyua-testers/ -tests/kyua-testers/Kyuafile -@bin tests/kyua-testers/atf_helpers -@bin tests/kyua-testers/atf_inttest -@bin tests/kyua-testers/atf_list_test -@bin tests/kyua-testers/atf_result_test -@bin tests/kyua-testers/cli_test -@bin tests/kyua-testers/env_test -@bin tests/kyua-testers/error_test -@bin tests/kyua-testers/fs_test -@bin tests/kyua-testers/plain_helpers -@bin tests/kyua-testers/plain_inttest -@bin tests/kyua-testers/result_test -@bin tests/kyua-testers/run_test -@bin tests/kyua-testers/stacktrace_helper -@bin tests/kyua-testers/stacktrace_test -@bin tests/kyua-testers/tap_helpers -@bin tests/kyua-testers/tap_inttest -@bin tests/kyua-testers/tap_parser_test -@bin tests/kyua-testers/text_test