diff --git a/ports/flatbuffers/fix-uwp-build.patch b/ports/flatbuffers/fix-uwp-build.patch
deleted file mode 100644
index 44513b9e..00000000
--- a/ports/flatbuffers/fix-uwp-build.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/src/util.cpp b/src/util.cpp
-index 3670a019..fb5d884f 100644
---- a/src/util.cpp
-+++ b/src/util.cpp
-@@ -255,9 +255,15 @@ bool ReadEnvironmentVariable(const char *var_name, std::string *_value) {
- #ifdef _MSC_VER
-   __pragma(warning(disable : 4996));  // _CRT_SECURE_NO_WARNINGS
- #endif
-+#if _WIN32_WINNT < 0x0A00
-   auto env_str = std::getenv(var_name);
-   if (!env_str) return false;
-   if (_value) *_value = std::string(env_str);
-+#else
-+  //There is no support for environment variables in UWP
-+  var_name; // Do nothing
-+  *_value = std::string("");
-+#endif
-   return true;
- }
- 
diff --git a/ports/flatbuffers/ignore_use_of_cmake_toolchain_file.patch b/ports/flatbuffers/ignore_use_of_cmake_toolchain_file.patch
deleted file mode 100644
index 8bd99db3..00000000
--- a/ports/flatbuffers/ignore_use_of_cmake_toolchain_file.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index ec782239..f163b64d 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -216,7 +216,7 @@ set(FlatBuffers_GRPCTest_SRCS
- # source_group(Compiler FILES ${FlatBuffers_Compiler_SRCS})
- # source_group(Tests FILES ${FlatBuffers_Tests_SRCS})
- 
--if(EXISTS "${CMAKE_TOOLCHAIN_FILE}")
-+if(EXISTS "${CMAKE_TOOLCHAIN_FILE}" AND NOT DEFINED VCPKG_TOOLCHAIN)
-   # do not apply any global settings if the toolchain
-   # is being configured externally
-   message(STATUS "Using toolchain file: ${CMAKE_TOOLCHAIN_FILE}.")
diff --git a/ports/flatbuffers/no-werror.patch b/ports/flatbuffers/no-werror.patch
deleted file mode 100644
index dcc5cde4..00000000
--- a/ports/flatbuffers/no-werror.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index ec782239..57566c5a 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -233,13 +233,17 @@ elseif(CMAKE_COMPILER_IS_GNUCXX)
-       "${CMAKE_CXX_FLAGS} -std=c++0x")
-   endif(CYGWIN)
-   set(CMAKE_CXX_FLAGS
--    "${CMAKE_CXX_FLAGS} -Wall -pedantic -Werror -Wextra -Werror=shadow")
-+    "${CMAKE_CXX_FLAGS} -Wall -pedantic -Wextra -Werror=shadow")
-   set(FLATBUFFERS_PRIVATE_CXX_FLAGS "-Wold-style-cast")
-   if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 4.4)
-     if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 7.0)
-       set(CMAKE_CXX_FLAGS
-         "${CMAKE_CXX_FLAGS} -faligned-new -Werror=implicit-fallthrough=2")
-     endif()
-+    if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 7.0)
-+      set(CMAKE_CXX_FLAGS
-+        "${CMAKE_CXX_FLAGS} -Wextra")
-+    endif()
-     set(CMAKE_CXX_FLAGS
-       "${CMAKE_CXX_FLAGS} -Wunused-result -Werror=unused-result -Wunused-parameter -Werror=unused-parameter")
-   endif()
diff --git a/ports/flatbuffers/portfile.cmake b/ports/flatbuffers/portfile.cmake
deleted file mode 100644
index ce824f02..00000000
--- a/ports/flatbuffers/portfile.cmake
+++ /dev/null
@@ -1,51 +0,0 @@
-vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
-
-vcpkg_from_github(
-    OUT_SOURCE_PATH SOURCE_PATH
-    REPO google/flatbuffers
-    REF v2.0.6
-    SHA512 be631f34064c28d81876bf137c796e9736623cf2cc4f2a05dd45372e7195729c99fad1fa795f8ce71a408756a842edbdc0c3bc714a7cf63203a1de8681d86fb6
-    HEAD_REF master
-    PATCHES
-        ignore_use_of_cmake_toolchain_file.patch
-        no-werror.patch
-        fix-uwp-build.patch
-)
-
-set(options "")
-if(VCPKG_CROSSCOMPILING)
-    list(APPEND options -DFLATBUFFERS_BUILD_FLATC=OFF -DFLATBUFFERS_BUILD_FLATHASH=OFF)
-endif()
-
-vcpkg_cmake_configure(
-    SOURCE_PATH "${SOURCE_PATH}"
-    OPTIONS
-        -DFLATBUFFERS_BUILD_TESTS=OFF
-        -DFLATBUFFERS_BUILD_GRPCTEST=OFF
-        ${options}
-)
-
-vcpkg_cmake_install()
-vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/flatbuffers)
-vcpkg_fixup_pkgconfig()
-
-file(GLOB flatc_path ${CURRENT_PACKAGES_DIR}/bin/flatc*)
-if(flatc_path)
-    make_directory("${CURRENT_PACKAGES_DIR}/tools/flatbuffers")
-    get_filename_component(flatc_executable ${flatc_path} NAME)
-    file(
-        RENAME
-        ${flatc_path}
-        ${CURRENT_PACKAGES_DIR}/tools/flatbuffers/${flatc_executable}
-    )
-    vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/flatbuffers")
-else()
-    file(APPEND "${CURRENT_PACKAGES_DIR}/share/flatbuffers/FlatbuffersConfig.cmake"
-"include(\"\${CMAKE_CURRENT_LIST_DIR}/../../../${HOST_TRIPLET}/share/flatbuffers/FlatcTargets.cmake\")\n")
-endif()
-
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
-
-# Handle copyright
-file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/ports/flatbuffers/vcpkg.json b/ports/flatbuffers/vcpkg.json
deleted file mode 100644
index 9313250e..00000000
--- a/ports/flatbuffers/vcpkg.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-  "name": "flatbuffers",
-  "version": "2.0.6",
-  "port-version": 0,
-  "description": [
-    "Memory Efficient Serialization Library",
-    "FlatBuffers is an efficient cross platform serialization library for games and other memory constrained apps. It allows you to directly access serialized data without unpacking/parsing it first, while still having great forwards/backwards compatibility."
-  ],
-  "homepage": "https://google.github.io/flatbuffers/",
-  "dependencies": [
-    {
-      "name": "flatbuffers",
-      "host": true
-    },
-    {
-      "name": "vcpkg-cmake",
-      "host": true
-    },
-    {
-      "name": "vcpkg-cmake-config",
-      "host": true
-    }
-  ]
-}
diff --git a/ports/grpc/00001-fix-uwp.patch b/ports/grpc/00001-fix-uwp.patch
deleted file mode 100644
index 80146bab..00000000
--- a/ports/grpc/00001-fix-uwp.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 1911144984..8f78306f77 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -181,6 +181,9 @@ if(UNIX)
- endif()
- if(WIN32)
-   set(_gRPC_PLATFORM_WINDOWS ON)
-+  if(CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
-+    set(_gRPC_PLATFORM_UWP ON)
-+  endif()
- endif()
- 
-  # Use C99 standard
-@@ -219,6 +222,9 @@ if(MSVC)
-   set(_gRPC_C_CXX_FLAGS "${_gRPC_C_CXX_FLAGS} /wd4267")
-   # TODO(jtattermusch): needed to build boringssl with VS2017, revisit later
-   set(_gRPC_C_CXX_FLAGS "${_gRPC_C_CXX_FLAGS} /wd4987 /wd4774 /wd4819 /wd4996 /wd4619")
-+  if(_gRPC_PLATFORM_UWP)
-+    add_definitions(-DGRPC_ARES=0)
-+  endif()
- endif()
- if (MINGW)
-   add_definitions(-D_WIN32_WINNT=0x600)
-@@ -286,6 +292,10 @@ file(MAKE_DIRECTORY ${_gRPC_PROTO_GENS_DIR})
- #     ``.proto`` files
- #
- function(protobuf_generate_grpc_cpp)
-+  if(_gRPC_PLATFORM_UWP)
-+    return()
-+  endif()
-+
-   if(NOT ARGN)
-     message(SEND_ERROR "Error: PROTOBUF_GENERATE_GRPC_CPP() called without any proto files")
-     return()
-@@ -358,6 +368,7 @@ if (gRPC_BUILD_GRPC_RUBY_PLUGIN)
-   list(APPEND _gRPC_PLUGIN_LIST grpc_ruby_plugin)
- endif ()
- 
-+if(NOT _gRPC_PLATFORM_UWP)
- add_custom_target(plugins
-   DEPENDS ${_gRPC_PLUGIN_LIST}
- )
-@@ -376,6 +387,7 @@ add_custom_target(tools_cxx
- 
- add_custom_target(tools
-   DEPENDS tools_c tools_cxx)
-+endif()
- 
- protobuf_generate_grpc_cpp(
-   src/proto/grpc/channelz/channelz.proto
-diff --git a/src/core/lib/iomgr/resource_quota.cc b/src/core/lib/iomgr/resource_quota.cc
-index dbe84e3466..cda40b6435 100644
---- a/src/core/lib/iomgr/resource_quota.cc
-+++ b/src/core/lib/iomgr/resource_quota.cc
-@@ -945,7 +945,7 @@ bool grpc_resource_user_alloc(grpc_resource_user* resource_user, size_t size,
- void grpc_resource_user_free(grpc_resource_user* resource_user, size_t size) {
-   gpr_mu_lock(&resource_user->mu);
-   grpc_resource_quota* resource_quota = resource_user->resource_quota;
--  gpr_atm prior = gpr_atm_no_barrier_fetch_add(&resource_quota->used, -size);
-+  gpr_atm prior = gpr_atm_no_barrier_fetch_add(&resource_quota->used, -static_cast<gpr_atm>(size));
-   GPR_ASSERT(prior >= static_cast<long>(size));
-   bool was_zero_or_negative = resource_user->free_pool <= 0;
-   resource_user->free_pool += static_cast<int64_t>(size);
-diff --git a/src/core/lib/security/credentials/alts/check_gcp_environment_windows.cc b/src/core/lib/security/credentials/alts/check_gcp_environment_windows.cc
-index 59432cff36..fed574d5bc 100644
---- a/src/core/lib/security/credentials/alts/check_gcp_environment_windows.cc
-+++ b/src/core/lib/security/credentials/alts/check_gcp_environment_windows.cc
-@@ -39,6 +39,7 @@ bool check_bios_data(const char*) { return false; }
- bool check_windows_registry_product_name(HKEY root_key,
-                                          const char* reg_key_path,
-                                          const char* reg_key_name) {
-+#if !defined(WINAPI_FAMILY) || WINAPI_FAMILY == WINAPI_FAMILY_DESKTOP_APP
-   const size_t kProductNameBufferSize = 256;
-   char const expected_substr[] = "Google";
- 
-@@ -71,6 +72,9 @@ bool check_windows_registry_product_name(HKEY root_key,
-   }
- 
-   return strstr(buffer, expected_substr) != nullptr;
-+#else
-+  return false;
-+#endif
- }
- 
- }  // namespace internal
diff --git a/ports/grpc/00002-static-linking-in-linux.patch b/ports/grpc/00002-static-linking-in-linux.patch
deleted file mode 100644
index 8999a24a..00000000
--- a/ports/grpc/00002-static-linking-in-linux.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 8f78306f77..e09f8fcc1e 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -211,6 +211,11 @@ if (NOT DEFINED CMAKE_POSITION_INDEPENDENT_CODE)
- endif()
- list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules")
- 
-+if (gRPC_STATIC_LINKING AND NOT _gRPC_PLATFORM_WINDOWS)
-+  # Force to static link
-+  set(CMAKE_EXE_LINKER_FLAGS "-Bstatic")
-+endif()
-+
- if(MSVC)
-   include(cmake/msvc_static_runtime.cmake)
-   add_definitions(-D_WIN32_WINNT=0x600 -D_SCL_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_WARNINGS -D_WINSOCK_DEPRECATED_NO_WARNINGS)
diff --git a/ports/grpc/00003-undef-base64-macro.patch b/ports/grpc/00003-undef-base64-macro.patch
deleted file mode 100644
index 3f540a53..00000000
--- a/ports/grpc/00003-undef-base64-macro.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/core/lib/transport/transport.cc b/src/core/lib/transport/transport.cc
-index 99a32980aa..f55db67113 100644
---- a/src/core/lib/transport/transport.cc
-+++ b/src/core/lib/transport/transport.cc
-@@ -97,6 +97,8 @@ void grpc_stream_ref_init(grpc_stream_refcount* refcount, int /*initial_refs*/,
-       refcount, &refcount->slice_refcount);
- }
- 
-+#undef move64
-+
- static void move64(uint64_t* from, uint64_t* to) {
-   *to += *from;
-   *from = 0;
diff --git a/ports/grpc/00004-link-gdi32-on-windows.patch b/ports/grpc/00004-link-gdi32-on-windows.patch
deleted file mode 100644
index e30e94f3..00000000
--- a/ports/grpc/00004-link-gdi32-on-windows.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index e09f8fcc1e..ec1714687e 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -278,7 +278,7 @@ elseif(UNIX)
- endif()
- 
- if(WIN32)
--  set(_gRPC_BASELIB_LIBRARIES wsock32 ws2_32 crypt32)
-+  set(_gRPC_BASELIB_LIBRARIES wsock32 ws2_32 crypt32 gdi32)
- endif()
- 
- # Create directory for generated .proto files
diff --git a/ports/grpc/00005-fix-uwp-error.patch b/ports/grpc/00005-fix-uwp-error.patch
deleted file mode 100644
index 0409cf6b..00000000
--- a/ports/grpc/00005-fix-uwp-error.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff --git a/src/core/lib/slice/slice.cc b/src/core/lib/slice/slice.cc
-index 5f7e9ea0c8..547b5415ef 100644
---- a/src/core/lib/slice/slice.cc
-+++ b/src/core/lib/slice/slice.cc
-@@ -233,7 +233,7 @@ grpc_slice grpc_slice_from_copied_string(const char* source) {
- grpc_slice grpc_slice_from_moved_buffer(grpc_core::UniquePtr<char> p,
-                                         size_t len) {
-   uint8_t* ptr = reinterpret_cast<uint8_t*>(p.get());
--  grpc_slice slice;
-+  grpc_slice slice = {};
-   if (len <= sizeof(slice.data.inlined.bytes)) {
-     slice.refcount = nullptr;
-     slice.data.inlined.length = len;
-@@ -253,7 +253,7 @@ grpc_slice grpc_slice_from_moved_string(grpc_core::UniquePtr<char> p) {
- }
- 
- grpc_slice grpc_slice_from_cpp_string(std::string str) {
--  grpc_slice slice;
-+  grpc_slice slice = {};
-   if (str.size() <= sizeof(slice.data.inlined.bytes)) {
-     slice.refcount = nullptr;
-     slice.data.inlined.length = str.size();
-diff --git a/src/core/lib/surface/server.cc b/src/core/lib/surface/server.cc
-index a97c1c57ce..ec9b268556 100644
---- a/src/core/lib/surface/server.cc
-+++ b/src/core/lib/surface/server.cc
-@@ -910,7 +910,7 @@ grpc_call_error Server::QueueRequestedCall(size_t cq_idx, RequestedCall* rc) {
-              GRPC_ERROR_CREATE_FROM_STATIC_STRING("Server Shutdown"));
-     return GRPC_CALL_OK;
-   }
--  RequestMatcherInterface* rm;
-+  RequestMatcherInterface* rm = nullptr;
-   switch (rc->type) {
-     case RequestedCall::Type::BATCH_CALL:
-       rm = unregistered_request_matcher_.get();
diff --git a/ports/grpc/00009-use-system-upb.patch b/ports/grpc/00009-use-system-upb.patch
deleted file mode 100644
index 46271516..00000000
--- a/ports/grpc/00009-use-system-upb.patch
+++ /dev/null
@@ -1,130 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 1c3146b691..78c9d8c0b3 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -87,6 +87,9 @@ set_property(CACHE gRPC_PROTOBUF_PROVIDER PROPERTY STRINGS "module" "package")
- set(gRPC_PROTOBUF_PACKAGE_TYPE "" CACHE STRING "Algorithm for searching protobuf package")
- set_property(CACHE gRPC_PROTOBUF_PACKAGE_TYPE PROPERTY STRINGS "CONFIG" "MODULE")
- 
-+set(gRPC_UPB_PROVIDER "module" CACHE STRING "Provider of upb library")
-+set_property(CACHE gRPC_UPB_PROVIDER PROPERTY STRINGS "module" "package")
-+
- if(gRPC_BUILD_TESTS)
-   set(gRPC_BENCHMARK_PROVIDER "module" CACHE STRING "Provider of benchmark library")
-   set_property(CACHE gRPC_BENCHMARK_PROVIDER PROPERTY STRINGS "module" "package")
-@@ -1504,7 +1507,6 @@ target_link_libraries(gpr
-   absl::synchronization
-   absl::time
-   absl::optional
--  upb
- )
- if(_gRPC_PLATFORM_ANDROID)
-   target_link_libraries(gpr
-@@ -3927,6 +3929,7 @@ endif()
- 
- endif()
- 
-+if(gRPC_UPB_PROVIDER STREQUAL "module")
- add_library(upb
-   third_party/upb/upb/decode_fast.c
-   third_party/upb/upb/decode.c
-@@ -3975,7 +3978,6 @@ target_link_libraries(upb
- )
- 
- 
--
- if(gRPC_INSTALL)
-   install(TARGETS upb EXPORT gRPCTargets
-     RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR}
-@@ -3983,7 +3985,7 @@ if(gRPC_INSTALL)
-     ARCHIVE DESTINATION ${gRPC_INSTALL_LIBDIR}
-   )
- endif()
--
-+endif()
- 
- 
- add_executable(check_epollexclusive
-@@ -7785,7 +7787,6 @@ target_link_libraries(activity_test
-   absl::time
-   absl::optional
-   absl::variant
--  upb
- )
- 
- 
-@@ -10532,7 +10533,6 @@ target_link_libraries(core_configuration_test
-   absl::synchronization
-   absl::time
-   absl::optional
--  upb
- )
- 
- 
-@@ -11377,7 +11377,6 @@ target_link_libraries(for_each_test
-   absl::time
-   absl::optional
-   absl::variant
--  upb
- )
- 
- 
-@@ -12988,7 +12987,6 @@ target_link_libraries(latch_test
-   absl::time
-   absl::optional
-   absl::variant
--  upb
- )
- 
- 
-@@ -13610,7 +13608,6 @@ target_link_libraries(observable_test
-   absl::time
-   absl::optional
-   absl::variant
--  upb
- )
- 
- 
-@@ -13855,7 +13852,6 @@ target_link_libraries(pipe_test
-   absl::time
-   absl::optional
-   absl::variant
--  upb
- )
- 
- 
-diff --git a/cmake/gRPCConfig.cmake.in b/cmake/gRPCConfig.cmake.in
-index 3623f4aa5e..df6ced560e 100644
---- a/cmake/gRPCConfig.cmake.in
-+++ b/cmake/gRPCConfig.cmake.in
-@@ -8,6 +8,7 @@ list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/modules)
- @_gRPC_FIND_CARES@
- @_gRPC_FIND_ABSL@
- @_gRPC_FIND_RE2@
-+@_gRPC_FIND_UPB@
- 
- # Targets
- include(${CMAKE_CURRENT_LIST_DIR}/gRPCTargets.cmake)
-diff --git a/cmake/upb.cmake b/cmake/upb.cmake
-index f2a0e508c3..88d654084f 100644
---- a/cmake/upb.cmake
-+++ b/cmake/upb.cmake
-@@ -12,9 +12,17 @@
- # See the License for the specific language governing permissions and
- # limitations under the License.
- 
-+set(_gRPC_UPB_GRPC_GENERATED_DIR "${CMAKE_CURRENT_SOURCE_DIR}/src/core/ext/upb-generated" "${CMAKE_CURRENT_SOURCE_DIR}/src/core/ext/upbdefs-generated")
-+if(gRPC_UPB_PROVIDER STREQUAL "module")
- set(UPB_ROOT_DIR ${CMAKE_CURRENT_SOURCE_DIR}/third_party/upb)
- 
- set(_gRPC_UPB_INCLUDE_DIR "${UPB_ROOT_DIR}")
--set(_gRPC_UPB_GRPC_GENERATED_DIR "${CMAKE_CURRENT_SOURCE_DIR}/src/core/ext/upb-generated" "${CMAKE_CURRENT_SOURCE_DIR}/src/core/ext/upbdefs-generated")
- 
- set(_gRPC_UPB_LIBRARIES upb)
-+elseif(gRPC_UPB_PROVIDER STREQUAL "package")
-+    find_package(upb CONFIG REQUIRED)
-+    set(_gRPC_UPB_LIBRARIES upb::upb)
-+    set(_gRPC_UPB_INCLUDE_DIR)
-+    set(upb ${_gRPC_UPB_LIBRARIES})
-+    set(_gRPC_FIND_UPB "if(NOT upb_FOUND)\n  find_package(upb CONFIG REQUIRED)\nendif()")
-+endif()
diff --git a/ports/grpc/00010-add-feature-absl-sync.patch b/ports/grpc/00010-add-feature-absl-sync.patch
deleted file mode 100644
index 3dc01a89..00000000
--- a/ports/grpc/00010-add-feature-absl-sync.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index b9954590ee..8ed3313c1b 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -2180,6 +2180,8 @@ target_link_libraries(grpc
-   ${_gRPC_UPB_LIBRARIES}
-   ${_gRPC_ALLTARGETS_LIBRARIES}
-   absl::flat_hash_map
-+  absl::time
-+  absl::synchronization
-   absl::inlined_vector
-   absl::bind_front
-   absl::statusor
-@@ -2734,6 +2736,8 @@ target_link_libraries(grpc_unsecure
-   ${_gRPC_ALLTARGETS_LIBRARIES}
-   absl::flat_hash_map
-   absl::inlined_vector
-+  absl::time
-+  absl::synchronization
-   absl::bind_front
-   absl::statusor
-   absl::variant
-diff --git a/cmake/abseil-cpp.cmake b/cmake/abseil-cpp.cmake
-index c89ba26f61..fe4bd41901 100644
---- a/cmake/abseil-cpp.cmake
-+++ b/cmake/abseil-cpp.cmake
-@@ -33,5 +33,8 @@ if(gRPC_ABSL_PROVIDER STREQUAL "module")
- elseif(gRPC_ABSL_PROVIDER STREQUAL "package")
-   # Use "CONFIG" as there is no built-in cmake module for absl.
-   find_package(absl REQUIRED CONFIG)
-+  if (gRPC_ABSL_SYNC_ENABLE)
-+    add_definitions(-DGPR_ABSEIL_SYNC=1)
-+  endif()
- endif()
- set(_gRPC_FIND_ABSL "if(NOT TARGET absl::strings)\n  find_package(absl CONFIG)\nendif()")
diff --git a/ports/grpc/00011-fix-csharp_plugin.patch b/ports/grpc/00011-fix-csharp_plugin.patch
deleted file mode 100644
index d3cbddef..00000000
--- a/ports/grpc/00011-fix-csharp_plugin.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 8ed3313c1b..b3b7d8b4c7 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -2232,10 +2232,14 @@ endif()
- 
- if(gRPC_BUILD_CSHARP_EXT)
- 
--add_library(grpc_csharp_ext SHARED
-+add_library(grpc_csharp_ext
-   src/csharp/ext/grpc_csharp_ext.c
- )
- 
-+if(WIN32 AND BUILD_SHARED_LIBS)
-+  target_compile_definitions(grpc_csharp_ext PUBLIC GPR_WINDOWS)
-+endif()
-+
- set_target_properties(grpc_csharp_ext PROPERTIES
-   VERSION ${gRPC_CORE_VERSION}
-   SOVERSION ${gRPC_CORE_SOVERSION}
-@@ -2249,6 +2253,11 @@ if(WIN32 AND MSVC)
-     install(FILES ${CMAKE_CURRENT_BINARY_DIR}/grpc_csharp_ext.pdb
-       DESTINATION ${gRPC_INSTALL_LIBDIR} OPTIONAL
-     )
-+    install(TARGETS grpc_csharp_ext
-+      RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR}
-+      LIBRARY DESTINATION ${gRPC_INSTALL_LIBDIR}
-+      ARCHIVE DESTINATION ${gRPC_INSTALL_LIBDIR}
-+    )
-   endif()
- endif()
- 
diff --git a/ports/grpc/00012-fix-use-cxx17.patch b/ports/grpc/00012-fix-use-cxx17.patch
deleted file mode 100644
index 0e972821..00000000
--- a/ports/grpc/00012-fix-use-cxx17.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index b3b7d8b4c7..e049b4f678 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -279,6 +279,11 @@ include(cmake/upb.cmake)
- include(cmake/xxhash.cmake)
- include(cmake/zlib.cmake)
- 
-+if(ABSL_USE_CXX17)
-+  message(STATUS "Found absl uses CXX17, enable CXX17 feature.")
-+  set(CMAKE_CXX_STANDARD 17)
-+endif()
-+
- if(_gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_IOS)
-   set(_gRPC_ALLTARGETS_LIBRARIES ${CMAKE_DL_LIBS} m pthread)
- elseif(_gRPC_PLATFORM_ANDROID)
diff --git a/ports/grpc/00013-build-upbdefs.patch b/ports/grpc/00013-build-upbdefs.patch
deleted file mode 100644
index d16813ea..00000000
--- a/ports/grpc/00013-build-upbdefs.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff --git a/cmake/upb.cmake b/cmake/upb.cmake
-index 88d654084f..f87898ef15 100644
---- a/cmake/upb.cmake
-+++ b/cmake/upb.cmake
-@@ -21,8 +21,21 @@ set(_gRPC_UPB_INCLUDE_DIR "${UPB_ROOT_DIR}")
- set(_gRPC_UPB_LIBRARIES upb)
- elseif(gRPC_UPB_PROVIDER STREQUAL "package")
-     find_package(upb CONFIG REQUIRED)
--    set(_gRPC_UPB_LIBRARIES upb::upb)
-+    set(_gRPC_UPB_LIBRARIES upb)
-     set(_gRPC_UPB_INCLUDE_DIR)
--    set(upb ${_gRPC_UPB_LIBRARIES})
-+    add_library(upb STATIC
-+        ${CMAKE_CURRENT_SOURCE_DIR}/src/core/ext/upbdefs-generated/google/protobuf/descriptor.upbdefs.c
-+        ${CMAKE_CURRENT_SOURCE_DIR}/src/core/ext/upb-generated/google/protobuf/descriptor.upb.c
-+    )
-+    set_target_properties(upb PROPERTIES OUTPUT_NAME grpc_upbdefs)
-+    target_include_directories(upb PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR})
-+    target_link_libraries(upb PUBLIC upb::all_libs)
-+    if(gRPC_INSTALL)
-+        install(TARGETS upb EXPORT gRPCTargets
-+            RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR}
-+            LIBRARY DESTINATION ${gRPC_INSTALL_LIBDIR}
-+            ARCHIVE DESTINATION ${gRPC_INSTALL_LIBDIR}
-+        )
-+    endif()
-     set(_gRPC_FIND_UPB "if(NOT upb_FOUND)\n  find_package(upb CONFIG REQUIRED)\nendif()")
- endif()
diff --git a/ports/grpc/00014-pkgconfig-upbdefs.patch b/ports/grpc/00014-pkgconfig-upbdefs.patch
deleted file mode 100644
index 5139cd0d..00000000
--- a/ports/grpc/00014-pkgconfig-upbdefs.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index e049b4f678..b5b005dbbc 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -17697,7 +17697,7 @@ generate_pkgconfig(
-   "high performance general RPC framework"
-   "${gRPC_CORE_VERSION}"
-   "gpr openssl absl_base absl_bind_front absl_cord absl_core_headers absl_flat_hash_map absl_inlined_vector absl_memory absl_optional absl_status absl_statusor absl_str_format absl_strings absl_synchronization absl_time absl_variant"
--  "-lgrpc -laddress_sorting -lre2 -lupb -lcares -lz"
-+  "-lgrpc -lgrpc_upbdefs -laddress_sorting -lre2 -lupb_descriptor_upb_proto -lupb_port -upb_table -lupb_fastdecode -lupb_reflection -lupb_textformat -lupb_json -lupb -lcares -lz"
-   ""
-   "grpc.pc")
- 
diff --git a/ports/grpc/00015-target-definitions.patch b/ports/grpc/00015-target-definitions.patch
deleted file mode 100644
index a6bcb04e..00000000
--- a/ports/grpc/00015-target-definitions.patch
+++ /dev/null
@@ -1,102 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 0097a1c..194d338 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -65,6 +65,8 @@ else()
-   set(_gRPC_INSTALL_SUPPORTED_FROM_MODULE ON)
- endif()
- 
-+add_library(grpc_definitions INTERFACE)
-+
- # Providers for third-party dependencies (gRPC_*_PROVIDER properties):
- # "module": build the dependency using sources from git submodule (under third_party)
- # "package": use cmake's find_package functionality to locate a pre-installed dependency
-@@ -222,7 +224,7 @@ endif()
- 
- if(MSVC)
-   include(cmake/msvc_static_runtime.cmake)
--  add_definitions(-D_WIN32_WINNT=0x600 -D_SCL_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_WARNINGS -D_WINSOCK_DEPRECATED_NO_WARNINGS)
-+  target_compile_definitions(grpc_definitions INTERFACE -D_WIN32_WINNT=0x600 -D_SCL_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_WARNINGS -D_WINSOCK_DEPRECATED_NO_WARNINGS)
-   # needed to compile protobuf
-   set(_gRPC_C_CXX_FLAGS "${_gRPC_C_CXX_FLAGS} /wd4065 /wd4506")
-   # TODO(jtattermusch): revisit warnings that were silenced as part of upgrade to protobuf3.6.0
-@@ -232,24 +234,24 @@ if(MSVC)
-   # TODO(jtattermusch): needed to build boringssl with VS2017, revisit later
-   set(_gRPC_C_CXX_FLAGS "${_gRPC_C_CXX_FLAGS} /wd4987 /wd4774 /wd4819 /wd4996 /wd4619")
-   if(_gRPC_PLATFORM_UWP)
--    add_definitions(-DGRPC_ARES=0)
-+    target_compile_definitions(grpc_definitions INTERFACE -DGRPC_ARES=0)
-   endif()
- endif()
- if (MINGW)
--  add_definitions(-D_WIN32_WINNT=0x600)
-+  target_compile_definitions(grpc_definitions INTERFACE -D_WIN32_WINNT=0x600)
- endif()
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${_gRPC_C_CXX_FLAGS}")
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${_gRPC_C_CXX_FLAGS}")
- 
- if(gRPC_USE_PROTO_LITE)
-   set(_gRPC_PROTOBUF_LIBRARY_NAME "libprotobuf-lite")
--  add_definitions("-DGRPC_USE_PROTO_LITE")
-+  target_compile_definitions(grpc_definitions INTERFACE -DGRPC_USE_PROTO_LITE)
- else()
-   set(_gRPC_PROTOBUF_LIBRARY_NAME "libprotobuf")
- endif()
- 
- if(gRPC_BACKWARDS_COMPATIBILITY_MODE)
--  add_definitions(-DGPR_BACKWARDS_COMPATIBILITY_MODE)
-+  target_compile_definitions(grpc_definitions INTERFACE -DGPR_BACKWARDS_COMPATIBILITY_MODE)
-   if(_gRPC_PLATFORM_MAC)
-     # some C++11 constructs not supported before OS X 10.10
-     set(CMAKE_OSX_DEPLOYMENT_TARGET 10.10)
-@@ -265,7 +267,7 @@ endif()
- if (gRPC_XDS_USER_AGENT_IS_CSHARP)
-   # The value of the defines needs to contain quotes.
-   # See https://github.com/grpc/grpc/blob/fbf32836a418cc84f58786700273b65cb9174e1d/src/core/ext/xds/xds_api.cc#L854
--  add_definitions("-DGRPC_XDS_USER_AGENT_NAME_SUFFIX=\"csharp\"" "-DGRPC_XDS_USER_AGENT_VERSION_SUFFIX=\"2.41.0\"")
-+  target_compile_definitions(grpc_definitions INTERFACE "-DGRPC_XDS_USER_AGENT_NAME_SUFFIX=\"csharp\"" "-DGRPC_XDS_USER_AGENT_VERSION_SUFFIX=\"2.41.0\"")
- endif()
- 
- include(cmake/abseil-cpp.cmake)
-@@ -285,15 +287,15 @@ if(ABSL_USE_CXX17)
- endif()
- 
- if(_gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_IOS)
--  set(_gRPC_ALLTARGETS_LIBRARIES ${CMAKE_DL_LIBS} m pthread)
-+  set(_gRPC_ALLTARGETS_LIBRARIES ${CMAKE_DL_LIBS} m pthread grpc_definitions)
- elseif(_gRPC_PLATFORM_ANDROID)
--  set(_gRPC_ALLTARGETS_LIBRARIES ${CMAKE_DL_LIBS} m)
-+  set(_gRPC_ALLTARGETS_LIBRARIES ${CMAKE_DL_LIBS} m grpc_definitions)
- elseif(UNIX)
--  set(_gRPC_ALLTARGETS_LIBRARIES ${CMAKE_DL_LIBS} rt m pthread)
-+  set(_gRPC_ALLTARGETS_LIBRARIES ${CMAKE_DL_LIBS} rt m pthread grpc_definitions)
- endif()
- 
- if(WIN32)
--  set(_gRPC_BASELIB_LIBRARIES wsock32 ws2_32 crypt32 gdi32)
-+  set(_gRPC_BASELIB_LIBRARIES wsock32 ws2_32 crypt32 gdi32 grpc_definitions)
- endif()
- 
- # Create directory for generated .proto files
-@@ -1115,7 +1117,7 @@ target_link_libraries(address_sorting
- 
- 
- if(gRPC_INSTALL)
--  install(TARGETS address_sorting EXPORT gRPCTargets
-+  install(TARGETS address_sorting grpc_definitions EXPORT gRPCTargets
-     RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR}
-     LIBRARY DESTINATION ${gRPC_INSTALL_LIBDIR}
-     ARCHIVE DESTINATION ${gRPC_INSTALL_LIBDIR}
-diff --git a/cmake/abseil-cpp.cmake b/cmake/abseil-cpp.cmake
-index c625bad..2f216c8 100644
---- a/cmake/abseil-cpp.cmake
-+++ b/cmake/abseil-cpp.cmake
-@@ -34,7 +34,7 @@ elseif(gRPC_ABSL_PROVIDER STREQUAL "package")
-   # Use "CONFIG" as there is no built-in cmake module for absl.
-   find_package(absl REQUIRED CONFIG)
-   if (gRPC_ABSL_SYNC_ENABLE)
--    add_definitions(-DGPR_ABSEIL_SYNC=1)
-+    target_compile_definitions(grpc_definitions INTERFACE -DGPR_ABSEIL_SYNC=1)
-   endif()
- endif()
- set(_gRPC_FIND_ABSL "if(NOT TARGET absl::strings)\n  find_package(absl CONFIG)\nendif()")
diff --git a/ports/grpc/gRPCTargets-vcpkg-tools.cmake b/ports/grpc/gRPCTargets-vcpkg-tools.cmake
deleted file mode 100644
index 08e3ee3a..00000000
--- a/ports/grpc/gRPCTargets-vcpkg-tools.cmake
+++ /dev/null
@@ -1,10 +0,0 @@
-file(GLOB GRPC_PLUGINS "${_IMPORT_PREFIX}/../@HOST_TRIPLET@/tools/grpc/grpc_*_plugin*")
-
-foreach(PLUGIN ${GRPC_PLUGINS})
-  get_filename_component(PLUGIN_NAME "${PLUGIN}" NAME_WE)
-  add_executable(gRPC::${PLUGIN_NAME} IMPORTED)
-  set_property(TARGET gRPC::${PLUGIN_NAME} APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE)
-  set_target_properties(gRPC::${PLUGIN_NAME} PROPERTIES
-    IMPORTED_LOCATION_RELEASE "${PLUGIN}"
-  )
-endforeach()
diff --git a/ports/grpc/portfile.cmake b/ports/grpc/portfile.cmake
deleted file mode 100644
index 6da1a0da..00000000
--- a/ports/grpc/portfile.cmake
+++ /dev/null
@@ -1,102 +0,0 @@
-if(VCPKG_TARGET_IS_WINDOWS)
-    vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
-endif()
-
-vcpkg_from_github(
-    OUT_SOURCE_PATH SOURCE_PATH
-    REPO grpc/grpc
-    REF fc662b7964384b701af5bd3ce6994d2180080eb4  # v1.41.0
-    SHA512 ebb534b5d55f1a84c5ee2ea75f2ef871819d278966dec2610877c2f8ddd87bae80a63cbab0393fb37b81844f261327848821ac641b55963583288e6ec3b94e62
-    HEAD_REF master
-    PATCHES
-        00001-fix-uwp.patch
-        00002-static-linking-in-linux.patch
-        00003-undef-base64-macro.patch
-        00004-link-gdi32-on-windows.patch
-        00005-fix-uwp-error.patch
-        00009-use-system-upb.patch
-        00010-add-feature-absl-sync.patch
-        00011-fix-csharp_plugin.patch
-        snprintf.patch
-        00012-fix-use-cxx17.patch
-        00013-build-upbdefs.patch
-        00014-pkgconfig-upbdefs.patch
-        00015-target-definitions.patch
-)
-
-if(NOT TARGET_TRIPLET STREQUAL HOST_TRIPLET)
-    vcpkg_add_to_path(PREPEND "${CURRENT_HOST_INSTALLED_DIR}/tools/grpc")
-endif()
-
-string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" gRPC_MSVC_STATIC_RUNTIME)
-string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" gRPC_STATIC_LINKING)
-
-if(VCPKG_TARGET_IS_UWP)
-    set(cares_CARES_PROVIDER OFF)
-else()
-    set(cares_CARES_PROVIDER "package")
-endif()
-
-vcpkg_check_features(
-    OUT_FEATURE_OPTIONS FEATURE_OPTIONS
-    FEATURES
-        absl-sync gRPC_ABSL_SYNC_ENABLE
-        codegen gRPC_BUILD_CODEGEN
-)
-
-vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
-    OPTIONS ${FEATURE_OPTIONS}
-        -DgRPC_INSTALL=ON
-        -DgRPC_BUILD_TESTS=OFF
-        -DgRPC_STATIC_LINKING=${gRPC_STATIC_LINKING}
-        -DgRPC_MSVC_STATIC_RUNTIME=${gRPC_MSVC_STATIC_RUNTIME}
-        -DgRPC_ZLIB_PROVIDER=package
-        -DgRPC_SSL_PROVIDER=package
-        -DgRPC_PROTOBUF_PROVIDER=package
-        -DgRPC_ABSL_PROVIDER=package
-        -DgRPC_UPB_PROVIDER=package
-        -DgRPC_RE2_PROVIDER=package
-        -DgRPC_PROTOBUF_PACKAGE_TYPE=CONFIG
-        -DgRPC_CARES_PROVIDER=${cares_CARES_PROVIDER}
-        -DgRPC_GFLAGS_PROVIDER=package
-        -DgRPC_BENCHMARK_PROVIDER=none
-        -DgRPC_BUILD_CSHARP_EXT=OFF
-        -DgRPC_INSTALL_CSHARP_EXT=OFF
-        -DgRPC_INSTALL_BINDIR:STRING=bin
-        -DgRPC_INSTALL_LIBDIR:STRING=lib
-        -DgRPC_INSTALL_INCLUDEDIR:STRING=include
-        -DgRPC_INSTALL_CMAKEDIR:STRING=share/grpc
-        -D_gRPC_PROTOBUF_PROTOC_EXECUTABLE=${CURRENT_HOST_INSTALLED_DIR}/tools/protobuf/protoc${VCPKG_HOST_EXECUTABLE_SUFFIX}
-        -DPROTOBUF_PROTOC_EXECUTABLE=${CURRENT_HOST_INSTALLED_DIR}/tools/protobuf/protoc${VCPKG_HOST_EXECUTABLE_SUFFIX}
-)
-
-vcpkg_install_cmake(ADD_BIN_TO_PATH)
-
-vcpkg_fixup_cmake_targets()
-
-if (gRPC_BUILD_CODEGEN)
-    vcpkg_copy_tools(
-        AUTO_CLEAN
-        TOOL_NAMES
-            grpc_php_plugin
-            grpc_python_plugin
-            grpc_node_plugin
-            grpc_objective_c_plugin
-            grpc_csharp_plugin
-            grpc_cpp_plugin
-            grpc_ruby_plugin
-    )
-else()
-    configure_file(${CMAKE_CURRENT_LIST_DIR}/gRPCTargets-vcpkg-tools.cmake ${CURRENT_PACKAGES_DIR}/share/grpc/gRPCTargets-vcpkg-tools.cmake @ONLY)
-endif()
-
-# Ignore the C# extension DLL in bin/
-SET(VCPKG_POLICY_EMPTY_PACKAGE enabled)
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
-
-vcpkg_copy_pdbs()
-
-file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
-configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" "${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-cmake-wrapper.cmake" @ONLY)
diff --git a/ports/grpc/snprintf.patch b/ports/grpc/snprintf.patch
deleted file mode 100644
index 1cbab590..00000000
--- a/ports/grpc/snprintf.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/src/core/tsi/alts/crypt/aes_gcm.cc b/src/core/tsi/alts/crypt/aes_gcm.cc
-index b761224cd9..9f2e89b7b7 100644
---- a/src/core/tsi/alts/crypt/aes_gcm.cc
-+++ b/src/core/tsi/alts/crypt/aes_gcm.cc
-@@ -19,6 +19,7 @@
- #include <grpc/support/port_platform.h>
- 
- #include <string.h>
-+#include <stdio.h>
- 
- #include <openssl/bio.h>
- #include <openssl/buffer.h>
diff --git a/ports/grpc/vcpkg-cmake-wrapper.cmake b/ports/grpc/vcpkg-cmake-wrapper.cmake
deleted file mode 100644
index 9adf0288..00000000
--- a/ports/grpc/vcpkg-cmake-wrapper.cmake
+++ /dev/null
@@ -1,2 +0,0 @@
-list(REMOVE_AT ARGS 0)
-_find_package(gRPC ${ARGS}) # Shouldn't this be fixed downstream instead of using a Wrapper?
\ No newline at end of file
diff --git a/ports/grpc/vcpkg.json b/ports/grpc/vcpkg.json
deleted file mode 100644
index dc662cba..00000000
--- a/ports/grpc/vcpkg.json
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-  "name": "grpc",
-  "version-semver": "1.41.0",
-  "port-version": 5,
-  "description": "An RPC library and framework",
-  "homepage": "https://github.com/grpc/grpc",
-  "dependencies": [
-    "abseil",
-    {
-      "name": "c-ares",
-      "platform": "!uwp"
-    },
-    "gflags",
-    {
-      "name": "grpc",
-      "host": true,
-      "features": [
-        "codegen"
-      ]
-    },
-    "openssl",
-    "protobuf",
-    {
-      "name": "protobuf",
-      "host": true
-    },
-    "re2",
-    "upb",
-    "zlib"
-  ],
-  "features": {
-    "absl-sync": {
-      "description": "Use abseil synchronization module"
-    },
-    "codegen": {
-      "description": "Build code generator machinery"
-    }
-  }
-}
diff --git a/ports/upb/add-all-libs-target.patch b/ports/upb/add-all-libs-target.patch
deleted file mode 100644
index 110fa3af..00000000
--- a/ports/upb/add-all-libs-target.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
-index 1834422..61cab5b 100644
---- a/cmake/CMakeLists.txt
-+++ b/cmake/CMakeLists.txt
-@@ -66,7 +66,7 @@ endif()
- enable_testing()
- 
- add_library(port INTERFACE)
--add_library(descriptor_upbproto INTERFACE)
-+add_library(descriptor_upb_proto INTERFACE)
- add_library(upb
-   ../upb/decode.c
-   ../upb/decode_internal.h
-@@ -141,15 +141,38 @@ install(
-   PATTERN "*.int.h"
- )
- target_include_directories(upb PUBLIC $<INSTALL_INTERFACE:include>)
-+
-+add_library(all_libs INTERFACE)
-+target_link_libraries(all_libs
-+  INTERFACE
-+  port
-+  descriptor_upb_proto
-+  upb
-+  fastdecode
-+  reflection
-+  textformat
-+  json
-+  table
-+)
-+
-+set_target_properties(port PROPERTIES OUTPUT_NAME upb_port)
-+set_target_properties(descriptor_upb_proto PROPERTIES OUTPUT_NAME upb_descriptor_upb_proto)
-+set_target_properties(fastdecode PROPERTIES OUTPUT_NAME upb_fastdecode)
-+set_target_properties(reflection PROPERTIES OUTPUT_NAME upb_reflection)
-+set_target_properties(textformat PROPERTIES OUTPUT_NAME upb_textformat)
-+set_target_properties(json PROPERTIES OUTPUT_NAME upb_json)
-+set_target_properties(table PROPERTIES OUTPUT_NAME upb_table)
-+
- install(TARGETS
-   port
--  descriptor_upbproto
-+  descriptor_upb_proto
-   upb
-   fastdecode
-   reflection
-   textformat
-   json
-   table
-+  all_libs
-   EXPORT upb-config
- )
- install(EXPORT upb-config NAMESPACE upb:: DESTINATION share/upb)
diff --git a/ports/upb/add-cmake-install.patch b/ports/upb/add-cmake-install.patch
deleted file mode 100644
index 5b605c6c..00000000
--- a/ports/upb/add-cmake-install.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
-index 879fdb6..d669bf9 100644
---- a/cmake/CMakeLists.txt
-+++ b/cmake/CMakeLists.txt
-@@ -1,6 +1,6 @@
- # This file was generated from BUILD using tools/make_cmakelists.py.
- 
--cmake_minimum_required(VERSION 3.1)
-+cmake_minimum_required (VERSION 3.14)
- 
- if(${CMAKE_VERSION} VERSION_LESS 3.12)
-     cmake_policy(VERSION ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION})
-@@ -62,6 +62,7 @@ endif()
- enable_testing()
- 
- add_library(port INTERFACE)
-+add_library(descriptor_upbproto INTERFACE)
- add_library(upb
-   ../upb/decode.c
-   ../upb/decode_internal.h
-@@ -126,4 +127,25 @@ add_library(table INTERFACE)
- target_link_libraries(table INTERFACE
-   port)
- 
--
-+install(
-+  DIRECTORY ../upb
-+  DESTINATION include
-+  FILES_MATCHING
-+  PATTERN "*.h"
-+  PATTERN "*.hpp"
-+  PATTERN "*.inc"
-+  PATTERN "*.int.h"
-+)
-+target_include_directories(upb PUBLIC $<INSTALL_INTERFACE:include>)
-+install(TARGETS
-+  port
-+  descriptor_upbproto
-+  upb
-+  fastdecode
-+  reflection
-+  textformat
-+  json
-+  table
-+  EXPORT upb-config
-+)
-+install(EXPORT upb-config NAMESPACE upb:: DESTINATION share/upb)
diff --git a/ports/upb/fix-uwp.patch b/ports/upb/fix-uwp.patch
deleted file mode 100644
index fd4e3a85..00000000
--- a/ports/upb/fix-uwp.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
-index d669bf9..1834422 100644
---- a/cmake/CMakeLists.txt
-+++ b/cmake/CMakeLists.txt
-@@ -59,6 +59,10 @@ elseif(UNIX)
-   set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--build-id")
- endif()
- 
-+if (MSVC)
-+  add_compile_options(/wd4146 /wd4703 -D_CRT_SECURE_NO_WARNINGS)
-+endif()
-+
- enable_testing()
- 
- add_library(port INTERFACE)
-diff --git a/upb/json_decode.c b/upb/json_decode.c
-index cc8139e..404ec1c 100644
---- a/upb/json_decode.c
-+++ b/upb/json_decode.c
-@@ -350,7 +350,7 @@ static char jsondec_escape(jsondec *d) {
- 
- static uint32_t jsondec_codepoint(jsondec *d) {
-   uint32_t cp = 0;
--  const char *end;
-+  const char *end = NULL;
- 
-   if (d->end - d->ptr < 4) {
-     jsondec_err(d, "EOF inside string");
-@@ -926,8 +926,8 @@ static upb_msgval jsondec_msg(jsondec *d, const upb_fielddef *f) {
- 
- static void jsondec_field(jsondec *d, upb_msg *msg, const upb_msgdef *m) {
-   upb_strview name;
--  const upb_fielddef *f;
--  const upb_fielddef *preserved;
-+  const upb_fielddef *f = NULL;
-+  const upb_fielddef *preserved = NULL;
- 
-   name = jsondec_string(d);
-   jsondec_entrysep(d);
-@@ -1205,8 +1205,8 @@ static void jsondec_struct(jsondec *d, upb_msg *msg, const upb_msgdef *m) {
- static void jsondec_wellknownvalue(jsondec *d, upb_msg *msg,
-                                    const upb_msgdef *m) {
-   upb_msgval val;
--  const upb_fielddef *f;
--  upb_msg *submsg;
-+  const upb_fielddef *f = NULL;
-+  upb_msg *submsg = NULL;
- 
-   switch (jsondec_peek(d)) {
-     case JD_NUMBER:
-@@ -1262,7 +1262,7 @@ static upb_strview jsondec_mask(jsondec *d, const char *buf, const char *end) {
-    * transform in place. */
-   const char *ptr = buf;
-   upb_strview ret;
--  char *out;
-+  char *out = NULL;
- 
-   ret.size = end - ptr;
-   while (ptr < end) {
-@@ -1331,7 +1331,7 @@ static void jsondec_anyfield(jsondec *d, upb_msg *msg, const upb_msgdef *m) {
- static const upb_msgdef *jsondec_typeurl(jsondec *d, upb_msg *msg,
-                                          const upb_msgdef *m) {
-   const upb_fielddef *type_url_f = upb_msgdef_itof(m, 1);
--  const upb_msgdef *type_m;
-+  const upb_msgdef *type_m = NULL;
-   upb_strview type_url = jsondec_string(d);
-   const char *end = type_url.data + type_url.size;
-   const char *ptr = end;
-@@ -1361,7 +1361,7 @@ static void jsondec_any(jsondec *d, upb_msg *msg, const upb_msgdef *m) {
-   /* string type_url = 1;
-    * bytes value = 2; */
-   const upb_fielddef *value_f = upb_msgdef_itof(m, 2);
--  upb_msg *any_msg;
-+  upb_msg *any_msg = NULL;
-   const upb_msgdef *any_m = NULL;
-   const char *pre_type_data = NULL;
-   const char *pre_type_end = NULL;
diff --git a/ports/upb/portfile.cmake b/ports/upb/portfile.cmake
deleted file mode 100644
index df8c5648..00000000
--- a/ports/upb/portfile.cmake
+++ /dev/null
@@ -1,33 +0,0 @@
-vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
-
-vcpkg_from_github(
-    OUT_SOURCE_PATH SOURCE_PATH
-    REPO protocolbuffers/upb
-    REF  e5c1583452e3b84f943d2caa338799f02a7e054c # 2021-10-06
-    SHA512 982426c42850e62c734b12d5268385782699f4e0895082dd5b1abc451d8ba79cd2fbff4147696098b05df51f69c53b4dac1c79db8cbe864dbcec377c50e42f2e
-    HEAD_REF master
-    PATCHES
-        add-cmake-install.patch
-        fix-uwp.patch
-        add-all-libs-target.patch
-)
-
-if(VCPKG_USE_SANITIZER)
-    list(APPEND FEATURE_OPTIONS
-        -DUPB_ENABLE_ASAN=ON
-        )
-endif()
-
-vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}/cmake
-    PREFER_NINJA
-    OPTIONS ${FEATURE_OPTIONS}
-)
-
-vcpkg_install_cmake()
-vcpkg_fixup_cmake_targets()
-vcpkg_copy_pdbs()
-
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share ${CURRENT_PACKAGES_DIR}/debug/include)
-
-file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/ports/upb/vcpkg.json b/ports/upb/vcpkg.json
deleted file mode 100644
index 4e8b3e45..00000000
--- a/ports/upb/vcpkg.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "name": "upb",
-  "version-date": "2021-10-06",
-  "port-version": 2,
-  "description": "μpb (often written 'upb') is a small protobuf implementation written in C.",
-  "homepage": "https://github.com/protocolbuffers/upb/"
-}
diff --git a/vcpkg_info.txt b/vcpkg_info.txt
index 5b7787e9..1da9097b 100644
--- a/vcpkg_info.txt
+++ b/vcpkg_info.txt
@@ -1,2 +1,2 @@
 https://github.com/microsoft/vcpkg.git
-c168ce4e765409509c9c482faa0468c4e1ab386b
+6ca56aeb457f033d344a7106cb3f9f1abf8f4e98