2026-09-25T16:55:20+0100 Stuart Henderson <[email protected]>: > On 2026/09/25 14:48, Johannes Thyssen Tishman wrote: > > 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 > > this diff is slightly confusing, you've mv'd the directory but kept > the original CVS files. cvs rm -Rf kyua-cli, remove the CVS dirs under > devel/kyua, and when it's ready to go in, import under devel/kyua. > > you'll need these in devel/kyua/pkg/PLIST: > @pkgpath devel/kyua-cli > @pkgpath devel/kyua-testers > @conflict kyua-cli-* > @conflict kyua-testers-* > > and in devel/quirks $stem_extensions I think you'll need these > > 'kyua-cli' => 'kyua', > 'kyua-testers' => 'kyua', > > to test the upgrade path, build new packages including quirks, move > them to a dir on their own. install the old packages. change to the > dir with new packages and "PKG_PATH=./ pkg_add -u -D unsigned". > you'll get "could not update" for all the other unrelated ports but > if things are right you should be left with just the one new > kyua package installed and no errors other than the unrelated > "could not update".
Thanks for the help Stuart. I hope I got it correct this time. The diff
below removes and unhooks devel/kyua-{cli,testers}, updates
devel/quirks, updates devel/lutok (needed by devel/kyua), and hooks
devel/kyua (port attached as a tarball).
Additionally, it updates devel/atf and revises yesterday's update for
mail/mlmmj, both of which now depend on devel/kyua.
By following your instruction I got the following output from pkg_add
when updating:
# PKG_PATH=./ pkg_add -u -D unsigned
quirks-7.226->7.226: ok
kyua-cli-0.8p3+kyua-testers-0.2p1->kyua-0.14.1: ok
Read shared items: ok
Couldn't find updates for atf-0.18p3 blake3-1.8.7 ccache-4.14
fmt-11.2.0p0 gettext-runtime-1.0 libhiredis-1.4.1 libiconv-1.19
libsodium-1.0.22 lua-5.1.5p9 lua-5.4.8p2 lutok-0.6.3 lz4-1.10.0
pkglocatedb-1.5 sqlite3-3.53.2 updatedb-0p0 vim-9.2.1125p0
xxhash-0.8.3p0 xz-5.8.4 zstd-1.5.7p0
# pkg_info | grep kyua
kyua-0.14.1 testing framework
What's the preferred way to commit this dance?
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 26 Sep 2026 10:17:05 -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/quirks/files/Quirks.pm
===================================================================
RCS file: /cvs/ports/devel/quirks/files/Quirks.pm,v
diff -u -p -r1.1833 Quirks.pm
--- devel/quirks/files/Quirks.pm 23 Sep 2026 16:47:23 -0000 1.1833
+++ devel/quirks/files/Quirks.pm 26 Sep 2026 10:17:06 -0000
@@ -272,6 +272,8 @@ my $stem_extensions = {
'kmime' => 'kf6-kmime',
'p7zip' => '7zip',
'p7zip-rar' => '7zip-rar',
+ 'kyua-cli' => 'kyua',
+ 'kyua-testers' => 'kyua',
};
Index: devel/kyua-cli/Makefile
===================================================================
RCS file: devel/kyua-cli/Makefile
diff -N devel/kyua-cli/Makefile
--- devel/kyua-cli/Makefile 18 Nov 2023 18:53:30 -0000 1.12
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,41 +0,0 @@
-COMMENT = testing framework
-DISTNAME = kyua-cli-0.8
-REVISION = 3
-
-CATEGORIES = devel
-HOMEPAGE = https://github.com/jmmv/kyua
-
-MAINTAINER = Sergey Bronnikov <[email protected]>
-
-# BSD
-PERMIT_PACKAGE = Yes
-
-WANTLIB += ${MODLUA_WANTLIB} atf-c atf-c++ c lutok m pthread sqlite3
${COMPILER_LIBCXX}
-
-SITES =
https://github.com/jmmv/kyua/releases/download/${DISTNAME}/
-
-COMPILER = base-clang ports-gcc base-gcc
-# auto_ptr
-CXXFLAGS_base-clang = -std=gnu++14
-
-MODULES = lang/lua
-MODLUA_SA = Yes
-
-BUILD_DEPENDS = ${RUN_DEPENDS}
-
-RUN_DEPENDS = devel/kyua-testers
-
-LIB_DEPENDS = devel/atf \
- databases/sqlite3 \
- devel/lutok
-
-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 <bsd.port.mk>
Index: devel/kyua-cli/distinfo
===================================================================
RCS file: devel/kyua-cli/distinfo
diff -N devel/kyua-cli/distinfo
--- devel/kyua-cli/distinfo 16 Mar 2014 11:28:11 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,2 +0,0 @@
-SHA256 (kyua-cli-0.8.tar.gz) = KPkJKeS3OVm90IodP1zn534OT8mXjRCxsHkWBCjXcLM=
-SIZE (kyua-cli-0.8.tar.gz) = 496577
Index: devel/kyua-cli/patches/patch-configure
===================================================================
RCS file: devel/kyua-cli/patches/patch-configure
diff -N devel/kyua-cli/patches/patch-configure
--- devel/kyua-cli/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 Sat Dec 7 14:14:38 2013
-+++ configure Fri Jan 24 16:17:48 2014
-@@ -4582,7 +4582,6 @@ fi
- -Wcast-qual \
- -Wextra \
- -Wpointer-arith \
-- -Wredundant-decls \
- -Wreturn-type \
- -Wshadow \
- -Wsign-compare \
Index: devel/kyua-cli/patches/patch-utils_datetime_test_cpp
===================================================================
RCS file: devel/kyua-cli/patches/patch-utils_datetime_test_cpp
diff -N devel/kyua-cli/patches/patch-utils_datetime_test_cpp
--- devel/kyua-cli/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-cli/pkg/DESCR
===================================================================
RCS file: devel/kyua-cli/pkg/DESCR
diff -N devel/kyua-cli/pkg/DESCR
--- devel/kyua-cli/pkg/DESCR 16 Mar 2014 11:28:11 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,5 +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.
Index: devel/kyua-cli/pkg/PLIST
===================================================================
RCS file: devel/kyua-cli/pkg/PLIST
diff -N devel/kyua-cli/pkg/PLIST
--- devel/kyua-cli/pkg/PLIST 11 Mar 2022 18:50:27 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,184 +0,0 @@
-@bin bin/kyua
-@man man/man1/kyua-about.1
-@man man/man1/kyua-config.1
-@man man/man1/kyua-db-exec.1
-@man man/man1/kyua-db-migrate.1
-@man man/man1/kyua-debug.1
-@man man/man1/kyua-help.1
-@man man/man1/kyua-list.1
-@man man/man1/kyua-report-html.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
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 <[email protected]>
-
-# 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 <bsd.port.mk>
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 <dirent.h>
- #include <err.h>
- #include <errno.h>
-+#include <fcntl.h>
- #include <signal.h>
- #include <stdbool.h>
- #include <stdio.h>
-@@ -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
Index: devel/lutok/Makefile
===================================================================
RCS file: /cvs/ports/devel/lutok/Makefile,v
diff -u -p -r1.13 Makefile
--- devel/lutok/Makefile 17 Nov 2023 18:09:58 -0000 1.13
+++ devel/lutok/Makefile 26 Sep 2026 10:17:06 -0000
@@ -1,38 +1,34 @@
COMMENT = lightweight C++ API for Lua
-DISTNAME = lutok-0.4
-REVISION = 3
+DISTNAME = lutok-0.6.3
SHARED_LIBS += lutok 0.0 # 2.0
+
CATEGORIES = devel
-HOMEPAGE = https://github.com/jmmv/lutok/
+HOMEPAGE = https://github.com/freebsd/lutok/
MAINTAINER = Sergey Bronnikov <[email protected]>
# BSD
PERMIT_PACKAGE = Yes
-WANTLIB += atf-c atf-c++ c ${MODLUA_WANTLIB} m ${COMPILER_LIBCXX}
+WANTLIB += ${MODLUA_WANTLIB} m ${COMPILER_LIBCXX}
-SITES =
https://github.com/jmmv/lutok/releases/download/${DISTNAME}/
+SITES =
https://github.com/freebsd/lutok/releases/download/${DISTNAME}/
-COMPILER = base-clang ports-gcc base-gcc
-CXXFLAGS_base-clang = -std=gnu++14
+COMPILER = base-clang ports-gcc
MODULES = lang/lua
+MODLUA_VERSION = 5.4
MODLUA_SA = Yes
-LIB_DEPENDS = devel/atf
-
-TEST_DEPENDS = devel/kyua-cli
+# Test if files are installed correctly
+TEST_DEPENDS = ${FULLPKGNAME}:${BUILD_PKGPATH}
+TEST_TARGET = installcheck
CONFIGURE_STYLE = gnu
-CONFIGURE_ARGS = --without-doxygen
+CONFIGURE_ARGS = --with-doxygen=no
CONFIGURE_ENV = LUA_CFLAGS="`pkg-config --cflags
${MODLUA_DEP}`" \
LUA_LIBS="`pkg-config --libs ${MODLUA_DEP}`"
-
-# 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}
Index: devel/lutok/distinfo
===================================================================
RCS file: /cvs/ports/devel/lutok/distinfo,v
diff -u -p -r1.1.1.1 distinfo
--- devel/lutok/distinfo 16 Mar 2014 11:26:21 -0000 1.1.1.1
+++ devel/lutok/distinfo 26 Sep 2026 10:17:06 -0000
@@ -1,2 +1,2 @@
-SHA256 (lutok-0.4.tar.gz) = LOxR76DI1lrOiyHqoIOEt3q8UIe0bnhfeN4cIft1TNU=
-SIZE (lutok-0.4.tar.gz) = 489570
+SHA256 (lutok-0.6.3.tar.gz) = XzP9+L42wtlbhmlH/0mqSpD/1vEKYXLZ7ZJD9qa0Lxg=
+SIZE (lutok-0.6.3.tar.gz) = 627534
Index: devel/lutok/patches/patch-configure
===================================================================
RCS file: /cvs/ports/devel/lutok/patches/patch-configure,v
diff -u -p -r1.2 patch-configure
--- devel/lutok/patches/patch-configure 11 Mar 2022 18:50:47 -0000 1.2
+++ devel/lutok/patches/patch-configure 26 Sep 2026 10:17:06 -0000
@@ -1,7 +1,8 @@
Don't clutter build logs.
---- configure.orig Sat Dec 7 20:14:13 2013
-+++ configure Fri Jan 24 16:13:42 2014
-@@ -15377,7 +15377,6 @@ fi
+Index: configure
+--- configure.orig
++++ configure
+@@ -20933,7 +20933,6 @@ fi
-Wcast-qual \
-Wextra \
-Wpointer-arith \
@@ -9,3 +10,23 @@ Don't clutter build logs.
-Wreturn-type \
-Wshadow \
-Wsign-compare \
+@@ -22122,19 +22121,6 @@ fi
+ break
+ fi
+ done
+-
+- if test "${lua_found}" = no
+-then :
+-
+-else case e in #(
+- e)
+- LUA_CFLAGS=$(${PKG_CONFIG} --cflags ${lua_found})
+-
+- LUA_LIBS=$(${PKG_CONFIG} --libs ${lua_found})
+-
+- ;;
+-esac
+-fi
+
+ if test "${lua_found}" = no
+ then :
Index: devel/lutok/pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/lutok/pkg/PLIST,v
diff -u -p -r1.2 PLIST
--- devel/lutok/pkg/PLIST 11 Mar 2022 18:50:47 -0000 1.2
+++ devel/lutok/pkg/PLIST 26 Sep 2026 10:17:06 -0000
@@ -7,7 +7,7 @@ include/lutok/stack_cleaner.hpp
include/lutok/state.hpp
include/lutok/state.ipp
include/lutok/test_utils.hpp
-lib/liblutok.a
+@static-lib lib/liblutok.a
lib/liblutok.la
@lib lib/liblutok.so.${LIBlutok_VERSION}
lib/pkgconfig/lutok.pc
@@ -15,57 +15,60 @@ share/doc/lutok/
share/doc/lutok/AUTHORS
share/doc/lutok/COPYING
share/doc/lutok/NEWS
-share/doc/lutok/README
-share/doc/lutok/a00001.html
-share/doc/lutok/a00002.html
-share/doc/lutok/a00002.png
-share/doc/lutok/a00003.html
-share/doc/lutok/a00004.html
-share/doc/lutok/a00005.html
-share/doc/lutok/a00005.png
-share/doc/lutok/a00006.html
-share/doc/lutok/a00006.png
-share/doc/lutok/a00007.html
-share/doc/lutok/a00008.html
-share/doc/lutok/a00009.html
-share/doc/lutok/a00010.html
+share/doc/lutok/README.md
share/doc/lutok/a00011.html
-share/doc/lutok/a00013.html
-share/doc/lutok/a00013_source.html
-share/doc/lutok/a00016.html
-share/doc/lutok/a00016_source.html
-share/doc/lutok/a00019.html
-share/doc/lutok/a00019_source.html
-share/doc/lutok/a00022.html
-share/doc/lutok/a00022_source.html
-share/doc/lutok/a00025.html
-share/doc/lutok/a00025_source.html
-share/doc/lutok/a00028.html
-share/doc/lutok/a00028_source.html
-share/doc/lutok/a00031.html
-share/doc/lutok/a00031_source.html
-share/doc/lutok/a00032.html
-share/doc/lutok/a00033.html
-share/doc/lutok/a00034.html
+share/doc/lutok/a00011_source.html
+share/doc/lutok/a00014.html
+share/doc/lutok/a00014_source.html
+share/doc/lutok/a00020.html
+share/doc/lutok/a00020_source.html
+share/doc/lutok/a00023.html
+share/doc/lutok/a00023_source.html
share/doc/lutok/a00035.html
-share/doc/lutok/a00039.html
-share/doc/lutok/a00040.html
-share/doc/lutok/a00041.html
-share/doc/lutok/a00042.html
-share/doc/lutok/a00043.html
-share/doc/lutok/a00044.html
-share/doc/lutok/a00045.html
-share/doc/lutok/a00046.html
-share/doc/lutok/a00047.html
-share/doc/lutok/a00048.html
-share/doc/lutok/a00049.html
+share/doc/lutok/a00035_source.html
+share/doc/lutok/a00050.html
+share/doc/lutok/a00050_source.html
+share/doc/lutok/a00056.html
+share/doc/lutok/a00056_source.html
+share/doc/lutok/a00064.html
+share/doc/lutok/a00065.html
+share/doc/lutok/a00066.html
+share/doc/lutok/a00067.html
+share/doc/lutok/a00880.html
+share/doc/lutok/a00883.html
+share/doc/lutok/a00884.html
+share/doc/lutok/a00887.html
+share/doc/lutok/a00888.html
+share/doc/lutok/a00891.html
+share/doc/lutok/a00892.html
+share/doc/lutok/a00895.html
+share/doc/lutok/a00895.png
+share/doc/lutok/a00896.html
+share/doc/lutok/a00899.html
+share/doc/lutok/a00899.png
+share/doc/lutok/a00900.html
+share/doc/lutok/a00903.html
+share/doc/lutok/a00903.png
+share/doc/lutok/a00904.html
+share/doc/lutok/a00907.html
+share/doc/lutok/a00908.html
+share/doc/lutok/a00911.html
+share/doc/lutok/a00912.html
+share/doc/lutok/a00915.html
+share/doc/lutok/a00916.html
+share/doc/lutok/a00919.html
+share/doc/lutok/a00920.html
+share/doc/lutok/a00923.html
share/doc/lutok/annotated.html
share/doc/lutok/bc_s.png
+share/doc/lutok/bc_sd.png
share/doc/lutok/bdwn.png
share/doc/lutok/classes.html
share/doc/lutok/closed.png
+share/doc/lutok/doc.png
+share/doc/lutok/docd.png
share/doc/lutok/doxygen.css
-share/doc/lutok/doxygen.png
+share/doc/lutok/doxygen.svg
share/doc/lutok/dynsections.js
share/doc/lutok/examples/
share/doc/lutok/examples/Makefile
@@ -74,22 +77,8 @@ share/doc/lutok/examples/hello.cpp
share/doc/lutok/examples/interpreter.cpp
share/doc/lutok/examples/raii.cpp
share/doc/lutok/files.html
-share/doc/lutok/ftv2blank.png
-share/doc/lutok/ftv2cl.png
-share/doc/lutok/ftv2doc.png
-share/doc/lutok/ftv2folderclosed.png
-share/doc/lutok/ftv2folderopen.png
-share/doc/lutok/ftv2lastnode.png
-share/doc/lutok/ftv2link.png
-share/doc/lutok/ftv2mlastnode.png
-share/doc/lutok/ftv2mnode.png
-share/doc/lutok/ftv2mo.png
-share/doc/lutok/ftv2node.png
-share/doc/lutok/ftv2ns.png
-share/doc/lutok/ftv2plastnode.png
-share/doc/lutok/ftv2pnode.png
-share/doc/lutok/ftv2splitbar.png
-share/doc/lutok/ftv2vertline.png
+share/doc/lutok/folderclosed.png
+share/doc/lutok/folderopen.png
share/doc/lutok/functions.html
share/doc/lutok/functions_func.html
share/doc/lutok/functions_vars.html
@@ -98,144 +87,93 @@ share/doc/lutok/globals_defs.html
share/doc/lutok/hierarchy.html
share/doc/lutok/index.html
share/doc/lutok/jquery.js
+share/doc/lutok/menu.js
+share/doc/lutok/menudata.js
share/doc/lutok/namespacemembers.html
share/doc/lutok/namespacemembers_func.html
share/doc/lutok/namespaces.html
share/doc/lutok/nav_f.png
+share/doc/lutok/nav_fd.png
share/doc/lutok/nav_g.png
share/doc/lutok/nav_h.png
+share/doc/lutok/nav_hd.png
share/doc/lutok/open.png
share/doc/lutok/search/
-share/doc/lutok/search/all_5f.html
-share/doc/lutok/search/all_5f.js
-share/doc/lutok/search/all_61.html
-share/doc/lutok/search/all_61.js
-share/doc/lutok/search/all_63.html
-share/doc/lutok/search/all_63.js
-share/doc/lutok/search/all_64.html
-share/doc/lutok/search/all_64.js
-share/doc/lutok/search/all_65.html
-share/doc/lutok/search/all_65.js
-share/doc/lutok/search/all_66.html
-share/doc/lutok/search/all_66.js
-share/doc/lutok/search/all_67.html
-share/doc/lutok/search/all_67.js
-share/doc/lutok/search/all_68.html
-share/doc/lutok/search/all_68.js
-share/doc/lutok/search/all_69.html
-share/doc/lutok/search/all_69.js
-share/doc/lutok/search/all_6c.html
-share/doc/lutok/search/all_6c.js
-share/doc/lutok/search/all_6e.html
-share/doc/lutok/search/all_6e.js
-share/doc/lutok/search/all_6f.html
-share/doc/lutok/search/all_6f.js
-share/doc/lutok/search/all_70.html
-share/doc/lutok/search/all_70.js
-share/doc/lutok/search/all_72.html
-share/doc/lutok/search/all_72.js
-share/doc/lutok/search/all_73.html
-share/doc/lutok/search/all_73.js
-share/doc/lutok/search/all_74.html
-share/doc/lutok/search/all_74.js
-share/doc/lutok/search/all_75.html
-share/doc/lutok/search/all_75.js
-share/doc/lutok/search/all_77.html
-share/doc/lutok/search/all_77.js
-share/doc/lutok/search/all_7e.html
-share/doc/lutok/search/all_7e.js
-share/doc/lutok/search/classes_61.html
-share/doc/lutok/search/classes_61.js
-share/doc/lutok/search/classes_64.html
-share/doc/lutok/search/classes_64.js
-share/doc/lutok/search/classes_65.html
-share/doc/lutok/search/classes_65.js
-share/doc/lutok/search/classes_66.html
-share/doc/lutok/search/classes_66.js
-share/doc/lutok/search/classes_69.html
-share/doc/lutok/search/classes_69.js
-share/doc/lutok/search/classes_73.html
-share/doc/lutok/search/classes_73.js
-share/doc/lutok/search/close.png
-share/doc/lutok/search/defines_72.html
-share/doc/lutok/search/defines_72.js
-share/doc/lutok/search/files_63.html
-share/doc/lutok/search/files_63.js
-share/doc/lutok/search/files_64.html
-share/doc/lutok/search/files_64.js
-share/doc/lutok/search/files_65.html
-share/doc/lutok/search/files_65.js
-share/doc/lutok/search/files_6f.html
-share/doc/lutok/search/files_6f.js
-share/doc/lutok/search/files_73.html
-share/doc/lutok/search/files_73.js
-share/doc/lutok/search/files_74.html
-share/doc/lutok/search/files_74.js
-share/doc/lutok/search/functions_61.html
-share/doc/lutok/search/functions_61.js
-share/doc/lutok/search/functions_63.html
-share/doc/lutok/search/functions_63.js
-share/doc/lutok/search/functions_64.html
-share/doc/lutok/search/functions_64.js
-share/doc/lutok/search/functions_65.html
-share/doc/lutok/search/functions_65.js
-share/doc/lutok/search/functions_66.html
-share/doc/lutok/search/functions_66.js
-share/doc/lutok/search/functions_67.html
-share/doc/lutok/search/functions_67.js
-share/doc/lutok/search/functions_68.html
-share/doc/lutok/search/functions_68.js
-share/doc/lutok/search/functions_69.html
-share/doc/lutok/search/functions_69.js
-share/doc/lutok/search/functions_6c.html
-share/doc/lutok/search/functions_6c.js
-share/doc/lutok/search/functions_6e.html
-share/doc/lutok/search/functions_6e.js
-share/doc/lutok/search/functions_6f.html
-share/doc/lutok/search/functions_6f.js
-share/doc/lutok/search/functions_70.html
-share/doc/lutok/search/functions_70.js
-share/doc/lutok/search/functions_72.html
-share/doc/lutok/search/functions_72.js
-share/doc/lutok/search/functions_73.html
-share/doc/lutok/search/functions_73.js
-share/doc/lutok/search/functions_74.html
-share/doc/lutok/search/functions_74.js
-share/doc/lutok/search/functions_75.html
-share/doc/lutok/search/functions_75.js
-share/doc/lutok/search/functions_77.html
-share/doc/lutok/search/functions_77.js
-share/doc/lutok/search/functions_7e.html
-share/doc/lutok/search/functions_7e.js
-share/doc/lutok/search/mag_sel.png
-share/doc/lutok/search/namespaces_61.html
-share/doc/lutok/search/namespaces_61.js
-share/doc/lutok/search/nomatches.html
+share/doc/lutok/search/all_0.js
+share/doc/lutok/search/all_1.js
+share/doc/lutok/search/all_10.js
+share/doc/lutok/search/all_11.js
+share/doc/lutok/search/all_12.js
+share/doc/lutok/search/all_2.js
+share/doc/lutok/search/all_3.js
+share/doc/lutok/search/all_4.js
+share/doc/lutok/search/all_5.js
+share/doc/lutok/search/all_6.js
+share/doc/lutok/search/all_7.js
+share/doc/lutok/search/all_8.js
+share/doc/lutok/search/all_9.js
+share/doc/lutok/search/all_a.js
+share/doc/lutok/search/all_b.js
+share/doc/lutok/search/all_c.js
+share/doc/lutok/search/all_d.js
+share/doc/lutok/search/all_e.js
+share/doc/lutok/search/all_f.js
+share/doc/lutok/search/classes_0.js
+share/doc/lutok/search/classes_1.js
+share/doc/lutok/search/classes_2.js
+share/doc/lutok/search/classes_3.js
+share/doc/lutok/search/classes_4.js
+share/doc/lutok/search/classes_5.js
+share/doc/lutok/search/close.svg
+share/doc/lutok/search/defines_0.js
+share/doc/lutok/search/files_0.js
+share/doc/lutok/search/files_1.js
+share/doc/lutok/search/files_2.js
+share/doc/lutok/search/files_3.js
+share/doc/lutok/search/files_4.js
+share/doc/lutok/search/files_5.js
+share/doc/lutok/search/functions_0.js
+share/doc/lutok/search/functions_1.js
+share/doc/lutok/search/functions_10.js
+share/doc/lutok/search/functions_11.js
+share/doc/lutok/search/functions_2.js
+share/doc/lutok/search/functions_3.js
+share/doc/lutok/search/functions_4.js
+share/doc/lutok/search/functions_5.js
+share/doc/lutok/search/functions_6.js
+share/doc/lutok/search/functions_7.js
+share/doc/lutok/search/functions_8.js
+share/doc/lutok/search/functions_9.js
+share/doc/lutok/search/functions_a.js
+share/doc/lutok/search/functions_b.js
+share/doc/lutok/search/functions_c.js
+share/doc/lutok/search/functions_d.js
+share/doc/lutok/search/functions_e.js
+share/doc/lutok/search/functions_f.js
+share/doc/lutok/search/mag.svg
+share/doc/lutok/search/mag_d.svg
+share/doc/lutok/search/mag_sel.svg
+share/doc/lutok/search/mag_seld.svg
+share/doc/lutok/search/namespaces_0.js
share/doc/lutok/search/search.css
share/doc/lutok/search/search.js
-share/doc/lutok/search/search_l.png
-share/doc/lutok/search/search_m.png
-share/doc/lutok/search/search_r.png
-share/doc/lutok/search/variables_5f.html
-share/doc/lutok/search/variables_5f.js
-share/doc/lutok/search/variables_6c.html
-share/doc/lutok/search/variables_6c.js
-share/doc/lutok/search/variables_6f.html
-share/doc/lutok/search/variables_6f.js
-share/doc/lutok/search/variables_73.html
-share/doc/lutok/search/variables_73.js
+share/doc/lutok/search/searchdata.js
+share/doc/lutok/search/typedefs_0.js
+share/doc/lutok/search/variables_0.js
+share/doc/lutok/search/variables_1.js
+share/doc/lutok/search/variables_2.js
+share/doc/lutok/search/variables_3.js
+share/doc/lutok/search/variables_4.js
+share/doc/lutok/splitbar.png
+share/doc/lutok/splitbard.png
+share/doc/lutok/sync_off.png
+share/doc/lutok/sync_on.png
share/doc/lutok/tab_a.png
+share/doc/lutok/tab_ad.png
share/doc/lutok/tab_b.png
+share/doc/lutok/tab_bd.png
share/doc/lutok/tab_h.png
+share/doc/lutok/tab_hd.png
share/doc/lutok/tab_s.png
+share/doc/lutok/tab_sd.png
share/doc/lutok/tabs.css
-tests/
-tests/lutok/
-tests/lutok/Kyuafile
-@bin tests/lutok/c_gate_test
-@bin tests/lutok/debug_test
-tests/lutok/examples_test
-@bin tests/lutok/exceptions_test
-@bin tests/lutok/operations_test
-@bin tests/lutok/stack_cleaner_test
-@bin tests/lutok/state_test
Index: devel/atf/Makefile
===================================================================
RCS file: /cvs/ports/devel/atf/Makefile,v
diff -u -p -r1.12 Makefile
--- devel/atf/Makefile 15 Nov 2023 13:57:57 -0000 1.12
+++ devel/atf/Makefile 26 Sep 2026 10:17:06 -0000
@@ -1,33 +1,33 @@
COMMENT = Automated Testing Framework
-DISTNAME = atf-0.18
-REVISION = 3
+DISTNAME = atf-0.26
-SHARED_LIBS += atf-c++ 0.0 # 0.0
-SHARED_LIBS += atf-c 0.0 # 0.0
+SHARED_LIBS += atf-c++ 1.0 # 0.0
+SHARED_LIBS += atf-c 1.0 # 0.0
CATEGORIES = devel
-HOMEPAGE = https://github.com/jmmv/atf
+HOMEPAGE = https://github.com/freebsd/atf
MAINTAINER = Sergey Bronnikov <[email protected]>
# BSD
PERMIT_PACKAGE = Yes
-WANTLIB += c m ${COMPILER_LIBCXX}
+WANTLIB += c m ${COMPILER_LIBCXX}
-SITES =
https://github.com/jmmv/atf/releases/download/${DISTNAME}/
+SITES =
https://github.com/freebsd/atf/releases/download/${DISTNAME}/
-COMPILER = base-clang ports-gcc base-gcc
+COMPILER = base-clang ports-gcc
-CXXFLAGS_base-clang = -std=gnu++11
+BUILD_DEPENDS = devel/kyua
+
+TEST_DEPENDS = ${FULLPKGNAME}:${BUILD_PKGPATH} \
+ devel/kyua
+
+TEST_TARGET = installcheck
CONFIGURE_STYLE = gnu
# Don't pickup bash
CONFIGURE_ENV = ATF_SHELL=/bin/sh
-
-TEST_DEPENDS = ${BASE_PKGPATH} \
- devel/kyua-cli
-TEST_TARGET = installcheck
PORTHOME = ${WRKDIR}
Index: devel/atf/distinfo
===================================================================
RCS file: /cvs/ports/devel/atf/distinfo,v
diff -u -p -r1.1.1.1 distinfo
--- devel/atf/distinfo 16 Mar 2014 11:27:28 -0000 1.1.1.1
+++ devel/atf/distinfo 26 Sep 2026 10:17:06 -0000
@@ -1,2 +1,2 @@
-SHA256 (atf-0.18.tar.gz) = OIp3mV/FsuTocow4YjSBkK5R2rjfo2Y2gL8ZeMt/8Xs=
-SIZE (atf-0.18.tar.gz) = 659698
+SHA256 (atf-0.26.tar.gz) = uucJML71ZfqsuVsQ5Wc2Ad8NfyXbcgzHNQYNEVyS7nM=
+SIZE (atf-0.26.tar.gz) = 634227
Index: devel/atf/patches/patch-configure
===================================================================
RCS file: /cvs/ports/devel/atf/patches/patch-configure,v
diff -u -p -r1.2 patch-configure
--- devel/atf/patches/patch-configure 11 Mar 2022 18:49:36 -0000 1.2
+++ devel/atf/patches/patch-configure 26 Sep 2026 10:17:06 -0000
@@ -1,7 +1,8 @@
Don't clutter build logs.
---- configure.orig Sat Nov 16 21:03:37 2013
-+++ configure Fri Jan 24 15:53:12 2014
-@@ -16178,7 +16178,6 @@ fi
+Index: configure
+--- configure.orig
++++ configure
+@@ -21035,7 +21035,6 @@ fi
-Wcast-qual \
-Wextra \
-Wpointer-arith \
@@ -9,3 +10,12 @@ Don't clutter build logs.
-Wreturn-type \
-Wshadow \
-Wsign-compare \
+@@ -22139,7 +22138,7 @@ fi
+ if test -z "${ATF_TARGET_OS}"; then
+ { printf '%s\n' "$as_me:${as_lineno-$LINENO}: Checking target OS" >&5
+ printf '%s\n' "$as_me: Checking target OS" >&6;}
+- ATF_TARGET_OS="$(uname -o)"
++ ATF_TARGET_OS="$(uname -s)"
+ fi
+
+ if test "${ATF_TARGET_OS}" = "FreeBSD"; then
Index: devel/atf/pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/atf/pkg/PLIST,v
diff -u -p -r1.3 PLIST
--- devel/atf/pkg/PLIST 11 Mar 2022 18:49:36 -0000 1.3
+++ devel/atf/pkg/PLIST 26 Sep 2026 10:17:06 -0000
@@ -4,15 +4,12 @@ include/atf-c++/
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++/noncopyable.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
@@ -20,10 +17,10 @@ include/atf-c/macros.h
include/atf-c/tc.h
include/atf-c/tp.h
include/atf-c/utils.h
-lib/libatf-c++.a
+@static-lib lib/libatf-c++.a
lib/libatf-c++.la
@lib lib/libatf-c++.so.${LIBatf-c++_VERSION}
-lib/libatf-c.a
+@static-lib lib/libatf-c.a
lib/libatf-c.la
@lib lib/libatf-c.so.${LIBatf-c_VERSION}
lib/pkgconfig/atf-c++.pc
@@ -33,10 +30,11 @@ lib/pkgconfig/atf-sh.pc
@man man/man1/atf-check.1
@man man/man1/atf-sh.1
@man man/man1/atf-test-program.1
-@man man/man3/atf-c++-api.3
-@man man/man3/atf-c-api.3
-@man man/man3/atf-sh-api.3
-@man man/man4/atf-test-case.4
+@man man/man3/atf-c++.3
+@man man/man3/atf-c.3
+@man man/man3/atf-sh.3
+@man man/man7/atf-test-case.7
+@man man/man7/atf.7
share/aclocal/
share/aclocal/atf-c++.m4
share/aclocal/atf-c.m4
@@ -48,46 +46,36 @@ share/doc/atf/
share/doc/atf/AUTHORS
share/doc/atf/COPYING
share/doc/atf/NEWS
-share/doc/atf/README
+share/doc/atf/README.md
tests/
tests/atf/
tests/atf/Kyuafile
tests/atf/atf-c/
tests/atf/atf-c++/
-tests/atf/atf-c++/Atffile
tests/atf/atf-c++/Kyuafile
@bin tests/atf/atf-c++/atf_c++_test
@bin tests/atf/atf-c++/build_test
@bin tests/atf/atf-c++/check_test
-@bin tests/atf/atf-c++/config_test
tests/atf/atf-c++/detail/
-tests/atf/atf-c++/detail/Atffile
tests/atf/atf-c++/detail/Kyuafile
@bin tests/atf/atf-c++/detail/application_test
-@bin tests/atf/atf-c++/detail/auto_array_test
@bin tests/atf/atf-c++/detail/env_test
@bin tests/atf/atf-c++/detail/exceptions_test
-@bin tests/atf/atf-c++/detail/expand_test
@bin tests/atf/atf-c++/detail/fs_test
-@bin tests/atf/atf-c++/detail/parser_test
@bin tests/atf/atf-c++/detail/process_test
-@bin tests/atf/atf-c++/detail/sanity_test
@bin tests/atf/atf-c++/detail/text_test
-@bin tests/atf/atf-c++/detail/ui_test
+@bin tests/atf/atf-c++/detail/version_helper
tests/atf/atf-c++/macros_hpp_test.cpp
@bin tests/atf/atf-c++/macros_test
tests/atf/atf-c++/pkg_config_test
@bin tests/atf/atf-c++/tests_test
tests/atf/atf-c++/unused_test.cpp
@bin tests/atf/atf-c++/utils_test
-tests/atf/atf-c/Atffile
tests/atf/atf-c/Kyuafile
@bin tests/atf/atf-c/atf_c_test
@bin tests/atf/atf-c/build_test
@bin tests/atf/atf-c/check_test
-@bin tests/atf/atf-c/config_test
tests/atf/atf-c/detail/
-tests/atf/atf-c/detail/Atffile
tests/atf/atf-c/detail/Kyuafile
@bin tests/atf/atf-c/detail/dynstr_test
@bin tests/atf/atf-c/detail/env_test
@@ -99,6 +87,7 @@ tests/atf/atf-c/detail/Kyuafile
@bin tests/atf/atf-c/detail/sanity_test
@bin tests/atf/atf-c/detail/text_test
@bin tests/atf/atf-c/detail/user_test
+@bin tests/atf/atf-c/detail/version_helper
@bin tests/atf/atf-c/error_test
tests/atf/atf-c/macros_h_test.c
@bin tests/atf/atf-c/macros_test
@@ -108,7 +97,6 @@ tests/atf/atf-c/pkg_config_test
tests/atf/atf-c/unused_test.c
@bin tests/atf/atf-c/utils_test
tests/atf/atf-sh/
-tests/atf/atf-sh/Atffile
tests/atf/atf-sh/Kyuafile
tests/atf/atf-sh/atf-check_test
tests/atf/atf-sh/atf_check_test
@@ -119,7 +107,6 @@ tests/atf/atf-sh/normalize_test
tests/atf/atf-sh/tc_test
tests/atf/atf-sh/tp_test
tests/atf/test-programs/
-tests/atf/test-programs/Atffile
tests/atf/test-programs/Kyuafile
@bin tests/atf/test-programs/c_helpers
tests/atf/test-programs/config_test
Index: mail/mlmmj/Makefile
===================================================================
RCS file: /cvs/ports/mail/mlmmj/Makefile,v
diff -u -p -r1.30 Makefile
--- mail/mlmmj/Makefile 25 Sep 2026 18:41:15 -0000 1.30
+++ mail/mlmmj/Makefile 26 Sep 2026 10:17:06 -0000
@@ -1,6 +1,7 @@
COMMENT= mailing list manager
V= 2.2.0
+REVISION= 0
DISTNAME= mlmmj-${V}
@@ -18,13 +19,11 @@ WANTLIB += c iconv
SITES=
https://codeberg.org/mlmmj/mlmmj/releases/download/RELEASE_${V:S/./_/g}/
-BUILD_DEPENDS= devel/kyua-cli \
+BUILD_DEPENDS= devel/kyua \
devel/atf
LIB_DEPENDS= converters/libiconv
-# XXX some test failures due to old kyua; update pending
-# 293/304 passed (11 failed)
TEST_DEPENDS= ${BUILD_DEPENDS}
CONFIGURE_STYLE=gnu
kyua-0.14.1.tar.gz
Description: application/tar-gz
