diff --git a/devel/hare/Makefile b/devel/hare/Makefile
index 91a481c327b7a..e8bc3f2407e98 100644
--- a/devel/hare/Makefile
+++ b/devel/hare/Makefile
@@ -1,9 +1,9 @@
 PORTNAME=	hare
-PORTVERSION=	g20230205
+PORTVERSION=	g20230719
 CATEGORIES=	devel
 MASTER_SITES=	https://git.sr.ht/~sircmpwn/${PORTNAME}/archive/
 PKGNAMESUFFIX=	-lang
-DISTNAME=	274b8b72
+DISTNAME=	0919412b
 DIST_SUBDIR=	hare
 
 MAINTAINER=	se@FreeBSD.org
@@ -21,7 +21,7 @@ BUILD_DEPENDS=	harec:lang/harec \
 		scdoc:textproc/scdoc
 RUN_DEPENDS=	harec:lang/harec
 
-MAKE_ARGS=	ARCH=${ARCH:S/^amd64$/x86_64/}
+MAKE_ARGS=	ARCH=${ARCH:S/^amd64$/x86_64/} PREFIX=${PREFIX}
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTNAME}
 
@@ -34,7 +34,7 @@ BROKEN=		pre-FreeBSD-13 assembler is not compatible with generated files
 .endif
 
 do-build:
-		${CP} ${FILESDIR}/config.mk ${WRKSRC}
+		${CP} ${WRKSRC}/config.example.mk ${WRKSRC}/config.mk
 		cd ${WRKSRC} && ${MAKE} ${MAKE_ARGS}
 
 post-stage:
diff --git a/devel/hare/distinfo b/devel/hare/distinfo
index d13000b6ffe70..8b83a64fbdaf9 100644
--- a/devel/hare/distinfo
+++ b/devel/hare/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1675628590
-SHA256 (hare/274b8b72.tar.gz) = 8fa5c8dd3d919b699b818481bc836ca5971446e561039ae8d5031698575460da
-SIZE (hare/274b8b72.tar.gz) = 718566
+TIMESTAMP = 1689760640
+SHA256 (hare/0919412b.tar.gz) = 66e005b9fd3073d7eed2b5143425f5988649215ff6947f2218b99614f5429e91
+SIZE (hare/0919412b.tar.gz) = 725891
diff --git a/devel/hare/files/config.mk b/devel/hare/files/config.mk
deleted file mode 100644
index ad1c697900721..0000000000000
--- a/devel/hare/files/config.mk
+++ /dev/null
@@ -1,49 +0,0 @@
-## Install configuration
-
-#PREFIX = /usr
-BINDIR = $(PREFIX)/bin
-MANDIR = $(PREFIX)/man
-DATADIR= $(PREFIX)/share/hare
-SRCDIR = $(DATADIR)/src
-
-# Where to install the stdlib tree
-STDLIB = $(SRCDIR)/hare/stdlib
-
-# Default HAREPATH
-LOCALSRCDIR = ${SRCDIR}/local-src
-HAREPATH = $(LOCALSRCDIR)/stdlib:$(LOCALSRCDIR)/third-party:$(DATADIR)/stdlib:$(DATADIR)/third-party
-
-## Build configuration
-
-# Platform to build for
-PLATFORM = freebsd
-#ARCH = x86_64
-
-# External tools and flags
-HAREC = harec
-HAREFLAGS =
-QBE = qbe
-AS = as
-LD = ld
-AR = ar
-SCDOC = scdoc
-
-# Where to store build artifacts
-HARECACHE = .cache
-BINOUT = .bin
-
-# Cross-compiler toolchains
-AARCH64_AS=aarch64-as
-AARCH64_AR=aarch64-ar
-AARCH64_CC=aarch64-cc
-AARCH64_LD=aarch64-ld
-
-RISCV64_AS=riscv64-as
-RISCV64_AR=riscv64-ar
-RISCV64_CC=riscv64-cc
-RISCV64_LD=riscv64-ld
-
-X86_64_AS=as
-X86_64_AR=ar
-X86_64_CC=cc
-X86_64_LD=ld
diff --git a/devel/hare/files/patch-config.example.mk b/devel/hare/files/patch-config.example.mk
new file mode 100644
index 0000000000000..acc39783a5d77
--- /dev/null
+++ b/devel/hare/files/patch-config.example.mk
@@ -0,0 +1,33 @@
+--- config.example.mk.orig	2023-07-19 01:21:32.000000000 +0200
++++ config.example.mk	2023-07-19 13:07:52.729248178 +0200
+@@ -1,21 +1,23 @@
+ ## Install configuration
+ 
+-PREFIX = /usr/local
+-BINDIR = $(PREFIX)/bin
+-MANDIR = $(PREFIX)/share/man
+-SRCDIR = $(PREFIX)/src
++#PREFIX =	%%LOCALBASE%%
++BINDIR = 	$(PREFIX)/bin
++MANDIR =	$(PREFIX)/man
++DATADIR =	$(PREFIX)/share/hare
++SRCDIR =	$(DATADIR)/src
+ 
+ # Where to install the stdlib tree
+ STDLIB = $(SRCDIR)/hare/stdlib
+ 
+ # Default HAREPATH
+-HAREPATH = $(SRCDIR)/hare/stdlib:$(SRCDIR)/hare/third-party
++LOCALSRCDIR = ${SRCDIR}/local-src
++HAREPATH = $(LOCALSRCDIR)/stdlib:$(LOCALSRCDIR)/third-party:$(DATADIR)/stdlib:$(DATADIR)/third-party
+ 
+ ## Build configuration
+ 
+ # Platform to build for
+-PLATFORM = linux
+-ARCH = x86_64
++PLATFORM = freebsd
++#ARCH = x86_64
+ 
+ # External tools and flags
+ HAREC = harec
diff --git a/devel/hare/pkg-plist b/devel/hare/pkg-plist
index bd31eade1e3b6..8f7edc8f82e27 100644
--- a/devel/hare/pkg-plist
+++ b/devel/hare/pkg-plist
@@ -3,11 +3,12 @@ bin/haredoc
 man/man1/hare.1.gz
 man/man1/haredoc.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/README.md
+%%PORTDOCS%%%%DOCSDIR%%/maintainers.md
 %%PORTDOCS%%%%DOCSDIR%%/modules.md
 %%PORTDOCS%%%%DOCSDIR%%/stdlib.md
 %%DATADIR%%/stdlib/ascii/README
 %%DATADIR%%/stdlib/ascii/ctype.ha
-%%DATADIR%%/stdlib/ascii/strcmp.ha
+%%DATADIR%%/stdlib/ascii/string.ha
 %%DATADIR%%/stdlib/ascii/valid.ha
 %%DATADIR%%/stdlib/bufio/README
 %%DATADIR%%/stdlib/bufio/buffered.ha
@@ -22,10 +23,10 @@ man/man1/haredoc.1.gz
 %%DATADIR%%/stdlib/bytes/trim.ha
 %%DATADIR%%/stdlib/bytes/two_way.ha
 %%DATADIR%%/stdlib/bytes/zero.ha
-%%DATADIR%%/stdlib/crypto/+test/authenc.ha
+%%DATADIR%%/stdlib/crypto/+test/authenc_test.ha
 %%DATADIR%%/stdlib/crypto/README
 %%DATADIR%%/stdlib/crypto/aes/+test/gcm.ha
-%%DATADIR%%/stdlib/crypto/aes/+test/ni+x86_64.ha
+%%DATADIR%%/stdlib/crypto/aes/+test/ni_test+x86_64.ha
 %%DATADIR%%/stdlib/crypto/aes/+x86_64/ni.ha
 %%DATADIR%%/stdlib/crypto/aes/+x86_64/ni_native.s
 %%DATADIR%%/stdlib/crypto/aes/README
@@ -48,9 +49,9 @@ man/man1/haredoc.1.gz
 %%DATADIR%%/stdlib/crypto/bcrypt/README
 %%DATADIR%%/stdlib/crypto/bcrypt/base64.ha
 %%DATADIR%%/stdlib/crypto/bcrypt/bcrypt.ha
-%%DATADIR%%/stdlib/crypto/bigint/+test/arithm.ha
-%%DATADIR%%/stdlib/crypto/bigint/+test/encoding.ha
-%%DATADIR%%/stdlib/crypto/bigint/+test/monty.ha
+%%DATADIR%%/stdlib/crypto/bigint/+test/arithm_test.ha
+%%DATADIR%%/stdlib/crypto/bigint/+test/encoding_test.ha
+%%DATADIR%%/stdlib/crypto/bigint/+test/monty_test.ha
 %%DATADIR%%/stdlib/crypto/bigint/+test/utils.ha
 %%DATADIR%%/stdlib/crypto/bigint/README
 %%DATADIR%%/stdlib/crypto/bigint/arithm.ha
@@ -69,6 +70,9 @@ man/man1/haredoc.1.gz
 %%DATADIR%%/stdlib/crypto/chacha/+test.ha
 %%DATADIR%%/stdlib/crypto/chacha/README
 %%DATADIR%%/stdlib/crypto/chacha/chacha20.ha
+%%DATADIR%%/stdlib/crypto/chachapoly/README
+%%DATADIR%%/stdlib/crypto/chachapoly/chachapoly.ha
+%%DATADIR%%/stdlib/crypto/chachapoly/encryption+test.ha
 %%DATADIR%%/stdlib/crypto/cipher/README
 %%DATADIR%%/stdlib/crypto/cipher/block.ha
 %%DATADIR%%/stdlib/crypto/cipher/cbc.ha
@@ -109,9 +113,9 @@ man/man1/haredoc.1.gz
 %%DATADIR%%/stdlib/crypto/random/+linux.ha
 %%DATADIR%%/stdlib/crypto/random/README
 %%DATADIR%%/stdlib/crypto/random/random.ha
-%%DATADIR%%/stdlib/crypto/rsa/+test/core.ha
-%%DATADIR%%/stdlib/crypto/rsa/+test/keys.ha
-%%DATADIR%%/stdlib/crypto/rsa/+test/pkcs1.ha
+%%DATADIR%%/stdlib/crypto/rsa/+test/core_test.ha
+%%DATADIR%%/stdlib/crypto/rsa/+test/keys_test.ha
+%%DATADIR%%/stdlib/crypto/rsa/+test/pkcs1_test.ha
 %%DATADIR%%/stdlib/crypto/rsa/README
 %%DATADIR%%/stdlib/crypto/rsa/core.ha
 %%DATADIR%%/stdlib/crypto/rsa/errors.ha
@@ -130,15 +134,6 @@ man/man1/haredoc.1.gz
 %%DATADIR%%/stdlib/crypto/x25519/+test.ha
 %%DATADIR%%/stdlib/crypto/x25519/README
 %%DATADIR%%/stdlib/crypto/x25519/x25519.ha
-%%DATADIR%%/stdlib/datetime/README
-%%DATADIR%%/stdlib/datetime/arithmetic.ha
-%%DATADIR%%/stdlib/datetime/chronology.ha
-%%DATADIR%%/stdlib/datetime/date.ha
-%%DATADIR%%/stdlib/datetime/datetime.ha
-%%DATADIR%%/stdlib/datetime/format.ha
-%%DATADIR%%/stdlib/datetime/parse.ha
-%%DATADIR%%/stdlib/datetime/time.ha
-%%DATADIR%%/stdlib/datetime/timezone.ha
 %%DATADIR%%/stdlib/dirs/README
 %%DATADIR%%/stdlib/dirs/xdg.ha
 %%DATADIR%%/stdlib/encoding/README
@@ -153,6 +148,7 @@ man/man1/haredoc.1.gz
 %%DATADIR%%/stdlib/encoding/pem/pem.ha
 %%DATADIR%%/stdlib/encoding/utf8/README
 %%DATADIR%%/stdlib/encoding/utf8/decode.ha
+%%DATADIR%%/stdlib/encoding/utf8/decodetable.ha
 %%DATADIR%%/stdlib/encoding/utf8/encode.ha
 %%DATADIR%%/stdlib/encoding/utf8/rune.ha
 %%DATADIR%%/stdlib/endian/README
@@ -174,12 +170,12 @@ man/man1/haredoc.1.gz
 %%DATADIR%%/stdlib/fnmatch/README
 %%DATADIR%%/stdlib/fnmatch/fnmatch.ha
 %%DATADIR%%/stdlib/format/README
-%%DATADIR%%/stdlib/format/elf/+aarch64.ha
-%%DATADIR%%/stdlib/format/elf/+freebsd.ha
-%%DATADIR%%/stdlib/format/elf/+linux.ha
-%%DATADIR%%/stdlib/format/elf/+riscv64.ha
-%%DATADIR%%/stdlib/format/elf/+x86_64.ha
 %%DATADIR%%/stdlib/format/elf/README
+%%DATADIR%%/stdlib/format/elf/arch+aarch64.ha
+%%DATADIR%%/stdlib/format/elf/arch+riscv64.ha
+%%DATADIR%%/stdlib/format/elf/arch+x86_64.ha
+%%DATADIR%%/stdlib/format/elf/platform+freebsd.ha
+%%DATADIR%%/stdlib/format/elf/platform+linux.ha
 %%DATADIR%%/stdlib/format/elf/types.ha
 %%DATADIR%%/stdlib/format/ini/+test.ha
 %%DATADIR%%/stdlib/format/ini/README
@@ -198,6 +194,7 @@ man/man1/haredoc.1.gz
 %%DATADIR%%/stdlib/glob/README
 %%DATADIR%%/stdlib/glob/glob.ha
 %%DATADIR%%/stdlib/hare/README
+%%DATADIR%%/stdlib/hare/ast/README
 %%DATADIR%%/stdlib/hare/ast/decl.ha
 %%DATADIR%%/stdlib/hare/ast/expr.ha
 %%DATADIR%%/stdlib/hare/ast/ident.ha
@@ -214,12 +211,12 @@ man/man1/haredoc.1.gz
 %%DATADIR%%/stdlib/hare/module/scan.ha
 %%DATADIR%%/stdlib/hare/module/types.ha
 %%DATADIR%%/stdlib/hare/module/walk.ha
-%%DATADIR%%/stdlib/hare/parse/+test/expr.ha
-%%DATADIR%%/stdlib/hare/parse/+test/ident.ha
+%%DATADIR%%/stdlib/hare/parse/+test/expr_test.ha
+%%DATADIR%%/stdlib/hare/parse/+test/ident_test.ha
 %%DATADIR%%/stdlib/hare/parse/+test/loc.ha
 %%DATADIR%%/stdlib/hare/parse/+test/roundtrip.ha
 %%DATADIR%%/stdlib/hare/parse/+test/types.ha
-%%DATADIR%%/stdlib/hare/parse/+test/unit.ha
+%%DATADIR%%/stdlib/hare/parse/+test/unit_test.ha
 %%DATADIR%%/stdlib/hare/parse/README
 %%DATADIR%%/stdlib/hare/parse/decl.ha
 %%DATADIR%%/stdlib/hare/parse/expr.ha
@@ -228,7 +225,10 @@ man/man1/haredoc.1.gz
 %%DATADIR%%/stdlib/hare/parse/parse.ha
 %%DATADIR%%/stdlib/hare/parse/type.ha
 %%DATADIR%%/stdlib/hare/parse/unit.ha
+%%DATADIR%%/stdlib/hare/types/+aarch64/writesize.ha
+%%DATADIR%%/stdlib/hare/types/+riscv64/writesize.ha
 %%DATADIR%%/stdlib/hare/types/+test.ha
+%%DATADIR%%/stdlib/hare/types/+x86_64/writesize.ha
 %%DATADIR%%/stdlib/hare/types/README
 %%DATADIR%%/stdlib/hare/types/arch.ha
 %%DATADIR%%/stdlib/hare/types/builtins.ha
@@ -246,6 +246,7 @@ man/man1/haredoc.1.gz
 %%DATADIR%%/stdlib/hare/unit/scan.ha
 %%DATADIR%%/stdlib/hare/unit/scope.ha
 %%DATADIR%%/stdlib/hare/unit/unit.ha
+%%DATADIR%%/stdlib/hare/unparse/README
 %%DATADIR%%/stdlib/hare/unparse/decl.ha
 %%DATADIR%%/stdlib/hare/unparse/expr.ha
 %%DATADIR%%/stdlib/hare/unparse/ident.ha
@@ -271,14 +272,14 @@ man/man1/haredoc.1.gz
 %%DATADIR%%/stdlib/hash/siphash/+test.ha
 %%DATADIR%%/stdlib/hash/siphash/README
 %%DATADIR%%/stdlib/hash/siphash/siphash.ha
-%%DATADIR%%/stdlib/io/+freebsd/file.ha
 %%DATADIR%%/stdlib/io/+freebsd/mmap.ha
+%%DATADIR%%/stdlib/io/+freebsd/platform_file.ha
 %%DATADIR%%/stdlib/io/+freebsd/vector.ha
-%%DATADIR%%/stdlib/io/+linux/file.ha
 %%DATADIR%%/stdlib/io/+linux/mmap.ha
+%%DATADIR%%/stdlib/io/+linux/platform_file.ha
 %%DATADIR%%/stdlib/io/+linux/vector.ha
-%%DATADIR%%/stdlib/io/+test/limit.ha
-%%DATADIR%%/stdlib/io/+test/stream.ha
+%%DATADIR%%/stdlib/io/+test/limit_test.ha
+%%DATADIR%%/stdlib/io/+test/stream_test.ha
 %%DATADIR%%/stdlib/io/README
 %%DATADIR%%/stdlib/io/arch+aarch64.ha
 %%DATADIR%%/stdlib/io/arch+riscv64.ha
@@ -286,6 +287,7 @@ man/man1/haredoc.1.gz
 %%DATADIR%%/stdlib/io/copy.ha
 %%DATADIR%%/stdlib/io/drain.ha
 %%DATADIR%%/stdlib/io/empty.ha
+%%DATADIR%%/stdlib/io/file.ha
 %%DATADIR%%/stdlib/io/handle.ha
 %%DATADIR%%/stdlib/io/limit.ha
 %%DATADIR%%/stdlib/io/stream.ha
@@ -308,10 +310,14 @@ man/man1/haredoc.1.gz
 %%DATADIR%%/stdlib/log/global.ha
 %%DATADIR%%/stdlib/log/logger.ha
 %%DATADIR%%/stdlib/log/silent.ha
+%%DATADIR%%/stdlib/math/+test/data.ha
+%%DATADIR%%/stdlib/math/+test/floats_test.ha
+%%DATADIR%%/stdlib/math/+test/math_test.ha
+%%DATADIR%%/stdlib/math/+test/trig_test.ha
 %%DATADIR%%/stdlib/math/README
 %%DATADIR%%/stdlib/math/complex/+test.ha
+%%DATADIR%%/stdlib/math/complex/README
 %%DATADIR%%/stdlib/math/complex/complex.ha
-%%DATADIR%%/stdlib/math/data+test.ha
 %%DATADIR%%/stdlib/math/fenv+aarch64.ha
 %%DATADIR%%/stdlib/math/fenv+riscv64.ha
 %%DATADIR%%/stdlib/math/fenv+x86_64.ha
@@ -325,6 +331,7 @@ man/man1/haredoc.1.gz
 %%DATADIR%%/stdlib/math/uints.ha
 %%DATADIR%%/stdlib/mime/README
 %%DATADIR%%/stdlib/mime/database.ha
+%%DATADIR%%/stdlib/mime/entries+test.ha
 %%DATADIR%%/stdlib/mime/lookup.ha
 %%DATADIR%%/stdlib/mime/parse.ha
 %%DATADIR%%/stdlib/mime/system.ha
@@ -346,13 +353,14 @@ man/man1/haredoc.1.gz
 %%DATADIR%%/stdlib/net/errors.ha
 %%DATADIR%%/stdlib/net/ip/+freebsd.ha
 %%DATADIR%%/stdlib/net/ip/+linux.ha
-%%DATADIR%%/stdlib/net/ip/+test.ha
 %%DATADIR%%/stdlib/net/ip/ip.ha
+%%DATADIR%%/stdlib/net/ip/test+test.ha
 %%DATADIR%%/stdlib/net/msg.ha
 %%DATADIR%%/stdlib/net/tcp/+freebsd.ha
 %%DATADIR%%/stdlib/net/tcp/+linux.ha
 %%DATADIR%%/stdlib/net/tcp/listener.ha
 %%DATADIR%%/stdlib/net/tcp/options.ha
+%%DATADIR%%/stdlib/net/types.ha
 %%DATADIR%%/stdlib/net/udp/+freebsd.ha
 %%DATADIR%%/stdlib/net/udp/+linux.ha
 %%DATADIR%%/stdlib/net/udp/options.ha
@@ -372,18 +380,24 @@ man/man1/haredoc.1.gz
 %%DATADIR%%/stdlib/net/uri/query.ha
 %%DATADIR%%/stdlib/net/uri/uri.ha
 %%DATADIR%%/stdlib/os/+freebsd/dirfdfs.ha
-%%DATADIR%%/stdlib/os/+freebsd/environ.ha
+%%DATADIR%%/stdlib/os/+freebsd/exit+libc-test.ha
+%%DATADIR%%/stdlib/os/+freebsd/exit+test.ha
 %%DATADIR%%/stdlib/os/+freebsd/exit.ha
 %%DATADIR%%/stdlib/os/+freebsd/fs.ha
+%%DATADIR%%/stdlib/os/+freebsd/platform_environ.ha
+%%DATADIR%%/stdlib/os/+freebsd/status.ha
 %%DATADIR%%/stdlib/os/+freebsd/stdfd.ha
 %%DATADIR%%/stdlib/os/+linux/dirfdfs.ha
-%%DATADIR%%/stdlib/os/+linux/environ+libc.ha
-%%DATADIR%%/stdlib/os/+linux/environ.ha
+%%DATADIR%%/stdlib/os/+linux/exit+libc-test.ha
+%%DATADIR%%/stdlib/os/+linux/exit+test.ha
 %%DATADIR%%/stdlib/os/+linux/exit.ha
 %%DATADIR%%/stdlib/os/+linux/fs.ha
 %%DATADIR%%/stdlib/os/+linux/memory.ha
+%%DATADIR%%/stdlib/os/+linux/platform_environ.ha
+%%DATADIR%%/stdlib/os/+linux/status.ha
 %%DATADIR%%/stdlib/os/+linux/stdfd.ha
 %%DATADIR%%/stdlib/os/README
+%%DATADIR%%/stdlib/os/environ.ha
 %%DATADIR%%/stdlib/os/exec/README
 %%DATADIR%%/stdlib/os/exec/cmd.ha
 %%DATADIR%%/stdlib/os/exec/exec+freebsd.ha
@@ -391,30 +405,35 @@ man/man1/haredoc.1.gz
 %%DATADIR%%/stdlib/os/exec/process+freebsd.ha
 %%DATADIR%%/stdlib/os/exec/process+linux.ha
 %%DATADIR%%/stdlib/os/exec/types.ha
-%%DATADIR%%/stdlib/os/fs.ha
+%%DATADIR%%/stdlib/os/os.ha
 %%DATADIR%%/stdlib/path/+freebsd.ha
 %%DATADIR%%/stdlib/path/+linux.ha
 %%DATADIR%%/stdlib/path/README
 %%DATADIR%%/stdlib/path/buffer.ha
+%%DATADIR%%/stdlib/path/error.ha
+%%DATADIR%%/stdlib/path/ext_stack.ha
 %%DATADIR%%/stdlib/path/iter.ha
-%%DATADIR%%/stdlib/path/join.ha
-%%DATADIR%%/stdlib/path/names.ha
-%%DATADIR%%/stdlib/path/util.ha
+%%DATADIR%%/stdlib/path/posix.ha
+%%DATADIR%%/stdlib/path/prefix.ha
+%%DATADIR%%/stdlib/path/stack.ha
 %%DATADIR%%/stdlib/regex/+test.ha
 %%DATADIR%%/stdlib/regex/README
 %%DATADIR%%/stdlib/regex/regex.ha
+%%DATADIR%%/stdlib/rt/+aarch64/arch_jmp.ha
 %%DATADIR%%/stdlib/rt/+aarch64/backtrace.ha
 %%DATADIR%%/stdlib/rt/+aarch64/cpuid.ha
 %%DATADIR%%/stdlib/rt/+aarch64/cpuid_native.s
 %%DATADIR%%/stdlib/rt/+aarch64/fenv.s
 %%DATADIR%%/stdlib/rt/+aarch64/getfp.s
-%%DATADIR%%/stdlib/rt/+aarch64/jmp.ha
 %%DATADIR%%/stdlib/rt/+aarch64/longjmp.s
 %%DATADIR%%/stdlib/rt/+aarch64/restore.s
 %%DATADIR%%/stdlib/rt/+aarch64/setjmp.s
-%%DATADIR%%/stdlib/rt/+freebsd/abort.ha
+%%DATADIR%%/stdlib/rt/+freebsd/+aarch64.ha
+%%DATADIR%%/stdlib/rt/+freebsd/+riscv64.ha
+%%DATADIR%%/stdlib/rt/+freebsd/+x86_64.ha
 %%DATADIR%%/stdlib/rt/+freebsd/env.ha
 %%DATADIR%%/stdlib/rt/+freebsd/errno.ha
+%%DATADIR%%/stdlib/rt/+freebsd/platform_abort.ha
 %%DATADIR%%/stdlib/rt/+freebsd/platformstart.ha
 %%DATADIR%%/stdlib/rt/+freebsd/segmalloc.ha
 %%DATADIR%%/stdlib/rt/+freebsd/signal.ha
@@ -431,11 +450,10 @@ man/man1/haredoc.1.gz
 %%DATADIR%%/stdlib/rt/+linux/+aarch64.ha
 %%DATADIR%%/stdlib/rt/+linux/+riscv64.ha
 %%DATADIR%%/stdlib/rt/+linux/+x86_64.ha
-%%DATADIR%%/stdlib/rt/+linux/abort.ha
 %%DATADIR%%/stdlib/rt/+linux/env.ha
 %%DATADIR%%/stdlib/rt/+linux/errno.ha
-%%DATADIR%%/stdlib/rt/+linux/platformstart+libc.ha
-%%DATADIR%%/stdlib/rt/+linux/platformstart.ha
+%%DATADIR%%/stdlib/rt/+linux/platform_abort.ha
+%%DATADIR%%/stdlib/rt/+linux/platformstart-libc.ha
 %%DATADIR%%/stdlib/rt/+linux/prctl.ha
 %%DATADIR%%/stdlib/rt/+linux/segmalloc.ha
 %%DATADIR%%/stdlib/rt/+linux/signal.ha
@@ -455,27 +473,22 @@ man/man1/haredoc.1.gz
 %%DATADIR%%/stdlib/rt/+linux/syscallsarch+riscv64.ha
 %%DATADIR%%/stdlib/rt/+linux/syscallsarch+x86_64.ha
 %%DATADIR%%/stdlib/rt/+linux/types.ha
+%%DATADIR%%/stdlib/rt/+riscv64/arch_jmp.ha
 %%DATADIR%%/stdlib/rt/+riscv64/backtrace.ha
 %%DATADIR%%/stdlib/rt/+riscv64/cpuid.ha
 %%DATADIR%%/stdlib/rt/+riscv64/cpuid_native.s
 %%DATADIR%%/stdlib/rt/+riscv64/fenv.s
 %%DATADIR%%/stdlib/rt/+riscv64/getfp.s
-%%DATADIR%%/stdlib/rt/+riscv64/jmp.ha
 %%DATADIR%%/stdlib/rt/+riscv64/longjmp.s
 %%DATADIR%%/stdlib/rt/+riscv64/restore.s
 %%DATADIR%%/stdlib/rt/+riscv64/setjmp.s
-%%DATADIR%%/stdlib/rt/+test/+freebsd.ha
-%%DATADIR%%/stdlib/rt/+test/+linux.ha
-%%DATADIR%%/stdlib/rt/+test/cstring.ha
-%%DATADIR%%/stdlib/rt/+test/run.ha
-%%DATADIR%%/stdlib/rt/+test/signal.ha
-%%DATADIR%%/stdlib/rt/+test/ztos.ha
+%%DATADIR%%/stdlib/rt/+test/signal_test.ha
+%%DATADIR%%/stdlib/rt/+x86_64/arch_jmp.ha
 %%DATADIR%%/stdlib/rt/+x86_64/backtrace.ha
 %%DATADIR%%/stdlib/rt/+x86_64/cpuid.ha
 %%DATADIR%%/stdlib/rt/+x86_64/cpuid_native.s
 %%DATADIR%%/stdlib/rt/+x86_64/fenv.s
 %%DATADIR%%/stdlib/rt/+x86_64/getfp.s
-%%DATADIR%%/stdlib/rt/+x86_64/jmp.ha
 %%DATADIR%%/stdlib/rt/+x86_64/longjmp.s
 %%DATADIR%%/stdlib/rt/+x86_64/restore.s
 %%DATADIR%%/stdlib/rt/+x86_64/setjmp.s
@@ -513,8 +526,8 @@ man/man1/haredoc.1.gz
 %%DATADIR%%/stdlib/sort/search.ha
 %%DATADIR%%/stdlib/sort/sort.ha
 %%DATADIR%%/stdlib/sort/types.ha
-%%DATADIR%%/stdlib/strconv/+test/stoi.ha
-%%DATADIR%%/stdlib/strconv/+test/stou.ha
+%%DATADIR%%/stdlib/strconv/+test/stoi_test.ha
+%%DATADIR%%/stdlib/strconv/+test/stou_test.ha
 %%DATADIR%%/stdlib/strconv/README
 %%DATADIR%%/stdlib/strconv/ftos.ha
 %%DATADIR%%/stdlib/strconv/itos.ha
@@ -530,7 +543,6 @@ man/man1/haredoc.1.gz
 %%DATADIR%%/stdlib/strings/compare.ha
 %%DATADIR%%/stdlib/strings/concat.ha
 %%DATADIR%%/stdlib/strings/contains.ha
-%%DATADIR%%/stdlib/strings/cstrings.ha
 %%DATADIR%%/stdlib/strings/dup.ha
 %%DATADIR%%/stdlib/strings/index.ha
 %%DATADIR%%/stdlib/strings/iter.ha
@@ -550,6 +562,9 @@ man/man1/haredoc.1.gz
 %%DATADIR%%/stdlib/temp/+freebsd.ha
 %%DATADIR%%/stdlib/temp/+linux.ha
 %%DATADIR%%/stdlib/temp/README
+%%DATADIR%%/stdlib/test/+test.ha
+%%DATADIR%%/stdlib/test/common.ha
+%%DATADIR%%/stdlib/test/fail+test.ha
 %%DATADIR%%/stdlib/time/+freebsd/functions.ha
 %%DATADIR%%/stdlib/time/+linux/+aarch64.ha
 %%DATADIR%%/stdlib/time/+linux/+riscv64.ha
@@ -560,6 +575,7 @@ man/man1/haredoc.1.gz
 %%DATADIR%%/stdlib/time/chrono/+freebsd.ha
 %%DATADIR%%/stdlib/time/chrono/+linux.ha
 %%DATADIR%%/stdlib/time/chrono/README
+%%DATADIR%%/stdlib/time/chrono/arithmetic.ha
 %%DATADIR%%/stdlib/time/chrono/chronology.ha
 %%DATADIR%%/stdlib/time/chrono/error.ha
 %%DATADIR%%/stdlib/time/chrono/leapsec.ha
@@ -567,11 +583,32 @@ man/man1/haredoc.1.gz
 %%DATADIR%%/stdlib/time/chrono/timezone.ha
 %%DATADIR%%/stdlib/time/chrono/tzdb.ha
 %%DATADIR%%/stdlib/time/conv.ha
+%%DATADIR%%/stdlib/time/date/README
+%%DATADIR%%/stdlib/time/date/date.ha
+%%DATADIR%%/stdlib/time/date/daydate.ha
+%%DATADIR%%/stdlib/time/date/daytime.ha
+%%DATADIR%%/stdlib/time/date/error.ha
+%%DATADIR%%/stdlib/time/date/format.ha
+%%DATADIR%%/stdlib/time/date/locality.ha
+%%DATADIR%%/stdlib/time/date/observe.ha
+%%DATADIR%%/stdlib/time/date/parithm.ha
+%%DATADIR%%/stdlib/time/date/parse.ha
+%%DATADIR%%/stdlib/time/date/period.ha
+%%DATADIR%%/stdlib/time/date/reckon.ha
+%%DATADIR%%/stdlib/time/date/tarithm.ha
+%%DATADIR%%/stdlib/time/date/virtual.ha
 %%DATADIR%%/stdlib/time/types.ha
 %%DATADIR%%/stdlib/types/README
 %%DATADIR%%/stdlib/types/arch+aarch64.ha
 %%DATADIR%%/stdlib/types/arch+riscv64.ha
 %%DATADIR%%/stdlib/types/arch+x86_64.ha
+%%DATADIR%%/stdlib/types/c/+test.ha
+%%DATADIR%%/stdlib/types/c/README
+%%DATADIR%%/stdlib/types/c/arch+aarch64.ha
+%%DATADIR%%/stdlib/types/c/arch+riscv64.ha
+%%DATADIR%%/stdlib/types/c/arch+x86_64.ha
+%%DATADIR%%/stdlib/types/c/strings.ha
+%%DATADIR%%/stdlib/types/c/types.ha
 %%DATADIR%%/stdlib/types/classes.ha
 %%DATADIR%%/stdlib/types/limits.ha
 %%DATADIR%%/stdlib/unix/+freebsd/getuid.ha
@@ -589,17 +626,20 @@ man/man1/haredoc.1.gz
 %%DATADIR%%/stdlib/unix/README
 %%DATADIR%%/stdlib/unix/hosts/+freebsd.ha
 %%DATADIR%%/stdlib/unix/hosts/+linux.ha
-%%DATADIR%%/stdlib/unix/hosts/lookup.ha
+%%DATADIR%%/stdlib/unix/hosts/hosts.ha
+%%DATADIR%%/stdlib/unix/hosts/test+test.ha
 %%DATADIR%%/stdlib/unix/passwd/group.ha
 %%DATADIR%%/stdlib/unix/passwd/passwd.ha
 %%DATADIR%%/stdlib/unix/passwd/types.ha
 %%DATADIR%%/stdlib/unix/poll/+freebsd.ha
 %%DATADIR%%/stdlib/unix/poll/+linux.ha
 %%DATADIR%%/stdlib/unix/poll/README
+%%DATADIR%%/stdlib/unix/poll/types.ha
 %%DATADIR%%/stdlib/unix/resolvconf/+freebsd.ha
 %%DATADIR%%/stdlib/unix/resolvconf/+linux.ha
 %%DATADIR%%/stdlib/unix/resolvconf/README
 %%DATADIR%%/stdlib/unix/resolvconf/load.ha
+%%DATADIR%%/stdlib/unix/signal/+freebsd.ha
 %%DATADIR%%/stdlib/unix/signal/+linux.ha
 %%DATADIR%%/stdlib/unix/signal/README
 %%DATADIR%%/stdlib/unix/signal/types.ha
@@ -613,7 +653,7 @@ man/man1/haredoc.1.gz
 %%DATADIR%%/stdlib/unix/tty/+linux/pty.ha
 %%DATADIR%%/stdlib/unix/tty/+linux/termios.ha
 %%DATADIR%%/stdlib/unix/tty/+linux/winsize.ha
-%%DATADIR%%/stdlib/unix/tty/pty.ha
+%%DATADIR%%/stdlib/unix/tty/pty_common.ha
 %%DATADIR%%/stdlib/unix/tty/types.ha
 %%DATADIR%%/stdlib/uuid/README
 %%DATADIR%%/stdlib/uuid/uuid.ha