- update to 1.3.9

9 files changed, 8 insertions, 46 deletions

diff --git a/net-im/licq-osd/Makefile b/net-im/licq-osd/Makefile
index fea6163f5f20..d77409c2d9c6 100644
--- a/net-im/licq-osd/Makefile
+++ b/net-im/licq-osd/Makefile
@@ -8,7 +8,6 @@
 
 PORTNAME=	osd
 PORTVERSION=	${OSD_LICQ_VER}
-PORTREVISION=	5
 PORTEPOCH=	1
 CATEGORIES=	net-im
 
diff --git a/net-im/licq-osd/distinfo b/net-im/licq-osd/distinfo
deleted file mode 100644
index c84c944c03e2..000000000000
--- a/net-im/licq-osd/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (licq_osd_plugin-1.2.7.2.tar.gz) = 59621561c391f3c85fecdd5f8ec562c8
-SHA256 (licq_osd_plugin-1.2.7.2.tar.gz) = bafc6a1b0cc2d7552e6328c3117fb23c0858814a311db276af0f7a537becfc69
-SIZE (licq_osd_plugin-1.2.7.2.tar.gz) = 204846
diff --git a/net-im/licq-osd/files/patch-aa b/net-im/licq-osd/files/patch-licq-osd.cpp
index b912e0ecf1f6..b912e0ecf1f6 100644
--- a/net-im/licq-osd/files/patch-aa
+++ b/net-im/licq-osd/files/patch-licq-osd.cpp
diff --git a/net-im/licq-osd/files/patch-src::licq_osd.conf.h b/net-im/licq-osd/files/patch-licq_osd.conf.h
index 536d83d1f4da..536d83d1f4da 100644
--- a/net-im/licq-osd/files/patch-src::licq_osd.conf.h
+++ b/net-im/licq-osd/files/patch-licq_osd.conf.h
diff --git a/net-im/licq-qt-gui/Makefile b/net-im/licq-qt-gui/Makefile
index 053642adb879..6d7991d5a918 100644
--- a/net-im/licq-qt-gui/Makefile
+++ b/net-im/licq-qt-gui/Makefile
@@ -7,7 +7,6 @@
 
 PORTNAME=	qt-gui
 PORTVERSION=	${QT_LICQ_VER}
-PORTREVISION=	3
 CATEGORIES=	net-im
 PKGNAMESUFFIX?=	${KDE_SUFFIX}${PKGNAMESUFFIX2}
 
diff --git a/net-im/licq/Makefile.inc b/net-im/licq/Makefile.inc
index e603991de4f8..2e60c902fdc3 100644
--- a/net-im/licq/Makefile.inc
+++ b/net-im/licq/Makefile.inc
@@ -2,11 +2,10 @@
 # $FreeBSD$
 
 PKGNAMEPREFIX=		licq-
-LICQ_VER=		1.3.6
-QT_LICQ_VER=		1.3.6
-OSD_LICQ_VER=		1.3.2.1
-RMS_LICQ_VER=		1.3.2
-CONSOLE_LICQ_VER=	1.3.6
+LICQ_VER=		1.3.9
+QT_LICQ_VER=		1.3.9
+OSD_LICQ_VER=		1.3.9
+CONSOLE_LICQ_VER=	1.3.9
 .if ${PORTNAME} != "base"
 RUN_DEPENDS+=		licq:${PORTSDIR}/${LICQ_PORT}
 .endif
diff --git a/net-im/licq/distinfo b/net-im/licq/distinfo
index 3e410b12f1ff..06a813ae58c5 100644
--- a/net-im/licq/distinfo
+++ b/net-im/licq/distinfo
@@ -1,3 +1,3 @@
-MD5 (licq-1.3.6.tar.bz2) = 9a2842dceba565601d0339347e6e203d
-SHA256 (licq-1.3.6.tar.bz2) = ad6ea66301923e5d106111a6b4654aaa72131d8b5c499d16dc9fbbc8cd29845e
-SIZE (licq-1.3.6.tar.bz2) = 4777777
+MD5 (licq-1.3.9.tar.bz2) = 5285efd538fc5540cc85bc8979b8efae
+SHA256 (licq-1.3.9.tar.bz2) = 67c300a3b7045a1d6f182f4824a9c6815f9b71db1816885fc83bf9937fffd056
+SIZE (licq-1.3.9.tar.bz2) = 4507409
diff --git a/net-im/licq/files/patch-socket.cpp b/net-im/licq/files/patch-socket.cpp
deleted file mode 100644
index be0b88a6038b..000000000000
--- a/net-im/licq/files/patch-socket.cpp
+++ /dev/null
@@ -1,32 +0,0 @@
---- src/socket.cpp.orig	Mon Jun 16 19:09:46 2003
-+++ src/socket.cpp	Mon Aug  2 16:05:55 2004
-@@ -20,6 +20,9 @@
- #include <netdb.h>
- #include <fcntl.h>
- #include <unistd.h>
-+#ifdef __FreeBSD__
-+#include <osreldate.h>
-+#endif
- 
- #ifdef HAVE_INET_ATON
- #include <arpa/inet.h>
-@@ -49,7 +52,6 @@
- #ifdef USE_SOCKS5
- 
- #define SOCKS
--#define INCLUDE_PROTOTYPES
- extern "C" {
- #include <socks.h>
- }
-@@ -489,7 +491,11 @@
-     m_sRemoteAddr.sin_family = AF_INET;
- 
-     // if connect fails then call CloseConnection to clean up before returning
-+#if defined(__FreeBSD__) && __FreeBSD_version < 400013
-+    int sizeofSockaddr = sizeof(struct sockaddr);
-+#else
-     socklen_t sizeofSockaddr = sizeof(struct sockaddr);
-+#endif
-     if (connect(m_nDescriptor, (struct sockaddr *)&m_sRemoteAddr, sizeofSockaddr) < 0)
-     {
-       // errno has been set
diff --git a/net-im/licq/pkg-plist b/net-im/licq/pkg-plist
index 3786c84d40e2..7ed57094eeab 100644
--- a/net-im/licq/pkg-plist
+++ b/net-im/licq/pkg-plist
@@ -25,6 +25,7 @@ include/licq/licq_interestcodes.h
 include/licq/licq_languagecodes.h
 include/licq/licq_log.h
 include/licq/licq_message.h
+include/licq/licq_mutex.h
 include/licq/licq_occupationcodes.h
 include/licq/licq_onevent.h
 include/licq/licq_organizationcodes.h
@@ -41,7 +42,6 @@ include/licq/licq_socket.h
 include/licq/licq_translate.h
 include/licq/licq_user.h
 include/licq/licq_utility.h
-include/licq/pthread_rdwr.h
 share/licq/sounds/Monty-Python.wav
 share/licq/sounds/fun/Auth.wav
 share/licq/sounds/fun/Chat.wav