diff --git a/ports/ccfits/portfile.cmake b/ports/ccfits/portfile.cmake
index 3a2c71ce5f8267..1faeb9d812308e 100644
--- a/ports/ccfits/portfile.cmake
+++ b/ports/ccfits/portfile.cmake
@@ -14,6 +14,8 @@ vcpkg_extract_source_archive(
 
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS
+        -DCMAKE_CXX_STANDARD=11 # 17 removes std::binary_function
 )
 
 vcpkg_cmake_install()
diff --git a/ports/ccfits/vcpkg.json b/ports/ccfits/vcpkg.json
index 1bc37f2eedca82..d9d4116e50d84d 100644
--- a/ports/ccfits/vcpkg.json
+++ b/ports/ccfits/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "ccfits",
   "version": "2.5",
-  "port-version": 11,
+  "port-version": 12,
   "description": "CCfits is an object oriented interface to the cfitsio library. It is designed to make the capabilities of cfitsio available to programmers working in C++.",
   "homepage": "https://heasarc.gsfc.nasa.gov/fitsio/CCfits/",
   "license": "NASA-1.3",
diff --git a/ports/cello/CMakeLists.txt b/ports/cello/CMakeLists.txt
index b54507f07e0561..333323c3aed6cb 100644
--- a/ports/cello/CMakeLists.txt
+++ b/ports/cello/CMakeLists.txt
@@ -16,6 +16,10 @@ target_include_directories(
 
 set_target_properties(cello PROPERTIES PUBLIC_HEADER include/Cello.h)
 
+if(ANDROID AND ANDROID_NATIVE_API_LEVEL LESS "33")
+    target_compile_definitions(cello PRIVATE CELLO_NSTRACE)
+endif()
+
 install(TARGETS cello EXPORT unofficial-cello-config)
 
 install(
diff --git a/ports/cello/vcpkg.json b/ports/cello/vcpkg.json
index f7f271eedfba89..58a8aebf3b680f 100644
--- a/ports/cello/vcpkg.json
+++ b/ports/cello/vcpkg.json
@@ -1,9 +1,10 @@
 {
   "name": "cello",
   "version-date": "2019-07-23",
-  "port-version": 3,
+  "port-version": 4,
   "description": "Higher level programming in C",
   "homepage": "https://libcello.org/",
+  "license": "BSD-2-Clause-Views",
   "dependencies": [
     {
       "name": "vcpkg-cmake",
diff --git a/ports/cgicc/portfile.cmake b/ports/cgicc/portfile.cmake
index 0ba6d6214e69fd..c2b3fb1621fa5b 100644
--- a/ports/cgicc/portfile.cmake
+++ b/ports/cgicc/portfile.cmake
@@ -19,6 +19,8 @@ file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}
 
 vcpkg_cmake_configure(
   SOURCE_PATH "${SOURCE_PATH}"
+  OPTIONS
+    -DCMAKE_CXX_STANDARD=11 # 17 removes std::unary_function
   OPTIONS_DEBUG
     -DDISABLE_INSTALL_HEADERS=ON
     -DDISABLE_INSTALL_TOOLS=ON
diff --git a/ports/cgicc/vcpkg.json b/ports/cgicc/vcpkg.json
index d99d2e6a73a547..754ba8ab1261e8 100644
--- a/ports/cgicc/vcpkg.json
+++ b/ports/cgicc/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "cgicc",
   "version": "3.2.20",
+  "port-version": 1,
   "description": "GNU Cgicc is an ANSI C++ compliant class library that greatly simplifies the creation of CGI applications for the World Wide Web",
   "homepage": "https://www.gnu.org/software/cgicc/",
   "dependencies": [
diff --git a/ports/chmlib/CMakeLists.txt b/ports/chmlib/CMakeLists.txt
index 49ce1f129ffff3..296ed6a4b62af3 100644
--- a/ports/chmlib/CMakeLists.txt
+++ b/ports/chmlib/CMakeLists.txt
@@ -1,7 +1,13 @@
 cmake_minimum_required(VERSION 3.5)
 project(chm C)
 
+include (CheckIncludeFiles)
+check_include_files(strings.h HAVE_STRINGS_H) # for ffs
+
 add_library(chm src/lzx.c src/chm_lib.c)
+if(HAVE_STRINGS_H)
+    target_compile_definitions(chm PRIVATE CHMLIB_HAVE_STRINGS_H)
+endif()
 
 if(BUILD_TOOLS)
     link_libraries(chm)
diff --git a/ports/chmlib/portfile.cmake b/ports/chmlib/portfile.cmake
index 88e996ae48523b..4a9c7d5c3f7b1d 100644
--- a/ports/chmlib/portfile.cmake
+++ b/ports/chmlib/portfile.cmake
@@ -16,6 +16,7 @@ vcpkg_extract_source_archive(
     ARCHIVE "${ARCHIVE}"
     PATCHES
         all-platforms.patch
+        strings_h.patch
 )
 
 file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}")
diff --git a/ports/chmlib/strings_h.patch b/ports/chmlib/strings_h.patch
new file mode 100644
index 00000000000000..e723392b3563fc
--- /dev/null
+++ b/ports/chmlib/strings_h.patch
@@ -0,0 +1,13 @@
+diff --git a/src/chm_lib.c b/src/chm_lib.c
+index 6c6736c..4a3f167 100644
+--- a/src/chm_lib.c
++++ b/src/chm_lib.c
+@@ -62,7 +62,7 @@
+ #include <stdio.h>
+ #endif
+ 
+-#if __sun || __sgi
++#ifdef CHMLIB_HAVE_STRINGS_H
+ #include <strings.h>
+ #endif
+ 
diff --git a/ports/chmlib/vcpkg.json b/ports/chmlib/vcpkg.json
index 0eb4108c125d30..cf9899013bfc23 100644
--- a/ports/chmlib/vcpkg.json
+++ b/ports/chmlib/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "chmlib",
   "version": "0.40",
-  "port-version": 7,
+  "port-version": 8,
   "description": "CHMLIB is a library for dealing with Microsoft ITSS/CHM format files. Right now, it is a very simple library, but sufficient for dealing with all of the .chm files I've come across. Due to the fairly well-designed indexing built into this particular file format, even a small library is able to gain reasonably good performance indexing into ITSS archives.",
   "homepage": "http://www.jedrea.com/chmlib/",
   "license": "LGPL-2.1-or-later",
diff --git a/ports/clfft/portfile.cmake b/ports/clfft/portfile.cmake
index c45c30a9c940c9..64cda211d236bc 100644
--- a/ports/clfft/portfile.cmake
+++ b/ports/clfft/portfile.cmake
@@ -12,6 +12,7 @@ vcpkg_from_github(
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}/src"
     OPTIONS
+        -DCMAKE_CXX_STANDARD=11 # 17 removes std::unary_function
         -DBUILD_LOADLIBRARIES=OFF
         -DBUILD_EXAMPLES=OFF
         -DSUFFIX_LIB=
diff --git a/ports/clfft/vcpkg.json b/ports/clfft/vcpkg.json
index 4eef7f93266f59..dbb41001b361c8 100644
--- a/ports/clfft/vcpkg.json
+++ b/ports/clfft/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "clfft",
   "version": "2.12.2",
-  "port-version": 6,
+  "port-version": 7,
   "description": "clFFT is an OpenCL 1.2 accelerated Fast Fourier Transform library.",
   "homepage": "https://github.com/clMathLibraries/clFFT",
   "license": "Apache-2.0",
diff --git a/ports/crfsuite/CMakeLists.txt b/ports/crfsuite/CMakeLists.txt
index 05dfa88d06a267..680a571569e0ed 100644
--- a/ports/crfsuite/CMakeLists.txt
+++ b/ports/crfsuite/CMakeLists.txt
@@ -1,6 +1,10 @@
 cmake_minimum_required(VERSION 3.19 FATAL_ERROR)
 PROJECT(crfsuite)
 
+if(ANDROID AND ANDROID_NATIVE_API_LEVEL LESS 28)
+    set(CMAKE_C_STANDARD 99) # no aligned_alloc
+endif()
+
 file(GLOB SOURCE_FILE_CQDB
     "lib/cqdb/src/*.c"
 )
diff --git a/ports/crfsuite/vcpkg.json b/ports/crfsuite/vcpkg.json
index b15828231253e5..bfb71241242e84 100644
--- a/ports/crfsuite/vcpkg.json
+++ b/ports/crfsuite/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "crfsuite",
   "version-date": "2020-08-27",
+  "port-version": 1,
   "description": "CRFSuite is an implementation of Conditional Random Fields (CRFs) for labeling sequential data.",
   "homepage": "https://www.chokkan.org/software/crfsuite/",
   "license": null,
diff --git a/ports/dp-thread-pool/portfile.cmake b/ports/dp-thread-pool/portfile.cmake
index 6cfbd8e19bdaa5..d7db6b6e9cbe21 100644
--- a/ports/dp-thread-pool/portfile.cmake
+++ b/ports/dp-thread-pool/portfile.cmake
@@ -14,6 +14,7 @@ vcpkg_cmake_configure(
         -DTP_BUILD_TESTS=OFF
         -DTP_BUILD_EXAMPLES=OFF
         -DTP_BUILD_BENCHMARKS=OFF
+        -DTP_CXX_STANDARD=20
 )
 
 vcpkg_cmake_install()
diff --git a/ports/dp-thread-pool/vcpkg.json b/ports/dp-thread-pool/vcpkg.json
index 1c35477d02eb8a..626e9dbada18b8 100644
--- a/ports/dp-thread-pool/vcpkg.json
+++ b/ports/dp-thread-pool/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "dp-thread-pool",
   "version": "0.6.2",
+  "port-version": 1,
   "maintainers": "Paul Tsouchlos <developer.paul.123@gmail.com>",
   "description": "dp::thread_pool - fast, lightweight C++20 thread pool.",
   "homepage": "https://github.com/DeveloperPaul123/thread-pool",
diff --git a/ports/entityx/portfile.cmake b/ports/entityx/portfile.cmake
index 2d77a8b2f17723..3a731ea121a986 100644
--- a/ports/entityx/portfile.cmake
+++ b/ports/entityx/portfile.cmake
@@ -12,6 +12,7 @@ vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
     DISABLE_PARALLEL_CONFIGURE
     OPTIONS
+        -DCMAKE_CXX_STANDARD=11 # std::iterator<X,Y> is deprecated in C++17
         -DENTITYX_BUILD_TESTING=false
         -DENTITYX_BUILD_SHARED=0
 )
diff --git a/ports/entityx/vcpkg.json b/ports/entityx/vcpkg.json
index 3b918ff5791af6..722271401e2171 100644
--- a/ports/entityx/vcpkg.json
+++ b/ports/entityx/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "entityx",
   "version": "1.3.0",
-  "port-version": 5,
+  "port-version": 6,
   "description": "EntityX - A fast, type-safe C++ Entity-Component system.",
   "homepage": "https://github.com/alecthomas/entityx",
   "dependencies": [
diff --git a/ports/freeglut/android.patch b/ports/freeglut/android.patch
new file mode 100644
index 00000000000000..dd4753f981bdd2
--- /dev/null
+++ b/ports/freeglut/android.patch
@@ -0,0 +1,12 @@
+diff --git a/src/android/native_app_glue/android_native_app_glue.c b/src/android/native_app_glue/android_native_app_glue.c
+index be8d941..6ddae78 100644
+--- a/src/android/native_app_glue/android_native_app_glue.c
++++ b/src/android/native_app_glue/android_native_app_glue.c
+@@ -18,6 +18,7 @@
+ #include <jni.h>
+ 
+ #include <errno.h>
++#include <stdlib.h>
+ #include <string.h>
+ #include <unistd.h>
+ #include <sys/resource.h>
diff --git a/ports/freeglut/gles.patch b/ports/freeglut/gles.patch
new file mode 100644
index 00000000000000..a09d298bb0e8da
--- /dev/null
+++ b/ports/freeglut/gles.patch
@@ -0,0 +1,22 @@
+diff --git a/src/fg_geometry.c b/src/fg_geometry.c
+index ee7cc89..ea42f72 100644
+--- a/src/fg_geometry.c
++++ b/src/fg_geometry.c
+@@ -44,7 +44,7 @@
+ 
+ /* declare for drawing using the different OpenGL versions here so we can
+    have a nice code order below */
+-#ifndef GL_VERSION_1_1
++#if !(defined(GL_VERSION_1_1) || defined(GL_VERSION_ES_CM_1_0))
+ static void fghDrawGeometryWire10(GLfloat *varr, GLfloat *narr, GLushort *iarr,
+ 		GLsizei nparts, GLsizei npartverts, GLenum prim, GLushort *iarr2,
+ 		GLsizei nparts2, GLsizei npartverts2);
+@@ -222,7 +222,7 @@ void fghDrawGeometrySolid(GLfloat *vertices, GLfloat *normals, GLfloat *textcs,
+     }
+ }
+ 
+-#ifndef GL_VERSION_1_1
++#if !(defined(GL_VERSION_1_1) || defined(GL_VERSION_ES_CM_1_0))
+ static void fghDrawGeometryWire10(GLfloat *varr, GLfloat *narr, GLushort *iarr,
+ 		GLsizei nparts, GLsizei npartverts, GLenum prim, GLushort *iarr2,
+ 		GLsizei nparts2, GLsizei npartverts2)
diff --git a/ports/freeglut/portfile.cmake b/ports/freeglut/portfile.cmake
index 3afc8e28b7b9cd..a123a456b91bc8 100755
--- a/ports/freeglut/portfile.cmake
+++ b/ports/freeglut/portfile.cmake
@@ -4,7 +4,9 @@ vcpkg_from_github(
     REF "v${VERSION}"
     SHA512 4bb6d6c086bac7a9c0ec78062dce58987555785abe6375f462ee249f65210a964a28fb10ba7ee8a42d7fafb00eb8d196eb403d65d255f02f88467369c187228b
     HEAD_REF master
-    PATCHES 
+    PATCHES
+        android.patch
+        gles.patch # amends https://github.com/freeglut/freeglut/commit/093a5a46
         x11-dependencies-export.patch
         fix-debug-macro.patch
         no_x64_enforcement.patch
diff --git a/ports/freeglut/vcpkg.json b/ports/freeglut/vcpkg.json
index e3ece926080234..acb3b2e240348d 100644
--- a/ports/freeglut/vcpkg.json
+++ b/ports/freeglut/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "freeglut",
   "version": "3.4.0",
-  "port-version": 1,
+  "port-version": 2,
   "description": "A free OpenGL utility toolkit, the open-sourced alternative to the GLUT library.",
   "homepage": "https://sourceforge.net/projects/freeglut/",
   "license": null,
diff --git a/ports/freerdp/portfile.cmake b/ports/freerdp/portfile.cmake
index 754547e8795a10..fbc9180fc31dc3 100644
--- a/ports/freerdp/portfile.cmake
+++ b/ports/freerdp/portfile.cmake
@@ -9,6 +9,7 @@ vcpkg_from_github(
         install-layout.patch
         keep-dup-libs.patch
         windows-linkage.patch
+        winpr_strerror.patch
 )
 file(WRITE "${SOURCE_PATH}/.source_version" "${VERSION}-vcpkg")
 file(WRITE "${SOURCE_PATH}/CMakeCPack.cmake" "")
diff --git a/ports/freerdp/vcpkg.json b/ports/freerdp/vcpkg.json
index f94a60a217425e..cd2169749c9645 100644
--- a/ports/freerdp/vcpkg.json
+++ b/ports/freerdp/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "freerdp",
   "version": "3.4.0",
-  "port-version": 1,
+  "port-version": 2,
   "description": "A free implementation of the Remote Desktop Protocol (RDP)",
   "homepage": "https://github.com/FreeRDP/FreeRDP",
   "license": "Apache-2.0",
diff --git a/ports/freerdp/winpr_strerror.patch b/ports/freerdp/winpr_strerror.patch
new file mode 100644
index 00000000000000..39f95937dfc714
--- /dev/null
+++ b/ports/freerdp/winpr_strerror.patch
@@ -0,0 +1,12 @@
+diff --git a/winpr/libwinpr/sysinfo/cpufeatures/cpu-features.c b/winpr/libwinpr/sysinfo/cpufeatures/cpu-features.c
+index d43b588..854c93a 100644
+--- a/winpr/libwinpr/sysinfo/cpufeatures/cpu-features.c
++++ b/winpr/libwinpr/sysinfo/cpufeatures/cpu-features.c
+@@ -73,6 +73,7 @@
+ #include <sys/system_properties.h>
+ #include <unistd.h>
+ #include <winpr/wtypes.h>
++#include <winpr/debug.h>
+ 
+ static pthread_once_t g_once;
+ static int g_inited;
diff --git a/ports/itpp/portfile.cmake b/ports/itpp/portfile.cmake
index db2ee89546a38b..598dc8a7090c56 100644
--- a/ports/itpp/portfile.cmake
+++ b/ports/itpp/portfile.cmake
@@ -17,6 +17,7 @@ file(RENAME "${SOURCE_PATH}/VERSION" "${SOURCE_PATH}/VERSION.txt")
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
+        -DCMAKE_CXX_STANDARD=11 # C++17 does not allow 'register'
         -DCMAKE_DISABLE_FIND_PACKAGE_LAPACK=ON
         -DCMAKE_DISABLE_FIND_PACKAGE_FFT=ON
         -DCMAKE_DISABLE_FIND_PACKAGE_BLAS=ON
diff --git a/ports/itpp/vcpkg.json b/ports/itpp/vcpkg.json
index 5d3d7ce37c928e..adafea28712cb9 100644
--- a/ports/itpp/vcpkg.json
+++ b/ports/itpp/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "itpp",
   "version-semver": "4.3.1",
-  "port-version": 10,
+  "port-version": 11,
   "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",
   "dependencies": [
diff --git a/ports/keccak-tiny/vcpkg.json b/ports/keccak-tiny/vcpkg.json
index 8223f5034a6832..b2dd0b6c5ced8c 100644
--- a/ports/keccak-tiny/vcpkg.json
+++ b/ports/keccak-tiny/vcpkg.json
@@ -1,9 +1,11 @@
 {
   "name": "keccak-tiny",
   "version-date": "2014-09-08",
+  "port-version": 1,
   "description": "A tiny implementation of SHA-3, SHAKE, Keccak, and sha3sum",
   "homepage": "https://github.com/coruus/keccak-tiny",
   "license": "CC0-1.0",
+  "supports": "!android",
   "dependencies": [
     {
       "name": "vcpkg-cmake",
diff --git a/ports/libcopp/portfile.cmake b/ports/libcopp/portfile.cmake
index 9fe462a4286d2c..078c53ba116a7d 100644
--- a/ports/libcopp/portfile.cmake
+++ b/ports/libcopp/portfile.cmake
@@ -16,10 +16,20 @@ vcpkg_from_github(
   HEAD_REF main
   )
 
+vcpkg_list(SET options)
+if(VCPKG_TARGET_IS_ANDROID)
+    vcpkg_list(APPEND options
+        -DCMAKE_CXX_EXTENSIONS=OFF
+        -DCOMPILER_OPTION_CURRENT_MAX_CXX_STANDARD=20
+    )
+endif()
+
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
     DISABLE_PARALLEL_CONFIGURE
-    OPTIONS "-DATFRAMEWORK_CMAKE_TOOLSET_DIR=${ATFRAMEWORK_CMAKE_TOOLSET}"
+    OPTIONS
+        ${options}
+        "-DATFRAMEWORK_CMAKE_TOOLSET_DIR=${ATFRAMEWORK_CMAKE_TOOLSET}"
 )
 
 vcpkg_cmake_install()
diff --git a/ports/libcopp/vcpkg.json b/ports/libcopp/vcpkg.json
index a4f4067193843c..6d0c0dcba90a44 100644
--- a/ports/libcopp/vcpkg.json
+++ b/ports/libcopp/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "libcopp",
   "version": "2.2.0",
+  "port-version": 1,
   "maintainers": "owent <admin@owent.net>",
   "description": "A cross-platfrom coroutine library for C++",
   "homepage": "https://github.com/owent/libcopp",
diff --git a/ports/libmodplug/portfile.cmake b/ports/libmodplug/portfile.cmake
index f7c08c5302ed67..da9035210c8a86 100644
--- a/ports/libmodplug/portfile.cmake
+++ b/ports/libmodplug/portfile.cmake
@@ -17,10 +17,12 @@ vcpkg_from_github(
         005-fix-install-paths.patch # https://github.com/Konstanty/libmodplug/pull/61
 )
 
-set(EXTRA_OPTIONS)
+set(EXTRA_OPTIONS "")
 
 if(VCPKG_TARGET_IS_EMSCRIPTEN)
     list(APPEND EXTRA_OPTIONS "-DCMAKE_CXX_STANDARD=11")
+elseif(VCPKG_TARGET_IS_ANDROID)
+    list(APPEND EXTRA_OPTIONS "-DCMAKE_CXX_STANDARD=11")
 endif()
 
 vcpkg_cmake_configure(
diff --git a/ports/libmodplug/vcpkg.json b/ports/libmodplug/vcpkg.json
index fbb20260551897..457f9592a973a5 100644
--- a/ports/libmodplug/vcpkg.json
+++ b/ports/libmodplug/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "libmodplug",
   "version": "0.8.9.0",
-  "port-version": 11,
+  "port-version": 12,
   "description": "The ModPlug mod file playing library.",
   "homepage": "https://github.com/Konstanty/libmodplug",
   "license": null,
diff --git a/ports/libodb-pgsql/CMakeLists.txt b/ports/libodb-pgsql/CMakeLists.txt
index 46137ab572d878..13d50c0551d875 100644
--- a/ports/libodb-pgsql/CMakeLists.txt
+++ b/ports/libodb-pgsql/CMakeLists.txt
@@ -1,5 +1,6 @@
 cmake_minimum_required(VERSION 3.0)
 project(libodb-pgsql VERSION 2.4.0 LANGUAGES CXX)
+set(CMAKE_CXX_STANDARD 11) # 17 removes 'auto_ptr'
 find_package(odb 2.4.0 REQUIRED COMPONENTS libodb)
 find_package(PostgreSQL REQUIRED)
 configure_file(config.unix.h.in
diff --git a/ports/libodb-pgsql/vcpkg.json b/ports/libodb-pgsql/vcpkg.json
index dbc4b807ccf8b0..59e2d48c141349 100644
--- a/ports/libodb-pgsql/vcpkg.json
+++ b/ports/libodb-pgsql/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "libodb-pgsql",
   "version": "2.4.0",
-  "port-version": 7,
+  "port-version": 8,
   "description": "Description: PostgreSQL support for the ODB ORM library",
   "homepage": "https://www.codesynthesis.com/products/odb/",
   "dependencies": [
diff --git a/ports/libodb-sqlite/CMakeLists.txt b/ports/libodb-sqlite/CMakeLists.txt
index e0689fa91f3a36..b6e86f93352f80 100644
--- a/ports/libodb-sqlite/CMakeLists.txt
+++ b/ports/libodb-sqlite/CMakeLists.txt
@@ -1,5 +1,6 @@
 cmake_minimum_required(VERSION 3.0)
 project(libodb-sqlite VERSION 2.4.0 LANGUAGES CXX)
+set(CMAKE_CXX_STANDARD 11) # 17 removes 'auto_ptr'
 find_package(odb 2.4.0 REQUIRED COMPONENTS libodb)
 find_package(unofficial-sqlite3 CONFIG)
 configure_file(config.unix.h.in odb/sqlite/details/config.h COPYONLY)
diff --git a/ports/libodb-sqlite/vcpkg.json b/ports/libodb-sqlite/vcpkg.json
index fdea27da32e054..5c8c92c73a166e 100644
--- a/ports/libodb-sqlite/vcpkg.json
+++ b/ports/libodb-sqlite/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "libodb-sqlite",
   "version": "2.4.0",
-  "port-version": 11,
+  "port-version": 12,
   "description": "Sqlite support for the ODB ORM library",
   "homepage": "https://www.codesynthesis.com/products/odb/",
   "dependencies": [
diff --git a/ports/libodb/portfile.cmake b/ports/libodb/portfile.cmake
index 26e099eeabff53..3bfc23cc876176 100644
--- a/ports/libodb/portfile.cmake
+++ b/ports/libodb/portfile.cmake
@@ -22,6 +22,8 @@ file(COPY
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
     DISABLE_PARALLEL_CONFIGURE
+    OPTIONS
+        -DCMAKE_CXX_STANDARD=11 # 17 removes 'auto_ptr'
     OPTIONS_DEBUG
         -DLIBODB_INSTALL_HEADERS=OFF
 )
diff --git a/ports/libodb/vcpkg.json b/ports/libodb/vcpkg.json
index 031d80e698e989..f4e414821c25ed 100644
--- a/ports/libodb/vcpkg.json
+++ b/ports/libodb/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "libodb",
   "version": "2.4.0",
-  "port-version": 11,
+  "port-version": 12,
   "description": "ODB library, base runtime for the ODB ORM solution",
   "homepage": "https://www.codesynthesis.com/products/odb/",
   "dependencies": [
diff --git a/ports/libpopt/CMakeLists.txt b/ports/libpopt/CMakeLists.txt
index 5348757b4784e1..5d0bbc829609ea 100644
--- a/ports/libpopt/CMakeLists.txt
+++ b/ports/libpopt/CMakeLists.txt
@@ -19,6 +19,10 @@ if(POPT_USE_CONFIG)
   include(CheckIncludeFile)
   include(CheckFunctionExists)
 
+  if(ANDROID AND ANDROID_NATIVE_API_LEVEL LESS "28")
+    set(HAVE_GLOB_H FALSE CACHE INTERNAL "")
+  endif()
+
   check_include_file(float.h HAVE_FLOAT_H)
   check_include_file(fnmatch.h HAVE_FNMATCH_H)
   check_include_file(glob.h HAVE_GLOB_H)
diff --git a/ports/libpopt/vcpkg.json b/ports/libpopt/vcpkg.json
index 8eb546202cdf5f..c9b1e8213365ac 100644
--- a/ports/libpopt/vcpkg.json
+++ b/ports/libpopt/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "libpopt",
   "version": "1.16",
-  "port-version": 16,
+  "port-version": 17,
   "description": "Library for parsing command line parameters",
   "dependencies": [
     {
diff --git a/ports/libudis86/CMakeLists.txt b/ports/libudis86/CMakeLists.txt
index fb47dd7f97084c..eb794274f99366 100644
--- a/ports/libudis86/CMakeLists.txt
+++ b/ports/libudis86/CMakeLists.txt
@@ -2,6 +2,7 @@ cmake_minimum_required (VERSION 3.9)
 
 project (udis86)
 
+add_definitions(-DHAVE_STRING_H)
 if (MSVC)
     add_definitions(-D_CRT_SECURE_NO_WARNINGS)
 endif()
diff --git a/ports/libudis86/vcpkg.json b/ports/libudis86/vcpkg.json
index 66b500f75062ba..8ec4ad58bd6324 100644
--- a/ports/libudis86/vcpkg.json
+++ b/ports/libudis86/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "libudis86",
   "version-date": "2018-01-28",
-  "port-version": 3,
+  "port-version": 4,
   "description": "Disassembler Library for x86 and x86-64",
   "homepage": "https://github.com/vmt/udis86",
   "dependencies": [
diff --git a/ports/libudns/configure.patch b/ports/libudns/configure.patch
new file mode 100644
index 00000000000000..b39e298dba6ac1
--- /dev/null
+++ b/ports/libudns/configure.patch
@@ -0,0 +1,61 @@
+diff --git a/configure b/configure
+index dda98b3..5594bf3 100755
+--- a/configure
++++ b/configure
+@@ -26,7 +26,7 @@ enable() {
+   opt=`echo "$1" | sed 's/^--[^-]*-//'`
+   case "$opt" in
+     ipv6) ;;
+-    *) echo "configure: unrecognized option \`$1'" >&2; exit 1;;
++    *) echo "configure: unrecognized option \`$1'" >&2; opt=unused;;
+   esac
+   eval enable_$opt=$2
+ }
+@@ -50,11 +50,14 @@ Optional features (all enabled by default if system supports a feature):
+ EOF
+       exit 0
+       ;;
+-    *) echo "configure: unknown option \`$1'" >&2; exit 1 ;;
++    *) echo "configure: unknown option \`$1'" >&2;;
+   esac
+   shift
+ done
+ 
++CC="$CC $CPPFLAGS"
++export CC
++
+ . ./configure.lib
+ 
+ ac_msg "configure"
+@@ -75,7 +78,8 @@ int main(int argc, char **argv) {
+ EOF
+ 
+ if ac_library_find_v 'socket and connect' "" "-lsocket -lnsl" <<EOF
+-int main() { socket(); connect(); return 0; }
++#include <sys/socket.h>
++int main() { socket(0,0,0); connect(0,0,0); return 0; }
+ EOF
+ then :
+ else
+diff --git a/configure.lib b/configure.lib
+index 541177a..672c082 100644
+--- a/configure.lib
++++ b/configure.lib
+@@ -125,7 +125,7 @@ ac_prog_c_compiler_v() {
+   echo 'int main(int argc, char **argv) { return 0; }' >conftest.c
+ 
+   if [ -n "$CC" ]; then
+-    if ac_run $CC -o conftest conftest.c && ac_run ./conftest; then
++    if ac_run $CC -o conftest conftest.c && true ac_run ./conftest; then
+       ac_result "\$CC ($CC)"
+     else
+       ac_result no
+@@ -224,7 +224,7 @@ ac_library_find_v() {
+ }
+ 
+ ac_compile_run() {
+-  ac_link "$@" && ac_run ./conftest
++  ac_link "$@" && true ac_run ./conftest
+ }
+ 
+ ac_grep_cpp() {
diff --git a/ports/libudns/ignore_unknown_options.patch b/ports/libudns/ignore_unknown_options.patch
deleted file mode 100644
index 4adbcf28cc07db..00000000000000
--- a/ports/libudns/ignore_unknown_options.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/configure b/configure
-index dda98b3ab..6f5f8a3c8 100644
---- a/configure	
-+++ b/configure
-@@ -25,10 +25,9 @@ fi
- enable() {
-   opt=`echo "$1" | sed 's/^--[^-]*-//'`
-   case "$opt" in
--    ipv6) ;;
--    *) echo "configure: unrecognized option \`$1'" >&2; exit 1;;
-+    ipv6) eval enable_$opt=$2 ;;
-+    *) echo "configure: unrecognized option \`$1'" >&2;;
-   esac
--  eval enable_$opt=$2
- }
- 
- while [ $# -gt 0 ]; do
-@@ -50,7 +49,7 @@ Optional features (all enabled by default if system supports a feature):
- EOF
-       exit 0
-       ;;
--    *) echo "configure: unknown option \`$1'" >&2; exit 1 ;;
-+    *) echo "configure: unknown option \`$1'" >&2;;
-   esac
-   shift
- done
diff --git a/ports/libudns/portfile.cmake b/ports/libudns/portfile.cmake
index a1169d438dad50..6d2a12c4ca4ab2 100644
--- a/ports/libudns/portfile.cmake
+++ b/ports/libudns/portfile.cmake
@@ -1,10 +1,13 @@
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY) # port needs work
+
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO ortclib/udns
     REF udns_0_4
     SHA512 4df8def718c75872536d42a757237d6c8e0afce8a53aedd7fea73814dc5cf8b5d6c9ae8f01a8cfc76864aa8293c172f08953a6750a66749ba19a3721bb4cf2ec
     HEAD_REF master
-    PATCHES ignore_unknown_options.patch
+    PATCHES
+        configure.patch
 )
 
 vcpkg_configure_make(
@@ -12,7 +15,7 @@ vcpkg_configure_make(
     COPY_SOURCE
 )
 
-vcpkg_build_make()
+vcpkg_build_make(BUILD_TARGET staticlib)
 vcpkg_fixup_pkgconfig()
 # Install
 if(NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL debug)
diff --git a/ports/libudns/vcpkg.json b/ports/libudns/vcpkg.json
index 14593afec6bb2f..535b2a7e0bea66 100644
--- a/ports/libudns/vcpkg.json
+++ b/ports/libudns/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "libudns",
   "version": "0.4",
-  "port-version": 5,
+  "port-version": 6,
   "description": "The DNS library, udns, implements thread-safe stub DNS resolver functionality, which may be used both traditional, syncronous way and asyncronously, with application-supplied event loop.",
   "homepage": "https://github.com/ortclib/udns",
   "supports": "!windows & !osx"
diff --git a/ports/libvmdk/android.patch b/ports/libvmdk/android.patch
new file mode 100644
index 00000000000000..fed62c3aba9f09
--- /dev/null
+++ b/ports/libvmdk/android.patch
@@ -0,0 +1,14 @@
+diff --git a/common/config.h b/common/config.h
+index 04eda99..3565329 100644
+--- a/common/config.h
++++ b/common/config.h
+@@ -128,7 +128,9 @@
+ #define HAVE_IOCTL 1
+ 
+ /* Define if nl_langinfo has CODESET support. */
++#if !(defined(__ANDROID__) && __ANDROID_API__ < 28)
+ #define HAVE_LANGINFO_CODESET 1
++#endif
+ 
+ /* Define to 1 if you have the <langinfo.h> header file. */
+ #define HAVE_LANGINFO_H 1
diff --git a/ports/libvmdk/portfile.cmake b/ports/libvmdk/portfile.cmake
index 89a244783df4cb..715d8b2071740e 100644
--- a/ports/libvmdk/portfile.cmake
+++ b/ports/libvmdk/portfile.cmake
@@ -10,6 +10,8 @@ vcpkg_extract_source_archive(
     SOURCE_PATH
     ARCHIVE "${ARCHIVE}"
     SOURCE_BASE "${VERSION}"
+    PATCHES
+        android.patch
 )
 
 file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}")
diff --git a/ports/libvmdk/vcpkg.json b/ports/libvmdk/vcpkg.json
index e8ab9b1e6f2730..eb0029f99b9685 100644
--- a/ports/libvmdk/vcpkg.json
+++ b/ports/libvmdk/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "libvmdk",
   "version": "20221124",
+  "port-version": 1,
   "description": "Library and tools to access the VMware Virtual Disk (VMDK) format",
   "homepage": "https://github.com/libyal/libvmdk",
   "supports": "!uwp",
diff --git a/ports/mecab/portfile.cmake b/ports/mecab/portfile.cmake
index b288e2ab3ceb75..83dc2cd8925025 100644
--- a/ports/mecab/portfile.cmake
+++ b/ports/mecab/portfile.cmake
@@ -20,6 +20,8 @@ file(COPY "${SOURCE_PATH}/mecab/COPYING" DESTINATION "${SOURCE_PATH}/mecab/src")
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}/mecab/src"
 	WINDOWS_USE_MSBUILD
+	OPTIONS
+        -DCMAKE_CXX_STANDARD=11 # 17 does not allow 'register'
 )
 
 vcpkg_cmake_install()
diff --git a/ports/mecab/vcpkg.json b/ports/mecab/vcpkg.json
index b59d7130ec59e6..ff532e5d69b687 100644
--- a/ports/mecab/vcpkg.json
+++ b/ports/mecab/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "mecab",
   "version-date": "2019-09-25",
-  "port-version": 5,
+  "port-version": 6,
   "description": "A morphological analysis engine based on CRF",
   "supports": "!uwp & !(arm & windows)",
   "dependencies": [
diff --git a/ports/pqp/CMakeLists.txt b/ports/pqp/CMakeLists.txt
index dab50802fbbe8e..418beb84a637fa 100644
--- a/ports/pqp/CMakeLists.txt
+++ b/ports/pqp/CMakeLists.txt
@@ -1,6 +1,8 @@
 cmake_minimum_required(VERSION 3.0)
 project(pqp)
 
+set(CMAKE_CXX_STANDARD 11)
+
 set(SOURCE_CUSTOM_DIR "PQP_v1.3")
 include_directories(${SOURCE_CUSTOM_DIR}/src)
 
diff --git a/ports/pqp/vcpkg.json b/ports/pqp/vcpkg.json
index f8fd0220194c59..6658fe615d225c 100644
--- a/ports/pqp/vcpkg.json
+++ b/ports/pqp/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "pqp",
   "version": "1.3",
-  "port-version": 7,
+  "port-version": 8,
   "description": "a proximity query package",
   "homepage": "https://gamma.cs.unc.edu/SSV/",
   "dependencies": [
diff --git a/ports/smpeg2/CMakeLists.txt b/ports/smpeg2/CMakeLists.txt
index 3c1e11d54fc356..bdbe2d524832fa 100644
--- a/ports/smpeg2/CMakeLists.txt
+++ b/ports/smpeg2/CMakeLists.txt
@@ -1,6 +1,8 @@
 cmake_minimum_required(VERSION 3.25)
 project(smpeg2 CXX)
 
+set(CMAKE_CXX_STANDARD 11) # 17 does not allow 'register'
+
 find_package(SDL2 CONFIG REQUIRED)
 
 if(MSVC)
@@ -66,6 +68,6 @@ install(EXPORT smpeg2-targets
     DESTINATION share/unofficial-smpeg2
 )
 
-if(NOT DEFINED SMPEG_SKIP_HEADERS)
+if(NOT SMPEG_SKIP_HEADERS)
     install(FILES smpeg.h MPEGframe.h DESTINATION include)
 endif()
diff --git a/ports/smpeg2/portfile.cmake b/ports/smpeg2/portfile.cmake
index 570bee625e1422..fe66aa845c384b 100644
--- a/ports/smpeg2/portfile.cmake
+++ b/ports/smpeg2/portfile.cmake
@@ -18,6 +18,9 @@ vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS_DEBUG
         -DSMPEG_SKIP_HEADERS=ON
+    MAYBE_UNUSED_VARIABLES
+        CMAKE_DISABLE_FIND_PACKAGE_ALSA
+        CMAKE_REQUIRE_FIND_PACKAGE_ALSA
 )
 vcpkg_cmake_install()
 vcpkg_copy_pdbs()
diff --git a/ports/smpeg2/vcpkg.json b/ports/smpeg2/vcpkg.json
index 5b8c653bde09b0..762a8e30284636 100644
--- a/ports/smpeg2/vcpkg.json
+++ b/ports/smpeg2/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "smpeg2",
   "version": "2.0.0",
-  "port-version": 10,
+  "port-version": 11,
   "description": "SDL MPEG Player Library",
   "homepage": "https://www.libsdl.org/projects/smpeg/",
   "license": null,
diff --git a/ports/spaceland/portfile.cmake b/ports/spaceland/portfile.cmake
index cad09f42025b06..2b447f9ffb84d8 100644
--- a/ports/spaceland/portfile.cmake
+++ b/ports/spaceland/portfile.cmake
@@ -15,10 +15,8 @@ vcpkg_extract_source_archive(
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
     DISABLE_PARALLEL_CONFIGURE
-	OPTIONS
-		-DSL_TEST=OFF
-		-DSL_INSTALL_SLFIND_MODULE=OFF
-	OPTIONS_DEBUG
+    OPTIONS
+        -DCMAKE_CXX_STANDARD=11 # 17 does not allow 'register'
         -DSL_TEST=OFF
         -DSL_INSTALL_SLFIND_MODULE=OFF
 )
diff --git a/ports/spaceland/vcpkg.json b/ports/spaceland/vcpkg.json
index f03ae94871cc91..1e97f93c0e6fd5 100644
--- a/ports/spaceland/vcpkg.json
+++ b/ports/spaceland/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "spaceland",
   "version": "7.8.2",
-  "port-version": 8,
+  "port-version": 9,
   "description": "Spaceland Lib (sl) is a suite for geometric computation, specifically adapted to OpenGL.",
   "dependencies": [
     {
diff --git a/ports/stlab/cross-build.patch b/ports/stlab/cross-build.patch
new file mode 100644
index 00000000000000..c819623678fc24
--- /dev/null
+++ b/ports/stlab/cross-build.patch
@@ -0,0 +1,31 @@
+diff --git a/cmake/StlabUtil.cmake b/cmake/StlabUtil.cmake
+index 3b6d21e..e8d81d7 100644
+--- a/cmake/StlabUtil.cmake
++++ b/cmake/StlabUtil.cmake
+@@ -2,7 +2,7 @@
+ # functionality useful for stlab builds.
+ 
+ include( CheckCXXSymbolExists )
+-include( CheckCXXSourceRuns )
++include( CheckCXXSourceCompiles )
+ 
+ # Determine if the selected C++ compiler has functional versions of
+ # 'std::variant' and 'std::optional'. Set the specified 'result_var' to 'TRUE'
+@@ -10,7 +10,7 @@ include( CheckCXXSourceRuns )
+ # this check consists of a smoke test and does not check all the ways these
+ # library components may be deficient.
+ function( stlab_check_disfunctional_variant_optional result_var )
+-  check_cxx_source_runs( "
++  check_cxx_source_compiles( "
+     #include <variant>
+     #include <optional>
+ 
+@@ -33,7 +33,7 @@ endfunction()
+ # and 'FALSE' otherwise. Note that this check consists of a smoke test and does
+ # not check all the ways this feature may be deficient.
+ function( stlab_check_disfunctional_coroutines result_var )
+-  check_cxx_source_runs( "
++  check_cxx_source_compiles( "
+ #include <concepts>
+ #include <coroutine>
+ #include <exception>
diff --git a/ports/stlab/portfile.cmake b/ports/stlab/portfile.cmake
index d05ff2c89d8edd..8c96e3f33b47f1 100644
--- a/ports/stlab/portfile.cmake
+++ b/ports/stlab/portfile.cmake
@@ -4,6 +4,8 @@ vcpkg_from_github(
     REF "v${VERSION}"
     SHA512 ceed4fffc381bebd5456d56e8f9d84094da2a9994c8be60e9c1fe4a72ae5f2c398448169927af1439615b55c549332dfe4c38a2b3b8bdf84e3c550fd14bf125c
     HEAD_REF main
+    PATCHES
+        cross-build.patch
 )
 
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
diff --git a/ports/stlab/vcpkg.json b/ports/stlab/vcpkg.json
index a4049bce60c603..758e715f81c631 100644
--- a/ports/stlab/vcpkg.json
+++ b/ports/stlab/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "stlab",
   "version": "1.7.1",
-  "port-version": 1,
+  "port-version": 2,
   "description": [
     "stlab is the ongoing work of what was Adobe Software Technology Lab.",
     "The Concurrency library provides futures and channels, high level constructs for implementing algorithms that eases the use of multiple CPU cores while minimizing contention. This library solves several problems of the C++11 and C++17 TS futures."
diff --git a/ports/tmxparser/portfile.cmake b/ports/tmxparser/portfile.cmake
index a909d7a6ac907a..be0f05f48068b2 100644
--- a/ports/tmxparser/portfile.cmake
+++ b/ports/tmxparser/portfile.cmake
@@ -12,6 +12,7 @@ vcpkg_from_github(
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
+        -DCMAKE_CXX_STANDARD=11 # 17 removes `std::ptr_fun`
         -DCMAKE_REQUIRE_FIND_PACKAGE_ZLIB=ON
 )
 
diff --git a/ports/tmxparser/vcpkg.json b/ports/tmxparser/vcpkg.json
index 7b8becf2b158a1..6cf05c5e804bd8 100644
--- a/ports/tmxparser/vcpkg.json
+++ b/ports/tmxparser/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "tmxparser",
   "version-date": "2019-10-14",
+  "port-version": 1,
   "description": "C++11 library for parsing the maps generated by the Map Editor called Tiled.",
   "license": "BSD-2-Clause",
   "supports": "!windows",
diff --git a/ports/xqilla/CMakeLists.txt b/ports/xqilla/CMakeLists.txt
index 85ecad2182f1f6..1a9445ff2fc412 100644
--- a/ports/xqilla/CMakeLists.txt
+++ b/ports/xqilla/CMakeLists.txt
@@ -9,6 +9,8 @@ endif()
 
 project(xqilla C CXX)
 
+set(CMAKE_CXX_STANDARD 11) # 17 does not allow 'register'
+
 add_library(xqilla  
 ./src/exceptions/XQException.cpp
 ./src/exceptions/XQillaException.cpp
diff --git a/ports/xqilla/vcpkg.json b/ports/xqilla/vcpkg.json
index 3c0ec55090ab18..e3fe221269a188 100644
--- a/ports/xqilla/vcpkg.json
+++ b/ports/xqilla/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "xqilla",
   "version": "2.3.4",
-  "port-version": 2,
+  "port-version": 3,
   "description": "XQuery and XPath 2 library",
   "homepage": "http://xqilla.sourceforge.net/HomePage",
   "license": "Apache-2.0",
diff --git a/scripts/azure-pipelines/android/azure-pipelines.yml b/scripts/azure-pipelines/android/azure-pipelines.yml
index 0a55478848fc5f..85922e2f184366 100644
--- a/scripts/azure-pipelines/android/azure-pipelines.yml
+++ b/scripts/azure-pipelines/android/azure-pipelines.yml
@@ -37,6 +37,8 @@ jobs:
     value: $[ dependencies.mintsas.outputs['mintsasstep.X_VCPKG_ASSET_SOURCES'] ]
   - name: X_VCPKG_BINARY_SOURCE_STUB
     value: $[ dependencies.mintsas.outputs['mintsasstep.X_VCPKG_BINARY_SOURCE_STUB'] ]
+  - name: ANDROID_NDK_HOME
+    value: /android-ndk-r26d
   steps:
     # Note: /mnt is the Azure machines' temporary disk.
   - bash: |
@@ -88,6 +90,7 @@ jobs:
         --mount type=bind,source=$(WORKING_ROOT)/failure-logs,target=/vcpkg/failure-logs \
         --mount type=bind,source=/mnt/vcpkg-ci,target=/mnt/vcpkg-ci \
         --env X_VCPKG_ASSET_SOURCES="$(X_VCPKG_ASSET_SOURCES)" \
+        --env ANDROID_NDK_HOME="${{ variables.ANDROID_NDK_HOME }}" \
         ${{ parameters.dockerImage }} \
         pwsh \
          -File /vcpkg/scripts/azure-pipelines/test-modified-ports.ps1 \
diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt
index e189d0ea03870a..6efa2e890ca013 100644
--- a/scripts/ci.baseline.txt
+++ b/scripts/ci.baseline.txt
@@ -285,6 +285,10 @@ cserialport:arm64-android=fail
 cserialport:x64-android=fail
 ctbench:x64-osx=fail
 ctbench:arm64-osx=fail
+# Needs android-28 (hidden before NDK r26)
+cyclonedds:arm-neon-android=fail
+cyclonedds:arm64-android=fail
+cyclonedds:x64-android=fail
 czmq:arm-neon-android=fail
 czmq:arm64-android=fail
 czmq:x64-android=fail
@@ -522,6 +526,8 @@ jinja2cpplight:arm64-android=fail
 jinja2cpplight:x64-android=fail
 kfr:x64-android=fail
 kfr:x64-uwp=fail
+# needs android-24
+kubazip:arm-neon-android=fail
 lastools:arm-neon-android=fail
 lastools:arm64-android=fail
 lastools:x64-android=fail
@@ -536,10 +542,18 @@ libaiff:x64-linux=fail
 libbson:arm-neon-android=fail
 libbson:arm64-android=fail
 libbson:x64-android=fail
+# needs android-28
+libcaer:arm-neon-android=fail
+libcaer:arm64-android=fail
+libcaer:x64-android=fail
 libcanberra:arm-neon-android=fail
 libcanberra:arm64-android=fail
 libcanberra:x64-android=fail
 libcerf:x64-windows-static-md=fail
+# needs android-24
+libconfuse:arm-neon-android=fail
+libconfuse:arm64-android=fail
+libconfuse:x64-android=fail
 libcoro:arm-neon-android=fail
 libcoro:arm64-android=fail
 libcoro:x64-android=fail
@@ -554,6 +568,8 @@ libcrafter:x64-android=fail
 libdc1394:arm-neon-android=fail
 libdc1394:x64-android=fail
 libdc1394:arm64-android=fail
+# 32-bit needs android-24
+libflac:arm-neon-android=fail
 # Fails to build due to incompatible delcaration of select in macOS 14.2
 libgo:x64-osx=fail
 libgo:x64-android=fail
@@ -574,6 +590,10 @@ libhdfs3:x64-android=fail
 libhdfs3:x64-linux=fail
 libhdfs3:x64-osx=fail
 libhdfs3:arm64-osx=fail
+# needs android-24
+libimobiledevice-glue:arm-neon-android=fail
+libimobiledevice-glue:arm64-android=fail
+libimobiledevice-glue:x64-android=fail
 # 120 min build time for libjxl arm64-uwp-rel, reason unknown
 libjxl:arm64-uwp=skip
 liblo:arm-neon-android=fail
@@ -635,7 +655,7 @@ libqcow:x64-windows=skip
 libqcow:x64-linux=skip
 libqcow:x86-windows=skip
 libqcow:arm64-windows=skip
-# needs ftello
+# 32-bit needs android-24
 libraw:arm-neon-android=fail
 # Conflicts with openssl
 libressl:arm-neon-android=skip
@@ -661,6 +681,10 @@ libtomcrypt:arm64-windows=fail
 libtomcrypt:arm64-uwp=fail
 libusb-win32:arm64-uwp=fail
 libusb-win32:x64-uwp=fail
+# needs android-26
+libvhdi:arm-neon-android=fail
+libvhdi:arm64-android=fail
+libvhdi:x64-android=fail
 #Skip detection to avoid upstream remove older releases
 libvmdk:arm-neon-android        =skip   # upstream issue https://github.com/microsoft/vcpkg/pull/13765#issuecomment-699710253
 libvmdk:arm64-android           =skip
@@ -703,6 +727,8 @@ log4cpp:x64-linux=fail # dynamic exception specifications
 loguru:arm-neon-android=fail
 loguru:arm64-android=fail
 loguru:x64-android=fail
+# 32-bit needs android-24
+lua:arm-neon-android=fail
 magma:x64-linux=fail
 mchehab-zbar:arm-neon-android=fail
 mchehab-zbar:arm64-android=fail
@@ -1181,6 +1207,10 @@ usd:x64-windows-static-md=skip
 usd:x64-linux=skip
 usd:x64-osx=skip
 usd:x86-windows=skip
+# needs android-24
+usrsctp:arm-neon-android=fail
+usrsctp:arm64-android=fail
+usrsctp:x64-android=fail
 # the version of v8 we have in the repo doesn't support VS2022
 v8:x64-android=fail
 v8:x64-windows-static-md=fail
@@ -1220,6 +1250,8 @@ wasmedge:arm64-android=fail
 wasmedge:x64-android=fail
 wavpack:arm-neon-android=fail
 wavpack:x64-android=fail
+# 32-bit needs android-24
+wcslib:arm-neon-android=fail
 # Collides with libpcap -> similar headers
 winpcap:x64-windows = skip
 winpcap:x86-windows = skip
diff --git a/versions/baseline.json b/versions/baseline.json
index 904fa5270a661b..a9b0503fd01d1d 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -1526,7 +1526,7 @@
     },
     "ccfits": {
       "baseline": "2.5",
-      "port-version": 11
+      "port-version": 12
     },
     "cctag": {
       "baseline": "1.0.2",
@@ -1546,7 +1546,7 @@
     },
     "cello": {
       "baseline": "2019-07-23",
-      "port-version": 3
+      "port-version": 4
     },
     "cereal": {
       "baseline": "1.3.2",
@@ -1566,7 +1566,7 @@
     },
     "cgicc": {
       "baseline": "3.2.20",
-      "port-version": 0
+      "port-version": 1
     },
     "cglm": {
       "baseline": "0.9.4",
@@ -1606,7 +1606,7 @@
     },
     "chmlib": {
       "baseline": "0.40",
-      "port-version": 7
+      "port-version": 8
     },
     "chromaprint": {
       "baseline": "1.5.1",
@@ -1674,7 +1674,7 @@
     },
     "clfft": {
       "baseline": "2.12.2",
-      "port-version": 6
+      "port-version": 7
     },
     "cli": {
       "baseline": "2.1.0",
@@ -2014,7 +2014,7 @@
     },
     "crfsuite": {
       "baseline": "2020-08-27",
-      "port-version": 0
+      "port-version": 1
     },
     "croncpp": {
       "baseline": "2023-03-30",
@@ -2330,7 +2330,7 @@
     },
     "dp-thread-pool": {
       "baseline": "0.6.2",
-      "port-version": 0
+      "port-version": 1
     },
     "dpdk": {
       "baseline": "22.07",
@@ -2526,7 +2526,7 @@
     },
     "entityx": {
       "baseline": "1.3.0",
-      "port-version": 5
+      "port-version": 6
     },
     "entt": {
       "baseline": "3.13.2",
@@ -2838,7 +2838,7 @@
     },
     "freeglut": {
       "baseline": "3.4.0",
-      "port-version": 1
+      "port-version": 2
     },
     "freeimage": {
       "baseline": "3.18.0",
@@ -2850,7 +2850,7 @@
     },
     "freerdp": {
       "baseline": "3.4.0",
-      "port-version": 1
+      "port-version": 2
     },
     "freetds": {
       "baseline": "1.3.10",
@@ -3714,7 +3714,7 @@
     },
     "itpp": {
       "baseline": "4.3.1",
-      "port-version": 10
+      "port-version": 11
     },
     "itsy-bitsy": {
       "baseline": "2022-08-02",
@@ -3866,7 +3866,7 @@
     },
     "keccak-tiny": {
       "baseline": "2014-09-08",
-      "port-version": 0
+      "port-version": 1
     },
     "kenlm": {
       "baseline": "20230531",
@@ -4270,7 +4270,7 @@
     },
     "libcopp": {
       "baseline": "2.2.0",
-      "port-version": 0
+      "port-version": 1
     },
     "libcoro": {
       "baseline": "0.11.1",
@@ -4690,7 +4690,7 @@
     },
     "libmodplug": {
       "baseline": "0.8.9.0",
-      "port-version": 11
+      "port-version": 12
     },
     "libmorton": {
       "baseline": "0.2.12",
@@ -4746,7 +4746,7 @@
     },
     "libodb": {
       "baseline": "2.4.0",
-      "port-version": 11
+      "port-version": 12
     },
     "libodb-boost": {
       "baseline": "2.4.0",
@@ -4758,11 +4758,11 @@
     },
     "libodb-pgsql": {
       "baseline": "2.4.0",
-      "port-version": 7
+      "port-version": 8
     },
     "libodb-sqlite": {
       "baseline": "2.4.0",
-      "port-version": 11
+      "port-version": 12
     },
     "libofx": {
       "baseline": "0.10.9",
@@ -4842,7 +4842,7 @@
     },
     "libpopt": {
       "baseline": "1.16",
-      "port-version": 16
+      "port-version": 17
     },
     "libpq": {
       "baseline": "16.2",
@@ -5106,11 +5106,11 @@
     },
     "libudis86": {
       "baseline": "2018-01-28",
-      "port-version": 3
+      "port-version": 4
     },
     "libudns": {
       "baseline": "0.4",
-      "port-version": 5
+      "port-version": 6
     },
     "libui": {
       "baseline": "2018-11-03",
@@ -5170,7 +5170,7 @@
     },
     "libvmdk": {
       "baseline": "20221124",
-      "port-version": 0
+      "port-version": 1
     },
     "libvorbis": {
       "baseline": "1.3.7",
@@ -5694,7 +5694,7 @@
     },
     "mecab": {
       "baseline": "2019-09-25",
-      "port-version": 5
+      "port-version": 6
     },
     "memorymodule": {
       "baseline": "2019-12-31",
@@ -6974,7 +6974,7 @@
     },
     "pqp": {
       "baseline": "1.3",
-      "port-version": 7
+      "port-version": 8
     },
     "pravila00-enum-string": {
       "baseline": "2023-10-16",
@@ -8218,7 +8218,7 @@
     },
     "smpeg2": {
       "baseline": "2.0.0",
-      "port-version": 10
+      "port-version": 11
     },
     "snap7": {
       "baseline": "1.4.2",
@@ -8306,7 +8306,7 @@
     },
     "spaceland": {
       "baseline": "7.8.2",
-      "port-version": 8
+      "port-version": 9
     },
     "span-lite": {
       "baseline": "0.11.0",
@@ -8482,7 +8482,7 @@
     },
     "stlab": {
       "baseline": "1.7.1",
-      "port-version": 1
+      "port-version": 2
     },
     "stormlib": {
       "baseline": "9.25",
@@ -8822,7 +8822,7 @@
     },
     "tmxparser": {
       "baseline": "2019-10-14",
-      "port-version": 0
+      "port-version": 1
     },
     "toml11": {
       "baseline": "3.8.1",
@@ -9566,7 +9566,7 @@
     },
     "xqilla": {
       "baseline": "2.3.4",
-      "port-version": 2
+      "port-version": 3
     },
     "xsimd": {
       "baseline": "12.1.1",
diff --git a/versions/c-/ccfits.json b/versions/c-/ccfits.json
index e7d066a886377f..6ecb16b2733657 100644
--- a/versions/c-/ccfits.json
+++ b/versions/c-/ccfits.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "eb6cf964f54147b38cb3bf2df9f70700d733ae25",
+      "version": "2.5",
+      "port-version": 12
+    },
     {
       "git-tree": "69b00d0813b3ec9b7b963f07cf570cca5a8e2fd5",
       "version": "2.5",
diff --git a/versions/c-/cello.json b/versions/c-/cello.json
index d9f7cb2ec7d6d8..4ed1b958709f03 100644
--- a/versions/c-/cello.json
+++ b/versions/c-/cello.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "77bec04318495925112bdf302bafc14956dde6c9",
+      "version-date": "2019-07-23",
+      "port-version": 4
+    },
     {
       "git-tree": "999cf1c190507b8494ddff1188f613bd4b6616ce",
       "version-date": "2019-07-23",
diff --git a/versions/c-/cgicc.json b/versions/c-/cgicc.json
index 8eb95ea7902e48..47fe8b35c8bb06 100644
--- a/versions/c-/cgicc.json
+++ b/versions/c-/cgicc.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "d14a5cb5e4d6f0606e2071d1c94262916a45fd6b",
+      "version": "3.2.20",
+      "port-version": 1
+    },
     {
       "git-tree": "f9e35a8d1360fc1eb4f323ef22e461d0e5926a90",
       "version": "3.2.20",
diff --git a/versions/c-/chmlib.json b/versions/c-/chmlib.json
index 0f191f67788927..4ed88d574e3043 100644
--- a/versions/c-/chmlib.json
+++ b/versions/c-/chmlib.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "a737b2f42b3bcb4992f51baac9a1a9254691a835",
+      "version": "0.40",
+      "port-version": 8
+    },
     {
       "git-tree": "bfe4841377722e56ccb7817f6ad93fcf24eab13b",
       "version": "0.40",
diff --git a/versions/c-/clfft.json b/versions/c-/clfft.json
index 3efe93477858f6..1e66c3d3090ab5 100644
--- a/versions/c-/clfft.json
+++ b/versions/c-/clfft.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "d0b090c1d13a7faf8136d73853376fc1dee4cc68",
+      "version": "2.12.2",
+      "port-version": 7
+    },
     {
       "git-tree": "4acb8a5a455beee82cacccf5b72e6c6aa8d8c6a7",
       "version": "2.12.2",
diff --git a/versions/c-/crfsuite.json b/versions/c-/crfsuite.json
index f81e1ca2c12ca0..e70b02249742a9 100644
--- a/versions/c-/crfsuite.json
+++ b/versions/c-/crfsuite.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "fadb490144cc26196613b2ca3c05f2ebff67026b",
+      "version-date": "2020-08-27",
+      "port-version": 1
+    },
     {
       "git-tree": "8f290a396def84e4a24ca49e29d17d7218b8e410",
       "version-date": "2020-08-27",
diff --git a/versions/d-/dp-thread-pool.json b/versions/d-/dp-thread-pool.json
index 47de052e063f31..cff54f60ba0318 100644
--- a/versions/d-/dp-thread-pool.json
+++ b/versions/d-/dp-thread-pool.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "b1d9e561e042312a0001dfbcb150bec1f4a40e98",
+      "version": "0.6.2",
+      "port-version": 1
+    },
     {
       "git-tree": "a8e355c1d995271f753fc560da82f65a3f5f8f02",
       "version": "0.6.2",
diff --git a/versions/e-/entityx.json b/versions/e-/entityx.json
index 1545ee642cc2e7..06710748df73c6 100644
--- a/versions/e-/entityx.json
+++ b/versions/e-/entityx.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "76f0e44ee706058d53a79eed3b1ba7df92ef2f35",
+      "version": "1.3.0",
+      "port-version": 6
+    },
     {
       "git-tree": "ad5351451933af0b68354f8ff7f018017c48d5c5",
       "version": "1.3.0",
diff --git a/versions/f-/freeglut.json b/versions/f-/freeglut.json
index 81073ba5ce8f3e..451d0dfa3f0167 100644
--- a/versions/f-/freeglut.json
+++ b/versions/f-/freeglut.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "4f94eb2ebe5a99dc25049de07201fbd5fc23ccbe",
+      "version": "3.4.0",
+      "port-version": 2
+    },
     {
       "git-tree": "f948f7bed9cac147c0687d4b170b99bc6b59f157",
       "version": "3.4.0",
diff --git a/versions/f-/freerdp.json b/versions/f-/freerdp.json
index 72f0c14180030e..223f6205c9b2ed 100644
--- a/versions/f-/freerdp.json
+++ b/versions/f-/freerdp.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "adae65a68573f62c50bfbd2a3df9a2f341ee7787",
+      "version": "3.4.0",
+      "port-version": 2
+    },
     {
       "git-tree": "f85a10d88842fb71133557fba557094a71ea94c7",
       "version": "3.4.0",
diff --git a/versions/i-/itpp.json b/versions/i-/itpp.json
index 44d121b8f57fbb..993791ac59b2d4 100644
--- a/versions/i-/itpp.json
+++ b/versions/i-/itpp.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "deb799807d61211af72ccc732eea3950b2d52b4c",
+      "version-semver": "4.3.1",
+      "port-version": 11
+    },
     {
       "git-tree": "bb2b4a2f0b7fed9c43bf3587695b1c8c99079e32",
       "version-semver": "4.3.1",
diff --git a/versions/k-/keccak-tiny.json b/versions/k-/keccak-tiny.json
index 1a1c9c5afaecba..78c139ad803647 100644
--- a/versions/k-/keccak-tiny.json
+++ b/versions/k-/keccak-tiny.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "bc08abcfa95ff215f36528c540d82bcbecab4ee1",
+      "version-date": "2014-09-08",
+      "port-version": 1
+    },
     {
       "git-tree": "068d9cedaf0a577eabe71f008037116929435931",
       "version-date": "2014-09-08",
diff --git a/versions/l-/libcopp.json b/versions/l-/libcopp.json
index 81a62990f80a92..69e8642a86f374 100644
--- a/versions/l-/libcopp.json
+++ b/versions/l-/libcopp.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "e0eacb882e582301599a4cd6e9d06b4e435a1561",
+      "version": "2.2.0",
+      "port-version": 1
+    },
     {
       "git-tree": "45c928d0a5c7281930ae8f7cd424a939da766f1a",
       "version": "2.2.0",
diff --git a/versions/l-/libmodplug.json b/versions/l-/libmodplug.json
index d05d041b32c530..3008435d2b8be3 100644
--- a/versions/l-/libmodplug.json
+++ b/versions/l-/libmodplug.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "840fa5f79ab3d2f289308845958294759213d69e",
+      "version": "0.8.9.0",
+      "port-version": 12
+    },
     {
       "git-tree": "d9af89d39aa5f14bf7314ebc51bc74df26ff2a3b",
       "version": "0.8.9.0",
diff --git a/versions/l-/libodb-pgsql.json b/versions/l-/libodb-pgsql.json
index 3f6d2a34c52994..e1ce8216474600 100644
--- a/versions/l-/libodb-pgsql.json
+++ b/versions/l-/libodb-pgsql.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "052d127643b92d10de1f4b1f5884787c4bafa92b",
+      "version": "2.4.0",
+      "port-version": 8
+    },
     {
       "git-tree": "793728785becb5235725430c432d1acfb9496cdb",
       "version": "2.4.0",
diff --git a/versions/l-/libodb-sqlite.json b/versions/l-/libodb-sqlite.json
index ea7a506551848e..4f5e65456b8133 100644
--- a/versions/l-/libodb-sqlite.json
+++ b/versions/l-/libodb-sqlite.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "02dc624090eb462a27ba05eb1f0851911c724d95",
+      "version": "2.4.0",
+      "port-version": 12
+    },
     {
       "git-tree": "99e10de8845c5171477dc00ef7b2afab6d0a40f7",
       "version": "2.4.0",
diff --git a/versions/l-/libodb.json b/versions/l-/libodb.json
index 0bbda9fa8812ca..aab684b6d6779d 100644
--- a/versions/l-/libodb.json
+++ b/versions/l-/libodb.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "72eba153a6a64136e4d3acc4145f6a0c27b333f7",
+      "version": "2.4.0",
+      "port-version": 12
+    },
     {
       "git-tree": "daca6d80b91b4d1c0d94a3b8a5553e6c2e9aa64f",
       "version": "2.4.0",
diff --git a/versions/l-/libpopt.json b/versions/l-/libpopt.json
index c6b6c0d8761cbb..03874d3c35a67a 100644
--- a/versions/l-/libpopt.json
+++ b/versions/l-/libpopt.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "2f73cf4ebdadeac639e83a83e2acc8766ed597c3",
+      "version": "1.16",
+      "port-version": 17
+    },
     {
       "git-tree": "0610bc947719ba9009a8e99444332fd27d315033",
       "version": "1.16",
diff --git a/versions/l-/libudis86.json b/versions/l-/libudis86.json
index 1528b0f4dc512c..d0862ebdd85fda 100644
--- a/versions/l-/libudis86.json
+++ b/versions/l-/libudis86.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "8c8ceebe8069429a1f3df2c57e36ce032b73bb53",
+      "version-date": "2018-01-28",
+      "port-version": 4
+    },
     {
       "git-tree": "db5757ef908acdfdb58b06da531d1a10aba11f69",
       "version-date": "2018-01-28",
diff --git a/versions/l-/libudns.json b/versions/l-/libudns.json
index 5eb542c70cd610..d8768005bb461f 100644
--- a/versions/l-/libudns.json
+++ b/versions/l-/libudns.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "3fbf0256b3d800d6d8ad4b905a05c4533ba82d8a",
+      "version": "0.4",
+      "port-version": 6
+    },
     {
       "git-tree": "b5b2efa89aac8ab7f97487cf72ed8aa489b2c6af",
       "version": "0.4",
diff --git a/versions/l-/libvmdk.json b/versions/l-/libvmdk.json
index e69c40ab703845..6efd612a10eaa0 100644
--- a/versions/l-/libvmdk.json
+++ b/versions/l-/libvmdk.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "83b05d9f7856924b78b137ce5f048c74e995e36d",
+      "version": "20221124",
+      "port-version": 1
+    },
     {
       "git-tree": "2065c045d5787d9fff6469d31fe6bbe2f925d367",
       "version": "20221124",
diff --git a/versions/m-/mecab.json b/versions/m-/mecab.json
index 8c33858cbe5662..363fcb2596feb4 100644
--- a/versions/m-/mecab.json
+++ b/versions/m-/mecab.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "60fff785f597952c284a1538d04b9b1ce4f3a906",
+      "version-date": "2019-09-25",
+      "port-version": 6
+    },
     {
       "git-tree": "66081fbeecacd152e3964b0f64f25e0f0b10d461",
       "version-date": "2019-09-25",
diff --git a/versions/p-/pqp.json b/versions/p-/pqp.json
index f52de416069c00..d8dff8bb3332cd 100644
--- a/versions/p-/pqp.json
+++ b/versions/p-/pqp.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "fd068435ebeeb2238fab7fcac21ce337344a30a7",
+      "version": "1.3",
+      "port-version": 8
+    },
     {
       "git-tree": "4260f6ff5614f3a8e85aeb773224362635b47337",
       "version": "1.3",
diff --git a/versions/s-/smpeg2.json b/versions/s-/smpeg2.json
index 6c7c9d6ff7d12e..c90796d6dbb4a8 100644
--- a/versions/s-/smpeg2.json
+++ b/versions/s-/smpeg2.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "a9dbc0195e8a7aa17a0be44e735f82ae4bc00bf3",
+      "version": "2.0.0",
+      "port-version": 11
+    },
     {
       "git-tree": "e72c715fb637688426feaa616ab0bc07c7758f8c",
       "version": "2.0.0",
diff --git a/versions/s-/spaceland.json b/versions/s-/spaceland.json
index 83a8d7825277c7..f16d1fa82b6543 100644
--- a/versions/s-/spaceland.json
+++ b/versions/s-/spaceland.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "c90ee76ea6a1d48d54be7f968df9a4847fd846de",
+      "version": "7.8.2",
+      "port-version": 9
+    },
     {
       "git-tree": "261556139a5816276568790ac8b8c7eba3b58f72",
       "version": "7.8.2",
diff --git a/versions/s-/stlab.json b/versions/s-/stlab.json
index d2f45242d54c37..c7181362348bf7 100644
--- a/versions/s-/stlab.json
+++ b/versions/s-/stlab.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "929ef11a6dc1df85348385786c621e0674c5c903",
+      "version": "1.7.1",
+      "port-version": 2
+    },
     {
       "git-tree": "abb069e17e53344d850ff3b01ebf636a1734a6e0",
       "version": "1.7.1",
diff --git a/versions/t-/tmxparser.json b/versions/t-/tmxparser.json
index 19c9d78d2ef7a5..203c789b50d68f 100644
--- a/versions/t-/tmxparser.json
+++ b/versions/t-/tmxparser.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "6cfca44e83f19eb68714ac2211026c914a255fd9",
+      "version-date": "2019-10-14",
+      "port-version": 1
+    },
     {
       "git-tree": "a3ac6698af14ebaa58de6ad3d5173ea54dc94ba9",
       "version-date": "2019-10-14",
diff --git a/versions/x-/xqilla.json b/versions/x-/xqilla.json
index 36e81f327fbca2..3415cf5683b994 100644
--- a/versions/x-/xqilla.json
+++ b/versions/x-/xqilla.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "c5b161b57b6ff9c1c2131514506ac05ef1f76e77",
+      "version": "2.3.4",
+      "port-version": 3
+    },
     {
       "git-tree": "1e825e06e975c55c3a0811107d2488b32b1f600b",
       "version": "2.3.4",