diff --git a/ports/cartographer/portfile.cmake b/ports/cartographer/portfile.cmake
index baff80a7da0aec..bd5fc54a67c97b 100644
--- a/ports/cartographer/portfile.cmake
+++ b/ports/cartographer/portfile.cmake
@@ -17,6 +17,7 @@ vcpkg_cmake_configure(
     OPTIONS
         -DGFLAGS_PREFER_EXPORTED_GFLAGS_CMAKE_CONFIGURATION=OFF
         -DGLOG_PREFER_EXPORTED_GLOG_CMAKE_CONFIGURATION=OFF
+        "-DProtobuf_PROTOC_EXECUTABLE=${CURRENT_HOST_INSTALLED_DIR}/tools/protobuf/protoc${VCPKG_HOST_EXECUTABLE_SUFFIX}"
         -Dgtest_disable_pthreads=ON
         -DCMAKE_USE_PTHREADS_INIT=OFF
     OPTIONS_DEBUG
diff --git a/ports/cartographer/vcpkg.json b/ports/cartographer/vcpkg.json
index 9cc51693b099f8..9e4909f60a5f6b 100644
--- a/ports/cartographer/vcpkg.json
+++ b/ports/cartographer/vcpkg.json
@@ -1,9 +1,10 @@
 {
   "name": "cartographer",
   "version": "1.0.0",
-  "port-version": 5,
+  "port-version": 6,
   "description": "Google 2D & 3D SLAM package",
   "homepage": "https://github.com/googlecartographer/cartographer",
+  "license": "Apache-2.0",
   "dependencies": [
     "boost-iostreams",
     "cairo",
@@ -18,6 +19,13 @@
     "gtest",
     "lua",
     "protobuf",
+    {
+      "name": "protobuf",
+      "host": true,
+      "features": [
+        "codegen"
+      ]
+    },
     {
       "name": "vcpkg-cmake",
       "host": true
diff --git a/ports/google-cloud-cpp/portfile.cmake b/ports/google-cloud-cpp/portfile.cmake
index 8d76f74e033f5f..80143fec74f2b9 100644
--- a/ports/google-cloud-cpp/portfile.cmake
+++ b/ports/google-cloud-cpp/portfile.cmake
@@ -40,6 +40,7 @@ vcpkg_cmake_configure(
         -DGOOGLE_CLOUD_CPP_ENABLE_CCACHE=OFF
         -DGOOGLE_CLOUD_CPP_ENABLE_EXAMPLES=OFF
         -DBUILD_TESTING=OFF
+        "-D_protobuf_PROTOC_EXECUTABLE=${CURRENT_HOST_INSTALLED_DIR}/tools/protobuf/protoc${VCPKG_HOST_EXECUTABLE_SUFFIX}"
 )
 
 vcpkg_cmake_install()
diff --git a/ports/google-cloud-cpp/vcpkg.json b/ports/google-cloud-cpp/vcpkg.json
index 1a52b2a2e02bb6..7442b1665663cf 100644
--- a/ports/google-cloud-cpp/vcpkg.json
+++ b/ports/google-cloud-cpp/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "google-cloud-cpp",
   "version": "2.1.0",
-  "port-version": 2,
+  "port-version": 3,
   "description": "C++ Client Libraries for Google Cloud Platform APIs.",
   "homepage": "https://github.com/googleapis/google-cloud-cpp",
   "license": "Apache-2.0",
@@ -448,7 +448,10 @@
         "protobuf",
         {
           "name": "protobuf",
-          "host": true
+          "host": true,
+          "features": [
+            "codegen"
+          ]
         }
       ]
     },
diff --git a/ports/grpc/gRPCTargets-vcpkg-tools.cmake b/ports/grpc/gRPCTargets-vcpkg-tools.cmake
deleted file mode 100644
index 08e3ee3afc4011..00000000000000
--- 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
index 39bcd1a4c0353a..9c50193a8e19d5 100644
--- a/ports/grpc/portfile.cmake
+++ b/ports/grpc/portfile.cmake
@@ -82,8 +82,6 @@ if (gRPC_BUILD_CODEGEN)
             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()
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share" "${CURRENT_PACKAGES_DIR}/debug/include")
diff --git a/ports/grpc/vcpkg.json b/ports/grpc/vcpkg.json
index 140fa1eab36f6d..6f38ecee053417 100644
--- a/ports/grpc/vcpkg.json
+++ b/ports/grpc/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "grpc",
   "version-semver": "1.48.0",
-  "port-version": 1,
+  "port-version": 2,
   "description": "An RPC library and framework",
   "homepage": "https://github.com/grpc/grpc",
   "license": "Apache-2.0",
@@ -22,7 +22,10 @@
     "protobuf",
     {
       "name": "protobuf",
-      "host": true
+      "host": true,
+      "features": [
+        "codegen"
+      ]
     },
     "re2",
     "upb",
diff --git a/ports/offscale-libetcd-cpp/fix-crosscompile-protobuf-grpc.patch b/ports/offscale-libetcd-cpp/fix-crosscompile-protobuf-grpc.patch
new file mode 100644
index 00000000000000..d8ae1dc09c93aa
--- /dev/null
+++ b/ports/offscale-libetcd-cpp/fix-crosscompile-protobuf-grpc.patch
@@ -0,0 +1,39 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 62ae7c4..45a4175 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -4,8 +4,9 @@ project(libetcd-cpp VERSION 0.0.1)
+ 
+ set(CMAKE_CXX_STANDARD 17)
+ 
+-find_package(gRPC REQUIRED)
+-find_package(protobuf REQUIRED)
++find_package(gRPC CONFIG REQUIRED)
++find_package(Protobuf CONFIG REQUIRED)
++find_program(gRPC_CPP_PLUGIN grpc_cpp_plugin REQUIRED)
+ 
+ file(GLOB_RECURSE protos LIST_DIRECTORIES false "proto/*.proto")
+ file(GLOB main_proto LIST_DIRECTORIES false "proto/rpc.proto")
+@@ -28,17 +29,17 @@ endforeach()
+ 
+ add_custom_command(
+   OUTPUT  ${rpc_protofiles}
+-  COMMAND  protobuf::protoc
+-  ARGS --grpc_out=${generated_path} -I ${protodir_path} --plugin=protoc-gen-grpc=$<TARGET_FILE:gRPC::grpc_cpp_plugin> ${main_proto}
+-  DEPENDS  gRPC::grpc_cpp_plugin protobuf::protoc ${main_proto}
++  COMMAND  "${Protobuf_PROTOC_EXECUTABLE}"
++  ARGS --grpc_out=${generated_path} -I ${protodir_path} "--plugin=protoc-gen-grpc=${gRPC_CPP_PLUGIN}" ${main_proto}
++  DEPENDS   ${main_proto}
+   COMMENT   "Running grpc protocol buffer compiler on ${main_proto}"
+   VERBATIM )
+ 
+ add_custom_command(
+   OUTPUT ${common_protofiles}
+-  COMMAND  protobuf::protoc
++  COMMAND  "${Protobuf_PROTOC_EXECUTABLE}"
+   ARGS --cpp_out=${generated_path} -I ${protodir_path} ${protos}
+-  DEPENDS ${protos} protobuf::protoc
++  DEPENDS ${protos}
+   COMMENT "Running cpp protocol buffer compiler on ${protos}"
+   VERBATIM )
+ 
diff --git a/ports/offscale-libetcd-cpp/portfile.cmake b/ports/offscale-libetcd-cpp/portfile.cmake
index a299682f54b2df..3df4a784bb9b25 100644
--- a/ports/offscale-libetcd-cpp/portfile.cmake
+++ b/ports/offscale-libetcd-cpp/portfile.cmake
@@ -7,11 +7,15 @@ vcpkg_from_github(
     PATCHES
         fix-dependency-grpc.patch
         install-debug.patch
+        fix-crosscompile-protobuf-grpc.patch
 )
 
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
     DISABLE_PARALLEL_CONFIGURE # see https://github.com/microsoft/vcpkg/pull/21168#issuecomment-961588989 why
+    OPTIONS
+        "-DProtobuf_PROTOC_EXECUTABLE=${CURRENT_HOST_INSTALLED_DIR}/tools/protobuf/protoc${VCPKG_HOST_EXECUTABLE_SUFFIX}"
+        "-DgRPC_CPP_PLUGIN=${CURRENT_HOST_INSTALLED_DIR}/tools/grpc/grpc_cpp_plugin${VCPKG_HOST_EXECUTABLE_SUFFIX}"
 )
 vcpkg_cmake_install()
 vcpkg_cmake_config_fixup(PACKAGE_NAME etcdcpp)
diff --git a/ports/offscale-libetcd-cpp/vcpkg.json b/ports/offscale-libetcd-cpp/vcpkg.json
index f2f2ec16cbe140..aac909d7b373bb 100644
--- a/ports/offscale-libetcd-cpp/vcpkg.json
+++ b/ports/offscale-libetcd-cpp/vcpkg.json
@@ -1,12 +1,32 @@
 {
   "name": "offscale-libetcd-cpp",
   "version-date": "2019-07-10",
-  "port-version": 3,
+  "port-version": 4,
   "description": "A C++ client library for etcd. etcd is a distributed, reliable key-value store.",
   "homepage": "https://github.com/offscale/libetcd-cpp",
+  "license": "Apache-2.0 OR MIT",
   "dependencies": [
     "grpc",
-    "protobuf",
+    {
+      "name": "grpc",
+      "host": true,
+      "features": [
+        "codegen"
+      ]
+    },
+    {
+      "name": "protobuf",
+      "features": [
+        "codegen"
+      ]
+    },
+    {
+      "name": "protobuf",
+      "host": true,
+      "features": [
+        "codegen"
+      ]
+    },
     {
       "name": "vcpkg-cmake",
       "host": true
diff --git a/ports/onnx/fix-dependency-protobuf.patch b/ports/onnx/fix-dependency-protobuf.patch
index 6ccdac66502656..d9f80274320d9b 100644
--- a/ports/onnx/fix-dependency-protobuf.patch
+++ b/ports/onnx/fix-dependency-protobuf.patch
@@ -6,7 +6,7 @@ index 1295eab..0fb9f17 100644
    include(googletest)
  endif()
  
-+find_package(protobuf CONFIG REQUIRED)
++find_package(Protobuf CONFIG REQUIRED)
  if((ONNX_USE_LITE_PROTO AND TARGET protobuf::libprotobuf-lite) OR ((NOT ONNX_USE_LITE_PROTO) AND TARGET protobuf::libprotobuf))
    # Sometimes we need to use protoc compiled for host architecture while linking
    # libprotobuf against target architecture. See https://github.com/caffe2/caffe
diff --git a/ports/onnx/portfile.cmake b/ports/onnx/portfile.cmake
index 8070f6dd9f494e..b986a42f0301f8 100644
--- a/ports/onnx/portfile.cmake
+++ b/ports/onnx/portfile.cmake
@@ -44,7 +44,7 @@ vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
         ${FEATURE_OPTIONS}
-        -DPython3_EXECUTABLE=${PYTHON3}
+        "-DPython3_EXECUTABLE=${PYTHON3}"
         -DONNX_ML=ON
         -DONNX_GEN_PB_TYPE_STUBS=ON
         -DONNX_USE_PROTOBUF_SHARED_LIBS=${USE_PROTOBUF_SHARED}
@@ -52,6 +52,8 @@ vcpkg_cmake_configure(
         -DONNX_USE_MSVC_STATIC_RUNTIME=${USE_STATIC_RUNTIME}
         -DONNX_BUILD_TESTS=OFF
         -DONNX_BUILD_BENCHMARKS=OFF
+        "-DONNX_CUSTOM_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}"
     MAYBE_UNUSED_VARIABLES
         ONNX_USE_MSVC_STATIC_RUNTIME
 )
diff --git a/ports/onnx/vcpkg.json b/ports/onnx/vcpkg.json
index 2eaace7ced619b..fe7fbcd41d3e33 100644
--- a/ports/onnx/vcpkg.json
+++ b/ports/onnx/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "onnx",
   "version-semver": "1.10.2",
-  "port-version": 1,
+  "port-version": 2,
   "description": "Open standard for machine learning interoperability",
   "homepage": "https://onnx.ai",
   "license": "Apache-2.0",
@@ -10,7 +10,10 @@
     "protobuf",
     {
       "name": "protobuf",
-      "host": true
+      "host": true,
+      "features": [
+        "codegen"
+      ]
     },
     {
       "name": "python3",
diff --git a/ports/opencv4/portfile.cmake b/ports/opencv4/portfile.cmake
index 5694c5c53e55c4..8a796e85eb6387 100644
--- a/ports/opencv4/portfile.cmake
+++ b/ports/opencv4/portfile.cmake
@@ -415,6 +415,7 @@ vcpkg_cmake_configure(
         ###### PROTOBUF
         -DPROTOBUF_UPDATE_FILES=${BUILD_opencv_dnn}
         -DUPDATE_PROTO_FILES=${BUILD_opencv_dnn}
+        "-DProtobuf_PROTOC_EXECUTABLE=${CURRENT_HOST_INSTALLED_DIR}/tools/protobuf/protoc${VCPKG_HOST_EXECUTABLE_SUFFIX}"
         ###### PYLINT/FLAKE8
         -DENABLE_PYLINT=OFF
         -DENABLE_FLAKE8=OFF
diff --git a/ports/opencv4/vcpkg.json b/ports/opencv4/vcpkg.json
index 6d331766f8fb8b..ff0fe0199fabbf 100644
--- a/ports/opencv4/vcpkg.json
+++ b/ports/opencv4/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "opencv4",
   "version": "4.6.0",
-  "port-version": 4,
+  "port-version": 5,
   "description": "computer vision library",
   "homepage": "https://github.com/opencv/opencv",
   "license": "Apache-2.0",
@@ -103,7 +103,14 @@
     "dnn": {
       "description": "Enable dnn module",
       "dependencies": [
-        "protobuf"
+        "protobuf",
+        {
+          "name": "protobuf",
+          "host": true,
+          "features": [
+            "codegen"
+          ]
+        }
       ]
     },
     "eigen": {
diff --git a/ports/protobuf/fix-crosscompile-protoc-generate-cmake-config.patch b/ports/protobuf/fix-crosscompile-protoc-generate-cmake-config.patch
new file mode 100644
index 00000000000000..89d7bf0c0f5cbd
--- /dev/null
+++ b/ports/protobuf/fix-crosscompile-protoc-generate-cmake-config.patch
@@ -0,0 +1,29 @@
+diff --git a/cmake/protobuf-config.cmake.in b/cmake/protobuf-config.cmake.in
+index 61669118c..5e32d4ecb 100644
+--- a/cmake/protobuf-config.cmake.in
++++ b/cmake/protobuf-config.cmake.in
+@@ -7,6 +7,12 @@ include("${CMAKE_CURRENT_LIST_DIR}/protobuf-options.cmake")
+ # Imported targets
+ include("${CMAKE_CURRENT_LIST_DIR}/protobuf-targets.cmake")
+ 
++set(_protobuf_generate_compiler protobuf::protoc)
++if(CMAKE_CROSSCOMPILING)
++  find_program(Protobuf_PROTOC_EXECUTABLE protoc DOC "Host protobuf compiler path")
++  set(_protobuf_generate_compiler "${Protobuf_PROTOC_EXECUTABLE}")
++endif()
++
+ function(protobuf_generate)
+   include(CMakeParseArguments)
+ 
+@@ -146,9 +152,9 @@ function(protobuf_generate)
+ 
+     add_custom_command(
+       OUTPUT ${_generated_srcs}
+-      COMMAND protobuf::protoc
++      COMMAND "${_protobuf_generate_compiler}"
+       ARGS ${protobuf_generate_PROTOC_OPTIONS} --${protobuf_generate_LANGUAGE}_out ${_plugin_options}:${protobuf_generate_PROTOC_OUT_DIR} ${_plugin} ${_protobuf_include_path} ${_abs_file}
+-      DEPENDS ${_abs_file} protobuf::protoc
++      DEPENDS ${_abs_file} "${_protobuf_generate_compiler}"
+       COMMENT ${_comment}
+       VERBATIM )
+   endforeach()
diff --git a/ports/protobuf/portfile.cmake b/ports/protobuf/portfile.cmake
index ebf240d7370d2a..c246e4f3d4e892 100644
--- a/ports/protobuf/portfile.cmake
+++ b/ports/protobuf/portfile.cmake
@@ -10,22 +10,19 @@ vcpkg_from_github(
         fix-static-build.patch
         fix-default-proto-file-path.patch
         compile_options.patch
+        fix-crosscompile-protoc-generate-cmake-config.patch
 )
 
-string(COMPARE EQUAL "${TARGET_TRIPLET}" "${HOST_TRIPLET}" protobuf_BUILD_PROTOC_BINARIES)
 string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" protobuf_BUILD_SHARED_LIBS)
 string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" protobuf_MSVC_STATIC_RUNTIME)
 
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
     FEATURES
-        zlib protobuf_WITH_ZLIB
+        codegen protobuf_BUILD_PROTOC_BINARIES
+        zlib    protobuf_WITH_ZLIB
 )
 
-if(VCPKG_TARGET_IS_UWP)
-    set(protobuf_BUILD_LIBPROTOC OFF)
-else()
-    set(protobuf_BUILD_LIBPROTOC ON)
-endif()
+set(protobuf_BUILD_LIBPROTOC ${protobuf_BUILD_PROTOC_BINARIES})
 
 if (VCPKG_DOWNLOAD_MODE)
     # download PKGCONFIG in download mode which is used in `vcpkg_fixup_pkgconfig()` at the end of this script.
@@ -40,7 +37,6 @@ vcpkg_cmake_configure(
         -Dprotobuf_MSVC_STATIC_RUNTIME=${protobuf_MSVC_STATIC_RUNTIME}
         -Dprotobuf_BUILD_TESTS=OFF
         -DCMAKE_INSTALL_CMAKEDIR:STRING=share/protobuf
-        -Dprotobuf_BUILD_PROTOC_BINARIES=${protobuf_BUILD_PROTOC_BINARIES}
         -Dprotobuf_BUILD_LIBPROTOC=${protobuf_BUILD_LIBPROTOC}
         ${FEATURE_OPTIONS}
 )
@@ -60,32 +56,30 @@ endfunction()
 
 protobuf_try_remove_recurse_wait("${CURRENT_PACKAGES_DIR}/debug/include")
 
-if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
-    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/protobuf/protobuf-targets-release.cmake"
-        "\${_IMPORT_PREFIX}/bin/protoc${VCPKG_HOST_EXECUTABLE_SUFFIX}"
-        "\${_IMPORT_PREFIX}/tools/protobuf/protoc${VCPKG_HOST_EXECUTABLE_SUFFIX}"
-    )
-endif()
-
-if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
-    file(READ "${CURRENT_PACKAGES_DIR}/debug/share/protobuf/protobuf-targets-debug.cmake" DEBUG_MODULE)
-    string(REPLACE "\${_IMPORT_PREFIX}" "\${_IMPORT_PREFIX}/debug" DEBUG_MODULE "${DEBUG_MODULE}")
-    string(REPLACE "\${_IMPORT_PREFIX}/debug/bin/protoc${EXECUTABLE_SUFFIX}" "\${_IMPORT_PREFIX}/tools/protobuf/protoc${EXECUTABLE_SUFFIX}" DEBUG_MODULE "${DEBUG_MODULE}")
-    file(WRITE "${CURRENT_PACKAGES_DIR}/share/protobuf/protobuf-targets-debug.cmake" "${DEBUG_MODULE}")
-endif()
+if(protobuf_BUILD_PROTOC_BINARIES)
+    if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
+        vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/protobuf/protobuf-targets-release.cmake"
+            "\${_IMPORT_PREFIX}/bin/protoc${EXECUTABLE_SUFFIX}"
+            "\${_IMPORT_PREFIX}/tools/protobuf/protoc${EXECUTABLE_SUFFIX}"
+        )
+    endif()
 
-protobuf_try_remove_recurse_wait("${CURRENT_PACKAGES_DIR}/debug/share")
+    if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
+        file(READ "${CURRENT_PACKAGES_DIR}/debug/share/protobuf/protobuf-targets-debug.cmake" DEBUG_MODULE)
+        string(REPLACE "\${_IMPORT_PREFIX}" "\${_IMPORT_PREFIX}/debug" DEBUG_MODULE "${DEBUG_MODULE}")
+        string(REPLACE "\${_IMPORT_PREFIX}/debug/bin/protoc${EXECUTABLE_SUFFIX}" "\${_IMPORT_PREFIX}/tools/protobuf/protoc${EXECUTABLE_SUFFIX}" DEBUG_MODULE "${DEBUG_MODULE}")
+        file(WRITE "${CURRENT_PACKAGES_DIR}/share/protobuf/protobuf-targets-debug.cmake" "${DEBUG_MODULE}")
+    endif()
 
-if(protobuf_BUILD_PROTOC_BINARIES)
     if(VCPKG_TARGET_IS_WINDOWS)
         vcpkg_copy_tools(TOOL_NAMES protoc AUTO_CLEAN)
     else()
         vcpkg_copy_tools(TOOL_NAMES protoc protoc-${version}.0 AUTO_CLEAN)
     endif()
-else()
-    file(COPY "${CURRENT_HOST_INSTALLED_DIR}/tools/${PORT}" DESTINATION "${CURRENT_PACKAGES_DIR}/tools")
 endif()
 
+protobuf_try_remove_recurse_wait("${CURRENT_PACKAGES_DIR}/debug/share")
+
 vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/${PORT}/protobuf-config.cmake"
     "if(protobuf_MODULE_COMPATIBLE)"
     "if(ON)"
@@ -120,9 +114,4 @@ endforeach()
 
 vcpkg_fixup_pkgconfig()
 
-if(NOT protobuf_BUILD_PROTOC_BINARIES)
-    configure_file("${CMAKE_CURRENT_LIST_DIR}/protobuf-targets-vcpkg-protoc.cmake" "${CURRENT_PACKAGES_DIR}/share/${PORT}/protobuf-targets-vcpkg-protoc.cmake" COPYONLY)
-endif()
-
-configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" "${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-cmake-wrapper.cmake" @ONLY)
 file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/ports/protobuf/protobuf-targets-vcpkg-protoc.cmake b/ports/protobuf/protobuf-targets-vcpkg-protoc.cmake
deleted file mode 100644
index 245adf56083899..00000000000000
--- a/ports/protobuf/protobuf-targets-vcpkg-protoc.cmake
+++ /dev/null
@@ -1,8 +0,0 @@
-# Create imported target protobuf::protoc
-add_executable(protobuf::protoc IMPORTED)
-
-# Import target "protobuf::protoc" for configuration "Release"
-set_property(TARGET protobuf::protoc APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE)
-set_target_properties(protobuf::protoc PROPERTIES
-    IMPORTED_LOCATION_RELEASE "${Protobuf_PROTOC_EXECUTABLE}"
-)
diff --git a/ports/protobuf/vcpkg-cmake-wrapper.cmake b/ports/protobuf/vcpkg-cmake-wrapper.cmake
deleted file mode 100644
index 7269aedcca508f..00000000000000
--- a/ports/protobuf/vcpkg-cmake-wrapper.cmake
+++ /dev/null
@@ -1,16 +0,0 @@
-if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.3)
-    cmake_policy(PUSH)
-    cmake_policy(SET CMP0057 NEW)
-    if(NOT "CONFIG" IN_LIST ARGS AND NOT "NO_MODULE" IN_LIST ARGS)
-        if("@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static")
-            set(Protobuf_USE_STATIC_LIBS ON)
-        else()
-            set(Protobuf_USE_STATIC_LIBS OFF)
-        endif()
-    endif()
-    cmake_policy(POP)
-endif()
-
-find_program(Protobuf_PROTOC_EXECUTABLE NAMES protoc PATHS "${CMAKE_CURRENT_LIST_DIR}/../../tools/protobuf" NO_DEFAULT_PATH)
-
-_find_package(${ARGS})
diff --git a/ports/protobuf/vcpkg.json b/ports/protobuf/vcpkg.json
index 9b341c1a03f986..23ffa13959a056 100644
--- a/ports/protobuf/vcpkg.json
+++ b/ports/protobuf/vcpkg.json
@@ -1,13 +1,17 @@
 {
   "name": "protobuf",
   "version": "3.21.4",
+  "port-version": 1,
   "description": "Protocol Buffers - Google's data interchange format",
   "homepage": "https://github.com/protocolbuffers/protobuf",
   "license": "BSD-3-Clause",
   "dependencies": [
     {
       "name": "protobuf",
-      "host": true
+      "host": true,
+      "features": [
+        "codegen"
+      ]
     },
     {
       "name": "vcpkg-cmake",
@@ -19,6 +23,10 @@
     }
   ],
   "features": {
+    "codegen": {
+      "description": "Build code generator machinery",
+      "supports": "!uwp"
+    },
     "zlib": {
       "description": "ZLib based features like Gzip streams",
       "dependencies": [
diff --git a/ports/srpc/portfile.cmake b/ports/srpc/portfile.cmake
index 5b5dbc81a8eb5d..a1d92a22849da4 100644
--- a/ports/srpc/portfile.cmake
+++ b/ports/srpc/portfile.cmake
@@ -9,6 +9,8 @@ vcpkg_from_github(
 vcpkg_cmake_configure(
     SOURCE_PATH ${SOURCE_PATH}
     DISABLE_PARALLEL_CONFIGURE
+    OPTIONS
+        "-DProtobuf_PROTOC_EXECUTABLE=${CURRENT_HOST_INSTALLED_DIR}/tools/protobuf/protoc${VCPKG_HOST_EXECUTABLE_SUFFIX}"
 )
 
 vcpkg_cmake_install()
diff --git a/ports/srpc/vcpkg.json b/ports/srpc/vcpkg.json
index 3b95d8da00f2f8..fe983b19b01fef 100644
--- a/ports/srpc/vcpkg.json
+++ b/ports/srpc/vcpkg.json
@@ -1,12 +1,21 @@
 {
   "name": "srpc",
   "version-semver": "0.9.3",
+  "port-version": 1,
   "description": "RPC based on Sogou C++ Workflow",
   "homepage": "https://github.com/sogou/srpc",
+  "license": "Apache-2.0",
   "dependencies": [
     "lz4",
     "openssl",
     "protobuf",
+    {
+      "name": "protobuf",
+      "host": true,
+      "features": [
+        "codegen"
+      ]
+    },
     "snappy",
     {
       "name": "vcpkg-cmake",
diff --git a/ports/upb/0001-make-cmakelists-py.patch b/ports/upb/0001-make-cmakelists-py.patch
index f0b73a50150d4a..d91030c8a54e84 100644
--- a/ports/upb/0001-make-cmakelists-py.patch
+++ b/ports/upb/0001-make-cmakelists-py.patch
@@ -1,137 +1,140 @@
-diff --git a/cmake/make_cmakelists.py b/cmake/make_cmakelists.py
-index d64c14f..12226cf 100755
---- a/cmake/make_cmakelists.py
-+++ b/cmake/make_cmakelists.py
-@@ -316,10 +316,132 @@ class Converter(object):
-       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()
- 
-+    set(CMAKE_CXX_STANDARD 11)
-+
-+    if (VCPKG_UPB_BUILD_CODEGEN)
-+      find_package(absl CONFIG REQUIRED)
-+      find_package(protobuf CONFIG REQUIRED)
-+
-+      if (ABSL_USE_CXX17)
-+        message(STATUS "Found absl uses CXX17, enable CXX17 feature.")
-+        set(CMAKE_CXX_STANDARD 17)
-+      endif()
-+    endif()
-+
-+    add_library(descriptor_upb_proto)
-+
-+    add_library(utf8_range
-+      ../third_party/utf8_range/naive.c
-+      ../third_party/utf8_range/range2-neon.c
-+      ../third_party/utf8_range/range2-sse.c
-+      ../third_party/utf8_range/utf8_range.h
-+    )
-+
-     %(toplevel)s
- 
-+    set(UPB_DESCRIPTOR_PROTO "${VCPKG_UPB_HOST_INCLUDE_DIR}/google/protobuf/descriptor.proto")
-+    if (VCPKG_UPB_BUILD_CODEGEN)
-+      set(UPB_CODEGEN_TARGETS protoc-gen-upb protoc-gen-upbdefs)
-+
-+      add_executable(protoc-gen-upbdefs
-+        ../upbc/common.h
-+        ../upbc/common.cc
-+        ../upbc/protoc-gen-upbdefs.cc
-+      )
-+      target_link_libraries(protoc-gen-upbdefs PRIVATE
-+        absl::flat_hash_map
-+        absl::strings
-+        protobuf::libprotobuf
-+        protobuf::libprotoc
-+      )
-+
-+      add_executable(protoc-gen-upb
-+        ../upbc/common.h
-+        ../upbc/common.cc
-+        ../upbc/protoc-gen-upb.cc
-+      )
-+      target_link_libraries(protoc-gen-upb PRIVATE
-+        mini_table
-+        port
-+        upb
-+        absl::flat_hash_map
-+        absl::flat_hash_set
-+        absl::strings
-+        protobuf::libprotobuf
-+        protobuf::libprotoc
-+      )
-+
-+      set(PROTOC_PROGRAM "\$<TARGET_FILE:protobuf::protoc>")
-+      set(PROTOC_GEN_UPB_PROGRAM "\$<TARGET_FILE:protoc-gen-upb>")
-+      set(PROTOC_GEN_UPBDEFS_PROGRAM "\$<TARGET_FILE:protoc-gen-upbdefs>")
-+    else()
-+      find_program(PROTOC_PROGRAM protoc)
-+      find_program(PROTOC_GEN_UPB_PROGRAM protoc-gen-upb)
-+      find_program(PROTOC_GEN_UPBDEFS_PROGRAM protoc-gen-upbdefs)
-+    endif()
-+
-+    set(UPB_DESCRIPTOR_SOURCES 
-+      "${CMAKE_CURRENT_BINARY_DIR}/google/protobuf/descriptor.upb.h" 
-+      "${CMAKE_CURRENT_BINARY_DIR}/google/protobuf/descriptor.upb.c"
-+      "${CMAKE_CURRENT_BINARY_DIR}/google/protobuf/descriptor.upbdefs.h"
-+      "${CMAKE_CURRENT_BINARY_DIR}/google/protobuf/descriptor.upbdefs.c"
-+    )
-+
-+    add_custom_command(
-+      OUTPUT ${UPB_DESCRIPTOR_SOURCES}
-+      DEPENDS "${UPB_DESCRIPTOR_PROTO}"
-+      COMMAND 
-+        "${PROTOC_PROGRAM}"
-+        "-I${VCPKG_UPB_HOST_INCLUDE_DIR}"
-+        "--plugin=protoc-gen-upb=${PROTOC_GEN_UPB_PROGRAM}"
-+        "--plugin=protoc-gen-upbdefs=${PROTOC_GEN_UPBDEFS_PROGRAM}"
-+        "--upb_out=${CMAKE_CURRENT_BINARY_DIR}"
-+        "--upbdefs_out=${CMAKE_CURRENT_BINARY_DIR}"
-+        "${UPB_DESCRIPTOR_PROTO}"
-+    )
-+    
-+    target_sources(descriptor_upb_proto PRIVATE ${UPB_DESCRIPTOR_SOURCES})
-+
-+    set_target_properties(reflection PROPERTIES OUTPUT_NAME upb_reflection)
-+    set_target_properties(fastdecode PROPERTIES OUTPUT_NAME upb_fastdecode)
-+    set_target_properties(textformat PROPERTIES OUTPUT_NAME upb_textformat)
-+    set_target_properties(json PROPERTIES OUTPUT_NAME upb_json)
-+    set_target_properties(utf8_range PROPERTIES OUTPUT_NAME upb_utf8_range)
-+    set_target_properties(mini_table PROPERTIES OUTPUT_NAME upb_mini_table)
-+
-+    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
-+      upb
-+      utf8_range
-+      fastdecode
-+      json
-+      port
-+      table
-+      descriptor_upb_proto
-+      reflection
-+      textformat
-+      mini_table_internal
-+      mini_table
-+      ${UPB_CODEGEN_TARGETS}
-+      EXPORT upb-config
-+    )
-+    install(EXPORT upb-config NAMESPACE upb:: DESTINATION share/upb)
-+
-   """)
- 
- data = {}
+diff --git a/cmake/make_cmakelists.py b/cmake/make_cmakelists.py
+index 29c73bb8..d85c1d7a 100755
+--- a/cmake/make_cmakelists.py
++++ b/cmake/make_cmakelists.py
+@@ -307,11 +307,134 @@ def convert(self):
+       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()
+ 
++    set(CMAKE_CXX_STANDARD 11)
++
++    if (VCPKG_UPB_BUILD_CODEGEN)
++      find_package(absl CONFIG REQUIRED)
++      find_package(protobuf CONFIG REQUIRED)
++
++      if (ABSL_USE_CXX17)
++        message(STATUS "Found absl uses CXX17, enable CXX17 feature.")
++        set(CMAKE_CXX_STANDARD 17)
++      endif()
++    endif()
++
++    add_library(descriptor_upb_proto)
++
++    add_library(utf8_range
++      ../third_party/utf8_range/naive.c
++      ../third_party/utf8_range/range2-neon.c
++      ../third_party/utf8_range/range2-sse.c
++      ../third_party/utf8_range/utf8_range.h
++    )
++
+     %(toplevel)s
+ 
+-  """)
++    set(UPB_DESCRIPTOR_PROTO "${VCPKG_UPB_HOST_INCLUDE_DIR}/google/protobuf/descriptor.proto")
++    if (VCPKG_UPB_BUILD_CODEGEN)
++      set(UPB_CODEGEN_TARGETS protoc-gen-upb protoc-gen-upbdefs)
++
++      add_executable(protoc-gen-upbdefs
++        ../upbc/common.h
++        ../upbc/common.cc
++        ../upbc/protoc-gen-upbdefs.cc
++      )
++      target_link_libraries(protoc-gen-upbdefs PRIVATE
++        absl::flat_hash_map
++        absl::strings
++        protobuf::libprotobuf
++        protobuf::libprotoc
++      )
++
++      add_executable(protoc-gen-upb
++        ../upbc/common.h
++        ../upbc/common.cc
++        ../upbc/protoc-gen-upb.cc
++      )
++      target_link_libraries(protoc-gen-upb PRIVATE
++        mini_table
++        port
++        upb
++        absl::flat_hash_map
++        absl::flat_hash_set
++        absl::strings
++        protobuf::libprotobuf
++        protobuf::libprotoc
++      )
++    endif()
++
++    if(NOT CMAKE_CROSSCOMPILING AND VCPKG_UPB_BUILD_CODEGEN)
++      set(PROTOC_PROGRAM "\$<TARGET_FILE:protobuf::protoc>")
++      set(PROTOC_GEN_UPB_PROGRAM "\$<TARGET_FILE:protoc-gen-upb>")
++      set(PROTOC_GEN_UPBDEFS_PROGRAM "\$<TARGET_FILE:protoc-gen-upbdefs>")
++    else()
++      find_program(PROTOC_PROGRAM protoc)
++      find_program(PROTOC_GEN_UPB_PROGRAM protoc-gen-upb)
++      find_program(PROTOC_GEN_UPBDEFS_PROGRAM protoc-gen-upbdefs)
++    endif()
++
++    set(UPB_DESCRIPTOR_SOURCES
++      "${CMAKE_CURRENT_BINARY_DIR}/google/protobuf/descriptor.upb.h"
++      "${CMAKE_CURRENT_BINARY_DIR}/google/protobuf/descriptor.upb.c"
++      "${CMAKE_CURRENT_BINARY_DIR}/google/protobuf/descriptor.upbdefs.h"
++      "${CMAKE_CURRENT_BINARY_DIR}/google/protobuf/descriptor.upbdefs.c"
++    )
++
++    add_custom_command(
++      OUTPUT ${UPB_DESCRIPTOR_SOURCES}
++      DEPENDS "${UPB_DESCRIPTOR_PROTO}"
++      COMMAND
++        "${PROTOC_PROGRAM}"
++        "-I${VCPKG_UPB_HOST_INCLUDE_DIR}"
++        "--plugin=protoc-gen-upb=${PROTOC_GEN_UPB_PROGRAM}"
++        "--plugin=protoc-gen-upbdefs=${PROTOC_GEN_UPBDEFS_PROGRAM}"
++        "--upb_out=${CMAKE_CURRENT_BINARY_DIR}"
++        "--upbdefs_out=${CMAKE_CURRENT_BINARY_DIR}"
++        "${UPB_DESCRIPTOR_PROTO}"
++    )
++
++    target_sources(descriptor_upb_proto PRIVATE ${UPB_DESCRIPTOR_SOURCES})
++
++    set_target_properties(reflection PROPERTIES OUTPUT_NAME upb_reflection)
++    set_target_properties(fastdecode PROPERTIES OUTPUT_NAME upb_fastdecode)
++    set_target_properties(textformat PROPERTIES OUTPUT_NAME upb_textformat)
++    set_target_properties(json PROPERTIES OUTPUT_NAME upb_json)
++    set_target_properties(utf8_range PROPERTIES OUTPUT_NAME upb_utf8_range)
++    set_target_properties(mini_table PROPERTIES OUTPUT_NAME upb_mini_table)
++
++    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
++      upb
++      utf8_range
++      fastdecode
++      json
++      port
++      table
++      descriptor_upb_proto
++      reflection
++      textformat
++      mini_table_internal
++      mini_table
++      ${UPB_CODEGEN_TARGETS}
++      EXPORT upb-config
++    )
++    install(EXPORT upb-config NAMESPACE upb:: DESTINATION share/upb)
++    """)
+ 
+ data = {}
+ converter = Converter()
diff --git a/ports/upb/portfile.cmake b/ports/upb/portfile.cmake
index 93bcbc1a5d3353..9ab04fe652529d 100644
--- a/ports/upb/portfile.cmake
+++ b/ports/upb/portfile.cmake
@@ -26,14 +26,13 @@ vcpkg_check_features(
         codegen VCPKG_UPB_BUILD_CODEGEN
 )
 
-if(NOT VCPKG_UPB_BUILD_CODEGEN)
-    vcpkg_add_to_path(PREPEND "${CURRENT_HOST_INSTALLED_DIR}/tools/protobuf" "${CURRENT_HOST_INSTALLED_DIR}/tools/upb")
-endif()
-
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}/cmake"
     OPTIONS ${FEATURE_OPTIONS}
         "-DVCPKG_UPB_HOST_INCLUDE_DIR=${CURRENT_HOST_INSTALLED_DIR}/include"
+        "-DPROTOC_PROGRAM=${CURRENT_HOST_INSTALLED_DIR}/tools/protobuf/protoc${VCPKG_HOST_EXECUTABLE_SUFFIX}"
+        "-DPROTOC_GEN_UPB_PROGRAM=${CURRENT_HOST_INSTALLED_DIR}/tools/upb/protoc-gen-upb${VCPKG_HOST_EXECUTABLE_SUFFIX}"
+        "-DPROTOC_GEN_UPBDEFS_PROGRAM=${CURRENT_HOST_INSTALLED_DIR}/tools/upb/protoc-gen-upbdefs${VCPKG_HOST_EXECUTABLE_SUFFIX}"
 )
 
 vcpkg_cmake_install(ADD_BIN_TO_PATH)
@@ -46,8 +45,6 @@ if (VCPKG_UPB_BUILD_CODEGEN)
             protoc-gen-upbdefs
             protoc-gen-upb
     )
-else()
-    configure_file("${CMAKE_CURRENT_LIST_DIR}/upb-config-vcpkg-tools.cmake" "${CURRENT_PACKAGES_DIR}/share/upb/upb-config-vcpkg-tools.cmake" @ONLY)
 endif()
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/upb/fuzz" "${CURRENT_PACKAGES_DIR}/debug/share" "${CURRENT_PACKAGES_DIR}/debug/include")
diff --git a/ports/upb/upb-config-vcpkg-tools.cmake b/ports/upb/upb-config-vcpkg-tools.cmake
deleted file mode 100644
index cd5f21ff614ba2..00000000000000
--- a/ports/upb/upb-config-vcpkg-tools.cmake
+++ /dev/null
@@ -1,10 +0,0 @@
-file(GLOB UPB_PLUGINS "${_IMPORT_PREFIX}/../@HOST_TRIPLET@/tools/upb/protoc-gen-upb*")
-
-foreach(PLUGIN ${UPB_PLUGINS})
-  get_filename_component(PLUGIN_NAME "${PLUGIN}" NAME_WE)
-  add_executable(upb::${PLUGIN_NAME} IMPORTED)
-  set_property(TARGET upb::${PLUGIN_NAME} APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE)
-  set_target_properties(upb::${PLUGIN_NAME} PROPERTIES
-    IMPORTED_LOCATION_RELEASE "${PLUGIN}"
-  )
-endforeach()
diff --git a/ports/upb/vcpkg.json b/ports/upb/vcpkg.json
index 24a64398bfb8c4..47e5d6090713ef 100644
--- a/ports/upb/vcpkg.json
+++ b/ports/upb/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "upb",
   "version-date": "2022-04-04",
+  "port-version": 1,
   "description": "μpb (often written 'upb') is a small protobuf implementation written in C.",
   "homepage": "https://github.com/protocolbuffers/upb/",
   "license": "BSD-2-Clause",
diff --git a/versions/baseline.json b/versions/baseline.json
index 8f42324d59604a..b0a024c52b1d9b 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -1282,7 +1282,7 @@
     },
     "cartographer": {
       "baseline": "1.0.0",
-      "port-version": 5
+      "port-version": 6
     },
     "casclib": {
       "baseline": "2021-11-16",
@@ -2662,7 +2662,7 @@
     },
     "google-cloud-cpp": {
       "baseline": "2.1.0",
-      "port-version": 2
+      "port-version": 3
     },
     "google-cloud-cpp-common": {
       "baseline": "alias",
@@ -2722,7 +2722,7 @@
     },
     "grpc": {
       "baseline": "1.48.0",
-      "port-version": 1
+      "port-version": 2
     },
     "grppi": {
       "baseline": "0.4.0",
@@ -5166,7 +5166,7 @@
     },
     "offscale-libetcd-cpp": {
       "baseline": "2019-07-10",
-      "port-version": 3
+      "port-version": 4
     },
     "ogdf": {
       "baseline": "2019-08-23",
@@ -5202,7 +5202,7 @@
     },
     "onnx": {
       "baseline": "1.10.2",
-      "port-version": 1
+      "port-version": 2
     },
     "onnx-optimizer": {
       "baseline": "0.2.6",
@@ -5274,7 +5274,7 @@
     },
     "opencv4": {
       "baseline": "4.6.0",
-      "port-version": 4
+      "port-version": 5
     },
     "opendnp3": {
       "baseline": "3.1.1",
@@ -5754,7 +5754,7 @@
     },
     "protobuf": {
       "baseline": "3.21.4",
-      "port-version": 0
+      "port-version": 1
     },
     "protobuf-c": {
       "baseline": "1.4.0",
@@ -6970,7 +6970,7 @@
     },
     "srpc": {
       "baseline": "0.9.3",
-      "port-version": 0
+      "port-version": 1
     },
     "starlink-ast": {
       "baseline": "9.2.7",
@@ -7426,7 +7426,7 @@
     },
     "upb": {
       "baseline": "2022-04-04",
-      "port-version": 0
+      "port-version": 1
     },
     "urdfdom": {
       "baseline": "3.1.0",
diff --git a/versions/c-/cartographer.json b/versions/c-/cartographer.json
index 6694174e7c8680..d8a007cd84513a 100644
--- a/versions/c-/cartographer.json
+++ b/versions/c-/cartographer.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "783693248586f9b1410c344819f0b2e9e845dd94",
+      "version": "1.0.0",
+      "port-version": 6
+    },
     {
       "git-tree": "b0e352bf9c678b6425f767a21470b2c8ef3f79b9",
       "version": "1.0.0",
diff --git a/versions/g-/google-cloud-cpp.json b/versions/g-/google-cloud-cpp.json
index be5201221abc80..638000f61de57b 100644
--- a/versions/g-/google-cloud-cpp.json
+++ b/versions/g-/google-cloud-cpp.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "c9c84793b6bbfb4de7e9752b18756225918804b8",
+      "version": "2.1.0",
+      "port-version": 3
+    },
     {
       "git-tree": "8e675db53dae8b88be806ecd93411810ee8048d7",
       "version": "2.1.0",
diff --git a/versions/g-/grpc.json b/versions/g-/grpc.json
index f7bab7cd11a894..428f3cc291848c 100644
--- a/versions/g-/grpc.json
+++ b/versions/g-/grpc.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "d86b43faeae9035de2102504d3b6cf33389ba52f",
+      "version-semver": "1.48.0",
+      "port-version": 2
+    },
     {
       "git-tree": "7b2206a9758481b4773a93435aa6cfe7de4bf9e5",
       "version-semver": "1.48.0",
diff --git a/versions/o-/offscale-libetcd-cpp.json b/versions/o-/offscale-libetcd-cpp.json
index bf4ad5b12d10d0..bccfabf7c548ea 100644
--- a/versions/o-/offscale-libetcd-cpp.json
+++ b/versions/o-/offscale-libetcd-cpp.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "73d51ea78bd13782519f68c1646983f1f7fbaaa6",
+      "version-date": "2019-07-10",
+      "port-version": 4
+    },
     {
       "git-tree": "70eb4516cd664f01e89d2701ae45ba05ea4c9d7a",
       "version-date": "2019-07-10",
diff --git a/versions/o-/onnx.json b/versions/o-/onnx.json
index a61d8ee3f3c151..089eb036e1e80e 100644
--- a/versions/o-/onnx.json
+++ b/versions/o-/onnx.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "9fa585cb62a376dc702e3751e680af258e53c476",
+      "version-semver": "1.10.2",
+      "port-version": 2
+    },
     {
       "git-tree": "62ee0b78332273115540d669065a467314aace3a",
       "version-semver": "1.10.2",
diff --git a/versions/o-/opencv4.json b/versions/o-/opencv4.json
index 60a076d77076a5..c7c665460e328b 100644
--- a/versions/o-/opencv4.json
+++ b/versions/o-/opencv4.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "2469ecab2570779f254e1f517152a0e711e54861",
+      "version": "4.6.0",
+      "port-version": 5
+    },
     {
       "git-tree": "970c048b2d380fe84e110c02a99dc099f8b877d0",
       "version": "4.6.0",
diff --git a/versions/p-/protobuf.json b/versions/p-/protobuf.json
index efed0c5b4b0b71..39ebdfb9c14256 100644
--- a/versions/p-/protobuf.json
+++ b/versions/p-/protobuf.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "367c2ddf31d391a5458cf7840943385a3afbf05e",
+      "version": "3.21.4",
+      "port-version": 1
+    },
     {
       "git-tree": "b66573195da9e32b3396e253b520ad498617405b",
       "version": "3.21.4",
diff --git a/versions/s-/srpc.json b/versions/s-/srpc.json
index 01f29288d85606..83e7b0bebe341b 100644
--- a/versions/s-/srpc.json
+++ b/versions/s-/srpc.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "a624b5658b9aca2ef01ec8dc8a5ce0edd8ddbbdc",
+      "version-semver": "0.9.3",
+      "port-version": 1
+    },
     {
       "git-tree": "7f8e905bb42ba10b9076c4fca512933f4e3171e5",
       "version-semver": "0.9.3",
diff --git a/versions/u-/upb.json b/versions/u-/upb.json
index 755b43a83265a4..2eb68a1fac2600 100644
--- a/versions/u-/upb.json
+++ b/versions/u-/upb.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "a50dc2476b696e412a6bd4d806a932ee7b921a49",
+      "version-date": "2022-04-04",
+      "port-version": 1
+    },
     {
       "git-tree": "de1d8718e4ea42428b87f4275352c4f3bbb6ac11",
       "version-date": "2022-04-04",