[Many ports] Remove/fix unused patch files (#20620)

* Remove/fix unused patch files

* Bump port versions

* Update git-tree hash

* Fix corrupt patch

* Update git-tree hash

* Apply suggestions from code review

Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>

* Update git-tree hash

Co-authored-by: chausner <chausner@users.noreply.github.com>
Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>

ports/3fd/portfile.cmake

@@ -22,7 +22,7 @@ vcpkg_from_github(
     SHA512 70630291b4055de2044ad76ef21e99d6ab6fd3468debb2a864a461cf8513642fe87f116e9dfff96ecff96f4577108493dc25aa40eeefcd93ee75990b13bb7b20
     HEAD_REF master
     PATCHES
-        rapidxml.patch
+        RapidXML.patch
 )
 
 # Build:

ports/3fd/vcpkg.json

@@ -1,6 +1,7 @@
 {
   "name": "3fd",
-  "version-string": "2.6.3",
+  "version": "2.6.3",
+  "port-version": 1,
   "description": "C++ Framework For Fast Development",
   "supports": "windows & !static & !arm64",
   "dependencies": [

ports/cppad/pkgconfig-fix.patch

@@ -1,63 +0,0 @@
-diff --git a/pkgconfig/CMakeLists.txt b/pkgconfig/CMakeLists.txt
-index db8b65902..b1224a01d 100644
---- a/pkgconfig/CMakeLists.txt
-+++ b/pkgconfig/CMakeLists.txt
-@@ -42,8 +42,9 @@ ENDIF( cppad_has_ipopt )
- # cppad_pkgconfig_cflags
- # cppad_pkgconfig_cflags_uninstalled
- #
--SET(cppad_pkgconfig_cflags             "-I${cppad_abs_includedir}" )
--SET(cppad_pkgconfig_cflags_uninstalled "-I${cppad_SOURCE_DIR}"     )
-+SET(cppad_pkgconfig_includedir          "${cmake_install_includedirs}" )
-+SET(cppad_pkgconfig_cflags_uninstalled  "-I${cppad_SOURCE_DIR}"        )
-+SET(cppad_pkgconfig_libdir              "${cmake_install_libdirs}"     )
- # ----------------------------------------------------------------------------
- # cppad_pkgconfig_libs
- # cppad_pkgconfig_libs_uninstalled
-@@ -74,7 +75,7 @@ IF( "${libs}" STREQUAL "" )
-     SET(cppad_pkgconfig_libs             "")
-     SET(cppad_pkgconfig_libs_uninstalled "")
- ELSE( "${libs}" STREQUAL "" )
--    SET(cppad_pkgconfig_libs             "-L${cppad_abs_libdir} ${libs}")
-+    SET(cppad_pkgconfig_libs             "-L\${libdir} ${libs}")
-     SET(cppad_pkgconfig_libs_uninstalled "${uninstalled} ${libs}")
- ENDIF( "${libs}" STREQUAL "" )
- #
-@@ -84,10 +85,12 @@ ENDIF( "${libs}" STREQUAL "" )
- CONFIGURE_FILE(
-     ${CMAKE_CURRENT_SOURCE_DIR}/cppad.pc.in
-     ${CMAKE_CURRENT_BINARY_DIR}/cppad.pc
-+    @ONLY
- )
- CONFIGURE_FILE(
-     ${CMAKE_CURRENT_SOURCE_DIR}/cppad-uninstalled.pc.in
-     ${CMAKE_CURRENT_BINARY_DIR}/cppad-uninstalled.pc
-+    @ONLY
- )
- # During install copy cppad.pc to datadir and libdir
- INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/cppad.pc
-diff --git a/pkgconfig/cppad.pc.in b/pkgconfig/cppad.pc.in
-index a202e3fb3..1c34c1e08 100644
---- a/pkgconfig/cppad.pc.in
-+++ b/pkgconfig/cppad.pc.in
-@@ -12,12 +12,19 @@
- # This file is used with pkg-config to include CppAD after it is installed
- #
- # Entries set by top source directory CMakeLists.txt file
-+
-+prefix=${pcfiledir}/../..
-+exec_prefix=${prefix}
-+libdir=${exec_prefix}/@cppad_pkgconfig_libdir@
-+includedir=${prefix}/@cppad_pkgconfig_includedir@
-+
- Name:         cppad
- Description:  @cppad_description@
- Version:      @cppad_version@
- URL:          @cppad_url@
-+
- #
- # Entries set by pkgconfig/CMakeLists.txt file
--Cflags:       @cppad_pkgconfig_cflags@
-+Cflags:       -I${includedir}
- Libs:         @cppad_pkgconfig_libs@
- Requires:     @cppad_pkgconfig_requires@

ports/cppad/vcpkg.json

@@ -1,6 +1,7 @@
 {
   "name": "cppad",
   "version-string": "20210000.7",
+  "port-version": 1,
   "description": "CppAD: A Package for Differentiation of C++ Algorithms",
   "homepage": "https://github.com/coin-or/CppAD",
   "supports": "!(arm | uwp)",

ports/cppitertools/fix-cmake-install-dir.patch

@@ -1,20 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 3caa411..775ce02 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -14,7 +14,7 @@ add_library(cppitertools::cppitertools ALIAS cppitertools)
-
- target_include_directories(cppitertools INTERFACE
-         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
--        $<INSTALL_INTERFACE:${cppitertools_INSTALL_CMAKE_DIR}/cppitertools>
-+        $<INSTALL_INTERFACE:${cppitertools_INSTALL_INCLUDE_DIR}/cppitertools>
-         )
-
-
-@@ -37,5 +37,5 @@ install(EXPORT cppitertools-targets
-         DESTINATION ${cppitertools_INSTALL_CMAKE_DIR}/cppitertools
-         )
-
--install(FILES ${CMAKE_CURRENT_BINARY_DIR}/cppitertools-config-version.cmake DESTINATION ${cppitertools_INSTALL_CMAKE_DIR})
-+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/cppitertools-config-version.cmake DESTINATION ${cppitertools_INSTALL_CMAKE_DIR}/cppitertools)
- install(DIRECTORY . DESTINATION ${cppitertools_INSTALL_INCLUDE_DIR}/cppitertools)

ports/cppitertools/vcpkg.json

@@ -1,7 +1,7 @@
 {
   "name": "cppitertools",
-  "version-string": "2.1",
-  "port-version": 1,
+  "version": "2.1",
+  "port-version": 2,
   "description": "Range-based for loop add-ons inspired by the Python builtins and itertools library",
   "homepage": "https://github.com/ryanhaining/cppitertools",
   "dependencies": [

ports/cpuid/fix-install-headers.patch

@@ -1,13 +0,0 @@
-diff --git a/libcpuid/CMakeLists.txt b/libcpuid/CMakeLists.txt
-index 96533ac..d71953f 100644
---- a/libcpuid/CMakeLists.txt
-+++ b/libcpuid/CMakeLists.txt
-@@ -75,7 +75,7 @@ install(TARGETS cpuid
-         LIBRARY DESTINATION "lib"
-         ARCHIVE DESTINATION "lib"
-         RUNTIME DESTINATION "bin"
--        INCLUDES DESTINATION "include")
-+        PUBLIC_HEADER DESTINATION "include")
- 
- install(FILES "${project_config}" "${version_config}"
-         DESTINATION "${config_install_dir}"

ports/cpuid/vcpkg.json

@@ -1,6 +1,7 @@
 {
   "name": "cpuid",
   "version": "0.5.1",
+  "port-version": 1,
   "description": "Provides CPU identification for the x86 (and x86_64)",
   "homepage": "https://github.com/anrieff/libcpuid",
   "supports": "x86 | x64",

ports/ctemplate/fix-msvc.patch

@@ -1,17 +0,0 @@
-diff --git a/src/per_expand_data.cc b/src/per_expand_data.cc
-index f8f3025..0a468cf 100644
---- a/src/per_expand_data.cc
-+++ b/src/per_expand_data.cc
-@@ -42,10 +42,12 @@ namespace ctemplate {
- 
- using std::string;
- 
-+#ifndef _MSC_VER
- bool PerExpandData::DataEq::operator()(const char* s1, const char* s2) const {
-   return ((s1 == 0 && s2 == 0) ||
-           (s1 && s2 && *s1 == *s2 && strcmp(s1, s2) == 0));
- }
-+#endif
- 
- PerExpandData::~PerExpandData() {
-   delete map_;

ports/ctemplate/vcpkg.json

@@ -1,7 +1,7 @@
 {
   "name": "ctemplate",
-  "version-string": "2020-09-14",
-  "port-version": 1,
+  "version-date": "2020-09-14",
+  "port-version": 2,
   "description": "C++ CTemplate system",
   "homepage": "https://github.com/OlafvdSpek/ctemplate"
 }

ports/dimcli/fix-NameBoolean.patch

@@ -1,63 +0,0 @@
-diff --git a/libs/dimcli/cli.cpp b/libs/dimcli/cli.cpp
-index 45dac3b..6129884 100644
---- a/libs/dimcli/cli.cpp
-+++ b/libs/dimcli/cli.cpp
-@@ -392,8 +392,8 @@ GroupConfig const & Cli::Config::findGrpOrDie(Cli const & cli) {
- ***/
- 
- //===========================================================================
--Cli::OptBase::OptBase(string const & names, bool boolean)
--    : m_bool{boolean}
-+Cli::OptBase::OptBase(string const & names, bool in_boolean)
-+    : m_bool{in_boolean}
-     , m_names{names}
- {
-     // set m_fromName and assert if names is malformed
-@@ -526,12 +526,12 @@ static bool includeName(
-     OptName const & name,
-     NameListType type,
-     Cli::OptBase const & opt,
--    bool boolean,
-+    bool in_boolean,
-     bool inverted
- ) {
-     if (name.opt != &opt)
-         return false;
--    if (boolean) {
-+    if (in_boolean) {
-         if (type == kNameEnable)
-             return !name.invert;
-         if (type == kNameDisable)
-diff --git a/libs/dimcli/cli.h b/libs/dimcli/cli.h
-index d4941dc..fa8d526 100644
---- a/libs/dimcli/cli.h
-+++ b/libs/dimcli/cli.h
-@@ -777,7 +777,7 @@ public:
-     };
- 
- public:
--    OptBase(std::string const & keys, bool boolean);
-+    OptBase(std::string const & keys, bool in_boolean);
-     virtual ~OptBase() {}
- 
-     //-----------------------------------------------------------------------
-@@ -1062,7 +1062,7 @@ std::string Cli::OptBase::toValueDesc<DIMCLI_LIB_FILESYSTEM_PATH>() const {
- template <typename A, typename T>
- class Cli::OptShim : public OptBase {
- public:
--    OptShim(std::string const & keys, bool boolean);
-+    OptShim(std::string const & keys, bool in_boolean);
-     OptShim(OptShim const &) = delete;
-     OptShim & operator=(OptShim const &) = delete;
- 
-@@ -1249,8 +1249,8 @@ protected:
- 
- //===========================================================================
- template <typename A, typename T>
--Cli::OptShim<A, T>::OptShim(std::string const & keys, bool boolean)
--    : OptBase(keys, boolean)
-+Cli::OptShim<A, T>::OptShim(std::string const & keys, bool in_boolean)
-+    : OptBase(keys, in_boolean)
- {
-     if (std::is_arithmetic<T>::value)
-         this->imbue(std::locale(""));

ports/dimcli/vcpkg.json

@@ -1,7 +1,7 @@
 {
   "name": "dimcli",
-  "version-string": "5.0.2",
-  "port-version": 1,
+  "version-semver": "5.0.2",
+  "port-version": 2,
   "description": "C++ command line parser toolkit",
   "homepage": "https://github.com/gknowles/dimcli"
 }

ports/freerdp/install-dirs.patch

@@ -10,4 +10,4 @@ index 5e67ef9..4ef3e8e 100644
 +cmake_minimum_required(VERSION 3.11)
  
  project(FreeRDP C CXX)
- 
+ 

ports/freerdp/portfile.cmake

@@ -10,6 +10,7 @@ vcpkg_from_github(
         openssl_threads.patch
         fix-include-path.patch
         fix-libusb.patch
+        install-dirs.patch
 )
 
 if (NOT VCPKG_TARGET_IS_WINDOWS)

ports/freerdp/vcpkg.json

@@ -1,6 +1,7 @@
 {
   "name": "freerdp",
-  "version-semver": "2.4.0",
+  "version": "2.4.0",
+  "port-version": 1,
   "description": "A free implementation of the Remote Desktop Protocol (RDP)",
   "homepage": "https://github.com/FreeRDP/FreeRDP",
   "supports": "!(arm | uwp)",

ports/openni2/disable_kinect.patch

@@ -1,40 +0,0 @@
-diff --git a/OpenNI.sln b/OpenNI.sln
-index 9af176a..3786850 100644
---- a/OpenNI.sln
-+++ b/OpenNI.sln
-@@ -86,12 +86,6 @@ Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "Install", "Packaging\Instal
- 		{5B74F010-8B79-46B5-B906-C2B56CDB3386} = {5B74F010-8B79-46B5-B906-C2B56CDB3386}
- 		{D5709FB9-909D-415F-8F86-2F25BEF6CE23} = {D5709FB9-909D-415F-8F86-2F25BEF6CE23}
- 		{1723CBBA-8EE7-439A-93FB-2E94B4DB2E63} = {1723CBBA-8EE7-439A-93FB-2E94B4DB2E63}
--		{E636BACA-795F-41CF-BC52-14C727BF014E} = {E636BACA-795F-41CF-BC52-14C727BF014E}
--	EndProjectSection
--EndProject
--Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Kinect", "Source\Drivers\Kinect\Kinect.vcxproj", "{E636BACA-795F-41CF-BC52-14C727BF014E}"
--	ProjectSection(ProjectDependencies) = postProject
--		{72D595BB-8C52-449B-91DB-0E9F6AEAF5BB} = {72D595BB-8C52-449B-91DB-0E9F6AEAF5BB}
- 	EndProjectSection
- EndProject
- Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DepthUtils", "Source\DepthUtils\DepthUtils.vcxproj", "{72D595BB-8C52-449B-91DB-0E9F6AEABBBB}"
-@@ -252,14 +246,6 @@ Global
- 		{BAEB9C48-562C-4D56-A6CD-18932265480A}.Debug|x86.ActiveCfg = Debug|x86
- 		{BAEB9C48-562C-4D56-A6CD-18932265480A}.Release|x64.ActiveCfg = Release|x64
- 		{BAEB9C48-562C-4D56-A6CD-18932265480A}.Release|x86.ActiveCfg = Release|x86
--		{E636BACA-795F-41CF-BC52-14C727BF014E}.Debug|x64.ActiveCfg = Debug|x64
--		{E636BACA-795F-41CF-BC52-14C727BF014E}.Debug|x64.Build.0 = Debug|x64
--		{E636BACA-795F-41CF-BC52-14C727BF014E}.Debug|x86.ActiveCfg = Debug|Win32
--		{E636BACA-795F-41CF-BC52-14C727BF014E}.Debug|x86.Build.0 = Debug|Win32
--		{E636BACA-795F-41CF-BC52-14C727BF014E}.Release|x64.ActiveCfg = Release|x64
--		{E636BACA-795F-41CF-BC52-14C727BF014E}.Release|x64.Build.0 = Release|x64
--		{E636BACA-795F-41CF-BC52-14C727BF014E}.Release|x86.ActiveCfg = Release|Win32
--		{E636BACA-795F-41CF-BC52-14C727BF014E}.Release|x86.Build.0 = Release|Win32
- 		{72D595BB-8C52-449B-91DB-0E9F6AEABBBB}.Debug|x64.ActiveCfg = Debug|x64
- 		{72D595BB-8C52-449B-91DB-0E9F6AEABBBB}.Debug|x64.Build.0 = Debug|x64
- 		{72D595BB-8C52-449B-91DB-0E9F6AEABBBB}.Debug|x86.ActiveCfg = Debug|Win32
-@@ -317,7 +303,6 @@ Global
- 		{9F6652AF-35F2-452E-A2D3-08D05F5C075E} = {238D091D-1A85-4A61-9DCD-483768C51804}
- 		{31F0F25B-A84A-48AC-9716-5DF9137F3855} = {238D091D-1A85-4A61-9DCD-483768C51804}
- 		{15ECC029-90DE-4D1D-B00A-4A8E647D8C24} = {238D091D-1A85-4A61-9DCD-483768C51804}
--		{E636BACA-795F-41CF-BC52-14C727BF014E} = {238D091D-1A85-4A61-9DCD-483768C51804}
- 		{5B74F010-8B79-46B5-B906-C2B56CDB3386} = {238D091D-1A85-4A61-9DCD-483768C51804}
- 		{BDA3BF24-550A-4BF9-83E5-0056134EED40} = {20285393-1DB1-4300-8AD3-30AEAE3C5DA6}
- 		{D39A4248-3985-41DE-AFD5-AEC58D29291F} = {20285393-1DB1-4300-8AD3-30AEAE3C5DA6}

ports/openni2/vcpkg.json

@@ -1,7 +1,7 @@
 {
   "name": "openni2",
   "version-string": "2.2.0.33",
-  "port-version": 12,
+  "port-version": 13,
   "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",

ports/osg/fix-builderror-with-libtiff.patch

@@ -1,26 +0,0 @@
-diff --git a/CMakeModules/OsgAndroidMacroUtils.cmake b/CMakeModules/OsgAndroidMacroUtils.cmake
-index 50c22e0..8e79b09 100644
---- a/CMakeModules/OsgAndroidMacroUtils.cmake
-+++ b/CMakeModules/OsgAndroidMacroUtils.cmake
-@@ -118,7 +118,7 @@ MACRO(ANDROID_3RD_PARTY)
-     #set(ENV{AND_OSG_LIB_PATHS} "$ENV{AND_OSG_LIB_PATHS}include ${TIFF_INCLUDE_DIR}/Android.mk \n")
-     if(TIFF_INCLUDE_DIR)
-         message(STATUS "TIF found ${TIFF_INCLUDE_DIR}" )
--        set(TIFF_FOUND "Yes")
-+        #set(TIFF_FOUND "Yes")
-         install(DIRECTORY 3rdparty/build/libtiff/ DESTINATION ./ )
-     else(TIFF_INCLUDE_DIR)
-         message(STATUS "TIF missing" )
-diff --git a/src/osgPlugins/CMakeLists.txt b/src/osgPlugins/CMakeLists.txt
-index 77d66f8..1504bf9 100644
---- a/src/osgPlugins/CMakeLists.txt
-+++ b/src/osgPlugins/CMakeLists.txt
-@@ -115,7 +115,7 @@ IF(PNG_FOUND AND OSG_CPP_EXCEPTIONS_AVAILABLE)
-     ADD_PLUGIN_DIRECTORY(png)
- ENDIF()
- IF(TIFF_FOUND AND OSG_CPP_EXCEPTIONS_AVAILABLE)
--    ADD_PLUGIN_DIRECTORY(tiff)
-+    #ADD_PLUGIN_DIRECTORY(tiff)
- ENDIF()
- IF(GDAL_FOUND)
-     ADD_PLUGIN_DIRECTORY(gdal)

ports/osg/vcpkg.json

@@ -1,7 +1,7 @@
 {
   "name": "osg",
   "version-string": "3.6.5",
-  "port-version": 8,
+  "port-version": 9,
   "description": "The OpenSceneGraph is an open source high performance 3D graphics toolkit.",
   "homepage": "https://github.com/openscenegraph/OpenSceneGraph",
   "dependencies": [

ports/osgearth/deprecated_cpp_fix.patch

@@ -1,28 +0,0 @@
-From 89bea8378ae632b0caa134293f713b927774ab50 Mon Sep 17 00:00:00 2001
-From: ankurv <ankurv@microsoft.com>
-Date: Sun, 3 Jan 2021 11:05:32 -0800
-Subject: [PATCH] Patch
-
----
- src/osgEarth/Threading | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/src/osgEarth/Threading b/src/osgEarth/Threading
-index 9093ca6..0fbd9ce 100644
---- a/src/osgEarth/Threading
-+++ b/src/osgEarth/Threading
-@@ -602,7 +602,11 @@ namespace osgEarth { namespace Threading
-     template<typename Fn, typename... Args>
-     constexpr auto cpp11invoke(Fn&& f, Args&&... args)
-         noexcept(noexcept(std::forward<Fn>(f)(std::forward<Args>(args)...)))
-+#if defined(__cpp_lib_is_invocable) && __cpp_lib_is_invocable >= 201703
-+        -> typename std::invoke_result<Fn(Args...)>::type
-+#else
-         -> typename std::result_of<Fn(Args...)>::type
-+#endif
-     {
-         return std::forward<Fn>(f)(std::forward<Args>(args)...);
-     }
--- 
-2.29.2.windows.3
-

ports/osgearth/vcpkg.json

@@ -1,6 +1,7 @@
 {
   "name": "osgearth",
   "version": "3.2",
+  "port-version": 1,
   "description": "osgEarth - Dynamic map generation toolkit for OpenSceneGraph Copyright 2021 Pelican Mapping.",
   "homepage": "https://github.com/gwaldron/osgearth",
   "supports": "!(x86 | wasm32)",

ports/sparsehash/00001-windows-use-std.patch

@@ -1,17 +0,0 @@
-diff --git a/src/windows/sparsehash/internal/sparseconfig.h b/src/windows/sparsehash/internal/sparseconfig.h
-index 3091559..f96e08c 100644
---- a/src/windows/sparsehash/internal/sparseconfig.h
-+++ b/src/windows/sparsehash/internal/sparseconfig.h
-@@ -7,10 +7,10 @@
- #define GOOGLE_NAMESPACE  ::google
- 
- /* the location of the header defining hash functions */
--#define HASH_FUN_H  <hash_map>
-+#define HASH_FUN_H  <unordered_map>
- 
- /* the namespace of the hash<> function */
--#define HASH_NAMESPACE  stdext
-+#define HASH_NAMESPACE  std
- 
- /* Define to 1 if you have the <inttypes.h> header file. */
- #undef HAVE_INTTYPES_H

ports/sparsehash/vcpkg.json

@@ -1,6 +1,7 @@
 {
   "name": "sparsehash",
   "version": "2.0.4",
+  "port-version": 1,
   "description": "The sparsehash package consists of two hashtable implementations: sparse, which is designed to be very space efficient, and dense, which is designed to be very time efficient.",
   "homepage": "https://github.com/sparsehash/sparsehash"
 }

ports/systemc/tlm_correct_dependency.patch

@@ -1,8 +0,0 @@
---- cmake\SystemCTLMConfig.cmake.in	Sat Oct 13 00:19:07 2018
-+++ cmake\SystemCTLMConfig.cmake.in.fixed	Mon Jan 28 15:23:44 2019
-@@ -2,4 +2,4 @@
- 
- # TLM is part of the SystemC language library.
- include(CMakeFindDependencyMacro)
--find_dependency (SystemC @SystemCLanguage_VERSION_MAJOR@.@SystemCLanguage_VERSION_MINOR@.@SystemCLanguage_VERSION_PATCH@.@SystemCLanguage_VERSION_RELEASE_DATE@ EXACT)
-+find_dependency (SystemCLanguage @SystemCLanguage_VERSION_MAJOR@.@SystemCLanguage_VERSION_MINOR@.@SystemCLanguage_VERSION_PATCH@.@SystemCLanguage_VERSION_RELEASE_DATE@ EXACT)

ports/systemc/vcpkg.json

@@ -1,6 +1,6 @@
 {
   "name": "systemc",
   "version-string": "2.3.3",
-  "port-version": 5,
+  "port-version": 6,
   "description": "A set of C++ classes and macros which provide an event-driven simulation kernel in C++"
 }

versions/3-/3fd.json

@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "622078647d4fff0a51a26a4ecff2ba9109e5764d",
+      "version": "2.6.3",
+      "port-version": 1
+    },
     {
       "git-tree": "73ad3c823ef701c37421b450a34271d6beaf7b07",
       "version-string": "2.6.3",

versions/baseline.json

@@ -2,7 +2,7 @@
   "default": {
     "3fd": {
       "baseline": "2.6.3",
-      "port-version": 0
+      "port-version": 1
     },
     "7zip": {
       "baseline": "19.00",
@@ -1526,7 +1526,7 @@
     },
     "cppad": {
       "baseline": "20210000.7",
-      "port-version": 0
+      "port-version": 1
     },
     "cppcms": {
       "baseline": "1.2.1",
@@ -1550,7 +1550,7 @@
     },
     "cppitertools": {
       "baseline": "2.1",
-      "port-version": 1
+      "port-version": 2
     },
     "cppkafka": {
       "baseline": "0.3.1",
@@ -1594,7 +1594,7 @@
     },
     "cpuid": {
       "baseline": "0.5.1",
-      "port-version": 0
+      "port-version": 1
     },
     "cpuinfo": {
       "baseline": "2021-04-04",
@@ -1646,7 +1646,7 @@
     },
     "ctemplate": {
       "baseline": "2020-09-14",
-      "port-version": 1
+      "port-version": 2
     },
     "ctp": {
       "baseline": "6.6.1_P1_20210406_se",
@@ -1786,7 +1786,7 @@
     },
     "dimcli": {
       "baseline": "5.0.2",
-      "port-version": 1
+      "port-version": 2
     },
     "directx-headers": {
       "baseline": "1.4.9",
@@ -2234,7 +2234,7 @@
     },
     "freerdp": {
       "baseline": "2.4.0",
-      "port-version": 0
+      "port-version": 1
     },
     "freetds": {
       "baseline": "1.2.11",
@@ -4898,7 +4898,7 @@
     },
     "openni2": {
       "baseline": "2.2.0.33",
-      "port-version": 12
+      "port-version": 13
     },
     "openscap": {
       "baseline": "1.3.1",
@@ -4974,7 +4974,7 @@
     },
     "osg": {
       "baseline": "3.6.5",
-      "port-version": 8
+      "port-version": 9
     },
     "osg-qt": {
       "baseline": "Qt5",
@@ -4982,7 +4982,7 @@
     },
     "osgearth": {
       "baseline": "3.2",
-      "port-version": 0
+      "port-version": 1
     },
     "osi": {
       "baseline": "0.108.6",
@@ -6302,7 +6302,7 @@
     },
     "sparsehash": {
       "baseline": "2.0.4",
-      "port-version": 0
+      "port-version": 1
     },
     "sparsepp": {
       "baseline": "1.22",
@@ -6482,7 +6482,7 @@
     },
     "systemc": {
       "baseline": "2.3.3",
-      "port-version": 5
+      "port-version": 6
     },
     "szip": {
       "baseline": "2.1.1",

versions/c-/cppad.json

@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "fd043aed2197ac43f337a7806061460728cf56a8",
+      "version-string": "20210000.7",
+      "port-version": 1
+    },
     {
       "git-tree": "00e184c8de4368f8ee0b6b5dd0c16034d7a99a8f",
       "version-string": "20210000.7",

versions/c-/cppitertools.json

@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "8373c4fe2df5953309d3fc443ceed59553d35824",
+      "version": "2.1",
+      "port-version": 2
+    },
     {
       "git-tree": "ee578d4182af8702a89a87b361e192d634055352",
       "version-string": "2.1",

versions/c-/cpuid.json

@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "7b5a58587efff685ef5c166bcfba98542606f8ca",
+      "version": "0.5.1",
+      "port-version": 1
+    },
     {
       "git-tree": "65cb7ff3fc46a78367e4c700b587e8093386e4b3",
       "version": "0.5.1",

versions/c-/ctemplate.json

@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "491ab782407b38835b9a555dc77e6d3af485fdae",
+      "version-date": "2020-09-14",
+      "port-version": 2
+    },
     {
       "git-tree": "49845dc04f38d16b9c148162fc1457ed78608ae7",
       "version-string": "2020-09-14",

versions/d-/dimcli.json

@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "9901ca1f1a121a702d4fb4c73ad6a482adff6c3f",
+      "version-semver": "5.0.2",
+      "port-version": 2
+    },
     {
       "git-tree": "025db5cad1969933359bac4047e0dea962fb692b",
       "version-string": "5.0.2",

versions/f-/freerdp.json

@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "501668a8e37d5fc800fbf2f82729507a0af386cd",
+      "version": "2.4.0",
+      "port-version": 1
+    },
     {
       "git-tree": "504bdd8f860f4e4b091de21a76999261bff207da",
       "version-semver": "2.4.0",

versions/o-/openni2.json

@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "b99fb68dafe4b930248e5ba4d39a7a2c4a4fc9ea",
+      "version-string": "2.2.0.33",
+      "port-version": 13
+    },
     {
       "git-tree": "7fd7382fff870dcc4920d0ff72e5ba00ad74fa6f",
       "version-string": "2.2.0.33",

versions/o-/osg.json

@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "786c1469d92ebae55703e2be690bd72083a800a3",
+      "version-string": "3.6.5",
+      "port-version": 9
+    },
     {
       "git-tree": "2a5b4c77e1ac62bb98a0deb970fc39a4976cc528",
       "version-string": "3.6.5",

versions/o-/osgearth.json

@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "f3ac1cffb36f0b0b2b531af29145de695cee2291",
+      "version": "3.2",
+      "port-version": 1
+    },
     {
       "git-tree": "a77075c3ff1a0372588cb78af6f4f08352b82896",
       "version": "3.2",

versions/s-/sparsehash.json

@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "0bb73fddc7adde82c92bad4cd03ad629d978db6b",
+      "version": "2.0.4",
+      "port-version": 1
+    },
     {
       "git-tree": "833f95be52924049168376714c59fd022ef9568c",
       "version": "2.0.4",

versions/s-/systemc.json

@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "c07c9aedd9229f1583602afe462aa9894562462c",
+      "version-string": "2.3.3",
+      "port-version": 6
+    },
     {
       "git-tree": "f10aa24af3ad40a22d15a729df5d64695c141226",
       "version-string": "2.3.3",