[liblzma] No debug postfix. Rewrite wrapper. (#22856)

* Restore upstream's DLL name * Don't add debug postfix * Decouple wrapper from config * Don't inject Find module stuff into config * Cleanup * [skip actions] Trim lzmad and LibLZMA patching * [skip actions] Fix CMAKE_DISABLE_FIND_PACKAGE_LibLZMA * [skip actions] CI * Update manifests * Update versions * Backfill LibLZMA::LibLZMA to CMake < 3.14 * Update versions * Update versions
2024-11-27 19:59:06 +08:00 · 2022-02-28 19:25:31 +01:00 · 2022-02-28 19:25:31 +01:00 · 0707a17ecf
commit 0707a17ecf
parent 43cb9a9026
46 changed files with 244 additions and 281 deletions
--- a/ports/avro-c/avro.patch
+++ b/ports/avro-c/avro.patch
@ -12,7 +12,7 @@ index aa923e1..9ee7937 100644
 # Eliminates warning about linker paths when linking both zlib and
 # liblzma.
 cmake_policy(SET CMP0003 NEW)
-@@ -149,50 +152,60 @@ else (ZLIB_FOUND)
+@@ -149,20 +152,25 @@ else (ZLIB_FOUND)
     message("Disabled deflate codec. zlib not found.")
 endif (ZLIB_FOUND)
 
@ -38,24 +38,13 @@ index aa923e1..9ee7937 100644
 
 -find_package(PkgConfig)
 -pkg_check_modules(LZMA liblzma)
-if (LZMA_FOUND)
 +find_package(LibLZMA REQUIRED)
-+if (LibLZMA_FOUND)
+set(LZMA_FOUND 1)
+set(LZMA_LIBRARIES LibLZMA::LibLZMA)
+ if (LZMA_FOUND)
     set(LZMA_PKG liblzma)
     add_definitions(-DLZMA_CODEC)
-+    set(LZMA_LIBRARIES LibLZMA::LibLZMA)
-     include_directories(${LZMA_INCLUDE_DIRS})
-     link_directories(${LZMA_LIBRARY_DIRS})
-     message("Enabled lzma codec")
-else (LZMA_FOUND)
-+else (LibLZMA_FOUND)
-     set(LZMA_PKG "")
-     set(LZMA_LIBRARIES "")
-     message("Disabled lzma codec. liblzma not found.")
-endif (LZMA_FOUND)
-+endif (LibLZMA_FOUND)
- 
- set(CODEC_LIBRARIES ${ZLIB_LIBRARIES} ${LZMA_LIBRARIES} ${SNAPPY_LIBRARIES})
+@@ -179,20 +187,26 @@ set(CODEC_LIBRARIES ${ZLIB_LIBRARIES} ${LZMA_LIBRARIES} ${SNAPPY_LIBRARIES})
 set(CODEC_PKG "@ZLIB_PKG@ @LZMA_PKG@ @SNAPPY_PKG@")
 
 # Jansson JSON library
--- a/ports/avro-c/vcpkg.json
+++ b/ports/avro-c/vcpkg.json
@ -1,9 +1,10 @@
 {
  "name": "avro-c",
  "version": "1.11.0",
-  "port-version": 2,
+  "port-version": 3,
  "description": "Apache Avro is a data serialization system",
  "homepage": "https://github.com/apache/avro",
+  "license": "Apache-2.0",
  "supports": "!uwp",
  "dependencies": [
    "jansson",
--- a/ports/boost-iostreams/b2-options.cmake
+++ b/ports/boost-iostreams/b2-options.cmake
@ -27,12 +27,6 @@ if("lzma" IN_LIST FEATURES)
    list(APPEND B2_OPTIONS
        -sLZMA_INCLUDE="${CURRENT_INSTALLED_DIR}/include"
    )
-    # Overwride debug library name
-    if(CMAKE_BUILD_TYPE STREQUAL "Debug")
-        list(APPEND B2_OPTIONS
-            -sLZMA_NAME=lzmad
-        )
-    endif()
    list(APPEND B2_OPTIONS
        -sLZMA_LIBRARY_PATH="${CURRENT_INSTALLED_DIR}/${lib_path_suffix}"
    )
--- a/ports/boost-iostreams/vcpkg.json
+++ b/ports/boost-iostreams/vcpkg.json
@ -1,9 +1,10 @@
 {
  "name": "boost-iostreams",
  "version": "1.78.0",
-  "port-version": 1,
+  "port-version": 2,
  "description": "Boost iostreams module",
  "homepage": "https://github.com/boostorg/iostreams",
+  "license": "BSL-1.0",
  "supports": "!uwp",
  "dependencies": [
    "boost-assert",
--- a/ports/elfutils/configure.ac.patch
+++ b/ports/elfutils/configure.ac.patch
@ -35,8 +35,7 @@ index 5a2dc373e..b1928831e 100644
 # We need this since bzip2 doesn't have a pkgconfig file.
 BZ2_LIB="$LIBS"
 AC_SUBST([BZ2_LIB])
-eu_ZIPLIB(lzma,LZMA,lzma,lzma_auto_decoder,[LZMA (xz)])
-+eu_ZIPLIB(lzma,LZMA,[lzma lzmad],lzma_auto_decoder,[LZMA (xz)])
+ eu_ZIPLIB(lzma,LZMA,lzma,lzma_auto_decoder,[LZMA (xz)])
 AS_IF([test "x$with_lzma" = xyes], [LIBLZMA="liblzma"], [LIBLZMA=""])
 AC_SUBST([LIBLZMA])
 eu_ZIPLIB(zstd,ZSTD,zstd,ZSTD_decompress,[ZSTD (zst)])
--- a/ports/elfutils/vcpkg.json
+++ b/ports/elfutils/vcpkg.json
@ -1,9 +1,10 @@
 {
  "name": "elfutils",
-  "version-string": "0.186",
-  "port-version": 1,
+  "version": "0.186",
+  "port-version": 2,
  "description": "elfutils is a collection of utilities and libraries to read, create and modify ELF binary files, find and handle DWARF debug data, symbols, thread state and stacktraces for processes and core files on GNU/Linux.",
  "homepage": "https://sourceware.org/elfutils/",
+  "license": null,
  "supports": "!windows",
  "dependencies": [
    "bzip2",
--- a/ports/ffmpeg/0004-fix-debug-build.patch
+++ b/ports/ffmpeg/0004-fix-debug-build.patch
@ -12,22 +12,19 @@ index bd2de34..fba948a 100755
         *)
             optname="${opt%%=*}"
             optname="${optname#--}"
-@@ -6152,8 +6153,13 @@
+@@ -6152,7 +6153,11 @@
 
 enabled  zlib && { check_pkg_config zlib zlib "zlib.h" zlibVersion ||
                    check_lib zlib   zlib.h      zlibVersion    -lz; }
 -enabled bzlib && check_lib bzlib bzlib.h BZ2_bzlibVersion    -lbz2
-enabled  lzma && check_lib lzma   lzma.h lzma_version_number -llzma
 +if enabled debug_configure; then
 +    enabled bzlib && check_lib bzlib bzlib.h BZ2_bzlibVersion    -lbz2d
-+    enabled  lzma && check_lib lzma   lzma.h lzma_version_number -llzmad
 +else
 +    enabled bzlib && check_lib bzlib bzlib.h BZ2_bzlibVersion    -lbz2
-+    enabled  lzma && check_lib lzma   lzma.h lzma_version_number -llzma
 +fi
+ enabled  lzma && check_lib lzma   lzma.h lzma_version_number -llzma
 
 # On some systems dynamic loading requires no extra linker flags
- check_lib libdl dlfcn.h "dlopen dlsym" || check_lib libdl dlfcn.h "dlopen dlsym" -ldl
@@ -6350,7 +6350,11 @@ enabled librubberband     && require_pkg_config librubberband "rubberband >= 1.8
 enabled libshine          && require_pkg_config libshine shine shine/layer3.h shine_encode_buffer
 enabled libsmbclient      && { check_pkg_config libsmbclient smbclient libsmbclient.h smbc_init ||
--- a/ports/ffmpeg/vcpkg.json
+++ b/ports/ffmpeg/vcpkg.json
@ -1,12 +1,13 @@
 {
  "name": "ffmpeg",
  "version": "4.4.1",
-  "port-version": 9,
+  "port-version": 10,
  "description": [
    "a library to decode, encode, transcode, mux, demux, stream, filter and play pretty much anything that humans and machines have created.",
    "FFmpeg is the leading multimedia framework, able to decode, encode, transcode, mux, demux, stream, filter and play pretty much anything that humans and machines have created. It supports the most obscure ancient formats up to the cutting edge. No matter if they were designed by some standards committee, the community or a corporation. It is also highly portable: FFmpeg compiles, runs, and passes our testing infrastructure FATE across Linux, Mac OS X, Microsoft Windows, the BSDs, Solaris, etc. under a wide variety of build environments, machine architectures, and configurations."
  ],
  "homepage": "https://ffmpeg.org",
+  "license": null,
  "dependencies": [
    {
      "name": "vcpkg-cmake",
--- a/ports/gdal/vcpkg-cmake-wrapper.cmake
+++ b/ports/gdal/vcpkg-cmake-wrapper.cmake
@ -121,7 +121,7 @@ if(GDAL_FOUND)
    endif()
    _gdal_add_dependency(geotiff_library  GeoTIFF CONFIG)
    _gdal_add_dependency(JPEG::JPEG  JPEG)
-    _gdal_add_dependency(liblzma::liblzma  liblzma CONFIG)
+    _gdal_add_dependency(LibLZMA::LibLZMA  LibLZMA)
    _gdal_add_dependency(png  libpng CONFIG)
    if("poppler" IN_LIST Z_VCPKG_PORT_FEATURES)
        _gdal_add_dependency(unofficial::poppler::poppler-private unofficial-poppler)
--- a/ports/gdal/vcpkg.json
+++ b/ports/gdal/vcpkg.json
@ -1,7 +1,7 @@
 {
  "name": "gdal",
  "version-semver": "3.4.1",
-  "port-version": 2,
+  "port-version": 3,
  "description": "The Geographic Data Abstraction Library for reading and writing geospatial raster and vector data",
  "homepage": "https://gdal.org",
  "license": null,
--- a/ports/libarchive/fix-dependencies.patch
+++ b/ports/libarchive/fix-dependencies.patch
@ -11,38 +11,26 @@ index 39b5333..8164d8f 100644
 ELSE()
   SET(BZIP2_FOUND FALSE) # Override cached value
 ENDIF()
-@@ -462,27 +462,15 @@ MARK_AS_ADVANCED(CLEAR BZIP2_LIBRARIES)
+@@ -462,7 +462,8 @@ MARK_AS_ADVANCED(CLEAR BZIP2_LIBRARIES)
 # Find LZMA
 #
 IF(ENABLE_LZMA)
 -  FIND_PACKAGE(LibLZMA)
-+  FIND_PACKAGE(LibLZMA CONFIG REQUIRED)
+  FIND_PACKAGE(LibLZMA REQUIRED)
+  SET(LIBLZMA_LIBRARIES LibLZMA::LibLZMA)
 ELSE()
   SET(LIBLZMA_FOUND FALSE) # Override cached value
 ENDIF()
- 
-IF(LIBLZMA_FOUND)
-+IF(LibLZMA_FOUND)
+@@ -470,6 +471,8 @@ ENDIF()
+ IF(LIBLZMA_FOUND)
   SET(HAVE_LIBLZMA 1)
   SET(HAVE_LZMA_H 1)
-  CMAKE_PUSH_CHECK_STATE()
-  INCLUDE_DIRECTORIES(${LIBLZMA_INCLUDE_DIRS})
-  LIST(APPEND ADDITIONAL_LIBS ${LIBLZMA_LIBRARIES})
-  # Test if a macro is needed for the library.
-  TRY_MACRO_FOR_LIBRARY(
-    "${LIBLZMA_INCLUDE_DIRS}" "${LIBLZMA_LIBRARIES}"
-    COMPILES
-    "#include <lzma.h>\nint main() {return (int)lzma_version_number(); }"
-    "WITHOUT_LZMA_API_STATIC;LZMA_API_STATIC")
-  IF(NOT WITHOUT_LZMA_API_STATIC AND LZMA_API_STATIC)
-    ADD_DEFINITIONS(-DLZMA_API_STATIC)
-  ENDIF(NOT WITHOUT_LZMA_API_STATIC AND LZMA_API_STATIC)
-  CMAKE_POP_CHECK_STATE()
 +  LIST(APPEND ADDITIONAL_LIBS LibLZMA::LibLZMA)
- ELSE(LIBLZMA_FOUND)
- # LZMA not found and will not be used.
- ENDIF(LIBLZMA_FOUND)
-@@ -555,22 +543,15 @@ IF(ENABLE_LZ4)
+elseif(0)
+   CMAKE_PUSH_CHECK_STATE()
+   INCLUDE_DIRECTORIES(${LIBLZMA_INCLUDE_DIRS})
+   LIST(APPEND ADDITIONAL_LIBS ${LIBLZMA_LIBRARIES})
+@@ -555,22 +558,15 @@ IF(ENABLE_LZ4)
     SET(LZ4_FIND_QUIETLY TRUE)
   ENDIF (LZ4_INCLUDE_DIR)
 
@ -138,13 +126,3 @@ index 39b5333..8164d8f 100644
 ELSE()
   SET(LIBXML2_FOUND FALSE)
 ENDIF()
-@@ -1432,8 +1400,7 @@ CHECK_C_SOURCE_COMPILES(
-   MAJOR_IN_SYSMACROS)
- 
- CMAKE_PUSH_CHECK_STATE()
-SET(CMAKE_REQUIRED_INCLUDES ${LIBLZMA_INCLUDE_DIR})
-SET(CMAKE_REQUIRED_LIBRARIES ${LIBLZMA_LIBRARIES})
-+SET(CMAKE_REQUIRED_LIBRARIES LibLZMA::LibLZMA)
- IF(ENABLE_LZMA)
- CHECK_C_SOURCE_COMPILES(
-   "#include <lzma.h>\n#if LZMA_VERSION < 50020000\n#error unsupported\n#endif\nint main(void){lzma_stream_encoder_mt(0, 0); return 0;}"
--- a/ports/libarchive/pkgconfig-modules.patch
+++ b/ports/libarchive/pkgconfig-modules.patch
@ -27,15 +27,15 @@ index 7b6f0ad..18cf15c 100644
   # Test if a macro is needed for the library.
   TRY_MACRO_FOR_LIBRARY(
     "${BZIP2_INCLUDE_DIR}" "${BZIP2_LIBRARIES}"
-@@ -471,6 +475,7 @@ IF(LibLZMA_FOUND)
+@@ -471,6 +475,7 @@ IF(LIBLZMA_FOUND)
   SET(HAVE_LIBLZMA 1)
   SET(HAVE_LZMA_H 1)
   LIST(APPEND ADDITIONAL_LIBS LibLZMA::LibLZMA)
 +  STRING(APPEND LIBARCHIVE_REQUIRES_PRIVATE " liblzma")
- ELSE(LIBLZMA_FOUND)
- # LZMA not found and will not be used.
- ENDIF(LIBLZMA_FOUND)
-@@ -499,6 +504,7 @@ IF(LZO2_FOUND)
+ elseif(0)
+   CMAKE_PUSH_CHECK_STATE()
+   INCLUDE_DIRECTORIES(${LIBLZMA_INCLUDE_DIRS})
+@@ -514,6 +519,7 @@ IF(LZO2_FOUND)
   SET(HAVE_LZO_LZO1X_H 1)
   INCLUDE_DIRECTORIES(${LZO2_INCLUDE_DIR})
   LIST(APPEND ADDITIONAL_LIBS ${LZO2_LIBRARY})
--- a/ports/libarchive/vcpkg.json
+++ b/ports/libarchive/vcpkg.json
@ -1,9 +1,10 @@
 {
  "name": "libarchive",
  "version-semver": "3.5.2",
-  "port-version": 3,
+  "port-version": 4,
  "description": "Library for reading and writing streaming archives",
  "homepage": "https://github.com/libarchive/libarchive",
+  "license": null,
  "supports": "!uwp",
  "dependencies": [
    {
--- a/ports/liblzma/portfile.cmake
+++ b/ports/liblzma/portfile.cmake
@ -13,8 +13,6 @@ vcpkg_from_github(

 vcpkg_cmake_configure(
    SOURCE_PATH "${SOURCE_PATH}"
-    OPTIONS_DEBUG
-        "-DCMAKE_DEBUG_POSTFIX=d" # This was in the old vcpkg CMakeLists.txt and I don't intend to fix it all over vcpkg 
 )
 vcpkg_cmake_install()
 vcpkg_copy_pdbs()
@ -27,91 +25,27 @@ set(PACKAGE_VERSION 5.2.5)
 if(NOT VCPKG_TARGET_IS_WINDOWS)
    set(PTHREAD_CFLAGS -pthread)
 endif()
-if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
-  set(prefix "${CURRENT_INSTALLED_DIR}")
-  configure_file("${SOURCE_PATH}/src/liblzma/liblzma.pc.in" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/liblzma.pc" @ONLY)
-endif()
-if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
+set(prefix "${CURRENT_INSTALLED_DIR}")
+configure_file("${SOURCE_PATH}/src/liblzma/liblzma.pc.in" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/liblzma.pc" @ONLY)
+if (NOT VCPKG_BUILD_TYPE)
  set(prefix "${CURRENT_INSTALLED_DIR}/debug")
  configure_file("${SOURCE_PATH}/src/liblzma/liblzma.pc.in" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/liblzma.pc" @ONLY)
-  vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/liblzma.pc" "-llzma" "-llzmad")
 endif()
 vcpkg_fixup_pkgconfig()

-
 vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/liblzma)

-file(WRITE "${CURRENT_PACKAGES_DIR}/share/liblzma/liblzma-config.cmake" "include(\"\${CMAKE_CURRENT_LIST_DIR}/liblzmaConfig.cmake\")")
-file(APPEND "${CURRENT_PACKAGES_DIR}/share/liblzma/liblzmaConfig.cmake"
-"
-include(\${CMAKE_ROOT}/Modules/SelectLibraryConfigurations.cmake)
-find_path(LibLZMA_INCLUDE_DIR NAMES lzma.h PATHS \"\${_IMPORT_PREFIX}/include\" NO_DEFAULT_PATH REQUIRED)
-if(NOT LibLZMA_LIBRARY)
-    find_library(LibLZMA_LIBRARY_RELEASE NAMES lzma PATHS \"\${_IMPORT_PREFIX}/lib\" NO_DEFAULT_PATH)
-    find_library(LibLZMA_LIBRARY_DEBUG NAMES lzmad PATHS \"\${_IMPORT_PREFIX}/debug/lib\" NO_DEFAULT_PATH)
-    select_library_configurations(LibLZMA)
-endif()
-set(LibLZMA_INCLUDE_DIRS \${LibLZMA_INCLUDE_DIR} CACHE PATH \"\")
-set(LibLZMA_LIBRARIES \${LibLZMA_LIBRARY} CACHE STRING \"\")
-set(LZMA_INCLUDE_DIR \${LibLZMA_INCLUDE_DIR} CACHE PATH \"\")
-set(LZMA_LIBRARY \${LibLZMA_LIBRARY} CACHE STRING \"\")
-set(LZMA_INCLUDE_DIRS \${LibLZMA_INCLUDE_DIR} CACHE PATH \"\")
-set(LZMA_LIBRARIES \${LibLZMA_LIBRARY} CACHE STRING \"\")
-set(LIBLZMA_INCLUDE_DIRS \${LibLZMA_INCLUDE_DIR} CACHE PATH \"\")
-set(LIBLZMA_LIBRARIES \${LibLZMA_LIBRARY} CACHE STRING \"\")
-set(LIBLZMA_INCLUDE_DIR \${LibLZMA_INCLUDE_DIR} CACHE PATH \"\")
-set(LIBLZMA_LIBRARY \${LibLZMA_LIBRARY} CACHE STRING \"\")
-
-if(LIBLZMA_INCLUDE_DIR AND EXISTS \"\${LIBLZMA_INCLUDE_DIR}/lzma/version.h\")
-    file(STRINGS \"\${LIBLZMA_INCLUDE_DIR}/lzma/version.h\" LIBLZMA_HEADER_CONTENTS REGEX \"#define LZMA_VERSION_[A-Z]+ [0-9]+\")
-
-    string(REGEX REPLACE \".*#define LZMA_VERSION_MAJOR ([0-9]+).*\" \"\\\\1\" LIBLZMA_VERSION_MAJOR \"\${LIBLZMA_HEADER_CONTENTS}\")
-    string(REGEX REPLACE \".*#define LZMA_VERSION_MINOR ([0-9]+).*\" \"\\\\1\" LIBLZMA_VERSION_MINOR \"\${LIBLZMA_HEADER_CONTENTS}\")
-    string(REGEX REPLACE \".*#define LZMA_VERSION_PATCH ([0-9]+).*\" \"\\\\1\" LIBLZMA_VERSION_PATCH \"\${LIBLZMA_HEADER_CONTENTS}\")
-
-    set(LIBLZMA_VERSION_STRING \"\${LIBLZMA_VERSION_MAJOR}.\${LIBLZMA_VERSION_MINOR}.\${LIBLZMA_VERSION_PATCH}\")
-    unset(LIBLZMA_HEADER_CONTENTS)
-endif()
-
-## We're using new code known now as XZ, even library still been called LZMA
-## it can be found in http://tukaani.org/xz/
-## Avoid using old codebase
-#if (LIBLZMA_LIBRARY)
-#   include(\${CMAKE_ROOT}/Modules/CheckLibraryExists.cmake)
-#   CHECK_LIBRARY_EXISTS(\${LibLZMA_LIBRARY_RELEASE} lzma_auto_decoder \"\" LIBLZMA_HAS_AUTO_DECODER)
-#   CHECK_LIBRARY_EXISTS(\${LibLZMA_LIBRARY_RELEASE} lzma_easy_encoder \"\" LIBLZMA_HAS_EASY_ENCODER)
-#   CHECK_LIBRARY_EXISTS(\${LibLZMA_LIBRARY_RELEASE} lzma_lzma_preset \"\" LIBLZMA_HAS_LZMA_PRESET)
-#endif ()
-
-set(LibLZMA_FOUND TRUE CACHE BOOL \"\")
-set(LZMA_FOUND TRUE CACHE BOOL \"\")
-set(LIBLZMA_FOUND TRUE CACHE BOOL \"\")
-")
-
-file(READ ${CURRENT_PACKAGES_DIR}/include/lzma.h _contents)
-if (VCPKG_LIBRARY_LINKAGE STREQUAL "static")
-    string(REPLACE "defined(LZMA_API_STATIC)" "1" _contents "${_contents}")
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/lzma.h" "defined(LZMA_API_STATIC)" "1")
 else()
-    string(REPLACE "defined(LZMA_API_STATIC)" "0" _contents "${_contents}")
-endif()
-file(WRITE ${CURRENT_PACKAGES_DIR}/include/lzma.h "${_contents}")
-
-if (VCPKG_BUILD_TYPE STREQUAL debug)
-    file(RENAME "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/include")
-else()
-    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/lzma.h" "defined(LZMA_API_STATIC)" "0")
 endif()

-if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
-    vcpkg_replace_string(
-        "${CURRENT_PACKAGES_DIR}/include/lzma.h"
-        "if !defined(LZMA_API_STATIC)"
-        "if 0"
-    )
-endif()
-
-file(COPY "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
+file(REMOVE_RECURSE
+    "${CURRENT_PACKAGES_DIR}/debug/include"
+    "${CURRENT_PACKAGES_DIR}/debug/share"
+    "${CURRENT_PACKAGES_DIR}/share/man"
+)

 set(TOOLS xz xzdec)
 foreach(_tool IN LISTS TOOLS)
@ -127,5 +61,6 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
 endif()

+file(COPY "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
+file(COPY "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
 file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
-file(COPY "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
--- a/ports/liblzma/vcpkg-cmake-wrapper.cmake
+++ b/ports/liblzma/vcpkg-cmake-wrapper.cmake
@ -1,8 +1,64 @@
-list(REMOVE_ITEM ARGS "NO_MODULE")
-list(REMOVE_ITEM ARGS "CONFIG")
-list(REMOVE_ITEM ARGS "MODULE") # Always call CONFIG.
-_find_package(${ARGS} CONFIG)
-if(NOT TARGET LibLZMA::LibLZMA AND TARGET liblzma::liblzma)
-    add_library(LibLZMA::LibLZMA INTERFACE IMPORTED) # Too lazy to fix wrong target usage all over vcpkg. 
-    set_target_properties(LibLZMA::LibLZMA PROPERTIES INTERFACE_LINK_LIBRARIES liblzma::liblzma)
+cmake_policy(PUSH)
+cmake_policy(SET CMP0012 NEW)
+cmake_policy(SET CMP0057 NEW)
+set(z_vcpkg_liblzma_fixup_needed 0)
+if(NOT "CONFIG" IN_LIST ARGS AND NOT "NO_MODULE" IN_LIST ARGS AND NOT CMAKE_DISABLE_FIND_PACKAGE_LibLZMA)
+    get_filename_component(z_vcpkg_liblzma_prefix "${CMAKE_CURRENT_LIST_DIR}" DIRECTORY)
+    get_filename_component(z_vcpkg_liblzma_prefix "${z_vcpkg_liblzma_prefix}" DIRECTORY)
+    find_path(LIBLZMA_INCLUDE_DIR NAMES lzma.h PATHS "${z_vcpkg_liblzma_prefix}/include" NO_DEFAULT_PATH)
+    # liblzma doesn't use a debug postfix, but FindLibLZMA.cmake expects it 
+    find_library(LIBLZMA_LIBRARY_RELEASE NAMES lzma PATHS "${z_vcpkg_liblzma_prefix}/lib" NO_DEFAULT_PATH)
+    find_library(LIBLZMA_LIBRARY_DEBUG NAMES lzma PATHS "${z_vcpkg_liblzma_prefix}/debug/lib" NO_DEFAULT_PATH)
+    unset(z_vcpkg_liblzma_prefix)
+    if(CMAKE_VERSION VERSION_LESS 3.16)
+        # Older versions of FindLibLZMA.cmake need a single lib in LIBLZMA_LIBRARY.
+        set(z_vcpkg_liblzma_fixup_needed 1)
+        set(LIBLZMA_LIBRARY "${LIBLZMA_LIBRARY_RELEASE}")
+    elseif(NOT TARGET LibLZMA::LibLZMA)
+        set(z_vcpkg_liblzma_fixup_needed 1)
+    endif()
+    # Known values, and required. Skip expensive tests.
+    set(LIBLZMA_HAS_AUTO_DECODER 1 CACHE INTERNAL "")
+    set(LIBLZMA_HAS_EASY_ENCODER 1 CACHE INTERNAL "")
+    set(LIBLZMA_HAS_LZMA_PRESET 1 CACHE INTERNAL "")
 endif()
+
+_find_package(${ARGS})
+
+if(z_vcpkg_liblzma_fixup_needed)
+    include(SelectLibraryConfigurations)
+    select_library_configurations(LIBLZMA)
+    if(NOT TARGET LibLZMA::LibLZMA)
+        # Backfill LibLZMA::LibLZMA to versions of cmake before 3.14
+        add_library(LibLZMA::LibLZMA UNKNOWN IMPORTED)
+        if(DEFINED LIBLZMA_INCLUDE_DIRS)
+            set_target_properties(LibLZMA::LibLZMA PROPERTIES
+                INTERFACE_INCLUDE_DIRECTORIES "${LIBLZMA_INCLUDE_DIRS}")
+        endif()
+        set_property(TARGET LibLZMA::LibLZMA APPEND PROPERTY
+            IMPORTED_CONFIGURATIONS RELEASE)
+        set_target_properties(LibLZMA::LibLZMA PROPERTIES
+            IMPORTED_LINK_INTERFACE_LANGUAGES_RELEASE "C"
+            IMPORTED_LOCATION_RELEASE "${LIBLZMA_LIBRARY_RELEASE}")
+        if(EXISTS "${LIBLZMA_LIBRARY}")
+            set_target_properties(LibLZMA::LibLZMA PROPERTIES
+                IMPORTED_LINK_INTERFACE_LANGUAGES "C"
+                IMPORTED_LOCATION "${LIBLZMA_LIBRARY}")
+        endif()
+    endif()
+    if(LIBLZMA_LIBRARY_DEBUG)
+        # Backfill debug variant to versions of cmake before 3.16
+        set_property(TARGET LibLZMA::LibLZMA APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG)
+        set_target_properties(LibLZMA::LibLZMA PROPERTIES IMPORTED_LOCATION_DEBUG "${LIBLZMA_LIBRARY_DEBUG}")
+    endif()
+endif()
+if(LIBLZMA_LIBRARIES AND NOT "Threads::Threads" IN_LIST LIBLZMA_LIBRARIES)
+    set(THREADS_PREFER_PTHREAD_FLAG TRUE)
+    find_package(Threads)
+    list(APPEND LIBLZMA_LIBRARIES ${CMAKE_THREAD_LIBS_INIT})
+    if(TARGET LibLZMA::LibLZMA)
+        set_property(TARGET LibLZMA::LibLZMA APPEND PROPERTY INTERFACE_LINK_LIBRARIES Threads::Threads)
+    endif()
+endif()
+unset(z_vcpkg_liblzma_fixup_needed)
+cmake_policy(POP)
--- a/ports/liblzma/vcpkg.json
+++ b/ports/liblzma/vcpkg.json
@ -1,9 +1,10 @@
 {
  "name": "liblzma",
  "version-semver": "5.2.5",
-  "port-version": 4,
+  "port-version": 5,
  "description": "Compression library with an API similar to that of zlib.",
-  "homepage": "hhttps://github.com/xz-mirror/xz",
+  "homepage": "https://github.com/xz-mirror/xz",
+  "license": null,
  "dependencies": [
    {
      "name": "vcpkg-cmake",
--- a/ports/liblzma/win_output_name.patch
+++ b/ports/liblzma/win_output_name.patch
@ -1,13 +1,17 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index e80b524..1ecf908 100644
+index e80b524..cddbccb 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -429,7 +429,7 @@ set_target_properties(liblzma PROPERTIES
+@@ -429,8 +429,11 @@ set_target_properties(liblzma PROPERTIES
 
     # It's liblzma.so or liblzma.dll, not libliblzma.so or lzma.dll.
     # Avoid the name lzma.dll because it would conflict with LZMA SDK.
 -    PREFIX ""
 +    OUTPUT_NAME lzma
 )
+if(WIN32 AND NOT MINGW)
+    set_target_properties(liblzma PROPERTIES RUNTIME_OUTPUT_NAME liblzma)
+endif()
 
 # Create liblzmaConfigVersion.cmake.
+ #
--- a/ports/libwandio/configure.lib.patch
+++ b/ports/libwandio/configure.lib.patch
@ -56,7 +56,7 @@ index 4579fbb3d..f6be008c8 100644
 	[
 -	AC_CHECK_HEADER(lzma.h, have_lzma=yes, have_lzma=no)
 +	# AC_CHECK_HEADER(lzma.h, have_lzma=yes, have_lzma=no)
-+    AC_SEARCH_LIBS(lzma_free, [lzma lzmad], have_lzma=yes, have_lzma=no)
+    AC_SEARCH_LIBS(lzma_free, [lzma], have_lzma=yes, have_lzma=no)
 	], [have_lzma=no])
 
 AS_IF([test "x$have_lzma" = "xyes"], [
--- a/ports/libwandio/vcpkg.json
+++ b/ports/libwandio/vcpkg.json
@ -1,9 +1,10 @@
 {
  "name": "libwandio",
-  "version-string": "4.2.1",
-  "port-version": 5,
+  "version": "4.2.1",
+  "port-version": 6,
  "description": "C library for simple and efficient file IO.",
  "homepage": "https://github.com/wanduow/wandio",
+  "license": "LGPL-3.0-only",
  "supports": "!windows",
  "dependencies": [
    "bzip2",
--- a/ports/libxml2/vcpkg-cmake-wrapper.cmake
+++ b/ports/libxml2/vcpkg-cmake-wrapper.cmake
@ -40,7 +40,7 @@ if(LibXml2_FOUND AND "@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static" AND NOT ${ARGV0
        endif()
    endif()
    if(TARGET LibXml2::LibXml2)
-        set_property(TARGET LibXml2::LibXml2 APPEND PROPERTY INTERFACE_LINK_LIBRARIES "liblzma::liblzma" "ZLIB::ZLIB")
+        set_property(TARGET LibXml2::LibXml2 APPEND PROPERTY INTERFACE_LINK_LIBRARIES "LibLZMA::LibLZMA" "ZLIB::ZLIB")
        if(TARGET Iconv::Iconv)
            set_property(TARGET LibXml2::LibXml2 APPEND PROPERTY INTERFACE_LINK_LIBRARIES "Iconv::Iconv")
        endif()
--- a/ports/libxml2/vcpkg.json
+++ b/ports/libxml2/vcpkg.json
@ -1,9 +1,10 @@
 {
  "name": "libxml2",
  "version-semver": "2.9.12",
-  "port-version": 4,
+  "port-version": 5,
  "description": "Libxml2 is the XML C parser and toolkit developed for the Gnome project (but usable outside of the Gnome platform).",
  "homepage": "https://xmlsoft.org/",
+  "license": "MIT",
  "dependencies": [
    "libiconv",
    "liblzma",
--- a/ports/libxslt/0001-Fix-makefile.patch
+++ b/ports/libxslt/0001-Fix-makefile.patch
@ -8,11 +8,11 @@ index 2e4742bb..8bfe7d83 100644
 LDFLAGS = $(LDFLAGS) /LIBPATH:$(BINDIR) /LIBPATH:$(LIBPREFIX)
 -LIBS =
 +# The libraries are needed for static builds (the makefile builds all tools and dlls)
-+LIBS = iconv.lib charset.lib ws2_32.lib
+LIBS = iconv.lib charset.lib ws2_32.lib lzma.lib
 +!if "$(DEBUG)" == "1"
-+LIBS = $(LIBS) zlibd.lib lzmad.lib
+LIBS = $(LIBS) zlibd.lib
 +!else
-+LIBS = $(LIBS) zlib.lib lzma.lib
+LIBS = $(LIBS) zlib.lib
 +!endif
 
 # The archiver and its options.
--- a/ports/libxslt/vcpkg.json
+++ b/ports/libxslt/vcpkg.json
@ -1,9 +1,10 @@
 {
  "name": "libxslt",
  "version": "1.1.34",
-  "port-version": 3,
+  "port-version": 4,
  "description": "Libxslt is a XSLT library implemented in C for XSLT 1.0 and most of EXSLT",
  "homepage": "https://github.com/GNOME/libxslt",
+  "license": null,
  "supports": "!uwp",
  "dependencies": [
    "liblzma",
--- a/ports/python3/portfile.cmake
+++ b/ports/python3/portfile.cmake
@ -80,7 +80,7 @@ if(VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_UWP)
        find_library(FFI_RELEASE NAMES libffi PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH)
        find_library(FFI_DEBUG NAMES libffi PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH)
        find_library(LZMA_RELEASE NAMES lzma PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH)
-        find_library(LZMA_DEBUG NAMES lzmad PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH)
+        find_library(LZMA_DEBUG NAMES lzma PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH)
        find_library(SQLITE_RELEASE NAMES sqlite3 PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH)
        find_library(SQLITE_DEBUG NAMES sqlite3 PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH)
        find_library(SSL_RELEASE NAMES libssl PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH)
--- a/ports/python3/vcpkg.json
+++ b/ports/python3/vcpkg.json
@ -1,7 +1,7 @@
 {
  "name": "python3",
  "version-semver": "3.10.1",
-  "port-version": 6,
+  "port-version": 7,
  "description": "The Python programming language",
  "homepage": "https://github.com/python/cpython",
  "license": "Python-2.0",
--- a/ports/qt5-imageformats/portfile.cmake
+++ b/ports/qt5-imageformats/portfile.cmake
@ -36,7 +36,7 @@ find_library(WEBPDECODER_DEBUG NAMES webpdecoder libwebpdecoder webpdecoderd lib

 #Dependent libraries
 find_library(LZMA_RELEASE lzma PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH)
-find_library(LZMA_DEBUG lzmad lzma PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH)
+find_library(LZMA_DEBUG lzma PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH)

 if(NOT VCPKG_TARGET_IS_WINDOWS)
    string(APPEND WEBP_RELEASE " -pthread")
--- a/ports/qt5-imageformats/vcpkg.json
+++ b/ports/qt5-imageformats/vcpkg.json
@ -1,8 +1,9 @@
 {
  "name": "qt5-imageformats",
-  "version-string": "5.15.2",
-  "port-version": 1,
+  "version": "5.15.2",
+  "port-version": 2,
  "description": "Qt5 Image Formats Module - Plugins for additional image formats: TIFF, MNG, TGA, WBMP",
+  "license": null,
  "dependencies": [
    "jasper",
    "libwebp",
--- a/ports/tiff/vcpkg-cmake-wrapper.cmake.in
+++ b/ports/tiff/vcpkg-cmake-wrapper.cmake.in
@ -20,9 +20,9 @@ if(TIFF_FOUND AND "@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static")
        list(APPEND z_vcpkg_tiff_libraries ${WEBP_LIBRARIES})
    endif()
    if(@lzma@)
-        find_package(LibLZMA CONFIG ${z_vcpkg_tiff_find_options})
+        find_package(LibLZMA ${z_vcpkg_tiff_find_options})
        list(APPEND z_vcpkg_tiff_link_libraries LibLZMA::LibLZMA)
-        list(APPEND z_vcpkg_tiff_libraries ${LZMA_LIBRARIES})
+        list(APPEND z_vcpkg_tiff_libraries ${LIBLZMA_LIBRARIES})
    endif()
    if(@jpeg@)
        find_package(JPEG ${z_vcpkg_tiff_find_options})
--- a/ports/tiff/vcpkg.json
+++ b/ports/tiff/vcpkg.json
@ -1,9 +1,10 @@
 {
  "name": "tiff",
  "version": "4.3.0",
-  "port-version": 5,
+  "port-version": 6,
  "description": "A library that supports the manipulation of TIFF image files",
  "homepage": "https://libtiff.gitlab.io/libtiff/",
+  "license": null,
  "dependencies": [
    {
      "name": "vcpkg-cmake",
--- a/ports/vtk/FindLZMA.patch
+++ b/ports/vtk/FindLZMA.patch
@ -1,86 +1,15 @@
-diff --git a/CMake/FindLZMA.cmake b/CMake/FindLZMA.cmake
-index 0c8c7943c..d60669484 100644
--- a/CMake/FindLZMA.cmake
-+++ b/CMake/FindLZMA.cmake
-@@ -1,9 +1,17 @@
- find_path(LZMA_INCLUDE_DIR
-   NAMES lzma.h
-   DOC "lzma include directory")
-find_library(LZMA_LIBRARY
-+# Note LZMA_LIBRARY is set somewhere else. Maybe one of the configs/wrappers installed by VCPKG defines it. 
-+# The original FindLZMA chokes on it since it contains optimized/debug keywords
-+# VTK should probably switch to FindLibLZMA from CMake
-+find_library(LZMA_LIBRARY_RELEASE
-   NAMES lzma
-   DOC "lzma library")
-+find_library(LZMA_LIBRARY_DEBUG
-+  NAMES lzmad lzma NAMES_PER_DIR
-+  DOC "lzma library")
-+ include(SelectLibraryConfigurations)
-+ select_library_configurations( LZMA )
- 
- if (LZMA_INCLUDE_DIR)
-   file(STRINGS "${LZMA_INCLUDE_DIR}/lzma/version.h" _lzma_version_lines
-@@ -20,22 +26,50 @@ endif ()
- 
- include(FindPackageHandleStandardArgs)
- find_package_handle_standard_args(LZMA
-  REQUIRED_VARS LZMA_LIBRARY LZMA_INCLUDE_DIR
-+  REQUIRED_VARS LZMA_LIBRARY LZMA_LIBRARY_RELEASE LZMA_LIBRARY_DEBUG LZMA_INCLUDE_DIR
-   VERSION_VAR LZMA_VERSION)
- 
- if (LZMA_FOUND)
-   set(LZMA_LIBRARIES "${LZMA_LIBRARY}")
-   set(LZMA_INCLUDE_DIRS "${LZMA_INCLUDE_DIR}")
-
-+  
-   if (NOT TARGET LZMA::LZMA)
-     include(vtkDetectLibraryType)
-    vtk_detect_library_type(lzma_library_type
-      PATH "${LZMA_LIBRARY}")
-    add_library(LZMA::LZMA "${lzma_library_type}" IMPORTED)
-    unset(lzma_library_type)
-    set_target_properties(LZMA::LZMA PROPERTIES
-      IMPORTED_LOCATION "${LZMA_LIBRARY}"
-      IMPORTED_IMPLIB "${LZMA_LIBRARY}"
-      INTERFACE_INCLUDE_DIRECTORIES "${LZMA_INCLUDE_DIR}")
-  endif ()
-+    if(LZMA_LIBRARY_RELEASE)
-+      vtk_detect_library_type(lzma_library_type
-+        PATH "${LZMA_LIBRARY_RELEASE}") 
-+    elseif(LZMA_LIBRARY_DEBUG)
-+        vtk_detect_library_type(lzma_library_type
-+        PATH "${LZMA_LIBRARY_DEBUG}") 
-+    else()
-+        vtk_detect_library_type(lzma_library_type
-+        PATH "${LZMA_LIBRARY}") 
-+    endif()
-+    
-+      add_library(LZMA::LZMA "${lzma_library_type}" IMPORTED)
-+      set_target_properties(LZMA::LZMA PROPERTIES
-+        INTERFACE_INCLUDE_DIRECTORIES "${LZMA_INCLUDE_DIR}")
-+    if(LZMA_LIBRARY_RELEASE)
-+      set_target_properties(LZMA::LZMA PROPERTIES
-+          IMPORTED_LOCATION_RELEASE "${LZMA_LIBRARY_RELEASE}"
-+          IMPORTED_IMPLIB_RELEASE "${LZMA_LIBRARY_RELEASE}")
-+    endif()
-+    if(LZMA_LIBRARY_DEBUG)
-+      set_target_properties(LZMA::LZMA PROPERTIES
-+          IMPORTED_LOCATION_DEBUG "${LZMA_LIBRARY_DEBUG}"
-+          IMPORTED_IMPLIB_DEBUG "${LZMA_LIBRARY_DEBUG}")
-+    endif()
-+  
-+    # Guard against possible stupidity of depending projects reading only LOCATION without configuration
-+    if(CMAKE_BUILD_TYPE MATCHES "Debug") 
-+      set_target_properties(LZMA::LZMA PROPERTIES
-+          IMPORTED_LOCATION "${LZMA_LIBRARY_DEBUG}"
-+          IMPORTED_IMPLIB "${LZMA_LIBRARY_DEBUG}")
-+    else()
-+      set_target_properties(LZMA::LZMA PROPERTIES
-+          IMPORTED_LOCATION "${LZMA_LIBRARY_RELEASE}"
-+          IMPORTED_IMPLIB "${LZMA_LIBRARY_RELEASE}")
-+    endif()
-+  endif()
-+  #set_target_properties(LZMA::LZMA PROPERTIES IMPORTED_GLOBAL TRUE)
- endif ()
- 
+diff --git a/CMake/FindLZMA.cmake b/CMake/FindLZMA.cmake
+index 0c8c794..796558c 100644
+--- a/CMake/FindLZMA.cmake
+++ b/CMake/FindLZMA.cmake
+@@ -1,3 +1,10 @@
+find_package(LibLZMA)
+set(LZMA_INCLUDE_DIR "${LIBLZMA_INCLUDE_DIR}" CACHE INTERNAL "")
+set(LZMA_LIBRARY "${LIBLZMA_LIBRARIES}" CACHE INTERNAL "")
+if(NOT TARGET LZMA::LZMA)
+  add_library(LZMA::LZMA ALIAS LibLZMA::LibLZMA)
+endif()
+
+ find_path(LZMA_INCLUDE_DIR
+   NAMES lzma.h
+   DOC "lzma include directory")
--- a/ports/vtk/vcpkg.json
+++ b/ports/vtk/vcpkg.json
@ -1,9 +1,10 @@
 {
  "name": "vtk",
  "version-semver": "9.0.3-pv5.9.1",
-  "port-version": 6,
+  "port-version": 7,
  "description": "Software system for 3D computer graphics, image processing, and visualization",
  "homepage": "https://github.com/Kitware/VTK",
+  "license": "BSD-3-Clause",
  "dependencies": [
    "double-conversion",
    "eigen3",
--- a/versions/a-/avro-c.json
+++ b/versions/a-/avro-c.json
@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "7b07da3abd56565c8d2e75942aab468ece0f3115",
+      "version": "1.11.0",
+      "port-version": 3
+    },
    {
      "git-tree": "e36456a1ada18a8020e4bb1fffa24b0dc2edfa3e",
      "version": "1.11.0",
--- a/versions/b-/boost-iostreams.json
+++ b/versions/b-/boost-iostreams.json
@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "73e04423bfb004c75708458688afeeb8a1806ba5",
+      "version": "1.78.0",
+      "port-version": 2
+    },
    {
      "git-tree": "1e23d8d78c5a33ee92fc1ec70db8125db72032a2",
      "version": "1.78.0",
--- a/versions/baseline.json
+++ b/versions/baseline.json
@ -250,7 +250,7 @@
    },
    "avro-c": {
      "baseline": "1.11.0",
-      "port-version": 2
+      "port-version": 3
    },
    "avro-cpp": {
      "baseline": "2021-06-01",
@ -766,7 +766,7 @@
    },
    "boost-iostreams": {
      "baseline": "1.78.0",
-      "port-version": 1
+      "port-version": 2
    },
    "boost-iterator": {
      "baseline": "1.78.0",
@ -2014,7 +2014,7 @@
    },
    "elfutils": {
      "baseline": "0.186",
-      "port-version": 1
+      "port-version": 2
    },
    "embree2": {
      "baseline": "2.17.7",
@ -2154,7 +2154,7 @@
    },
    "ffmpeg": {
      "baseline": "4.4.1",
-      "port-version": 9
+      "port-version": 10
    },
    "ffnvcodec": {
      "baseline": "11.1.5.0",
@ -2378,7 +2378,7 @@
    },
    "gdal": {
      "baseline": "3.4.1",
-      "port-version": 2
+      "port-version": 3
    },
    "gdcm": {
      "baseline": "3.0.7",
@ -3338,7 +3338,7 @@
    },
    "libarchive": {
      "baseline": "3.5.2",
-      "port-version": 3
+      "port-version": 4
    },
    "libass": {
      "baseline": "0.15.2",
@ -3666,7 +3666,7 @@
    },
    "liblzma": {
      "baseline": "5.2.5",
-      "port-version": 4
+      "port-version": 5
    },
    "libmad": {
      "baseline": "0.15.1",
@ -4098,7 +4098,7 @@
    },
    "libwandio": {
      "baseline": "4.2.1",
-      "port-version": 5
+      "port-version": 6
    },
    "libwebm": {
      "baseline": "1.0.0.28",
@ -4122,7 +4122,7 @@
    },
    "libxml2": {
      "baseline": "2.9.12",
-      "port-version": 4
+      "port-version": 5
    },
    "libxmlmm": {
      "baseline": "0.6.0",
@ -4138,7 +4138,7 @@
    },
    "libxslt": {
      "baseline": "1.1.34",
-      "port-version": 3
+      "port-version": 4
    },
    "libyaml": {
      "baseline": "0.2.5",
@ -5550,7 +5550,7 @@
    },
    "python3": {
      "baseline": "3.10.1",
-      "port-version": 6
+      "port-version": 7
    },
    "qca": {
      "baseline": "2.3.4",
@ -5642,7 +5642,7 @@
    },
    "qt5-imageformats": {
      "baseline": "5.15.2",
-      "port-version": 1
+      "port-version": 2
    },
    "qt5-location": {
      "baseline": "5.15.2",
@ -6850,7 +6850,7 @@
    },
    "tiff": {
      "baseline": "4.3.0",
-      "port-version": 5
+      "port-version": 6
    },
    "tinkerforge": {
      "baseline": "2.1.25",
@ -7266,7 +7266,7 @@
    },
    "vtk": {
      "baseline": "9.0.3-pv5.9.1",
-      "port-version": 6
+      "port-version": 7
    },
    "vtk-dicom": {
      "baseline": "0.8.12",
--- a/versions/e-/elfutils.json
+++ b/versions/e-/elfutils.json
@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "03e8299432623718bf6b58a61d19d408b6c8828c",
+      "version": "0.186",
+      "port-version": 2
+    },
    {
      "git-tree": "1e219cc99d3cfb41ba24f835240acf510a62bc3c",
      "version-string": "0.186",
--- a/versions/f-/ffmpeg.json
+++ b/versions/f-/ffmpeg.json
@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "d525f98e7146a1fd731febe7c472232142d62821",
+      "version": "4.4.1",
+      "port-version": 10
+    },
    {
      "git-tree": "558575c9b18b2ff734d48fe175e61f5a11c02ce4",
      "version": "4.4.1",
--- a/versions/g-/gdal.json
+++ b/versions/g-/gdal.json
@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "a8c88697265b7f88d7576c24c57456da86500b19",
+      "version-semver": "3.4.1",
+      "port-version": 3
+    },
    {
      "git-tree": "e90ac12366dec86dcacf5a66562e48f80254b3c5",
      "version-semver": "3.4.1",
--- a/versions/l-/libarchive.json
+++ b/versions/l-/libarchive.json
@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "96ba668589b8400bcc1164b98fc5dcecf3af923e",
+      "version-semver": "3.5.2",
+      "port-version": 4
+    },
    {
      "git-tree": "2408bfca781ee9e5add6e674043e5f8ccca73a1b",
      "version-semver": "3.5.2",
--- a/versions/l-/liblzma.json
+++ b/versions/l-/liblzma.json
@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "18b7cbd0972b536a6bd4c0ef0f41dce9c3f047ac",
+      "version-semver": "5.2.5",
+      "port-version": 5
+    },
    {
      "git-tree": "273eaeff533f90bc42394cca9f1ea23ff6b49534",
      "version-semver": "5.2.5",
--- a/versions/l-/libwandio.json
+++ b/versions/l-/libwandio.json
@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "eb4e485cc1313349e0fbb65d4997d5968245877a",
+      "version": "4.2.1",
+      "port-version": 6
+    },
    {
      "git-tree": "8340fce2f7c5dd26c578bb7c59f8d3f8d982c105",
      "version-string": "4.2.1",
--- a/versions/l-/libxml2.json
+++ b/versions/l-/libxml2.json
@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "582189632eff9dc4ba2ef262a853c339d2838bd9",
+      "version-semver": "2.9.12",
+      "port-version": 5
+    },
    {
      "git-tree": "5cb8ed61786fdd081204880cd02d9376b17130eb",
      "version-semver": "2.9.12",
--- a/versions/l-/libxslt.json
+++ b/versions/l-/libxslt.json
@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "034ea26a2cde47c4d19df6eb35bc124a79ad37a3",
+      "version": "1.1.34",
+      "port-version": 4
+    },
    {
      "git-tree": "f139a7054e2347bc0f48ba6cabe14a74e7d1db36",
      "version": "1.1.34",
--- a/versions/p-/python3.json
+++ b/versions/p-/python3.json
@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "31155fa7fa6cfa0fd2554e89584c92a2135bce19",
+      "version-semver": "3.10.1",
+      "port-version": 7
+    },
    {
      "git-tree": "a7ef4a1d73a9e486cd23edd98f12a2f4d4216920",
      "version-semver": "3.10.1",
--- a/versions/q-/qt5-imageformats.json
+++ b/versions/q-/qt5-imageformats.json
@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "5bf32f350b7d08389629bc565c66aeb5f84e93b0",
+      "version": "5.15.2",
+      "port-version": 2
+    },
    {
      "git-tree": "6f6ca0b9e789dbfafa84ca02eec3da94f2728494",
      "version-string": "5.15.2",
--- a/versions/t-/tiff.json
+++ b/versions/t-/tiff.json
@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "7d1677b9568234f05c4be9f04f321b9506884376",
+      "version": "4.3.0",
+      "port-version": 6
+    },
    {
      "git-tree": "29af46222dc88425d734288253d807f1a9b96419",
      "version": "4.3.0",
--- a/versions/v-/vtk.json
+++ b/versions/v-/vtk.json
@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "4ba3d3d0db6e98e9a47d8c5c86790da3ef9af25b",
+      "version-semver": "9.0.3-pv5.9.1",
+      "port-version": 7
+    },
    {
      "git-tree": "4a9a03829df133347e358e94e79953ac9d91ae82",
      "version-semver": "9.0.3-pv5.9.1",