Add a number of includes hidden by libstdc++'s name space pollution.

5 files changed, 33 insertions, 13 deletions

diff --git a/security/zoneminder/distinfo b/security/zoneminder/distinfo
index c21c79ea8f4..8b8f31961f1 100644
--- a/security/zoneminder/distinfo
+++ b/security/zoneminder/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2013/03/24 16:47:47 joerg Exp $
+$NetBSD: distinfo,v 1.3 2013/04/29 21:31:12 joerg Exp $
 
 SHA1 (ZoneMinder-1.25.0.tar.gz) = a93a976a5cd82f1e197f4d7bd626d3f0387c4231
 RMD160 (ZoneMinder-1.25.0.tar.gz) = 32a4f503770103e55bfe592864c1cab82e7395a6
@@ -7,14 +7,14 @@ SHA1 (patch-Makefile_am) = 09b3ba7f9c292ef672506219be66f059290b6405
 SHA1 (patch-configure_ac) = 87410ce8bc8fe42e08bf0e32e40b59619f7db90d
 SHA1 (patch-scripts_zm_in) = 91809c9a179a0135c432a0ffad7c2d2ddfd512de
 SHA1 (patch-src_Makefile_am) = 84999df8b7c80b049e2dd9cb308e12f50ed8285f
-SHA1 (patch-src_zm__thread.h) = 51b2868f6de36e6713f6f0a0cd5a40e8cfc7b943
+SHA1 (patch-src_zm__thread.h) = 8313d3294592fd08c775f612d70cc935e4f64d9a
 SHA1 (patch-src_zm__timer.h) = 38dae4f8573c7ae6d459adddf05260ce4b6e2088
 SHA1 (patch-src_zm__utils.cpp) = f6a109296146822014d57d39094390adcc5df760
 SHA1 (patch-src_zm__utils.h) = 361a69dfd4e2c3e46cf6fea3e1470df2e5cfa446
 SHA1 (patch-src_zm_comms_cpp) = d40932a3d0ae4375a649f200d973995d56aa71c7
-SHA1 (patch-src_zm_comms_h) = 69992d44e17d5c8e15cd4431f2fcb313e4891852
-SHA1 (patch-src_zm_logger_cpp) = 879077d2961ee735dd3e150aaf18a81117dc98db
-SHA1 (patch-src_zm_remote_camera_h) = 9df0e7f0eaab171b50560eb3490a4c5f44d066dc
+SHA1 (patch-src_zm_comms_h) = baeb73040ff3ba862f23ad6301de7daba182456e
+SHA1 (patch-src_zm_logger_cpp) = 3b0373e9d648d25ef4e3e09429199f654f876ccb
+SHA1 (patch-src_zm_remote_camera_h) = c86b6267c295caba71ca72df02c24e6b6cba981f
 SHA1 (patch-src_zm_signal_h) = 226e96d4771921a8ad23fbe130a80a43550062d3
 SHA1 (patch-src_zm_thread_cpp) = c5f64697c3024c6c382f9ae2c5dbe9c21b529b6e
 SHA1 (patch-src_zmc_cpp) = d1046ddfad3a88bdd30501237834ec9e9fbc4c83
diff --git a/security/zoneminder/patches/patch-src_zm__thread.h b/security/zoneminder/patches/patch-src_zm__thread.h
index dc1fc4f0c4b..5a3e5d6cc32 100644
--- a/security/zoneminder/patches/patch-src_zm__thread.h
+++ b/security/zoneminder/patches/patch-src_zm__thread.h
@@ -1,8 +1,16 @@
-$NetBSD: patch-src_zm__thread.h,v 1.1 2013/03/24 16:47:47 joerg Exp $
+$NetBSD: patch-src_zm__thread.h,v 1.2 2013/04/29 21:31:13 joerg Exp $
 
 --- src/zm_thread.h.orig	2009-06-08 09:20:17.000000000 +0000
 +++ src/zm_thread.h
-@@ -27,7 +27,7 @@
+@@ -20,6 +20,7 @@
+ #ifndef ZM_THREAD_H
+ #define ZM_THREAD_H
+ 
++#include <unistd.h>
+ #include <pthread.h>
+ #include "zm_exception.h"
+ #include "zm_utils.h"
+@@ -27,7 +28,7 @@
  class ThreadException : public Exception
  {
  public:
diff --git a/security/zoneminder/patches/patch-src_zm_comms_h b/security/zoneminder/patches/patch-src_zm_comms_h
index f5a85e75cfb..c19488bd77c 100644
--- a/security/zoneminder/patches/patch-src_zm_comms_h
+++ b/security/zoneminder/patches/patch-src_zm_comms_h
@@ -1,4 +1,4 @@
-$NetBSD: patch-src_zm_comms_h,v 1.2 2013/03/24 16:47:47 joerg Exp $
+$NetBSD: patch-src_zm_comms_h,v 1.3 2013/04/29 21:31:13 joerg Exp $
 
 extern "C" system headers.
 
@@ -6,7 +6,7 @@ Include missing system headers for NetBSD.
 
 --- src/zm_comms.h.orig	2009-10-14 13:08:49.000000000 +0000
 +++ src/zm_comms.h
-@@ -22,10 +22,17 @@
+@@ -22,10 +22,18 @@
  
  #include "zm_exception.h"
  
@@ -20,6 +20,7 @@ Include missing system headers for NetBSD.
 +#include <netinet/in.h>
 +#include <stdlib.h>
 +#include <string.h>
++#include <time.h>
 +}
  
  #include <set>
diff --git a/security/zoneminder/patches/patch-src_zm_logger_cpp b/security/zoneminder/patches/patch-src_zm_logger_cpp
index 4d2a47fdf25..94d8fb6b442 100644
--- a/security/zoneminder/patches/patch-src_zm_logger_cpp
+++ b/security/zoneminder/patches/patch-src_zm_logger_cpp
@@ -1,11 +1,19 @@
-$NetBSD: patch-src_zm_logger_cpp,v 1.2 2013/03/24 16:47:47 joerg Exp $
+$NetBSD: patch-src_zm_logger_cpp,v 1.3 2013/04/29 21:31:13 joerg Exp $
 
 If the system has syscall() but not SYS_gettid [E.g. NetBSD], don't attempt
 to use SYS_gettid.
 
 --- src/zm_logger.cpp.orig	2011-06-28 11:07:35.000000000 +0000
 +++ src/zm_logger.cpp
-@@ -515,7 +515,7 @@ void Logger::logPrint( bool hex, const c
+@@ -33,6 +33,7 @@
+ #include <signal.h>
+ #include <stdarg.h>
+ #include <errno.h>
++#include <unistd.h>
+ 
+ bool Logger::smInitialised = false;
+ Logger *Logger::smInstance = 0;
+@@ -515,7 +516,7 @@ void Logger::logPrint( bool hex, const c
      #endif
  
          pid_t tid;
diff --git a/security/zoneminder/patches/patch-src_zm_remote_camera_h b/security/zoneminder/patches/patch-src_zm_remote_camera_h
index 8de4bb61a46..b68c6d005bf 100644
--- a/security/zoneminder/patches/patch-src_zm_remote_camera_h
+++ b/security/zoneminder/patches/patch-src_zm_remote_camera_h
@@ -1,10 +1,10 @@
-$NetBSD: patch-src_zm_remote_camera_h,v 1.2 2013/03/24 16:47:47 joerg Exp $
+$NetBSD: patch-src_zm_remote_camera_h,v 1.3 2013/04/29 21:31:13 joerg Exp $
 
 Declare sockaddr_in.
 
 --- src/zm_remote_camera.h.orig	2009-06-02 07:59:26.000000000 +0000
 +++ src/zm_remote_camera.h
-@@ -22,6 +22,8 @@
+@@ -22,8 +22,11 @@
  
  #include "zm_camera.h"
  
@@ -12,4 +12,7 @@ Declare sockaddr_in.
 +
  #include <string>
  #include <netdb.h>
++#include <time.h>
  
+ //
+ // Class representing 'remote' cameras, i.e. those which are