Update licq-{core,gui-console,gui-qt} to 1.3.5.

New in 1.3.4
o Fix a few bugs where users would falsely go offline
o Make sending typing notifications optional
o Fixes for newly registered users
o Fix the handling of pidfiles so that Licq always starts unless there actually
is an other instance of Licq running.
o 64-bit compatibility changes
o Compilation fixes
o Fixes for Licq on Mac OS X (with Fink)
o Iconv fixes
o ICQ: Fix a bug where contacts would receive empty messages
o ICQ: Update the protocol to properly set info
o ICQ: Show more version information of remote clients
o ICQ: Fix SSL issue
o MSN: Fix a race error in MSN packet parsing
o MSN: Fix socket handling
o KDE: Addressbook fix
o KDE: Add spell checking to the kde-gui (Using KSpell)
o Qt/KDE: Show user's pictures as a tooltip or status icon
o Qt/KDE: Optional "Send with Enter"
o Qt/KDE: Improve hyperlink detection
o Qt/KDE: Improve emoticon detection and processing
o Qt/KDE: Add a custom message box handler
o Qt/KDE: New KDE iconset to better integrate with the KDE desktop
Many various minor bugs and crashes fixed... See http://tinyurl.com/ygdrfo for d
etails.

Build and basic startup done on NetBSD 4.0 and Mac OS X 10.5

5 files changed, 22 insertions, 67 deletions

diff --git a/chat/licq-core/patches/patch-ab b/chat/licq-core/patches/patch-ab
deleted file mode 100644
index 1d4165cf44b..00000000000
--- a/chat/licq-core/patches/patch-ab
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2005/12/19 19:38:55 joerg Exp $
-
---- src/socket.cpp.orig	2005-12-19 18:33:17.000000000 +0000
-+++ src/socket.cpp
-@@ -1012,7 +1012,7 @@ bool TCPSocket::SSL_Pending()
- bool TCPSocket::SecureConnect()
- {
-   pthread_mutex_init(&mutex_ssl, NULL);
--  m_pSSL = SSL_new(gSSL_CTX);
-+  m_p_SSL = SSL_new(gSSL_CTX);
- #ifdef SSL_DEBUG
-   m_pSSL->debug = 1;
- #endif
-@@ -1045,7 +1045,7 @@ bool TCPSocket::SecureListen()
- {
-   pthread_mutex_init(&mutex_ssl, NULL);
- 
--  m_pSSL = SSL_new(gSSL_CTX);
-+  m_p_SSL = SSL_new(gSSL_CTX);
-   SSL_set_session(m_pSSL, NULL);
-   SSL_set_fd(m_pSSL, m_nDescriptor);
-   int i = SSL_accept(m_pSSL);
diff --git a/chat/licq-core/patches/patch-ac b/chat/licq-core/patches/patch-ac
deleted file mode 100644
index 98b1d2bf0b9..00000000000
--- a/chat/licq-core/patches/patch-ac
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ac,v 1.3 2007/09/29 12:51:17 rillig Exp $
-
---- 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__) || defined(__NetBSD__)
-+  { unsigned long tmp; m_fConf.ReadNum("SSTime", tmp, 0L); m_nSSTime = tmp; }
-+#else
-   m_fConf.ReadNum("SSTime", (unsigned long)m_nSSTime, 0L);
-+#endif
-   m_fConf.ReadNum("SSCount", m_nSSCount, 0);
-   SetAutoResponse(szTemp);
- 
diff --git a/chat/licq-core/patches/patch-ag b/chat/licq-core/patches/patch-ag
deleted file mode 100644
index 870b2750c0f..00000000000
--- a/chat/licq-core/patches/patch-ag
+++ /dev/null
@@ -1,13 +0,0 @@
-$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
deleted file mode 100644
index 70eca8040dc..00000000000
--- a/chat/licq-core/patches/patch-ah
+++ /dev/null
@@ -1,12 +0,0 @@
-$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-qa b/chat/licq-core/patches/patch-qa
index 45214a8c30d..1c240386663 100644
--- a/chat/licq-core/patches/patch-qa
+++ b/chat/licq-core/patches/patch-qa
@@ -1,8 +1,8 @@
-$NetBSD: patch-qa,v 1.1 2007/10/10 10:20:32 rillig Exp $
+$NetBSD: patch-qa,v 1.2 2007/12/22 22:34:24 jdolecek Exp $
 
---- plugins/qt-gui/configure.orig	2006-04-28 10:36:59.000000000 +0000
+--- plugins/qt-gui/configure.orig	2007-10-28 19:42:59.000000000 +0100
 +++ plugins/qt-gui/configure
-@@ -17307,8 +17307,8 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+@@ -22556,8 +22556,8 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
      save_LIBS="$LIBS"
  
      CXXFLAGS="$CXXFLAGS $QT_INCLUDES $X_CFLAGS"
@@ -12,4 +12,22 @@ $NetBSD: patch-qa,v 1.1 2007/10/10 10:20:32 rillig Exp $
 +    LIBS="$LIB_QT $X_PRE_LIBS -lX11 -lXext $LIBS $PTHREAD_LIBS"
  
      cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
+ /* confdefs.h.  */
+@@ -22943,7 +22943,7 @@ echo "${ECHO_T}no" >&6; }
+ 
+ 
+ 
+-  if test "$have_kde" == "yes"; then
++  if test "$have_kde" = "yes"; then
+     # Extract the first word of "dcopidl", so it can be a program name with args.
+ set dummy dcopidl; ac_word=$2
+ { echo "$as_me:$LINENO: checking for $ac_word" >&5
+@@ -23978,6 +23978,8 @@ do
+   case $ac_option in
+   # Handling of the options.
+   -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
++	: Avoid regenerating within pkgsrc
++	exit 0
+     ac_cs_recheck=: ;;
+   --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
+     echo "$ac_cs_version"; exit ;;