diff --git a/ports/pcre2/fix-cmake.patch b/ports/pcre2/fix-cmake.patch
deleted file mode 100644
index f6b9b4a646..0000000000
--- a/ports/pcre2/fix-cmake.patch
+++ /dev/null
@@ -1,326 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 1888c14..41fcfda 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -150,6 +150,7 @@ include(CheckFunctionExists)
- include(CheckSymbolExists)
- include(CheckIncludeFile)
- include(CheckTypeSize)
-+INCLUDE(CMakePackageConfigHelpers)
- include(GNUInstallDirs) # for CMAKE_INSTALL_LIBDIR
- 
- check_include_file(assert.h HAVE_ASSERT_H)
-@@ -792,7 +793,7 @@ if(PCRE2_BUILD_PCRE2_8)
-         SOVERSION ${LIBPCRE2_8_SOVERSION}
-     )
-     target_compile_definitions(pcre2-8-static PUBLIC PCRE2_STATIC)
--    target_include_directories(pcre2-8-static PUBLIC ${PROJECT_BINARY_DIR})
-+    target_include_directories(pcre2-8-static PUBLIC $<BUILD_INTERFACE:${PROJECT_BINARY_DIR}> $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
-     if(REQUIRE_PTHREAD)
-       target_link_libraries(pcre2-8-static Threads::Threads)
-     endif()
-@@ -808,7 +809,7 @@ if(PCRE2_BUILD_PCRE2_8)
-         SOVERSION ${LIBPCRE2_POSIX_SOVERSION}
-     )
-     target_link_libraries(pcre2-posix-static pcre2-8-static)
--    target_include_directories(pcre2-posix-static PUBLIC ${PROJECT_SOURCE_DIR}/src)
-+    target_include_directories(pcre2-posix-static PUBLIC $<BUILD_INTERFACE:${PROJECT_BINARY_DIR}> $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
-     set(TARGETS ${TARGETS} pcre2-posix-static)
- 
-     if(MSVC)
-@@ -825,7 +826,7 @@ if(PCRE2_BUILD_PCRE2_8)
- 
-   if(BUILD_SHARED_LIBS)
-     add_library(pcre2-8-shared SHARED ${PCRE2_HEADERS} ${PCRE2_SOURCES} ${PROJECT_BINARY_DIR}/config.h)
--    target_include_directories(pcre2-8-shared PUBLIC ${PROJECT_BINARY_DIR})
-+    target_include_directories(pcre2-8-shared PUBLIC $<BUILD_INTERFACE:${PROJECT_BINARY_DIR}> $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
-     set_target_properties(
-       pcre2-8-shared
-       PROPERTIES
-@@ -844,7 +845,7 @@ if(PCRE2_BUILD_PCRE2_8)
-     set(DLL_PDB_DEBUG_FILES $<TARGET_PDB_FILE_DIR:pcre2-8-shared>/pcre2-8d.pdb ${DLL_PDB_DEBUG_FILES})
- 
-     add_library(pcre2-posix-shared SHARED ${PCRE2POSIX_HEADERS} ${PCRE2POSIX_SOURCES})
--    target_include_directories(pcre2-posix-shared PUBLIC ${PROJECT_SOURCE_DIR}/src)
-+    target_include_directories(pcre2-posix-shared PUBLIC $<BUILD_INTERFACE:${PROJECT_BINARY_DIR}> $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
-     set_target_properties(
-       pcre2-posix-shared
-       PROPERTIES
-@@ -886,7 +887,7 @@ endif()
- if(PCRE2_BUILD_PCRE2_16)
-   if(BUILD_STATIC_LIBS)
-     add_library(pcre2-16-static STATIC ${PCRE2_HEADERS} ${PCRE2_SOURCES} ${PROJECT_BINARY_DIR}/config.h)
--    target_include_directories(pcre2-16-static PUBLIC ${PROJECT_BINARY_DIR})
-+    target_include_directories(pcre2-16-static PUBLIC $<BUILD_INTERFACE:${PROJECT_BINARY_DIR}> $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
-     set_target_properties(
-       pcre2-16-static
-       PROPERTIES
-@@ -915,7 +916,7 @@ if(PCRE2_BUILD_PCRE2_16)
- 
-   if(BUILD_SHARED_LIBS)
-     add_library(pcre2-16-shared SHARED ${PCRE2_HEADERS} ${PCRE2_SOURCES} ${PROJECT_BINARY_DIR}/config.h)
--    target_include_directories(pcre2-16-shared PUBLIC ${PROJECT_BINARY_DIR})
-+    target_include_directories(pcre2-16-shared PUBLIC $<BUILD_INTERFACE:${PROJECT_BINARY_DIR}> $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
-     set_target_properties(
-       pcre2-16-shared
-       PROPERTIES
-@@ -956,7 +957,7 @@ endif()
- if(PCRE2_BUILD_PCRE2_32)
-   if(BUILD_STATIC_LIBS)
-     add_library(pcre2-32-static STATIC ${PCRE2_HEADERS} ${PCRE2_SOURCES} ${PROJECT_BINARY_DIR}/config.h)
--    target_include_directories(pcre2-32-static PUBLIC ${PROJECT_BINARY_DIR})
-+    target_include_directories(pcre2-32-static PUBLIC $<BUILD_INTERFACE:${PROJECT_BINARY_DIR}> $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
-     set_target_properties(
-       pcre2-32-static
-       PROPERTIES
-@@ -985,7 +986,7 @@ if(PCRE2_BUILD_PCRE2_32)
- 
-   if(BUILD_SHARED_LIBS)
-     add_library(pcre2-32-shared SHARED ${PCRE2_HEADERS} ${PCRE2_SOURCES} ${PROJECT_BINARY_DIR}/config.h)
--    target_include_directories(pcre2-32-shared PUBLIC ${PROJECT_BINARY_DIR})
-+    target_include_directories(pcre2-32-shared PUBLIC $<BUILD_INTERFACE:${PROJECT_BINARY_DIR}> $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
-     set_target_properties(
-       pcre2-32-shared
-       PROPERTIES
-@@ -1244,10 +1245,14 @@ set(CMAKE_INSTALL_ALWAYS 1)
- 
- install(
-   TARGETS ${TARGETS}
--  RUNTIME DESTINATION bin
-+  EXPORT pcre2-targets
-+  RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-   LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-   ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
- )
-+INSTALL(EXPORT pcre2-targets
-+        DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/pcre2
-+        NAMESPACE pcre2::)
- install(FILES ${pkg_config_files} DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
- install(
-   FILES "${CMAKE_CURRENT_BINARY_DIR}/pcre2-config"
-@@ -1261,11 +1266,12 @@ install(FILES ${PCRE2_HEADERS} ${PCRE2POSIX_HEADERS} DESTINATION include)
- # CMake config files.
- set(PCRE2_CONFIG_IN ${CMAKE_CURRENT_SOURCE_DIR}/cmake/pcre2-config.cmake.in)
- set(PCRE2_CONFIG_OUT ${CMAKE_CURRENT_BINARY_DIR}/cmake/pcre2-config.cmake)
--configure_file(${PCRE2_CONFIG_IN} ${PCRE2_CONFIG_OUT} @ONLY)
--set(PCRE2_CONFIG_VERSION_IN ${CMAKE_CURRENT_SOURCE_DIR}/cmake/pcre2-config-version.cmake.in)
-+configure_package_config_file(${PCRE2_CONFIG_IN} ${PCRE2_CONFIG_OUT} INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/pcre2)
- set(PCRE2_CONFIG_VERSION_OUT ${CMAKE_CURRENT_BINARY_DIR}/cmake/pcre2-config-version.cmake)
--configure_file(${PCRE2_CONFIG_VERSION_IN} ${PCRE2_CONFIG_VERSION_OUT} @ONLY)
--install(FILES ${PCRE2_CONFIG_OUT} ${PCRE2_CONFIG_VERSION_OUT} DESTINATION "${PCRE2_INSTALL_CMAKEDIR}")
-+write_basic_package_version_file(${PCRE2_CONFIG_VERSION_OUT}
-+                                 VERSION ${PCRE2_MAJOR}.${PCRE2_MINOR}.0
-+                                 COMPATIBILITY SameMajorVersion)
-+install(FILES ${PCRE2_CONFIG_OUT} ${PCRE2_CONFIG_VERSION_OUT} DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/pcre2)
- 
- file(GLOB html ${PROJECT_SOURCE_DIR}/doc/html/*.html ${PROJECT_SOURCE_DIR}/doc/html/*.txt)
- file(
-diff --git a/cmake/pcre2-config-version.cmake.in b/cmake/pcre2-config-version.cmake.in
-index db00606..e69de29 100644
---- a/cmake/pcre2-config-version.cmake.in
-+++ b/cmake/pcre2-config-version.cmake.in
-@@ -1,14 +0,0 @@
--set(PACKAGE_VERSION_MAJOR @PCRE2_MAJOR@)
--set(PACKAGE_VERSION_MINOR @PCRE2_MINOR@)
--set(PACKAGE_VERSION_PATCH 0)
--set(PACKAGE_VERSION @PCRE2_MAJOR@.@PCRE2_MINOR@.0)
--
--# Check whether the requested PACKAGE_FIND_VERSION is compatible
--if(PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION OR PACKAGE_VERSION_MAJOR GREATER PACKAGE_FIND_VERSION_MAJOR)
--  set(PACKAGE_VERSION_COMPATIBLE FALSE)
--else()
--  set(PACKAGE_VERSION_COMPATIBLE TRUE)
--  if(PACKAGE_VERSION VERSION_EQUAL PACKAGE_FIND_VERSION)
--    set(PACKAGE_VERSION_EXACT TRUE)
--  endif()
--endif()
-diff --git a/cmake/pcre2-config.cmake.in b/cmake/pcre2-config.cmake.in
-index 082dc19..545f4de 100644
---- a/cmake/pcre2-config.cmake.in
-+++ b/cmake/pcre2-config.cmake.in
-@@ -5,11 +5,17 @@
- #
- # Static vs. shared
- # -----------------
--# To make use of the static library instead of the shared one, one needs
-+# To force using the static library instead of the shared one, one needs
- # to set the variable PCRE2_USE_STATIC_LIBS to ON before calling find_package.
-+# If the variable is not set, the static library will be used if only that has
-+# been built, otherwise the shared library will be used.
-+#
-+# The following components are supported: 8BIT, 16BIT, 32BIT and POSIX.
-+# They used to be required but not anymore; all available targets will
-+# be defined regardless of the requested components.
- # Example:
- #   set(PCRE2_USE_STATIC_LIBS ON)
--#   find_package(PCRE2 CONFIG COMPONENTS 8BIT)
-+#   find_package(PCRE2 CONFIG)
- #
- # This will define the following variables:
- #
-@@ -23,88 +29,42 @@
- #   PCRE2::32BIT - The 32 bit PCRE2 library.
- #   PCRE2::POSIX - The POSIX PCRE2 library.
- 
--set(PCRE2_NON_STANDARD_LIB_PREFIX @NON_STANDARD_LIB_PREFIX@)
--set(PCRE2_NON_STANDARD_LIB_SUFFIX @NON_STANDARD_LIB_SUFFIX@)
--set(PCRE2_8BIT_NAME pcre2-8)
--set(PCRE2_16BIT_NAME pcre2-16)
--set(PCRE2_32BIT_NAME pcre2-32)
--set(PCRE2_POSIX_NAME pcre2-posix)
--find_path(PCRE2_INCLUDE_DIR NAMES pcre2.h DOC "PCRE2 include directory")
--if(PCRE2_USE_STATIC_LIBS)
--  if(MSVC)
--    set(PCRE2_8BIT_NAME pcre2-8-static)
--    set(PCRE2_16BIT_NAME pcre2-16-static)
--    set(PCRE2_32BIT_NAME pcre2-32-static)
--    set(PCRE2_POSIX_NAME pcre2-posix-static)
--  endif()
--
--  set(PCRE2_PREFIX ${CMAKE_STATIC_LIBRARY_PREFIX})
--  set(PCRE2_SUFFIX ${CMAKE_STATIC_LIBRARY_SUFFIX})
--else()
--  set(PCRE2_PREFIX ${CMAKE_SHARED_LIBRARY_PREFIX})
--  if(MINGW AND PCRE2_NON_STANDARD_LIB_PREFIX)
--    set(PCRE2_PREFIX "")
--  endif()
-+@PACKAGE_INIT@
- 
--  set(PCRE2_SUFFIX ${CMAKE_SHARED_LIBRARY_SUFFIX})
--  if(MINGW AND PCRE2_NON_STANDARD_LIB_SUFFIX)
--    set(PCRE2_SUFFIX "-0.dll")
--  elseif(MSVC)
--    set(PCRE2_SUFFIX ${CMAKE_STATIC_LIBRARY_SUFFIX})
--  endif()
-+include(CMakeFindDependencyMacro)
-+if("@REQUIRE_PTHREAD@") # REQUIRE_PTHREAD
-+  find_dependency(Threads)
- endif()
--find_library(
--  PCRE2_8BIT_LIBRARY
--  NAMES ${PCRE2_PREFIX}${PCRE2_8BIT_NAME}${PCRE2_SUFFIX} ${PCRE2_PREFIX}${PCRE2_8BIT_NAME}d${PCRE2_SUFFIX}
--  DOC "8 bit PCRE2 library"
--)
--find_library(
--  PCRE2_16BIT_LIBRARY
--  NAMES ${PCRE2_PREFIX}${PCRE2_16BIT_NAME}${PCRE2_SUFFIX} ${PCRE2_PREFIX}${PCRE2_16BIT_NAME}d${PCRE2_SUFFIX}
--  DOC "16 bit PCRE2 library"
--)
--find_library(
--  PCRE2_32BIT_LIBRARY
--  NAMES ${PCRE2_PREFIX}${PCRE2_32BIT_NAME}${PCRE2_SUFFIX} ${PCRE2_PREFIX}${PCRE2_32BIT_NAME}d${PCRE2_SUFFIX}
--  DOC "32 bit PCRE2 library"
--)
--find_library(
--  PCRE2_POSIX_LIBRARY
--  NAMES ${PCRE2_PREFIX}${PCRE2_POSIX_NAME}${PCRE2_SUFFIX} ${PCRE2_PREFIX}${PCRE2_POSIX_NAME}d${PCRE2_SUFFIX}
--  DOC "8 bit POSIX PCRE2 library"
--)
--unset(PCRE2_NON_STANDARD_LIB_PREFIX)
--unset(PCRE2_NON_STANDARD_LIB_SUFFIX)
--unset(PCRE2_8BIT_NAME)
--unset(PCRE2_16BIT_NAME)
--unset(PCRE2_32BIT_NAME)
--unset(PCRE2_POSIX_NAME)
- 
--# Set version
--if(PCRE2_INCLUDE_DIR)
--  set(PCRE2_VERSION "@PCRE2_MAJOR@.@PCRE2_MINOR@.0")
--endif()
-+include("${CMAKE_CURRENT_LIST_DIR}/pcre2-targets.cmake")
- 
--# Which components have been found.
--if(PCRE2_8BIT_LIBRARY)
--  set(PCRE2_8BIT_FOUND TRUE)
--endif()
--if(PCRE2_16BIT_LIBRARY)
--  set(PCRE2_16BIT_FOUND TRUE)
--endif()
--if(PCRE2_32BIT_LIBRARY)
--  set(PCRE2_32BIT_FOUND TRUE)
--endif()
--if(PCRE2_POSIX_LIBRARY)
--  set(PCRE2_POSIX_FOUND TRUE)
--endif()
-+# Set version
-+set(PCRE2_VERSION "@PCRE2_MAJOR@.@PCRE2_MINOR@.0")
- 
--# Check if at least one component has been specified.
--list(LENGTH PCRE2_FIND_COMPONENTS PCRE2_NCOMPONENTS)
--if(PCRE2_NCOMPONENTS LESS 1)
--  message(FATAL_ERROR "No components have been specified. This is not allowed. Please, specify at least one component.")
--endif()
--unset(PCRE2_NCOMPONENTS)
-+# Chooses the linkage of the library to expose in the
-+# unsuffixed edition of the target.
-+macro(_pcre2_add_component_target component target)
-+  # If the static library exists and either PCRE2_USE_STATIC_LIBS
-+  # is defined, or the dynamic library does not exist, use the static library.
-+  if(NOT TARGET PCRE2::${component})
-+    if(TARGET pcre2::pcre2-${target}-static AND (PCRE2_USE_STATIC_LIBS OR NOT TARGET pcre2::pcre2-${target}-shared))
-+      add_library(PCRE2::${component} ALIAS pcre2::pcre2-${target}-static)
-+      set(PCRE2_${component}_FOUND TRUE)
-+    # Otherwise use the dynamic library if it exists.
-+    elseif(TARGET pcre2::pcre2-${target}-shared AND NOT PCRE2_USE_STATIC_LIBS)
-+      add_library(PCRE2::${component} ALIAS pcre2::pcre2-${target}-shared)
-+      set(PCRE2_${component}_FOUND TRUE)
-+    endif()
-+    if(PCRE2_${component}_FOUND)
-+      get_target_property(PCRE2_${component}_LIBRARY PCRE2::${component} IMPORTED_LOCATION)
-+      set(PCRE2_LIBRARIES ${PCRE2_LIBRARIES} ${PCRE2_${component}_LIBRARY})
-+    endif()
-+  endif()
-+endmacro()
-+_pcre2_add_component_target(8BIT 8)
-+_pcre2_add_component_target(16BIT 16)
-+_pcre2_add_component_target(32BIT 32)
-+_pcre2_add_component_target(POSIX posix)
- 
- # When POSIX component has been specified make sure that also 8BIT component is specified.
- set(PCRE2_8BIT_COMPONENT FALSE)
-@@ -126,43 +86,5 @@ endif()
- unset(PCRE2_8BIT_COMPONENT)
- unset(PCRE2_POSIX_COMPONENT)
- 
--include(FindPackageHandleStandardArgs)
--set(${CMAKE_FIND_PACKAGE_NAME}_CONFIG "${CMAKE_CURRENT_LIST_FILE}")
--find_package_handle_standard_args(
--  PCRE2
--  FOUND_VAR PCRE2_FOUND
--  REQUIRED_VARS PCRE2_INCLUDE_DIR
--  HANDLE_COMPONENTS
--  VERSION_VAR PCRE2_VERSION
--  CONFIG_MODE
--)
--
--set(PCRE2_LIBRARIES)
--if(PCRE2_FOUND)
--  foreach(component ${PCRE2_FIND_COMPONENTS})
--    if(PCRE2_USE_STATIC_LIBS)
--      add_library(PCRE2::${component} STATIC IMPORTED)
--      target_compile_definitions(PCRE2::${component} INTERFACE PCRE2_STATIC)
--    else()
--      add_library(PCRE2::${component} SHARED IMPORTED)
--    endif()
--    set_target_properties(
--      PCRE2::${component}
--      PROPERTIES
--        IMPORTED_LOCATION "${PCRE2_${component}_LIBRARY}"
--        IMPORTED_IMPLIB "${PCRE2_${component}_LIBRARY}"
--        INTERFACE_INCLUDE_DIRECTORIES "${PCRE2_INCLUDE_DIR}"
--    )
--    if(component STREQUAL "POSIX")
--      set_target_properties(
--        PCRE2::${component}
--        PROPERTIES INTERFACE_LINK_LIBRARIES "PCRE2::8BIT" LINK_LIBRARIES "PCRE2::8BIT"
--      )
--    endif()
--
--    set(PCRE2_LIBRARIES ${PCRE2_LIBRARIES} ${PCRE2_${component}_LIBRARY})
--    mark_as_advanced(PCRE2_${component}_LIBRARY)
--  endforeach()
--endif()
--
--mark_as_advanced(PCRE2_INCLUDE_DIR)
-+# Check for required components.
-+check_required_components("PCRE2")
diff --git a/ports/pcre2/no-static-suffix.patch b/ports/pcre2/no-static-suffix.patch
index 4da7bc1a24..4c81e96e05 100644
--- a/ports/pcre2/no-static-suffix.patch
+++ b/ports/pcre2/no-static-suffix.patch
@@ -1,9 +1,9 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 52cd05d..1888c14 100644
+index 523bdcb..9d5d1a4 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -812,8 +812,8 @@ if(PCRE2_BUILD_PCRE2_8)
-     set(TARGETS ${TARGETS} pcre2-posix-static)
+@@ -942,8 +942,8 @@ if(PCRE2_BUILD_PCRE2_8)
+     list(APPEND TARGETS pcre2-posix-static)
  
      if(MSVC)
 -      set_target_properties(pcre2-8-static PROPERTIES OUTPUT_NAME pcre2-8-static)
@@ -13,8 +13,8 @@ index 52cd05d..1888c14 100644
      else()
        set_target_properties(pcre2-8-static PROPERTIES OUTPUT_NAME pcre2-8)
        set_target_properties(pcre2-posix-static PROPERTIES OUTPUT_NAME pcre2-posix)
-@@ -904,7 +904,7 @@ if(PCRE2_BUILD_PCRE2_16)
-     set(TARGETS ${TARGETS} pcre2-16-static)
+@@ -1049,7 +1049,7 @@ if(PCRE2_BUILD_PCRE2_16)
+     list(APPEND TARGETS pcre2-16-static)
  
      if(MSVC)
 -      set_target_properties(pcre2-16-static PROPERTIES OUTPUT_NAME pcre2-16-static)
@@ -22,8 +22,8 @@ index 52cd05d..1888c14 100644
      else()
        set_target_properties(pcre2-16-static PROPERTIES OUTPUT_NAME pcre2-16)
      endif()
-@@ -974,7 +974,7 @@ if(PCRE2_BUILD_PCRE2_32)
-     set(TARGETS ${TARGETS} pcre2-32-static)
+@@ -1127,7 +1127,7 @@ if(PCRE2_BUILD_PCRE2_32)
+     list(APPEND TARGETS pcre2-32-static)
  
      if(MSVC)
 -      set_target_properties(pcre2-32-static PROPERTIES OUTPUT_NAME pcre2-32-static)
diff --git a/ports/pcre2/pcre2-10.35_fix-uwp.patch b/ports/pcre2/pcre2-10.35_fix-uwp.patch
index 09992b2fc1..16d8d7711c 100644
--- a/ports/pcre2/pcre2-10.35_fix-uwp.patch
+++ b/ports/pcre2/pcre2-10.35_fix-uwp.patch
@@ -1,12 +1,12 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 9e91617..52cd05d 100644
+index c970996..523bdcb 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -770,6 +770,7 @@ endif()
+@@ -894,6 +894,7 @@ endif()
  
  if(MSVC)
    add_compile_definitions(_CRT_SECURE_NO_DEPRECATE _CRT_SECURE_NO_WARNINGS)
 +  add_compile_options(/wd4146)
  endif()
  
- set(CMAKE_INCLUDE_CURRENT_DIR 1)
+ set(TARGETS)
diff --git a/ports/pcre2/portfile.cmake b/ports/pcre2/portfile.cmake
index 3e9e69d20a..f022ac690c 100644
--- a/ports/pcre2/portfile.cmake
+++ b/ports/pcre2/portfile.cmake
@@ -2,19 +2,18 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO PCRE2Project/pcre2
     REF "pcre2-${VERSION}"
-    SHA512 c945dfcf31795ab9ed2a19fec775087b3daaa64235a632260e7d8c7fc9fcb7f47321540670bd05cf691af52dd8df5679d148ef0829276163d5db3cecd0e7c2da
+    SHA512 4deef8ce95711e65fe07624e6b2aace794594adb15e8363a0279a7b947bf5c75a5858fbdc5251d0a28a7ca97ae8bba561aa5f85805d5c07d417d3e7b3b3486a4
     HEAD_REF master
     PATCHES
         pcre2-10.35_fix-uwp.patch
         no-static-suffix.patch
-        fix-cmake.patch
 )
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SLJIT_SOURCE_PATH
     REPO zherczeg/sljit
-    REF 8481dde366d0346ac5475aa03ae48ee44fa74ca4
-    SHA512 99a6ab54ee6b9b3b2e241d2f29eb24217c8385bb3b756411116eaed0d91f008401822406710431ccf17ddf687828b8ab6933230e44144bea03f550c0f5ac9210
+    REF 45f910b78c6605ebf5b53d3ec7cb00f2312fe417
+    SHA512 c05c83cc762f430c01e2aaf876aaac41a70b67ed8b91bc81102ad527c8921c5e75b41bab35bb8237dd5f53fecd7b8f31206865efffce2ea0a1aa9c87079fc643
     HEAD_REF main
 )
 
diff --git a/ports/pcre2/vcpkg.json b/ports/pcre2/vcpkg.json
index cb1d585c10..55e1d20d42 100644
--- a/ports/pcre2/vcpkg.json
+++ b/ports/pcre2/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "pcre2",
-  "version": "10.46",
+  "version": "10.47",
   "description": "Regular Expression pattern matching using the same syntax and semantics as Perl 5.",
   "homepage": "https://github.com/PCRE2Project/pcre2",
   "license": "BSD-3-Clause",
diff --git a/versions/baseline.json b/versions/baseline.json
index 7833ac9697..79a5250564 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -7389,7 +7389,7 @@
       "port-version": 7
     },
     "pcre2": {
-      "baseline": "10.46",
+      "baseline": "10.47",
       "port-version": 0
     },
     "pdal": {
diff --git a/versions/p-/pcre2.json b/versions/p-/pcre2.json
index fd44d74ea2..7251a7d4d2 100644
--- a/versions/p-/pcre2.json
+++ b/versions/p-/pcre2.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "753cc6dbffbcde00b0c10b8d594108beb320a183",
+      "version": "10.47",
+      "port-version": 0
+    },
     {
       "git-tree": "b9e8bfd3ac8c49f5399e82a016319f1c256a1cc4",
       "version": "10.46",