From 0524d6f90b5733112c6da5784ec3f2d674a85c08 Mon Sep 17 00:00:00 2001
From: Eric Kilmer <eric.d.kilmer@gmail.com>
Date: Tue, 5 Oct 2021 10:42:43 -0400
Subject: [PATCH 1/2] Add grpc and abseil

---
 dependencies.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dependencies.txt b/dependencies.txt
index ea34f135..a7ae21dc 100644
--- a/dependencies.txt
+++ b/dependencies.txt
@@ -4,3 +4,4 @@ glog
 gtest
 gflags
 protobuf
+grpc

From fa87b41db11c7b15aa44061d20da2386f8a2eba0 Mon Sep 17 00:00:00 2001
From: Eric Kilmer <eric.d.kilmer@gmail.com>
Date: Tue, 5 Oct 2021 11:46:17 -0400
Subject: [PATCH 2/2] Add abseil and grpc. Remove old ports

---
 dependencies.txt                              |  3 +-
 ports/brotli/CONTROL                          |  5 --
 ports/brotli/fix-arm-uwp.patch                | 13 ---
 ports/brotli/install.patch                    | 58 --------------
 ports/brotli/pkgconfig.patch                  | 74 -----------------
 ports/brotli/portfile.cmake                   | 30 -------
 .../remove-emscripten-detect-asan.patch       | 24 ------
 ports/brotli/vcpkg-cmake-wrapper.cmake        | 11 ---
 ports/gtest/0002-Fix-z7-override.patch        | 13 ---
 ports/gtest/CONTROL                           |  5 --
 ports/gtest/fix-build-failure-in-gcc-11.patch | 22 -----
 ports/gtest/fix-main-lib-path.patch           | 68 ----------------
 ports/gtest/portfile.cmake                    | 80 -------------------
 ports/gtest/remove-werror.patch               | 20 -----
 ports/gtest/usage                             |  8 --
 15 files changed, 2 insertions(+), 432 deletions(-)
 delete mode 100644 ports/brotli/CONTROL
 delete mode 100644 ports/brotli/fix-arm-uwp.patch
 delete mode 100644 ports/brotli/install.patch
 delete mode 100644 ports/brotli/pkgconfig.patch
 delete mode 100644 ports/brotli/portfile.cmake
 delete mode 100644 ports/brotli/remove-emscripten-detect-asan.patch
 delete mode 100644 ports/brotli/vcpkg-cmake-wrapper.cmake
 delete mode 100644 ports/gtest/0002-Fix-z7-override.patch
 delete mode 100644 ports/gtest/CONTROL
 delete mode 100644 ports/gtest/fix-build-failure-in-gcc-11.patch
 delete mode 100644 ports/gtest/fix-main-lib-path.patch
 delete mode 100644 ports/gtest/portfile.cmake
 delete mode 100644 ports/gtest/remove-werror.patch
 delete mode 100644 ports/gtest/usage

diff --git a/dependencies.txt b/dependencies.txt
index a7ae21dc..9aeffc25 100644
--- a/dependencies.txt
+++ b/dependencies.txt
@@ -4,4 +4,5 @@ glog
 gtest
 gflags
 protobuf
-grpc
+abseil
+grpc[absl-sync,codegen]
diff --git a/ports/brotli/CONTROL b/ports/brotli/CONTROL
deleted file mode 100644
index 93d89044..00000000
--- a/ports/brotli/CONTROL
+++ /dev/null
@@ -1,5 +0,0 @@
-Source: brotli
-Version: 1.0.9
-Port-Version: 1
-Homepage: https://github.com/google/brotli
-Description: a generic-purpose lossless compression algorithm that compresses data using a combination of a modern variant of the LZ77 algorithm, Huffman coding and 2nd order context modeling.
diff --git a/ports/brotli/fix-arm-uwp.patch b/ports/brotli/fix-arm-uwp.patch
deleted file mode 100644
index 7ed3fcd3..00000000
--- a/ports/brotli/fix-arm-uwp.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index e6c6054..2c4b757 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -124,6 +124,8 @@ elseif(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
-   add_definitions(-DOS_FREEBSD)
- elseif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
-   add_definitions(-DOS_MACOSX)
-+elseif(MSVC)
-+  add_definitions(-D_CRT_SECURE_NO_WARNINGS)
- endif()
- 
- function(transform_sources_list INPUT_FILE OUTPUT_FILE)
diff --git a/ports/brotli/install.patch b/ports/brotli/install.patch
deleted file mode 100644
index af3d3f3e..00000000
--- a/ports/brotli/install.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 4ff3401..46492d0 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -185,14 +185,13 @@ endforeach()
- 
- foreach(lib IN LISTS BROTLI_SHARED_LIBS BROTLI_STATIC_LIBS)
-   target_link_libraries(${lib} ${LIBM_LIBRARY})
--  set_property(TARGET ${lib} APPEND PROPERTY INCLUDE_DIRECTORIES ${BROTLI_INCLUDE_DIRS})
-   set_target_properties(${lib} PROPERTIES
-     VERSION "${BROTLI_ABI_COMPATIBILITY}.${BROTLI_ABI_AGE}.${BROTLI_ABI_REVISION}"
-     SOVERSION "${BROTLI_ABI_COMPATIBILITY}")
-   if(NOT BROTLI_EMSCRIPTEN)
-     set_target_properties(${lib} PROPERTIES POSITION_INDEPENDENT_CODE TRUE)
-   endif()
--  set_property(TARGET ${lib} APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES "${BROTLI_INCLUDE_DIRS}")
-+  set_property(TARGET ${lib} APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES "$<BUILD_INTERFACE:${BROTLI_INCLUDE_DIRS}>" $<INSTALL_INTERFACE:include>)
- endforeach()
- 
- if(NOT BROTLI_EMSCRIPTEN)
-@@ -223,27 +222,35 @@ if(NOT BROTLI_EMSCRIPTEN)
- if(NOT BROTLI_BUNDLED_MODE)
-   install(
-     TARGETS brotli
--    RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
-+    RUNTIME DESTINATION tools/brotli
-+    CONFIGURATIONS Release
-   )
- 
-+  if(BUILD_SHARED_LIBS)
-   install(
-     TARGETS ${BROTLI_LIBRARIES_CORE}
-+    EXPORT brotli
-     ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
-     LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
-     RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
-   )
--
-+  else()
-   install(
-     TARGETS ${BROTLI_LIBRARIES_CORE_STATIC}
-+    EXPORT brotli
-     ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
-     LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
-     RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
-   )
-+  endif()
- 
-   install(
-     DIRECTORY ${BROTLI_INCLUDE_DIRS}/brotli
-     DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
-+    CONFIGURATIONS Release
-   )
-+  
-+  install(EXPORT brotli FILE unofficial-brotli-config.cmake NAMESPACE unofficial::brotli:: DESTINATION share/unofficial-brotli)
- endif()  # BROTLI_BUNDLED_MODE
- endif()  # BROTLI_EMSCRIPTEN
- 
diff --git a/ports/brotli/pkgconfig.patch b/ports/brotli/pkgconfig.patch
deleted file mode 100644
index c11e0d49..00000000
--- a/ports/brotli/pkgconfig.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index b1c654b..fcd9024 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -390,7 +390,7 @@ function(generate_pkg_config_path outvar path)
-   set("${outvar}" "${${outvar}}" PARENT_SCOPE)
- endfunction(generate_pkg_config_path)
- 
--function(transform_pc_file INPUT_FILE OUTPUT_FILE VERSION)
-+function(transform_pc_file INPUT_FILE OUTPUT_FILE VERSION SHARED_TARGET STATIC_TARGET)
-   file(READ ${INPUT_FILE} TEXT)
- 
-   set(PREFIX "${CMAKE_INSTALL_PREFIX}")
-@@ -404,15 +404,22 @@ function(transform_pc_file INPUT_FILE OUTPUT_FILE VERSION)
-   string(REGEX REPLACE "@includedir@" "${INCLUDEDIR}" TEXT ${TEXT})
- 
-   string(REGEX REPLACE "@PACKAGE_VERSION@" "${VERSION}" TEXT ${TEXT})
-+  
-+  if(BUILD_SHARED_LIBS)
-+    set(LIB_NAME "${SHARED_TARGET}")
-+  else()
-+    set(LIB_NAME "${STATIC_TARGET}")
-+  endif()
-+  string(REGEX REPLACE "@lib_name@" "${LIB_NAME}" TEXT ${TEXT})
- 
-   file(WRITE ${OUTPUT_FILE} ${TEXT})
- endfunction()
- 
--transform_pc_file("scripts/libbrotlicommon.pc.in" "${CMAKE_CURRENT_BINARY_DIR}/libbrotlicommon.pc" "${BROTLI_VERSION}")
-+transform_pc_file("scripts/libbrotlicommon.pc.in" "${CMAKE_CURRENT_BINARY_DIR}/libbrotlicommon.pc" "${BROTLI_VERSION}" brotlicommon brotlicommon-static)
- 
--transform_pc_file("scripts/libbrotlidec.pc.in" "${CMAKE_CURRENT_BINARY_DIR}/libbrotlidec.pc" "${BROTLI_VERSION}")
-+transform_pc_file("scripts/libbrotlidec.pc.in" "${CMAKE_CURRENT_BINARY_DIR}/libbrotlidec.pc" "${BROTLI_VERSION}" brotlidec brotlidec-static)
- 
--transform_pc_file("scripts/libbrotlienc.pc.in" "${CMAKE_CURRENT_BINARY_DIR}/libbrotlienc.pc" "${BROTLI_VERSION}")
-+transform_pc_file("scripts/libbrotlienc.pc.in" "${CMAKE_CURRENT_BINARY_DIR}/libbrotlienc.pc" "${BROTLI_VERSION}" brotlienc brotlienc-static)
- 
- if(NOT BROTLI_EMSCRIPTEN)
- if(NOT BROTLI_BUNDLED_MODE)
-diff --git a/scripts/libbrotlicommon.pc.in b/scripts/libbrotlicommon.pc.in
-index 10ca969..7736344 100644
---- a/scripts/libbrotlicommon.pc.in
-+++ b/scripts/libbrotlicommon.pc.in
-@@ -7,5 +7,5 @@ Name: libbrotlicommon
- URL: https://github.com/google/brotli
- Description: Brotli common dictionary library
- Version: @PACKAGE_VERSION@
--Libs: -L${libdir} -R${libdir} -lbrotlicommon
-+Libs: -L${libdir} -l@lib_name@
- Cflags: -I${includedir}
-diff --git a/scripts/libbrotlidec.pc.in b/scripts/libbrotlidec.pc.in
-index e7c3124..a7dc8ce 100644
---- a/scripts/libbrotlidec.pc.in
-+++ b/scripts/libbrotlidec.pc.in
-@@ -7,6 +7,6 @@ Name: libbrotlidec
- URL: https://github.com/google/brotli
- Description: Brotli decoder library
- Version: @PACKAGE_VERSION@
--Libs: -L${libdir} -R${libdir} -lbrotlidec
-+Libs: -L${libdir} -l@lib_name@
- Requires.private: libbrotlicommon >= 1.0.2
- Cflags: -I${includedir}
-diff --git a/scripts/libbrotlienc.pc.in b/scripts/libbrotlienc.pc.in
-index 4dd0811..eb2712e 100644
---- a/scripts/libbrotlienc.pc.in
-+++ b/scripts/libbrotlienc.pc.in
-@@ -7,6 +7,6 @@ Name: libbrotlienc
- URL: https://github.com/google/brotli
- Description: Brotli encoder library
- Version: @PACKAGE_VERSION@
--Libs: -L${libdir} -R${libdir} -lbrotlienc
-+Libs: -L${libdir} -l@lib_name@
- Requires.private: libbrotlicommon >= 1.0.2
- Cflags: -I${includedir}
diff --git a/ports/brotli/portfile.cmake b/ports/brotli/portfile.cmake
deleted file mode 100644
index 415a8a51..00000000
--- a/ports/brotli/portfile.cmake
+++ /dev/null
@@ -1,30 +0,0 @@
-vcpkg_from_github(
-    OUT_SOURCE_PATH SOURCE_PATH
-    REPO google/brotli
-    REF e61745a6b7add50d380cfd7d3883dd6c62fc2c71 # v1.0.9
-    SHA512 303444695600b70ce59708e06bf21647d9b8dd33d772c53bbe49320f2f8f95ca8a7d6df2d29b7f36ff99001967e2d28380e0e305d778031940a3a5c6585f9a4f
-    HEAD_REF master
-    PATCHES
-        install.patch
-        fix-arm-uwp.patch
-        pkgconfig.patch
-        remove-emscripten-detect-asan.patch
-)
-
-vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
-    OPTIONS -DBROTLI_DISABLE_TESTS=ON
-)
-
-vcpkg_install_cmake()
-
-vcpkg_copy_pdbs()
-
-vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/brotli)
-vcpkg_fixup_cmake_targets(CONFIG_PATH share/unofficial-brotli TARGET_PATH share/unofficial-brotli)
-vcpkg_fixup_pkgconfig()
-
-
-file(COPY ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/unofficial-brotli)
-file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
diff --git a/ports/brotli/remove-emscripten-detect-asan.patch b/ports/brotli/remove-emscripten-detect-asan.patch
deleted file mode 100644
index c51af844..00000000
--- a/ports/brotli/remove-emscripten-detect-asan.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index fcd9024..0662e11 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -13,18 +13,7 @@ else()
-   message(STATUS "Build type is '${CMAKE_BUILD_TYPE}'")
- endif()
- 
--include(CheckCSourceCompiles)
--check_c_source_compiles(
--  "#if defined(__EMSCRIPTEN__)
--   int main() {return 0;}
--   #endif"
--  BROTLI_EMSCRIPTEN
--)
--if (BROTLI_EMSCRIPTEN)
--  message("-- Compiler is EMSCRIPTEN")
--else()
--  message("-- Compiler is not EMSCRIPTEN")
--endif()
-+set(BROTLI_EMSCRIPTEN OFF)
- 
- # If Brotli is being bundled in another project, we don't want to
- # install anything.  However, we want to let people override this, so
diff --git a/ports/brotli/vcpkg-cmake-wrapper.cmake b/ports/brotli/vcpkg-cmake-wrapper.cmake
deleted file mode 100644
index 882106bc..00000000
--- a/ports/brotli/vcpkg-cmake-wrapper.cmake
+++ /dev/null
@@ -1,11 +0,0 @@
-_find_package(${ARGS})
-foreach(T brotlicommon brotlidec brotlienc)
-    if(TARGET unofficial::brotli::${T} AND NOT TARGET unofficial::brotli::${T}-static)
-        _add_library(unofficial::brotli::${T}-static INTERFACE IMPORTED)
-        set_target_properties(unofficial::brotli::${T}-static PROPERTIES INTERFACE_LINK_LIBRARIES "unofficial::brotli::${T}")
-    endif()
-    if(NOT TARGET unofficial::brotli::${T} AND TARGET unofficial::brotli::${T}-static)
-        _add_library(unofficial::brotli::${T} INTERFACE IMPORTED)
-        set_target_properties(unofficial::brotli::${T} PROPERTIES INTERFACE_LINK_LIBRARIES "unofficial::brotli::${T}-static")
-    endif()
-endforeach()
diff --git a/ports/gtest/0002-Fix-z7-override.patch b/ports/gtest/0002-Fix-z7-override.patch
deleted file mode 100644
index cf875084..00000000
--- a/ports/gtest/0002-Fix-z7-override.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/googletest/cmake/internal_utils.cmake b/googletest/cmake/internal_utils.cmake
-index 99725b7..3c25b0a 100644
---- a/googletest/cmake/internal_utils.cmake
-+++ b/googletest/cmake/internal_utils.cmake
-@@ -66,7 +66,7 @@ macro(config_compiler_and_linker)
-   if (MSVC)
-     # Newlines inside flags variables break CMake's NMake generator.
-     # TODO(vladl@google.com): Add -RTCs and -RTCu to debug builds.
--    set(cxx_base_flags "-GS -W4 -WX -wd4251 -wd4275 -nologo -J -Zi")
-+    set(cxx_base_flags "-GS -W4 -WX -wd4251 -wd4275 -nologo -J")
-     set(cxx_base_flags "${cxx_base_flags} -D_UNICODE -DUNICODE -DWIN32 -D_WIN32")
-     set(cxx_base_flags "${cxx_base_flags} -DSTRICT -DWIN32_LEAN_AND_MEAN")
-     set(cxx_exception_flags "-EHsc -D_HAS_EXCEPTIONS=1")
diff --git a/ports/gtest/CONTROL b/ports/gtest/CONTROL
deleted file mode 100644
index c0f5bb9d..00000000
--- a/ports/gtest/CONTROL
+++ /dev/null
@@ -1,5 +0,0 @@
-Source: gtest
-Version: 1.10.0
-Port-Version: 4
-Homepage: https://github.com/google/googletest
-Description: GoogleTest and GoogleMock testing frameworks.
diff --git a/ports/gtest/fix-build-failure-in-gcc-11.patch b/ports/gtest/fix-build-failure-in-gcc-11.patch
deleted file mode 100644
index b0369892..00000000
--- a/ports/gtest/fix-build-failure-in-gcc-11.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/googletest/src/gtest-death-test.cc b/googletest/src/gtest-death-test.cc
-index da09a1cf..43cbd78a 100644
---- a/googletest/src/gtest-death-test.cc
-+++ b/googletest/src/gtest-death-test.cc
-@@ -1288,7 +1288,7 @@ static void StackLowerThanAddress(const void* ptr,
- // making comparison result unpredictable.
- GTEST_ATTRIBUTE_NO_SANITIZE_HWADDRESS_
- static void StackLowerThanAddress(const void* ptr, bool* result) {
--  int dummy;
-+  int dummy = 0;
-   *result = (&dummy < ptr);
- }
- 
-@@ -1296,7 +1296,7 @@ static void StackLowerThanAddress(const void* ptr, bool* result) {
- GTEST_ATTRIBUTE_NO_SANITIZE_ADDRESS_
- GTEST_ATTRIBUTE_NO_SANITIZE_HWADDRESS_
- static bool StackGrowsDown() {
--  int dummy;
-+  int dummy = 0;
-   bool result;
-   StackLowerThanAddress(&dummy, &result);
-   return result;
diff --git a/ports/gtest/fix-main-lib-path.patch b/ports/gtest/fix-main-lib-path.patch
deleted file mode 100644
index e07806ee..00000000
--- a/ports/gtest/fix-main-lib-path.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-diff --git a/googlemock/CMakeLists.txt b/googlemock/CMakeLists.txt
-index 3e72d75..9d135ff 100644
---- a/googlemock/CMakeLists.txt
-+++ b/googlemock/CMakeLists.txt
-@@ -115,7 +115,8 @@ endif()
- ########################################################################
- #
- # Install rules
--install_project(gmock gmock_main)
-+install_project(gmock)
-+install_project(gmock_main)
- 
- ########################################################################
- #
-diff --git a/googletest/CMakeLists.txt b/googletest/CMakeLists.txt
-index e33718b..a049c2c 100644
---- a/googletest/CMakeLists.txt
-+++ b/googletest/CMakeLists.txt
-@@ -136,7 +136,8 @@ target_link_libraries(gtest_main PUBLIC gtest)
- ########################################################################
- #
- # Install rules
--install_project(gtest gtest_main)
-+install_project(gtest)
-+install_project(gtest_main)
- 
- ########################################################################
- #
-diff --git a/googletest/cmake/internal_utils.cmake b/googletest/cmake/internal_utils.cmake
-index 69defc8..cf7295a 100644
---- a/googletest/cmake/internal_utils.cmake
-+++ b/googletest/cmake/internal_utils.cmake
-@@ -317,11 +317,15 @@ function(install_project)
-     install(DIRECTORY "${PROJECT_SOURCE_DIR}/include/"
-       DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
-     # Install the project targets.
-+    set (LIB_INSTALL_DST ${CMAKE_INSTALL_LIBDIR})
-+    if (${ARGN} MATCHES "_main")
-+      set (LIB_INSTALL_DST ${CMAKE_INSTALL_LIBDIR}/manual-link)
-+    endif()
-     install(TARGETS ${ARGN}
-       EXPORT ${targets_export_name}
-       RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
--      ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
--      LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}")
-+      ARCHIVE DESTINATION "${LIB_INSTALL_DST}"
-+      LIBRARY DESTINATION "${LIB_INSTALL_DST}")
-     if(CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
-       # Install PDBs
-       foreach(t ${ARGN})
-@@ -330,7 +334,7 @@ function(install_project)
-         get_target_property(t_pdb_output_directory ${t} PDB_OUTPUT_DIRECTORY)
-         install(FILES
-           "${t_pdb_output_directory}/\${CMAKE_INSTALL_CONFIG_NAME}/$<$<CONFIG:Debug>:${t_pdb_name_debug}>$<$<NOT:$<CONFIG:Debug>>:${t_pdb_name}>.pdb"
--          DESTINATION ${CMAKE_INSTALL_LIBDIR}
-+          DESTINATION ${LIB_INSTALL_DST}
-           OPTIONAL)
-       endforeach()
-     endif()
-@@ -340,7 +344,7 @@ function(install_project)
-       configure_file("${PROJECT_SOURCE_DIR}/cmake/${t}.pc.in"
-         "${configured_pc}" @ONLY)
-       install(FILES "${configured_pc}"
--        DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
-+        DESTINATION "${LIB_INSTALL_DST}/pkgconfig")
-     endforeach()
-   endif()
- endfunction()
diff --git a/ports/gtest/portfile.cmake b/ports/gtest/portfile.cmake
deleted file mode 100644
index db507258..00000000
--- a/ports/gtest/portfile.cmake
+++ /dev/null
@@ -1,80 +0,0 @@
-if (EXISTS "${CURRENT_BUILDTREES_DIR}/src/.git")
-    file(REMOVE_RECURSE ${CURRENT_BUILDTREES_DIR}/src)
-endif()
-
-vcpkg_from_github(
-    OUT_SOURCE_PATH SOURCE_PATH
-    REPO google/googletest
-    REF release-1.10.0
-    SHA512 bd52abe938c3722adc2347afad52ea3a17ecc76730d8d16b065e165bc7477d762bce0997a427131866a89f1001e3f3315198204ffa5d643a9355f1f4d0d7b1a9
-    HEAD_REF master
-    PATCHES
-        0002-Fix-z7-override.patch
-        fix-main-lib-path.patch
-        fix-build-failure-in-gcc-11.patch
-        remove-werror.patch
-)
-
-string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "dynamic" GTEST_FORCE_SHARED_CRT)
-
-vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
-    OPTIONS
-        -DBUILD_GMOCK=ON
-        -DBUILD_GTEST=ON
-        -DCMAKE_DEBUG_POSTFIX=d
-        -Dgtest_force_shared_crt=${GTEST_FORCE_SHARED_CRT}
-)
-
-vcpkg_install_cmake()
-vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/GTest TARGET_PATH share/GTest)
-
-file(
-    INSTALL
-        "${SOURCE_PATH}/googletest/src/gtest.cc"
-        "${SOURCE_PATH}/googletest/src/gtest_main.cc"
-        "${SOURCE_PATH}/googletest/src/gtest-all.cc"
-        "${SOURCE_PATH}/googletest/src/gtest-death-test.cc"
-        "${SOURCE_PATH}/googletest/src/gtest-filepath.cc"
-        "${SOURCE_PATH}/googletest/src/gtest-internal-inl.h"
-        "${SOURCE_PATH}/googletest/src/gtest-matchers.cc"
-        "${SOURCE_PATH}/googletest/src/gtest-port.cc"
-        "${SOURCE_PATH}/googletest/src/gtest-printers.cc"
-        "${SOURCE_PATH}/googletest/src/gtest-test-part.cc"
-        "${SOURCE_PATH}/googletest/src/gtest-typed-test.cc"
-    DESTINATION
-        ${CURRENT_PACKAGES_DIR}/src
-)
-
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
-
-if(EXISTS ${CURRENT_PACKAGES_DIR}/debug/lib/gtest_maind.lib)
-    file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/lib/manual-link)
-    file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/gtest_maind.lib ${CURRENT_PACKAGES_DIR}/debug/lib/manual-link/gtest_maind.lib)
-    file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/gmock_maind.lib ${CURRENT_PACKAGES_DIR}/debug/lib/manual-link/gmock_maind.lib)
-
-    file(READ ${CURRENT_PACKAGES_DIR}/share/gtest/GTestTargets-debug.cmake DEBUG_CONFIG)
-    string(REPLACE "\${_IMPORT_PREFIX}/debug/lib/gtest_maind.lib"
-                   "\${_IMPORT_PREFIX}/debug/lib/manual-link/gtest_maind.lib" DEBUG_CONFIG "${DEBUG_CONFIG}")
-    string(REPLACE "\${_IMPORT_PREFIX}/debug/lib/gmock_maind.lib"
-                   "\${_IMPORT_PREFIX}/debug/lib/manual-link/gmock_maind.lib" DEBUG_CONFIG "${DEBUG_CONFIG}")
-    file(WRITE ${CURRENT_PACKAGES_DIR}/share/gtest/GTestTargets-debug.cmake "${DEBUG_CONFIG}")
-endif()
-
-if(EXISTS ${CURRENT_PACKAGES_DIR}/lib/gtest_main.lib)
-    file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/lib/manual-link)
-    file(RENAME ${CURRENT_PACKAGES_DIR}/lib/gtest_main.lib ${CURRENT_PACKAGES_DIR}/lib/manual-link/gtest_main.lib)
-    file(RENAME ${CURRENT_PACKAGES_DIR}/lib/gmock_main.lib ${CURRENT_PACKAGES_DIR}/lib/manual-link/gmock_main.lib)
-
-    file(READ ${CURRENT_PACKAGES_DIR}/share/gtest/GTestTargets-release.cmake RELEASE_CONFIG)
-    string(REPLACE "\${_IMPORT_PREFIX}/lib/gtest_main.lib"
-                   "\${_IMPORT_PREFIX}/lib/manual-link/gtest_main.lib" RELEASE_CONFIG "${RELEASE_CONFIG}")
-    string(REPLACE "\${_IMPORT_PREFIX}/lib/gmock_main.lib"
-                   "\${_IMPORT_PREFIX}/lib/manual-link/gmock_main.lib" RELEASE_CONFIG "${RELEASE_CONFIG}")
-    file(WRITE ${CURRENT_PACKAGES_DIR}/share/gtest/GTestTargets-release.cmake "${RELEASE_CONFIG}")
-endif()
-
-vcpkg_copy_pdbs()
-
-file(INSTALL ${SOURCE_PATH}/googletest/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
diff --git a/ports/gtest/remove-werror.patch b/ports/gtest/remove-werror.patch
deleted file mode 100644
index 2b7339da..00000000
--- a/ports/gtest/remove-werror.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/googletest/cmake/internal_utils.cmake b/googletest/cmake/internal_utils.cmake
-index 4439cb9..e385a5a 100644
---- a/googletest/cmake/internal_utils.cmake
-+++ b/googletest/cmake/internal_utils.cmake
-@@ -82,13 +82,13 @@ macro(config_compiler_and_linker)
-     # http://stackoverflow.com/questions/3232669 explains the issue.
-     set(cxx_base_flags "${cxx_base_flags} -wd4702")
-   elseif (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
--    set(cxx_base_flags "-Wall -Wshadow -Werror -Wconversion")
-+    set(cxx_base_flags "-Wall -Wshadow -Wconversion")
-     set(cxx_exception_flags "-fexceptions")
-     set(cxx_no_exception_flags "-fno-exceptions")
-     set(cxx_strict_flags "-W -Wpointer-arith -Wreturn-type -Wcast-qual -Wwrite-strings -Wswitch -Wunused-parameter -Wcast-align -Wchar-subscripts -Winline -Wredundant-decls")
-     set(cxx_no_rtti_flags "-fno-rtti")
-   elseif (CMAKE_COMPILER_IS_GNUCXX)
--    set(cxx_base_flags "-Wall -Wshadow -Werror")
-+    set(cxx_base_flags "-Wall -Wshadow")
-     if(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 7.0.0)
-       set(cxx_base_flags "${cxx_base_flags} -Wno-error=dangling-else")
-     endif()
diff --git a/ports/gtest/usage b/ports/gtest/usage
deleted file mode 100644
index 3ed19445..00000000
--- a/ports/gtest/usage
+++ /dev/null
@@ -1,8 +0,0 @@
-The package gtest is compatible with built-in CMake targets:
-
-    enable_testing()
-    
-    find_package(GTest CONFIG REQUIRED)
-    target_link_libraries(main PRIVATE GTest::gtest GTest::gtest_main GTest::gmock GTest::gmock_main)
-    
-    add_test(AllTestsInMain main)