diff --git a/vcpkg b/vcpkg
index 229f836da66..ddf0c6df807 160000
--- a/vcpkg
+++ b/vcpkg
@@ -1 +1 @@
-Subproject commit 229f836da6616f2982ce1a7a5b18cf48f6c27e0c
+Subproject commit ddf0c6df807a454c74f33d7ba75037314bf9a79c
diff --git a/vcpkg_overlays/libmysql/cross-build.patch b/vcpkg_overlays/libmysql/cross-build.patch
deleted file mode 100644
index a91118b4f85..00000000000
--- a/vcpkg_overlays/libmysql/cross-build.patch
+++ /dev/null
@@ -1,162 +0,0 @@
-diff --git a/cmake/os/Darwin.cmake b/cmake/os/Darwin.cmake
-index 725b9bd..289bb3d 100644
---- a/cmake/os/Darwin.cmake
-+++ b/cmake/os/Darwin.cmake
-@@ -31,13 +31,9 @@ ENDIF()
- # We require at least XCode 10.0
- IF(NOT FORCE_UNSUPPORTED_COMPILER)
-   IF(MY_COMPILER_IS_CLANG)
--    CHECK_C_SOURCE_RUNS("
--      int main()
--      {
--        return (__clang_major__ < 10);
--      }" HAVE_SUPPORTED_CLANG_VERSION)
--    IF(NOT HAVE_SUPPORTED_CLANG_VERSION)
--      MESSAGE(FATAL_ERROR "XCode 10.0 or newer is required!")
-+    IF (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 10)
-+      MESSAGE(FATAL_ERROR
-+        "XCode 10.0 or newer is required! Compiler version was ${CMAKE_CXX_COMPILER_VERSION}")
-     ENDIF()
-   ELSE()
-     MESSAGE(FATAL_ERROR "Unsupported compiler!")
-diff --git a/libmysql/CMakeLists.txt b/libmysql/CMakeLists.txt
-index 8e22453..2b63413 100644
---- a/libmysql/CMakeLists.txt
-+++ b/libmysql/CMakeLists.txt
-@@ -259,6 +259,7 @@ ELSEIF(FREEBSD)
-   MESSAGE(STATUS "BSD built in DNS SRV APIs")
- ELSE()
-   FIND_LIBRARY(RESOLV_LIBRARY NAMES resolv)
-+  FIND_LIBRARY(RESOLV_LIBRARY NAMES resolv PATHS ${CMAKE_C_IMPLICIT_LINK_DIRECTORIES} NO_DEFAULT_PATH)
-   IF (RESOLV_LIBRARY)
-     LIST(APPEND LIBS_TO_LINK ${RESOLV_LIBRARY})
-     SET(HAVE_UNIX_DNS_SRV 1 PARENT_SCOPE)
-@@ -413,6 +414,7 @@ MYSQL_ADD_EXECUTABLE(libmysql_api_test
-   ${CMAKE_CURRENT_BINARY_DIR}/api_test.c
-   LINK_LIBRARIES libmysql ${LIBRT}
-   SKIP_INSTALL
-+  EXCLUDE_FROM_ALL
-   )
- # Clang/UBSAN needs this on some platforms.
- SET_TARGET_PROPERTIES(libmysql_api_test PROPERTIES LINKER_LANGUAGE CXX)
-@@ -439,6 +441,6 @@ ADD_CUSTOM_COMMAND(
-   COMMAND libmysql_api_test
-   > ${CMAKE_CURRENT_BINARY_DIR}/libmysql_api_test.out
-   )
--MY_ADD_CUSTOM_TARGET(run_libmysql_api_test ALL
-+MY_ADD_CUSTOM_TARGET(run_libmysql_api_test
-   DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/libmysql_api_test.out
-   )
-diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt
-index 8e93387..d971acb 100644
---- a/scripts/CMakeLists.txt
-+++ b/scripts/CMakeLists.txt
-@@ -69,7 +69,6 @@ ADD_CUSTOM_COMMAND(
- 
- # Add target for the above to be built
- MY_ADD_CUSTOM_TARGET(GenFixPrivs
--  ALL
-   DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/mysql_fix_privilege_tables_sql.h
- )
- 
-diff --git a/scripts/sys_schema/CMakeLists.txt b/scripts/sys_schema/CMakeLists.txt
-index aaba357..a0e5265 100644
---- a/scripts/sys_schema/CMakeLists.txt
-+++ b/scripts/sys_schema/CMakeLists.txt
-@@ -221,7 +221,6 @@ MY_ADD_CUSTOM_TARGET(sql_commands
-   DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/sql_commands.h)
- 
- MY_ADD_CUSTOM_TARGET(GenSysSchemaC
--  ALL
-   DEPENDS comp_sql sql_commands
-   COMMENT "Generating Sys Schema C code"
- )
-diff --git a/share/CMakeLists.txt b/share/CMakeLists.txt
-index 28cde40..be916cb 100644
---- a/share/CMakeLists.txt
-+++ b/share/CMakeLists.txt
-@@ -47,8 +47,12 @@ SET(dirs
-   ukrainian
-   )
- 
--FOREACH (dir ${dirs})
--  INSTALL(DIRECTORY ${CMAKE_BINARY_DIR}/${INSTALL_MYSQLSHAREDIR}/${dir}
-+  set(src_dir ${CMAKE_BINARY_DIR}/share/libmysql)
-+  if(CMAKE_CROSSCOMPILING)
-+    set(src_dir ${VCPKG_INSTALLED_DIR}/${VCPKG_HOST_TRIPLET}/share/libmysql)
-+  endif()
-+  FOREACH (dir ${dirs})
-+  INSTALL(DIRECTORY ${src_dir}/${dir}
-     DESTINATION ${INSTALL_MYSQLSHAREDIR}
-     COMPONENT Server
-     )
-diff --git a/strings/CMakeLists.txt b/strings/CMakeLists.txt
-index 665b35d..88f0743 100644
---- a/strings/CMakeLists.txt
-+++ b/strings/CMakeLists.txt
-@@ -69,6 +69,13 @@ SET(ZH_HANS_SRC_FILE ${CMAKE_SOURCE_DIR}/strings/lang_data/zh_hans.txt)
- SET(ZH_HANS_DST_FILE ${CMAKE_BINARY_DIR}/strings/uca900_zh_tbls.cc)
- SET(JA_HANS_SRC_FILE ${CMAKE_SOURCE_DIR}/strings/lang_data/ja_hans.txt)
- SET(JA_HANS_DST_FILE ${CMAKE_BINARY_DIR}/strings/uca900_ja_tbls.cc)
-+if(CMAKE_CROSSCOMPILING)
-+  file(COPY
-+    "${VCPKG_INSTALLED_DIR}/${VCPKG_HOST_TRIPLET}/share/libmysql/${PROJECT_VERSION}/uca900_zh_tbls.cc"
-+    "${VCPKG_INSTALLED_DIR}/${VCPKG_HOST_TRIPLET}/share/libmysql/${PROJECT_VERSION}/uca900_ja_tbls.cc"
-+    DESTINATION "${CMAKE_BINARY_DIR}/strings"
-+  )
-+else()
- ADD_CUSTOM_COMMAND(OUTPUT ${ZH_HANS_DST_FILE}
-                           ${JA_HANS_DST_FILE}
-                    COMMAND uca9dump zh
-@@ -79,6 +86,8 @@ ADD_CUSTOM_COMMAND(OUTPUT ${ZH_HANS_DST_FILE}
-                      --out_file=${JA_HANS_DST_FILE}
-                    DEPENDS uca9dump ${ZH_HANS_SRC_FILE} ${JA_HANS_SRC_FILE}
-                   )
-+install(FILES "${ZH_HANS_DST_FILE}" "${JA_HANS_DST_FILE}" DESTINATION "share/libmysql/${PROJECT_VERSION}")
-+endif()
- 
- SET_SOURCE_FILES_PROPERTIES(
-   ${JA_HANS_DST_FILE} ${ZH_HANS_DST_FILE}
-diff --git a/utilities/CMakeLists.txt b/utilities/CMakeLists.txt
-index da34524..dc397da 100644
---- a/utilities/CMakeLists.txt
-+++ b/utilities/CMakeLists.txt
-@@ -39,6 +39,21 @@ MYSQL_ADD_EXECUTABLE(comp_client_err
-   SKIP_INSTALL
-   )
- 
-+if(CMAKE_CROSSCOMPILING)
-+  file(COPY
-+    ${VCPKG_INSTALLED_DIR}/${VCPKG_HOST_TRIPLET}/include/mysql/mysqld_error.h
-+    ${VCPKG_INSTALLED_DIR}/${VCPKG_HOST_TRIPLET}/share/libmysql/${PROJECT_VERSION}/mysqlclient_ername.h
-+    ${VCPKG_INSTALLED_DIR}/${VCPKG_HOST_TRIPLET}/share/libmysql/${PROJECT_VERSION}/mysqld_ername.h
-+    ${VCPKG_INSTALLED_DIR}/${VCPKG_HOST_TRIPLET}/share/libmysql/${PROJECT_VERSION}/mysqld_errmsg.h
-+    DESTINATION ${PROJECT_BINARY_DIR}/include
-+  )
-+  file(COPY
-+    ${VCPKG_INSTALLED_DIR}/${VCPKG_HOST_TRIPLET}/share/libmysql/${PROJECT_VERSION}/errmsg.sys
-+    DESTINATION ${PROJECT_BINARY_DIR}/share/libmysql/english
-+  )
-+  add_custom_target(GenClientError)
-+  add_custom_target(GenError)
-+else()
- ADD_CUSTOM_COMMAND(OUTPUT ${PROJECT_BINARY_DIR}/include/mysqlclient_ername.h
-   COMMAND comp_client_err
-   --in_file=${PROJECT_SOURCE_DIR}/include/errmsg.h
-@@ -97,6 +112,16 @@ MYSQL_ADD_EXECUTABLE(range_check_err
-   SKIP_INSTALL
-   )
- 
-+  install(
-+    FILES
-+      ${PROJECT_BINARY_DIR}/include/mysqlclient_ername.h
-+      ${PROJECT_BINARY_DIR}/include/mysqld_ername.h
-+      ${PROJECT_BINARY_DIR}/include/mysqld_errmsg.h
-+      ${PROJECT_BINARY_DIR}/share/libmysql/english/errmsg.sys
-+    DESTINATION share/libmysql/${PROJECT_VERSION}
-+  )
-+endif()
-+
- # Set InnoDB mutex type
- ADD_DEFINITIONS(-DMUTEX_EVENT)
- 
diff --git a/vcpkg_overlays/libmysql/dependencies.patch b/vcpkg_overlays/libmysql/dependencies.patch
deleted file mode 100644
index 0129d71e974..00000000000
--- a/vcpkg_overlays/libmysql/dependencies.patch
+++ /dev/null
@@ -1,140 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index e17ec1d0..465e42f0 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -818,8 +818,12 @@ INCLUDE(fileutils)
- INCLUDE(zlib)
- INCLUDE(zstd)
- INCLUDE(lz4)
--INCLUDE(icu)
--INCLUDE(libevent)
-+macro(MYSQL_CHECK_ICU)
-+endmacro()
-+macro(MYSQL_CHECK_LIBEVENT)
-+endmacro()
-+macro(WARN_MISSING_SYSTEM_LIBEVENT)
-+endmacro()
- INCLUDE(ssl)
- INCLUDE(sasl)
- INCLUDE(ldap)
-@@ -837,7 +841,8 @@ INCLUDE(curl)
- INCLUDE(rapidjson)
- INCLUDE(fprofile)
- INCLUDE(gloves)
--INCLUDE(fido2)
-+macro(MYSQL_CHECK_FIDO)
-+endmacro()
- INCLUDE(win_jemalloc)
- 
- IF(UNIX)
-@@ -1942,7 +1947,7 @@ MYSQL_CHECK_RAPIDJSON()
- MYSQL_CHECK_FIDO()
- MYSQL_CHECK_FIDO_DLLS()
- 
--IF(APPLE)
-+IF(0)
-   GET_FILENAME_COMPONENT(HOMEBREW_BASE ${HOMEBREW_HOME} DIRECTORY)
-   IF(EXISTS ${HOMEBREW_BASE}/include/boost)
-     FOREACH(SYSTEM_LIB ICU LIBEVENT LZ4 PROTOBUF ZSTD FIDO)
-diff --git a/cmake/boost.cmake b/cmake/boost.cmake
-index c979055c..53e55fcf 100644
---- a/cmake/boost.cmake
-+++ b/cmake/boost.cmake
-@@ -301,7 +301,7 @@ IF(NOT BOOST_MAJOR_VERSION EQUAL 10)
-   COULD_NOT_FIND_BOOST()
- ENDIF()
- 
--IF(NOT BOOST_MINOR_VERSION EQUAL 77)
-+IF(NOT BOOST_MINOR_VERSION EQUAL 77 AND NOT IGNORE_BOOST_VERSION)
-   MESSAGE(WARNING "Boost minor version found is ${BOOST_MINOR_VERSION} "
-     "we need 77"
-     )
-diff --git a/cmake/libutils.cmake b/cmake/libutils.cmake
-index 7107f4bd..bb7f3733 100644
---- a/cmake/libutils.cmake
-+++ b/cmake/libutils.cmake
-@@ -534,7 +534,7 @@ MACRO(MERGE_CONVENIENCE_LIBRARIES TARGET_ARG)
- 
-   # On Windows, ssleay32.lib/libeay32.lib or libssl.lib/libcrypto.lib
-   # must be merged into mysqlclient.lib
--  IF(WIN32 AND ${TARGET} STREQUAL "mysqlclient")
-+  IF(0)
-     SET(LINKER_EXTRA_FLAGS "")
-     FOREACH(LIB ${SSL_LIBRARIES})
-       STRING_APPEND(LINKER_EXTRA_FLAGS " ${LIB}")
-diff --git a/cmake/lz4.cmake b/cmake/lz4.cmake
-index 10e7e8c8..48772329 100644
---- a/cmake/lz4.cmake
-+++ b/cmake/lz4.cmake
-@@ -46,7 +46,7 @@ FUNCTION(FIND_SYSTEM_LZ4)
-   FIND_PATH(LZ4_INCLUDE_DIR
-     NAMES lz4frame.h)
-   FIND_LIBRARY(LZ4_SYSTEM_LIBRARY
--    NAMES lz4)
-+    NAMES lz4d lz4 NAMES_PER_DIR)
-   IF (LZ4_INCLUDE_DIR AND LZ4_SYSTEM_LIBRARY)
-     SET(SYSTEM_LZ4_FOUND 1 CACHE INTERNAL "")
-     ADD_LIBRARY(lz4_interface INTERFACE)
-diff --git a/cmake/ssl.cmake b/cmake/ssl.cmake
-index 04e3af87..8ae52c82 100644
---- a/cmake/ssl.cmake
-+++ b/cmake/ssl.cmake
-@@ -273,7 +273,18 @@ MACRO (MYSQL_CHECK_SSL)
-     FIND_ALTERNATIVE_SYSTEM_SSL()
-   ENDIF()
- 
--  IF(WITH_SSL STREQUAL "system" OR WITH_SSL_PATH OR ALTERNATIVE_SYSTEM_SSL)
-+  IF(WITH_SSL STREQUAL "system")
-+    find_package(OpenSSL REQUIRED)
-+    set(OPENSSL_LIBRARY OpenSSL::SSL CACHE STRING "")
-+    set(CRYPTO_LIBRARY OpenSSL::Crypto CACHE STRING "")
-+    find_program(OPENSSL_EXECUTABLE openssl
-+          DOC "path to the openssl executable")
-+    set(SSL_DEFINES "-DHAVE_OPENSSL")
-+    add_library(ext::openssl ALIAS OpenSSL::SSL)
-+    set(SSL_LIBRARIES ext::openssl)
-+    set(OPENSSL_APPLINK_C "${OPENSSL_APPLINK_SOURCE}")
-+    include_directories(SYSTEM ${OPENSSL_INCLUDE_DIR})
-+  ELSEIF(WITH_SSL STREQUAL "system" OR WITH_SSL_PATH OR ALTERNATIVE_SYSTEM_SSL)
-     IF((APPLE OR WIN32) AND WITH_SSL STREQUAL "system")
-       # FindOpenSSL.cmake knows about
-       # http://www.slproweb.com/products/Win32OpenSSL.html
-diff --git a/cmake/zlib.cmake b/cmake/zlib.cmake
-index 3781fe09..ac312ad0 100644
---- a/cmake/zlib.cmake
-+++ b/cmake/zlib.cmake
-@@ -124,7 +124,7 @@ MACRO (MYSQL_CHECK_ZLIB)
-     MESSAGE(FATAL_ERROR "WITH_ZLIB must be bundled or system")
-   ENDIF()
- 
--  ADD_LIBRARY(ext::zlib ALIAS zlib_interface)
-+  ADD_LIBRARY(ext::zlib ALIAS ZLIB::ZLIB)
- 
-   IF(ZLIB_VERSION VERSION_LESS MIN_ZLIB_VERSION_REQUIRED)
-     MESSAGE(FATAL_ERROR
-diff --git a/cmake/zstd.cmake b/cmake/zstd.cmake
-index 425426d1..0ae1a907 100644
---- a/cmake/zstd.cmake
-+++ b/cmake/zstd.cmake
-@@ -90,15 +90,16 @@ MACRO (MYSQL_CHECK_ZSTD)
-   IF(WITH_ZSTD STREQUAL "bundled")
-     MYSQL_USE_BUNDLED_ZSTD()
-   ELSEIF(WITH_ZSTD STREQUAL "system")
--    FIND_SYSTEM_ZSTD()
--    IF (NOT SYSTEM_ZSTD_FOUND)
--      MESSAGE(FATAL_ERROR "Cannot find system zstd libraries.")
--    ENDIF()
-+    find_package(ZSTD NAMES zstd REQUIRED)
-   ELSE()
-     MESSAGE(FATAL_ERROR "WITH_ZSTD must be bundled or system")
-   ENDIF()
- 
--  ADD_LIBRARY(ext::zstd ALIAS zstd_interface)
-+  if(TARGET zstd::libzstd_shared)
-+    add_library(ext::zstd ALIAS zstd::libzstd_shared)
-+  else()
-+    add_library(ext::zstd ALIAS zstd::libzstd_static)
-+  endif()
- 
-   IF(ZSTD_VERSION VERSION_LESS MIN_ZSTD_VERSION_REQUIRED)
-     MESSAGE(FATAL_ERROR
diff --git a/vcpkg_overlays/libmysql/fix_dup_symbols.patch b/vcpkg_overlays/libmysql/fix_dup_symbols.patch
deleted file mode 100644
index 352fd8af89f..00000000000
--- a/vcpkg_overlays/libmysql/fix_dup_symbols.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt
-index 058967b..bcd8841 100644
---- a/client/CMakeLists.txt
-+++ b/client/CMakeLists.txt
-@@ -43,7 +43,6 @@ MYSQL_ADD_EXECUTABLE(mysql
-   pattern_matcher.cc
-   readline.cc
-   client_query_attributes.cc
--  multi_factor_passwordopt-vars.cc
-   ${CMAKE_CURRENT_SOURCE_DIR}/common/user_registration.cc
-   LINK_LIBRARIES mysqlclient client_base ${EDITLINE_LIBRARY}
-   )
-@@ -226,7 +226,6 @@ SET(MYSQLBINLOG_SOURCES
-   ${CMAKE_SOURCE_DIR}/sql/binlog_reader.cc
-   ${CMAKE_SOURCE_DIR}/sql/stream_cipher.cc
-   ${CMAKE_SOURCE_DIR}/sql/rpl_log_encryption.cc
--  ${CMAKE_SOURCE_DIR}/libbinlogevents/src/trx_boundary_parser.cpp
-   )
- 
- SET(MYSQLBINLOG_LIBRARIES
diff --git a/vcpkg_overlays/libmysql/install-exports.patch b/vcpkg_overlays/libmysql/install-exports.patch
deleted file mode 100644
index 3cf34ed3be5..00000000000
--- a/vcpkg_overlays/libmysql/install-exports.patch
+++ /dev/null
@@ -1,121 +0,0 @@
-diff --git a/cmake/install_macros.cmake b/cmake/install_macros.cmake
-index baf49cd5..c45fda71 100644
---- a/cmake/install_macros.cmake
-+++ b/cmake/install_macros.cmake
-@@ -113,8 +113,30 @@ FUNCTION(MYSQL_INSTALL_TARGET target_arg)
-   IF(ARG_NAMELINK_SKIP)
-     SET(LIBRARY_INSTALL_ARGS NAMELINK_SKIP)
-   ENDIF()
-+  if(target STREQUAL "libmysql" OR target STREQUAL "mysqlclient")
-+    target_include_directories(${target} INTERFACE $<INSTALL_INTERFACE:include>)
-+    if(target STREQUAL "mysqlclient")
-+      set_target_properties(${target} PROPERTIES EXPORT_NAME libmysql) # uniform
-+    endif()
-+    FILE(WRITE "${CMAKE_CURRENT_BINARY_DIR}/unofficial-libmysql-config.cmake"
-+"include(CMakeFindDependencyMacro)
-+find_dependency(OpenSSL)
-+find_dependency(Threads)
-+find_dependency(ZLIB)
-+find_dependency(zstd CONFIG)
-+include(\"\${CMAKE_CURRENT_LIST_DIR}/unofficial-libmysql-targets.cmake\")
-+if(NOT TARGET ${target}) # legacy vcpkg
-+  add_library(${target} INTERFACE IMPORTED)
-+  set_target_properties(${target} PROPERTIES INTERFACE_LINK_LIBRARIES unofficial::libmysql::libmysql)
-+endif()
-+")
-+    install(FILES "${CMAKE_CURRENT_BINARY_DIR}/unofficial-libmysql-config.cmake" DESTINATION "share/unofficial-libmysql")
-+    install(EXPORT "unofficial-libmysql-targets" NAMESPACE unofficial::libmysql:: DESTINATION "share/unofficial-libmysql")
-+    set(LIBRARY_EXPORT_ARGS EXPORT unofficial-libmysql-targets)
-+  endif()
-   INSTALL(TARGETS ${target}
--    RUNTIME DESTINATION ${ARG_DESTINATION} ${COMP}
-+    ${LIBRARY_EXPORT_ARGS}
-+    RUNTIME DESTINATION bin ${COMP}
-     ARCHIVE DESTINATION ${ARG_DESTINATION} ${COMP}
-     LIBRARY DESTINATION ${ARG_DESTINATION} ${COMP} ${LIBRARY_INSTALL_ARGS})
-   SET(INSTALL_LOCATION ${ARG_DESTINATION} )
-diff --git a/cmake/libutils.cmake b/cmake/libutils.cmake
-index a5333987..c954bfb1 100644
---- a/cmake/libutils.cmake
-+++ b/cmake/libutils.cmake
-@@ -385,8 +385,12 @@ MACRO(MERGE_LIBRARIES_SHARED TARGET_ARG)
-     IF(ARG_NAMELINK_SKIP)
-       SET(INSTALL_ARGS NAMELINK_SKIP)
-     ENDIF()
-+    if(INSTALL_STATIC_LIBRARIES)
-+      set_target_properties(${TARGET} PROPERTIES EXCLUDE_FROM_ALL 1)
-+    else()
-     MYSQL_INSTALL_TARGET(${TARGET} DESTINATION "${DESTINATION}" ${COMP}
-       ${INSTALL_ARGS})
-+    endif()
-   ENDIF()
- 
-   IF(WIN32)
-@@ -563,6 +567,8 @@ MACRO(MERGE_CONVENIENCE_LIBRARIES TARGET_ARG)
-     ENDIF()
-     IF(INSTALL_STATIC_LIBRARIES)
-       MYSQL_INSTALL_TARGET(${TARGET} DESTINATION "${INSTALL_LIBDIR}" ${COMP})
-+    else()
-+      set_target_properties(${TARGET} PROPERTIES EXCLUDE_FROM_ALL 1)
-     ENDIF()
-   ENDIF()
- ENDMACRO(MERGE_CONVENIENCE_LIBRARIES)
-diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt
-index c4ef5694..8e933877 100644
---- a/scripts/CMakeLists.txt
-+++ b/scripts/CMakeLists.txt
-@@ -315,10 +315,14 @@ MACRO(EXTRACT_LINK_LIBRARIES target var)
-     FOREACH(lib ${TARGET_LIB_DEPENDS})
-       IF (lib MATCHES "^\\-l")
-         SET(${var} "${${var}} ${lib} ")
-+      elseif(lib MATCHES "^ext::(openssl|zlib|zstd)" AND NOT WIN32)
-+        list(APPEND ext_targets "${CMAKE_MATCH_1}")
-       ELSEIF (lib MATCHES "^ext::")
-         STRING(REGEX MATCH "ext::([a-z]+)" MATCH_LIB "${lib}")
-         SET(SYSTEM_LIB ${CMAKE_MATCH_1})
-         SET(${var} "${${var}} -l${SYSTEM_LIB} ")
-+      elseif(TARGET "${lib}" AND NOT WIN32)
-+        # merged or shared, not external
-       ELSEIF (lib MATCHES "^\\-L")
-         # Search directory. Test on FreeBSD: -L/usr/local/lib -lunwind
-         SET(${var} "${${var}} ${lib} ")
-@@ -354,6 +358,7 @@ IF(MSVC)
-   GET_TARGET_PROPERTY(LIBMYSQL_OS_SHLIB_VERSION mysqlclient VERSION)
-   GET_TARGET_PROPERTY(LIBMYSQL_OS_OUTPUT_NAME mysqlclient OUTPUT_NAME)
- ELSE()
-+  EXTRACT_LINK_LIBRARIES(libmysql CLIENT_LIBS)
-   GET_TARGET_PROPERTY(LIBMYSQL_OS_SHLIB_VERSION libmysql VERSION)
-   GET_TARGET_PROPERTY(LIBMYSQL_OS_OUTPUT_NAME libmysql OUTPUT_NAME)
- ENDIF()
-@@ -373,6 +378,10 @@ IF (WITH_SSL STREQUAL "system")
-       "${CONFIG_LIBS_PRIVATE}")
-   ENDIF()
- ENDIF()
-+list(APPEND CONFIG_REQUIRES_PRIVATE ${ext_targets})
-+list(REMOVE_DUPLICATES CONFIG_REQUIRES_PRIVATE)
-+list(JOIN CONFIG_REQUIRES_PRIVATE " " CONFIG_REQUIRES_PRIVATE)
-+string(REPLACE "zstd" "libzstd" CONFIG_REQUIRES_PRIVATE "${CONFIG_REQUIRES_PRIVATE}" )
- 
- MESSAGE(STATUS "CONFIG_CLIENT_LIBS ${CONFIG_CLIENT_LIBS}")
- MESSAGE(STATUS "CONFIG_LIBS_PRIVATE ${CONFIG_LIBS_PRIVATE}")
-diff --git a/scripts/mysql_config.sh b/scripts/mysql_config.sh
-index 6e8520be..bf1a45af 100644
---- a/scripts/mysql_config.sh
-+++ b/scripts/mysql_config.sh
-@@ -119,6 +119,16 @@ fi
- # Create options 
- libs="-L$pkglibdir@RPATH_OPTION@"
- libs="$libs -l@LIBMYSQL_OS_OUTPUT_NAME@ @CONFIG_CLIENT_LIBS@"
-+if test -z "${PKG_CONFIG}" ; then
-+  if pkg-config --version >/dev/null 2>&1 ; then
-+    PKG_CONFIG=pkg-config
-+  elif pkgconf --version >/dev/null 2>&1 ; then
-+    PKG_CONFIG=pkgconf
-+  else
-+    PKG_CONFIG=false
-+  fi
-+fi
-+libs="$libs $(${PKG_CONFIG} --libs @CONFIG_REQUIRES_PRIVATE@)"
- 
- cflags="-I$pkgincludedir @CFLAGS@"
- cxxflags="-I$pkgincludedir @CXXFLAGS@"
diff --git a/vcpkg_overlays/libmysql/libmysql-config.cmake b/vcpkg_overlays/libmysql/libmysql-config.cmake
deleted file mode 100644
index ea2bbbe0ab0..00000000000
--- a/vcpkg_overlays/libmysql/libmysql-config.cmake
+++ /dev/null
@@ -1,6 +0,0 @@
-file(READ "${CMAKE_CURRENT_LIST_DIR}/usage" usage)
-message(WARNING "find_package(libmysql) is deprecated.\n${usage}")
-include(CMakeFindDependencyMacro)
-find_dependency(unofficial-libmysql CONFIG REQUIRED)
-set(libmysql_FOUND 1)
-set(MYSQL_LIBRARIES unofficial::libmysql::libmysql)
diff --git a/vcpkg_overlays/libmysql/portfile.cmake b/vcpkg_overlays/libmysql/portfile.cmake
deleted file mode 100644
index 34565231170..00000000000
--- a/vcpkg_overlays/libmysql/portfile.cmake
+++ /dev/null
@@ -1,160 +0,0 @@
-if (EXISTS "${CURRENT_INSTALLED_DIR}/include/mysql/mysql.h")
-    message(FATAL_ERROR "FATAL ERROR: ${PORT} and libmariadb are incompatible.")
-endif()
-
-vcpkg_from_github(
-    OUT_SOURCE_PATH SOURCE_PATH
-    REPO mysql/mysql-server
-    REF mysql-${VERSION}
-    SHA512 5df45c1ce1e2c620856b9274666cf56738d6a0308c33c9c96583b494c987fb0e862e676301109b9e4732070d54e6086596a62ad342f35adc59ca9f749e37b561
-    HEAD_REF master
-    PATCHES
-        dependencies.patch
-        install-exports.patch
-        fix_dup_symbols.patch
-        cross-build.patch
-)
-
-vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
-    INVERTED_FEATURES
-        host-tools FORCE_CMAKE_CROSSCOMPILING
-)
-
-file(GLOB third_party "${SOURCE_PATH}/extra/*" "${SOURCE_PATH}/include/boost_1_70_0")
-list(REMOVE_ITEM third_party "${SOURCE_PATH}/extra/libedit")
-if (third_party)
-    file(REMOVE_RECURSE ${third_party})
-endif()
-
-#Skip the version check for Visual Studio
-set(FORCE_UNSUPPORTED_COMPILER "")
-if(VCPKG_TARGET_IS_WINDOWS)
-    set(FORCE_UNSUPPORTED_COMPILER 1)
-endif()
-
-string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static"  BUILD_STATIC_LIBS)
-string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static"  STATIC_CRT_LINKAGE)
-
-set(cross_options "")
-if(VCPKG_CROSSCOMPILING)
-    list(APPEND cross_options
-        -DCMAKE_CROSSCOMPILING=1
-        -DVCPKG_HOST_TRIPLET=${HOST_TRIPLET}
-        # required, skip try_run
-        -DHAVE_RAPIDJSON_WITH_STD_REGEX=1
-    )
-    if(NOT VCPKG_TARGET_IS_WINDOWS)
-        list(APPEND cross_options
-            # optimistic, skip try_run
-            -DHAVE_CLOCK_GETTIME=1
-            -DHAVE_CLOCK_REALTIME=1
-            # pessimistic, skip try_run
-            -DHAVE_C_FLOATING_POINT_FUSED_MADD=1
-            -DHAVE_CXX_FLOATING_POINT_FUSED_MADD=1
-            -DHAVE_SETNS=0
-        )
-    endif()
-endif()
-if ("-DFORCE_CMAKE_CROSSCOMPILING=ON" IN_LIST FEATURE_OPTIONS)
-    list(APPEND cross_options
-        -DCMAKE_CROSSCOMPILING=OFF
-    )
-endif()
-
-vcpkg_cmake_configure(
-    SOURCE_PATH "${SOURCE_PATH}"
-    OPTIONS
-        ${cross_options}
-        -DINSTALL_INCLUDEDIR=include/mysql
-        -DINSTALL_DOCDIR=share/${PORT}/doc
-        -DINSTALL_MANDIR=share/${PORT}/doc
-        -DINSTALL_INFODIR=share/${PORT}/doc
-        -DINSTALL_DOCREADMEDIR=share/${PORT}
-        -DINSTALL_SHAREDIR=share
-        -DINSTALL_MYSQLSHAREDIR=share/${PORT}
-        -DWITHOUT_SERVER=ON
-        -DWITH_BUILD_ID=OFF
-        -DWITH_UNIT_TESTS=OFF
-        -DENABLED_PROFILING=OFF
-        -DWIX_DIR=OFF
-        -DIGNORE_BOOST_VERSION=ON
-        -DWITH_TEST_TRACE_PLUGIN=OFF
-        -DMYSQL_MAINTAINER_MODE=OFF
-        -DBUNDLE_RUNTIME_LIBRARIES=OFF
-        -DDOWNLOAD_BOOST=OFF
-        -DWITH_CURL=none
-        -DWITH_EDITLINE=bundled # not in vcpkg
-        -DWITH_LZ4=system
-        -DWITH_RAPIDJSON=system
-        -DWITH_SSL=system
-        -DWITH_SYSTEMD=OFF
-        -DWITH_ZLIB=system
-        -DWITH_ZSTD=system
-        -DFORCE_UNSUPPORTED_COMPILER=${FORCE_UNSUPPORTED_COMPILER}
-        -DINSTALL_STATIC_LIBRARIES=${BUILD_STATIC_LIBS}
-        -DLINK_STATIC_RUNTIME_LIBRARIES=${STATIC_CRT_LINKAGE}
-    MAYBE_UNUSED_VARIABLES
-        BUNDLE_RUNTIME_LIBRARIES # only on windows
-        LINK_STATIC_RUNTIME_LIBRARIES # only on windows
-        WIX_DIR # only on windows
-        WITH_BUILD_ID # only on windows
-)
-
-vcpkg_cmake_install(ADD_BIN_TO_PATH)
-vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-libmysql)
-vcpkg_fixup_pkgconfig()
-
-set(MYSQL_TOOLS
-    my_print_defaults
-    mysql
-    mysql_config_editor
-    mysql_migrate_keyring
-    mysql_secure_installation
-    mysql_ssl_rsa_setup
-    mysqladmin
-    mysqlbinlog
-    mysqlcheck
-    mysqldump
-    mysqlimport
-    mysqlpump
-    mysqlshow
-    mysqlslap
-    mysqltest
-    perror
-    zlib_decompress
-)
-if (NOT VCPKG_CROSSCOMPILING)
-    list(APPEND MYSQL_TOOLS
-        comp_err
-    )
-endif()
-if (VCPKG_TARGET_IS_WINDOWS)
-    list(APPEND MYSQL_TOOLS
-        echo
-    )
-else()
-    list(APPEND MYSQL_TOOLS
-        mysql_config
-    )
-endif()
-
-vcpkg_copy_tools(TOOL_NAMES ${MYSQL_TOOLS} AUTO_CLEAN)
-
-file(REMOVE_RECURSE
-    "${CURRENT_PACKAGES_DIR}/debug/include"
-    "${CURRENT_PACKAGES_DIR}/debug/share"
-    "${CURRENT_PACKAGES_DIR}/lib/debug"
-)
-
-if (NOT VCPKG_TARGET_IS_WINDOWS)
-    set(MYSQL_CONFIG_FILE "${CURRENT_PACKAGES_DIR}/tools/libmysql/mysql_config")
-    vcpkg_replace_string("${MYSQL_CONFIG_FILE}" "/bin/mysql_.*config" "/tools/libmysql/mysql_.*config")
-    vcpkg_replace_string("${MYSQL_CONFIG_FILE}" "'${CURRENT_PACKAGES_DIR}" "\"\$basedir\"\'")
-endif()
-
-file(INSTALL "${CURRENT_PORT_DIR}/libmysql-config.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
-file(INSTALL "${CURRENT_PORT_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
-
-set(libedit_copying "${SOURCE_PATH}/COPYING for libedit")
-file(COPY_FILE "${SOURCE_PATH}/extra/libedit/libedit-20210910-3.1/COPYING" "${libedit_copying}")
-vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE" "${libedit_copying}")
diff --git a/vcpkg_overlays/libmysql/usage b/vcpkg_overlays/libmysql/usage
deleted file mode 100644
index 7ea8c37e177..00000000000
--- a/vcpkg_overlays/libmysql/usage
+++ /dev/null
@@ -1,4 +0,0 @@
-libmysql provides CMake targets:
-
-    find_package(unofficial-libmysql REQUIRED)
-    target_link_libraries(main PRIVATE unofficial::libmysql::libmysql)
diff --git a/vcpkg_overlays/libmysql/vcpkg.json b/vcpkg_overlays/libmysql/vcpkg.json
deleted file mode 100644
index b143f59ef7f..00000000000
--- a/vcpkg_overlays/libmysql/vcpkg.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  "name": "libmysql",
-  "version": "8.0.34",
-  "port-version": 1,
-  "description": "A MySQL client library for C development",
-  "homepage": "https://github.com/mysql/mysql-server",
-  "license": "GPL-2.0-or-later",
-  "supports": "!android & !mingw & !uwp & !xbox",
-  "dependencies": [
-    "boost-algorithm",
-    "boost-functional",
-    "boost-geometry",
-    "boost-graph",
-    "boost-optional",
-    "lz4",
-    {
-      "name": "ncurses",
-      "platform": "!windows | mingw"
-    },
-    "openssl",
-    "rapidjson",
-    {
-      "name": "vcpkg-cmake",
-      "host": true
-    },
-    {
-      "name": "vcpkg-cmake-config",
-      "host": true
-    },
-    "zlib",
-    "zstd"
-  ],
-  "default-features": [
-    "host-tools"
-  ],
-  "features": {
-    "host-tools": {
-      "description": "Build CLI tools",
-      "dependencies": [
-        {
-          "name": "libmysql",
-          "host": true
-        }
-      ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/vcpkg_overlays/libxml2/disable-docs.patch b/vcpkg_overlays/libxml2/disable-docs.patch
deleted file mode 100644
index 848961429d6..00000000000
--- a/vcpkg_overlays/libxml2/disable-docs.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index f922d5ab..70466bc7 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -599,15 +599,5 @@ if(LIBXML2_WITH_PYTHON)
- endif()
- 
--install(FILES doc/xml2-config.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1 COMPONENT documentation)
--install(FILES doc/xmlcatalog.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1 COMPONENT documentation)
--install(FILES doc/xmllint.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1 COMPONENT documentation)
--install(DIRECTORY doc/ DESTINATION ${CMAKE_INSTALL_DOCDIR} COMPONENT documentation
--	PATTERN "Makefile.*" EXCLUDE
--	PATTERN "*.1" EXCLUDE
--	PATTERN "*.py" EXCLUDE
--	PATTERN "*.res" EXCLUDE
--	PATTERN "*.xml" EXCLUDE
--	PATTERN "*.xsl" EXCLUDE)
- 
- configure_package_config_file(
- 	libxml2-config.cmake.cmake.in libxml2-config.cmake
diff --git a/vcpkg_overlays/libxml2/fix_cmakelist.patch b/vcpkg_overlays/libxml2/fix_cmakelist.patch
deleted file mode 100644
index f8c60d0f156..00000000000
--- a/vcpkg_overlays/libxml2/fix_cmakelist.patch
+++ /dev/null
@@ -1,108 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index f922d5ab..685964b3 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -420,15 +420,15 @@ endif()
- if(LIBXML2_WITH_ICU)
- 	target_link_libraries(LibXml2 PRIVATE ICU::data ICU::i18n ICU::uc)
- 	if(WIN32)
--		set(ICU_LIBS "-licudt -licuin -licuuc")
-+		set(ICU_LIBS "icu-i18n")
- 	else()
--		set(ICU_LIBS "-licudata -licui18n -licuuc")
-+		set(ICU_LIBS "icu-i18n")
- 	endif()
- endif()
- 
- if(LIBXML2_WITH_LZMA)
- 	target_link_libraries(LibXml2 PRIVATE LibLZMA::LibLZMA)
--	set(LZMA_LIBS "-llzma")
-+	set(LZMA_LIBS "liblzma")
- endif()
- 
- if(LIBXML2_WITH_THREADS)
-@@ -438,7 +438,7 @@ endif()
- 
- if(LIBXML2_WITH_ZLIB)
- 	target_link_libraries(LibXml2 PRIVATE ZLIB::ZLIB)
--	set(Z_LIBS "-lz")
-+	set(Z_LIBS "zlib")
- endif()
- 
- set_target_properties(
-@@ -490,23 +490,9 @@ set_target_properties(
-         SOVERSION ${LIBXML_MAJOR_VERSION}
- )
- 
-+set(XML_LIB_NAME xml2)
- if(MSVC)
--	if(BUILD_SHARED_LIBS)
--		set_target_properties(
--			LibXml2
--			PROPERTIES
--			DEBUG_POSTFIX d
--		)
--	else()
--		set_target_properties(
--			LibXml2
--			PROPERTIES
--			DEBUG_POSTFIX sd
--			MINSIZEREL_POSTFIX s
--			RELEASE_POSTFIX s
--			RELWITHDEBINFO_POSTFIX s
--		)
--	endif()
-+	set(XML_LIB_NAME libxml2)
- endif()
- 
- install(FILES ${LIBXML2_HDRS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/libxml2/libxml COMPONENT development)
-@@ -654,30 +640,30 @@ install(DIRECTORY doc/ DESTINATION ${CMAKE_INSTALL_DATADIR}/doc/libxml2 COMPONEN
- 
- configure_package_config_file(
- 	libxml2-config.cmake.cmake.in libxml2-config.cmake
--	INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/libxml2-${PROJECT_VERSION}
-+	INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/libxml2
- )
- 
- install(
- 	FILES ${CMAKE_CURRENT_BINARY_DIR}/libxml2-config.cmake
--	DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/libxml2-${PROJECT_VERSION}
-+	DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/libxml2
- 	COMPONENT development
- )
- 
- write_basic_package_version_file(
- 	${CMAKE_CURRENT_BINARY_DIR}/libxml2-config-version.cmake
- 	VERSION ${PROJECT_VERSION}
--	COMPATIBILITY ExactVersion
-+	COMPATIBILITY SameMinorVersion
- )
- 
- install(
- 	FILES ${CMAKE_CURRENT_BINARY_DIR}/libxml2-config-version.cmake
--	DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/libxml2-${PROJECT_VERSION}
-+	DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/libxml2
- 	COMPONENT development
- )
- 
- install(
- 	EXPORT LibXml2
--	DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/libxml2-${PROJECT_VERSION}
-+	DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/libxml2
- 	NAMESPACE LibXml2::
- 	FILE libxml2-export.cmake
- 	COMPONENT development
-diff --git a/libxml-2.0.pc.in b/libxml-2.0.pc.in
-index 2653a7c5..2eb2f362 100644
---- a/libxml-2.0.pc.in
-+++ b/libxml-2.0.pc.in
-@@ -8,6 +8,7 @@ Name: libXML
- Version: @VERSION@
- Description: libXML library version2.
- Requires:
--Libs: -L${libdir} @XML_LIBS@
--Libs.private: @XML_PRIVATE_LIBS@ @LIBS@
-+Requires.private: @ICU_LIBS@ @Z_LIBS@ @LZMA_LIBS@
-+Libs: -L${libdir} -l@XML_LIB_NAME@
-+Libs.private: @THREAD_LIBS@ @ICONV_LIBS@ @LIBM@ @WIN32_EXTRA_LIBADD@ @LIBS@
- Cflags: @XML_INCLUDEDIR@ @XML_CFLAGS@
diff --git a/vcpkg_overlays/libxml2/portfile.cmake b/vcpkg_overlays/libxml2/portfile.cmake
deleted file mode 100644
index 483416031d5..00000000000
--- a/vcpkg_overlays/libxml2/portfile.cmake
+++ /dev/null
@@ -1,90 +0,0 @@
-vcpkg_from_gitlab(
-    GITLAB_URL https://gitlab.gnome.org/
-    OUT_SOURCE_PATH SOURCE_PATH
-    REPO GNOME/libxml2
-    REF f507d167f1755b7eaea09fb1a44d29aab828b6d1
-    SHA512 2ac3dcab31111f608a3fe33dde492c9653ad2bd49a792373acdd03d2787e1a4ef70eeb7a3d47cf67eefd43aee2ab75ec50b36cdcd124445ca206de924abb6021
-    HEAD_REF master
-    PATCHES
-        disable-docs.patch
-        fix_cmakelist.patch
-)
-
-vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
-    FEATURES
-        "ftp" LIBXML2_WITH_FTP
-        "http" LIBXML2_WITH_HTTP
-        "iconv" LIBXML2_WITH_ICONV
-        "legacy" LIBXML2_WITH_LEGACY
-        "lzma" LIBXML2_WITH_LZMA
-        "zlib" LIBXML2_WITH_ZLIB
-        "tools" LIBXML2_WITH_PROGRAMS
-)
-vcpkg_cmake_configure(
-    SOURCE_PATH "${SOURCE_PATH}"
-    OPTIONS
-        ${FEATURE_OPTIONS}
-        -DLIBXML2_WITH_TESTS=OFF
-        -DLIBXML2_WITH_HTML=ON
-        -DLIBXML2_WITH_C14N=ON
-        -DLIBXML2_WITH_CATALOG=ON
-        -DLIBXML2_WITH_DEBUG=ON
-        -DLIBXML2_WITH_ISO8859X=ON
-        -DLIBXML2_WITH_ICU=OFF # Culprit of linkage issues? Solving this is probably another PR
-        -DLIBXML2_WITH_MEM_DEBUG=OFF
-        -DLIBXML2_WITH_MODULES=ON
-        -DLIBXML2_WITH_OUTPUT=ON
-        -DLIBXML2_WITH_PATTERN=ON
-        -DLIBXML2_WITH_PUSH=ON
-        -DLIBXML2_WITH_PYTHON=OFF
-        -DLIBXML2_WITH_READER=ON
-        -DLIBXML2_WITH_REGEXPS=ON
-        -DLIBXML2_WITH_RUN_DEBUG=OFF
-        -DLIBXML2_WITH_SAX1=ON
-        -DLIBXML2_WITH_SCHEMAS=ON
-        -DLIBXML2_WITH_SCHEMATRON=ON
-        -DLIBXML2_WITH_THREADS=ON
-        -DLIBXML2_WITH_THREAD_ALLOC=OFF
-        -DLIBXML2_WITH_TREE=ON
-        -DLIBXML2_WITH_VALID=ON
-        -DLIBXML2_WITH_WRITER=ON
-        -DLIBXML2_WITH_XINCLUDE=ON
-        -DLIBXML2_WITH_XPATH=ON
-        -DLIBXML2_WITH_XPTR=ON
-)
-
-vcpkg_cmake_install()
-
-vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/libxml2")
-vcpkg_fixup_pkgconfig()
-
-vcpkg_copy_pdbs()
-
-if("tools" IN_LIST FEATURES)
-    vcpkg_copy_tools(TOOL_NAMES xmllint xmlcatalog AUTO_CLEAN)
-endif()
-
-if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
-    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
-endif()
-
-if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
-    set(_file "${CURRENT_PACKAGES_DIR}/include/libxml2/libxml/xmlexports.h")
-    file(READ "${_file}" _contents)
-    string(REPLACE "#ifdef LIBXML_STATIC" "#undef LIBXML_STATIC\n#define LIBXML_STATIC\n#ifdef LIBXML_STATIC" _contents "${_contents}")
-    file(WRITE "${_file}" "${_contents}")
-endif()
-
-file(COPY "${CURRENT_PACKAGES_DIR}/include/libxml2/" DESTINATION "${CURRENT_PACKAGES_DIR}/include") # TODO: Fix usage in all dependent ports hardcoding the wrong include path.
-
-# Cleanup
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/xml2Conf.sh" "${CURRENT_PACKAGES_DIR}/debug/lib/xml2Conf.sh")
-
-file(COPY
-    "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake"
-    "${CMAKE_CURRENT_LIST_DIR}/usage"
-    DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}"
-)
-file(INSTALL "${SOURCE_PATH}/Copyright" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/vcpkg_overlays/libxml2/usage b/vcpkg_overlays/libxml2/usage
deleted file mode 100644
index 4eb53991550..00000000000
--- a/vcpkg_overlays/libxml2/usage
+++ /dev/null
@@ -1,4 +0,0 @@
-The package libxml2 is compatible with built-in CMake targets:
-
-    find_package(LibXml2 REQUIRED)
-    target_link_libraries(main PRIVATE LibXml2::LibXml2)
diff --git a/vcpkg_overlays/libxml2/vcpkg-cmake-wrapper.cmake b/vcpkg_overlays/libxml2/vcpkg-cmake-wrapper.cmake
deleted file mode 100644
index 596a9af5fed..00000000000
--- a/vcpkg_overlays/libxml2/vcpkg-cmake-wrapper.cmake
+++ /dev/null
@@ -1,3 +0,0 @@
-list(REMOVE_ITEM ARGS "NO_MODULE" "CONFIG" "MODULE")
-_find_package(${ARGS} CONFIG)
-set(LIBXML2_FOUND "${LibXml2_FOUND}") # fphsa compatibility
diff --git a/vcpkg_overlays/libxml2/vcpkg.json b/vcpkg_overlays/libxml2/vcpkg.json
deleted file mode 100644
index 47f4866b135..00000000000
--- a/vcpkg_overlays/libxml2/vcpkg.json
+++ /dev/null
@@ -1,57 +0,0 @@
-{
-  "name": "libxml2",
-  "version": "2.10.3",
-  "port-version": 1,
-  "description": "Libxml2 is the XML C parser and toolkit developed for the Gnome project (but usable outside of the Gnome platform).",
-  "homepage": "https://gitlab.gnome.org/GNOME/libxml2/-/wikis/home",
-  "license": "MIT",
-  "dependencies": [
-    {
-      "name": "vcpkg-cmake",
-      "host": true
-    },
-    {
-      "name": "vcpkg-cmake-config",
-      "host": true
-    }
-  ],
-  "default-features": [
-    "iconv",
-    "lzma",
-    "zlib"
-  ],
-  "features": {
-    "ftp": {
-      "description": "Add the FTP support",
-      "supports": "!uwp"
-    },
-    "http": {
-      "description": "Add the HTTP support",
-      "supports": "!uwp"
-    },
-    "iconv": {
-      "description": "Add ICONV support",
-      "dependencies": [
-        "libiconv"
-      ]
-    },
-    "legacy": {
-      "description": "Add deprecated APIs for compatibility"
-    },
-    "lzma": {
-      "description": "Use LZMA",
-      "dependencies": [
-        "liblzma"
-      ]
-    },
-    "tools": {
-      "description": "Build tools"
-    },
-    "zlib": {
-      "description": "Use ZLib",
-      "dependencies": [
-        "zlib"
-      ]
-    }
-  }
-}
diff --git a/vcpkg_overlays/libxslt/fix-gcrypt-deps.patch b/vcpkg_overlays/libxslt/fix-gcrypt-deps.patch
deleted file mode 100644
index 6d91a7248d4..00000000000
--- a/vcpkg_overlays/libxslt/fix-gcrypt-deps.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 6dc6501..d36a049 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -317,7 +317,9 @@ target_include_directories(
- 
- if(LIBXSLT_WITH_CRYPTO AND NOT WIN32)
- 	target_link_libraries(LibExslt PRIVATE Gcrypt::Gcrypt)
--	set(LIBGCRYPT_LIBS "-lgcrypt")
-+	# For libexslt.pc
-+	set(LIBGCRYPT_LIBS "")
-+	string(APPEND EXSLT_PRIVATE_REQUIRES " libgcrypt")
- endif()
- 
- target_link_libraries(LibExslt PUBLIC LibXslt LibXml2::LibXml2)
-diff --git a/FindGcrypt.cmake b/FindGcrypt.cmake
-index 781113d..a78fa84 100644
---- a/FindGcrypt.cmake
-+++ b/FindGcrypt.cmake
-@@ -1,3 +1,20 @@
-+cmake_policy(PUSH)
-+cmake_policy(SET CMP0012 NEW)
-+cmake_policy(SET CMP0057 NEW)
-+find_package(PkgConfig)
-+if("REQUIRED" IN_LIST ${CMAKE_FIND_PACKAGE_NAME}_FIND_REQUIRED)
-+	pkg_check_modules(libxslt_gcrypt REQUIRED IMPORTED_TARGET libgcrypt)
-+else()
-+	pkg_check_modules(libxslt_gcrypt IMPORTED_TARGET libgcrypt)
-+endif()
-+set(Gcrypt_FOUND "${libxslt_gcrypt_FOUND}") # CMake standard, needed for find_dependency
-+set(GCRYPT_FOUND "${libxslt_gcrypt_FOUND}") # libxslt usage
-+if(libxslt_gcrypt_FOUND AND NOT TARGET Gcrypt::Gcrypt)
-+	add_library(Gcrypt::Gcrypt INTERFACE IMPORTED)
-+	set_target_properties(Gcrypt::Gcrypt PROPERTIES INTERFACE_LINK_LIBRARIES PkgConfig::libxslt_gcrypt)
-+endif()
-+cmake_policy(POP)
-+if(0)
- include(FindPackageHandleStandardArgs)
- include(SelectLibraryConfigurations)
- 
-@@ -38,3 +53,4 @@ if(GCRYPT_FOUND AND NOT TARGET Gcrypt::Gcrypt)
- 		INTERFACE_INCLUDE_DIRECTORIES "${GCRYPT_INCLUDE_DIRS}"
- 	)
- endif()
-+endif()
diff --git a/vcpkg_overlays/libxslt/libexslt-pkgconfig.patch b/vcpkg_overlays/libxslt/libexslt-pkgconfig.patch
deleted file mode 100644
index b500a8108ca..00000000000
--- a/vcpkg_overlays/libxslt/libexslt-pkgconfig.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/libexslt.pc.in b/libexslt.pc.in
-index 1d60563..50089e8 100644
---- a/libexslt.pc.in
-+++ b/libexslt.pc.in
-@@ -7,7 +7,8 @@ includedir=@includedir@
- Name: libexslt
- Version: @LIBEXSLT_VERSION@
- Description: EXSLT Extension library
--Requires: libxml-2.0, libxslt
-+Requires: libxslt
-+Requires.private: @EXSLT_PRIVATE_REQUIRES@
- Cflags: @EXSLT_INCLUDEDIR@
- Libs: @EXSLT_LIBDIR@ -lexslt
- Libs.private: @EXSLT_PRIVATE_LIBS@
diff --git a/vcpkg_overlays/libxslt/msvc-no-suffix.patch b/vcpkg_overlays/libxslt/msvc-no-suffix.patch
deleted file mode 100644
index 243687fc579..00000000000
--- a/vcpkg_overlays/libxslt/msvc-no-suffix.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index d8679fb..6dc6501 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -244,7 +249,7 @@ set_target_properties(
- 	VERSION ${PROJECT_VERSION}
- )
- 
--if(MSVC)
-+if(0) # Never add suffixes which are not added by the autotools build or the nmake makefiles
- 	if(BUILD_SHARED_LIBS)
- 		set_target_properties(
- 			LibXslt
-@@ -327,7 +332,7 @@ set_target_properties(
- 	VERSION ${LIBEXSLT_VERSION}
- )
- 
--if(MSVC)
-+if(0) # same reason as above
- 	if(BUILD_SHARED_LIBS)
- 		set_target_properties(
- 			LibExslt
diff --git a/vcpkg_overlays/libxslt/portfile.cmake b/vcpkg_overlays/libxslt/portfile.cmake
deleted file mode 100644
index 6624f6a7818..00000000000
--- a/vcpkg_overlays/libxslt/portfile.cmake
+++ /dev/null
@@ -1,83 +0,0 @@
-vcpkg_from_github(
-    OUT_SOURCE_PATH SOURCE_PATH
-    REPO GNOME/libxslt
-    REF v1.1.37
-    SHA512 4e7a57cbe02ceea34404213a88bdbb63a756edfab63063ce3979b670816ae3f6fb3637a49508204e6e46b936628e0a3b8b77e9201530a1184225bd68da403b25
-    HEAD_REF master
-    PATCHES
-        python3.patch
-        msvc-no-suffix.patch
-        libexslt-pkgconfig.patch
-        fix-gcrypt-deps.patch
-        skip-install-docs.patch
-)
-
-vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
-    FEATURES
-        "python"          LIBXSLT_WITH_PYTHON
-        "crypto"          LIBXSLT_WITH_CRYPTO
-)
-if("python" IN_LIST FEATURES)
-    vcpkg_find_acquire_program(PYTHON3)
-    list(APPEND FEATURE_OPTIONS "-DPYTHON_EXECUTABLE=${PYTHON3}")
-    list(APPEND FEATURE_OPTIONS_RELEASE "-DLIBXSLT_PYTHON_INSTALL_DIR=${CURRENT_PACKAGES_DIR}/lib/site-packages")
-    list(APPEND FEATURE_OPTIONS_DEBUG "-DLIBXSLT_PYTHON_INSTALL_DIR=${CURRENT_PACKAGES_DIR}/debug/lib/site-packages")
-endif()
-vcpkg_cmake_configure(
-    SOURCE_PATH "${SOURCE_PATH}"
-    OPTIONS
-        ${FEATURE_OPTIONS}
-        -DLIBXSLT_WITH_TESTS:BOOL=OFF
-        -DLIBXSLT_WITH_THREADS:BOOL=ON
-    OPTIONS_RELEASE
-        ${FEATURE_OPTIONS_RELEASE}
-        -DLIBXSLT_WITH_XSLT_DEBUG:BOOL=OFF
-        -DLIBXSLT_WITH_MEM_DEBUG:BOOL=OFF
-        -DLIBXSLT_WITH_DEBUGGER:BOOL=OFF
-    OPTIONS_DEBUG
-        ${FEATURE_OPTIONS_DEBUG}
-        -DLIBXSLT_WITH_XSLT_DEBUG:BOOL=ON
-        -DLIBXSLT_WITH_MEM_DEBUG:BOOL=ON
-        -DLIBXSLT_WITH_DEBUGGER:BOOL=ON
-    )
-vcpkg_cmake_install()
-file(GLOB config_path RELATIVE "${CURRENT_PACKAGES_DIR}" "${CURRENT_PACKAGES_DIR}/lib/cmake/libxslt-*")
-vcpkg_cmake_config_fixup(CONFIG_PATH "${config_path}")
-
-file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/xsltConf.sh" "${CURRENT_PACKAGES_DIR}/debug/lib/xsltConf.sh")
-
-file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/libxslt")
-file(RENAME "${CURRENT_PACKAGES_DIR}/bin/xslt-config" "${CURRENT_PACKAGES_DIR}/tools/libxslt/xslt-config")
-vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/libxslt/xslt-config" [[$(cd "$(dirname "$0")"; pwd -P)/..]] [[$(cd "$(dirname "$0")/../.."; pwd -P)]])
-if(NOT VCPKG_BUILD_TYPE)
-    file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/libxslt/debug")
-    file(RENAME "${CURRENT_PACKAGES_DIR}/debug/bin/xslt-config" "${CURRENT_PACKAGES_DIR}/tools/libxslt/debug/xslt-config")
-    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/libxslt/debug/xslt-config" [[$(cd "$(dirname "$0")"; pwd -P)/..]] [[$(cd "$(dirname "$0")/../../../debug"; pwd -P)]])
-    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/libxslt/debug/xslt-config" [[${prefix}/include]] [[${prefix}/../include]])
-endif()
-vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/libxslt/xsltconfig.h" "#define LIBXSLT_DEFAULT_PLUGINS_PATH() \"${CURRENT_INSTALLED_DIR}/lib/libxslt-plugins\"" "")
-vcpkg_copy_tools(TOOL_NAMES xsltproc AUTO_CLEAN)
-
-vcpkg_fixup_pkgconfig()
-vcpkg_copy_pdbs()
-
-if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
-    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/libxslt/xsltexports.h" "ifdef LIBXSLT_STATIC" "if 1")
-    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/libexslt/exsltexports.h" "ifdef LIBEXSLT_STATIC" "if 1")
-endif()
-
-if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW)
-    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libxslt.pc" " -lxslt" " -llibxslt")
-    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libexslt.pc" " -lexslt" " -llibexslt")
-    if(NOT VCPKG_BUILD_TYPE)
-        vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libxslt.pc" " -lxslt" " -llibxslt")
-        vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libexslt.pc" " -lexslt" " -llibexslt")
-        endif()
-endif()
-
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
-
-file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/libxslt")
-file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
-file(INSTALL "${SOURCE_PATH}/Copyright" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/vcpkg_overlays/libxslt/python3.patch b/vcpkg_overlays/libxslt/python3.patch
deleted file mode 100644
index fc86d1fc56e..00000000000
--- a/vcpkg_overlays/libxslt/python3.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index d8679fb..6dc6501 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -35,6 +35,11 @@ if(LIBXSLT_WITH_PYTHON)
- 	check_symbol_exists(F_GETFL fcntl.h HAVE_F_GETFL)
- 	if(HAVE_UNISTD_H AND HAVE_F_GETFL)
- 		find_package(Python COMPONENTS Interpreter Development REQUIRED)
-+	elseif(1)
-+		find_package(Python3 COMPONENTS Interpreter Development REQUIRED)
-+		add_library(Python::Python ALIAS Python3::Python)
-+		set(Python_EXECUTABLE ${Python3_EXECUTABLE})
-+		set(Python_SITEARCH ${Python3_SITEARCH})
- 	else()
- 		find_package(Python2 COMPONENTS Interpreter Development REQUIRED)
- 		add_library(Python::Python ALIAS Python2::Python)
diff --git a/vcpkg_overlays/libxslt/skip-install-docs.patch b/vcpkg_overlays/libxslt/skip-install-docs.patch
deleted file mode 100644
index a5d59f32540..00000000000
--- a/vcpkg_overlays/libxslt/skip-install-docs.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 6dc6501..d36a049 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -432,10 +434,12 @@ if(LIBXSLT_WITH_PYTHON)
- 	install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libxslt.py DESTINATION ${LIBXSLT_PYTHON_INSTALL_DIR} COMPONENT runtime)
- endif()
- 
-+if(VCPKG_INSTALL_DOCS)
- install(FILES libexslt/libexslt.3 DESTINATION ${CMAKE_INSTALL_MANDIR}/man3 COMPONENT documentation)
- install(FILES libxslt/libxslt.3 DESTINATION ${CMAKE_INSTALL_MANDIR}/man3 COMPONENT documentation)
- install(FILES doc/xsltproc.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1 COMPONENT documentation)
- install(DIRECTORY doc/ DESTINATION ${CMAKE_INSTALL_DATADIR}/doc/libxslt COMPONENT documentation PATTERN Makefile.* EXCLUDE)
-+endif()
- 
- if(LIBXSLT_WITH_CRYPTO AND NOT WIN32)
- 	install(FILES FindGcrypt.cmake DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/libxslt-${PROJECT_VERSION} COMPONENT development)
diff --git a/vcpkg_overlays/libxslt/usage b/vcpkg_overlays/libxslt/usage
deleted file mode 100644
index 9bf987b6467..00000000000
--- a/vcpkg_overlays/libxslt/usage
+++ /dev/null
@@ -1,12 +0,0 @@
-The package libxslt is compatible with built-in CMake targets:
-
-    # xslt library
-    find_package(LibXslt REQUIRED)
-    target_link_libraries(main PRIVATE LibXslt::LibXslt)
-
-    # exslt library
-    find_package(LibXslt REQUIRED)
-    target_link_libraries(main PRIVATE LibXslt::LibExslt)
-
-In order to use modules, you must set environment variable LIBXSLT_PLUGINS_PATH
-at runtime.
diff --git a/vcpkg_overlays/libxslt/vcpkg-cmake-wrapper.cmake b/vcpkg_overlays/libxslt/vcpkg-cmake-wrapper.cmake
deleted file mode 100644
index 3d9f6e3dfa8..00000000000
--- a/vcpkg_overlays/libxslt/vcpkg-cmake-wrapper.cmake
+++ /dev/null
@@ -1,5 +0,0 @@
-list(REMOVE_ITEM ARGS "NO_MODULE")
-list(REMOVE_ITEM ARGS "CONFIG")
-list(REMOVE_ITEM ARGS "MODULE")
-
-_find_package(${ARGS} CONFIG)
diff --git a/vcpkg_overlays/libxslt/vcpkg.json b/vcpkg_overlays/libxslt/vcpkg.json
deleted file mode 100644
index 8b9e8b83bc2..00000000000
--- a/vcpkg_overlays/libxslt/vcpkg.json
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-  "name": "libxslt",
-  "version": "1.1.37",
-  "port-version": 2,
-  "description": "Libxslt is a XSLT library implemented in C for XSLT 1.0 and most of EXSLT",
-  "homepage": "https://github.com/GNOME/libxslt",
-  "license": null,
-  "supports": "!uwp",
-  "dependencies": [
-    "libxml2",
-    {
-      "name": "vcpkg-cmake",
-      "host": true
-    },
-    {
-      "name": "vcpkg-cmake-config",
-      "host": true
-    }
-  ],
-  "default-features": [
-    "default-features"
-  ],
-  "features": {
-    "crypto": {
-      "description": "Build with crypto support",
-      "supports": "!windows",
-      "dependencies": [
-        "libgcrypt"
-      ]
-    },
-    "default-features": {
-      "description": "default features for the current platform"
-    },
-    "plugins": {
-      "description": "(deprecated)",
-      "supports": "!static"
-    },
-    "python": {
-      "description": "Builds with python support",
-      "supports": "!windows"
-    }
-  }
-}
diff --git a/vcpkg_overlays/nlp-engine/CMakeLists.txt b/vcpkg_overlays/nlp-engine/CMakeLists.txt
deleted file mode 100644
index 66dd00be7e8..00000000000
--- a/vcpkg_overlays/nlp-engine/CMakeLists.txt
+++ /dev/null
@@ -1,67 +0,0 @@
-cmake_minimum_required(VERSION 3.15)
-
-# set the project name and version
-project(nlp-engine)
-
-set(CMAKE_CXX_STANDARD 17)
-
-find_package(ICU REQUIRED COMPONENTS data i18n io tu uc)
-
-include_directories(cs/include)
-include_directories(include)
-include_directories(include/Api)
-include_directories(include/Api/lite)
-include_directories(${ICU_INCLUDE_DIRS})
-
-add_subdirectory(cs)
-add_subdirectory(src)
-
-install(DIRECTORY "${CMAKE_SOURCE_DIR}/include" DESTINATION "." FILES_MATCHING PATTERN "*.h")
-
-add_definitions( -DLITE_EXPORTS )
-if(WIN32)
-  add_definitions( -DMSVC_VERSION=${MSVC_VERSION} -D_CRT_SECURE_NO_WARNINGS )
-else()
-  add_definitions( -DLINUX -Wno-write-strings -Wno-deprecated )
-endif()
-
-file(GLOB lite_src "lite/*.h" "lite/*.cpp")
-add_library(nlp-engine SHARED ${lite_src})
-target_link_libraries(nlp-engine PRIVATE 
-  prim
-  kbm
-  consh
-  words
-  ${ICU_LIBRARIES}
-)
-
-target_include_directories(nlp-engine
-  INTERFACE
-  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
-  $<INSTALL_INTERFACE:include/Api/lite>
-  $<INSTALL_INTERFACE:include/Api>
-)
-
-install(TARGETS nlp-engine 
-  EXPORT nlp-engine-config
-  RUNTIME DESTINATION bin
-  ARCHIVE DESTINATION lib
-  LIBRARY DESTINATION lib
-)
-
-install(EXPORT nlp-engine-config
-  FILE nlp-engine-config.cmake
-  DESTINATION share/cmake/nlp-engine
-)
-
-install(
-  DIRECTORY ./analyzers
-  DESTINATION share/nlp-engine
-  COMPONENT Runtime
-)
-
-install(
-  DIRECTORY ./data
-  DESTINATION share/nlp-engine
-  COMPONENT Runtime
-)
diff --git a/vcpkg_overlays/nlp-engine/portfile.cmake b/vcpkg_overlays/nlp-engine/portfile.cmake
deleted file mode 100644
index ae931ff004c..00000000000
--- a/vcpkg_overlays/nlp-engine/portfile.cmake
+++ /dev/null
@@ -1,38 +0,0 @@
-vcpkg_from_github(
-  OUT_SOURCE_PATH SOURCE_PATH
-  REPO VisualText/nlp-engine
-  REF v${VERSION}
-  SHA512 a6871cb3db10a1d4bd7d5290141a82e788269da28b2d995963825dc4c50025e6099f5f872e4538054b7fb169773b6d6d3e73e3dd102bc3e0cbb5bddcd95ae484
-  HEAD_REF master
-)
-
-vcpkg_from_github(
-  OUT_SOURCE_PATH ANALYZER_PATH
-  REPO VisualText/analyzers
-  REF v1.6.2
-  SHA512 07479c8ba1f36c3a0bb035af7414e96ce1477ffaa8a276256fc3749d169c0bb99f9ac9ad5c9b5b0868d634644013c46643a90598dd465e4f16bbe82a47ac60fe
-  HEAD_REF master
-)
-
-vcpkg_from_github(
-  OUT_SOURCE_PATH PARSE_EN_US_PATH
-  REPO VisualText/parse-en-us
-  REF v1.1.1
-  SHA512 1aa01c0befe82b8fe415576ae992b0b60fe51b816e93fd8f45da4c5ccacc3dc87c21373ba001cf0d0c503131b4b83346e86f1522795901bbceb07c63a52d6294
-  HEAD_REF master
-)
-
-file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
-file(COPY "${ANALYZER_PATH}/." DESTINATION "${SOURCE_PATH}/analyzers" PATTERN "*.*")
-file(COPY "${PARSE_EN_US_PATH}/." DESTINATION "${SOURCE_PATH}/analyzers/parse-en-us" PATTERN "*.*")
-
-vcpkg_cmake_configure(
-    SOURCE_PATH "${SOURCE_PATH}"
-)
-vcpkg_cmake_install()
-vcpkg_cmake_config_fixup(PACKAGE_NAME "nlp-engine" CONFIG_PATH "share/cmake/nlp-engine")
-
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
-
-file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/vcpkg_overlays/nlp-engine/vcpkg.json b/vcpkg_overlays/nlp-engine/vcpkg.json
deleted file mode 100644
index f58aab2fe7b..00000000000
--- a/vcpkg_overlays/nlp-engine/vcpkg.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "name": "nlp-engine",
-  "version-semver": "2.10.6",
-  "port-version": 0,
-  "homepage": "https://github.com/VisualText/nlp-engine",
-  "description": "The NLP engine is a cross-platform text analysis tool that can be accessed through a command line executable or by calling its C++ functions from another language.",
-  "dependencies": [
-    {
-      "name": "vcpkg-cmake",
-      "host": true
-    },
-    {
-      "name": "vcpkg-cmake-config",
-      "host": true
-    },
-    {
-      "name": "icu",
-      "features": [
-        "tools"
-      ]
-    }
-  ]
-}
\ No newline at end of file