[pkgsrc/trunk]: pkgsrc/www/dansguardian Fix build with 64-bit time_t

[sborrill <sborrill%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/9d69a94a6ebd
branches:  trunk
changeset: 621549:9d69a94a6ebd
user:      sborrill <sborrill%pkgsrc.org@localhost>
date:      Thu Jul 11 14:05:14 2013 +0000

description:
Fix build with 64-bit time_t

diffstat:

 www/dansguardian/distinfo                 |   4 ++-
 www/dansguardian/patches/patch-String.cpp |  33 +++++++++++++++++++++++++++++++
 www/dansguardian/patches/patch-String.hpp |  13 ++++++++++++
 3 files changed, 49 insertions(+), 1 deletions(-)

diffs (72 lines):

diff -r 38d94cf9c7a5 -r 9d69a94a6ebd www/dansguardian/distinfo
--- a/www/dansguardian/distinfo Thu Jul 11 13:15:57 2013 +0000
+++ b/www/dansguardian/distinfo Thu Jul 11 14:05:14 2013 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2011/11/25 22:24:39 joerg Exp $
+$NetBSD: distinfo,v 1.5 2013/07/11 14:05:14 sborrill Exp $
 
 SHA1 (dansguardian-2.8.0.6.source.tar.gz) = 6d82eed13536a64a2f6711fa221756fa0bfe19f0
 RMD160 (dansguardian-2.8.0.6.source.tar.gz) = cf3493b26b4fcd5b366a6fe472e3c6c9e3cfe6d3
@@ -10,6 +10,8 @@
 SHA1 (patch-ListContainer.cpp) = e38034615e831c9dd45eb861f97a6c2cf381e631
 SHA1 (patch-RegExp.cpp) = a1b56dedd627afaaf00aac8285874b508db348d4
 SHA1 (patch-Socket.cpp) = f8c6f13266f33bb03ffac57ca4734708640b1c77
+SHA1 (patch-String.cpp) = 543ac3b2a04666cbe1560a9431e5d3040c80aeac
+SHA1 (patch-String.hpp) = beda3ffb28fa1dcd00f6383e9896b3fdbf7de1fa
 SHA1 (patch-SysV.cpp) = bc173150d4663d90672298361589bfd8919d519b
 SHA1 (patch-UDSocket.cpp) = d047b546a9bee74ff8dbccfe66bf75f2e61738a5
 SHA1 (patch-aa) = c4af2622ee48dedb15f5a22874c1c1bff5ea51ef
diff -r 38d94cf9c7a5 -r 9d69a94a6ebd www/dansguardian/patches/patch-String.cpp
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/www/dansguardian/patches/patch-String.cpp Thu Jul 11 14:05:14 2013 +0000
@@ -0,0 +1,33 @@
+$NetBSD: patch-String.cpp,v 1.1 2013/07/11 14:05:14 sborrill Exp $
+
+Fix build with 64-bit time_t
+--- String.cpp.orig    2013-07-11 14:43:00.000000000 +0100
++++ String.cpp 2013-07-11 14:46:38.000000000 +0100
+@@ -102,6 +102,27 @@
+     }
+ #endif
+ 
++#ifdef __GCCVER3
++    String::String(const long long num) {
++        std::ostringstream buf;
++        buf << num << std::ends;
++        std::string s = buf.str();
++        char* bs = (char*)s.c_str();
++        int l = strlen(bs);
++        data = new char[l + 1];
++        memcpy(data, bs, l);
++        sl = l;
++        data[sl] = '\0';
++    }
++#else
++    String::String(const long long num) {
++        std::ostrstream buf;
++        buf << num << std::ends;
++        data = buf.str();  // with side effect: it calls buf.freeze()
++        sl = buf.pcount() - 1;
++    }
++#endif
++
+ String::String(const char* bs, int len) {
+     data = new char[len + 1];
+     memcpy(data, bs, len);
diff -r 38d94cf9c7a5 -r 9d69a94a6ebd www/dansguardian/patches/patch-String.hpp
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/www/dansguardian/patches/patch-String.hpp Thu Jul 11 14:05:14 2013 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-String.hpp,v 1.1 2013/07/11 14:05:14 sborrill Exp $
+
+Fix build with 64-bit time_t
+--- String.hpp.orig    2013-07-11 14:41:21.000000000 +0100
++++ String.hpp 2013-07-11 14:41:38.000000000 +0100
+@@ -38,6 +38,7 @@
+     String(const String& s);
+     String(const int num);
+     String(const long num);
++    String(const long long num);
+     String(const char bs[], int len);
+     String(const char bs[], int start, int len);
+     friend ostream &  operator << (ostream & out, const String& s);