diff --git a/ports/chartdir/portfile.cmake b/ports/chartdir/portfile.cmake
index f4ad36e81f..d22b18e2d5 100644
--- a/ports/chartdir/portfile.cmake
+++ b/ports/chartdir/portfile.cmake
@@ -88,6 +88,6 @@ endif()
 file(GLOB HEADERS "${SOURCE_PATH}/include/*.h")
 file(COPY ${HEADERS} DESTINATION "${CURRENT_PACKAGES_DIR}/include/${PORT}")
 file(COPY "${CMAKE_CURRENT_LIST_DIR}/chartdir.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include")
-file(COPY "${SOURCE_PATH}/LICENSE.TXT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright")
 configure_file("${CMAKE_CURRENT_LIST_DIR}/Config.cmake.in" "${CURRENT_PACKAGES_DIR}/share/${PORT}/chartdir-config.cmake" @ONLY)
 file(COPY "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
+file(INSTALL "${SOURCE_PATH}/LICENSE.TXT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/ports/chartdir/vcpkg.json b/ports/chartdir/vcpkg.json
index 9e8fcacfa5..be70f68ae9 100644
--- a/ports/chartdir/vcpkg.json
+++ b/ports/chartdir/vcpkg.json
@@ -1,8 +1,9 @@
 {
   "name": "chartdir",
   "version": "7.0.0",
-  "port-version": 4,
+  "port-version": 5,
   "description": "ChartDirector is a powerful chart component for creating professional looking charts for web and windows applications.",
   "homepage": "https://www.advsofteng.com/",
+  "license": null,
   "supports": "!arm & !uwp"
 }
diff --git a/ports/mdnsresponder/portfile.cmake b/ports/mdnsresponder/portfile.cmake
index 5a391a45a0..edb814715c 100644
--- a/ports/mdnsresponder/portfile.cmake
+++ b/ports/mdnsresponder/portfile.cmake
@@ -86,8 +86,5 @@ file(INSTALL
   "${SOURCE_PATH}/mDNSShared/dns_sd.h"
   DESTINATION "${CURRENT_PACKAGES_DIR}/include"
 )
-file(INSTALL
-  "${SOURCE_PATH}/LICENSE"
-  DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright"
-)
 vcpkg_copy_pdbs()
+file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/ports/mdnsresponder/vcpkg.json b/ports/mdnsresponder/vcpkg.json
index 920ce4c4ad..add6a23fac 100644
--- a/ports/mdnsresponder/vcpkg.json
+++ b/ports/mdnsresponder/vcpkg.json
@@ -1,8 +1,9 @@
 {
   "name": "mdnsresponder",
   "version": "878.270.2",
-  "port-version": 1,
+  "port-version": 2,
   "description": "The mDNSResponder project is a component of Bonjour, Apple's ease-of-use IP networking initiative.",
   "homepage": "https://developer.apple.com/bonjour/",
+  "license": null,
   "supports": "windows & !uwp & !arm"
 }
diff --git a/ports/mgnlibs/portfile.cmake b/ports/mgnlibs/portfile.cmake
index cd5ee8d213..fa0295e7cd 100644
--- a/ports/mgnlibs/portfile.cmake
+++ b/ports/mgnlibs/portfile.cmake
@@ -7,10 +7,8 @@ vcpkg_from_github(
     HEAD_REF master
 )
 
-# Put the licence file where vcpkg expects it
-file(COPY ${SOURCE_PATH}/README.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/mgnlibs/README.md)
-file(RENAME ${CURRENT_PACKAGES_DIR}/share/mgnlibs/README.md ${CURRENT_PACKAGES_DIR}/share/mgnlibs/copyright)
-
 # Copy the header files
 file(GLOB HEADER_FILES ${SOURCE_PATH}/*.h)
 file(COPY ${HEADER_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/include/mgnlibs)
+
+file(INSTALL "${SOURCE_PATH}/README.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/ports/mgnlibs/vcpkg.json b/ports/mgnlibs/vcpkg.json
index e6b8522580..6758c73659 100644
--- a/ports/mgnlibs/vcpkg.json
+++ b/ports/mgnlibs/vcpkg.json
@@ -1,7 +1,8 @@
 {
   "name": "mgnlibs",
-  "version-string": "2019-09-29",
-  "port-version": 1,
+  "version-date": "2019-09-29",
+  "port-version": 2,
   "description": "Single-file public domain libraries for C/C++",
-  "homepage": "https://github.com/mattiasgustavsson/libs"
+  "homepage": "https://github.com/mattiasgustavsson/libs",
+  "license": "MIT"
 }
diff --git a/ports/moos-core/portfile.cmake b/ports/moos-core/portfile.cmake
index 197467428e..b799cc2ed7 100644
--- a/ports/moos-core/portfile.cmake
+++ b/ports/moos-core/portfile.cmake
@@ -10,22 +10,20 @@ vcpkg_from_github(
         cmake_fix.patch
 )
 
-vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
     DISABLE_PARALLEL_CONFIGURE
     OPTIONS
         -DCMAKE_ENABLE_EXPORT=OFF
 )
 
-vcpkg_install_cmake()
+vcpkg_cmake_install()
 
-vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/MOOS)
+vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/MOOS)
 
 # Stage tools
-file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools)
-file(RENAME ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/tools/${PORT})
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin ${CURRENT_PACKAGES_DIR}/debug/include)
+file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools")
+file(RENAME "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/tools/${PORT}")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin" "${CURRENT_PACKAGES_DIR}/debug/include")
 
-# Put the licence file where vcpkg expects it
-file(COPY ${SOURCE_PATH}/Core/GPLCore.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright)
+file(INSTALL "${SOURCE_PATH}/Core/GPLCore.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/ports/moos-core/vcpkg.json b/ports/moos-core/vcpkg.json
index 43a01cf253..068e390a1a 100644
--- a/ports/moos-core/vcpkg.json
+++ b/ports/moos-core/vcpkg.json
@@ -1,7 +1,18 @@
 {
   "name": "moos-core",
-  "version-string": "10.4.0",
-  "port-version": 6,
+  "version": "10.4.0",
+  "port-version": 7,
   "description": "A very light weight, easy to use middleware.",
-  "homepage": "https://sites.google.com/site/moossoftware/"
+  "homepage": "https://sites.google.com/site/moossoftware/",
+  "license": null,
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ]
 }
diff --git a/ports/quirc/portfile.cmake b/ports/quirc/portfile.cmake
index 225479cd4e..329856d517 100644
--- a/ports/quirc/portfile.cmake
+++ b/ports/quirc/portfile.cmake
@@ -8,19 +8,18 @@ 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_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
 )
 
-vcpkg_install_cmake()
+vcpkg_cmake_install()
 
 vcpkg_copy_pdbs()
 
-vcpkg_fixup_cmake_targets()
+vcpkg_cmake_config_fixup()
 
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 
-file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/quirc/copyright)
+file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/ports/quirc/vcpkg.json b/ports/quirc/vcpkg.json
index 9297f73662..dbe9377df4 100644
--- a/ports/quirc/vcpkg.json
+++ b/ports/quirc/vcpkg.json
@@ -1,6 +1,18 @@
 {
   "name": "quirc",
   "version": "1.1",
-  "port-version": 2,
-  "description": "quirc is one of the C library available for scanning QR Codes"
+  "port-version": 3,
+  "description": "quirc is one of the C library available for scanning QR Codes",
+  "homepage": "https://github.com/dlbeer/quirc",
+  "license": null,
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ]
 }
diff --git a/versions/baseline.json b/versions/baseline.json
index a80f3d43be..29965cfc74 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -1358,7 +1358,7 @@
     },
     "chartdir": {
       "baseline": "7.0.0",
-      "port-version": 4
+      "port-version": 5
     },
     "check": {
       "baseline": "0.15.2",
@@ -4490,7 +4490,7 @@
     },
     "mdnsresponder": {
       "baseline": "878.270.2",
-      "port-version": 1
+      "port-version": 2
     },
     "mdspan": {
       "baseline": "2021-11-03",
@@ -4530,7 +4530,7 @@
     },
     "mgnlibs": {
       "baseline": "2019-09-29",
-      "port-version": 1
+      "port-version": 2
     },
     "mhook": {
       "baseline": "2.5.1",
@@ -4642,7 +4642,7 @@
     },
     "moos-core": {
       "baseline": "10.4.0",
-      "port-version": 6
+      "port-version": 7
     },
     "moos-essential": {
       "baseline": "10.0.1",
@@ -6094,7 +6094,7 @@
     },
     "quirc": {
       "baseline": "1.1",
-      "port-version": 2
+      "port-version": 3
     },
     "qwt": {
       "baseline": "6.2.0",
diff --git a/versions/c-/chartdir.json b/versions/c-/chartdir.json
index 96f84184e0..d55116f14b 100644
--- a/versions/c-/chartdir.json
+++ b/versions/c-/chartdir.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "004cfa7f9fabe534a808428ba7b6c6e3844153b9",
+      "version": "7.0.0",
+      "port-version": 5
+    },
     {
       "git-tree": "7f64b5801adec2ea3f13517ffa35bd96b6a8bb9f",
       "version": "7.0.0",
diff --git a/versions/m-/mdnsresponder.json b/versions/m-/mdnsresponder.json
index f410f52089..e15d683a28 100644
--- a/versions/m-/mdnsresponder.json
+++ b/versions/m-/mdnsresponder.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "682a242458b4279dc56aa5111c5c94dc09038c23",
+      "version": "878.270.2",
+      "port-version": 2
+    },
     {
       "git-tree": "3a57c5a00a432c5f54ca26ddf0a1ea7298364e55",
       "version": "878.270.2",
diff --git a/versions/m-/mgnlibs.json b/versions/m-/mgnlibs.json
index ae2cc30baa..d8807add72 100644
--- a/versions/m-/mgnlibs.json
+++ b/versions/m-/mgnlibs.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "1713a84947406acff6800ccc47f68951394b424d",
+      "version-date": "2019-09-29",
+      "port-version": 2
+    },
     {
       "git-tree": "4a611255e7ec6133fd9167e7db71227a7da8dd22",
       "version-string": "2019-09-29",
diff --git a/versions/m-/moos-core.json b/versions/m-/moos-core.json
index 16f32ea864..b3c3d744a7 100644
--- a/versions/m-/moos-core.json
+++ b/versions/m-/moos-core.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "2081cab97d387c22addea1cec2a244f45a1a6b09",
+      "version": "10.4.0",
+      "port-version": 7
+    },
     {
       "git-tree": "bbdd0d3fb08ac68bdd5d73aedb783d5edf912845",
       "version-string": "10.4.0",
diff --git a/versions/q-/quirc.json b/versions/q-/quirc.json
index dc70374be3..4b237f44cf 100644
--- a/versions/q-/quirc.json
+++ b/versions/q-/quirc.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "85b17d675bbbb05448d16af79d434bc5fca51f7b",
+      "version": "1.1",
+      "port-version": 3
+    },
     {
       "git-tree": "15bad29ef4d2466b236311ce7af075dbb9507ed9",
       "version": "1.1",