From cb32d750640a679b346e148689b9a54c98ac4ad1 Mon Sep 17 00:00:00 2001
From: Kai Pastor <dg0yt@darc.de>
Date: Tue, 24 Jan 2023 01:05:18 +0100
Subject: [PATCH] [ncurses] Update to 6.4 (#29129)

* [ncurses] Update to 6.4

* Adopt new pkgconfig dir option

Fixes native mingw builds.
---
 ports/ncurses/portfile.cmake | 55 +++++++++++++++---------------------
 ports/ncurses/vcpkg.json     |  3 +-
 versions/baseline.json       |  4 +--
 versions/n-/ncurses.json     |  5 ++++
 4 files changed, 31 insertions(+), 36 deletions(-)

diff --git a/ports/ncurses/portfile.cmake b/ports/ncurses/portfile.cmake
index 2fcc1d052c33f9..383e7140099877 100644
--- a/ports/ncurses/portfile.cmake
+++ b/ports/ncurses/portfile.cmake
@@ -1,12 +1,11 @@
-set(NCURSES_VERSION_STR 6.3)
 vcpkg_download_distfile(
     ARCHIVE_PATH
     URLS
-        "https://invisible-mirror.net/archives/ncurses/ncurses-${NCURSES_VERSION_STR}.tar.gz"
-        "ftp://ftp.invisible-island.net/ncurses/ncurses-${NCURSES_VERSION_STR}.tar.gz"
-        "https://ftp.gnu.org/gnu/ncurses/ncurses-${NCURSES_VERSION_STR}.tar.gz"
-    FILENAME "ncurses-${NCURSES_VERSION_STR}.tgz"
-    SHA512 5373f228cba6b7869210384a607a2d7faecfcbfef6dbfcd7c513f4e84fbd8bcad53ac7db2e7e84b95582248c1039dcfc7c4db205a618f7da22a166db482f0105
+        "https://invisible-mirror.net/archives/ncurses/ncurses-${VERSION}.tar.gz"
+        "ftp://ftp.invisible-island.net/ncurses/ncurses-${VERSION}.tar.gz"
+        "https://ftp.gnu.org/gnu/ncurses/ncurses-${VERSION}.tar.gz"
+    FILENAME "ncurses-${VERSION}.tgz"
+    SHA512 1c2efff87a82a57e57b0c60023c87bae93f6718114c8f9dc010d4c21119a2f7576d0225dab5f0a227c2cfc6fb6bdbd62728e407f35fce5bf351bb50cf9e0fd34
 )
 
 vcpkg_extract_source_archive(
@@ -14,15 +13,8 @@ vcpkg_extract_source_archive(
     ARCHIVE "${ARCHIVE_PATH}"
 )
 
-set(OPTIONS
-    --disable-db-install
-    --enable-pc-files
-    --without-ada
-    --without-manpages
-    --without-progs
-    --without-tack
-    --without-tests
-)
+vcpkg_list(SET OPTIONS)
+
 if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
     list(APPEND OPTIONS
         --with-shared
@@ -45,27 +37,26 @@ if(VCPKG_TARGET_IS_MINGW)
     )
 endif()
 
-file(MAKE_DIRECTORY "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig")
-file(MAKE_DIRECTORY "${CURRENT_INSTALLED_DIR}/lib/pkgconfig")
-
-set(OPTIONS_DEBUG
-    "--with-pkg-config-libdir=${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig"
-    --with-debug
-    --without-normal
-)
-set(OPTIONS_RELEASE
-    "--with-pkg-config-libdir=${CURRENT_INSTALLED_DIR}/lib/pkgconfig"
-    --without-debug
-    --with-normal
-)
-
 vcpkg_configure_make(
     SOURCE_PATH "${SOURCE_PATH}"
     DETERMINE_BUILD_TRIPLET
-    OPTIONS ${OPTIONS}
-    OPTIONS_DEBUG ${OPTIONS_DEBUG}
-    OPTIONS_RELEASE ${OPTIONS_RELEASE}
     NO_ADDITIONAL_PATHS
+    OPTIONS
+        ${OPTIONS}
+        --disable-db-install
+        --enable-pc-files
+        --without-ada
+        --without-manpages
+        --without-progs
+        --without-tack
+        --without-tests
+        --with-pkg-config-libdir=libdir
+    OPTIONS_DEBUG
+        --with-debug
+        --without-normal
+    OPTIONS_RELEASE
+        --without-debug
+        --with-normal
 )
 vcpkg_install_make()
 
diff --git a/ports/ncurses/vcpkg.json b/ports/ncurses/vcpkg.json
index 67c5ca78214bdf..0aa9d5555011ba 100644
--- a/ports/ncurses/vcpkg.json
+++ b/ports/ncurses/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "ncurses",
-  "version": "6.3",
-  "port-version": 4,
+  "version": "6.4",
   "description": "Free software emulation of curses in System V Release 4.0, and more",
   "homepage": "https://invisible-island.net/ncurses/announce.html",
   "license": "MIT",
diff --git a/versions/baseline.json b/versions/baseline.json
index 7ba07151e2175c..c1ff8bef427504 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -5261,8 +5261,8 @@
       "port-version": 0
     },
     "ncurses": {
-      "baseline": "6.3",
-      "port-version": 4
+      "baseline": "6.4",
+      "port-version": 0
     },
     "neargye-semver": {
       "baseline": "0.3.0",
diff --git a/versions/n-/ncurses.json b/versions/n-/ncurses.json
index 237b9d8cc59c61..74c9c47afa72b9 100644
--- a/versions/n-/ncurses.json
+++ b/versions/n-/ncurses.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "c557b7daa2f3a87a54e037e7b984ad8a661c5903",
+      "version": "6.4",
+      "port-version": 0
+    },
     {
       "git-tree": "83eac97c40a368314b01639191657529194d8bdc",
       "version": "6.3",