[botan/bitsery/cgl] Update to latest release (#20132)

11 files changed, 96 insertions, 78 deletions

diff --git a/ports/bitsery/portfile.cmake b/ports/bitsery/portfile.cmake
index 146f6f75d..16fec4c35 100644
--- a/ports/bitsery/portfile.cmake
+++ b/ports/bitsery/portfile.cmake
@@ -1,21 +1,20 @@
 vcpkg_from_github(
-	OUT_SOURCE_PATH SOURCE_PATH
-	REPO fraillt/bitsery
-	REF db884a0656a3aabb87da1ae6edf12629507f76a7
-	SHA512 7c94a09ed7cf07aa6c347d2960de622c5d69a25c7af501d10224b02f9db1bb191e8a5f7f096de488650f5a164e554b20f950fcdde423afced0ebfed249cb1c3d
-	HEAD_REF master
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO fraillt/bitsery
+    REF c0fc083c9de805e5825d7553507569febf6a6f93 # v5.2.2
+    SHA512 a4c8660f6e8dcb5162f6f75e0f1e4716032b8403e9461f42e0628955eb07dc7c17aec9f774f45c2c15cce28a231699a71815d3d6d7d0f34a1367ee1e2d944305
+    HEAD_REF master
 )
 
-vcpkg_configure_cmake(
-	SOURCE_PATH ${SOURCE_PATH}
-	PREFER_NINJA
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
 )
 
-vcpkg_install_cmake()
+vcpkg_cmake_install()
 
-vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT})
+vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT})
 
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib)
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug)
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug")
 
-file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/ports/bitsery/vcpkg.json b/ports/bitsery/vcpkg.json
index dfad4f5c5..4fad88260 100644
--- a/ports/bitsery/vcpkg.json
+++ b/ports/bitsery/vcpkg.json
@@ -1,7 +1,16 @@
 {
   "name": "bitsery",
-  "version-string": "5.2.1",
-  "port-version": 1,
+  "version": "5.2.2",
   "description": "Header only C++ binary serialization library",
-  "homepage": "https://github.com/fraillt/bitsery"
+  "homepage": "https://github.com/fraillt/bitsery",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ]
 }
diff --git a/ports/botan/fix-generate-build-path.patch b/ports/botan/fix-generate-build-path.patch
index 11c3dc0af..455c1f139 100644
--- a/ports/botan/fix-generate-build-path.patch
+++ b/ports/botan/fix-generate-build-path.patch
@@ -1,13 +1,13 @@
-diff --git a/configure.py b/configure.py

-index 00baa0c..cfec5bb 100644

---- a/configure.py

-+++ b/configure.py

-@@ -2035,7 +2035,7 @@ def create_template_vars(source_paths, build_paths, options, modules, cc, arch,

-         'maintainer_mode': options.maintainer_mode,

- 

-         'out_dir': build_dir,

--        'build_dir': build_paths.build_dir,

-+        'build_dir': os.path.abspath(build_paths.build_dir),

- 

-         'doc_stamp_file': os.path.join(build_paths.build_dir, 'doc.stamp'),

-         'makefile_path': os.path.join(build_paths.build_dir, '..', 'Makefile'),

+diff --git a/configure.py b/configure.py
+index 89f87d4..ba7914f 100644
+--- a/configure.py
++++ b/configure.py
+@@ -2076,7 +2076,7 @@ def create_template_vars(source_paths, build_paths, options, modules, cc, arch,
+         'maintainer_mode': options.maintainer_mode,
+ 
+         'out_dir': build_dir,
+-        'build_dir': build_paths.build_dir,
++        'build_dir': os.path.abspath(build_paths.build_dir),
+ 
+         'doc_stamp_file': os.path.join(build_paths.build_dir, 'doc.stamp'),
+         'makefile_path': os.path.join(build_paths.build_dir, '..', 'Makefile'),
diff --git a/ports/botan/portfile.cmake b/ports/botan/portfile.cmake
index 6d04e1e93..4351791f3 100644
--- a/ports/botan/portfile.cmake
+++ b/ports/botan/portfile.cmake
@@ -1,10 +1,8 @@
-set(BOTAN_VERSION 2.16.0)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO randombit/botan
-    REF 82a20c67bd54b8c6c75f32bd31dea5b12f3d7e67 # 2.16.0
-    SHA512 42b8dac0a6b44afee14e8ba928b323790b8d90395ba70b4919b3d033e5b9073706355c2263c2a9e66357fa6d4af4c85430c93a65cfdaa79f1c83c89940619a66
+    REF d4bd416702a65eddcc14ee06b9c1b674631e6ae3 # 2.18.1
+    SHA512 6c8a8a772ff926402aa77ea1156e8a6b8fcaa18514107c94e9d2c7c76daaf9a02ef8c5c249d1ddf56655bab0ecd0d91490d907fc2239259689662533089b09ad
     HEAD_REF master
     PATCHES
         fix-generate-build-path.patch
@@ -58,13 +56,13 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
 function(BOTAN_BUILD BOTAN_BUILD_TYPE)
 
     if(BOTAN_BUILD_TYPE STREQUAL "dbg")
-        set(BOTAN_FLAG_PREFIX ${CURRENT_PACKAGES_DIR}/debug)
+        set(BOTAN_FLAG_PREFIX "${CURRENT_PACKAGES_DIR}/debug")
         set(BOTAN_FLAG_DEBUGMODE --debug-mode)
         set(BOTAN_DEBUG_SUFFIX "")
         set(BOTAN_MSVC_RUNTIME_SUFFIX "d")
     else()
         set(BOTAN_FLAG_DEBUGMODE)
-        set(BOTAN_FLAG_PREFIX ${CURRENT_PACKAGES_DIR})
+        set(BOTAN_FLAG_PREFIX "${CURRENT_PACKAGES_DIR}")
         set(BOTAN_MSVC_RUNTIME_SUFFIX "")
     endif()
 
@@ -113,7 +111,6 @@ function(BOTAN_BUILD BOTAN_BUILD_TYPE)
             --libdir=${BOTAN_FLAG_PREFIX}/lib
             --pkgconfigdir=${BOTAN_FLAG_PREFIX}/lib
             --includedir=${BOTAN_FLAG_PREFIX}/include
-            --docdir=${BOTAN_FLAG_PREFIX}/share
         WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${BOTAN_BUILD_TYPE}"
         LOGNAME install-${TARGET_TRIPLET}-${BOTAN_BUILD_TYPE})
 
@@ -123,31 +120,24 @@ endfunction()
 BOTAN_BUILD(rel)
 BOTAN_BUILD(dbg)
 
-file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools/botan)
+file(RENAME "${CURRENT_PACKAGES_DIR}/include/botan-2/botan" "${CURRENT_PACKAGES_DIR}/include/botan")
+
+vcpkg_copy_pdbs()
 
-set(cli_exe_name "botan")
 if(CMAKE_HOST_WIN32)
-    set(cli_exe_name "botan-cli.exe")
+    vcpkg_copy_tools(TOOL_NAMES botan-cli AUTO_CLEAN)
+else()
+    vcpkg_copy_tools(TOOL_NAMES botan AUTO_CLEAN)
 endif()
-file(RENAME ${CURRENT_PACKAGES_DIR}/bin/${cli_exe_name} ${CURRENT_PACKAGES_DIR}/tools/botan/${cli_exe_name})
-file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/${cli_exe_name})
-
-file(RENAME ${CURRENT_PACKAGES_DIR}/include/botan-2/botan ${CURRENT_PACKAGES_DIR}/include/botan)
 
 file(REMOVE_RECURSE
-    ${CURRENT_PACKAGES_DIR}/debug/include
-    ${CURRENT_PACKAGES_DIR}/debug/share
-    ${CURRENT_PACKAGES_DIR}/include/botan-2
-    ${CURRENT_PACKAGES_DIR}/share/botan-${BOTAN_VERSION}/manual)
+    "${CURRENT_PACKAGES_DIR}/debug/include"
+    "${CURRENT_PACKAGES_DIR}/debug/share"
+    "${CURRENT_PACKAGES_DIR}/include/botan-2"
+    "${CURRENT_PACKAGES_DIR}/share/doc")
 
 if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
-    file(REMOVE_RECURSE
-        ${CURRENT_PACKAGES_DIR}/bin
-        ${CURRENT_PACKAGES_DIR}/debug/bin)
+    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
 endif()
 
-vcpkg_copy_pdbs()
-vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/botan)
-
-file(RENAME ${CURRENT_PACKAGES_DIR}/share/botan-${BOTAN_VERSION}/ ${CURRENT_PACKAGES_DIR}/share/botan/)
-file(RENAME ${CURRENT_PACKAGES_DIR}/share/botan/license.txt ${CURRENT_PACKAGES_DIR}/share/botan/copyright)
+file(INSTALL "${SOURCE_PATH}/license.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/ports/botan/vcpkg.json b/ports/botan/vcpkg.json
index 0dbf7567d..939b83990 100644
--- a/ports/botan/vcpkg.json
+++ b/ports/botan/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "botan",
-  "version": "2.16.0",
-  "port-version": 2,
+  "version": "2.18.1",
   "description": "A cryptography library written in C++11",
   "homepage": "https://botan.randombit.net",
   "supports": "!(windows & arm)",
diff --git a/ports/cgl/portfile.cmake b/ports/cgl/portfile.cmake
index 8969d8131..97583b097 100644
--- a/ports/cgl/portfile.cmake
+++ b/ports/cgl/portfile.cmake
@@ -3,26 +3,25 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO coin-or/Cgl
-    REF 6377b88754fafacf24baac28bb27c0623cc14457
-    SHA512 7579a89f945fd3b88cc1f0dd95906c385b5c730b58bd620ea8b820926096256f9083f50dd4e70f71d69432e4d0ffc60b4ec8fa517893a549621d8373f944a1bb
+    REF 31797b2997219934db02a40d501c4b6d8efa7398 # 0.60.3
+    SHA512 33e01acdfd2057541492f4e83c0554ed74489995c47cef0b954529d4603090d03457fdababb331132b3fd286c985e46a3c8e3abbdb2eed36e7eaa8102acd095e
     PATCHES fix-c1083-error.patch
 )
 
-file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
-file(COPY ${CMAKE_CURRENT_LIST_DIR}/Config.cmake.in DESTINATION ${SOURCE_PATH})
+file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}")
+file(COPY "${CMAKE_CURRENT_LIST_DIR}/Config.cmake.in" DESTINATION "${SOURCE_PATH}")
 
-vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
 )
 
-vcpkg_install_cmake()
+vcpkg_cmake_install()
 
-vcpkg_fixup_cmake_targets()
+vcpkg_cmake_config_fixup()
 
 vcpkg_copy_pdbs()
 
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
 
-file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
\ No newline at end of file
+file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/ports/cgl/vcpkg.json b/ports/cgl/vcpkg.json
index 3e59231a8..7b72af761 100644
--- a/ports/cgl/vcpkg.json
+++ b/ports/cgl/vcpkg.json
@@ -1,12 +1,19 @@
 {
   "name": "cgl",
-  "version-string": "0.60.2",
-  "port-version": 3,
+  "version": "0.60.3",
   "description": "The COIN-OR Cut Generation Library (Cgl) is a collection of cut generators that can be used with other COIN-OR packages that make use of cuts, such as, among others, the linear solver Clp or the mixed integer linear programming solvers Cbc or BCP.",
   "homepage": "https://github.com/coin-or/Cgl",
   "dependencies": [
     "clp",
     "coinutils",
-    "osi"
+    "osi",
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
   ]
 }
diff --git a/versions/b-/bitsery.json b/versions/b-/bitsery.json
index ac1631a2a..bff5f7ba5 100644
--- a/versions/b-/bitsery.json
+++ b/versions/b-/bitsery.json
@@ -1,6 +1,11 @@
 {
   "versions": [
     {
+      "git-tree": "6fdd20d510ccb63049b899419af07461f42097e5",
+      "version": "5.2.2",
+      "port-version": 0
+    },
+    {
       "git-tree": "adbbef892ab01c8b0c57b7be2684ae6bb1a29a99",
       "version-string": "5.2.1",
       "port-version": 1
diff --git a/versions/b-/botan.json b/versions/b-/botan.json
index fec275a65..d4bca8167 100644
--- a/versions/b-/botan.json
+++ b/versions/b-/botan.json
@@ -1,6 +1,11 @@
 {
   "versions": [
     {
+      "git-tree": "5233d2cda62be282a698410ebf3f70f5f2cda8cf",
+      "version": "2.18.1",
+      "port-version": 0
+    },
+    {
       "git-tree": "8a0618dd4e015d7a0ae5339e6758c5f1fd4754a6",
       "version": "2.16.0",
       "port-version": 2
diff --git a/versions/baseline.json b/versions/baseline.json
index 9303aaef3..e519cf727 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -433,8 +433,8 @@
       "port-version": 1
     },
     "bitsery": {
-      "baseline": "5.2.1",
-      "port-version": 1
+      "baseline": "5.2.2",
+      "port-version": 0
     },
     "blas": {
       "baseline": "1",
@@ -1065,8 +1065,8 @@
       "port-version": 0
     },
     "botan": {
-      "baseline": "2.16.0",
-      "port-version": 2
+      "baseline": "2.18.1",
+      "port-version": 0
     },
     "box2d": {
       "baseline": "2.4.1",
@@ -1233,8 +1233,8 @@
       "port-version": 5
     },
     "cgl": {
-      "baseline": "0.60.2",
-      "port-version": 3
+      "baseline": "0.60.3",
+      "port-version": 0
     },
     "cgltf": {
       "baseline": "1.10",
diff --git a/versions/c-/cgl.json b/versions/c-/cgl.json
index 39d0dabbd..15745b705 100644
--- a/versions/c-/cgl.json
+++ b/versions/c-/cgl.json
@@ -1,6 +1,11 @@
 {
   "versions": [
     {
+      "git-tree": "b3104cbc44a135a7d7b75e0929571dc0aa314033",
+      "version": "0.60.3",
+      "port-version": 0
+    },
+    {
       "git-tree": "08a6d5bffda4d5fe0b5891a225e7f3fa86cca8a6",
       "version-string": "0.60.2",
       "port-version": 3