From 497d3d9a50f19aeb98f99b01747caf8313826ec2 Mon Sep 17 00:00:00 2001
From: Schrijvers Luc <begasus@gmail.com>
Date: Fri, 24 Mar 2023 09:29:06 +0100
Subject: [PATCH] psqlodbc, fix build (#8097)

---
 .../patches/psqlodbc-09.03.0400.patchset      | 37 +++++++++++++++----
 dev-libs/psqlodbc/psqlodbc-09.03.0400.recipe  |  6 +--
 2 files changed, 32 insertions(+), 11 deletions(-)

diff --git a/dev-libs/psqlodbc/patches/psqlodbc-09.03.0400.patchset b/dev-libs/psqlodbc/patches/psqlodbc-09.03.0400.patchset
index f74b0bba2..c05adee8f 100644
--- a/dev-libs/psqlodbc/patches/psqlodbc-09.03.0400.patchset
+++ b/dev-libs/psqlodbc/patches/psqlodbc-09.03.0400.patchset
@@ -1,13 +1,8 @@
-From 2cc0b4ec3352f0f9bd189496b1ab3eeeeb89dc9f Mon Sep 17 00:00:00 2001
+From 8a9c5047debdbeec496c1ec5569de3278d643a66 Mon Sep 17 00:00:00 2001
 From: Mark Hellegers <mark@firedisk.net>
 Date: Wed, 10 Jun 2015 23:30:01 +0200
-Subject: [PATCH] Changes to make psqlodbc run on Haiku
+Subject: Changes to make psqlodbc run on Haiku
 
----
- config/config.guess | 6 ++++++
- config/config.sub   | 2 +-
- configure.ac        | 2 +-
- 3 files changed, 8 insertions(+), 2 deletions(-)
 
 diff --git a/config/config.guess b/config/config.guess
 index 0e30d56..9070f97 100755
@@ -53,5 +48,31 @@ index 5f4b9cb..3bffe33 100644
  	(SQLHSTMT StatementHandle,SQLUSMALLINT ColumnNumber,
  	SQLUSMALLINT FieldIdentifier, SQLPOINTER CharacterAttribute,
 -- 
-2.2.2
+2.37.3
+
+
+From ec05bae02be74a9d32e7605e0ca555a51793c7d8 Mon Sep 17 00:00:00 2001
+From: begasus <begasus@gmail.com>
+Date: Fri, 24 Mar 2023 08:48:01 +0100
+Subject: Fix conflicting int types
+
+
+diff --git a/md5.h b/md5.h
+index 4f5721e..c4a91e1 100644
+--- a/md5.h
++++ b/md5.h
+@@ -39,7 +39,11 @@ typedef char bool;
+ #ifndef HAVE_UINT8
+ typedef unsigned char uint8;	/* == 8 bits */
+ typedef unsigned short uint16;	/* == 16 bits */
++#ifdef __HAIKU__
++#include <SupportDefs.h>
++#else
+ typedef unsigned int uint32;	/* == 32 bits */
++#endif
+ #endif /* not HAVE_UINT8 */
+ 
+ extern bool md5_hash(const void *buff, size_t len, char *hexsum);
+-- 
+2.37.3
 
diff --git a/dev-libs/psqlodbc/psqlodbc-09.03.0400.recipe b/dev-libs/psqlodbc/psqlodbc-09.03.0400.recipe
index 3869cea87..63cda8c49 100644
--- a/dev-libs/psqlodbc/psqlodbc-09.03.0400.recipe
+++ b/dev-libs/psqlodbc/psqlodbc-09.03.0400.recipe
@@ -4,12 +4,12 @@ database using the ODBC API."
 HOMEPAGE="https://odbc.postgresql.org"
 COPYRIGHT="1996-2014 PostgreSQL Global Development Group"
 LICENSE="GNU LGPL v2"
-REVISION="4"
+REVISION="5"
 SOURCE_URI="https://ftp.postgresql.org/pub/odbc/versions/src/psqlodbc-09.03.0400.tar.gz"
 CHECKSUM_SHA256="de77dfa89dba0a159afc57b2e312ca6e9075dd92b761c7cc700c0450ba02b56b"
 PATCHES="psqlodbc-$portVersion.patchset"
 
-ARCHITECTURES="x86_gcc2 ?x86"
+ARCHITECTURES="all"
 SECONDARY_ARCHITECTURES="x86 x86_gcc2"
 
 PROVIDES="
@@ -55,7 +55,7 @@ INSTALL()
 {
 	make install
 
-	prepareInstalledDevelLibs psqlodbcw
+	prepareInstalledDevelLib psqlodbcw
 
 	packageEntries devel \
 		$developDir