From 4de736ea9aa839b12b591731a60cc7ff098bd60b Mon Sep 17 00:00:00 2001
From: Pietro Cerutti <gahr@FreeBSD.org>
Date: Mon, 15 Sep 2014 07:28:58 +0000
Subject: [PATCH] - Fix build on 9.x and above. 8.x needs some more
 investigation.

---
 .../zorba/files/patch-bin-debugger_main.cpp   |  7 ++++---
 textproc/zorba/files/patch-bin_zorbacmd.cpp   | 11 ++++++++++
 .../files/patch-src-util_string_util.cpp      | 20 ++++++++++++++-----
 3 files changed, 30 insertions(+), 8 deletions(-)
 create mode 100644 textproc/zorba/files/patch-bin_zorbacmd.cpp

diff --git a/textproc/zorba/files/patch-bin-debugger_main.cpp b/textproc/zorba/files/patch-bin-debugger_main.cpp
index 5bd4192814f0..6ff3f76ee35f 100644
--- a/textproc/zorba/files/patch-bin-debugger_main.cpp
+++ b/textproc/zorba/files/patch-bin-debugger_main.cpp
@@ -1,10 +1,11 @@
---- bin/debugger/main.cpp.orig	2012-06-21 11:19:43.000000000 +0200
-+++ bin/debugger/main.cpp	2012-06-21 11:19:27.000000000 +0200
-@@ -22,6 +22,8 @@
+--- bin/debugger/main.cpp.orig	2012-10-04 00:35:17.000000000 +0200
++++ bin/debugger/main.cpp	2014-09-11 15:46:51.000000000 +0200
+@@ -22,6 +22,9 @@
  #include <unistd.h>
  #endif
  
 +#include <signal.h>
++#include <stdlib.h>
 +
  #include <vector>
  
diff --git a/textproc/zorba/files/patch-bin_zorbacmd.cpp b/textproc/zorba/files/patch-bin_zorbacmd.cpp
new file mode 100644
index 000000000000..b0eb2e126c5e
--- /dev/null
+++ b/textproc/zorba/files/patch-bin_zorbacmd.cpp
@@ -0,0 +1,11 @@
+--- bin/zorbacmd.cpp.orig	2014-09-12 09:26:04.000000000 +0200
++++ bin/zorbacmd.cpp	2014-09-12 09:26:23.000000000 +0200
+@@ -16,6 +16,8 @@
+ 
+ #include "zorbacmdproperties.h"
+ 
++#include <stdlib.h>
++
+ #include <memory>
+ #include <iostream>
+ #include <fstream>
diff --git a/textproc/zorba/files/patch-src-util_string_util.cpp b/textproc/zorba/files/patch-src-util_string_util.cpp
index 3ada0d6aa50c..315c9958bd7a 100644
--- a/textproc/zorba/files/patch-src-util_string_util.cpp
+++ b/textproc/zorba/files/patch-src-util_string_util.cpp
@@ -1,6 +1,16 @@
---- src/util/string_util.cpp.orig	2012-06-13 06:56:48.000000000 +0200
-+++ src/util/string_util.cpp	2012-06-21 09:49:48.000000000 +0200
-@@ -92,7 +92,11 @@
+--- src/util/string_util.cpp.orig	2012-10-04 00:35:16.000000000 +0200
++++ src/util/string_util.cpp	2014-09-12 11:43:08.000000000 +0200
+@@ -18,6 +18,9 @@
+ #include <cerrno>
+ #include <cstdlib>
+ 
++#include <stdlib.h>
++#include <limits.h>
++
+ #include "ascii_util.h"
+ #include "cxx_util.h"
+ #include "string_util.h"
+@@ -92,7 +95,11 @@
  float atof( char const *s ) {
    char *end;
    errno = 0;
@@ -12,7 +22,7 @@
    check_parse_number( s, end, &result );
    return result;
  }
-@@ -100,7 +104,11 @@
+@@ -100,7 +107,11 @@
  long long atoll( char const *s ) {
    char *end;
    errno = 0;
@@ -24,7 +34,7 @@
    check_parse_number( s, end, static_cast<long long*>( nullptr ) );
    return result;
  }
-@@ -114,7 +122,11 @@
+@@ -114,7 +125,11 @@
  
    char *end;
    errno = 0;