From 84216277df28f571d9bf57a09d51bdabc2bb54fe Mon Sep 17 00:00:00 2001
From: autoantwort <41973254+autoantwort@users.noreply.github.com>
Date: Tue, 30 Nov 2021 01:52:16 +0100
Subject: [PATCH] [blitz] no absolute paths (#21708)

---
 ports/blitz/portfile.cmake | 25 +++++++++++++++----------
 ports/blitz/vcpkg.json     | 14 ++++++++++++--
 versions/b-/blitz.json     |  5 +++++
 versions/baseline.json     |  2 +-
 4 files changed, 33 insertions(+), 13 deletions(-)

diff --git a/ports/blitz/portfile.cmake b/ports/blitz/portfile.cmake
index f8681cf3603..f53a286e7f1 100644
--- a/ports/blitz/portfile.cmake
+++ b/ports/blitz/portfile.cmake
@@ -10,27 +10,32 @@ vcpkg_from_github(
 
 vcpkg_find_acquire_program(PYTHON2)
 get_filename_component(PYTHON2_DIR "${PYTHON2}" DIRECTORY)
-vcpkg_add_to_path(${PYTHON2_DIR})
+vcpkg_add_to_path("${PYTHON2_DIR}")
 
-vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS
         -DBUILD_DOC=OFF
         -DBUILD_TESTING=OFF    
 )
 
-vcpkg_install_cmake()
+vcpkg_cmake_install()
 
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 
 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_fixup_cmake_targets(CONFIG_PATH lib/cmake)
+vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake)
+vcpkg_fixup_pkgconfig()
+
+vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/blitz/matbops.h" "${SOURCE_PATH}" "")
+vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/blitz/matuops.h" "${SOURCE_PATH}" "")
+vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/blitz/mathfunc.h" "${SOURCE_PATH}" "")
+vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/blitz/promote-old.h" "${SOURCE_PATH}" "")
 
 # Handle copyright
-file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
-vcpkg_fixup_pkgconfig()
+file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/ports/blitz/vcpkg.json b/ports/blitz/vcpkg.json
index 2ef9a3c24e0..906e4d83391 100644
--- a/ports/blitz/vcpkg.json
+++ b/ports/blitz/vcpkg.json
@@ -1,8 +1,18 @@
 {
   "name": "blitz",
   "version-string": "2020-03-25",
-  "port-version": 2,
+  "port-version": 3,
   "description": "Blitz++ is a C++ template class library that provides high-performance multidimensional array containers for scientific computing.",
   "homepage": "https://github.com/blitzpp/blitz",
-  "supports": "!(arm | arm64 | uwp)"
+  "supports": "!(arm | arm64 | uwp)",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ]
 }
diff --git a/versions/b-/blitz.json b/versions/b-/blitz.json
index 797c31d5c66..f7d3137bef4 100644
--- a/versions/b-/blitz.json
+++ b/versions/b-/blitz.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "ddf54a36a0fa345a482b66d648778c13f0008eeb",
+      "version-string": "2020-03-25",
+      "port-version": 3
+    },
     {
       "git-tree": "6f6a860240cf01fea1a9f90f6970dec75980a1d1",
       "version-string": "2020-03-25",
diff --git a/versions/baseline.json b/versions/baseline.json
index f51ee053c36..3938ef09f1c 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -502,7 +502,7 @@
     },
     "blitz": {
       "baseline": "2020-03-25",
-      "port-version": 2
+      "port-version": 3
     },
     "blosc": {
       "baseline": "1.18.1",