Update to 0.4.7, provided by Shell Hung in pkg/14663.

Changes:
- i18n support
- fix terminal restore on reconnect
- uses more secure API
- more documentation

8 files changed, 62 insertions, 138 deletions

diff --git a/chat/micq/Makefile b/chat/micq/Makefile
index 398061816ad..845114d56ef 100644
--- a/chat/micq/Makefile
+++ b/chat/micq/Makefile
@@ -1,21 +1,21 @@
-# $NetBSD: Makefile,v 1.4 2001/03/18 15:59:13 itojun Exp $
+# $NetBSD: Makefile,v 1.5 2001/11/28 17:30:38 wiz Exp $
 
-DISTNAME=	micq-0.4.6.p1
-PKGNAME=	${DISTNAME:S/p//}
+DISTNAME=	micq-0.4.7
 CATEGORIES=	chat
 MASTER_SITES=	http://micq.ukeer.de/source/
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	packages@netbsd.org
+MAINTAINER=	shell@shellhung.org
 HOMEPAGE=	http://micq.ukeer.de/
 COMMENT=	text-mode ICQ client
 
-WRKSRC=		${WRKDIR}/${DISTNAME:S/.p/-p/}/src
+USE_GMAKE=	YES
+GNU_CONFIGURE=	YES
 
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/micq ${PREFIX}/bin
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/micq
-	${INSTALL_MAN} ${WRKSRC}/../README ${PREFIX}/share/doc/micq
-	${INSTALL_MAN} ${WRKSRC}/../micq.1 ${PREFIX}/man/man1
+post-install:
+	${INSTALL_MAN} ${WRKSRC}/doc/micq.1 ${PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/doc/micq.7 ${PREFIX}/man/man7
+	${INSTALL_MAN} ${WRKSRC}/doc/micqrc.5 ${PREFIX}/man/man5
 
+.include "../../devel/gettext-lib/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/chat/micq/PLIST b/chat/micq/PLIST
index dad8e7ce599..adea796dbc5 100644
--- a/chat/micq/PLIST
+++ b/chat/micq/PLIST
@@ -1,5 +1,24 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 19:47:12 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2001/11/28 17:30:38 wiz Exp $
 bin/micq
-share/doc/micq/README
 man/man1/micq.1
-@dirrm share/doc/micq
+man/man5/micqrc.5
+man/man7/micq.7
+share/micq/bg.i18n
+share/micq/br.i18n
+share/micq/cn.i18n
+share/micq/de.i18n
+share/micq/en.i18n
+share/micq/en_fun.i18n
+share/micq/es.i18n
+share/micq/fi.i18n
+share/micq/fr.i18n
+share/micq/hr.i18n
+share/micq/id.i18n
+share/micq/it.i18n
+share/micq/nl.i18n
+share/micq/pl.i18n
+share/micq/ru.i18n
+share/micq/se.i18n
+share/micq/uk.i18n
+share/micq/yu.i18n
+@dirrm share/micq
diff --git a/chat/micq/distinfo b/chat/micq/distinfo
index 8b766b899c6..cf2b99b3d1c 100644
--- a/chat/micq/distinfo
+++ b/chat/micq/distinfo
@@ -1,9 +1,6 @@
-$NetBSD: distinfo,v 1.3 2001/09/14 15:23:45 wiz Exp $
+$NetBSD: distinfo,v 1.4 2001/11/28 17:30:38 wiz Exp $
 
-SHA1 (micq-0.4.6.p1.tgz) = eba14a1eba2f8b58b90cf848d585dec4d682dff0
-Size (micq-0.4.6.p1.tgz) = 154700 bytes
-SHA1 (patch-aa) = 322ab4a2911afc465b7b49160356e10861909c04
-SHA1 (patch-ab) = e6ffb16d76f314f3d43f2e0d57bdfdcc55fcf89b
-SHA1 (patch-ac) = 066d11e997afb8ce87ad646304466638650f9baf
-SHA1 (patch-ad) = 6d12139dd3bc8028f133fa8687bbe6a3086aaa0b
-SHA1 (patch-ae) = e5b8b53c8c1c7e7ad3a2d98a540317ae8fcd6929
+SHA1 (micq-0.4.7.tgz) = 9eafac726ba1766c365c3fe13c93bd2846d0e558
+Size (micq-0.4.7.tgz) = 254626 bytes
+SHA1 (patch-ab) = a2f834722669baa3371a1e2cfb0a819d56cb279e
+SHA1 (patch-ac) = 3d10352b5bbd2717874384154ca4a58e22a04f7d
diff --git a/chat/micq/patches/patch-aa b/chat/micq/patches/patch-aa
deleted file mode 100644
index bc216b44768..00000000000
--- a/chat/micq/patches/patch-aa
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2001/09/14 15:23:46 wiz Exp $
-
---- Makefile.orig	Tue Jan 23 17:49:05 2001
-+++ Makefile
-@@ -2,15 +2,18 @@
- # originally by Matt D. Smith
- # rewritten by  Rico Gloeckner <mc@verdinet.de>
- 
--CC = gcc
--CFLAGS = -O4 -Wall -DUNIX 
-+#CC = gcc
-+CFLAGS += -Wall -DUNIX 
- 
- # uncomment the line below for debuging info
- #CFLAGS += -g
- 
- CLIBS = 
-+
-+.if (${OPSYS} == "SunOS")
- #uncomment the line below if your using Solaris
--#CLIBS= -lnsl -lsocket
-+CLIBS= -lnsl -lsocket
-+.endif
- #uncomment the line below if your using MiNT
- #CLIBS= -lsocket
- #uncomment the line below if your using NeXT
diff --git a/chat/micq/patches/patch-ab b/chat/micq/patches/patch-ab
index 073432bd198..4d0d9a9b38d 100644
--- a/chat/micq/patches/patch-ab
+++ b/chat/micq/patches/patch-ab
@@ -1,13 +1,17 @@
-$NetBSD: patch-ab,v 1.1 2001/01/31 19:10:12 tron Exp $
+$NetBSD: patch-ab,v 1.2 2001/11/28 17:30:39 wiz Exp $
 
---- mreadline.c.orig	Tue Jan 23 11:49:05 2001
-+++ mreadline.c	Wed Jan 24 22:01:31 2001
-@@ -359,7 +359,7 @@
-               break;
-            }
-         }
--	sprintf (s, "%s %s/", message_cmd,
-+	snprintf (s, sizeof(s), "%s %s/", message_cmd,
- 		tab_array[tab_pointer]);
- 	clen = cpos = strlen (s);
- 	R_undraw();
+--- src/mreadline.c.orig	Thu Nov 22 00:29:15 2001
++++ src/mreadline.c
+@@ -166,9 +166,10 @@
+     }
+ 
+     if ((uin = TabGetNext ()))
+-        sprintf (s, "%s %s/", message_cmd, UIN2Name (uin));
++        snprintf (s, sizeof(s), "%s %s/", message_cmd, UIN2Name (uin));
+     else
+-        sprintf (s, "%s ", message_cmd);
++        snprintf (s, sizeof(2), "%s ", message_cmd);
++
+ 
+     clen = cpos = strlen (s);
+     R_undraw ();
diff --git a/chat/micq/patches/patch-ac b/chat/micq/patches/patch-ac
index 0a5de64c499..e8d866f2f68 100644
--- a/chat/micq/patches/patch-ac
+++ b/chat/micq/patches/patch-ac
@@ -1,13 +1,13 @@
-$NetBSD: patch-ac,v 1.1 2001/01/31 19:10:12 tron Exp $
+$NetBSD: patch-ac,v 1.2 2001/11/28 17:30:39 wiz Exp $
 
---- sendmsg.c.orig	Tue Jan 23 11:49:05 2001
-+++ sendmsg.c	Wed Jan 24 22:02:47 2001
-@@ -977,7 +977,7 @@
+--- src/sendmsg.c.orig	Thu Nov 22 00:32:01 2001
++++ src/sendmsg.c
+@@ -1087,7 +1087,7 @@
  {
-    char buf[450];
-    
--   sprintf( buf, "%s\xFE%s", url, description );
-+   snprintf( buf, sizeof(buf), "%s\xFE%s", url, description );
-    icq_sendmsg( sok, uin, buf, URL_MESS );
+     char buf[450];
+ 
+-    sprintf (buf, "%s\xFE%s", url, description);
++    snprintf (buf, sizeof(buf), "%s\xFE%s", url, description);
+     icq_sendmsg (sok, uin, buf, URL_MESS);
  }
  
diff --git a/chat/micq/patches/patch-ad b/chat/micq/patches/patch-ad
deleted file mode 100644
index ec798279762..00000000000
--- a/chat/micq/patches/patch-ad
+++ /dev/null
@@ -1,42 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2001/01/31 19:10:12 tron Exp $
-
---- util_ui.c.orig	Tue Jan 23 17:49:05 2001
-+++ util_ui.c	Wed Jan 31 20:07:47 2001
-@@ -102,7 +102,7 @@
-    assert( 2048 >= strlen( str ) );
-    
-    va_start( args, str );
--   vsprintf( buf, str, args );
-+   vsnprintf( buf, sizeof(buf), str, args );
-    k = write( fd, buf, strlen( buf ) );
-    if ( k != strlen( buf ) )
-    {
-@@ -292,7 +292,7 @@
-    
-    va_start( args, str );
- #ifndef CURSES_UI
--   vsprintf( buf, str, args );
-+   vsnprintf( buf, sizeof(buf), str, args );
-    str2 = buf;
-    while ( (void *) NULL != ( str1 = strchr( str2, '\x1b' ) ) )
-    {
-@@ -423,19 +423,6 @@
-    thetime=localtime(&p);
- 
-    M_print( "%.02d:%.02d:%.02d",thetime->tm_hour,thetime->tm_min,thetime->tm_sec );
--}
--
--static void remove_tab( int index )
--{
--   int j;
--
--   if ( tab_array[ index ] != NULL ) {
--	free( tab_array[ index ] );
--   }
--   for ( j=index; j+1<TAB_SLOTS; j++ ) {
--	tab_array[ j ] = tab_array[ j+1 ];
--   }
--   tab_array[ TAB_SLOTS ] = NULL;
- }
- 
- void add_tab( DWORD uin )
diff --git a/chat/micq/patches/patch-ae b/chat/micq/patches/patch-ae
deleted file mode 100644
index f0d490025d7..00000000000
--- a/chat/micq/patches/patch-ae
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2001/01/31 19:10:13 tron Exp $
-
---- icq_response.c.orig	Tue Jan 23 17:49:05 2001
-+++ icq_response.c	Wed Jan 31 20:05:15 2001
-@@ -871,19 +871,14 @@
-       }
-       *tmp = 0;
-       char_conv ("wc",data);
--// temporaryy fix to buffer overflow
--// should be solved better -mc
--//      strcpy (url_desc,data);
--      url_desc[0] = '\0';
--      strncat(url_desc,data,sizeof(url_data)-1);
-+      strncpy(url_desc,data,sizeof(url_data)-1);
-+      url_data[sizeof(url_data)-1] = '\0';
- 
-       tmp++;
-       data = tmp;
-       char_conv ("wc",data);
--// same apllies here --mc
--//      strcpy (url_data,data);
--      url_data[0] = '\0';
--      strncat (url_data,data,sizeof(url_data)-1);
-+      strncpy(url_data,data,sizeof(url_data)-1);
-+      url_data[sizeof(url_data)-1] = '\0';
- 
- // and again
- //      sprintf (message,"Description: %s \n                          URL: %s",url_desc,url_data);