[pcre2] update to 10.45 (#44116)

2025-03-13 04:36:05 +09:00 · 2025-03-13 04:36:05 +09:00 · 36e6a8b98c
parent 945ed76f57
commit 36e6a8b98c
10 changed files with 248 additions and 212 deletions
--- a/ports/pcre2/fix-cmake.patch
+++ b/ports/pcre2/fix-cmake.patch
@ -1,148 +1,132 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 3c915d9..d5963f8 100644
+index 1888c14..41fcfda 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -143,6 +143,7 @@ INCLUDE(CheckFunctionExists)
- INCLUDE(CheckSymbolExists)
- INCLUDE(CheckIncludeFile)
- INCLUDE(CheckTypeSize)
+@@ -150,6 +150,7 @@ include(CheckFunctionExists)
+ include(CheckSymbolExists)
+ include(CheckIncludeFile)
+ include(CheckTypeSize)
 +INCLUDE(CMakePackageConfigHelpers)
- INCLUDE(GNUInstallDirs) # for CMAKE_INSTALL_LIBDIR
+ include(GNUInstallDirs) # for CMAKE_INSTALL_LIBDIR
 
- CHECK_INCLUDE_FILE(dirent.h     HAVE_DIRENT_H)
-@@ -696,7 +697,9 @@ IF(PCRE2_BUILD_PCRE2_8)
-       VERSION ${LIBPCRE2_8_VERSION}
-       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(REQUIRE_PTHREAD)
-@@ -709,7 +712,9 @@ IF(PCRE2_BUILD_PCRE2_8)
-       VERSION ${LIBPCRE2_POSIX_VERSION}
-       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)
+ 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)
-@@ -726,7 +731,9 @@ IF(PCRE2_BUILD_PCRE2_8)
+     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
-       COMPILE_DEFINITIONS PCRE2_CODE_UNIT_WIDTH=8
-       MACHO_COMPATIBILITY_VERSION "${LIBPCRE2_8_MACHO_COMPATIBILITY_VERSION}"
-@@ -740,7 +747,9 @@ IF(PCRE2_BUILD_PCRE2_8)
-     set(targets ${targets} pcre2-8-shared)
+   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
-       COMPILE_DEFINITIONS PCRE2_CODE_UNIT_WIDTH=8
-       MACHO_COMPATIBILITY_VERSION "${LIBPCRE2_POSIX_MACHO_COMPATIBILITY_VERSION}"
-@@ -779,7 +788,9 @@ ENDIF(PCRE2_BUILD_PCRE2_8)
- 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 UNITY_BUILD OFF
-       COMPILE_DEFINITIONS PCRE2_CODE_UNIT_WIDTH=16
-       MACHO_COMPATIBILITY_VERSION "${LIBPCRE2_32_MACHO_COMPATIBILITY_VERSION}"
-@@ -804,7 +815,9 @@ IF(PCRE2_BUILD_PCRE2_16)
+     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 UNITY_BUILD OFF
-       COMPILE_DEFINITIONS PCRE2_CODE_UNIT_WIDTH=16
-       MACHO_COMPATIBILITY_VERSION "${LIBPCRE2_32_MACHO_COMPATIBILITY_VERSION}"
-@@ -841,7 +854,9 @@ ENDIF(PCRE2_BUILD_PCRE2_16)
- 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 UNITY_BUILD OFF
-       COMPILE_DEFINITIONS PCRE2_CODE_UNIT_WIDTH=32
-       MACHO_COMPATIBILITY_VERSION "${LIBPCRE2_32_MACHO_COMPATIBILITY_VERSION}"
-@@ -866,7 +881,9 @@ IF(PCRE2_BUILD_PCRE2_32)
+   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 UNITY_BUILD OFF
-       COMPILE_DEFINITIONS PCRE2_CODE_UNIT_WIDTH=32
-       MACHO_COMPATIBILITY_VERSION "${LIBPCRE2_32_MACHO_COMPATIBILITY_VERSION}"
-@@ -1107,9 +1124,13 @@ ENDIF(PCRE2_BUILD_TESTS)
- SET(CMAKE_INSTALL_ALWAYS 1)
+   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(
+   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"
-   DESTINATION bin
-@@ -1121,11 +1142,12 @@ INSTALL(FILES ${PCRE2_HEADERS} ${PCRE2POSIX_HEADERS} DESTINATION include)
+ 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_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)
+-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 cmake)
+-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)
- FILE(GLOB man1 ${PROJECT_SOURCE_DIR}/doc/*.1)
+ 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 dac149e..e69de29 100644
+index db00606..e69de29 100644
 --- a/cmake/pcre2-config-version.cmake.in
 +++ b/cmake/pcre2-config-version.cmake.in
-@@ -1,15 +0,0 @@
+@@ -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)
+-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)
@ -151,7 +135,7 @@ index dac149e..e69de29 100644
 -  endif()
 -endif()
 diff --git a/cmake/pcre2-config.cmake.in b/cmake/pcre2-config.cmake.in
-index 12f3a35..159669b 100644
+index 082dc19..545f4de 100644
 --- a/cmake/pcre2-config.cmake.in
 +++ b/cmake/pcre2-config.cmake.in
@@ -5,11 +5,17 @@
@ -174,7 +158,7 @@ index 12f3a35..159669b 100644
 #
 # This will define the following variables:
 #
-@@ -23,70 +29,42 @@
+@@ -23,88 +29,42 @@
 #   PCRE2::32BIT - The 32 bit PCRE2 library.
 #   PCRE2::POSIX - The POSIX PCRE2 library.
 
@ -185,69 +169,87 @@ index 12f3a35..159669b 100644
 -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)
+-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 ()
-+@PACKAGE_INIT@
- 
+-  endif()
+-
 -  set(PCRE2_PREFIX ${CMAKE_STATIC_LIBRARY_PREFIX})
 -  set(PCRE2_SUFFIX ${CMAKE_STATIC_LIBRARY_SUFFIX})
-else ()
+-else()
 -  set(PCRE2_PREFIX ${CMAKE_SHARED_LIBRARY_PREFIX})
-  if (MINGW AND PCRE2_NON_STANDARD_LIB_PREFIX)
+-  if(MINGW AND PCRE2_NON_STANDARD_LIB_PREFIX)
 -    set(PCRE2_PREFIX "")
-  endif ()
+-  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()
- 
-  set(PCRE2_SUFFIX ${CMAKE_SHARED_LIBRARY_SUFFIX})
-  if (MINGW AND PCRE2_NON_STANDARD_LIB_SUFFIX)
-    set(PCRE2_SUFFIX "-0.dll")
-  endif ()
-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")
+ 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")
 
- # Set version
-if (PCRE2_INCLUDE_DIR)
-  set(PCRE2_VERSION "@PCRE2_MAJOR@.@PCRE2_MINOR@.0")
-endif ()
+-# 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")
 
-# 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 ()
-
 -# Check if at least one component has been specified.
 -list(LENGTH PCRE2_FIND_COMPONENTS PCRE2_NCOMPONENTS)
-if (PCRE2_NCOMPONENTS LESS 1)
+-if(PCRE2_NCOMPONENTS LESS 1)
 -  message(FATAL_ERROR "No components have been specified. This is not allowed. Please, specify at least one component.")
-endif ()
+-endif()
 -unset(PCRE2_NCOMPONENTS)
 +# Chooses the linkage of the library to expose in the
 +# unsuffixed edition of the target.
@ -276,13 +278,14 @@ index 12f3a35..159669b 100644
 
 # When POSIX component has been specified make sure that also 8BIT component is specified.
 set(PCRE2_8BIT_COMPONENT FALSE)
-@@ -105,42 +83,5 @@ endif()
+@@ -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
+-find_package_handle_standard_args(
+-  PCRE2
 -  FOUND_VAR PCRE2_FOUND
 -  REQUIRED_VARS PCRE2_INCLUDE_DIR
 -  HANDLE_COMPONENTS
@ -291,33 +294,33 @@ index 12f3a35..159669b 100644
 -)
 -
 -set(PCRE2_LIBRARIES)
-if (PCRE2_FOUND)
+-if(PCRE2_FOUND)
 -  foreach(component ${PCRE2_FIND_COMPONENTS})
-    if (PCRE2_USE_STATIC_LIBS)
+-    if(PCRE2_USE_STATIC_LIBS)
 -      add_library(PCRE2::${component} STATIC IMPORTED)
 -      target_compile_definitions(PCRE2::${component} INTERFACE PCRE2_STATIC)
-    else ()
+-    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}"
+-    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"
+-    if(component STREQUAL "POSIX")
+-      set_target_properties(
+-        PCRE2::${component}
+-        PROPERTIES INTERFACE_LINK_LIBRARIES "PCRE2::8BIT" LINK_LIBRARIES "PCRE2::8BIT"
 -      )
-    endif ()
+-    endif()
 -
 -    set(PCRE2_LIBRARIES ${PCRE2_LIBRARIES} ${PCRE2_${component}_LIBRARY})
 -    mark_as_advanced(PCRE2_${component}_LIBRARY)
 -  endforeach()
-endif ()
+-endif()
 -
-mark_as_advanced(
-  PCRE2_INCLUDE_DIR
-)
+-mark_as_advanced(PCRE2_INCLUDE_DIR)
 +# Check for required components.
 +check_required_components("PCRE2")
--- a/ports/pcre2/no-static-suffix.patch
+++ b/ports/pcre2/no-static-suffix.patch
@ -1,33 +1,33 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 2815dbb..3c915d9 100644
+index 52cd05d..1888c14 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -713,8 +713,8 @@ IF(PCRE2_BUILD_PCRE2_8)
-     set(targets ${targets} pcre2-posix-static)
+@@ -812,8 +812,8 @@ if(PCRE2_BUILD_PCRE2_8)
+     set(TARGETS ${TARGETS} pcre2-posix-static)
 
-     IF(MSVC)
-      SET_TARGET_PROPERTIES(pcre2-8-static PROPERTIES OUTPUT_NAME pcre2-8-static)
-      SET_TARGET_PROPERTIES(pcre2-posix-static PROPERTIES OUTPUT_NAME pcre2-posix-static)
-+      SET_TARGET_PROPERTIES(pcre2-8-static PROPERTIES OUTPUT_NAME pcre2-8)
-+      SET_TARGET_PROPERTIES(pcre2-posix-static PROPERTIES OUTPUT_NAME pcre2-posix)
-     ELSE(MSVC)
-       SET_TARGET_PROPERTIES(pcre2-8-static PROPERTIES OUTPUT_NAME pcre2-8)
-       SET_TARGET_PROPERTIES(pcre2-posix-static PROPERTIES OUTPUT_NAME pcre2-posix)
-@@ -793,7 +793,7 @@ IF(PCRE2_BUILD_PCRE2_16)
-     set(targets ${targets} pcre2-16-static)
+     if(MSVC)
+-      set_target_properties(pcre2-8-static PROPERTIES OUTPUT_NAME pcre2-8-static)
+-      set_target_properties(pcre2-posix-static PROPERTIES OUTPUT_NAME pcre2-posix-static)
+      set_target_properties(pcre2-8-static PROPERTIES OUTPUT_NAME pcre2-8)
+      set_target_properties(pcre2-posix-static PROPERTIES OUTPUT_NAME pcre2-posix)
+     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)
 
-     IF(MSVC)
-      SET_TARGET_PROPERTIES(pcre2-16-static PROPERTIES OUTPUT_NAME pcre2-16-static)
-+      SET_TARGET_PROPERTIES(pcre2-16-static PROPERTIES OUTPUT_NAME pcre2-16)
-     ELSE(MSVC)
-       SET_TARGET_PROPERTIES(pcre2-16-static PROPERTIES OUTPUT_NAME pcre2-16)
-     ENDIF(MSVC)
-@@ -855,7 +855,7 @@ IF(PCRE2_BUILD_PCRE2_32)
-     set(targets ${targets} pcre2-32-static)
+     if(MSVC)
+-      set_target_properties(pcre2-16-static PROPERTIES OUTPUT_NAME pcre2-16-static)
+      set_target_properties(pcre2-16-static PROPERTIES OUTPUT_NAME pcre2-16)
+     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)
 
-     IF(MSVC)
-      SET_TARGET_PROPERTIES(pcre2-32-static PROPERTIES OUTPUT_NAME pcre2-32-static)
-+      SET_TARGET_PROPERTIES(pcre2-32-static PROPERTIES OUTPUT_NAME pcre2-32)
-     ELSE(MSVC)
-       SET_TARGET_PROPERTIES(pcre2-32-static PROPERTIES OUTPUT_NAME pcre2-32)
-     ENDIF(MSVC)
+     if(MSVC)
+-      set_target_properties(pcre2-32-static PROPERTIES OUTPUT_NAME pcre2-32-static)
+      set_target_properties(pcre2-32-static PROPERTIES OUTPUT_NAME pcre2-32)
+     else()
+       set_target_properties(pcre2-32-static PROPERTIES OUTPUT_NAME pcre2-32)
+     endif()
--- a/ports/pcre2/pcre2-10.35_fix-uwp.patch
+++ b/ports/pcre2/pcre2-10.35_fix-uwp.patch
@ -1,10 +1,12 @@
--- a/CMakeLists.txt	2020-05-09 16:43:10.000000000 +0200
-+++ b/CMakeLists.txt	2020-06-03 20:57:17.026182500 +0200
-@@ -619,6 +619,7 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 9e91617..52cd05d 100644
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -770,6 +770,7 @@ endif()
 
- IF(MSVC)
-   ADD_DEFINITIONS(-D_CRT_SECURE_NO_DEPRECATE -D_CRT_SECURE_NO_WARNINGS)
+ if(MSVC)
+   add_compile_definitions(_CRT_SECURE_NO_DEPRECATE _CRT_SECURE_NO_WARNINGS)
 +  add_compile_options(/wd4146)
- ENDIF(MSVC)
+ endif()
 
- SET(CMAKE_INCLUDE_CURRENT_DIR 1)
+ set(CMAKE_INCLUDE_CURRENT_DIR 1)
--- a/ports/pcre2/portfile.cmake
+++ b/ports/pcre2/portfile.cmake
@ -2,7 +2,7 @@ vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO PCRE2Project/pcre2
    REF "pcre2-${VERSION}"
-    SHA512 50f3b8b10faf432e0ffe87eca84fdebdb10869b092e4dc66c33bd6e2657638d4433698669af2c5ad9f691d27789663682a7235943761f716f5f2e0637deafc97
+    SHA512 2c4fd0bcd6c4f606627c17336d583e14d7bd3f5cd5ab0219ded46e7d784a792a8bbd33332fd06772f451041c046e15d1feaa6b48d8f9aa00dcddbc6cdb89be92
    HEAD_REF master
    PATCHES
        pcre2-10.35_fix-uwp.patch
@ -10,6 +10,18 @@ vcpkg_from_github(
        fix-cmake.patch
 )

+vcpkg_from_github(
+    OUT_SOURCE_PATH SLJIT_SOURCE_PATH
+    REPO zherczeg/sljit
+    REF 8481dde366d0346ac5475aa03ae48ee44fa74ca4
+    SHA512 99a6ab54ee6b9b3b2e241d2f29eb24217c8385bb3b756411116eaed0d91f008401822406710431ccf17ddf687828b8ab6933230e44144bea03f550c0f5ac9210
+    HEAD_REF main
+)
+
+file(REMOVE_RECURSE "${SOURCE_PATH}/deps/sljit")
+file(MAKE_DIRECTORY "${SOURCE_PATH}/deps")
+file(RENAME "${SLJIT_SOURCE_PATH}" "${SOURCE_PATH}/deps/sljit")
+
 string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC)
 string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" INSTALL_PDB)
 string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" BUILD_STATIC_CRT)
--- a/ports/pcre2/vcpkg.json
+++ b/ports/pcre2/vcpkg.json
@ -1,6 +1,6 @@
 {
  "name": "pcre2",
-  "version": "10.43",
+  "version": "10.45",
  "description": "Regular Expression pattern matching using the same syntax and semantics as Perl 5.",
  "homepage": "https://github.com/PCRE2Project/pcre2",
  "license": "BSD-3-Clause",
--- a/ports/poco/0001-static-pcre.patch
+++ b/ports/poco/0001-static-pcre.patch
@ -1,8 +1,8 @@
 diff --git a/Foundation/CMakeLists.txt b/Foundation/CMakeLists.txt
-index 5898d22..d8df9dc 100644
+index d5f3b26..cb29e69 100644
 --- a/Foundation/CMakeLists.txt
 +++ b/Foundation/CMakeLists.txt
-@@ -101,6 +101,23 @@ set_target_properties(Foundation
+@@ -101,6 +101,31 @@ set_target_properties(Foundation
 if(POCO_UNBUNDLED)
 	target_link_libraries(Foundation PUBLIC Pcre2::Pcre2 ZLIB::ZLIB Utf8Proc::Utf8Proc)
 	target_compile_definitions(Foundation PUBLIC POCO_UNBUNDLED)
@ -22,7 +22,15 @@ index 5898d22..d8df9dc 100644
 +		-D_pcre2_utt_8=_poco_pcre2_utt_8
 +		-D_pcre2_utt_names_8=_poco_pcre2_utt_names_8
 +		-D_pcre2_utt_size_8=_poco_pcre2_utt_size_8
-+	)
+		-D_pcre2_unicode_version_8=_poco_pcre2_unicode_version_8
+		-D_pcre2_ucd_caseless_sets_8=_poco_pcre2_ucd_caseless_sets_8
+		-D_pcre2_ucd_digit_sets_8=_poco_pcre2_ucd_digit_sets_8
+		-D_pcre2_ucd_script_sets_8=_poco_pcre2_ucd_script_sets_8
+		-D_pcre2_ucd_boolprop_sets_8=_poco_pcre2_ucd_boolprop_sets_8
+		-D_pcre2_ucd_records_8=_poco_pcre2_ucd_records_8
+		-D_pcre2_ucd_stage1_8=_poco_pcre2_ucd_stage1_8
+		-D_pcre2_ucd_stage2_8=_poco_pcre2_ucd_stage2_8
+)
 else()
 	target_compile_definitions(Foundation PUBLIC UTF8PROC_STATIC)
 endif(POCO_UNBUNDLED)
--- a/ports/poco/vcpkg.json
+++ b/ports/poco/vcpkg.json
@ -1,6 +1,7 @@
 {
  "name": "poco",
  "version": "1.14.1",
+  "port-version": 1,
  "description": "Modern, powerful open source C++ class libraries for building network and internet-based applications that run on desktop, server, mobile and embedded systems.",
  "homepage": "https://github.com/pocoproject/poco",
  "license": "BSL-1.0",
--- a/versions/baseline.json
+++ b/versions/baseline.json
@ -7033,7 +7033,7 @@
      "port-version": 7
    },
    "pcre2": {
-      "baseline": "10.43",
+      "baseline": "10.45",
      "port-version": 0
    },
    "pdal": {
@ -7218,7 +7218,7 @@
    },
    "poco": {
      "baseline": "1.14.1",
-      "port-version": 0
+      "port-version": 1
    },
    "podofo": {
      "baseline": "0.10.4",
--- a/versions/p-/pcre2.json
+++ b/versions/p-/pcre2.json
@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "c3bbfe8c53a8712c9a988361cfb476af65fc0bee",
+      "version": "10.45",
+      "port-version": 0
+    },
    {
      "git-tree": "eeb6bcd249a7a2fd9be3f305c694279227fdf6cc",
      "version": "10.43",
--- a/versions/p-/poco.json
+++ b/versions/p-/poco.json
@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "0fbc74c0a62a6b1b4240b30a3594245ee187fbe9",
+      "version": "1.14.1",
+      "port-version": 1
+    },
    {
      "git-tree": "2d144c2571f1942148b89df62d85b0f7475db671",
      "version": "1.14.1",