Fix missing includes. Don't forward define std::less.

3 files changed, 42 insertions, 1 deletions

diff --git a/net/openwbem/distinfo b/net/openwbem/distinfo
index dee861959c7..1b186af1ee6 100644
--- a/net/openwbem/distinfo
+++ b/net/openwbem/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2013/03/26 23:34:34 joerg Exp $
+$NetBSD: distinfo,v 1.6 2013/05/23 14:58:09 joerg Exp $
 
 SHA1 (openwbem-3.2.2.tar.gz) = 3272e5cbcfb2a864cccf71e15e0da0f6623420bb
 RMD160 (openwbem-3.2.2.tar.gz) = 31ce8c80d47ff7539315e3978b8c1c493bd17f35
@@ -8,10 +8,12 @@ SHA1 (patch-ab) = c83f632376f12d7378b1f013a0db5d4ae63f15bf
 SHA1 (patch-ac) = ea2f928b13eaef464e133b0e510fa4b8cfee95b9
 SHA1 (patch-ad) = e8b7c3a3b7fbab6052a9e866c8a1c9f1653db590
 SHA1 (patch-ae) = a9d923bdf6e52acff83588605f2913b196c92038
+SHA1 (patch-src_authenticators_pam_OW__PAMAuthentication.cpp) = f3dd3bf3b2c4848c928f0909653eb2488a1f3a39
 SHA1 (patch-src_cim_OW__CIMDateTime.cpp) = 186db29470cbe526c4e18aca13604ab578b3bad3
 SHA1 (patch-src_cimom_server_OW__Platform.cpp) = f7a2f848f565c0c33810bc90ff1455598c024769
 SHA1 (patch-src_cimom_server_OW__PlatformSignal.cpp) = f6d2427d1a2f0bce8cbbc558583bd7d429cfc515
 SHA1 (patch-src_common_OW__COWReference.hpp) = f67f64de56a8745d24a0d738b9c546f5edf249d8
+SHA1 (patch-src_common_OW__CommonFwd.hpp) = 1f1a721f7da14eb0d4ac08f56f1b8086e9d5795a
 SHA1 (patch-src_common_OW__HashMap.hpp) = 37475181bf6e979bde55ef717f14ce62ab730aed
 SHA1 (patch-src_common_OW__HashMultiMap.hpp) = 3d94543356bf0837996a9faf4075ccc6965bd462
 SHA1 (patch-src_common_OW__List.hpp) = e106aca83db05b484ad573cb8da889453321836f
diff --git a/net/openwbem/patches/patch-src_authenticators_pam_OW__PAMAuthentication.cpp b/net/openwbem/patches/patch-src_authenticators_pam_OW__PAMAuthentication.cpp
new file mode 100644
index 00000000000..49b18e7a103
--- /dev/null
+++ b/net/openwbem/patches/patch-src_authenticators_pam_OW__PAMAuthentication.cpp
@@ -0,0 +1,14 @@
+$NetBSD: patch-src_authenticators_pam_OW__PAMAuthentication.cpp,v 1.1 2013/05/23 14:58:09 joerg Exp $
+
+--- src/authenticators/pam/OW_PAMAuthentication.cpp.orig	2013-05-23 13:20:37.000000000 +0000
++++ src/authenticators/pam/OW_PAMAuthentication.cpp
+@@ -39,7 +39,8 @@
+ #include "OW_AuthenticatorIFC.hpp"
+ #include "OW_Array.hpp"
+ 
+-#include <string.h>
++#include <cstdlib>
++#include <cstring>
+ 
+ #ifdef OW_GNU_LINUX
+ 	#ifdef OW_HAVE_PWD_H
diff --git a/net/openwbem/patches/patch-src_common_OW__CommonFwd.hpp b/net/openwbem/patches/patch-src_common_OW__CommonFwd.hpp
new file mode 100644
index 00000000000..2ec73590489
--- /dev/null
+++ b/net/openwbem/patches/patch-src_common_OW__CommonFwd.hpp
@@ -0,0 +1,25 @@
+$NetBSD: patch-src_common_OW__CommonFwd.hpp,v 1.1 2013/05/23 14:58:09 joerg Exp $
+
+--- src/common/OW_CommonFwd.hpp.orig	2013-05-23 13:15:41.000000000 +0000
++++ src/common/OW_CommonFwd.hpp
+@@ -38,19 +38,7 @@
+ #include "OW_ArrayFwd.hpp"
+ #include "OW_IntrusiveReference.hpp"
+ 
+-// Yeah I know this is forbidden by the standard, but what am I gonna do?  #include <algorithm> ? I think not.
+-// If it causes a problem on some compiler, just #ifdef a fix in.
+-#ifdef OW_WIN32
+-namespace std
+-{
+-	template <typename T> struct less;
+-}
+-#else
+-namespace std
+-{
+-	template <typename T> class less;
+-}
+-#endif
++#include <algorithm>
+ 
+ namespace OW_NAMESPACE
+ {