diff --git a/ports/antlr4/portfile.cmake b/ports/antlr4/portfile.cmake
index 1770cabfc1..76d2009ca0 100644
--- a/ports/antlr4/portfile.cmake
+++ b/ports/antlr4/portfile.cmake
@@ -3,7 +3,7 @@ vcpkg_fail_port_install(ON_TARGET "uwp")
 set(VERSION 4.9.1)
 
 vcpkg_download_distfile(ARCHIVE
-    URLS "http://www.antlr.org/download/antlr4-cpp-runtime-${VERSION}-source.zip"
+    URLS "https://www.antlr.org/download/antlr4-cpp-runtime-${VERSION}-source.zip"
     FILENAME "antlr4-cpp-runtime-${VERSION}-source.zip"
     SHA512 fe33005f73f8d408fcea8ebab62c0def119bbe0c075f04a66404d0df258126eb6caf0a8bbac34d5c4c9e79d4aa8896f32698a560d4be7d71a32dcc3457245cee
 )
diff --git a/ports/antlr4/vcpkg.json b/ports/antlr4/vcpkg.json
index 22a33dc305..350a5ad30f 100644
--- a/ports/antlr4/vcpkg.json
+++ b/ports/antlr4/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "antlr4",
-  "version-string": "4.9.1",
-  "port-version": 1,
+  "version": "4.9.1",
+  "port-version": 2,
   "description": "ANother Tool for Language Recognition",
   "homepage": "https://www.antlr.org",
   "supports": "!uwp",
diff --git a/ports/apr-util/portfile.cmake b/ports/apr-util/portfile.cmake
index befefb4fca..cdca97d376 100644
--- a/ports/apr-util/portfile.cmake
+++ b/ports/apr-util/portfile.cmake
@@ -1,5 +1,5 @@
 vcpkg_download_distfile(ARCHIVE
-    URLS "http://archive.apache.org/dist/apr/apr-util-1.6.1.tar.bz2"
+    URLS "https://archive.apache.org/dist/apr/apr-util-1.6.1.tar.bz2"
     FILENAME "apr-util-1.6.1.tar.bz2"
     SHA512 40eff8a37c0634f7fdddd6ca5e596b38de15fd10767a34c30bbe49c632816e8f3e1e230678034f578dd5816a94f246fb5dfdf48d644829af13bf28de3225205d
 
diff --git a/ports/apr-util/vcpkg.json b/ports/apr-util/vcpkg.json
index 7398beb9ca..448c05f305 100644
--- a/ports/apr-util/vcpkg.json
+++ b/ports/apr-util/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "apr-util",
-  "version-string": "1.6.1",
-  "port-version": 5,
+  "version": "1.6.1",
+  "port-version": 6,
   "description": "Apache Portable Runtime (APR) project  mission is to create and maintain software libraries that provide a predictable and consistent interface to underlying platform-specific implementation",
   "homepage": "https://apr.apache.org/",
   "dependencies": [
diff --git a/ports/avisynthplus/vcpkg.json b/ports/avisynthplus/vcpkg.json
index 88e47ac016..a8d0f4e60a 100644
--- a/ports/avisynthplus/vcpkg.json
+++ b/ports/avisynthplus/vcpkg.json
@@ -1,8 +1,8 @@
 {
   "name": "avisynthplus",
   "version-semver": "3.7.0",
-  "port-version": 1,
+  "port-version": 2,
   "description": "An improved version of the AviSynth frameserver, with improved features and developer friendliness",
-  "homepage": "http://avs-plus.net/",
+  "homepage": "https://avs-plus.net/",
   "supports": "!arm & !uwp"
 }
diff --git a/ports/berkeleydb/portfile.cmake b/ports/berkeleydb/portfile.cmake
index 93d89fb3eb..9aef31cf2c 100644
--- a/ports/berkeleydb/portfile.cmake
+++ b/ports/berkeleydb/portfile.cmake
@@ -1,7 +1,7 @@
 vcpkg_fail_port_install( ON_TARGET "uwp" "linux" "osx")
 
 vcpkg_download_distfile(ARCHIVE
-    URLS "http://download.oracle.com/berkeley-db/db-4.8.30.NC.zip"
+    URLS "https://download.oracle.com/berkeley-db/db-4.8.30.NC.zip"
     FILENAME "db-4.8.30.NC.zip"
     SHA512 59c1d2d5a3551f988ab1dc063900572b67ad087537e0d71760de34601f9ebd4d5c070a49b809bec4a599a62417e9a162683ce0f6442deb1a0dadb80764bf6eab
 )
diff --git a/ports/berkeleydb/vcpkg.json b/ports/berkeleydb/vcpkg.json
index 318643530b..860e13a3fc 100644
--- a/ports/berkeleydb/vcpkg.json
+++ b/ports/berkeleydb/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "berkeleydb",
-  "version-string": "4.8.30",
-  "port-version": 6,
+  "version": "4.8.30",
+  "port-version": 7,
   "description": "BDB - A high-performance embedded database for key/value data.",
   "homepage": "https://download.oracle.com/",
   "supports": "!(uwp | linux | osx)"
diff --git a/ports/bext-di/portfile.cmake b/ports/bext-di/portfile.cmake
index 8b123db7d2..36ce8c0a9b 100644
--- a/ports/bext-di/portfile.cmake
+++ b/ports/bext-di/portfile.cmake
@@ -10,7 +10,7 @@ file(INSTALL ${SOURCE_PATH}/include/boost
     DESTINATION ${CURRENT_PACKAGES_DIR}/include)
 
 vcpkg_download_distfile(LICENSE
-    URLS http://www.boost.org/LICENSE_1_0.txt
+    URLS https://www.boost.org/LICENSE_1_0.txt
     FILENAME "di-copyright"
     SHA512 d6078467835dba8932314c1c1e945569a64b065474d7aced27c9a7acc391d52e9f234138ed9f1aa9cd576f25f12f557e0b733c14891d42c16ecdc4a7bd4d60b8
 )
diff --git a/ports/bext-di/vcpkg.json b/ports/bext-di/vcpkg.json
index 3278462b4b..2b47e5578d 100644
--- a/ports/bext-di/vcpkg.json
+++ b/ports/bext-di/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "bext-di",
-  "version-string": "1.2.0",
+  "version": "1.2.0",
+  "port-version": 1,
   "description": "C++14 Dependency Injection Library.",
   "homepage": "https://github.com/boost-ext/di"
 }
diff --git a/ports/cello/vcpkg.json b/ports/cello/vcpkg.json
index ebb509e68f..67e817b41a 100644
--- a/ports/cello/vcpkg.json
+++ b/ports/cello/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "cello",
-  "version-string": "2019-07-23",
-  "port-version": 1,
+  "version-date": "2019-07-23",
+  "port-version": 2,
   "description": "Higher level programming in C",
-  "homepage": "http://libcello.org/"
+  "homepage": "https://libcello.org/"
 }
diff --git a/ports/cfitsio/portfile.cmake b/ports/cfitsio/portfile.cmake
index 05821771a0..e75a109454 100644
--- a/ports/cfitsio/portfile.cmake
+++ b/ports/cfitsio/portfile.cmake
@@ -1,5 +1,5 @@
 vcpkg_download_distfile(ARCHIVE
-    URLS "http://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/cfitsio-3.49.tar.gz"
+    URLS "https://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/cfitsio-3.49.tar.gz"
     FILENAME "cfitsio-3.49.tar.gz"
     SHA512 9836a4af3bbbfed1ea1b4c70b9d500ac485d7c3d8131eb8a25ee6ef6662f46ba52b5161c45c709ed9a601ff0e9ec36daa5650eaaf4f2cc7d6f4bb5640f10da15
 )
diff --git a/ports/cfitsio/vcpkg.json b/ports/cfitsio/vcpkg.json
index fe2794b542..9ecf0be86e 100644
--- a/ports/cfitsio/vcpkg.json
+++ b/ports/cfitsio/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "cfitsio",
   "version": "3.49",
-  "port-version": 1,
+  "port-version": 2,
   "description": "Library of C and Fortran subroutines for reading and writing data files in FITS (Flexible Image Transport System) data format",
   "homepage": "https://heasarc.gsfc.nasa.gov/fitsio/",
   "dependencies": [
diff --git a/ports/chartdir/vcpkg.json b/ports/chartdir/vcpkg.json
index f10b4d1711..0d5298fd67 100644
--- a/ports/chartdir/vcpkg.json
+++ b/ports/chartdir/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "chartdir",
   "version": "7.0.0",
-  "port-version": 1,
+  "port-version": 2,
   "description": "ChartDirector is a powerful chart component for creating professional looking charts for web and windows applications.",
   "homepage": "https://www.advsofteng.com/"
 }
diff --git a/ports/clapack/portfile.cmake b/ports/clapack/portfile.cmake
index 986335e6d0..d84c864e20 100644
--- a/ports/clapack/portfile.cmake
+++ b/ports/clapack/portfile.cmake
@@ -5,7 +5,7 @@ endif()
 vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 
 vcpkg_download_distfile(ARCHIVE
-  URLS "http://www.netlib.org/clapack/clapack-3.2.1-CMAKE.tgz"
+  URLS "https://www.netlib.org/clapack/clapack-3.2.1-CMAKE.tgz"
   FILENAME "clapack-3.2.1.tgz"
   SHA512 cf19c710291ddff3f6ead7d86bdfdeaebca21291d9df094bf0a8ef599546b007757fb2dbb19b56511bb53ef7456eac0c73973b9627bf4d02982c856124428b49
 )
diff --git a/ports/clapack/vcpkg.json b/ports/clapack/vcpkg.json
index f0fd61e8f6..78b840f564 100644
--- a/ports/clapack/vcpkg.json
+++ b/ports/clapack/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "clapack",
-  "version-string": "3.2.1",
-  "port-version": 19,
+  "version": "3.2.1",
+  "port-version": 20,
   "description": "CLAPACK (f2c'ed version of LAPACK)",
   "homepage": "https://www.netlib.org/clapack",
   "dependencies": [
diff --git a/ports/cppunit/portfile.cmake b/ports/cppunit/portfile.cmake
index 01522579ff..602bad91fd 100644
--- a/ports/cppunit/portfile.cmake
+++ b/ports/cppunit/portfile.cmake
@@ -2,7 +2,7 @@
 vcpkg_fail_port_install(ON_TARGET "uwp")
 
 vcpkg_download_distfile(ARCHIVE
-    URLS "http://dev-www.libreoffice.org/src/cppunit-1.15.1.tar.gz"
+    URLS "https://dev-www.libreoffice.org/src/cppunit-1.15.1.tar.gz"
     FILENAME "cppunit-1.15.1.tar.gz"
     SHA512 0feb47faec451357bb4c4e287efa17bb60fd3ad966d5350e9f25b414aaab79e94921024b0c0497672f8d3eeb22a599213d2d71d9e1d28b243b3e37f3a9a43691
 )
diff --git a/ports/cppunit/vcpkg.json b/ports/cppunit/vcpkg.json
index 221f330a05..21eec3130a 100644
--- a/ports/cppunit/vcpkg.json
+++ b/ports/cppunit/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "cppunit",
   "version": "1.15.1",
-  "port-version": 1,
+  "port-version": 2,
   "description": "Unit testing framework module for the C++ programming language",
   "homepage": "https://www.freedesktop.org/wiki/Software/cppunit",
   "supports": "!uwp",
diff --git a/ports/crfsuite/vcpkg.json b/ports/crfsuite/vcpkg.json
index aa62f95bf1..ec11656ceb 100644
--- a/ports/crfsuite/vcpkg.json
+++ b/ports/crfsuite/vcpkg.json
@@ -1,9 +1,9 @@
 {
   "name": "crfsuite",
   "version-date": "2019-07-21",
-  "port-version": 1,
+  "port-version": 2,
   "description": "CRFSuite is an implementation of Conditional Random Fields (CRFs) for labeling sequential data.",
-  "homepage": "http://www.chokkan.org/software/crfsuite/",
+  "homepage": "https://www.chokkan.org/software/crfsuite/",
   "supports": "!uwp",
   "dependencies": [
     "liblbfgs"
diff --git a/ports/exprtk/vcpkg.json b/ports/exprtk/vcpkg.json
index 9a1d1a1a28..a68e74ed7b 100644
--- a/ports/exprtk/vcpkg.json
+++ b/ports/exprtk/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "exprtk",
-  "version-string": "2021-01-01",
-  "port-version": 1,
+  "version-date": "2021-01-01",
+  "port-version": 2,
   "description": "Simple to use, easy to integrate and extremely efficient run-time C++ mathematical expression parser and evaluation engine.",
-  "homepage": "http://www.partow.net/programming/exprtk/index.html"
+  "homepage": "https://www.partow.net/programming/exprtk/index.html"
 }
diff --git a/ports/ffmpeg/portfile.cmake b/ports/ffmpeg/portfile.cmake
index 974ce39411..d15014c885 100644
--- a/ports/ffmpeg/portfile.cmake
+++ b/ports/ffmpeg/portfile.cmake
@@ -66,9 +66,9 @@ vcpkg_from_github(
         0011-Fix-x265-detection.patch
         0012-Fix-ssl-110-detection.patch
         0013-define-WINVER.patch
-        0014-avfilter-dependency-fix.patch  # http://ffmpeg.org/pipermail/ffmpeg-devel/2021-February/275819.html
+        0014-avfilter-dependency-fix.patch  # https://ffmpeg.org/pipermail/ffmpeg-devel/2021-February/275819.html
         0015-Fix-xml2-detection.patch
-        0016-configure-dnn-needs-avformat.patch  # http://ffmpeg.org/pipermail/ffmpeg-devel/2021-May/279926.html
+        0016-configure-dnn-needs-avformat.patch  # https://ffmpeg.org/pipermail/ffmpeg-devel/2021-May/279926.html
         ${PATCHES}
         0018-libaom-Dont-use-aom_codec_av1_dx_algo.patch
         0019-libx264-Do-not-explicitly-set-X264_API_IMPORTS.patch
@@ -541,7 +541,7 @@ if(VCPKG_TARGET_IS_UWP)
     set(OPTIONS_CROSS " --enable-cross-compile --target-os=win32 --arch=${VCPKG_TARGET_ARCHITECTURE}")
 endif()
 
-set(OPTIONS_DEBUG "--debug") # Note: --disable-optimizations can't be used due to http://ffmpeg.org/pipermail/libav-user/2013-March/003945.html
+set(OPTIONS_DEBUG "--debug") # Note: --disable-optimizations can't be used due to https://ffmpeg.org/pipermail/libav-user/2013-March/003945.html
 set(OPTIONS_RELEASE "")
 
 set(OPTIONS "${OPTIONS} ${OPTIONS_CROSS}")
diff --git a/ports/ffmpeg/vcpkg.json b/ports/ffmpeg/vcpkg.json
index c5396743d4..56c0b2f2b1 100644
--- a/ports/ffmpeg/vcpkg.json
+++ b/ports/ffmpeg/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "ffmpeg",
   "version": "4.4.1",
-  "port-version": 4,
+  "port-version": 5,
   "description": [
     "a library to decode, encode, transcode, mux, demux, stream, filter and play pretty much anything that humans and machines have created.",
     "FFmpeg is the leading multimedia framework, able to decode, encode, transcode, mux, demux, stream, filter and play pretty much anything that humans and machines have created. It supports the most obscure ancient formats up to the cutting edge. No matter if they were designed by some standards committee, the community or a corporation. It is also highly portable: FFmpeg compiles, runs, and passes our testing infrastructure FATE across Linux, Mac OS X, Microsoft Windows, the BSDs, Solaris, etc. under a wide variety of build environments, machine architectures, and configurations."
diff --git a/ports/fftw3/portfile.cmake b/ports/fftw3/portfile.cmake
index 45a9052e72..7d3c75f190 100644
--- a/ports/fftw3/portfile.cmake
+++ b/ports/fftw3/portfile.cmake
@@ -1,5 +1,5 @@
 vcpkg_download_distfile(ARCHIVE
-    URLS "http://www.fftw.org/fftw-3.3.10.tar.gz"
+    URLS "https://www.fftw.org/fftw-3.3.10.tar.gz"
     FILENAME "fftw-3.3.10.tar.gz"
     SHA512 2d34b5ccac7b08740dbdacc6ebe451d8a34cf9d9bfec85a5e776e87adf94abfd803c222412d8e10fbaa4ed46f504aa87180396af1b108666cde4314a55610b40
 )
diff --git a/ports/fftw3/vcpkg.json b/ports/fftw3/vcpkg.json
index 53d4932318..99fe9ed090 100644
--- a/ports/fftw3/vcpkg.json
+++ b/ports/fftw3/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "fftw3",
   "version": "3.3.10",
-  "port-version": 2,
+  "port-version": 3,
   "description": "FFTW is a C subroutine library for computing the discrete Fourier transform (DFT) in one or more dimensions, of arbitrary input size, and of both real and complex data (as well as of even/odd data, i.e. the discrete cosine/sine transforms or DCT/DST).",
   "homepage": "https://www.fftw.org/",
   "dependencies": [
diff --git a/ports/fftwpp/vcpkg.json b/ports/fftwpp/vcpkg.json
index e702a1b933..175e29ab34 100644
--- a/ports/fftwpp/vcpkg.json
+++ b/ports/fftwpp/vcpkg.json
@@ -1,8 +1,8 @@
 {
   "name": "fftwpp",
-  "version-string": "2019-12-19",
-  "port-version": 1,
-  "description": "FFTW++ is a C++ header/MPI transpose for Version 3 of the highly optimized FFTW (http://www.fftw.org) Fourier Transform library.",
+  "version-date": "2019-12-19",
+  "port-version": 2,
+  "description": "FFTW++ is a C++ header/MPI transpose for Version 3 of the highly optimized FFTW (https://www.fftw.org) Fourier Transform library.",
   "homepage": "https://www.fftw.org/",
   "dependencies": [
     "fftw3"
diff --git a/versions/a-/antlr4.json b/versions/a-/antlr4.json
index 033e470100..522cf7a664 100644
--- a/versions/a-/antlr4.json
+++ b/versions/a-/antlr4.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "31ac3fa20b3f7944e5ac32b7ac7883f3d976dae6",
+      "version": "4.9.1",
+      "port-version": 2
+    },
     {
       "git-tree": "0b8591ea0b8692c0c2963c468ee5b9c2e260ace4",
       "version-string": "4.9.1",
diff --git a/versions/a-/apr-util.json b/versions/a-/apr-util.json
index 642c2d01f6..5cb8b4d738 100644
--- a/versions/a-/apr-util.json
+++ b/versions/a-/apr-util.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "d27be40b8f670b002604154ef5657c011b8de733",
+      "version": "1.6.1",
+      "port-version": 6
+    },
     {
       "git-tree": "dfc76280690e9d419c43ee5242466de5b4e317c2",
       "version-string": "1.6.1",
diff --git a/versions/a-/avisynthplus.json b/versions/a-/avisynthplus.json
index c8cd5d8775..1f6240d38f 100644
--- a/versions/a-/avisynthplus.json
+++ b/versions/a-/avisynthplus.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "ed06319cd3b2bb9e0811743ca7f66dd9539eabef",
+      "version-semver": "3.7.0",
+      "port-version": 2
+    },
     {
       "git-tree": "747e0dd9f81ace8b2f473dc455871938d930df28",
       "version-semver": "3.7.0",
diff --git a/versions/b-/berkeleydb.json b/versions/b-/berkeleydb.json
index e21920be6a..e51fe1ff0a 100644
--- a/versions/b-/berkeleydb.json
+++ b/versions/b-/berkeleydb.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "753782cd715f3780a1d3d75ef7655e92a414a440",
+      "version": "4.8.30",
+      "port-version": 7
+    },
     {
       "git-tree": "fdef7fa8068cc8b7443905db215bed2dcf378abf",
       "version-string": "4.8.30",
diff --git a/versions/b-/bext-di.json b/versions/b-/bext-di.json
index d0526b9c9d..c53b8f6e1d 100644
--- a/versions/b-/bext-di.json
+++ b/versions/b-/bext-di.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "8b3c494eee383a036b07453ff9b34d1be65be06d",
+      "version": "1.2.0",
+      "port-version": 1
+    },
     {
       "git-tree": "a77676231f3c6c3fe9c145bfe670cfae495fb8ac",
       "version-string": "1.2.0",
diff --git a/versions/baseline.json b/versions/baseline.json
index f61c6205f1..2c5360b361 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -90,7 +90,7 @@
     },
     "antlr4": {
       "baseline": "4.9.1",
-      "port-version": 1
+      "port-version": 2
     },
     "any-lite": {
       "baseline": "0.4.0",
@@ -114,7 +114,7 @@
     },
     "apr-util": {
       "baseline": "1.6.1",
-      "port-version": 5
+      "port-version": 6
     },
     "apsi": {
       "baseline": "0.7.0",
@@ -246,7 +246,7 @@
     },
     "avisynthplus": {
       "baseline": "3.7.0",
-      "port-version": 1
+      "port-version": 2
     },
     "avro-c": {
       "baseline": "1.11.0",
@@ -430,11 +430,11 @@
     },
     "berkeleydb": {
       "baseline": "4.8.30",
-      "port-version": 6
+      "port-version": 7
     },
     "bext-di": {
       "baseline": "1.2.0",
-      "port-version": 0
+      "port-version": 1
     },
     "bext-sml": {
       "baseline": "1.1.4",
@@ -1282,7 +1282,7 @@
     },
     "cello": {
       "baseline": "2019-07-23",
-      "port-version": 1
+      "port-version": 2
     },
     "cereal": {
       "baseline": "1.3.0",
@@ -1294,7 +1294,7 @@
     },
     "cfitsio": {
       "baseline": "3.49",
-      "port-version": 1
+      "port-version": 2
     },
     "cgal": {
       "baseline": "5.3.1",
@@ -1330,7 +1330,7 @@
     },
     "chartdir": {
       "baseline": "7.0.0",
-      "port-version": 1
+      "port-version": 2
     },
     "check": {
       "baseline": "0.15.2",
@@ -1374,7 +1374,7 @@
     },
     "clapack": {
       "baseline": "3.2.1",
-      "port-version": 19
+      "port-version": 20
     },
     "clara": {
       "baseline": "1.1.5",
@@ -1598,7 +1598,7 @@
     },
     "cppunit": {
       "baseline": "1.15.1",
-      "port-version": 1
+      "port-version": 2
     },
     "cpputest": {
       "baseline": "2019-9-16",
@@ -1646,7 +1646,7 @@
     },
     "crfsuite": {
       "baseline": "2019-07-21",
-      "port-version": 1
+      "port-version": 2
     },
     "croncpp": {
       "baseline": "2020-09-04",
@@ -2062,7 +2062,7 @@
     },
     "exprtk": {
       "baseline": "2021-01-01",
-      "port-version": 1
+      "port-version": 2
     },
     "ezc3d": {
       "baseline": "1.4.6",
@@ -2146,7 +2146,7 @@
     },
     "ffmpeg": {
       "baseline": "4.4.1",
-      "port-version": 4
+      "port-version": 5
     },
     "ffnvcodec": {
       "baseline": "11.1.5.0",
@@ -2154,11 +2154,11 @@
     },
     "fftw3": {
       "baseline": "3.3.10",
-      "port-version": 2
+      "port-version": 3
     },
     "fftwpp": {
       "baseline": "2019-12-19",
-      "port-version": 1
+      "port-version": 2
     },
     "field3d": {
       "baseline": "1.7.3",
diff --git a/versions/c-/cello.json b/versions/c-/cello.json
index 1151051309..de140e58f2 100644
--- a/versions/c-/cello.json
+++ b/versions/c-/cello.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "a281b67048d19f8136aaa8e0198b1db5dec5c4dd",
+      "version-date": "2019-07-23",
+      "port-version": 2
+    },
     {
       "git-tree": "45d476438561ae8c8e7a8eb7871faadb1379e874",
       "version-string": "2019-07-23",
diff --git a/versions/c-/cfitsio.json b/versions/c-/cfitsio.json
index adf8116dd3..42b71d6faf 100644
--- a/versions/c-/cfitsio.json
+++ b/versions/c-/cfitsio.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "bc1418de4f14dd9c1a7e9c9ebc8d8015e1769935",
+      "version": "3.49",
+      "port-version": 2
+    },
     {
       "git-tree": "0ed894cb8efbfd277570991a78f29b70e4e931cd",
       "version": "3.49",
diff --git a/versions/c-/chartdir.json b/versions/c-/chartdir.json
index 13afedbde2..5121b6e16a 100644
--- a/versions/c-/chartdir.json
+++ b/versions/c-/chartdir.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "fe0cf0c045f1092f18faa48f70b6b23d66e6298e",
+      "version": "7.0.0",
+      "port-version": 2
+    },
     {
       "git-tree": "fc56555cd56d261127f985f6208cb23258dcb262",
       "version": "7.0.0",
diff --git a/versions/c-/clapack.json b/versions/c-/clapack.json
index f0700bc5a0..421ccf45a6 100644
--- a/versions/c-/clapack.json
+++ b/versions/c-/clapack.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "2fd47cedfcd13b7c3a339c7acf4b89c14caea8d5",
+      "version": "3.2.1",
+      "port-version": 20
+    },
     {
       "git-tree": "bedf61cf9cf765a2c823e1f2427a16af6d8a711e",
       "version-string": "3.2.1",
diff --git a/versions/c-/cppunit.json b/versions/c-/cppunit.json
index 181fce503f..044f2d91bb 100644
--- a/versions/c-/cppunit.json
+++ b/versions/c-/cppunit.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "5a65f009e556f249711d69ed679c2b570d9e79db",
+      "version": "1.15.1",
+      "port-version": 2
+    },
     {
       "git-tree": "1384ee0101801f599b23f167aee7cfc733536022",
       "version": "1.15.1",
diff --git a/versions/c-/crfsuite.json b/versions/c-/crfsuite.json
index 6041994074..443a63e70f 100644
--- a/versions/c-/crfsuite.json
+++ b/versions/c-/crfsuite.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "973286d78761d5a06d7188a21df0e15124dbf610",
+      "version-date": "2019-07-21",
+      "port-version": 2
+    },
     {
       "git-tree": "65bc9733064d028bb4f2960d824862263f74bfde",
       "version-date": "2019-07-21",
diff --git a/versions/e-/exprtk.json b/versions/e-/exprtk.json
index 0dd368f44e..b7d0e6b905 100644
--- a/versions/e-/exprtk.json
+++ b/versions/e-/exprtk.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "2cf53dbae59a6b96821ac0407d0bb9a87dd2561c",
+      "version-date": "2021-01-01",
+      "port-version": 2
+    },
     {
       "git-tree": "f43789e8da0899715ef1d0544880baa13ce38d64",
       "version-string": "2021-01-01",
diff --git a/versions/f-/ffmpeg.json b/versions/f-/ffmpeg.json
index 1fdafc9e33..b508e96347 100644
--- a/versions/f-/ffmpeg.json
+++ b/versions/f-/ffmpeg.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "9e9f11b54d40824604dc895ac7f9f0a39dc21486",
+      "version": "4.4.1",
+      "port-version": 5
+    },
     {
       "git-tree": "d7e12377ceb86caf3720807cb4be9f0f51c93798",
       "version": "4.4.1",
diff --git a/versions/f-/fftw3.json b/versions/f-/fftw3.json
index ecf5755099..27f1fec620 100644
--- a/versions/f-/fftw3.json
+++ b/versions/f-/fftw3.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "2bd307eb2dafcd4938d16fc484fbbb731228f4c3",
+      "version": "3.3.10",
+      "port-version": 3
+    },
     {
       "git-tree": "3cd11b90c63cec797697dc3235ae1e22e4a509fc",
       "version": "3.3.10",
diff --git a/versions/f-/fftwpp.json b/versions/f-/fftwpp.json
index 5427eaba1d..696a59c994 100644
--- a/versions/f-/fftwpp.json
+++ b/versions/f-/fftwpp.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "e7eb11bd6344e0d4db5a9e510a980ec2fedfdf90",
+      "version-date": "2019-12-19",
+      "port-version": 2
+    },
     {
       "git-tree": "d9b689681032352f667f7335feed82d0260fe5bf",
       "version-string": "2019-12-19",