3 files changed, 47 insertions, 26 deletions
diff --git a/ports/bitserializer/CONTROL b/ports/bitserializer/CONTROL
deleted file mode 100644
index bc33cc552..000000000
--- a/ports/bitserializer/CONTROL
+++ /dev/null
@@ -1,22 +0,0 @@
-Source: bitserializer
-Version: 0.10
-Description: Core part of C++ 17 library for serialization to JSON, XML, YAML
-Homepage: https://bitbucket.org/Pavel_Kisliak/bitserializer
-Default-Features: cpprestjson-archive, rapidjson-archive, pugixml-archive
-Supports: !(arm|osx)
-
-Feature: cpprestjson-archive
-Build-Depends: cpprestsdk
-Description: Module for support JSON (implementation based on the CppRestSDK library)
-
-Feature: rapidjson-archive
-Build-Depends: rapidjson
-Description: Module for support JSON (implementation based on the RapidJson library)
-
-Feature: pugixml-archive
-Build-Depends: pugixml
-Description: Module for support XML (implementation based on the PugiXml library)
-
-Feature: rapidyaml-archive
-Build-Depends: ryml (!arm&!arm64&!osx)
-Description: Module for support YAML (implementation based on the RapidYaml library)
diff --git a/ports/bitserializer/portfile.cmake b/ports/bitserializer/portfile.cmake
index d4ae86979..3b8e4184f 100644
--- a/ports/bitserializer/portfile.cmake
+++ b/ports/bitserializer/portfile.cmake
@@ -7,10 +7,11 @@ vcpkg_from_bitbucket(
 )
 
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
-    "cpprestjson-archive"  BUILD_CPPRESTJSON_ARCHIVE
-    "rapidjson-archive"    BUILD_RAPIDJSON_ARCHIVE
-    "pugixml-archive"      BUILD_PUGIXML_ARCHIVE
-    "rapidyaml-archive"    BUILD_RAPIDYAML_ARCHIVE
+    FEATURES
+        "cpprestjson-archive"  BUILD_CPPRESTJSON_ARCHIVE
+        "rapidjson-archive"    BUILD_RAPIDJSON_ARCHIVE
+        "pugixml-archive"      BUILD_PUGIXML_ARCHIVE
+        "rapidyaml-archive"    BUILD_RAPIDYAML_ARCHIVE
 )
 
 vcpkg_configure_cmake(
diff --git a/ports/bitserializer/vcpkg.json b/ports/bitserializer/vcpkg.json
new file mode 100644
index 000000000..4866a2dc8
--- /dev/null
+++ b/ports/bitserializer/vcpkg.json
@@ -0,0 +1,42 @@
+{
+  "name": "bitserializer",
+  "version": "0.10",
+  "port-version": 1,
+  "description": "Core part of C++ 17 library for serialization to JSON, XML, YAML",
+  "homepage": "https://bitbucket.org/Pavel_Kisliak/bitserializer",
+  "supports": "!(arm | osx)",
+  "default-features": [
+    "cpprestjson-archive",
+    "pugixml-archive",
+    "rapidjson-archive"
+  ],
+  "features": {
+    "cpprestjson-archive": {
+      "description": "Module for support JSON (implementation based on the CppRestSDK library)",
+      "dependencies": [
+        "cpprestsdk"
+      ]
+    },
+    "pugixml-archive": {
+      "description": "Module for support XML (implementation based on the PugiXml library)",
+      "dependencies": [
+        "pugixml"
+      ]
+    },
+    "rapidjson-archive": {
+      "description": "Module for support JSON (implementation based on the RapidJson library)",
+      "dependencies": [
+        "rapidjson"
+      ]
+    },
+    "rapidyaml-archive": {
+      "description": "Module for support YAML (implementation based on the RapidYaml library)",
+      "dependencies": [
+        {
+          "name": "ryml",
+          "platform": "!arm & !arm64 & !osx"
+        }
+      ]
+    }
+  }
+}