Add patches to fix compilation on 64-bit NetBSD, working around

its problems with struct timeval. Patches supplied by drochner@
thanks Matthias!

5 files changed, 111 insertions, 1 deletions

diff --git a/editors/dasher/distinfo b/editors/dasher/distinfo
index 03dc9afd4c6..04c1c958aaa 100644
--- a/editors/dasher/distinfo
+++ b/editors/dasher/distinfo
@@ -1,7 +1,11 @@
-$NetBSD: distinfo,v 1.20 2007/04/17 20:31:34 joerg Exp $
+$NetBSD: distinfo,v 1.21 2007/04/18 23:19:27 wiz Exp $
 
 SHA1 (dasher-4.4.1.tar.bz2) = ecf3864e246e09e938c8b8c87518965a43a0695c
 RMD160 (dasher-4.4.1.tar.bz2) = 182793011215bb9bfb515fc4d60c829d1372c705
 Size (dasher-4.4.1.tar.bz2) = 6779949 bytes
 SHA1 (patch-aa) = 52a3e82bef8595efcf9aab0d5c53931fd9c9f7a7
 SHA1 (patch-ab) = a5dac2d9f8a59ee4ea4370fa5b75e8e0f008fdbd
+SHA1 (patch-ac) = 134c514feb9488387e2bdf39e5cfff5054340634
+SHA1 (patch-ad) = b4b26a7b5520f5ce42937386a4a2f7a05c1f5d21
+SHA1 (patch-ae) = 5dfa6e3ba3a86d5eddfb37265a2bb0f9e58ca8fa
+SHA1 (patch-af) = 7ce150f6d4d6112a70bd390fcd02a1b879e9a906
diff --git a/editors/dasher/patches/patch-ac b/editors/dasher/patches/patch-ac
new file mode 100644
index 00000000000..23928f7ae23
--- /dev/null
+++ b/editors/dasher/patches/patch-ac
@@ -0,0 +1,22 @@
+$NetBSD: patch-ac,v 1.3 2007/04/18 23:19:27 wiz Exp $
+
+--- Src/DasherCore/BasicLog.cpp.orig	2007-04-16 16:06:42.000000000 +0200
++++ Src/DasherCore/BasicLog.cpp
+@@ -79,6 +79,7 @@ std::string CBasicLog::GetDateStamp() {
+ #else
+   struct timeval sTimeBuffer;
+   struct timezone sTimezoneBuffer;
++  time_t help; /* workaround for bad NetBSD struct timeval */
+ #endif
+   char* szTimeLine = NULL;
+ 
+@@ -87,7 +88,8 @@ std::string CBasicLog::GetDateStamp() {
+     szTimeLine = ctime(&(sTimeBuffer.time));
+ #else
+     gettimeofday(&sTimeBuffer, &sTimezoneBuffer);
+-    szTimeLine = ctime(&(sTimeBuffer.tv_sec));
++    help = sTimeBuffer.tv_sec;
++    szTimeLine = ctime(&help);
+ #endif
+ 
+     return std::string(szTimeLine).substr(0, 24);
diff --git a/editors/dasher/patches/patch-ad b/editors/dasher/patches/patch-ad
new file mode 100644
index 00000000000..669bebaaab6
--- /dev/null
+++ b/editors/dasher/patches/patch-ad
@@ -0,0 +1,22 @@
+$NetBSD: patch-ad,v 1.1 2007/04/18 23:19:28 wiz Exp $
+
+--- Src/DasherCore/FileLogger.cpp.orig	2007-04-18 13:11:35.000000000 +0200
++++ Src/DasherCore/FileLogger.cpp
+@@ -503,6 +503,7 @@ std::string CFileLogger::GetTimeDateStam
+ #else
+     struct timeval sTimeBuffer;
+     struct timezone sTimezoneBuffer;
++    time_t help; /* workaround for bad NetBSD struct timeval */
+ #endif
+     char* szTimeLine = NULL;
+ 
+@@ -511,7 +512,8 @@ std::string CFileLogger::GetTimeDateStam
+     szTimeLine = ctime(&(sTimeBuffer.time));
+ #else
+     gettimeofday(&sTimeBuffer, &sTimezoneBuffer);
+-    szTimeLine = ctime(&(sTimeBuffer.tv_sec));
++    help = sTimeBuffer.tv_sec;
++    szTimeLine = ctime(&help);
+ #endif
+  
+     // Format is:
diff --git a/editors/dasher/patches/patch-ae b/editors/dasher/patches/patch-ae
new file mode 100644
index 00000000000..67a0ecf66bf
--- /dev/null
+++ b/editors/dasher/patches/patch-ae
@@ -0,0 +1,40 @@
+$NetBSD: patch-ae,v 1.1 2007/04/18 23:19:28 wiz Exp $
+
+--- Src/DasherCore/TimeSpan.cpp.orig	2007-04-18 13:15:12.000000000 +0200
++++ Src/DasherCore/TimeSpan.cpp
+@@ -114,6 +114,7 @@ string CTimeSpan::GetTimeStamp()
+ #else
+     struct timeval sTimeBuffer;
+     struct timezone sTimezoneBuffer;
++    time_t help; /* workaround for bad NetBSD struct timeval */
+ #endif
+     char* szTimeLine = NULL;
+ 
+@@ -122,7 +123,8 @@ string CTimeSpan::GetTimeStamp()
+     szTimeLine = ctime(&(sTimeBuffer.time));
+ #else
+     gettimeofday(&sTimeBuffer, &sTimezoneBuffer);
+-    szTimeLine = ctime(&(sTimeBuffer.tv_sec));
++    help = sTimeBuffer.tv_sec;
++    szTimeLine = ctime(&help);
+ #endif
+   
+   if ((szTimeLine != NULL) && (strlen(szTimeLine) > 18))
+@@ -188,6 +190,7 @@ string CTimeSpan::GetDateStamp()
+ #else
+   struct timeval sTimeBuffer;
+   struct timezone sTimezoneBuffer;
++  time_t help; /* workaround for bad NetBSD struct timeval */
+ #endif
+   char* szTimeLine = NULL;
+ 
+@@ -196,7 +199,8 @@ string CTimeSpan::GetDateStamp()
+     szTimeLine = ctime(&(sTimeBuffer.time));
+ #else
+     gettimeofday(&sTimeBuffer, &sTimezoneBuffer);
+-    szTimeLine = ctime(&(sTimeBuffer.tv_sec));
++    help = sTimeBuffer.tv_sec;
++    szTimeLine = ctime(&help);
+ #endif
+ 
+  
diff --git a/editors/dasher/patches/patch-af b/editors/dasher/patches/patch-af
new file mode 100644
index 00000000000..efde0690c97
--- /dev/null
+++ b/editors/dasher/patches/patch-af
@@ -0,0 +1,22 @@
+$NetBSD: patch-af,v 1.1 2007/04/18 23:19:28 wiz Exp $
+
+--- Src/DasherCore/UserLog.cpp.orig	2007-04-18 13:17:45.000000000 +0200
++++ Src/DasherCore/UserLog.cpp
+@@ -658,6 +658,7 @@ void CUserLog::SetOuputFilename(const st
+ #else
+     struct timeval sTimeBuffer;
+     struct timezone sTimezoneBuffer;
++    time_t help; /* workaround for bad NetBSD struct timeval */
+ #endif
+     char* szTimeLine = NULL;
+ 
+@@ -666,7 +667,8 @@ void CUserLog::SetOuputFilename(const st
+     szTimeLine = ctime(&(sTimeBuffer.time));
+ #else
+     gettimeofday(&sTimeBuffer, &sTimezoneBuffer);
+-    szTimeLine = ctime(&(sTimeBuffer.tv_sec));
++    help = sTimeBuffer.tv_sec;
++    szTimeLine = ctime(&help);
+ #endif
+ 
+     if ((szTimeLine != NULL) && (strlen(szTimeLine) > 18))