diff --git a/ports/aubio/portfile.cmake b/ports/aubio/portfile.cmake
index e8d49dce4c..f7ab0f1abf 100644
--- a/ports/aubio/portfile.cmake
+++ b/ports/aubio/portfile.cmake
@@ -8,7 +8,7 @@ vcpkg_from_github(
     HEAD_REF master
 )
 
-file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
+file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}")
 
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
     FEATURES
@@ -16,8 +16,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
 )
 
 vcpkg_cmake_configure(
-  SOURCE_PATH ${SOURCE_PATH}
-  PREFER_NINJA
+  SOURCE_PATH "${SOURCE_PATH}"
   OPTIONS ${FEATURE_OPTIONS}
   OPTIONS_RELEASE
     -DTOOLS_INSTALLDIR=tools/aubio
@@ -31,15 +30,7 @@ vcpkg_cmake_config_fixup()
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share")
 
-# Handle copyright and credentials
-file(COPY
-    ${SOURCE_PATH}/COPYING
-    ${SOURCE_PATH}/AUTHORS
-    ${SOURCE_PATH}/ChangeLog
-    ${SOURCE_PATH}/README.md
-  DESTINATION
-    ${CURRENT_PACKAGES_DIR}/share/${PORT})
-
 vcpkg_copy_pdbs()
-vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT})
-file(RENAME ${CURRENT_PACKAGES_DIR}/share/${PORT}/COPYING ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright)
\ No newline at end of file
+vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/${PORT}")
+
+file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/ports/aubio/vcpkg.json b/ports/aubio/vcpkg.json
index bbae92425a..e774045343 100644
--- a/ports/aubio/vcpkg.json
+++ b/ports/aubio/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "aubio",
   "version-semver": "0.4.9",
-  "port-version": 8,
+  "port-version": 9,
   "description": "Aubio is a tool designed for the extraction of annotations from audio signals. Its features include segmenting a sound file before each of its attacks, performing pitch detection, tapping the beat and producing midi streams from live audio.",
   "homepage": "https://github.com/aubio/aubio",
   "license": "GPL-3.0-or-later",
diff --git a/ports/bitserializer/portfile.cmake b/ports/bitserializer/portfile.cmake
index 7e0f67a1d4..28c43ace76 100644
--- a/ports/bitserializer/portfile.cmake
+++ b/ports/bitserializer/portfile.cmake
@@ -15,15 +15,14 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
 )
 
 vcpkg_cmake_configure(
-    SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
+    SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
         ${FEATURE_OPTIONS}
 )
 vcpkg_cmake_install()
 vcpkg_cmake_config_fixup(CONFIG_PATH share/bitserializer)
 
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib ${CURRENT_PACKAGES_DIR}/debug)
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib" "${CURRENT_PACKAGES_DIR}/debug")
 
 # Handle copyright
-file(INSTALL ${SOURCE_PATH}/license.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+file(INSTALL "${SOURCE_PATH}/license.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/ports/bitserializer/vcpkg.json b/ports/bitserializer/vcpkg.json
index 09a3a8b1b3..42b09e65d2 100644
--- a/ports/bitserializer/vcpkg.json
+++ b/ports/bitserializer/vcpkg.json
@@ -1,8 +1,10 @@
 {
   "name": "bitserializer",
   "version": "0.44",
+  "port-version": 1,
   "description": "C++ 17 library for serialization to JSON, XML, YAML",
   "homepage": "https://bitbucket.org/Pavel_Kisliak/bitserializer",
+  "license": "MIT",
   "dependencies": [
     {
       "name": "vcpkg-cmake",
diff --git a/ports/crfsuite/portfile.cmake b/ports/crfsuite/portfile.cmake
index 14e3392163..dac715441e 100644
--- a/ports/crfsuite/portfile.cmake
+++ b/ports/crfsuite/portfile.cmake
@@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO chokkan/crfsuite
-    REF 5d1bd3b803bb26582ed5cc274d6b5af6cc7f9cae
-    SHA512 e7f329f96fb0dc0e347b3e7a3e26b23ceb45e6fae7b59ace05633a24d58a31665826ebc5280e5a864f50598772791e4b5b3e7da7f46994655cbe03806f823f73
+    REF a2a1547727985e3aff6a35cffe073f57f0223e9d
+    SHA512 d80f72fe13288bc516772542438c09439c6abbd4c15b06650f1de1fee7f7f710c1eed924d4300141807b8f86af398ae5d217974c13a65044515ceb163de441a4
     HEAD_REF master
 )
 
@@ -13,11 +13,10 @@ list(REMOVE_ITEM SOURCE_FILE "${SOURCE_PATH}/win32/liblbfgs/lbfgs_debug.lib")
 
 file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}")
 
-vcpkg_configure_cmake(
+vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
-    PREFIX_NINJA
 )
-vcpkg_install_cmake()
+vcpkg_cmake_install()
 vcpkg_copy_pdbs()
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
diff --git a/ports/crfsuite/vcpkg.json b/ports/crfsuite/vcpkg.json
index 5899466d52..b158282312 100644
--- a/ports/crfsuite/vcpkg.json
+++ b/ports/crfsuite/vcpkg.json
@@ -1,11 +1,15 @@
 {
   "name": "crfsuite",
-  "version-date": "2019-07-21",
-  "port-version": 3,
+  "version-date": "2020-08-27",
   "description": "CRFSuite is an implementation of Conditional Random Fields (CRFs) for labeling sequential data.",
   "homepage": "https://www.chokkan.org/software/crfsuite/",
+  "license": null,
   "supports": "!uwp",
   "dependencies": [
-    "liblbfgs"
+    "liblbfgs",
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    }
   ]
 }
diff --git a/ports/freealut/portfile.cmake b/ports/freealut/portfile.cmake
index 668b64e3a0..5db22992db 100644
--- a/ports/freealut/portfile.cmake
+++ b/ports/freealut/portfile.cmake
@@ -10,8 +10,7 @@ vcpkg_from_github(
 )
 
 vcpkg_cmake_configure(
-    SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
+    SOURCE_PATH "${SOURCE_PATH}"
     DISABLE_PARALLEL_CONFIGURE
     OPTIONS 
         -DBUILD_EXAMPLES=OFF
@@ -19,7 +18,7 @@ vcpkg_cmake_configure(
 )
 
 vcpkg_cmake_install()
-vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT})
+vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/${PORT}")
 vcpkg_fixup_pkgconfig()
 vcpkg_copy_pdbs()
 
@@ -39,4 +38,4 @@ if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/bin/freealut-config")
     file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin/freealut-config")
 endif()
 
-file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/ports/freealut/vcpkg.json b/ports/freealut/vcpkg.json
index 81739956c9..a6f1860ae7 100644
--- a/ports/freealut/vcpkg.json
+++ b/ports/freealut/vcpkg.json
@@ -1,12 +1,13 @@
 {
   "name": "freealut",
   "version": "1.1.0",
-  "port-version": 1,
+  "port-version": 2,
   "description": [
     "FreeALUT is a free implementation of OpenAL's ALUT standard.",
     "ALUT is a set of portable functions which remove the annoying details of getting an audio application started. It is the OpenAL counterpart of what GLUT is for OpenGL. "
   ],
   "homepage": "https://github.com/vancegroup/freealut",
+  "license": "LGPL-2.0-only",
   "supports": "!uwp",
   "dependencies": [
     "openal-soft",
diff --git a/ports/libe57/portfile.cmake b/ports/libe57/portfile.cmake
index c260430d67..afb1b4af4c 100644
--- a/ports/libe57/portfile.cmake
+++ b/ports/libe57/portfile.cmake
@@ -1,5 +1,5 @@
 set(VERSION 1.1.332)
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/E57RefImpl_src-${VERSION})
+set(SOURCE_PATH "${CURRENT_BUILDTREES_DIR}/src/E57RefImpl_src-${VERSION}")
 
 vcpkg_from_sourceforge(
     OUT_SOURCE_PATH SOURCE_PATH
@@ -13,11 +13,10 @@ vcpkg_from_sourceforge(
 )
 
 vcpkg_cmake_configure(
-    SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
+    SOURCE_PATH "${SOURCE_PATH}"
 )
 
-file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/share/libe57)
+file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/share/libe57")
 
 vcpkg_cmake_install()
 vcpkg_cmake_config_fixup()
@@ -28,5 +27,7 @@ vcpkg_copy_tools(
     AUTO_CLEAN
 )
 
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
+file(REMOVE "${CURRENT_PACKAGES_DIR}/share/e57refimpl/CHANGES.TXT")
+file(REMOVE "${CURRENT_PACKAGES_DIR}/share/e57refimpl/README.TXT")
diff --git a/ports/libe57/vcpkg.json b/ports/libe57/vcpkg.json
index eb35fdaab4..03f74169f5 100644
--- a/ports/libe57/vcpkg.json
+++ b/ports/libe57/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "libe57",
   "version-semver": "1.1.332",
-  "port-version": 1,
+  "port-version": 2,
   "description": "An open source implementation of the ASTM E2807 Standard Specification for 3D Imaging Data Exchange in the C++ language.",
   "homepage": "http://www.libe57.org/",
   "license": "BSL-1.0",
diff --git a/ports/libffi/portfile.cmake b/ports/libffi/portfile.cmake
index 7e397e685d..81bce85bae 100644
--- a/ports/libffi/portfile.cmake
+++ b/ports/libffi/portfile.cmake
@@ -3,7 +3,7 @@ set(VERSION 3.4.2)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO libffi/libffi
-    REF v${VERSION}
+    REF "v${VERSION}"
     SHA512 d399319efcca375fe901b05722e25eca31d11a4261c6a5d5079480bbc552d4e4b42de2026912689d3b2f886ebb3c8bebbea47102e38a2f6acbc526b8d5bba388
     HEAD_REF master
 )
@@ -13,9 +13,8 @@ file(COPY "${CMAKE_CURRENT_LIST_DIR}/libffiConfig.cmake.in" DESTINATION "${SOURC
 
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
-    PREFER_NINJA
     OPTIONS
-        -DFFI_CONFIG_FILE=${CMAKE_CURRENT_LIST_DIR}/fficonfig.h
+        "-DFFI_CONFIG_FILE=${CMAKE_CURRENT_LIST_DIR}/fficonfig.h"
     OPTIONS_DEBUG
         -DFFI_SKIP_HEADERS=ON
 )
diff --git a/ports/libffi/vcpkg.json b/ports/libffi/vcpkg.json
index 83130d841f..bebdbc62ea 100644
--- a/ports/libffi/vcpkg.json
+++ b/ports/libffi/vcpkg.json
@@ -1,9 +1,10 @@
 {
   "name": "libffi",
   "version": "3.4.2",
-  "port-version": 4,
+  "port-version": 5,
   "description": "Portable, high level programming interface to various calling conventions",
   "homepage": "https://github.com/libffi/libffi",
+  "license": "MIT",
   "dependencies": [
     {
       "name": "vcpkg-cmake",
diff --git a/ports/libmodplug/portfile.cmake b/ports/libmodplug/portfile.cmake
index a7af038161..cbc4e44073 100644
--- a/ports/libmodplug/portfile.cmake
+++ b/ports/libmodplug/portfile.cmake
@@ -4,7 +4,7 @@ if (VCPKG_LIBRARY_LINKAGE STREQUAL static)
     set(STATIC_PATCH "001-automagically-define-modplug-static.patch")
 endif()
 
-vcpkg_from_github(ARCHIVE
+vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Konstanty/libmodplug
     REF ${MODPLUG_HASH}
@@ -17,14 +17,14 @@ vcpkg_from_github(ARCHIVE
         005-fix-install-paths.patch # https://github.com/Konstanty/libmodplug/pull/61
 )
 
-vcpkg_configure_cmake(SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA)
+vcpkg_cmake_configure(SOURCE_PATH "${SOURCE_PATH}")
 
-vcpkg_install_cmake()
+vcpkg_cmake_install()
 
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 
 vcpkg_copy_pdbs()
 
 vcpkg_fixup_pkgconfig()
 
-file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/ports/libmodplug/vcpkg.json b/ports/libmodplug/vcpkg.json
index d5c8419554..d9a4feaa5c 100644
--- a/ports/libmodplug/vcpkg.json
+++ b/ports/libmodplug/vcpkg.json
@@ -1,8 +1,15 @@
 {
   "name": "libmodplug",
-  "version-string": "0.8.9.0",
-  "port-version": 9,
+  "version": "0.8.9.0",
+  "port-version": 10,
   "description": "The ModPlug mod file playing library.",
   "homepage": "https://github.com/Konstanty/libmodplug",
-  "supports": "!uwp"
+  "license": null,
+  "supports": "!uwp",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    }
+  ]
 }
diff --git a/ports/libsodium/portfile.cmake b/ports/libsodium/portfile.cmake
index f4afdc1978..6fd98241f5 100644
--- a/ports/libsodium/portfile.cmake
+++ b/ports/libsodium/portfile.cmake
@@ -6,11 +6,10 @@ vcpkg_from_github(
     HEAD_REF master
 )
 
-file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
+file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}")
 
 vcpkg_cmake_configure(
-    SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
+    SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
         -DBUILD_TESTING=OFF
 )
@@ -24,20 +23,16 @@ vcpkg_cmake_config_fixup(
 )
 
 file(REMOVE_RECURSE
-    ${CURRENT_PACKAGES_DIR}/debug/include
-    ${CURRENT_PACKAGES_DIR}/debug/share
+    "${CURRENT_PACKAGES_DIR}/debug/include"
+    "${CURRENT_PACKAGES_DIR}/debug/share"
 )
 
-file(REMOVE ${CURRENT_PACKAGES_DIR}/include/Makefile.am)
+file(REMOVE "${CURRENT_PACKAGES_DIR}/include/Makefile.am")
 
 configure_file(
-    ${SOURCE_PATH}/LICENSE
-    ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright
-    COPYONLY
-)
-
-configure_file(
-    ${CMAKE_CURRENT_LIST_DIR}/sodiumConfig.cmake.in
-    ${CURRENT_PACKAGES_DIR}/share/unofficial-sodium/unofficial-sodiumConfig.cmake
+    "${CMAKE_CURRENT_LIST_DIR}/sodiumConfig.cmake.in"
+    "${CURRENT_PACKAGES_DIR}/share/unofficial-sodium/unofficial-sodiumConfig.cmake"
     @ONLY
 )
+
+file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/ports/libsodium/vcpkg.json b/ports/libsodium/vcpkg.json
index 24a31c5be3..d2b01af14e 100644
--- a/ports/libsodium/vcpkg.json
+++ b/ports/libsodium/vcpkg.json
@@ -1,9 +1,10 @@
 {
   "name": "libsodium",
   "version": "1.0.18",
-  "port-version": 6,
+  "port-version": 7,
   "description": "A modern and easy-to-use crypto library",
   "homepage": "https://github.com/jedisct1/libsodium",
+  "license": "ISC",
   "dependencies": [
     {
       "name": "vcpkg-cmake",
diff --git a/ports/libsrtp/portfile.cmake b/ports/libsrtp/portfile.cmake
index d4074da0e4..4651baecc2 100644
--- a/ports/libsrtp/portfile.cmake
+++ b/ports/libsrtp/portfile.cmake
@@ -19,7 +19,6 @@ endif()
 
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
-    PREFER_NINJA
 )
 
 vcpkg_cmake_install()
diff --git a/ports/libsrtp/vcpkg.json b/ports/libsrtp/vcpkg.json
index 5ca1f13520..9131a77f82 100644
--- a/ports/libsrtp/vcpkg.json
+++ b/ports/libsrtp/vcpkg.json
@@ -1,8 +1,9 @@
 {
   "name": "libsrtp",
   "version": "2.4.2",
-  "port-version": 1,
+  "port-version": 2,
   "description": "This package provides an implementation of the Secure Real-time Transport Protocol (SRTP), the Universal Security Transform (UST), and a supporting cryptographic kernel.",
+  "license": null,
   "dependencies": [
     {
       "name": "vcpkg-cmake",
diff --git a/ports/llfio/portfile.cmake b/ports/llfio/portfile.cmake
index f896ba2392..6f133d71c1 100644
--- a/ports/llfio/portfile.cmake
+++ b/ports/llfio/portfile.cmake
@@ -59,7 +59,6 @@ endif()
 
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
-    PREFER_NINJA
     OPTIONS
         -DPROJECT_IS_DEPENDENCY=On
         -Dquickcpplib_DIR=${CURRENT_INSTALLED_DIR}/share/quickcpplib
diff --git a/ports/llfio/vcpkg.json b/ports/llfio/vcpkg.json
index d35443deb3..52457a800b 100644
--- a/ports/llfio/vcpkg.json
+++ b/ports/llfio/vcpkg.json
@@ -1,8 +1,10 @@
 {
   "name": "llfio",
-  "version-string": "2.0-20220112",
+  "version": "2.0-20220112",
+  "port-version": 1,
   "description": "P1031 low level file i/o and filesystem library for the C++ standard",
   "homepage": "https://github.com/ned14/llfio",
+  "license": "Apache-2.0 OR BSL-1.0",
   "supports": "!uwp",
   "dependencies": [
     "outcome",
diff --git a/ports/matio/portfile.cmake b/ports/matio/portfile.cmake
index c72bd3e4d0..924b302cab 100644
--- a/ports/matio/portfile.cmake
+++ b/ports/matio/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO tbeu/matio
-    REF ca56394e5672115df1981996ed12524d1d551259 # v1.5.19
-    SHA512 67c239d8aabafaa935775f3b260ba0756c196b0d845ef5116365c9aa6a0b24dae70d92c4e74d5d43ae073ae0744f084f0f58ead864eb77c813d43dbbb3e4ec5e
+    REF e9e063e08ef2a27fcc22b1e526258fea5a5de329 # v1.5.23
+    SHA512 78b13f4796870158f5cf2b8234c0ab6dc8b449cba49608ce40c51a3f91994c33c29b8a6de1ceed94a81fc7faa798d8c3a45a275f3a3abba70a0cd7be731e1d9c
     HEAD_REF master
     PATCHES fix-dependencies.patch
 )
@@ -19,8 +19,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
 )
 
 vcpkg_cmake_configure(
-    SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
+    SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS ${FEATURE_OPTIONS}
         -DMATIO_SHARED=${BUILD_SHARED}
         -DMATIO_USE_CONAN=OFF
diff --git a/ports/matio/vcpkg.json b/ports/matio/vcpkg.json
index 7e4b8d05ad..c325999aaf 100644
--- a/ports/matio/vcpkg.json
+++ b/ports/matio/vcpkg.json
@@ -1,9 +1,9 @@
 {
   "name": "matio",
-  "version-semver": "1.5.19",
-  "port-version": 1,
+  "version-semver": "1.5.23",
   "description": "MATLAB MAT File I/O Library",
   "homepage": "https://github.com/tbeu/matio",
+  "license": "BSD-2-Clause",
   "dependencies": [
     {
       "name": "vcpkg-cmake",
diff --git a/ports/matplotplusplus/portfile.cmake b/ports/matplotplusplus/portfile.cmake
index 8755fc8f2a..155d073849 100644
--- a/ports/matplotplusplus/portfile.cmake
+++ b/ports/matplotplusplus/portfile.cmake
@@ -31,8 +31,7 @@ vcpkg_check_features(
 )
 
 vcpkg_cmake_configure(
-    SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
+    SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS ${FEATURE_OPTIONS}
         -DCPM_USE_LOCAL_PACKAGES=ON
         -DBUILD_EXAMPLES=OFF
diff --git a/ports/matplotplusplus/vcpkg.json b/ports/matplotplusplus/vcpkg.json
index 296b6f8802..dce9fa30f5 100644
--- a/ports/matplotplusplus/vcpkg.json
+++ b/ports/matplotplusplus/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "matplotplusplus",
   "version-date": "2021-04-11",
-  "port-version": 5,
+  "port-version": 6,
   "description": "A C++ graphics library for data visualization",
   "homepage": "https://alandefreitas.github.io/matplotplusplus/",
   "license": "MIT",
diff --git a/ports/ned14-internal-quickcpplib/portfile.cmake b/ports/ned14-internal-quickcpplib/portfile.cmake
index d4c6318e6d..8f78243a0a 100644
--- a/ports/ned14-internal-quickcpplib/portfile.cmake
+++ b/ports/ned14-internal-quickcpplib/portfile.cmake
@@ -8,7 +8,7 @@
 # known to be compatible with QuickCppLib. It has occurred in the
 # past that newer versions were severely broken with QuickCppLib.
 
-include(${CURRENT_PORT_DIR}/sha_manifest.cmake)
+include("${CURRENT_PORT_DIR}/sha_manifest.cmake")
 
 if (NOT "cxx20" IN_LIST FEATURES)
     message(WARNING [=[
@@ -66,7 +66,6 @@ vcpkg_check_features(
 # Use QuickCppLib's own build process, skipping examples and tests.
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
-    PREFER_NINJA
     OPTIONS
         -DPROJECT_IS_DEPENDENCY=On
         -DCMAKE_DISABLE_FIND_PACKAGE_Git=ON
diff --git a/ports/ned14-internal-quickcpplib/vcpkg.json b/ports/ned14-internal-quickcpplib/vcpkg.json
index d79bfba953..2bd11b31ec 100644
--- a/ports/ned14-internal-quickcpplib/vcpkg.json
+++ b/ports/ned14-internal-quickcpplib/vcpkg.json
@@ -1,8 +1,10 @@
 {
   "name": "ned14-internal-quickcpplib",
-  "version-string": "0.0.0-cad832c8",
+  "version": "0.0.0-cad832c8",
+  "port-version": 1,
   "description": "NOT FOR EXTERNAL CONSUMPTION, a set of internal scripts used by ned14's libraries.",
   "homepage": "https://github.com/ned14/quickcpplib",
+  "license": "Apache-2.0",
   "dependencies": [
     "byte-lite",
     "gsl-lite",
diff --git a/ports/pixel/portfile.cmake b/ports/pixel/portfile.cmake
index 1cac519bf8..36c5424f49 100644
--- a/ports/pixel/portfile.cmake
+++ b/ports/pixel/portfile.cmake
@@ -1,5 +1,5 @@
 if(VCPKG_TARGET_IS_LINUX)
-    message(WARNING"${PORT} currently requires libglu1-mesa from the system package manager:
+    message(WARNING "${PORT} currently requires libglu1-mesa from the system package manager:
     This can be installed on Ubuntu systems via sudo apt install libglu1-mesa-dev")
 endif()
 
diff --git a/ports/pixel/vcpkg.json b/ports/pixel/vcpkg.json
index 00d5b4c22d..cc01890b4b 100644
--- a/ports/pixel/vcpkg.json
+++ b/ports/pixel/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "pixel",
   "version-date": "2022-03-15",
+  "port-version": 1,
   "description": "Simple 2D Graphics based on standard and portable OpenGL.",
   "homepage": "https://github.com/dascandy/pixel",
   "license": "Apache-2.0",
diff --git a/ports/pystring/portfile.cmake b/ports/pystring/portfile.cmake
index 31143c5c9c..bc370a0c2c 100644
--- a/ports/pystring/portfile.cmake
+++ b/ports/pystring/portfile.cmake
@@ -8,11 +8,10 @@ vcpkg_from_github(
   HEAD_REF master
 )
 
-file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
+file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}")
 
 vcpkg_cmake_configure(
-  SOURCE_PATH ${SOURCE_PATH}
-  PREFER_NINJA
+  SOURCE_PATH "${SOURCE_PATH}"
   OPTIONS_DEBUG -DDISABLE_INSTALL_HEADERS=ON
 )
 
@@ -20,4 +19,4 @@ vcpkg_cmake_install()
 vcpkg_cmake_config_fixup()
 vcpkg_copy_pdbs()
 
-file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/ports/pystring/vcpkg.json b/ports/pystring/vcpkg.json
index 4011f52e79..915b006049 100644
--- a/ports/pystring/vcpkg.json
+++ b/ports/pystring/vcpkg.json
@@ -1,9 +1,10 @@
 {
   "name": "pystring",
   "version-semver": "1.1.3",
-  "port-version": 4,
+  "port-version": 5,
   "description": "Pystring is a collection of C++ functions which match the interface and behavior of python's string class methods using std::string",
   "homepage": "https://github.com/imageworks/pystring",
+  "license": "LGPL-2.1-only",
   "dependencies": [
     {
       "name": "vcpkg-cmake",
diff --git a/ports/rbdl/portfile.cmake b/ports/rbdl/portfile.cmake
index be6a63c81a..750e4c6754 100644
--- a/ports/rbdl/portfile.cmake
+++ b/ports/rbdl/portfile.cmake
@@ -4,7 +4,7 @@ endif()
 
 string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" RBDL_STATIC)
 
-vcpkg_from_github(ARCHIVE
+vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO rbdl/rbdl
     REF v2.6.0
@@ -27,5 +27,5 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 vcpkg_copy_pdbs()
 
 file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
-
-vcpkg_fixup_pkgconfig()
+
+vcpkg_fixup_pkgconfig()
diff --git a/ports/rbdl/vcpkg.json b/ports/rbdl/vcpkg.json
index 96a3389ae3..9bc73197e3 100644
--- a/ports/rbdl/vcpkg.json
+++ b/ports/rbdl/vcpkg.json
@@ -1,9 +1,10 @@
 {
   "name": "rbdl",
   "version": "2.6.0",
-  "port-version": 2,
+  "port-version": 3,
   "description": "Rigid Body Dynamics Library",
   "homepage": "https://github.com/rbdl/rbdl",
+  "license": "Zlib",
   "dependencies": [
     "eigen3",
     {
diff --git a/ports/recast/portfile.cmake b/ports/recast/portfile.cmake
index 11484caa16..ebace1d11c 100644
--- a/ports/recast/portfile.cmake
+++ b/ports/recast/portfile.cmake
@@ -11,8 +11,7 @@ vcpkg_from_github(
 file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}")
 
 vcpkg_cmake_configure(
-    SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
+    SOURCE_PATH "${SOURCE_PATH}"
 )
 
 vcpkg_cmake_install()
@@ -20,6 +19,6 @@ vcpkg_cmake_install()
 vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-recast CONFIG_PATH share/unofficial-recast)
 
 vcpkg_copy_pdbs()
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 
 file(INSTALL "${SOURCE_PATH}/License.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/ports/recast/vcpkg.json b/ports/recast/vcpkg.json
index 5abe9f93b0..7163e255a9 100644
--- a/ports/recast/vcpkg.json
+++ b/ports/recast/vcpkg.json
@@ -1,9 +1,10 @@
 {
   "name": "recast",
   "version": "1.5.1",
-  "port-version": 4,
+  "port-version": 5,
   "description": "Navigation-mesh Toolset for Games",
   "homepage": "https://github.com/recastnavigation/recastnavigation",
+  "license": "Zlib",
   "dependencies": [
     {
       "name": "vcpkg-cmake",
diff --git a/ports/refl-cpp/portfile.cmake b/ports/refl-cpp/portfile.cmake
index c6f83e8656..3ef302408c 100644
--- a/ports/refl-cpp/portfile.cmake
+++ b/ports/refl-cpp/portfile.cmake
@@ -2,7 +2,7 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO veselink1/refl-cpp
-    REF ce47c1355219f3b9af56ae91d997daf2b1555d97 v0.12.3
+    REF ce47c1355219f3b9af56ae91d997daf2b1555d97 #v0.12.3
     SHA512 f73e542a9ee00d677e2445c148b732cbdf6247adc1f4f412ad8e9587c5971b3cb02b39b15cdb9b0788f53e9efea6c5a485367505ecb569a367be012f6246ea92
     HEAD_REF master
 )
diff --git a/ports/refl-cpp/vcpkg.json b/ports/refl-cpp/vcpkg.json
index 8cbcc31a5b..88defcfdda 100644
--- a/ports/refl-cpp/vcpkg.json
+++ b/ports/refl-cpp/vcpkg.json
@@ -1,6 +1,8 @@
 {
   "name": "refl-cpp",
   "version": "0.12.3",
+  "port-version": 1,
   "description": "Static reflection for C++17 (compile-time enumeration, attributes, proxies, overloads, template functions, metaprogramming).",
-  "homepage": "https://github.com/veselink1/refl-cpp"
+  "homepage": "https://github.com/veselink1/refl-cpp",
+  "license": "MIT"
 }
diff --git a/ports/restinio/portfile.cmake b/ports/restinio/portfile.cmake
index 2b13c48341..0d36ca26c9 100644
--- a/ports/restinio/portfile.cmake
+++ b/ports/restinio/portfile.cmake
@@ -6,13 +6,12 @@ vcpkg_from_github(
 )
 
 vcpkg_cmake_configure(
-    SOURCE_PATH ${SOURCE_PATH}/vcpkg
-    PREFER_NINJA
+    SOURCE_PATH "${SOURCE_PATH}/vcpkg"
 )
 
 vcpkg_cmake_install()
 vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/restinio)
 
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib ${CURRENT_PACKAGES_DIR}/debug)
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib" "${CURRENT_PACKAGES_DIR}/debug")
 # Handle copyright
-file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/ports/restinio/vcpkg.json b/ports/restinio/vcpkg.json
index 5cf1ad2986..ed6cc623b9 100644
--- a/ports/restinio/vcpkg.json
+++ b/ports/restinio/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "restinio",
   "version": "0.6.14",
+  "port-version": 1,
   "description": "A header-only C++14 library that gives you an embedded HTTP/Websocket server targeted primarily for asynchronous processing of HTTP-requests.",
   "homepage": "https://github.com/Stiffstream/restinio",
   "license": "BSD-3-Clause",
diff --git a/ports/sockpp/portfile.cmake b/ports/sockpp/portfile.cmake
index f9af412b42..2ab525a968 100644
--- a/ports/sockpp/portfile.cmake
+++ b/ports/sockpp/portfile.cmake
@@ -8,11 +8,10 @@ vcpkg_from_github(
     HEAD_REF master
 )
 
-vcpkg_replace_string(${SOURCE_PATH}/CMakeLists.txt "\${SOCKPP}-static" "\${SOCKPP}")
+vcpkg_replace_string("${SOURCE_PATH}/CMakeLists.txt" "\${SOCKPP}-static" "\${SOCKPP}")
 
 vcpkg_cmake_configure(
-    SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
+    SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
         -DSOCKPP_BUILD_SHARED=OFF
         -DSOCKPP_BUILD_STATIC=ON
@@ -23,9 +22,9 @@ vcpkg_cmake_configure(
 
 vcpkg_cmake_install()
 
-file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
-file(INSTALL ${CURRENT_PORT_DIR}/sockppConfig.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
+file(INSTALL "${CURRENT_PORT_DIR}/sockppConfig.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
 
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 
-file(COPY ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
+file(COPY "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
+file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/ports/sockpp/vcpkg.json b/ports/sockpp/vcpkg.json
index c985086f14..07d6f3f000 100644
--- a/ports/sockpp/vcpkg.json
+++ b/ports/sockpp/vcpkg.json
@@ -1,17 +1,15 @@
 {
   "name": "sockpp",
   "version": "0.7.1",
+  "port-version": 1,
   "description": "Simple, modern, C++ socket library. This is a fairly low-level C++ wrapper around the Berkeley sockets library using socket, acceptor, and connector classes that are familiar concepts from other languages.",
   "homepage": "https://github.com/fpagliughi/sockpp",
+  "license": "BSD-3-Clause",
   "supports": "!uwp",
   "dependencies": [
     {
       "name": "vcpkg-cmake",
       "host": true
-    },
-    {
-      "name": "vcpkg-cmake-config",
-      "host": true
     }
   ]
 }
diff --git a/ports/szip/portfile.cmake b/ports/szip/portfile.cmake
index 038736e7a9..1f5a9fb2f6 100644
--- a/ports/szip/portfile.cmake
+++ b/ports/szip/portfile.cmake
@@ -8,7 +8,7 @@ vcpkg_download_distfile(ARCHIVE
 vcpkg_extract_source_archive_ex(
     OUT_SOURCE_PATH SOURCE_PATH
     ARCHIVE "${ARCHIVE}"
-    REF szip-${SZIP_VERSION}
+    REF "szip-${SZIP_VERSION}"
     PATCHES
         fix-linkage-config.patch
         mingw-lib-names.patch
@@ -16,7 +16,6 @@ vcpkg_extract_source_archive_ex(
 
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
-    PREFER_NINJA
     OPTIONS
         -DSZIP_INSTALL_DATA_DIR=share/szip/data
         -DSZIP_INSTALL_CMAKE_DIR=share/szip
@@ -62,7 +61,8 @@ if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/lib")
 endif()
 vcpkg_fixup_pkgconfig()
 
-file(RENAME "${CURRENT_PACKAGES_DIR}/share/szip/data/COPYING" "${CURRENT_PACKAGES_DIR}/share/szip/copyright")
-
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/szip/data")
+
+file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/ports/szip/vcpkg.json b/ports/szip/vcpkg.json
index 7c83b1a157..a0e93f3155 100644
--- a/ports/szip/vcpkg.json
+++ b/ports/szip/vcpkg.json
@@ -1,9 +1,10 @@
 {
   "name": "szip",
   "version": "2.1.1",
-  "port-version": 7,
+  "port-version": 8,
   "description": "Szip compression software, providing lossless compression of scientific data",
   "homepage": "https://support.hdfgroup.org/ftp/lib-external/szip",
+  "license": null,
   "dependencies": [
     {
       "name": "vcpkg-cmake",
diff --git a/ports/taglib/portfile.cmake b/ports/taglib/portfile.cmake
index a951b7e64a..c376de69a3 100644
--- a/ports/taglib/portfile.cmake
+++ b/ports/taglib/portfile.cmake
@@ -13,7 +13,6 @@ endif()
 
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
-    PREFER_NINJA
     OPTIONS ${WINRT_OPTIONS}
 )
 vcpkg_cmake_install()
@@ -32,12 +31,6 @@ endif()
 
 # remove the debug/include files
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
-
-# copyright file
-file(COPY "${SOURCE_PATH}/COPYING.LGPL" DESTINATION "${CURRENT_PACKAGES_DIR}/share/taglib")
-file(COPY "${SOURCE_PATH}/COPYING.MPL" DESTINATION "${CURRENT_PACKAGES_DIR}/share/taglib")
-file(RENAME "${CURRENT_PACKAGES_DIR}/share/taglib/COPYING.LGPL" "${CURRENT_PACKAGES_DIR}/share/taglib/copyright")
-
 file(REMOVE "${CURRENT_PACKAGES_DIR}/bin/taglib-config.cmd" "${CURRENT_PACKAGES_DIR}/debug/bin/taglib-config.cmd") # Contains absolute paths
 
 # remove bin directory for static builds (taglib creates a cmake batch file there)
@@ -48,3 +41,7 @@ endif()
 
 vcpkg_copy_pdbs()
 
+# copyright file
+file(COPY "${SOURCE_PATH}/COPYING.LGPL" DESTINATION "${CURRENT_PACKAGES_DIR}/share/taglib")
+file(COPY "${SOURCE_PATH}/COPYING.MPL" DESTINATION "${CURRENT_PACKAGES_DIR}/share/taglib")
+file(RENAME "${CURRENT_PACKAGES_DIR}/share/taglib/COPYING.LGPL" "${CURRENT_PACKAGES_DIR}/share/taglib/copyright")
diff --git a/ports/taglib/vcpkg.json b/ports/taglib/vcpkg.json
index 54e9759ba2..2a3f1c97a6 100644
--- a/ports/taglib/vcpkg.json
+++ b/ports/taglib/vcpkg.json
@@ -1,10 +1,10 @@
 {
   "name": "taglib",
   "version-semver": "1.12.0",
-  "port-version": 2,
+  "port-version": 3,
   "description": "TagLib Audio Meta-Data Library",
   "homepage": "https://taglib.org/",
-  "license": "LGPL-2.1 OR MPL-1.1",
+  "license": "LGPL-2.1-only OR MPL-1.1",
   "dependencies": [
     {
       "name": "vcpkg-cmake",
diff --git a/ports/thor/portfile.cmake b/ports/thor/portfile.cmake
index 8371f16139..c45ca4297e 100644
--- a/ports/thor/portfile.cmake
+++ b/ports/thor/portfile.cmake
@@ -1,4 +1,4 @@
-vcpkg_from_github(ARCHIVE
+vcpkg_from_github(
   OUT_SOURCE_PATH SOURCE_PATH
   REPO Bromeon/Thor
   REF v2.0
@@ -6,24 +6,23 @@ vcpkg_from_github(ARCHIVE
   HEAD_REF master
   PATCHES fix-dependency-sfml.patch
 )
-file(REMOVE ${SOURCE_PATH}/cmake/Modules/FindSFML.cmake)
+file(REMOVE "${SOURCE_PATH}/cmake/Modules/FindSFML.cmake")
 
-file(REMOVE_RECURSE ${SOURCE_PATH}/extlibs)
-file(COPY ${CURRENT_INSTALLED_DIR}/include/Aurora DESTINATION ${SOURCE_PATH}/extlibs/aurora/include)
+file(REMOVE_RECURSE "${SOURCE_PATH}/extlibs")
+file(COPY "${CURRENT_INSTALLED_DIR}/include/Aurora" DESTINATION "${SOURCE_PATH}/extlibs/aurora/include")
 file(WRITE "${SOURCE_PATH}/extlibs/aurora/License.txt")
 
 string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" THOR_STATIC_STD_LIBS)
 string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" THOR_SHARED_LIBS)
 
-vcpkg_configure_cmake(
-  SOURCE_PATH ${SOURCE_PATH}
-  PREFER_NINJA
+vcpkg_cmake_configure(
+  SOURCE_PATH "${SOURCE_PATH}"
   OPTIONS
     -DTHOR_SHARED_LIBS=${THOR_SHARED_LIBS}
     -DTHOR_STATIC_STD_LIBS=${THOR_STATIC_STD_LIBS}
 )
 
-vcpkg_install_cmake()
+vcpkg_cmake_install()
 
 vcpkg_copy_pdbs()
 
@@ -48,10 +47,10 @@ if(LICENSE)
   file(REMOVE ${LICENSE})
 endif()
 
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/include/Aurora)
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/include/Aurora")
 
 if(NOT VCPKG_TARGET_IS_WINDOWS)
-    file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
+    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
 endif()
 
-file(INSTALL ${SOURCE_PATH}/License.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+file(INSTALL "${SOURCE_PATH}/License.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/ports/thor/vcpkg.json b/ports/thor/vcpkg.json
index 3b1c3cfee0..17b1ad360f 100644
--- a/ports/thor/vcpkg.json
+++ b/ports/thor/vcpkg.json
@@ -1,11 +1,16 @@
 {
   "name": "thor",
   "version": "2.0",
-  "port-version": 4,
+  "port-version": 5,
   "description": "Extends the multimedia library SFML with higher-level features",
   "homepage": "www.bromeon.ch/libraries/thor",
+  "license": "Zlib",
   "dependencies": [
     "aurora",
-    "sfml"
+    "sfml",
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    }
   ]
 }
diff --git a/ports/workflow/portfile.cmake b/ports/workflow/portfile.cmake
index 5075bbde4b..300b21cc32 100644
--- a/ports/workflow/portfile.cmake
+++ b/ports/workflow/portfile.cmake
@@ -17,15 +17,16 @@ else()
 endif()
 
 vcpkg_cmake_configure(
-    SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
+    SOURCE_PATH "${SOURCE_PATH}"
     DISABLE_PARALLEL_CONFIGURE
 )
 
 vcpkg_cmake_install()
-vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT})
+vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/${PORT}")
 vcpkg_copy_pdbs()
 
 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)
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/doc")
+
+file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/ports/workflow/vcpkg.json b/ports/workflow/vcpkg.json
index bbea856635..66c55a536e 100644
--- a/ports/workflow/vcpkg.json
+++ b/ports/workflow/vcpkg.json
@@ -1,8 +1,10 @@
 {
   "name": "workflow",
   "version": "0.9.7",
+  "port-version": 1,
   "description": "About C++ Parallel Computing and Asynchronous Networking Engine",
   "homepage": "https://github.com/sogou/workflow",
+  "license": "Apache-2.0",
   "dependencies": [
     "openssl",
     {
diff --git a/versions/a-/aubio.json b/versions/a-/aubio.json
index 9528d263f5..11156e198e 100644
--- a/versions/a-/aubio.json
+++ b/versions/a-/aubio.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "511a11ecdc92221bcde518ad98f22512788a07a4",
+      "version-semver": "0.4.9",
+      "port-version": 9
+    },
     {
       "git-tree": "4888190139ae3bd7f3fdb15f79453b25f59a45f5",
       "version-semver": "0.4.9",
diff --git a/versions/b-/bitserializer.json b/versions/b-/bitserializer.json
index a58466de15..00d44d04e1 100644
--- a/versions/b-/bitserializer.json
+++ b/versions/b-/bitserializer.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "e25c895f4054e151b1865640ae8500efcddda95b",
+      "version": "0.44",
+      "port-version": 1
+    },
     {
       "git-tree": "66c9246073510ab554418a0b63ef9ee471b05b76",
       "version": "0.44",
diff --git a/versions/baseline.json b/versions/baseline.json
index e26402e1e6..794458caac 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -222,7 +222,7 @@
     },
     "aubio": {
       "baseline": "0.4.9",
-      "port-version": 8
+      "port-version": 9
     },
     "audiofile": {
       "baseline": "1.1.0",
@@ -466,7 +466,7 @@
     },
     "bitserializer": {
       "baseline": "0.44",
-      "port-version": 0
+      "port-version": 1
     },
     "bitserializer-cpprestjson": {
       "baseline": "alias",
@@ -1689,8 +1689,8 @@
       "port-version": 0
     },
     "crfsuite": {
-      "baseline": "2019-07-21",
-      "port-version": 3
+      "baseline": "2020-08-27",
+      "port-version": 0
     },
     "croncpp": {
       "baseline": "2020-09-04",
@@ -2318,7 +2318,7 @@
     },
     "freealut": {
       "baseline": "1.1.0",
-      "port-version": 1
+      "port-version": 2
     },
     "freeglut": {
       "baseline": "3.2.2",
@@ -3522,7 +3522,7 @@
     },
     "libe57": {
       "baseline": "1.1.332",
-      "port-version": 1
+      "port-version": 2
     },
     "libe57format": {
       "baseline": "2.2.0",
@@ -3554,7 +3554,7 @@
     },
     "libffi": {
       "baseline": "3.4.2",
-      "port-version": 4
+      "port-version": 5
     },
     "libfido2": {
       "baseline": "1.10.0",
@@ -3782,7 +3782,7 @@
     },
     "libmodplug": {
       "baseline": "0.8.9.0",
-      "port-version": 9
+      "port-version": 10
     },
     "libmorton": {
       "baseline": "0.2.8",
@@ -4018,7 +4018,7 @@
     },
     "libsodium": {
       "baseline": "1.0.18",
-      "port-version": 6
+      "port-version": 7
     },
     "libsoundio": {
       "baseline": "2.0.0",
@@ -4046,7 +4046,7 @@
     },
     "libsrtp": {
       "baseline": "2.4.2",
-      "port-version": 1
+      "port-version": 2
     },
     "libssh": {
       "baseline": "0.9.6",
@@ -4258,7 +4258,7 @@
     },
     "llfio": {
       "baseline": "2.0-20220112",
-      "port-version": 0
+      "port-version": 1
     },
     "llgl": {
       "baseline": "2019-08-15",
@@ -4425,8 +4425,8 @@
       "port-version": 0
     },
     "matio": {
-      "baseline": "1.5.19",
-      "port-version": 1
+      "baseline": "1.5.23",
+      "port-version": 0
     },
     "matplotlib-cpp": {
       "baseline": "2020-08-27",
@@ -4434,7 +4434,7 @@
     },
     "matplotplusplus": {
       "baseline": "2021-04-11",
-      "port-version": 5
+      "port-version": 6
     },
     "matroska": {
       "baseline": "1.6.3",
@@ -4814,7 +4814,7 @@
     },
     "ned14-internal-quickcpplib": {
       "baseline": "0.0.0-cad832c8",
-      "port-version": 0
+      "port-version": 1
     },
     "neon2sse": {
       "baseline": "2021-09-16",
@@ -5426,7 +5426,7 @@
     },
     "pixel": {
       "baseline": "2022-03-15",
-      "port-version": 0
+      "port-version": 1
     },
     "pixman": {
       "baseline": "0.40.0",
@@ -5638,7 +5638,7 @@
     },
     "pystring": {
       "baseline": "1.1.3",
-      "port-version": 4
+      "port-version": 5
     },
     "python2": {
       "baseline": "2.7.18",
@@ -6114,7 +6114,7 @@
     },
     "rbdl": {
       "baseline": "2.6.0",
-      "port-version": 2
+      "port-version": 3
     },
     "rbdl-orb": {
       "baseline": "3.1.2",
@@ -6154,7 +6154,7 @@
     },
     "recast": {
       "baseline": "1.5.1",
-      "port-version": 4
+      "port-version": 5
     },
     "redis-plus-plus": {
       "baseline": "1.3.2",
@@ -6162,7 +6162,7 @@
     },
     "refl-cpp": {
       "baseline": "0.12.3",
-      "port-version": 0
+      "port-version": 1
     },
     "refprop-headers": {
       "baseline": "2019-04-14",
@@ -6198,7 +6198,7 @@
     },
     "restinio": {
       "baseline": "0.6.14",
-      "port-version": 0
+      "port-version": 1
     },
     "rexo": {
       "baseline": "0.2.2",
@@ -6602,7 +6602,7 @@
     },
     "sockpp": {
       "baseline": "0.7.1",
-      "port-version": 0
+      "port-version": 1
     },
     "soem": {
       "baseline": "1.4.0",
@@ -6854,7 +6854,7 @@
     },
     "szip": {
       "baseline": "2.1.1",
-      "port-version": 7
+      "port-version": 8
     },
     "tabulate": {
       "baseline": "2019-01-06",
@@ -6866,7 +6866,7 @@
     },
     "taglib": {
       "baseline": "1.12.0",
-      "port-version": 2
+      "port-version": 3
     },
     "taocpp-json": {
       "baseline": "2020-09-14",
@@ -6954,7 +6954,7 @@
     },
     "thor": {
       "baseline": "2.0",
-      "port-version": 4
+      "port-version": 5
     },
     "threadpool": {
       "baseline": "0.2.5",
@@ -7542,7 +7542,7 @@
     },
     "workflow": {
       "baseline": "0.9.7",
-      "port-version": 0
+      "port-version": 1
     },
     "wpilib": {
       "baseline": "2020.3.2",
diff --git a/versions/c-/crfsuite.json b/versions/c-/crfsuite.json
index 0458068996..f81e1ca2c1 100644
--- a/versions/c-/crfsuite.json
+++ b/versions/c-/crfsuite.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "8f290a396def84e4a24ca49e29d17d7218b8e410",
+      "version-date": "2020-08-27",
+      "port-version": 0
+    },
     {
       "git-tree": "b74e8dd91be02cf5bbbd6f6387d66468fe579e8e",
       "version-date": "2019-07-21",
diff --git a/versions/f-/freealut.json b/versions/f-/freealut.json
index 6bc300bb79..457bdf8ebd 100644
--- a/versions/f-/freealut.json
+++ b/versions/f-/freealut.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "bb6f48903b677ac0c8560a068e53f7a028b2a5d4",
+      "version": "1.1.0",
+      "port-version": 2
+    },
     {
       "git-tree": "ba650aae9b1cf7a21c83ad0303f1bc520a82740b",
       "version": "1.1.0",
diff --git a/versions/l-/libe57.json b/versions/l-/libe57.json
index 0371207eac..647a283515 100644
--- a/versions/l-/libe57.json
+++ b/versions/l-/libe57.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "e53fb4c480d35feeeb67361182d4d630ac3834ca",
+      "version-semver": "1.1.332",
+      "port-version": 2
+    },
     {
       "git-tree": "e38a82bc97129e317606207d234101aefe7dcb17",
       "version-semver": "1.1.332",
diff --git a/versions/l-/libffi.json b/versions/l-/libffi.json
index f69e954761..ba4f4807ce 100644
--- a/versions/l-/libffi.json
+++ b/versions/l-/libffi.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "14f8b4d7dc645ea8f2ddfe77eeaaeef55f123cb5",
+      "version": "3.4.2",
+      "port-version": 5
+    },
     {
       "git-tree": "05f73f7c0bbd49045d312d90683a01405f5ffd83",
       "version": "3.4.2",
diff --git a/versions/l-/libmodplug.json b/versions/l-/libmodplug.json
index a342cd4762..0cc7077213 100644
--- a/versions/l-/libmodplug.json
+++ b/versions/l-/libmodplug.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "605d260810f9d1a489af7fb484d509581b39763d",
+      "version": "0.8.9.0",
+      "port-version": 10
+    },
     {
       "git-tree": "28b465d4794e5c5545cb486da31a9a7ce208654b",
       "version-string": "0.8.9.0",
diff --git a/versions/l-/libsodium.json b/versions/l-/libsodium.json
index 7c623c5346..b193c35e27 100644
--- a/versions/l-/libsodium.json
+++ b/versions/l-/libsodium.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "9ffdf9b217021918c33311af9faa9b4a3086d004",
+      "version": "1.0.18",
+      "port-version": 7
+    },
     {
       "git-tree": "06e21819c9b176b52aa0b9226c3e2bc07ec20a23",
       "version": "1.0.18",
diff --git a/versions/l-/libsrtp.json b/versions/l-/libsrtp.json
index 85c54b46b8..07d81e3305 100644
--- a/versions/l-/libsrtp.json
+++ b/versions/l-/libsrtp.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "7c935c9b1559cab3460f928c2a6abb25271cfb65",
+      "version": "2.4.2",
+      "port-version": 2
+    },
     {
       "git-tree": "a7e8bce682acd4a29f666961a69127864cd93374",
       "version": "2.4.2",
diff --git a/versions/l-/llfio.json b/versions/l-/llfio.json
index f2a4b5461d..f7910b2e6d 100644
--- a/versions/l-/llfio.json
+++ b/versions/l-/llfio.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "bc96b88ab308808ce26135e75038c4b316d5533c",
+      "version": "2.0-20220112",
+      "port-version": 1
+    },
     {
       "git-tree": "aaacb49264f3175de57367f28c90bd3904d7209f",
       "version-string": "2.0-20220112",
diff --git a/versions/m-/matio.json b/versions/m-/matio.json
index 74bf34be5d..472498c791 100644
--- a/versions/m-/matio.json
+++ b/versions/m-/matio.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "e018403a4c2e749f8983b6a64f60dac577342853",
+      "version-semver": "1.5.23",
+      "port-version": 0
+    },
     {
       "git-tree": "c11c8ba1ca5c7f0286165d497088779ec0df756a",
       "version-semver": "1.5.19",
diff --git a/versions/m-/matplotplusplus.json b/versions/m-/matplotplusplus.json
index 6d730f39d3..8dc2b38c29 100644
--- a/versions/m-/matplotplusplus.json
+++ b/versions/m-/matplotplusplus.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "8554ae7ec807245bdcd27b44ddebd39608edfe53",
+      "version-date": "2021-04-11",
+      "port-version": 6
+    },
     {
       "git-tree": "e0496a49614d3fc1f77f20f230b3168720140c3b",
       "version-date": "2021-04-11",
diff --git a/versions/n-/ned14-internal-quickcpplib.json b/versions/n-/ned14-internal-quickcpplib.json
index dbd0afaa80..28e2339353 100644
--- a/versions/n-/ned14-internal-quickcpplib.json
+++ b/versions/n-/ned14-internal-quickcpplib.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "be7fa7b222ea2c080583b12ad2f203d63c7ed55c",
+      "version": "0.0.0-cad832c8",
+      "port-version": 1
+    },
     {
       "git-tree": "af77893b0d87106812194f8bc866ecfbc6ade24a",
       "version-string": "0.0.0-cad832c8",
diff --git a/versions/p-/pixel.json b/versions/p-/pixel.json
index f0bfad7838..3e2ca86e6a 100644
--- a/versions/p-/pixel.json
+++ b/versions/p-/pixel.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "54bad3e5b7d0455972d0cc84fa90e5d6549b6203",
+      "version-date": "2022-03-15",
+      "port-version": 1
+    },
     {
       "git-tree": "dbf76415a78802e7dc2717280e2a44123a04df69",
       "version-date": "2022-03-15",
diff --git a/versions/p-/pystring.json b/versions/p-/pystring.json
index 7fef6450f6..ab15494a5a 100644
--- a/versions/p-/pystring.json
+++ b/versions/p-/pystring.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "b0b08ff66f53aeb63ab3797212c667a822c88a3e",
+      "version-semver": "1.1.3",
+      "port-version": 5
+    },
     {
       "git-tree": "ed5bf60bd6e1720457de5eaa39f01f5b3a414f01",
       "version-semver": "1.1.3",
diff --git a/versions/r-/rbdl.json b/versions/r-/rbdl.json
index cc9bc2e16b..b229336aa0 100644
--- a/versions/r-/rbdl.json
+++ b/versions/r-/rbdl.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "9d0f94e12844bb594f54986246e876569cfca0c1",
+      "version": "2.6.0",
+      "port-version": 3
+    },
     {
       "git-tree": "48b44c8cf3286f0ce9c87b95e126634997d03137",
       "version": "2.6.0",
diff --git a/versions/r-/recast.json b/versions/r-/recast.json
index 82f778cd71..76bccf1b4d 100644
--- a/versions/r-/recast.json
+++ b/versions/r-/recast.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "fe2b42ef737e0b51a58bb9f56340e324ab8f82c3",
+      "version": "1.5.1",
+      "port-version": 5
+    },
     {
       "git-tree": "2f34af0b398b4c37f0cdf3fcd8dc9db965e4dd5e",
       "version": "1.5.1",
diff --git a/versions/r-/refl-cpp.json b/versions/r-/refl-cpp.json
index 2eb82df9d6..349e371cde 100644
--- a/versions/r-/refl-cpp.json
+++ b/versions/r-/refl-cpp.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "cb8d6fa4720dd349ab60b95ad01380b55d0d4e1c",
+      "version": "0.12.3",
+      "port-version": 1
+    },
     {
       "git-tree": "7018b2c10e3c2e2be8dd774fb43d2f04fa520a02",
       "version": "0.12.3",
diff --git a/versions/r-/restinio.json b/versions/r-/restinio.json
index 43569965bf..7939d0c292 100644
--- a/versions/r-/restinio.json
+++ b/versions/r-/restinio.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "ea4d99d764e913dd233ac8d1df27c6720f5ccbd9",
+      "version": "0.6.14",
+      "port-version": 1
+    },
     {
       "git-tree": "65493f16b394fd5a61f908afc058dae965a60989",
       "version": "0.6.14",
diff --git a/versions/s-/sockpp.json b/versions/s-/sockpp.json
index d54217a9c5..792eb3f5de 100644
--- a/versions/s-/sockpp.json
+++ b/versions/s-/sockpp.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "608151660b414b2bbcdec35bdd622fdce5620abb",
+      "version": "0.7.1",
+      "port-version": 1
+    },
     {
       "git-tree": "d54d2c1ee9ebaae60a83c72c50207b83d56f3917",
       "version": "0.7.1",
diff --git a/versions/s-/szip.json b/versions/s-/szip.json
index 83945853f3..de4087f88f 100644
--- a/versions/s-/szip.json
+++ b/versions/s-/szip.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "0c8569ffc46401d06cff22755c0b95953ce5e828",
+      "version": "2.1.1",
+      "port-version": 8
+    },
     {
       "git-tree": "6f810fcedf9469940a80e5c343d983a55134332b",
       "version": "2.1.1",
diff --git a/versions/t-/taglib.json b/versions/t-/taglib.json
index 4c35acb648..74616d0a26 100644
--- a/versions/t-/taglib.json
+++ b/versions/t-/taglib.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "68a57ea8641a01a2a1c353f91acb5a3020c0769b",
+      "version-semver": "1.12.0",
+      "port-version": 3
+    },
     {
       "git-tree": "246255cab48b434b3c78aaa315f5f62b4692f255",
       "version-semver": "1.12.0",
diff --git a/versions/t-/thor.json b/versions/t-/thor.json
index 708cdd8038..be1564b237 100644
--- a/versions/t-/thor.json
+++ b/versions/t-/thor.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "45ba80aa43a83b1c810d757922428538f82d8123",
+      "version": "2.0",
+      "port-version": 5
+    },
     {
       "git-tree": "cada171d405874f848790c8e10a7f332bbed1e6c",
       "version": "2.0",
diff --git a/versions/w-/workflow.json b/versions/w-/workflow.json
index 67609cd7f7..fd24509a37 100644
--- a/versions/w-/workflow.json
+++ b/versions/w-/workflow.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "2e673ba0fd8857c0d13f6137e32b3ce5cfda65d9",
+      "version": "0.9.7",
+      "port-version": 1
+    },
     {
       "git-tree": "864387c239d4b0fadabfc4b314564d75c9bc07bc",
       "version": "0.9.7",