[libpq] Unconditionally install to subdir (microsoft#33564)

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

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

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",

versions/baseline.json

@@ -4494,7 +4494,7 @@
     },
     "libpq": {
       "baseline": "15.3",
-      "port-version": 1
+      "port-version": 2
     },
     "libpqxx": {
       "baseline": "7.7.4",

versions/l-/libpq.json

@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "859b43f8db33293c411c365d945ecd4ae2cc056b",
+      "version": "15.3",
+      "port-version": 2
+    },
     {
       "git-tree": "a62f65ad38aa981b6ff7474e16f739a3ffbc622b",
       "version": "15.3",