From 112067db83cd9a4bab80aec8a025af305dbaac5e Mon Sep 17 00:00:00 2001
From: autoantwort <41973254+autoantwort@users.noreply.github.com>
Date: Tue, 2 Mar 2021 01:10:04 +0100
Subject: [libpq] fix filenames (linux -> windows cross compile) (#16434)

* [libpq] fix filenames

* add version files

* add version files
---
 ports/libpq/CONTROL                                |   2 +-
 ports/libpq/patches/windows/Solution_DEBUG.patch   | 157 +++++++++++++++++++++
 ports/libpq/patches/windows/Solution_Debug.patch   | 157 ---------------------
 ports/libpq/patches/windows/Solution_RELEASE.patch | 157 +++++++++++++++++++++
 ports/libpq/patches/windows/Solution_Release.patch | 157 ---------------------
 .../patches/windows/python3_build_DEBUG.patch      |  40 ++++++
 .../patches/windows/python3_build_Debug.patch      |  40 ------
 .../patches/windows/python3_build_RELEASE.patch    |  39 +++++
 .../patches/windows/python3_build_Release.patch    |  39 -----
 versions/baseline.json                             |   2 +-
 versions/l-/libpq.json                             |   5 +
 11 files changed, 400 insertions(+), 395 deletions(-)
 create mode 100644 ports/libpq/patches/windows/Solution_DEBUG.patch
 delete mode 100644 ports/libpq/patches/windows/Solution_Debug.patch
 create mode 100644 ports/libpq/patches/windows/Solution_RELEASE.patch
 delete mode 100644 ports/libpq/patches/windows/Solution_Release.patch
 create mode 100644 ports/libpq/patches/windows/python3_build_DEBUG.patch
 delete mode 100644 ports/libpq/patches/windows/python3_build_Debug.patch
 create mode 100644 ports/libpq/patches/windows/python3_build_RELEASE.patch
 delete mode 100644 ports/libpq/patches/windows/python3_build_Release.patch

diff --git a/ports/libpq/CONTROL b/ports/libpq/CONTROL
index 5d535ff72..d684fa239 100644
--- a/ports/libpq/CONTROL
+++ b/ports/libpq/CONTROL
@@ -1,6 +1,6 @@
 Source: libpq
 Version: 12.2
-Port-Version: 11
+Port-Version: 12
 Build-Depends: libpq[core,bonjour] (osx)
 Supports: !uwp
 Homepage: https://www.postgresql.org/
diff --git a/ports/libpq/patches/windows/Solution_DEBUG.patch b/ports/libpq/patches/windows/Solution_DEBUG.patch
new file mode 100644
index 000000000..e641f468a
--- /dev/null
+++ b/ports/libpq/patches/windows/Solution_DEBUG.patch
@@ -0,0 +1,157 @@
+diff --git a/src/tools/msvc/Solution.pm b/src/tools/msvc/Solution.pm
+index 51711c2bf..d33fdc3b0 100644
+--- a/src/tools/msvc/Solution.pm	
++++ b/src/tools/msvc/Solution.pm
+@@ -650,7 +650,7 @@ sub AddProject
+ 	if ($self->{options}->{zlib})
+ 	{
+ 		$proj->AddIncludeDir($self->{options}->{zlib} . '\include');
+-		$proj->AddLibrary($self->{options}->{zlib} . '\lib\zdll.lib');
++		$proj->AddLibrary($self->{options}->{zlib} . '\debug\lib\zlibd.lib'); # This must be updated
+ 	}
+ 	if ($self->{options}->{openssl})
+ 	{
+@@ -661,7 +661,7 @@ sub AddProject
+ 		# changed their library names from:
+ 		# - libeay to libcrypto
+ 		# - ssleay to libssl
+-		if ($digit1 >= '1' && $digit2 >= '1' && $digit3 >= '0')
++		if ($digit1 >= '1' && $digit2 >= '1' && $digit3 >= '0') # This must be updated
+ 		{
+ 			my $dbgsuffix;
+ 			my $libsslpath;
+@@ -670,27 +670,27 @@ sub AddProject
+ 			# The format name of the libraries is slightly
+ 			# different between the Win32 and Win64 platform, so
+ 			# adapt.
+-			if (-e "$self->{options}->{openssl}/lib/VC/sslcrypto32MD.lib")
++			if (-e "$self->{options}->{openssl}/lib/VC/sslcrypto32MD.lib") # This must be updated
+ 			{
+ 				# Win32 here, with a debugging library set.
+ 				$dbgsuffix     = 1;
+-				$libsslpath    = '\lib\VC\libssl32.lib';
+-				$libcryptopath = '\lib\VC\libcrypto32.lib';
++				$libsslpath    = '\lib\VC\libssl32.lib'; # This must be updated
++				$libcryptopath = '\lib\VC\libcrypto32.lib'; # This must be updated
+ 			}
+-			elsif (-e "$self->{options}->{openssl}/lib/VC/sslcrypto64MD.lib")
++			elsif (-e "$self->{options}->{openssl}/lib/VC/sslcrypto64MD.lib") # This must be updated
+ 			{
+ 				# Win64 here, with a debugging library set.
+ 				$dbgsuffix     = 1;
+-				$libsslpath    = '\lib\VC\libssl64.lib';
+-				$libcryptopath = '\lib\VC\libcrypto64.lib';
++				$libsslpath    = '\lib\VC\libssl64.lib'; # This must be updated
++				$libcryptopath = '\lib\VC\libcrypto64.lib'; # This must be updated
+ 			}
+ 			else
+ 			{
+ 				# On both Win32 and Win64 the same library
+ 				# names are used without a debugging context.
+ 				$dbgsuffix     = 0;
+-				$libsslpath    = '\lib\libssl.lib';
+-				$libcryptopath = '\lib\libcrypto.lib';
++				$libsslpath    = '\debug\lib\libssl.lib'; # This must be updated
++				$libcryptopath = '\debug\lib\libcrypto.lib'; # This must be updated
+ 			}
+ 
+ 			$proj->AddLibrary($self->{options}->{openssl} . $libsslpath,
+@@ -698,16 +698,16 @@ sub AddProject
+ 			$proj->AddLibrary($self->{options}->{openssl} . $libcryptopath,
+ 				$dbgsuffix);
+ 		}
+-		else
++		else 
+ 		{
+ 			# Choose which set of libraries to use depending on if
+ 			# debugging libraries are in place in the installer.
+-			if (-e "$self->{options}->{openssl}/lib/VC/ssleay32MD.lib")
++			if (-e "$self->{options}->{openssl}/lib/VC/ssleay32MD.lib") # This must be updated
+ 			{
+ 				$proj->AddLibrary(
+-					$self->{options}->{openssl} . '\lib\VC\ssleay32.lib', 1);
++					$self->{options}->{openssl} . '\lib\VC\ssleay32.lib', 1); # This must be updated
+ 				$proj->AddLibrary(
+-					$self->{options}->{openssl} . '\lib\VC\libeay32.lib', 1);
++					$self->{options}->{openssl} . '\lib\VC\libeay32.lib', 1); # This must be updated
+ 			}
+ 			else
+ 			{
+@@ -715,60 +715,60 @@ sub AddProject
+ 				# to be here, so don't ask for it in last
+ 				# parameter.
+ 				$proj->AddLibrary(
+-					$self->{options}->{openssl} . '\lib\ssleay32.lib', 0);
++					$self->{options}->{openssl} . '\debug\lib\ssleay32.lib', 0); # This must be updated
+ 				$proj->AddLibrary(
+-					$self->{options}->{openssl} . '\lib\libeay32.lib', 0);
++					$self->{options}->{openssl} . '\debug\lib\libeay32.lib', 0); # This must be updated
+ 			}
+ 		}
+ 	}
+ 	if ($self->{options}->{nls})
+ 	{
+ 		$proj->AddIncludeDir($self->{options}->{nls} . '\include');
+-		$proj->AddLibrary($self->{options}->{nls} . '\lib\libintl.lib');
++		$proj->AddLibrary($self->{options}->{nls} . '\debug\lib\intl.lib'); # This must be updated
+ 	}
+ 	if ($self->{options}->{gss})
+ 	{
+-		$proj->AddIncludeDir($self->{options}->{gss} . '\inc\krb5');
+-		$proj->AddLibrary($self->{options}->{gss} . '\lib\i386\krb5_32.lib');
+-		$proj->AddLibrary($self->{options}->{gss} . '\lib\i386\comerr32.lib');
+-		$proj->AddLibrary($self->{options}->{gss} . '\lib\i386\gssapi32.lib');
++		$proj->AddIncludeDir($self->{options}->{gss} . '\inc\krb5');  # This must be updated
++		$proj->AddLibrary($self->{options}->{gss} . '\lib\i386\krb5_32.lib'); # This must be updated
++		$proj->AddLibrary($self->{options}->{gss} . '\lib\i386\comerr32.lib');# This must be updated
++		$proj->AddLibrary($self->{options}->{gss} . '\lib\i386\gssapi32.lib');# This must be updated
+ 	}
+ 	if ($self->{options}->{iconv})
+ 	{
+ 		$proj->AddIncludeDir($self->{options}->{iconv} . '\include');
+-		$proj->AddLibrary($self->{options}->{iconv} . '\lib\iconv.lib');
++		$proj->AddLibrary($self->{options}->{iconv} . '\debug\lib\iconv.lib'); # This must be updated
+ 	}
+ 	if ($self->{options}->{icu})
+ 	{
+ 		$proj->AddIncludeDir($self->{options}->{icu} . '\include');
+ 		if ($self->{platform} eq 'Win32')
+ 		{
+-			$proj->AddLibrary($self->{options}->{icu} . '\lib\icuin.lib');
+-			$proj->AddLibrary($self->{options}->{icu} . '\lib\icuuc.lib');
+-			$proj->AddLibrary($self->{options}->{icu} . '\lib\icudt.lib');
++			$proj->AddLibrary($self->{options}->{icu} . '\debug\lib\icuind.lib'); # This must be updated
++			$proj->AddLibrary($self->{options}->{icu} . '\debug\lib\icuucd.lib'); # This must be updated
++			$proj->AddLibrary($self->{options}->{icu} . '\debug\lib\icudtd.lib'); # This must be updated
+ 		}
+ 		else
+ 		{
+-			$proj->AddLibrary($self->{options}->{icu} . '\lib64\icuin.lib');
+-			$proj->AddLibrary($self->{options}->{icu} . '\lib64\icuuc.lib');
+-			$proj->AddLibrary($self->{options}->{icu} . '\lib64\icudt.lib');
++			$proj->AddLibrary($self->{options}->{icu} . '\debug\lib\icuind.lib'); # This must be updated
++			$proj->AddLibrary($self->{options}->{icu} . '\debug\lib\icuucd.lib'); # This must be updated
++			$proj->AddLibrary($self->{options}->{icu} . '\debug\lib\icudtd.lib'); # This must be updated
+ 		}
+ 	}
+ 	if ($self->{options}->{xml})
+ 	{
+ 		$proj->AddIncludeDir($self->{options}->{xml} . '\include');
+ 		$proj->AddIncludeDir($self->{options}->{xml} . '\include\libxml2');
+-		$proj->AddLibrary($self->{options}->{xml} . '\lib\libxml2.lib');
++		$proj->AddLibrary($self->{options}->{xml} . '\debug\lib\libxml2.lib'); # This must be updated
+ 	}
+ 	if ($self->{options}->{xslt})
+ 	{
+ 		$proj->AddIncludeDir($self->{options}->{xslt} . '\include');
+-		$proj->AddLibrary($self->{options}->{xslt} . '\lib\libxslt.lib');
++		$proj->AddLibrary($self->{options}->{xslt} . '\debug\lib\libxslt.lib'); # This must be updated
+ 	}
+ 	if ($self->{options}->{uuid})
+ 	{
+ 		$proj->AddIncludeDir($self->{options}->{uuid} . '\include');
+-		$proj->AddLibrary($self->{options}->{uuid} . '\lib\uuid.lib');
++		$proj->AddLibrary($self->{options}->{uuid} . '\debug\lib\uuid.lib'); # This must be updated
+ 	}
+ 	return $proj;
+ }
diff --git a/ports/libpq/patches/windows/Solution_Debug.patch b/ports/libpq/patches/windows/Solution_Debug.patch
deleted file mode 100644
index e641f468a..000000000
--- a/ports/libpq/patches/windows/Solution_Debug.patch
+++ /dev/null
@@ -1,157 +0,0 @@
-diff --git a/src/tools/msvc/Solution.pm b/src/tools/msvc/Solution.pm
-index 51711c2bf..d33fdc3b0 100644
---- a/src/tools/msvc/Solution.pm	
-+++ b/src/tools/msvc/Solution.pm
-@@ -650,7 +650,7 @@ sub AddProject
- 	if ($self->{options}->{zlib})
- 	{
- 		$proj->AddIncludeDir($self->{options}->{zlib} . '\include');
--		$proj->AddLibrary($self->{options}->{zlib} . '\lib\zdll.lib');
-+		$proj->AddLibrary($self->{options}->{zlib} . '\debug\lib\zlibd.lib'); # This must be updated
- 	}
- 	if ($self->{options}->{openssl})
- 	{
-@@ -661,7 +661,7 @@ sub AddProject
- 		# changed their library names from:
- 		# - libeay to libcrypto
- 		# - ssleay to libssl
--		if ($digit1 >= '1' && $digit2 >= '1' && $digit3 >= '0')
-+		if ($digit1 >= '1' && $digit2 >= '1' && $digit3 >= '0') # This must be updated
- 		{
- 			my $dbgsuffix;
- 			my $libsslpath;
-@@ -670,27 +670,27 @@ sub AddProject
- 			# The format name of the libraries is slightly
- 			# different between the Win32 and Win64 platform, so
- 			# adapt.
--			if (-e "$self->{options}->{openssl}/lib/VC/sslcrypto32MD.lib")
-+			if (-e "$self->{options}->{openssl}/lib/VC/sslcrypto32MD.lib") # This must be updated
- 			{
- 				# Win32 here, with a debugging library set.
- 				$dbgsuffix     = 1;
--				$libsslpath    = '\lib\VC\libssl32.lib';
--				$libcryptopath = '\lib\VC\libcrypto32.lib';
-+				$libsslpath    = '\lib\VC\libssl32.lib'; # This must be updated
-+				$libcryptopath = '\lib\VC\libcrypto32.lib'; # This must be updated
- 			}
--			elsif (-e "$self->{options}->{openssl}/lib/VC/sslcrypto64MD.lib")
-+			elsif (-e "$self->{options}->{openssl}/lib/VC/sslcrypto64MD.lib") # This must be updated
- 			{
- 				# Win64 here, with a debugging library set.
- 				$dbgsuffix     = 1;
--				$libsslpath    = '\lib\VC\libssl64.lib';
--				$libcryptopath = '\lib\VC\libcrypto64.lib';
-+				$libsslpath    = '\lib\VC\libssl64.lib'; # This must be updated
-+				$libcryptopath = '\lib\VC\libcrypto64.lib'; # This must be updated
- 			}
- 			else
- 			{
- 				# On both Win32 and Win64 the same library
- 				# names are used without a debugging context.
- 				$dbgsuffix     = 0;
--				$libsslpath    = '\lib\libssl.lib';
--				$libcryptopath = '\lib\libcrypto.lib';
-+				$libsslpath    = '\debug\lib\libssl.lib'; # This must be updated
-+				$libcryptopath = '\debug\lib\libcrypto.lib'; # This must be updated
- 			}
- 
- 			$proj->AddLibrary($self->{options}->{openssl} . $libsslpath,
-@@ -698,16 +698,16 @@ sub AddProject
- 			$proj->AddLibrary($self->{options}->{openssl} . $libcryptopath,
- 				$dbgsuffix);
- 		}
--		else
-+		else 
- 		{
- 			# Choose which set of libraries to use depending on if
- 			# debugging libraries are in place in the installer.
--			if (-e "$self->{options}->{openssl}/lib/VC/ssleay32MD.lib")
-+			if (-e "$self->{options}->{openssl}/lib/VC/ssleay32MD.lib") # This must be updated
- 			{
- 				$proj->AddLibrary(
--					$self->{options}->{openssl} . '\lib\VC\ssleay32.lib', 1);
-+					$self->{options}->{openssl} . '\lib\VC\ssleay32.lib', 1); # This must be updated
- 				$proj->AddLibrary(
--					$self->{options}->{openssl} . '\lib\VC\libeay32.lib', 1);
-+					$self->{options}->{openssl} . '\lib\VC\libeay32.lib', 1); # This must be updated
- 			}
- 			else
- 			{
-@@ -715,60 +715,60 @@ sub AddProject
- 				# to be here, so don't ask for it in last
- 				# parameter.
- 				$proj->AddLibrary(
--					$self->{options}->{openssl} . '\lib\ssleay32.lib', 0);
-+					$self->{options}->{openssl} . '\debug\lib\ssleay32.lib', 0); # This must be updated
- 				$proj->AddLibrary(
--					$self->{options}->{openssl} . '\lib\libeay32.lib', 0);
-+					$self->{options}->{openssl} . '\debug\lib\libeay32.lib', 0); # This must be updated
- 			}
- 		}
- 	}
- 	if ($self->{options}->{nls})
- 	{
- 		$proj->AddIncludeDir($self->{options}->{nls} . '\include');
--		$proj->AddLibrary($self->{options}->{nls} . '\lib\libintl.lib');
-+		$proj->AddLibrary($self->{options}->{nls} . '\debug\lib\intl.lib'); # This must be updated
- 	}
- 	if ($self->{options}->{gss})
- 	{
--		$proj->AddIncludeDir($self->{options}->{gss} . '\inc\krb5');
--		$proj->AddLibrary($self->{options}->{gss} . '\lib\i386\krb5_32.lib');
--		$proj->AddLibrary($self->{options}->{gss} . '\lib\i386\comerr32.lib');
--		$proj->AddLibrary($self->{options}->{gss} . '\lib\i386\gssapi32.lib');
-+		$proj->AddIncludeDir($self->{options}->{gss} . '\inc\krb5');  # This must be updated
-+		$proj->AddLibrary($self->{options}->{gss} . '\lib\i386\krb5_32.lib'); # This must be updated
-+		$proj->AddLibrary($self->{options}->{gss} . '\lib\i386\comerr32.lib');# This must be updated
-+		$proj->AddLibrary($self->{options}->{gss} . '\lib\i386\gssapi32.lib');# This must be updated
- 	}
- 	if ($self->{options}->{iconv})
- 	{
- 		$proj->AddIncludeDir($self->{options}->{iconv} . '\include');
--		$proj->AddLibrary($self->{options}->{iconv} . '\lib\iconv.lib');
-+		$proj->AddLibrary($self->{options}->{iconv} . '\debug\lib\iconv.lib'); # This must be updated
- 	}
- 	if ($self->{options}->{icu})
- 	{
- 		$proj->AddIncludeDir($self->{options}->{icu} . '\include');
- 		if ($self->{platform} eq 'Win32')
- 		{
--			$proj->AddLibrary($self->{options}->{icu} . '\lib\icuin.lib');
--			$proj->AddLibrary($self->{options}->{icu} . '\lib\icuuc.lib');
--			$proj->AddLibrary($self->{options}->{icu} . '\lib\icudt.lib');
-+			$proj->AddLibrary($self->{options}->{icu} . '\debug\lib\icuind.lib'); # This must be updated
-+			$proj->AddLibrary($self->{options}->{icu} . '\debug\lib\icuucd.lib'); # This must be updated
-+			$proj->AddLibrary($self->{options}->{icu} . '\debug\lib\icudtd.lib'); # This must be updated
- 		}
- 		else
- 		{
--			$proj->AddLibrary($self->{options}->{icu} . '\lib64\icuin.lib');
--			$proj->AddLibrary($self->{options}->{icu} . '\lib64\icuuc.lib');
--			$proj->AddLibrary($self->{options}->{icu} . '\lib64\icudt.lib');
-+			$proj->AddLibrary($self->{options}->{icu} . '\debug\lib\icuind.lib'); # This must be updated
-+			$proj->AddLibrary($self->{options}->{icu} . '\debug\lib\icuucd.lib'); # This must be updated
-+			$proj->AddLibrary($self->{options}->{icu} . '\debug\lib\icudtd.lib'); # This must be updated
- 		}
- 	}
- 	if ($self->{options}->{xml})
- 	{
- 		$proj->AddIncludeDir($self->{options}->{xml} . '\include');
- 		$proj->AddIncludeDir($self->{options}->{xml} . '\include\libxml2');
--		$proj->AddLibrary($self->{options}->{xml} . '\lib\libxml2.lib');
-+		$proj->AddLibrary($self->{options}->{xml} . '\debug\lib\libxml2.lib'); # This must be updated
- 	}
- 	if ($self->{options}->{xslt})
- 	{
- 		$proj->AddIncludeDir($self->{options}->{xslt} . '\include');
--		$proj->AddLibrary($self->{options}->{xslt} . '\lib\libxslt.lib');
-+		$proj->AddLibrary($self->{options}->{xslt} . '\debug\lib\libxslt.lib'); # This must be updated
- 	}
- 	if ($self->{options}->{uuid})
- 	{
- 		$proj->AddIncludeDir($self->{options}->{uuid} . '\include');
--		$proj->AddLibrary($self->{options}->{uuid} . '\lib\uuid.lib');
-+		$proj->AddLibrary($self->{options}->{uuid} . '\debug\lib\uuid.lib'); # This must be updated
- 	}
- 	return $proj;
- }
diff --git a/ports/libpq/patches/windows/Solution_RELEASE.patch b/ports/libpq/patches/windows/Solution_RELEASE.patch
new file mode 100644
index 000000000..cc41b8d0b
--- /dev/null
+++ b/ports/libpq/patches/windows/Solution_RELEASE.patch
@@ -0,0 +1,157 @@
+diff --git a/src/tools/msvc/Solution.pm b/src/tools/msvc/Solution.pm
+index 51711c2bf..d33fdc3b0 100644
+--- a/src/tools/msvc/Solution.pm	
++++ b/src/tools/msvc/Solution.pm
+@@ -650,7 +650,7 @@ sub AddProject
+ 	if ($self->{options}->{zlib})
+ 	{
+ 		$proj->AddIncludeDir($self->{options}->{zlib} . '\include');
+-		$proj->AddLibrary($self->{options}->{zlib} . '\lib\zdll.lib');
++		$proj->AddLibrary($self->{options}->{zlib} . '\lib\zlib.lib'); # This must be updated
+ 	}
+ 	if ($self->{options}->{openssl})
+ 	{
+@@ -661,7 +661,7 @@ sub AddProject
+ 		# changed their library names from:
+ 		# - libeay to libcrypto
+ 		# - ssleay to libssl
+-		if ($digit1 >= '1' && $digit2 >= '1' && $digit3 >= '0')
++		if ($digit1 >= '1' && $digit2 >= '1' && $digit3 >= '0') # This must be updated
+ 		{
+ 			my $dbgsuffix;
+ 			my $libsslpath;
+@@ -670,27 +670,27 @@ sub AddProject
+ 			# The format name of the libraries is slightly
+ 			# different between the Win32 and Win64 platform, so
+ 			# adapt.
+-			if (-e "$self->{options}->{openssl}/lib/VC/sslcrypto32MD.lib")
++			if (-e "$self->{options}->{openssl}/lib/VC/sslcrypto32MD.lib") # This must be updated
+ 			{
+ 				# Win32 here, with a debugging library set.
+ 				$dbgsuffix     = 1;
+-				$libsslpath    = '\lib\VC\libssl32.lib';
+-				$libcryptopath = '\lib\VC\libcrypto32.lib';
++				$libsslpath    = '\lib\VC\libssl32.lib'; # This must be updated
++				$libcryptopath = '\lib\VC\libcrypto32.lib'; # This must be updated
+ 			}
+-			elsif (-e "$self->{options}->{openssl}/lib/VC/sslcrypto64MD.lib")
++			elsif (-e "$self->{options}->{openssl}/lib/VC/sslcrypto64MD.lib") # This must be updated
+ 			{
+ 				# Win64 here, with a debugging library set.
+ 				$dbgsuffix     = 1;
+-				$libsslpath    = '\lib\VC\libssl64.lib';
+-				$libcryptopath = '\lib\VC\libcrypto64.lib';
++				$libsslpath    = '\lib\VC\libssl64.lib'; # This must be updated
++				$libcryptopath = '\lib\VC\libcrypto64.lib'; # This must be updated
+ 			}
+ 			else
+ 			{
+ 				# On both Win32 and Win64 the same library
+ 				# names are used without a debugging context.
+ 				$dbgsuffix     = 0;
+-				$libsslpath    = '\lib\libssl.lib';
+-				$libcryptopath = '\lib\libcrypto.lib';
++				$libsslpath    = '\lib\libssl.lib'; # This must be updated
++				$libcryptopath = '\lib\libcrypto.lib'; # This must be updated
+ 			}
+ 
+ 			$proj->AddLibrary($self->{options}->{openssl} . $libsslpath,
+@@ -698,16 +698,16 @@ sub AddProject
+ 			$proj->AddLibrary($self->{options}->{openssl} . $libcryptopath,
+ 				$dbgsuffix);
+ 		}
+-		else
++		else 
+ 		{
+ 			# Choose which set of libraries to use depending on if
+ 			# debugging libraries are in place in the installer.
+-			if (-e "$self->{options}->{openssl}/lib/VC/ssleay32MD.lib")
++			if (-e "$self->{options}->{openssl}/lib/VC/ssleay32MD.lib") # This must be updated
+ 			{
+ 				$proj->AddLibrary(
+-					$self->{options}->{openssl} . '\lib\VC\ssleay32.lib', 1);
++					$self->{options}->{openssl} . '\lib\VC\ssleay32.lib', 1); # This must be updated
+ 				$proj->AddLibrary(
+-					$self->{options}->{openssl} . '\lib\VC\libeay32.lib', 1);
++					$self->{options}->{openssl} . '\lib\VC\libeay32.lib', 1); # This must be updated
+ 			}
+ 			else
+ 			{
+@@ -715,60 +715,60 @@ sub AddProject
+ 				# to be here, so don't ask for it in last
+ 				# parameter.
+ 				$proj->AddLibrary(
+-					$self->{options}->{openssl} . '\lib\ssleay32.lib', 0);
++					$self->{options}->{openssl} . '\lib\ssleay32.lib', 0); # This must be updated
+ 				$proj->AddLibrary(
+-					$self->{options}->{openssl} . '\lib\libeay32.lib', 0);
++					$self->{options}->{openssl} . '\lib\libeay32.lib', 0); # This must be updated
+ 			}
+ 		}
+ 	}
+ 	if ($self->{options}->{nls})
+ 	{
+ 		$proj->AddIncludeDir($self->{options}->{nls} . '\include');
+-		$proj->AddLibrary($self->{options}->{nls} . '\lib\libintl.lib');
++		$proj->AddLibrary($self->{options}->{nls} . '\lib\intl.lib'); # This must be updated
+ 	}
+ 	if ($self->{options}->{gss})
+ 	{
+-		$proj->AddIncludeDir($self->{options}->{gss} . '\inc\krb5');
+-		$proj->AddLibrary($self->{options}->{gss} . '\lib\i386\krb5_32.lib');
+-		$proj->AddLibrary($self->{options}->{gss} . '\lib\i386\comerr32.lib');
+-		$proj->AddLibrary($self->{options}->{gss} . '\lib\i386\gssapi32.lib');
++		$proj->AddIncludeDir($self->{options}->{gss} . '\inc\krb5');  # This must be updated
++		$proj->AddLibrary($self->{options}->{gss} . '\lib\i386\krb5_32.lib'); # This must be updated
++		$proj->AddLibrary($self->{options}->{gss} . '\lib\i386\comerr32.lib');# This must be updated
++		$proj->AddLibrary($self->{options}->{gss} . '\lib\i386\gssapi32.lib');# This must be updated
+ 	}
+ 	if ($self->{options}->{iconv})
+ 	{
+ 		$proj->AddIncludeDir($self->{options}->{iconv} . '\include');
+-		$proj->AddLibrary($self->{options}->{iconv} . '\lib\iconv.lib');
++		$proj->AddLibrary($self->{options}->{iconv} . '\lib\iconv.lib'); # This must be updated
+ 	}
+ 	if ($self->{options}->{icu})
+ 	{
+ 		$proj->AddIncludeDir($self->{options}->{icu} . '\include');
+ 		if ($self->{platform} eq 'Win32')
+ 		{
+-			$proj->AddLibrary($self->{options}->{icu} . '\lib\icuin.lib');
+-			$proj->AddLibrary($self->{options}->{icu} . '\lib\icuuc.lib');
+-			$proj->AddLibrary($self->{options}->{icu} . '\lib\icudt.lib');
++			$proj->AddLibrary($self->{options}->{icu} . '\lib\icuin.lib'); # This must be updated
++			$proj->AddLibrary($self->{options}->{icu} . '\lib\icuuc.lib'); # This must be updated
++			$proj->AddLibrary($self->{options}->{icu} . '\lib\icudt.lib'); # This must be updated
+ 		}
+ 		else
+ 		{
+-			$proj->AddLibrary($self->{options}->{icu} . '\lib64\icuin.lib');
+-			$proj->AddLibrary($self->{options}->{icu} . '\lib64\icuuc.lib');
+-			$proj->AddLibrary($self->{options}->{icu} . '\lib64\icudt.lib');
++			$proj->AddLibrary($self->{options}->{icu} . '\lib\icuin.lib'); # This must be updated
++			$proj->AddLibrary($self->{options}->{icu} . '\lib\icuuc.lib'); # This must be updated
++			$proj->AddLibrary($self->{options}->{icu} . '\lib\icudt.lib'); # This must be updated
+ 		}
+ 	}
+ 	if ($self->{options}->{xml})
+ 	{
+ 		$proj->AddIncludeDir($self->{options}->{xml} . '\include');
+ 		$proj->AddIncludeDir($self->{options}->{xml} . '\include\libxml2');
+-		$proj->AddLibrary($self->{options}->{xml} . '\lib\libxml2.lib');
++		$proj->AddLibrary($self->{options}->{xml} . '\lib\libxml2.lib'); # This must be updated
+ 	}
+ 	if ($self->{options}->{xslt})
+ 	{
+ 		$proj->AddIncludeDir($self->{options}->{xslt} . '\include');
+-		$proj->AddLibrary($self->{options}->{xslt} . '\lib\libxslt.lib');
++		$proj->AddLibrary($self->{options}->{xslt} . '\lib\libxslt.lib'); # This must be updated
+ 	}
+ 	if ($self->{options}->{uuid})
+ 	{
+ 		$proj->AddIncludeDir($self->{options}->{uuid} . '\include');
+-		$proj->AddLibrary($self->{options}->{uuid} . '\lib\uuid.lib');
++		$proj->AddLibrary($self->{options}->{uuid} . '\lib\uuid.lib'); # This must be updated
+ 	}
+ 	return $proj;
+ }
diff --git a/ports/libpq/patches/windows/Solution_Release.patch b/ports/libpq/patches/windows/Solution_Release.patch
deleted file mode 100644
index cc41b8d0b..000000000
--- a/ports/libpq/patches/windows/Solution_Release.patch
+++ /dev/null
@@ -1,157 +0,0 @@
-diff --git a/src/tools/msvc/Solution.pm b/src/tools/msvc/Solution.pm
-index 51711c2bf..d33fdc3b0 100644
---- a/src/tools/msvc/Solution.pm	
-+++ b/src/tools/msvc/Solution.pm
-@@ -650,7 +650,7 @@ sub AddProject
- 	if ($self->{options}->{zlib})
- 	{
- 		$proj->AddIncludeDir($self->{options}->{zlib} . '\include');
--		$proj->AddLibrary($self->{options}->{zlib} . '\lib\zdll.lib');
-+		$proj->AddLibrary($self->{options}->{zlib} . '\lib\zlib.lib'); # This must be updated
- 	}
- 	if ($self->{options}->{openssl})
- 	{
-@@ -661,7 +661,7 @@ sub AddProject
- 		# changed their library names from:
- 		# - libeay to libcrypto
- 		# - ssleay to libssl
--		if ($digit1 >= '1' && $digit2 >= '1' && $digit3 >= '0')
-+		if ($digit1 >= '1' && $digit2 >= '1' && $digit3 >= '0') # This must be updated
- 		{
- 			my $dbgsuffix;
- 			my $libsslpath;
-@@ -670,27 +670,27 @@ sub AddProject
- 			# The format name of the libraries is slightly
- 			# different between the Win32 and Win64 platform, so
- 			# adapt.
--			if (-e "$self->{options}->{openssl}/lib/VC/sslcrypto32MD.lib")
-+			if (-e "$self->{options}->{openssl}/lib/VC/sslcrypto32MD.lib") # This must be updated
- 			{
- 				# Win32 here, with a debugging library set.
- 				$dbgsuffix     = 1;
--				$libsslpath    = '\lib\VC\libssl32.lib';
--				$libcryptopath = '\lib\VC\libcrypto32.lib';
-+				$libsslpath    = '\lib\VC\libssl32.lib'; # This must be updated
-+				$libcryptopath = '\lib\VC\libcrypto32.lib'; # This must be updated
- 			}
--			elsif (-e "$self->{options}->{openssl}/lib/VC/sslcrypto64MD.lib")
-+			elsif (-e "$self->{options}->{openssl}/lib/VC/sslcrypto64MD.lib") # This must be updated
- 			{
- 				# Win64 here, with a debugging library set.
- 				$dbgsuffix     = 1;
--				$libsslpath    = '\lib\VC\libssl64.lib';
--				$libcryptopath = '\lib\VC\libcrypto64.lib';
-+				$libsslpath    = '\lib\VC\libssl64.lib'; # This must be updated
-+				$libcryptopath = '\lib\VC\libcrypto64.lib'; # This must be updated
- 			}
- 			else
- 			{
- 				# On both Win32 and Win64 the same library
- 				# names are used without a debugging context.
- 				$dbgsuffix     = 0;
--				$libsslpath    = '\lib\libssl.lib';
--				$libcryptopath = '\lib\libcrypto.lib';
-+				$libsslpath    = '\lib\libssl.lib'; # This must be updated
-+				$libcryptopath = '\lib\libcrypto.lib'; # This must be updated
- 			}
- 
- 			$proj->AddLibrary($self->{options}->{openssl} . $libsslpath,
-@@ -698,16 +698,16 @@ sub AddProject
- 			$proj->AddLibrary($self->{options}->{openssl} . $libcryptopath,
- 				$dbgsuffix);
- 		}
--		else
-+		else 
- 		{
- 			# Choose which set of libraries to use depending on if
- 			# debugging libraries are in place in the installer.
--			if (-e "$self->{options}->{openssl}/lib/VC/ssleay32MD.lib")
-+			if (-e "$self->{options}->{openssl}/lib/VC/ssleay32MD.lib") # This must be updated
- 			{
- 				$proj->AddLibrary(
--					$self->{options}->{openssl} . '\lib\VC\ssleay32.lib', 1);
-+					$self->{options}->{openssl} . '\lib\VC\ssleay32.lib', 1); # This must be updated
- 				$proj->AddLibrary(
--					$self->{options}->{openssl} . '\lib\VC\libeay32.lib', 1);
-+					$self->{options}->{openssl} . '\lib\VC\libeay32.lib', 1); # This must be updated
- 			}
- 			else
- 			{
-@@ -715,60 +715,60 @@ sub AddProject
- 				# to be here, so don't ask for it in last
- 				# parameter.
- 				$proj->AddLibrary(
--					$self->{options}->{openssl} . '\lib\ssleay32.lib', 0);
-+					$self->{options}->{openssl} . '\lib\ssleay32.lib', 0); # This must be updated
- 				$proj->AddLibrary(
--					$self->{options}->{openssl} . '\lib\libeay32.lib', 0);
-+					$self->{options}->{openssl} . '\lib\libeay32.lib', 0); # This must be updated
- 			}
- 		}
- 	}
- 	if ($self->{options}->{nls})
- 	{
- 		$proj->AddIncludeDir($self->{options}->{nls} . '\include');
--		$proj->AddLibrary($self->{options}->{nls} . '\lib\libintl.lib');
-+		$proj->AddLibrary($self->{options}->{nls} . '\lib\intl.lib'); # This must be updated
- 	}
- 	if ($self->{options}->{gss})
- 	{
--		$proj->AddIncludeDir($self->{options}->{gss} . '\inc\krb5');
--		$proj->AddLibrary($self->{options}->{gss} . '\lib\i386\krb5_32.lib');
--		$proj->AddLibrary($self->{options}->{gss} . '\lib\i386\comerr32.lib');
--		$proj->AddLibrary($self->{options}->{gss} . '\lib\i386\gssapi32.lib');
-+		$proj->AddIncludeDir($self->{options}->{gss} . '\inc\krb5');  # This must be updated
-+		$proj->AddLibrary($self->{options}->{gss} . '\lib\i386\krb5_32.lib'); # This must be updated
-+		$proj->AddLibrary($self->{options}->{gss} . '\lib\i386\comerr32.lib');# This must be updated
-+		$proj->AddLibrary($self->{options}->{gss} . '\lib\i386\gssapi32.lib');# This must be updated
- 	}
- 	if ($self->{options}->{iconv})
- 	{
- 		$proj->AddIncludeDir($self->{options}->{iconv} . '\include');
--		$proj->AddLibrary($self->{options}->{iconv} . '\lib\iconv.lib');
-+		$proj->AddLibrary($self->{options}->{iconv} . '\lib\iconv.lib'); # This must be updated
- 	}
- 	if ($self->{options}->{icu})
- 	{
- 		$proj->AddIncludeDir($self->{options}->{icu} . '\include');
- 		if ($self->{platform} eq 'Win32')
- 		{
--			$proj->AddLibrary($self->{options}->{icu} . '\lib\icuin.lib');
--			$proj->AddLibrary($self->{options}->{icu} . '\lib\icuuc.lib');
--			$proj->AddLibrary($self->{options}->{icu} . '\lib\icudt.lib');
-+			$proj->AddLibrary($self->{options}->{icu} . '\lib\icuin.lib'); # This must be updated
-+			$proj->AddLibrary($self->{options}->{icu} . '\lib\icuuc.lib'); # This must be updated
-+			$proj->AddLibrary($self->{options}->{icu} . '\lib\icudt.lib'); # This must be updated
- 		}
- 		else
- 		{
--			$proj->AddLibrary($self->{options}->{icu} . '\lib64\icuin.lib');
--			$proj->AddLibrary($self->{options}->{icu} . '\lib64\icuuc.lib');
--			$proj->AddLibrary($self->{options}->{icu} . '\lib64\icudt.lib');
-+			$proj->AddLibrary($self->{options}->{icu} . '\lib\icuin.lib'); # This must be updated
-+			$proj->AddLibrary($self->{options}->{icu} . '\lib\icuuc.lib'); # This must be updated
-+			$proj->AddLibrary($self->{options}->{icu} . '\lib\icudt.lib'); # This must be updated
- 		}
- 	}
- 	if ($self->{options}->{xml})
- 	{
- 		$proj->AddIncludeDir($self->{options}->{xml} . '\include');
- 		$proj->AddIncludeDir($self->{options}->{xml} . '\include\libxml2');
--		$proj->AddLibrary($self->{options}->{xml} . '\lib\libxml2.lib');
-+		$proj->AddLibrary($self->{options}->{xml} . '\lib\libxml2.lib'); # This must be updated
- 	}
- 	if ($self->{options}->{xslt})
- 	{
- 		$proj->AddIncludeDir($self->{options}->{xslt} . '\include');
--		$proj->AddLibrary($self->{options}->{xslt} . '\lib\libxslt.lib');
-+		$proj->AddLibrary($self->{options}->{xslt} . '\lib\libxslt.lib'); # This must be updated
- 	}
- 	if ($self->{options}->{uuid})
- 	{
- 		$proj->AddIncludeDir($self->{options}->{uuid} . '\include');
--		$proj->AddLibrary($self->{options}->{uuid} . '\lib\uuid.lib');
-+		$proj->AddLibrary($self->{options}->{uuid} . '\lib\uuid.lib'); # This must be updated
- 	}
- 	return $proj;
- }
diff --git a/ports/libpq/patches/windows/python3_build_DEBUG.patch b/ports/libpq/patches/windows/python3_build_DEBUG.patch
new file mode 100644
index 000000000..cbc722e0c
--- /dev/null
+++ b/ports/libpq/patches/windows/python3_build_DEBUG.patch
@@ -0,0 +1,40 @@
+diff --git a/src/tools/msvc/Mkvcbuild.pm b/src/tools/msvc/Mkvcbuild.pm
+index 99f39caa5..21b5559d6 100644
+--- a/src/tools/msvc/Mkvcbuild.pm	
++++ b/src/tools/msvc/Mkvcbuild.pm
+@@ -494,14 +494,15 @@ sub mkvcbuild
+ 
+ 		# Attempt to get python version and location.
+ 		# Assume python.exe in specified dir.
+-		my $pythonprog = "import sys;print(sys.prefix);"
+-		  . "print(str(sys.version_info[0])+str(sys.version_info[1]))";
+-		my $prefixcmd =
+-		  $solution->{options}->{python} . "\\python -c \"$pythonprog\"";
+-		my $pyout = `$prefixcmd`;
+-		die "Could not query for python version!\n" if $?;
+-		my ($pyprefix, $pyver) = split(/\r?\n/, $pyout);
+-
++		#my $pythonprog = "import sys;print(sys.prefix);"
++		#  . "print(str(sys.version_info[0])+str(sys.version_info[1]))";
++		#my $prefixcmd =
++		#  $solution->{options}->{python} . "\\python -c \"$pythonprog\"";
++		#my $pyout = `$prefixcmd`;
++		#die "Could not query for python version!\n" if $?;
++		#my ($pyprefix, $pyver) = split(/\r?\n/, $pyout);
++		my $pyprefix = $solution->{options}->{python};
++		my $pyver = 37;
+ 		# Sometimes (always?) if python is not present, the execution
+ 		# appears to work, but gives no data...
+ 		die "Failed to query python for version information\n"
+@@ -510,8 +511,9 @@ sub mkvcbuild
+ 		my $pymajorver = substr($pyver, 0, 1);
+ 		my $plpython = $solution->AddProject('plpython' . $pymajorver,
+ 			'dll', 'PLs', 'src/pl/plpython');
+-		$plpython->AddIncludeDir($pyprefix . '/include');
+-		$plpython->AddLibrary($pyprefix . "/Libs/python$pyver.lib");
++		$plpython->AddIncludeDir($pyprefix . '/include/python3.7');
++		$plpython->AddDefine('_DEBUG'); # required for python autolink linking correctly!
++		$plpython->AddLibrary($pyprefix . "/debug/lib/python$pyver" . "_d.lib");
+ 		$plpython->AddReference($postgres);
+ 
+ 		# Add transform modules dependent on plpython
diff --git a/ports/libpq/patches/windows/python3_build_Debug.patch b/ports/libpq/patches/windows/python3_build_Debug.patch
deleted file mode 100644
index cbc722e0c..000000000
--- a/ports/libpq/patches/windows/python3_build_Debug.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff --git a/src/tools/msvc/Mkvcbuild.pm b/src/tools/msvc/Mkvcbuild.pm
-index 99f39caa5..21b5559d6 100644
---- a/src/tools/msvc/Mkvcbuild.pm	
-+++ b/src/tools/msvc/Mkvcbuild.pm
-@@ -494,14 +494,15 @@ sub mkvcbuild
- 
- 		# Attempt to get python version and location.
- 		# Assume python.exe in specified dir.
--		my $pythonprog = "import sys;print(sys.prefix);"
--		  . "print(str(sys.version_info[0])+str(sys.version_info[1]))";
--		my $prefixcmd =
--		  $solution->{options}->{python} . "\\python -c \"$pythonprog\"";
--		my $pyout = `$prefixcmd`;
--		die "Could not query for python version!\n" if $?;
--		my ($pyprefix, $pyver) = split(/\r?\n/, $pyout);
--
-+		#my $pythonprog = "import sys;print(sys.prefix);"
-+		#  . "print(str(sys.version_info[0])+str(sys.version_info[1]))";
-+		#my $prefixcmd =
-+		#  $solution->{options}->{python} . "\\python -c \"$pythonprog\"";
-+		#my $pyout = `$prefixcmd`;
-+		#die "Could not query for python version!\n" if $?;
-+		#my ($pyprefix, $pyver) = split(/\r?\n/, $pyout);
-+		my $pyprefix = $solution->{options}->{python};
-+		my $pyver = 37;
- 		# Sometimes (always?) if python is not present, the execution
- 		# appears to work, but gives no data...
- 		die "Failed to query python for version information\n"
-@@ -510,8 +511,9 @@ sub mkvcbuild
- 		my $pymajorver = substr($pyver, 0, 1);
- 		my $plpython = $solution->AddProject('plpython' . $pymajorver,
- 			'dll', 'PLs', 'src/pl/plpython');
--		$plpython->AddIncludeDir($pyprefix . '/include');
--		$plpython->AddLibrary($pyprefix . "/Libs/python$pyver.lib");
-+		$plpython->AddIncludeDir($pyprefix . '/include/python3.7');
-+		$plpython->AddDefine('_DEBUG'); # required for python autolink linking correctly!
-+		$plpython->AddLibrary($pyprefix . "/debug/lib/python$pyver" . "_d.lib");
- 		$plpython->AddReference($postgres);
- 
- 		# Add transform modules dependent on plpython
diff --git a/ports/libpq/patches/windows/python3_build_RELEASE.patch b/ports/libpq/patches/windows/python3_build_RELEASE.patch
new file mode 100644
index 000000000..5ac42cfc7
--- /dev/null
+++ b/ports/libpq/patches/windows/python3_build_RELEASE.patch
@@ -0,0 +1,39 @@
+diff --git a/src/tools/msvc/Mkvcbuild.pm b/src/tools/msvc/Mkvcbuild.pm
+index 99f39caa5..21b5559d6 100644
+--- a/src/tools/msvc/Mkvcbuild.pm	
++++ b/src/tools/msvc/Mkvcbuild.pm
+@@ -494,14 +494,15 @@ sub mkvcbuild
+ 
+ 		# Attempt to get python version and location.
+ 		# Assume python.exe in specified dir.
+-		my $pythonprog = "import sys;print(sys.prefix);"
+-		  . "print(str(sys.version_info[0])+str(sys.version_info[1]))";
+-		my $prefixcmd =
+-		  $solution->{options}->{python} . "\\python -c \"$pythonprog\"";
+-		my $pyout = `$prefixcmd`;
+-		die "Could not query for python version!\n" if $?;
+-		my ($pyprefix, $pyver) = split(/\r?\n/, $pyout);
+-
++		#my $pythonprog = "import sys;print(sys.prefix);"
++		#  . "print(str(sys.version_info[0])+str(sys.version_info[1]))";
++		#my $prefixcmd =
++		#  $solution->{options}->{python} . "\\python -c \"$pythonprog\"";
++		#my $pyout = `$prefixcmd`;
++		#die "Could not query for python version!\n" if $?;
++		#my ($pyprefix, $pyver) = split(/\r?\n/, $pyout);
++		my $pyprefix = $solution->{options}->{python};
++		my $pyver = 37;
+ 		# Sometimes (always?) if python is not present, the execution
+ 		# appears to work, but gives no data...
+ 		die "Failed to query python for version information\n"
+@@ -510,8 +511,8 @@ sub mkvcbuild
+ 		my $pymajorver = substr($pyver, 0, 1);
+ 		my $plpython = $solution->AddProject('plpython' . $pymajorver,
+ 			'dll', 'PLs', 'src/pl/plpython');
+-		$plpython->AddIncludeDir($pyprefix . '/include');
+-		$plpython->AddLibrary($pyprefix . "/Libs/python$pyver.lib");
++		$plpython->AddIncludeDir($pyprefix . '/include/python3.7');
++		$plpython->AddLibrary($pyprefix . "/lib/python$pyver.lib");
+ 		$plpython->AddReference($postgres);
+ 
+ 		# Add transform modules dependent on plpython
diff --git a/ports/libpq/patches/windows/python3_build_Release.patch b/ports/libpq/patches/windows/python3_build_Release.patch
deleted file mode 100644
index 5ac42cfc7..000000000
--- a/ports/libpq/patches/windows/python3_build_Release.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff --git a/src/tools/msvc/Mkvcbuild.pm b/src/tools/msvc/Mkvcbuild.pm
-index 99f39caa5..21b5559d6 100644
---- a/src/tools/msvc/Mkvcbuild.pm	
-+++ b/src/tools/msvc/Mkvcbuild.pm
-@@ -494,14 +494,15 @@ sub mkvcbuild
- 
- 		# Attempt to get python version and location.
- 		# Assume python.exe in specified dir.
--		my $pythonprog = "import sys;print(sys.prefix);"
--		  . "print(str(sys.version_info[0])+str(sys.version_info[1]))";
--		my $prefixcmd =
--		  $solution->{options}->{python} . "\\python -c \"$pythonprog\"";
--		my $pyout = `$prefixcmd`;
--		die "Could not query for python version!\n" if $?;
--		my ($pyprefix, $pyver) = split(/\r?\n/, $pyout);
--
-+		#my $pythonprog = "import sys;print(sys.prefix);"
-+		#  . "print(str(sys.version_info[0])+str(sys.version_info[1]))";
-+		#my $prefixcmd =
-+		#  $solution->{options}->{python} . "\\python -c \"$pythonprog\"";
-+		#my $pyout = `$prefixcmd`;
-+		#die "Could not query for python version!\n" if $?;
-+		#my ($pyprefix, $pyver) = split(/\r?\n/, $pyout);
-+		my $pyprefix = $solution->{options}->{python};
-+		my $pyver = 37;
- 		# Sometimes (always?) if python is not present, the execution
- 		# appears to work, but gives no data...
- 		die "Failed to query python for version information\n"
-@@ -510,8 +511,8 @@ sub mkvcbuild
- 		my $pymajorver = substr($pyver, 0, 1);
- 		my $plpython = $solution->AddProject('plpython' . $pymajorver,
- 			'dll', 'PLs', 'src/pl/plpython');
--		$plpython->AddIncludeDir($pyprefix . '/include');
--		$plpython->AddLibrary($pyprefix . "/Libs/python$pyver.lib");
-+		$plpython->AddIncludeDir($pyprefix . '/include/python3.7');
-+		$plpython->AddLibrary($pyprefix . "/lib/python$pyver.lib");
- 		$plpython->AddReference($postgres);
- 
- 		# Add transform modules dependent on plpython
diff --git a/versions/baseline.json b/versions/baseline.json
index ddfda0562..c30c98480 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -3310,7 +3310,7 @@
     },
     "libpq": {
       "baseline": "12.2",
-      "port-version": 11
+      "port-version": 12
     },
     "libpqxx": {
       "baseline": "7.3.1",
diff --git a/versions/l-/libpq.json b/versions/l-/libpq.json
index a076337a1..79bd9d64c 100644
--- a/versions/l-/libpq.json
+++ b/versions/l-/libpq.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "04f39fd5eb9744d0d5a649098fe92281028d30f1",
+      "version-string": "12.2",
+      "port-version": 12
+    },
     {
       "git-tree": "e09ebfc1a310be48ed9f5f3e6d2a648cfddff424",
       "version-string": "12.2",
-- 
cgit v1.2.3