[minisat-master-keying] Update to 2.3.6 (#20437)

* Update minisat-master-keying to 2.3.6

* Update CI baseline

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

4 files changed, 28 insertions, 15 deletions

diff --git a/ports/minisat-master-keying/portfile.cmake b/ports/minisat-master-keying/portfile.cmake
index 34bd4ca95..3b487e3c0 100644
--- a/ports/minisat-master-keying/portfile.cmake
+++ b/ports/minisat-master-keying/portfile.cmake
@@ -3,22 +3,21 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(

     OUT_SOURCE_PATH SOURCE_PATH

     REPO master-keying/minisat

-    REF 60f47c0b59a5116639a73ceb9b50eb818536af0b

-    SHA512 267b7dd44bd1390826228c45ce0e71976a78940d2086470a26b59a6c692ad5e0e911c255eda0c187c33f8138b34deab59aa53191a0e1a46df38c5b73680d74d6

+    REF v2.3.6
+    SHA512 48E7AC1C97EA58070EAB9310F977404295E881B1403D527A33E059A0BB5A16CAA9AF2FA9E5230AD7E53E008B83077E300B3BAEEB0C220BE4E52B6B85887A05E1
     HEAD_REF master

 )

 

-vcpkg_configure_cmake(

-    SOURCE_PATH ${SOURCE_PATH}

-    PREFER_NINJA

+vcpkg_cmake_configure(

+    SOURCE_PATH "${SOURCE_PATH}"

 )

 

-vcpkg_install_cmake()

-vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/MiniSat TARGET_PATH share/minisat)

+vcpkg_cmake_install()

+vcpkg_cmake_config_fixup(PACKAGE_NAME MiniSat CONFIG_PATH lib/cmake/MiniSat)

 

 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()

-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)

+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")

 

-file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/minisat-master-keying RENAME copyright)

+file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)

diff --git a/ports/minisat-master-keying/vcpkg.json b/ports/minisat-master-keying/vcpkg.json
index 9df7d9d6e..c2a89562e 100644
--- a/ports/minisat-master-keying/vcpkg.json
+++ b/ports/minisat-master-keying/vcpkg.json
@@ -1,10 +1,19 @@
 {
   "name": "minisat-master-keying",
-  "version-string": "2.2-mod",
-  "port-version": 3,
+  "version": "2.3.6",
   "description": [
     "A minimalistic high-performance SAT solver",
     "This is a modernized, cross-platform, CMake-enabled fork of the original MiniSat."
   ],
-  "homepage": "https://github.com/master-keying/minisat"
+  "homepage": "https://github.com/master-keying/minisat",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ]
 }
diff --git a/versions/baseline.json b/versions/baseline.json
index 03f2862c5..b513a6370 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -4277,8 +4277,8 @@
       "port-version": 1
     },
     "minisat-master-keying": {
-      "baseline": "2.2-mod",
-      "port-version": 3
+      "baseline": "2.3.6",
+      "port-version": 0
     },
     "minitrace": {
       "baseline": "2019.02.06",
diff --git a/versions/m-/minisat-master-keying.json b/versions/m-/minisat-master-keying.json
index fe7d267fc..9012522e4 100644
--- a/versions/m-/minisat-master-keying.json
+++ b/versions/m-/minisat-master-keying.json
@@ -1,6 +1,11 @@
 {
   "versions": [
     {
+      "git-tree": "e7f174538407ae3f279ab4c7d2025a8545d220c9",
+      "version": "2.3.6",
+      "port-version": 0
+    },
+    {
       "git-tree": "175ab6a87c6a80cbbd2ff26c976c17cab6e8fff6",
       "version-string": "2.2-mod",
       "port-version": 3