Update CloudABI libraries to newer versions.

libc++ still had some local patches to make its locale code work on
CloudABI. This has been fixed by adding missing C functions to
cloudlibc, but also by making some portability cleanups to libc++ that
have been upstreamed in the meantime.

By bumping both these packages to a newer version, we can get rid of the
local patches.

13 files changed, 22 insertions, 167 deletions

diff --git a/devel/cloudabi-cloudlibc/Makefile b/devel/cloudabi-cloudlibc/Makefile
index 5be5a34ad812..4ab94f5930f5 100644
--- a/devel/cloudabi-cloudlibc/Makefile
+++ b/devel/cloudabi-cloudlibc/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	cloudlibc
-PORTVERSION=	0.1
+PORTVERSION=	0.2
 CATEGORIES=	devel
 MASTER_SITES=	https://nuxi.nl/distfiles/cloudlibc/
 PKGNAMEPREFIX=	cloudabi-
diff --git a/devel/cloudabi-cloudlibc/distinfo b/devel/cloudabi-cloudlibc/distinfo
index 8cd022cee8fd..63c027ae91b7 100644
--- a/devel/cloudabi-cloudlibc/distinfo
+++ b/devel/cloudabi-cloudlibc/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cloudlibc-0.1.tar.xz) = e1849c8861148a47bfb193fb063bbf37578a1b1dd64f42a963d849143dac37e4
-SIZE (cloudlibc-0.1.tar.xz) = 617924
+SHA256 (cloudlibc-0.2.tar.xz) = 4e0ba922c85318b3126b769bed2b67ff6b5126eb5e2d825241b1c056f41e58ac
+SIZE (cloudlibc-0.2.tar.xz) = 628216
diff --git a/devel/cloudabi-cloudlibc/pkg-plist b/devel/cloudabi-cloudlibc/pkg-plist
index d9746de748c8..3974ef5cb157 100644
--- a/devel/cloudabi-cloudlibc/pkg-plist
+++ b/devel/cloudabi-cloudlibc/pkg-plist
@@ -7,6 +7,7 @@ x86_64-unknown-cloudabi/include/_/struct/iovec.h
 x86_64-unknown-cloudabi/include/_/struct/timespec.h
 x86_64-unknown-cloudabi/include/_/types.h
 x86_64-unknown-cloudabi/include/aio.h
+x86_64-unknown-cloudabi/include/argdata.h
 x86_64-unknown-cloudabi/include/arpa/inet.h
 x86_64-unknown-cloudabi/include/assert.h
 x86_64-unknown-cloudabi/include/complex.h
diff --git a/devel/cloudabi-compiler-rt/Makefile b/devel/cloudabi-compiler-rt/Makefile
index 649e556304fc..048163be3799 100644
--- a/devel/cloudabi-compiler-rt/Makefile
+++ b/devel/cloudabi-compiler-rt/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	compiler-rt
-DISTVERSION=	0.240389
+DISTVERSION=	0.241676
 CATEGORIES=	devel
 MASTER_SITES=	https://nuxi.nl/distfiles/compiler-rt/
 PKGNAMEPREFIX=	cloudabi-
diff --git a/devel/cloudabi-compiler-rt/distinfo b/devel/cloudabi-compiler-rt/distinfo
index fa1d41745720..f50ae736bfd0 100644
--- a/devel/cloudabi-compiler-rt/distinfo
+++ b/devel/cloudabi-compiler-rt/distinfo
@@ -1,2 +1,2 @@
-SHA256 (compiler-rt-0.240389.tar.xz) = 1df516ee4a9662e261458f69018b3c44e3c3d18702e1e90234478c00ad14c5eb
-SIZE (compiler-rt-0.240389.tar.xz) = 1182404
+SHA256 (compiler-rt-0.241676.tar.xz) = 4da00d6b177af1a882c6c5a3a43f2ec5820494bcc0681046a2bc8a43477cd2eb
+SIZE (compiler-rt-0.241676.tar.xz) = 1164088
diff --git a/devel/cloudabi-libc++/Makefile b/devel/cloudabi-libc++/Makefile
index 2ea589670532..99b9c3eac8c9 100644
--- a/devel/cloudabi-libc++/Makefile
+++ b/devel/cloudabi-libc++/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	libc++
-PORTVERSION=	0.240527
+PORTVERSION=	0.241676
 CATEGORIES=	devel
 MASTER_SITES=	https://nuxi.nl/distfiles/libc++/:libcxx \
 		https://nuxi.nl/distfiles/libc++abi/:libcxxabi
diff --git a/devel/cloudabi-libc++/distinfo b/devel/cloudabi-libc++/distinfo
index b64e3835cba3..d16963766c2d 100644
--- a/devel/cloudabi-libc++/distinfo
+++ b/devel/cloudabi-libc++/distinfo
@@ -1,4 +1,4 @@
-SHA256 (libc++-0.240527.tar.xz) = 6775bb5ef2cacc71cd40d70ce54d77237333cb9ea83f1d06e0fd10fe58561f44
-SIZE (libc++-0.240527.tar.xz) = 967240
-SHA256 (libc++abi-0.240527.tar.xz) = 16b206bb5ad40fbd40f69f79c31924aa9efe7e01255f69962361f873f13b4c29
-SIZE (libc++abi-0.240527.tar.xz) = 507212
+SHA256 (libc++-0.241676.tar.xz) = f95aa5a100128377e52313456d3016125182186df11109e434ad7f9b8ed25f1d
+SIZE (libc++-0.241676.tar.xz) = 959656
+SHA256 (libc++abi-0.241676.tar.xz) = 204a6772d70e1ad910117ca30335718ac9f344df555145abbe34b0bbf14ed50e
+SIZE (libc++abi-0.241676.tar.xz) = 506816
diff --git a/devel/cloudabi-libc++/files/patch-include_locale b/devel/cloudabi-libc++/files/patch-include_locale
deleted file mode 100644
index 39b2e097e289..000000000000
--- a/devel/cloudabi-libc++/files/patch-include_locale
+++ /dev/null
@@ -1,18 +0,0 @@
---- include/locale.orig	2015-06-17 04:49:22 UTC
-+++ include/locale
-@@ -1297,13 +1297,13 @@ __num_put<_CharT>::__widen_and_group_flo
-         *__oe++ = __ct.widen(*__nf++);
-         *__oe++ = __ct.widen(*__nf++);
-         for (__ns = __nf; __ns < __ne; ++__ns)
--            if (!isxdigit_l(*__ns, _LIBCPP_GET_C_LOCALE))
-+            if (!isxdigit(*__ns))
-                 break;
-     }
-     else
-     {
-         for (__ns = __nf; __ns < __ne; ++__ns)
--            if (!isdigit_l(*__ns, _LIBCPP_GET_C_LOCALE))
-+            if (!isdigit(*__ns))
-                 break;
-     }
-     if (__grouping.empty())
diff --git a/devel/cloudabi-libc++/files/patch-src_locale.cpp b/devel/cloudabi-libc++/files/patch-src_locale.cpp
deleted file mode 100644
index 9a29c36a5542..000000000000
--- a/devel/cloudabi-libc++/files/patch-src_locale.cpp
+++ /dev/null
@@ -1,128 +0,0 @@
---- src/locale.cpp.orig	2015-06-24 08:46:54 UTC
-+++ src/locale.cpp
-@@ -575,8 +575,6 @@ locale::global(const locale& loc)
-     locale& g = __global();
-     locale r = g;
-     g = loc;
--    if (g.name() != "*")
--        setlocale(LC_ALL, g.name().c_str());
-     return r;
- }
- 
-@@ -813,7 +811,7 @@ ctype<wchar_t>::do_toupper(char_type c) 
- #elif defined(__GLIBC__) || defined(__EMSCRIPTEN__) || defined(__NetBSD__)
-     return isascii(c) ? ctype<char>::__classic_upper_table()[c] : c;
- #else
--    return (isascii(c) && iswlower_l(c, __cloc())) ? c-L'a'+L'A' : c;
-+    return (isascii(c) && iswlower(c)) ? c-L'a'+L'A' : c;
- #endif
- }
- 
-@@ -827,7 +825,7 @@ ctype<wchar_t>::do_toupper(char_type* lo
-         *low = isascii(*low) ? ctype<char>::__classic_upper_table()[*low]
-                              : *low;
- #else
--        *low = (isascii(*low) && islower_l(*low, __cloc())) ? (*low-L'a'+L'A') : *low;
-+        *low = (isascii(*low) && islower(*low)) ? (*low-L'a'+L'A') : *low;
- #endif
-     return low;
- }
-@@ -840,7 +838,7 @@ ctype<wchar_t>::do_tolower(char_type c) 
- #elif defined(__GLIBC__) || defined(__EMSCRIPTEN__) || defined(__NetBSD__)
-     return isascii(c) ? ctype<char>::__classic_lower_table()[c] : c;
- #else
--    return (isascii(c) && isupper_l(c, __cloc())) ? c-L'A'+'a' : c;
-+    return (isascii(c) && isupper(c)) ? c-L'A'+'a' : c;
- #endif
- }
- 
-@@ -854,7 +852,7 @@ ctype<wchar_t>::do_tolower(char_type* lo
-         *low = isascii(*low) ? ctype<char>::__classic_lower_table()[*low]
-                              : *low;
- #else
--        *low = (isascii(*low) && isupper_l(*low, __cloc())) ? *low-L'A'+L'a' : *low;
-+        *low = (isascii(*low) && isupper(*low)) ? *low-L'A'+L'a' : *low;
- #endif
-     return low;
- }
-@@ -923,7 +921,7 @@ ctype<char>::do_toupper(char_type c) con
-     return isascii(c) ? 
-       static_cast<char>(__classic_upper_table()[static_cast<unsigned char>(c)]) : c;
- #else
--    return (isascii(c) && islower_l(c, __cloc())) ? c-'a'+'A' : c;
-+    return (isascii(c) && islower(c)) ? c-'a'+'A' : c;
- #endif
- }
- 
-@@ -940,7 +938,7 @@ ctype<char>::do_toupper(char_type* low, 
-         *low = isascii(*low) ?
-           static_cast<char>(__classic_upper_table()[static_cast<size_t>(*low)]) : *low;
- #else
--        *low = (isascii(*low) && islower_l(*low, __cloc())) ? *low-'a'+'A' : *low;
-+        *low = (isascii(*low) && islower(*low)) ? *low-'a'+'A' : *low;
- #endif
-     return low;
- }
-@@ -957,7 +955,7 @@ ctype<char>::do_tolower(char_type c) con
-     return isascii(c) ?
-       static_cast<char>(__classic_lower_table()[static_cast<size_t>(c)]) : c;
- #else
--    return (isascii(c) && isupper_l(c, __cloc())) ? c-'A'+'a' : c;
-+    return (isascii(c) && isupper(c)) ? c-'A'+'a' : c;
- #endif
- }
- 
-@@ -972,7 +970,7 @@ ctype<char>::do_tolower(char_type* low, 
- #elif defined(__GLIBC__) || defined(__EMSCRIPTEN__)
-         *low = isascii(*low) ? static_cast<char>(__classic_lower_table()[static_cast<size_t>(*low)]) : *low;
- #else
--        *low = (isascii(*low) && isupper_l(*low, __cloc())) ? *low-'A'+'a' : *low;
-+        *low = (isascii(*low) && isupper(*low)) ? *low-'A'+'a' : *low;
- #endif
-     return low;
- }
-@@ -1201,28 +1199,28 @@ ctype_byname<char>::~ctype_byname()
- char
- ctype_byname<char>::do_toupper(char_type c) const
- {
--    return static_cast<char>(toupper_l(static_cast<unsigned char>(c), __l));
-+    return static_cast<char>(toupper(static_cast<unsigned char>(c)));
- }
- 
- const char*
- ctype_byname<char>::do_toupper(char_type* low, const char_type* high) const
- {
-     for (; low != high; ++low)
--        *low = static_cast<char>(toupper_l(static_cast<unsigned char>(*low), __l));
-+        *low = static_cast<char>(toupper(static_cast<unsigned char>(*low)));
-     return low;
- }
- 
- char
- ctype_byname<char>::do_tolower(char_type c) const
- {
--    return static_cast<char>(tolower_l(static_cast<unsigned char>(c), __l));
-+    return static_cast<char>(tolower(static_cast<unsigned char>(c)));
- }
- 
- const char*
- ctype_byname<char>::do_tolower(char_type* low, const char_type* high) const
- {
-     for (; low != high; ++low)
--        *low = static_cast<char>(tolower_l(static_cast<unsigned char>(*low), __l));
-+        *low = static_cast<char>(tolower(static_cast<unsigned char>(*low)));
-     return low;
- }
- 
-@@ -1707,11 +1705,6 @@ codecvt<wchar_t, char, mbstate_t>::do_un
- int
- codecvt<wchar_t, char, mbstate_t>::do_encoding() const  _NOEXCEPT
- {
--#ifdef _LIBCPP_LOCALE__L_EXTENSIONS
--    if (mbtowc_l(nullptr, nullptr, MB_LEN_MAX, __l) == 0)
--#else
--    if (__mbtowc_l(nullptr, nullptr, MB_LEN_MAX, __l) == 0)
--#endif
-     {
-         // stateless encoding
- #ifdef _LIBCPP_LOCALE__L_EXTENSIONS
diff --git a/devel/cloudabi-libc++abi/Makefile b/devel/cloudabi-libc++abi/Makefile
index 1c4661b8dadc..3f91a0329a88 100644
--- a/devel/cloudabi-libc++abi/Makefile
+++ b/devel/cloudabi-libc++abi/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	libc++abi
-PORTVERSION=	0.240527
+PORTVERSION=	0.241676
 CATEGORIES=	devel
 MASTER_SITES=	https://nuxi.nl/distfiles/libc++abi/:libcxxabi \
 		https://nuxi.nl/distfiles/libunwind/:libunwind
diff --git a/devel/cloudabi-libc++abi/distinfo b/devel/cloudabi-libc++abi/distinfo
index 1524feb62d11..9564379e7168 100644
--- a/devel/cloudabi-libc++abi/distinfo
+++ b/devel/cloudabi-libc++abi/distinfo
@@ -1,4 +1,4 @@
-SHA256 (libc++abi-0.240527.tar.xz) = 16b206bb5ad40fbd40f69f79c31924aa9efe7e01255f69962361f873f13b4c29
-SIZE (libc++abi-0.240527.tar.xz) = 507212
-SHA256 (libunwind-0.240527.tar.xz) = a921907dbdadbf86fbc9f0317f6a88707907e36be0ecce283cd46e45dfb16e0f
-SIZE (libunwind-0.240527.tar.xz) = 59036
+SHA256 (libc++abi-0.241676.tar.xz) = 204a6772d70e1ad910117ca30335718ac9f344df555145abbe34b0bbf14ed50e
+SIZE (libc++abi-0.241676.tar.xz) = 506816
+SHA256 (libunwind-0.241676.tar.xz) = 6daeb7e5258c41d4bd702cf23da3f2c51d51387ed1c3cf110284b565a713ee5f
+SIZE (libunwind-0.241676.tar.xz) = 59316
diff --git a/devel/cloudabi-libunwind/Makefile b/devel/cloudabi-libunwind/Makefile
index cbe09a310563..90cf14e9d43b 100644
--- a/devel/cloudabi-libunwind/Makefile
+++ b/devel/cloudabi-libunwind/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	libunwind
-PORTVERSION=	0.240527
+PORTVERSION=	0.241676
 CATEGORIES=	devel
 MASTER_SITES=	https://nuxi.nl/distfiles/libc++abi/:libcxxabi \
 		https://nuxi.nl/distfiles/libunwind/:libunwind
diff --git a/devel/cloudabi-libunwind/distinfo b/devel/cloudabi-libunwind/distinfo
index 1524feb62d11..9564379e7168 100644
--- a/devel/cloudabi-libunwind/distinfo
+++ b/devel/cloudabi-libunwind/distinfo
@@ -1,4 +1,4 @@
-SHA256 (libc++abi-0.240527.tar.xz) = 16b206bb5ad40fbd40f69f79c31924aa9efe7e01255f69962361f873f13b4c29
-SIZE (libc++abi-0.240527.tar.xz) = 507212
-SHA256 (libunwind-0.240527.tar.xz) = a921907dbdadbf86fbc9f0317f6a88707907e36be0ecce283cd46e45dfb16e0f
-SIZE (libunwind-0.240527.tar.xz) = 59036
+SHA256 (libc++abi-0.241676.tar.xz) = 204a6772d70e1ad910117ca30335718ac9f344df555145abbe34b0bbf14ed50e
+SIZE (libc++abi-0.241676.tar.xz) = 506816
+SHA256 (libunwind-0.241676.tar.xz) = 6daeb7e5258c41d4bd702cf23da3f2c51d51387ed1c3cf110284b565a713ee5f
+SIZE (libunwind-0.241676.tar.xz) = 59316