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

8 files changed, 47 insertions, 80 deletions

diff --git a/chat/licq-core/Makefile b/chat/licq-core/Makefile
index ff0314fb293..944e7930605 100644
--- a/chat/licq-core/Makefile
+++ b/chat/licq-core/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2006/11/02 07:07:13 jdolecek Exp $
+# $NetBSD: Makefile,v 1.10 2007/12/22 22:34:22 jdolecek Exp $
 #
 
-DISTNAME=	licq-1.2.6
-PKGREVISION=	1
+DISTNAME=	licq-1.3.5
 PKGNAME=	${DISTNAME:C/-/-core-/}
 CATEGORIES=	chat
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=licq/}
@@ -16,5 +15,12 @@ USE_LANGUAGES=	c c++
 USE_LIBTOOL=	YES
 GNU_CONFIGURE=	YES
 
+.include "../../mk/bsd.prefs.mk"
+
+# Make sure modules can link correctly
+.if ${OPSYS} == "Darwin"
+INSTALL_UNSTRIPPED=	yes
+.endif
+
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/chat/licq-core/PLIST b/chat/licq-core/PLIST
index 618b501e836..e8377bccd10 100644
--- a/chat/licq-core/PLIST
+++ b/chat/licq-core/PLIST
@@ -1,11 +1,14 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2003/04/24 23:57:36 hubertf Exp $
+@comment $NetBSD: PLIST,v 1.2 2007/12/22 22:34:23 jdolecek Exp $
 bin/licq
+bin/viewurl-firefox.sh
 bin/viewurl-lynx.sh
 bin/viewurl-mozilla.sh
 bin/viewurl-ncftp.sh
 bin/viewurl-netscape.sh
 bin/viewurl-opera.sh
+bin/viewurl-seamonkey.sh
 bin/viewurl-w3m.sh
+include/licq/licq_backgroundcodes.h
 include/licq/licq_buffer.h
 include/licq/licq_chat.h
 include/licq/licq_color.h
@@ -15,15 +18,22 @@ include/licq/licq_events.h
 include/licq/licq_file.h
 include/licq/licq_filetransfer.h
 include/licq/licq_history.h
+include/licq/licq_homepagecodes.h
 include/licq/licq_icq.h
 include/licq/licq_icqd.h
+include/licq/licq_interestcodes.h
 include/licq/licq_languagecodes.h
 include/licq/licq_log.h
 include/licq/licq_message.h
+include/licq/licq_occupationcodes.h
 include/licq/licq_onevent.h
+include/licq/licq_organizationcodes.h
 include/licq/licq_packets.h
 include/licq/licq_plugin.h
 include/licq/licq_plugind.h
+include/licq/licq_protoplugin.h
+include/licq/licq_protoplugind.h
+include/licq/licq_providers.h
 include/licq/licq_proxy.h
 include/licq/licq_sar.h
 include/licq/licq_sighandler.h
diff --git a/chat/licq-core/distinfo b/chat/licq-core/distinfo
index 50b7c614ebe..2dad2207365 100644
--- a/chat/licq-core/distinfo
+++ b/chat/licq-core/distinfo
@@ -1,17 +1,13 @@
-$NetBSD: distinfo,v 1.9 2007/10/10 10:20:32 rillig Exp $
+$NetBSD: distinfo,v 1.10 2007/12/22 22:34:23 jdolecek 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 (licq-1.3.5.tar.bz2) = a1059173f36694e6e5ec9ba62ced6e9738807916
+RMD160 (licq-1.3.5.tar.bz2) = 4442f6cb3630d8300e5f128617a522bd2cb863dc
+Size (licq-1.3.5.tar.bz2) = 3260471 bytes
 SHA1 (patch-aa) = 974a65e3483b3438fb3c6c9aaf96aa67e4c60fa6
-SHA1 (patch-ab) = 6acfff2027ce5ed4c8fb7eddbdbc4b4a7617eea9
-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
 SHA1 (patch-ca) = 36475ac0642e8908a2ae6a8913efa25ba09af1c3
-SHA1 (patch-qa) = 92cac6e7248275ba4c1a611262e56dd2a33ffe73
+SHA1 (patch-qa) = a2f8c7aa14f30a1139600ef89b39b5540d5ef715
 SHA1 (patch-qb) = 2fa14d43c3d415947fdd67db30642b31030e5a3b
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 ;;