Apply the patch instead of using a forked vcpkg repo

Author: BewareMyPower

pkg/mac/build-static-library.sh

@@ -34,10 +34,21 @@ else
     exit 1
 fi
 
-# Use a forked version of vcpkg to support building libcurl with IPv6 disabled
-rm -rf vcpkg
-git clone https://github.com/BewareMyPower/vcpkg.git -b curl-8.4.0-osx-patch
-git apply vcpkg-osx-json.diff
+# Apply the patch to support building libcurl with IPv6 disabled
+COMMIT_ID=$(grep "builtin-baseline" vcpkg.json | sed 's/"//g' | sed 's/,//' | awk '{print $2}')
+cd vcpkg
+git reset --hard $COMMIT_ID
+git apply ../pkg/mac/vcpkg-curl-patch.diff
+git add ports/curl
+git commit -m "Disable IPv6 for macOS in curl"
+./bootstrap-vcpkg.sh
+./vcpkg x-add-version --all
+git add versions/
+git commit -m "Update version"
+COMMIT_ID=$(git log --pretty=oneline | head -n 1 | awk '{print $1}')
+cd ..
+sed -i.bak "s/.*builtin-baseline.*/  \"builtin-baseline\": \"$COMMIT_ID\",/" vcpkg.json
+sed -i.bak "s/\"version>=\": \"8\.4\.0\"/\"version>=\": \"8.4.0#1\"/" vcpkg.json
 
 INSTALL_DIR=$PWD/pkg/mac/.install
 set -x

pkg/mac/vcpkg-curl-patch.diff

@@ -0,0 +1,27 @@
+diff --git a/ports/curl/portfile.cmake b/ports/curl/portfile.cmake
+index bdc544e9e..340d93865 100644
+--- a/ports/curl/portfile.cmake
++++ b/ports/curl/portfile.cmake
+@@ -64,6 +64,10 @@ if(VCPKG_TARGET_IS_WINDOWS)
+     list(APPEND OPTIONS -DENABLE_UNICODE=ON)
+ endif()
+ 
++if(VCPKG_TARGET_IS_OSX)
++    list(APPEND OPTIONS -DENABLE_IPV6=OFF)
++endif()
++
+ vcpkg_cmake_configure(
+     SOURCE_PATH "${SOURCE_PATH}"
+     OPTIONS 
+diff --git a/ports/curl/vcpkg.json b/ports/curl/vcpkg.json
+index e028d3897..a63858e34 100644
+--- a/ports/curl/vcpkg.json
++++ b/ports/curl/vcpkg.json
+@@ -1,6 +1,7 @@
+ {
+   "name": "curl",
+   "version": "8.4.0",
++  "port-version": 1,
+   "description": "A library for transferring data with URLs",
+   "homepage": "https://curl.se/",
+   "license": "curl AND ISC AND BSD-3-Clause",