summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorMaxim Sobolev <sobomax@FreeBSD.org>2002-04-22 17:56:04 +0000
committerMaxim Sobolev <sobomax@FreeBSD.org>2002-04-22 17:56:04 +0000
commit3cb156739765c09aba28c80ef2f604a805825d4e (patch)
tree9c306761e2c20a174180d6a71c57093c57aa67d0 /net
parentb3fd8221ac94de1f1789623146155d7d7561cb10 (diff)
downloadfreebsd-ports-3cb156739765c09aba28c80ef2f604a805825d4e.zip
- Backport some of the patched missed during previous update;
- HAS_CONFIGURE --> GNU_CONFIGURE; - sort pkg-plist; - make PORTVERSION more sane.
Diffstat (limited to 'net')
-rw-r--r--net/micq/Makefile7
-rw-r--r--net/micq/files/patch-ab17
-rw-r--r--net/micq/files/patch-ac14
-rw-r--r--net/micq/files/patch-lang::ru.i18n59
-rw-r--r--net/micq/files/patch-src::icq_response.c30
-rw-r--r--net/micq/files/patch-src::util.c29
-rw-r--r--net/micq/pkg-plist2
7 files changed, 154 insertions, 4 deletions
diff --git a/net/micq/Makefile b/net/micq/Makefile
index 13ca9ab2ca10..3e19b79b5e76 100644
--- a/net/micq/Makefile
+++ b/net/micq/Makefile
@@ -6,15 +6,16 @@
#
PORTNAME= micq
-PORTVERSION= 0.4.8.pl3
+PORTVERSION= 0.4.8.3
PORTREVISION= 0
CATEGORIES= net
-MASTER_SITES= ftp://micq.ukeer.de/pub/micq/source/
+MASTER_SITES= http://micq.org/source/
+DISTNAME= ${PORTNAME}-${PORTVERSION:S/3/pl3/}
EXTRACT_SUFX= .tgz
MAINTAINER= ports@FreeBSD.org
-HAS_CONFIGURE= yes
+GNU_CONFIGURE= yes
MAN1= micq.1
MAN5= micqrc.5
diff --git a/net/micq/files/patch-ab b/net/micq/files/patch-ab
new file mode 100644
index 000000000000..5a8cda93173a
--- /dev/null
+++ b/net/micq/files/patch-ab
@@ -0,0 +1,17 @@
+
+$FreeBSD$
+
+--- src/mreadline.c.orig Fri Feb 8 01:02:42 2002
++++ src/mreadline.c Fri Apr 5 12:51:45 2002
+@@ -174,9 +174,9 @@
+ }
+
+ if ((uin = TabGetNext ()))
+- sprintf (s, "%s %s/", msgcmd, ContactFindName (uin));
++ snprintf (s, sizeof(s), "%s %s/", msgcmd, ContactFindName (uin));
+ else
+- sprintf (s, "%s ", msgcmd);
++ snprintf (s, sizeof(s), "%s ", msgcmd);
+
+ clen = cpos = strlen (s);
+ R_undraw ();
diff --git a/net/micq/files/patch-ac b/net/micq/files/patch-ac
new file mode 100644
index 000000000000..c01bc9202d4c
--- /dev/null
+++ b/net/micq/files/patch-ac
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- src/server.c 2002/04/05 09:53:54 1.1
++++ src/server.c 2002/04/05 09:54:20
+@@ -134,7 +134,7 @@
+ {
+ char buf[450];
+
+- sprintf (buf, "%s\xFE%s", url, description);
++ snprintf (buf, sizeof(buf), "%s\xFE%s", url, description);
+ icq_sendmsg (sess, uin, buf, URL_MESS);
+ }
+
diff --git a/net/micq/files/patch-lang::ru.i18n b/net/micq/files/patch-lang::ru.i18n
new file mode 100644
index 000000000000..0339831982fa
--- /dev/null
+++ b/net/micq/files/patch-lang::ru.i18n
@@ -0,0 +1,59 @@
+
+$FreeBSD$
+
+--- lang/ru.i18n.orig Thu Mar 28 01:12:08 2002
++++ lang/ru.i18n Fri Apr 5 12:45:39 2002
+@@ -521,29 +521,29 @@
+ 506:�������:
+ 507:����:
+ 508:�����:
+-#509:Cellular:
+-#510:Zip:
++509:�������:
++510:������:
+ 511:������:
+ 512:��� ������:
+ 513:��� ������ ������:
+ 514:������ ������:
+-515:������� ������:
++515:�������� ������:
+ 516:�������:
+ 517:���������:
+ 518:�����������:
+ 519:����� ������:
+-520:Zip ������:
++520:������� ������:
+ 521:������� ����:
+ 522:������� �����:
+ 523:������� �������:
+ 524:�������������� ������:
+-525:����:
++525:����������:
+ 526:�� �������
+ 527:�������:
+ 528:�������
+ 529:�������
+ 530:�� ������
+-#531:Homepage:
++531:�������� ��������:
+ 532:�������:
+ 533:�����:
+ 534:�������� ���� �� ������ ��� ������� L:
+@@ -553,7 +553,7 @@
+ 538:������� ��� �������� (4 �����):
+ 539:������� ����� ��������:
+ 540:������� ���� ��������:
+-541:����>
++541:����������>
+ 542:������� ������ e-mail:
+ 543:������� ������ e-mail:
+ 544:������� �����:
+@@ -562,7 +562,7 @@
+ 547:������� ����:
+ 548:������� �����:
+ 549:������� ����� ��������:
+-550:������� zip (������ ���� ��������):
++550:������� ������ (������ ���� ��������):
+ 551:������� ���������� ��� ������:
+ 552:������� ���� ��������� ���� (+/- 0-12):
+ 553:���� ����� ������:
diff --git a/net/micq/files/patch-src::icq_response.c b/net/micq/files/patch-src::icq_response.c
new file mode 100644
index 000000000000..00cc6012dc48
--- /dev/null
+++ b/net/micq/files/patch-src::icq_response.c
@@ -0,0 +1,30 @@
+
+$FreeBSD$
+
+--- src/icq_response.c.orig Thu Mar 28 01:12:10 2002
++++ src/icq_response.c Fri Apr 5 13:02:01 2002
+@@ -1,4 +1,4 @@
+-/* $Id: icq_response.c,v 1.37 2002/03/27 23:12:10 kuhlmann Exp $ */
++/* $Id: icq_response.c,v 1.1 2002/04/05 10:00:08 root Exp root $ */
+ /* Copyright ? */
+
+ #include "micq.h"
+@@ -465,14 +465,14 @@
+ {
+ strcpy (buf, new);
+ strcat (buf, " ");
+- sprintf (buf + strlen (buf), "%d.%d", ver / 10000,
++ snprintf (buf + strlen (buf), sizeof(buf) - strlen (buf), "%d.%d", ver / 10000,
+ (ver / 100) % 100);
+- if (ver % 100) sprintf (buf + strlen (buf), ".%d", (ver / 10) % 10);
+- if (ver % 10) sprintf (buf + strlen (buf), " cvs %d", ver % 10);
++ if (ver % 100) snprintf (buf + strlen (buf), sizeof(buf) - strlen (buf), ".%d", (ver / 10) % 10);
++ if (ver % 10) snprintf (buf + strlen (buf), sizeof(buf) - strlen (buf), " cvs %d", ver % 10);
+ if (ssl) strcat (buf, "/SSL");
+ }
+ else if (prG->verbose)
+- sprintf (buf, "%s %08x", i18n (827, "Unknown client"), (unsigned int)tstamp);
++ snprintf (buf, sizeof(buf), "%s %08x", i18n (827, "Unknown client"), (unsigned int)tstamp);
+ else
+ buf[0] = '\0';
+
diff --git a/net/micq/files/patch-src::util.c b/net/micq/files/patch-src::util.c
new file mode 100644
index 000000000000..e71d003fa922
--- /dev/null
+++ b/net/micq/files/patch-src::util.c
@@ -0,0 +1,29 @@
+
+$FreeBSD$
+
+--- src/util.c 2002/04/05 10:00:08 1.1
++++ src/util.c 2002/04/05 10:03:37
+@@ -343,7 +343,7 @@
+
+ timeval = time (0);
+ va_start (args, str);
+- sprintf (buf, "\n%-24.24s ", ctime (&timeval));
++ snprintf (buf, sizeof(buf), "\n%-24.24s ", ctime (&timeval));
+ vsprintf (&buf[strlen (buf)], str, args);
+ va_end (args);
+
+@@ -356,12 +356,12 @@
+ else
+ return -1;
+ }
+- sprintf (buffer, "%s%ld.log", prG->logplace, uin);
++ snprintf (buffer, sizeof(buffer), "%s%ld.log", prG->logplace, uin);
+
+ #if HAVE_SYMLINK
+ if (ContactFindNick (uin))
+ {
+- sprintf (symbuf, "%s%s.log", prG->logplace, ContactFindNick (uin));
++ snprintf (symbuf, sizeof(symbuf), "%s%s.log", prG->logplace, ContactFindNick (uin));
+ symlink (buffer, symbuf);
+ }
+ #endif
diff --git a/net/micq/pkg-plist b/net/micq/pkg-plist
index 056afff26607..b2debce32066 100644
--- a/net/micq/pkg-plist
+++ b/net/micq/pkg-plist
@@ -17,8 +17,8 @@ share/micq/ru.i18n
share/micq/se.i18n
share/micq/uk.i18n
share/micq/yu.i18n
-@dirrm share/micq
%%PORTDOCS%%share/doc/micq/commands.txt
%%PORTDOCS%%share/doc/micq/icq091.txt
%%PORTDOCS%%share/doc/micq/icqv7.txt
+@dirrm share/micq
%%PORTDOCS%%@dirrm share/doc/micq
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-15 15:56:38 +0000