Fixed build errors on NetBSD 4.99.

5 files changed, 49 insertions, 6 deletions

diff --git a/chat/licq-core/distinfo b/chat/licq-core/distinfo
index 754fca33c88..aea3e3cc930 100644
--- a/chat/licq-core/distinfo
+++ b/chat/licq-core/distinfo
@@ -1,11 +1,14 @@
-$NetBSD: distinfo,v 1.7 2006/11/02 07:07:13 jdolecek Exp $
+$NetBSD: distinfo,v 1.8 2007/09/29 12:51:17 rillig Exp $
 
 SHA1 (licq-1.2.6.tar.bz2) = fef2d6d8c9a368313335f3ac0e86128aa24133ef
 RMD160 (licq-1.2.6.tar.bz2) = fcb2e19bf7d30c1824392a9be3ea1619072e4ce5
 Size (licq-1.2.6.tar.bz2) = 3282918 bytes
 SHA1 (patch-aa) = 974a65e3483b3438fb3c6c9aaf96aa67e4c60fa6
 SHA1 (patch-ab) = 6acfff2027ce5ed4c8fb7eddbdbc4b4a7617eea9
-SHA1 (patch-ac) = 4fbad9cf60611ae1c930f82f8a8464769f742283
+SHA1 (patch-ac) = fe2c60619c0f0f2dd41d6854aa6e2a56b0fab950
 SHA1 (patch-ad) = d53a300e08852c9ad09ec900b46feb2c37129d76
 SHA1 (patch-ae) = cf0ad230f4dcaca9ed1d3f92a4c5e6e131029d68
 SHA1 (patch-af) = 86a99ad96c56f0e53547025a7c5536a01fd2a8b8
+SHA1 (patch-ag) = a8924861f010c4052ee5ade8937a064b675b3a37
+SHA1 (patch-ah) = cec92dd4d617f47e98339b7b662052dc06d4d220
+SHA1 (patch-ai) = f8cebb4e821a1b648e69135db5dd232a9459773a
diff --git a/chat/licq-core/patches/patch-ac b/chat/licq-core/patches/patch-ac
index 9d50b76ec93..98b1d2bf0b9 100644
--- a/chat/licq-core/patches/patch-ac
+++ b/chat/licq-core/patches/patch-ac
@@ -1,12 +1,12 @@
-$NetBSD: patch-ac,v 1.2 2006/03/11 16:44:44 yyamano Exp $
+$NetBSD: patch-ac,v 1.3 2007/09/29 12:51:17 rillig Exp $
 
---- src/user.cpp.orig	2003-03-07 07:29:19.000000000 +0900
-+++ src/user.cpp
+--- src/user.cpp.orig	2003-03-06 23:29:19.000000000 +0100
++++ src/user.cpp	2007-09-29 14:48:00.000000000 +0200
 @@ -2544,7 +2544,11 @@ ICQOwner::ICQOwner()
    m_fConf.ReadBool("HideIP", m_bHideIp, false);
    m_fConf.ReadNum("RCG", m_nRandomChatGroup, ICQ_RANDOMxCHATxGROUP_NONE);
    m_fConf.ReadStr("AutoResponse", szTemp, "");
-+#if defined(__DragonFly__) || defined(__APPLE__)
++#if defined(__DragonFly__) || defined(__APPLE__) || defined(__NetBSD__)
 +  { unsigned long tmp; m_fConf.ReadNum("SSTime", tmp, 0L); m_nSSTime = tmp; }
 +#else
    m_fConf.ReadNum("SSTime", (unsigned long)m_nSSTime, 0L);
diff --git a/chat/licq-core/patches/patch-ag b/chat/licq-core/patches/patch-ag
new file mode 100644
index 00000000000..870b2750c0f
--- /dev/null
+++ b/chat/licq-core/patches/patch-ag
@@ -0,0 +1,13 @@
+$NetBSD: patch-ag,v 1.1 2007/09/29 12:51:17 rillig Exp $
+
+--- include/licq_buffer.h.orig	2002-11-05 08:00:37.000000000 +0100
++++ include/licq_buffer.h	2007-09-29 14:40:32.000000000 +0200
+@@ -62,7 +62,7 @@ public:
+ 
+    char *Pack(CBuffer *);
+    char *Pack(const char *data, int size);
+-   char *CBuffer::PackLNTS(const char *);
++   char *PackLNTS(const char *);
+    char *PackString(const char *data, unsigned short max = 0);
+    char *PackUnsignedShort(unsigned short data);
+    char *PackUnsignedLong(unsigned long data);
diff --git a/chat/licq-core/patches/patch-ah b/chat/licq-core/patches/patch-ah
new file mode 100644
index 00000000000..70eca8040dc
--- /dev/null
+++ b/chat/licq-core/patches/patch-ah
@@ -0,0 +1,12 @@
+$NetBSD: patch-ah,v 1.1 2007/09/29 12:51:17 rillig Exp $
+
+--- src/icqd-srv.cpp.orig	2003-03-23 19:09:21.000000000 +0100
++++ src/icqd-srv.cpp	2007-09-29 14:46:33.000000000 +0200
+@@ -25,6 +25,7 @@
+ #include "licq_filetransfer.h"
+ #include "support.h"
+ #include "licq_message.h"
++#include "licq.h"
+ 
+ //-----icqAddUser----------------------------------------------------------
+ void CICQDaemon::icqAddUser(unsigned long _nUin, bool _bAuthRequired)
diff --git a/chat/licq-core/patches/patch-ai b/chat/licq-core/patches/patch-ai
new file mode 100644
index 00000000000..f06fcd0217c
--- /dev/null
+++ b/chat/licq-core/patches/patch-ai
@@ -0,0 +1,15 @@
+$NetBSD: patch-ai,v 1.1 2007/09/29 12:51:17 rillig Exp $
+
+--- src/licq.h.orig	2001-05-27 01:15:55.000000000 +0200
++++ src/licq.h	2007-09-29 14:46:02.000000000 +0200
+@@ -38,5 +38,10 @@ protected:
+ friend class CICQDaemon;
+ };
+ 
++extern void *MonitorSockets_tep(void *);
++extern void *Ping_tep(void *);
++extern void *Shutdown_tep(void *);
++extern void *ProcessRunningEvent_Server_tep(void *);
++extern void *ProcessRunningEvent_Client_tep(void *);
+ 
+ #endif