diff --git a/ports/akali/CONTROL b/ports/akali/CONTROL
index 5ccbed60d43..333143ca969 100644
--- a/ports/akali/CONTROL
+++ b/ports/akali/CONTROL
@@ -1,5 +1,6 @@
 Source: akali
 Version: 1.42
+Port-Version: 1
 Description: C++ Common Library.
 Homepage: https://github.com/winsoft666/akali
-Supports: !(arm|arm64|uwp)
\ No newline at end of file
+Supports: !(arm|arm64|uwp)
diff --git a/ports/akali/portfile.cmake b/ports/akali/portfile.cmake
index 6a2658d5fb8..e91bbd88f95 100644
--- a/ports/akali/portfile.cmake
+++ b/ports/akali/portfile.cmake
@@ -13,6 +13,7 @@ string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" AKALI_STATIC)
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
     PREFER_NINJA
+    DISABLE_PARALLEL_CONFIGURE
     OPTIONS
         -DAKALI_STATIC:BOOL=${AKALI_STATIC}
         -DBUILD_TESTS:BOOL=OFF
diff --git a/ports/ignition-modularscripts/CONTROL b/ports/ignition-modularscripts/CONTROL
index e52ae90a5a5..98ceba1af5e 100644
--- a/ports/ignition-modularscripts/CONTROL
+++ b/ports/ignition-modularscripts/CONTROL
@@ -1,4 +1,4 @@
 Source: ignition-modularscripts
 Version: 2020-05-16
-Port-Version: 1
+Port-Version: 2
 Description: Vcpkg helpers to package ignition libraries
diff --git a/ports/ignition-modularscripts/ignition_modular_library.cmake b/ports/ignition-modularscripts/ignition_modular_library.cmake
index b294c097b6f..77506bb3be3 100644
--- a/ports/ignition-modularscripts/ignition_modular_library.cmake
+++ b/ports/ignition-modularscripts/ignition_modular_library.cmake
@@ -3,6 +3,7 @@ function(ignition_modular_build_library NAME MAJOR_VERSION SOURCE_PATH CMAKE_PAC
     vcpkg_configure_cmake(
         SOURCE_PATH ${SOURCE_PATH}
         PREFER_NINJA
+        DISABLE_PARALLEL_CONFIGURE
         OPTIONS -DBUILD_TESTING=OFF
     )
 
@@ -29,13 +30,13 @@ function(ignition_modular_build_library NAME MAJOR_VERSION SOURCE_PATH CMAKE_PAC
         file(COPY ${CMAKE_RELEASE_FILES} DESTINATION
                   "${CURRENT_PACKAGES_DIR}/share/${CMAKE_PACKAGE_NAME}/")
     endif()
-    
+
     # Remove unused files files
     file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/cmake
                         ${CURRENT_PACKAGES_DIR}/debug/include
                         ${CURRENT_PACKAGES_DIR}/debug/lib/cmake
                         ${CURRENT_PACKAGES_DIR}/debug/share)
-    
+
     # Make pkg-config files relocatable
     if(NOT IML_DISABLE_PKGCONFIG_INSTALL)
         if(VCPKG_TARGET_IS_LINUX)
@@ -97,7 +98,7 @@ endfunction()
 ## ### CMAKE_PACKAGE_NAME
 ## The name of the CMake package for the port.
 ## If not specified, defaults to `ignition-${NAME}${MAJOR_VERSION}`.
-## 
+##
 ## ### DISABLE_PKGCONFIG_INSTALL
 ## If present, disable installation of .pc pkg-config configuration files.
 ##
@@ -112,16 +113,16 @@ function(ignition_modular_library)
     set(oneValueArgs NAME VERSION SHA512 REF HEAD_REF CMAKE_PACKAGE_NAME)
 	set(multiValueArgs PATCHES)
     cmake_parse_arguments(IML "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
-    
+
     string(REPLACE "." ";" IML_VERSION_LIST ${IML_VERSION})
     list(GET IML_VERSION_LIST 0 IML_MAJOR_VERSION)
 
-    # If the REF option is omitted, use the canonical one 
+    # If the REF option is omitted, use the canonical one
     if(NOT DEFINED IML_REF)
         set(IML_REF "ignition-${IML_NAME}${IML_MAJOR_VERSION}_${IML_VERSION}")
     endif()
-    
-    # If the HEAD_REF option is omitted, use the canonical one 
+
+    # If the HEAD_REF option is omitted, use the canonical one
     if(NOT DEFINED IML_HEAD_REF)
         set(IML_HEAD_REF "ign-${IML_NAME}${IML_MAJOR_VERSION}")
     endif()
@@ -141,7 +142,7 @@ function(ignition_modular_library)
         HEAD_REF ${IML_HEAD_REF}
         PATCHES ${IML_PATCHES}
     )
-    
+
     # Build library
     ignition_modular_build_library(${IML_NAME} ${IML_MAJOR_VERSION} ${SOURCE_PATH} ${IML_CMAKE_PACKAGE_NAME} ${DEFAULT_CMAKE_PACKAGE_NAME} ${IML_DISABLE_PKGCONFIG_INSTALL})
 endfunction()
diff --git a/ports/ignition-msgs1/CONTROL b/ports/ignition-msgs1/CONTROL
index 47665b0389e..1581a5c30f9 100644
--- a/ports/ignition-msgs1/CONTROL
+++ b/ports/ignition-msgs1/CONTROL
@@ -1,4 +1,5 @@
 Source: ignition-msgs1
-Version: 1.0.0-1
+Version: 1.0.0
+Port-Version: 2
 Build-Depends: ignition-cmake0, ignition-math4, protobuf
 Description: Middleware protobuf messages for robotics
diff --git a/ports/ignition-msgs1/portfile.cmake b/ports/ignition-msgs1/portfile.cmake
index d85be26068e..d206ded1210 100644
--- a/ports/ignition-msgs1/portfile.cmake
+++ b/ports/ignition-msgs1/portfile.cmake
@@ -1,5 +1,3 @@
-include(vcpkg_common_functions)
-
 include(${CURRENT_INSTALLED_DIR}/share/ignitionmodularscripts/ignition_modular_library.cmake)
 
 # Explicitly disable cross-compilation until the upstream discussion
diff --git a/ports/knet/portfile.cmake b/ports/knet/portfile.cmake
index f974cec0c26..88909350f91 100644
--- a/ports/knet/portfile.cmake
+++ b/ports/knet/portfile.cmake
@@ -13,6 +13,7 @@ vcpkg_from_github(
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
     PREFER_NINJA
+    DISABLE_PARALLEL_CONFIGURE
     OPTIONS
         -DKNET_BUILD_EXAMPLE:BOOL=OFF
         -DKNET_BUILD_TEST:BOOL=OFF
diff --git a/ports/knet/vcpkg.json b/ports/knet/vcpkg.json
index 5ac2b02499c..3ec7b282fda 100644
--- a/ports/knet/vcpkg.json
+++ b/ports/knet/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "knet",
   "version-string": "1.0.1",
+  "port-version": 1,
   "description": "A cross platform lock-free and timer-supported C++11 network library.",
   "homepage": "https://github.com/kibaamor/knet",
   "license": "MIT",
diff --git a/ports/libnice/CONTROL b/ports/libnice/CONTROL
index a2f87af5cba..eabcc1255a5 100644
--- a/ports/libnice/CONTROL
+++ b/ports/libnice/CONTROL
@@ -1,5 +1,6 @@
 Source: libnice
-Version: 0.1.15-4
+Version: 0.1.15
+Port-Version: 5
 Homepage: https://nice.freedesktop.org
 Description: Libnice is an implementation of the IETF's Interactive Connectivity Establishment (ICE) standard (RFC 5245) and the Session Traversal Utilities for NAT (STUN) standard (RFC 5389).
 Build-Depends: glib, openssl
diff --git a/ports/libnice/portfile.cmake b/ports/libnice/portfile.cmake
index ff09f483722..2741712a3bd 100644
--- a/ports/libnice/portfile.cmake
+++ b/ports/libnice/portfile.cmake
@@ -14,6 +14,7 @@ file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
     PREFER_NINJA
+    DISABLE_PARALLEL_CONFIGURE
     OPTIONS_RELEASE -DOPTIMIZE=1
     OPTIONS_DEBUG -DDEBUGGABLE=1
 )
diff --git a/ports/libp7-baical/CONTROL b/ports/libp7-baical/CONTROL
index 179d6d825f8..d23258e0311 100644
--- a/ports/libp7-baical/CONTROL
+++ b/ports/libp7-baical/CONTROL
@@ -1,6 +1,4 @@
 Source: libp7-baical
-Version: 4.4
-Port-Version: 5
-Homepage: https://baical.net/
-Description: P7 is a library for high-speed sending telemetry & trace data from application
-Supports: !(arm|uwp|osx)
\ No newline at end of file
+Version: replaced
+Build-Depends: libp7client
+Description: An old name for the port libp7client; please install libp7client instead.
diff --git a/ports/libp7-baical/portfile.cmake b/ports/libp7-baical/portfile.cmake
index d6fc5f9deb4..6320a2825b8 100644
--- a/ports/libp7-baical/portfile.cmake
+++ b/ports/libp7-baical/portfile.cmake
@@ -1,30 +1,2 @@
-vcpkg_fail_port_install(ON_ARCH "arm" ON_TARGET "uwp" "osx")
-
-set(LIBP7_VERSION 4.4)
-set(LIBP7_HASH 500fefdf6fb01999ddb2accc8309cf8749fb7a65abb98faaf6d71a5ae3da4eac8c00c083905b01f7f6cc973387b605f2c4db0bb007562f76b7ad43b6abe2b91f)
-
-vcpkg_download_distfile(ARCHIVE
-    URLS "http://baical.net/files/libP7_v${LIBP7_VERSION}.zip"
-    FILENAME "libP7_v${LIBP7_VERSION}.zip"
-    SHA512 ${LIBP7_HASH}
-)
-
-vcpkg_extract_source_archive_ex(
-    OUT_SOURCE_PATH SOURCE_PATH
-    ARCHIVE ${ARCHIVE}
-    NO_REMOVE_ONE_LEVEL
-)
-
-file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
-
-vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
-)
-
-vcpkg_install_cmake()
-vcpkg_copy_pdbs()
-
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
-
-file(INSTALL ${SOURCE_PATH}/License.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
\ No newline at end of file
+set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
+message(WARNING "libp7-baical has been replaced by libp7client.")
diff --git a/ports/libp7-baical/CMakeLists.txt b/ports/libp7client/CMakeLists.txt
similarity index 63%
rename from ports/libp7-baical/CMakeLists.txt
rename to ports/libp7client/CMakeLists.txt
index 6b1044e4391..f2eb53af357 100644
--- a/ports/libp7-baical/CMakeLists.txt
+++ b/ports/libp7client/CMakeLists.txt
@@ -1,24 +1,17 @@
 project(P7)
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.18)
 
-set(SOURCES "Sources/ClBaical.cpp"
-            "Sources/ClFile.cpp"
-            "Sources/Client.cpp"
-            "Sources/ClNull.cpp"
-            "Sources/ClText.cpp"
-            "Sources/CRC32.cpp"
-            "Sources/Proxy.cpp"
-            "Sources/Telemetry.cpp"
-            "Sources/Trace.cpp"
-)
+add_library(P7
+  "Sources/ClBaical.cpp"
+  "Sources/ClFile.cpp"
+  "Sources/Client.cpp"
+  "Sources/ClNull.cpp"
+  "Sources/ClText.cpp"
+  "Sources/CRC32.cpp"
+  "Sources/Proxy.cpp"
+  "Sources/Telemetry.cpp"
+  "Sources/Trace.cpp")
 
-if(WIN32)
-  set(RESOURCES "Sources/P7Client.rc")
-else()
-  set(RESOURCES "")
-endif()
-
-add_library(P7 "${SOURCES}" "${RESOURCES}")
 target_include_directories(P7 PRIVATE "Headers/")
 target_include_directories(P7 PRIVATE "Shared/")
 if(WIN32)
@@ -30,7 +23,7 @@ endif()
 
 if(WIN32)
   set_target_properties(P7 PROPERTIES PREFIX "")
-  if(CMAKE_SIZEOF_VOID_P EQUAL 8)   
+  if(CMAKE_SIZEOF_VOID_P EQUAL 8)
     set_target_properties(P7 PROPERTIES DEBUG_POSTFIX "x64d")
     set_target_properties(P7 PROPERTIES RELEASE_POSTFIX "x64")
   else()
@@ -45,9 +38,9 @@ endif()
 
 install(TARGETS P7
         RUNTIME DESTINATION "bin"
-        ARCHIVE DESTINATION "lib" 
+        ARCHIVE DESTINATION "lib"
         LIBRARY DESTINATION "lib")
-        
-install(DIRECTORY Headers/ 
+
+install(DIRECTORY Headers/
         DESTINATION include/P7
         FILES_MATCHING PATTERN "*.h")
diff --git a/ports/libp7client/CONTROL b/ports/libp7client/CONTROL
index f7020b6f136..aa506cf6c5a 100644
--- a/ports/libp7client/CONTROL
+++ b/ports/libp7client/CONTROL
@@ -1,4 +1,5 @@
 Source: libp7client
-Version: 5.2-1
+Version: 5.6
+Homepage: https://baical.net/
 Description: Open source, cross-platform, fastest library for sending logs, telemetry & trace data from your application.
-Supports: x86|x64
\ No newline at end of file
+Supports: !(arm|uwp|osx)
diff --git a/ports/libp7client/fix-runtime-library.patch b/ports/libp7client/fix-runtime-library.patch
deleted file mode 100644
index d7d2ab931a8..00000000000
--- a/ports/libp7client/fix-runtime-library.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-diff --git a/Sources/P7ClientDll.vcxproj b/Sources/P7ClientDll.vcxproj
-index 9fab3d0..a7035d9 100644
---- a/Sources/P7ClientDll.vcxproj
-+++ b/Sources/P7ClientDll.vcxproj
-@@ -112,7 +112,7 @@
-       <AdditionalIncludeDirectories>$(ProjectDir)\..\Shared\;$(ProjectDir)\..\Shared\Platforms\Windows_x86;$(ProjectDir)\..\Headers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-       <ShowIncludes>false</ShowIncludes>
-       <EnablePREfast>false</EnablePREfast>
--      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-     </ClCompile>
-     <Link>
-       <SubSystem>Windows</SubSystem>
-@@ -137,7 +137,7 @@
-       <Optimization>Disabled</Optimization>
-       <PreprocessorDefinitions>_WIN64;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-       <AdditionalIncludeDirectories>$(ProjectDir)\..\Shared\;$(ProjectDir)\..\Shared\Platforms\Windows_x86;$(ProjectDir)\..\Headers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
--      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-     </ClCompile>
-     <Link>
-       <SubSystem>Windows</SubSystem>
-@@ -165,7 +165,7 @@
-       <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-       <AdditionalIncludeDirectories>$(ProjectDir)\..\Shared\;$(ProjectDir)\..\Shared\Platforms\Windows_x86;$(ProjectDir)\..\Headers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
--      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-+      <RuntimeLibrary>MultiThreadedDll</RuntimeLibrary>
-     </ClCompile>
-     <Link>
-       <SubSystem>Windows</SubSystem>
-@@ -195,7 +195,7 @@
-       <PreprocessorDefinitions>_WIN64;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-       <AdditionalIncludeDirectories>$(ProjectDir)\..\Shared\;$(ProjectDir)\..\Shared\Platforms\Windows_x86;$(ProjectDir)\..\Headers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
--      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-+      <RuntimeLibrary>MultiThreadedDll</RuntimeLibrary>
-     </ClCompile>
-     <Link>
-       <SubSystem>Windows</SubSystem>
-diff --git a/Sources/P7ClientLib.vcxproj b/Sources/P7ClientLib.vcxproj
-index 3b46bab..725f8a4 100644
---- a/Sources/P7ClientLib.vcxproj
-+++ b/Sources/P7ClientLib.vcxproj
-@@ -161,6 +161,7 @@
-       <AdditionalIncludeDirectories>$(ProjectDir)\..\Shared\;$(ProjectDir)\..\Shared\Platforms\Windows_x86;$(ProjectDir)\..\Headers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-       <ShowIncludes>false</ShowIncludes>
-       <EnablePREfast>false</EnablePREfast>
-+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-     </ClCompile>
-     <Link>
-       <SubSystem>Windows</SubSystem>
-@@ -181,6 +182,7 @@
-       <Optimization>Disabled</Optimization>
-       <PreprocessorDefinitions>_WIN64;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-       <AdditionalIncludeDirectories>$(ProjectDir)\..\Shared\;$(ProjectDir)\..\Shared\Platforms\Windows_x86;$(ProjectDir)\..\Headers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-     </ClCompile>
-     <Link>
-       <SubSystem>Windows</SubSystem>
-@@ -204,6 +206,7 @@
-       <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-       <AdditionalIncludeDirectories>$(ProjectDir)\..\Shared\;$(ProjectDir)\..\Shared\Platforms\Windows_x86;$(ProjectDir)\..\Headers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-     </ClCompile>
-     <Link>
-       <SubSystem>Windows</SubSystem>
-@@ -255,6 +258,7 @@
-       <PreprocessorDefinitions>_WIN64;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-       <AdditionalIncludeDirectories>$(ProjectDir)\..\Shared\;$(ProjectDir)\..\Shared\Platforms\Windows_x86;$(ProjectDir)\..\Headers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-     </ClCompile>
-     <Link>
-       <SubSystem>Windows</SubSystem>
diff --git a/ports/libp7client/portfile.cmake b/ports/libp7client/portfile.cmake
index 1a0b002eaf6..66a87883463 100644
--- a/ports/libp7client/portfile.cmake
+++ b/ports/libp7client/portfile.cmake
@@ -1,118 +1,27 @@
-include(vcpkg_common_functions)
-
-if (NOT VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_UWP)
-    message(FATAL_ERROR "Unsupported system: ${VCPKG_CMAKE_SYSTEM_NAME}")
-endif()
-
-if (VCPKG_TARGET_ARCHITECTURE STREQUAL "x86")
-    set(BUILD_ARCH "Win32")
-    set(ARCH "32")
-elseif (VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")
-    set(BUILD_ARCH "x64")
-    set(ARCH "64")
-elseif (VCPKG_TARGET_ARCHITECTURE STREQUAL "arm")
-    message(FATAL_ERROR "Unsupported architecture: ${VCPKG_TARGET_ARCHITECTURE}")
-elseif (VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64")
-    message(FATAL_ERROR "Unsupported architecture: ${VCPKG_TARGET_ARCHITECTURE}")
-else()
-    message(FATAL_ERROR "Unsupported architecture: ${VCPKG_TARGET_ARCHITECTURE}")
-endif()
-
-set(VERSION 5.2)
+vcpkg_fail_port_install(ON_ARCH "arm" ON_TARGET "uwp" "osx")
 
 vcpkg_download_distfile(ARCHIVE
-    URLS "http://baical.net/files/libP7Client_v${VERSION}.zip"
-    FILENAME "libP7Client_v${VERSION}.zip"
-    SHA512 9744b9c3f091db90aca3485408d3e1169317152ea353ab3845cd7cfb9d61d105b55be17ad83c5970e01d7d0f37566313bc18c0f8a4c16bcd1582cd7a5ea29b87
+    URLS http://baical.net/files/libP7Client_v5.6.zip
+    FILENAME libP7Client_v5.6.zip
+    SHA512 992256854b717a45ae9e11ed16aa27b8b054de97718f027664634597d756aa26fe10dcad765cde7695802c90def46461abbcbfde81923fdd40ea2b659e1a8240
 )
 
 vcpkg_extract_source_archive_ex(
     OUT_SOURCE_PATH SOURCE_PATH
-    ARCHIVE ${ARCHIVE} 
+    ARCHIVE "${ARCHIVE}"
     NO_REMOVE_ONE_LEVEL
-    REF ${VERSION}
-    PATCHES
-        "fix-runtime-library.patch"
-)
-if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
-    vcpkg_build_msbuild(
-        PROJECT_PATH ${SOURCE_PATH}/Sources/P7ClientLib.vcxproj
-        PLATFORM ${BUILD_ARCH}
-        RELEASE_CONFIGURATION 
-        DEBUG_CONFIGURATION 
-        OPTIONS
-            "/p:NoWarn=C4996" 
-    )
-
-    file(GLOB LIB_FILES LIST_DIRECTORIES false "${SOURCE_PATH}/Binaries/*${ARCH}.lib")
-    file(GLOB D_LIB_FILES LIST_DIRECTORIES false "${SOURCE_PATH}/Binaries/*${ARCH}d.lib")
-else()
-    vcpkg_build_msbuild(
-        PROJECT_PATH ${SOURCE_PATH}/Sources/P7ClientDll.vcxproj
-        PLATFORM ${BUILD_ARCH}
-        #RELEASE_CONFIGURATION 
-        #DEBUG_CONFIGURATION 
-        OPTIONS
-            "/p:NoWarn=C4996"
-    )
-
-    file(GLOB DLL_LIB_FILES LIST_DIRECTORIES false "${SOURCE_PATH}/Binaries/*${ARCH}.dll.lib")
-    file(GLOB D_DLL_LIB_FILES LIST_DIRECTORIES false "${SOURCE_PATH}/Binaries/*${ARCH}d.dll.lib")
-
-    file(GLOB DLL_FILES LIST_DIRECTORIES false "${SOURCE_PATH}/Binaries/*${ARCH}.dll")
-    file(GLOB D_DLL_FILES LIST_DIRECTORIES false "${SOURCE_PATH}/Binaries/*${ARCH}d.dll")
-
-    file(GLOB PDB_FILES LIST_DIRECTORIES false "${SOURCE_PATH}/Binaries/*${ARCH}.pdb")
-    file(GLOB D_PDB_FILES LIST_DIRECTORIES false "${SOURCE_PATH}/Binaries/*${ARCH}d.pdb")
-
-endif()
-
-file(GLOB HEADER_FILES LIST_DIRECTORIES false "${SOURCE_PATH}/Headers/*.h")
-file(INSTALL
-    ${HEADER_FILES}
-    DESTINATION ${CURRENT_PACKAGES_DIR}/include/P7
 )
 
-#file(GLOB EXE_FILES LIST_DIRECTORIES false "${SOURCE_PATH}/Binaries/*${ARCH}.exe")
-#file(GLOB D_EXE_FILES LIST_DIRECTORIES false "${SOURCE_PATH}/Binaries/*${ARCH}d.exe")
+file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
 
-file(INSTALL
-    ${LIB_FILES}
-    DESTINATION ${CURRENT_PACKAGES_DIR}/lib
-)
-file(INSTALL
-    ${D_LIB_FILES}
-    DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib
-)
-file(INSTALL
-    ${DLL_LIB_FILES}
-    DESTINATION ${CURRENT_PACKAGES_DIR}/lib
-)
-file(INSTALL
-    ${D_DLL_LIB_FILES}
-    DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib
-)
-file(INSTALL
-    ${DLL_FILES}
-    DESTINATION ${CURRENT_PACKAGES_DIR}/bin
-)
-file(INSTALL
-    ${D_DLL_FILES}
-    DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin
-)
-file(INSTALL
-    ${PDB_FILES}
-    DESTINATION ${CURRENT_PACKAGES_DIR}/bin
-)
-file(INSTALL
-    ${D_PDB_FILES}
-    DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
 )
 
-file(INSTALL ${SOURCE_PATH}/License.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/libp7client RENAME copyright)
+vcpkg_install_cmake()
+vcpkg_copy_pdbs()
 
-if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
-    file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin)
-endif()
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
 
-vcpkg_copy_pdbs()
\ No newline at end of file
+file(INSTALL ${SOURCE_PATH}/License.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
diff --git a/ports/nvtt/CONTROL b/ports/nvtt/CONTROL
index aaa38826959..4e2332dad88 100644
--- a/ports/nvtt/CONTROL
+++ b/ports/nvtt/CONTROL
@@ -1,5 +1,7 @@
 Source: nvtt
 Version: 2.1.2
+Port-Version: 1
 Homepage: https://github.com/castano/nvidia-texture-tools
 Description: Texture processing tools with support for Direct3D 10 and 11 formats.
 Supports: !x86
+Build-Depends: libsquish
diff --git a/ports/nvtt/portfile.cmake b/ports/nvtt/portfile.cmake
index 46ea7f9b8e3..f235be2d0cd 100644
--- a/ports/nvtt/portfile.cmake
+++ b/ports/nvtt/portfile.cmake
@@ -15,6 +15,7 @@ vcpkg_from_github(
         squish.patch
         fix-build-error.patch
         add-compile-options-for-osx.patch
+        skip-building-libsquish.patch
 )
 
 vcpkg_configure_cmake(
@@ -38,4 +39,4 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
 
 # Handle copyright
 file(REMOVE ${CURRENT_PACKAGES_DIR}/share/doc/nvtt/LICENSE)
-file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
\ No newline at end of file
+file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
diff --git a/ports/nvtt/skip-building-libsquish.patch b/ports/nvtt/skip-building-libsquish.patch
new file mode 100644
index 00000000000..dba065d1f34
--- /dev/null
+++ b/ports/nvtt/skip-building-libsquish.patch
@@ -0,0 +1,13 @@
+diff --git a/extern/CMakeLists.txt b/extern/CMakeLists.txt
+index 911c19e..6f13de4 100644
+--- a/extern/CMakeLists.txt
++++ b/extern/CMakeLists.txt
+@@ -5,7 +5,6 @@ ADD_SUBDIRECTORY(EtcLib)
+ ADD_SUBDIRECTORY(rg_etc1_v104)
+ #ADD_SUBDIRECTORY(etcpack)
+ 
+-ADD_SUBDIRECTORY(libsquish-1.15)
++#ADD_SUBDIRECTORY(libsquish-1.15)
+ 
+ ADD_SUBDIRECTORY(CMP_Core)
+-
diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt
index 49fafc396bf..173cb32c415 100644
--- a/scripts/ci.baseline.txt
+++ b/scripts/ci.baseline.txt
@@ -380,7 +380,6 @@ farmhash:x64-windows-static=fail
 farmhash:x86-windows=fail
 fastrtps:arm-uwp=fail
 fastrtps:x64-linux=fail
-fastrtps:x64-osx=fail
 fastrtps:x64-uwp=fail
 fastrtps:x64-windows-static=fail
 fdk-aac:arm64-windows=fail
@@ -747,11 +746,6 @@ libosip2:x64-uwp=fail
 libosip2:x64-windows=fail
 libosip2:x64-windows-static=fail
 libosip2:x86-windows=fail
-libp7client:arm64-windows=fail
-libp7client:arm-uwp=fail
-libp7client:x64-linux=fail
-libp7client:x64-osx=fail
-libp7client:x64-uwp=fail
 libpcap:arm64-windows=fail
 libpcap:arm-uwp=fail
 libpcap:x64-osx=fail
@@ -1053,7 +1047,6 @@ nana:x64-linux=fail
 nana:x64-osx=fail
 nana:x64-uwp=fail
 nanodbc:arm-uwp=fail
-nanodbc:x64-osx=fail
 nanodbc:x64-uwp=fail
 nanodbc:x64-linux=skip
 nanogui:arm64-windows=fail
@@ -1073,7 +1066,6 @@ nethost:x64-uwp=fail
 nethost:arm-uwp=fail
 nettle:x64-windows-static=skip
 nettle:x64-windows=skip
-nettle:x64-osx=fail
 networkdirect-sdk:arm64-windows=fail
 networkdirect-sdk:arm-uwp=fail
 networkdirect-sdk:x64-linux=fail
@@ -1210,8 +1202,6 @@ openssl-windows:x64-osx=fail
 openssl-windows:x64-uwp=fail
 opentracing:arm-uwp=fail
 opentracing:x64-uwp=fail
-openvdb:x64-osx=fail
-#openvdb:x64-windows-static=fail # https://github.com/microsoft/vcpkg/pull/10816#issuecomment-613784827
 openvpn3:x64-osx=fail
 openvr:arm64-windows=fail
 openvr:arm-uwp=fail