diff options
author | Dirk Meyer <dinoex@FreeBSD.org> | 2006-10-31 05:27:10 +0000 |
---|---|---|
committer | Dirk Meyer <dinoex@FreeBSD.org> | 2006-10-31 05:27:10 +0000 |
commit | 833affb30ca43eac853dcc3d1772f4251d9f6a85 (patch) | |
tree | 2c8eaecaefda3b6876c6c863a1db9fc90b467e33 /net-im/licq | |
parent | - fix interactive mode for OpenLDAP (diff) |
- update to 1.3.4
pkg-plist files submitted by Dennis Schneider
Notes
Notes:
svn path=/head/; revision=175659
Diffstat (limited to 'net-im/licq')
-rw-r--r-- | net-im/licq/Makefile.inc | 8 | ||||
-rw-r--r-- | net-im/licq/distinfo | 6 | ||||
-rw-r--r-- | net-im/licq/files/patch-admin-ltmain.sh | 12 | ||||
-rw-r--r-- | net-im/licq/files/patch-licq_buffer.h | 12 | ||||
-rw-r--r-- | net-im/licq/files/patch-licq_icqd.h | 75 | ||||
-rw-r--r-- | net-im/licq/files/patch-translate.cpp | 56 | ||||
-rw-r--r-- | net-im/licq/pkg-plist | 6 |
7 files changed, 11 insertions, 164 deletions
diff --git a/net-im/licq/Makefile.inc b/net-im/licq/Makefile.inc index 9ebf6396de19..c75f4a0c935e 100644 --- a/net-im/licq/Makefile.inc +++ b/net-im/licq/Makefile.inc @@ -2,11 +2,11 @@ # $FreeBSD$ PKGNAMEPREFIX= licq- -LICQ_VER= 1.3.2 -QT_LICQ_VER= 1.3.2 -OSD_LICQ_VER= 1.3.2 +LICQ_VER= 1.3.4 +QT_LICQ_VER= 1.3.4 +OSD_LICQ_VER= 1.3.4 RMS_LICQ_VER= 0.33 -CONSOLE_LICQ_VER= 1.3.2 +CONSOLE_LICQ_VER= 1.3.4 JONS_GTK_LICQ_VER= 0.20.2 .if ${PORTNAME} != "base" RUN_DEPENDS+= licq:${PORTSDIR}/${LICQ_PORT} diff --git a/net-im/licq/distinfo b/net-im/licq/distinfo index e21e8e9f2e3d..f8eec4d6c823 100644 --- a/net-im/licq/distinfo +++ b/net-im/licq/distinfo @@ -1,3 +1,3 @@ -MD5 (licq-1.3.2.tar.bz2) = 0471bb8fed91eefb23dfe153c9a4a806 -SHA256 (licq-1.3.2.tar.bz2) = 3c6ec77d42973c93a9d1926a3aa444ff0388263f38a19c9b51e1337cde60f8bc -SIZE (licq-1.3.2.tar.bz2) = 3980117 +MD5 (licq-1.3.4.tar.bz2) = 3bab0c9d1977f9b14421d36110e17e0c +SHA256 (licq-1.3.4.tar.bz2) = eed39b1fa78d6c03655babc6cb03155ed71391ec1422752d0611bd2583c2f608 +SIZE (licq-1.3.4.tar.bz2) = 3088438 diff --git a/net-im/licq/files/patch-admin-ltmain.sh b/net-im/licq/files/patch-admin-ltmain.sh deleted file mode 100644 index 33a0638ce819..000000000000 --- a/net-im/licq/files/patch-admin-ltmain.sh +++ /dev/null @@ -1,12 +0,0 @@ ---- admin/ltmain.sh.orig Sun Oct 26 04:47:29 2003 -+++ admin/ltmain.sh Sun Oct 26 04:47:56 2003 -@@ -1239,7 +1239,7 @@ - esac - elif test "X$arg" = "X-lc_r"; then - case $host in -- *-*-openbsd* | *-*-freebsd*) -+ *-*-openbsd*) - # Do not include libc_r directly, use -pthread flag. - continue - ;; - diff --git a/net-im/licq/files/patch-licq_buffer.h b/net-im/licq/files/patch-licq_buffer.h deleted file mode 100644 index 3de48085cf96..000000000000 --- a/net-im/licq/files/patch-licq_buffer.h +++ /dev/null @@ -1,12 +0,0 @@ -diff -ru licq-1.3.2/include/licq_buffer.h include/licq_buffer.h ---- licq-1.3.2/include/licq_buffer.h Wed Feb 4 18:00:20 2004 -+++ include/licq_buffer.h Sat Jul 15 16:38:24 2006 -@@ -62,7 +62,7 @@ - - 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/net-im/licq/files/patch-licq_icqd.h b/net-im/licq/files/patch-licq_icqd.h deleted file mode 100644 index 520f4157cd00..000000000000 --- a/net-im/licq/files/patch-licq_icqd.h +++ /dev/null @@ -1,75 +0,0 @@ -diff -ru licq-1.3.2/include/licq_icqd.h include/licq_icqd.h ---- licq-1.3.2/include/licq_icqd.h Fri Sep 9 18:13:53 2005 -+++ include/licq_icqd.h Sun Sep 3 20:00:07 2006 -@@ -6,6 +6,11 @@ - #ifndef ICQD_H - #define ICQD_H - -+#include <sys/select.h> -+#include <sys/time.h> -+#include <sys/types.h> -+#include <unistd.h> -+ - #include <vector> - #include <list> - #include <deque> -@@ -39,6 +44,28 @@ - class CReverseConnectToUserData; - class CMSN; - -+#define FOR_EACH_PROTO_PLUGIN_START(d) \ -+ { \ -+ ProtoPluginsList _pl_; \ -+ ProtoPluginsListIter _ppit; \ -+ d->ProtoPluginList(_pl_); \ -+ for (_ppit = _pl_.begin(); _ppit != _pl_.end(); _ppit++) \ -+ { -+ -+#define FOR_EACH_PROTO_PLUGIN_END \ -+ } \ -+ } -+ -+/* Forward declarations for friend functions */ -+void *Ping_tep(void *p); -+void *UpdateUsers_tep(void *p); -+void *MonitorSockets_tep(void *p); -+void *ReverseConnectToUser_tep(void *p); -+void *ProcessRunningEvent_Client_tep(void *p); -+void *ProcessRunningEvent_Server_tep(void *p); -+void *Shutdown_tep(void *p); -+void *ConnectToServer_tep(void *s); -+ - const unsigned short IGNORE_MASSMSG = 1; - const unsigned short IGNORE_NEWUSERS = 2; - const unsigned short IGNORE_EMAILPAGER = 4; -@@ -577,9 +604,12 @@ - ICQEvent *PopPluginEvent(); - CSignal *PopProtoSignal(); - -- // Server Side List functions -+ // ICQ options - bool UseServerContactList() { return m_bUseSS; } -- void SetUseServerContactList(bool b) { m_bUseSS = b; } -+ bool SendTypingNotification() { return m_bSendTN; } -+ -+ void SetUseServerContactList(bool b) { m_bUseSS = b; } -+ void SetSendTypingNotification(bool b) { m_bSendTN = b; } - - // Misc functions - bool ReconnectAfterUinClash() { return m_bReconnectAfterUinClash; } -@@ -669,6 +699,7 @@ - - // Misc - bool m_bUseSS; // server side list -+ bool m_bSendTN; // Send typing notifications - bool m_bReconnectAfterUinClash; // reconnect after uin has been used from another location? - - // Statistics -@@ -726,6 +757,7 @@ - ICQEvent *DoneExtendedServerEvent(const unsigned short, EventResult); - ICQEvent *DoneExtendedEvent(ICQEvent *, EventResult); - ICQEvent *DoneExtendedEvent(unsigned long tag, EventResult _eResult); -+ bool hasServerEvent(unsigned long); - void ProcessDoneEvent(ICQEvent *); - void PushExtendedEvent(ICQEvent *); - void PushPluginSignal(CICQSignal *); diff --git a/net-im/licq/files/patch-translate.cpp b/net-im/licq/files/patch-translate.cpp deleted file mode 100644 index 836fce3920b5..000000000000 --- a/net-im/licq/files/patch-translate.cpp +++ /dev/null @@ -1,56 +0,0 @@ ---- src/translate.cpp.orig Thu Oct 13 17:09:23 2005 -+++ src/translate.cpp Sun Dec 11 16:46:24 2005 -@@ -223,7 +223,8 @@ - char *szNewStr = new char[nLen + 1]; - size_t nInSize, nOutSize; - -- char *szIn = _sz, *szOut = szNewStr; -+ const char *szIn = _sz; -+ char *szOut = szNewStr; - iconv_t tr; - - nInSize = nLen; -@@ -268,7 +269,8 @@ - char *szNewStr = new char[nLen + 1]; - size_t nInSize, nOutSize; - -- char *szIn = _sz, *szOut = szNewStr; -+ const char *szIn = _sz; -+ char *szOut = szNewStr; - iconv_t tr; - - nInSize = nLen; -@@ -312,7 +314,8 @@ - char *szNewStr = new char[nLen * 2]; - size_t nInSize, nOutSize; - -- char *szIn = _sz, *szOut = szNewStr; -+ const char *szIn = _sz; -+ char *szOut = szNewStr; - iconv_t tr; - - nInSize = nLen; -@@ -339,11 +342,21 @@ - unsigned short nLen = strlen(_sz) * 3; - char *szNewStr = new char[nLen + 1]; - size_t nInSize, nOutSize; -- char *szOut = szNewStr, *szIn = _sz; -+ const char *szIn = _sz; -+ char *szOut = szNewStr; - iconv_t tr; - - nInSize = strlen(szIn); - nOutSize = nLen; -+ //--- deleting ' ' from _szEncoding --- -+ char *_szEnc_tmp = _szEncoding, *_szEnc_tmp2 = _szEncoding; -+ int _szflag = 0; -+ while (*_szEnc_tmp) -+ { -+ if (*_szEnc_tmp == ' ') {*_szEnc_tmp++; _szflag++;} -+ *_szEnc_tmp2++ = *_szEnc_tmp++; -+ } -+ while(_szflag--) --(*_szEnc_tmp2) = '\0'; - - tr = iconv_open("UCS-2BE", _szEncoding); - size_t ret = iconv(tr, &szIn, &nInSize, &szOut, &nOutSize); - diff --git a/net-im/licq/pkg-plist b/net-im/licq/pkg-plist index ce4cba563e01..1ee67f37894a 100644 --- a/net-im/licq/pkg-plist +++ b/net-im/licq/pkg-plist @@ -1,10 +1,12 @@ bin/licq +bin/viewurl-firefox.sh bin/viewurl-lynx.sh +bin/viewurl-mozilla.sh bin/viewurl-ncftp.sh bin/viewurl-netscape.sh -bin/viewurl-mozilla.sh -bin/viewurl-w3m.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 |