diff --git a/dev-db/postgresql/patches/postgresql11-11.1.patchset b/dev-db/postgresql/patches/postgresql11-11.1.patchset
index 993d80175..be4a87568 100644
--- a/dev-db/postgresql/patches/postgresql11-11.1.patchset
+++ b/dev-db/postgresql/patches/postgresql11-11.1.patchset
@@ -1,4 +1,4 @@
-From 0a6f6a4449906a71fc1e1a80be4248e2126f4583 Mon Sep 17 00:00:00 2001
+From f6614de28c3d72e841fe264fb186d055e43ee5fd Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
 Date: Mon, 24 Dec 2018 17:42:35 +0100
 Subject: Applied patches
@@ -575,10 +575,10 @@ diff --git a/src/template/haiku b/src/template/haiku
 new file mode 100644
 index 0000000..e69de29
 -- 
-2.19.1
+2.37.3
 
 
-From 1f594356d989fcee542518915b01029d8a3b469c Mon Sep 17 00:00:00 2001
+From 4cf41446adbc8e6b216f2e2a6a3d7a4b34819d89 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
 Date: Mon, 24 Dec 2018 18:19:05 +0100
 Subject: Build fix
@@ -599,5 +599,28 @@ index b505e2a..f782c33 100644
  	if (pgwin32_is_admin())
  	{
 -- 
-2.19.1
+2.37.3
+
+
+From 6d33a10454983097e4da017f3aa3db6db88dce2b Mon Sep 17 00:00:00 2001
+From: begasus <begasus@gmail.com>
+Date: Mon, 26 Dec 2022 17:34:07 +0100
+Subject: adjust autoconf required version
+
+
+diff --git a/configure.in b/configure.in
+index b19e7d7..8a816e9 100644
+--- a/configure.in
++++ b/configure.in
+@@ -19,7 +19,7 @@ m4_pattern_forbid(^PGAC_)dnl to catch undefined macros
+ 
+ AC_INIT([PostgreSQL], [11.1], [pgsql-bugs@postgresql.org])
+ 
+-m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.69], [], [m4_fatal([Autoconf version 2.69 is required.
++m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.71], [], [m4_fatal([Autoconf version 2.69 is required.
+ Untested combinations of 'autoconf' and PostgreSQL versions are not
+ recommended.  You can remove the check from 'configure.in' but it is then
+ your responsibility whether the result works or not.])])
+-- 
+2.37.3
 
diff --git a/dev-db/postgresql/patches/postgresql12-12.0.patchset b/dev-db/postgresql/patches/postgresql12-12.0.patchset
index fd40a863f..18466ac3b 100644
--- a/dev-db/postgresql/patches/postgresql12-12.0.patchset
+++ b/dev-db/postgresql/patches/postgresql12-12.0.patchset
@@ -1,11 +1,10 @@
-From 2949f19609ab24f32d2d3094ca424704dd99df45 Mon Sep 17 00:00:00 2001
+From b79cd20e894787165914ed5a3c777a86e8b97055 Mon Sep 17 00:00:00 2001
 From: Augustin Cavalier <waddlesplash@gmail.com>
 Date: Thu, 3 Oct 2019 17:36:43 +0000
-Subject: [PATCH] Changes to make Postgresql run on Haiku.
+Subject: Changes to make Postgresql run on Haiku.
 
 Adapted from Mark Hellegers' 9.3.5 patch.
 
-
 diff --git a/configure.in b/configure.in
 index 6942f81..339db16 100644
 --- a/configure.in
@@ -576,5 +575,28 @@ diff --git a/src/template/haiku b/src/template/haiku
 new file mode 100644
 index 0000000..e69de29
 -- 
-2.23.0
+2.37.3
+
+
+From 5a79714834681eec183f65c037b2c186772485be Mon Sep 17 00:00:00 2001
+From: begasus <begasus@gmail.com>
+Date: Mon, 26 Dec 2022 17:35:12 +0100
+Subject: adjust autoconf required version
+
+
+diff --git a/configure.in b/configure.in
+index 339db16..f9339f5 100644
+--- a/configure.in
++++ b/configure.in
+@@ -19,7 +19,7 @@ m4_pattern_forbid(^PGAC_)dnl to catch undefined macros
+ 
+ AC_INIT([PostgreSQL], [12.0], [pgsql-bugs@lists.postgresql.org])
+ 
+-m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.69], [], [m4_fatal([Autoconf version 2.69 is required.
++m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.71], [], [m4_fatal([Autoconf version 2.69 is required.
+ Untested combinations of 'autoconf' and PostgreSQL versions are not
+ recommended.  You can remove the check from 'configure.in' but it is then
+ your responsibility whether the result works or not.])])
+-- 
+2.37.3
 
diff --git a/dev-db/postgresql/postgresql-9.6.10.recipe b/dev-db/postgresql/postgresql-9.6.10.recipe
index 5df48677d..d72be2b3b 100644
--- a/dev-db/postgresql/postgresql-9.6.10.recipe
+++ b/dev-db/postgresql/postgresql-9.6.10.recipe
@@ -40,6 +40,7 @@ REQUIRES="
 	"
 
 PROVIDES_server="
+	postgresql${secondaryArchSuffix}_server = $portVersion compat >= 9
 	cmd:clusterdb$secondaryArchSuffix = $portVersion compat >= 9
 	cmd:createdb$secondaryArchSuffix = $portVersion compat >= 9
 	cmd:createlang$secondaryArchSuffix = $portVersion compat >= 9
@@ -82,8 +83,8 @@ PROVIDES_devel="
 	postgresql${secondaryArchSuffix}_devel = $portVersion
 	devel:libecpg$secondaryArchSuffix = $portVersion
 	devel:libecpg_compat$secondaryArchSuffix = $portVersion
-	devel:libpgfeutils$secondaryArchSuffix = $portVersion
 	devel:libpgcommon$secondaryArchSuffix = $portVersion
+	devel:libpgfeutils$secondaryArchSuffix = $portVersion
 	devel:libpgport$secondaryArchSuffix = $portVersion
 	devel:libpgtypes$secondaryArchSuffix = $portVersion
 	devel:libpq$secondaryArchSuffix = $portVersion
@@ -126,14 +127,16 @@ INSTALL()
 {
 	make install
 
+	rm $libDir/{libecpg,libecpg_compat,libpgtypes,libpq}.a
+
 	prepareInstalledDevelLibs \
-		libpgport \
-		libpgcommon \
 		libecpg \
+		libecpg_compat \
+		libpgcommon \
 		libpgfeutils \
+		libpgport \
 		libpgtypes \
-		libpq \
-		libecpg_compat
+		libpq
 	fixPkgconfig
 
 	mkdir -p $developLibDir/postgresql/pgxs
diff --git a/dev-db/postgresql/postgresql11-11.1.recipe b/dev-db/postgresql/postgresql11-11.1.recipe
index 764b1a01d..b3785d2b9 100644
--- a/dev-db/postgresql/postgresql11-11.1.recipe
+++ b/dev-db/postgresql/postgresql11-11.1.recipe
@@ -106,13 +106,13 @@ REQUIRES_server="
 
 PROVIDES_devel="
 	postgresql11${secondaryArchSuffix}_devel = $portVersion
-	devel:libpgport$secondaryArchSuffix = $portVersion
-	devel:libpgcommon$secondaryArchSuffix = $portVersion
 	devel:libecpg$secondaryArchSuffix = $portVersion
+	devel:libecpg_compat$secondaryArchSuffix = $portVersion
+	devel:libpgcommon$secondaryArchSuffix = $portVersion
 	devel:libpgfeutils$secondaryArchSuffix = $portVersion
+	devel:libpgport$secondaryArchSuffix = $portVersion
 	devel:libpgtypes$secondaryArchSuffix = $portVersion
 	devel:libpq$secondaryArchSuffix = $portVersion
-	devel:libecpg_compat$secondaryArchSuffix = $portVersion
 	"
 REQUIRES_devel="
 	postgresql11${secondaryArchSuffix} == $portVersion base
@@ -177,13 +177,17 @@ INSTALL()
 {
 	make install
 
-	prepareInstalledDevelLibs libpgport \
-		libpgcommon \
+	# remove leftover static libraries
+	rm $libDir/{libecpg,libecpg_compat,libpgtypes,libpq}.a
+
+	prepareInstalledDevelLibs  \
 		libecpg \
-		libpgtypes \
-		libpq \
 		libecpg_compat \
-		libpgfeutils
+		libpgcommon \
+		libpgfeutils \
+		libpgport \
+		libpgtypes \
+		libpq
 	fixPkgconfig
 
 	mkdir -p $developLibDir/postgresql/pgxs
diff --git a/dev-db/postgresql/postgresql12-12.0.recipe b/dev-db/postgresql/postgresql12-12.0.recipe
index 33887e8b9..773c7a2e2 100644
--- a/dev-db/postgresql/postgresql12-12.0.recipe
+++ b/dev-db/postgresql/postgresql12-12.0.recipe
@@ -112,15 +112,15 @@ REQUIRES_server="
 
 PROVIDES_devel="
 	postgresql12${secondaryArchSuffix}_devel = $portVersion
-	devel:libpgport$secondaryArchSuffix = $portVersion
+	devel:libecpg$secondaryArchSuffix = $portVersion
+	devel:libecpg_compat$secondaryArchSuffix = $portVersion
 	devel:libpgcommon$secondaryArchSuffix = $portVersion
 	devel:libpgcommon_shlib$secondaryArchSuffix = $portVersion
-	devel:libecpg$secondaryArchSuffix = $portVersion
-	devel:libpgport_shlib$secondaryArchSuffix = $portVersion
 	devel:libpgfeutils$secondaryArchSuffix = $portVersion
+	devel:libpgport$secondaryArchSuffix = $portVersion
+	devel:libpgport_shlib$secondaryArchSuffix = $portVersion
 	devel:libpgtypes$secondaryArchSuffix = $portVersion
 	devel:libpq$secondaryArchSuffix = $portVersion
-	devel:libecpg_compat$secondaryArchSuffix = $portVersion
 	"
 REQUIRES_devel="
 	postgresql12${secondaryArchSuffix} == $portVersion base
@@ -185,15 +185,19 @@ INSTALL()
 {
 	make install
 
-	prepareInstalledDevelLibs libpgport \
+	# remove leftover static libraries
+	rm $libDir/{libecpg,libecpg_compat,libpgtypes,libpq}.a
+
+	prepareInstalledDevelLibs \
+		libecpg \
+		libecpg_compat \
 		libpgcommon \
 		libpgcommon_shlib \
+		libpgfeutils \
+		libpgport \
 		libpgport_shlib \
-		libecpg \
 		libpgtypes \
-		libpq \
-		libecpg_compat \
-		libpgfeutils
+		libpq
 	fixPkgconfig
 
 	mkdir -p $developLibDir/postgresql/pgxs