From e7e328cf9d3ce28cfd407fe4e052bb9e7f5c87a6 Mon Sep 17 00:00:00 2001
From: autoantwort <41973254+autoantwort@users.noreply.github.com>
Date: Thu, 28 Oct 2021 00:19:28 +0200
Subject: [PATCH] [many ports] call vcpkg_fixup_pkgconfig() (#20953)

* [many ports] call vcpkg_fixup_pkgconfig()

The ports generate pc files, but don't call vcpkg_fixup_pkgconfig() so that there are absolute paths in the pc files

* Update port-version for armadillo and polyclipping.

* Update version database.

Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
---
 ports/ace/portfile.cmake                     |   2 +
 ports/ace/vcpkg.json                         |   2 +-
 ports/amqpcpp/portfile.cmake                 |   2 +
 ports/amqpcpp/vcpkg.json                     |   1 +
 ports/aom/portfile.cmake                     |   2 +
 ports/aom/vcpkg.json                         |   1 +
 ports/aricpp/portfile.cmake                  |   2 +
 ports/aricpp/vcpkg.json                      |   1 +
 ports/armadillo/portfile.cmake               |   2 +
 ports/armadillo/vcpkg.json                   |   2 +-
 ports/arrow/portfile.cmake                   |   2 +
 ports/arrow/vcpkg.json                       |   1 +
 ports/bcg729/portfile.cmake                  |   2 +
 ports/bcg729/vcpkg.json                      |   1 +
 ports/bddisasm/portfile.cmake                |   2 +
 ports/bddisasm/vcpkg.json                    |   1 +
 ports/bde/portfile.cmake                     |   2 +
 ports/bde/vcpkg.json                         |   2 +-
 ports/bdwgc/portfile.cmake                   |   2 +
 ports/bdwgc/vcpkg.json                       |   1 +
 ports/blitz/portfile.cmake                   |   3 +-
 ports/blitz/vcpkg.json                       |   2 +-
 ports/blosc/portfile.cmake                   |   2 +
 ports/blosc/vcpkg.json                       |   2 +-
 ports/brpc/portfile.cmake                    |   2 +
 ports/brpc/vcpkg.json                        |   2 +-
 ports/bullet3/portfile.cmake                 |   2 +
 ports/bullet3/vcpkg.json                     |   2 +-
 ports/capnproto/portfile.cmake               |   2 +
 ports/capnproto/vcpkg.json                   |   1 +
 ports/ccd/portfile.cmake                     |   2 +
 ports/ccd/vcpkg.json                         |   2 +-
 ports/charls/portfile.cmake                  |   2 +
 ports/charls/vcpkg.json                      |   2 +-
 ports/check/portfile.cmake                   |   3 +-
 ports/check/vcpkg.json                       |   2 +-
 ports/cjson/portfile.cmake                   |   2 +
 ports/cjson/vcpkg.json                       |   1 +
 ports/clblast/portfile.cmake                 |   2 +
 ports/clblast/vcpkg.json                     |   2 +-
 ports/cli/portfile.cmake                     |   2 +
 ports/cli/vcpkg.json                         |   1 +
 ports/cmocka/portfile.cmake                  |   2 +
 ports/cmocka/vcpkg.json                      |   1 +
 ports/coin/portfile.cmake                    |   2 +
 ports/coin/vcpkg.json                        |   2 +-
 ports/collada-dom/portfile.cmake             |   2 +
 ports/collada-dom/vcpkg.json                 |   2 +-
 ports/cpp-redis/portfile.cmake               |   3 +-
 ports/cpp-redis/vcpkg.json                   |   2 +-
 ports/cppcodec/portfile.cmake                |   2 +
 ports/cppcodec/vcpkg.json                    |   2 +-
 ports/cpuid/portfile.cmake                   |   2 +
 ports/cpuid/vcpkg.json                       |   2 +-
 ports/curlpp/portfile.cmake                  |   2 +
 ports/curlpp/vcpkg.json                      |   2 +-
 ports/dlib/portfile.cmake                    |   2 +
 ports/dlib/vcpkg.json                        |   2 +-
 ports/easyloggingpp/portfile.cmake           |   2 +
 ports/easyloggingpp/vcpkg.json               |   1 +
 ports/edlib/portfile.cmake                   |   2 +
 ports/edlib/vcpkg.json                       |   1 +
 ports/fcl/portfile.cmake                     |   2 +
 ports/fcl/vcpkg.json                         |   1 +
 ports/fftw3/portfile.cmake                   |   2 +
 ports/fftw3/vcpkg.json                       |   2 +-
 ports/flann/portfile.cmake                   |   2 +
 ports/flann/vcpkg.json                       |   2 +-
 ports/flatbuffers/portfile.cmake             |   2 +
 ports/flatbuffers/vcpkg.json                 |   2 +-
 ports/fluidlite/portfile.cmake               |   2 +
 ports/fluidlite/vcpkg.json                   |   2 +-
 ports/folly/portfile.cmake                   |   2 +
 ports/folly/vcpkg.json                       |   2 +-
 ports/freeglut/portfile.cmake                |   2 +
 ports/freeglut/vcpkg.json                    |   2 +-
 ports/freeopcua/portfile.cmake               |   2 +
 ports/freeopcua/vcpkg.json                   |   2 +-
 ports/functions-framework-cpp/portfile.cmake |   2 +
 ports/functions-framework-cpp/vcpkg.json     |   1 +
 ports/geogram/portfile.cmake                 |   2 +
 ports/geogram/vcpkg.json                     |   1 +
 ports/geographiclib/portfile.cmake           |   2 +
 ports/geographiclib/vcpkg.json               |   1 +
 ports/getdns/portfile.cmake                  |   2 +
 ports/getdns/vcpkg.json                      |   2 +-
 ports/gflags/portfile.cmake                  |   2 +
 ports/gflags/vcpkg.json                      |   2 +-
 ports/graphite2/portfile.cmake               |   2 +
 ports/graphite2/vcpkg.json                   |   2 +-
 ports/graphqlparser/portfile.cmake           |   2 +
 ports/graphqlparser/vcpkg.json               |   2 +-
 ports/graphviz/portfile.cmake                |   2 +
 ports/graphviz/vcpkg.json                    |   1 +
 ports/hiredis/portfile.cmake                 |   3 +-
 ports/hiredis/vcpkg.json                     |   1 +
 ports/hyperscan/portfile.cmake               |   2 +
 ports/hyperscan/vcpkg.json                   |   2 +-
 ports/igraph/portfile.cmake                  |   2 +
 ports/igraph/vcpkg.json                      |   1 +
 ports/iniparser/portfile.cmake               |   2 +
 ports/iniparser/vcpkg.json                   |   2 +-
 ports/itpp/portfile.cmake                    |   2 +
 ports/itpp/vcpkg.json                        |   2 +-
 ports/jansson/portfile.cmake                 |   2 +
 ports/jansson/vcpkg.json                     |   2 +-
 ports/json11/portfile.cmake                  |   2 +
 ports/json11/vcpkg.json                      |   2 +-
 ports/libbson/portfile.cmake                 |   2 +
 ports/libbson/vcpkg.json                     |   1 +
 ports/libcerf/portfile.cmake                 |   2 +
 ports/libcerf/vcpkg.json                     |   2 +-
 ports/libconfuse/portfile.cmake              |   2 +
 ports/libconfuse/vcpkg.json                  |   2 +-
 ports/libevent/portfile.cmake                |   2 +
 ports/libevent/vcpkg.json                    |   2 +-
 ports/libevhtp/portfile.cmake                |   3 +-
 ports/libevhtp/vcpkg.json                    |   2 +-
 ports/libfort/portfile.cmake                 |   2 +
 ports/libfort/vcpkg.json                     |   1 +
 ports/libfreenect2/portfile.cmake            |   2 +
 ports/libfreenect2/vcpkg.json                |   2 +-
 ports/libgd/portfile.cmake                   |   2 +
 ports/libgd/vcpkg.json                       |   1 +
 ports/libgta/portfile.cmake                  |   2 +
 ports/libgta/vcpkg.json                      |   2 +-
 ports/libkeyfinder/portfile.cmake            |   2 +
 ports/libkeyfinder/vcpkg.json                |   1 +
 ports/libkml/portfile.cmake                  |   3 +-
 ports/libkml/vcpkg.json                      |   2 +-
 ports/liblemon/portfile.cmake                |   3 +-
 ports/liblemon/vcpkg.json                    |   2 +-
 ports/liblo/portfile.cmake                   |   2 +
 ports/liblo/vcpkg.json                       |   2 +-
 ports/libmikmod/portfile.cmake               |   2 +
 ports/libmikmod/vcpkg.json                   |   2 +-
 ports/libmt32emu/portfile.cmake              |   2 +
 ports/libmt32emu/vcpkg.json                  |   1 +
 ports/libpqxx/portfile.cmake                 |   2 +
 ports/libpqxx/vcpkg.json                     |   2 +-
 ports/libproxy/portfile.cmake                |   2 +
 ports/libproxy/vcpkg.json                    |   1 +
 ports/libqrencode/portfile.cmake             |   2 +
 ports/libqrencode/vcpkg.json                 |   1 +
 ports/librdkafka/portfile.cmake              |   2 +
 ports/librdkafka/vcpkg.json                  |   2 +-
 ports/libsbml/portfile.cmake                 |   3 +-
 ports/libsbml/vcpkg.json                     |   1 +
 ports/libtins/portfile.cmake                 |   2 +
 ports/libtins/vcpkg.json                     |   2 +-
 ports/libtorrent/portfile.cmake              |   2 +
 ports/libtorrent/vcpkg.json                  |   1 +
 ports/libwebsockets/portfile.cmake           |   2 +
 ports/libwebsockets/vcpkg.json               |   2 +-
 ports/libxlsxwriter/portfile.cmake           |   3 +-
 ports/libxlsxwriter/vcpkg.json               |   1 +
 ports/mongo-c-driver/portfile.cmake          |   2 +
 ports/mongo-c-driver/vcpkg.json              |   1 +
 ports/mosquitto/portfile.cmake               |   2 +
 ports/mosquitto/vcpkg.json                   |   2 +-
 ports/msgpack/portfile.cmake                 |   2 +
 ports/msgpack/vcpkg.json                     |   2 +-
 ports/msgpack11/portfile.cmake               |   2 +
 ports/msgpack11/vcpkg.json                   |   2 +-
 ports/munit/portfile.cmake                   |   2 +
 ports/munit/vcpkg.json                       |   2 +-
 ports/muparser/portfile.cmake                |   3 +-
 ports/muparser/vcpkg.json                    |   2 +-
 ports/nanoflann/portfile.cmake               |   3 +-
 ports/nanoflann/vcpkg.json                   |   1 +
 ports/nanomsg/portfile.cmake                 |   2 +
 ports/nanomsg/vcpkg.json                     |   2 +-
 ports/nlopt/portfile.cmake                   |   2 +
 ports/nlopt/vcpkg.json                       |   1 +
 ports/octomap/portfile.cmake                 |   2 +
 ports/octomap/vcpkg.json                     |   2 +-
 ports/ode/portfile.cmake                     |   2 +
 ports/ode/vcpkg.json                         |   2 +-
 ports/ois/portfile.cmake                     |   2 +
 ports/ois/vcpkg.json                         |   2 +-
 ports/oniguruma/portfile.cmake               |   2 +
 ports/oniguruma/vcpkg.json                   |   1 +
 ports/opencc/portfile.cmake                  |   3 +-
 ports/opencc/vcpkg.json                      |   2 +-
 ports/openimageio/portfile.cmake             |   2 +
 ports/openimageio/vcpkg.json                 |   2 +-
 ports/orocos-kdl/portfile.cmake              |   3 +-
 ports/orocos-kdl/vcpkg.json                  |   2 +-
 ports/osg/portfile.cmake                     |   2 +
 ports/osg/vcpkg.json                         |   2 +-
 ports/p-ranav-csv2/portfile.cmake            |   2 +
 ports/p-ranav-csv2/vcpkg.json                |   2 +-
 ports/pcl/portfile.cmake                     |   2 +
 ports/pcl/vcpkg.json                         |   2 +-
 ports/plplot/portfile.cmake                  |   2 +
 ports/plplot/vcpkg.json                      |   2 +-
 ports/polyclipping/portfile.cmake            |   2 +
 ports/polyclipping/vcpkg.json                |   2 +-
 ports/ponder/portfile.cmake                  |   2 +
 ports/ponder/vcpkg.json                      |   2 +-
 ports/poppler/portfile.cmake                 |   3 +-
 ports/poppler/vcpkg.json                     |   2 +-
 ports/portaudio/portfile.cmake               |   2 +
 ports/portaudio/vcpkg.json                   |   2 +-
 ports/ppconsul/portfile.cmake                |   2 +
 ports/ppconsul/vcpkg.json                    |   2 +-
 ports/raylib/portfile.cmake                  |   2 +
 ports/raylib/vcpkg.json                      |   2 +-
 ports/rbdl/portfile.cmake                    |   2 +
 ports/rbdl/vcpkg.json                        |   2 +-
 ports/realsense2/portfile.cmake              |   3 +-
 ports/realsense2/vcpkg.json                  |   1 +
 ports/redis-plus-plus/portfile.cmake         |   2 +
 ports/redis-plus-plus/vcpkg.json             |   1 +
 ports/rpclib/portfile.cmake                  |   2 +
 ports/rpclib/vcpkg.json                      |   1 +
 ports/rtaudio/portfile.cmake                 |   2 +
 ports/rtaudio/vcpkg.json                     |   1 +
 ports/sais/portfile.cmake                    |   2 +
 ports/sais/vcpkg.json                        |   2 +-
 ports/sdformat6/portfile.cmake               |   2 +
 ports/sdformat6/vcpkg.json                   |   2 +-
 ports/sentencepiece/portfile.cmake           |   2 +
 ports/sentencepiece/vcpkg.json               |   1 +
 ports/simage/portfile.cmake                  |   2 +
 ports/simage/vcpkg.json                      |   2 +-
 ports/sol2/portfile.cmake                    |   2 +
 ports/sol2/vcpkg.json                        |   2 +-
 ports/soxr/portfile.cmake                    |   2 +
 ports/soxr/vcpkg.json                        |   2 +-
 ports/sparsehash/portfile.cmake              |   2 +
 ports/sparsehash/vcpkg.json                  |   2 +-
 ports/stxxl/portfile.cmake                   |   2 +
 ports/stxxl/vcpkg.json                       |   2 +-
 ports/superlu/portfile.cmake                 |   2 +
 ports/superlu/vcpkg.json                     |   2 +-
 ports/thrift/portfile.cmake                  |   3 +-
 ports/thrift/vcpkg.json                      |   2 +-
 ports/tidy-html5/portfile.cmake              |   2 +
 ports/tidy-html5/vcpkg.json                  |   2 +-
 ports/tinyobjloader/portfile.cmake           |   2 +
 ports/tinyobjloader/vcpkg.json               |   2 +-
 ports/tinyply/portfile.cmake                 |   2 +
 ports/tinyply/vcpkg.json                     |   2 +-
 ports/tlx/portfile.cmake                     |   2 +
 ports/tlx/vcpkg.json                         |   2 +-
 ports/tmxparser/portfile.cmake               |   2 +
 ports/tmxparser/vcpkg.json                   |   2 +-
 ports/uchardet/portfile.cmake                |   2 +
 ports/uchardet/vcpkg.json                    |   1 +
 ports/unittest-cpp/portfile.cmake            |   2 +
 ports/unittest-cpp/vcpkg.json                |   2 +-
 ports/uriparser/portfile.cmake               |   2 +
 ports/uriparser/vcpkg.json                   |   1 +
 ports/usrsctp/portfile.cmake                 |   2 +
 ports/usrsctp/vcpkg.json                     |   1 +
 ports/wampcc/portfile.cmake                  |   2 +
 ports/wampcc/vcpkg.json                      |   2 +-
 ports/xalan-c/portfile.cmake                 |   2 +
 ports/xalan-c/vcpkg.json                     |   1 +
 ports/xerces-c/portfile.cmake                |   2 +
 ports/xerces-c/vcpkg.json                    |   2 +-
 ports/xlnt/portfile.cmake                    |   2 +
 ports/xlnt/vcpkg.json                        |   2 +-
 ports/xtensor-fftw/portfile.cmake            |   2 +
 ports/xtensor-fftw/vcpkg.json                |   2 +-
 ports/z3/portfile.cmake                      |   2 +
 ports/z3/vcpkg.json                          |   1 +
 ports/zeromq/portfile.cmake                  |   2 +
 ports/zeromq/vcpkg.json                      |   2 +-
 ports/zyre/portfile.cmake                    |   2 +
 ports/zyre/vcpkg.json                        |   2 +-
 ports/zziplib/portfile.cmake                 |   2 +
 ports/zziplib/vcpkg.json                     |   2 +-
 versions/a-/ace.json                         |   5 +
 versions/a-/amqpcpp.json                     |   5 +
 versions/a-/aom.json                         |   5 +
 versions/a-/aricpp.json                      |   5 +
 versions/a-/armadillo.json                   |   5 +
 versions/a-/arrow.json                       |   5 +
 versions/b-/bcg729.json                      |   5 +
 versions/b-/bddisasm.json                    |   5 +
 versions/b-/bde.json                         |   5 +
 versions/b-/bdwgc.json                       |   5 +
 versions/b-/blitz.json                       |   5 +
 versions/b-/blosc.json                       |   5 +
 versions/b-/brpc.json                        |   5 +
 versions/b-/bullet3.json                     |   5 +
 versions/baseline.json                       | 274 +++++++++----------
 versions/c-/capnproto.json                   |   5 +
 versions/c-/ccd.json                         |   5 +
 versions/c-/charls.json                      |   5 +
 versions/c-/check.json                       |   5 +
 versions/c-/cjson.json                       |   5 +
 versions/c-/clblast.json                     |   5 +
 versions/c-/cli.json                         |   5 +
 versions/c-/cmocka.json                      |   5 +
 versions/c-/coin.json                        |   5 +
 versions/c-/collada-dom.json                 |   5 +
 versions/c-/cpp-redis.json                   |   5 +
 versions/c-/cppcodec.json                    |   5 +
 versions/c-/cpuid.json                       |   5 +
 versions/c-/curlpp.json                      |   5 +
 versions/d-/dlib.json                        |   5 +
 versions/e-/easyloggingpp.json               |   5 +
 versions/e-/edlib.json                       |   5 +
 versions/f-/fcl.json                         |   5 +
 versions/f-/fftw3.json                       |   5 +
 versions/f-/flann.json                       |   5 +
 versions/f-/flatbuffers.json                 |   5 +
 versions/f-/fluidlite.json                   |   5 +
 versions/f-/folly.json                       |   5 +
 versions/f-/freeglut.json                    |   5 +
 versions/f-/freeopcua.json                   |   5 +
 versions/f-/functions-framework-cpp.json     |   5 +
 versions/g-/geogram.json                     |   5 +
 versions/g-/geographiclib.json               |   5 +
 versions/g-/getdns.json                      |   5 +
 versions/g-/gflags.json                      |   5 +
 versions/g-/graphite2.json                   |   5 +
 versions/g-/graphqlparser.json               |   5 +
 versions/g-/graphviz.json                    |   5 +
 versions/h-/hiredis.json                     |   5 +
 versions/h-/hyperscan.json                   |   5 +
 versions/i-/igraph.json                      |   5 +
 versions/i-/iniparser.json                   |   5 +
 versions/i-/itpp.json                        |   5 +
 versions/j-/jansson.json                     |   5 +
 versions/j-/json11.json                      |   5 +
 versions/l-/libbson.json                     |   5 +
 versions/l-/libcerf.json                     |   5 +
 versions/l-/libconfuse.json                  |   5 +
 versions/l-/libevent.json                    |   5 +
 versions/l-/libevhtp.json                    |   5 +
 versions/l-/libfort.json                     |   5 +
 versions/l-/libfreenect2.json                |   5 +
 versions/l-/libgd.json                       |   5 +
 versions/l-/libgta.json                      |   5 +
 versions/l-/libkeyfinder.json                |   5 +
 versions/l-/libkml.json                      |   5 +
 versions/l-/liblemon.json                    |   5 +
 versions/l-/liblo.json                       |   5 +
 versions/l-/libmikmod.json                   |   5 +
 versions/l-/libmt32emu.json                  |   5 +
 versions/l-/libpqxx.json                     |   5 +
 versions/l-/libproxy.json                    |   5 +
 versions/l-/libqrencode.json                 |   5 +
 versions/l-/librdkafka.json                  |   5 +
 versions/l-/libsbml.json                     |   5 +
 versions/l-/libtins.json                     |   5 +
 versions/l-/libtorrent.json                  |   5 +
 versions/l-/libwebsockets.json               |   5 +
 versions/l-/libxlsxwriter.json               |   5 +
 versions/m-/mongo-c-driver.json              |   5 +
 versions/m-/mosquitto.json                   |   5 +
 versions/m-/msgpack.json                     |   5 +
 versions/m-/msgpack11.json                   |   5 +
 versions/m-/munit.json                       |   5 +
 versions/m-/muparser.json                    |   5 +
 versions/n-/nanoflann.json                   |   5 +
 versions/n-/nanomsg.json                     |   5 +
 versions/n-/nlopt.json                       |   5 +
 versions/o-/octomap.json                     |   5 +
 versions/o-/ode.json                         |   5 +
 versions/o-/ois.json                         |   5 +
 versions/o-/oniguruma.json                   |   5 +
 versions/o-/opencc.json                      |   5 +
 versions/o-/openimageio.json                 |   5 +
 versions/o-/orocos-kdl.json                  |   5 +
 versions/o-/osg.json                         |   5 +
 versions/p-/p-ranav-csv2.json                |   5 +
 versions/p-/pcl.json                         |   5 +
 versions/p-/plplot.json                      |   5 +
 versions/p-/polyclipping.json                |   5 +
 versions/p-/ponder.json                      |   5 +
 versions/p-/poppler.json                     |   5 +
 versions/p-/portaudio.json                   |   5 +
 versions/p-/ppconsul.json                    |   5 +
 versions/r-/raylib.json                      |   5 +
 versions/r-/rbdl.json                        |   5 +
 versions/r-/realsense2.json                  |   5 +
 versions/r-/redis-plus-plus.json             |   5 +
 versions/r-/rpclib.json                      |   5 +
 versions/r-/rtaudio.json                     |   5 +
 versions/s-/sais.json                        |   5 +
 versions/s-/sdformat6.json                   |   5 +
 versions/s-/sentencepiece.json               |   5 +
 versions/s-/simage.json                      |   5 +
 versions/s-/sol2.json                        |   5 +
 versions/s-/soxr.json                        |   5 +
 versions/s-/sparsehash.json                  |   5 +
 versions/s-/stxxl.json                       |   5 +
 versions/s-/superlu.json                     |   5 +
 versions/t-/thrift.json                      |   5 +
 versions/t-/tidy-html5.json                  |   5 +
 versions/t-/tinyobjloader.json               |   5 +
 versions/t-/tinyply.json                     |   5 +
 versions/t-/tlx.json                         |   5 +
 versions/t-/tmxparser.json                   |   5 +
 versions/u-/uchardet.json                    |   5 +
 versions/u-/unittest-cpp.json                |   5 +
 versions/u-/uriparser.json                   |   5 +
 versions/u-/usrsctp.json                     |   5 +
 versions/w-/wampcc.json                      |   5 +
 versions/x-/xalan-c.json                     |   5 +
 versions/x-/xerces-c.json                    |   5 +
 versions/x-/xlnt.json                        |   5 +
 versions/x-/xtensor-fftw.json                |   5 +
 versions/z-/z3.json                          |   5 +
 versions/z-/zeromq.json                      |   5 +
 versions/z-/zyre.json                        |   5 +
 versions/z-/zziplib.json                     |   5 +
 412 files changed, 1233 insertions(+), 246 deletions(-)

diff --git a/ports/ace/portfile.cmake b/ports/ace/portfile.cmake
index 7cfd84321fcafb..b478d120b36664 100644
--- a/ports/ace/portfile.cmake
+++ b/ports/ace/portfile.cmake
@@ -432,3 +432,5 @@ elseif(VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_OSX)
   # Handle copyright
   file(INSTALL ${ACE_ROOT}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
 endif()
+
+vcpkg_fixup_pkgconfig()
diff --git a/ports/ace/vcpkg.json b/ports/ace/vcpkg.json
index 5a77820e02ba04..77463fd0714856 100644
--- a/ports/ace/vcpkg.json
+++ b/ports/ace/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "ace",
   "version": "7.0.3",
-  "port-version": 1,
+  "port-version": 2,
   "description": "The ADAPTIVE Communication Environment",
   "homepage": "https://www.dre.vanderbilt.edu/~schmidt/ACE.html",
   "features": {
diff --git a/ports/amqpcpp/portfile.cmake b/ports/amqpcpp/portfile.cmake
index e8c634342fc344..6827a433550259 100644
--- a/ports/amqpcpp/portfile.cmake
+++ b/ports/amqpcpp/portfile.cmake
@@ -31,3 +31,5 @@ vcpkg_cmake_config_fixup(CONFIG_PATH cmake)
 file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
+
+vcpkg_fixup_pkgconfig()
diff --git a/ports/amqpcpp/vcpkg.json b/ports/amqpcpp/vcpkg.json
index e248db9cc10765..8252d41bf8dd38 100644
--- a/ports/amqpcpp/vcpkg.json
+++ b/ports/amqpcpp/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "amqpcpp",
   "version": "4.3.14",
+  "port-version": 1,
   "description": "AMQP-CPP is a C++ library for communicating with a RabbitMQ message broker",
   "homepage": "https://github.com/CopernicaMarketingSoftware/AMQP-CPP",
   "supports": "!uwp",
diff --git a/ports/aom/portfile.cmake b/ports/aom/portfile.cmake
index 86a10e902723d1..aaad140a9971e1 100644
--- a/ports/aom/portfile.cmake
+++ b/ports/aom/portfile.cmake
@@ -46,3 +46,5 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include
 
 # Handle copyright
 file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+
+vcpkg_fixup_pkgconfig()
diff --git a/ports/aom/vcpkg.json b/ports/aom/vcpkg.json
index d3b84fcd2afa04..4c129276311c9c 100644
--- a/ports/aom/vcpkg.json
+++ b/ports/aom/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "aom",
   "version-semver": "3.2.0",
+  "port-version": 1,
   "description": "AV1 codec library",
   "homepage": "https://aomedia.googlesource.com/aom",
   "supports": "!uwp & !arm",
diff --git a/ports/aricpp/portfile.cmake b/ports/aricpp/portfile.cmake
index 816a9e6f46f02f..f9c96b5bdbfeb7 100644
--- a/ports/aricpp/portfile.cmake
+++ b/ports/aricpp/portfile.cmake
@@ -17,3 +17,5 @@ vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/aricpp)
 
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug ${CURRENT_PACKAGES_DIR}/lib)
 file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+
+vcpkg_fixup_pkgconfig()
diff --git a/ports/aricpp/vcpkg.json b/ports/aricpp/vcpkg.json
index ee76880bff46a3..acfc7e0fb5f162 100644
--- a/ports/aricpp/vcpkg.json
+++ b/ports/aricpp/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "aricpp",
   "version-semver": "1.1.1",
+  "port-version": 1,
   "description": "Asterisk ARI interface bindings for modern C++",
   "homepage": "https://github.com/daniele77/aricpp",
   "dependencies": [
diff --git a/ports/armadillo/portfile.cmake b/ports/armadillo/portfile.cmake
index 87a305332b9361..c5d72826d98d59 100644
--- a/ports/armadillo/portfile.cmake
+++ b/ports/armadillo/portfile.cmake
@@ -43,3 +43,5 @@ endif()
 
 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)
+
+vcpkg_fixup_pkgconfig()
diff --git a/ports/armadillo/vcpkg.json b/ports/armadillo/vcpkg.json
index d1846befb9b6ab..02e934e2000ee4 100644
--- a/ports/armadillo/vcpkg.json
+++ b/ports/armadillo/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "armadillo",
   "version": "10.6.2",
-  "port-version": 1,
+  "port-version": 2,
   "description": "Armadillo is a high quality linear algebra library (matrix maths) for the C++ language, aiming towards a good balance between speed and ease of use",
   "homepage": "http://arma.sourceforge.net",
   "dependencies": [
diff --git a/ports/arrow/portfile.cmake b/ports/arrow/portfile.cmake
index 221b3e0d9cdb89..e5a1dcc6c6245f 100644
--- a/ports/arrow/portfile.cmake
+++ b/ports/arrow/portfile.cmake
@@ -100,3 +100,5 @@ file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/shar
 
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
+
+vcpkg_fixup_pkgconfig()
diff --git a/ports/arrow/vcpkg.json b/ports/arrow/vcpkg.json
index 98b76849430e8e..cdddf011af6dc6 100644
--- a/ports/arrow/vcpkg.json
+++ b/ports/arrow/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "arrow",
   "version": "5.0.0",
+  "port-version": 1,
   "description": "Cross-language development platform for in-memory analytics",
   "homepage": "https://arrow.apache.org",
   "supports": "x64",
diff --git a/ports/bcg729/portfile.cmake b/ports/bcg729/portfile.cmake
index 4a6f5c6f63ad70..a7be7799b118ac 100644
--- a/ports/bcg729/portfile.cmake
+++ b/ports/bcg729/portfile.cmake
@@ -23,3 +23,5 @@ file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/s
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
+
+vcpkg_fixup_pkgconfig()
diff --git a/ports/bcg729/vcpkg.json b/ports/bcg729/vcpkg.json
index 5896ad827eb48c..c9a88a49bca0d0 100644
--- a/ports/bcg729/vcpkg.json
+++ b/ports/bcg729/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "bcg729",
   "version-string": "1.1.1",
+  "port-version": 1,
   "description": "Bcg729 is an open source implementation of the ITU G.729 Annex A and B codec.",
   "homepage": "https://github.com/BelledonneCommunications/bcg729"
 }
diff --git a/ports/bddisasm/portfile.cmake b/ports/bddisasm/portfile.cmake
index 78cb08023b8a24..02a0a0709f622d 100644
--- a/ports/bddisasm/portfile.cmake
+++ b/ports/bddisasm/portfile.cmake
@@ -28,3 +28,5 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
+
+vcpkg_fixup_pkgconfig()
diff --git a/ports/bddisasm/vcpkg.json b/ports/bddisasm/vcpkg.json
index c48346811fe744..269bc12e06b307 100644
--- a/ports/bddisasm/vcpkg.json
+++ b/ports/bddisasm/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "bddisasm",
   "version": "1.34.2",
+  "port-version": 1,
   "maintainers": "Cristi Anichitei <ianichitei@bitdefender.com>",
   "description": "bddisasm is a fast, lightweight, x86/x64 instruction decoder and emulator.",
   "homepage": "https://github.com/bitdefender/bddisasm",
diff --git a/ports/bde/portfile.cmake b/ports/bde/portfile.cmake
index 3acdd38205aef1..63d4a8422529cb 100644
--- a/ports/bde/portfile.cmake
+++ b/ports/bde/portfile.cmake
@@ -134,3 +134,5 @@ file(INSTALL ${SOURCE_PATH}/LICENSE
      DESTINATION ${CURRENT_PACKAGES_DIR}/share/bde
      RENAME copyright
 )
+
+vcpkg_fixup_pkgconfig()
diff --git a/ports/bde/vcpkg.json b/ports/bde/vcpkg.json
index 4d7499c2fe0358..7fffab8885a0c5 100644
--- a/ports/bde/vcpkg.json
+++ b/ports/bde/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "bde",
   "version-string": "3.2.0.0",
-  "port-version": 3,
+  "port-version": 4,
   "description": "Basic Development Environment - a set of foundational C++ libraries used at Bloomberg.",
   "supports": "!windows"
 }
diff --git a/ports/bdwgc/portfile.cmake b/ports/bdwgc/portfile.cmake
index 6a9a7c1da9b33d..468154cd0b3af4 100644
--- a/ports/bdwgc/portfile.cmake
+++ b/ports/bdwgc/portfile.cmake
@@ -24,3 +24,5 @@ vcpkg_copy_pdbs()
 file(INSTALL "${SOURCE_PATH}/README.QUICK" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
+
+vcpkg_fixup_pkgconfig()
diff --git a/ports/bdwgc/vcpkg.json b/ports/bdwgc/vcpkg.json
index e752f91c0d3310..8923c52721762f 100644
--- a/ports/bdwgc/vcpkg.json
+++ b/ports/bdwgc/vcpkg.json
@@ -1,5 +1,6 @@
 {
   "name": "bdwgc",
   "version": "8.2.0",
+  "port-version": 1,
   "description": "The Boehm-Demers-Weiser conservative C/C++ Garbage Collector (libgc, bdwgc, boehm-gc)"
 }
diff --git a/ports/blitz/portfile.cmake b/ports/blitz/portfile.cmake
index 7e90f2a6456dcc..f8681cf36032fb 100644
--- a/ports/blitz/portfile.cmake
+++ b/ports/blitz/portfile.cmake
@@ -32,4 +32,5 @@ vcpkg_copy_pdbs()
 vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake)
 
 # Handle copyright
-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)
+vcpkg_fixup_pkgconfig()
diff --git a/ports/blitz/vcpkg.json b/ports/blitz/vcpkg.json
index 22e8dd6e0bd098..2ef9a3c24e0166 100644
--- a/ports/blitz/vcpkg.json
+++ b/ports/blitz/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "blitz",
   "version-string": "2020-03-25",
-  "port-version": 1,
+  "port-version": 2,
   "description": "Blitz++ is a C++ template class library that provides high-performance multidimensional array containers for scientific computing.",
   "homepage": "https://github.com/blitzpp/blitz",
   "supports": "!(arm | arm64 | uwp)"
diff --git a/ports/blosc/portfile.cmake b/ports/blosc/portfile.cmake
index 041548b478ae76..01c42a5631ba0a 100644
--- a/ports/blosc/portfile.cmake
+++ b/ports/blosc/portfile.cmake
@@ -41,3 +41,5 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
 
 # Handle copyright
 file(INSTALL ${SOURCE_PATH}/LICENSES/BLOSC.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/blosc RENAME copyright)
+
+vcpkg_fixup_pkgconfig()
diff --git a/ports/blosc/vcpkg.json b/ports/blosc/vcpkg.json
index f9b3e0513b9dae..47ea38da4861fc 100644
--- a/ports/blosc/vcpkg.json
+++ b/ports/blosc/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "blosc",
   "version-string": "1.18.1",
-  "port-version": 2,
+  "port-version": 3,
   "description": "A blocking, shuffling and loss-less compression library that can be faster than `memcpy()`",
   "homepage": "https://github.com/Blosc/c-blosc",
   "dependencies": [
diff --git a/ports/brpc/portfile.cmake b/ports/brpc/portfile.cmake
index 3547c642337e70..b78f6e4ccc2489 100644
--- a/ports/brpc/portfile.cmake
+++ b/ports/brpc/portfile.cmake
@@ -30,3 +30,5 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/butil/third_party/superfast
 vcpkg_copy_pdbs()
 
 file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+
+vcpkg_fixup_pkgconfig()
diff --git a/ports/brpc/vcpkg.json b/ports/brpc/vcpkg.json
index 2b2e1568916597..8d7e722c7b4e2b 100644
--- a/ports/brpc/vcpkg.json
+++ b/ports/brpc/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "brpc",
   "version-string": "0.9.7",
-  "port-version": 2,
+  "port-version": 3,
   "description": "Industrial-grade RPC framework used throughout Baidu, with 1,000,000+ instances and thousands kinds of services, called \"baidu-rpc\" inside Baidu.",
   "homepage": "https://github.com/apache/incubator-brpc",
   "supports": "!windows",
diff --git a/ports/bullet3/portfile.cmake b/ports/bullet3/portfile.cmake
index 886535ee995a70..39bb69f8ed2633 100644
--- a/ports/bullet3/portfile.cmake
+++ b/ports/bullet3/portfile.cmake
@@ -41,3 +41,5 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/bullet/BulletInverseDynamic
 vcpkg_copy_pdbs()
 
 file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+
+vcpkg_fixup_pkgconfig()
diff --git a/ports/bullet3/vcpkg.json b/ports/bullet3/vcpkg.json
index 70c9be0ba1a999..7aa0e9feb1acde 100644
--- a/ports/bullet3/vcpkg.json
+++ b/ports/bullet3/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "bullet3",
   "version": "3.17",
-  "port-version": 1,
+  "port-version": 2,
   "description": "Bullet Physics is a professional collision detection, rigid body, and soft body dynamics library",
   "homepage": "https://github.com/bulletphysics/bullet3",
   "features": {
diff --git a/ports/capnproto/portfile.cmake b/ports/capnproto/portfile.cmake
index 62f7950eee8df1..7e12093501067f 100644
--- a/ports/capnproto/portfile.cmake
+++ b/ports/capnproto/portfile.cmake
@@ -38,3 +38,5 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
 
 # Handle copyright
 file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+
+vcpkg_fixup_pkgconfig()
diff --git a/ports/capnproto/vcpkg.json b/ports/capnproto/vcpkg.json
index 0f65a548579223..97a39f16cee938 100644
--- a/ports/capnproto/vcpkg.json
+++ b/ports/capnproto/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "capnproto",
   "version": "0.9.1",
+  "port-version": 1,
   "description": "Data interchange format and capability-based RPC system",
   "homepage": "https://capnproto.org/",
   "supports": "!uwp & !((arm | arm64) & windows)",
diff --git a/ports/ccd/portfile.cmake b/ports/ccd/portfile.cmake
index a465560caca020..c2c294d56d8cc6 100644
--- a/ports/ccd/portfile.cmake
+++ b/ports/ccd/portfile.cmake
@@ -31,3 +31,5 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/share/doc)
 
 file(INSTALL ${SOURCE_PATH}/BSD-LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+
+vcpkg_fixup_pkgconfig()
diff --git a/ports/ccd/vcpkg.json b/ports/ccd/vcpkg.json
index 43110c69d5ed9a..15978fb00201ad 100644
--- a/ports/ccd/vcpkg.json
+++ b/ports/ccd/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "ccd",
   "version-string": "2.1-4",
-  "port-version": 2,
+  "port-version": 3,
   "description": "Library for collision detection between two convex shapes",
   "homepage": "https://github.com/danfis/libccd"
 }
diff --git a/ports/charls/portfile.cmake b/ports/charls/portfile.cmake
index 436d11a8e06f88..bbb9038c2062c9 100644
--- a/ports/charls/portfile.cmake
+++ b/ports/charls/portfile.cmake
@@ -22,3 +22,5 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
 file(INSTALL ${SOURCE_PATH}/LICENSE.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
 
 vcpkg_copy_pdbs()
+
+vcpkg_fixup_pkgconfig()
diff --git a/ports/charls/vcpkg.json b/ports/charls/vcpkg.json
index b03c6bcdd25a8b..3f07ca3c2eba0e 100644
--- a/ports/charls/vcpkg.json
+++ b/ports/charls/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "charls",
   "version-string": "2.2.0",
-  "port-version": 1,
+  "port-version": 2,
   "description": "CharLS, a C++ JPEG-LS library implementation.",
   "homepage": "https://github.com/team-charls/charls"
 }
diff --git a/ports/check/portfile.cmake b/ports/check/portfile.cmake
index b01006cf63990c..0553e098195a02 100644
--- a/ports/check/portfile.cmake
+++ b/ports/check/portfile.cmake
@@ -26,4 +26,5 @@ endif()
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share)
 
 # Handle copyright
-file(INSTALL ${SOURCE_PATH}/COPYING.LESSER DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
\ No newline at end of file
+file(INSTALL ${SOURCE_PATH}/COPYING.LESSER DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+vcpkg_fixup_pkgconfig()
diff --git a/ports/check/vcpkg.json b/ports/check/vcpkg.json
index d94e11b6862262..eb021bead0734b 100644
--- a/ports/check/vcpkg.json
+++ b/ports/check/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "check",
   "version-string": "0.15.2",
-  "port-version": 1,
+  "port-version": 2,
   "description": "A unit testing framework for C",
   "homepage": "https://github.com/libcheck/check"
 }
diff --git a/ports/cjson/portfile.cmake b/ports/cjson/portfile.cmake
index f960d83f2fce85..340de48e5b4f76 100644
--- a/ports/cjson/portfile.cmake
+++ b/ports/cjson/portfile.cmake
@@ -56,3 +56,5 @@ file(WRITE "${CURRENT_PACKAGES_DIR}/include/cjson/cJSON.h" "${_contents}")
 
 # Handle copyright
 configure_file("${SOURCE_PATH}/LICENSE" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY)
+
+vcpkg_fixup_pkgconfig()
diff --git a/ports/cjson/vcpkg.json b/ports/cjson/vcpkg.json
index e32c54aed3e663..cfdfb121e120b9 100644
--- a/ports/cjson/vcpkg.json
+++ b/ports/cjson/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "cjson",
   "version": "1.7.15",
+  "port-version": 1,
   "description": "Ultralightweight JSON parser in ANSI C",
   "homepage": "https://github.com/DaveGamble/cJSON",
   "dependencies": [
diff --git a/ports/clblast/portfile.cmake b/ports/clblast/portfile.cmake
index 6eb78772a5b736..bdb3e5f050d271 100644
--- a/ports/clblast/portfile.cmake
+++ b/ports/clblast/portfile.cmake
@@ -42,3 +42,5 @@ vcpkg_copy_pdbs()
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
 
 file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+
+vcpkg_fixup_pkgconfig()
diff --git a/ports/clblast/vcpkg.json b/ports/clblast/vcpkg.json
index 1bf12a26b2e004..06c744fa346fd9 100644
--- a/ports/clblast/vcpkg.json
+++ b/ports/clblast/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "clblast",
   "version-string": "1.5.1",
-  "port-version": 1,
+  "port-version": 2,
   "description": "A modern, lightweight, performant and tunable OpenCL BLAS library written in C++11.",
   "dependencies": [
     "opencl"
diff --git a/ports/cli/portfile.cmake b/ports/cli/portfile.cmake
index e8e1ffc7a4baef..a9dee4d7d59612 100644
--- a/ports/cli/portfile.cmake
+++ b/ports/cli/portfile.cmake
@@ -17,3 +17,5 @@ vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/cli)
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/lib")
 file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+
+vcpkg_fixup_pkgconfig()
diff --git a/ports/cli/vcpkg.json b/ports/cli/vcpkg.json
index dc433aa91304e1..96f9e55556db74 100644
--- a/ports/cli/vcpkg.json
+++ b/ports/cli/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "cli",
   "version-semver": "2.0.0",
+  "port-version": 1,
   "description": "A library for interactive command line interfaces in modern C++",
   "homepage": "https://github.com/daniele77/cli",
   "dependencies": [
diff --git a/ports/cmocka/portfile.cmake b/ports/cmocka/portfile.cmake
index 220868ebb3ec26..53c9aee69890ae 100644
--- a/ports/cmocka/portfile.cmake
+++ b/ports/cmocka/portfile.cmake
@@ -26,3 +26,5 @@ vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT})
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
 
 file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+
+vcpkg_fixup_pkgconfig()
diff --git a/ports/cmocka/vcpkg.json b/ports/cmocka/vcpkg.json
index d7bcbcf49635a2..8978acdb42c3da 100644
--- a/ports/cmocka/vcpkg.json
+++ b/ports/cmocka/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "cmocka",
   "version-string": "2020-08-01",
+  "port-version": 1,
   "description": "An elegant unit testing framework for C with support for mock objects",
   "homepage": "https://cmocka.org/",
   "license": "Apache-2.0"
diff --git a/ports/coin/portfile.cmake b/ports/coin/portfile.cmake
index 830bd64f9770bf..19ac9f120c032b 100644
--- a/ports/coin/portfile.cmake
+++ b/ports/coin/portfile.cmake
@@ -45,3 +45,5 @@ endif()
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/share/Coin/profiler)
+
+vcpkg_fixup_pkgconfig()
diff --git a/ports/coin/vcpkg.json b/ports/coin/vcpkg.json
index c9f254f77d2243..fbe97369e885e9 100644
--- a/ports/coin/vcpkg.json
+++ b/ports/coin/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "coin",
   "version-string": "4.0.0",
-  "port-version": 3,
+  "port-version": 4,
   "description": "A high-level 3D visualization library with Open Inventor 2.1 API",
   "homepage": "https://github.com/coin3d/coin",
   "supports": "!(arm | arm64 | uwp)",
diff --git a/ports/collada-dom/portfile.cmake b/ports/collada-dom/portfile.cmake
index 84c236dab08fc7..a3deb51fd4790a 100644
--- a/ports/collada-dom/portfile.cmake
+++ b/ports/collada-dom/portfile.cmake
@@ -24,3 +24,5 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
 
 # Handle copyright
 file(INSTALL ${SOURCE_PATH}/licenses/license_e.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+
+vcpkg_fixup_pkgconfig()
diff --git a/ports/collada-dom/vcpkg.json b/ports/collada-dom/vcpkg.json
index e929b4a076eed0..66e14efe6a6545 100644
--- a/ports/collada-dom/vcpkg.json
+++ b/ports/collada-dom/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "collada-dom",
   "version-string": "2.5.0",
-  "port-version": 5,
+  "port-version": 6,
   "description": "The COLLADA Document Object Model (DOM) is an application programming interface (API) that provides a C++ object representation of a COLLADA XML instance document.",
   "homepage": "https://github.com/rdiankov/collada-dom",
   "dependencies": [
diff --git a/ports/cpp-redis/portfile.cmake b/ports/cpp-redis/portfile.cmake
index 6a8144b58a8ce5..033878abff6fe2 100644
--- a/ports/cpp-redis/portfile.cmake
+++ b/ports/cpp-redis/portfile.cmake
@@ -57,4 +57,5 @@ endif()
 
 vcpkg_copy_pdbs()
 
-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)
+vcpkg_fixup_pkgconfig()
diff --git a/ports/cpp-redis/vcpkg.json b/ports/cpp-redis/vcpkg.json
index a0b08e18a7cff3..e04ec8d84b1224 100644
--- a/ports/cpp-redis/vcpkg.json
+++ b/ports/cpp-redis/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "cpp-redis",
   "version-string": "4.3.1",
-  "port-version": 3,
+  "port-version": 4,
   "description": "cpp-redis is a C++11 Asynchronous Multi-Platform Lightweight Redis Client, with support for synchronous operations and pipelining.",
   "homepage": "https://github.com/cpp-redis/cpp_redis",
   "dependencies": [
diff --git a/ports/cppcodec/portfile.cmake b/ports/cppcodec/portfile.cmake
index 63e1b95855cebe..792e734f5d4607 100644
--- a/ports/cppcodec/portfile.cmake
+++ b/ports/cppcodec/portfile.cmake
@@ -20,3 +20,5 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug ${CURRENT_PACKAGES_DIR}/lib)
 
 file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
     
+
+vcpkg_fixup_pkgconfig()
diff --git a/ports/cppcodec/vcpkg.json b/ports/cppcodec/vcpkg.json
index 0713dfd7f0fd8a..1066a7b85b689c 100644
--- a/ports/cppcodec/vcpkg.json
+++ b/ports/cppcodec/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "cppcodec",
   "version-string": "0.2",
-  "port-version": 1,
+  "port-version": 2,
   "description": "Header-only C++11 library to encode/decode base64, base64url, base32, base32hex and hex (a.k.a. base16) as specified in RFC 4648, plus Crockford's base32."
 }
diff --git a/ports/cpuid/portfile.cmake b/ports/cpuid/portfile.cmake
index 00f374a928fedd..306ccd5ac4025f 100644
--- a/ports/cpuid/portfile.cmake
+++ b/ports/cpuid/portfile.cmake
@@ -24,3 +24,5 @@ vcpkg_copy_pdbs()
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin" "${CURRENT_PACKAGES_DIR}/debug/include")
 
 file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+
+vcpkg_fixup_pkgconfig()
diff --git a/ports/cpuid/vcpkg.json b/ports/cpuid/vcpkg.json
index cae732ea586a44..a2ae5e99bfd2bc 100644
--- a/ports/cpuid/vcpkg.json
+++ b/ports/cpuid/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "cpuid",
   "version": "0.5.1",
-  "port-version": 1,
+  "port-version": 2,
   "description": "Provides CPU identification for the x86 (and x86_64)",
   "homepage": "https://github.com/anrieff/libcpuid",
   "supports": "x86 | x64",
diff --git a/ports/curlpp/portfile.cmake b/ports/curlpp/portfile.cmake
index 9611908db85c0a..f589a73bb0d821 100644
--- a/ports/curlpp/portfile.cmake
+++ b/ports/curlpp/portfile.cmake
@@ -32,3 +32,5 @@ vcpkg_copy_pdbs()
 file(INSTALL ${SOURCE_PATH}/doc/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
 file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/unofficial-${PORT})
 
+
+vcpkg_fixup_pkgconfig()
diff --git a/ports/curlpp/vcpkg.json b/ports/curlpp/vcpkg.json
index 9ca5d29edc3770..4486c433db6be4 100644
--- a/ports/curlpp/vcpkg.json
+++ b/ports/curlpp/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "curlpp",
   "version-string": "2018-06-15",
-  "port-version": 4,
+  "port-version": 5,
   "description": "C++ wrapper around libcURL",
   "dependencies": [
     "curl"
diff --git a/ports/dlib/portfile.cmake b/ports/dlib/portfile.cmake
index 481554b90e49e9..29a43c144e189e 100644
--- a/ports/dlib/portfile.cmake
+++ b/ports/dlib/portfile.cmake
@@ -77,3 +77,5 @@ file(WRITE ${CURRENT_PACKAGES_DIR}/include/dlib/config.h "${_contents}")
 # Handle copyright
 file(INSTALL ${SOURCE_PATH}/dlib/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/share/doc)
+
+vcpkg_fixup_pkgconfig()
diff --git a/ports/dlib/vcpkg.json b/ports/dlib/vcpkg.json
index bb60944f8d3111..a67b77498f7428 100644
--- a/ports/dlib/vcpkg.json
+++ b/ports/dlib/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "dlib",
   "version": "19.21",
-  "port-version": 5,
+  "port-version": 6,
   "description": "Modern C++ toolkit containing machine learning algorithms and tools for creating complex software in C++",
   "homepage": "https://github.com/davisking/dlib",
   "dependencies": [
diff --git a/ports/easyloggingpp/portfile.cmake b/ports/easyloggingpp/portfile.cmake
index a2d04b6ca962b8..bb198a315094bb 100644
--- a/ports/easyloggingpp/portfile.cmake
+++ b/ports/easyloggingpp/portfile.cmake
@@ -20,3 +20,5 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
 
 file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/easyloggingpp" RENAME copyright)
 
+
+vcpkg_fixup_pkgconfig()
diff --git a/ports/easyloggingpp/vcpkg.json b/ports/easyloggingpp/vcpkg.json
index 1dbf4d6e081414..277158eaabe381 100644
--- a/ports/easyloggingpp/vcpkg.json
+++ b/ports/easyloggingpp/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "easyloggingpp",
   "version": "9.97.0",
+  "port-version": 1,
   "description": "Easylogging++ is a single header efficient logging library for C++ applications.",
   "homepage": "https://github.com/amrayn/easyloggingpp",
   "dependencies": [
diff --git a/ports/edlib/portfile.cmake b/ports/edlib/portfile.cmake
index 96fdcc3bab6b49..60a6cca637486d 100644
--- a/ports/edlib/portfile.cmake
+++ b/ports/edlib/portfile.cmake
@@ -17,3 +17,5 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 
 # Handle copyright
 file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+
+vcpkg_fixup_pkgconfig()
diff --git a/ports/edlib/vcpkg.json b/ports/edlib/vcpkg.json
index 4ac50b3bf21de2..f66b09ff1f777a 100644
--- a/ports/edlib/vcpkg.json
+++ b/ports/edlib/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "edlib",
   "version": "1.2.7",
+  "port-version": 1,
   "description": "Lightweight, super fast C/C++ (& Python) library for sequence alignment using edit (Levenshtein) distance.",
   "homepage": "https://github.com/Martinsos/edlib",
   "dependencies": [
diff --git a/ports/fcl/portfile.cmake b/ports/fcl/portfile.cmake
index ea76835c381f00..079633dc4eb9de 100644
--- a/ports/fcl/portfile.cmake
+++ b/ports/fcl/portfile.cmake
@@ -36,3 +36,5 @@ endif()
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share")
 
 file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+
+vcpkg_fixup_pkgconfig()
diff --git a/ports/fcl/vcpkg.json b/ports/fcl/vcpkg.json
index 255d59d887aefa..2ce7c11ff3a435 100644
--- a/ports/fcl/vcpkg.json
+++ b/ports/fcl/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "fcl",
   "version": "0.7.0",
+  "port-version": 1,
   "description": "a library for performing three types of proximity queries on a pair of geometric models composed of triangles",
   "homepage": "https://github.com/flexible-collision-library/fcl",
   "supports": "static",
diff --git a/ports/fftw3/portfile.cmake b/ports/fftw3/portfile.cmake
index 3493d7cdac1646..45a9052e727d1a 100644
--- a/ports/fftw3/portfile.cmake
+++ b/ports/fftw3/portfile.cmake
@@ -70,3 +70,5 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
 
 file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+
+vcpkg_fixup_pkgconfig()
diff --git a/ports/fftw3/vcpkg.json b/ports/fftw3/vcpkg.json
index 08b641c4a522b1..53d4932318f809 100644
--- a/ports/fftw3/vcpkg.json
+++ b/ports/fftw3/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "fftw3",
   "version": "3.3.10",
-  "port-version": 1,
+  "port-version": 2,
   "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/flann/portfile.cmake b/ports/flann/portfile.cmake
index d70669b5ff8957..4c15477150e0e3 100644
--- a/ports/flann/portfile.cmake
+++ b/ports/flann/portfile.cmake
@@ -44,3 +44,5 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
 
 # Handle copyright
 file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/flann RENAME copyright)
+
+vcpkg_fixup_pkgconfig()
diff --git a/ports/flann/vcpkg.json b/ports/flann/vcpkg.json
index 1221c9be98c49c..0074e93dc6ef36 100644
--- a/ports/flann/vcpkg.json
+++ b/ports/flann/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "flann",
   "version-date": "2019-04-07",
-  "port-version": 2,
+  "port-version": 3,
   "description": "Fast Library for Approximate Nearest Neighbors",
   "homepage": "https://github.com/mariusmuja/flann",
   "dependencies": [
diff --git a/ports/flatbuffers/portfile.cmake b/ports/flatbuffers/portfile.cmake
index 5cf7ab6bbae9a1..e0feff81b6aeeb 100644
--- a/ports/flatbuffers/portfile.cmake
+++ b/ports/flatbuffers/portfile.cmake
@@ -46,3 +46,5 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bi
 
 # Handle copyright
 file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+
+vcpkg_fixup_pkgconfig()
diff --git a/ports/flatbuffers/vcpkg.json b/ports/flatbuffers/vcpkg.json
index 76d6c2a5df1f78..911c5f189cb341 100644
--- a/ports/flatbuffers/vcpkg.json
+++ b/ports/flatbuffers/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "flatbuffers",
   "version-string": "2.0.0",
-  "port-version": 1,
+  "port-version": 2,
   "description": [
     "Memory Efficient Serialization Library",
     "FlatBuffers is an efficient cross platform serialization library for games and other memory constrained apps. It allows you to directly access serialized data without unpacking/parsing it first, while still having great forwards/backwards compatibility."
diff --git a/ports/fluidlite/portfile.cmake b/ports/fluidlite/portfile.cmake
index 707fcd720b8a7c..8e99d8f01d24f7 100644
--- a/ports/fluidlite/portfile.cmake
+++ b/ports/fluidlite/portfile.cmake
@@ -29,3 +29,5 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
 
 # Handle copyright
 file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+
+vcpkg_fixup_pkgconfig()
diff --git a/ports/fluidlite/vcpkg.json b/ports/fluidlite/vcpkg.json
index 4e0bb02ad9f921..ea960e89ba005e 100644
--- a/ports/fluidlite/vcpkg.json
+++ b/ports/fluidlite/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "fluidlite",
   "version-string": "2020-08-27",
-  "port-version": 1,
+  "port-version": 2,
   "description": "FluidLite is a very light version of FluidSynth designed to be hardware, platform and external dependency independant.",
   "homepage": "https://github.com/divideconcept/FluidLite"
 }
diff --git a/ports/folly/portfile.cmake b/ports/folly/portfile.cmake
index 09266888e43952..0d195a0552a1ce 100644
--- a/ports/folly/portfile.cmake
+++ b/ports/folly/portfile.cmake
@@ -97,3 +97,5 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
 
 # Handle copyright
 file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+
+vcpkg_fixup_pkgconfig()
diff --git a/ports/folly/vcpkg.json b/ports/folly/vcpkg.json
index 6b1908125b470f..64d892bf556549 100644
--- a/ports/folly/vcpkg.json
+++ b/ports/folly/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "folly",
   "version-string": "2021.06.14.00",
-  "port-version": 2,
+  "port-version": 3,
   "description": "An open-source C++ library developed and used at Facebook. The library is UNSTABLE on Windows",
   "homepage": "https://github.com/facebook/folly",
   "supports": "x64 | (arm64 & !windows)",
diff --git a/ports/freeglut/portfile.cmake b/ports/freeglut/portfile.cmake
index 8a872e6b6edc53..b281d12c7ef1e3 100755
--- a/ports/freeglut/portfile.cmake
+++ b/ports/freeglut/portfile.cmake
@@ -75,3 +75,5 @@ file(COPY ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/sh
 if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux")
     file(COPY ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/glut)
 endif()
+
+vcpkg_fixup_pkgconfig()
diff --git a/ports/freeglut/vcpkg.json b/ports/freeglut/vcpkg.json
index 9c53e4f6bcf217..dc95985d8a1d84 100644
--- a/ports/freeglut/vcpkg.json
+++ b/ports/freeglut/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "freeglut",
   "version-string": "3.2.1",
-  "port-version": 6,
+  "port-version": 7,
   "description": "Open source implementation of GLUT with source and binary backwards compatibility.",
   "homepage": "https://sourceforge.net/projects/freeglut/"
 }
diff --git a/ports/freeopcua/portfile.cmake b/ports/freeopcua/portfile.cmake
index 76e9508370b729..566c7a52744fe3 100644
--- a/ports/freeopcua/portfile.cmake
+++ b/ports/freeopcua/portfile.cmake
@@ -32,3 +32,5 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
 
 #Handle copyright
 file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/freeopcua RENAME copyright)
+
+vcpkg_fixup_pkgconfig()
diff --git a/ports/freeopcua/vcpkg.json b/ports/freeopcua/vcpkg.json
index b2cd24b19acfd2..02da47e65d08bc 100644
--- a/ports/freeopcua/vcpkg.json
+++ b/ports/freeopcua/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "freeopcua",
   "version-string": "20190125",
-  "port-version": 4,
+  "port-version": 5,
   "description": "OPC-UA server and client library written in C++ and with a lot of code auto-generated from xml specification using python.",
   "dependencies": [
     "boost-asio",
diff --git a/ports/functions-framework-cpp/portfile.cmake b/ports/functions-framework-cpp/portfile.cmake
index 73aff324cba56b..58b21e9572e719 100644
--- a/ports/functions-framework-cpp/portfile.cmake
+++ b/ports/functions-framework-cpp/portfile.cmake
@@ -29,3 +29,5 @@ file(
     RENAME copyright)
 
 vcpkg_copy_pdbs()
+
+vcpkg_fixup_pkgconfig()
diff --git a/ports/functions-framework-cpp/vcpkg.json b/ports/functions-framework-cpp/vcpkg.json
index 9a11c01441d6bc..dbb15a285e238d 100644
--- a/ports/functions-framework-cpp/vcpkg.json
+++ b/ports/functions-framework-cpp/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "functions-framework-cpp",
   "version": "1.0.0",
+  "port-version": 1,
   "description": "Functions Framework for C++.",
   "homepage": "https://github.com/GoogleCloudPlatform/functions-framework-cpp/",
   "license": "Apache-2.0",
diff --git a/ports/geogram/portfile.cmake b/ports/geogram/portfile.cmake
index 3dd71429b21318..76a240210da42d 100644
--- a/ports/geogram/portfile.cmake
+++ b/ports/geogram/portfile.cmake
@@ -79,3 +79,5 @@ vcpkg_replace_string(
 
 # Handle copyright
 file(INSTALL ${SOURCE_PATH}/doc/devkit/license.dox DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+
+vcpkg_fixup_pkgconfig()
diff --git a/ports/geogram/vcpkg.json b/ports/geogram/vcpkg.json
index 4f6012ecf87d5a..79374c8cbdc912 100644
--- a/ports/geogram/vcpkg.json
+++ b/ports/geogram/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "geogram",
   "version": "1.7.6",
+  "port-version": 1,
   "description": "Geogram is a programming library of geometric algorithms.",
   "homepage": "https://gforge.inria.fr/projects/geogram/",
   "supports": "!uwp",
diff --git a/ports/geographiclib/portfile.cmake b/ports/geographiclib/portfile.cmake
index 3b7bd3f51fa256..a5c71f8f730af1 100644
--- a/ports/geographiclib/portfile.cmake
+++ b/ports/geographiclib/portfile.cmake
@@ -52,3 +52,5 @@ file (INSTALL ${SOURCE_PATH}/LICENSE.txt
 # Install usage
 configure_file (${CMAKE_CURRENT_LIST_DIR}/usage
   ${CURRENT_PACKAGES_DIR}/share/${PORT}/usage @ONLY)
+
+vcpkg_fixup_pkgconfig()
diff --git a/ports/geographiclib/vcpkg.json b/ports/geographiclib/vcpkg.json
index df18eaf32021b4..69c49bc99c4e3e 100644
--- a/ports/geographiclib/vcpkg.json
+++ b/ports/geographiclib/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "geographiclib",
   "version": "1.52",
+  "port-version": 1,
   "description": "GeographicLib, a C++ library for performing geographic conversions",
   "homepage": "https://geographiclib.sourceforge.io",
   "features": {
diff --git a/ports/getdns/portfile.cmake b/ports/getdns/portfile.cmake
index 6c9a85e56e96ac..3a48f7cf208db3 100644
--- a/ports/getdns/portfile.cmake
+++ b/ports/getdns/portfile.cmake
@@ -43,3 +43,5 @@ file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${
 vcpkg_copy_pdbs()
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
+
+vcpkg_fixup_pkgconfig()
diff --git a/ports/getdns/vcpkg.json b/ports/getdns/vcpkg.json
index 05fceec365b2b3..749af94157850f 100644
--- a/ports/getdns/vcpkg.json
+++ b/ports/getdns/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "getdns",
   "version-string": "1.6.0",
-  "port-version": 1,
+  "port-version": 2,
   "description": "GetDNS is a modern asynchronous DNS API",
   "homepage": "https://getdnsapi.net/",
   "supports": "!uwp & windows",
diff --git a/ports/gflags/portfile.cmake b/ports/gflags/portfile.cmake
index e0d9e1dab01d2d..f1c22ff1aa6055 100644
--- a/ports/gflags/portfile.cmake
+++ b/ports/gflags/portfile.cmake
@@ -39,3 +39,5 @@ file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_D
 file(INSTALL "${SOURCE_PATH}/COPYING.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
 
 vcpkg_copy_pdbs()
+
+vcpkg_fixup_pkgconfig()
diff --git a/ports/gflags/vcpkg.json b/ports/gflags/vcpkg.json
index 5b020a81eb4c65..3b8d22a06ff163 100644
--- a/ports/gflags/vcpkg.json
+++ b/ports/gflags/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "gflags",
   "version-string": "2.2.2",
-  "port-version": 4,
+  "port-version": 5,
   "description": "A C++ library that implements commandline flags processing",
   "homepage": "https://github.com/gflags/gflags",
   "supports": "!uwp"
diff --git a/ports/graphite2/portfile.cmake b/ports/graphite2/portfile.cmake
index 44fe08ba6abc1d..428aa3a68c047c 100644
--- a/ports/graphite2/portfile.cmake
+++ b/ports/graphite2/portfile.cmake
@@ -23,3 +23,5 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
 
 file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
 file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+
+vcpkg_fixup_pkgconfig()
diff --git a/ports/graphite2/vcpkg.json b/ports/graphite2/vcpkg.json
index cd5e479f4029d4..70a6b070fab94a 100644
--- a/ports/graphite2/vcpkg.json
+++ b/ports/graphite2/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "graphite2",
   "version-string": "1.3.14",
-  "port-version": 1,
+  "port-version": 2,
   "description": [
     "Graphite is a \"smart font\" system developed specifically to handle the complexities of lesser-known languages of the world.",
     "Graphite2 is a rework of the original Graphite engine that is faster, smaller, and uses an API that is better suited to the layout architecture of most text-processing applications."
diff --git a/ports/graphqlparser/portfile.cmake b/ports/graphqlparser/portfile.cmake
index 92e36911089508..308810ba265c51 100644
--- a/ports/graphqlparser/portfile.cmake
+++ b/ports/graphqlparser/portfile.cmake
@@ -40,3 +40,5 @@ vcpkg_copy_pdbs()
 
 # Handle copyright
 configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/graphqlparser/copyright COPYONLY)
+
+vcpkg_fixup_pkgconfig()
diff --git a/ports/graphqlparser/vcpkg.json b/ports/graphqlparser/vcpkg.json
index d859a1f19f7567..77770b16d64a62 100644
--- a/ports/graphqlparser/vcpkg.json
+++ b/ports/graphqlparser/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "graphqlparser",
   "version-string": "0.7.0",
-  "port-version": 2,
+  "port-version": 3,
   "description": "A GraphQL query parser in C++ with C and C++ APIs"
 }
diff --git a/ports/graphviz/portfile.cmake b/ports/graphviz/portfile.cmake
index 93692bd8ddb469..6a4b451063a832 100644
--- a/ports/graphviz/portfile.cmake
+++ b/ports/graphviz/portfile.cmake
@@ -42,3 +42,5 @@ vcpkg_copy_tools(
 
 # # Handle copyright
 file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+
+vcpkg_fixup_pkgconfig()
diff --git a/ports/graphviz/vcpkg.json b/ports/graphviz/vcpkg.json
index 88243e941299eb..249daf03cbcc88 100644
--- a/ports/graphviz/vcpkg.json
+++ b/ports/graphviz/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "graphviz",
   "version-semver": "2.49.1",
+  "port-version": 1,
   "description": "Graph Visualization Tools",
   "homepage": "https://graphviz.org/",
   "dependencies": [
diff --git a/ports/hiredis/portfile.cmake b/ports/hiredis/portfile.cmake
index ebd8179b34c0b3..7ba78cda34dddc 100644
--- a/ports/hiredis/portfile.cmake
+++ b/ports/hiredis/portfile.cmake
@@ -38,4 +38,5 @@ if("ssl" IN_LIST FEATURES)
 endif()
 
 # Handle copyright
-file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
\ No newline at end of file
+file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_fixup_pkgconfig()
diff --git a/ports/hiredis/vcpkg.json b/ports/hiredis/vcpkg.json
index 68627dc901681a..32b9954975346c 100644
--- a/ports/hiredis/vcpkg.json
+++ b/ports/hiredis/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "hiredis",
   "version": "1.0.2",
+  "port-version": 1,
   "description": "Hiredis is a minimalistic C client library for the Redis database.",
   "homepage": "https://github.com/redis/hiredis",
   "supports": "!(windows & !static)",
diff --git a/ports/hyperscan/portfile.cmake b/ports/hyperscan/portfile.cmake
index 2aec198d3a5caa..b69532635f7645 100644
--- a/ports/hyperscan/portfile.cmake
+++ b/ports/hyperscan/portfile.cmake
@@ -26,3 +26,5 @@ 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)
+
+vcpkg_fixup_pkgconfig()
diff --git a/ports/hyperscan/vcpkg.json b/ports/hyperscan/vcpkg.json
index bddb221f39bd8f..05f19e116b4441 100644
--- a/ports/hyperscan/vcpkg.json
+++ b/ports/hyperscan/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "hyperscan",
   "version-string": "5.3.0",
-  "port-version": 2,
+  "port-version": 3,
   "description": "A regular expression library with O(length of input) match times that takes advantage of Intel hardware to provide blazing speed.",
   "homepage": "https://www.hyperscan.io",
   "supports": "!arm",
diff --git a/ports/igraph/portfile.cmake b/ports/igraph/portfile.cmake
index edd1dd242d7e32..2d57f74509d425 100644
--- a/ports/igraph/portfile.cmake
+++ b/ports/igraph/portfile.cmake
@@ -61,3 +61,5 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/igraph)
 
 file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+
+vcpkg_fixup_pkgconfig()
diff --git a/ports/igraph/vcpkg.json b/ports/igraph/vcpkg.json
index e7158bff7ab08a..33f6b1df8a74de 100644
--- a/ports/igraph/vcpkg.json
+++ b/ports/igraph/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "igraph",
   "version": "0.9.4",
+  "port-version": 1,
   "description": "igraph is a C library for network analysis and graph theory, with an emphasis on efficiency portability and ease of use.",
   "homepage": "https://igraph.org/",
   "dependencies": [
diff --git a/ports/iniparser/portfile.cmake b/ports/iniparser/portfile.cmake
index 94eb59601ede04..30487f815b7648 100644
--- a/ports/iniparser/portfile.cmake
+++ b/ports/iniparser/portfile.cmake
@@ -24,3 +24,5 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
 vcpkg_fixup_cmake_targets(CONFIG_PATH share/unofficial-${PORT} TARGET_PATH share/unofficial-${PORT})
 
 file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+
+vcpkg_fixup_pkgconfig()
diff --git a/ports/iniparser/vcpkg.json b/ports/iniparser/vcpkg.json
index a5acd226bd1c4a..88ad1b9f61585a 100644
--- a/ports/iniparser/vcpkg.json
+++ b/ports/iniparser/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "iniparser",
   "version-string": "2020-04-06",
-  "port-version": 1,
+  "port-version": 2,
   "description": "C library for parsing INI-style files",
   "homepage": "ndevilla.free.fr/iniparser"
 }
diff --git a/ports/itpp/portfile.cmake b/ports/itpp/portfile.cmake
index a87cedcb7db359..696f333824e9d2 100644
--- a/ports/itpp/portfile.cmake
+++ b/ports/itpp/portfile.cmake
@@ -34,3 +34,5 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
 vcpkg_copy_pdbs()
 
 file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+
+vcpkg_fixup_pkgconfig()
diff --git a/ports/itpp/vcpkg.json b/ports/itpp/vcpkg.json
index 00ac96b67f2f3f..972f0cd1998219 100644
--- a/ports/itpp/vcpkg.json
+++ b/ports/itpp/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "itpp",
   "version-semver": "4.3.1",
-  "port-version": 7,
+  "port-version": 8,
   "description": "IT++ is a C++ library of mathematical, signal processing and communication classes and functions. Its main use is in simulation of communication systems and for performing research in the area of communications.",
   "homepage": "http://itpp.sourceforge.net"
 }
diff --git a/ports/jansson/portfile.cmake b/ports/jansson/portfile.cmake
index f0233ddacf723b..7d9679ffa0f4a6 100644
--- a/ports/jansson/portfile.cmake
+++ b/ports/jansson/portfile.cmake
@@ -46,3 +46,5 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
 file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
 
 vcpkg_copy_pdbs()
+
+vcpkg_fixup_pkgconfig()
diff --git a/ports/jansson/vcpkg.json b/ports/jansson/vcpkg.json
index d494c8d5df602f..defd7c351629ae 100644
--- a/ports/jansson/vcpkg.json
+++ b/ports/jansson/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "jansson",
   "version-string": "2.13.1",
-  "port-version": 1,
+  "port-version": 2,
   "description": "Jansson is a C library for encoding, decoding and manipulating JSON data",
   "homepage": "https://github.com/akheron/jansson"
 }
diff --git a/ports/json11/portfile.cmake b/ports/json11/portfile.cmake
index 9d1c459bc14676..3ff8b0f2951b1e 100644
--- a/ports/json11/portfile.cmake
+++ b/ports/json11/portfile.cmake
@@ -26,3 +26,5 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
 # Handle copyright
 file(COPY ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/json11)
 file(RENAME ${CURRENT_PACKAGES_DIR}/share/json11/LICENSE.txt ${CURRENT_PACKAGES_DIR}/share/json11/copyright)
+
+vcpkg_fixup_pkgconfig()
diff --git a/ports/json11/vcpkg.json b/ports/json11/vcpkg.json
index f2aad6b8cbbcc4..70fb4f20971d4c 100644
--- a/ports/json11/vcpkg.json
+++ b/ports/json11/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "json11",
   "version-string": "2017-06-20",
-  "port-version": 3,
+  "port-version": 4,
   "description": "json11 is a tiny JSON library for C++11, providing JSON parsing and serialization."
 }
diff --git a/ports/libbson/portfile.cmake b/ports/libbson/portfile.cmake
index e9f48e7f1867bf..afb674f5476ca2 100644
--- a/ports/libbson/portfile.cmake
+++ b/ports/libbson/portfile.cmake
@@ -72,3 +72,5 @@ file(COPY "${SOURCE_PATH}/THIRD_PARTY_NOTICES" DESTINATION "${CURRENT_PACKAGES_D
 
 file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
 file(INSTALL "${CURRENT_PORT_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
+
+vcpkg_fixup_pkgconfig()
diff --git a/ports/libbson/vcpkg.json b/ports/libbson/vcpkg.json
index a35c4c3967cfa9..b985071bd12408 100644
--- a/ports/libbson/vcpkg.json
+++ b/ports/libbson/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "libbson",
   "version": "1.17.6",
+  "port-version": 1,
   "description": "libbson is a library providing useful routines related to building, parsing, and iterating BSON documents.",
   "homepage": "https://github.com/mongodb/libbson",
   "dependencies": [
diff --git a/ports/libcerf/portfile.cmake b/ports/libcerf/portfile.cmake
index 199e396e92cff9..1054bf5c8c73d8 100644
--- a/ports/libcerf/portfile.cmake
+++ b/ports/libcerf/portfile.cmake
@@ -29,3 +29,5 @@ vcpkg_install_cmake()
 
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
 file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/libcerf RENAME copyright)
+
+vcpkg_fixup_pkgconfig()
diff --git a/ports/libcerf/vcpkg.json b/ports/libcerf/vcpkg.json
index 73b60013ee8263..3d134faac927e6 100644
--- a/ports/libcerf/vcpkg.json
+++ b/ports/libcerf/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "libcerf",
   "version-string": "1.13",
-  "port-version": 1,
+  "port-version": 2,
   "description": "A self-contained numeric library that provides an efficient and accurate implementation of complex error functions, along with Dawson, Faddeeva, and Voigt functions.",
   "homepage": "https://jugit.fz-juelich.de/mlz/libcerf"
 }
diff --git a/ports/libconfuse/portfile.cmake b/ports/libconfuse/portfile.cmake
index ac49ff157c7639..239c8dacfd7e3d 100644
--- a/ports/libconfuse/portfile.cmake
+++ b/ports/libconfuse/portfile.cmake
@@ -36,3 +36,5 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
 
 # Handle copyright
 configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY)
+
+vcpkg_fixup_pkgconfig()
diff --git a/ports/libconfuse/vcpkg.json b/ports/libconfuse/vcpkg.json
index 2a9a604f5775cf..dd7416c670337b 100644
--- a/ports/libconfuse/vcpkg.json
+++ b/ports/libconfuse/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "libconfuse",
   "version-string": "2019-07-14",
-  "port-version": 1,
+  "port-version": 2,
   "description": "Small configuration file parser library for C",
   "homepage": "https://github.com/martinh/libconfuse"
 }
diff --git a/ports/libevent/portfile.cmake b/ports/libevent/portfile.cmake
index d6b02bbf707e66..30af582dbfb9cb 100644
--- a/ports/libevent/portfile.cmake
+++ b/ports/libevent/portfile.cmake
@@ -68,3 +68,5 @@ vcpkg_copy_pdbs()
 
 #Handle copyright
 file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+
+vcpkg_fixup_pkgconfig()
diff --git a/ports/libevent/vcpkg.json b/ports/libevent/vcpkg.json
index 1ddfa7a44f5ec9..2259af3744bc17 100644
--- a/ports/libevent/vcpkg.json
+++ b/ports/libevent/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "libevent",
   "version-string": "2.1.12",
-  "port-version": 2,
+  "port-version": 3,
   "description": "An event notification library",
   "homepage": "https://github.com/libevent/libevent",
   "supports": "!uwp",
diff --git a/ports/libevhtp/portfile.cmake b/ports/libevhtp/portfile.cmake
index ddd97c10c6d4c2..71c17ee533389d 100644
--- a/ports/libevhtp/portfile.cmake
+++ b/ports/libevhtp/portfile.cmake
@@ -30,4 +30,5 @@ vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT})
 vcpkg_copy_pdbs()
 
 # Handle copyright
-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)
+vcpkg_fixup_pkgconfig()
diff --git a/ports/libevhtp/vcpkg.json b/ports/libevhtp/vcpkg.json
index 5d95f7901669ff..04f8de1723fb4d 100644
--- a/ports/libevhtp/vcpkg.json
+++ b/ports/libevhtp/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "libevhtp",
   "version-string": "1.2.18",
-  "port-version": 1,
+  "port-version": 2,
   "description": "Libevhtp was created as a replacement API for Libevent's current HTTP API.",
   "homepage": "https://github.com/criticalstack/libevhtp",
   "dependencies": [
diff --git a/ports/libfort/portfile.cmake b/ports/libfort/portfile.cmake
index 969af67eb1779a..a016161cbd8da5 100644
--- a/ports/libfort/portfile.cmake
+++ b/ports/libfort/portfile.cmake
@@ -22,3 +22,5 @@ vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/libfort)
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 
 file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+
+vcpkg_fixup_pkgconfig()
diff --git a/ports/libfort/vcpkg.json b/ports/libfort/vcpkg.json
index 7a13edcc58b104..a12c8b575734bb 100644
--- a/ports/libfort/vcpkg.json
+++ b/ports/libfort/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "libfort",
   "version-semver": "0.4.2",
+  "port-version": 1,
   "description": "A simple crossplatform library to create formatted text tables",
   "homepage": "https://github.com/seleznevae/libfort",
   "license": "MIT",
diff --git a/ports/libfreenect2/portfile.cmake b/ports/libfreenect2/portfile.cmake
index 3405097713e604..ba35cee15a7216 100644
--- a/ports/libfreenect2/portfile.cmake
+++ b/ports/libfreenect2/portfile.cmake
@@ -40,3 +40,5 @@ vcpkg_copy_pdbs()
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
 
 file(INSTALL ${SOURCE_PATH}/GPL2 DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+
+vcpkg_fixup_pkgconfig()
diff --git a/ports/libfreenect2/vcpkg.json b/ports/libfreenect2/vcpkg.json
index a68b6564e4458d..fda7d64da6ee37 100644
--- a/ports/libfreenect2/vcpkg.json
+++ b/ports/libfreenect2/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "libfreenect2",
   "version-string": "0.2.0",
-  "port-version": 6,
+  "port-version": 7,
   "description": "Open source drivers for the Kinect for Windows v2 device",
   "homepage": "https://github.com/OpenKinect/libfreenect2",
   "dependencies": [
diff --git a/ports/libgd/portfile.cmake b/ports/libgd/portfile.cmake
index aa5d9deb322fb1..4477e791cab7ef 100644
--- a/ports/libgd/portfile.cmake
+++ b/ports/libgd/portfile.cmake
@@ -53,3 +53,5 @@ vcpkg_copy_pdbs()
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 
 file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+
+vcpkg_fixup_pkgconfig()
diff --git a/ports/libgd/vcpkg.json b/ports/libgd/vcpkg.json
index e87ee5bc75cb9e..34ae61fac38ec0 100644
--- a/ports/libgd/vcpkg.json
+++ b/ports/libgd/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "libgd",
   "version-semver": "2.3.2",
+  "port-version": 1,
   "description": "Open source code library for the dynamic creation of images by programmers.",
   "homepage": "https://github.com/libgd/libgd",
   "dependencies": [
diff --git a/ports/libgta/portfile.cmake b/ports/libgta/portfile.cmake
index 1e4b0f95102f99..65409dc33b186f 100644
--- a/ports/libgta/portfile.cmake
+++ b/ports/libgta/portfile.cmake
@@ -33,3 +33,5 @@ endif()
 
 file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/libgta)
 file(RENAME ${CURRENT_PACKAGES_DIR}/share/libgta/COPYING ${CURRENT_PACKAGES_DIR}/share/libgta/copyright)
+
+vcpkg_fixup_pkgconfig()
diff --git a/ports/libgta/vcpkg.json b/ports/libgta/vcpkg.json
index 789978fe468767..40aeadb4c95a73 100644
--- a/ports/libgta/vcpkg.json
+++ b/ports/libgta/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "libgta",
   "version-string": "1.0.8",
-  "port-version": 2,
+  "port-version": 3,
   "description": "Libgta is a portable library that implements the Generic Tagged Array (GTA) file format.",
   "homepage": "https://download.savannah.nongnu.org/releases/gta",
   "dependencies": [
diff --git a/ports/libkeyfinder/portfile.cmake b/ports/libkeyfinder/portfile.cmake
index 8b06add324f093..e87077ddf2b17a 100644
--- a/ports/libkeyfinder/portfile.cmake
+++ b/ports/libkeyfinder/portfile.cmake
@@ -23,3 +23,5 @@ vcpkg_cmake_config_fixup(PACKAGE_NAME KeyFinder CONFIG_PATH lib/cmake/KeyFinder)
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 
 file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+
+vcpkg_fixup_pkgconfig()
diff --git a/ports/libkeyfinder/vcpkg.json b/ports/libkeyfinder/vcpkg.json
index c52f0c914978a8..6c3fbfca19bf91 100644
--- a/ports/libkeyfinder/vcpkg.json
+++ b/ports/libkeyfinder/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "libkeyfinder",
   "version-string": "2.2.5",
+  "port-version": 1,
   "description": "Musical key detection for digital audio",
   "homepage": "https://github.com/mixxxdj/libkeyfinder",
   "license": "GPL-3.0-or-later",
diff --git a/ports/libkml/portfile.cmake b/ports/libkml/portfile.cmake
index 581a3b6089b15d..ce54b1c7e39eed 100644
--- a/ports/libkml/portfile.cmake
+++ b/ports/libkml/portfile.cmake
@@ -27,4 +27,5 @@ elseif (VCPKG_TARGET_IS_OSX)
 endif()
 
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
-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)
+vcpkg_fixup_pkgconfig()
diff --git a/ports/libkml/vcpkg.json b/ports/libkml/vcpkg.json
index adb47787c4c9f9..fa70197a25326d 100644
--- a/ports/libkml/vcpkg.json
+++ b/ports/libkml/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "libkml",
   "version-string": "1.3.0",
-  "port-version": 7,
+  "port-version": 8,
   "description": "Reference implementation of OGC KML 2.2",
   "homepage": "https://github.com/libkml/libkml",
   "dependencies": [
diff --git a/ports/liblemon/portfile.cmake b/ports/liblemon/portfile.cmake
index 14eebfe6c66cc5..290b7e715bfc0c 100644
--- a/ports/liblemon/portfile.cmake
+++ b/ports/liblemon/portfile.cmake
@@ -41,4 +41,5 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bi
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/share/doc)
 
 # Handle copyright
-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)
+vcpkg_fixup_pkgconfig()
diff --git a/ports/liblemon/vcpkg.json b/ports/liblemon/vcpkg.json
index 06e75ebcda66bc..7cbf85eb1a73f2 100644
--- a/ports/liblemon/vcpkg.json
+++ b/ports/liblemon/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "liblemon",
   "version-string": "2019-06-13",
-  "port-version": 2,
+  "port-version": 3,
   "description": "Library for Efficient Modeling and Optimization in Networks",
   "homepage": "https://lemon.cs.elte.hu/trac/lemon"
 }
diff --git a/ports/liblo/portfile.cmake b/ports/liblo/portfile.cmake
index 3ddfd9e7a0d931..f43a524239ab11 100644
--- a/ports/liblo/portfile.cmake
+++ b/ports/liblo/portfile.cmake
@@ -28,3 +28,5 @@ endif()
 
 # Handle copyright
 file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/liblo RENAME copyright)
+
+vcpkg_fixup_pkgconfig()
diff --git a/ports/liblo/vcpkg.json b/ports/liblo/vcpkg.json
index f013f968c972b0..6d060c75106019 100644
--- a/ports/liblo/vcpkg.json
+++ b/ports/liblo/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "liblo",
   "version-string": "0.31",
-  "port-version": 1,
+  "port-version": 2,
   "description": "liblo is an implementation of the Open Sound Control protocol for POSIX systems",
   "homepage": "https://github.com/radarsat1/liblo"
 }
diff --git a/ports/libmikmod/portfile.cmake b/ports/libmikmod/portfile.cmake
index 55556e2055315c..17d19c755e2f2e 100644
--- a/ports/libmikmod/portfile.cmake
+++ b/ports/libmikmod/portfile.cmake
@@ -45,3 +45,5 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
 endif()
 
 file(INSTALL ${SOURCE_PATH}/COPYING.LESSER DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+
+vcpkg_fixup_pkgconfig()
diff --git a/ports/libmikmod/vcpkg.json b/ports/libmikmod/vcpkg.json
index f981fac5c16e1f..797bcbc03226ec 100644
--- a/ports/libmikmod/vcpkg.json
+++ b/ports/libmikmod/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "libmikmod",
   "version-string": "3.3.11.1",
-  "port-version": 9,
+  "port-version": 10,
   "description": "Mikmod is a module player and library supporting many formats, including mod, s3m, it, and xm.",
   "homepage": "https://sourceforge.net/projects/mikmod/",
   "dependencies": [
diff --git a/ports/libmt32emu/portfile.cmake b/ports/libmt32emu/portfile.cmake
index cb9ed893973440..706307693acd88 100644
--- a/ports/libmt32emu/portfile.cmake
+++ b/ports/libmt32emu/portfile.cmake
@@ -23,3 +23,5 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/doc")
 
 
 file(INSTALL "${SOURCE_PATH}/mt32emu/COPYING.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+
+vcpkg_fixup_pkgconfig()
diff --git a/ports/libmt32emu/vcpkg.json b/ports/libmt32emu/vcpkg.json
index aace79c4e27099..79ead6f26c5b85 100644
--- a/ports/libmt32emu/vcpkg.json
+++ b/ports/libmt32emu/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "libmt32emu",
   "version": "2.5.3",
+  "port-version": 1,
   "description": "A MT-32 emulator",
   "homepage": "https://github.com/munt/munt/tree/master/mt32emu",
   "dependencies": [
diff --git a/ports/libpqxx/portfile.cmake b/ports/libpqxx/portfile.cmake
index a8bb2c2db9fd47..53d7eea4d43f60 100644
--- a/ports/libpqxx/portfile.cmake
+++ b/ports/libpqxx/portfile.cmake
@@ -24,3 +24,5 @@ vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/libpqxx)
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share")
 
 file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+
+vcpkg_fixup_pkgconfig()
diff --git a/ports/libpqxx/vcpkg.json b/ports/libpqxx/vcpkg.json
index 3f493980a4253f..880ccb1974f81a 100644
--- a/ports/libpqxx/vcpkg.json
+++ b/ports/libpqxx/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "libpqxx",
   "version-semver": "7.6.0",
-  "port-version": 1,
+  "port-version": 2,
   "description": "The official C++ client API for PostgreSQL",
   "homepage": "https://www.postgresql.org/",
   "dependencies": [
diff --git a/ports/libproxy/portfile.cmake b/ports/libproxy/portfile.cmake
index 94c3ecda3f817e..26842e7979d66d 100644
--- a/ports/libproxy/portfile.cmake
+++ b/ports/libproxy/portfile.cmake
@@ -47,3 +47,5 @@ file(COPY "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake"
 file(REMOVE_RECURSE "${LIBPROXY_TOOLS}" "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share")
 
 file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+
+vcpkg_fixup_pkgconfig()
diff --git a/ports/libproxy/vcpkg.json b/ports/libproxy/vcpkg.json
index 15e72c018e6b1a..fb855d40c08877 100644
--- a/ports/libproxy/vcpkg.json
+++ b/ports/libproxy/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "libproxy",
   "version": "0.4.17",
+  "port-version": 1,
   "description": "libproxy is a library that provides automatic proxy configuration management.",
   "homepage": "https://github.com/libproxy/libproxy",
   "dependencies": [
diff --git a/ports/libqrencode/portfile.cmake b/ports/libqrencode/portfile.cmake
index 40e383c3cbeb4b..b65c1db51c59c7 100644
--- a/ports/libqrencode/portfile.cmake
+++ b/ports/libqrencode/portfile.cmake
@@ -52,3 +52,5 @@ vcpkg_copy_pdbs()
 
 file(COPY "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
 file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+
+vcpkg_fixup_pkgconfig()
diff --git a/ports/libqrencode/vcpkg.json b/ports/libqrencode/vcpkg.json
index e9f572ad9644ed..a32d95184f014e 100644
--- a/ports/libqrencode/vcpkg.json
+++ b/ports/libqrencode/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "libqrencode",
   "version-semver": "4.1.1",
+  "port-version": 1,
   "description": "libqrencode - a fast and compact QR Code encoding library",
   "homepage": "https://github.com/fukuchi/libqrencode",
   "dependencies": [
diff --git a/ports/librdkafka/portfile.cmake b/ports/librdkafka/portfile.cmake
index 9b2d48255c30b8..d565ed28ea08d2 100644
--- a/ports/librdkafka/portfile.cmake
+++ b/ports/librdkafka/portfile.cmake
@@ -75,3 +75,5 @@ configure_file(${SOURCE_PATH}/LICENSES.txt ${CURRENT_PACKAGES_DIR}/share/${PORT}
 
 # Install usage
 configure_file(${CMAKE_CURRENT_LIST_DIR}/usage ${CURRENT_PACKAGES_DIR}/share/${PORT}/usage @ONLY)
+
+vcpkg_fixup_pkgconfig()
diff --git a/ports/librdkafka/vcpkg.json b/ports/librdkafka/vcpkg.json
index 77894d11653221..a4f0ed147cd9f6 100644
--- a/ports/librdkafka/vcpkg.json
+++ b/ports/librdkafka/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "librdkafka",
   "version-string": "1.7.0",
-  "port-version": 1,
+  "port-version": 2,
   "description": "The Apache Kafka C/C++ library",
   "homepage": "https://github.com/edenhill/librdkafka",
   "features": {
diff --git a/ports/libsbml/portfile.cmake b/ports/libsbml/portfile.cmake
index 47a1cc601e3ee0..9b88b13b09dc3c 100644
--- a/ports/libsbml/portfile.cmake
+++ b/ports/libsbml/portfile.cmake
@@ -86,4 +86,5 @@ if(EXISTS "${CURRENT_PACKAGES_DIR}/README.md")
     file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/README.md")
 endif()
 
-file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
\ No newline at end of file
+file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_fixup_pkgconfig()
diff --git a/ports/libsbml/vcpkg.json b/ports/libsbml/vcpkg.json
index aeb7318e60d237..cc2cc215654fda 100644
--- a/ports/libsbml/vcpkg.json
+++ b/ports/libsbml/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "libsbml",
   "version": "5.19.0",
+  "port-version": 1,
   "description": "A library for reading / writing SBML files",
   "supports": "!uwp",
   "dependencies": [
diff --git a/ports/libtins/portfile.cmake b/ports/libtins/portfile.cmake
index ae783e53b6bc70..176b9c7b0691cd 100644
--- a/ports/libtins/portfile.cmake
+++ b/ports/libtins/portfile.cmake
@@ -34,3 +34,5 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
 
 # Handle copyright
 file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/libtins RENAME copyright)
+
+vcpkg_fixup_pkgconfig()
diff --git a/ports/libtins/vcpkg.json b/ports/libtins/vcpkg.json
index f4f2b274806d2e..864794750b9222 100644
--- a/ports/libtins/vcpkg.json
+++ b/ports/libtins/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "libtins",
   "version-string": "4.3",
-  "port-version": 1,
+  "port-version": 2,
   "description": "High-level, multiplatform C++ network packet sniffing and crafting library",
   "dependencies": [
     "boost-any",
diff --git a/ports/libtorrent/portfile.cmake b/ports/libtorrent/portfile.cmake
index e70a78efffba0a..0c11403fc11d0e 100644
--- a/ports/libtorrent/portfile.cmake
+++ b/ports/libtorrent/portfile.cmake
@@ -58,3 +58,5 @@ file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${
 
 # Do not duplicate include files
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share ${CURRENT_PACKAGES_DIR}/share/cmake)
+
+vcpkg_fixup_pkgconfig()
diff --git a/ports/libtorrent/vcpkg.json b/ports/libtorrent/vcpkg.json
index 39fe5343c423f8..7e0de91ddd6257 100644
--- a/ports/libtorrent/vcpkg.json
+++ b/ports/libtorrent/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "libtorrent",
   "version": "1.2.14",
+  "port-version": 1,
   "maintainers": "Arvid Norberg <arvid.norberg@gmail.com>",
   "description": "An efficient feature complete C++ BitTorrent implementation",
   "homepage": "https://libtorrent.org",
diff --git a/ports/libwebsockets/portfile.cmake b/ports/libwebsockets/portfile.cmake
index 29692ab0771cdd..e9013c6b56d323 100644
--- a/ports/libwebsockets/portfile.cmake
+++ b/ports/libwebsockets/portfile.cmake
@@ -182,3 +182,5 @@ endif ()
 
 vcpkg_copy_pdbs()
 file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+
+vcpkg_fixup_pkgconfig()
diff --git a/ports/libwebsockets/vcpkg.json b/ports/libwebsockets/vcpkg.json
index 8d993fee9af96e..e674bdd8c42a65 100644
--- a/ports/libwebsockets/vcpkg.json
+++ b/ports/libwebsockets/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "libwebsockets",
   "version-semver": "4.2.2",
-  "port-version": 2,
+  "port-version": 3,
   "description": "Libwebsockets is a lightweight pure C library built to use minimal CPU and memory resources, and provide fast throughput in both directions as client or server.",
   "homepage": "https://github.com/warmcat/libwebsockets",
   "supports": "!uwp",
diff --git a/ports/libxlsxwriter/portfile.cmake b/ports/libxlsxwriter/portfile.cmake
index 20700c76c2e0dd..f2bf4f7e04be53 100644
--- a/ports/libxlsxwriter/portfile.cmake
+++ b/ports/libxlsxwriter/portfile.cmake
@@ -24,4 +24,5 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 
 vcpkg_copy_pdbs()
 
-file(INSTALL "${SOURCE_PATH}/License.txt" DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
\ No newline at end of file
+file(INSTALL "${SOURCE_PATH}/License.txt" DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+vcpkg_fixup_pkgconfig()
diff --git a/ports/libxlsxwriter/vcpkg.json b/ports/libxlsxwriter/vcpkg.json
index 2138d56be6f8c6..d54a1f03618565 100644
--- a/ports/libxlsxwriter/vcpkg.json
+++ b/ports/libxlsxwriter/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "libxlsxwriter",
   "version-semver": "1.1.3",
+  "port-version": 1,
   "description": "Libxlsxwriter is a C library that can be used to write text, numbers, formulas and hyperlinks to multiple worksheets in an Excel 2007+ XLSX file.",
   "homepage": "https://github.com/jmcnamara/libxlsxwriter",
   "dependencies": [
diff --git a/ports/mongo-c-driver/portfile.cmake b/ports/mongo-c-driver/portfile.cmake
index c223980a26c33c..ff22ec6c2433b6 100644
--- a/ports/mongo-c-driver/portfile.cmake
+++ b/ports/mongo-c-driver/portfile.cmake
@@ -119,3 +119,5 @@ file(WRITE ${CURRENT_PACKAGES_DIR}/share/libmongoc-1.0/libmongoc-1.0-config.cmak
 file(COPY "${SOURCE_PATH}/THIRD_PARTY_NOTICES" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
 file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
 file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
+
+vcpkg_fixup_pkgconfig()
diff --git a/ports/mongo-c-driver/vcpkg.json b/ports/mongo-c-driver/vcpkg.json
index 1fa6e983a5a299..7f75b1c1f23416 100644
--- a/ports/mongo-c-driver/vcpkg.json
+++ b/ports/mongo-c-driver/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "mongo-c-driver",
   "version": "1.17.6",
+  "port-version": 1,
   "description": "Client library written in C for MongoDB.",
   "homepage": "https://github.com/mongodb/mongo-c-driver",
   "dependencies": [
diff --git a/ports/mosquitto/portfile.cmake b/ports/mosquitto/portfile.cmake
index 8994d654356a82..7db0e5ee68f7be 100644
--- a/ports/mosquitto/portfile.cmake
+++ b/ports/mosquitto/portfile.cmake
@@ -52,3 +52,5 @@ configure_file(${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake ${CURRENT_PAC
 file(INSTALL ${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)
+
+vcpkg_fixup_pkgconfig()
diff --git a/ports/mosquitto/vcpkg.json b/ports/mosquitto/vcpkg.json
index b755eff18a1902..78f4999c664d3f 100644
--- a/ports/mosquitto/vcpkg.json
+++ b/ports/mosquitto/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "mosquitto",
   "version": "2.0.12",
-  "port-version": 1,
+  "port-version": 2,
   "description": "Mosquitto is an open source message broker that implements the MQ Telemetry Transport protocol versions 3.1 and 3.1.1, MQTT provides a lightweight method of carrying out messaging using a publish/subscribe model, This makes it suitable for machine to machine messaging such as with low power sensors or mobile devices such as phones, embedded computers or microcontrollers like the Arduino",
   "homepage": "https://mosquitto.org/download/",
   "dependencies": [
diff --git a/ports/msgpack/portfile.cmake b/ports/msgpack/portfile.cmake
index 86e2ea37810c11..13a6263046a40a 100644
--- a/ports/msgpack/portfile.cmake
+++ b/ports/msgpack/portfile.cmake
@@ -35,3 +35,5 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
 
 file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/msgpack)
 file(RENAME ${CURRENT_PACKAGES_DIR}/share/msgpack/COPYING ${CURRENT_PACKAGES_DIR}/share/msgpack/copyright)
+
+vcpkg_fixup_pkgconfig()
diff --git a/ports/msgpack/vcpkg.json b/ports/msgpack/vcpkg.json
index 6901ce161022b8..a76f2c6fd72bd2 100644
--- a/ports/msgpack/vcpkg.json
+++ b/ports/msgpack/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "msgpack",
   "version-string": "3.3.0",
-  "port-version": 1,
+  "port-version": 2,
   "description": "MessagePack is an efficient binary serialization format, which lets you exchange data among multiple languages like JSON, except that it's faster and smaller.",
   "homepage": "https://github.com/msgpack/msgpack-c"
 }
diff --git a/ports/msgpack11/portfile.cmake b/ports/msgpack11/portfile.cmake
index f4dc73c63c4730..d0783dece5c837 100644
--- a/ports/msgpack11/portfile.cmake
+++ b/ports/msgpack11/portfile.cmake
@@ -25,3 +25,5 @@ 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)
+
+vcpkg_fixup_pkgconfig()
diff --git a/ports/msgpack11/vcpkg.json b/ports/msgpack11/vcpkg.json
index 0072e7dfd09d04..f76e0a28a542a9 100644
--- a/ports/msgpack11/vcpkg.json
+++ b/ports/msgpack11/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "msgpack11",
   "version": "0.0.10",
-  "port-version": 2,
+  "port-version": 3,
   "description": "msgpack11 is a tiny MsgPack library for C++11, providing MsgPack parsing and serialization.This library is inspired by json11.The API of msgpack11 is designed to be similar with json11.",
   "homepage": "https://msgpack.org",
   "dependencies": [
diff --git a/ports/munit/portfile.cmake b/ports/munit/portfile.cmake
index cf6d0df3cb5fe7..6a8c8e194d2fa8 100644
--- a/ports/munit/portfile.cmake
+++ b/ports/munit/portfile.cmake
@@ -21,3 +21,5 @@ vcpkg_install_meson()
 vcpkg_copy_pdbs()
 
 file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+
+vcpkg_fixup_pkgconfig()
diff --git a/ports/munit/vcpkg.json b/ports/munit/vcpkg.json
index ca60d49b7040bc..a729d1df72ee14 100644
--- a/ports/munit/vcpkg.json
+++ b/ports/munit/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "munit",
   "version-string": "2019-04-06",
-  "port-version": 2,
+  "port-version": 3,
   "description": "A small but full-featured unit testing framework for C",
   "homepage": "https://github.com/nemequ/munit",
   "supports": "!(arm | arm64 | uwp)",
diff --git a/ports/muparser/portfile.cmake b/ports/muparser/portfile.cmake
index db4bc987ef18b8..dcc548737f8532 100644
--- a/ports/muparser/portfile.cmake
+++ b/ports/muparser/portfile.cmake
@@ -23,4 +23,5 @@ 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
+file(INSTALL ${SOURCE_PATH}/License.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+vcpkg_fixup_pkgconfig()
diff --git a/ports/muparser/vcpkg.json b/ports/muparser/vcpkg.json
index 2ba2aa091c6494..967c3712e894f3 100644
--- a/ports/muparser/vcpkg.json
+++ b/ports/muparser/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "muparser",
   "version-string": "2.3.2",
-  "port-version": 1,
+  "port-version": 2,
   "description": "Fast math parser library",
   "homepage": "https://github.com/beltoforion/muparser",
   "supports": "!uwp"
diff --git a/ports/nanoflann/portfile.cmake b/ports/nanoflann/portfile.cmake
index 0d047c9b6b7667..cd295d76d8ec38 100644
--- a/ports/nanoflann/portfile.cmake
+++ b/ports/nanoflann/portfile.cmake
@@ -15,4 +15,5 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/${PORT}")
 
 # Handle copyright
-file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
\ No newline at end of file
+file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_fixup_pkgconfig()
diff --git a/ports/nanoflann/vcpkg.json b/ports/nanoflann/vcpkg.json
index e8ca03b60fc7d0..cdf0b0cf0220be 100644
--- a/ports/nanoflann/vcpkg.json
+++ b/ports/nanoflann/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "nanoflann",
   "version": "1.3.2",
+  "port-version": 1,
   "description": "nanoflann is a C++11 header-only library for building KD-Trees of datasets with different topologies: R2, R3 (point clouds), SO(2) and SO(3) (2D and 3D rotation groups).",
   "homepage": "https://github.com/jlblancoc/nanoflann",
   "dependencies": [
diff --git a/ports/nanomsg/portfile.cmake b/ports/nanomsg/portfile.cmake
index 49fdab38e7c094..5561f2bbb11fe3 100644
--- a/ports/nanomsg/portfile.cmake
+++ b/ports/nanomsg/portfile.cmake
@@ -61,3 +61,5 @@ endif()
 configure_file(${SOURCE_PATH}/COPYING ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY)
 
 vcpkg_copy_pdbs()
+
+vcpkg_fixup_pkgconfig()
diff --git a/ports/nanomsg/vcpkg.json b/ports/nanomsg/vcpkg.json
index 4ed0ef1c5f8df4..fb0644ceb8442c 100644
--- a/ports/nanomsg/vcpkg.json
+++ b/ports/nanomsg/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "nanomsg",
   "version-string": "1.1.5",
-  "port-version": 3,
+  "port-version": 4,
   "description": [
     "a simple high-performance implementation of several \"scalability protocols\".",
     "These scalability protocols are light-weight messaging protocols which can be used to solve a number of very common messaging patterns, such as request/reply, publish/subscribe, surveyor/respondent, and so forth. These protocols can run over a variety of transports such as TCP, UNIX sockets, and even WebSocket."
diff --git a/ports/nlopt/portfile.cmake b/ports/nlopt/portfile.cmake
index 114ee72e5b11a0..e2204c239ff163 100644
--- a/ports/nlopt/portfile.cmake
+++ b/ports/nlopt/portfile.cmake
@@ -27,3 +27,5 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
 
 file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+
+vcpkg_fixup_pkgconfig()
diff --git a/ports/nlopt/vcpkg.json b/ports/nlopt/vcpkg.json
index 7097097133dce5..3e895d4a3b2c91 100644
--- a/ports/nlopt/vcpkg.json
+++ b/ports/nlopt/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "nlopt",
   "version-string": "2.7.0",
+  "port-version": 1,
   "description": "a library for nonlinear local and global optimization, for functions with and without gradient information.",
   "homepage": "https://github.com/stevengj/nlopt"
 }
diff --git a/ports/octomap/portfile.cmake b/ports/octomap/portfile.cmake
index 1708296a529f7f..0730461b63ef3c 100644
--- a/ports/octomap/portfile.cmake
+++ b/ports/octomap/portfile.cmake
@@ -42,3 +42,5 @@ file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "
 file(INSTALL ${SOURCE_PATH}/octomap/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
 
 vcpkg_copy_pdbs()
+
+vcpkg_fixup_pkgconfig()
diff --git a/ports/octomap/vcpkg.json b/ports/octomap/vcpkg.json
index 8aa0e86d57c540..a68ad430a6bc0f 100644
--- a/ports/octomap/vcpkg.json
+++ b/ports/octomap/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "octomap",
   "version-string": "1.9.5",
-  "port-version": 1,
+  "port-version": 2,
   "description": "An Efficient Probabilistic 3D Mapping Framework Based on Octrees",
   "homepage": "https://octomap.github.io/"
 }
diff --git a/ports/ode/portfile.cmake b/ports/ode/portfile.cmake
index cb10fc9c0369f4..800c2f63189c55 100644
--- a/ports/ode/portfile.cmake
+++ b/ports/ode/portfile.cmake
@@ -23,3 +23,5 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/cmake)
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/cmake)
+
+vcpkg_fixup_pkgconfig()
diff --git a/ports/ode/vcpkg.json b/ports/ode/vcpkg.json
index 4d507866a37512..921ec7dd3331b8 100644
--- a/ports/ode/vcpkg.json
+++ b/ports/ode/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "ode",
   "version-string": "0.16.1",
-  "port-version": 1,
+  "port-version": 2,
   "description": "Open Dynamics Engine",
   "homepage": "https://bitbucket.org/odedevs/ode/src/default/"
 }
diff --git a/ports/ois/portfile.cmake b/ports/ois/portfile.cmake
index 84859bb096aed5..3c06999d7ec811 100644
--- a/ports/ois/portfile.cmake
+++ b/ports/ois/portfile.cmake
@@ -27,3 +27,5 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
 
 # Handle copyright
 file(INSTALL ${SOURCE_PATH}/LICENSE.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+
+vcpkg_fixup_pkgconfig()
diff --git a/ports/ois/vcpkg.json b/ports/ois/vcpkg.json
index 2b6b7140f896fc..00b05789f307dc 100644
--- a/ports/ois/vcpkg.json
+++ b/ports/ois/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "ois",
   "version-string": "1.5",
-  "port-version": 2,
+  "port-version": 3,
   "description": "Cross Platform Object Oriented Input Lib System. Meant to be very robust and compatiable with many systems and operating systems.",
   "homepage": "https://wgois.github.io/OIS/"
 }
diff --git a/ports/oniguruma/portfile.cmake b/ports/oniguruma/portfile.cmake
index d1089e8af3a739..86e9f97c741b4c 100644
--- a/ports/oniguruma/portfile.cmake
+++ b/ports/oniguruma/portfile.cmake
@@ -50,3 +50,5 @@ else()
 endif()
 
 file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+
+vcpkg_fixup_pkgconfig()
diff --git a/ports/oniguruma/vcpkg.json b/ports/oniguruma/vcpkg.json
index a0211d3c836aa4..7247d3036ce378 100644
--- a/ports/oniguruma/vcpkg.json
+++ b/ports/oniguruma/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "oniguruma",
   "version": "6.9.7.1",
+  "port-version": 1,
   "description": "Modern and flexible regular expressions library",
   "homepage": "https://github.com/kkos/oniguruma",
   "dependencies": [
diff --git a/ports/opencc/portfile.cmake b/ports/opencc/portfile.cmake
index c67b2d33fc0e9e..ad68c29b229203 100644
--- a/ports/opencc/portfile.cmake
+++ b/ports/opencc/portfile.cmake
@@ -49,4 +49,5 @@ endif()
 
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share)
 
-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)
+vcpkg_fixup_pkgconfig()
diff --git a/ports/opencc/vcpkg.json b/ports/opencc/vcpkg.json
index dc346293c31b3d..3645c6d13632e8 100644
--- a/ports/opencc/vcpkg.json
+++ b/ports/opencc/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "opencc",
   "version-string": "2020-04-26",
-  "port-version": 8,
+  "port-version": 9,
   "description": "A project for conversion between Traditional and Simplified Chinese",
   "homepage": "https://github.com/BYVoid/OpenCC",
   "supports": "!(arm | arm64 | uwp)",
diff --git a/ports/openimageio/portfile.cmake b/ports/openimageio/portfile.cmake
index 55a1535b071a4d..9d49af03dc2e2d 100644
--- a/ports/openimageio/portfile.cmake
+++ b/ports/openimageio/portfile.cmake
@@ -88,3 +88,5 @@ file(COPY "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${C
 
 # Handle copyright
 file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+
+vcpkg_fixup_pkgconfig()
diff --git a/ports/openimageio/vcpkg.json b/ports/openimageio/vcpkg.json
index 0dc7c2edd28d87..fd23968aa1d445 100644
--- a/ports/openimageio/vcpkg.json
+++ b/ports/openimageio/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "openimageio",
   "version": "2.3.7.2",
-  "port-version": 3,
+  "port-version": 4,
   "description": "A library for reading and writing images, and a bunch of related classes, utilities, and application.",
   "homepage": "https://github.com/OpenImageIO/oiio",
   "dependencies": [
diff --git a/ports/orocos-kdl/portfile.cmake b/ports/orocos-kdl/portfile.cmake
index 784987f7b2256b..6d6764f6cb9bc3 100644
--- a/ports/orocos-kdl/portfile.cmake
+++ b/ports/orocos-kdl/portfile.cmake
@@ -27,4 +27,5 @@ file(REMOVE_RECURSE
   ${CURRENT_PACKAGES_DIR}/share/doc
   ${CURRENT_PACKAGES_DIR}/doc/liborocos-kdl)
 
-file(INSTALL ${SOURCE_PATH}/orocos_kdl/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
\ No newline at end of file
+file(INSTALL ${SOURCE_PATH}/orocos_kdl/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+vcpkg_fixup_pkgconfig()
diff --git a/ports/orocos-kdl/vcpkg.json b/ports/orocos-kdl/vcpkg.json
index 4535b0f93ad36f..3eeca90301373e 100644
--- a/ports/orocos-kdl/vcpkg.json
+++ b/ports/orocos-kdl/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "orocos-kdl",
   "version": "1.4",
-  "port-version": 4,
+  "port-version": 5,
   "description": "Kinematics and Dynamics Library.",
   "homepage": "https://github.com/orocos/orocos_kinematics_dynamics",
   "dependencies": [
diff --git a/ports/osg/portfile.cmake b/ports/osg/portfile.cmake
index b8aeaa71227085..1ea919dcd4848c 100644
--- a/ports/osg/portfile.cmake
+++ b/ports/osg/portfile.cmake
@@ -143,3 +143,5 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin/osgPlugins-${OSG_VER}/)
 
 # Handle copyright
 file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+
+vcpkg_fixup_pkgconfig()
diff --git a/ports/osg/vcpkg.json b/ports/osg/vcpkg.json
index b1f62b5da6ec3c..66d2ee8e566290 100644
--- a/ports/osg/vcpkg.json
+++ b/ports/osg/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "osg",
   "version-string": "3.6.5",
-  "port-version": 9,
+  "port-version": 10,
   "description": "The OpenSceneGraph is an open source high performance 3D graphics toolkit.",
   "homepage": "https://github.com/openscenegraph/OpenSceneGraph",
   "dependencies": [
diff --git a/ports/p-ranav-csv2/portfile.cmake b/ports/p-ranav-csv2/portfile.cmake
index 99196f53d25129..9e03f7ab4334d6 100644
--- a/ports/p-ranav-csv2/portfile.cmake
+++ b/ports/p-ranav-csv2/portfile.cmake
@@ -23,3 +23,5 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR
 
 file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
 file(INSTALL ${SOURCE_PATH}/LICENSE.mio DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
+
+vcpkg_fixup_pkgconfig()
diff --git a/ports/p-ranav-csv2/vcpkg.json b/ports/p-ranav-csv2/vcpkg.json
index 2b3d4dd861591d..957935ad900dfd 100644
--- a/ports/p-ranav-csv2/vcpkg.json
+++ b/ports/p-ranav-csv2/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "p-ranav-csv2",
   "version-string": "2020-12-14",
-  "port-version": 1,
+  "port-version": 2,
   "description": "CSV for modern C++",
   "homepage": "https://github.com/p-ranav/csv2"
 }
diff --git a/ports/pcl/portfile.cmake b/ports/pcl/portfile.cmake
index 008b8934e562c9..4af4e0ddfcca83 100644
--- a/ports/pcl/portfile.cmake
+++ b/ports/pcl/portfile.cmake
@@ -75,3 +75,5 @@ if("tools" IN_LIST FEATURES)
 endif()
 
 file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+
+vcpkg_fixup_pkgconfig()
diff --git a/ports/pcl/vcpkg.json b/ports/pcl/vcpkg.json
index 4f0fa3a87576d9..53743da5cff29d 100644
--- a/ports/pcl/vcpkg.json
+++ b/ports/pcl/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "pcl",
   "version": "1.11.1",
-  "port-version": 4,
+  "port-version": 5,
   "description": "Point Cloud Library (PCL) is open source library for 2D/3D image and point cloud processing.",
   "homepage": "https://github.com/PointCloudLibrary/pcl",
   "supports": "!(arm64 & windows)",
diff --git a/ports/plplot/portfile.cmake b/ports/plplot/portfile.cmake
index eb20f613c5c33e..cc4b7a433a2fc0 100644
--- a/ports/plplot/portfile.cmake
+++ b/ports/plplot/portfile.cmake
@@ -67,3 +67,5 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
 
 file(INSTALL ${SOURCE_PATH}/Copyright DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+
+vcpkg_fixup_pkgconfig()
diff --git a/ports/plplot/vcpkg.json b/ports/plplot/vcpkg.json
index a4d0cf1cfe287c..80eed11923c7a1 100644
--- a/ports/plplot/vcpkg.json
+++ b/ports/plplot/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "plplot",
   "version-string": "5.13.0",
-  "port-version": 10,
+  "port-version": 11,
   "description": "PLplot is a cross-platform software package for creating scientific plots whose (UTF-8) plot symbols and text are limited in practice only by what Unicode-aware system fonts are installed on a user's computer.",
   "dependencies": [
     "bzip2",
diff --git a/ports/polyclipping/portfile.cmake b/ports/polyclipping/portfile.cmake
index 8ba349173f30b6..9c953825366206 100644
--- a/ports/polyclipping/portfile.cmake
+++ b/ports/polyclipping/portfile.cmake
@@ -29,3 +29,5 @@ file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/FindCLIPPER.cmake DESTINATION ${CURRENT_P
 file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/clipper)
 
 file(INSTALL ${SOURCE_PATH}/License.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+
+vcpkg_fixup_pkgconfig()
diff --git a/ports/polyclipping/vcpkg.json b/ports/polyclipping/vcpkg.json
index 919342867e6b7e..a57d032a8e0475 100644
--- a/ports/polyclipping/vcpkg.json
+++ b/ports/polyclipping/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "polyclipping",
   "version-string": "6.4.2",
-  "port-version": 8,
+  "port-version": 9,
   "description": "The Clipper library performs clipping and offsetting for both lines and polygons. All four boolean clipping operations are supported - intersection, union, difference and exclusive-or. Polygons can be of any shape including self-intersecting polygons.",
   "homepage": "https://sourceforge.net/projects/polyclipping/"
 }
diff --git a/ports/ponder/portfile.cmake b/ports/ponder/portfile.cmake
index 5c800cd7e877ab..a19debe8c52286 100644
--- a/ports/ponder/portfile.cmake
+++ b/ports/ponder/portfile.cmake
@@ -36,3 +36,5 @@ endif()
 
 # Handle copyright
 configure_file(${SOURCE_PATH}/COPYING.txt ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY)
+
+vcpkg_fixup_pkgconfig()
diff --git a/ports/ponder/vcpkg.json b/ports/ponder/vcpkg.json
index 265d12f5f67d77..3959fa165fea61 100644
--- a/ports/ponder/vcpkg.json
+++ b/ports/ponder/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "ponder",
   "version-string": "3.0.0",
-  "port-version": 2,
+  "port-version": 3,
   "description": "A C++ multi-purpose reflection library.",
   "homepage": "https://github.com/billyquith/ponder"
 }
diff --git a/ports/poppler/portfile.cmake b/ports/poppler/portfile.cmake
index 74e8b22e269bdc..fcb96f6c666e54 100644
--- a/ports/poppler/portfile.cmake
+++ b/ports/poppler/portfile.cmake
@@ -41,4 +41,5 @@ vcpkg_install_cmake()
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 
-file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
\ No newline at end of file
+file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+vcpkg_fixup_pkgconfig()
diff --git a/ports/poppler/vcpkg.json b/ports/poppler/vcpkg.json
index b9c59fb01f00bb..2ae9cae7753454 100644
--- a/ports/poppler/vcpkg.json
+++ b/ports/poppler/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "poppler",
   "version": "20.12.1",
-  "port-version": 5,
+  "port-version": 6,
   "description": "a PDF rendering library",
   "homepage": "https://poppler.freedesktop.org/",
   "dependencies": [
diff --git a/ports/portaudio/portfile.cmake b/ports/portaudio/portfile.cmake
index 95d047b2432aed..30e9adfa0509a8 100644
--- a/ports/portaudio/portfile.cmake
+++ b/ports/portaudio/portfile.cmake
@@ -42,3 +42,5 @@ endif()
 
 # Handle copyright
 file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+
+vcpkg_fixup_pkgconfig()
diff --git a/ports/portaudio/vcpkg.json b/ports/portaudio/vcpkg.json
index 4d504978f70684..cbf20bfc6b01aa 100644
--- a/ports/portaudio/vcpkg.json
+++ b/ports/portaudio/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "portaudio",
   "version": "19.7",
-  "port-version": 1,
+  "port-version": 2,
   "description": "PortAudio Portable Cross-platform Audio I/O API PortAudio is a free, cross-platform, open-source, audio I/O library.  It lets you write simple audio programs in 'C' or C++ that will compile and run on many platforms including Windows, Macintosh OS X, and Unix (OSS/ALSA). It is intended to promote the exchange of audio software between developers on different platforms. Many applications use PortAudio for Audio I/O.",
   "homepage": "http://www.portaudio.com",
   "supports": "!uwp"
diff --git a/ports/ppconsul/portfile.cmake b/ports/ppconsul/portfile.cmake
index 9b8c4c4e707efd..cc1692760d07f4 100644
--- a/ports/ppconsul/portfile.cmake
+++ b/ports/ppconsul/portfile.cmake
@@ -25,3 +25,5 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
 
 
 vcpkg_copy_pdbs()
+
+vcpkg_fixup_pkgconfig()
diff --git a/ports/ppconsul/vcpkg.json b/ports/ppconsul/vcpkg.json
index 7dd7895a47f2f6..ff2b678c8df8aa 100644
--- a/ports/ppconsul/vcpkg.json
+++ b/ports/ppconsul/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "ppconsul",
   "version-string": "0.5",
-  "port-version": 2,
+  "port-version": 3,
   "description": "A C++ client library for Consul. Consul is a distributed tool for discovering and configuring services in your infrastructure.",
   "homepage": "https://github.com/oliora/ppconsul",
   "dependencies": [
diff --git a/ports/raylib/portfile.cmake b/ports/raylib/portfile.cmake
index 7af3d4c36090de..e429052f2c65fb 100644
--- a/ports/raylib/portfile.cmake
+++ b/ports/raylib/portfile.cmake
@@ -83,3 +83,5 @@ endif()
 
 configure_file(${CMAKE_CURRENT_LIST_DIR}/usage ${CURRENT_PACKAGES_DIR}/share/${PORT}/usage @ONLY)
 configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY)
+
+vcpkg_fixup_pkgconfig()
diff --git a/ports/raylib/vcpkg.json b/ports/raylib/vcpkg.json
index f63f9a7ea9cdf3..2180f2b8c9b01d 100644
--- a/ports/raylib/vcpkg.json
+++ b/ports/raylib/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "raylib",
   "version-semver": "3.7.0",
-  "port-version": 1,
+  "port-version": 2,
   "description": "A simple and easy-to-use library to enjoy videogames programming",
   "homepage": "https://github.com/raysan5/raylib",
   "supports": "!(arm | uwp)",
diff --git a/ports/rbdl/portfile.cmake b/ports/rbdl/portfile.cmake
index 362bb19bdd5de6..be6a63c81a1981 100644
--- a/ports/rbdl/portfile.cmake
+++ b/ports/rbdl/portfile.cmake
@@ -27,3 +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()
diff --git a/ports/rbdl/vcpkg.json b/ports/rbdl/vcpkg.json
index ee07f6de7664e3..96a3389ae331ea 100644
--- a/ports/rbdl/vcpkg.json
+++ b/ports/rbdl/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "rbdl",
   "version": "2.6.0",
-  "port-version": 1,
+  "port-version": 2,
   "description": "Rigid Body Dynamics Library",
   "homepage": "https://github.com/rbdl/rbdl",
   "dependencies": [
diff --git a/ports/realsense2/portfile.cmake b/ports/realsense2/portfile.cmake
index bd45c69d2e8283..7d59d891f21db6 100644
--- a/ports/realsense2/portfile.cmake
+++ b/ports/realsense2/portfile.cmake
@@ -67,4 +67,5 @@ if(BUILD_OPENNI2_BINDINGS)
     endif()
 endif()
 
-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)
+vcpkg_fixup_pkgconfig()
diff --git a/ports/realsense2/vcpkg.json b/ports/realsense2/vcpkg.json
index e5add498a8e339..8eeac97239e159 100644
--- a/ports/realsense2/vcpkg.json
+++ b/ports/realsense2/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "realsense2",
   "version": "2.49.0",
+  "port-version": 1,
   "description": "Intel® RealSense™ SDK 2.0 is a cross-platform library for Intel® RealSense™ depth cameras (D400 series and the SR300).",
   "homepage": "https://github.com/IntelRealSense/librealsense",
   "dependencies": [
diff --git a/ports/redis-plus-plus/portfile.cmake b/ports/redis-plus-plus/portfile.cmake
index ace6b27f6a0de3..eb5b6b644fd56c 100644
--- a/ports/redis-plus-plus/portfile.cmake
+++ b/ports/redis-plus-plus/portfile.cmake
@@ -37,3 +37,5 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
 
 # Handle copyright
 file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright )
+
+vcpkg_fixup_pkgconfig()
diff --git a/ports/redis-plus-plus/vcpkg.json b/ports/redis-plus-plus/vcpkg.json
index b67b176b7c8fe9..a789d9c2727462 100644
--- a/ports/redis-plus-plus/vcpkg.json
+++ b/ports/redis-plus-plus/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "redis-plus-plus",
   "version-semver": "1.3.1",
+  "port-version": 1,
   "description": "This is a C++ client for Redis. It's based on hiredis, and written in C++ 11",
   "homepage": "https://github.com/sewenew/redis-plus-plus",
   "dependencies": [
diff --git a/ports/rpclib/portfile.cmake b/ports/rpclib/portfile.cmake
index 053efc179bc9c4..ef13e915061473 100644
--- a/ports/rpclib/portfile.cmake
+++ b/ports/rpclib/portfile.cmake
@@ -23,3 +23,5 @@ vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/cmake/rpclib")
 vcpkg_copy_pdbs()
 
 file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+
+vcpkg_fixup_pkgconfig()
diff --git a/ports/rpclib/vcpkg.json b/ports/rpclib/vcpkg.json
index cff1b08e719ce0..add630ed8631ef 100644
--- a/ports/rpclib/vcpkg.json
+++ b/ports/rpclib/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "rpclib",
   "version-semver": "2.3.0",
+  "port-version": 1,
   "description": "a RPC library for C++, providing both a client and server implementation. It is built using modern C++14.",
   "homepage": "https://github.com/rpclib/rpclib"
 }
diff --git a/ports/rtaudio/portfile.cmake b/ports/rtaudio/portfile.cmake
index 2d069486caf28e..42f47fb57b4c0d 100644
--- a/ports/rtaudio/portfile.cmake
+++ b/ports/rtaudio/portfile.cmake
@@ -40,3 +40,5 @@ vcpkg_copy_pdbs()
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
 
 configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY)
+
+vcpkg_fixup_pkgconfig()
diff --git a/ports/rtaudio/vcpkg.json b/ports/rtaudio/vcpkg.json
index 6c24da39165273..9b9d8ce10a55da 100644
--- a/ports/rtaudio/vcpkg.json
+++ b/ports/rtaudio/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "rtaudio",
   "version-date": "2021-08-15",
+  "port-version": 1,
   "description": "A set of C++ classes that provide a common API for realtime audio input/output across Linux (native ALSA, JACK, PulseAudio and OSS), Macintosh OS X (CoreAudio and JACK), and Windows (DirectSound, ASIO and WASAPI) operating systems.",
   "homepage": "https://github.com/thestk/rtaudio",
   "supports": "!uwp",
diff --git a/ports/sais/portfile.cmake b/ports/sais/portfile.cmake
index 0e5240b0bdc0c0..5c0a0891a6a41a 100644
--- a/ports/sais/portfile.cmake
+++ b/ports/sais/portfile.cmake
@@ -23,3 +23,5 @@ vcpkg_copy_pdbs()
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
 
 file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+
+vcpkg_fixup_pkgconfig()
diff --git a/ports/sais/vcpkg.json b/ports/sais/vcpkg.json
index 59f2e9ad80d42e..7b0edbadd3d011 100644
--- a/ports/sais/vcpkg.json
+++ b/ports/sais/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "sais",
   "version-string": "2.4.1",
-  "port-version": 2,
+  "port-version": 3,
   "description": "An implementation of the induced sorting algorithm"
 }
diff --git a/ports/sdformat6/portfile.cmake b/ports/sdformat6/portfile.cmake
index 1b6babd87aa93e..6e32429e37285a 100644
--- a/ports/sdformat6/portfile.cmake
+++ b/ports/sdformat6/portfile.cmake
@@ -52,3 +52,5 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include
 
 # Handle copyright
 file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+
+vcpkg_fixup_pkgconfig()
diff --git a/ports/sdformat6/vcpkg.json b/ports/sdformat6/vcpkg.json
index 84c6969921f3fa..935b1be224ea16 100644
--- a/ports/sdformat6/vcpkg.json
+++ b/ports/sdformat6/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "sdformat6",
   "version": "6.2.0",
-  "port-version": 2,
+  "port-version": 3,
   "description": "Simulation Description Format (SDF) parser and description files.",
   "homepage": "http://sdformat.org/",
   "supports": "!(arm | uwp)",
diff --git a/ports/sentencepiece/portfile.cmake b/ports/sentencepiece/portfile.cmake
index 38c551cee6ce11..e05fe13f3b3005 100644
--- a/ports/sentencepiece/portfile.cmake
+++ b/ports/sentencepiece/portfile.cmake
@@ -30,3 +30,5 @@ endif()
 configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY)
 
 vcpkg_copy_pdbs()
+
+vcpkg_fixup_pkgconfig()
diff --git a/ports/sentencepiece/vcpkg.json b/ports/sentencepiece/vcpkg.json
index 0a621c341b9bac..e13c6f989e94de 100644
--- a/ports/sentencepiece/vcpkg.json
+++ b/ports/sentencepiece/vcpkg.json
@@ -1,5 +1,6 @@
 {
   "name": "sentencepiece",
   "version": "0.1.95",
+  "port-version": 1,
   "description": "SentencePiece is an unsupervised text tokenizer and detokenizer mainly for Neural Network-based text generation systems where the vocabulary size is predetermined prior to the neural model training"
 }
diff --git a/ports/simage/portfile.cmake b/ports/simage/portfile.cmake
index 247018842c37ab..e5415273f950ed 100644
--- a/ports/simage/portfile.cmake
+++ b/ports/simage/portfile.cmake
@@ -73,3 +73,5 @@ 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)
+
+vcpkg_fixup_pkgconfig()
diff --git a/ports/simage/vcpkg.json b/ports/simage/vcpkg.json
index e302ce701c30c6..0122ad0f151f21 100644
--- a/ports/simage/vcpkg.json
+++ b/ports/simage/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "simage",
   "version-semver": "1.8.1",
-  "port-version": 1,
+  "port-version": 2,
   "description": "Image file format library abstraction layer",
   "homepage": "https://github.com/coin3d/simage",
   "supports": "!uwp",
diff --git a/ports/sol2/portfile.cmake b/ports/sol2/portfile.cmake
index cf20001db68d22..901aeb51fc6e08 100644
--- a/ports/sol2/portfile.cmake
+++ b/ports/sol2/portfile.cmake
@@ -25,3 +25,5 @@ file(
 file(INSTALL ${SOURCE_PATH}/single/include/sol DESTINATION ${CURRENT_PACKAGES_DIR}/include/)
 
 file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+
+vcpkg_fixup_pkgconfig()
diff --git a/ports/sol2/vcpkg.json b/ports/sol2/vcpkg.json
index 22de87e461a3fa..54c8837d5b8655 100644
--- a/ports/sol2/vcpkg.json
+++ b/ports/sol2/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "sol2",
   "version-string": "3.2.2",
-  "port-version": 1,
+  "port-version": 2,
   "description": "Sol v2.0 - a C++ <-> Lua API wrapper with advanced features and top notch performance - is here, and it's great",
   "homepage": "https://github.com/ThePhD/sol2",
   "dependencies": [
diff --git a/ports/soxr/portfile.cmake b/ports/soxr/portfile.cmake
index 15fbce5a263125..63070fcb4771fe 100644
--- a/ports/soxr/portfile.cmake
+++ b/ports/soxr/portfile.cmake
@@ -35,3 +35,5 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/doc")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/doc")
+
+vcpkg_fixup_pkgconfig()
diff --git a/ports/soxr/vcpkg.json b/ports/soxr/vcpkg.json
index 4887394e562060..ec6f109904f2b1 100644
--- a/ports/soxr/vcpkg.json
+++ b/ports/soxr/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "soxr",
   "version": "0.1.3",
-  "port-version": 5,
+  "port-version": 6,
   "description": "High quality audio resampling",
   "homepage": "https://sourceforge.net/projects/soxr/",
   "dependencies": [
diff --git a/ports/sparsehash/portfile.cmake b/ports/sparsehash/portfile.cmake
index b23df02e6238e3..876726cd42f48c 100644
--- a/ports/sparsehash/portfile.cmake
+++ b/ports/sparsehash/portfile.cmake
@@ -36,3 +36,5 @@ configure_file(
 
 configure_file(${SOURCE_PATH}/COPYING ${CURRENT_PACKAGES_DIR}/share/sparsehash/copyright COPYONLY)
 file(COPY ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/sparsehash)
+
+vcpkg_fixup_pkgconfig()
diff --git a/ports/sparsehash/vcpkg.json b/ports/sparsehash/vcpkg.json
index a2306e43dcb3a8..9882cefac45219 100644
--- a/ports/sparsehash/vcpkg.json
+++ b/ports/sparsehash/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "sparsehash",
   "version": "2.0.4",
-  "port-version": 1,
+  "port-version": 2,
   "description": "The sparsehash package consists of two hashtable implementations: sparse, which is designed to be very space efficient, and dense, which is designed to be very time efficient.",
   "homepage": "https://github.com/sparsehash/sparsehash"
 }
diff --git a/ports/stxxl/portfile.cmake b/ports/stxxl/portfile.cmake
index a45fce791fb945..d11b14015e42d0 100644
--- a/ports/stxxl/portfile.cmake
+++ b/ports/stxxl/portfile.cmake
@@ -70,3 +70,5 @@ file(REMOVE_RECURSE
 configure_file(${SOURCE_PATH}/LICENSE_1_0.txt ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY)
 
 vcpkg_copy_pdbs()
+
+vcpkg_fixup_pkgconfig()
diff --git a/ports/stxxl/vcpkg.json b/ports/stxxl/vcpkg.json
index 1a3847d57b2d0a..e6a4029b0e1056 100644
--- a/ports/stxxl/vcpkg.json
+++ b/ports/stxxl/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "stxxl",
   "version-string": "2018-11-15",
-  "port-version": 3,
+  "port-version": 4,
   "description": "Standard Template Library for Extra Large Data Sets"
 }
diff --git a/ports/superlu/portfile.cmake b/ports/superlu/portfile.cmake
index 807981f5dd9044..3d21ec510ff9da 100644
--- a/ports/superlu/portfile.cmake
+++ b/ports/superlu/portfile.cmake
@@ -27,3 +27,5 @@ 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)
+
+vcpkg_fixup_pkgconfig()
diff --git a/ports/superlu/vcpkg.json b/ports/superlu/vcpkg.json
index 9de4be6746d655..08b6be02a71cb7 100644
--- a/ports/superlu/vcpkg.json
+++ b/ports/superlu/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "superlu",
   "version-string": "2020-01-07",
-  "port-version": 3,
+  "port-version": 4,
   "description": "Supernodal sparse direct solver.",
   "homepage": "https://github.com/xiaoyeli/superlu",
   "supports": "!(uwp | arm)",
diff --git a/ports/thrift/portfile.cmake b/ports/thrift/portfile.cmake
index f39ba11b90c674..f2b42b5301e15f 100644
--- a/ports/thrift/portfile.cmake
+++ b/ports/thrift/portfile.cmake
@@ -70,4 +70,5 @@ if ("${VCPKG_LIBRARY_LINKAGE}" STREQUAL "static")
     file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin)
 endif()
 
-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)
+vcpkg_fixup_pkgconfig()
diff --git a/ports/thrift/vcpkg.json b/ports/thrift/vcpkg.json
index ebc179aa157edb..df0a2a109e8f82 100644
--- a/ports/thrift/vcpkg.json
+++ b/ports/thrift/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "thrift",
   "version-string": "0.13.0",
-  "port-version": 1,
+  "port-version": 2,
   "description": "Apache Thrift is a software project spanning a variety of programming languages and use cases. Our goal is to make reliable, performant communication and data serialization across languages as efficient and seamless as possible.",
   "homepage": "https://github.com/apache/thrift",
   "dependencies": [
diff --git a/ports/tidy-html5/portfile.cmake b/ports/tidy-html5/portfile.cmake
index ddf60c6b29131b..159ed86aaa7a16 100644
--- a/ports/tidy-html5/portfile.cmake
+++ b/ports/tidy-html5/portfile.cmake
@@ -38,3 +38,5 @@ vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT})
 
 file(INSTALL ${SOURCE_PATH}/README/LICENSE.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/tidy-html5 RENAME copyright)
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
+
+vcpkg_fixup_pkgconfig()
diff --git a/ports/tidy-html5/vcpkg.json b/ports/tidy-html5/vcpkg.json
index f910fd5f571e18..7071cab8fae270 100644
--- a/ports/tidy-html5/vcpkg.json
+++ b/ports/tidy-html5/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "tidy-html5",
   "version-string": "5.7.28",
-  "port-version": 3,
+  "port-version": 4,
   "description": "Tidy tidies HTML and XML. It can tidy your documents by itself, and developers can easily integrate its features into even more powerful tools.",
   "homepage": "https://github.com/htacg/tidy-html5"
 }
diff --git a/ports/tinyobjloader/portfile.cmake b/ports/tinyobjloader/portfile.cmake
index 86f76edb04d083..224947e5b5e5aa 100644
--- a/ports/tinyobjloader/portfile.cmake
+++ b/ports/tinyobjloader/portfile.cmake
@@ -37,3 +37,5 @@ vcpkg_copy_pdbs()
 
 # Put the licence file where vcpkg expects it
 file(RENAME ${CURRENT_PACKAGES_DIR}/share/tinyobjloader/LICENSE ${CURRENT_PACKAGES_DIR}/share/tinyobjloader/copyright)
+
+vcpkg_fixup_pkgconfig()
diff --git a/ports/tinyobjloader/vcpkg.json b/ports/tinyobjloader/vcpkg.json
index 45ed27c108b4ea..30bd1bb6f00620 100644
--- a/ports/tinyobjloader/vcpkg.json
+++ b/ports/tinyobjloader/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "tinyobjloader",
   "version-string": "2.0.0-rc2",
-  "port-version": 1,
+  "port-version": 2,
   "description": "Tiny but powerful single file wavefront obj loader",
   "features": {
     "double": {
diff --git a/ports/tinyply/portfile.cmake b/ports/tinyply/portfile.cmake
index a5e93530c9d1df..b41fdb0fec2add 100644
--- a/ports/tinyply/portfile.cmake
+++ b/ports/tinyply/portfile.cmake
@@ -32,3 +32,5 @@ file(READ "${SOURCE_PATH}/readme.md" readme_contents)
 string(FIND "${readme_contents}" "License" license_line_pos)
 string(SUBSTRING "${readme_contents}" ${license_line_pos} -1 license_contents)
 file(WRITE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright "${license_contents}")
+
+vcpkg_fixup_pkgconfig()
diff --git a/ports/tinyply/vcpkg.json b/ports/tinyply/vcpkg.json
index 5cf3b739825e59..b369c42455069b 100644
--- a/ports/tinyply/vcpkg.json
+++ b/ports/tinyply/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "tinyply",
   "version-string": "2020-05-22",
-  "port-version": 1,
+  "port-version": 2,
   "description": "C++11 ply 3d mesh format importer & exporter",
   "homepage": "https://github.com/ddiakopoulos/tinyply"
 }
diff --git a/ports/tlx/portfile.cmake b/ports/tlx/portfile.cmake
index 525894d28041b9..2ee4ca4f35705f 100644
--- a/ports/tlx/portfile.cmake
+++ b/ports/tlx/portfile.cmake
@@ -36,3 +36,5 @@ endif()
 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)
+
+vcpkg_fixup_pkgconfig()
diff --git a/ports/tlx/vcpkg.json b/ports/tlx/vcpkg.json
index 072971f8f65a55..5433956b112026 100644
--- a/ports/tlx/vcpkg.json
+++ b/ports/tlx/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "tlx",
   "version-string": "0.5.20191212",
-  "port-version": 1,
+  "port-version": 2,
   "description": "tlx is a collection of C++ helpers and extensions universally needed, but not found in the STL",
   "homepage": "https://github.com/tlx/tlx"
 }
diff --git a/ports/tmxparser/portfile.cmake b/ports/tmxparser/portfile.cmake
index 1f1b9e28616144..cf45ef27266826 100644
--- a/ports/tmxparser/portfile.cmake
+++ b/ports/tmxparser/portfile.cmake
@@ -35,3 +35,5 @@ endif()
 
 # Handle copyright
 file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+
+vcpkg_fixup_pkgconfig()
diff --git a/ports/tmxparser/vcpkg.json b/ports/tmxparser/vcpkg.json
index 769ae662bc8c95..9beb4ea250ab42 100644
--- a/ports/tmxparser/vcpkg.json
+++ b/ports/tmxparser/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "tmxparser",
   "version-string": "2.1.0",
-  "port-version": 5,
+  "port-version": 6,
   "description": "C++11 library for parsing the maps generated by the Map Editor called Tiled.",
   "dependencies": [
     "tinyxml2",
diff --git a/ports/uchardet/portfile.cmake b/ports/uchardet/portfile.cmake
index a407fd7831a55f..0e6a69566553e4 100644
--- a/ports/uchardet/portfile.cmake
+++ b/ports/uchardet/portfile.cmake
@@ -39,3 +39,5 @@ file(REMOVE_RECURSE
 )
 
 file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+
+vcpkg_fixup_pkgconfig()
diff --git a/ports/uchardet/vcpkg.json b/ports/uchardet/vcpkg.json
index 41a2bbe78438e8..6175ae9a45ecca 100644
--- a/ports/uchardet/vcpkg.json
+++ b/ports/uchardet/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "uchardet",
   "version-date": "2021-09-03",
+  "port-version": 1,
   "description": "An encoding detector library ported from Mozilla.",
   "homepage": "https://cgit.freedesktop.org/uchardet/uchardet/",
   "dependencies": [
diff --git a/ports/unittest-cpp/portfile.cmake b/ports/unittest-cpp/portfile.cmake
index 4558d8a1769058..f962a5b885546a 100644
--- a/ports/unittest-cpp/portfile.cmake
+++ b/ports/unittest-cpp/portfile.cmake
@@ -25,3 +25,5 @@ file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${
 
 # Remove duplicate includes
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+
+vcpkg_fixup_pkgconfig()
diff --git a/ports/unittest-cpp/vcpkg.json b/ports/unittest-cpp/vcpkg.json
index b80cbbad575091..8e48fb8aebb4bf 100644
--- a/ports/unittest-cpp/vcpkg.json
+++ b/ports/unittest-cpp/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "unittest-cpp",
   "version-semver": "2.0.0",
-  "port-version": 2,
+  "port-version": 3,
   "description": "A lightweight unit testing framework for C++",
   "homepage": "https://github.com/unittest-cpp/unittest-cpp"
 }
diff --git a/ports/uriparser/portfile.cmake b/ports/uriparser/portfile.cmake
index e09c67d88ddbe2..76fe6f6565ca44 100644
--- a/ports/uriparser/portfile.cmake
+++ b/ports/uriparser/portfile.cmake
@@ -54,3 +54,5 @@ endif()
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share")
 
 file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+
+vcpkg_fixup_pkgconfig()
diff --git a/ports/uriparser/vcpkg.json b/ports/uriparser/vcpkg.json
index dab0db2bb09689..52e853d95362ef 100644
--- a/ports/uriparser/vcpkg.json
+++ b/ports/uriparser/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "uriparser",
   "version-semver": "0.9.5",
+  "port-version": 1,
   "description": "Strictly RFC 3986 compliant URI parsing and handling library written in C89.",
   "homepage": "https://uriparser.github.io/",
   "license": "BSD-3-Clause",
diff --git a/ports/usrsctp/portfile.cmake b/ports/usrsctp/portfile.cmake
index f560279e5e8651..55ea67667acf41 100644
--- a/ports/usrsctp/portfile.cmake
+++ b/ports/usrsctp/portfile.cmake
@@ -22,3 +22,5 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 configure_file("${SOURCE_PATH}/LICENSE.md" "${CURRENT_PACKAGES_DIR}/share/usrsctp/copyright" COPYONLY)
 
 vcpkg_copy_pdbs()
+
+vcpkg_fixup_pkgconfig()
diff --git a/ports/usrsctp/vcpkg.json b/ports/usrsctp/vcpkg.json
index 64d475e3bfda8d..56683423af4653 100644
--- a/ports/usrsctp/vcpkg.json
+++ b/ports/usrsctp/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "usrsctp",
   "version": "0.9.5.0",
+  "port-version": 1,
   "description": "A userland SCTP stack supporting FreeBSD, Linux, Mac OS X and Windows.",
   "dependencies": [
     {
diff --git a/ports/wampcc/portfile.cmake b/ports/wampcc/portfile.cmake
index 8b31ecb4670285..e50d780dcd5787 100644
--- a/ports/wampcc/portfile.cmake
+++ b/ports/wampcc/portfile.cmake
@@ -49,3 +49,5 @@ vcpkg_install_cmake()
 
 file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/wampcc RENAME copyright)
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+
+vcpkg_fixup_pkgconfig()
diff --git a/ports/wampcc/vcpkg.json b/ports/wampcc/vcpkg.json
index da8a456f1e77c2..025aed5a301a5c 100644
--- a/ports/wampcc/vcpkg.json
+++ b/ports/wampcc/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "wampcc",
   "version-string": "2019-09-04",
-  "port-version": 1,
+  "port-version": 2,
   "description": "Wampcc is C++ library that implements the Web Application Messaging Protocol (WAMP) protocol.",
   "dependencies": [
     "jansson",
diff --git a/ports/xalan-c/portfile.cmake b/ports/xalan-c/portfile.cmake
index 33f3edecd036f5..6fa5ca3ab6b69a 100644
--- a/ports/xalan-c/portfile.cmake
+++ b/ports/xalan-c/portfile.cmake
@@ -36,3 +36,5 @@ file(REMOVE_RECURSE
 file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
 
 vcpkg_copy_pdbs()
+
+vcpkg_fixup_pkgconfig()
diff --git a/ports/xalan-c/vcpkg.json b/ports/xalan-c/vcpkg.json
index faf80bf2bba6e0..425d9bfd286891 100644
--- a/ports/xalan-c/vcpkg.json
+++ b/ports/xalan-c/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "xalan-c",
   "version": "1.12",
+  "port-version": 1,
   "description": "Xalan is an XSLT processor for transforming XML documents into HTML, text, or other XML document types",
   "homepage": "https://github.com/apache/xalan-c",
   "dependencies": [
diff --git a/ports/xerces-c/portfile.cmake b/ports/xerces-c/portfile.cmake
index 18a29890b22317..22d44193d804a7 100644
--- a/ports/xerces-c/portfile.cmake
+++ b/ports/xerces-c/portfile.cmake
@@ -64,3 +64,5 @@ file(REMOVE_RECURSE
 
 # Handle copyright
 file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+
+vcpkg_fixup_pkgconfig()
diff --git a/ports/xerces-c/vcpkg.json b/ports/xerces-c/vcpkg.json
index fb3ff4cab6bed4..bb836f898b76b5 100644
--- a/ports/xerces-c/vcpkg.json
+++ b/ports/xerces-c/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "xerces-c",
   "version-string": "3.2.3",
-  "port-version": 2,
+  "port-version": 3,
   "description": "Xerces-C++ is a XML parser, for parsing, generating, manipulating, and validating XML documents using the DOM, SAX, and SAX2 APIs.",
   "homepage": "https://github.com/apache/xerces-c",
   "features": {
diff --git a/ports/xlnt/portfile.cmake b/ports/xlnt/portfile.cmake
index 29101c2010724d..3ad72194a91dd8 100644
--- a/ports/xlnt/portfile.cmake
+++ b/ports/xlnt/portfile.cmake
@@ -38,3 +38,5 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/share/man)
 file(INSTALL ${SOURCE_PATH}/LICENSE.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
 
 vcpkg_copy_pdbs()
+
+vcpkg_fixup_pkgconfig()
diff --git a/ports/xlnt/vcpkg.json b/ports/xlnt/vcpkg.json
index df61b6066421f2..eb2275878f6ccd 100644
--- a/ports/xlnt/vcpkg.json
+++ b/ports/xlnt/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "xlnt",
   "version": "1.5.0",
-  "port-version": 2,
+  "port-version": 3,
   "description": "Cross-platform user-friendly xlsx library for C++14",
   "homepage": "https://github.com/tfussell/xlnt"
 }
diff --git a/ports/xtensor-fftw/portfile.cmake b/ports/xtensor-fftw/portfile.cmake
index e22efc2e345b2d..e7e70a729f8827 100644
--- a/ports/xtensor-fftw/portfile.cmake
+++ b/ports/xtensor-fftw/portfile.cmake
@@ -29,3 +29,5 @@ vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT})
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
 
 file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+
+vcpkg_fixup_pkgconfig()
diff --git a/ports/xtensor-fftw/vcpkg.json b/ports/xtensor-fftw/vcpkg.json
index 22d6e69a88e7e2..8ba4afb3f1d097 100644
--- a/ports/xtensor-fftw/vcpkg.json
+++ b/ports/xtensor-fftw/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "xtensor-fftw",
   "version-string": "2019-11-30",
-  "port-version": 1,
+  "port-version": 2,
   "description": "FFTW bindings for the xtensor C++14 multi-dimensional array library",
   "homepage": "https://github.com/xtensor-stack/xtensor-fftw",
   "dependencies": [
diff --git a/ports/z3/portfile.cmake b/ports/z3/portfile.cmake
index aab0d9b88492eb..e5d5ec72a6fb60 100644
--- a/ports/z3/portfile.cmake
+++ b/ports/z3/portfile.cmake
@@ -31,3 +31,5 @@ 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)
+
+vcpkg_fixup_pkgconfig()
diff --git a/ports/z3/vcpkg.json b/ports/z3/vcpkg.json
index 3020f60f725ced..1ad7aece5c8d0f 100644
--- a/ports/z3/vcpkg.json
+++ b/ports/z3/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "z3",
   "version": "4.8.12",
+  "port-version": 1,
   "description": "Z3 is a theorem prover from Microsoft Research",
   "homepage": "https://github.com/Z3Prover/z3",
   "supports": "!uwp"
diff --git a/ports/zeromq/portfile.cmake b/ports/zeromq/portfile.cmake
index 01c5aa49cd6426..ba51367e2f5cc2 100644
--- a/ports/zeromq/portfile.cmake
+++ b/ports/zeromq/portfile.cmake
@@ -63,3 +63,5 @@ endif()
 file(RENAME "${CURRENT_PACKAGES_DIR}/share/zmq/COPYING.LESSER.txt" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright")
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share" "${CURRENT_PACKAGES_DIR}/share/zmq")
+
+vcpkg_fixup_pkgconfig()
diff --git a/ports/zeromq/vcpkg.json b/ports/zeromq/vcpkg.json
index 631f9cf784659d..e7d469bf287bca 100644
--- a/ports/zeromq/vcpkg.json
+++ b/ports/zeromq/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "zeromq",
   "version": "4.3.4",
-  "port-version": 1,
+  "port-version": 2,
   "description": "The ZeroMQ lightweight messaging kernel is a library which extends the standard socket interfaces with features traditionally provided by specialised messaging middleware products",
   "homepage": "https://github.com/zeromq/libzmq",
   "supports": "!uwp",
diff --git a/ports/zyre/portfile.cmake b/ports/zyre/portfile.cmake
index e2a3f9878bab27..b73db8ecb51fd3 100644
--- a/ports/zyre/portfile.cmake
+++ b/ports/zyre/portfile.cmake
@@ -62,3 +62,5 @@ endif()
 
 # Handle copyright
 configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY)
+
+vcpkg_fixup_pkgconfig()
diff --git a/ports/zyre/vcpkg.json b/ports/zyre/vcpkg.json
index ca7068be0f19e3..2abbffdfd4a901 100644
--- a/ports/zyre/vcpkg.json
+++ b/ports/zyre/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "zyre",
   "version-string": "2019-07-07",
-  "port-version": 2,
+  "port-version": 3,
   "description": "An open-source framework for proximity-based peer-to-peer applications",
   "homepage": "https://github.com/zeromq/zyre",
   "dependencies": [
diff --git a/ports/zziplib/portfile.cmake b/ports/zziplib/portfile.cmake
index cc1d4905475b2a..9ee3ee64d6b4f4 100644
--- a/ports/zziplib/portfile.cmake
+++ b/ports/zziplib/portfile.cmake
@@ -52,3 +52,5 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
 
 # Handle copyright
 file(INSTALL ${SOURCE_PATH}/COPYING.LIB DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+
+vcpkg_fixup_pkgconfig()
diff --git a/ports/zziplib/vcpkg.json b/ports/zziplib/vcpkg.json
index 95279853a3dac6..cdbca56158e3ae 100644
--- a/ports/zziplib/vcpkg.json
+++ b/ports/zziplib/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "zziplib",
   "version-string": "0.13.71",
-  "port-version": 2,
+  "port-version": 3,
   "description": "library providing read access on ZIP-archives",
   "homepage": "https://github.com/gdraheim/zziplib",
   "dependencies": [
diff --git a/versions/a-/ace.json b/versions/a-/ace.json
index bac72f23262530..4e05683ae848da 100644
--- a/versions/a-/ace.json
+++ b/versions/a-/ace.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "67c57059b237310a1907da692fc75acb3d8d2726",
+      "version": "7.0.3",
+      "port-version": 2
+    },
     {
       "git-tree": "d4585581f988569d9428b693540dbd6f8305be8d",
       "version": "7.0.3",
diff --git a/versions/a-/amqpcpp.json b/versions/a-/amqpcpp.json
index fa976f7d1ad2fb..4195befef5ae5e 100644
--- a/versions/a-/amqpcpp.json
+++ b/versions/a-/amqpcpp.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "bb3c11de2e142fc43d0c3bbcddc2a56b563de733",
+      "version": "4.3.14",
+      "port-version": 1
+    },
     {
       "git-tree": "e17952ad85007dbc08e20711b8f5bd462712e4e0",
       "version": "4.3.14",
diff --git a/versions/a-/aom.json b/versions/a-/aom.json
index 1091b77be60683..16639b522ef107 100644
--- a/versions/a-/aom.json
+++ b/versions/a-/aom.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "5d7bac96c35260b96135bf3ec1d456994d549eb3",
+      "version-semver": "3.2.0",
+      "port-version": 1
+    },
     {
       "git-tree": "04432e0fa953e42790ff74f6d927130d9a4e28a7",
       "version-semver": "3.2.0",
diff --git a/versions/a-/aricpp.json b/versions/a-/aricpp.json
index 36bcbe95b469c7..728221b15af2cd 100644
--- a/versions/a-/aricpp.json
+++ b/versions/a-/aricpp.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "266bfd31b17badea05be9f9859b0ce84f4d9f60e",
+      "version-semver": "1.1.1",
+      "port-version": 1
+    },
     {
       "git-tree": "6bab43826055b88429107ef725b3c98fdded73ee",
       "version-semver": "1.1.1",
diff --git a/versions/a-/armadillo.json b/versions/a-/armadillo.json
index 21920f3b23c173..381c58c27a5a5b 100644
--- a/versions/a-/armadillo.json
+++ b/versions/a-/armadillo.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "2a7774c182c273a8d6f350a383f4a3bcf01e308e",
+      "version": "10.6.2",
+      "port-version": 2
+    },
     {
       "git-tree": "34c37cb8151d003da697e9d725033567a4ccb2f7",
       "version": "10.6.2",
diff --git a/versions/a-/arrow.json b/versions/a-/arrow.json
index 904f3430ca5f31..8d0b86eb61ad1c 100644
--- a/versions/a-/arrow.json
+++ b/versions/a-/arrow.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "79938475d53bb40ad7bf8d0fbda9e65f7630dde7",
+      "version": "5.0.0",
+      "port-version": 1
+    },
     {
       "git-tree": "bf5c2b42bb8c4efa09d69a4ce6e75ae3ace45f02",
       "version": "5.0.0",
diff --git a/versions/b-/bcg729.json b/versions/b-/bcg729.json
index 07eb8c734a18b9..544f247119b529 100644
--- a/versions/b-/bcg729.json
+++ b/versions/b-/bcg729.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "16cf88e26d0bf3ebd469c722cd4df96c59556fb7",
+      "version-string": "1.1.1",
+      "port-version": 1
+    },
     {
       "git-tree": "666c71eec6573ef70d9f2630962511687723bb0e",
       "version-string": "1.1.1",
diff --git a/versions/b-/bddisasm.json b/versions/b-/bddisasm.json
index 5707d0c4bf6bad..7b4f30795643db 100644
--- a/versions/b-/bddisasm.json
+++ b/versions/b-/bddisasm.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "615b986c25f902c2053661948092cbfa757fa400",
+      "version": "1.34.2",
+      "port-version": 1
+    },
     {
       "git-tree": "d6ba1aba5922829f7eb5d8197dbffe5aa8f9722b",
       "version": "1.34.2",
diff --git a/versions/b-/bde.json b/versions/b-/bde.json
index c37874aac45179..f587a05e530024 100644
--- a/versions/b-/bde.json
+++ b/versions/b-/bde.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "60082ad73e5c9fb9828041183b026fc15e453218",
+      "version-string": "3.2.0.0",
+      "port-version": 4
+    },
     {
       "git-tree": "b940e98efec0d1f48f2edfe2027d2bce251ec7a8",
       "version-string": "3.2.0.0",
diff --git a/versions/b-/bdwgc.json b/versions/b-/bdwgc.json
index 50dc59430a4a1b..7719dfd7208e77 100644
--- a/versions/b-/bdwgc.json
+++ b/versions/b-/bdwgc.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "84653790601fd0e28aaeb12a9a58292b7e3af1bc",
+      "version": "8.2.0",
+      "port-version": 1
+    },
     {
       "git-tree": "ea1da0228494df421f826c098fdf574a93afbb66",
       "version": "8.2.0",
diff --git a/versions/b-/blitz.json b/versions/b-/blitz.json
index b30b87f50efe51..797c31d5c66d7d 100644
--- a/versions/b-/blitz.json
+++ b/versions/b-/blitz.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "6f6a860240cf01fea1a9f90f6970dec75980a1d1",
+      "version-string": "2020-03-25",
+      "port-version": 2
+    },
     {
       "git-tree": "50cc7fc499a0dd0ea2d61de84ee5875327ffd255",
       "version-string": "2020-03-25",
diff --git a/versions/b-/blosc.json b/versions/b-/blosc.json
index ee956cdfadfb46..9f5863b6d0f31b 100644
--- a/versions/b-/blosc.json
+++ b/versions/b-/blosc.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "a9ae0480271a2db8d001d389b4c62af49ea50770",
+      "version-string": "1.18.1",
+      "port-version": 3
+    },
     {
       "git-tree": "0d29f4f5d2e2d2fd70c4489149d81cc548d31cc1",
       "version-string": "1.18.1",
diff --git a/versions/b-/brpc.json b/versions/b-/brpc.json
index d625bae51605ad..2049b07521ea35 100644
--- a/versions/b-/brpc.json
+++ b/versions/b-/brpc.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "42b5a413e49655d73b772efa7642eefff429b4c1",
+      "version-string": "0.9.7",
+      "port-version": 3
+    },
     {
       "git-tree": "0b89b1bee5f50f8bdb551ae2373feb51b144fbc2",
       "version-string": "0.9.7",
diff --git a/versions/b-/bullet3.json b/versions/b-/bullet3.json
index 042edb960a1991..49a5583439717c 100644
--- a/versions/b-/bullet3.json
+++ b/versions/b-/bullet3.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "bcc42d2c8eb5fc4134c31f6176bc0c0ae3bc46e1",
+      "version": "3.17",
+      "port-version": 2
+    },
     {
       "git-tree": "5d6e2d765a4cca130170b4a574e99a938ce54818",
       "version": "3.17",
diff --git a/versions/baseline.json b/versions/baseline.json
index e177578a237802..df343e6be77b16 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -18,7 +18,7 @@
     },
     "ace": {
       "baseline": "7.0.3",
-      "port-version": 1
+      "port-version": 2
     },
     "activemq-cpp": {
       "baseline": "3.9.5",
@@ -70,7 +70,7 @@
     },
     "amqpcpp": {
       "baseline": "4.3.14",
-      "port-version": 0
+      "port-version": 1
     },
     "anax": {
       "baseline": "2.1.0",
@@ -98,7 +98,7 @@
     },
     "aom": {
       "baseline": "3.2.0",
-      "port-version": 0
+      "port-version": 1
     },
     "approval-tests-cpp": {
       "baseline": "10.12.0",
@@ -154,11 +154,11 @@
     },
     "aricpp": {
       "baseline": "1.1.1",
-      "port-version": 0
+      "port-version": 1
     },
     "armadillo": {
       "baseline": "10.6.2",
-      "port-version": 1
+      "port-version": 2
     },
     "arrayfire": {
       "baseline": "3.8.0",
@@ -166,7 +166,7 @@
     },
     "arrow": {
       "baseline": "5.0.0",
-      "port-version": 0
+      "port-version": 1
     },
     "ashes": {
       "baseline": "2021-06-18",
@@ -390,19 +390,19 @@
     },
     "bcg729": {
       "baseline": "1.1.1",
-      "port-version": 0
+      "port-version": 1
     },
     "bddisasm": {
       "baseline": "1.34.2",
-      "port-version": 0
+      "port-version": 1
     },
     "bde": {
       "baseline": "3.2.0.0",
-      "port-version": 3
+      "port-version": 4
     },
     "bdwgc": {
       "baseline": "8.2.0",
-      "port-version": 0
+      "port-version": 1
     },
     "beast": {
       "baseline": "0",
@@ -494,11 +494,11 @@
     },
     "blitz": {
       "baseline": "2020-03-25",
-      "port-version": 1
+      "port-version": 2
     },
     "blosc": {
       "baseline": "1.18.1",
-      "port-version": 2
+      "port-version": 3
     },
     "boinc": {
       "baseline": "7.18.1",
@@ -1142,7 +1142,7 @@
     },
     "brpc": {
       "baseline": "0.9.7",
-      "port-version": 2
+      "port-version": 3
     },
     "brunocodutra-metal": {
       "baseline": "2.1.3",
@@ -1166,7 +1166,7 @@
     },
     "bullet3": {
       "baseline": "3.17",
-      "port-version": 1
+      "port-version": 2
     },
     "bustache": {
       "baseline": "1.1.0",
@@ -1218,7 +1218,7 @@
     },
     "capnproto": {
       "baseline": "0.9.1",
-      "port-version": 0
+      "port-version": 1
     },
     "capstone": {
       "baseline": "4.0.2",
@@ -1250,7 +1250,7 @@
     },
     "ccd": {
       "baseline": "2.1-4",
-      "port-version": 2
+      "port-version": 3
     },
     "ccfits": {
       "baseline": "2.5",
@@ -1314,7 +1314,7 @@
     },
     "charls": {
       "baseline": "2.2.0",
-      "port-version": 1
+      "port-version": 2
     },
     "chartdir": {
       "baseline": "7.0.0",
@@ -1322,7 +1322,7 @@
     },
     "check": {
       "baseline": "0.15.2",
-      "port-version": 1
+      "port-version": 2
     },
     "chipmunk": {
       "baseline": "7.0.3",
@@ -1354,7 +1354,7 @@
     },
     "cjson": {
       "baseline": "1.7.15",
-      "port-version": 0
+      "port-version": 1
     },
     "clamav": {
       "baseline": "0.103.0",
@@ -1374,7 +1374,7 @@
     },
     "clblast": {
       "baseline": "1.5.1",
-      "port-version": 1
+      "port-version": 2
     },
     "clfft": {
       "baseline": "2.12.2",
@@ -1382,7 +1382,7 @@
     },
     "cli": {
       "baseline": "2.0.0",
-      "port-version": 0
+      "port-version": 1
     },
     "cli11": {
       "baseline": "2.1.2",
@@ -1426,7 +1426,7 @@
     },
     "cmocka": {
       "baseline": "2020-08-01",
-      "port-version": 0
+      "port-version": 1
     },
     "cnl": {
       "baseline": "1.1.7",
@@ -1438,7 +1438,7 @@
     },
     "coin": {
       "baseline": "4.0.0",
-      "port-version": 3
+      "port-version": 4
     },
     "coinutils": {
       "baseline": "2.11.4",
@@ -1446,7 +1446,7 @@
     },
     "collada-dom": {
       "baseline": "2.5.0",
-      "port-version": 5
+      "port-version": 6
     },
     "colmap": {
       "baseline": "3.6",
@@ -1530,7 +1530,7 @@
     },
     "cpp-redis": {
       "baseline": "4.3.1",
-      "port-version": 3
+      "port-version": 4
     },
     "cpp-taskflow": {
       "baseline": "2.6.0",
@@ -1550,7 +1550,7 @@
     },
     "cppcodec": {
       "baseline": "0.2",
-      "port-version": 1
+      "port-version": 2
     },
     "cppcoro": {
       "baseline": "2020-2-28",
@@ -1610,7 +1610,7 @@
     },
     "cpuid": {
       "baseline": "0.5.1",
-      "port-version": 1
+      "port-version": 2
     },
     "cpuinfo": {
       "baseline": "2021-04-04",
@@ -1694,7 +1694,7 @@
     },
     "curlpp": {
       "baseline": "2018-06-15",
-      "port-version": 4
+      "port-version": 5
     },
     "cute-headers": {
       "baseline": "2019-09-20",
@@ -1862,7 +1862,7 @@
     },
     "dlib": {
       "baseline": "19.21",
-      "port-version": 5
+      "port-version": 6
     },
     "dmlc": {
       "baseline": "2019-08-12",
@@ -1942,7 +1942,7 @@
     },
     "easyloggingpp": {
       "baseline": "9.97.0",
-      "port-version": 0
+      "port-version": 1
     },
     "eathread": {
       "baseline": "1.32.09",
@@ -1966,7 +1966,7 @@
     },
     "edlib": {
       "baseline": "1.2.7",
-      "port-version": 0
+      "port-version": 1
     },
     "effects11": {
       "baseline": "11.26",
@@ -2114,7 +2114,7 @@
     },
     "fcl": {
       "baseline": "0.7.0",
-      "port-version": 0
+      "port-version": 1
     },
     "fdk-aac": {
       "baseline": "2.0.2",
@@ -2134,7 +2134,7 @@
     },
     "fftw3": {
       "baseline": "3.3.10",
-      "port-version": 1
+      "port-version": 2
     },
     "fftwpp": {
       "baseline": "2019-12-19",
@@ -2154,7 +2154,7 @@
     },
     "flann": {
       "baseline": "2019-04-07",
-      "port-version": 2
+      "port-version": 3
     },
     "flashlight-cpu": {
       "baseline": "0.3",
@@ -2166,7 +2166,7 @@
     },
     "flatbuffers": {
       "baseline": "2.0.0",
-      "port-version": 1
+      "port-version": 2
     },
     "flint": {
       "baseline": "2.5.2",
@@ -2178,7 +2178,7 @@
     },
     "fluidlite": {
       "baseline": "2020-08-27",
-      "port-version": 1
+      "port-version": 2
     },
     "fluidsynth": {
       "baseline": "2.2.1",
@@ -2202,7 +2202,7 @@
     },
     "folly": {
       "baseline": "2021.06.14.00",
-      "port-version": 2
+      "port-version": 3
     },
     "font-chef": {
       "baseline": "1.0.1",
@@ -2238,7 +2238,7 @@
     },
     "freeglut": {
       "baseline": "3.2.1",
-      "port-version": 6
+      "port-version": 7
     },
     "freeimage": {
       "baseline": "3.18.0",
@@ -2246,7 +2246,7 @@
     },
     "freeopcua": {
       "baseline": "20190125",
-      "port-version": 4
+      "port-version": 5
     },
     "freerdp": {
       "baseline": "2.4.0",
@@ -2298,7 +2298,7 @@
     },
     "functions-framework-cpp": {
       "baseline": "1.0.0",
-      "port-version": 0
+      "port-version": 1
     },
     "fuzzylite": {
       "baseline": "6.0",
@@ -2370,11 +2370,11 @@
     },
     "geogram": {
       "baseline": "1.7.6",
-      "port-version": 0
+      "port-version": 1
     },
     "geographiclib": {
       "baseline": "1.52",
-      "port-version": 0
+      "port-version": 1
     },
     "geos": {
       "baseline": "3.9.1",
@@ -2386,7 +2386,7 @@
     },
     "getdns": {
       "baseline": "1.6.0",
-      "port-version": 1
+      "port-version": 2
     },
     "getopt": {
       "baseline": "0",
@@ -2406,7 +2406,7 @@
     },
     "gflags": {
       "baseline": "2.2.2",
-      "port-version": 4
+      "port-version": 5
     },
     "ghc-filesystem": {
       "baseline": "1.5.4",
@@ -2538,15 +2538,15 @@
     },
     "graphite2": {
       "baseline": "1.3.14",
-      "port-version": 1
+      "port-version": 2
     },
     "graphqlparser": {
       "baseline": "0.7.0",
-      "port-version": 2
+      "port-version": 3
     },
     "graphviz": {
       "baseline": "2.49.1",
-      "port-version": 0
+      "port-version": 1
     },
     "greatest": {
       "baseline": "1.5.0",
@@ -2674,7 +2674,7 @@
     },
     "hiredis": {
       "baseline": "1.0.2",
-      "port-version": 0
+      "port-version": 1
     },
     "hpx": {
       "baseline": "1.7.1",
@@ -2698,7 +2698,7 @@
     },
     "hyperscan": {
       "baseline": "5.3.0",
-      "port-version": 2
+      "port-version": 3
     },
     "hypodermic": {
       "baseline": "2.5.3",
@@ -2794,7 +2794,7 @@
     },
     "igraph": {
       "baseline": "0.9.4",
-      "port-version": 0
+      "port-version": 1
     },
     "iir1": {
       "baseline": "1.8.0",
@@ -2846,7 +2846,7 @@
     },
     "iniparser": {
       "baseline": "2020-04-06",
-      "port-version": 1
+      "port-version": 2
     },
     "inja": {
       "baseline": "3.3.0",
@@ -2890,7 +2890,7 @@
     },
     "itpp": {
       "baseline": "4.3.1",
-      "port-version": 7
+      "port-version": 8
     },
     "ixwebsocket": {
       "baseline": "11.2.6",
@@ -2906,7 +2906,7 @@
     },
     "jansson": {
       "baseline": "2.13.1",
-      "port-version": 1
+      "port-version": 2
     },
     "jasper": {
       "baseline": "2.0.33",
@@ -2954,7 +2954,7 @@
     },
     "json11": {
       "baseline": "2017-06-20",
-      "port-version": 3
+      "port-version": 4
     },
     "json5-parser": {
       "baseline": "1.0.0",
@@ -3294,7 +3294,7 @@
     },
     "libbson": {
       "baseline": "1.17.6",
-      "port-version": 0
+      "port-version": 1
     },
     "libcanberra": {
       "baseline": "0.30",
@@ -3310,7 +3310,7 @@
     },
     "libcerf": {
       "baseline": "1.13",
-      "port-version": 1
+      "port-version": 2
     },
     "libconfig": {
       "baseline": "1.7.3",
@@ -3318,7 +3318,7 @@
     },
     "libconfuse": {
       "baseline": "2019-07-14",
-      "port-version": 1
+      "port-version": 2
     },
     "libcopp": {
       "baseline": "1.4.1",
@@ -3378,11 +3378,11 @@
     },
     "libevent": {
       "baseline": "2.1.12",
-      "port-version": 2
+      "port-version": 3
     },
     "libevhtp": {
       "baseline": "1.2.18",
-      "port-version": 1
+      "port-version": 2
     },
     "libexif": {
       "baseline": "0.6.22",
@@ -3406,11 +3406,11 @@
     },
     "libfort": {
       "baseline": "0.4.2",
-      "port-version": 0
+      "port-version": 1
     },
     "libfreenect2": {
       "baseline": "0.2.0",
-      "port-version": 6
+      "port-version": 7
     },
     "libftdi": {
       "baseline": "0.20",
@@ -3426,7 +3426,7 @@
     },
     "libgd": {
       "baseline": "2.3.2",
-      "port-version": 0
+      "port-version": 1
     },
     "libgeotiff": {
       "baseline": "1.6.0",
@@ -3454,7 +3454,7 @@
     },
     "libgta": {
       "baseline": "1.0.8",
-      "port-version": 2
+      "port-version": 3
     },
     "libguarded": {
       "baseline": "2019-08-27",
@@ -3534,11 +3534,11 @@
     },
     "libkeyfinder": {
       "baseline": "2.2.5",
-      "port-version": 0
+      "port-version": 1
     },
     "libkml": {
       "baseline": "1.3.0",
-      "port-version": 7
+      "port-version": 8
     },
     "liblas": {
       "baseline": "1.8.1",
@@ -3550,7 +3550,7 @@
     },
     "liblemon": {
       "baseline": "2019-06-13",
-      "port-version": 2
+      "port-version": 3
     },
     "liblinear": {
       "baseline": "243",
@@ -3558,7 +3558,7 @@
     },
     "liblo": {
       "baseline": "0.31",
-      "port-version": 1
+      "port-version": 2
     },
     "liblsl": {
       "baseline": "1.14.0",
@@ -3598,7 +3598,7 @@
     },
     "libmikmod": {
       "baseline": "3.3.11.1",
-      "port-version": 9
+      "port-version": 10
     },
     "libmodbus": {
       "baseline": "3.1.6",
@@ -3626,7 +3626,7 @@
     },
     "libmt32emu": {
       "baseline": "2.5.3",
-      "port-version": 0
+      "port-version": 1
     },
     "libmupdf": {
       "baseline": "1.18.1-so-3.11.14",
@@ -3734,7 +3734,7 @@
     },
     "libpqxx": {
       "baseline": "7.6.0",
-      "port-version": 1
+      "port-version": 2
     },
     "libprotobuf-mutator": {
       "baseline": "1.0",
@@ -3742,7 +3742,7 @@
     },
     "libproxy": {
       "baseline": "0.4.17",
-      "port-version": 0
+      "port-version": 1
     },
     "libqcow": {
       "baseline": "20210419",
@@ -3754,7 +3754,7 @@
     },
     "libqrencode": {
       "baseline": "4.1.1",
-      "port-version": 0
+      "port-version": 1
     },
     "librabbitmq": {
       "baseline": "2020-06-03",
@@ -3770,7 +3770,7 @@
     },
     "librdkafka": {
       "baseline": "1.7.0",
-      "port-version": 1
+      "port-version": 2
     },
     "libressl": {
       "baseline": "3.3.4",
@@ -3802,7 +3802,7 @@
     },
     "libsbml": {
       "baseline": "5.19.0",
-      "port-version": 0
+      "port-version": 1
     },
     "libsbsms": {
       "baseline": "2.3.0",
@@ -3894,7 +3894,7 @@
     },
     "libtins": {
       "baseline": "4.3",
-      "port-version": 1
+      "port-version": 2
     },
     "libtomcrypt": {
       "baseline": "1.18.2",
@@ -3906,7 +3906,7 @@
     },
     "libtorrent": {
       "baseline": "1.2.14",
-      "port-version": 0
+      "port-version": 1
     },
     "libu2f-server": {
       "baseline": "1.1.0",
@@ -3990,7 +3990,7 @@
     },
     "libwebsockets": {
       "baseline": "4.2.2",
-      "port-version": 2
+      "port-version": 3
     },
     "libxdiff": {
       "baseline": "0.23",
@@ -3998,7 +3998,7 @@
     },
     "libxlsxwriter": {
       "baseline": "1.1.3",
-      "port-version": 0
+      "port-version": 1
     },
     "libxml2": {
       "baseline": "2.9.12",
@@ -4378,7 +4378,7 @@
     },
     "mongo-c-driver": {
       "baseline": "1.17.6",
-      "port-version": 0
+      "port-version": 1
     },
     "mongo-cxx-driver": {
       "baseline": "3.6.5",
@@ -4410,7 +4410,7 @@
     },
     "mosquitto": {
       "baseline": "2.0.12",
-      "port-version": 1
+      "port-version": 2
     },
     "mozjpeg": {
       "baseline": "2021-09-27",
@@ -4478,11 +4478,11 @@
     },
     "msgpack": {
       "baseline": "3.3.0",
-      "port-version": 1
+      "port-version": 2
     },
     "msgpack11": {
       "baseline": "0.0.10",
-      "port-version": 2
+      "port-version": 3
     },
     "msinttypes": {
       "baseline": "2018-02-25",
@@ -4506,11 +4506,11 @@
     },
     "munit": {
       "baseline": "2019-04-06",
-      "port-version": 2
+      "port-version": 3
     },
     "muparser": {
       "baseline": "2.3.2",
-      "port-version": 1
+      "port-version": 2
     },
     "murmurhash": {
       "baseline": "2016-01-09",
@@ -4542,7 +4542,7 @@
     },
     "nanoflann": {
       "baseline": "1.3.2",
-      "port-version": 0
+      "port-version": 1
     },
     "nanogui": {
       "baseline": "2019-09-23",
@@ -4550,7 +4550,7 @@
     },
     "nanomsg": {
       "baseline": "1.1.5",
-      "port-version": 3
+      "port-version": 4
     },
     "nanopb": {
       "baseline": "0.4.5",
@@ -4638,7 +4638,7 @@
     },
     "nlopt": {
       "baseline": "2.7.0",
-      "port-version": 0
+      "port-version": 1
     },
     "nmap": {
       "baseline": "7.70",
@@ -4758,11 +4758,11 @@
     },
     "octomap": {
       "baseline": "1.9.5",
-      "port-version": 1
+      "port-version": 2
     },
     "ode": {
       "baseline": "0.16.1",
-      "port-version": 1
+      "port-version": 2
     },
     "offscale-libetcd-cpp": {
       "baseline": "2019-07-10",
@@ -4782,7 +4782,7 @@
     },
     "ois": {
       "baseline": "1.5",
-      "port-version": 2
+      "port-version": 3
     },
     "ompl": {
       "baseline": "1.5.1",
@@ -4798,7 +4798,7 @@
     },
     "oniguruma": {
       "baseline": "6.9.7.1",
-      "port-version": 0
+      "port-version": 1
     },
     "onnx": {
       "baseline": "1.10.1",
@@ -4830,7 +4830,7 @@
     },
     "opencc": {
       "baseline": "2020-04-26",
-      "port-version": 8
+      "port-version": 9
     },
     "opencensus-cpp": {
       "baseline": "0.4.0",
@@ -4894,7 +4894,7 @@
     },
     "openimageio": {
       "baseline": "2.3.7.2",
-      "port-version": 3
+      "port-version": 4
     },
     "openjpeg": {
       "baseline": "2.4.0",
@@ -4994,11 +4994,11 @@
     },
     "orocos-kdl": {
       "baseline": "1.4",
-      "port-version": 4
+      "port-version": 5
     },
     "osg": {
       "baseline": "3.6.5",
-      "port-version": 9
+      "port-version": 10
     },
     "osg-qt": {
       "baseline": "Qt5",
@@ -5026,7 +5026,7 @@
     },
     "p-ranav-csv2": {
       "baseline": "2020-12-14",
-      "port-version": 1
+      "port-version": 2
     },
     "pagmo2": {
       "baseline": "2.16.1",
@@ -5094,7 +5094,7 @@
     },
     "pcl": {
       "baseline": "1.11.1",
-      "port-version": 4
+      "port-version": 5
     },
     "pcre": {
       "baseline": "8.45",
@@ -5218,7 +5218,7 @@
     },
     "plplot": {
       "baseline": "5.13.0",
-      "port-version": 10
+      "port-version": 11
     },
     "plustache": {
       "baseline": "0.4.0",
@@ -5254,7 +5254,7 @@
     },
     "polyclipping": {
       "baseline": "6.4.2",
-      "port-version": 8
+      "port-version": 9
     },
     "polyhook2": {
       "baseline": "2021-05-09",
@@ -5266,11 +5266,11 @@
     },
     "ponder": {
       "baseline": "3.0.0",
-      "port-version": 2
+      "port-version": 3
     },
     "poppler": {
       "baseline": "20.12.1",
-      "port-version": 5
+      "port-version": 6
     },
     "popsift": {
       "baseline": "0.9",
@@ -5282,7 +5282,7 @@
     },
     "portaudio": {
       "baseline": "19.7",
-      "port-version": 1
+      "port-version": 2
     },
     "portmidi": {
       "baseline": "0.234",
@@ -5294,7 +5294,7 @@
     },
     "ppconsul": {
       "baseline": "0.5",
-      "port-version": 2
+      "port-version": 3
     },
     "ppmagic": {
       "baseline": "2020-07-03",
@@ -5822,11 +5822,11 @@
     },
     "raylib": {
       "baseline": "3.7.0",
-      "port-version": 1
+      "port-version": 2
     },
     "rbdl": {
       "baseline": "2.6.0",
-      "port-version": 1
+      "port-version": 2
     },
     "rbdl-orb": {
       "baseline": "3.1.2",
@@ -5854,7 +5854,7 @@
     },
     "realsense2": {
       "baseline": "2.49.0",
-      "port-version": 0
+      "port-version": 1
     },
     "recast": {
       "baseline": "1.5.1",
@@ -5862,7 +5862,7 @@
     },
     "redis-plus-plus": {
       "baseline": "1.3.1",
-      "port-version": 0
+      "port-version": 1
     },
     "refl-cpp": {
       "baseline": "0.12.0",
@@ -5938,7 +5938,7 @@
     },
     "rpclib": {
       "baseline": "2.3.0",
-      "port-version": 0
+      "port-version": 1
     },
     "rply": {
       "baseline": "1.1.4",
@@ -5974,7 +5974,7 @@
     },
     "rtaudio": {
       "baseline": "2021-08-15",
-      "port-version": 0
+      "port-version": 1
     },
     "rtlsdr": {
       "baseline": "2020-04-16",
@@ -6022,7 +6022,7 @@
     },
     "sais": {
       "baseline": "2.4.1",
-      "port-version": 2
+      "port-version": 3
     },
     "sajson": {
       "baseline": "2018-09-21",
@@ -6066,7 +6066,7 @@
     },
     "sdformat6": {
       "baseline": "6.2.0",
-      "port-version": 2
+      "port-version": 3
     },
     "sdformat9": {
       "baseline": "9.4.0",
@@ -6122,7 +6122,7 @@
     },
     "sentencepiece": {
       "baseline": "0.1.95",
-      "port-version": 0
+      "port-version": 1
     },
     "sentry-native": {
       "baseline": "0.4.12",
@@ -6190,7 +6190,7 @@
     },
     "simage": {
       "baseline": "1.8.1",
-      "port-version": 1
+      "port-version": 2
     },
     "simde": {
       "baseline": "0.7.2",
@@ -6290,7 +6290,7 @@
     },
     "sol2": {
       "baseline": "3.2.2",
-      "port-version": 1
+      "port-version": 2
     },
     "solid3": {
       "baseline": "3.5.8",
@@ -6314,7 +6314,7 @@
     },
     "soxr": {
       "baseline": "0.1.3",
-      "port-version": 5
+      "port-version": 6
     },
     "spaceland": {
       "baseline": "7.8.2",
@@ -6326,7 +6326,7 @@
     },
     "sparsehash": {
       "baseline": "2.0.4",
-      "port-version": 1
+      "port-version": 2
     },
     "sparsepp": {
       "baseline": "1.22",
@@ -6486,7 +6486,7 @@
     },
     "stxxl": {
       "baseline": "2018-11-15",
-      "port-version": 3
+      "port-version": 4
     },
     "suitesparse": {
       "baseline": "5.8.0",
@@ -6498,7 +6498,7 @@
     },
     "superlu": {
       "baseline": "2020-01-07",
-      "port-version": 3
+      "port-version": 4
     },
     "symengine": {
       "baseline": "0.7.0",
@@ -6614,11 +6614,11 @@
     },
     "thrift": {
       "baseline": "0.13.0",
-      "port-version": 1
+      "port-version": 2
     },
     "tidy-html5": {
       "baseline": "5.7.28",
-      "port-version": 3
+      "port-version": 4
     },
     "tiff": {
       "baseline": "4.3.0",
@@ -6682,11 +6682,11 @@
     },
     "tinyobjloader": {
       "baseline": "2.0.0-rc2",
-      "port-version": 1
+      "port-version": 2
     },
     "tinyply": {
       "baseline": "2020-05-22",
-      "port-version": 1
+      "port-version": 2
     },
     "tinyspline": {
       "baseline": "0.3.0",
@@ -6730,7 +6730,7 @@
     },
     "tlx": {
       "baseline": "0.5.20191212",
-      "port-version": 1
+      "port-version": 2
     },
     "tmx": {
       "baseline": "1.1.0",
@@ -6742,7 +6742,7 @@
     },
     "tmxparser": {
       "baseline": "2.1.0",
-      "port-version": 5
+      "port-version": 6
     },
     "toml11": {
       "baseline": "3.7.0",
@@ -6826,7 +6826,7 @@
     },
     "uchardet": {
       "baseline": "2021-09-03",
-      "port-version": 0
+      "port-version": 1
     },
     "umock-c": {
       "baseline": "2020-06-17",
@@ -6846,7 +6846,7 @@
     },
     "unittest-cpp": {
       "baseline": "2.0.0",
-      "port-version": 2
+      "port-version": 3
     },
     "unixodbc": {
       "baseline": "2.3.7",
@@ -6878,7 +6878,7 @@
     },
     "uriparser": {
       "baseline": "0.9.5",
-      "port-version": 0
+      "port-version": 1
     },
     "usbmuxd": {
       "baseline": "1.2.235",
@@ -6894,7 +6894,7 @@
     },
     "usrsctp": {
       "baseline": "0.9.5.0",
-      "port-version": 0
+      "port-version": 1
     },
     "utf8h": {
       "baseline": "2021-10-21",
@@ -7042,7 +7042,7 @@
     },
     "wampcc": {
       "baseline": "2019-09-04",
-      "port-version": 1
+      "port-version": 2
     },
     "wangle": {
       "baseline": "2021.06.14.00",
@@ -7150,7 +7150,7 @@
     },
     "xalan-c": {
       "baseline": "1.12",
-      "port-version": 0
+      "port-version": 1
     },
     "xaudio2redist": {
       "baseline": "1.2.8",
@@ -7162,7 +7162,7 @@
     },
     "xerces-c": {
       "baseline": "3.2.3",
-      "port-version": 2
+      "port-version": 3
     },
     "xeus": {
       "baseline": "0.24.3",
@@ -7174,7 +7174,7 @@
     },
     "xlnt": {
       "baseline": "1.5.0",
-      "port-version": 2
+      "port-version": 3
     },
     "xlsxio": {
       "baseline": "2021-03-24",
@@ -7214,7 +7214,7 @@
     },
     "xtensor-fftw": {
       "baseline": "2019-11-30",
-      "port-version": 1
+      "port-version": 2
     },
     "xtensor-io": {
       "baseline": "0.12.8",
@@ -7274,7 +7274,7 @@
     },
     "z3": {
       "baseline": "4.8.12",
-      "port-version": 0
+      "port-version": 1
     },
     "z85": {
       "baseline": "1.0",
@@ -7282,7 +7282,7 @@
     },
     "zeromq": {
       "baseline": "4.3.4",
-      "port-version": 1
+      "port-version": 2
     },
     "zfp": {
       "baseline": "0.5.5",
@@ -7334,11 +7334,11 @@
     },
     "zyre": {
       "baseline": "2019-07-07",
-      "port-version": 2
+      "port-version": 3
     },
     "zziplib": {
       "baseline": "0.13.71",
-      "port-version": 2
+      "port-version": 3
     }
   }
 }
diff --git a/versions/c-/capnproto.json b/versions/c-/capnproto.json
index 86c7d903bfae28..cf51d2af2b9fe6 100644
--- a/versions/c-/capnproto.json
+++ b/versions/c-/capnproto.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "129b6b745372d94f313df0989ad6a8980d7eaef7",
+      "version": "0.9.1",
+      "port-version": 1
+    },
     {
       "git-tree": "408771ff99776c9b25fd1121da589b720b7081c0",
       "version": "0.9.1",
diff --git a/versions/c-/ccd.json b/versions/c-/ccd.json
index 58ea1931eebc9c..9e383a9c1f34d3 100644
--- a/versions/c-/ccd.json
+++ b/versions/c-/ccd.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "8e6fc55567d05873ba6f78c3c33363a0fd9a1549",
+      "version-string": "2.1-4",
+      "port-version": 3
+    },
     {
       "git-tree": "9a10df3929e80702a9e8c110612b1ecd8c32bee9",
       "version-string": "2.1-4",
diff --git a/versions/c-/charls.json b/versions/c-/charls.json
index 02c4bd16ebac0a..e2f9510e0f455e 100644
--- a/versions/c-/charls.json
+++ b/versions/c-/charls.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "215d96df3e02eb0bfaae991586f4b64fd03c6cf2",
+      "version-string": "2.2.0",
+      "port-version": 2
+    },
     {
       "git-tree": "9e9e71b04ec39396631b28e98175e4c862cb154d",
       "version-string": "2.2.0",
diff --git a/versions/c-/check.json b/versions/c-/check.json
index e518c2ca13233f..c8884ded5ddf3e 100644
--- a/versions/c-/check.json
+++ b/versions/c-/check.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "f88273666d201fd843e12ba5d98d4ed8a10bd576",
+      "version-string": "0.15.2",
+      "port-version": 2
+    },
     {
       "git-tree": "889eae1f6ba0c9809e6718e6b15143b65dc6394f",
       "version-string": "0.15.2",
diff --git a/versions/c-/cjson.json b/versions/c-/cjson.json
index 8e9a453126e082..d8f68b8d1d1e6a 100644
--- a/versions/c-/cjson.json
+++ b/versions/c-/cjson.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "cb79fc0bdbc6754cf6c267d97e2825655929351b",
+      "version": "1.7.15",
+      "port-version": 1
+    },
     {
       "git-tree": "4a0cbb7810d1e9fda06ff7da2f8deb5249401267",
       "version": "1.7.15",
diff --git a/versions/c-/clblast.json b/versions/c-/clblast.json
index 74496d27ad5413..54b2e59d8640ff 100644
--- a/versions/c-/clblast.json
+++ b/versions/c-/clblast.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "3f2832bf6fb704f7e83a56c4a1b952287b2ceb49",
+      "version-string": "1.5.1",
+      "port-version": 2
+    },
     {
       "git-tree": "dcbde8693746ad43009a522210aed6794d6a0a58",
       "version-string": "1.5.1",
diff --git a/versions/c-/cli.json b/versions/c-/cli.json
index fa9ecd85596108..4da89892f00631 100644
--- a/versions/c-/cli.json
+++ b/versions/c-/cli.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "2c5da108b7e41bd3da82fe9b670a308d664b3a0e",
+      "version-semver": "2.0.0",
+      "port-version": 1
+    },
     {
       "git-tree": "52c57cc23f038ec2f73805b37f42639541036956",
       "version-semver": "2.0.0",
diff --git a/versions/c-/cmocka.json b/versions/c-/cmocka.json
index 7d3c2316dd2b97..c1b208e9c499a1 100644
--- a/versions/c-/cmocka.json
+++ b/versions/c-/cmocka.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "7b4b3515ae508de2f3eccb509948e8ed20eb877e",
+      "version-string": "2020-08-01",
+      "port-version": 1
+    },
     {
       "git-tree": "feb5623c3cdb647c97be873f2a625468305d8a5d",
       "version-string": "2020-08-01",
diff --git a/versions/c-/coin.json b/versions/c-/coin.json
index 4f7ef31b880d28..6a52852b545626 100644
--- a/versions/c-/coin.json
+++ b/versions/c-/coin.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "e5bf7296f7f3b3655c946280754bbbfbbbf9db2a",
+      "version-string": "4.0.0",
+      "port-version": 4
+    },
     {
       "git-tree": "e30ae46d4c197521650caf4ca0b407d8f50655e9",
       "version-string": "4.0.0",
diff --git a/versions/c-/collada-dom.json b/versions/c-/collada-dom.json
index daa821db21dc2c..05ec0b2a77fdf9 100644
--- a/versions/c-/collada-dom.json
+++ b/versions/c-/collada-dom.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "c33581459a51d5ef7cc436a8aebb9d330224a6f3",
+      "version-string": "2.5.0",
+      "port-version": 6
+    },
     {
       "git-tree": "478639eba0f0d87ac17cf3b28a072edaeed35ca5",
       "version-string": "2.5.0",
diff --git a/versions/c-/cpp-redis.json b/versions/c-/cpp-redis.json
index bfe2327b22d821..866315dc8b6759 100644
--- a/versions/c-/cpp-redis.json
+++ b/versions/c-/cpp-redis.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "5ba5958862c17ab2f3943b0134b2ad756ae73613",
+      "version-string": "4.3.1",
+      "port-version": 4
+    },
     {
       "git-tree": "f412f0e14f585bccfec1add71fd23ad9ea8f1f9f",
       "version-string": "4.3.1",
diff --git a/versions/c-/cppcodec.json b/versions/c-/cppcodec.json
index 8e5bae079ca74f..bfdbbaccc7159a 100644
--- a/versions/c-/cppcodec.json
+++ b/versions/c-/cppcodec.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "cb6b230ec592ba7bc54d85013007f501971f03fa",
+      "version-string": "0.2",
+      "port-version": 2
+    },
     {
       "git-tree": "9546342ff5d08d76abe6774215ae78778494eb55",
       "version-string": "0.2",
diff --git a/versions/c-/cpuid.json b/versions/c-/cpuid.json
index 955c93f17b1a71..658b88edbc9566 100644
--- a/versions/c-/cpuid.json
+++ b/versions/c-/cpuid.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "ad9738f7afc11f1fa0cea524f4d79dd6cc644e7c",
+      "version": "0.5.1",
+      "port-version": 2
+    },
     {
       "git-tree": "7b5a58587efff685ef5c166bcfba98542606f8ca",
       "version": "0.5.1",
diff --git a/versions/c-/curlpp.json b/versions/c-/curlpp.json
index f9f3404fba1693..5c17f5665f4a5e 100644
--- a/versions/c-/curlpp.json
+++ b/versions/c-/curlpp.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "c4802498d8b285cc5a3d3bcb574db0fe22267381",
+      "version-string": "2018-06-15",
+      "port-version": 5
+    },
     {
       "git-tree": "a764bda6f69b8e79e3f3734ceb420d4c814e9605",
       "version-string": "2018-06-15",
diff --git a/versions/d-/dlib.json b/versions/d-/dlib.json
index 9d7cd262cf8b8b..bc4a094ae6df12 100644
--- a/versions/d-/dlib.json
+++ b/versions/d-/dlib.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "971541b525e72e4ca19c0e20d7ddf7ce1cd2ee83",
+      "version": "19.21",
+      "port-version": 6
+    },
     {
       "git-tree": "58207e22ff2355358bee9fb607b03b6cab1030c6",
       "version": "19.21",
diff --git a/versions/e-/easyloggingpp.json b/versions/e-/easyloggingpp.json
index a9b91c65a578d1..ecd4b4cc411504 100644
--- a/versions/e-/easyloggingpp.json
+++ b/versions/e-/easyloggingpp.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "9cf908bc2aaf8f7ec50bf54b111aed600ca50282",
+      "version": "9.97.0",
+      "port-version": 1
+    },
     {
       "git-tree": "3978e3f41876c42b501eb4d246ee98dea886fa36",
       "version": "9.97.0",
diff --git a/versions/e-/edlib.json b/versions/e-/edlib.json
index 3ba91696c5020e..b78f396ff8175d 100644
--- a/versions/e-/edlib.json
+++ b/versions/e-/edlib.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "65bdc2cad90a351c2f7e0034f3f6acabe54f5e1c",
+      "version": "1.2.7",
+      "port-version": 1
+    },
     {
       "git-tree": "bbcb572fded319dcbb790d57132513c35be4a9fa",
       "version": "1.2.7",
diff --git a/versions/f-/fcl.json b/versions/f-/fcl.json
index d1d2324f4dc8f3..96a11d1afafe23 100644
--- a/versions/f-/fcl.json
+++ b/versions/f-/fcl.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "63fe0d8f64a95e4eef52c44f1e2a6e6240ca53fe",
+      "version": "0.7.0",
+      "port-version": 1
+    },
     {
       "git-tree": "b42fbc15486c71cabb2db25ccea7032240b87201",
       "version": "0.7.0",
diff --git a/versions/f-/fftw3.json b/versions/f-/fftw3.json
index 6a5b99192bf833..ecf57550990fb0 100644
--- a/versions/f-/fftw3.json
+++ b/versions/f-/fftw3.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "3cd11b90c63cec797697dc3235ae1e22e4a509fc",
+      "version": "3.3.10",
+      "port-version": 2
+    },
     {
       "git-tree": "ecf3602083e88dce78331f58590466c22664c584",
       "version": "3.3.10",
diff --git a/versions/f-/flann.json b/versions/f-/flann.json
index 21fc14ccfa3ba7..19f01d96b347cf 100644
--- a/versions/f-/flann.json
+++ b/versions/f-/flann.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "7677f18c73aa0d5216af138b2fba9bcea56e3f1b",
+      "version-date": "2019-04-07",
+      "port-version": 3
+    },
     {
       "git-tree": "960ba6bf0c3bb6c11b5a4a9bf413a21947927e08",
       "version-date": "2019-04-07",
diff --git a/versions/f-/flatbuffers.json b/versions/f-/flatbuffers.json
index 22bcf8a9f91537..f6805b6df702c0 100644
--- a/versions/f-/flatbuffers.json
+++ b/versions/f-/flatbuffers.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "65234b189b0389dfa2f89f58f33e56037a03b519",
+      "version-string": "2.0.0",
+      "port-version": 2
+    },
     {
       "git-tree": "8bfd2df96c7250148b6dee28e4cd5be2fa785b60",
       "version-string": "2.0.0",
diff --git a/versions/f-/fluidlite.json b/versions/f-/fluidlite.json
index 1598640a8bbbd9..aa2fb6e81f577d 100644
--- a/versions/f-/fluidlite.json
+++ b/versions/f-/fluidlite.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "6b725769d2d4d23c2bdc4adcc9ca9d02a4421868",
+      "version-string": "2020-08-27",
+      "port-version": 2
+    },
     {
       "git-tree": "b603d9cfa1d22dac6387ecff4bd32bc0ba8e5331",
       "version-string": "2020-08-27",
diff --git a/versions/f-/folly.json b/versions/f-/folly.json
index 8a92dabc1f4892..689c82a265ba9b 100644
--- a/versions/f-/folly.json
+++ b/versions/f-/folly.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "8bba15fddadde6b40f2984f6928aa24a50aa2b47",
+      "version-string": "2021.06.14.00",
+      "port-version": 3
+    },
     {
       "git-tree": "747fc5abd957e03e89acad08f28925927fb5f33b",
       "version-string": "2021.06.14.00",
diff --git a/versions/f-/freeglut.json b/versions/f-/freeglut.json
index 24bc7f74479cb0..c2006f58908b6f 100644
--- a/versions/f-/freeglut.json
+++ b/versions/f-/freeglut.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "bf1c06d0a07b6bc80a63c3825a4d136f5307a2f4",
+      "version-string": "3.2.1",
+      "port-version": 7
+    },
     {
       "git-tree": "a7907c76300594175b45a5fa05bacee2b91c9a65",
       "version-string": "3.2.1",
diff --git a/versions/f-/freeopcua.json b/versions/f-/freeopcua.json
index 35378c0eaeeb93..1ee029185b51db 100644
--- a/versions/f-/freeopcua.json
+++ b/versions/f-/freeopcua.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "15fe1dbb4b4b3283072825b22ef29acdf5835950",
+      "version-string": "20190125",
+      "port-version": 5
+    },
     {
       "git-tree": "ffcfcd9ddd2551f8ca82752def0ff7a30b6bb2dc",
       "version-string": "20190125",
diff --git a/versions/f-/functions-framework-cpp.json b/versions/f-/functions-framework-cpp.json
index 1ab6c47b7bef93..b275187ef7ec8c 100644
--- a/versions/f-/functions-framework-cpp.json
+++ b/versions/f-/functions-framework-cpp.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "45f93916767e8d79db63cc94b8274f98ee1bef1c",
+      "version": "1.0.0",
+      "port-version": 1
+    },
     {
       "git-tree": "ea5cc9295e63419251720c34b2bbd02d710333c0",
       "version": "1.0.0",
diff --git a/versions/g-/geogram.json b/versions/g-/geogram.json
index 47abac7be8190e..0c7d105d61b8f2 100644
--- a/versions/g-/geogram.json
+++ b/versions/g-/geogram.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "d6d9b9c3652ebbfd846a225ba06a1867e0a6ba25",
+      "version": "1.7.6",
+      "port-version": 1
+    },
     {
       "git-tree": "3a40b9eb7d73644d89c9987fc0b8da98c7ae2a94",
       "version": "1.7.6",
diff --git a/versions/g-/geographiclib.json b/versions/g-/geographiclib.json
index 8fd320c34ee033..120c03144d7ec0 100644
--- a/versions/g-/geographiclib.json
+++ b/versions/g-/geographiclib.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "7ffcb729874bc667cba2368b92d64dc04effb73c",
+      "version": "1.52",
+      "port-version": 1
+    },
     {
       "git-tree": "b80d69df97ec60b98b202270c5357b72729fbc90",
       "version": "1.52",
diff --git a/versions/g-/getdns.json b/versions/g-/getdns.json
index 66e1f854141122..91db8f5628bb8a 100644
--- a/versions/g-/getdns.json
+++ b/versions/g-/getdns.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "d6c0d2d8c997256eff5049eb3fa3447a5387d2f9",
+      "version-string": "1.6.0",
+      "port-version": 2
+    },
     {
       "git-tree": "b01f8f51c6a395b7a7d44f772bec78a0445e51d6",
       "version-string": "1.6.0",
diff --git a/versions/g-/gflags.json b/versions/g-/gflags.json
index e1530e30903bde..e20ff41292fc09 100644
--- a/versions/g-/gflags.json
+++ b/versions/g-/gflags.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "7c1fe35b0a7e9b5b9f58b16c6cc08caa108fb945",
+      "version-string": "2.2.2",
+      "port-version": 5
+    },
     {
       "git-tree": "16da9eec785be4c0d0ad3e32cc3b39698d0611b1",
       "version-string": "2.2.2",
diff --git a/versions/g-/graphite2.json b/versions/g-/graphite2.json
index 3d577c07c594da..8d6de06834a4b2 100644
--- a/versions/g-/graphite2.json
+++ b/versions/g-/graphite2.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "a2078beaafe054dd4f6bd162af48de28f3f9194c",
+      "version-string": "1.3.14",
+      "port-version": 2
+    },
     {
       "git-tree": "544016171b9bf0c28449d96cfa9ccebdb3c1aecb",
       "version-string": "1.3.14",
diff --git a/versions/g-/graphqlparser.json b/versions/g-/graphqlparser.json
index e1240fb532907e..d08ff94d1b12b8 100644
--- a/versions/g-/graphqlparser.json
+++ b/versions/g-/graphqlparser.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "654424cc8d0176569961a4c128fef87478375296",
+      "version-string": "0.7.0",
+      "port-version": 3
+    },
     {
       "git-tree": "1bddecee3cfbfe8826912f0b5de6bdf0b4f1a880",
       "version-string": "0.7.0",
diff --git a/versions/g-/graphviz.json b/versions/g-/graphviz.json
index f1a81d1cbfb5c0..32fd45fe604ccc 100644
--- a/versions/g-/graphviz.json
+++ b/versions/g-/graphviz.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "61316edc3deb64749cf84f70f5b0dbd669c06a9e",
+      "version-semver": "2.49.1",
+      "port-version": 1
+    },
     {
       "git-tree": "3d90393fc2bdb3a481e1a371fbbb8e816d0317b6",
       "version-semver": "2.49.1",
diff --git a/versions/h-/hiredis.json b/versions/h-/hiredis.json
index 92fd218b8065a0..fb3ee3693dbed9 100644
--- a/versions/h-/hiredis.json
+++ b/versions/h-/hiredis.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "0c7e16c5c3a9f612e1b46f96be41389b8ba11e6a",
+      "version": "1.0.2",
+      "port-version": 1
+    },
     {
       "git-tree": "934af68bcc045c77d7b46cef46b6a8cdf97ce2b8",
       "version": "1.0.2",
diff --git a/versions/h-/hyperscan.json b/versions/h-/hyperscan.json
index f8b74cab063a56..7003a010247b76 100644
--- a/versions/h-/hyperscan.json
+++ b/versions/h-/hyperscan.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "14beb85ac3a741f5504afa923832eb651795f530",
+      "version-string": "5.3.0",
+      "port-version": 3
+    },
     {
       "git-tree": "442b4a5b4350665bc7d9fb3b0f734f1fa088973a",
       "version-string": "5.3.0",
diff --git a/versions/i-/igraph.json b/versions/i-/igraph.json
index fdcdf644dd8e9f..f8db7cf33b15fe 100644
--- a/versions/i-/igraph.json
+++ b/versions/i-/igraph.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "9814112513cedc4fdc1d0eaf8f633278c792decb",
+      "version": "0.9.4",
+      "port-version": 1
+    },
     {
       "git-tree": "e03d26f1f8688463fda90a1ace2dc38a1045954d",
       "version": "0.9.4",
diff --git a/versions/i-/iniparser.json b/versions/i-/iniparser.json
index 3bd03f7bb2256f..4e334c1bfb4f72 100644
--- a/versions/i-/iniparser.json
+++ b/versions/i-/iniparser.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "4c89c4448c92e7d793775802d4d6cba832af7457",
+      "version-string": "2020-04-06",
+      "port-version": 2
+    },
     {
       "git-tree": "203982e2f00de4e77024c34486cae13d34c15779",
       "version-string": "2020-04-06",
diff --git a/versions/i-/itpp.json b/versions/i-/itpp.json
index 488d58ee064a9c..9c7418be64bd05 100644
--- a/versions/i-/itpp.json
+++ b/versions/i-/itpp.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "be87bf8b58b5f6b0fb3f19dfc14acf24114332d0",
+      "version-semver": "4.3.1",
+      "port-version": 8
+    },
     {
       "git-tree": "e10390b026b73c352e32bdf11ea58230a7e51d53",
       "version-semver": "4.3.1",
diff --git a/versions/j-/jansson.json b/versions/j-/jansson.json
index f01eec560765ae..6ee4877460ec93 100644
--- a/versions/j-/jansson.json
+++ b/versions/j-/jansson.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "f63fad0d7e1e2a98826543c3b1f671c34b104a72",
+      "version-string": "2.13.1",
+      "port-version": 2
+    },
     {
       "git-tree": "e03158776f244589d6af861b4ceefabd4cd9fd12",
       "version-string": "2.13.1",
diff --git a/versions/j-/json11.json b/versions/j-/json11.json
index e745d3e6d4416e..688a24f272c3cf 100644
--- a/versions/j-/json11.json
+++ b/versions/j-/json11.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "b99e54cd236396200e19e414a7375d0463d5ba5a",
+      "version-string": "2017-06-20",
+      "port-version": 4
+    },
     {
       "git-tree": "d1c9cec8f84522bd1bb53aae81708000ef8952de",
       "version-string": "2017-06-20",
diff --git a/versions/l-/libbson.json b/versions/l-/libbson.json
index f9e63d686572ab..34edeaa0f555d8 100644
--- a/versions/l-/libbson.json
+++ b/versions/l-/libbson.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "6ad46cf0f2a10843d03cfd2e0388527561f9e2f0",
+      "version": "1.17.6",
+      "port-version": 1
+    },
     {
       "git-tree": "e2f9da5cc55e652deed81d0feb7aa71be2a1fdef",
       "version": "1.17.6",
diff --git a/versions/l-/libcerf.json b/versions/l-/libcerf.json
index 254b6011a446b2..7a35564988a5ec 100644
--- a/versions/l-/libcerf.json
+++ b/versions/l-/libcerf.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "e4bb4a4b841e96215ccc856fa1b8acc56270a1e4",
+      "version-string": "1.13",
+      "port-version": 2
+    },
     {
       "git-tree": "c9e514fd4a455016bc077fb0af7703a947868273",
       "version-string": "1.13",
diff --git a/versions/l-/libconfuse.json b/versions/l-/libconfuse.json
index d0f3f205f5056f..5d810f7bdbdd98 100644
--- a/versions/l-/libconfuse.json
+++ b/versions/l-/libconfuse.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "0af146d2f574294e6d2da2492203ebd1ddf5e2eb",
+      "version-string": "2019-07-14",
+      "port-version": 2
+    },
     {
       "git-tree": "aacb676c2698728d17cb0540a3dd4f538bcc2d66",
       "version-string": "2019-07-14",
diff --git a/versions/l-/libevent.json b/versions/l-/libevent.json
index 8b985467980002..46161cb6eb17cd 100644
--- a/versions/l-/libevent.json
+++ b/versions/l-/libevent.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "f0ac053f302fc802ef35f3349ad4af562a5a806d",
+      "version-string": "2.1.12",
+      "port-version": 3
+    },
     {
       "git-tree": "16a3ac34416a0b208f97f9a0afdeecdcc60699e1",
       "version-string": "2.1.12",
diff --git a/versions/l-/libevhtp.json b/versions/l-/libevhtp.json
index 3324e7fd60607f..a28699da2dccb8 100644
--- a/versions/l-/libevhtp.json
+++ b/versions/l-/libevhtp.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "c28b6abc864cbfff6270358471bf9e97fd063710",
+      "version-string": "1.2.18",
+      "port-version": 2
+    },
     {
       "git-tree": "98227c0bbd789df044f349480c00378c5c56984c",
       "version-string": "1.2.18",
diff --git a/versions/l-/libfort.json b/versions/l-/libfort.json
index 319568ce4b8dc5..a4111418ede913 100644
--- a/versions/l-/libfort.json
+++ b/versions/l-/libfort.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "6b7925f1a567ce07e29977e40eb17f2a520922c8",
+      "version-semver": "0.4.2",
+      "port-version": 1
+    },
     {
       "git-tree": "3323e3e7b75556050db8a8ff3adeb38c3b7bfb98",
       "version-semver": "0.4.2",
diff --git a/versions/l-/libfreenect2.json b/versions/l-/libfreenect2.json
index f0c0ee3b1ec8cc..51d96893507f44 100644
--- a/versions/l-/libfreenect2.json
+++ b/versions/l-/libfreenect2.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "cdedefe776984f442e8af70b0e0738d12d56fafa",
+      "version-string": "0.2.0",
+      "port-version": 7
+    },
     {
       "git-tree": "00c2b86114dcda5bd91f93d83e696b85148037a0",
       "version-string": "0.2.0",
diff --git a/versions/l-/libgd.json b/versions/l-/libgd.json
index 1a4733a9317849..9b02569ba0327b 100644
--- a/versions/l-/libgd.json
+++ b/versions/l-/libgd.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "998c59c287a0d8a172944f46fbfce71c8967394f",
+      "version-semver": "2.3.2",
+      "port-version": 1
+    },
     {
       "git-tree": "e1e99522d139bf2f72dc030d433117e8f430885f",
       "version-semver": "2.3.2",
diff --git a/versions/l-/libgta.json b/versions/l-/libgta.json
index 6db93eda974c9a..cf86d9ae5cae9e 100644
--- a/versions/l-/libgta.json
+++ b/versions/l-/libgta.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "18ddcdbec1183e609dbb8a76bddbadd4b3ee6d72",
+      "version-string": "1.0.8",
+      "port-version": 3
+    },
     {
       "git-tree": "876f40188d1fb98aa9e19123118134f2a58925da",
       "version-string": "1.0.8",
diff --git a/versions/l-/libkeyfinder.json b/versions/l-/libkeyfinder.json
index 3ec54157c557a0..04281ace1e201b 100644
--- a/versions/l-/libkeyfinder.json
+++ b/versions/l-/libkeyfinder.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "f4b04b3607199759e373764303378ab76ef9c158",
+      "version-string": "2.2.5",
+      "port-version": 1
+    },
     {
       "git-tree": "d2f8022bca9bc70894c26b7d73437eadfa9b9bca",
       "version-string": "2.2.5",
diff --git a/versions/l-/libkml.json b/versions/l-/libkml.json
index 3654170b971468..8b24a120d2d2bf 100644
--- a/versions/l-/libkml.json
+++ b/versions/l-/libkml.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "1ce9dd050baf9ae42da2bb0c6d0feae1241b6e01",
+      "version-string": "1.3.0",
+      "port-version": 8
+    },
     {
       "git-tree": "c2647d8b06542a475e0de99aedc3ce939a10b35d",
       "version-string": "1.3.0",
diff --git a/versions/l-/liblemon.json b/versions/l-/liblemon.json
index 9e3f9f8e5406f1..054fcfe0c94ecd 100644
--- a/versions/l-/liblemon.json
+++ b/versions/l-/liblemon.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "b099f8cb08e44ae21fb5d019369cd4c598e305eb",
+      "version-string": "2019-06-13",
+      "port-version": 3
+    },
     {
       "git-tree": "fbcfa0caff95b07142e28cd453690c26d62bc025",
       "version-string": "2019-06-13",
diff --git a/versions/l-/liblo.json b/versions/l-/liblo.json
index d7bfa72e19441c..2088b8489c3550 100644
--- a/versions/l-/liblo.json
+++ b/versions/l-/liblo.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "00837a43b20b0ccf863f3574b34714f8f7d3bd37",
+      "version-string": "0.31",
+      "port-version": 2
+    },
     {
       "git-tree": "c4df5a746fe8bc045b2287c0b6122717757a30a3",
       "version-string": "0.31",
diff --git a/versions/l-/libmikmod.json b/versions/l-/libmikmod.json
index d096d0cb0e7383..a1735fbbef8965 100644
--- a/versions/l-/libmikmod.json
+++ b/versions/l-/libmikmod.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "ed94a83a674fb90d5884515fc763840df2ec0375",
+      "version-string": "3.3.11.1",
+      "port-version": 10
+    },
     {
       "git-tree": "e0dd535be8f9f4f477cc21a745724b2c42f93d01",
       "version-string": "3.3.11.1",
diff --git a/versions/l-/libmt32emu.json b/versions/l-/libmt32emu.json
index dc8386caeb3d83..5fd4ad5af52c40 100644
--- a/versions/l-/libmt32emu.json
+++ b/versions/l-/libmt32emu.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "da8f12396b75ff5163acd190bf7f79a3d0b5098a",
+      "version": "2.5.3",
+      "port-version": 1
+    },
     {
       "git-tree": "a1893148ecacd02e10cb14c90539f23687b597b6",
       "version": "2.5.3",
diff --git a/versions/l-/libpqxx.json b/versions/l-/libpqxx.json
index 37d3671b44c72c..8166fc426ec7f3 100644
--- a/versions/l-/libpqxx.json
+++ b/versions/l-/libpqxx.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "5c4df2807e229629d04aecc0a66f11219d4dcbcd",
+      "version-semver": "7.6.0",
+      "port-version": 2
+    },
     {
       "git-tree": "37cce5f0124f6f870793a650937ca978c1fc4750",
       "version-semver": "7.6.0",
diff --git a/versions/l-/libproxy.json b/versions/l-/libproxy.json
index 7dbd18fd981531..034b48d44842b5 100644
--- a/versions/l-/libproxy.json
+++ b/versions/l-/libproxy.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "159dadd3ff9a4ba3ce1fec74a933980aa895ee02",
+      "version": "0.4.17",
+      "port-version": 1
+    },
     {
       "git-tree": "ab650ac3327ba4cd214ca5de79a626574594c63f",
       "version": "0.4.17",
diff --git a/versions/l-/libqrencode.json b/versions/l-/libqrencode.json
index e078d4768f7a17..1bcd7daf6467e1 100644
--- a/versions/l-/libqrencode.json
+++ b/versions/l-/libqrencode.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "52b904615b0dcea800292c9eaf2f06da32f2160d",
+      "version-semver": "4.1.1",
+      "port-version": 1
+    },
     {
       "git-tree": "89b4597328eb8e7399b0cdaf1342c0abc74771c7",
       "version-semver": "4.1.1",
diff --git a/versions/l-/librdkafka.json b/versions/l-/librdkafka.json
index 2dfb0785b2287c..bfca292f7a2a64 100644
--- a/versions/l-/librdkafka.json
+++ b/versions/l-/librdkafka.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "3d418b5510b8ed058f73035681f3e1de5aa94c28",
+      "version-string": "1.7.0",
+      "port-version": 2
+    },
     {
       "git-tree": "7a309365a3b06309b47543f15b421ecfe4421d6a",
       "version-string": "1.7.0",
diff --git a/versions/l-/libsbml.json b/versions/l-/libsbml.json
index 7faeb17e46b5f0..9dd6c3d51314de 100644
--- a/versions/l-/libsbml.json
+++ b/versions/l-/libsbml.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "12ec3d5ff69d3e8b960c03b9b0ae8127663227f5",
+      "version": "5.19.0",
+      "port-version": 1
+    },
     {
       "git-tree": "6b31fe78dcb93a9935119d5b9bcefbb1f3950d6a",
       "version": "5.19.0",
diff --git a/versions/l-/libtins.json b/versions/l-/libtins.json
index 431224b36190f9..4089a88cfc5e47 100644
--- a/versions/l-/libtins.json
+++ b/versions/l-/libtins.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "b853d9ee6a83bba8f0d0b6e568b664b9729aadea",
+      "version-string": "4.3",
+      "port-version": 2
+    },
     {
       "git-tree": "bd15852b2fb7471ef3eb99bb1fc827627f9643f8",
       "version-string": "4.3",
diff --git a/versions/l-/libtorrent.json b/versions/l-/libtorrent.json
index d1863361dbe367..919372b2ee67ac 100644
--- a/versions/l-/libtorrent.json
+++ b/versions/l-/libtorrent.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "8ee811432c2056d11d9f2d346142c2c1be44a328",
+      "version": "1.2.14",
+      "port-version": 1
+    },
     {
       "git-tree": "39f5e5060bcc3eafc3c4be164289aaad15027b1d",
       "version": "1.2.14",
diff --git a/versions/l-/libwebsockets.json b/versions/l-/libwebsockets.json
index 54c474063fd05e..e78d116b4012b9 100644
--- a/versions/l-/libwebsockets.json
+++ b/versions/l-/libwebsockets.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "579de2367eb835f65d3c480b02af4ee72b6b4f24",
+      "version-semver": "4.2.2",
+      "port-version": 3
+    },
     {
       "git-tree": "ea372a08d75d1a3a7c37a99b1daf9e85ba017ccf",
       "version-semver": "4.2.2",
diff --git a/versions/l-/libxlsxwriter.json b/versions/l-/libxlsxwriter.json
index 6403a027698b25..c68eb249ae2a50 100644
--- a/versions/l-/libxlsxwriter.json
+++ b/versions/l-/libxlsxwriter.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "13265cc8f10d1cd14a723dfda351ac6ad6625e60",
+      "version-semver": "1.1.3",
+      "port-version": 1
+    },
     {
       "git-tree": "6355a7b3fb476841c51ccde98e671ca3b181b000",
       "version-semver": "1.1.3",
diff --git a/versions/m-/mongo-c-driver.json b/versions/m-/mongo-c-driver.json
index 644ab6b2429ff1..dd0a4566f94cd1 100644
--- a/versions/m-/mongo-c-driver.json
+++ b/versions/m-/mongo-c-driver.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "1885ed4c6d71d255e97ef46bc1dd3b5353686845",
+      "version": "1.17.6",
+      "port-version": 1
+    },
     {
       "git-tree": "a9982d4176e1480433444ecace3b389bb8ca8570",
       "version": "1.17.6",
diff --git a/versions/m-/mosquitto.json b/versions/m-/mosquitto.json
index 0fe4043f198df9..d107dafb3ba64d 100644
--- a/versions/m-/mosquitto.json
+++ b/versions/m-/mosquitto.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "a94c1fb81601520c8a9766865574b5e132e1c848",
+      "version": "2.0.12",
+      "port-version": 2
+    },
     {
       "git-tree": "ef8ae230660456d039888e201ea521f58caf0951",
       "version": "2.0.12",
diff --git a/versions/m-/msgpack.json b/versions/m-/msgpack.json
index d21cc8c3e55921..4c220e85a79dbb 100644
--- a/versions/m-/msgpack.json
+++ b/versions/m-/msgpack.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "33927863a8eae2ea7c816389e7ef3dbdcc00382a",
+      "version-string": "3.3.0",
+      "port-version": 2
+    },
     {
       "git-tree": "ed079e3006a28fcef3dc95c108e03d20027de40c",
       "version-string": "3.3.0",
diff --git a/versions/m-/msgpack11.json b/versions/m-/msgpack11.json
index ae8c3847cdd489..d7390a5071c070 100644
--- a/versions/m-/msgpack11.json
+++ b/versions/m-/msgpack11.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "628d7986a87b3b326796bcacd492aabe846c4ea9",
+      "version": "0.0.10",
+      "port-version": 3
+    },
     {
       "git-tree": "7d1352df08016b8ba7b2de4fa027e4b37825bb8e",
       "version": "0.0.10",
diff --git a/versions/m-/munit.json b/versions/m-/munit.json
index 05267b5019ddf2..36ea7690b0310b 100644
--- a/versions/m-/munit.json
+++ b/versions/m-/munit.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "f6489068c02b6a87d45ab01592ef733e22904bd7",
+      "version-string": "2019-04-06",
+      "port-version": 3
+    },
     {
       "git-tree": "e73f59b95da8f7045c775a0fc263c5d2da26b320",
       "version-string": "2019-04-06",
diff --git a/versions/m-/muparser.json b/versions/m-/muparser.json
index 53f8dfd72541b8..481fd9ef30f80e 100644
--- a/versions/m-/muparser.json
+++ b/versions/m-/muparser.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "ffef8786866359a02e3e50d62bcda523967fddce",
+      "version-string": "2.3.2",
+      "port-version": 2
+    },
     {
       "git-tree": "60a779cc21e94cf9ef8a7df52a0177d79f298e2d",
       "version-string": "2.3.2",
diff --git a/versions/n-/nanoflann.json b/versions/n-/nanoflann.json
index a62b9a89779d93..cda02d8a58aaaa 100644
--- a/versions/n-/nanoflann.json
+++ b/versions/n-/nanoflann.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "481ec544fb82ec73f6f0e01d1333f412d3e82d2d",
+      "version": "1.3.2",
+      "port-version": 1
+    },
     {
       "git-tree": "d9c4ef40eda67ef94cca10e5a50ac679ac0a34ad",
       "version": "1.3.2",
diff --git a/versions/n-/nanomsg.json b/versions/n-/nanomsg.json
index 6737ed193034e0..efb1e3ff83f606 100644
--- a/versions/n-/nanomsg.json
+++ b/versions/n-/nanomsg.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "ffe814aa129dfc6a1cdfc5d38e7a441d2b2fc47b",
+      "version-string": "1.1.5",
+      "port-version": 4
+    },
     {
       "git-tree": "6c34a4dcd9b1c045f989cc67c0dad5ac594696d4",
       "version-string": "1.1.5",
diff --git a/versions/n-/nlopt.json b/versions/n-/nlopt.json
index e6bc5fb323ec3b..e4eed6a6b5c235 100644
--- a/versions/n-/nlopt.json
+++ b/versions/n-/nlopt.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "8307558e59725a365e7139c8e5fd371e5d3481e4",
+      "version-string": "2.7.0",
+      "port-version": 1
+    },
     {
       "git-tree": "7702c2f9e4c4ef687a026196c6a707c390e676a5",
       "version-string": "2.7.0",
diff --git a/versions/o-/octomap.json b/versions/o-/octomap.json
index 0e046deb987047..59c664cca449b2 100644
--- a/versions/o-/octomap.json
+++ b/versions/o-/octomap.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "7b192c5e8bc138bffe383afcadf8bc91a0130d58",
+      "version-string": "1.9.5",
+      "port-version": 2
+    },
     {
       "git-tree": "603822afeb335c9005956f3791668fb4a449d7b4",
       "version-string": "1.9.5",
diff --git a/versions/o-/ode.json b/versions/o-/ode.json
index aecb5f5dbe5b92..696381184d9de7 100644
--- a/versions/o-/ode.json
+++ b/versions/o-/ode.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "6a0ed0d341666ec960fd7596bb2ac66737604cd3",
+      "version-string": "0.16.1",
+      "port-version": 2
+    },
     {
       "git-tree": "1b4c24af36c99cf547f0a2026062a91d1d78f90a",
       "version-string": "0.16.1",
diff --git a/versions/o-/ois.json b/versions/o-/ois.json
index 620afbf81ea1e3..bbefaa8d60a12b 100644
--- a/versions/o-/ois.json
+++ b/versions/o-/ois.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "0d8ca34b4a48f37cf731b920ab96995bcc81a8f4",
+      "version-string": "1.5",
+      "port-version": 3
+    },
     {
       "git-tree": "def78425a0a4688d94604ff68965f64a024d1aeb",
       "version-string": "1.5",
diff --git a/versions/o-/oniguruma.json b/versions/o-/oniguruma.json
index 36bf67599a5429..32d80a4245e00e 100644
--- a/versions/o-/oniguruma.json
+++ b/versions/o-/oniguruma.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "107a3e6619a149a76b52ef9c9f4dbb1b7343a456",
+      "version": "6.9.7.1",
+      "port-version": 1
+    },
     {
       "git-tree": "9f6ae35330e50d5e767e67141441506c26a832fb",
       "version": "6.9.7.1",
diff --git a/versions/o-/opencc.json b/versions/o-/opencc.json
index 2dff67ec4d53e1..f4b6768bfa4a18 100644
--- a/versions/o-/opencc.json
+++ b/versions/o-/opencc.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "b7f1756b470f31ae2da4a2d65eb5c409d4798b8e",
+      "version-string": "2020-04-26",
+      "port-version": 9
+    },
     {
       "git-tree": "4236b23738ad59b661253bf3a449355d838cb7dc",
       "version-string": "2020-04-26",
diff --git a/versions/o-/openimageio.json b/versions/o-/openimageio.json
index 1b67c28e9e71ad..bfe2c174b14e2f 100644
--- a/versions/o-/openimageio.json
+++ b/versions/o-/openimageio.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "8b1ce552e00d88857ad35695435b353caf9ad4c2",
+      "version": "2.3.7.2",
+      "port-version": 4
+    },
     {
       "git-tree": "a7643bd1ea5b962a2b98a9c6c991a15021fab17d",
       "version": "2.3.7.2",
diff --git a/versions/o-/orocos-kdl.json b/versions/o-/orocos-kdl.json
index 1dec315b2aea4c..7510517179491c 100644
--- a/versions/o-/orocos-kdl.json
+++ b/versions/o-/orocos-kdl.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "265346d96786cba36fc5ddc4e2a734dfa755746d",
+      "version": "1.4",
+      "port-version": 5
+    },
     {
       "git-tree": "c882240643c0748d609a52adec04abd93ffc120e",
       "version": "1.4",
diff --git a/versions/o-/osg.json b/versions/o-/osg.json
index 2100c623efcc74..6ca076e4782efa 100644
--- a/versions/o-/osg.json
+++ b/versions/o-/osg.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "233201eee3ebfaaac75ba9696d12209e9a1fbc32",
+      "version-string": "3.6.5",
+      "port-version": 10
+    },
     {
       "git-tree": "786c1469d92ebae55703e2be690bd72083a800a3",
       "version-string": "3.6.5",
diff --git a/versions/p-/p-ranav-csv2.json b/versions/p-/p-ranav-csv2.json
index 6a6708f8ab96f0..722000a3731ecf 100644
--- a/versions/p-/p-ranav-csv2.json
+++ b/versions/p-/p-ranav-csv2.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "0f944640e81f4ed10db72f2708212b475c3e83b2",
+      "version-string": "2020-12-14",
+      "port-version": 2
+    },
     {
       "git-tree": "64496087c54cb9b4fec4b566cbfc7f6182a753a2",
       "version-string": "2020-12-14",
diff --git a/versions/p-/pcl.json b/versions/p-/pcl.json
index 59e677fd34ab71..f149a9d52b07df 100644
--- a/versions/p-/pcl.json
+++ b/versions/p-/pcl.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "32f16f4b317bc068cc45259ca36d23ebd16a3099",
+      "version": "1.11.1",
+      "port-version": 5
+    },
     {
       "git-tree": "7d8ce8bc561fa2b928b9a5075c4f8659c86b5906",
       "version": "1.11.1",
diff --git a/versions/p-/plplot.json b/versions/p-/plplot.json
index cce975d7432edf..ebcf8ac2b8d828 100644
--- a/versions/p-/plplot.json
+++ b/versions/p-/plplot.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "ad6d85b2cc702beabe146047209cb580174ceea8",
+      "version-string": "5.13.0",
+      "port-version": 11
+    },
     {
       "git-tree": "d3b92bbff064890556b4d4f759d2cea20041e79d",
       "version-string": "5.13.0",
diff --git a/versions/p-/polyclipping.json b/versions/p-/polyclipping.json
index 178f2f0d4f4954..4c9bf56ae56bb3 100644
--- a/versions/p-/polyclipping.json
+++ b/versions/p-/polyclipping.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "6701622648b7f5ab04e6552b312d1cd8543de99c",
+      "version-string": "6.4.2",
+      "port-version": 9
+    },
     {
       "git-tree": "715616bd21d5d75a9101ac86da0188263b9774c9",
       "version-string": "6.4.2",
diff --git a/versions/p-/ponder.json b/versions/p-/ponder.json
index 117c9967dc4cae..6dab8444b76c64 100644
--- a/versions/p-/ponder.json
+++ b/versions/p-/ponder.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "84acf8367d19d188309207790cc07c149e0464f3",
+      "version-string": "3.0.0",
+      "port-version": 3
+    },
     {
       "git-tree": "07af14a9b06787eef8901b771c95aa0633f50c07",
       "version-string": "3.0.0",
diff --git a/versions/p-/poppler.json b/versions/p-/poppler.json
index 4ee0511e4a0e8d..0b609a36c975af 100644
--- a/versions/p-/poppler.json
+++ b/versions/p-/poppler.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "3f15f5c09cc977692e0c081d39e7e85f2229efe1",
+      "version": "20.12.1",
+      "port-version": 6
+    },
     {
       "git-tree": "a864cfe9349a7922e6ce0d44a28f6845a40597e0",
       "version": "20.12.1",
diff --git a/versions/p-/portaudio.json b/versions/p-/portaudio.json
index e0640fc378eb5d..a44336cb8ba62e 100644
--- a/versions/p-/portaudio.json
+++ b/versions/p-/portaudio.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "b090c514cbfce25b342a884efc937ede432df55a",
+      "version": "19.7",
+      "port-version": 2
+    },
     {
       "git-tree": "d6254fa08fb9fd57617978cdc98a3890bc1205d1",
       "version": "19.7",
diff --git a/versions/p-/ppconsul.json b/versions/p-/ppconsul.json
index 505d18a0dceed5..a9592c3a53cf68 100644
--- a/versions/p-/ppconsul.json
+++ b/versions/p-/ppconsul.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "5f08036342cef58a0f47fc01fe02bdf5c8e5d09c",
+      "version-string": "0.5",
+      "port-version": 3
+    },
     {
       "git-tree": "8c7383164dcbe93141eb683eeeb362381ebbd4cd",
       "version-string": "0.5",
diff --git a/versions/r-/raylib.json b/versions/r-/raylib.json
index 493c25123d1f61..6b130f7906d886 100644
--- a/versions/r-/raylib.json
+++ b/versions/r-/raylib.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "9820d99ae1c7e23e42ee1bb3372ecee0de42c2bc",
+      "version-semver": "3.7.0",
+      "port-version": 2
+    },
     {
       "git-tree": "e27352fbab2a4e815a478265032a4faa60d34060",
       "version-semver": "3.7.0",
diff --git a/versions/r-/rbdl.json b/versions/r-/rbdl.json
index 832ea5af49ba5c..cc9bc2e16bce36 100644
--- a/versions/r-/rbdl.json
+++ b/versions/r-/rbdl.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "48b44c8cf3286f0ce9c87b95e126634997d03137",
+      "version": "2.6.0",
+      "port-version": 2
+    },
     {
       "git-tree": "44606d1a4e33112ca45274e823041ad877e62623",
       "version": "2.6.0",
diff --git a/versions/r-/realsense2.json b/versions/r-/realsense2.json
index f0b1fa8703fdc8..e8a75384e86625 100644
--- a/versions/r-/realsense2.json
+++ b/versions/r-/realsense2.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "b7c65d664a018a4d4922c844e8cbcbb05ba597eb",
+      "version": "2.49.0",
+      "port-version": 1
+    },
     {
       "git-tree": "196cd1829bb74acd275abdcbc5344238b5414661",
       "version": "2.49.0",
diff --git a/versions/r-/redis-plus-plus.json b/versions/r-/redis-plus-plus.json
index 02919e2fd4cfbf..76887d28a2ad0d 100644
--- a/versions/r-/redis-plus-plus.json
+++ b/versions/r-/redis-plus-plus.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "4da3b8dd26c05426ae7d2a844f854423e9d0624d",
+      "version-semver": "1.3.1",
+      "port-version": 1
+    },
     {
       "git-tree": "a8bbde067a459c4fff18d7c63eb682487f1955e5",
       "version-semver": "1.3.1",
diff --git a/versions/r-/rpclib.json b/versions/r-/rpclib.json
index a78ca9521f3215..6bf33a47b202d3 100644
--- a/versions/r-/rpclib.json
+++ b/versions/r-/rpclib.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "b19a21c8e68b3e689495b961664f63450ffdd35d",
+      "version-semver": "2.3.0",
+      "port-version": 1
+    },
     {
       "git-tree": "8479e995436633dafc97a4dd951beff832bc3367",
       "version-semver": "2.3.0",
diff --git a/versions/r-/rtaudio.json b/versions/r-/rtaudio.json
index 9f3a61f0033ee0..41ce62151682ba 100644
--- a/versions/r-/rtaudio.json
+++ b/versions/r-/rtaudio.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "89b766b5d1b97a4e306dd358db18a2a5d0505824",
+      "version-date": "2021-08-15",
+      "port-version": 1
+    },
     {
       "git-tree": "551c1a7847652aa574e0af5af18d00b6e55fd034",
       "version-date": "2021-08-15",
diff --git a/versions/s-/sais.json b/versions/s-/sais.json
index 4a74c9313f4c25..36b41e722fcc12 100644
--- a/versions/s-/sais.json
+++ b/versions/s-/sais.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "b4fb1d4e7743c5f80f03e1b8fe4f1863b9a12e7d",
+      "version-string": "2.4.1",
+      "port-version": 3
+    },
     {
       "git-tree": "44efe5647de5509bb4073f3c03305a8bbf4c27f2",
       "version-string": "2.4.1",
diff --git a/versions/s-/sdformat6.json b/versions/s-/sdformat6.json
index 7a75fc099cbe60..e664b40922444b 100644
--- a/versions/s-/sdformat6.json
+++ b/versions/s-/sdformat6.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "1273532dcedd66beb82c6ce89024abac0e385761",
+      "version": "6.2.0",
+      "port-version": 3
+    },
     {
       "git-tree": "9104c5c84ce079686624adeaa3032543415acda2",
       "version": "6.2.0",
diff --git a/versions/s-/sentencepiece.json b/versions/s-/sentencepiece.json
index 5a139553e2fe4e..f4c97fd2a99403 100644
--- a/versions/s-/sentencepiece.json
+++ b/versions/s-/sentencepiece.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "f7469c8030fdd88ef6beb9aef9458c91269a5bb8",
+      "version": "0.1.95",
+      "port-version": 1
+    },
     {
       "git-tree": "107679132fbb9a52ab4c995583db14a748554565",
       "version": "0.1.95",
diff --git a/versions/s-/simage.json b/versions/s-/simage.json
index 3f603aff786625..890ad1c331b088 100644
--- a/versions/s-/simage.json
+++ b/versions/s-/simage.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "0020fb767148212015f8839835689e193060c88e",
+      "version-semver": "1.8.1",
+      "port-version": 2
+    },
     {
       "git-tree": "f9b941ad6737569ae7c400625b6fc8aac8140683",
       "version-semver": "1.8.1",
diff --git a/versions/s-/sol2.json b/versions/s-/sol2.json
index 0a05b4a8c8f9a6..1aa7ab94a61aa1 100644
--- a/versions/s-/sol2.json
+++ b/versions/s-/sol2.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "fca1a728c9f2ff6db12a00fafeae82f69a903b48",
+      "version-string": "3.2.2",
+      "port-version": 2
+    },
     {
       "git-tree": "1dd17eacaccf75a326029df0e26ad1b20c940ad5",
       "version-string": "3.2.2",
diff --git a/versions/s-/soxr.json b/versions/s-/soxr.json
index 99dea5a0cfa9de..5f0f63d391f52f 100644
--- a/versions/s-/soxr.json
+++ b/versions/s-/soxr.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "fca92eeca8f38c1662193dd443e401c5fe7fbfc7",
+      "version": "0.1.3",
+      "port-version": 6
+    },
     {
       "git-tree": "0ea0e47df2ab6381e68ffae49c05c4de0a37f665",
       "version": "0.1.3",
diff --git a/versions/s-/sparsehash.json b/versions/s-/sparsehash.json
index 2b77e12c0bb931..b88c835fdecfd7 100644
--- a/versions/s-/sparsehash.json
+++ b/versions/s-/sparsehash.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "c835b4a393784616327a8e5532769096fc443375",
+      "version": "2.0.4",
+      "port-version": 2
+    },
     {
       "git-tree": "0bb73fddc7adde82c92bad4cd03ad629d978db6b",
       "version": "2.0.4",
diff --git a/versions/s-/stxxl.json b/versions/s-/stxxl.json
index dd71c34f60504a..25fcc439f2d420 100644
--- a/versions/s-/stxxl.json
+++ b/versions/s-/stxxl.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "081a4c6de6290ce05297cc873fa0fde245133a8a",
+      "version-string": "2018-11-15",
+      "port-version": 4
+    },
     {
       "git-tree": "dc3442a34aeab30bf9b04d7d49775527303c8811",
       "version-string": "2018-11-15",
diff --git a/versions/s-/superlu.json b/versions/s-/superlu.json
index b0fb8c288e5a41..7d13bfe6b5a188 100644
--- a/versions/s-/superlu.json
+++ b/versions/s-/superlu.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "88c6ebaf1337aa31cf3afec8250fd7ee1b990b6e",
+      "version-string": "2020-01-07",
+      "port-version": 4
+    },
     {
       "git-tree": "610cdc3479021b9cf5608147a656469c0a8e7bf7",
       "version-string": "2020-01-07",
diff --git a/versions/t-/thrift.json b/versions/t-/thrift.json
index de82f925644785..2461b1285e6b6e 100644
--- a/versions/t-/thrift.json
+++ b/versions/t-/thrift.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "5db8f1e2a1a482177c2ff99e74d34e25b60fb7f4",
+      "version-string": "0.13.0",
+      "port-version": 2
+    },
     {
       "git-tree": "c7225d5805f82b8027c801f08d162bbd41b2b99f",
       "version-string": "0.13.0",
diff --git a/versions/t-/tidy-html5.json b/versions/t-/tidy-html5.json
index 976625125f9a1e..372b548580bc74 100644
--- a/versions/t-/tidy-html5.json
+++ b/versions/t-/tidy-html5.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "ba5557c5b17df0184bd2ee1eeee06ec1131576f8",
+      "version-string": "5.7.28",
+      "port-version": 4
+    },
     {
       "git-tree": "6b446932540002cb1b664d7f5286fdb6c0f7af28",
       "version-string": "5.7.28",
diff --git a/versions/t-/tinyobjloader.json b/versions/t-/tinyobjloader.json
index a459ab3ab47f9d..b7f2aac5b17548 100644
--- a/versions/t-/tinyobjloader.json
+++ b/versions/t-/tinyobjloader.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "1e64b6f58d80d1ff9b43cd9700c8996d0b5b764d",
+      "version-string": "2.0.0-rc2",
+      "port-version": 2
+    },
     {
       "git-tree": "42c09a92244dd67f0c8a1a92e688173413517dee",
       "version-string": "2.0.0-rc2",
diff --git a/versions/t-/tinyply.json b/versions/t-/tinyply.json
index 9c7c4b10bab283..107004406373de 100644
--- a/versions/t-/tinyply.json
+++ b/versions/t-/tinyply.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "d4b7f95bfaf84b3013c43310740340d8951068f5",
+      "version-string": "2020-05-22",
+      "port-version": 2
+    },
     {
       "git-tree": "24e53b2ef803576808b7e5176301b979e01fcd1c",
       "version-string": "2020-05-22",
diff --git a/versions/t-/tlx.json b/versions/t-/tlx.json
index be300c08c714bb..28d3f7c8d3e86a 100644
--- a/versions/t-/tlx.json
+++ b/versions/t-/tlx.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "268aa098ddcd207b076e10ebf1ef398aae834243",
+      "version-string": "0.5.20191212",
+      "port-version": 2
+    },
     {
       "git-tree": "5b51b49c324771227a0c96e16b595496f1094cd9",
       "version-string": "0.5.20191212",
diff --git a/versions/t-/tmxparser.json b/versions/t-/tmxparser.json
index 4c2c7eea850f9b..c22057839e5abe 100644
--- a/versions/t-/tmxparser.json
+++ b/versions/t-/tmxparser.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "a0f3908517c6bf7656418385bb0fff72314a2a4e",
+      "version-string": "2.1.0",
+      "port-version": 6
+    },
     {
       "git-tree": "a1d1d7f89ce4ee1ebb8eaea792da1ab3f21367e9",
       "version-string": "2.1.0",
diff --git a/versions/u-/uchardet.json b/versions/u-/uchardet.json
index 11892e0a289352..c8c1d09fa58a50 100644
--- a/versions/u-/uchardet.json
+++ b/versions/u-/uchardet.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "bef8f2cbbb385ec635dbca67e3783496a15cb4a0",
+      "version-date": "2021-09-03",
+      "port-version": 1
+    },
     {
       "git-tree": "46d56e5d20654b04eb3b97cc2ae46b1ae7c07eb9",
       "version-date": "2021-09-03",
diff --git a/versions/u-/unittest-cpp.json b/versions/u-/unittest-cpp.json
index fe90fa82995c34..7bbc55419e223e 100644
--- a/versions/u-/unittest-cpp.json
+++ b/versions/u-/unittest-cpp.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "454c93c4ef93d7661b8bf6743996167f921b687f",
+      "version-semver": "2.0.0",
+      "port-version": 3
+    },
     {
       "git-tree": "22f6d4e1405162f02c4d25e742fcf0dcc0503146",
       "version-semver": "2.0.0",
diff --git a/versions/u-/uriparser.json b/versions/u-/uriparser.json
index e5a5c312417884..b4704cd8998a67 100644
--- a/versions/u-/uriparser.json
+++ b/versions/u-/uriparser.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "6e6605cac24d7d9cc91af51a7ea3b1da2adde159",
+      "version-semver": "0.9.5",
+      "port-version": 1
+    },
     {
       "git-tree": "cdf383916004ac2ef910b4ea82632d8474763956",
       "version-semver": "0.9.5",
diff --git a/versions/u-/usrsctp.json b/versions/u-/usrsctp.json
index f06592bfef660e..44c86c94478843 100644
--- a/versions/u-/usrsctp.json
+++ b/versions/u-/usrsctp.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "fcf79007e70c0b2872453841199dae68e7ac01fa",
+      "version": "0.9.5.0",
+      "port-version": 1
+    },
     {
       "git-tree": "f2af7adab77a27695756a783a27f5c602ded9082",
       "version": "0.9.5.0",
diff --git a/versions/w-/wampcc.json b/versions/w-/wampcc.json
index 5d742fa5f6cc7f..6c5eb55af194d3 100644
--- a/versions/w-/wampcc.json
+++ b/versions/w-/wampcc.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "00037d098a709bf36797f4cc768b5e62ad4db387",
+      "version-string": "2019-09-04",
+      "port-version": 2
+    },
     {
       "git-tree": "720c45bd8d01b9d57a41cc41debd9858a7461654",
       "version-string": "2019-09-04",
diff --git a/versions/x-/xalan-c.json b/versions/x-/xalan-c.json
index 2b730965799b9b..b9b318b55cc874 100644
--- a/versions/x-/xalan-c.json
+++ b/versions/x-/xalan-c.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "2a2f5f469a510da8d58186fc7f58f8fc9b1e83d6",
+      "version": "1.12",
+      "port-version": 1
+    },
     {
       "git-tree": "f09497ebb2b151b2ea0576a42ca284bcad3bf70d",
       "version": "1.12",
diff --git a/versions/x-/xerces-c.json b/versions/x-/xerces-c.json
index a2a8d80a065ec7..2f515db5c405f2 100644
--- a/versions/x-/xerces-c.json
+++ b/versions/x-/xerces-c.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "b920ebcb559e728e512c42e7e27ce5db58aba440",
+      "version-string": "3.2.3",
+      "port-version": 3
+    },
     {
       "git-tree": "f14ab8d047187d9621974f90d1981534ae7eb58a",
       "version-string": "3.2.3",
diff --git a/versions/x-/xlnt.json b/versions/x-/xlnt.json
index c12760bf18991e..cda2e706dbbc4d 100644
--- a/versions/x-/xlnt.json
+++ b/versions/x-/xlnt.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "225346f8b24e3d09ad6b63b928ed2e6f1cfed4d4",
+      "version": "1.5.0",
+      "port-version": 3
+    },
     {
       "git-tree": "e6bb2b46d0e6bf4e603c93c974bd2eb704e3a520",
       "version": "1.5.0",
diff --git a/versions/x-/xtensor-fftw.json b/versions/x-/xtensor-fftw.json
index 340a6b42790756..b5496821117490 100644
--- a/versions/x-/xtensor-fftw.json
+++ b/versions/x-/xtensor-fftw.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "ca6e7889f9ae5d1d9a627d7591e22962cde621c4",
+      "version-string": "2019-11-30",
+      "port-version": 2
+    },
     {
       "git-tree": "a83a72b6737956e551fe4ddbaa12564048141cec",
       "version-string": "2019-11-30",
diff --git a/versions/z-/z3.json b/versions/z-/z3.json
index 1f82e94b62a301..ee81c0872d8c9c 100644
--- a/versions/z-/z3.json
+++ b/versions/z-/z3.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "679ab881c1277be69ffc601a568e3b47d4d55432",
+      "version": "4.8.12",
+      "port-version": 1
+    },
     {
       "git-tree": "898df3d611ad4a833593adbfd7f2a3b0e686fc2b",
       "version": "4.8.12",
diff --git a/versions/z-/zeromq.json b/versions/z-/zeromq.json
index 7c15ff356bbcc3..28e134099eb40c 100644
--- a/versions/z-/zeromq.json
+++ b/versions/z-/zeromq.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "423c351e8759303bc9ba74a065ce9b983a5f85f5",
+      "version": "4.3.4",
+      "port-version": 2
+    },
     {
       "git-tree": "43f1c320c2710a2f0efa61b54608a33da707bd43",
       "version": "4.3.4",
diff --git a/versions/z-/zyre.json b/versions/z-/zyre.json
index 2ab1d8056cbe70..d32f3b0fd1746e 100644
--- a/versions/z-/zyre.json
+++ b/versions/z-/zyre.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "2efde0db3fd2fb13029cd66d585311ac1d6d146b",
+      "version-string": "2019-07-07",
+      "port-version": 3
+    },
     {
       "git-tree": "118b2285a26addbacaefb2f573f27e1a13bd4af3",
       "version-string": "2019-07-07",
diff --git a/versions/z-/zziplib.json b/versions/z-/zziplib.json
index b17a3621fe7978..708656c376de95 100644
--- a/versions/z-/zziplib.json
+++ b/versions/z-/zziplib.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "af9957469a45f5b512845c4f180af1a7e4e2e886",
+      "version-string": "0.13.71",
+      "port-version": 3
+    },
     {
       "git-tree": "a83631e1e1b136f52e8367253ef162fb369f36a3",
       "version-string": "0.13.71",