From f9b33711d60c4c4e5fb9fb167eb1a637b8b769e2 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Sat, 13 Jun 2020 20:44:59 +1000
Subject: [PATCH] graphviz: fix build

---
 media-gfx/graphviz/graphviz-2.44.0.recipe     |  2 +-
 .../graphviz/patches/graphviz-2.44.0.patchset | 57 ++++++++++---------
 2 files changed, 30 insertions(+), 29 deletions(-)

diff --git a/media-gfx/graphviz/graphviz-2.44.0.recipe b/media-gfx/graphviz/graphviz-2.44.0.recipe
index d7bfba70d..050751bf7 100644
--- a/media-gfx/graphviz/graphviz-2.44.0.recipe
+++ b/media-gfx/graphviz/graphviz-2.44.0.recipe
@@ -14,7 +14,7 @@ shapes."
 HOMEPAGE="https://www.graphviz.org/"
 COPYRIGHT="1994-2020 AT&T Corp."
 LICENSE="EPL v1.0"
-REVISION="1"
+REVISION="2"
 SOURCE_URI="https://www2.graphviz.org/Packages/stable/portable_source/graphviz-$portVersion.tar.gz"
 CHECKSUM_SHA256="9aabd13a8018b708ab3c822de2326c19d0a52ed59f50a6b0f9318c07e2a6d93b"
 SOURCE_FILENAME="graphviz-$portVersion.tar.gz"
diff --git a/media-gfx/graphviz/patches/graphviz-2.44.0.patchset b/media-gfx/graphviz/patches/graphviz-2.44.0.patchset
index 053aa7797..b43a65792 100644
--- a/media-gfx/graphviz/patches/graphviz-2.44.0.patchset
+++ b/media-gfx/graphviz/patches/graphviz-2.44.0.patchset
@@ -1,4 +1,4 @@
-From 52c8dbbe777e75c3d312d8019a1f671a8e0d0876 Mon Sep 17 00:00:00 2001
+From bd27f8036ea0565c9f491fd529ff404ce49aba67 Mon Sep 17 00:00:00 2001
 From: begasus <begasus@gmail.com>
 Date: Sun, 25 Feb 2018 15:09:25 +0100
 Subject: set Haiku font directories
@@ -46,7 +46,7 @@ index 5e098aa..36b95d5 100644
 2.26.0
 
 
-From 1e5062602f2f984c5cc17c312254337c9e2d83b2 Mon Sep 17 00:00:00 2001
+From 436287c353da2fa6d955e3ee4d94d195e72036b4 Mon Sep 17 00:00:00 2001
 From: begasus <begasus@gmail.com>
 Date: Sun, 25 Feb 2018 15:14:43 +0100
 Subject: undef _hdr_malloc for Haiku
@@ -71,7 +71,7 @@ index 441d9da..d898a09 100644
 2.26.0
 
 
-From 92d4f1109623efd92fd27fe6d492597756d877ab Mon Sep 17 00:00:00 2001
+From ce8fb90920844cc4db7c6ef27f8d940dd0dcd811 Mon Sep 17 00:00:00 2001
 From: begasus <begasus@gmail.com>
 Date: Sun, 25 Feb 2018 15:17:14 +0100
 Subject: set default font for Haiku
@@ -94,30 +94,7 @@ index 2c745c2..76f2902 100644
 2.26.0
 
 
-From 0cf7d3dc8e6613fd029b6a9e8478c943c28e2eaa Mon Sep 17 00:00:00 2001
-From: begasus <begasus@gmail.com>
-Date: Mon, 26 Feb 2018 19:20:59 +0100
-Subject: Don't define waitpid unless necessary
-
-
-diff --git a/lib/sfio/sfhdr.h b/lib/sfio/sfhdr.h
-index d3b3329..be6ad0f 100644
---- a/lib/sfio/sfhdr.h
-+++ b/lib/sfio/sfhdr.h
-@@ -812,7 +812,7 @@ extern "C" {
- #endif /* _WIN32 */
- 
-     extern time_t time(time_t *);
--    extern int waitpid(int, int *, int);
-+    extern pid_t waitpid(pid_t, int *, int);
- #ifndef _WIN32
-     extern void _exit(int);
- #endif
--- 
-2.26.0
-
-
-From d542280d5cdd3a27b8243055e412777a86e18408 Mon Sep 17 00:00:00 2001
+From 64e9b874a77ab94f04aec8ef733de83fb904b984 Mon Sep 17 00:00:00 2001
 From: Gerasim Troeglazov <3dEyes@gmail.com>
 Date: Sat, 13 Jun 2020 13:02:14 +1000
 Subject: Use system declaration for sbrk and getpagesize
@@ -152,7 +129,7 @@ index d898a09..6a3435f 100644
 2.26.0
 
 
-From c12c329ab172dd3363dba6cedabf0aab62d8d53c Mon Sep 17 00:00:00 2001
+From 63c401942f01fa58e5c18cf74320fa000c48b284 Mon Sep 17 00:00:00 2001
 From: Gerasim Troeglazov <3dEyes@gmail.com>
 Date: Sat, 13 Jun 2020 13:03:04 +1000
 Subject: Remove mstats
@@ -174,3 +151,27 @@ index 36b95d5..8914236 100644
 -- 
 2.26.0
 
+
+From 66778ea9fe4e8566cd6b9ad397677cfc725bb186 Mon Sep 17 00:00:00 2001
+From: Gerasim Troeglazov <3dEyes@gmail.com>
+Date: Sat, 13 Jun 2020 20:34:04 +1000
+Subject: Use system declaration for waitpid
+
+
+diff --git a/lib/sfio/sfhdr.h b/lib/sfio/sfhdr.h
+index d3b3329..e5c790e 100644
+--- a/lib/sfio/sfhdr.h
++++ b/lib/sfio/sfhdr.h
+@@ -812,7 +812,9 @@ extern "C" {
+ #endif /* _WIN32 */
+ 
+     extern time_t time(time_t *);
++#ifndef __HAIKU__
+     extern int waitpid(int, int *, int);
++#endif
+ #ifndef _WIN32
+     extern void _exit(int);
+ #endif
+-- 
+2.26.0
+