diff --git a/ports/ignition-cmake2/FindGTS.patch b/ports/ignition-cmake2/FindGTS.patch
deleted file mode 100644
index 47bb145e00..0000000000
--- a/ports/ignition-cmake2/FindGTS.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff --git a/cmake/FindGTS.cmake b/cmake/FindGTS.cmake
-index ad00a9715..a83d8af40 100644
---- a/cmake/FindGTS.cmake
-+++ b/cmake/FindGTS.cmake
-@@ -67,6 +67,26 @@ else()
-   # 2.1 Need glib library
-   find_library(GLIB_LIBRARY glib-2.0)
-   list(APPEND GTS_LIBRARIES "${GLIB_LIBRARY}")
-+  find_path(GLIB_INCLUDE_DIRS glib.h
-+    HINTS
-+      ${CMAKE_FIND_ROOT_PATH}
-+    PATH
-+      ${CMAKE_FIND_ROOT_PATH}
-+    PATH_SUFFIXES 
-+      include
-+      include/glib-2.0
-+    DOC "glib header include dir"
-+  )
-+  find_path(GLIB_CONFIG_INCLUDE_DIRS glibconfig.h
-+    HINTS
-+      ${CMAKE_FIND_ROOT_PATH}
-+    PATHS
-+      ${CMAKE_FIND_ROOT_PATH}
-+    PATH_SUFFIXES
-+      lib/glib-2.0/include
-+    doc "glib header include dir"
-+  )
-+  list(APPEND GTS_INCLUDE_DIRS ${GLIB_INCLUDE_DIRS} ${GLIB_CONFIG_INCLUDE_DIRS})
- 
-   if (GTS_FOUND)
-     # We need to manually specify the pkgconfig entry (and type of entry),
diff --git a/ports/ignition-cmake2/vcpkg.json b/ports/ignition-cmake2/vcpkg.json
index 98d4e3e431..597efb06b0 100644
--- a/ports/ignition-cmake2/vcpkg.json
+++ b/ports/ignition-cmake2/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "ignition-cmake2",
   "version": "2.16.0",
+  "port-version": 1,
   "description": "CMake helper functions for building robotic applications",
   "homepage": "https://ignitionrobotics.org/libs/cmake",
   "license": null,
diff --git a/ports/ignition-math6/fix-isspace.patch b/ports/ignition-math6/fix-isspace.patch
deleted file mode 100644
index 70d593229e..0000000000
--- a/ports/ignition-math6/fix-isspace.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/include/ignition/math/Color.hh b/include/ignition/math/Color.hh
-index faf7a08..16758c5 100644
---- a/include/ignition/math/Color.hh
-+++ b/include/ignition/math/Color.hh
-@@ -18,6 +18,7 @@
- #define IGNITION_MATH_COLOR_HH_
- 
- #include <iostream>
-+#include <cctype>
- 
- #include <ignition/math/Helpers.hh>
- #include <ignition/math/Vector3.hh>
diff --git a/ports/ignition-math6/vcpkg.json b/ports/ignition-math6/vcpkg.json
index ad2325291e..4e58cce919 100644
--- a/ports/ignition-math6/vcpkg.json
+++ b/ports/ignition-math6/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "ignition-math6",
   "version": "6.9.2",
+  "port-version": 1,
   "description": "Math API for robotic applications",
   "homepage": "https://ignitionrobotics.org/libs/math",
   "license": null,
diff --git a/versions/baseline.json b/versions/baseline.json
index c06c8c2aa5..6d2711c335 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -3010,7 +3010,7 @@
     },
     "ignition-cmake2": {
       "baseline": "2.16.0",
-      "port-version": 0
+      "port-version": 1
     },
     "ignition-common1": {
       "baseline": "1.1.1",
@@ -3034,7 +3034,7 @@
     },
     "ignition-math6": {
       "baseline": "6.9.2",
-      "port-version": 0
+      "port-version": 1
     },
     "ignition-modularscripts": {
       "baseline": "2022-05-11",
diff --git a/versions/i-/ignition-cmake2.json b/versions/i-/ignition-cmake2.json
index bf739cda16..6841d81aae 100644
--- a/versions/i-/ignition-cmake2.json
+++ b/versions/i-/ignition-cmake2.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "fefe057cb14c0f698b0ebb1a717b5bba189ab355",
+      "version": "2.16.0",
+      "port-version": 1
+    },
     {
       "git-tree": "1e94a4739cf0e6197a67fbd5770cbff1afcf5f51",
       "version": "2.16.0",
diff --git a/versions/i-/ignition-math6.json b/versions/i-/ignition-math6.json
index ba446607ee..39bd611e62 100644
--- a/versions/i-/ignition-math6.json
+++ b/versions/i-/ignition-math6.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "4c64259804945e426650515f5de69bb29107a167",
+      "version": "6.9.2",
+      "port-version": 1
+    },
     {
       "git-tree": "6ba12e1d6fbb4b7b72e209a4dad9b3bf0ec83879",
       "version": "6.9.2",