From 2b2852767f67c6fa6898b57beb1b2b5bf6af1462 Mon Sep 17 00:00:00 2001
From: Kai Pastor <dg0yt@darc.de>
Date: Thu, 7 Sep 2023 01:51:54 +0200
Subject: [PATCH] [libpq] Unconditionally install to subdir (#33564)

---
 ports/libpq/portfile.cmake         |  1 +
 ports/libpq/unix/installdirs.patch | 48 ++++++++++++++++++++++++++++++
 ports/libpq/vcpkg.json             |  2 +-
 versions/baseline.json             |  2 +-
 versions/l-/libpq.json             |  5 ++++
 5 files changed, 56 insertions(+), 2 deletions(-)
 create mode 100644 ports/libpq/unix/installdirs.patch

diff --git a/ports/libpq/portfile.cmake b/ports/libpq/portfile.cmake
index 5593f7702363fd..406372d31578e8 100644
--- a/ports/libpq/portfile.cmake
+++ b/ports/libpq/portfile.cmake
@@ -8,6 +8,7 @@ vcpkg_extract_source_archive(
     SOURCE_PATH
     ARCHIVE "${ARCHIVE}"
     PATCHES
+        unix/installdirs.patch
         unix/fix-configure.patch
         unix/single-linkage.patch
         unix/no-server-tools.patch
diff --git a/ports/libpq/unix/installdirs.patch b/ports/libpq/unix/installdirs.patch
new file mode 100644
index 00000000000000..ae6653f904df7e
--- /dev/null
+++ b/ports/libpq/unix/installdirs.patch
@@ -0,0 +1,48 @@
+diff --git a/src/Makefile.global.in b/src/Makefile.global.in
+index 5dacc4d..a9a797e 100644
+--- a/src/Makefile.global.in
++++ b/src/Makefile.global.in
+@@ -100,14 +100,14 @@ datarootdir := @datarootdir@
+ 
+ bindir := @bindir@
+ 
+-datadir := @datadir@
++datadir := @datadir@/postgresql
+ ifeq "$(findstring pgsql, $(datadir))" ""
+ ifeq "$(findstring postgres, $(datadir))" ""
+ override datadir := $(datadir)/postgresql
+ endif
+ endif
+ 
+-sysconfdir := @sysconfdir@
++sysconfdir := @sysconfdir@/postgresql
+ ifeq "$(findstring pgsql, $(sysconfdir))" ""
+ ifeq "$(findstring postgres, $(sysconfdir))" ""
+ override sysconfdir := $(sysconfdir)/postgresql
+@@ -116,7 +116,7 @@ endif
+ 
+ libdir := @libdir@
+ 
+-pkglibdir = $(libdir)
++pkglibdir = $(libdir)/postgresql
+ ifeq "$(findstring pgsql, $(pkglibdir))" ""
+ ifeq "$(findstring postgres, $(pkglibdir))" ""
+ override pkglibdir := $(pkglibdir)/postgresql
+@@ -125,7 +125,7 @@ endif
+ 
+ includedir := @includedir@
+ 
+-pkgincludedir = $(includedir)
++pkgincludedir = $(includedir)/postgresql
+ ifeq "$(findstring pgsql, $(pkgincludedir))" ""
+ ifeq "$(findstring postgres, $(pkgincludedir))" ""
+ override pkgincludedir := $(pkgincludedir)/postgresql
+@@ -134,7 +134,7 @@ endif
+ 
+ mandir := @mandir@
+ 
+-docdir := @docdir@
++docdir := @docdir@/postgresql
+ ifeq "$(findstring pgsql, $(docdir))" ""
+ ifeq "$(findstring postgres, $(docdir))" ""
+ override docdir := $(docdir)/postgresql
diff --git a/ports/libpq/vcpkg.json b/ports/libpq/vcpkg.json
index 3dfcd11b0b3ba5..2574d459e77639 100644
--- a/ports/libpq/vcpkg.json
+++ b/ports/libpq/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "libpq",
   "version": "15.3",
-  "port-version": 1,
+  "port-version": 2,
   "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 0526a53aa2235f..9fdb6c6e314f8b 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -4494,7 +4494,7 @@
     },
     "libpq": {
       "baseline": "15.3",
-      "port-version": 1
+      "port-version": 2
     },
     "libpqxx": {
       "baseline": "7.7.4",
diff --git a/versions/l-/libpq.json b/versions/l-/libpq.json
index 25b1740628cc26..b4c4666cfe574f 100644
--- a/versions/l-/libpq.json
+++ b/versions/l-/libpq.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "859b43f8db33293c411c365d945ecd4ae2cc056b",
+      "version": "15.3",
+      "port-version": 2
+    },
     {
       "git-tree": "a62f65ad38aa981b6ff7474e16f739a3ffbc622b",
       "version": "15.3",