From 76a0947c4d5e8e6a79cdcb1cd65872f66450274f Mon Sep 17 00:00:00 2001
From: bernd <bernd@openbsd.org>
Date: Fri, 11 May 2007 11:25:17 +0000
Subject: [PATCH] Update to micq-0.5.3.

ok david@
---
 net/micq/Makefile                         |  7 +++----
 net/micq/distinfo                         | 10 +++++-----
 net/micq/patches/patch-configure          | 24 +++++++++++------------
 net/micq/patches/patch-src_oscar_roster_c | 16 ---------------
 net/micq/patches/patch-src_util_str_c     | 17 ++++++++++++++++
 5 files changed, 37 insertions(+), 37 deletions(-)
 delete mode 100644 net/micq/patches/patch-src_oscar_roster_c
 create mode 100644 net/micq/patches/patch-src_util_str_c

diff --git a/net/micq/Makefile b/net/micq/Makefile
index c01877dde37..2f2c3ba737c 100644
--- a/net/micq/Makefile
+++ b/net/micq/Makefile
@@ -1,10 +1,9 @@
-# $OpenBSD: Makefile,v 1.40 2006/11/03 17:55:07 bernd Exp $
+# $OpenBSD: Makefile,v 1.41 2007/05/11 11:25:17 bernd Exp $
 # $FreeBSD: Makefile,v 1.6 1999/06/03 08:31:06 ache Exp $
 
 COMMENT=	"text-based ICQ implementation"
 
-DISTNAME=	micq-0.5.1
-PKGNAME=	${DISTNAME}p0
+DISTNAME=	micq-0.5.3
 CATEGORIES=	net
 
 MAINTAINER=	David Krause <david@openbsd.org>
@@ -25,7 +24,7 @@ EXTRACT_SUFX=	.tgz
 
 MODULES=	converters/libiconv
 
-CONFIGURE_ARGS+=--enable-ssl=openssl
+CONFIGURE_ARGS+=--enable-ssl=openssl --disable-tcl
 CONFIGURE_ENV+=	MICQ_EXTRAVERSION="OpenBSD Ports Tree"
 
 USE_GMAKE=	Yes
diff --git a/net/micq/distinfo b/net/micq/distinfo
index 105501ac97f..eab9fff86e6 100644
--- a/net/micq/distinfo
+++ b/net/micq/distinfo
@@ -1,5 +1,5 @@
-MD5 (micq-0.5.1.tgz) = io0z4TCt0BfnYpPniNPVkA==
-RMD160 (micq-0.5.1.tgz) = RRjl/kwU6iN2RHCg0JkWWLRzuus=
-SHA1 (micq-0.5.1.tgz) = Glrs4l6Chh3jGYUbxf9nAVcKb7g=
-SHA256 (micq-0.5.1.tgz) = nco3QLrWCOmaimVfySSYrxpgNg9BIFFJAv4m76XJJd4=
-SIZE (micq-0.5.1.tgz) = 1082826
+MD5 (micq-0.5.3.tgz) = W/PCr2KwwLQy1fICIt6rsg==
+RMD160 (micq-0.5.3.tgz) = 1pVFmtD7UCiI4AoH6EBMsQz7mw0=
+SHA1 (micq-0.5.3.tgz) = 0vDpy5B4A4XFgeh1F+4D+pCRa7o=
+SHA256 (micq-0.5.3.tgz) = /l+7lyis2+O+mW+BaDWgveNvhfLtAIaKHAXqeZ3+gGU=
+SIZE (micq-0.5.3.tgz) = 1135563
diff --git a/net/micq/patches/patch-configure b/net/micq/patches/patch-configure
index 1d5c5c9e44c..72050ccdccf 100644
--- a/net/micq/patches/patch-configure
+++ b/net/micq/patches/patch-configure
@@ -1,12 +1,12 @@
-$OpenBSD: patch-configure,v 1.2 2006/01/25 03:27:40 david Exp $
---- configure.orig	Mon Jan 16 15:59:21 2006
-+++ configure	Mon Jan 23 02:42:24 2006
-@@ -13916,7 +13916,7 @@ s,@EGREP@,$EGREP,;t t
- s,@LIBGNUTLS_CONFIG@,$LIBGNUTLS_CONFIG,;t t
- s,@LIBGNUTLS_CFLAGS@,$LIBGNUTLS_CFLAGS,;t t
- s,@LIBGNUTLS_LIBS@,$LIBGNUTLS_LIBS,;t t
--s,@LIBICONV@,$LIBICONV,;t t
-+s,@LIBICONV@,$LTLIBICONV,;t t
- s,@LTLIBICONV@,$LTLIBICONV,;t t
- s,@CXX@,$CXX,;t t
- s,@CXXFLAGS@,$CXXFLAGS,;t t
+$OpenBSD: patch-configure,v 1.3 2007/05/11 11:25:17 bernd Exp $
+--- configure.orig	Wed May  9 21:52:43 2007
++++ configure	Wed May  9 21:53:09 2007
+@@ -16406,7 +16406,7 @@ EGREP!$EGREP$ac_delim
+ LIBGNUTLS_CONFIG!$LIBGNUTLS_CONFIG$ac_delim
+ LIBGNUTLS_CFLAGS!$LIBGNUTLS_CFLAGS$ac_delim
+ LIBGNUTLS_LIBS!$LIBGNUTLS_LIBS$ac_delim
+-LIBICONV!$LIBICONV$ac_delim
++LIBICONV!$LTLIBICONV$ac_delim
+ LTLIBICONV!$LTLIBICONV$ac_delim
+ CXX!$CXX$ac_delim
+ _ACEOF
diff --git a/net/micq/patches/patch-src_oscar_roster_c b/net/micq/patches/patch-src_oscar_roster_c
deleted file mode 100644
index 0e3d2dce7e1..00000000000
--- a/net/micq/patches/patch-src_oscar_roster_c
+++ /dev/null
@@ -1,16 +0,0 @@
-$OpenBSD: patch-src_oscar_roster_c,v 1.1 2006/11/03 17:55:07 bernd Exp $
-
-Backport from micq CVS. (Fixed >0.5.1)
-
-* Fix icq login problem
-
---- src/oscar_roster.c.orig	Fri Nov  3 01:15:05 2006
-+++ src/oscar_roster.c	Fri Nov  3 01:15:45 2006
-@@ -100,6 +100,7 @@ JUMP_SNAC_F(SnacSrvReplylists)
-     SnacCliReady (serv);
-     SnacCliAddcontact (serv, NULL, serv->contacts);
-     SnacCliReqofflinemsgs (serv);
-+    SnacCliReqinfo (serv);
-     if (serv->flags & CONN_WIZARD)
-     {
-         IMRoster (serv, IMROSTER_IMPORT);
diff --git a/net/micq/patches/patch-src_util_str_c b/net/micq/patches/patch-src_util_str_c
new file mode 100644
index 00000000000..02aabb19962
--- /dev/null
+++ b/net/micq/patches/patch-src_util_str_c
@@ -0,0 +1,17 @@
+$OpenBSD: patch-src_util_str_c,v 1.1 2007/05/11 11:25:17 bernd Exp $
+
+http://micq.org/pipermail/micq-list/2007-April/001483.html
+Should be fixed in micq >0.5.3.
+
+--- src/util_str.c.orig	Wed May  9 21:54:15 2007
++++ src/util_str.c	Wed May  9 21:54:43 2007
+@@ -412,7 +412,8 @@ const char *s_time (time_t *stamp)
+         stamp = NULL;
+     }
+     now = *localtime (&nowsec);
+-    
++
++    s_init (&str, "", 32);
+     while (!rc)
+     {
+         rc = strftime (str.txt, str.max,