Add missing include. Avoid incompatible forward declaration, just

include the correct header.

3 files changed, 32 insertions, 1 deletions

diff --git a/devel/log4cxx/distinfo b/devel/log4cxx/distinfo
index 6c7710830b7..3a25a93ecf5 100644
--- a/devel/log4cxx/distinfo
+++ b/devel/log4cxx/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2011/11/25 21:45:51 joerg Exp $
+$NetBSD: distinfo,v 1.3 2013/04/30 22:17:38 joerg Exp $
 
 SHA1 (apache-log4cxx-0.10.0.tar.gz) = d79c053e8ac90f66c5e873b712bb359fd42b648d
 RMD160 (apache-log4cxx-0.10.0.tar.gz) = 6df384e5c746c3c6903efae6c9f0d64e4f07a5ad
@@ -6,3 +6,5 @@ Size (apache-log4cxx-0.10.0.tar.gz) = 1667425 bytes
 SHA1 (patch-src_examples_cpp_console.cpp) = 203b987f6a324c906c9ca5a19113190bdb3bfb79
 SHA1 (patch-src_main_cpp_inputstreamreader.cpp) = a4540a7154a11d12928829eac76c44fbcabc41bb
 SHA1 (patch-src_main_cpp_socketoutputstream.cpp) = ebfd51ed3cb86f2995571ba70a82fba5c2ddb7ce
+SHA1 (patch-src_main_cpp_stringhelper.cpp) = f108eb6c4998d5df83e5efa706466d14d7d0a534
+SHA1 (patch-src_main_include_log4cxx_helpers_simpledateformat.h) = 7cf95276cfc3b6cb6ad02aad68e9e45d7663a2d5
diff --git a/devel/log4cxx/patches/patch-src_main_cpp_stringhelper.cpp b/devel/log4cxx/patches/patch-src_main_cpp_stringhelper.cpp
new file mode 100644
index 00000000000..115dabc7b0a
--- /dev/null
+++ b/devel/log4cxx/patches/patch-src_main_cpp_stringhelper.cpp
@@ -0,0 +1,12 @@
+$NetBSD: patch-src_main_cpp_stringhelper.cpp,v 1.1 2013/04/30 22:17:38 joerg Exp $
+
+--- src/main/cpp/stringhelper.cpp.orig	2013-04-30 11:09:04.000000000 +0000
++++ src/main/cpp/stringhelper.cpp
+@@ -28,6 +28,7 @@
+ #endif
+ #include <log4cxx/private/log4cxx_private.h>
+ #include <cctype>
++#include <cstdlib>
+ #include <apr.h>
+ 
+ 
diff --git a/devel/log4cxx/patches/patch-src_main_include_log4cxx_helpers_simpledateformat.h b/devel/log4cxx/patches/patch-src_main_include_log4cxx_helpers_simpledateformat.h
new file mode 100644
index 00000000000..5277d0afa1d
--- /dev/null
+++ b/devel/log4cxx/patches/patch-src_main_include_log4cxx_helpers_simpledateformat.h
@@ -0,0 +1,17 @@
+$NetBSD: patch-src_main_include_log4cxx_helpers_simpledateformat.h,v 1.1 2013/04/30 22:17:38 joerg Exp $
+
+--- src/main/include/log4cxx/helpers/simpledateformat.h.orig	2013-04-30 11:08:29.000000000 +0000
++++ src/main/include/log4cxx/helpers/simpledateformat.h
+@@ -26,11 +26,10 @@
+ 
+ 
+ #include <log4cxx/helpers/dateformat.h>
++#include <locale>
+ #include <vector>
+ #include <time.h>
+ 
+-namespace std { class locale; }
+-
+ namespace log4cxx
+ {
+         namespace helpers