diff --git a/devel/wasi-compiler-rt/Makefile b/devel/wasi-compiler-rt/Makefile
index 89fa972ac97e..352058337db0 100644
--- a/devel/wasi-compiler-rt/Makefile
+++ b/devel/wasi-compiler-rt/Makefile
@@ -1,65 +1,68 @@
 PORTNAME=	compiler-rt
 DISTVERSION?=	0
 PORTREVISION?=	0
 CATEGORIES=	devel lang
 MASTER_SITES=	https://github.com/llvm/llvm-project/releases/download/llvmorg-${DISTVERSION:S/rc/-rc/}/ \
 		https://${PRE_}releases.llvm.org/${LLVM_RELEASE}/${RCDIR}/
 PKGNAMEPREFIX=	wasi-
 PKGNAMESUFFIX=	${LLVM_VERSION}
 DISTNAME=	llvm-project-${DISTVERSION}.src
 DISTFILES=	llvm-project-${DISTVERSION}.src${EXTRACT_SUFX}
 
 MAINTAINER=	vishwin@FreeBSD.org
 COMMENT=	Clang builtins library for WebAssembly System Interface
 WWW=		https://llvm.org/
 
 LICENSE=	LLVM2
 LICENSE_NAME=	Apache License 2.0 with LLVM Exceptions
 LICENSE_FILE=	${WRKSRC}/llvm/LICENSE.TXT
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-BUILD_DEPENDS=	${WASI_SYSROOT}/include/stdarg.h:devel/wasi-libc
-
 USES=		cmake tar:xz
 
 .if ${DISTVERSION} == 0
 IGNORE=		is a meta-port; there is nothing to build
 PKGNAMESUFFIX=	-master
 .else
+BUILD_DEPENDS=	${WASI_SYSROOT}/include/stdarg.h:devel/wasi-libc@${LLVM_VERSION}
 USES+=		llvm:${LLVM_SUFFIX}
 .endif
 
 LLVM_RELEASE=	${DISTVERSION:C/rc.*//}
 LLVM_SUFFIX=	${LLVM_RELEASE:C/\.[0-9]\.[0-9]$//}
 DISTINFO_FILE=	${PORTSDIR}/${LLVM_PORT}/distinfo
 NO_ARCH=	yes
 
-CC=		${LOCALBASE}/bin/clang${LLVM_VERSION}
-CXX=		${LOCALBASE}/bin/clang++${LLVM_VERSION}
 WASI_SYSROOT=	${LOCALBASE}/share/wasi-sysroot
 TRIPLE=		wasm32-wasi
 WITHOUT_CPU_CFLAGS=	yes
 # try to sync with https://github.com/WebAssembly/wasi-sdk
-# Makefile and wasi-sdk.cmake
+# wasi-sdk.cmake and cmake/wasi-sdk-sysroot.cmake
 CMAKE_SOURCE_PATH=	${WRKSRC}/compiler-rt/lib/builtins
-CMAKE_ARGS=	-DCMAKE_AR=${LOCALBASE}/bin/llvm-ar${LLVM_VERSION} \
+CMAKE_ARGS=	-DCMAKE_SYSTEM_NAME=WASI \
+		-DCMAKE_SYSTEM_VERSION=1 \
+		-DCMAKE_SYSTEM_PROCESSOR=wasm32 \
+		-DCMAKE_AR=${LOCALBASE}/bin/llvm-ar${LLVM_VERSION} \
 		-DCMAKE_RANLIB=${LOCALBASE}/bin/llvm-ranlib${LLVM_VERSION} \
 		-DCMAKE_C_COMPILER_TARGET=${TRIPLE} \
 		-DCMAKE_CXX_COMPILER_TARGET=${TRIPLE} \
+		-DCMAKE_ASM_COMPILER_TARGET=${TRIPLE} \
 		-DCMAKE_FIND_ROOT_PATH_MODE_PROGRAM=NEVER \
 		-DCMAKE_FIND_ROOT_PATH_MODE_LIBRARY=ONLY \
 		-DCMAKE_FIND_ROOT_PATH_MODE_INCLUDE=ONLY \
 		-DCMAKE_FIND_ROOT_PATH_MODE_PACKAGE=ONLY \
-		-DCMAKE_SYSROOT=${WASI_SYSROOT} \
 		-DCMAKE_C_COMPILER_WORKS=ON \
+		-DCMAKE_CXX_COMPILER_WORKS=ON \
+		-DCMAKE_SYSROOT=${WASI_SYSROOT} \
 		-DCOMPILER_RT_BAREMETAL_BUILD=ON \
+		-DCOMPILER_RT_BUILD_XRAY=OFF \
 		-DCOMPILER_RT_INCLUDE_TESTS=OFF \
-		-DCOMPILER_RT_HAS_FPIC_FLAG=ON \
+		-DCOMPILER_RT_HAS_FPIC_FLAG=OFF \
+		-DCOMPILER_RT_ENABLE_IOS=OFF \
 		-DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON \
 		-DCOMPILER_RT_OS_DIR=wasi
-
-CMAKE_ARGS+=	-DLLVM_CMAKE_DIR=${LLVM_PREFIX}
 CMAKE_INSTALL_PREFIX=	${LLVM_PREFIX}/lib/clang/${LLVM_VERSION}
+
 PLIST_FILES=	${LLVM_PREFIX}/lib/clang/${LLVM_VERSION}/lib/wasi/libclang_rt.builtins-wasm32.a
 
 .include <bsd.port.mk>
diff --git a/devel/wasi-compiler-rt17/Makefile b/devel/wasi-compiler-rt17/Makefile
index caae24542522..5c7882c84831 100644
--- a/devel/wasi-compiler-rt17/Makefile
+++ b/devel/wasi-compiler-rt17/Makefile
@@ -1,7 +1,7 @@
 # must sync with devel/llvm17
 DISTVERSION=	17.0.6
-PORTREVISION=	1
+PORTREVISION=	2
 
 MASTERDIR=	${.CURDIR}/../wasi-compiler-rt
 
 .include "${MASTERDIR}/Makefile"
diff --git a/devel/wasi-compiler-rt18/Makefile b/devel/wasi-compiler-rt18/Makefile
index e56592852dfc..5d51ffdf1b5b 100644
--- a/devel/wasi-compiler-rt18/Makefile
+++ b/devel/wasi-compiler-rt18/Makefile
@@ -1,6 +1,7 @@
 # must sync with devel/llvm18
 DISTVERSION=	18.1.8
+PORTREVISION=	1
 
 MASTERDIR=	${.CURDIR}/../wasi-compiler-rt
 
 .include "${MASTERDIR}/Makefile"
diff --git a/devel/wasi-libc/Makefile b/devel/wasi-libc/Makefile
index 4121d70b7eb4..6b55843fd271 100644
--- a/devel/wasi-libc/Makefile
+++ b/devel/wasi-libc/Makefile
@@ -1,47 +1,52 @@
 PORTNAME=	wasi-libc
 DISTVERSIONPREFIX=	wasi-sdk-
-DISTVERSION=	21
-PORTREVISION=	1
+DISTVERSION=	22-27
+DISTVERSIONSUFFIX=	-g98897e2
 CATEGORIES=	devel
+PKGNAMESUFFIX=	${FLAVOR}
 
 MAINTAINER=	vishwin@FreeBSD.org
 COMMENT=	C standard library for WebAssembly System Interface
 WWW=		https://github.com/WebAssembly/wasi-libc
 
 LICENSE=	APACHE20 MIT LLVM2
 LICENSE_COMB=	multi
 LICENSE_FILE_APACHE20=	${WRKSRC}/LICENSE-APACHE
 LICENSE_FILE_MIT=	${WRKSRC}/LICENSE-MIT
 LICENSE_FILE_LLVM2=	${WRKSRC}/LICENSE-APACHE-LLVM
 LICENSE_NAME_LLVM2=	Apache License 2.0 with LLVM Exceptions
 LICENSE_PERMS_LLVM2=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-USES=		gmake llvm:min=17
+FLAVORS=	18 19 17
+
+USES=		gmake llvm:${FLAVOR}
 USE_GITHUB=	yes
 GH_ACCOUNT=	WebAssembly
 GH_TUPLE=	WebAssembly:WASI:59cbe14:wasi/tools/wasi-headers/WASI
 NO_ARCH=	yes
+PLIST=		${PKGDIR}/pkg-plist${LLVM_VERSION}
+CONFLICTS_INSTALL=	wasi-libc[0-9]*
 
 ALL_TARGET=	finish
 
 # NOTE: matches the https://github.com/WebAssembly/wasi-sdk
 WASI_SYSROOT=	${PREFIX}/share/wasi-sysroot
 
 MAKE_ENV=	INSTALL_DIR=${STAGEDIR}${WASI_SYSROOT} \
 		EXTRA_CFLAGS="-O2 -DNDEBUG -isystem ${FILESDIR}" \
 		AR=${LOCALBASE}/bin/llvm-ar${LLVM_VERSION} \
 		NM=${LOCALBASE}/bin/llvm-nm${LLVM_VERSION} \
 
 post-patch:
 # NOTE: phony targets cause make install to rebuild everything
 #       https://github.com/WebAssembly/wasi-libc/issues/156
 	${REINPLACE_CMD} -e 's|install: finish|install:|' ${WRKSRC}/Makefile
 
 post-install:
 # NOTE: our llvm ports don't ship stdarg/stddef clang headers, so
 #       they are copied from clang/lib/Headers into FILESDIR and we install
 #       them to the sysroot
-	${INSTALL_DATA} ${FILESDIR}/*stdarg*.h ${STAGEDIR}${WASI_SYSROOT}/include/
-	${INSTALL_DATA} ${FILESDIR}/*stddef*.h ${STAGEDIR}${WASI_SYSROOT}/include/
+	${INSTALL_DATA} ${FILESDIR}/llvm${LLVM_VERSION}/*stdarg*.h ${STAGEDIR}${WASI_SYSROOT}/include/
+	${INSTALL_DATA} ${FILESDIR}/llvm${LLVM_VERSION}/*stddef*.h ${STAGEDIR}${WASI_SYSROOT}/include/
 
 .include <bsd.port.mk>
diff --git a/devel/wasi-libc/distinfo b/devel/wasi-libc/distinfo
index 123bd995cc9d..dbc1032fc1ce 100644
--- a/devel/wasi-libc/distinfo
+++ b/devel/wasi-libc/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1704903461
-SHA256 (WebAssembly-wasi-libc-wasi-sdk-21_GH0.tar.gz) = 4a2a3e3b120ba1163c57f34ac79c3de720a8355ee3a753d81f1f0c58c4cf6017
-SIZE (WebAssembly-wasi-libc-wasi-sdk-21_GH0.tar.gz) = 1313865
+TIMESTAMP = 1729202659
+SHA256 (WebAssembly-wasi-libc-wasi-sdk-22-27-g98897e2_GH0.tar.gz) = 0c393cbc7c14d9c2dfe53b850aff91d808e7d409d36cc28fc33b469bc45a145f
+SIZE (WebAssembly-wasi-libc-wasi-sdk-22-27-g98897e2_GH0.tar.gz) = 1433626
 SHA256 (WebAssembly-WASI-59cbe14_GH0.tar.gz) = 4e36c4add2421b44ccdded83d442d9aadf02ffa8b534d94016fad2bb7b781cc6
 SIZE (WebAssembly-WASI-59cbe14_GH0.tar.gz) = 162059
diff --git a/devel/wasi-libc/files/__stddef_max_align_t.h b/devel/wasi-libc/files/llvm17/__stddef_max_align_t.h
similarity index 90%
copy from devel/wasi-libc/files/__stddef_max_align_t.h
copy to devel/wasi-libc/files/llvm17/__stddef_max_align_t.h
index 512606a87728..e3b439285d0f 100644
--- a/devel/wasi-libc/files/__stddef_max_align_t.h
+++ b/devel/wasi-libc/files/llvm17/__stddef_max_align_t.h
@@ -1,27 +1,27 @@
-/*===---- __stddef_max_align_t.h - Definition of max_align_t ---------------===
+/*===---- __stddef_max_align_t.h - Definition of max_align_t for modules ---===
  *
  * Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
  * See https://llvm.org/LICENSE.txt for license information.
  * SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
  *
  *===-----------------------------------------------------------------------===
  */
 
 #ifndef __CLANG_MAX_ALIGN_T_DEFINED
 #define __CLANG_MAX_ALIGN_T_DEFINED
 
 #if defined(_MSC_VER)
 typedef double max_align_t;
 #elif defined(__APPLE__)
 typedef long double max_align_t;
 #else
 // Define 'max_align_t' to match the GCC definition.
 typedef struct {
   long long __clang_max_align_nonce1
       __attribute__((__aligned__(__alignof__(long long))));
   long double __clang_max_align_nonce2
       __attribute__((__aligned__(__alignof__(long double))));
 } max_align_t;
 #endif
 
 #endif
diff --git a/devel/wasi-libc/files/llvm17/stdarg.h b/devel/wasi-libc/files/llvm17/stdarg.h
new file mode 100644
index 000000000000..ba978721f1f3
--- /dev/null
+++ b/devel/wasi-libc/files/llvm17/stdarg.h
@@ -0,0 +1,51 @@
+/*===---- stdarg.h - Variable argument handling ----------------------------===
+ *
+ * Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+ * See https://llvm.org/LICENSE.txt for license information.
+ * SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+ *
+ *===-----------------------------------------------------------------------===
+ */
+
+#ifndef __STDARG_H
+
+#ifndef __GNUC_VA_LIST
+#define __GNUC_VA_LIST
+typedef __builtin_va_list __gnuc_va_list;
+#endif
+
+#ifdef __need___va_list
+#undef __need___va_list
+#else
+#define __STDARG_H
+#ifndef _VA_LIST
+typedef __builtin_va_list va_list;
+#define _VA_LIST
+#endif
+
+/* FIXME: This is using the placeholder dates Clang produces for these macros
+   in C2x mode; switch to the correct values once they've been published. */
+#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 202000L
+/* C2x does not require the second parameter for va_start. */
+#define va_start(ap, ...) __builtin_va_start(ap, 0)
+#else
+/* Versions before C2x do require the second parameter. */
+#define va_start(ap, param) __builtin_va_start(ap, param)
+#endif
+#define va_end(ap)          __builtin_va_end(ap)
+#define va_arg(ap, type)    __builtin_va_arg(ap, type)
+
+/* GCC always defines __va_copy, but does not define va_copy unless in c99 mode
+ * or -ansi is not specified, since it was not part of C90.
+ */
+#define __va_copy(d,s) __builtin_va_copy(d,s)
+
+#if (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) ||              \
+    (defined(__cplusplus) && __cplusplus >= 201103L) ||                        \
+    !defined(__STRICT_ANSI__)
+#define va_copy(dest, src)  __builtin_va_copy(dest, src)
+#endif
+
+#endif /* __STDARG_H */
+
+#endif /* not __STDARG_H */
diff --git a/devel/wasi-libc/files/llvm17/stddef.h b/devel/wasi-libc/files/llvm17/stddef.h
new file mode 100644
index 000000000000..539541f0ed41
--- /dev/null
+++ b/devel/wasi-libc/files/llvm17/stddef.h
@@ -0,0 +1,133 @@
+/*===---- stddef.h - Basic type definitions --------------------------------===
+ *
+ * Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+ * See https://llvm.org/LICENSE.txt for license information.
+ * SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+ *
+ *===-----------------------------------------------------------------------===
+ */
+
+#if !defined(__STDDEF_H) || defined(__need_ptrdiff_t) ||                       \
+    defined(__need_size_t) || defined(__need_wchar_t) ||                       \
+    defined(__need_NULL) || defined(__need_wint_t)
+
+#if !defined(__need_ptrdiff_t) && !defined(__need_size_t) &&                   \
+    !defined(__need_wchar_t) && !defined(__need_NULL) &&                       \
+    !defined(__need_wint_t)
+/* Always define miscellaneous pieces when modules are available. */
+#if !__has_feature(modules)
+#define __STDDEF_H
+#endif
+#define __need_ptrdiff_t
+#define __need_size_t
+#define __need_wchar_t
+#define __need_NULL
+#define __need_STDDEF_H_misc
+/* __need_wint_t is intentionally not defined here. */
+#endif
+
+#if defined(__need_ptrdiff_t)
+#if !defined(_PTRDIFF_T) || __has_feature(modules)
+/* Always define ptrdiff_t when modules are available. */
+#if !__has_feature(modules)
+#define _PTRDIFF_T
+#endif
+typedef __PTRDIFF_TYPE__ ptrdiff_t;
+#endif
+#undef __need_ptrdiff_t
+#endif /* defined(__need_ptrdiff_t) */
+
+#if defined(__need_size_t)
+#if !defined(_SIZE_T) || __has_feature(modules)
+/* Always define size_t when modules are available. */
+#if !__has_feature(modules)
+#define _SIZE_T
+#endif
+typedef __SIZE_TYPE__ size_t;
+#endif
+#undef __need_size_t
+#endif /*defined(__need_size_t) */
+
+#if defined(__need_STDDEF_H_misc)
+/* ISO9899:2011 7.20 (C11 Annex K): Define rsize_t if __STDC_WANT_LIB_EXT1__ is
+ * enabled. */
+#if (defined(__STDC_WANT_LIB_EXT1__) && __STDC_WANT_LIB_EXT1__ >= 1 && \
+     !defined(_RSIZE_T)) || __has_feature(modules)
+/* Always define rsize_t when modules are available. */
+#if !__has_feature(modules)
+#define _RSIZE_T
+#endif
+typedef __SIZE_TYPE__ rsize_t;
+#endif
+#endif /* defined(__need_STDDEF_H_misc) */
+
+#if defined(__need_wchar_t)
+#if !defined(__cplusplus) || (defined(_MSC_VER) && !_NATIVE_WCHAR_T_DEFINED)
+/* Always define wchar_t when modules are available. */
+#if !defined(_WCHAR_T) || __has_feature(modules)
+#if !__has_feature(modules)
+#define _WCHAR_T
+#if defined(_MSC_EXTENSIONS)
+#define _WCHAR_T_DEFINED
+#endif
+#endif
+typedef __WCHAR_TYPE__ wchar_t;
+#endif
+#endif
+#undef __need_wchar_t
+#endif /* defined(__need_wchar_t) */
+
+#if defined(__need_NULL)
+#undef NULL
+#ifdef __cplusplus
+#  if !defined(__MINGW32__) && !defined(_MSC_VER)
+#    define NULL __null
+#  else
+#    define NULL 0
+#  endif
+#else
+#  define NULL ((void*)0)
+#endif
+#ifdef __cplusplus
+#if defined(_MSC_EXTENSIONS) && defined(_NATIVE_NULLPTR_SUPPORTED)
+namespace std { typedef decltype(nullptr) nullptr_t; }
+using ::std::nullptr_t;
+#endif
+#endif
+#undef __need_NULL
+#endif /* defined(__need_NULL) */
+
+/* FIXME: This is using the placeholder dates Clang produces for these macros
+   in C2x mode; switch to the correct values once they've been published. */
+#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 202000L
+typedef typeof(nullptr) nullptr_t;
+#endif /* defined(__STDC_VERSION__) && __STDC_VERSION__ >= 202000L */
+
+#if defined(__need_STDDEF_H_misc) && defined(__STDC_VERSION__) &&              \
+    __STDC_VERSION__ >= 202000L
+#define unreachable() __builtin_unreachable()
+#endif /* defined(__need_STDDEF_H_misc) && >= C23 */
+
+#if defined(__need_STDDEF_H_misc)
+#if (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L) ||              \
+    (defined(__cplusplus) && __cplusplus >= 201103L)
+#include "__stddef_max_align_t.h"
+#endif
+#define offsetof(t, d) __builtin_offsetof(t, d)
+#undef __need_STDDEF_H_misc
+#endif  /* defined(__need_STDDEF_H_misc) */
+
+/* Some C libraries expect to see a wint_t here. Others (notably MinGW) will use
+__WINT_TYPE__ directly; accommodate both by requiring __need_wint_t */
+#if defined(__need_wint_t)
+/* Always define wint_t when modules are available. */
+#if !defined(_WINT_T) || __has_feature(modules)
+#if !__has_feature(modules)
+#define _WINT_T
+#endif
+typedef __WINT_TYPE__ wint_t;
+#endif
+#undef __need_wint_t
+#endif /* __need_wint_t */
+
+#endif
diff --git a/devel/wasi-libc/files/__stdarg___gnuc_va_list.h b/devel/wasi-libc/files/llvm18/__stdarg___gnuc_va_list.h
similarity index 100%
copy from devel/wasi-libc/files/__stdarg___gnuc_va_list.h
copy to devel/wasi-libc/files/llvm18/__stdarg___gnuc_va_list.h
diff --git a/devel/wasi-libc/files/__stdarg___va_copy.h b/devel/wasi-libc/files/llvm18/__stdarg___va_copy.h
similarity index 100%
copy from devel/wasi-libc/files/__stdarg___va_copy.h
copy to devel/wasi-libc/files/llvm18/__stdarg___va_copy.h
diff --git a/devel/wasi-libc/files/__stdarg_va_arg.h b/devel/wasi-libc/files/llvm18/__stdarg_va_arg.h
similarity index 100%
copy from devel/wasi-libc/files/__stdarg_va_arg.h
copy to devel/wasi-libc/files/llvm18/__stdarg_va_arg.h
diff --git a/devel/wasi-libc/files/__stdarg_va_copy.h b/devel/wasi-libc/files/llvm18/__stdarg_va_copy.h
similarity index 100%
copy from devel/wasi-libc/files/__stdarg_va_copy.h
copy to devel/wasi-libc/files/llvm18/__stdarg_va_copy.h
diff --git a/devel/wasi-libc/files/__stdarg_va_list.h b/devel/wasi-libc/files/llvm18/__stdarg_va_list.h
similarity index 100%
copy from devel/wasi-libc/files/__stdarg_va_list.h
copy to devel/wasi-libc/files/llvm18/__stdarg_va_list.h
diff --git a/devel/wasi-libc/files/__stddef_max_align_t.h b/devel/wasi-libc/files/llvm18/__stddef_max_align_t.h
similarity index 100%
copy from devel/wasi-libc/files/__stddef_max_align_t.h
copy to devel/wasi-libc/files/llvm18/__stddef_max_align_t.h
diff --git a/devel/wasi-libc/files/__stddef_null.h b/devel/wasi-libc/files/llvm18/__stddef_null.h
similarity index 100%
copy from devel/wasi-libc/files/__stddef_null.h
copy to devel/wasi-libc/files/llvm18/__stddef_null.h
diff --git a/devel/wasi-libc/files/__stddef_nullptr_t.h b/devel/wasi-libc/files/llvm18/__stddef_nullptr_t.h
similarity index 100%
copy from devel/wasi-libc/files/__stddef_nullptr_t.h
copy to devel/wasi-libc/files/llvm18/__stddef_nullptr_t.h
diff --git a/devel/wasi-libc/files/__stddef_offsetof.h b/devel/wasi-libc/files/llvm18/__stddef_offsetof.h
similarity index 100%
copy from devel/wasi-libc/files/__stddef_offsetof.h
copy to devel/wasi-libc/files/llvm18/__stddef_offsetof.h
diff --git a/devel/wasi-libc/files/__stddef_ptrdiff_t.h b/devel/wasi-libc/files/llvm18/__stddef_ptrdiff_t.h
similarity index 100%
copy from devel/wasi-libc/files/__stddef_ptrdiff_t.h
copy to devel/wasi-libc/files/llvm18/__stddef_ptrdiff_t.h
diff --git a/devel/wasi-libc/files/__stddef_rsize_t.h b/devel/wasi-libc/files/llvm18/__stddef_rsize_t.h
similarity index 100%
copy from devel/wasi-libc/files/__stddef_rsize_t.h
copy to devel/wasi-libc/files/llvm18/__stddef_rsize_t.h
diff --git a/devel/wasi-libc/files/__stddef_size_t.h b/devel/wasi-libc/files/llvm18/__stddef_size_t.h
similarity index 100%
copy from devel/wasi-libc/files/__stddef_size_t.h
copy to devel/wasi-libc/files/llvm18/__stddef_size_t.h
diff --git a/devel/wasi-libc/files/__stddef_unreachable.h b/devel/wasi-libc/files/llvm18/__stddef_unreachable.h
similarity index 96%
copy from devel/wasi-libc/files/__stddef_unreachable.h
copy to devel/wasi-libc/files/llvm18/__stddef_unreachable.h
index 518580c92d3f..61df43e9732f 100644
--- a/devel/wasi-libc/files/__stddef_unreachable.h
+++ b/devel/wasi-libc/files/llvm18/__stddef_unreachable.h
@@ -1,17 +1,21 @@
 /*===---- __stddef_unreachable.h - Definition of unreachable ---------------===
  *
  * Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
  * See https://llvm.org/LICENSE.txt for license information.
  * SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
  *
  *===-----------------------------------------------------------------------===
  */
 
+#ifndef __cplusplus
+
 /*
  * When -fbuiltin-headers-in-system-modules is set this is a non-modular header
  * and needs to behave as if it was textual.
  */
 #if !defined(unreachable) ||                                                   \
     (__has_feature(modules) && !__building_module(_Builtin_stddef))
 #define unreachable() __builtin_unreachable()
 #endif
+
+#endif
diff --git a/devel/wasi-libc/files/__stddef_wchar_t.h b/devel/wasi-libc/files/llvm18/__stddef_wchar_t.h
similarity index 100%
copy from devel/wasi-libc/files/__stddef_wchar_t.h
copy to devel/wasi-libc/files/llvm18/__stddef_wchar_t.h
diff --git a/devel/wasi-libc/files/__stddef_wint_t.h b/devel/wasi-libc/files/llvm18/__stddef_wint_t.h
similarity index 100%
copy from devel/wasi-libc/files/__stddef_wint_t.h
copy to devel/wasi-libc/files/llvm18/__stddef_wint_t.h
diff --git a/devel/wasi-libc/files/stdarg.h b/devel/wasi-libc/files/llvm18/stdarg.h
similarity index 100%
copy from devel/wasi-libc/files/stdarg.h
copy to devel/wasi-libc/files/llvm18/stdarg.h
diff --git a/devel/wasi-libc/files/stddef.h b/devel/wasi-libc/files/llvm18/stddef.h
similarity index 100%
copy from devel/wasi-libc/files/stddef.h
copy to devel/wasi-libc/files/llvm18/stddef.h
diff --git a/devel/wasi-libc/files/__stdarg___gnuc_va_list.h b/devel/wasi-libc/files/llvm19/__stdarg___gnuc_va_list.h
similarity index 100%
rename from devel/wasi-libc/files/__stdarg___gnuc_va_list.h
rename to devel/wasi-libc/files/llvm19/__stdarg___gnuc_va_list.h
diff --git a/devel/wasi-libc/files/__stdarg___va_copy.h b/devel/wasi-libc/files/llvm19/__stdarg___va_copy.h
similarity index 100%
rename from devel/wasi-libc/files/__stdarg___va_copy.h
rename to devel/wasi-libc/files/llvm19/__stdarg___va_copy.h
diff --git a/devel/wasi-libc/files/__stddef_wint_t.h b/devel/wasi-libc/files/llvm19/__stdarg_header_macro.h
similarity index 71%
copy from devel/wasi-libc/files/__stddef_wint_t.h
copy to devel/wasi-libc/files/llvm19/__stdarg_header_macro.h
index 0aa291507957..beb92ee02526 100644
--- a/devel/wasi-libc/files/__stddef_wint_t.h
+++ b/devel/wasi-libc/files/llvm19/__stdarg_header_macro.h
@@ -1,15 +1,12 @@
-/*===---- __stddef_wint.h - Definition of wint_t ---------------------------===
+/*===---- __stdarg_header_macro.h ------------------------------------------===
  *
  * Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
  * See https://llvm.org/LICENSE.txt for license information.
  * SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
  *
  *===-----------------------------------------------------------------------===
  */
 
-#ifndef _WINT_T
-#define _WINT_T
-
-typedef __WINT_TYPE__ wint_t;
-
+#ifndef __STDARG_H
+#define __STDARG_H
 #endif
diff --git a/devel/wasi-libc/files/__stdarg_va_arg.h b/devel/wasi-libc/files/llvm19/__stdarg_va_arg.h
similarity index 100%
rename from devel/wasi-libc/files/__stdarg_va_arg.h
rename to devel/wasi-libc/files/llvm19/__stdarg_va_arg.h
diff --git a/devel/wasi-libc/files/__stdarg_va_copy.h b/devel/wasi-libc/files/llvm19/__stdarg_va_copy.h
similarity index 100%
rename from devel/wasi-libc/files/__stdarg_va_copy.h
rename to devel/wasi-libc/files/llvm19/__stdarg_va_copy.h
diff --git a/devel/wasi-libc/files/__stdarg_va_list.h b/devel/wasi-libc/files/llvm19/__stdarg_va_list.h
similarity index 100%
rename from devel/wasi-libc/files/__stdarg_va_list.h
rename to devel/wasi-libc/files/llvm19/__stdarg_va_list.h
diff --git a/devel/wasi-libc/files/__stddef_wint_t.h b/devel/wasi-libc/files/llvm19/__stddef_header_macro.h
similarity index 71%
copy from devel/wasi-libc/files/__stddef_wint_t.h
copy to devel/wasi-libc/files/llvm19/__stddef_header_macro.h
index 0aa291507957..db5fb3c0abc1 100644
--- a/devel/wasi-libc/files/__stddef_wint_t.h
+++ b/devel/wasi-libc/files/llvm19/__stddef_header_macro.h
@@ -1,15 +1,12 @@
-/*===---- __stddef_wint.h - Definition of wint_t ---------------------------===
+/*===---- __stddef_header_macro.h ------------------------------------------===
  *
  * Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
  * See https://llvm.org/LICENSE.txt for license information.
  * SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
  *
  *===-----------------------------------------------------------------------===
  */
 
-#ifndef _WINT_T
-#define _WINT_T
-
-typedef __WINT_TYPE__ wint_t;
-
+#ifndef __STDDEF_H
+#define __STDDEF_H
 #endif
diff --git a/devel/wasi-libc/files/__stddef_max_align_t.h b/devel/wasi-libc/files/llvm19/__stddef_max_align_t.h
similarity index 100%
rename from devel/wasi-libc/files/__stddef_max_align_t.h
rename to devel/wasi-libc/files/llvm19/__stddef_max_align_t.h
diff --git a/devel/wasi-libc/files/__stddef_null.h b/devel/wasi-libc/files/llvm19/__stddef_null.h
similarity index 100%
rename from devel/wasi-libc/files/__stddef_null.h
rename to devel/wasi-libc/files/llvm19/__stddef_null.h
diff --git a/devel/wasi-libc/files/__stddef_nullptr_t.h b/devel/wasi-libc/files/llvm19/__stddef_nullptr_t.h
similarity index 100%
rename from devel/wasi-libc/files/__stddef_nullptr_t.h
rename to devel/wasi-libc/files/llvm19/__stddef_nullptr_t.h
diff --git a/devel/wasi-libc/files/__stddef_offsetof.h b/devel/wasi-libc/files/llvm19/__stddef_offsetof.h
similarity index 100%
rename from devel/wasi-libc/files/__stddef_offsetof.h
rename to devel/wasi-libc/files/llvm19/__stddef_offsetof.h
diff --git a/devel/wasi-libc/files/__stddef_ptrdiff_t.h b/devel/wasi-libc/files/llvm19/__stddef_ptrdiff_t.h
similarity index 100%
rename from devel/wasi-libc/files/__stddef_ptrdiff_t.h
rename to devel/wasi-libc/files/llvm19/__stddef_ptrdiff_t.h
diff --git a/devel/wasi-libc/files/__stddef_rsize_t.h b/devel/wasi-libc/files/llvm19/__stddef_rsize_t.h
similarity index 100%
rename from devel/wasi-libc/files/__stddef_rsize_t.h
rename to devel/wasi-libc/files/llvm19/__stddef_rsize_t.h
diff --git a/devel/wasi-libc/files/__stddef_size_t.h b/devel/wasi-libc/files/llvm19/__stddef_size_t.h
similarity index 100%
rename from devel/wasi-libc/files/__stddef_size_t.h
rename to devel/wasi-libc/files/llvm19/__stddef_size_t.h
diff --git a/devel/wasi-libc/files/__stddef_unreachable.h b/devel/wasi-libc/files/llvm19/__stddef_unreachable.h
similarity index 96%
rename from devel/wasi-libc/files/__stddef_unreachable.h
rename to devel/wasi-libc/files/llvm19/__stddef_unreachable.h
index 518580c92d3f..61df43e9732f 100644
--- a/devel/wasi-libc/files/__stddef_unreachable.h
+++ b/devel/wasi-libc/files/llvm19/__stddef_unreachable.h
@@ -1,17 +1,21 @@
 /*===---- __stddef_unreachable.h - Definition of unreachable ---------------===
  *
  * Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
  * See https://llvm.org/LICENSE.txt for license information.
  * SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
  *
  *===-----------------------------------------------------------------------===
  */
 
+#ifndef __cplusplus
+
 /*
  * When -fbuiltin-headers-in-system-modules is set this is a non-modular header
  * and needs to behave as if it was textual.
  */
 #if !defined(unreachable) ||                                                   \
     (__has_feature(modules) && !__building_module(_Builtin_stddef))
 #define unreachable() __builtin_unreachable()
 #endif
+
+#endif
diff --git a/devel/wasi-libc/files/__stddef_wchar_t.h b/devel/wasi-libc/files/llvm19/__stddef_wchar_t.h
similarity index 100%
rename from devel/wasi-libc/files/__stddef_wchar_t.h
rename to devel/wasi-libc/files/llvm19/__stddef_wchar_t.h
diff --git a/devel/wasi-libc/files/__stddef_wint_t.h b/devel/wasi-libc/files/llvm19/__stddef_wint_t.h
similarity index 100%
rename from devel/wasi-libc/files/__stddef_wint_t.h
rename to devel/wasi-libc/files/llvm19/__stddef_wint_t.h
diff --git a/devel/wasi-libc/files/stdarg.h b/devel/wasi-libc/files/llvm19/stdarg.h
similarity index 66%
rename from devel/wasi-libc/files/stdarg.h
rename to devel/wasi-libc/files/llvm19/stdarg.h
index 94b066566f08..6203d7a600a2 100644
--- a/devel/wasi-libc/files/stdarg.h
+++ b/devel/wasi-libc/files/llvm19/stdarg.h
@@ -1,79 +1,75 @@
 /*===---- stdarg.h - Variable argument handling ----------------------------===
  *
  * Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
  * See https://llvm.org/LICENSE.txt for license information.
  * SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
  *
  *===-----------------------------------------------------------------------===
  */
 
 /*
  * This header is designed to be included multiple times. If any of the __need_
  * macros are defined, then only that subset of interfaces are provided. This
  * can be useful for POSIX headers that need to not expose all of stdarg.h, but
  * need to use some of its interfaces. Otherwise this header provides all of
  * the expected interfaces.
  *
- * When clang modules are enabled, this header is a textual header. It ignores
- * its header guard so that multiple submodules can export its interfaces.
- * Take module SM with submodules A and B, whose headers both include stdarg.h
- * When SM.A builds, __STDARG_H will be defined. When SM.B builds, the
- * definition from SM.A will leak when building without local submodule
- * visibility. stdarg.h wouldn't include any of its implementation headers, and
- * SM.B wouldn't import any of the stdarg modules, and SM.B's `export *`
- * wouldn't export any stdarg interfaces as expected. However, since stdarg.h
- * ignores its header guard when building with modules, it all works as
- * expected.
- *
- * When clang modules are not enabled, the header guards can function in the
- * normal simple fashion.
+ * When clang modules are enabled, this header is a textual header to support
+ * the multiple include behavior. As such, it doesn't directly declare anything
+ * so that it doesn't add duplicate declarations to all of its includers'
+ * modules.
  */
-#if !defined(__STDARG_H) || __has_feature(modules) ||                          \
-    defined(__need___va_list) || defined(__need_va_list) ||                    \
-    defined(__need_va_arg) || defined(__need___va_copy) ||                     \
-    defined(__need_va_copy)
+#if defined(__MVS__) && __has_include_next(<stdarg.h>)
+#undef __need___va_list
+#undef __need_va_list
+#undef __need_va_arg
+#undef __need___va_copy
+#undef __need_va_copy
+#include <__stdarg_header_macro.h>
+#include_next <stdarg.h>
 
+#else
 #if !defined(__need___va_list) && !defined(__need_va_list) &&                  \
     !defined(__need_va_arg) && !defined(__need___va_copy) &&                   \
     !defined(__need_va_copy)
-#define __STDARG_H
 #define __need___va_list
 #define __need_va_list
 #define __need_va_arg
 #define __need___va_copy
 /* GCC always defines __va_copy, but does not define va_copy unless in c99 mode
  * or -ansi is not specified, since it was not part of C90.
  */
 #if (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) ||              \
     (defined(__cplusplus) && __cplusplus >= 201103L) ||                        \
     !defined(__STRICT_ANSI__)
 #define __need_va_copy
 #endif
+#include <__stdarg_header_macro.h>
 #endif
 
 #ifdef __need___va_list
 #include <__stdarg___gnuc_va_list.h>
 #undef __need___va_list
 #endif /* defined(__need___va_list) */
 
 #ifdef __need_va_list
 #include <__stdarg_va_list.h>
 #undef __need_va_list
 #endif /* defined(__need_va_list) */
 
 #ifdef __need_va_arg
 #include <__stdarg_va_arg.h>
 #undef __need_va_arg
 #endif /* defined(__need_va_arg) */
 
 #ifdef __need___va_copy
 #include <__stdarg___va_copy.h>
 #undef __need___va_copy
 #endif /* defined(__need___va_copy) */
 
 #ifdef __need_va_copy
 #include <__stdarg_va_copy.h>
 #undef __need_va_copy
 #endif /* defined(__need_va_copy) */
 
-#endif
+#endif /* __MVS__ */
diff --git a/devel/wasi-libc/files/stddef.h b/devel/wasi-libc/files/llvm19/stddef.h
similarity index 67%
rename from devel/wasi-libc/files/stddef.h
rename to devel/wasi-libc/files/llvm19/stddef.h
index e0ad7b8d17af..99b275aebf5a 100644
--- a/devel/wasi-libc/files/stddef.h
+++ b/devel/wasi-libc/files/llvm19/stddef.h
@@ -1,123 +1,139 @@
 /*===---- stddef.h - Basic type definitions --------------------------------===
  *
  * Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
  * See https://llvm.org/LICENSE.txt for license information.
  * SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
  *
  *===-----------------------------------------------------------------------===
  */
 
 /*
  * This header is designed to be included multiple times. If any of the __need_
  * macros are defined, then only that subset of interfaces are provided. This
  * can be useful for POSIX headers that need to not expose all of stddef.h, but
  * need to use some of its interfaces. Otherwise this header provides all of
  * the expected interfaces.
  *
- * When clang modules are enabled, this header is a textual header. It ignores
- * its header guard so that multiple submodules can export its interfaces.
- * Take module SM with submodules A and B, whose headers both include stddef.h
- * When SM.A builds, __STDDEF_H will be defined. When SM.B builds, the
- * definition from SM.A will leak when building without local submodule
- * visibility. stddef.h wouldn't include any of its implementation headers, and
- * SM.B wouldn't import any of the stddef modules, and SM.B's `export *`
- * wouldn't export any stddef interfaces as expected. However, since stddef.h
- * ignores its header guard when building with modules, it all works as
- * expected.
- *
- * When clang modules are not enabled, the header guards can function in the
- * normal simple fashion.
+ * When clang modules are enabled, this header is a textual header to support
+ * the multiple include behavior. As such, it doesn't directly declare anything
+ * so that it doesn't add duplicate declarations to all of its includers'
+ * modules.
  */
-#if !defined(__STDDEF_H) || __has_feature(modules) ||                          \
-    (defined(__STDC_WANT_LIB_EXT1__) && __STDC_WANT_LIB_EXT1__ >= 1) ||        \
-    defined(__need_ptrdiff_t) || defined(__need_size_t) ||                     \
-    defined(__need_rsize_t) || defined(__need_wchar_t) ||                      \
-    defined(__need_NULL) || defined(__need_nullptr_t) ||                       \
-    defined(__need_unreachable) || defined(__need_max_align_t) ||              \
-    defined(__need_offsetof) || defined(__need_wint_t)
+#if defined(__MVS__) && __has_include_next(<stddef.h>)
+#undef __need_ptrdiff_t
+#undef __need_size_t
+#undef __need_rsize_t
+#undef __need_wchar_t
+#undef __need_NULL
+#undef __need_nullptr_t
+#undef __need_unreachable
+#undef __need_max_align_t
+#undef __need_offsetof
+#undef __need_wint_t
+#include <__stddef_header_macro.h>
+#include_next <stddef.h>
+
+#else
 
 #if !defined(__need_ptrdiff_t) && !defined(__need_size_t) &&                   \
     !defined(__need_rsize_t) && !defined(__need_wchar_t) &&                    \
     !defined(__need_NULL) && !defined(__need_nullptr_t) &&                     \
     !defined(__need_unreachable) && !defined(__need_max_align_t) &&            \
     !defined(__need_offsetof) && !defined(__need_wint_t)
-#define __STDDEF_H
 #define __need_ptrdiff_t
 #define __need_size_t
 /* ISO9899:2011 7.20 (C11 Annex K): Define rsize_t if __STDC_WANT_LIB_EXT1__ is
  * enabled. */
 #if defined(__STDC_WANT_LIB_EXT1__) && __STDC_WANT_LIB_EXT1__ >= 1
 #define __need_rsize_t
 #endif
 #define __need_wchar_t
+#if !defined(__STDDEF_H) || __has_feature(modules)
+/*
+ * __stddef_null.h is special when building without modules: if __need_NULL is
+ * set, then it will unconditionally redefine NULL. To avoid stepping on client
+ * definitions of NULL, __need_NULL should only be set the first time this
+ * header is included, that is when __STDDEF_H is not defined. However, when
+ * building with modules, this header is a textual header and needs to
+ * unconditionally include __stdef_null.h to support multiple submodules
+ * exporting _Builtin_stddef.null. Take module SM with submodules A and B, whose
+ * headers both include stddef.h When SM.A builds, __STDDEF_H will be defined.
+ * When SM.B builds, the definition from SM.A will leak when building without
+ * local submodule visibility. stddef.h wouldn't include __stddef_null.h, and
+ * SM.B wouldn't import _Builtin_stddef.null, and SM.B's `export *` wouldn't
+ * export NULL as expected. When building with modules, always include
+ * __stddef_null.h so that everything works as expected.
+ */
 #define __need_NULL
+#endif
 #if (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 202311L) ||              \
     defined(__cplusplus)
 #define __need_nullptr_t
 #endif
 #if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 202311L
 #define __need_unreachable
 #endif
 #if (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L) ||              \
     (defined(__cplusplus) && __cplusplus >= 201103L)
 #define __need_max_align_t
 #endif
 #define __need_offsetof
 /* wint_t is provided by <wchar.h> and not <stddef.h>. It's here
  * for compatibility, but must be explicitly requested. Therefore
  * __need_wint_t is intentionally not defined here. */
+#include <__stddef_header_macro.h>
 #endif
 
 #if defined(__need_ptrdiff_t)
 #include <__stddef_ptrdiff_t.h>
 #undef __need_ptrdiff_t
 #endif /* defined(__need_ptrdiff_t) */
 
 #if defined(__need_size_t)
 #include <__stddef_size_t.h>
 #undef __need_size_t
 #endif /*defined(__need_size_t) */
 
 #if defined(__need_rsize_t)
 #include <__stddef_rsize_t.h>
 #undef __need_rsize_t
 #endif /* defined(__need_rsize_t) */
 
 #if defined(__need_wchar_t)
 #include <__stddef_wchar_t.h>
 #undef __need_wchar_t
 #endif /* defined(__need_wchar_t) */
 
 #if defined(__need_NULL)
 #include <__stddef_null.h>
 #undef __need_NULL
 #endif /* defined(__need_NULL) */
 
 #if defined(__need_nullptr_t)
 #include <__stddef_nullptr_t.h>
 #undef __need_nullptr_t
 #endif /* defined(__need_nullptr_t) */
 
 #if defined(__need_unreachable)
 #include <__stddef_unreachable.h>
 #undef __need_unreachable
 #endif /* defined(__need_unreachable) */
 
 #if defined(__need_max_align_t)
 #include <__stddef_max_align_t.h>
 #undef __need_max_align_t
 #endif /* defined(__need_max_align_t) */
 
 #if defined(__need_offsetof)
 #include <__stddef_offsetof.h>
 #undef __need_offsetof
 #endif /* defined(__need_offsetof) */
 
 /* Some C libraries expect to see a wint_t here. Others (notably MinGW) will use
 __WINT_TYPE__ directly; accommodate both by requiring __need_wint_t */
 #if defined(__need_wint_t)
 #include <__stddef_wint_t.h>
 #undef __need_wint_t
 #endif /* __need_wint_t */
 
-#endif
+#endif /* __MVS__ */
diff --git a/devel/wasi-libc/pkg-plist b/devel/wasi-libc/pkg-plist
deleted file mode 100644
index 1a52ec4c7996..000000000000
--- a/devel/wasi-libc/pkg-plist
+++ /dev/null
@@ -1,238 +0,0 @@
-share/wasi-sysroot/include/__errno.h
-share/wasi-sysroot/include/__errno_values.h
-share/wasi-sysroot/include/__fd_set.h
-share/wasi-sysroot/include/__function___isatty.h
-share/wasi-sysroot/include/__functions_malloc.h
-share/wasi-sysroot/include/__functions_memcpy.h
-share/wasi-sysroot/include/__header_dirent.h
-share/wasi-sysroot/include/__header_fcntl.h
-share/wasi-sysroot/include/__header_inttypes.h
-share/wasi-sysroot/include/__header_netinet_in.h
-share/wasi-sysroot/include/__header_poll.h
-share/wasi-sysroot/include/__header_stdlib.h
-share/wasi-sysroot/include/__header_string.h
-share/wasi-sysroot/include/__header_sys_ioctl.h
-share/wasi-sysroot/include/__header_sys_resource.h
-share/wasi-sysroot/include/__header_sys_socket.h
-share/wasi-sysroot/include/__header_sys_stat.h
-share/wasi-sysroot/include/__header_time.h
-share/wasi-sysroot/include/__header_unistd.h
-share/wasi-sysroot/include/__macro_FD_SETSIZE.h
-share/wasi-sysroot/include/__macro_PAGESIZE.h
-share/wasi-sysroot/include/__mode_t.h
-share/wasi-sysroot/include/__seek.h
-share/wasi-sysroot/include/__stdarg___gnuc_va_list.h
-share/wasi-sysroot/include/__stdarg___va_copy.h
-share/wasi-sysroot/include/__stdarg_va_arg.h
-share/wasi-sysroot/include/__stdarg_va_copy.h
-share/wasi-sysroot/include/__stdarg_va_list.h
-share/wasi-sysroot/include/__stddef_max_align_t.h
-share/wasi-sysroot/include/__stddef_null.h
-share/wasi-sysroot/include/__stddef_nullptr_t.h
-share/wasi-sysroot/include/__stddef_offsetof.h
-share/wasi-sysroot/include/__stddef_ptrdiff_t.h
-share/wasi-sysroot/include/__stddef_rsize_t.h
-share/wasi-sysroot/include/__stddef_size_t.h
-share/wasi-sysroot/include/__stddef_unreachable.h
-share/wasi-sysroot/include/__stddef_wchar_t.h
-share/wasi-sysroot/include/__stddef_wint_t.h
-share/wasi-sysroot/include/__struct_dirent.h
-share/wasi-sysroot/include/__struct_in6_addr.h
-share/wasi-sysroot/include/__struct_in_addr.h
-share/wasi-sysroot/include/__struct_iovec.h
-share/wasi-sysroot/include/__struct_msghdr.h
-share/wasi-sysroot/include/__struct_pollfd.h
-share/wasi-sysroot/include/__struct_rusage.h
-share/wasi-sysroot/include/__struct_sockaddr.h
-share/wasi-sysroot/include/__struct_sockaddr_in.h
-share/wasi-sysroot/include/__struct_sockaddr_in6.h
-share/wasi-sysroot/include/__struct_sockaddr_storage.h
-share/wasi-sysroot/include/__struct_sockaddr_un.h
-share/wasi-sysroot/include/__struct_stat.h
-share/wasi-sysroot/include/__struct_timespec.h
-share/wasi-sysroot/include/__struct_timeval.h
-share/wasi-sysroot/include/__struct_tm.h
-share/wasi-sysroot/include/__struct_tms.h
-share/wasi-sysroot/include/__typedef_DIR.h
-share/wasi-sysroot/include/__typedef_blkcnt_t.h
-share/wasi-sysroot/include/__typedef_blksize_t.h
-share/wasi-sysroot/include/__typedef_clock_t.h
-share/wasi-sysroot/include/__typedef_clockid_t.h
-share/wasi-sysroot/include/__typedef_dev_t.h
-share/wasi-sysroot/include/__typedef_fd_set.h
-share/wasi-sysroot/include/__typedef_gid_t.h
-share/wasi-sysroot/include/__typedef_in_addr_t.h
-share/wasi-sysroot/include/__typedef_in_port_t.h
-share/wasi-sysroot/include/__typedef_ino_t.h
-share/wasi-sysroot/include/__typedef_mode_t.h
-share/wasi-sysroot/include/__typedef_nfds_t.h
-share/wasi-sysroot/include/__typedef_nlink_t.h
-share/wasi-sysroot/include/__typedef_off_t.h
-share/wasi-sysroot/include/__typedef_sa_family_t.h
-share/wasi-sysroot/include/__typedef_sigset_t.h
-share/wasi-sysroot/include/__typedef_socklen_t.h
-share/wasi-sysroot/include/__typedef_ssize_t.h
-share/wasi-sysroot/include/__typedef_suseconds_t.h
-share/wasi-sysroot/include/__typedef_time_t.h
-share/wasi-sysroot/include/__typedef_uid_t.h
-share/wasi-sysroot/include/alloca.h
-share/wasi-sysroot/include/ar.h
-share/wasi-sysroot/include/arpa/ftp.h
-share/wasi-sysroot/include/arpa/inet.h
-share/wasi-sysroot/include/arpa/nameser.h
-share/wasi-sysroot/include/arpa/nameser_compat.h
-share/wasi-sysroot/include/arpa/telnet.h
-share/wasi-sysroot/include/arpa/tftp.h
-share/wasi-sysroot/include/assert.h
-share/wasi-sysroot/include/bits/alltypes.h
-share/wasi-sysroot/include/bits/dirent.h
-share/wasi-sysroot/include/bits/fcntl.h
-share/wasi-sysroot/include/bits/fenv.h
-share/wasi-sysroot/include/bits/float.h
-share/wasi-sysroot/include/bits/hwcap.h
-share/wasi-sysroot/include/bits/io.h
-share/wasi-sysroot/include/bits/ioctl.h
-share/wasi-sysroot/include/bits/ioctl_fix.h
-share/wasi-sysroot/include/bits/ipcstat.h
-share/wasi-sysroot/include/bits/limits.h
-share/wasi-sysroot/include/bits/mman.h
-share/wasi-sysroot/include/bits/poll.h
-share/wasi-sysroot/include/bits/posix.h
-share/wasi-sysroot/include/bits/reg.h
-share/wasi-sysroot/include/bits/resource.h
-share/wasi-sysroot/include/bits/signal.h
-share/wasi-sysroot/include/bits/socket.h
-share/wasi-sysroot/include/bits/stat.h
-share/wasi-sysroot/include/bits/stdint.h
-share/wasi-sysroot/include/byteswap.h
-share/wasi-sysroot/include/complex.h
-share/wasi-sysroot/include/cpio.h
-share/wasi-sysroot/include/crypt.h
-share/wasi-sysroot/include/ctype.h
-share/wasi-sysroot/include/dirent.h
-share/wasi-sysroot/include/dlfcn.h
-share/wasi-sysroot/include/endian.h
-share/wasi-sysroot/include/err.h
-share/wasi-sysroot/include/errno.h
-share/wasi-sysroot/include/fcntl.h
-share/wasi-sysroot/include/features.h
-share/wasi-sysroot/include/fenv.h
-share/wasi-sysroot/include/float.h
-share/wasi-sysroot/include/fmtmsg.h
-share/wasi-sysroot/include/fnmatch.h
-share/wasi-sysroot/include/ftw.h
-share/wasi-sysroot/include/getopt.h
-share/wasi-sysroot/include/glob.h
-share/wasi-sysroot/include/iconv.h
-share/wasi-sysroot/include/ifaddrs.h
-share/wasi-sysroot/include/inttypes.h
-share/wasi-sysroot/include/iso646.h
-share/wasi-sysroot/include/langinfo.h
-share/wasi-sysroot/include/libgen.h
-share/wasi-sysroot/include/limits.h
-share/wasi-sysroot/include/locale.h
-share/wasi-sysroot/include/malloc.h
-share/wasi-sysroot/include/math.h
-share/wasi-sysroot/include/memory.h
-share/wasi-sysroot/include/monetary.h
-share/wasi-sysroot/include/mqueue.h
-share/wasi-sysroot/include/netinet/icmp6.h
-share/wasi-sysroot/include/netinet/igmp.h
-share/wasi-sysroot/include/netinet/in.h
-share/wasi-sysroot/include/netinet/in_systm.h
-share/wasi-sysroot/include/netinet/ip.h
-share/wasi-sysroot/include/netinet/ip6.h
-share/wasi-sysroot/include/netinet/ip_icmp.h
-share/wasi-sysroot/include/netinet/tcp.h
-share/wasi-sysroot/include/netinet/udp.h
-share/wasi-sysroot/include/netpacket/packet.h
-share/wasi-sysroot/include/nl_types.h
-share/wasi-sysroot/include/poll.h
-share/wasi-sysroot/include/regex.h
-share/wasi-sysroot/include/sched.h
-share/wasi-sysroot/include/search.h
-share/wasi-sysroot/include/semaphore.h
-share/wasi-sysroot/include/signal.h
-share/wasi-sysroot/include/stdalign.h
-share/wasi-sysroot/include/stdarg.h
-share/wasi-sysroot/include/stdbool.h
-share/wasi-sysroot/include/stdc-predef.h
-share/wasi-sysroot/include/stddef.h
-share/wasi-sysroot/include/stdint.h
-share/wasi-sysroot/include/stdio.h
-share/wasi-sysroot/include/stdio_ext.h
-share/wasi-sysroot/include/stdlib.h
-share/wasi-sysroot/include/stdnoreturn.h
-share/wasi-sysroot/include/string.h
-share/wasi-sysroot/include/strings.h
-share/wasi-sysroot/include/stropts.h
-share/wasi-sysroot/include/sys/dir.h
-share/wasi-sysroot/include/sys/errno.h
-share/wasi-sysroot/include/sys/eventfd.h
-share/wasi-sysroot/include/sys/fcntl.h
-share/wasi-sysroot/include/sys/file.h
-share/wasi-sysroot/include/sys/ioctl.h
-share/wasi-sysroot/include/sys/mman.h
-share/wasi-sysroot/include/sys/param.h
-share/wasi-sysroot/include/sys/poll.h
-share/wasi-sysroot/include/sys/random.h
-share/wasi-sysroot/include/sys/reg.h
-share/wasi-sysroot/include/sys/resource.h
-share/wasi-sysroot/include/sys/select.h
-share/wasi-sysroot/include/sys/signal.h
-share/wasi-sysroot/include/sys/socket.h
-share/wasi-sysroot/include/sys/stat.h
-share/wasi-sysroot/include/sys/stropts.h
-share/wasi-sysroot/include/sys/syscall.h
-share/wasi-sysroot/include/sys/sysinfo.h
-share/wasi-sysroot/include/sys/time.h
-share/wasi-sysroot/include/sys/timeb.h
-share/wasi-sysroot/include/sys/times.h
-share/wasi-sysroot/include/sys/timex.h
-share/wasi-sysroot/include/sys/ttydefaults.h
-share/wasi-sysroot/include/sys/types.h
-share/wasi-sysroot/include/sys/uio.h
-share/wasi-sysroot/include/sys/un.h
-share/wasi-sysroot/include/sys/utsname.h
-share/wasi-sysroot/include/syscall.h
-share/wasi-sysroot/include/sysexits.h
-share/wasi-sysroot/include/tar.h
-share/wasi-sysroot/include/tgmath.h
-share/wasi-sysroot/include/threads.h
-share/wasi-sysroot/include/time.h
-share/wasi-sysroot/include/uchar.h
-share/wasi-sysroot/include/unistd.h
-share/wasi-sysroot/include/utime.h
-share/wasi-sysroot/include/values.h
-share/wasi-sysroot/include/wasi/api.h
-share/wasi-sysroot/include/wasi/libc-environ.h
-share/wasi-sysroot/include/wasi/libc-find-relpath.h
-share/wasi-sysroot/include/wasi/libc-nocwd.h
-share/wasi-sysroot/include/wasi/libc.h
-share/wasi-sysroot/include/wchar.h
-share/wasi-sysroot/include/wctype.h
-share/wasi-sysroot/lib/wasm32-wasi/crt1-command.o
-share/wasi-sysroot/lib/wasm32-wasi/crt1-reactor.o
-share/wasi-sysroot/lib/wasm32-wasi/crt1.o
-share/wasi-sysroot/lib/wasm32-wasi/libc-printscan-long-double.a
-share/wasi-sysroot/lib/wasm32-wasi/libc-printscan-no-floating-point.a
-share/wasi-sysroot/lib/wasm32-wasi/libc.a
-share/wasi-sysroot/lib/wasm32-wasi/libc.imports
-share/wasi-sysroot/lib/wasm32-wasi/libcrypt.a
-share/wasi-sysroot/lib/wasm32-wasi/libdl.a
-share/wasi-sysroot/lib/wasm32-wasi/libm.a
-share/wasi-sysroot/lib/wasm32-wasi/libpthread.a
-share/wasi-sysroot/lib/wasm32-wasi/libresolv.a
-share/wasi-sysroot/lib/wasm32-wasi/librt.a
-share/wasi-sysroot/lib/wasm32-wasi/libutil.a
-share/wasi-sysroot/lib/wasm32-wasi/libwasi-emulated-getpid.a
-share/wasi-sysroot/lib/wasm32-wasi/libwasi-emulated-mman.a
-share/wasi-sysroot/lib/wasm32-wasi/libwasi-emulated-process-clocks.a
-share/wasi-sysroot/lib/wasm32-wasi/libwasi-emulated-signal.a
-share/wasi-sysroot/lib/wasm32-wasi/libxnet.a
-share/wasi-sysroot/share/wasm32-wasi/defined-symbols.txt
-share/wasi-sysroot/share/wasm32-wasi/include-all.c
-share/wasi-sysroot/share/wasm32-wasi/predefined-macros.txt
-share/wasi-sysroot/share/wasm32-wasi/undefined-symbols.txt
-@dir share/wasi-sysroot/include/net
-@dir share/wasi-sysroot/include/scsi
diff --git a/devel/wasi-libc/pkg-plist17 b/devel/wasi-libc/pkg-plist17
new file mode 100644
index 000000000000..3081c285f23d
--- /dev/null
+++ b/devel/wasi-libc/pkg-plist17
@@ -0,0 +1,233 @@
+share/wasi-sysroot/include/__stddef_max_align_t.h
+share/wasi-sysroot/include/stdarg.h
+share/wasi-sysroot/include/stddef.h
+share/wasi-sysroot/include/wasm32-wasi/__errno.h
+share/wasi-sysroot/include/wasm32-wasi/__errno_values.h
+share/wasi-sysroot/include/wasm32-wasi/__fd_set.h
+share/wasi-sysroot/include/wasm32-wasi/__function___isatty.h
+share/wasi-sysroot/include/wasm32-wasi/__functions_malloc.h
+share/wasi-sysroot/include/wasm32-wasi/__functions_memcpy.h
+share/wasi-sysroot/include/wasm32-wasi/__header_dirent.h
+share/wasi-sysroot/include/wasm32-wasi/__header_fcntl.h
+share/wasi-sysroot/include/wasm32-wasi/__header_inttypes.h
+share/wasi-sysroot/include/wasm32-wasi/__header_netinet_in.h
+share/wasi-sysroot/include/wasm32-wasi/__header_poll.h
+share/wasi-sysroot/include/wasm32-wasi/__header_stdlib.h
+share/wasi-sysroot/include/wasm32-wasi/__header_string.h
+share/wasi-sysroot/include/wasm32-wasi/__header_sys_ioctl.h
+share/wasi-sysroot/include/wasm32-wasi/__header_sys_resource.h
+share/wasi-sysroot/include/wasm32-wasi/__header_sys_socket.h
+share/wasi-sysroot/include/wasm32-wasi/__header_sys_stat.h
+share/wasi-sysroot/include/wasm32-wasi/__header_time.h
+share/wasi-sysroot/include/wasm32-wasi/__header_unistd.h
+share/wasi-sysroot/include/wasm32-wasi/__macro_FD_SETSIZE.h
+share/wasi-sysroot/include/wasm32-wasi/__macro_PAGESIZE.h
+share/wasi-sysroot/include/wasm32-wasi/__mode_t.h
+share/wasi-sysroot/include/wasm32-wasi/__seek.h
+share/wasi-sysroot/include/wasm32-wasi/__struct_dirent.h
+share/wasi-sysroot/include/wasm32-wasi/__struct_in6_addr.h
+share/wasi-sysroot/include/wasm32-wasi/__struct_in_addr.h
+share/wasi-sysroot/include/wasm32-wasi/__struct_iovec.h
+share/wasi-sysroot/include/wasm32-wasi/__struct_msghdr.h
+share/wasi-sysroot/include/wasm32-wasi/__struct_pollfd.h
+share/wasi-sysroot/include/wasm32-wasi/__struct_rusage.h
+share/wasi-sysroot/include/wasm32-wasi/__struct_sockaddr.h
+share/wasi-sysroot/include/wasm32-wasi/__struct_sockaddr_in.h
+share/wasi-sysroot/include/wasm32-wasi/__struct_sockaddr_in6.h
+share/wasi-sysroot/include/wasm32-wasi/__struct_sockaddr_storage.h
+share/wasi-sysroot/include/wasm32-wasi/__struct_sockaddr_un.h
+share/wasi-sysroot/include/wasm32-wasi/__struct_stat.h
+share/wasi-sysroot/include/wasm32-wasi/__struct_timespec.h
+share/wasi-sysroot/include/wasm32-wasi/__struct_timeval.h
+share/wasi-sysroot/include/wasm32-wasi/__struct_tm.h
+share/wasi-sysroot/include/wasm32-wasi/__struct_tms.h
+share/wasi-sysroot/include/wasm32-wasi/__typedef_DIR.h
+share/wasi-sysroot/include/wasm32-wasi/__typedef_blkcnt_t.h
+share/wasi-sysroot/include/wasm32-wasi/__typedef_blksize_t.h
+share/wasi-sysroot/include/wasm32-wasi/__typedef_clock_t.h
+share/wasi-sysroot/include/wasm32-wasi/__typedef_clockid_t.h
+share/wasi-sysroot/include/wasm32-wasi/__typedef_dev_t.h
+share/wasi-sysroot/include/wasm32-wasi/__typedef_fd_set.h
+share/wasi-sysroot/include/wasm32-wasi/__typedef_gid_t.h
+share/wasi-sysroot/include/wasm32-wasi/__typedef_in_addr_t.h
+share/wasi-sysroot/include/wasm32-wasi/__typedef_in_port_t.h
+share/wasi-sysroot/include/wasm32-wasi/__typedef_ino_t.h
+share/wasi-sysroot/include/wasm32-wasi/__typedef_mode_t.h
+share/wasi-sysroot/include/wasm32-wasi/__typedef_nfds_t.h
+share/wasi-sysroot/include/wasm32-wasi/__typedef_nlink_t.h
+share/wasi-sysroot/include/wasm32-wasi/__typedef_off_t.h
+share/wasi-sysroot/include/wasm32-wasi/__typedef_sa_family_t.h
+share/wasi-sysroot/include/wasm32-wasi/__typedef_sigset_t.h
+share/wasi-sysroot/include/wasm32-wasi/__typedef_socklen_t.h
+share/wasi-sysroot/include/wasm32-wasi/__typedef_ssize_t.h
+share/wasi-sysroot/include/wasm32-wasi/__typedef_suseconds_t.h
+share/wasi-sysroot/include/wasm32-wasi/__typedef_time_t.h
+share/wasi-sysroot/include/wasm32-wasi/__typedef_uid_t.h
+share/wasi-sysroot/include/wasm32-wasi/__wasi_snapshot.h
+share/wasi-sysroot/include/wasm32-wasi/alloca.h
+share/wasi-sysroot/include/wasm32-wasi/ar.h
+share/wasi-sysroot/include/wasm32-wasi/arpa/ftp.h
+share/wasi-sysroot/include/wasm32-wasi/arpa/inet.h
+share/wasi-sysroot/include/wasm32-wasi/arpa/nameser.h
+share/wasi-sysroot/include/wasm32-wasi/arpa/nameser_compat.h
+share/wasi-sysroot/include/wasm32-wasi/arpa/telnet.h
+share/wasi-sysroot/include/wasm32-wasi/arpa/tftp.h
+share/wasi-sysroot/include/wasm32-wasi/assert.h
+share/wasi-sysroot/include/wasm32-wasi/bits/alltypes.h
+share/wasi-sysroot/include/wasm32-wasi/bits/dirent.h
+share/wasi-sysroot/include/wasm32-wasi/bits/fcntl.h
+share/wasi-sysroot/include/wasm32-wasi/bits/fenv.h
+share/wasi-sysroot/include/wasm32-wasi/bits/float.h
+share/wasi-sysroot/include/wasm32-wasi/bits/hwcap.h
+share/wasi-sysroot/include/wasm32-wasi/bits/io.h
+share/wasi-sysroot/include/wasm32-wasi/bits/ioctl.h
+share/wasi-sysroot/include/wasm32-wasi/bits/ioctl_fix.h
+share/wasi-sysroot/include/wasm32-wasi/bits/ipcstat.h
+share/wasi-sysroot/include/wasm32-wasi/bits/limits.h
+share/wasi-sysroot/include/wasm32-wasi/bits/mman.h
+share/wasi-sysroot/include/wasm32-wasi/bits/poll.h
+share/wasi-sysroot/include/wasm32-wasi/bits/posix.h
+share/wasi-sysroot/include/wasm32-wasi/bits/reg.h
+share/wasi-sysroot/include/wasm32-wasi/bits/resource.h
+share/wasi-sysroot/include/wasm32-wasi/bits/setjmp.h
+share/wasi-sysroot/include/wasm32-wasi/bits/signal.h
+share/wasi-sysroot/include/wasm32-wasi/bits/socket.h
+share/wasi-sysroot/include/wasm32-wasi/bits/stat.h
+share/wasi-sysroot/include/wasm32-wasi/bits/stdint.h
+share/wasi-sysroot/include/wasm32-wasi/byteswap.h
+share/wasi-sysroot/include/wasm32-wasi/complex.h
+share/wasi-sysroot/include/wasm32-wasi/cpio.h
+share/wasi-sysroot/include/wasm32-wasi/crypt.h
+share/wasi-sysroot/include/wasm32-wasi/ctype.h
+share/wasi-sysroot/include/wasm32-wasi/dirent.h
+share/wasi-sysroot/include/wasm32-wasi/dlfcn.h
+share/wasi-sysroot/include/wasm32-wasi/endian.h
+share/wasi-sysroot/include/wasm32-wasi/err.h
+share/wasi-sysroot/include/wasm32-wasi/errno.h
+share/wasi-sysroot/include/wasm32-wasi/fcntl.h
+share/wasi-sysroot/include/wasm32-wasi/features.h
+share/wasi-sysroot/include/wasm32-wasi/fenv.h
+share/wasi-sysroot/include/wasm32-wasi/float.h
+share/wasi-sysroot/include/wasm32-wasi/fmtmsg.h
+share/wasi-sysroot/include/wasm32-wasi/fnmatch.h
+share/wasi-sysroot/include/wasm32-wasi/fts.h
+share/wasi-sysroot/include/wasm32-wasi/ftw.h
+share/wasi-sysroot/include/wasm32-wasi/getopt.h
+share/wasi-sysroot/include/wasm32-wasi/glob.h
+share/wasi-sysroot/include/wasm32-wasi/iconv.h
+share/wasi-sysroot/include/wasm32-wasi/ifaddrs.h
+share/wasi-sysroot/include/wasm32-wasi/inttypes.h
+share/wasi-sysroot/include/wasm32-wasi/iso646.h
+share/wasi-sysroot/include/wasm32-wasi/langinfo.h
+share/wasi-sysroot/include/wasm32-wasi/libgen.h
+share/wasi-sysroot/include/wasm32-wasi/limits.h
+share/wasi-sysroot/include/wasm32-wasi/locale.h
+share/wasi-sysroot/include/wasm32-wasi/malloc.h
+share/wasi-sysroot/include/wasm32-wasi/math.h
+share/wasi-sysroot/include/wasm32-wasi/memory.h
+share/wasi-sysroot/include/wasm32-wasi/monetary.h
+share/wasi-sysroot/include/wasm32-wasi/mqueue.h
+share/wasi-sysroot/include/wasm32-wasi/netinet/icmp6.h
+share/wasi-sysroot/include/wasm32-wasi/netinet/igmp.h
+share/wasi-sysroot/include/wasm32-wasi/netinet/in.h
+share/wasi-sysroot/include/wasm32-wasi/netinet/in_systm.h
+share/wasi-sysroot/include/wasm32-wasi/netinet/ip.h
+share/wasi-sysroot/include/wasm32-wasi/netinet/ip6.h
+share/wasi-sysroot/include/wasm32-wasi/netinet/ip_icmp.h
+share/wasi-sysroot/include/wasm32-wasi/netinet/tcp.h
+share/wasi-sysroot/include/wasm32-wasi/netinet/udp.h
+share/wasi-sysroot/include/wasm32-wasi/netpacket/packet.h
+share/wasi-sysroot/include/wasm32-wasi/nl_types.h
+share/wasi-sysroot/include/wasm32-wasi/poll.h
+share/wasi-sysroot/include/wasm32-wasi/pthread.h
+share/wasi-sysroot/include/wasm32-wasi/regex.h
+share/wasi-sysroot/include/wasm32-wasi/sched.h
+share/wasi-sysroot/include/wasm32-wasi/search.h
+share/wasi-sysroot/include/wasm32-wasi/semaphore.h
+share/wasi-sysroot/include/wasm32-wasi/setjmp.h
+share/wasi-sysroot/include/wasm32-wasi/signal.h
+share/wasi-sysroot/include/wasm32-wasi/stdalign.h
+share/wasi-sysroot/include/wasm32-wasi/stdbool.h
+share/wasi-sysroot/include/wasm32-wasi/stdc-predef.h
+share/wasi-sysroot/include/wasm32-wasi/stdint.h
+share/wasi-sysroot/include/wasm32-wasi/stdio.h
+share/wasi-sysroot/include/wasm32-wasi/stdio_ext.h
+share/wasi-sysroot/include/wasm32-wasi/stdlib.h
+share/wasi-sysroot/include/wasm32-wasi/stdnoreturn.h
+share/wasi-sysroot/include/wasm32-wasi/string.h
+share/wasi-sysroot/include/wasm32-wasi/strings.h
+share/wasi-sysroot/include/wasm32-wasi/stropts.h
+share/wasi-sysroot/include/wasm32-wasi/sys/dir.h
+share/wasi-sysroot/include/wasm32-wasi/sys/errno.h
+share/wasi-sysroot/include/wasm32-wasi/sys/eventfd.h
+share/wasi-sysroot/include/wasm32-wasi/sys/fcntl.h
+share/wasi-sysroot/include/wasm32-wasi/sys/file.h
+share/wasi-sysroot/include/wasm32-wasi/sys/ioctl.h
+share/wasi-sysroot/include/wasm32-wasi/sys/mman.h
+share/wasi-sysroot/include/wasm32-wasi/sys/param.h
+share/wasi-sysroot/include/wasm32-wasi/sys/poll.h
+share/wasi-sysroot/include/wasm32-wasi/sys/random.h
+share/wasi-sysroot/include/wasm32-wasi/sys/reg.h
+share/wasi-sysroot/include/wasm32-wasi/sys/resource.h
+share/wasi-sysroot/include/wasm32-wasi/sys/select.h
+share/wasi-sysroot/include/wasm32-wasi/sys/signal.h
+share/wasi-sysroot/include/wasm32-wasi/sys/socket.h
+share/wasi-sysroot/include/wasm32-wasi/sys/stat.h
+share/wasi-sysroot/include/wasm32-wasi/sys/statvfs.h
+share/wasi-sysroot/include/wasm32-wasi/sys/stropts.h
+share/wasi-sysroot/include/wasm32-wasi/sys/syscall.h
+share/wasi-sysroot/include/wasm32-wasi/sys/sysinfo.h
+share/wasi-sysroot/include/wasm32-wasi/sys/time.h
+share/wasi-sysroot/include/wasm32-wasi/sys/timeb.h
+share/wasi-sysroot/include/wasm32-wasi/sys/times.h
+share/wasi-sysroot/include/wasm32-wasi/sys/timex.h
+share/wasi-sysroot/include/wasm32-wasi/sys/ttydefaults.h
+share/wasi-sysroot/include/wasm32-wasi/sys/types.h
+share/wasi-sysroot/include/wasm32-wasi/sys/uio.h
+share/wasi-sysroot/include/wasm32-wasi/sys/un.h
+share/wasi-sysroot/include/wasm32-wasi/sys/utsname.h
+share/wasi-sysroot/include/wasm32-wasi/syscall.h
+share/wasi-sysroot/include/wasm32-wasi/sysexits.h
+share/wasi-sysroot/include/wasm32-wasi/tar.h
+share/wasi-sysroot/include/wasm32-wasi/tgmath.h
+share/wasi-sysroot/include/wasm32-wasi/threads.h
+share/wasi-sysroot/include/wasm32-wasi/time.h
+share/wasi-sysroot/include/wasm32-wasi/uchar.h
+share/wasi-sysroot/include/wasm32-wasi/unistd.h
+share/wasi-sysroot/include/wasm32-wasi/utime.h
+share/wasi-sysroot/include/wasm32-wasi/values.h
+share/wasi-sysroot/include/wasm32-wasi/wasi/api.h
+share/wasi-sysroot/include/wasm32-wasi/wasi/libc-environ.h
+share/wasi-sysroot/include/wasm32-wasi/wasi/libc-find-relpath.h
+share/wasi-sysroot/include/wasm32-wasi/wasi/libc-nocwd.h
+share/wasi-sysroot/include/wasm32-wasi/wasi/libc.h
+share/wasi-sysroot/include/wasm32-wasi/wasi/wasip2.h
+share/wasi-sysroot/include/wasm32-wasi/wchar.h
+share/wasi-sysroot/include/wasm32-wasi/wctype.h
+share/wasi-sysroot/lib/wasm32-wasi/crt1-command.o
+share/wasi-sysroot/lib/wasm32-wasi/crt1-reactor.o
+share/wasi-sysroot/lib/wasm32-wasi/crt1.o
+share/wasi-sysroot/lib/wasm32-wasi/libc-printscan-long-double.a
+share/wasi-sysroot/lib/wasm32-wasi/libc-printscan-no-floating-point.a
+share/wasi-sysroot/lib/wasm32-wasi/libc.a
+share/wasi-sysroot/lib/wasm32-wasi/libc.imports
+share/wasi-sysroot/lib/wasm32-wasi/libcrypt.a
+share/wasi-sysroot/lib/wasm32-wasi/libdl.a
+share/wasi-sysroot/lib/wasm32-wasi/libm.a
+share/wasi-sysroot/lib/wasm32-wasi/libpthread.a
+share/wasi-sysroot/lib/wasm32-wasi/libresolv.a
+share/wasi-sysroot/lib/wasm32-wasi/librt.a
+share/wasi-sysroot/lib/wasm32-wasi/libsetjmp.a
+share/wasi-sysroot/lib/wasm32-wasi/libutil.a
+share/wasi-sysroot/lib/wasm32-wasi/libwasi-emulated-getpid.a
+share/wasi-sysroot/lib/wasm32-wasi/libwasi-emulated-mman.a
+share/wasi-sysroot/lib/wasm32-wasi/libwasi-emulated-process-clocks.a
+share/wasi-sysroot/lib/wasm32-wasi/libwasi-emulated-pthread.a
+share/wasi-sysroot/lib/wasm32-wasi/libwasi-emulated-signal.a
+share/wasi-sysroot/lib/wasm32-wasi/libxnet.a
+share/wasi-sysroot/share/wasm32-wasi/defined-symbols.txt
+share/wasi-sysroot/share/wasm32-wasi/include-all.c
+share/wasi-sysroot/share/wasm32-wasi/predefined-macros.txt
+share/wasi-sysroot/share/wasm32-wasi/undefined-symbols.txt
+@dir share/wasi-sysroot/include/wasm32-wasi/net
+@dir share/wasi-sysroot/include/wasm32-wasi/scsi
diff --git a/devel/wasi-libc/pkg-plist18 b/devel/wasi-libc/pkg-plist18
new file mode 100644
index 000000000000..de08ff484d88
--- /dev/null
+++ b/devel/wasi-libc/pkg-plist18
@@ -0,0 +1,247 @@
+share/wasi-sysroot/include/__stdarg___gnuc_va_list.h
+share/wasi-sysroot/include/__stdarg___va_copy.h
+share/wasi-sysroot/include/__stdarg_va_arg.h
+share/wasi-sysroot/include/__stdarg_va_copy.h
+share/wasi-sysroot/include/__stdarg_va_list.h
+share/wasi-sysroot/include/__stddef_max_align_t.h
+share/wasi-sysroot/include/__stddef_null.h
+share/wasi-sysroot/include/__stddef_nullptr_t.h
+share/wasi-sysroot/include/__stddef_offsetof.h
+share/wasi-sysroot/include/__stddef_ptrdiff_t.h
+share/wasi-sysroot/include/__stddef_rsize_t.h
+share/wasi-sysroot/include/__stddef_size_t.h
+share/wasi-sysroot/include/__stddef_unreachable.h
+share/wasi-sysroot/include/__stddef_wchar_t.h
+share/wasi-sysroot/include/__stddef_wint_t.h
+share/wasi-sysroot/include/stdarg.h
+share/wasi-sysroot/include/stddef.h
+share/wasi-sysroot/include/wasm32-wasi/__errno.h
+share/wasi-sysroot/include/wasm32-wasi/__errno_values.h
+share/wasi-sysroot/include/wasm32-wasi/__fd_set.h
+share/wasi-sysroot/include/wasm32-wasi/__function___isatty.h
+share/wasi-sysroot/include/wasm32-wasi/__functions_malloc.h
+share/wasi-sysroot/include/wasm32-wasi/__functions_memcpy.h
+share/wasi-sysroot/include/wasm32-wasi/__header_dirent.h
+share/wasi-sysroot/include/wasm32-wasi/__header_fcntl.h
+share/wasi-sysroot/include/wasm32-wasi/__header_inttypes.h
+share/wasi-sysroot/include/wasm32-wasi/__header_netinet_in.h
+share/wasi-sysroot/include/wasm32-wasi/__header_poll.h
+share/wasi-sysroot/include/wasm32-wasi/__header_stdlib.h
+share/wasi-sysroot/include/wasm32-wasi/__header_string.h
+share/wasi-sysroot/include/wasm32-wasi/__header_sys_ioctl.h
+share/wasi-sysroot/include/wasm32-wasi/__header_sys_resource.h
+share/wasi-sysroot/include/wasm32-wasi/__header_sys_socket.h
+share/wasi-sysroot/include/wasm32-wasi/__header_sys_stat.h
+share/wasi-sysroot/include/wasm32-wasi/__header_time.h
+share/wasi-sysroot/include/wasm32-wasi/__header_unistd.h
+share/wasi-sysroot/include/wasm32-wasi/__macro_FD_SETSIZE.h
+share/wasi-sysroot/include/wasm32-wasi/__macro_PAGESIZE.h
+share/wasi-sysroot/include/wasm32-wasi/__mode_t.h
+share/wasi-sysroot/include/wasm32-wasi/__seek.h
+share/wasi-sysroot/include/wasm32-wasi/__struct_dirent.h
+share/wasi-sysroot/include/wasm32-wasi/__struct_in6_addr.h
+share/wasi-sysroot/include/wasm32-wasi/__struct_in_addr.h
+share/wasi-sysroot/include/wasm32-wasi/__struct_iovec.h
+share/wasi-sysroot/include/wasm32-wasi/__struct_msghdr.h
+share/wasi-sysroot/include/wasm32-wasi/__struct_pollfd.h
+share/wasi-sysroot/include/wasm32-wasi/__struct_rusage.h
+share/wasi-sysroot/include/wasm32-wasi/__struct_sockaddr.h
+share/wasi-sysroot/include/wasm32-wasi/__struct_sockaddr_in.h
+share/wasi-sysroot/include/wasm32-wasi/__struct_sockaddr_in6.h
+share/wasi-sysroot/include/wasm32-wasi/__struct_sockaddr_storage.h
+share/wasi-sysroot/include/wasm32-wasi/__struct_sockaddr_un.h
+share/wasi-sysroot/include/wasm32-wasi/__struct_stat.h
+share/wasi-sysroot/include/wasm32-wasi/__struct_timespec.h
+share/wasi-sysroot/include/wasm32-wasi/__struct_timeval.h
+share/wasi-sysroot/include/wasm32-wasi/__struct_tm.h
+share/wasi-sysroot/include/wasm32-wasi/__struct_tms.h
+share/wasi-sysroot/include/wasm32-wasi/__typedef_DIR.h
+share/wasi-sysroot/include/wasm32-wasi/__typedef_blkcnt_t.h
+share/wasi-sysroot/include/wasm32-wasi/__typedef_blksize_t.h
+share/wasi-sysroot/include/wasm32-wasi/__typedef_clock_t.h
+share/wasi-sysroot/include/wasm32-wasi/__typedef_clockid_t.h
+share/wasi-sysroot/include/wasm32-wasi/__typedef_dev_t.h
+share/wasi-sysroot/include/wasm32-wasi/__typedef_fd_set.h
+share/wasi-sysroot/include/wasm32-wasi/__typedef_gid_t.h
+share/wasi-sysroot/include/wasm32-wasi/__typedef_in_addr_t.h
+share/wasi-sysroot/include/wasm32-wasi/__typedef_in_port_t.h
+share/wasi-sysroot/include/wasm32-wasi/__typedef_ino_t.h
+share/wasi-sysroot/include/wasm32-wasi/__typedef_mode_t.h
+share/wasi-sysroot/include/wasm32-wasi/__typedef_nfds_t.h
+share/wasi-sysroot/include/wasm32-wasi/__typedef_nlink_t.h
+share/wasi-sysroot/include/wasm32-wasi/__typedef_off_t.h
+share/wasi-sysroot/include/wasm32-wasi/__typedef_sa_family_t.h
+share/wasi-sysroot/include/wasm32-wasi/__typedef_sigset_t.h
+share/wasi-sysroot/include/wasm32-wasi/__typedef_socklen_t.h
+share/wasi-sysroot/include/wasm32-wasi/__typedef_ssize_t.h
+share/wasi-sysroot/include/wasm32-wasi/__typedef_suseconds_t.h
+share/wasi-sysroot/include/wasm32-wasi/__typedef_time_t.h
+share/wasi-sysroot/include/wasm32-wasi/__typedef_uid_t.h
+share/wasi-sysroot/include/wasm32-wasi/__wasi_snapshot.h
+share/wasi-sysroot/include/wasm32-wasi/alloca.h
+share/wasi-sysroot/include/wasm32-wasi/ar.h
+share/wasi-sysroot/include/wasm32-wasi/arpa/ftp.h
+share/wasi-sysroot/include/wasm32-wasi/arpa/inet.h
+share/wasi-sysroot/include/wasm32-wasi/arpa/nameser.h
+share/wasi-sysroot/include/wasm32-wasi/arpa/nameser_compat.h
+share/wasi-sysroot/include/wasm32-wasi/arpa/telnet.h
+share/wasi-sysroot/include/wasm32-wasi/arpa/tftp.h
+share/wasi-sysroot/include/wasm32-wasi/assert.h
+share/wasi-sysroot/include/wasm32-wasi/bits/alltypes.h
+share/wasi-sysroot/include/wasm32-wasi/bits/dirent.h
+share/wasi-sysroot/include/wasm32-wasi/bits/fcntl.h
+share/wasi-sysroot/include/wasm32-wasi/bits/fenv.h
+share/wasi-sysroot/include/wasm32-wasi/bits/float.h
+share/wasi-sysroot/include/wasm32-wasi/bits/hwcap.h
+share/wasi-sysroot/include/wasm32-wasi/bits/io.h
+share/wasi-sysroot/include/wasm32-wasi/bits/ioctl.h
+share/wasi-sysroot/include/wasm32-wasi/bits/ioctl_fix.h
+share/wasi-sysroot/include/wasm32-wasi/bits/ipcstat.h
+share/wasi-sysroot/include/wasm32-wasi/bits/limits.h
+share/wasi-sysroot/include/wasm32-wasi/bits/mman.h
+share/wasi-sysroot/include/wasm32-wasi/bits/poll.h
+share/wasi-sysroot/include/wasm32-wasi/bits/posix.h
+share/wasi-sysroot/include/wasm32-wasi/bits/reg.h
+share/wasi-sysroot/include/wasm32-wasi/bits/resource.h
+share/wasi-sysroot/include/wasm32-wasi/bits/setjmp.h
+share/wasi-sysroot/include/wasm32-wasi/bits/signal.h
+share/wasi-sysroot/include/wasm32-wasi/bits/socket.h
+share/wasi-sysroot/include/wasm32-wasi/bits/stat.h
+share/wasi-sysroot/include/wasm32-wasi/bits/stdint.h
+share/wasi-sysroot/include/wasm32-wasi/byteswap.h
+share/wasi-sysroot/include/wasm32-wasi/complex.h
+share/wasi-sysroot/include/wasm32-wasi/cpio.h
+share/wasi-sysroot/include/wasm32-wasi/crypt.h
+share/wasi-sysroot/include/wasm32-wasi/ctype.h
+share/wasi-sysroot/include/wasm32-wasi/dirent.h
+share/wasi-sysroot/include/wasm32-wasi/dlfcn.h
+share/wasi-sysroot/include/wasm32-wasi/endian.h
+share/wasi-sysroot/include/wasm32-wasi/err.h
+share/wasi-sysroot/include/wasm32-wasi/errno.h
+share/wasi-sysroot/include/wasm32-wasi/fcntl.h
+share/wasi-sysroot/include/wasm32-wasi/features.h
+share/wasi-sysroot/include/wasm32-wasi/fenv.h
+share/wasi-sysroot/include/wasm32-wasi/float.h
+share/wasi-sysroot/include/wasm32-wasi/fmtmsg.h
+share/wasi-sysroot/include/wasm32-wasi/fnmatch.h
+share/wasi-sysroot/include/wasm32-wasi/fts.h
+share/wasi-sysroot/include/wasm32-wasi/ftw.h
+share/wasi-sysroot/include/wasm32-wasi/getopt.h
+share/wasi-sysroot/include/wasm32-wasi/glob.h
+share/wasi-sysroot/include/wasm32-wasi/iconv.h
+share/wasi-sysroot/include/wasm32-wasi/ifaddrs.h
+share/wasi-sysroot/include/wasm32-wasi/inttypes.h
+share/wasi-sysroot/include/wasm32-wasi/iso646.h
+share/wasi-sysroot/include/wasm32-wasi/langinfo.h
+share/wasi-sysroot/include/wasm32-wasi/libgen.h
+share/wasi-sysroot/include/wasm32-wasi/limits.h
+share/wasi-sysroot/include/wasm32-wasi/locale.h
+share/wasi-sysroot/include/wasm32-wasi/malloc.h
+share/wasi-sysroot/include/wasm32-wasi/math.h
+share/wasi-sysroot/include/wasm32-wasi/memory.h
+share/wasi-sysroot/include/wasm32-wasi/monetary.h
+share/wasi-sysroot/include/wasm32-wasi/mqueue.h
+share/wasi-sysroot/include/wasm32-wasi/netinet/icmp6.h
+share/wasi-sysroot/include/wasm32-wasi/netinet/igmp.h
+share/wasi-sysroot/include/wasm32-wasi/netinet/in.h
+share/wasi-sysroot/include/wasm32-wasi/netinet/in_systm.h
+share/wasi-sysroot/include/wasm32-wasi/netinet/ip.h
+share/wasi-sysroot/include/wasm32-wasi/netinet/ip6.h
+share/wasi-sysroot/include/wasm32-wasi/netinet/ip_icmp.h
+share/wasi-sysroot/include/wasm32-wasi/netinet/tcp.h
+share/wasi-sysroot/include/wasm32-wasi/netinet/udp.h
+share/wasi-sysroot/include/wasm32-wasi/netpacket/packet.h
+share/wasi-sysroot/include/wasm32-wasi/nl_types.h
+share/wasi-sysroot/include/wasm32-wasi/poll.h
+share/wasi-sysroot/include/wasm32-wasi/pthread.h
+share/wasi-sysroot/include/wasm32-wasi/regex.h
+share/wasi-sysroot/include/wasm32-wasi/sched.h
+share/wasi-sysroot/include/wasm32-wasi/search.h
+share/wasi-sysroot/include/wasm32-wasi/semaphore.h
+share/wasi-sysroot/include/wasm32-wasi/setjmp.h
+share/wasi-sysroot/include/wasm32-wasi/signal.h
+share/wasi-sysroot/include/wasm32-wasi/stdalign.h
+share/wasi-sysroot/include/wasm32-wasi/stdbool.h
+share/wasi-sysroot/include/wasm32-wasi/stdc-predef.h
+share/wasi-sysroot/include/wasm32-wasi/stdint.h
+share/wasi-sysroot/include/wasm32-wasi/stdio.h
+share/wasi-sysroot/include/wasm32-wasi/stdio_ext.h
+share/wasi-sysroot/include/wasm32-wasi/stdlib.h
+share/wasi-sysroot/include/wasm32-wasi/stdnoreturn.h
+share/wasi-sysroot/include/wasm32-wasi/string.h
+share/wasi-sysroot/include/wasm32-wasi/strings.h
+share/wasi-sysroot/include/wasm32-wasi/stropts.h
+share/wasi-sysroot/include/wasm32-wasi/sys/dir.h
+share/wasi-sysroot/include/wasm32-wasi/sys/errno.h
+share/wasi-sysroot/include/wasm32-wasi/sys/eventfd.h
+share/wasi-sysroot/include/wasm32-wasi/sys/fcntl.h
+share/wasi-sysroot/include/wasm32-wasi/sys/file.h
+share/wasi-sysroot/include/wasm32-wasi/sys/ioctl.h
+share/wasi-sysroot/include/wasm32-wasi/sys/mman.h
+share/wasi-sysroot/include/wasm32-wasi/sys/param.h
+share/wasi-sysroot/include/wasm32-wasi/sys/poll.h
+share/wasi-sysroot/include/wasm32-wasi/sys/random.h
+share/wasi-sysroot/include/wasm32-wasi/sys/reg.h
+share/wasi-sysroot/include/wasm32-wasi/sys/resource.h
+share/wasi-sysroot/include/wasm32-wasi/sys/select.h
+share/wasi-sysroot/include/wasm32-wasi/sys/signal.h
+share/wasi-sysroot/include/wasm32-wasi/sys/socket.h
+share/wasi-sysroot/include/wasm32-wasi/sys/stat.h
+share/wasi-sysroot/include/wasm32-wasi/sys/statvfs.h
+share/wasi-sysroot/include/wasm32-wasi/sys/stropts.h
+share/wasi-sysroot/include/wasm32-wasi/sys/syscall.h
+share/wasi-sysroot/include/wasm32-wasi/sys/sysinfo.h
+share/wasi-sysroot/include/wasm32-wasi/sys/time.h
+share/wasi-sysroot/include/wasm32-wasi/sys/timeb.h
+share/wasi-sysroot/include/wasm32-wasi/sys/times.h
+share/wasi-sysroot/include/wasm32-wasi/sys/timex.h
+share/wasi-sysroot/include/wasm32-wasi/sys/ttydefaults.h
+share/wasi-sysroot/include/wasm32-wasi/sys/types.h
+share/wasi-sysroot/include/wasm32-wasi/sys/uio.h
+share/wasi-sysroot/include/wasm32-wasi/sys/un.h
+share/wasi-sysroot/include/wasm32-wasi/sys/utsname.h
+share/wasi-sysroot/include/wasm32-wasi/syscall.h
+share/wasi-sysroot/include/wasm32-wasi/sysexits.h
+share/wasi-sysroot/include/wasm32-wasi/tar.h
+share/wasi-sysroot/include/wasm32-wasi/tgmath.h
+share/wasi-sysroot/include/wasm32-wasi/threads.h
+share/wasi-sysroot/include/wasm32-wasi/time.h
+share/wasi-sysroot/include/wasm32-wasi/uchar.h
+share/wasi-sysroot/include/wasm32-wasi/unistd.h
+share/wasi-sysroot/include/wasm32-wasi/utime.h
+share/wasi-sysroot/include/wasm32-wasi/values.h
+share/wasi-sysroot/include/wasm32-wasi/wasi/api.h
+share/wasi-sysroot/include/wasm32-wasi/wasi/libc-environ.h
+share/wasi-sysroot/include/wasm32-wasi/wasi/libc-find-relpath.h
+share/wasi-sysroot/include/wasm32-wasi/wasi/libc-nocwd.h
+share/wasi-sysroot/include/wasm32-wasi/wasi/libc.h
+share/wasi-sysroot/include/wasm32-wasi/wasi/wasip2.h
+share/wasi-sysroot/include/wasm32-wasi/wchar.h
+share/wasi-sysroot/include/wasm32-wasi/wctype.h
+share/wasi-sysroot/lib/wasm32-wasi/crt1-command.o
+share/wasi-sysroot/lib/wasm32-wasi/crt1-reactor.o
+share/wasi-sysroot/lib/wasm32-wasi/crt1.o
+share/wasi-sysroot/lib/wasm32-wasi/libc-printscan-long-double.a
+share/wasi-sysroot/lib/wasm32-wasi/libc-printscan-no-floating-point.a
+share/wasi-sysroot/lib/wasm32-wasi/libc.a
+share/wasi-sysroot/lib/wasm32-wasi/libc.imports
+share/wasi-sysroot/lib/wasm32-wasi/libcrypt.a
+share/wasi-sysroot/lib/wasm32-wasi/libdl.a
+share/wasi-sysroot/lib/wasm32-wasi/libm.a
+share/wasi-sysroot/lib/wasm32-wasi/libpthread.a
+share/wasi-sysroot/lib/wasm32-wasi/libresolv.a
+share/wasi-sysroot/lib/wasm32-wasi/librt.a
+share/wasi-sysroot/lib/wasm32-wasi/libsetjmp.a
+share/wasi-sysroot/lib/wasm32-wasi/libutil.a
+share/wasi-sysroot/lib/wasm32-wasi/libwasi-emulated-getpid.a
+share/wasi-sysroot/lib/wasm32-wasi/libwasi-emulated-mman.a
+share/wasi-sysroot/lib/wasm32-wasi/libwasi-emulated-process-clocks.a
+share/wasi-sysroot/lib/wasm32-wasi/libwasi-emulated-pthread.a
+share/wasi-sysroot/lib/wasm32-wasi/libwasi-emulated-signal.a
+share/wasi-sysroot/lib/wasm32-wasi/libxnet.a
+share/wasi-sysroot/share/wasm32-wasi/defined-symbols.txt
+share/wasi-sysroot/share/wasm32-wasi/include-all.c
+share/wasi-sysroot/share/wasm32-wasi/predefined-macros.txt
+share/wasi-sysroot/share/wasm32-wasi/undefined-symbols.txt
+@dir share/wasi-sysroot/include/wasm32-wasi/net
+@dir share/wasi-sysroot/include/wasm32-wasi/scsi
diff --git a/devel/wasi-libc/pkg-plist19 b/devel/wasi-libc/pkg-plist19
new file mode 100644
index 000000000000..f0b2808b051d
--- /dev/null
+++ b/devel/wasi-libc/pkg-plist19
@@ -0,0 +1,249 @@
+share/wasi-sysroot/include/__stdarg___gnuc_va_list.h
+share/wasi-sysroot/include/__stdarg___va_copy.h
+share/wasi-sysroot/include/__stdarg_header_macro.h
+share/wasi-sysroot/include/__stdarg_va_arg.h
+share/wasi-sysroot/include/__stdarg_va_copy.h
+share/wasi-sysroot/include/__stdarg_va_list.h
+share/wasi-sysroot/include/__stddef_header_macro.h
+share/wasi-sysroot/include/__stddef_max_align_t.h
+share/wasi-sysroot/include/__stddef_null.h
+share/wasi-sysroot/include/__stddef_nullptr_t.h
+share/wasi-sysroot/include/__stddef_offsetof.h
+share/wasi-sysroot/include/__stddef_ptrdiff_t.h
+share/wasi-sysroot/include/__stddef_rsize_t.h
+share/wasi-sysroot/include/__stddef_size_t.h
+share/wasi-sysroot/include/__stddef_unreachable.h
+share/wasi-sysroot/include/__stddef_wchar_t.h
+share/wasi-sysroot/include/__stddef_wint_t.h
+share/wasi-sysroot/include/stdarg.h
+share/wasi-sysroot/include/stddef.h
+share/wasi-sysroot/include/wasm32-wasi/__errno.h
+share/wasi-sysroot/include/wasm32-wasi/__errno_values.h
+share/wasi-sysroot/include/wasm32-wasi/__fd_set.h
+share/wasi-sysroot/include/wasm32-wasi/__function___isatty.h
+share/wasi-sysroot/include/wasm32-wasi/__functions_malloc.h
+share/wasi-sysroot/include/wasm32-wasi/__functions_memcpy.h
+share/wasi-sysroot/include/wasm32-wasi/__header_dirent.h
+share/wasi-sysroot/include/wasm32-wasi/__header_fcntl.h
+share/wasi-sysroot/include/wasm32-wasi/__header_inttypes.h
+share/wasi-sysroot/include/wasm32-wasi/__header_netinet_in.h
+share/wasi-sysroot/include/wasm32-wasi/__header_poll.h
+share/wasi-sysroot/include/wasm32-wasi/__header_stdlib.h
+share/wasi-sysroot/include/wasm32-wasi/__header_string.h
+share/wasi-sysroot/include/wasm32-wasi/__header_sys_ioctl.h
+share/wasi-sysroot/include/wasm32-wasi/__header_sys_resource.h
+share/wasi-sysroot/include/wasm32-wasi/__header_sys_socket.h
+share/wasi-sysroot/include/wasm32-wasi/__header_sys_stat.h
+share/wasi-sysroot/include/wasm32-wasi/__header_time.h
+share/wasi-sysroot/include/wasm32-wasi/__header_unistd.h
+share/wasi-sysroot/include/wasm32-wasi/__macro_FD_SETSIZE.h
+share/wasi-sysroot/include/wasm32-wasi/__macro_PAGESIZE.h
+share/wasi-sysroot/include/wasm32-wasi/__mode_t.h
+share/wasi-sysroot/include/wasm32-wasi/__seek.h
+share/wasi-sysroot/include/wasm32-wasi/__struct_dirent.h
+share/wasi-sysroot/include/wasm32-wasi/__struct_in6_addr.h
+share/wasi-sysroot/include/wasm32-wasi/__struct_in_addr.h
+share/wasi-sysroot/include/wasm32-wasi/__struct_iovec.h
+share/wasi-sysroot/include/wasm32-wasi/__struct_msghdr.h
+share/wasi-sysroot/include/wasm32-wasi/__struct_pollfd.h
+share/wasi-sysroot/include/wasm32-wasi/__struct_rusage.h
+share/wasi-sysroot/include/wasm32-wasi/__struct_sockaddr.h
+share/wasi-sysroot/include/wasm32-wasi/__struct_sockaddr_in.h
+share/wasi-sysroot/include/wasm32-wasi/__struct_sockaddr_in6.h
+share/wasi-sysroot/include/wasm32-wasi/__struct_sockaddr_storage.h
+share/wasi-sysroot/include/wasm32-wasi/__struct_sockaddr_un.h
+share/wasi-sysroot/include/wasm32-wasi/__struct_stat.h
+share/wasi-sysroot/include/wasm32-wasi/__struct_timespec.h
+share/wasi-sysroot/include/wasm32-wasi/__struct_timeval.h
+share/wasi-sysroot/include/wasm32-wasi/__struct_tm.h
+share/wasi-sysroot/include/wasm32-wasi/__struct_tms.h
+share/wasi-sysroot/include/wasm32-wasi/__typedef_DIR.h
+share/wasi-sysroot/include/wasm32-wasi/__typedef_blkcnt_t.h
+share/wasi-sysroot/include/wasm32-wasi/__typedef_blksize_t.h
+share/wasi-sysroot/include/wasm32-wasi/__typedef_clock_t.h
+share/wasi-sysroot/include/wasm32-wasi/__typedef_clockid_t.h
+share/wasi-sysroot/include/wasm32-wasi/__typedef_dev_t.h
+share/wasi-sysroot/include/wasm32-wasi/__typedef_fd_set.h
+share/wasi-sysroot/include/wasm32-wasi/__typedef_gid_t.h
+share/wasi-sysroot/include/wasm32-wasi/__typedef_in_addr_t.h
+share/wasi-sysroot/include/wasm32-wasi/__typedef_in_port_t.h
+share/wasi-sysroot/include/wasm32-wasi/__typedef_ino_t.h
+share/wasi-sysroot/include/wasm32-wasi/__typedef_mode_t.h
+share/wasi-sysroot/include/wasm32-wasi/__typedef_nfds_t.h
+share/wasi-sysroot/include/wasm32-wasi/__typedef_nlink_t.h
+share/wasi-sysroot/include/wasm32-wasi/__typedef_off_t.h
+share/wasi-sysroot/include/wasm32-wasi/__typedef_sa_family_t.h
+share/wasi-sysroot/include/wasm32-wasi/__typedef_sigset_t.h
+share/wasi-sysroot/include/wasm32-wasi/__typedef_socklen_t.h
+share/wasi-sysroot/include/wasm32-wasi/__typedef_ssize_t.h
+share/wasi-sysroot/include/wasm32-wasi/__typedef_suseconds_t.h
+share/wasi-sysroot/include/wasm32-wasi/__typedef_time_t.h
+share/wasi-sysroot/include/wasm32-wasi/__typedef_uid_t.h
+share/wasi-sysroot/include/wasm32-wasi/__wasi_snapshot.h
+share/wasi-sysroot/include/wasm32-wasi/alloca.h
+share/wasi-sysroot/include/wasm32-wasi/ar.h
+share/wasi-sysroot/include/wasm32-wasi/arpa/ftp.h
+share/wasi-sysroot/include/wasm32-wasi/arpa/inet.h
+share/wasi-sysroot/include/wasm32-wasi/arpa/nameser.h
+share/wasi-sysroot/include/wasm32-wasi/arpa/nameser_compat.h
+share/wasi-sysroot/include/wasm32-wasi/arpa/telnet.h
+share/wasi-sysroot/include/wasm32-wasi/arpa/tftp.h
+share/wasi-sysroot/include/wasm32-wasi/assert.h
+share/wasi-sysroot/include/wasm32-wasi/bits/alltypes.h
+share/wasi-sysroot/include/wasm32-wasi/bits/dirent.h
+share/wasi-sysroot/include/wasm32-wasi/bits/fcntl.h
+share/wasi-sysroot/include/wasm32-wasi/bits/fenv.h
+share/wasi-sysroot/include/wasm32-wasi/bits/float.h
+share/wasi-sysroot/include/wasm32-wasi/bits/hwcap.h
+share/wasi-sysroot/include/wasm32-wasi/bits/io.h
+share/wasi-sysroot/include/wasm32-wasi/bits/ioctl.h
+share/wasi-sysroot/include/wasm32-wasi/bits/ioctl_fix.h
+share/wasi-sysroot/include/wasm32-wasi/bits/ipcstat.h
+share/wasi-sysroot/include/wasm32-wasi/bits/limits.h
+share/wasi-sysroot/include/wasm32-wasi/bits/mman.h
+share/wasi-sysroot/include/wasm32-wasi/bits/poll.h
+share/wasi-sysroot/include/wasm32-wasi/bits/posix.h
+share/wasi-sysroot/include/wasm32-wasi/bits/reg.h
+share/wasi-sysroot/include/wasm32-wasi/bits/resource.h
+share/wasi-sysroot/include/wasm32-wasi/bits/setjmp.h
+share/wasi-sysroot/include/wasm32-wasi/bits/signal.h
+share/wasi-sysroot/include/wasm32-wasi/bits/socket.h
+share/wasi-sysroot/include/wasm32-wasi/bits/stat.h
+share/wasi-sysroot/include/wasm32-wasi/bits/stdint.h
+share/wasi-sysroot/include/wasm32-wasi/byteswap.h
+share/wasi-sysroot/include/wasm32-wasi/complex.h
+share/wasi-sysroot/include/wasm32-wasi/cpio.h
+share/wasi-sysroot/include/wasm32-wasi/crypt.h
+share/wasi-sysroot/include/wasm32-wasi/ctype.h
+share/wasi-sysroot/include/wasm32-wasi/dirent.h
+share/wasi-sysroot/include/wasm32-wasi/dlfcn.h
+share/wasi-sysroot/include/wasm32-wasi/endian.h
+share/wasi-sysroot/include/wasm32-wasi/err.h
+share/wasi-sysroot/include/wasm32-wasi/errno.h
+share/wasi-sysroot/include/wasm32-wasi/fcntl.h
+share/wasi-sysroot/include/wasm32-wasi/features.h
+share/wasi-sysroot/include/wasm32-wasi/fenv.h
+share/wasi-sysroot/include/wasm32-wasi/float.h
+share/wasi-sysroot/include/wasm32-wasi/fmtmsg.h
+share/wasi-sysroot/include/wasm32-wasi/fnmatch.h
+share/wasi-sysroot/include/wasm32-wasi/fts.h
+share/wasi-sysroot/include/wasm32-wasi/ftw.h
+share/wasi-sysroot/include/wasm32-wasi/getopt.h
+share/wasi-sysroot/include/wasm32-wasi/glob.h
+share/wasi-sysroot/include/wasm32-wasi/iconv.h
+share/wasi-sysroot/include/wasm32-wasi/ifaddrs.h
+share/wasi-sysroot/include/wasm32-wasi/inttypes.h
+share/wasi-sysroot/include/wasm32-wasi/iso646.h
+share/wasi-sysroot/include/wasm32-wasi/langinfo.h
+share/wasi-sysroot/include/wasm32-wasi/libgen.h
+share/wasi-sysroot/include/wasm32-wasi/limits.h
+share/wasi-sysroot/include/wasm32-wasi/locale.h
+share/wasi-sysroot/include/wasm32-wasi/malloc.h
+share/wasi-sysroot/include/wasm32-wasi/math.h
+share/wasi-sysroot/include/wasm32-wasi/memory.h
+share/wasi-sysroot/include/wasm32-wasi/monetary.h
+share/wasi-sysroot/include/wasm32-wasi/mqueue.h
+share/wasi-sysroot/include/wasm32-wasi/netinet/icmp6.h
+share/wasi-sysroot/include/wasm32-wasi/netinet/igmp.h
+share/wasi-sysroot/include/wasm32-wasi/netinet/in.h
+share/wasi-sysroot/include/wasm32-wasi/netinet/in_systm.h
+share/wasi-sysroot/include/wasm32-wasi/netinet/ip.h
+share/wasi-sysroot/include/wasm32-wasi/netinet/ip6.h
+share/wasi-sysroot/include/wasm32-wasi/netinet/ip_icmp.h
+share/wasi-sysroot/include/wasm32-wasi/netinet/tcp.h
+share/wasi-sysroot/include/wasm32-wasi/netinet/udp.h
+share/wasi-sysroot/include/wasm32-wasi/netpacket/packet.h
+share/wasi-sysroot/include/wasm32-wasi/nl_types.h
+share/wasi-sysroot/include/wasm32-wasi/poll.h
+share/wasi-sysroot/include/wasm32-wasi/pthread.h
+share/wasi-sysroot/include/wasm32-wasi/regex.h
+share/wasi-sysroot/include/wasm32-wasi/sched.h
+share/wasi-sysroot/include/wasm32-wasi/search.h
+share/wasi-sysroot/include/wasm32-wasi/semaphore.h
+share/wasi-sysroot/include/wasm32-wasi/setjmp.h
+share/wasi-sysroot/include/wasm32-wasi/signal.h
+share/wasi-sysroot/include/wasm32-wasi/stdalign.h
+share/wasi-sysroot/include/wasm32-wasi/stdbool.h
+share/wasi-sysroot/include/wasm32-wasi/stdc-predef.h
+share/wasi-sysroot/include/wasm32-wasi/stdint.h
+share/wasi-sysroot/include/wasm32-wasi/stdio.h
+share/wasi-sysroot/include/wasm32-wasi/stdio_ext.h
+share/wasi-sysroot/include/wasm32-wasi/stdlib.h
+share/wasi-sysroot/include/wasm32-wasi/stdnoreturn.h
+share/wasi-sysroot/include/wasm32-wasi/string.h
+share/wasi-sysroot/include/wasm32-wasi/strings.h
+share/wasi-sysroot/include/wasm32-wasi/stropts.h
+share/wasi-sysroot/include/wasm32-wasi/sys/dir.h
+share/wasi-sysroot/include/wasm32-wasi/sys/errno.h
+share/wasi-sysroot/include/wasm32-wasi/sys/eventfd.h
+share/wasi-sysroot/include/wasm32-wasi/sys/fcntl.h
+share/wasi-sysroot/include/wasm32-wasi/sys/file.h
+share/wasi-sysroot/include/wasm32-wasi/sys/ioctl.h
+share/wasi-sysroot/include/wasm32-wasi/sys/mman.h
+share/wasi-sysroot/include/wasm32-wasi/sys/param.h
+share/wasi-sysroot/include/wasm32-wasi/sys/poll.h
+share/wasi-sysroot/include/wasm32-wasi/sys/random.h
+share/wasi-sysroot/include/wasm32-wasi/sys/reg.h
+share/wasi-sysroot/include/wasm32-wasi/sys/resource.h
+share/wasi-sysroot/include/wasm32-wasi/sys/select.h
+share/wasi-sysroot/include/wasm32-wasi/sys/signal.h
+share/wasi-sysroot/include/wasm32-wasi/sys/socket.h
+share/wasi-sysroot/include/wasm32-wasi/sys/stat.h
+share/wasi-sysroot/include/wasm32-wasi/sys/statvfs.h
+share/wasi-sysroot/include/wasm32-wasi/sys/stropts.h
+share/wasi-sysroot/include/wasm32-wasi/sys/syscall.h
+share/wasi-sysroot/include/wasm32-wasi/sys/sysinfo.h
+share/wasi-sysroot/include/wasm32-wasi/sys/time.h
+share/wasi-sysroot/include/wasm32-wasi/sys/timeb.h
+share/wasi-sysroot/include/wasm32-wasi/sys/times.h
+share/wasi-sysroot/include/wasm32-wasi/sys/timex.h
+share/wasi-sysroot/include/wasm32-wasi/sys/ttydefaults.h
+share/wasi-sysroot/include/wasm32-wasi/sys/types.h
+share/wasi-sysroot/include/wasm32-wasi/sys/uio.h
+share/wasi-sysroot/include/wasm32-wasi/sys/un.h
+share/wasi-sysroot/include/wasm32-wasi/sys/utsname.h
+share/wasi-sysroot/include/wasm32-wasi/syscall.h
+share/wasi-sysroot/include/wasm32-wasi/sysexits.h
+share/wasi-sysroot/include/wasm32-wasi/tar.h
+share/wasi-sysroot/include/wasm32-wasi/tgmath.h
+share/wasi-sysroot/include/wasm32-wasi/threads.h
+share/wasi-sysroot/include/wasm32-wasi/time.h
+share/wasi-sysroot/include/wasm32-wasi/uchar.h
+share/wasi-sysroot/include/wasm32-wasi/unistd.h
+share/wasi-sysroot/include/wasm32-wasi/utime.h
+share/wasi-sysroot/include/wasm32-wasi/values.h
+share/wasi-sysroot/include/wasm32-wasi/wasi/api.h
+share/wasi-sysroot/include/wasm32-wasi/wasi/libc-environ.h
+share/wasi-sysroot/include/wasm32-wasi/wasi/libc-find-relpath.h
+share/wasi-sysroot/include/wasm32-wasi/wasi/libc-nocwd.h
+share/wasi-sysroot/include/wasm32-wasi/wasi/libc.h
+share/wasi-sysroot/include/wasm32-wasi/wasi/wasip2.h
+share/wasi-sysroot/include/wasm32-wasi/wchar.h
+share/wasi-sysroot/include/wasm32-wasi/wctype.h
+share/wasi-sysroot/lib/wasm32-wasi/crt1-command.o
+share/wasi-sysroot/lib/wasm32-wasi/crt1-reactor.o
+share/wasi-sysroot/lib/wasm32-wasi/crt1.o
+share/wasi-sysroot/lib/wasm32-wasi/libc-printscan-long-double.a
+share/wasi-sysroot/lib/wasm32-wasi/libc-printscan-no-floating-point.a
+share/wasi-sysroot/lib/wasm32-wasi/libc.a
+share/wasi-sysroot/lib/wasm32-wasi/libc.imports
+share/wasi-sysroot/lib/wasm32-wasi/libcrypt.a
+share/wasi-sysroot/lib/wasm32-wasi/libdl.a
+share/wasi-sysroot/lib/wasm32-wasi/libm.a
+share/wasi-sysroot/lib/wasm32-wasi/libpthread.a
+share/wasi-sysroot/lib/wasm32-wasi/libresolv.a
+share/wasi-sysroot/lib/wasm32-wasi/librt.a
+share/wasi-sysroot/lib/wasm32-wasi/libsetjmp.a
+share/wasi-sysroot/lib/wasm32-wasi/libutil.a
+share/wasi-sysroot/lib/wasm32-wasi/libwasi-emulated-getpid.a
+share/wasi-sysroot/lib/wasm32-wasi/libwasi-emulated-mman.a
+share/wasi-sysroot/lib/wasm32-wasi/libwasi-emulated-process-clocks.a
+share/wasi-sysroot/lib/wasm32-wasi/libwasi-emulated-pthread.a
+share/wasi-sysroot/lib/wasm32-wasi/libwasi-emulated-signal.a
+share/wasi-sysroot/lib/wasm32-wasi/libxnet.a
+share/wasi-sysroot/share/wasm32-wasi/defined-symbols.txt
+share/wasi-sysroot/share/wasm32-wasi/include-all.c
+share/wasi-sysroot/share/wasm32-wasi/predefined-macros.txt
+share/wasi-sysroot/share/wasm32-wasi/undefined-symbols.txt
+@dir share/wasi-sysroot/include/wasm32-wasi/net
+@dir share/wasi-sysroot/include/wasm32-wasi/scsi
diff --git a/devel/wasi-libcxx/Makefile b/devel/wasi-libcxx/Makefile
index c87c5f29c884..12d5d23ff82c 100644
--- a/devel/wasi-libcxx/Makefile
+++ b/devel/wasi-libcxx/Makefile
@@ -1,91 +1,91 @@
 PORTNAME=	libcxx
 DISTVERSION?=	0
 PORTREVISION?=	0
 CATEGORIES=	devel lang
 MASTER_SITES=	https://github.com/llvm/llvm-project/releases/download/llvmorg-${DISTVERSION:S/rc/-rc/}/ \
 		https://${PRE_}releases.llvm.org/${LLVM_RELEASE}/${RCDIR}/
 PKGNAMEPREFIX=	wasi-
 PKGNAMESUFFIX=	${LLVM_VERSION}
 DISTNAME=	llvm-project-${DISTVERSION}.src
 DISTFILES=	llvm-project-${DISTVERSION}.src${EXTRACT_SUFX}
 
 MAINTAINER=	vishwin@FreeBSD.org
 COMMENT=	C++ standard library for WebAssembly System Interface
 WWW=		https://llvm.org/
 
 LICENSE=	LLVM2
 LICENSE_NAME=	Apache License 2.0 with LLVM Exceptions
 LICENSE_FILE=	${WRKSRC}/llvm/LICENSE.TXT
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-BUILD_DEPENDS=	${WASI_SYSROOT}/include/stdarg.h:devel/wasi-libc
-
 USES=		cmake tar:xz
 
 .if ${DISTVERSION} == 0
 IGNORE=		is a meta port; there is nothing to build
 PKGNAMESUFFIX=	-master
 .else
-BUILD_DEPENDS+=	wasi-compiler-rt${LLVM_VERSION}>0:devel/wasi-compiler-rt${LLVM_VERSION}
+BUILD_DEPENDS=	${WASI_SYSROOT}/include/stdarg.h:devel/wasi-libc@${LLVM_VERSION} \
+		wasi-compiler-rt${LLVM_VERSION}>0:devel/wasi-compiler-rt${LLVM_VERSION}
 USES+=		llvm:${LLVM_SUFFIX}
 .endif
 
 LLVM_RELEASE=	${DISTVERSION:C/rc.*//}
 LLVM_SUFFIX=	${LLVM_RELEASE:C/\.[0-9]\.[0-9]$//}
 DISTINFO_FILE=	${PORTSDIR}/${LLVM_PORT}/distinfo
 SSP_UNSAFE=	yes
 NO_ARCH=	yes
 PLIST=		${.CURDIR}/pkg-plist
 
-CONFIGURE_ENV+=	CC="${CC}" CFLAGS="${CFLAGS}" \
-		CXX="${CXX}" CXXFLAGS="${CXXFLAGS}"
-CC=		${LOCALBASE}/bin/clang${LLVM_VERSION}
-CXX=		${LOCALBASE}/bin/clang++${LLVM_VERSION}
 WASI_SYSROOT=	${LOCALBASE}/share/wasi-sysroot
 TRIPLE=		wasm32-wasi
 WITHOUT_CPU_CFLAGS=	yes
 # try to sync with https://github.com/WebAssembly/wasi-sdk
-# Makefile and wasi-sdk.cmake
+# wasi-sdk.cmake and cmake/wasi-sdk-sysroot.cmake
 CMAKE_INSTALL_PREFIX=	${PREFIX}/share/wasi-sysroot
 CMAKE_SOURCE_PATH=	${WRKSRC}/runtimes
-CMAKE_ARGS=	-DCMAKE_AR=${LOCALBASE}/bin/llvm-ar${LLVM_VERSION} \
+CMAKE_ARGS=	-DCMAKE_SYSTEM_NAME=WASI \
+		-DCMAKE_SYSTEM_VERSION=1 \
+		-DCMAKE_SYSTEM_PROCESSOR=wasm32 \
+		-DCMAKE_AR=${LOCALBASE}/bin/llvm-ar${LLVM_VERSION} \
 		-DCMAKE_RANLIB=${LOCALBASE}/bin/llvm-ranlib${LLVM_VERSION} \
 		-DCMAKE_C_COMPILER_TARGET=${TRIPLE} \
 		-DCMAKE_CXX_COMPILER_TARGET=${TRIPLE} \
+		-DCMAKE_ASM_COMPILER_TARGET=${TRIPLE} \
 		-DCMAKE_FIND_ROOT_PATH_MODE_PROGRAM=NEVER \
+		-DCMAKE_FIND_ROOT_PATH_MODE_LIBRARY=ONLY \
 		-DCMAKE_FIND_ROOT_PATH_MODE_INCLUDE=ONLY \
 		-DCMAKE_FIND_ROOT_PATH_MODE_PACKAGE=ONLY \
 		-DCMAKE_C_COMPILER_WORKS=ON \
 		-DCMAKE_CXX_COMPILER_WORKS=ON \
-		-DCMAKE_STAGING_PREFIX=${CMAKE_INSTALL_PREFIX} \
-		-DLLVM_CONFIG_PATH=${LOCALBASE}/bin/${LLVM_CONFIG} \
+		-DCMAKE_SYSROOT=${WASI_SYSROOT} \
 		-DCXX_SUPPORTS_CXX11=ON \
 		-DLIBCXX_ENABLE_THREADS:BOOL=OFF \
 		-DLIBCXX_HAS_PTHREAD_API:BOOL=OFF \
 		-DLIBCXX_HAS_EXTERNAL_THREAD_API:BOOL=OFF \
 		-DLIBCXX_BUILD_EXTERNAL_THREAD_LIBRARY:BOOL=OFF \
 		-DLIBCXX_HAS_WIN32_THREAD_API:BOOL=OFF \
 		-DLLVM_COMPILER_CHECKED=ON \
 		-DLIBCXX_ENABLE_SHARED:BOOL=OFF \
 		-DLIBCXX_ENABLE_EXPERIMENTAL_LIBRARY:BOOL=OFF \
 		-DLIBCXX_ENABLE_EXCEPTIONS:BOOL=OFF \
 		-DLIBCXX_ENABLE_FILESYSTEM:BOOL=OFF \
 		-DLIBCXX_CXX_ABI=libcxxabi \
 		-DLIBCXX_HAS_MUSL_LIBC:BOOL=ON \
 		-DLIBCXX_ABI_VERSION=2 \
 		-DLIBCXXABI_ENABLE_EXCEPTIONS:BOOL=OFF \
 		-DLIBCXXABI_ENABLE_SHARED:BOOL=OFF \
 		-DLIBCXXABI_SILENT_TERMINATE:BOOL=ON \
 		-DLIBCXXABI_ENABLE_THREADS:BOOL=OFF \
 		-DLIBCXXABI_HAS_PTHREAD_API:BOOL=OFF \
 		-DLIBCXXABI_HAS_EXTERNAL_THREAD_API:BOOL=OFF \
 		-DLIBCXXABI_BUILD_EXTERNAL_THREAD_LIBRARY:BOOL=OFF \
 		-DLIBCXXABI_HAS_WIN32_THREAD_API:BOOL=OFF \
 		-DLIBCXXABI_USE_LLVM_UNWINDER:BOOL=OFF \
 		-DUNIX:BOOL=ON \
-		-DCMAKE_SYSROOT=${WASI_SYSROOT} \
 		-DLIBCXX_LIBDIR_SUFFIX=/${TRIPLE} \
 		-DLIBCXXABI_LIBDIR_SUFFIX=/${TRIPLE} \
+		-DLIBCXX_INCLUDE_TESTS=OFF \
+		-DLIBCXX_INCLUDE_BENCHMARKS=OFF \
 		-DLLVM_ENABLE_RUNTIMES="libcxx;libcxxabi"
 
 .include <bsd.port.mk>
diff --git a/devel/wasi-libcxx17/Makefile b/devel/wasi-libcxx17/Makefile
index a9198e632db2..8c682b125293 100644
--- a/devel/wasi-libcxx17/Makefile
+++ b/devel/wasi-libcxx17/Makefile
@@ -1,7 +1,7 @@
 # must sync with devel/llvm17
 DISTVERSION=	17.0.6
-PORTREVISION=	1
+PORTREVISION=	2
 
 MASTERDIR=	${.CURDIR}/../wasi-libcxx
 
 .include "${MASTERDIR}/Makefile"
diff --git a/devel/wasi-libcxx18/Makefile b/devel/wasi-libcxx18/Makefile
index a167ef85ce3c..dfdc11ed6177 100644
--- a/devel/wasi-libcxx18/Makefile
+++ b/devel/wasi-libcxx18/Makefile
@@ -1,6 +1,7 @@
 # must sync with devel/llvm18
 DISTVERSION=	18.1.8
+PORTREVISION=	1
 
 MASTERDIR=	${.CURDIR}/../wasi-libcxx
 
 .include "${MASTERDIR}/Makefile"
diff --git a/mail/thunderbird/Makefile b/mail/thunderbird/Makefile
index 19a1e556f6d8..0aefe9bb5e87 100644
--- a/mail/thunderbird/Makefile
+++ b/mail/thunderbird/Makefile
@@ -1,77 +1,78 @@
 PORTNAME=	thunderbird
 DISTVERSION=	128.3.2
+PORTREVISION=	1
 CATEGORIES=	mail news net-im wayland
 MASTER_SITES=	MOZILLA/${PORTNAME}/releases/${DISTVERSION}esr/source \
 		MOZILLA/${PORTNAME}/candidates/${DISTVERSION}esr-candidates/build1/source
 DISTFILES=	${DISTNAME}esr.source${EXTRACT_SUFX}
 
 MAINTAINER=	gecko@FreeBSD.org
 COMMENT=	Mozilla Thunderbird is standalone mail and news that stands above
 WWW=		https://www.mozilla.com/thunderbird/
 
 BUILD_DEPENDS=	nspr>=4.32:devel/nspr \
 		nss>=3.101:security/nss \
 		libevent>=2.1.8:devel/libevent \
 		harfbuzz>=8.5.0:print/harfbuzz \
 		graphite2>=1.3.14:graphics/graphite2 \
 		png>=1.6.43:graphics/png \
 		dav1d>=1.0.0:multimedia/dav1d \
 		libvpx>=1.14.0:multimedia/libvpx \
 		${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \
 		v4l_compat>0:multimedia/v4l_compat \
 		autoconf2.13:devel/autoconf2.13 \
 		nasm:devel/nasm \
 		yasm:devel/yasm \
 		zip:archivers/zip
 LIB_DEPENDS=	libjson-c.so:devel/json-c \
 		libbotan-2.so:security/botan2
 
 USE_GECKO=	gecko
 # cannot use system icu: calendar is completely broken by
 # https://unicode-org.atlassian.net/browse/ICU-22132 (fix not in 74.1)
 USE_MOZILLA=	-icu -sqlite
 CFLAGS_powerpc64le=	-DSQLITE_BYTEORDER=1234
 
 USES=		tar:xz
 
 MOZ_OPTIONS=	--enable-application=comm/mail --enable-official-branding
 MOZ_OPTIONS+=	--with-system-bz2 --with-system-jsonc --with-system-botan
 MOZ_MK_OPTIONS=	MOZ_THUNDERBIRD=1 MAIL_PKG_SHARED=1
 MOZ_EXPORT=		MOZ_THUNDERBIRD=1 MAIL_PKG_SHARED=1
 
 PORTNAME_ICON=	${MOZILLA}.png
 PORTNAME_ICON_SRC=	${PREFIX}/lib/${MOZILLA}/chrome/icons/default/default48.png
 
 SYSTEM_PREFS=	${FAKEDIR}/lib/${PORTNAME}/defaults/pref/${PORTNAME}.js
 
 OPTIONS_DEFAULT=CANBERRA
 
 .include "${.CURDIR}/../../www/firefox/Makefile.options"
 
 .include <bsd.port.options.mk>
 
 .if ${ARCH} == powerpc64
 MOZ_OPTIONS+=	--without-wasm-sandboxed-libraries
 .else
 BUILD_DEPENDS+=	${LOCALBASE}/share/wasi-sysroot/lib/wasm32-wasi/libc++abi.a:devel/wasi-libcxx${LLVM_VERSION} \
 		${LOCALBASE}/share/wasi-sysroot/lib/wasm32-wasi/libc.a:devel/wasi-libc \
 		wasi-compiler-rt${LLVM_VERSION}>0:devel/wasi-compiler-rt${LLVM_VERSION}
 MOZ_OPTIONS+=	--with-wasi-sysroot=${LOCALBASE}/share/wasi-sysroot
 .endif
 
 post-extract:
 	@${SED} -e 's|@PORTNAME_ICON@|${PORTNAME_ICON:R}|;s|@MOZILLA@|${MOZILLA}|' \
 		<${FILESDIR}/thunderbird.desktop.in >${WRKDIR}/${MOZILLA_EXEC_NAME}.desktop
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
 		${WRKSRC}/comm/mail/app/nsMailApp.cpp
 
 port-pre-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/defaults
 
 post-install:
 	${INSTALL_DATA} ${WRKDIR}/${MOZILLA_EXEC_NAME}.desktop ${STAGEDIR}${PREFIX}/share/applications
 	${LN} -sf ${PORTNAME_ICON_SRC} ${STAGEDIR}${PREFIX}/share/pixmaps/${PORTNAME_ICON}
 
 .include <bsd.port.mk>
diff --git a/www/firefox-esr/Makefile b/www/firefox-esr/Makefile
index 85250c06a86e..fc29ab326471 100644
--- a/www/firefox-esr/Makefile
+++ b/www/firefox-esr/Makefile
@@ -1,70 +1,71 @@
 PORTNAME=	firefox
 DISTVERSION=	128.3.1
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	www wayland
 MASTER_SITES=	MOZILLA/${PORTNAME}/releases/${DISTVERSION}esr/source \
 		MOZILLA/${PORTNAME}/candidates/${DISTVERSION}esr-candidates/build1/source
 PKGNAMESUFFIX=	-esr
 DISTFILES=	${DISTNAME}esr.source${EXTRACT_SUFX}
 
 MAINTAINER=	gecko@FreeBSD.org
 COMMENT=	Web browser based on the browser portion of Mozilla
 WWW=		https://www.mozilla.com/firefox
 
 BUILD_DEPENDS=	nspr>=4.32:devel/nspr \
 		nss>=3.101:security/nss \
 		icu>=73.1,1:devel/icu \
 		libevent>=2.1.8:devel/libevent \
 		harfbuzz>=8.5.0:print/harfbuzz \
 		graphite2>=1.3.14:graphics/graphite2 \
 		png>=1.6.43:graphics/png \
 		dav1d>=1.0.0:multimedia/dav1d \
 		libvpx>=1.14.0:multimedia/libvpx \
 		${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \
 		v4l_compat>0:multimedia/v4l_compat \
 		autoconf2.13:devel/autoconf2.13 \
 		nasm:devel/nasm \
 		yasm:devel/yasm \
 		zip:archivers/zip
 
 USE_GECKO=	gecko
 CPE_PRODUCT=	${PORTNAME}_esr
 CONFLICTS_INSTALL=	firefox
 USE_MOZILLA=	-sqlite
 CFLAGS_powerpc64le=	-DSQLITE_BYTEORDER=1234
 CONFIGURE_ENV+=	BINDGEN_CFLAGS="-I${LOCALBASE}/include"
 
 USES=		tar:xz
 
 FIREFOX_ICON=		${MOZILLA}.png
 FIREFOX_ICON_SRC=	${PREFIX}/lib/${MOZILLA}/browser/chrome/icons/default/default48.png
 FIREFOX_DESKTOP=	${MOZSRC}/taskcluster/docker/${MOZILLA}-snap/${MOZILLA}.desktop
 MOZ_OPTIONS=	--enable-application=browser \
 		--enable-official-branding
 
 .include "${.CURDIR}/../../www/firefox/Makefile.options"
 
 .include <bsd.port.options.mk>
 
 .if ${ARCH} == powerpc64
 MOZ_OPTIONS+=	--without-wasm-sandboxed-libraries
 .else
 BUILD_DEPENDS+= ${LOCALBASE}/share/wasi-sysroot/lib/wasm32-wasi/libc++abi.a:devel/wasi-libcxx${LLVM_VERSION} \
 		${LOCALBASE}/share/wasi-sysroot/lib/wasm32-wasi/libc.a:devel/wasi-libc \
 		wasi-compiler-rt${LLVM_VERSION}>0:devel/wasi-compiler-rt${LLVM_VERSION}
 MOZ_OPTIONS+=	--with-wasi-sysroot=${LOCALBASE}/share/wasi-sysroot
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's/%u/%U/' -e '/X-MultipleArgs/d' \
 		-e '/^Icon/s/=.*/=${FIREFOX_ICON:R}/' \
 		${FIREFOX_DESKTOP}
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
 		${WRKSRC}/browser/app/nsBrowserApp.cpp
 
 post-install:
 	${INSTALL_DATA} ${FIREFOX_DESKTOP} ${STAGEDIR}${PREFIX}/share/applications/
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/pixmaps
 	${LN} -sf ${FIREFOX_ICON_SRC} ${STAGEDIR}${PREFIX}/share/pixmaps/${FIREFOX_ICON}
 
 .include <bsd.port.mk>
diff --git a/www/firefox/Makefile b/www/firefox/Makefile
index f86f24307d33..bf31ec242ee0 100644
--- a/www/firefox/Makefile
+++ b/www/firefox/Makefile
@@ -1,72 +1,73 @@
 PORTNAME=	firefox
 DISTVERSION=	131.0.3
+PORTREVISION=	1
 PORTEPOCH=	2
 CATEGORIES=	www wayland
 MASTER_SITES=	MOZILLA/${PORTNAME}/releases/${DISTVERSION}${DISTVERSIONSUFFIX}/source \
 		MOZILLA/${PORTNAME}/candidates/${DISTVERSION}${DISTVERSIONSUFFIX}-candidates/build1/source
 DISTFILES=	${DISTNAME}.source${EXTRACT_SUFX}
 
 MAINTAINER=	gecko@FreeBSD.org
 COMMENT=	Web browser based on the browser portion of Mozilla
 WWW=		https://www.mozilla.com/firefox
 
 BUILD_DEPENDS=	nspr>=4.32:devel/nspr \
 		nss>=3.104:security/nss \
 		icu>=73.1:devel/icu \
 		libevent>=2.1.8:devel/libevent \
 		harfbuzz>=9.0.0:print/harfbuzz \
 		graphite2>=1.3.14:graphics/graphite2 \
 		png>=1.6.43:graphics/png \
 		dav1d>=1.0.0:multimedia/dav1d \
 		libvpx>=1.14.1:multimedia/libvpx \
 		${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \
 		v4l_compat>0:multimedia/v4l_compat \
 		autoconf2.13:devel/autoconf2.13 \
 		nasm:devel/nasm \
 		yasm:devel/yasm \
 		zip:archivers/zip
 
 USE_GECKO=	gecko
 CONFLICTS_INSTALL=	firefox-esr
 USE_MOZILLA=	-sqlite
 CFLAGS_powerpc64le=	-DSQLITE_BYTEORDER=1234
 # work around bindgen not finding ICU, e.g.
 # dist/include/mozilla/intl/ICU4CGlue.h:8:10: fatal error: 'unicode/uenum.h' file not found, err: true
 CONFIGURE_ENV+=	BINDGEN_CFLAGS="-I${LOCALBASE}/include"
 
 USES=		tar:xz
 # helpful when testing beta
 WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION}
 
 FIREFOX_ICON=		${MOZILLA}.png
 FIREFOX_ICON_SRC=	${PREFIX}/lib/${MOZILLA}/browser/chrome/icons/default/default48.png
 MOZ_OPTIONS=	--enable-application=browser \
 		--enable-official-branding
 
 .include "${.CURDIR}/../../www/firefox/Makefile.options"
 
 .include <bsd.port.options.mk>
 
 .if ${ARCH} == powerpc64
 MOZ_OPTIONS+=	--without-wasm-sandboxed-libraries
 .else
 BUILD_DEPENDS+=	${LOCALBASE}/share/wasi-sysroot/lib/wasm32-wasi/libc++abi.a:devel/wasi-libcxx${LLVM_VERSION} \
 		${LOCALBASE}/share/wasi-sysroot/lib/wasm32-wasi/libc.a:devel/wasi-libc \
 		wasi-compiler-rt${LLVM_VERSION}>0:devel/wasi-compiler-rt${LLVM_VERSION}
 MOZ_OPTIONS+=	--with-wasi-sysroot=${LOCALBASE}/share/wasi-sysroot
 .endif
 
 post-extract:
 	@${SED} -e 's|@FIREFOX_ICON@|${FIREFOX_ICON:R}|;s|@MOZILLA@|${MOZILLA}|' \
 		<${FILESDIR}/firefox.desktop.in >${WRKDIR}/${MOZILLA_EXEC_NAME}.desktop
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
 		${WRKSRC}/browser/app/nsBrowserApp.cpp
 
 post-install:
 	${INSTALL_DATA} ${WRKDIR}/${MOZILLA_EXEC_NAME}.desktop ${STAGEDIR}${PREFIX}/share/applications
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/pixmaps
 	${LN} -sf ${FIREFOX_ICON_SRC} ${STAGEDIR}${PREFIX}/share/pixmaps/${FIREFOX_ICON}
 
 .include <bsd.port.mk>
diff --git a/www/librewolf/Makefile b/www/librewolf/Makefile
index ad6c6289ab17..a2fe94cca6d6 100644
--- a/www/librewolf/Makefile
+++ b/www/librewolf/Makefile
@@ -1,103 +1,104 @@
 PORTNAME=	librewolf
 DISTVERSION=	131.0.2
 DISTVERSIONSUFFIX=	-1.source
+PORTREVISION=	1
 CATEGORIES=	www wayland
 MASTER_SITES=	https://gitlab.com/api/v4/projects/32320088/packages/generic/${PORTNAME}-source/${DISTVERSION}-1/
 
 MAINTAINER=	freebsd@sysctl.cz
 COMMENT=	Custom version of Firefox, focused on privacy, security and freedom
 WWW=		https://librewolf.net/
 
 LICENSE=	MPL20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	nspr>=4.32:devel/nspr \
 		nss>=3.104:security/nss \
 		icu>=73.1:devel/icu \
 		libevent>=2.1.8:devel/libevent \
 		harfbuzz>=9.0.0:print/harfbuzz \
 		graphite2>=1.3.14:graphics/graphite2 \
 		png>=1.6.43:graphics/png \
 		dav1d>=1.0.0:multimedia/dav1d \
 		libvpx>=1.14.1:multimedia/libvpx \
 		${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \
 		v4l_compat>0:multimedia/v4l_compat \
 		autoconf2.13:devel/autoconf2.13 \
 		nasm:devel/nasm \
 		yasm:devel/yasm \
 		zip:archivers/zip
 
 USE_GECKO=	gecko
 USE_MOZILLA=	-sqlite
 
 # work around bindgen not finding ICU, e.g.
 # dist/include/mozilla/intl/ICU4CGlue.h:8:10: fatal error: 'unicode/uenum.h' file not found, err: true
 CONFIGURE_ENV+=	BINDGEN_CFLAGS="-I${LOCALBASE}/include"
 CONFIGURE_ENV+=	MOZ_REQUIRE_SIGNING=""
 CFLAGS_powerpc64le=	-DSQLITE_BYTEORDER=1234
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION}-1
 
 MOZILLA_CAP=	${MOZILLA:C/^(.).*/\1/:tu}${MOZILLA:C/^.//}
 
 MOZ_EXPORT+=	MOZ_TELEMETRY_REPORTING="" \
 		MOZILLA_OFFICIAL="1" \
 		MOZ_OFFICIAL_BRANDING="1" \
 		MOZ_APP_DISPLAYNAME="${MOZILLA_CAP}" \
 		MOZ_APP_NAME="${MOZILLA}"
 
 MOZ_OPTIONS=	--enable-application=browser \
 		--allow-addon-sideload \
 		--disable-crashreporter \
 		--disable-debug \
 		--disable-default-browser-agent \
 		--disable-tests \
 		--disable-updater \
 		--enable-hardening \
 		--enable-optimize \
 		--enable-release \
 		--with-app-name=${MOZILLA} \
 		--with-branding=browser/branding/${MOZILLA} \
 		--with-unsigned-addon-scopes=app,system \
 		--enable-bootstrap \
 		MOZ_CRASHREPORTER=0 \
 		MOZ_DATA_REPORTING=0
 
 FIREFOX_ICON=		${MOZILLA}.png
 FIREFOX_ICON_SRC=	${PREFIX}/lib/${MOZILLA}/browser/chrome/icons/default/default48.png
 
 .include "${.CURDIR}/../../www/firefox/Makefile.options"
 
 .include <bsd.port.options.mk>
 
 .if ${ARCH} == amd64
 MOZ_OPTIONS+=	--enable-rust-simd
 .endif
 
 .if ${ARCH} == powerpc64
 CFLAGS+=	-DHWY_COMPILE_ONLY_SCALAR
 MOZ_OPTIONS+=	--without-wasm-sandboxed-libraries
 .else
 BUILD_DEPENDS+=	${LOCALBASE}/share/wasi-sysroot/lib/wasm32-wasi/libc++abi.a:devel/wasi-libcxx${LLVM_VERSION} \
 		${LOCALBASE}/share/wasi-sysroot/lib/wasm32-wasi/libc.a:devel/wasi-libc \
 		wasi-compiler-rt${LLVM_VERSION}>0:devel/wasi-compiler-rt${LLVM_VERSION}
 MOZ_OPTIONS+=	--with-wasi-sysroot=${LOCALBASE}/share/wasi-sysroot
 .endif
 
 post-extract:
 	@${SED} -e 's|@FIREFOX_ICON@|${FIREFOX_ICON:R}|;s|@MOZILLA@|${MOZILLA}|' \
 		-e 's|firefox|${MOZILLA}|' \
 		-e 's|Firefox|${MOZILLA_CAP}|' \
 		<${.CURDIR}/../firefox/files/firefox.desktop.in >${WRKDIR}/${MOZILLA_EXEC_NAME}.desktop
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
 		${WRKSRC}/browser/app/nsBrowserApp.cpp
 	@${RM} ${WRKSRC}/mozconfig
 
 post-install:
 	${INSTALL_DATA} ${WRKDIR}/${MOZILLA_EXEC_NAME}.desktop ${STAGEDIR}${PREFIX}/share/applications
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/pixmaps
 	${LN} -sf ${FIREFOX_ICON_SRC} ${STAGEDIR}${PREFIX}/share/pixmaps/${FIREFOX_ICON}
 
 .include <bsd.port.mk>
diff --git a/www/tor-browser/Makefile b/www/tor-browser/Makefile
index ce14768b6380..622d507a8de3 100644
--- a/www/tor-browser/Makefile
+++ b/www/tor-browser/Makefile
@@ -1,126 +1,126 @@
 PORTNAME=	tor-browser
 DISTVERSION=	13.5a9
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	www net security wayland
 MASTER_SITES=	TOR \
 		https://build-sources.tbb.torproject.org/:source1 \
 		LOCAL/jsm:source2
 MASTER_SITE_SUBDIR=	torbrowser/${DISTVERSION}
 DISTNAME=	src-firefox-tor-browser-115.12.0esr-13.5-1-build2
 DISTFILES=	${DISTNAME}.tar.xz \
 		manual_112141.zip:source1 \
 		firefox-tor-browser-13.0.1-build2-firefox-1l0n-out.tar:source2
 MAINTAINER=	freebsd@sysctl.cz
 COMMENT=	Tor Browser for FreeBSD
 WWW=		https://www.torproject.org/
 
 LICENSE=	MPL20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	nspr>=4.32:devel/nspr \
 		nss>=3.94:security/nss \
 		icu>=73.1:devel/icu \
 		libevent>=2.1.8:devel/libevent \
 		harfbuzz>=8.2.2:print/harfbuzz \
 		graphite2>=1.3.14:graphics/graphite2 \
 		png>=1.6.39:graphics/png \
 		dav1d>=1.0.0:multimedia/dav1d \
 		libvpx>=1.13.1:multimedia/libvpx \
 		${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \
 		v4l_compat>0:multimedia/v4l_compat \
 		autoconf2.13:devel/autoconf2.13 \
 		nasm:devel/nasm \
 		yasm:devel/yasm \
 		zip:archivers/zip
 USE_GITLAB=nodefault
 GL_SITE=	https://gitlab.torproject.org/
 GL_ACCOUNT=	tpo
 GL_PROJECT=	translation:basebrowser translation:torbrowser
 GL_TAGNAME=	3faf7dcd545109f7bbd8a6374838e139ca422d6c:basebrowser 51bc08246d73990d461f747fb3c8cc7b6f66c1f4:torbrowser
 RUN_DEPENDS=	tor:security/tor \
 		obfs4proxy:security/obfs4proxy-tor
 
 USES=		compiler:c++11-lib libtool \
 		perl5 pkgconfig python shebangfix localbase:ldflags tar:xz python:3
 USE_GECKO=	gecko
 
 SSP_UNSAFE=	yes
 
 SUB_FILES=	torrc-defaults tor-browser.desktop
 BUNDLE_LIBS=	yes
 
 USE_MOZILLA=	-sqlite
 MOZILLA_VER=115.4.0
 CFLAGS_powerpc64le=	-DSQLITE_BYTEORDER=1234
 CONFIGURE_ENV+=	BINDGEN_CFLAGS="-I${LOCALBASE}/include" \
 		MOZ_CHROME_MULTILOCALE="ar ca cs da de el es-ES fa fi fr ga-IE he hu id is it ja ka ko lt mk ms my nb-NO nl pl pt-BR ro ru sq sv-SE th tr uk vi zh-CN zh-TW en-US"
 MAKE_ENV+=	AB_CD="multi" \
 		LOCALES="ar ca cs da de el es-ES fa fi fr ga-IE he hu id is it ja ka ko lt mk ms my nb-NO nl pl pt-BR ro ru sq sv-SE th tr uk vi zh-CN zh-TW en-US"
 MOZ_EXPORT+=	MOZ_TELEMETRY_REPORTING="" \
 		MOZILLA_OFFICIAL="1" \
 		MOZ_OFFICIAL_BRANDING="1" \
 		MOZ_APP_DISPLAYNAME="Tor Browser" \
 		MOZ_APP_NAME="tor-browser" \
 		MOZ_CHROME_MULTILOCALE="ar ca cs da de el es-ES fa fi fr ga-IE he hu id is it ja ka ko lt mk ms my nb-NO nl pl pt-BR ro ru sq sv-SE th tr uk vi zh-CN zh-TW en-US"
 MOZ_OPTIONS=	--with-base-browser-version=${DISTVERSION} \
 	--enable-official-branding \
 	--enable-optimize \
 	--enable-bundled-fonts \
 	--disable-tests \
 	--disable-debug \
 	--disable-crashreporter \
 	--disable-webrtc \
 	--disable-parental-controls \
 	--enable-proxy-bypass-protection \
 	--disable-system-policies \
 	--disable-backgroundtasks \
 	--with-distribution-id=org.torproject \
 	--with-branding=browser/branding/tb-release
 
 WRKSRC=		${WRKDIR}/${DISTNAME:S/src-//}
 SHEBANG_FILES+=	mach
 .include	"${.CURDIR}/../../www/firefox/Makefile.options"
 .include <bsd.port.options.mk>
 
 .if ${ARCH} == amd64
 MOZ_OPTIONS+=	--enable-rust-simd
 .endif
 .if ${ARCH} == powerpc64
 MOZ_OPTIONS+=	--without-wasm-sandboxed-libraries
 .else
 BUILD_DEPENDS+=	${LOCALBASE}/share/wasi-sysroot/lib/wasm32-wasi/libc++abi.a:devel/wasi-libcxx${LLVM_VERSION} \
 		${LOCALBASE}/share/wasi-sysroot/lib/wasm32-wasi/libc.a:devel/wasi-libc \
 		wasi-compiler-rt${LLVM_VERSION}>0:devel/wasi-compiler-rt${LLVM_VERSION}
 MOZILLA_PLIST_DIRS=	bin lib share/pixmaps share/applications share/tor-browser
 MOZ_OPTIONS+=	--with-wasi-sysroot=${LOCALBASE}/share/wasi-sysroot
 .endif
 post-patch:
 	@${REINPLACE_CMD} 's|LOCALBASE|${LOCALBASE}|g' "${WRKSRC}/browser/app/profile/000-tor-browser.js"
 	${MKDIR} ${WRKSRC}/tmp-manual
 	unzip -d ${WRKSRC}/tmp-manual ${DISTDIR}/manual_112141.zip
 	${MKDIR} ${WRKSRC}/tmp-l10n-central
 	tar -C ${WRKSRC}/tmp-l10n-central -xf ${DISTDIR}/firefox-tor-browser-13.0.1-build2-firefox-1l0n-out.tar
 pre-configure:
 	@${REINPLACE_CMD} 's|export MOZ_GOOGLE_.*||g' ${WRKSRC}/.mozconfig
 	${PYTHON_CMD} ${FILESDIR}/packagemanual.py ${WRKSRC}/tmp-manual/public ${WRKSRC}/browser/base/content/manual
 post-build:
 	${MKDIR} -p ${WRKSRC}/../.mozbuild/l10n-central
 	find  ${WRKSRC}/tmp-l10n-central -name "*.tar.xz"  -exec tar -C ${WRKSRC}/../.mozbuild/l10n-central -xvf {} \;
 	cd ${WRKSRC}/../.build/ && MOZBUILD_STATE_PATH=${WRKSRC}/../.mozbuild MOZ_AUTOMATION="1" ${WRKSRC}/mach package-multi-locale  --locales ar ca cs da de el es-ES fa fi fr ga-IE he hu id is it ja ka ko lt mk ms my nb-NO nl pl pt-BR ro ru sq sv-SE th tr uk vi zh-CN zh-TW
 .for i in ar ca cs da de el es-ES fa fi fr ga-IE he hu id is it ja ka ko lt mk ms my nb-NO nl pl pt-BR ro ru sq sv-SE th tr uk vi zh-CN zh-TW
 	${CP} ${WRKDIR}/translation-3faf7dcd545109f7bbd8a6374838e139ca422d6c/${i}/base-browser.ftl ${WRKDIR}/.build/dist/bin/browser/localization/${i}/browser/base-browser.ftl
 	${CP} ${WRKDIR}/translation-3faf7dcd545109f7bbd8a6374838e139ca422d6c/${i}/newIdentity.properties ${WRKDIR}/.build/dist/bin/browser/chrome/${i}/locale/browser/newIdentity.properties
 	${CP} ${WRKDIR}/translation-3faf7dcd545109f7bbd8a6374838e139ca422d6c/${i}/securityLevel.properties ${WRKDIR}/.build/dist/bin/browser/chrome/${i}/locale/browser/securityLevel.properties
 	${MKDIR} ${WRKDIR}/.build/dist/bin/chrome/torbutton/locale/${i}/browser
 	test -f ${WRKDIR}/translation-51bc08246d73990d461f747fb3c8cc7b6f66c1f4/${i}/tor-browser.ftl && ${CP} ${WRKDIR}/translation-51bc08246d73990d461f747fb3c8cc7b6f66c1f4/${i}/tor-browser.ftl ${WRKDIR}/.build/dist/bin/browser/localization/${i}/browser/tor-browser.ftl 
 	${CP} ${WRKDIR}/translation-51bc08246d73990d461f747fb3c8cc7b6f66c1f4/${i}/cryptoSafetyPrompt.properties ${WRKDIR}/.build/dist/bin/browser/chrome/${i}/locale/browser/cryptoSafetyPrompt.properties
 .for j in brand.dtd aboutDialog.dtd aboutTBUpdate.dtd torbutton.dtd onboarding.properties brand.properties torlauncher.properties branding/brand.ftl rulesets.properties settings.properties torConnect.properties onionLocation.properties aboutTor.dtd torbutton.properties browserOnboarding.properties 
 	${MKDIR} ${WRKDIR}/.build/dist/bin/chrome/torbutton/locale/${i}/branding
 	${CP} ${WRKDIR}/translation-51bc08246d73990d461f747fb3c8cc7b6f66c1f4/${i}/${j} ${WRKDIR}/.build/dist/bin/chrome/torbutton/locale/${i}/${j}
 .endfor 
 .endfor
 post-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${WRKDIR}/torrc-defaults ${STAGEDIR}${DATADIR}/torrc-defaults
 	${INSTALL_DATA} ${WRKDIR}/tor-browser.desktop ${STAGEDIR}${PREFIX}/share/applications/tor-browser.desktop
 .include <bsd.port.mk>
diff --git a/www/waterfox/Makefile b/www/waterfox/Makefile
index 08539617489e..f696918ba8a3 100644
--- a/www/waterfox/Makefile
+++ b/www/waterfox/Makefile
@@ -1,106 +1,106 @@
 PORTNAME=	waterfox
 DISTVERSIONPREFIX=	G
 DISTVERSION=	6.0.19
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	www
 
 MAINTAINER=	freebsd@sysctl.cz
 COMMENT=	Distilled fork of Firefox
 WWW=		https://www.waterfox.net/
 
 LICENSE=	MPL20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	nspr>=4.32:devel/nspr \
 		nss>=3.95:security/nss \
 		icu>=74.2:devel/icu \
 		libevent>=2.1.8:devel/libevent \
 		harfbuzz>=8.3.0:print/harfbuzz \
 		graphite2>=1.3.14:graphics/graphite2 \
 		png>=1.6.39:graphics/png \
 		dav1d>=1.0.0:multimedia/dav1d \
 		libvpx>=1.13.0:multimedia/libvpx \
 		${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \
 		v4l_compat>0:multimedia/v4l_compat \
 		autoconf2.13:devel/autoconf2.13 \
 		nasm:devel/nasm \
 		yasm:devel/yasm \
 		zip:archivers/zip
 
 USE_GECKO=	gecko
 USE_GITHUB=	yes
 GH_ACCOUNT=	BrowserWorks
 GH_PROJECT=	Waterfox
 USE_MOZILLA=	-sqlite
 
 # work around bindgen not finding ICU, e.g.
 # dist/include/mozilla/intl/ICU4CGlue.h:8:10: fatal error: 'unicode/uenum.h' file not found, err: true
 CONFIGURE_ENV+=		BINDGEN_CFLAGS="-I${LOCALBASE}/include" \
 			MOZ_REQUIRE_SIGNING=""
 
 CFLAGS_powerpc64le=	-DSQLITE_BYTEORDER=1234
 
 BINARY_ALIAS+=		python3=${PYTHON_CMD}
 
 MOZILLA_CAP=	${MOZILLA:C/^(.).*/\1/:tu}${MOZILLA:C/^.//}
 
 MOZ_EXPORT+=	MOZ_TELEMETRY_REPORTING="" \
 		MOZILLA_OFFICIAL="1" \
 		MOZ_OFFICIAL_BRANDING="1" \
 		MOZ_APP_DISPLAYNAME="${MOZILLA_CAP}" \
 		MOZ_APP_NAME="${MOZILLA}"
 
 MOZ_OPTIONS+=	--enable-application=browser \
 		--allow-addon-sideload \
 		--disable-crashreporter \
 		--disable-debug \
 		--disable-default-browser-agent \
 		--disable-tests \
 		--disable-updater \
 		--enable-hardening \
 		--enable-optimize \
 		--enable-release \
 		--with-app-name=${MOZILLA} \
 		--with-unsigned-addon-scopes=app,system \
 		--enable-bootstrap \
 		MOZ_CRASHREPORTER=0 \
 		MOZ_DATA_REPORTING=0
 
 FIREFOX_ICON=		${MOZILLA}.png
 FIREFOX_ICON_SRC=	${PREFIX}/lib/${MOZILLA}/browser/chrome/icons/default/default48.png
 FIREFOX_DESKTOP=	${MOZSRC}/taskcluster/docker/firefox-snap/firefox.desktop
 
 .include "${.CURDIR}/../../www/firefox/Makefile.options"
 
 .include <bsd.port.options.mk>
 
 .if ${ARCH} == amd64
 MOZ_OPTIONS+=	--enable-rust-simd
 .endif
 
 .if ${ARCH} == powerpc64
 CFLAGS+=	-DHWY_COMPILE_ONLY_SCALAR
 MOZ_OPTIONS+=	--without-wasm-sandboxed-libraries
 .else
 BUILD_DEPENDS+=	${LOCALBASE}/share/wasi-sysroot/lib/wasm32-wasi/libc++abi.a:devel/wasi-libcxx${LLVM_VERSION} \
 		${LOCALBASE}/share/wasi-sysroot/lib/wasm32-wasi/libc.a:devel/wasi-libc \
 		wasi-compiler-rt${LLVM_VERSION}>0:devel/wasi-compiler-rt${LLVM_VERSION}
 MOZ_OPTIONS+=	--with-wasi-sysroot=${LOCALBASE}/share/wasi-sysroot
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's/%u/%U/' -e '/X-MultipleArgs/d' \
 		-e 's/firefox/${MOZILLA}/' \
 		-e 's/Firefox/${MOZILLA_CAP}/' \
 		-e '/^Icon/s/=.*/=${FIREFOX_ICON:R}/' \
 		${FIREFOX_DESKTOP}
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
 		${WRKSRC}/browser/app/nsBrowserApp.cpp
 
 post-install:
 	${INSTALL_DATA} ${FIREFOX_DESKTOP} ${STAGEDIR}${PREFIX}/share/applications/${MOZILLA}.desktop
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/pixmaps
 	${LN} -sf ${FIREFOX_ICON_SRC} ${STAGEDIR}${PREFIX}/share/pixmaps/${FIREFOX_ICON}
 
 .include <bsd.port.mk>