From f4a827c2a7c3fb12ecfe69bdd32dfff6b4fe15e9 Mon Sep 17 00:00:00 2001
From: Vitalii Koshura <lestat.de.lionkur@gmail.com>
Date: Wed, 8 Sep 2021 16:54:48 +0200
Subject: [rappture] Update port to use vcpkg.json instead of CONTROL (#20049)

Signed-off-by: Vitalii Koshura <lestat.de.lionkur@gmail.com>
---
 ports/rappture/CONTROL        |  4 ----
 ports/rappture/portfile.cmake |  7 +++----
 ports/rappture/vcpkg.json     | 18 ++++++++++++++++++
 versions/baseline.json        |  2 +-
 versions/r-/rappture.json     |  5 +++++
 5 files changed, 27 insertions(+), 9 deletions(-)
 delete mode 100644 ports/rappture/CONTROL
 create mode 100644 ports/rappture/vcpkg.json

diff --git a/ports/rappture/CONTROL b/ports/rappture/CONTROL
deleted file mode 100644
index 611bda78a..000000000
--- a/ports/rappture/CONTROL
+++ /dev/null
@@ -1,4 +0,0 @@
-Source: rappture
-Version: 1.9
-Description: Rappture is a toolkit supporting Rapid application infrastructure, making it quick and easy to develop powerful scientific applications.
-Build-Depends: expat, zlib
diff --git a/ports/rappture/portfile.cmake b/ports/rappture/portfile.cmake
index 00bde7d3a..e79ec3085 100644
--- a/ports/rappture/portfile.cmake
+++ b/ports/rappture/portfile.cmake
@@ -15,14 +15,13 @@ vcpkg_extract_source_archive_ex(
 
 file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
 
-vcpkg_configure_cmake(
+vcpkg_cmake_configure(
     SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
 )
 
-vcpkg_install_cmake()
+vcpkg_cmake_install()
 
-vcpkg_fixup_cmake_targets()
+vcpkg_cmake_config_fixup()
 
 vcpkg_copy_pdbs()
 
diff --git a/ports/rappture/vcpkg.json b/ports/rappture/vcpkg.json
new file mode 100644
index 000000000..68a1a5efa
--- /dev/null
+++ b/ports/rappture/vcpkg.json
@@ -0,0 +1,18 @@
+{
+  "name": "rappture",
+  "version": "1.9",
+  "port-version": 1,
+  "description": "Rappture is a toolkit supporting Rapid application infrastructure, making it quick and easy to develop powerful scientific applications.",
+  "dependencies": [
+    "expat",
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    },
+    "zlib"
+  ]
+}
diff --git a/versions/baseline.json b/versions/baseline.json
index a799197a3..04b482790 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -5586,7 +5586,7 @@
     },
     "rappture": {
       "baseline": "1.9",
-      "port-version": 0
+      "port-version": 1
     },
     "raylib": {
       "baseline": "3.7.0",
diff --git a/versions/r-/rappture.json b/versions/r-/rappture.json
index 0ba67c263..ae1cfa5a6 100644
--- a/versions/r-/rappture.json
+++ b/versions/r-/rappture.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "46511874b74e433c10e518d592ae43a475bb7aaf",
+      "version": "1.9",
+      "port-version": 1
+    },
     {
       "git-tree": "1bff8b135623078465252ff2d940407537851f2a",
       "version-string": "1.9",
-- 
cgit v1.2.3