Stage, and fix build with clang.

PR:		191377
Submitted by:	tkato432@yahoo.com

5 files changed, 96 insertions, 25 deletions

diff --git a/www/logtools/files/patch-aa b/www/logtools/files/patch-aa
deleted file mode 100644
index 396944cd5a03..000000000000
--- a/www/logtools/files/patch-aa
+++ /dev/null
@@ -1,11 +0,0 @@
---- clfmerge.cpp.orig	Tue Jan  8 17:15:37 2002
-+++ clfmerge.cpp	Tue Jan  8 17:14:06 2002
-@@ -201,7 +201,7 @@
-   unsigned int map_items = 0;
-   bool set_map_items = false, domain_mangling = false;
-   int int_c;
--  optind = 0;
-+  optind = 1;
-   while(-1 != (int_c = getopt(argc, argv, "b:hd")) )
-   {
-     switch(char(int_c))
diff --git a/www/logtools/files/patch-ac b/www/logtools/files/patch-ac
deleted file mode 100644
index 96ca9b3dd995..000000000000
--- a/www/logtools/files/patch-ac
+++ /dev/null
@@ -1,14 +0,0 @@
---- clfdomainsplit.cpp.orig	Mon Jun  9 10:56:27 2003
-+++ clfdomainsplit.cpp	Mon Jun  9 10:56:47 2003
-@@ -1,10 +1,6 @@
- #include <stdio.h>
- 
--#if (__GNUC__ >= 3)
--#include <ext/hash_map>
--#else
--#include <hash_map>
--#endif
-+#include <hash_map.h>
- 
- #include <unistd.h>
- #include <string>
diff --git a/www/logtools/files/patch-clfdomainsplit.cpp b/www/logtools/files/patch-clfdomainsplit.cpp
new file mode 100644
index 000000000000..753703f1aa4a
--- /dev/null
+++ b/www/logtools/files/patch-clfdomainsplit.cpp
@@ -0,0 +1,43 @@
+--- clfdomainsplit.cpp.orig	Mon Jun  9 10:56:27 2003
++++ clfdomainsplit.cpp	Mon Jun  9 10:56:47 2003
+@@ -1,19 +1,23 @@
+-#include <stdio.h>
++#include <cstdio>
+ 
+-#if (__GNUC__ >= 3)
+-#include <ext/hash_map>
++#if defined(_LIBCPP_VERSION)
++#include <unordered_map>
+ #else
+-#include <hash_map>
++#include <ext/hash_map>
+ #endif
+ 
++#include <cstdlib>
+ #include <unistd.h>
+ #include <cstring>
+ #include <vector>
+-#include <ctype.h>
++#include <cctype>
++#include <string>
+ #include "logtools.h"
+ 
+ using namespace std;
++#if !defined(_LIBCPP_VERSION)
+ using namespace __gnu_cxx;
++#endif
+ 
+ // MAX_FDS is the maximum number of files that will be directly written to
+ // by one process
+@@ -166,7 +170,11 @@
+   size_t operator()(const string str) const { return hash<const char *>()(str.c_str()); }
+ };
+ 
++#if defined(_LIBCPP_VERSION)
++typedef unordered_map<const string, FILE **, hash_string, eqstr> HASH_TYPE;
++#else
+ typedef hash_map<const string, FILE **, hash_string, eqstr> HASH_TYPE;
++#endif
+ HASH_TYPE fd_map;
+ 
+ typedef FILE * PFILE;
diff --git a/www/logtools/files/patch-clfmerge.cpp b/www/logtools/files/patch-clfmerge.cpp
new file mode 100644
index 000000000000..017e4814186b
--- /dev/null
+++ b/www/logtools/files/patch-clfmerge.cpp
@@ -0,0 +1,53 @@
+--- clfmerge.cpp.orig	Tue Jan  8 17:15:37 2002
++++ clfmerge.cpp	Tue Jan  8 17:14:06 2002
+@@ -1,17 +1,26 @@
+-#include <stdio.h>
++#include <cstdio>
++
++#if defined(_LIBCPP_VERSION)
++#include <unordered_map>
++#else
+ #include <ext/hash_map>
+-#include <stdlib.h>
++#endif
++
++#include <cstdlib>
+ #include <map>
+ #include <cstring>
+ #include <unistd.h>
+-#include <ctype.h>
++#include <cctype>
++#include <string>
+ 
+ #include "logtools.h"
+ 
+ #define BUF_SIZE 4096
+ 
+ using namespace std;
++#if !defined(_LIBCPP_VERSION)
+ using namespace __gnu_cxx;
++#endif
+ 
+ struct eqstr
+ {
+@@ -19,7 +28,11 @@
+   { return strcmp(s1, s2) == 0; }
+ };
+ 
++#if defined(_LIBCPP_VERSION)
++unordered_map<const char *, const char *, hash<const char *>, eqstr> months;
++#else
+ hash_map<const char *, const char *, hash<const char *>, eqstr> months;
++#endif
+ 
+ class LogFile
+ {
+@@ -207,7 +220,7 @@
+   unsigned int map_items = 0;
+   bool set_map_items = false, domain_mangling = false;
+   int int_c;
+-  optind = 0;
++  optind = 1;
+   while(-1 != (int_c = getopt(argc, argv, "b:hd")) )
+   {
+     switch(char(int_c))
diff --git a/www/logtools/files/patch-ab b/www/logtools/files/patch-clfsplit.cpp
index 3bc487017665..3bc487017665 100644
--- a/www/logtools/files/patch-ab
+++ b/www/logtools/files/patch-clfsplit.cpp