From d616af7c86962a9fd012668d6c7fe25cb034d0e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20Tassoux?= <contact@rt2.fr>
Date: Fri, 7 Jan 2022 23:57:24 +0100
Subject: [PATCH] [plf-colony] Update to 6.33 - [plf-hive] Add new port
 (#22389)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* [plf-colony-hive] Update to 6.33

* [plf-hive] Add new port

* [plf-colony][plf-hive] Update version files

* [plf-colony][plf-hive] Add quotes to paths

* [plf-colony][plf-hive] Update version files

* [plf-hive] Add version file

Co-authored-by: Rémy Tassoux <rt2@rasterizedworld.com>
---
 ports/plf-colony/portfile.cmake |  9 ++++-----
 ports/plf-colony/vcpkg.json     |  2 +-
 ports/plf-hive/portfile.cmake   | 13 +++++++++++++
 ports/plf-hive/vcpkg.json       |  6 ++++++
 versions/baseline.json          |  6 +++++-
 versions/p-/plf-colony.json     |  5 +++++
 versions/p-/plf-hive.json       |  9 +++++++++
 7 files changed, 43 insertions(+), 7 deletions(-)
 create mode 100644 ports/plf-hive/portfile.cmake
 create mode 100644 ports/plf-hive/vcpkg.json
 create mode 100644 versions/p-/plf-hive.json

diff --git a/ports/plf-colony/portfile.cmake b/ports/plf-colony/portfile.cmake
index 97e64da711..e4ec7bd473 100644
--- a/ports/plf-colony/portfile.cmake
+++ b/ports/plf-colony/portfile.cmake
@@ -3,12 +3,11 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO mattreecebentley/plf_colony
-    REF e6e563b63dd9e64fc2fcc66a757e366641e62f01
-    SHA512 61723a47387fb3ce9a342fbd6db11369774c1a5c5d28ba2db1fee3396a0588a0e9df50cbcaa4561f409d34ddadc17ae61dba29606aa6481647f3bcd003cfaafa
+    REF 7243b4601b5d7e989550c158a9918ea5a05feaf4
+    SHA512 aaf898ac5a37720545a7b7226c8bd09be80dcdd03d9c77a2c64cfe0aedbb59ede4042001c616c4b5d29f13717ae5b637c0608d83819c2bceae5606c8555a64da
     HEAD_REF master
 )
 
-file(COPY ${SOURCE_PATH}/plf_colony.h DESTINATION ${CURRENT_PACKAGES_DIR}/include)
+file(COPY "${SOURCE_PATH}/plf_colony.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include")
 
-# Handle copyright
-configure_file(${SOURCE_PATH}/LICENSE.md ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY)
+file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/ports/plf-colony/vcpkg.json b/ports/plf-colony/vcpkg.json
index 5529658fae..01101a6a1d 100644
--- a/ports/plf-colony/vcpkg.json
+++ b/ports/plf-colony/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "plf-colony",
-  "version": "6.28",
+  "version": "6.33",
   "description": "An unordered C++ data container providing fast iteration/insertion/erasure while maintaining pointer/iterator validity to non-erased elements regardless of insertions/erasures.",
   "homepage": "https://plflib.org/colony.htm"
 }
diff --git a/ports/plf-hive/portfile.cmake b/ports/plf-hive/portfile.cmake
new file mode 100644
index 0000000000..8fcbfb5d3d
--- /dev/null
+++ b/ports/plf-hive/portfile.cmake
@@ -0,0 +1,13 @@
+# header-only library
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO mattreecebentley/plf_hive
+    REF 39dfcc5712125cc645df123c120006b7a6fd95d6
+    SHA512 81a1f185ca8293b6fb83605c05ecf14d024194334cb64932daa29ecae064918241fa7f3e4a688dc2b19b4b5dd8a2605d60947bd513f7cd30299fd6ba25aa8b35
+    HEAD_REF master
+)
+
+file(COPY "${SOURCE_PATH}/plf_hive.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include")
+
+file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/ports/plf-hive/vcpkg.json b/ports/plf-hive/vcpkg.json
new file mode 100644
index 0000000000..4393fa9720
--- /dev/null
+++ b/ports/plf-hive/vcpkg.json
@@ -0,0 +1,6 @@
+{
+  "name": "plf-hive",
+  "version-date": "2021-12-11",
+  "description": "plf::hive is a fork of plf::colony to match the current C++ standards proposal.",
+  "homepage": "https://plflib.org/colony.htm"
+}
diff --git a/versions/baseline.json b/versions/baseline.json
index d1c03ae39e..bce9e6e35f 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -5301,7 +5301,11 @@
       "port-version": 0
     },
     "plf-colony": {
-      "baseline": "6.28",
+      "baseline": "6.33",
+      "port-version": 0
+    },
+    "plf-hive": {
+      "baseline": "2021-12-11",
       "port-version": 0
     },
     "plf-list": {
diff --git a/versions/p-/plf-colony.json b/versions/p-/plf-colony.json
index 88bbddd621..16d3e369de 100644
--- a/versions/p-/plf-colony.json
+++ b/versions/p-/plf-colony.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "7e90bb5fdf6e933b8d5c14e07d85c920e7a7afea",
+      "version": "6.33",
+      "port-version": 0
+    },
     {
       "git-tree": "39c9b9a09ea0d7f88ac7a9cd90addb057e259f20",
       "version": "6.28",
diff --git a/versions/p-/plf-hive.json b/versions/p-/plf-hive.json
new file mode 100644
index 0000000000..7b8317a658
--- /dev/null
+++ b/versions/p-/plf-hive.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "8e5c8a3892eb3ca1cade64672eaa76d3a9c74990",
+      "version-date": "2021-12-11",
+      "port-version": 0
+    }
+  ]
+}