diff --git a/ports/gdal/dependency_win.cmake b/ports/gdal/dependency_win.cmake
index c3be0f5626..be060ce8b0 100644
--- a/ports/gdal/dependency_win.cmake
+++ b/ports/gdal/dependency_win.cmake
@@ -114,7 +114,7 @@ macro(find_dependency_win)
     if("hdf5" IN_LIST FEATURES)
         file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}" HDF5_DIR)
         x_vcpkg_pkgconfig_get_modules(PREFIX HDF5 MODULES --msvc-syntax hdf5 LIBS)
-        list(APPEND NMAKE_OPTIONS "HDF5_DIR=${CURRENT_INSTALLED_DIR}" "HDF5_PLUGIN=NO")
+        list(APPEND NMAKE_OPTIONS "HDF5_DIR=${HDF5_DIR}" "HDF5_PLUGIN=NO")
         list(APPEND NMAKE_OPTIONS_REL "HDF5_LIB=${HDF5_LIBS_RELEASE}")
         list(APPEND NMAKE_OPTIONS_DBG "HDF5_LIB=${HDF5_LIBS_DEBUG}")
         if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
@@ -160,9 +160,9 @@ macro(find_dependency_win)
         file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/include" CRYPTOPP_INCLUDE)
         file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/cryptopp-static.lib" CRYPTOPP_LIBRARY_REL)
         file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/cryptopp-static.lib" CRYPTOPP_LIBRARY_DBG)
-        list(APPEND NMAKE_OPTIONS CRYPTOPP_INC=-I${CRYPTOPP_INCLUDE})
-        list(APPEND NMAKE_OPTIONS_REL CRYPTOPP_LIB=${CRYPTOPP_LIBRARY_REL})
-        list(APPEND NMAKE_OPTIONS_DBG CRYPTOPP_LIB=${CRYPTOPP_LIBRARY_DBG})
+        list(APPEND NMAKE_OPTIONS "CRYPTOPP_INC=-I${CRYPTOPP_INCLUDE}")
+        list(APPEND NMAKE_OPTIONS_REL "CRYPTOPP_LIB=${CRYPTOPP_LIBRARY_REL}")
+        list(APPEND NMAKE_OPTIONS_DBG "CRYPTOPP_LIB=${CRYPTOPP_LIBRARY_DBG}")
     endif()
 
     # freexl
@@ -170,17 +170,17 @@ macro(find_dependency_win)
         file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/include" FREEXL_INCLUDE)
         file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/freexl.lib" FREEXL_LIBRARY_REL)
         file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/freexl.lib" FREEXL_LIBRARY_DBG)
-        list(APPEND NMAKE_OPTIONS FREEXL_CFLAGS=-I${FREEXL_INCLUDE})
-        list(APPEND NMAKE_OPTIONS_REL FREEXL_LIBS=${FREEXL_LIBRARY_REL})
-        list(APPEND NMAKE_OPTIONS_DBG FREEXL_LIBS=${FREEXL_LIBRARY_DBG})
+        list(APPEND NMAKE_OPTIONS "FREEXL_CFLAGS=-I${FREEXL_INCLUDE}")
+        list(APPEND NMAKE_OPTIONS_REL "FREEXL_LIBS=${FREEXL_LIBRARY_REL}")
+        list(APPEND NMAKE_OPTIONS_DBG "FREEXL_LIBS=${FREEXL_LIBRARY_DBG}")
     endif()
 
     # libkml
     if("system-libraries" IN_LIST FEATURES AND EXISTS "${CURRENT_INSTALLED_DIR}/lib/kmlbase.lib")
         file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}" LIBKML_DIR)
-        list(APPEND NMAKE_OPTIONS LIBKML_DIR=${LIBKML_DIR})
+        list(APPEND NMAKE_OPTIONS "LIBKML_DIR=${LIBKML_DIR}")
         file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/include" LIBKML_INCLUDE)
-        list(APPEND NMAKE_OPTIONS LIBKML_INCLUDE=-I${LIBKML_INCLUDE})
+        list(APPEND NMAKE_OPTIONS "LIBKML_INCLUDE=-I${LIBKML_INCLUDE}")
         file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/kmlbase.lib" KMLBASE_REL)
         file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/kmlbase.lib" KMLBASE_DBG)
         file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/kmlconvenience.lib" KMLCONVENIENCE_REL)
@@ -210,10 +210,10 @@ macro(find_dependency_win)
         file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/xerces-c_3.lib" XERCES_LIBRARY_REL)
         file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/xerces-c_3D.lib" XERCES_LIBRARY_DBG)
         list(APPEND NMAKE_OPTIONS ILI_ENABLED=YES)
-        list(APPEND NMAKE_OPTIONS XERCES_DIR=${XERCES_DIR})
+        list(APPEND NMAKE_OPTIONS "XERCES_DIR=${XERCES_DIR}")
         list(APPEND NMAKE_OPTIONS "XERCES_INCLUDE=-I${XERCES_INCLUDE} -I${XERCES_INCLUDE}/xercesc")
-        list(APPEND NMAKE_OPTIONS_REL XERCES_LIB=${XERCES_LIBRARY_REL})
-        list(APPEND NMAKE_OPTIONS_DBG XERCES_LIB=${XERCES_LIBRARY_DBG})
+        list(APPEND NMAKE_OPTIONS_REL "XERCES_LIB=${XERCES_LIBRARY_REL}")
+        list(APPEND NMAKE_OPTIONS_DBG "XERCES_LIB=${XERCES_LIBRARY_DBG}")
     endif()
 
 endmacro()
diff --git a/ports/gdal/vcpkg.json b/ports/gdal/vcpkg.json
index f32f73cbe4..e50ff15663 100644
--- a/ports/gdal/vcpkg.json
+++ b/ports/gdal/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "gdal",
   "version-semver": "3.5.1",
-  "port-version": 4,
+  "port-version": 5,
   "description": "The Geographic Data Abstraction Library for reading and writing geospatial raster and vector data",
   "homepage": "https://gdal.org",
   "license": null,
diff --git a/ports/opengl/portfile.cmake b/ports/opengl/portfile.cmake
index 5a20f8ea09..cd209dbb28 100644
--- a/ports/opengl/portfile.cmake
+++ b/ports/opengl/portfile.cmake
@@ -2,78 +2,63 @@ if(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore
     vcpkg_get_windows_sdk(WINDOWS_SDK)
 
     if (WINDOWS_SDK MATCHES "10.")
-        file(TO_NATIVE_PATH "$ENV{WindowsSdkDir}Lib/${WINDOWS_SDK}/um/${TRIPLET_SYSTEM_ARCH}/OpenGL32.Lib" LIBGLFILEPATH)
-        file(TO_NATIVE_PATH "$ENV{WindowsSdkDir}Lib/${WINDOWS_SDK}/um/${TRIPLET_SYSTEM_ARCH}/GlU32.Lib" LIBGLUFILEPATH)
-        file(TO_NATIVE_PATH "$ENV{WindowsSdkDir}Include/${WINDOWS_SDK}/um" HEADERSPATH)
+        set(LIBGLFILEPATH "$ENV{WindowsSdkDir}Lib/${WINDOWS_SDK}/um/${TRIPLET_SYSTEM_ARCH}/OpenGL32.Lib")
+        set(LIBGLUFILEPATH "$ENV{WindowsSdkDir}Lib/${WINDOWS_SDK}/um/${TRIPLET_SYSTEM_ARCH}/GlU32.Lib")
+        set(HEADERSPATH "$ENV{WindowsSdkDir}Include/${WINDOWS_SDK}/um")
     elseif(WINDOWS_SDK MATCHES "8.")
-        file(TO_NATIVE_PATH "$ENV{WindowsSdkDir}Lib/winv6.3/um/${TRIPLET_SYSTEM_ARCH}/OpenGL32.Lib" LIBGLFILEPATH)
-        file(TO_NATIVE_PATH "$ENV{WindowsSdkDir}Lib/winv6.3/um/${TRIPLET_SYSTEM_ARCH}/GlU32.Lib" LIBGLUFILEPATH)
-        file(TO_NATIVE_PATH "$ENV{WindowsSdkDir}Include/um" HEADERSPATH)
+        set(LIBGLFILEPATH "$ENV{WindowsSdkDir}Lib/winv6.3/um/${TRIPLET_SYSTEM_ARCH}/OpenGL32.Lib")
+        set(LIBGLUFILEPATH "$ENV{WindowsSdkDir}Lib/winv6.3/um/${TRIPLET_SYSTEM_ARCH}/GlU32.Lib")
+        set(HEADERSPATH "$ENV{WindowsSdkDir}Include/um")
     else()
         message(FATAL_ERROR "Portfile not yet configured for Windows SDK with version: ${WINDOWS_SDK}")
     endif()
 
     if (NOT EXISTS "${LIBGLFILEPATH}")
-        message(FATAL_ERROR "Cannot find Windows ${WINDOWS_SDK} SDK. File does not exist: ${LIBGLFILEPATH}")
+        file(TO_NATIVE_PATH "${LIBGLFILEPATH}" DISPLAY)
+        message(FATAL_ERROR "Cannot find Windows ${WINDOWS_SDK} SDK. File does not exist: ${DISPLAY}")
     endif()
 
     if (NOT EXISTS "${LIBGLUFILEPATH}")
-        message(FATAL_ERROR "Cannot find Windows ${WINDOWS_SDK} SDK. File does not exist: ${LIBGLUFILEPATH}")
+        file(TO_NATIVE_PATH "${LIBGLUFILEPATH}" DISPLAY)
+        message(FATAL_ERROR "Cannot find Windows ${WINDOWS_SDK} SDK. File does not exist: ${DISPLAY}")
     endif()
 
-    file(TO_NATIVE_PATH "${CURRENT_PACKAGES_DIR}/include/gl"   INCLUDEGLPATH)   
-    file(TO_NATIVE_PATH "${CURRENT_PACKAGES_DIR}/share/opengl" SHAREOPENGLPATH)   
-    file(TO_NATIVE_PATH "${CURRENT_PACKAGES_DIR}/lib"          RELEASELIBPATH)
-    file(TO_NATIVE_PATH "${CURRENT_PACKAGES_DIR}/debug/lib"    DEBUGLIBPATH)
-    file(TO_NATIVE_PATH "${HEADERSPATH}/gl/GL.h"               GLGLHPATH)
-    file(TO_NATIVE_PATH "${HEADERSPATH}/gl/GLU.h"              GLGLUHPATH)
+    set(INCLUDEGLPATH "${CURRENT_PACKAGES_DIR}/include/gl")
+    set(SHAREOPENGLPATH "${CURRENT_PACKAGES_DIR}/share/opengl")
+    set(RELEASELIBPATH "${CURRENT_PACKAGES_DIR}/lib")
+    set(DEBUGLIBPATH "${CURRENT_PACKAGES_DIR}/debug/lib")
+    set(GLGLHPATH "${HEADERSPATH}/gl/GL.h")
+    set(GLGLUHPATH "${HEADERSPATH}/gl/GLU.h")
 
-    file(MAKE_DIRECTORY
-        "${INCLUDEGLPATH}"
-        "${SHAREOPENGLPATH}"
-    )
-    if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
-        file(MAKE_DIRECTORY
-            "${RELEASELIBPATH}"
-        )
-    endif()
-    if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
-        file(MAKE_DIRECTORY
-            "${DEBUGLIBPATH}"
-        )
+    file(MAKE_DIRECTORY "${INCLUDEGLPATH}" "${SHAREOPENGLPATH}" "${RELEASELIBPATH}")
+    if (NOT VCPKG_BUILD_TYPE)
+        file(MAKE_DIRECTORY "${DEBUGLIBPATH}")
     endif()
 
-    file(COPY
-       "${GLGLHPATH}"
-       "${GLGLUHPATH}"
-        DESTINATION "${INCLUDEGLPATH}"
-    )
-    if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
-        file(COPY ${LIBGLFILEPATH}  DESTINATION "${RELEASELIBPATH}")
-        file(COPY ${LIBGLUFILEPATH} DESTINATION "${RELEASELIBPATH}")
-    endif()
-    if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
-        file(COPY ${LIBGLFILEPATH}  DESTINATION "${DEBUGLIBPATH}")
-        file(COPY ${LIBGLUFILEPATH} DESTINATION "${DEBUGLIBPATH}")
+    file(COPY "${GLGLHPATH}" "${GLGLUHPATH}" DESTINATION "${INCLUDEGLPATH}")
+
+    if (NOT VCPKG_BUILD_TYPE)
+        file(COPY "${LIBGLFILEPATH}" DESTINATION "${DEBUGLIBPATH}")
+        file(COPY "${LIBGLUFILEPATH}" DESTINATION "${DEBUGLIBPATH}")
     endif()
+    file(COPY "${LIBGLFILEPATH}" DESTINATION "${RELEASELIBPATH}")
+    file(COPY "${LIBGLUFILEPATH}" DESTINATION "${RELEASELIBPATH}")
 
     if (WINDOWS_SDK MATCHES "10.")
-        file(WRITE ${CURRENT_PACKAGES_DIR}/share/opengl/copyright "See https://developer.microsoft.com/windows/downloads/windows-10-sdk for the Windows 10 SDK license")
+        file(WRITE "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" "See https://developer.microsoft.com/windows/downloads/windows-10-sdk for the Windows 10 SDK license")
     elseif(WINDOWS_SDK MATCHES "8.")
-        file(WRITE ${CURRENT_PACKAGES_DIR}/share/opengl/copyright "See https://developer.microsoft.com/windows/downloads/windows-8-1-sdk for the Windows 8.1 SDK license")
+        file(WRITE "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" "See https://developer.microsoft.com/windows/downloads/windows-8-1-sdk for the Windows 8.1 SDK license")
     endif()
-    
+
     string(REGEX MATCH "^([0-9]+)\\.([0-9]+)\\.([0-9]+)" WINDOWS_SDK_SEMVER "${WINDOWS_SDK}")
-    if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
-        configure_file("${CMAKE_CURRENT_LIST_DIR}/opengl.pc.in" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/opengl.pc" @ONLY)
-        configure_file("${CMAKE_CURRENT_LIST_DIR}/glu.pc.in" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/glu.pc" @ONLY)
-    endif()
-    if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
+    configure_file("${CMAKE_CURRENT_LIST_DIR}/opengl.pc.in" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/opengl.pc" @ONLY)
+    configure_file("${CMAKE_CURRENT_LIST_DIR}/glu.pc.in" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/glu.pc" @ONLY)
+    if (NOT VCPKG_BUILD_TYPE)
         configure_file("${CMAKE_CURRENT_LIST_DIR}/opengl.pc.in" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/opengl.pc" @ONLY)
         configure_file("${CMAKE_CURRENT_LIST_DIR}/glu.pc.in" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/glu.pc" @ONLY)
     endif()
-    vcpkg_fixup_pkgconfig()
 
+    vcpkg_fixup_pkgconfig()
 else()
     set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
 endif()
diff --git a/ports/opengl/vcpkg.json b/ports/opengl/vcpkg.json
index e921d648fb..ea5e3d1c85 100644
--- a/ports/opengl/vcpkg.json
+++ b/ports/opengl/vcpkg.json
@@ -1,5 +1,7 @@
 {
   "name": "opengl",
   "version-date": "2022-03-14",
-  "description": "Open Graphics Library (OpenGL)[3][4][5] is a cross-language, cross-platform application programming interface (API) for rendering 2D and 3D vector graphics."
+  "port-version": 1,
+  "description": "Open Graphics Library (OpenGL)[3][4][5] is a cross-language, cross-platform application programming interface (API) for rendering 2D and 3D vector graphics.",
+  "license": null
 }
diff --git a/ports/openni2/portfile.cmake b/ports/openni2/portfile.cmake
index 0864fda611..e06d555e83 100644
--- a/ports/openni2/portfile.cmake
+++ b/ports/openni2/portfile.cmake
@@ -1,7 +1,3 @@
-if (VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
-    message(FATAL_ERROR "Error: UWP builds are currently not supported.")
-endif()
-
 find_path(COR_H_PATH cor.h)
 if(COR_H_PATH MATCHES "NOTFOUND")
     message(FATAL_ERROR "Could not find <cor.h>. Ensure the NETFXSDK is installed.")
@@ -21,10 +17,6 @@ vcpkg_from_github(
             replace_environment_variable.patch
 )
 
-file(REMOVE_RECURSE ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET})
-file(MAKE_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET})
-file(COPY ${SOURCE_PATH} DESTINATION ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET})
-
 file(TO_NATIVE_PATH ${CURRENT_INSTALLED_DIR} NATIVE_INSTALLED_DIR)
 configure_file("${SOURCE_PATH}/Source/Drivers/Kinect/Kinect.vcxproj" "${SOURCE_PATH}/Source/Drivers/Kinect/Kinect.vcxproj" @ONLY)
 
@@ -44,14 +36,14 @@ endif()
 set(SOURCE_INCLUDE_PATH "${SOURCE_PATH}/Include")
 set(SOURCE_BIN_PATH_RELEASE "${SOURCE_PATH}/Bin/${PLATFORM}-Release")
 set(SOURCE_BIN_PATH_DEBUG "${SOURCE_PATH}/Bin/${PLATFORM}-Debug")
-set(SOURCE_CONFIG_PATH ${SOURCE_PATH}/Config)
+set(SOURCE_CONFIG_PATH "${SOURCE_PATH}/Config")
 set(SOURCE_THIRDPARTY_PATH "${SOURCE_PATH}/ThirdParty")
 
 file(
     INSTALL
         "${SOURCE_INCLUDE_PATH}/Android-Arm/OniPlatformAndroid-Arm.h"
     DESTINATION
-        ${CURRENT_PACKAGES_DIR}/include/openni2/Android-Arm
+        "${CURRENT_PACKAGES_DIR}/include/openni2/Android-Arm"
 )
 
 file(
@@ -59,35 +51,35 @@ file(
         "${SOURCE_INCLUDE_PATH}/Driver/OniDriverAPI.h"
         "${SOURCE_INCLUDE_PATH}/Driver/OniDriverTypes.h"
     DESTINATION
-        ${CURRENT_PACKAGES_DIR}/include/openni2/Driver
+        "${CURRENT_PACKAGES_DIR}/include/openni2/Driver"
 )
 
 file(
     INSTALL
         "${SOURCE_INCLUDE_PATH}/Linux-Arm/OniPlatformLinux-Arm.h"
     DESTINATION
-        ${CURRENT_PACKAGES_DIR}/include/openni2/Linux-Arm
+        "${CURRENT_PACKAGES_DIR}/include/openni2/Linux-Arm"
 )
 
 file(
     INSTALL
         "${SOURCE_INCLUDE_PATH}/Linux-x86/OniPlatformLinux-x86.h"
     DESTINATION
-        ${CURRENT_PACKAGES_DIR}/include/openni2/Linux-x86
+        "${CURRENT_PACKAGES_DIR}/include/openni2/Linux-x86"
 )
 
 file(
     INSTALL
         "${SOURCE_INCLUDE_PATH}/MacOSX/OniPlatformMacOSX.h"
     DESTINATION
-        ${CURRENT_PACKAGES_DIR}/include/openni2/MacOSX
+        "${CURRENT_PACKAGES_DIR}/include/openni2/MacOSX"
 )
 
 file(
     INSTALL
         "${SOURCE_INCLUDE_PATH}/Win32/OniPlatformWin32.h"
     DESTINATION
-        ${CURRENT_PACKAGES_DIR}/include/openni2/Win32
+        "${CURRENT_PACKAGES_DIR}/include/openni2/Win32"
 )
 
 file(
@@ -105,22 +97,24 @@ file(
         "${SOURCE_INCLUDE_PATH}/PS1080.h"
         "${SOURCE_INCLUDE_PATH}/PSLink.h"
     DESTINATION
-        ${CURRENT_PACKAGES_DIR}/include/openni2
+        "${CURRENT_PACKAGES_DIR}/include/openni2"
 )
 
 file(
     INSTALL
         "${SOURCE_BIN_PATH_RELEASE}/OpenNI2.lib"
     DESTINATION
-        ${CURRENT_PACKAGES_DIR}/lib
+        "${CURRENT_PACKAGES_DIR}/lib"
 )
 
+if(NOT VCPKG_BUILD_TYPE)
 file(
     INSTALL
         "${SOURCE_BIN_PATH_DEBUG}/OpenNI2.lib"
     DESTINATION
-        ${CURRENT_PACKAGES_DIR}/debug/lib
+        "${CURRENT_PACKAGES_DIR}/debug/lib"
 )
+endif()
 
 file(
     INSTALL
@@ -131,23 +125,24 @@ file(
         "${SOURCE_BIN_PATH_RELEASE}/OpenNI2/Drivers/PSLink.dll"
         "${SOURCE_CONFIG_PATH}/OpenNI2/Drivers/PSLink.ini"
     DESTINATION
-        ${CURRENT_PACKAGES_DIR}/bin/OpenNI2/Drivers
+        "${CURRENT_PACKAGES_DIR}/bin/OpenNI2/Drivers"
 )
 
 file(
     INSTALL
         "${SOURCE_CONFIG_PATH}/OpenNI.ini"
     DESTINATION
-        ${CURRENT_PACKAGES_DIR}/bin/OpenNI2
+        "${CURRENT_PACKAGES_DIR}/bin/OpenNI2"
 )
 
 file(
     INSTALL
         "${SOURCE_BIN_PATH_RELEASE}/OpenNI2.dll"
     DESTINATION
-        ${CURRENT_PACKAGES_DIR}/bin
+        "${CURRENT_PACKAGES_DIR}/bin"
 )
 
+if(NOT VCPKG_BUILD_TYPE)
 file(
     INSTALL
         "${SOURCE_BIN_PATH_DEBUG}/OpenNI2/Drivers/Kinect.dll"
@@ -157,22 +152,25 @@ file(
         "${SOURCE_BIN_PATH_DEBUG}/OpenNI2/Drivers/PSLink.dll"
         "${SOURCE_CONFIG_PATH}/OpenNI2/Drivers/PSLink.ini"
     DESTINATION
-        ${CURRENT_PACKAGES_DIR}/debug/bin/OpenNI2/Drivers
+        "${CURRENT_PACKAGES_DIR}/debug/bin/OpenNI2/Drivers"
 )
+endif()
 
 file(
     INSTALL
         "${SOURCE_CONFIG_PATH}/OpenNI.ini"
     DESTINATION
-        ${CURRENT_PACKAGES_DIR}/debug/bin/OpenNI2
+        "${CURRENT_PACKAGES_DIR}/debug/bin/OpenNI2"
 )
 
+if(NOT VCPKG_BUILD_TYPE)
 file(
     INSTALL
         "${SOURCE_BIN_PATH_DEBUG}/OpenNI2.dll"
     DESTINATION
-        ${CURRENT_PACKAGES_DIR}/debug/bin
+        "${CURRENT_PACKAGES_DIR}/debug/bin"
 )
+endif()
 
 file(
     INSTALL
@@ -183,7 +181,7 @@ file(
         "${SOURCE_BIN_PATH_RELEASE}/OpenNI2/Drivers/PSLink.dll"
         "${SOURCE_CONFIG_PATH}/OpenNI2/Drivers/PSLink.ini"
     DESTINATION
-        ${CURRENT_PACKAGES_DIR}/tools/openni2/OpenNI2/Drivers
+        "${CURRENT_PACKAGES_DIR}/tools/openni2/OpenNI2/Drivers"
 )
 
 if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86")
@@ -201,13 +199,14 @@ file(
         "${SOURCE_BIN_PATH_RELEASE}/PS1080Console.exe"
         "${SOURCE_BIN_PATH_RELEASE}/PSLinkConsole.exe"
     DESTINATION
-        ${CURRENT_PACKAGES_DIR}/tools/openni2
+        "${CURRENT_PACKAGES_DIR}/tools/openni2"
 )
 
 # Deploy Script
-file(COPY ${CMAKE_CURRENT_LIST_DIR}/openni2deploy.ps1 DESTINATION ${CURRENT_PACKAGES_DIR}/bin/OpenNI2)
-file(COPY ${CMAKE_CURRENT_LIST_DIR}/openni2deploy.ps1 DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin/OpenNI2)
+file(COPY "${CMAKE_CURRENT_LIST_DIR}/openni2deploy.ps1" DESTINATION "${CURRENT_PACKAGES_DIR}/bin/OpenNI2")
+if(NOT VCPKG_BUILD_TYPE)
+file(COPY "${CMAKE_CURRENT_LIST_DIR}/openni2deploy.ps1" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin/OpenNI2")
+endif()
 
 # Handle copyright
-file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/openni2)
-file(RENAME ${CURRENT_PACKAGES_DIR}/share/openni2/LICENSE ${CURRENT_PACKAGES_DIR}/share/openni2/copyright)
+file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/ports/openni2/vcpkg.json b/ports/openni2/vcpkg.json
index 5110fbc072..c0aa598769 100644
--- a/ports/openni2/vcpkg.json
+++ b/ports/openni2/vcpkg.json
@@ -1,10 +1,11 @@
 {
   "name": "openni2",
-  "version-string": "2.2.0.33",
-  "port-version": 13,
+  "version": "2.2.0.33",
+  "port-version": 14,
   "description": "OpenNI is open source library for access to Natural Interaction (NI) devices such as RGB-D camera.",
   "homepage": "https://github.com/OpenNI/OpenNI2",
-  "supports": "!uwp",
+  "license": "Apache-2.0",
+  "supports": "!uwp & !staticcrt",
   "dependencies": [
     "kinectsdk1"
   ]
diff --git a/ports/openssl/unix/CMakeLists.txt b/ports/openssl/unix/CMakeLists.txt
index 79e9f923f3..75c21805ac 100644
--- a/ports/openssl/unix/CMakeLists.txt
+++ b/ports/openssl/unix/CMakeLists.txt
@@ -84,11 +84,6 @@ endif()
 
 string(REGEX REPLACE "^ " "" CFLAGS "${CFLAGS}")
 
-if(CMAKE_HOST_WIN32)
-    file(TO_NATIVE_PATH ENV_PATH "${COMPILER_ROOT};$ENV{PATH}")
-else()
-    file(TO_NATIVE_PATH ENV_PATH "${COMPILER_ROOT}:$ENV{PATH}")
-endif()
 set(ENV{ANDROID_DEV} "${CMAKE_SYSROOT}/usr")
 
 if(NOT IOS)
diff --git a/ports/openssl/vcpkg.json b/ports/openssl/vcpkg.json
index 2fd99fedfa..b40155bdec 100644
--- a/ports/openssl/vcpkg.json
+++ b/ports/openssl/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "openssl",
   "version": "3.0.5",
-  "port-version": 3,
+  "port-version": 4,
   "description": "OpenSSL is an open source project that provides a robust, commercial-grade, and full-featured toolkit for the Transport Layer Security (TLS) and Secure Sockets Layer (SSL) protocols. It is also a general-purpose cryptography library.",
   "homepage": "https://www.openssl.org",
   "license": "Apache-2.0",
diff --git a/scripts/buildsystems/vcpkg.cmake b/scripts/buildsystems/vcpkg.cmake
index 31cee14eb7..f7823e72b5 100644
--- a/scripts/buildsystems/vcpkg.cmake
+++ b/scripts/buildsystems/vcpkg.cmake
@@ -441,7 +441,8 @@ if(VCPKG_MANIFEST_MODE AND VCPKG_MANIFEST_INSTALL AND NOT Z_VCPKG_CMAKE_IN_TRY_C
     if(NOT EXISTS "${Z_VCPKG_EXECUTABLE}" AND NOT Z_VCPKG_HAS_FATAL_ERROR)
         message(STATUS "Bootstrapping vcpkg before install")
 
-        file(TO_NATIVE_PATH "${CMAKE_BINARY_DIR}/vcpkg-bootstrap.log" Z_VCPKG_BOOTSTRAP_LOG)
+        set(Z_VCPKG_BOOTSTRAP_LOG "${CMAKE_BINARY_DIR}/vcpkg-bootstrap.log")
+        file(TO_NATIVE_PATH "${Z_VCPKG_BOOTSTRAP_LOG}" Z_NATIVE_VCPKG_BOOTSTRAP_LOG)
         execute_process(
             COMMAND "${Z_VCPKG_BOOTSTRAP_SCRIPT}" ${VCPKG_BOOTSTRAP_OPTIONS}
             OUTPUT_FILE "${Z_VCPKG_BOOTSTRAP_LOG}"
@@ -452,7 +453,7 @@ if(VCPKG_MANIFEST_MODE AND VCPKG_MANIFEST_INSTALL AND NOT Z_VCPKG_CMAKE_IN_TRY_C
             message(STATUS "Bootstrapping vcpkg before install - done")
         else()
             message(STATUS "Bootstrapping vcpkg before install - failed")
-            z_vcpkg_add_fatal_error("vcpkg install failed. See logs for more information: ${Z_VCPKG_BOOTSTRAP_LOG}")
+            z_vcpkg_add_fatal_error("vcpkg install failed. See logs for more information: ${Z_NATIVE_VCPKG_BOOTSTRAP_LOG}")
         endif()
     endif()
 
@@ -511,7 +512,8 @@ if(VCPKG_MANIFEST_MODE AND VCPKG_MANIFEST_INSTALL AND NOT Z_VCPKG_CMAKE_IN_TRY_C
             ${Z_VCPKG_MANIFEST_INSTALL_ECHO_PARAMS}
         )
 
-        file(TO_NATIVE_PATH "${CMAKE_BINARY_DIR}/vcpkg-manifest-install.log" Z_VCPKG_MANIFEST_INSTALL_LOGFILE)
+        set(Z_VCPKG_MANIFEST_INSTALL_LOGFILE "${CMAKE_BINARY_DIR}/vcpkg-manifest-install.log")
+        file(TO_NATIVE_PATH "${Z_VCPKG_MANIFEST_INSTALL_LOGFILE}" Z_NATIVE_VCPKG_MANIFEST_INSTALL_LOGFILE)
         file(WRITE "${Z_VCPKG_MANIFEST_INSTALL_LOGFILE}" "${Z_VCPKG_MANIFEST_INSTALL_LOGTEXT}")
 
         if(Z_VCPKG_MANIFEST_INSTALL_RESULT EQUAL 0)
@@ -524,7 +526,7 @@ if(VCPKG_MANIFEST_MODE AND VCPKG_MANIFEST_INSTALL AND NOT Z_VCPKG_CMAKE_IN_TRY_C
             endif()
         else()
             message(STATUS "Running vcpkg install - failed")
-            z_vcpkg_add_fatal_error("vcpkg install failed. See logs for more information: ${Z_VCPKG_MANIFEST_INSTALL_LOGFILE}")
+            z_vcpkg_add_fatal_error("vcpkg install failed. See logs for more information: ${Z_NATIVE_VCPKG_MANIFEST_INSTALL_LOGFILE}")
         endif()
     endif()
 endif()
diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt
index a2b72a3f7b..5746427ef6 100644
--- a/scripts/ci.baseline.txt
+++ b/scripts/ci.baseline.txt
@@ -794,8 +794,6 @@ openmama:x64-windows-static-md=fail
 openmesh:arm64-windows=fail
 openmesh:arm-uwp=fail
 openmesh:x64-uwp=fail
-openni2:x64-uwp=fail
-openni2:x64-windows-static=fail
 openscap:x64-windows-static=fail
 openscap:x64-osx=fail
 openvpn3:x64-osx=fail
diff --git a/scripts/cmake/vcpkg_build_qmake.cmake b/scripts/cmake/vcpkg_build_qmake.cmake
index c64a9f2742..39aca26290 100644
--- a/scripts/cmake/vcpkg_build_qmake.cmake
+++ b/scripts/cmake/vcpkg_build_qmake.cmake
@@ -38,8 +38,6 @@ function(vcpkg_build_qmake)
         set(invoke_command "${MAKE}")
     endif()
 
-    file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}" NATIVE_INSTALLED_DIR)
-
     if(NOT DEFINED arg_BUILD_LOGNAME)
         set(arg_BUILD_LOGNAME build)
     endif()
diff --git a/scripts/cmake/vcpkg_execute_required_process_repeat.cmake b/scripts/cmake/vcpkg_execute_required_process_repeat.cmake
index b7dc3ddda7..a13f8fa6e0 100644
--- a/scripts/cmake/vcpkg_execute_required_process_repeat.cmake
+++ b/scripts/cmake/vcpkg_execute_required_process_repeat.cmake
@@ -66,6 +66,6 @@ Halting portfile execution.
         "  Command failed: ${pretty_command}\n"
         "  Working Directory: ${arg_WORKING_DIRECTORY}\n"
         "  See logs for more information:\n"
-        "${stringifed_logs}"
+        "${stringified_logs}"
     )
 endfunction()
diff --git a/scripts/ports.cmake b/scripts/ports.cmake
index 9f7b9d01f9..4c3b9304b3 100644
--- a/scripts/ports.cmake
+++ b/scripts/ports.cmake
@@ -152,8 +152,6 @@ if(CMD STREQUAL "BUILD")
         include("${SCRIPTS}/build_info.cmake")
     endif()
 elseif(CMD STREQUAL "CREATE")
-    file(TO_NATIVE_PATH "${VCPKG_ROOT_DIR}" NATIVE_VCPKG_ROOT_DIR)
-    file(TO_NATIVE_PATH "${DOWNLOADS}" NATIVE_DOWNLOADS)
     if(NOT DEFINED PORT_PATH)
         set(PORT_PATH "${VCPKG_ROOT_DIR}/ports/${PORT}")
     endif()
diff --git a/versions/baseline.json b/versions/baseline.json
index a44272b2f1..d27315d778 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -2482,7 +2482,7 @@
     },
     "gdal": {
       "baseline": "3.5.1",
-      "port-version": 4
+      "port-version": 5
     },
     "gdcm": {
       "baseline": "3.0.12",
@@ -5218,7 +5218,7 @@
     },
     "opengl": {
       "baseline": "2022-03-14",
-      "port-version": 0
+      "port-version": 1
     },
     "opengl-registry": {
       "baseline": "2021-11-17",
@@ -5266,7 +5266,7 @@
     },
     "openni2": {
       "baseline": "2.2.0.33",
-      "port-version": 13
+      "port-version": 14
     },
     "openscap": {
       "baseline": "1.3.1",
@@ -5274,7 +5274,7 @@
     },
     "openssl": {
       "baseline": "3.0.5",
-      "port-version": 3
+      "port-version": 4
     },
     "openssl-unix": {
       "baseline": "1.1.1h",
diff --git a/versions/g-/gdal.json b/versions/g-/gdal.json
index 5e23d15edd..c2888c0485 100644
--- a/versions/g-/gdal.json
+++ b/versions/g-/gdal.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "e875fbb6dc288ea2719e00a6b71b4834b8814640",
+      "version-semver": "3.5.1",
+      "port-version": 5
+    },
     {
       "git-tree": "419767a67a207c3b5401b817d8537acafe257e1b",
       "version-semver": "3.5.1",
diff --git a/versions/o-/opengl.json b/versions/o-/opengl.json
index f2e28fba53..2459fe648a 100644
--- a/versions/o-/opengl.json
+++ b/versions/o-/opengl.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "1c402a05f67513fe35a8991b8865db4db6181ec7",
+      "version-date": "2022-03-14",
+      "port-version": 1
+    },
     {
       "git-tree": "6778094e7a9e5027545a46af473d27ce28890c53",
       "version-date": "2022-03-14",
diff --git a/versions/o-/openni2.json b/versions/o-/openni2.json
index 45f539ce40..36caa8dde4 100644
--- a/versions/o-/openni2.json
+++ b/versions/o-/openni2.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "31c61be8515cff93cca9a905969a8292023f0b4e",
+      "version": "2.2.0.33",
+      "port-version": 14
+    },
     {
       "git-tree": "b99fb68dafe4b930248e5ba4d39a7a2c4a4fc9ea",
       "version-string": "2.2.0.33",
diff --git a/versions/o-/openssl.json b/versions/o-/openssl.json
index 162f779d23..bbcf02ac3f 100644
--- a/versions/o-/openssl.json
+++ b/versions/o-/openssl.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "557ff31f9a64f01cd0d98dd44793ce3c7fd32893",
+      "version": "3.0.5",
+      "port-version": 4
+    },
     {
       "git-tree": "d4fd408544a2a6635ce994badc226aa945c8f78a",
       "version": "3.0.5",