From 22c78a0cb4e0af242565a34be8601a75266be4c6 Mon Sep 17 00:00:00 2001
From: Akash Munagala <akash.munagala@gmail.com>
Date: Thu, 17 Feb 2022 00:04:00 -0600
Subject: [PATCH 01/15] Fix graphviz tools

---
 ports/graphviz/portfile.cmake | 32 +++++++++++++++++++++++++++-----
 ports/graphviz/vcpkg.json     |  2 +-
 2 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/ports/graphviz/portfile.cmake b/ports/graphviz/portfile.cmake
index 6a4b451063a832..c1710743ef8e4a 100644
--- a/ports/graphviz/portfile.cmake
+++ b/ports/graphviz/portfile.cmake
@@ -9,6 +9,20 @@ vcpkg_from_gitlab(
         0001-Fix-build.patch
 )
 
+if(VCPKG_TARGET_IS_OSX)
+    message("${PORT} currently requires the following libraries from the system package manager:\n    libtool\n\nThey can be installed with brew install libtool")
+elseif(VCPKG_TARGET_IS_LINUX)
+    message("${PORT} currently requires the following libraries from the system package manager:\n    libtool\n\nThey can be installed with apt-get install libtool")
+else()
+    vcpkg_download_distfile(
+        LTDL_H_PATH
+        URLS "https://gitlab.com/graphviz/graphviz-windows-dependencies/-/raw/141d3a21be904fa8dc2ae3ed01d36684db07a35d/${VCPKG_TARGET_ARCHITECTURE}/include/ltdl.h"
+        FILENAME ltdl.h
+        SHA512 f2d20e849e35060536265f47014c40eb70e57dacd600a9db112fc465fbfa6a66217b44a8c3dc33039c260a27f09d9034b329b03cc28c32a22ec503fcd17b78cd
+    )
+    file(COPY ${LTDL_H_PATH} DESTINATION ${SOURCE_PATH}/lib/common)
+endif()
+
 vcpkg_acquire_msys(MSYS_ROOT PACKAGES gawk)
 vcpkg_add_to_path("${MSYS_ROOT}/usr/bin")
 
@@ -19,7 +33,6 @@ vcpkg_find_acquire_program(PYTHON3)
 
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
-
     DISABLE_PARALLEL_CONFIGURE
     OPTIONS
         -DBISON_EXECUTABLE=${BISON}
@@ -27,7 +40,7 @@ vcpkg_cmake_configure(
         -DGIT_EXECUTABLE=${GIT}
         -DPython3_EXECUTABLE=${PYTHON3}
         -DPKG_CONFIG_EXECUTABLE=${CURRENT_INSTALLED_DIR}/tools/pkgconf/pkgconf
-        -Denable_ltdl=OFF
+        -DLTDL_INCLUDE_DIR=${SOURCE_PATH}/lib/common
 )
 
 vcpkg_cmake_install()
@@ -39,8 +52,17 @@ vcpkg_copy_tools(
     TOOL_NAMES acyclic bcomps ccomps circo dijkstra dot fdp gc gml2gv graphml2gv gv2gml gvcolor gvgen gvpack gvpr gxl2gv mm2gv neato nop osage patchwork sccmap sfdp tred twopi unflatten
     AUTO_CLEAN
 )
+file(GLOB PLUGINS "${CURRENT_PACKAGES_DIR}/bin/gvplugin_*")
+file(COPY ${PLUGINS} DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}")
 
-# # Handle copyright
+vcpkg_execute_required_process(
+    COMMAND dot -c
+    WORKING_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools/${PORT}
+    LOGNAME configure-plugins
+)
+file(COPY "${CURRENT_PACKAGES_DIR}/tools/${PORT}/config6" DESTINATION "${CURRENT_PACKAGES_DIR}/bin")
+
+# Handle copyright
 file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
-
-vcpkg_fixup_pkgconfig()
+
+vcpkg_fixup_pkgconfig()
diff --git a/ports/graphviz/vcpkg.json b/ports/graphviz/vcpkg.json
index 249daf03cbcc88..ddef15cae2e60c 100644
--- a/ports/graphviz/vcpkg.json
+++ b/ports/graphviz/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "graphviz",
   "version-semver": "2.49.1",
-  "port-version": 1,
+  "port-version": 2,
   "description": "Graph Visualization Tools",
   "homepage": "https://graphviz.org/",
   "dependencies": [

From 86b5abcca105670f6b1d6b7c2c6ec4d5f3280739 Mon Sep 17 00:00:00 2001
From: Akash Munagala <akash.munagala@gmail.com>
Date: Thu, 17 Feb 2022 00:04:34 -0600
Subject: [PATCH 02/15] Update versions

---
 versions/baseline.json    | 2 +-
 versions/g-/graphviz.json | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/versions/baseline.json b/versions/baseline.json
index c8b5e0096a71fa..eb0f4dd82984d9 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -2586,7 +2586,7 @@
     },
     "graphviz": {
       "baseline": "2.49.1",
-      "port-version": 1
+      "port-version": 2
     },
     "greatest": {
       "baseline": "1.5.0",
diff --git a/versions/g-/graphviz.json b/versions/g-/graphviz.json
index 32fd45fe604ccc..f0b7339962e30b 100644
--- a/versions/g-/graphviz.json
+++ b/versions/g-/graphviz.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "93dade275cf5f6a3a89122b6d38068fd396d2dae",
+      "version-semver": "2.49.1",
+      "port-version": 2
+    },
     {
       "git-tree": "61316edc3deb64749cf84f70f5b0dbd669c06a9e",
       "version-semver": "2.49.1",

From 846a810a71e43e93a9f21a951c53aba395acca2f Mon Sep 17 00:00:00 2001
From: Akash Munagala <akash.munagala@gmail.com>
Date: Thu, 17 Feb 2022 01:23:45 -0600
Subject: [PATCH 03/15] Add license

---
 ports/graphviz/vcpkg.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ports/graphviz/vcpkg.json b/ports/graphviz/vcpkg.json
index ddef15cae2e60c..bfcc7ac7d7f011 100644
--- a/ports/graphviz/vcpkg.json
+++ b/ports/graphviz/vcpkg.json
@@ -4,6 +4,7 @@
   "port-version": 2,
   "description": "Graph Visualization Tools",
   "homepage": "https://graphviz.org/",
+  "license": "EPL-1.0",
   "dependencies": [
     "cairo",
     "getopt",

From f6d446b0051e037a1771133b1a4a31e63224fbdf Mon Sep 17 00:00:00 2001
From: Akash Munagala <akash.munagala@gmail.com>
Date: Thu, 17 Feb 2022 01:24:03 -0600
Subject: [PATCH 04/15] Fix non-Windows build

---
 ports/graphviz/portfile.cmake | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/ports/graphviz/portfile.cmake b/ports/graphviz/portfile.cmake
index c1710743ef8e4a..dfc7eb9b92a3d7 100644
--- a/ports/graphviz/portfile.cmake
+++ b/ports/graphviz/portfile.cmake
@@ -8,7 +8,7 @@ vcpkg_from_gitlab(
     PATCHES
         0001-Fix-build.patch
 )
-
+set(LTDL_OPTION)
 if(VCPKG_TARGET_IS_OSX)
     message("${PORT} currently requires the following libraries from the system package manager:\n    libtool\n\nThey can be installed with brew install libtool")
 elseif(VCPKG_TARGET_IS_LINUX)
@@ -21,6 +21,7 @@ else()
         SHA512 f2d20e849e35060536265f47014c40eb70e57dacd600a9db112fc465fbfa6a66217b44a8c3dc33039c260a27f09d9034b329b03cc28c32a22ec503fcd17b78cd
     )
     file(COPY ${LTDL_H_PATH} DESTINATION ${SOURCE_PATH}/lib/common)
+    set(LTDL_OPTION "-DLTDL_INCLUDE_DIR=${SOURCE_PATH}/lib/common")
 endif()
 
 vcpkg_acquire_msys(MSYS_ROOT PACKAGES gawk)
@@ -40,7 +41,7 @@ vcpkg_cmake_configure(
         -DGIT_EXECUTABLE=${GIT}
         -DPython3_EXECUTABLE=${PYTHON3}
         -DPKG_CONFIG_EXECUTABLE=${CURRENT_INSTALLED_DIR}/tools/pkgconf/pkgconf
-        -DLTDL_INCLUDE_DIR=${SOURCE_PATH}/lib/common
+        ${LTDL_OPTION}
 )
 
 vcpkg_cmake_install()

From a02c435dd58e865919bc8357a392f9292a9fc63a Mon Sep 17 00:00:00 2001
From: Akash Munagala <akash.munagala@gmail.com>
Date: Thu, 17 Feb 2022 01:24:32 -0600
Subject: [PATCH 05/15] Update versions

---
 versions/g-/graphviz.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/versions/g-/graphviz.json b/versions/g-/graphviz.json
index f0b7339962e30b..23936eff6dabf9 100644
--- a/versions/g-/graphviz.json
+++ b/versions/g-/graphviz.json
@@ -1,7 +1,7 @@
 {
   "versions": [
     {
-      "git-tree": "93dade275cf5f6a3a89122b6d38068fd396d2dae",
+      "git-tree": "a3b0b79ec2189ee63bdb25e05fc762a2d18575dd",
       "version-semver": "2.49.1",
       "port-version": 2
     },

From 45e94de331b57c6a4cccb531ebde5045a262e080 Mon Sep 17 00:00:00 2001
From: Akash Munagala <akash.munagala@gmail.com>
Date: Thu, 17 Feb 2022 01:51:00 -0600
Subject: [PATCH 06/15] Fix dot command call for non-Windows

---
 ports/graphviz/portfile.cmake | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/ports/graphviz/portfile.cmake b/ports/graphviz/portfile.cmake
index dfc7eb9b92a3d7..0f2569483d9a1f 100644
--- a/ports/graphviz/portfile.cmake
+++ b/ports/graphviz/portfile.cmake
@@ -56,8 +56,15 @@ vcpkg_copy_tools(
 file(GLOB PLUGINS "${CURRENT_PACKAGES_DIR}/bin/gvplugin_*")
 file(COPY ${PLUGINS} DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}")
 
+
+if(VCPKG_TARGET_IS_WINDOWS)
+    set(DOT_COMMAND "dot")
+else()
+    set(DOT_COMMAND "./dot")
+endif()
+
 vcpkg_execute_required_process(
-    COMMAND dot -c
+    COMMAND ${DOT_COMMAND} -c
     WORKING_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools/${PORT}
     LOGNAME configure-plugins
 )

From 371f9b2f581441a52b54570f492a72cfc719b3f2 Mon Sep 17 00:00:00 2001
From: Akash Munagala <akash.munagala@gmail.com>
Date: Thu, 17 Feb 2022 01:51:13 -0600
Subject: [PATCH 07/15] Update versions

---
 versions/g-/graphviz.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/versions/g-/graphviz.json b/versions/g-/graphviz.json
index 23936eff6dabf9..aacb041cc6ac88 100644
--- a/versions/g-/graphviz.json
+++ b/versions/g-/graphviz.json
@@ -1,7 +1,7 @@
 {
   "versions": [
     {
-      "git-tree": "a3b0b79ec2189ee63bdb25e05fc762a2d18575dd",
+      "git-tree": "8d63422459c9adb6f5cf3fb15e1705be0b3ad85b",
       "version-semver": "2.49.1",
       "port-version": 2
     },

From d529eb6e9c9baf76a5f88122b47f7cf77e540f87 Mon Sep 17 00:00:00 2001
From: Akash Munagala <akash.munagala@gmail.com>
Date: Thu, 17 Feb 2022 02:40:26 -0600
Subject: [PATCH 08/15] Force dynamic library

---
 ports/graphviz/portfile.cmake | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/ports/graphviz/portfile.cmake b/ports/graphviz/portfile.cmake
index 0f2569483d9a1f..e175e848ce6a16 100644
--- a/ports/graphviz/portfile.cmake
+++ b/ports/graphviz/portfile.cmake
@@ -1,3 +1,5 @@
+vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY)
+
 vcpkg_from_gitlab(
     GITLAB_URL https://gitlab.com
     OUT_SOURCE_PATH SOURCE_PATH
@@ -8,6 +10,7 @@ vcpkg_from_gitlab(
     PATCHES
         0001-Fix-build.patch
 )
+
 set(LTDL_OPTION)
 if(VCPKG_TARGET_IS_OSX)
     message("${PORT} currently requires the following libraries from the system package manager:\n    libtool\n\nThey can be installed with brew install libtool")
@@ -56,7 +59,6 @@ vcpkg_copy_tools(
 file(GLOB PLUGINS "${CURRENT_PACKAGES_DIR}/bin/gvplugin_*")
 file(COPY ${PLUGINS} DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}")
 
-
 if(VCPKG_TARGET_IS_WINDOWS)
     set(DOT_COMMAND "dot")
 else()

From 89aea42bed32903cc79dec98a87822a21af87608 Mon Sep 17 00:00:00 2001
From: Akash Munagala <akash.munagala@gmail.com>
Date: Thu, 17 Feb 2022 02:40:37 -0600
Subject: [PATCH 09/15] Update versions

---
 versions/g-/graphviz.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/versions/g-/graphviz.json b/versions/g-/graphviz.json
index aacb041cc6ac88..f108d0f6a58b89 100644
--- a/versions/g-/graphviz.json
+++ b/versions/g-/graphviz.json
@@ -1,7 +1,7 @@
 {
   "versions": [
     {
-      "git-tree": "8d63422459c9adb6f5cf3fb15e1705be0b3ad85b",
+      "git-tree": "d20073911ce5cf658d682839c091bd0390663d70",
       "version-semver": "2.49.1",
       "port-version": 2
     },

From 36b5ce754349caff915e44e2dca845d385de8fcc Mon Sep 17 00:00:00 2001
From: Akash Munagala <akash.munagala@gmail.com>
Date: Thu, 17 Feb 2022 13:49:38 -0600
Subject: [PATCH 10/15] Try fixing unix

---
 ports/graphviz/portfile.cmake | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ports/graphviz/portfile.cmake b/ports/graphviz/portfile.cmake
index e175e848ce6a16..d923196c69b3b3 100644
--- a/ports/graphviz/portfile.cmake
+++ b/ports/graphviz/portfile.cmake
@@ -59,10 +59,11 @@ vcpkg_copy_tools(
 file(GLOB PLUGINS "${CURRENT_PACKAGES_DIR}/bin/gvplugin_*")
 file(COPY ${PLUGINS} DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}")
 
-if(VCPKG_TARGET_IS_WINDOWS)
+if(VCPKG_HOST_IS_WINDOWS)
     set(DOT_COMMAND "dot")
 else()
     set(DOT_COMMAND "./dot")
+    set(ENV{LD_LIBRARY_PATH} "$ENV{LD_LIBRARY_PATH}:${CURRENT_PACKAGES_DIR}/bin")
 endif()
 
 vcpkg_execute_required_process(

From db1ed10822ef893cf5d1ee15a5d099fc2416b3c5 Mon Sep 17 00:00:00 2001
From: Akash Munagala <akash.munagala@gmail.com>
Date: Thu, 17 Feb 2022 14:46:09 -0600
Subject: [PATCH 11/15] Try using rpath

---
 ports/graphviz/portfile.cmake | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/ports/graphviz/portfile.cmake b/ports/graphviz/portfile.cmake
index d923196c69b3b3..25b7d53320ccd2 100644
--- a/ports/graphviz/portfile.cmake
+++ b/ports/graphviz/portfile.cmake
@@ -35,6 +35,11 @@ vcpkg_find_acquire_program(FLEX)
 vcpkg_find_acquire_program(GIT)
 vcpkg_find_acquire_program(PYTHON3)
 
+set(EXTRA_CMAKE_OPTIONS)
+if(NOT VCPKG_TARGET_IS_WINDOWS)
+    set(EXTRA_CMAKE_OPTIONS "-DCMAKE_INSTALL_RPATH=${CURRENT_PACKAGES_DIR}/bin")
+endif()
+
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
     DISABLE_PARALLEL_CONFIGURE
@@ -45,6 +50,7 @@ vcpkg_cmake_configure(
         -DPython3_EXECUTABLE=${PYTHON3}
         -DPKG_CONFIG_EXECUTABLE=${CURRENT_INSTALLED_DIR}/tools/pkgconf/pkgconf
         ${LTDL_OPTION}
+        ${EXTRA_CMAKE_OPTIONS}
 )
 
 vcpkg_cmake_install()
@@ -63,7 +69,6 @@ if(VCPKG_HOST_IS_WINDOWS)
     set(DOT_COMMAND "dot")
 else()
     set(DOT_COMMAND "./dot")
-    set(ENV{LD_LIBRARY_PATH} "$ENV{LD_LIBRARY_PATH}:${CURRENT_PACKAGES_DIR}/bin")
 endif()
 
 vcpkg_execute_required_process(

From 3da8d3b80902bc270502ae1e7d2deb256f17212e Mon Sep 17 00:00:00 2001
From: Akash Munagala <akash.munagala@gmail.com>
Date: Thu, 17 Feb 2022 21:11:50 -0600
Subject: [PATCH 12/15] Try fixing unix

---
 ports/graphviz/portfile.cmake | 37 ++++++++++++++---------------------
 1 file changed, 15 insertions(+), 22 deletions(-)

diff --git a/ports/graphviz/portfile.cmake b/ports/graphviz/portfile.cmake
index 25b7d53320ccd2..6878831652d655 100644
--- a/ports/graphviz/portfile.cmake
+++ b/ports/graphviz/portfile.cmake
@@ -11,7 +11,6 @@ vcpkg_from_gitlab(
         0001-Fix-build.patch
 )
 
-set(LTDL_OPTION)
 if(VCPKG_TARGET_IS_OSX)
     message("${PORT} currently requires the following libraries from the system package manager:\n    libtool\n\nThey can be installed with brew install libtool")
 elseif(VCPKG_TARGET_IS_LINUX)
@@ -24,7 +23,11 @@ else()
         SHA512 f2d20e849e35060536265f47014c40eb70e57dacd600a9db112fc465fbfa6a66217b44a8c3dc33039c260a27f09d9034b329b03cc28c32a22ec503fcd17b78cd
     )
     file(COPY ${LTDL_H_PATH} DESTINATION ${SOURCE_PATH}/lib/common)
-    set(LTDL_OPTION "-DLTDL_INCLUDE_DIR=${SOURCE_PATH}/lib/common")
+    set(EXTRA_CMAKE_OPTION "-DLTDL_INCLUDE_DIR=${SOURCE_PATH}/lib/common")
+endif()
+
+if(NOT VCPKG_TARGET_IS_WINDOWS)
+    set(EXTRA_CMAKE_OPTION "-DCMAKE_INSTALL_RPATH=${CURRENT_INSTALLED_DIR}/lib")
 endif()
 
 vcpkg_acquire_msys(MSYS_ROOT PACKAGES gawk)
@@ -35,11 +38,6 @@ vcpkg_find_acquire_program(FLEX)
 vcpkg_find_acquire_program(GIT)
 vcpkg_find_acquire_program(PYTHON3)
 
-set(EXTRA_CMAKE_OPTIONS)
-if(NOT VCPKG_TARGET_IS_WINDOWS)
-    set(EXTRA_CMAKE_OPTIONS "-DCMAKE_INSTALL_RPATH=${CURRENT_PACKAGES_DIR}/bin")
-endif()
-
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
     DISABLE_PARALLEL_CONFIGURE
@@ -49,8 +47,7 @@ vcpkg_cmake_configure(
         -DGIT_EXECUTABLE=${GIT}
         -DPython3_EXECUTABLE=${PYTHON3}
         -DPKG_CONFIG_EXECUTABLE=${CURRENT_INSTALLED_DIR}/tools/pkgconf/pkgconf
-        ${LTDL_OPTION}
-        ${EXTRA_CMAKE_OPTIONS}
+        ${EXTRA_CMAKE_OPTION}
 )
 
 vcpkg_cmake_install()
@@ -62,22 +59,18 @@ vcpkg_copy_tools(
     TOOL_NAMES acyclic bcomps ccomps circo dijkstra dot fdp gc gml2gv graphml2gv gv2gml gvcolor gvgen gvpack gvpr gxl2gv mm2gv neato nop osage patchwork sccmap sfdp tred twopi unflatten
     AUTO_CLEAN
 )
-file(GLOB PLUGINS "${CURRENT_PACKAGES_DIR}/bin/gvplugin_*")
-file(COPY ${PLUGINS} DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}")
 
-if(VCPKG_HOST_IS_WINDOWS)
-    set(DOT_COMMAND "dot")
-else()
-    set(DOT_COMMAND "./dot")
+if(VCPKG_TARGET_IS_WINDOWS)
+    file(GLOB PLUGINS "${CURRENT_PACKAGES_DIR}/bin/gvplugin_*")
+    file(COPY ${PLUGINS} DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}")
+    vcpkg_execute_required_process(
+        COMMAND dot -c
+        WORKING_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools/${PORT}
+        LOGNAME configure-plugins
+    )
+    file(COPY "${CURRENT_PACKAGES_DIR}/tools/${PORT}/config6" DESTINATION "${CURRENT_PACKAGES_DIR}/bin")
 endif()
 
-vcpkg_execute_required_process(
-    COMMAND ${DOT_COMMAND} -c
-    WORKING_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools/${PORT}
-    LOGNAME configure-plugins
-)
-file(COPY "${CURRENT_PACKAGES_DIR}/tools/${PORT}/config6" DESTINATION "${CURRENT_PACKAGES_DIR}/bin")
-
 # Handle copyright
 file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
 

From 893e07a0d786a229cee05745fda4d9c53b7fcaf9 Mon Sep 17 00:00:00 2001
From: Akash Munagala <akash.munagala@gmail.com>
Date: Thu, 17 Feb 2022 21:12:10 -0600
Subject: [PATCH 13/15] Update versions

---
 versions/g-/graphviz.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/versions/g-/graphviz.json b/versions/g-/graphviz.json
index f108d0f6a58b89..412f7de4e9c6db 100644
--- a/versions/g-/graphviz.json
+++ b/versions/g-/graphviz.json
@@ -1,7 +1,7 @@
 {
   "versions": [
     {
-      "git-tree": "d20073911ce5cf658d682839c091bd0390663d70",
+      "git-tree": "1640101d8b7aef3e73e85f4beb6070dfad914aad",
       "version-semver": "2.49.1",
       "port-version": 2
     },

From b35dc426c22d51988df2e66ec9a65de7302384e5 Mon Sep 17 00:00:00 2001
From: Akash Munagala <akash.munagala@gmail.com>
Date: Thu, 17 Feb 2022 21:18:06 -0600
Subject: [PATCH 14/15] Make pkgconf a host dep

---
 ports/graphviz/portfile.cmake | 2 +-
 ports/graphviz/vcpkg.json     | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/ports/graphviz/portfile.cmake b/ports/graphviz/portfile.cmake
index 6878831652d655..14f0b00db5c63e 100644
--- a/ports/graphviz/portfile.cmake
+++ b/ports/graphviz/portfile.cmake
@@ -46,7 +46,7 @@ vcpkg_cmake_configure(
         -DFLEX_EXECUTABLE=${FLEX}
         -DGIT_EXECUTABLE=${GIT}
         -DPython3_EXECUTABLE=${PYTHON3}
-        -DPKG_CONFIG_EXECUTABLE=${CURRENT_INSTALLED_DIR}/tools/pkgconf/pkgconf
+        -DPKG_CONFIG_EXECUTABLE=${CURRENT_HOST_INSTALLED_DIR}/tools/pkgconf/pkgconf
         ${EXTRA_CMAKE_OPTION}
 )
 
diff --git a/ports/graphviz/vcpkg.json b/ports/graphviz/vcpkg.json
index bfcc7ac7d7f011..d9e8eca967d8e0 100644
--- a/ports/graphviz/vcpkg.json
+++ b/ports/graphviz/vcpkg.json
@@ -11,7 +11,10 @@
     "libffi",
     "libgd",
     "pango",
-    "pkgconf",
+    {
+      "name": "pkgconf",
+      "host": true
+    },
     {
       "name": "vcpkg-cmake",
       "host": true

From 07e59a945da7b15459b63dca602a6482dbe758de Mon Sep 17 00:00:00 2001
From: Akash Munagala <akash.munagala@gmail.com>
Date: Thu, 17 Feb 2022 21:18:14 -0600
Subject: [PATCH 15/15] Update versions

---
 versions/g-/graphviz.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/versions/g-/graphviz.json b/versions/g-/graphviz.json
index 412f7de4e9c6db..1c479d139c7a0b 100644
--- a/versions/g-/graphviz.json
+++ b/versions/g-/graphviz.json
@@ -1,7 +1,7 @@
 {
   "versions": [
     {
-      "git-tree": "1640101d8b7aef3e73e85f4beb6070dfad914aad",
+      "git-tree": "912ac6a1578bd9cf23c20ed7f3bc85c25058c872",
       "version-semver": "2.49.1",
       "port-version": 2
     },