diff --git a/ports/botan/portfile.cmake b/ports/botan/portfile.cmake
index 4351791f3f..ea5fae8de0 100644
--- a/ports/botan/portfile.cmake
+++ b/ports/botan/portfile.cmake
@@ -120,6 +120,12 @@ endfunction()
 BOTAN_BUILD(rel)
 BOTAN_BUILD(dbg)
 
+file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/lib/pkgconfig")
+file(RENAME "${CURRENT_PACKAGES_DIR}/lib/botan-2.pc" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/botan-2.pc")
+file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig")
+file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/botan-2.pc" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/botan-2.pc")
+vcpkg_fixup_pkgconfig()
+
 file(RENAME "${CURRENT_PACKAGES_DIR}/include/botan-2/botan" "${CURRENT_PACKAGES_DIR}/include/botan")
 
 vcpkg_copy_pdbs()
diff --git a/ports/botan/vcpkg.json b/ports/botan/vcpkg.json
index 939b839901..809346855a 100644
--- a/ports/botan/vcpkg.json
+++ b/ports/botan/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "botan",
   "version": "2.18.1",
+  "port-version": 1,
   "description": "A cryptography library written in C++11",
   "homepage": "https://botan.randombit.net",
   "supports": "!(windows & arm)",
diff --git a/ports/cppad/portfile.cmake b/ports/cppad/portfile.cmake
index 1a041d48f4..3de2570379 100644
--- a/ports/cppad/portfile.cmake
+++ b/ports/cppad/portfile.cmake
@@ -25,16 +25,8 @@ vcpkg_cmake_configure(
 )
 
 vcpkg_cmake_install()
-
-# Install the pkgconfig file
-if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
-    file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/pkgconfig/cppad.pc" DESTINATION "${CURRENT_PACKAGES_DIR}/lib/pkgconfig")
-endif()
-if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
-    file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/pkgconfig/cppad.pc" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig")
-endif()
-
 vcpkg_fixup_pkgconfig()
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/pkgconfig")
 
 # Add the copyright
 file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/ports/cppad/vcpkg.json b/ports/cppad/vcpkg.json
index a8c2d15910..48ae8fa4eb 100644
--- a/ports/cppad/vcpkg.json
+++ b/ports/cppad/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "cppad",
   "version-string": "20210000.7",
-  "port-version": 1,
+  "port-version": 2,
   "description": "CppAD: A Package for Differentiation of C++ Algorithms",
   "homepage": "https://github.com/coin-or/CppAD",
   "supports": "!(arm | uwp)",
diff --git a/ports/gtest/fix-main-lib-path.patch b/ports/gtest/fix-main-lib-path.patch
index 8b4349f7f1..c2998f3e44 100644
--- a/ports/gtest/fix-main-lib-path.patch
+++ b/ports/gtest/fix-main-lib-path.patch
@@ -57,12 +57,3 @@ index 8d8d60a..b08ce28 100644
            OPTIONAL)
        endforeach()
      endif()
-@@ -338,7 +342,7 @@ function(install_project)
-       configure_file("${PROJECT_SOURCE_DIR}/cmake/${t}.pc.in"
-         "${configured_pc}" @ONLY)
-       install(FILES "${configured_pc}"
--        DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
-+        DESTINATION "${LIB_INSTALL_DST}/pkgconfig")
-     endforeach()
-   endif()
- endfunction()
diff --git a/ports/gtest/portfile.cmake b/ports/gtest/portfile.cmake
index 0053f5d5b4..97086c5bc3 100644
--- a/ports/gtest/portfile.cmake
+++ b/ports/gtest/portfile.cmake
@@ -46,32 +46,11 @@ file(
 
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
 
-if(EXISTS ${CURRENT_PACKAGES_DIR}/debug/lib/gtest_maind.lib)
-    file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/lib/manual-link)
-    file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/gtest_maind.lib ${CURRENT_PACKAGES_DIR}/debug/lib/manual-link/gtest_maind.lib)
-    file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/gmock_maind.lib ${CURRENT_PACKAGES_DIR}/debug/lib/manual-link/gmock_maind.lib)
-
-    file(READ ${CURRENT_PACKAGES_DIR}/share/gtest/GTestTargets-debug.cmake DEBUG_CONFIG)
-    string(REPLACE "\${_IMPORT_PREFIX}/debug/lib/gtest_maind.lib"
-                   "\${_IMPORT_PREFIX}/debug/lib/manual-link/gtest_maind.lib" DEBUG_CONFIG "${DEBUG_CONFIG}")
-    string(REPLACE "\${_IMPORT_PREFIX}/debug/lib/gmock_maind.lib"
-                   "\${_IMPORT_PREFIX}/debug/lib/manual-link/gmock_maind.lib" DEBUG_CONFIG "${DEBUG_CONFIG}")
-    file(WRITE ${CURRENT_PACKAGES_DIR}/share/gtest/GTestTargets-debug.cmake "${DEBUG_CONFIG}")
-endif()
-
-if(EXISTS ${CURRENT_PACKAGES_DIR}/lib/gtest_main.lib)
-    file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/lib/manual-link)
-    file(RENAME ${CURRENT_PACKAGES_DIR}/lib/gtest_main.lib ${CURRENT_PACKAGES_DIR}/lib/manual-link/gtest_main.lib)
-    file(RENAME ${CURRENT_PACKAGES_DIR}/lib/gmock_main.lib ${CURRENT_PACKAGES_DIR}/lib/manual-link/gmock_main.lib)
-
-    file(READ ${CURRENT_PACKAGES_DIR}/share/gtest/GTestTargets-release.cmake RELEASE_CONFIG)
-    string(REPLACE "\${_IMPORT_PREFIX}/lib/gtest_main.lib"
-                   "\${_IMPORT_PREFIX}/lib/manual-link/gtest_main.lib" RELEASE_CONFIG "${RELEASE_CONFIG}")
-    string(REPLACE "\${_IMPORT_PREFIX}/lib/gmock_main.lib"
-                   "\${_IMPORT_PREFIX}/lib/manual-link/gmock_main.lib" RELEASE_CONFIG "${RELEASE_CONFIG}")
-    file(WRITE ${CURRENT_PACKAGES_DIR}/share/gtest/GTestTargets-release.cmake "${RELEASE_CONFIG}")
-endif()
-
+vcpkg_fixup_pkgconfig()
+vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/gmock_main.pc" "libdir=\${prefix}/lib" "libdir=\${prefix}/lib/manual-link")
+vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/gtest_main.pc" "libdir=\${prefix}/lib" "libdir=\${prefix}/lib/manual-link")
+vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/gmock_main.pc" "libdir=\${prefix}/lib" "libdir=\${prefix}/lib/manual-link")
+vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/gtest_main.pc" "libdir=\${prefix}/lib" "libdir=\${prefix}/lib/manual-link")
 vcpkg_copy_pdbs()
 
 file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
diff --git a/ports/gtest/vcpkg.json b/ports/gtest/vcpkg.json
index 1d2a266ccd..b90a78d676 100644
--- a/ports/gtest/vcpkg.json
+++ b/ports/gtest/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "gtest",
   "version-semver": "1.11.0",
+  "port-version": 1,
   "description": "GoogleTest and GoogleMock testing frameworks",
   "homepage": "https://github.com/google/googletest"
 }
diff --git a/ports/log4cpp/portfile.cmake b/ports/log4cpp/portfile.cmake
index 9c9bc600e7..e36923d62e 100644
--- a/ports/log4cpp/portfile.cmake
+++ b/ports/log4cpp/portfile.cmake
@@ -20,8 +20,9 @@ vcpkg_configure_cmake(
 
 vcpkg_install_cmake()
 
+vcpkg_fixup_pkgconfig()
+
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
-vcpkg_fixup_cmake_targets(CONFIG_PATH lib/pkgconfig TARGET_PATH share/${PORT})
 vcpkg_fixup_cmake_targets(CONFIG_PATH share/${PORT})
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
 
diff --git a/ports/log4cpp/vcpkg.json b/ports/log4cpp/vcpkg.json
index 18c56ff490..e2e1668055 100644
--- a/ports/log4cpp/vcpkg.json
+++ b/ports/log4cpp/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "log4cpp",
   "version-string": "2.9.1",
-  "port-version": 5,
+  "port-version": 6,
   "description": "Log4cpp is library of C++ classes for flexible logging to files, syslog, IDSA and other destinations. It is modeled after the Log4j Java library, staying as close to their API as is reasonable.",
   "homepage": "https://github.com/orocos-toolchain/log4cpp",
   "supports": "!uwp"
diff --git a/ports/openmesh/portfile.cmake b/ports/openmesh/portfile.cmake
index 7ff6cf13a3..08f173929e 100644
--- a/ports/openmesh/portfile.cmake
+++ b/ports/openmesh/portfile.cmake
@@ -32,6 +32,11 @@ vcpkg_install_cmake()
 vcpkg_copy_pdbs()
 vcpkg_fixup_cmake_targets(CONFIG_PATH share/OpenMesh/cmake TARGET_PATH share/OpenMesh/cmake)
 
+file(RENAME "${CURRENT_PACKAGES_DIR}/debug/libdata/pkgconfig" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig")
+file(RENAME "${CURRENT_PACKAGES_DIR}/libdata/pkgconfig" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/libdata" "${CURRENT_PACKAGES_DIR}/libdata")
+vcpkg_fixup_pkgconfig()
+
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/OpenMesh/Tools/VDPM/xpm)
 # Only move dynamic libraries to bin on Windows
diff --git a/ports/openmesh/vcpkg.json b/ports/openmesh/vcpkg.json
index 9d64ee9cac..80c5f197b6 100644
--- a/ports/openmesh/vcpkg.json
+++ b/ports/openmesh/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "openmesh",
   "version-string": "8.1",
-  "port-version": 1,
+  "port-version": 2,
   "description": "A generic and efficient polygon mesh data structure"
 }
diff --git a/ports/polyclipping/portfile.cmake b/ports/polyclipping/portfile.cmake
index 8eb73a6353..8ba349173f 100644
--- a/ports/polyclipping/portfile.cmake
+++ b/ports/polyclipping/portfile.cmake
@@ -19,6 +19,10 @@ vcpkg_configure_cmake(
 vcpkg_install_cmake()
 vcpkg_fixup_cmake_targets()
 
+file(RENAME "${CURRENT_PACKAGES_DIR}/debug/share/pkgconfig" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig")
+file(RENAME "${CURRENT_PACKAGES_DIR}/share/pkgconfig" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig")
+vcpkg_fixup_pkgconfig()
+
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
 file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/FindCLIPPER.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/clipper)
diff --git a/ports/polyclipping/vcpkg.json b/ports/polyclipping/vcpkg.json
index 8e524232f8..919342867e 100644
--- a/ports/polyclipping/vcpkg.json
+++ b/ports/polyclipping/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "polyclipping",
   "version-string": "6.4.2",
-  "port-version": 7,
+  "port-version": 8,
   "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/quill/portfile.cmake b/ports/quill/portfile.cmake
index 2902e76edd..2d1699be8a 100644
--- a/ports/quill/portfile.cmake
+++ b/ports/quill/portfile.cmake
@@ -21,6 +21,10 @@ vcpkg_cmake_configure(
 vcpkg_cmake_install()
 vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/quill)
 
+file(RENAME "${CURRENT_PACKAGES_DIR}/debug/pkgconfig" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig")
+file(RENAME "${CURRENT_PACKAGES_DIR}/pkgconfig" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig")
+vcpkg_fixup_pkgconfig()
+
 vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/quill/TweakMe.h" "// #define QUILL_FMT_EXTERNAL" "#define QUILL_FMT_EXTERNAL")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 
diff --git a/ports/quill/vcpkg.json b/ports/quill/vcpkg.json
index b180656a73..e01b4e275a 100644
--- a/ports/quill/vcpkg.json
+++ b/ports/quill/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "quill",
   "version-semver": "1.6.3",
-  "port-version": 1,
+  "port-version": 2,
   "description": "C++14 Asynchronous Low Latency Logging Library",
   "homepage": "https://github.com/odygrd/quill/",
   "supports": "!(uwp | android)",
diff --git a/versions/b-/botan.json b/versions/b-/botan.json
index d4bca81679..870044f359 100644
--- a/versions/b-/botan.json
+++ b/versions/b-/botan.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "9257baaf49b708cde128ff31e74fe848ef30a264",
+      "version": "2.18.1",
+      "port-version": 1
+    },
     {
       "git-tree": "5233d2cda62be282a698410ebf3f70f5f2cda8cf",
       "version": "2.18.1",
diff --git a/versions/baseline.json b/versions/baseline.json
index 01c1c06f0f..389900a757 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -1118,7 +1118,7 @@
     },
     "botan": {
       "baseline": "2.18.1",
-      "port-version": 0
+      "port-version": 1
     },
     "box2d": {
       "baseline": "2.4.1",
@@ -1534,7 +1534,7 @@
     },
     "cppad": {
       "baseline": "20210000.7",
-      "port-version": 1
+      "port-version": 2
     },
     "cppcms": {
       "baseline": "1.2.1",
@@ -2574,7 +2574,7 @@
     },
     "gtest": {
       "baseline": "1.11.0",
-      "port-version": 0
+      "port-version": 1
     },
     "gtk": {
       "baseline": "4.3.0",
@@ -4082,7 +4082,7 @@
     },
     "log4cpp": {
       "baseline": "2.9.1",
-      "port-version": 5
+      "port-version": 6
     },
     "log4cxx": {
       "baseline": "0.12.0",
@@ -4898,7 +4898,7 @@
     },
     "openmesh": {
       "baseline": "8.1",
-      "port-version": 1
+      "port-version": 2
     },
     "openmpi": {
       "baseline": "4.1.0",
@@ -5246,7 +5246,7 @@
     },
     "polyclipping": {
       "baseline": "6.4.2",
-      "port-version": 7
+      "port-version": 8
     },
     "polyhook2": {
       "baseline": "2021-05-09",
@@ -5754,7 +5754,7 @@
     },
     "quill": {
       "baseline": "1.6.3",
-      "port-version": 1
+      "port-version": 2
     },
     "quirc": {
       "baseline": "1.1",
diff --git a/versions/c-/cppad.json b/versions/c-/cppad.json
index 20c81ce956..38aadae7be 100644
--- a/versions/c-/cppad.json
+++ b/versions/c-/cppad.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "5ec54e982dd160ae43272613536a53de6884d6d4",
+      "version-string": "20210000.7",
+      "port-version": 2
+    },
     {
       "git-tree": "fd043aed2197ac43f337a7806061460728cf56a8",
       "version-string": "20210000.7",
diff --git a/versions/g-/gtest.json b/versions/g-/gtest.json
index 9afd832b72..1bbfb49970 100644
--- a/versions/g-/gtest.json
+++ b/versions/g-/gtest.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "e95c8da96b4a206c21d0197e5547e921d748d166",
+      "version-semver": "1.11.0",
+      "port-version": 1
+    },
     {
       "git-tree": "8dd6b8fb34e78fd1646f5d98720dd563d4a38a33",
       "version-semver": "1.11.0",
diff --git a/versions/l-/log4cpp.json b/versions/l-/log4cpp.json
index a620119438..44f7d51729 100644
--- a/versions/l-/log4cpp.json
+++ b/versions/l-/log4cpp.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "c68e17d674484b6ec48269fb47eb711f0e2fcbab",
+      "version-string": "2.9.1",
+      "port-version": 6
+    },
     {
       "git-tree": "e0dcd61960233e62367f4944e294ae90300d82e4",
       "version-string": "2.9.1",
diff --git a/versions/o-/openmesh.json b/versions/o-/openmesh.json
index 28109452d7..164c3fbf16 100644
--- a/versions/o-/openmesh.json
+++ b/versions/o-/openmesh.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "19e385c7e6a18248b06db012c7ba0a68e98921a7",
+      "version-string": "8.1",
+      "port-version": 2
+    },
     {
       "git-tree": "c243179bd63b698826adde0be25dae93a9afd26a",
       "version-string": "8.1",
diff --git a/versions/p-/polyclipping.json b/versions/p-/polyclipping.json
index 4871d33c9e..178f2f0d4f 100644
--- a/versions/p-/polyclipping.json
+++ b/versions/p-/polyclipping.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "715616bd21d5d75a9101ac86da0188263b9774c9",
+      "version-string": "6.4.2",
+      "port-version": 8
+    },
     {
       "git-tree": "25fcf0404b9a7c414b238c0973b4aa43d7bbd6e2",
       "version-string": "6.4.2",
diff --git a/versions/q-/quill.json b/versions/q-/quill.json
index d2cbe00bff..a300b7fe2f 100644
--- a/versions/q-/quill.json
+++ b/versions/q-/quill.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "1d6790b5d6faf5173c73ea42e07acea665aebffc",
+      "version-semver": "1.6.3",
+      "port-version": 2
+    },
     {
       "git-tree": "53bbd43b741956bcb2d1e74cb34bca27b51b7d11",
       "version-semver": "1.6.3",