The attached diff updates devel/fmt to 8.0.0.
Builds on amd64. Tests need to be fixed but library seems to work
ok. I'll look into the tests, probably need to upstream some stuff
again.
Thanks.
Index: devel/fmt/Makefile
===================================================================
RCS file: /cvs/ports/devel/fmt/Makefile,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 Makefile
--- devel/fmt/Makefile 30 Jan 2021 15:37:05 -0000 1.2
+++ devel/fmt/Makefile 24 Jun 2021 02:21:24 -0000
@@ -4,9 +4,9 @@ COMMENT= alternative formatting library
GH_ACCOUNT= fmtlib
GH_PROJECT= fmt
-GH_TAGNAME= 7.1.3
+GH_TAGNAME= 8.0.0
-SHARED_LIBS= fmt 0.0
+SHARED_LIBS= fmt 1.0
CATEGORIES= devel
Index: devel/fmt/distinfo
===================================================================
RCS file: /cvs/ports/devel/fmt/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 distinfo
--- devel/fmt/distinfo 2 Jan 2021 21:51:19 -0000 1.1.1.1
+++ devel/fmt/distinfo 24 Jun 2021 02:21:24 -0000
@@ -1,2 +1,2 @@
-SHA256 (fmt-7.1.3.tar.gz) = XK5wcgQrMEPhLVPVDvQEu7dpSdrR3jaNf5k6FcjAXsw=
-SIZE (fmt-7.1.3.tar.gz) = 770029
+SHA256 (fmt-8.0.0.tar.gz) = e84OngIuWGsXixUAAufCM5mU48K75EAn6auw1g+czoM=
+SIZE (fmt-8.0.0.tar.gz) = 804902
Index: devel/fmt/patches/patch-test_gtest-extra-test_cc
===================================================================
RCS file: devel/fmt/patches/patch-test_gtest-extra-test_cc
diff -N devel/fmt/patches/patch-test_gtest-extra-test_cc
--- devel/fmt/patches/patch-test_gtest-extra-test_cc 2 Jan 2021 21:51:19 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,50 +0,0 @@
-$OpenBSD: patch-test_gtest-extra-test_cc,v 1.1.1.1 2021/01/02 21:51:19 jca Exp $
-
-Index: test/gtest-extra-test.cc
---- test/gtest-extra-test.cc.orig
-+++ test/gtest-extra-test.cc
-@@ -22,14 +22,6 @@
-
- namespace {
-
--// This is used to suppress coverity warnings about untrusted values.
--std::string sanitize(const std::string& s) {
-- std::string result;
-- for (std::string::const_iterator i = s.begin(), end = s.end(); i != end; ++i)
-- result.push_back(static_cast<char>(*i & 0xff));
-- return result;
--}
--
- // Tests that assertion macros evaluate their arguments exactly once.
- class SingleEvaluationTest : public ::testing::Test {
- protected:
-@@ -369,6 +361,10 @@ TEST(OutputRedirectTest, FlushErrorInCtor) {
- write_copy.dup2(write_fd); // "undo" close or dtor will fail
- }
-
-+#if !defined(__OpenBSD__)
-+// NOTE(fagg): There's some bug in this test. Can't find it.
-+// Upstream suggests it doesn't matter so lets leave this compiled
-+// out for now while i work on figuring it out.
- TEST(OutputRedirectTest, DupErrorInCtor) {
- buffered_file f = open_buffered_file();
- int fd = (f.fileno)();
-@@ -380,6 +376,7 @@ TEST(OutputRedirectTest, DupErrorInCtor) {
- fmt::format("cannot duplicate file descriptor {}", fd));
- copy.dup2(fd); // "undo" close or dtor will fail
- }
-+#endif
-
- TEST(OutputRedirectTest, RestoreAndRead) {
- file read_end, write_end;
-@@ -388,8 +385,8 @@ TEST(OutputRedirectTest, RestoreAndRead) {
- std::fprintf(file.get(), "[[[");
- OutputRedirect redir(file.get());
- std::fprintf(file.get(), "censored");
-- EXPECT_EQ("censored", sanitize(redir.restore_and_read()));
-- EXPECT_EQ("", sanitize(redir.restore_and_read()));
-+ EXPECT_EQ("censored", redir.restore_and_read());
-+ EXPECT_EQ("", redir.restore_and_read());
- std::fprintf(file.get(), "]]]");
- file = buffered_file();
- EXPECT_READ(read_end, "[[[]]]");
Index: devel/fmt/patches/patch-test_posix-mock-test_cc
===================================================================
RCS file: devel/fmt/patches/patch-test_posix-mock-test_cc
diff -N devel/fmt/patches/patch-test_posix-mock-test_cc
--- devel/fmt/patches/patch-test_posix-mock-test_cc 2 Jan 2021 21:51:19 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,19 +0,0 @@
-$OpenBSD: patch-test_posix-mock-test_cc,v 1.1.1.1 2021/01/02 21:51:19 jca Exp $
-
-Index: test/posix-mock-test.cc
---- test/posix-mock-test.cc.orig
-+++ test/posix-mock-test.cc
-@@ -194,12 +194,12 @@ int(test::fileno)(FILE* stream) {
- # define EXPECT_EQ_POSIX(expected, actual)
- #endif
-
-+#if FMT_USE_FCNTL
- static void write_file(fmt::cstring_view filename, fmt::string_view content) {
- fmt::buffered_file f(filename, "w");
- f.print("{}", content);
- }
-
--#if FMT_USE_FCNTL
- using fmt::file;
-
- TEST(UtilTest, GetPageSize) {
Index: devel/fmt/patches/patch-test_std-format-test_cc
===================================================================
RCS file: devel/fmt/patches/patch-test_std-format-test_cc
diff -N devel/fmt/patches/patch-test_std-format-test_cc
--- devel/fmt/patches/patch-test_std-format-test_cc 2 Jan 2021 21:51:19 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-$OpenBSD: patch-test_std-format-test_cc,v 1.1.1.1 2021/01/02 21:51:19 jca Exp $
-
-Index: test/std-format-test.cc
---- test/std-format-test.cc.orig
-+++ test/std-format-test.cc
-@@ -111,7 +111,7 @@ template <> struct std::formatter<S> {
- char c = get_char();
- if (!isdigit(c) || (++iter, get_char()) != '}')
- throw format_error("invalid format");
-- width_arg_id = c - '0';
-+ width_arg_id = fmt::detail::to_unsigned(c - '0');
- ctx.check_arg_id(width_arg_id);
- return ++iter;
- }
Index: devel/fmt/pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/fmt/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 PLIST
--- devel/fmt/pkg/PLIST 2 Jan 2021 21:51:19 -0000 1.1.1.1
+++ devel/fmt/pkg/PLIST 24 Jun 2021 02:21:24 -0000
@@ -1,5 +1,6 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2021/01/02 21:51:19 jca Exp $
include/fmt/
+include/fmt/args.h
include/fmt/chrono.h
include/fmt/color.h
include/fmt/compile.h
@@ -9,9 +10,9 @@ include/fmt/format.h
include/fmt/locale.h
include/fmt/os.h
include/fmt/ostream.h
-include/fmt/posix.h
include/fmt/printf.h
include/fmt/ranges.h
+include/fmt/xchar.h
lib/cmake/
lib/cmake/fmt/
lib/cmake/fmt/fmt-config-version.cmake
