cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

upgrade to version 0.4.7

Browse Source 
--
No response from maintainer
This commit is contained in:
kevlo 2001-07-25 16:13:01 +00:00
parent 6db4be3ca1
commit c23b85ea71
13 changed files with 48 additions and 171 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
net/micq/Makefile
View File

@ -1,32 +1,34 @@
# $OpenBSD: Makefile,v 1.16 2001/05/26 05:13:46 form Exp $
# $OpenBSD: Makefile,v 1.17 2001/07/25 16:13:01 kevlo Exp $
# $FreeBSD: Makefile,v 1.6 1999/06/03 08:31:06 ache Exp $
COMMENT= "text-based ICQ implementation"
DISTNAME= micq-0.4.6-p4
PKGNAME= micq-0.4.6p4
DISTNAME= micq-0.4.7
CATEGORIES= net
MASTER_SITES= http://micq.ukeer.de/source/
EXTRACT_SUFX= .tgz
NEED_VERSION= 1.425
MAINTAINER= Oleg Safiullin <form@openbsd.org>
HOMEPAGE= http://micq.ukeer.de/
COPTS= -DHAVE_SNPRINTF
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
do-install:
${INSTALL_PROGRAM} ${WRKBUILD}/src/micq ${PREFIX}/bin
${INSTALL_MAN} ${WRKSRC}/micq.1 ${PREFIX}/man/man1
MASTER_SITES= ${HOMEPAGE}/source/
EXTRACT_SUFX= .tgz
USE_GMAKE= Yes
CONFIGURE_STYLE= gnu
DOCS= README README.SOCKS5 commands.txt icq091.txt
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/micq
${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/micq
${INSTALL_DATA} ${WRKSRC}/CHANGELOG ${PREFIX}/share/doc/micq
${INSTALL_DATA_DIR} ${PREFIX}/share/micq
${INSTALL_DATA} ${WRKSRC}/lang/*.i18n ${PREFIX}/share/micq
${INSTALL_MAN} ${WRKSRC}/doc/micq.1 ${PREFIX}/man/man1
${INSTALL_MAN} ${WRKSRC}/doc/micqrc.5 ${PREFIX}/man/man5
${INSTALL_MAN} ${WRKSRC}/doc/micq.7 ${PREFIX}/man/man7
cd ${WRKSRC}/doc; ${INSTALL_DATA} ${DOCS} ${PREFIX}/share/doc/micq
.include <bsd.port.mk>

6
net/micq/files/md5
View File

@ -1,3 +1,3 @@
MD5 (micq-0.4.6-p4.tgz) = 406023bd8b0a33ef0acef96454b63f88
RMD160 (micq-0.4.6-p4.tgz) = e4c3a675bf4a5bc5bd64b684b5a7f7ecc0eb4677
SHA1 (micq-0.4.6-p4.tgz) = e19f9bd7f5a2d2272e6ff1ab51a330034c6e2693
MD5 (micq-0.4.7.tgz) = 6081be02fe7c2cf4279c29cfd28b4c9c
RMD160 (micq-0.4.7.tgz) = a3f6b148746f8534b5e4feee6ca8244e15b91924
SHA1 (micq-0.4.7.tgz) = 9eafac726ba1766c365c3fe13c93bd2846d0e558

18
net/micq/patches/patch-src_Makefile
View File

@ -1,18 +0,0 @@
$OpenBSD: patch-src_Makefile,v 1.1 2001/05/26 05:13:47 form Exp $
--- src/Makefile.orig Sat May 26 10:52:10 2001
+++ src/Makefile Sat May 26 10:52:36 2001
@@ -2,11 +2,11 @@
# originally by Matt D. Smith
# rewritten by Rico Gloeckner <mc@verdinet.de>
-CC = gcc
-CFLAGS = -O2 -Wall -DUNIX
+#CC = gcc
+CFLAGS += -DUNIX
# uncomment the line below for debuging info
-CFLAGS += -g
+#CFLAGS += -g
CLIBS =
#uncomment the line below if your using Solaris

12
net/micq/patches/patch-src_i18n_c
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-src_i18n_c,v 1.1 2001/05/26 05:13:47 form Exp $
--- src/i18n.c.orig Sat May 26 11:41:53 2001
+++ src/i18n.c Sat May 26 11:44:24 2001
@@ -42,7 +42,7 @@ int i18nOpen (const char *loc)
if (i18nf == -1 && strchr (loc, '_'))
i18nf = M_fdopen ("%s/.micq/%.*s.i18n", getenv ("HOME") ? getenv ("HOME") : "", strchr (loc, '_') - loc, loc);
if (i18nf == -1)
- return 0;
+ return -1;
for (i = 0; i < i18nSLOTS; i++)
i18nStrings[i] = NULL;

41
net/micq/patches/patch-src_icq_response_c
View File

@ -1,41 +0,0 @@
$OpenBSD: patch-src_icq_response_c,v 1.3 2001/05/31 03:45:43 form Exp $
--- src/icq_response.c.orig Thu Apr 19 05:38:54 2001
+++ src/icq_response.c Thu May 31 09:21:48 2001
@@ -278,8 +278,8 @@ void Meta_User (SOK_T sok, UBYTE * data,
newline = "";
if ((*(data + 1) > 0) && (*(data + 1) <= 12))
{
- M_print ("%s%02d.%s. %4d \t", i18n (532, "Born : "),
- *(data + 2), i18n (-1, TableGetMonth (*(data + 1))), *(data) + 1900);
+ M_print ("%s%02d.%s.%4d \t", i18n (532, "Born : "),
+ *(data + 2), TableGetMonth (*(data + 1)), *(data) + 1900);
newline = "\n";
}
data += 3;
@@ -509,7 +509,7 @@ void User_Offline (int sok, UBYTE * pak)
Time_Stamp ();
M_print (" ");
Print_UIN_Name_10 (remote_uin);
- M_print (" %s\n", i18n (30, " logged off."));
+ M_print (" %s\n", i18n (30, "logged off."));
log_event (remote_uin, LOG_ONLINE, "User logged off %s\n", UIN2Name (remote_uin));
if ((con = UIN2Contact (remote_uin)) != NULL)
{
@@ -534,7 +534,7 @@ void User_Online (int sok, UBYTE * pak)
Time_Stamp ();
M_print (" ");
Print_UIN_Name_10 (remote_uin);
- M_print (" %s (", i18n (31, " logged on."));
+ M_print (" %s (", i18n (31, "logged on."));
Print_Status (new_status);
M_print (")");
@@ -617,7 +617,7 @@ void Status_Update (int sok, UBYTE * pak
{
Contacts[index].status = new_status;
}
- M_print (" %s", i18n (35, " changed status to "));
+ M_print (" %s", i18n (35, "changed status to "));
Print_Status (new_status);
M_print ("\n");
}

17
net/micq/patches/patch-src_micq_c
View File

@ -1,17 +0,0 @@
$OpenBSD: patch-src_micq_c,v 1.1 2001/05/26 05:13:47 form Exp $
--- src/micq.c.orig Sat May 26 11:44:33 2001
+++ src/micq.c Sat May 26 11:45:14 2001
@@ -621,10 +621,10 @@ int main (int argc, char *argv[])
M_print ("No reverse engineering or decompilation of any Mirabilis code took place to make this program.\n");
#endif
- if (i)
- M_print (i18n (0, "Successfully loaded translations (%d entries). No version.\n"), i);
- else
+ if (i < 0)
M_print ("Couldn't load internationalization.\n");
+ else if (i > 0)
+ M_print (i18n (0, "Successfully loaded translations (%d entries). No version.\n"), i);
/* and now we save the time that Micq was started, so that uptime will be
able to appear semi intelligent. */

19
net/micq/patches/patch-src_mreadline_c
View File

@ -1,21 +1,14 @@
$OpenBSD: patch-src_mreadline_c,v 1.1 2001/05/26 05:13:48 form Exp $
--- src/mreadline.c.orig Sat May 26 10:57:08 2001
+++ src/mreadline.c Sat May 26 10:58:54 2001
@@ -140,9 +140,17 @@ void R_process_input_tab (void)
--- src/mreadline.c.orig Sun Jun 17 21:56:27 2001
+++ src/mreadline.c Thu Jul 19 14:33:46 2001
@@ -166,9 +166,9 @@
}
if ((uin = TabGetNext ()))
+#ifdef HAVE_SNPRINTF
- sprintf (s, "%s %s/", message_cmd, UIN2Name (uin));
+ snprintf (s, sizeof(s), "%s %s/", message_cmd, UIN2Name (uin));
+#else
sprintf (s, "%s %s/", message_cmd, UIN2Name (uin));
+#endif
else
+#ifdef HAVE_SNPRINTF
+ snprintf (s, sizeof(s), "%s ", message_cmd);
+#else
sprintf (s, "%s ", message_cmd);
+#endif
- sprintf (s, "%s ", message_cmd);
+ snprintf (s, sizeof(s), "%s ", message_cmd);
clen = cpos = strlen (s);
R_undraw ();

11
net/micq/patches/patch-src_msg_queue_c
View File

@ -1,11 +0,0 @@
$OpenBSD: patch-src_msg_queue_c,v 1.1 2001/05/31 03:47:00 form Exp $
--- src/msg_queue.c.orig Thu May 31 10:21:42 2001
+++ src/msg_queue.c Thu May 31 10:22:45 2001
@@ -143,6 +143,7 @@ void Check_Queue (UDWORD seq)
{
R_undraw ();
Time_Stamp ();
+ char_conv("wc", &queued_msg->body[32]);
M_print (" " ACKCOL "%10s" NOCOL " " MSGACKSTR "%s\n",
UIN2Name (Chars_2_DW (&queued_msg->body[PAK_DATA_OFFSET])),
MsgEllipsis (&queued_msg->body[32]));

29
net/micq/patches/patch-src_sendmsg_c
View File

@ -1,32 +1,11 @@
$OpenBSD: patch-src_sendmsg_c,v 1.2 2001/05/31 03:45:43 form Exp $
--- src/sendmsg.c.orig Thu Apr 19 05:38:54 2001
+++ src/sendmsg.c Thu May 31 10:15:03 2001
@@ -488,8 +488,6 @@ void icq_sendmsg (SOK_T sok, UDWORD uin,
else
log_event (uin, LOG_MESS, "You sent instant message to %d\n%s\n", uin, text);
- char_conv ("cw", text);
-
len = strlen (text);
Word_2_Chars (pak.head.ver, ICQ_VER);
Word_2_Chars (pak.head.cmd, CMD_SENDM);
@@ -502,6 +500,7 @@ void icq_sendmsg (SOK_T sok, UDWORD uin,
memcpy (&pak.data, &msg, sizeof (msg));
memcpy (&pak.data[8], text, len + 1);
+ char_conv ("cw", (char *)&pak.data[8]);
size = sizeof (msg) + len + 1;
@@ -998,7 +997,11 @@ void icq_sendurl (SOK_T sok, UDWORD uin,
--- src/sendmsg.c.orig Sun Jun 17 21:56:27 2001
+++ src/sendmsg.c Thu Jul 19 14:35:25 2001
@@ -1087,7 +1087,7 @@
{
char buf[450];
+#ifdef HAVE_SNPRINTF
- sprintf (buf, "%s\xFE%s", url, description);
+ snprintf (buf, sizeof(buf), "%s\xFE%s", url, description);
+#else
sprintf (buf, "%s\xFE%s", url, description);
+#endif
icq_sendmsg (sok, uin, buf, URL_MESS);
}

13
net/micq/patches/patch-src_ui_c
View File

@ -1,7 +1,6 @@
$OpenBSD: patch-src_ui_c,v 1.1 2001/05/31 03:45:43 form Exp $
--- src/ui.c.orig Thu May 31 10:31:13 2001
+++ src/ui.c Thu May 31 10:31:40 2001
@@ -560,7 +560,6 @@ BOOL Do_Multiline_All (SOK_T sok, char *
--- src/ui.c.orig Thu Jul 19 12:33:18 2001
+++ src/ui.c Thu Jul 19 12:35:42 2001
@@ -732,7 +732,6 @@
{
static int offset = 0;
static char msg[1024];
@ -9,7 +8,7 @@ $OpenBSD: patch-src_ui_c,v 1.1 2001/05/31 03:45:43 form Exp $
int i;
msg[offset] = 0;
@@ -568,9 +567,7 @@ BOOL Do_Multiline_All (SOK_T sok, char *
@@ -740,9 +739,7 @@
{
for (i = 0; i < Num_Contacts; i++)
{
@ -18,9 +17,9 @@ $OpenBSD: patch-src_ui_c,v 1.1 2001/05/31 03:45:43 form Exp $
- free (temp);
+ icq_sendmsg (sok, Contacts[i].uin, msg, MRNORM_MESS);
}
M_print ("Message sent!\n");
M_print (i18n (659, "Message sent!\n"));
offset = 0;
@@ -596,9 +593,7 @@ BOOL Do_Multiline_All (SOK_T sok, char *
@@ -768,9 +765,7 @@
M_print (i18n (37, "Message sent before last line buffer is full\n"));
for (i = 0; i < Num_Contacts; i++)
{

7
net/micq/patches/patch-src_util_c
View File

@ -1,7 +1,6 @@
$OpenBSD: patch-src_util_c,v 1.1 2001/05/26 05:13:48 form Exp $
--- src/util.c.orig Sat May 26 11:56:46 2001
+++ src/util.c Sat May 26 11:56:54 2001
@@ -211,7 +211,7 @@ char *MsgEllipsis (char *msg)
--- src/util.c.orig Thu Jul 19 13:06:55 2001
+++ src/util.c Thu Jul 19 13:07:10 2001
@@ -215,7 +215,7 @@
{
if (*p == '\r' || *p == '\n')
{

7
net/micq/patches/patch-src_util_table_c
View File

@ -1,7 +1,6 @@
$OpenBSD: patch-src_util_table_c,v 1.1 2001/05/28 05:15:38 form Exp $
--- src/util_table.c.orig Mon May 28 12:11:34 2001
+++ src/util_table.c Mon May 28 12:11:40 2001
@@ -157,7 +157,7 @@ const char *TableGetCountry (UWORD code)
--- src/util_table.c.orig Thu Jul 19 13:09:02 2001
+++ src/util_table.c Thu Jul 19 13:09:14 2001
@@ -188,7 +188,7 @@
{
int i;

9
net/micq/pkg/PLIST
View File

@ -1,13 +1,18 @@
@comment $OpenBSD: PLIST,v 1.6 2001/05/26 05:13:48 form Exp $
@comment $OpenBSD: PLIST,v 1.7 2001/07/25 16:13:09 kevlo Exp $
bin/micq
man/man1/micq.1
share/doc/micq/CHANGELOG
man/man5/micqrc.5
man/man7/micq.7
share/doc/micq/README
share/doc/micq/README.SOCKS5
share/doc/micq/commands.txt
share/doc/micq/icq091.txt
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