et: update to 6.2.8

[Benny Siegert <bsiegert%NetBSD.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Benny Siegert <bsiegert%NetBSD.org@localhost>
Pushed By:	bsiegert
Date:		Fri Sep 8 20:52:10 2023 +0200
Changeset:	12f62609c6d412fd03325471a1cfe91da5360c94

Modified Files:
	et/Makefile
	et/distinfo
	et/patches/patch-CMakeLists.txt
Removed Files:
	et/TODO

Log Message:
et: update to 6.2.8

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=12f62609c6d412fd03325471a1cfe91da5360c94

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 et/Makefile                     | 19 ++++---------
 et/TODO                         | 10 -------
 et/distinfo                     |  8 +++---
 et/patches/patch-CMakeLists.txt | 63 ++++++++++++++++++++++++++++++++---------
 4 files changed, 60 insertions(+), 40 deletions(-)

diffs:
diff --git a/et/Makefile b/et/Makefile
index 826b2b6ad6..7edc78fb95 100644
--- a/et/Makefile
+++ b/et/Makefile
@@ -1,11 +1,10 @@
 # $NetBSD$
 
-GITHUB_PROJECT=	EternalTerminal
-GITHUB_TAG=	et-v${PKGVERSION_NOREV}
-
-DISTNAME=	et-6.1.11
+DISTNAME=	et-6.2.8
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_GITHUB:=MisterTea/}
+GITHUB_PROJECT=	EternalTerminal
+GITHUB_TAG=	et-v${PKGVERSION_NOREV}
 DIST_SUBDIR=	${GITHUB_PROJECT}
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
@@ -19,15 +18,6 @@ USE_TOOLS+=	pkg-config
 USE_LANGUAGES=	c c++
 USE_TOOLS+=	perl
 GCC_REQD+=	9  # uses std::filesystem
-#LIBS+=		-lstdc++fs
-
-#.include "../../mk/bsd.prefs.mk"
-#PKGSRC_COMPILER=                clang
-#CLANGBASE=                      ${PREFIX}
-#.include "../../lang/llvm/buildlink3.mk"
-#BUILDLINK_DEPMETHOD.llvm=       build
-#.include "../../lang/clang/buildlink3.mk"
-#BUILDLINK_DEPMETHOD.clang=      build
 
 CMAKE_ARGS+=	-DDISABLE_VCPKG=ON
 CMAKE_ARGS+=	-DDISABLE_TELEMETRY=ON
@@ -49,6 +39,9 @@ PKGCONFIG_OVERRIDE+=	external_imported/vcpkg/ports/v8/v8_libbase.pc.in
 PKGCONFIG_OVERRIDE+=	external_imported/vcpkg/ports/v8/v8_libplatform.pc.in
 PKGCONFIG_OVERRIDE+=	external_imported/vcpkg/ports/v8/v8_monolith.pc.in
 
+.include "../../security/openssl/buildlink3.mk"
+.include "../../devel/catch2/buildlink3.mk"
+.include "../../textproc/nlohmann-json/buildlink3.mk"
 .include "../../devel/cxxopts/buildlink3.mk"
 .include "../../devel/protobuf/buildlink3.mk"
 .include "../../security/libsodium/buildlink3.mk"
diff --git a/et/TODO b/et/TODO
deleted file mode 100644
index c286039f75..0000000000
--- a/et/TODO
+++ /dev/null
@@ -1,10 +0,0 @@
-On NetBSD, there is a compiler error when linking the binary, related to use of
-std::filesystem:
-
-/usr/bin/ld: libet-lib.a(LogHandler.cpp.o): in function `et::LogHandler::stderrToFile(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)':
-/usr/pkg/gcc8/include/c++/bits/fs_path.h:185: undefined reference to `std::filesystem::__cxx11::path::_M_split_cmpts()'
-/usr/bin/ld: libet-lib.a(LogHandler.cpp.o): in function `et::LogHandler::stderrToFile(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)':
-/usr/obj/pkgsrc/wip/et/work/EternalTerminal-et-v6.1.11/src/base/LogHandler.cpp:51: undefined reference to `std::filesystem::permissions(std::filesystem::__cxx11::path const&, std::filesystem::perms, std::filesystem::perm_options)'
-collect2: error: ld returned 1 exit status
-
-nros: The above is now fixed.
diff --git a/et/distinfo b/et/distinfo
index f20ba8e16a..ea98f0cb98 100644
--- a/et/distinfo
+++ b/et/distinfo
@@ -1,6 +1,6 @@
 $NetBSD$
 
-BLAKE2s (EternalTerminal/et-6.1.11.tar.gz) = 0e7079816a169b76e08c395c3f010df424a2f5abe95d99c0b08af53ae0b021e5
-SHA512 (EternalTerminal/et-6.1.11.tar.gz) = 71b1fe20096a46e6f0ce87ec18d5074f90f48193a1637becb9692b20e7d92fc3b091cf843cecca30a4591fc94396494ff8282343ec6068a2905afd8f4225b3e4
-Size (EternalTerminal/et-6.1.11.tar.gz) = 22081590 bytes
-SHA1 (patch-CMakeLists.txt) = b3f41dc56c7d9828f24ddb49e2b5157c6495ffd6
+BLAKE2s (EternalTerminal/et-6.2.8.tar.gz) = 8067439ac6b25ca0767ebb9a5c49ddfe2c71823c20fbd34178c75598334f5d06
+SHA512 (EternalTerminal/et-6.2.8.tar.gz) = 0ec06dee3d51e89eb7c03ba062cb771dca228ad06685104361c5e3cc7239a91d67530c95c686c4ede41584ad0f894aa35013499bd3a051b8da7bd0303d4fa9ae
+Size (EternalTerminal/et-6.2.8.tar.gz) = 23387724 bytes
+SHA1 (patch-CMakeLists.txt) = bf820a7c3e4521cf77c207b2d140d712b56ec79a
diff --git a/et/patches/patch-CMakeLists.txt b/et/patches/patch-CMakeLists.txt
index 0f222fcd04..872310932c 100644
--- a/et/patches/patch-CMakeLists.txt
+++ b/et/patches/patch-CMakeLists.txt
@@ -2,25 +2,62 @@ $NetBSD$
 
 * use pkgsrc cxxopts
 
---- CMakeLists.txt.orig	2022-01-11 14:53:44.000000000 +0000
+--- CMakeLists.txt.orig	2023-09-01 02:44:10.000000000 +0000
 +++ CMakeLists.txt
-@@ -281,11 +281,6 @@ macro(DECORATE_TARGET TARGET_NAME)
+@@ -94,7 +94,7 @@ include(CMakeFindDependencyMacro)
+ 
+ # Add cmake script directory.
+ list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
+-set(CMAKE_MODULE_PATH "${EXTERNAL_DIR}/sanitizers-cmake/cmake"
++set (CMAKE_MODULE_PATH "/Users/bsiegert/pkgsrc/wip/et/work/.buildlink/cmake-Modules" "${EXTERNAL_DIR}/sanitizers-cmake/cmake"
+   ${CMAKE_MODULE_PATH})
+ 
+ # Required packages
+@@ -106,22 +106,18 @@ find_package(Protobuf REQUIRED)
+ find_package(ZLIB REQUIRED)
+ find_package(Unwind)
+ 
++find_package(cxxopts CONFIG REQUIRED)
++find_package(nlohmann_json CONFIG REQUIRED)
++
+ if(DISABLE_VCPKG)
+ add_subdirectory(${EXTERNAL_DIR}/Catch2)
+-add_subdirectory(${EXTERNAL_DIR}/cxxopts)
+ add_subdirectory(${EXTERNAL_DIR}/cpp-httplib)
+-add_subdirectory(${EXTERNAL_DIR}/json)
+ include_directories(
+   ${EXTERNAL_DIR}/cpp-httplib
+   ${EXTERNAL_DIR}/simpleini
+-  ${EXTERNAL_DIR}/json/include
+-  ${EXTERNAL_DIR}/cxxopts/include
+ )
+ else()
+ find_package(Catch2 CONFIG REQUIRED)
+-find_package(httplib CONFIG REQUIRED)
+-find_package(cxxopts CONFIG REQUIRED)
+-find_package(nlohmann_json CONFIG REQUIRED)
+ find_path(SIMPLEINI_INCLUDE_DIRS "ConvertUTF.c")
+ endif()
+ 
+@@ -182,7 +176,7 @@ if(USE_SENTRY)
+   endif()
+ endif()
+ 
+-set(CMAKE_MODULE_PATH "${EXTERNAL_DIR}/cotire/CMake"
++set (CMAKE_MODULE_PATH "/Users/bsiegert/pkgsrc/wip/et/work/.buildlink/cmake-Modules" "${EXTERNAL_DIR}/cotire/CMake"
+   ${CMAKE_MODULE_PATH})
+ include(cotire)
+ 
+@@ -324,12 +318,6 @@ macro(DECORATE_TARGET TARGET_NAME)
    add_sanitizers(${TARGET_NAME})
    set_target_properties(${TARGET_NAME} PROPERTIES COTIRE_CXX_PREFIX_HEADER_INIT
-                                                   "src/base/Headers.hpp")
+     "src/base/Headers.hpp")
+-
 -  if(CMAKE_CROSSCOMPILING)
--    # Doesn't work when cross-compiling
+-  # Doesn't work when cross-compiling
 -  else()
 -    cotire(${TARGET_NAME})
 -  endif()
  endmacro()
  
- include_directories(
-@@ -293,7 +288,6 @@ include_directories(
-   ${EXTERNAL_DIR}/ThreadPool
-   ${EXTERNAL_DIR}/PlatformFolders
-   ${EXTERNAL_DIR}/Catch2/single_include
--  ${EXTERNAL_DIR}/cxxopts/include
-   ${EXTERNAL_DIR}/msgpack-c/include
-   ${EXTERNAL_DIR}/sentry-native/include
-   ${EXTERNAL_DIR}/json/single_include/nlohmann
+ macro(DECORATE_FUZZER TARGET_NAME)