Re: git: 126e6a3e5bc4 - main - devel/wasi-libc: update to sdk-34

In reply to: Charlie Li : "git: 126e6a3e5bc4 - main - devel/wasi-libc: update to sdk-34"
Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Dima Panov <fluffy_at_FreeBSD.org>
Date: Tue, 01 Sep 2026 18:03:44 UTC
Hello!

After this update any gecko (firefox, thunderbird, librewolf) fails to build with same error:

/usr/local/bin/clang++21 -std=gnu++20 --target=wasm32-wasip1 --sysroot=/usr/local/share/wasi-sysroot -o rlbox.wasm -Wl,--export-all -Wl,--stack-first -Wl,-z,stack-size=262144 -Wl,--no-entry -Wl,--import-memory -Wl,--impo
rt-table ogg_alloc.wasm ogg_bitwise.wasm ogg_framing.wasm moz_xmlparse.wasm moz_xmltok.wasm xmlrole.wasm wasm2c_sandbox_wrapper.wasm mozHunspellRLBoxSandbox.wasm affentry.wasm affixmgr.wasm csutil.wasm hashmgr.wasm hunsp
ell.wasm phonet.wasm replist.wasm suggestmgr.wasm GraphiteExtra.wasm CmapCache.wasm Code.wasm Collider.wasm Decompressor.wasm Face.wasm FeatureMap.wasm Font.wasm GlyphCache.wasm GlyphFace.wasm Intervals.wasm Justifier.wa
sm NameTable.wasm Pass.wasm Position.wasm Segment.wasm Silf.wasm Slot.wasm Sparse.wasm TtfUtil.wasm UtfCodec.wasm call_machine.wasm gr_char_info.wasm gr_face.wasm gr_features.wasm gr_font.wasm gr_segment.wasm gr_slot.was
m cxxalloc.wasm mozalloc.wasm RLBoxWOFF2Sandbox.wasm table_tags.wasm variable_length.wasm woff2_common.wasm woff2_dec.wasm woff2_out.wasm -lwasi-emulated-process-clocks
wasm-ld: error: /usr/local/share/wasi-sysroot/lib/wasm32-wasip1/libc++.a(chrono.cpp.o): undefined symbol: __cxa_begin_catch
wasm-ld: error: /usr/local/share/wasi-sysroot/lib/wasm32-wasip1/libc++.a(stdexcept.cpp.o): undefined symbol: __cxa_allocate_exception
wasm-ld: error: /usr/local/share/wasi-sysroot/lib/wasm32-wasip1/libc++.a(stdexcept.cpp.o): undefined symbol: __cxa_throw
wasm-ld: error: /usr/local/share/wasi-sysroot/lib/wasm32-wasip1/libc++.a(string.cpp.o): undefined symbol: __cxa_allocate_exception
wasm-ld: error: /usr/local/share/wasi-sysroot/lib/wasm32-wasip1/libc++.a(string.cpp.o): undefined symbol: __cxa_throw
wasm-ld: error: /usr/local/share/wasi-sysroot/lib/wasm32-wasip1/libc++.a(string.cpp.o): undefined symbol: __cxa_allocate_exception
wasm-ld: error: /usr/local/share/wasi-sysroot/lib/wasm32-wasip1/libc++.a(string.cpp.o): undefined symbol: __cxa_throw
wasm-ld: error: /usr/local/share/wasi-sysroot/lib/wasm32-wasip1/libc++.a(string.cpp.o): undefined symbol: __cxa_allocate_exception
wasm-ld: error: /usr/local/share/wasi-sysroot/lib/wasm32-wasip1/libc++.a(string.cpp.o): undefined symbol: __cxa_throw
wasm-ld: error: /usr/local/share/wasi-sysroot/lib/wasm32-wasip1/libc++.a(string.cpp.o): undefined symbol: __cxa_allocate_exception
wasm-ld: error: /usr/local/share/wasi-sysroot/lib/wasm32-wasip1/libc++.a(string.cpp.o): undefined symbol: __cxa_throw
wasm-ld: error: /usr/local/share/wasi-sysroot/lib/wasm32-wasip1/libc++.a(system_error.cpp.o): undefined symbol: __cxa_allocate_exception
wasm-ld: error: /usr/local/share/wasi-sysroot/lib/wasm32-wasip1/libc++.a(system_error.cpp.o): undefined symbol: __cxa_throw
wasm-ld: error: /usr/local/share/wasi-sysroot/lib/wasm32-wasip1/libc++.a(new_helpers.cpp.o): undefined symbol: __cxa_allocate_exception
wasm-ld: error: /usr/local/share/wasi-sysroot/lib/wasm32-wasip1/libc++.a(new_helpers.cpp.o): undefined symbol: __cxa_throw
wasm-ld: error: /usr/local/share/wasi-sysroot/lib/wasm32-wasip1/libc++.a(ios.cpp.o): undefined symbol: __cxa_allocate_exception
wasm-ld: error: /usr/local/share/wasi-sysroot/lib/wasm32-wasip1/libc++.a(ios.cpp.o): undefined symbol: __cxa_throw
wasm-ld: error: /usr/local/share/wasi-sysroot/lib/wasm32-wasip1/libc++.a(ios.cpp.o): undefined symbol: __cxa_rethrow
wasm-ld: error: /usr/local/share/wasi-sysroot/lib/wasm32-wasip1/libc++.a(ios.cpp.o): undefined symbol: __cxa_rethrow
wasm-ld: error: /usr/local/share/wasi-sysroot/lib/wasm32-wasip1/libc++.a(ios.instantiations.cpp.o): undefined symbol: __cxa_allocate_exception
wasm-ld: error: too many errors emitted, stopping now (use -error-limit=0 to see all errors)
clang++: error: linker command failed with exit code 1 (use -v to see invocation)
gmake[3]: *** [/wrkdirs/usr/ports/www/firefox/work/firefox-155.0/config/rules.mk:485: rlbox.wasm] Error 1
gmake[3]: Leaving directory '/wrkdirs/usr/ports/www/firefox/work/.build/security/rlbox'
gmake[2]: *** [/wrkdirs/usr/ports/www/firefox/work/firefox-155.0/config/recurse.mk:79: security/rlbox/pre-compile] Error 2


On 30.08.2026 06:15, Charlie Li wrote:
> The branch main has been updated by vishwin:
> 
> URL: https://cgit.FreeBSD.org/ports/commit/?id=126e6a3e5bc43e21d47e5a995f962314e97b5f26
> 
> commit 126e6a3e5bc43e21d47e5a995f962314e97b5f26
> Author:     Charlie Li <vishwin@FreeBSD.org>
> AuthorDate: 2026-08-30 03:04:53 +0000
> Commit:     Charlie Li <vishwin@FreeBSD.org>
> CommitDate: 2026-08-30 03:04:53 +0000
> 
>      devel/wasi-libc: update to sdk-34
>      
>      Changes:        https://github.com/WebAssembly/wasi-sdk/releases/tag/wasi-sdk-34
>                      https://github.com/WebAssembly/wasi-sdk/releases/tag/wasi-sdk-33
>      
>      - sync CMAKE_ARGS from wasi-sdk
>      - consolidate wasi-libc's plists, they have been identical after cmake transition
>      - bump all existing WASI toolchain ports
>      
>      Consumer PORTREVISIONs to be bumped
> ---
>   devel/wasi-compiler-rt/Makefile            |   8 +-
>   devel/wasi-compiler-rt17/Makefile          |   2 +-
>   devel/wasi-compiler-rt18/Makefile          |   2 +-
>   devel/wasi-compiler-rt19/Makefile          |   2 +-
>   devel/wasi-compiler-rt20/Makefile          |   2 +-
>   devel/wasi-compiler-rt21/Makefile          |   2 +-
>   devel/wasi-compiler-rt22/Makefile          |   1 +
>   devel/wasi-libc/Makefile                   |  23 ++-
>   devel/wasi-libc/distinfo                   |   6 +-
>   devel/wasi-libc/{pkg-plist17 => pkg-plist} |   1 -
>   devel/wasi-libc/pkg-plist18                | 225 -----------------------------
>   devel/wasi-libc/pkg-plist19                | 225 -----------------------------
>   devel/wasi-libc/pkg-plist20                | 225 -----------------------------
>   devel/wasi-libc/pkg-plist21                | 225 -----------------------------
>   devel/wasi-libc/pkg-plist22                | 225 -----------------------------
>   devel/wasi-libcxx/Makefile                 |  15 +-
>   devel/wasi-libcxx17/Makefile               |   2 +-
>   devel/wasi-libcxx18/Makefile               |   2 +-
>   devel/wasi-libcxx19/Makefile               |   2 +-
>   devel/wasi-libcxx20/Makefile               |   2 +-
>   devel/wasi-libcxx21/Makefile               |   2 +-
>   devel/wasi-libcxx22/Makefile               |   1 +
>   22 files changed, 49 insertions(+), 1151 deletions(-)
> 
> diff --git a/devel/wasi-compiler-rt/Makefile b/devel/wasi-compiler-rt/Makefile
> index ce4f30b1c44f..e3aa2535d207 100644
> --- a/devel/wasi-compiler-rt/Makefile
> +++ b/devel/wasi-compiler-rt/Makefile
> @@ -36,7 +36,7 @@ WASI_SYSROOT=	${LOCALBASE}/share/wasi-sysroot
>   TRIPLE=		wasm32-unknown-wasip1
>   WITHOUT_CPU_CFLAGS=	yes
>   # try to sync with https://github.com/WebAssembly/wasi-sdk
> -# wasi-sdk.cmake and cmake/wasi-sdk-sysroot.cmake
> +# wasi-sdk-p1.cmake and cmake/wasi-sdk-sysroot.cmake
>   CMAKE_SOURCE_PATH=	${WRKSRC}/compiler-rt/lib/builtins
>   CMAKE_ARGS=	-DCMAKE_SYSTEM_NAME=WASI \
>   		-DCMAKE_SYSTEM_VERSION=1 \
> @@ -52,7 +52,8 @@ CMAKE_ARGS=	-DCMAKE_SYSTEM_NAME=WASI \
>   		-DCMAKE_FIND_ROOT_PATH_MODE_PACKAGE=ONLY \
>   		-DCMAKE_C_COMPILER_WORKS=ON \
>   		-DCMAKE_CXX_COMPILER_WORKS=ON \
> -		-DCMAKE_SYSROOT=${WASI_SYSROOT} \
> +		-DCMAKE_C_LINKER_DEPFILE_SUPPORTED=OFF \
> +		-DCMAKE_CXX_LINKER_DEPFILE_SUPPORTED=OFF \
>   		-DLLVM_ENABLE_PER_TARGET_RUNTIME_DIR=ON \
>   		-DCOMPILER_RT_BAREMETAL_BUILD=ON \
>   		-DCOMPILER_RT_BUILD_XRAY=OFF \
> @@ -66,7 +67,8 @@ CMAKE_ARGS=	-DCMAKE_SYSTEM_NAME=WASI \
>   		-DCOMPILER_RT_BUILD_CTX_PROFILE=OFF \
>   		-DCOMPILER_RT_BUILD_MEMPROF=OFF \
>   		-DCOMPILER_RT_BUILD_ORC=OFF \
> -		-DCOMPILER_RT_BUILD_GWP_ASAN=OFF
> +		-DCOMPILER_RT_BUILD_GWP_ASAN=OFF \
> +		-DCMAKE_SYSROOT=${WASI_SYSROOT}
>   CMAKE_INSTALL_PREFIX=	${LLVM_PREFIX}/lib/clang/${LLVM_VERSION}
>   
>   PLIST_FILES=	${LLVM_PREFIX}/lib/clang/${LLVM_VERSION}/lib/${TRIPLE}/libclang_rt.builtins.a
> diff --git a/devel/wasi-compiler-rt17/Makefile b/devel/wasi-compiler-rt17/Makefile
> index 9b74ed72d90f..96992479ad0d 100644
> --- a/devel/wasi-compiler-rt17/Makefile
> +++ b/devel/wasi-compiler-rt17/Makefile
> @@ -1,6 +1,6 @@
>   # must sync with devel/llvm17
>   DISTVERSION=	17.0.6
> -PORTREVISION=	3
> +PORTREVISION=	4
>   
>   MASTERDIR=	${.CURDIR}/../wasi-compiler-rt
>   
> diff --git a/devel/wasi-compiler-rt18/Makefile b/devel/wasi-compiler-rt18/Makefile
> index 4193f7a52630..3f292513f0a1 100644
> --- a/devel/wasi-compiler-rt18/Makefile
> +++ b/devel/wasi-compiler-rt18/Makefile
> @@ -1,6 +1,6 @@
>   # must sync with devel/llvm18
>   DISTVERSION=	18.1.8
> -PORTREVISION=	2
> +PORTREVISION=	3
>   
>   MASTERDIR=	${.CURDIR}/../wasi-compiler-rt
>   
> diff --git a/devel/wasi-compiler-rt19/Makefile b/devel/wasi-compiler-rt19/Makefile
> index 78e2e41b366b..e797845d72f3 100644
> --- a/devel/wasi-compiler-rt19/Makefile
> +++ b/devel/wasi-compiler-rt19/Makefile
> @@ -1,6 +1,6 @@
>   # must sync with devel/llvm19
>   DISTVERSION=	19.1.7
> -PORTREVISION=	1
> +PORTREVISION=	2
>   
>   MASTERDIR=	${.CURDIR}/../wasi-compiler-rt
>   
> diff --git a/devel/wasi-compiler-rt20/Makefile b/devel/wasi-compiler-rt20/Makefile
> index a167c0636db4..e4e7699f8b39 100644
> --- a/devel/wasi-compiler-rt20/Makefile
> +++ b/devel/wasi-compiler-rt20/Makefile
> @@ -1,6 +1,6 @@
>   # must sync with devel/llvm20
>   DISTVERSION=	20.1.8
> -PORTREVISION=	1
> +PORTREVISION=	2
>   
>   MASTERDIR=	${.CURDIR}/../wasi-compiler-rt
>   
> diff --git a/devel/wasi-compiler-rt21/Makefile b/devel/wasi-compiler-rt21/Makefile
> index 3b66285ddc8f..d5544d6297e0 100644
> --- a/devel/wasi-compiler-rt21/Makefile
> +++ b/devel/wasi-compiler-rt21/Makefile
> @@ -1,6 +1,6 @@
>   # must sync with devel/llvm21
>   DISTVERSION=	21.1.8
> -PORTREVISION=	1
> +PORTREVISION=	2
>   
>   MASTERDIR=	${.CURDIR}/../wasi-compiler-rt
>   
> diff --git a/devel/wasi-compiler-rt22/Makefile b/devel/wasi-compiler-rt22/Makefile
> index 4589b940761a..94a710cbb122 100644
> --- a/devel/wasi-compiler-rt22/Makefile
> +++ b/devel/wasi-compiler-rt22/Makefile
> @@ -1,5 +1,6 @@
>   # must sync with devel/llvm22
>   DISTVERSION=	22.1.8
> +PORTREVISION=	1
>   
>   MASTERDIR=	${.CURDIR}/../wasi-compiler-rt
>   
> diff --git a/devel/wasi-libc/Makefile b/devel/wasi-libc/Makefile
> index 9958b22c9d8b..0cfdbd575d15 100644
> --- a/devel/wasi-libc/Makefile
> +++ b/devel/wasi-libc/Makefile
> @@ -1,6 +1,6 @@
>   PORTNAME=	wasi-libc
>   DISTVERSIONPREFIX=	wasi-sdk-
> -DISTVERSION=	32
> +DISTVERSION=	34
>   CATEGORIES=	devel
>   PKGNAMESUFFIX=	${FLAVOR}
>   
> @@ -27,7 +27,6 @@ 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}
>   PLIST_SUB=	TRIPLE=${TRIPLE}
>   CONFLICTS_INSTALL=	wasi-libc[0-9]*
>   WITHOUT_CPU_CFLAGS=	yes
> @@ -36,12 +35,28 @@ WITHOUT_CPU_CFLAGS=	yes
>   WASI_SYSROOT=	${PREFIX}/share/wasi-sysroot
>   TRIPLE=		wasm32-wasip1
>   
> +# try to sync with wasi-sdk-p1.cmake and cmake/wasi-sdk-sysroot.cmake
>   CMAKE_INSTALL_PREFIX=	${WASI_SYSROOT}
> -CMAKE_ARGS=	-DCMAKE_AR=llvm-ar${LLVM_VERSION} \
> -		-DCMAKE_NM=llvm-nm${LLVM_VERSION} \
> +CMAKE_ARGS=	-DCMAKE_SYSTEM_NAME=WASI \
> +		-DCMAKE_SYSTEM_VERSION=1 \
> +		-DCMAKE_SYSTEM_PROCESSOR=wasm32 \
> +		-DCMAKE_AR=llvm-ar${LLVM_VERSION} \
>   		-DCMAKE_RANLIB=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_C_LINKER_DEPFILE_SUPPORTED=OFF \
> +		-DCMAKE_CXX_LINKER_DEPFILE_SUPPORTED=OFF \
>   		-DTARGET_TRIPLE=${TRIPLE} \
>   		-DBUILTINS_LIB=${LLVM_PREFIX:S|${PREFIX}|${LOCALBASE}|}/lib/clang/${LLVM_VERSION}/lib/${TRIPLE:S|-|-unknown-|}/libclang_rt.builtins.a \
> +		-DUSE_WASM_COMPONENT_LD=OFF \
> +		-DCMAKE_SYSROOT=${WASI_SYSROOT} \
>   		-DBUILD_SHARED=OFF
>   
>   .include <bsd.port.mk>
> diff --git a/devel/wasi-libc/distinfo b/devel/wasi-libc/distinfo
> index 851dfc1f346a..eb938e7695e8 100644
> --- a/devel/wasi-libc/distinfo
> +++ b/devel/wasi-libc/distinfo
> @@ -1,5 +1,5 @@
> -TIMESTAMP = 1775223092
> -SHA256 (WebAssembly-wasi-libc-wasi-sdk-32_GH0.tar.gz) = ea9827495c0f35bca3b3d0a953e854cac112c43bea3196b5a4f7f8fc4704b9a4
> -SIZE (WebAssembly-wasi-libc-wasi-sdk-32_GH0.tar.gz) = 1637111
> +TIMESTAMP = 1788016983
> +SHA256 (WebAssembly-wasi-libc-wasi-sdk-34_GH0.tar.gz) = 21bc47f96cf0eb535e532697dce4cdfdbc91f59223bdc00d8495d191888c5fe8
> +SIZE (WebAssembly-wasi-libc-wasi-sdk-34_GH0.tar.gz) = 2675372
>   SHA256 (WebAssembly-WASI-59cbe14_GH0.tar.gz) = 4e36c4add2421b44ccdded83d442d9aadf02ffa8b534d94016fad2bb7b781cc6
>   SIZE (WebAssembly-WASI-59cbe14_GH0.tar.gz) = 162059
> diff --git a/devel/wasi-libc/pkg-plist17 b/devel/wasi-libc/pkg-plist
> similarity index 99%
> rename from devel/wasi-libc/pkg-plist17
> rename to devel/wasi-libc/pkg-plist
> index 9451850aff7e..566a89056100 100644
> --- a/devel/wasi-libc/pkg-plist17
> +++ b/devel/wasi-libc/pkg-plist
> @@ -1,4 +1,3 @@
> -share/wasi-sysroot/include/%%TRIPLE%%/__errno.h
>   share/wasi-sysroot/include/%%TRIPLE%%/__errno_values.h
>   share/wasi-sysroot/include/%%TRIPLE%%/__fd_set.h
>   share/wasi-sysroot/include/%%TRIPLE%%/__function___isatty.h
> diff --git a/devel/wasi-libc/pkg-plist18 b/devel/wasi-libc/pkg-plist18
> deleted file mode 100644
> index 9451850aff7e..000000000000
> --- a/devel/wasi-libc/pkg-plist18
> +++ /dev/null
> @@ -1,225 +0,0 @@
> -share/wasi-sysroot/include/%%TRIPLE%%/__errno.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__errno_values.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__fd_set.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__function___isatty.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__functions_malloc.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__functions_memcpy.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__header_dirent.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__header_fcntl.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__header_inttypes.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__header_netinet_in.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__header_poll.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__header_stdlib.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__header_string.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__header_sys_ioctl.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__header_sys_resource.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__header_sys_socket.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__header_sys_stat.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__header_time.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__header_unistd.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__macro_FD_SETSIZE.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__macro_PAGESIZE.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__mode_t.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__seek.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__struct_dirent.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__struct_in6_addr.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__struct_in_addr.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__struct_iovec.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__struct_msghdr.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__struct_pollfd.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__struct_rusage.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__struct_sockaddr.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__struct_sockaddr_in.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__struct_sockaddr_in6.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__struct_sockaddr_storage.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__struct_sockaddr_un.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__struct_stat.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__struct_timespec.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__struct_timeval.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__struct_tm.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__struct_tms.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__typedef_DIR.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__typedef_blkcnt_t.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__typedef_blksize_t.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__typedef_clock_t.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__typedef_clockid_t.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__typedef_dev_t.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__typedef_fd_set.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__typedef_gid_t.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__typedef_in_addr_t.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__typedef_in_port_t.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__typedef_ino_t.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__typedef_mode_t.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__typedef_nfds_t.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__typedef_nlink_t.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__typedef_off_t.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__typedef_sa_family_t.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__typedef_sigset_t.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__typedef_socklen_t.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__typedef_ssize_t.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__typedef_suseconds_t.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__typedef_time_t.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__typedef_uid_t.h
> -share/wasi-sysroot/include/%%TRIPLE%%/alloca.h
> -share/wasi-sysroot/include/%%TRIPLE%%/ar.h
> -share/wasi-sysroot/include/%%TRIPLE%%/arpa/ftp.h
> -share/wasi-sysroot/include/%%TRIPLE%%/arpa/inet.h
> -share/wasi-sysroot/include/%%TRIPLE%%/arpa/nameser.h
> -share/wasi-sysroot/include/%%TRIPLE%%/arpa/nameser_compat.h
> -share/wasi-sysroot/include/%%TRIPLE%%/arpa/telnet.h
> -share/wasi-sysroot/include/%%TRIPLE%%/arpa/tftp.h
> -share/wasi-sysroot/include/%%TRIPLE%%/assert.h
> -share/wasi-sysroot/include/%%TRIPLE%%/bits/alltypes.h
> -share/wasi-sysroot/include/%%TRIPLE%%/bits/dirent.h
> -share/wasi-sysroot/include/%%TRIPLE%%/bits/fcntl.h
> -share/wasi-sysroot/include/%%TRIPLE%%/bits/fenv.h
> -share/wasi-sysroot/include/%%TRIPLE%%/bits/float.h
> -share/wasi-sysroot/include/%%TRIPLE%%/bits/hwcap.h
> -share/wasi-sysroot/include/%%TRIPLE%%/bits/io.h
> -share/wasi-sysroot/include/%%TRIPLE%%/bits/ioctl.h
> -share/wasi-sysroot/include/%%TRIPLE%%/bits/ioctl_fix.h
> -share/wasi-sysroot/include/%%TRIPLE%%/bits/ipcstat.h
> -share/wasi-sysroot/include/%%TRIPLE%%/bits/limits.h
> -share/wasi-sysroot/include/%%TRIPLE%%/bits/mman.h
> -share/wasi-sysroot/include/%%TRIPLE%%/bits/poll.h
> -share/wasi-sysroot/include/%%TRIPLE%%/bits/posix.h
> -share/wasi-sysroot/include/%%TRIPLE%%/bits/reg.h
> -share/wasi-sysroot/include/%%TRIPLE%%/bits/resource.h
> -share/wasi-sysroot/include/%%TRIPLE%%/bits/setjmp.h
> -share/wasi-sysroot/include/%%TRIPLE%%/bits/signal.h
> -share/wasi-sysroot/include/%%TRIPLE%%/bits/socket.h
> -share/wasi-sysroot/include/%%TRIPLE%%/bits/stat.h
> -share/wasi-sysroot/include/%%TRIPLE%%/bits/stdint.h
> -share/wasi-sysroot/include/%%TRIPLE%%/byteswap.h
> -share/wasi-sysroot/include/%%TRIPLE%%/complex.h
> -share/wasi-sysroot/include/%%TRIPLE%%/cpio.h
> -share/wasi-sysroot/include/%%TRIPLE%%/crypt.h
> -share/wasi-sysroot/include/%%TRIPLE%%/ctype.h
> -share/wasi-sysroot/include/%%TRIPLE%%/dirent.h
> -share/wasi-sysroot/include/%%TRIPLE%%/dlfcn.h
> -share/wasi-sysroot/include/%%TRIPLE%%/endian.h
> -share/wasi-sysroot/include/%%TRIPLE%%/err.h
> -share/wasi-sysroot/include/%%TRIPLE%%/errno.h
> -share/wasi-sysroot/include/%%TRIPLE%%/fcntl.h
> -share/wasi-sysroot/include/%%TRIPLE%%/features.h
> -share/wasi-sysroot/include/%%TRIPLE%%/fenv.h
> -share/wasi-sysroot/include/%%TRIPLE%%/float.h
> -share/wasi-sysroot/include/%%TRIPLE%%/fmtmsg.h
> -share/wasi-sysroot/include/%%TRIPLE%%/fnmatch.h
> -share/wasi-sysroot/include/%%TRIPLE%%/fts.h
> -share/wasi-sysroot/include/%%TRIPLE%%/ftw.h
> -share/wasi-sysroot/include/%%TRIPLE%%/getopt.h
> -share/wasi-sysroot/include/%%TRIPLE%%/glob.h
> -share/wasi-sysroot/include/%%TRIPLE%%/iconv.h
> -share/wasi-sysroot/include/%%TRIPLE%%/ifaddrs.h
> -share/wasi-sysroot/include/%%TRIPLE%%/inttypes.h
> -share/wasi-sysroot/include/%%TRIPLE%%/iso646.h
> -share/wasi-sysroot/include/%%TRIPLE%%/langinfo.h
> -share/wasi-sysroot/include/%%TRIPLE%%/libgen.h
> -share/wasi-sysroot/include/%%TRIPLE%%/limits.h
> -share/wasi-sysroot/include/%%TRIPLE%%/locale.h
> -share/wasi-sysroot/include/%%TRIPLE%%/malloc.h
> -share/wasi-sysroot/include/%%TRIPLE%%/math.h
> -share/wasi-sysroot/include/%%TRIPLE%%/memory.h
> -share/wasi-sysroot/include/%%TRIPLE%%/monetary.h
> -share/wasi-sysroot/include/%%TRIPLE%%/mqueue.h
> -share/wasi-sysroot/include/%%TRIPLE%%/netinet/icmp6.h
> -share/wasi-sysroot/include/%%TRIPLE%%/netinet/igmp.h
> -share/wasi-sysroot/include/%%TRIPLE%%/netinet/in.h
> -share/wasi-sysroot/include/%%TRIPLE%%/netinet/in_systm.h
> -share/wasi-sysroot/include/%%TRIPLE%%/netinet/ip.h
> -share/wasi-sysroot/include/%%TRIPLE%%/netinet/ip6.h
> -share/wasi-sysroot/include/%%TRIPLE%%/netinet/ip_icmp.h
> -share/wasi-sysroot/include/%%TRIPLE%%/netinet/tcp.h
> -share/wasi-sysroot/include/%%TRIPLE%%/netinet/udp.h
> -share/wasi-sysroot/include/%%TRIPLE%%/netpacket/packet.h
> -share/wasi-sysroot/include/%%TRIPLE%%/nl_types.h
> -share/wasi-sysroot/include/%%TRIPLE%%/poll.h
> -share/wasi-sysroot/include/%%TRIPLE%%/pthread.h
> -share/wasi-sysroot/include/%%TRIPLE%%/regex.h
> -share/wasi-sysroot/include/%%TRIPLE%%/sched.h
> -share/wasi-sysroot/include/%%TRIPLE%%/search.h
> -share/wasi-sysroot/include/%%TRIPLE%%/semaphore.h
> -share/wasi-sysroot/include/%%TRIPLE%%/setjmp.h
> -share/wasi-sysroot/include/%%TRIPLE%%/signal.h
> -share/wasi-sysroot/include/%%TRIPLE%%/stdalign.h
> -share/wasi-sysroot/include/%%TRIPLE%%/stdbool.h
> -share/wasi-sysroot/include/%%TRIPLE%%/stdc-predef.h
> -share/wasi-sysroot/include/%%TRIPLE%%/stdint.h
> -share/wasi-sysroot/include/%%TRIPLE%%/stdio.h
> -share/wasi-sysroot/include/%%TRIPLE%%/stdio_ext.h
> -share/wasi-sysroot/include/%%TRIPLE%%/stdlib.h
> -share/wasi-sysroot/include/%%TRIPLE%%/stdnoreturn.h
> -share/wasi-sysroot/include/%%TRIPLE%%/string.h
> -share/wasi-sysroot/include/%%TRIPLE%%/strings.h
> -share/wasi-sysroot/include/%%TRIPLE%%/stropts.h
> -share/wasi-sysroot/include/%%TRIPLE%%/sys/dir.h
> -share/wasi-sysroot/include/%%TRIPLE%%/sys/errno.h
> -share/wasi-sysroot/include/%%TRIPLE%%/sys/eventfd.h
> -share/wasi-sysroot/include/%%TRIPLE%%/sys/fcntl.h
> -share/wasi-sysroot/include/%%TRIPLE%%/sys/file.h
> -share/wasi-sysroot/include/%%TRIPLE%%/sys/ioctl.h
> -share/wasi-sysroot/include/%%TRIPLE%%/sys/mman.h
> -share/wasi-sysroot/include/%%TRIPLE%%/sys/param.h
> -share/wasi-sysroot/include/%%TRIPLE%%/sys/poll.h
> -share/wasi-sysroot/include/%%TRIPLE%%/sys/random.h
> -share/wasi-sysroot/include/%%TRIPLE%%/sys/reg.h
> -share/wasi-sysroot/include/%%TRIPLE%%/sys/resource.h
> -share/wasi-sysroot/include/%%TRIPLE%%/sys/select.h
> -share/wasi-sysroot/include/%%TRIPLE%%/sys/signal.h
> -share/wasi-sysroot/include/%%TRIPLE%%/sys/socket.h
> -share/wasi-sysroot/include/%%TRIPLE%%/sys/stat.h
> -share/wasi-sysroot/include/%%TRIPLE%%/sys/statvfs.h
> -share/wasi-sysroot/include/%%TRIPLE%%/sys/stropts.h
> -share/wasi-sysroot/include/%%TRIPLE%%/sys/syscall.h
> -share/wasi-sysroot/include/%%TRIPLE%%/sys/sysinfo.h
> -share/wasi-sysroot/include/%%TRIPLE%%/sys/time.h
> -share/wasi-sysroot/include/%%TRIPLE%%/sys/timeb.h
> -share/wasi-sysroot/include/%%TRIPLE%%/sys/times.h
> -share/wasi-sysroot/include/%%TRIPLE%%/sys/timex.h
> -share/wasi-sysroot/include/%%TRIPLE%%/sys/ttydefaults.h
> -share/wasi-sysroot/include/%%TRIPLE%%/sys/types.h
> -share/wasi-sysroot/include/%%TRIPLE%%/sys/uio.h
> -share/wasi-sysroot/include/%%TRIPLE%%/sys/un.h
> -share/wasi-sysroot/include/%%TRIPLE%%/sys/utsname.h
> -share/wasi-sysroot/include/%%TRIPLE%%/syscall.h
> -share/wasi-sysroot/include/%%TRIPLE%%/sysexits.h
> -share/wasi-sysroot/include/%%TRIPLE%%/tar.h
> -share/wasi-sysroot/include/%%TRIPLE%%/tgmath.h
> -share/wasi-sysroot/include/%%TRIPLE%%/threads.h
> -share/wasi-sysroot/include/%%TRIPLE%%/time.h
> -share/wasi-sysroot/include/%%TRIPLE%%/uchar.h
> -share/wasi-sysroot/include/%%TRIPLE%%/unistd.h
> -share/wasi-sysroot/include/%%TRIPLE%%/utime.h
> -share/wasi-sysroot/include/%%TRIPLE%%/values.h
> -share/wasi-sysroot/include/%%TRIPLE%%/wasi/api.h
> -share/wasi-sysroot/include/%%TRIPLE%%/wasi/libc-busywait.h
> -share/wasi-sysroot/include/%%TRIPLE%%/wasi/libc-environ.h
> -share/wasi-sysroot/include/%%TRIPLE%%/wasi/libc-find-relpath.h
> -share/wasi-sysroot/include/%%TRIPLE%%/wasi/libc-nocwd.h
> -share/wasi-sysroot/include/%%TRIPLE%%/wasi/libc.h
> -share/wasi-sysroot/include/%%TRIPLE%%/wasi/version.h
> -share/wasi-sysroot/include/%%TRIPLE%%/wasi/wasip1.h
> -share/wasi-sysroot/include/%%TRIPLE%%/wasi/wasip2.h
> -share/wasi-sysroot/include/%%TRIPLE%%/wasi/wasip3.h
> -share/wasi-sysroot/include/%%TRIPLE%%/wchar.h
> -share/wasi-sysroot/include/%%TRIPLE%%/wctype.h
> -share/wasi-sysroot/lib/%%TRIPLE%%/crt1-command.o
> -share/wasi-sysroot/lib/%%TRIPLE%%/crt1-reactor.o
> -share/wasi-sysroot/lib/%%TRIPLE%%/crt1.o
> -share/wasi-sysroot/lib/%%TRIPLE%%/libc-printscan-long-double.a
> -share/wasi-sysroot/lib/%%TRIPLE%%/libc-printscan-no-floating-point.a
> -share/wasi-sysroot/lib/%%TRIPLE%%/libc.a
> -share/wasi-sysroot/lib/%%TRIPLE%%/libcrypt.a
> -share/wasi-sysroot/lib/%%TRIPLE%%/libdl.a
> -share/wasi-sysroot/lib/%%TRIPLE%%/libm.a
> -share/wasi-sysroot/lib/%%TRIPLE%%/libpthread.a
> -share/wasi-sysroot/lib/%%TRIPLE%%/libresolv.a
> -share/wasi-sysroot/lib/%%TRIPLE%%/librt.a
> -share/wasi-sysroot/lib/%%TRIPLE%%/libsetjmp.a
> -share/wasi-sysroot/lib/%%TRIPLE%%/libutil.a
> -share/wasi-sysroot/lib/%%TRIPLE%%/libwasi-emulated-getpid.a
> -share/wasi-sysroot/lib/%%TRIPLE%%/libwasi-emulated-mman.a
> -share/wasi-sysroot/lib/%%TRIPLE%%/libwasi-emulated-process-clocks.a
> -share/wasi-sysroot/lib/%%TRIPLE%%/libwasi-emulated-signal.a
> -share/wasi-sysroot/lib/%%TRIPLE%%/libxnet.a
> diff --git a/devel/wasi-libc/pkg-plist19 b/devel/wasi-libc/pkg-plist19
> deleted file mode 100644
> index 9451850aff7e..000000000000
> --- a/devel/wasi-libc/pkg-plist19
> +++ /dev/null
> @@ -1,225 +0,0 @@
> -share/wasi-sysroot/include/%%TRIPLE%%/__errno.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__errno_values.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__fd_set.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__function___isatty.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__functions_malloc.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__functions_memcpy.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__header_dirent.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__header_fcntl.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__header_inttypes.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__header_netinet_in.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__header_poll.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__header_stdlib.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__header_string.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__header_sys_ioctl.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__header_sys_resource.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__header_sys_socket.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__header_sys_stat.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__header_time.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__header_unistd.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__macro_FD_SETSIZE.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__macro_PAGESIZE.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__mode_t.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__seek.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__struct_dirent.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__struct_in6_addr.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__struct_in_addr.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__struct_iovec.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__struct_msghdr.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__struct_pollfd.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__struct_rusage.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__struct_sockaddr.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__struct_sockaddr_in.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__struct_sockaddr_in6.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__struct_sockaddr_storage.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__struct_sockaddr_un.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__struct_stat.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__struct_timespec.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__struct_timeval.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__struct_tm.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__struct_tms.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__typedef_DIR.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__typedef_blkcnt_t.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__typedef_blksize_t.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__typedef_clock_t.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__typedef_clockid_t.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__typedef_dev_t.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__typedef_fd_set.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__typedef_gid_t.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__typedef_in_addr_t.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__typedef_in_port_t.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__typedef_ino_t.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__typedef_mode_t.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__typedef_nfds_t.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__typedef_nlink_t.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__typedef_off_t.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__typedef_sa_family_t.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__typedef_sigset_t.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__typedef_socklen_t.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__typedef_ssize_t.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__typedef_suseconds_t.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__typedef_time_t.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__typedef_uid_t.h
> -share/wasi-sysroot/include/%%TRIPLE%%/alloca.h
> -share/wasi-sysroot/include/%%TRIPLE%%/ar.h
> -share/wasi-sysroot/include/%%TRIPLE%%/arpa/ftp.h
> -share/wasi-sysroot/include/%%TRIPLE%%/arpa/inet.h
> -share/wasi-sysroot/include/%%TRIPLE%%/arpa/nameser.h
> -share/wasi-sysroot/include/%%TRIPLE%%/arpa/nameser_compat.h
> -share/wasi-sysroot/include/%%TRIPLE%%/arpa/telnet.h
> -share/wasi-sysroot/include/%%TRIPLE%%/arpa/tftp.h
> -share/wasi-sysroot/include/%%TRIPLE%%/assert.h
> -share/wasi-sysroot/include/%%TRIPLE%%/bits/alltypes.h
> -share/wasi-sysroot/include/%%TRIPLE%%/bits/dirent.h
> -share/wasi-sysroot/include/%%TRIPLE%%/bits/fcntl.h
> -share/wasi-sysroot/include/%%TRIPLE%%/bits/fenv.h
> -share/wasi-sysroot/include/%%TRIPLE%%/bits/float.h
> -share/wasi-sysroot/include/%%TRIPLE%%/bits/hwcap.h
> -share/wasi-sysroot/include/%%TRIPLE%%/bits/io.h
> -share/wasi-sysroot/include/%%TRIPLE%%/bits/ioctl.h
> -share/wasi-sysroot/include/%%TRIPLE%%/bits/ioctl_fix.h
> -share/wasi-sysroot/include/%%TRIPLE%%/bits/ipcstat.h
> -share/wasi-sysroot/include/%%TRIPLE%%/bits/limits.h
> -share/wasi-sysroot/include/%%TRIPLE%%/bits/mman.h
> -share/wasi-sysroot/include/%%TRIPLE%%/bits/poll.h
> -share/wasi-sysroot/include/%%TRIPLE%%/bits/posix.h
> -share/wasi-sysroot/include/%%TRIPLE%%/bits/reg.h
> -share/wasi-sysroot/include/%%TRIPLE%%/bits/resource.h
> -share/wasi-sysroot/include/%%TRIPLE%%/bits/setjmp.h
> -share/wasi-sysroot/include/%%TRIPLE%%/bits/signal.h
> -share/wasi-sysroot/include/%%TRIPLE%%/bits/socket.h
> -share/wasi-sysroot/include/%%TRIPLE%%/bits/stat.h
> -share/wasi-sysroot/include/%%TRIPLE%%/bits/stdint.h
> -share/wasi-sysroot/include/%%TRIPLE%%/byteswap.h
> -share/wasi-sysroot/include/%%TRIPLE%%/complex.h
> -share/wasi-sysroot/include/%%TRIPLE%%/cpio.h
> -share/wasi-sysroot/include/%%TRIPLE%%/crypt.h
> -share/wasi-sysroot/include/%%TRIPLE%%/ctype.h
> -share/wasi-sysroot/include/%%TRIPLE%%/dirent.h
> -share/wasi-sysroot/include/%%TRIPLE%%/dlfcn.h
> -share/wasi-sysroot/include/%%TRIPLE%%/endian.h
> -share/wasi-sysroot/include/%%TRIPLE%%/err.h
> -share/wasi-sysroot/include/%%TRIPLE%%/errno.h
> -share/wasi-sysroot/include/%%TRIPLE%%/fcntl.h
> -share/wasi-sysroot/include/%%TRIPLE%%/features.h
> -share/wasi-sysroot/include/%%TRIPLE%%/fenv.h
> -share/wasi-sysroot/include/%%TRIPLE%%/float.h
> -share/wasi-sysroot/include/%%TRIPLE%%/fmtmsg.h
> -share/wasi-sysroot/include/%%TRIPLE%%/fnmatch.h
> -share/wasi-sysroot/include/%%TRIPLE%%/fts.h
> -share/wasi-sysroot/include/%%TRIPLE%%/ftw.h
> -share/wasi-sysroot/include/%%TRIPLE%%/getopt.h
> -share/wasi-sysroot/include/%%TRIPLE%%/glob.h
> -share/wasi-sysroot/include/%%TRIPLE%%/iconv.h
> -share/wasi-sysroot/include/%%TRIPLE%%/ifaddrs.h
> -share/wasi-sysroot/include/%%TRIPLE%%/inttypes.h
> -share/wasi-sysroot/include/%%TRIPLE%%/iso646.h
> -share/wasi-sysroot/include/%%TRIPLE%%/langinfo.h
> -share/wasi-sysroot/include/%%TRIPLE%%/libgen.h
> -share/wasi-sysroot/include/%%TRIPLE%%/limits.h
> -share/wasi-sysroot/include/%%TRIPLE%%/locale.h
> -share/wasi-sysroot/include/%%TRIPLE%%/malloc.h
> -share/wasi-sysroot/include/%%TRIPLE%%/math.h
> -share/wasi-sysroot/include/%%TRIPLE%%/memory.h
> -share/wasi-sysroot/include/%%TRIPLE%%/monetary.h
> -share/wasi-sysroot/include/%%TRIPLE%%/mqueue.h
> -share/wasi-sysroot/include/%%TRIPLE%%/netinet/icmp6.h
> -share/wasi-sysroot/include/%%TRIPLE%%/netinet/igmp.h
> -share/wasi-sysroot/include/%%TRIPLE%%/netinet/in.h
> -share/wasi-sysroot/include/%%TRIPLE%%/netinet/in_systm.h
> -share/wasi-sysroot/include/%%TRIPLE%%/netinet/ip.h
> -share/wasi-sysroot/include/%%TRIPLE%%/netinet/ip6.h
> -share/wasi-sysroot/include/%%TRIPLE%%/netinet/ip_icmp.h
> -share/wasi-sysroot/include/%%TRIPLE%%/netinet/tcp.h
> -share/wasi-sysroot/include/%%TRIPLE%%/netinet/udp.h
> -share/wasi-sysroot/include/%%TRIPLE%%/netpacket/packet.h
> -share/wasi-sysroot/include/%%TRIPLE%%/nl_types.h
> -share/wasi-sysroot/include/%%TRIPLE%%/poll.h
> -share/wasi-sysroot/include/%%TRIPLE%%/pthread.h
> -share/wasi-sysroot/include/%%TRIPLE%%/regex.h
> -share/wasi-sysroot/include/%%TRIPLE%%/sched.h
> -share/wasi-sysroot/include/%%TRIPLE%%/search.h
> -share/wasi-sysroot/include/%%TRIPLE%%/semaphore.h
> -share/wasi-sysroot/include/%%TRIPLE%%/setjmp.h
> -share/wasi-sysroot/include/%%TRIPLE%%/signal.h
> -share/wasi-sysroot/include/%%TRIPLE%%/stdalign.h
> -share/wasi-sysroot/include/%%TRIPLE%%/stdbool.h
> -share/wasi-sysroot/include/%%TRIPLE%%/stdc-predef.h
> -share/wasi-sysroot/include/%%TRIPLE%%/stdint.h
> -share/wasi-sysroot/include/%%TRIPLE%%/stdio.h
> -share/wasi-sysroot/include/%%TRIPLE%%/stdio_ext.h
> -share/wasi-sysroot/include/%%TRIPLE%%/stdlib.h
> -share/wasi-sysroot/include/%%TRIPLE%%/stdnoreturn.h
> -share/wasi-sysroot/include/%%TRIPLE%%/string.h
> -share/wasi-sysroot/include/%%TRIPLE%%/strings.h
> -share/wasi-sysroot/include/%%TRIPLE%%/stropts.h
> -share/wasi-sysroot/include/%%TRIPLE%%/sys/dir.h
> -share/wasi-sysroot/include/%%TRIPLE%%/sys/errno.h
> -share/wasi-sysroot/include/%%TRIPLE%%/sys/eventfd.h
> -share/wasi-sysroot/include/%%TRIPLE%%/sys/fcntl.h
> -share/wasi-sysroot/include/%%TRIPLE%%/sys/file.h
> -share/wasi-sysroot/include/%%TRIPLE%%/sys/ioctl.h
> -share/wasi-sysroot/include/%%TRIPLE%%/sys/mman.h
> -share/wasi-sysroot/include/%%TRIPLE%%/sys/param.h
> -share/wasi-sysroot/include/%%TRIPLE%%/sys/poll.h
> -share/wasi-sysroot/include/%%TRIPLE%%/sys/random.h
> -share/wasi-sysroot/include/%%TRIPLE%%/sys/reg.h
> -share/wasi-sysroot/include/%%TRIPLE%%/sys/resource.h
> -share/wasi-sysroot/include/%%TRIPLE%%/sys/select.h
> -share/wasi-sysroot/include/%%TRIPLE%%/sys/signal.h
> -share/wasi-sysroot/include/%%TRIPLE%%/sys/socket.h
> -share/wasi-sysroot/include/%%TRIPLE%%/sys/stat.h
> -share/wasi-sysroot/include/%%TRIPLE%%/sys/statvfs.h
> -share/wasi-sysroot/include/%%TRIPLE%%/sys/stropts.h
> -share/wasi-sysroot/include/%%TRIPLE%%/sys/syscall.h
> -share/wasi-sysroot/include/%%TRIPLE%%/sys/sysinfo.h
> -share/wasi-sysroot/include/%%TRIPLE%%/sys/time.h
> -share/wasi-sysroot/include/%%TRIPLE%%/sys/timeb.h
> -share/wasi-sysroot/include/%%TRIPLE%%/sys/times.h
> -share/wasi-sysroot/include/%%TRIPLE%%/sys/timex.h
> -share/wasi-sysroot/include/%%TRIPLE%%/sys/ttydefaults.h
> -share/wasi-sysroot/include/%%TRIPLE%%/sys/types.h
> -share/wasi-sysroot/include/%%TRIPLE%%/sys/uio.h
> -share/wasi-sysroot/include/%%TRIPLE%%/sys/un.h
> -share/wasi-sysroot/include/%%TRIPLE%%/sys/utsname.h
> -share/wasi-sysroot/include/%%TRIPLE%%/syscall.h
> -share/wasi-sysroot/include/%%TRIPLE%%/sysexits.h
> -share/wasi-sysroot/include/%%TRIPLE%%/tar.h
> -share/wasi-sysroot/include/%%TRIPLE%%/tgmath.h
> -share/wasi-sysroot/include/%%TRIPLE%%/threads.h
> -share/wasi-sysroot/include/%%TRIPLE%%/time.h
> -share/wasi-sysroot/include/%%TRIPLE%%/uchar.h
> -share/wasi-sysroot/include/%%TRIPLE%%/unistd.h
> -share/wasi-sysroot/include/%%TRIPLE%%/utime.h
> -share/wasi-sysroot/include/%%TRIPLE%%/values.h
> -share/wasi-sysroot/include/%%TRIPLE%%/wasi/api.h
> -share/wasi-sysroot/include/%%TRIPLE%%/wasi/libc-busywait.h
> -share/wasi-sysroot/include/%%TRIPLE%%/wasi/libc-environ.h
> -share/wasi-sysroot/include/%%TRIPLE%%/wasi/libc-find-relpath.h
> -share/wasi-sysroot/include/%%TRIPLE%%/wasi/libc-nocwd.h
> -share/wasi-sysroot/include/%%TRIPLE%%/wasi/libc.h
> -share/wasi-sysroot/include/%%TRIPLE%%/wasi/version.h
> -share/wasi-sysroot/include/%%TRIPLE%%/wasi/wasip1.h
> -share/wasi-sysroot/include/%%TRIPLE%%/wasi/wasip2.h
> -share/wasi-sysroot/include/%%TRIPLE%%/wasi/wasip3.h
> -share/wasi-sysroot/include/%%TRIPLE%%/wchar.h
> -share/wasi-sysroot/include/%%TRIPLE%%/wctype.h
> -share/wasi-sysroot/lib/%%TRIPLE%%/crt1-command.o
> -share/wasi-sysroot/lib/%%TRIPLE%%/crt1-reactor.o
> -share/wasi-sysroot/lib/%%TRIPLE%%/crt1.o
> -share/wasi-sysroot/lib/%%TRIPLE%%/libc-printscan-long-double.a
> -share/wasi-sysroot/lib/%%TRIPLE%%/libc-printscan-no-floating-point.a
> -share/wasi-sysroot/lib/%%TRIPLE%%/libc.a
> -share/wasi-sysroot/lib/%%TRIPLE%%/libcrypt.a
> -share/wasi-sysroot/lib/%%TRIPLE%%/libdl.a
> -share/wasi-sysroot/lib/%%TRIPLE%%/libm.a
> -share/wasi-sysroot/lib/%%TRIPLE%%/libpthread.a
> -share/wasi-sysroot/lib/%%TRIPLE%%/libresolv.a
> -share/wasi-sysroot/lib/%%TRIPLE%%/librt.a
> -share/wasi-sysroot/lib/%%TRIPLE%%/libsetjmp.a
> -share/wasi-sysroot/lib/%%TRIPLE%%/libutil.a
> -share/wasi-sysroot/lib/%%TRIPLE%%/libwasi-emulated-getpid.a
> -share/wasi-sysroot/lib/%%TRIPLE%%/libwasi-emulated-mman.a
> -share/wasi-sysroot/lib/%%TRIPLE%%/libwasi-emulated-process-clocks.a
> -share/wasi-sysroot/lib/%%TRIPLE%%/libwasi-emulated-signal.a
> -share/wasi-sysroot/lib/%%TRIPLE%%/libxnet.a
> diff --git a/devel/wasi-libc/pkg-plist20 b/devel/wasi-libc/pkg-plist20
> deleted file mode 100644
> index 9451850aff7e..000000000000
> --- a/devel/wasi-libc/pkg-plist20
> +++ /dev/null
> @@ -1,225 +0,0 @@
> -share/wasi-sysroot/include/%%TRIPLE%%/__errno.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__errno_values.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__fd_set.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__function___isatty.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__functions_malloc.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__functions_memcpy.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__header_dirent.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__header_fcntl.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__header_inttypes.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__header_netinet_in.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__header_poll.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__header_stdlib.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__header_string.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__header_sys_ioctl.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__header_sys_resource.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__header_sys_socket.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__header_sys_stat.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__header_time.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__header_unistd.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__macro_FD_SETSIZE.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__macro_PAGESIZE.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__mode_t.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__seek.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__struct_dirent.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__struct_in6_addr.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__struct_in_addr.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__struct_iovec.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__struct_msghdr.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__struct_pollfd.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__struct_rusage.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__struct_sockaddr.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__struct_sockaddr_in.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__struct_sockaddr_in6.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__struct_sockaddr_storage.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__struct_sockaddr_un.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__struct_stat.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__struct_timespec.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__struct_timeval.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__struct_tm.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__struct_tms.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__typedef_DIR.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__typedef_blkcnt_t.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__typedef_blksize_t.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__typedef_clock_t.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__typedef_clockid_t.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__typedef_dev_t.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__typedef_fd_set.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__typedef_gid_t.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__typedef_in_addr_t.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__typedef_in_port_t.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__typedef_ino_t.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__typedef_mode_t.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__typedef_nfds_t.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__typedef_nlink_t.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__typedef_off_t.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__typedef_sa_family_t.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__typedef_sigset_t.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__typedef_socklen_t.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__typedef_ssize_t.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__typedef_suseconds_t.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__typedef_time_t.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__typedef_uid_t.h
> -share/wasi-sysroot/include/%%TRIPLE%%/alloca.h
> -share/wasi-sysroot/include/%%TRIPLE%%/ar.h
> -share/wasi-sysroot/include/%%TRIPLE%%/arpa/ftp.h
> -share/wasi-sysroot/include/%%TRIPLE%%/arpa/inet.h
> -share/wasi-sysroot/include/%%TRIPLE%%/arpa/nameser.h
> -share/wasi-sysroot/include/%%TRIPLE%%/arpa/nameser_compat.h
> -share/wasi-sysroot/include/%%TRIPLE%%/arpa/telnet.h
> -share/wasi-sysroot/include/%%TRIPLE%%/arpa/tftp.h
> -share/wasi-sysroot/include/%%TRIPLE%%/assert.h
> -share/wasi-sysroot/include/%%TRIPLE%%/bits/alltypes.h
> -share/wasi-sysroot/include/%%TRIPLE%%/bits/dirent.h
> -share/wasi-sysroot/include/%%TRIPLE%%/bits/fcntl.h
> -share/wasi-sysroot/include/%%TRIPLE%%/bits/fenv.h
> -share/wasi-sysroot/include/%%TRIPLE%%/bits/float.h
> -share/wasi-sysroot/include/%%TRIPLE%%/bits/hwcap.h
> -share/wasi-sysroot/include/%%TRIPLE%%/bits/io.h
> -share/wasi-sysroot/include/%%TRIPLE%%/bits/ioctl.h
> -share/wasi-sysroot/include/%%TRIPLE%%/bits/ioctl_fix.h
> -share/wasi-sysroot/include/%%TRIPLE%%/bits/ipcstat.h
> -share/wasi-sysroot/include/%%TRIPLE%%/bits/limits.h
> -share/wasi-sysroot/include/%%TRIPLE%%/bits/mman.h
> -share/wasi-sysroot/include/%%TRIPLE%%/bits/poll.h
> -share/wasi-sysroot/include/%%TRIPLE%%/bits/posix.h
> -share/wasi-sysroot/include/%%TRIPLE%%/bits/reg.h
> -share/wasi-sysroot/include/%%TRIPLE%%/bits/resource.h
> -share/wasi-sysroot/include/%%TRIPLE%%/bits/setjmp.h
> -share/wasi-sysroot/include/%%TRIPLE%%/bits/signal.h
> -share/wasi-sysroot/include/%%TRIPLE%%/bits/socket.h
> -share/wasi-sysroot/include/%%TRIPLE%%/bits/stat.h
> -share/wasi-sysroot/include/%%TRIPLE%%/bits/stdint.h
> -share/wasi-sysroot/include/%%TRIPLE%%/byteswap.h
> -share/wasi-sysroot/include/%%TRIPLE%%/complex.h
> -share/wasi-sysroot/include/%%TRIPLE%%/cpio.h
> -share/wasi-sysroot/include/%%TRIPLE%%/crypt.h
> -share/wasi-sysroot/include/%%TRIPLE%%/ctype.h
> -share/wasi-sysroot/include/%%TRIPLE%%/dirent.h
> -share/wasi-sysroot/include/%%TRIPLE%%/dlfcn.h
> -share/wasi-sysroot/include/%%TRIPLE%%/endian.h
> -share/wasi-sysroot/include/%%TRIPLE%%/err.h
> -share/wasi-sysroot/include/%%TRIPLE%%/errno.h
> -share/wasi-sysroot/include/%%TRIPLE%%/fcntl.h
> -share/wasi-sysroot/include/%%TRIPLE%%/features.h
> -share/wasi-sysroot/include/%%TRIPLE%%/fenv.h
> -share/wasi-sysroot/include/%%TRIPLE%%/float.h
> -share/wasi-sysroot/include/%%TRIPLE%%/fmtmsg.h
> -share/wasi-sysroot/include/%%TRIPLE%%/fnmatch.h
> -share/wasi-sysroot/include/%%TRIPLE%%/fts.h
> -share/wasi-sysroot/include/%%TRIPLE%%/ftw.h
> -share/wasi-sysroot/include/%%TRIPLE%%/getopt.h
> -share/wasi-sysroot/include/%%TRIPLE%%/glob.h
> -share/wasi-sysroot/include/%%TRIPLE%%/iconv.h
> -share/wasi-sysroot/include/%%TRIPLE%%/ifaddrs.h
> -share/wasi-sysroot/include/%%TRIPLE%%/inttypes.h
> -share/wasi-sysroot/include/%%TRIPLE%%/iso646.h
> -share/wasi-sysroot/include/%%TRIPLE%%/langinfo.h
> -share/wasi-sysroot/include/%%TRIPLE%%/libgen.h
> -share/wasi-sysroot/include/%%TRIPLE%%/limits.h
> -share/wasi-sysroot/include/%%TRIPLE%%/locale.h
> -share/wasi-sysroot/include/%%TRIPLE%%/malloc.h
> -share/wasi-sysroot/include/%%TRIPLE%%/math.h
> -share/wasi-sysroot/include/%%TRIPLE%%/memory.h
> -share/wasi-sysroot/include/%%TRIPLE%%/monetary.h
> -share/wasi-sysroot/include/%%TRIPLE%%/mqueue.h
> -share/wasi-sysroot/include/%%TRIPLE%%/netinet/icmp6.h
> -share/wasi-sysroot/include/%%TRIPLE%%/netinet/igmp.h
> -share/wasi-sysroot/include/%%TRIPLE%%/netinet/in.h
> -share/wasi-sysroot/include/%%TRIPLE%%/netinet/in_systm.h
> -share/wasi-sysroot/include/%%TRIPLE%%/netinet/ip.h
> -share/wasi-sysroot/include/%%TRIPLE%%/netinet/ip6.h
> -share/wasi-sysroot/include/%%TRIPLE%%/netinet/ip_icmp.h
> -share/wasi-sysroot/include/%%TRIPLE%%/netinet/tcp.h
> -share/wasi-sysroot/include/%%TRIPLE%%/netinet/udp.h
> -share/wasi-sysroot/include/%%TRIPLE%%/netpacket/packet.h
> -share/wasi-sysroot/include/%%TRIPLE%%/nl_types.h
> -share/wasi-sysroot/include/%%TRIPLE%%/poll.h
> -share/wasi-sysroot/include/%%TRIPLE%%/pthread.h
> -share/wasi-sysroot/include/%%TRIPLE%%/regex.h
> -share/wasi-sysroot/include/%%TRIPLE%%/sched.h
> -share/wasi-sysroot/include/%%TRIPLE%%/search.h
> -share/wasi-sysroot/include/%%TRIPLE%%/semaphore.h
> -share/wasi-sysroot/include/%%TRIPLE%%/setjmp.h
> -share/wasi-sysroot/include/%%TRIPLE%%/signal.h
> -share/wasi-sysroot/include/%%TRIPLE%%/stdalign.h
> -share/wasi-sysroot/include/%%TRIPLE%%/stdbool.h
> -share/wasi-sysroot/include/%%TRIPLE%%/stdc-predef.h
> -share/wasi-sysroot/include/%%TRIPLE%%/stdint.h
> -share/wasi-sysroot/include/%%TRIPLE%%/stdio.h
> -share/wasi-sysroot/include/%%TRIPLE%%/stdio_ext.h
> -share/wasi-sysroot/include/%%TRIPLE%%/stdlib.h
> -share/wasi-sysroot/include/%%TRIPLE%%/stdnoreturn.h
> -share/wasi-sysroot/include/%%TRIPLE%%/string.h
> -share/wasi-sysroot/include/%%TRIPLE%%/strings.h
> -share/wasi-sysroot/include/%%TRIPLE%%/stropts.h
> -share/wasi-sysroot/include/%%TRIPLE%%/sys/dir.h
> -share/wasi-sysroot/include/%%TRIPLE%%/sys/errno.h
> -share/wasi-sysroot/include/%%TRIPLE%%/sys/eventfd.h
> -share/wasi-sysroot/include/%%TRIPLE%%/sys/fcntl.h
> -share/wasi-sysroot/include/%%TRIPLE%%/sys/file.h
> -share/wasi-sysroot/include/%%TRIPLE%%/sys/ioctl.h
> -share/wasi-sysroot/include/%%TRIPLE%%/sys/mman.h
> -share/wasi-sysroot/include/%%TRIPLE%%/sys/param.h
> -share/wasi-sysroot/include/%%TRIPLE%%/sys/poll.h
> -share/wasi-sysroot/include/%%TRIPLE%%/sys/random.h
> -share/wasi-sysroot/include/%%TRIPLE%%/sys/reg.h
> -share/wasi-sysroot/include/%%TRIPLE%%/sys/resource.h
> -share/wasi-sysroot/include/%%TRIPLE%%/sys/select.h
> -share/wasi-sysroot/include/%%TRIPLE%%/sys/signal.h
> -share/wasi-sysroot/include/%%TRIPLE%%/sys/socket.h
> -share/wasi-sysroot/include/%%TRIPLE%%/sys/stat.h
> -share/wasi-sysroot/include/%%TRIPLE%%/sys/statvfs.h
> -share/wasi-sysroot/include/%%TRIPLE%%/sys/stropts.h
> -share/wasi-sysroot/include/%%TRIPLE%%/sys/syscall.h
> -share/wasi-sysroot/include/%%TRIPLE%%/sys/sysinfo.h
> -share/wasi-sysroot/include/%%TRIPLE%%/sys/time.h
> -share/wasi-sysroot/include/%%TRIPLE%%/sys/timeb.h
> -share/wasi-sysroot/include/%%TRIPLE%%/sys/times.h
> -share/wasi-sysroot/include/%%TRIPLE%%/sys/timex.h
> -share/wasi-sysroot/include/%%TRIPLE%%/sys/ttydefaults.h
> -share/wasi-sysroot/include/%%TRIPLE%%/sys/types.h
> -share/wasi-sysroot/include/%%TRIPLE%%/sys/uio.h
> -share/wasi-sysroot/include/%%TRIPLE%%/sys/un.h
> -share/wasi-sysroot/include/%%TRIPLE%%/sys/utsname.h
> -share/wasi-sysroot/include/%%TRIPLE%%/syscall.h
> -share/wasi-sysroot/include/%%TRIPLE%%/sysexits.h
> -share/wasi-sysroot/include/%%TRIPLE%%/tar.h
> -share/wasi-sysroot/include/%%TRIPLE%%/tgmath.h
> -share/wasi-sysroot/include/%%TRIPLE%%/threads.h
> -share/wasi-sysroot/include/%%TRIPLE%%/time.h
> -share/wasi-sysroot/include/%%TRIPLE%%/uchar.h
> -share/wasi-sysroot/include/%%TRIPLE%%/unistd.h
> -share/wasi-sysroot/include/%%TRIPLE%%/utime.h
> -share/wasi-sysroot/include/%%TRIPLE%%/values.h
> -share/wasi-sysroot/include/%%TRIPLE%%/wasi/api.h
> -share/wasi-sysroot/include/%%TRIPLE%%/wasi/libc-busywait.h
> -share/wasi-sysroot/include/%%TRIPLE%%/wasi/libc-environ.h
> -share/wasi-sysroot/include/%%TRIPLE%%/wasi/libc-find-relpath.h
> -share/wasi-sysroot/include/%%TRIPLE%%/wasi/libc-nocwd.h
> -share/wasi-sysroot/include/%%TRIPLE%%/wasi/libc.h
> -share/wasi-sysroot/include/%%TRIPLE%%/wasi/version.h
> -share/wasi-sysroot/include/%%TRIPLE%%/wasi/wasip1.h
> -share/wasi-sysroot/include/%%TRIPLE%%/wasi/wasip2.h
> -share/wasi-sysroot/include/%%TRIPLE%%/wasi/wasip3.h
> -share/wasi-sysroot/include/%%TRIPLE%%/wchar.h
> -share/wasi-sysroot/include/%%TRIPLE%%/wctype.h
> -share/wasi-sysroot/lib/%%TRIPLE%%/crt1-command.o
> -share/wasi-sysroot/lib/%%TRIPLE%%/crt1-reactor.o
> -share/wasi-sysroot/lib/%%TRIPLE%%/crt1.o
> -share/wasi-sysroot/lib/%%TRIPLE%%/libc-printscan-long-double.a
> -share/wasi-sysroot/lib/%%TRIPLE%%/libc-printscan-no-floating-point.a
> -share/wasi-sysroot/lib/%%TRIPLE%%/libc.a
> -share/wasi-sysroot/lib/%%TRIPLE%%/libcrypt.a
> -share/wasi-sysroot/lib/%%TRIPLE%%/libdl.a
> -share/wasi-sysroot/lib/%%TRIPLE%%/libm.a
> -share/wasi-sysroot/lib/%%TRIPLE%%/libpthread.a
> -share/wasi-sysroot/lib/%%TRIPLE%%/libresolv.a
> -share/wasi-sysroot/lib/%%TRIPLE%%/librt.a
> -share/wasi-sysroot/lib/%%TRIPLE%%/libsetjmp.a
> -share/wasi-sysroot/lib/%%TRIPLE%%/libutil.a
> -share/wasi-sysroot/lib/%%TRIPLE%%/libwasi-emulated-getpid.a
> -share/wasi-sysroot/lib/%%TRIPLE%%/libwasi-emulated-mman.a
> -share/wasi-sysroot/lib/%%TRIPLE%%/libwasi-emulated-process-clocks.a
> -share/wasi-sysroot/lib/%%TRIPLE%%/libwasi-emulated-signal.a
> -share/wasi-sysroot/lib/%%TRIPLE%%/libxnet.a
> diff --git a/devel/wasi-libc/pkg-plist21 b/devel/wasi-libc/pkg-plist21
> deleted file mode 100644
> index 9451850aff7e..000000000000
> --- a/devel/wasi-libc/pkg-plist21
> +++ /dev/null
> @@ -1,225 +0,0 @@
> -share/wasi-sysroot/include/%%TRIPLE%%/__errno.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__errno_values.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__fd_set.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__function___isatty.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__functions_malloc.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__functions_memcpy.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__header_dirent.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__header_fcntl.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__header_inttypes.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__header_netinet_in.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__header_poll.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__header_stdlib.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__header_string.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__header_sys_ioctl.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__header_sys_resource.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__header_sys_socket.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__header_sys_stat.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__header_time.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__header_unistd.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__macro_FD_SETSIZE.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__macro_PAGESIZE.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__mode_t.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__seek.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__struct_dirent.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__struct_in6_addr.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__struct_in_addr.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__struct_iovec.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__struct_msghdr.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__struct_pollfd.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__struct_rusage.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__struct_sockaddr.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__struct_sockaddr_in.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__struct_sockaddr_in6.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__struct_sockaddr_storage.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__struct_sockaddr_un.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__struct_stat.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__struct_timespec.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__struct_timeval.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__struct_tm.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__struct_tms.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__typedef_DIR.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__typedef_blkcnt_t.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__typedef_blksize_t.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__typedef_clock_t.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__typedef_clockid_t.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__typedef_dev_t.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__typedef_fd_set.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__typedef_gid_t.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__typedef_in_addr_t.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__typedef_in_port_t.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__typedef_ino_t.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__typedef_mode_t.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__typedef_nfds_t.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__typedef_nlink_t.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__typedef_off_t.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__typedef_sa_family_t.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__typedef_sigset_t.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__typedef_socklen_t.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__typedef_ssize_t.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__typedef_suseconds_t.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__typedef_time_t.h
> -share/wasi-sysroot/include/%%TRIPLE%%/__typedef_uid_t.h
> -share/wasi-sysroot/include/%%TRIPLE%%/alloca.h
> *** 507 LINES SKIPPED ***

-- 
Sincerely,
Dima (fluffy@FreeBSD.org, https://t.me/FluffyBSD, @fluffy:matrix-dev.freebsd.org)
(desktop, kde, x11, office, ports-secteam)@FreeBSD team