From 6af584dd59aa5bdba75dae6781ec74614e03e5b9 Mon Sep 17 00:00:00 2001
From: Kai Pastor <dg0yt@darc.de>
Date: Tue, 6 Aug 2024 23:41:10 +0200
Subject: [PATCH] [libpq] Update to 16.3 (#40110)

---
 ports/libpq/portfile.cmake           | 15 +++++++--------
 ports/libpq/unix/fix-configure.patch |  2 +-
 ports/libpq/vcpkg.json               |  3 +--
 versions/baseline.json               |  4 ++--
 versions/l-/libpq.json               |  5 +++++
 5 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/ports/libpq/portfile.cmake b/ports/libpq/portfile.cmake
index 7822054376..be31beed3a 100644
--- a/ports/libpq/portfile.cmake
+++ b/ports/libpq/portfile.cmake
@@ -1,7 +1,7 @@
 vcpkg_download_distfile(ARCHIVE
     URLS "https://ftp.postgresql.org/pub/source/v${VERSION}/postgresql-${VERSION}.tar.bz2"
     FILENAME "postgresql-${VERSION}.tar.bz2"
-    SHA512 3194941cc3f1ec86b6cf4f08c6422d268d99890441f8fc9ab87b6a7fd16c990fa230b544308644cbef54e6960c4984e3703752e40930bdc0537b7bfda3ab7ccf
+    SHA512 dc1c8d4fbc8e53e9be91dcf1b644b3969bd634f11bf5a1c4fe16619fd386f3349a5509788d43e6a57d099ad75233026d4dd4e0bb180ffc747fd3c1a575c51a5f
 )
 
 vcpkg_extract_source_archive(
@@ -31,20 +31,19 @@ else()
     set(HAS_TOOLS FALSE)
 endif()
 
-set(required_programs PERL)
-if(VCPKG_TARGET_IS_WINDOWS)
-    list(APPEND required_programs BISON FLEX)
+vcpkg_cmake_get_vars(cmake_vars_file)
+include("${cmake_vars_file}")
+
+set(required_programs BISON FLEX)
+if(VCPKG_DETECTED_MSVC OR NOT VCPKG_HOST_IS_WINDOWS)
+    list(APPEND required_programs PERL)
 endif()
 foreach(program_name IN LISTS required_programs)
-    # Need to rename win_bison and win_flex to just bison and flex
     vcpkg_find_acquire_program(${program_name})
     get_filename_component(program_dir ${${program_name}} DIRECTORY)
     vcpkg_add_to_path(PREPEND "${program_dir}")
 endforeach()
 
-vcpkg_cmake_get_vars(cmake_vars_file)
-include("${cmake_vars_file}")
-
 if(VCPKG_DETECTED_MSVC)
     if("nls" IN_LIST FEATURES)
         vcpkg_acquire_msys(MSYS_ROOT PACKAGES gettext)
diff --git a/ports/libpq/unix/fix-configure.patch b/ports/libpq/unix/fix-configure.patch
index 29c7646352..c9d453c07c 100644
--- a/ports/libpq/unix/fix-configure.patch
+++ b/ports/libpq/unix/fix-configure.patch
@@ -4,7 +4,7 @@ index 7f97248..48ff1a1 100644
 +++ b/configure.ac
 @@ -19,7 +19,8 @@ m4_pattern_forbid(^PGAC_)dnl to catch undefined macros
  
- AC_INIT([PostgreSQL], [16.2], [pgsql-bugs@lists.postgresql.org], [], [https://www.postgresql.org/])
+ AC_INIT([PostgreSQL], [16.3], [pgsql-bugs@lists.postgresql.org], [], [https://www.postgresql.org/])
  
 -m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.69], [], [m4_fatal([Autoconf version 2.69 is required.
 +cross_compiling=yes # Avoid conftest loading shared objects
diff --git a/ports/libpq/vcpkg.json b/ports/libpq/vcpkg.json
index 772c1a995b..511e8d4aaa 100644
--- a/ports/libpq/vcpkg.json
+++ b/ports/libpq/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "libpq",
-  "version": "16.2",
-  "port-version": 1,
+  "version": "16.3",
   "description": "The official database access API of postgresql",
   "homepage": "https://www.postgresql.org/",
   "license": "PostgreSQL",
diff --git a/versions/baseline.json b/versions/baseline.json
index 60946a603d..2f53a898ab 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -4889,8 +4889,8 @@
       "port-version": 17
     },
     "libpq": {
-      "baseline": "16.2",
-      "port-version": 1
+      "baseline": "16.3",
+      "port-version": 0
     },
     "libpqxx": {
       "baseline": "7.9.0",
diff --git a/versions/l-/libpq.json b/versions/l-/libpq.json
index 5cde1562a8..1773f8d3e8 100644
--- a/versions/l-/libpq.json
+++ b/versions/l-/libpq.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "e5b88c49c78feaa118b52ae4279e372aa52dbe9b",
+      "version": "16.3",
+      "port-version": 0
+    },
     {
       "git-tree": "aac67118e4bd1ee29001f206697fb8461e47a590",
       "version": "16.2",