diff options
author | Vanilla I. Shu <vanilla@FreeBSD.org> | 2002-10-16 01:57:23 +0000 |
---|---|---|
committer | Vanilla I. Shu <vanilla@FreeBSD.org> | 2002-10-16 01:57:23 +0000 |
commit | c7a199d66b0a44ae60d833a2ec9f12cc0ede7dd3 (patch) | |
tree | a3aeb640266250163aa5692fec365cd4a4237a55 /net-im/climm | |
parent | - Fix MASTER_SITES (diff) |
Upgrade to 0.4.9.4.
PR: ports/44118
Submitted by: Ports Fury.
Notes
Notes:
svn path=/head/; revision=68133
Diffstat (limited to 'net-im/climm')
-rw-r--r-- | net-im/climm/Makefile | 9 | ||||
-rw-r--r-- | net-im/climm/distinfo | 2 | ||||
-rw-r--r-- | net-im/climm/files/patch-Makefile.in | 11 | ||||
-rw-r--r-- | net-im/climm/files/patch-ab | 17 | ||||
-rw-r--r-- | net-im/climm/files/patch-ac | 14 | ||||
-rw-r--r-- | net-im/climm/files/patch-lang::ru.i18n | 35 | ||||
-rw-r--r-- | net-im/climm/files/patch-src::icq_response.c | 42 | ||||
-rw-r--r-- | net-im/climm/files/patch-src::util.c | 46 | ||||
-rw-r--r-- | net-im/climm/pkg-plist | 8 |
9 files changed, 31 insertions, 153 deletions
diff --git a/net-im/climm/Makefile b/net-im/climm/Makefile index 724064e076fc..f1d3785590c6 100644 --- a/net-im/climm/Makefile +++ b/net-im/climm/Makefile @@ -6,16 +6,17 @@ # PORTNAME= micq -PORTVERSION= 0.4.8.9 -PORTREVISION= 0 +PORTVERSION= 0.4.9.4 CATEGORIES= net -MASTER_SITES= http://micq.org/source/ -DISTNAME= ${PORTNAME}-${PORTVERSION:S/9/pl9/} +MASTER_SITES= http://micq.org/source/ \ + http://micq.alpha345.com/source/ \ + http://http.bg.micq.org/source/ EXTRACT_SUFX= .tgz MAINTAINER= ports@FreeBSD.org GNU_CONFIGURE= yes +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} MAN1= micq.1 MAN5= micqrc.5 diff --git a/net-im/climm/distinfo b/net-im/climm/distinfo index 8fad4098a93c..9307f228cc0d 100644 --- a/net-im/climm/distinfo +++ b/net-im/climm/distinfo @@ -1 +1 @@ -MD5 (micq-0.4.8.pl9.tgz) = eae3b1e32e78fcdf783fc8a769d77f7c +MD5 (micq-0.4.9.4.tgz) = 9f8555feaca1560373305d80d340856e diff --git a/net-im/climm/files/patch-Makefile.in b/net-im/climm/files/patch-Makefile.in new file mode 100644 index 000000000000..739c2738811f --- /dev/null +++ b/net-im/climm/files/patch-Makefile.in @@ -0,0 +1,11 @@ +--- Makefile.in.orig Sat Oct 5 23:35:35 2002 ++++ Makefile.in Mon Oct 7 23:28:32 2002 +@@ -81,7 +81,7 @@ + am__quote = @am__quote@ + install_sh = @install_sh@ + +-SUBDIRS = src lang doc ++SUBDIRS = src lang + + EXTRA_DIST = TODO + subdir = . diff --git a/net-im/climm/files/patch-ab b/net-im/climm/files/patch-ab deleted file mode 100644 index 5a8cda93173a..000000000000 --- a/net-im/climm/files/patch-ab +++ /dev/null @@ -1,17 +0,0 @@ - -$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-im/climm/files/patch-ac b/net-im/climm/files/patch-ac deleted file mode 100644 index 45a371954d0e..000000000000 --- a/net-im/climm/files/patch-ac +++ /dev/null @@ -1,14 +0,0 @@ - -$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%c%s", url, ConvSep (), description); -+ snprintf (buf, sizeof(buf), "%s%c%s", url, ConvSep (), description); - icq_sendmsg (sess, uin, buf, URL_MESS); - } - diff --git a/net-im/climm/files/patch-lang::ru.i18n b/net-im/climm/files/patch-lang::ru.i18n index 86bc0e3a41c8..ebcc7e7fb912 100644 --- a/net-im/climm/files/patch-lang::ru.i18n +++ b/net-im/climm/files/patch-lang::ru.i18n @@ -1,45 +1,30 @@ - -$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 @@ - 1506:Телефон: +--- lang/ru.i18n.orig Fri Oct 4 04:17:28 2002 ++++ lang/ru.i18n Mon Oct 14 02:49:22 2002 +@@ -478,7 +478,7 @@ 1507:Факс: 1508:Улица: --#1509:Cellular: --#1510:Zip: -+1509:Сотовый: + 1509:Сотовый: +-1510:П.И.: +1510:Индекс: 1511:Страна: 1512:Код страны: 1513:Код страны работы: - 1514:Страна работы: --1515:Странца работы: -+1515:Страница работы: - 1516:Занятие: +@@ -488,12 +488,12 @@ 1517:Должность: 1518:Департамент: 1519:Место работы: -1520:Zip работы: +1520:Рабочий индекс: 1521:Рабочий факс: - 1522:Раюочий адрес: + 1522:Рабочий адрес: 1523:Рабочий телефон: 1524:Местоположение работы: -1525:Инфа: +1525:Информация: - 1526:Не указано - 1527:Возраст: 1528:Женский 1529:Мужской 1530:Не указан --#1531:Homepage: -+1531:Домашняя страница: - 1532:Родился: - 1533:Языки: - 1534:Выберите язык по номеру или нажмите L: -@@ -553,7 +553,7 @@ +@@ -507,7 +507,7 @@ 1538:Введите год рождения (4 цифры): 1539:Введите месяц рождения: 1540:Введите день рождения: @@ -48,7 +33,7 @@ $FreeBSD$ 1542:Введите другой e-mail: 1543:Введите старый e-mail: 1544:Введите город: -@@ -562,7 +562,7 @@ +@@ -516,7 +516,7 @@ 1547:Введите факс: 1548:Введите адрес: 1549:Введите номер квартиры: @@ -56,4 +41,4 @@ $FreeBSD$ +1550:Введите индекс (должен быть числовым): 1551:Введите телефонный код страны: 1552:Введите свою временную зону (+/- 0-12): - 1553:Ваша новая кличка: + 1553:Ваш новый никнейм: diff --git a/net-im/climm/files/patch-src::icq_response.c b/net-im/climm/files/patch-src::icq_response.c deleted file mode 100644 index 184646a48318..000000000000 --- a/net-im/climm/files/patch-src::icq_response.c +++ /dev/null @@ -1,42 +0,0 @@ -*** src/icq_response.c.orig Sat May 11 00:59:50 2002 ---- src/icq_response.c Sat May 11 20:05:32 2002 -*************** -*** 1,4 **** -! /* $Id: icq_response.c,v 1.53 2002/05/10 15:59:50 kuhlmann Exp $ */ - /* Copyright ? */ - - #include "micq.h" ---- 1,4 ---- -! /* $Id: icq_response.c,v 1.1 2002/04/05 10:00:08 root Exp root $ */ - /* Copyright ? */ - - #include "micq.h" -*************** -*** 482,494 **** - { - strcpy (buf, new); - strcat (buf, " "); -! sprintf (buf + strlen (buf), "%d.%d", v1, v2); -! if (v3 || v4) sprintf (buf + strlen (buf), ".%d", v3); -! if (v4) sprintf (buf + strlen (buf), " cvs %d", v4); - if (ssl) strcat (buf, "/SSL"); - } - else if (prG->verbose) -! sprintf (buf, "%s %08x", i18n (1827, "Unknown client"), (unsigned int)tstamp); - else - buf[0] = '\0'; - ---- 482,494 ---- - { - strcpy (buf, new); - strcat (buf, " "); -! snprintf (buf + strlen (buf), sizeof (buf) - strlen (buf), "%d.%d", v1, v2); -! if (v3 || v4) snprintf (buf + strlen (buf), sizeof (buf) - strlen (buf), ".%d", v3); -! if (v4) snprintf (buf + strlen (buf), sizeof (buf) - strlen (buf), " cvs %d", v4); - if (ssl) strcat (buf, "/SSL"); - } - else if (prG->verbose) -! snprintf (buf, sizeof (buf), "%s %08x", i18n (1827, "Unknown client"), (unsigned int)tstamp); - else - buf[0] = '\0'; - diff --git a/net-im/climm/files/patch-src::util.c b/net-im/climm/files/patch-src::util.c deleted file mode 100644 index 0a6ff21c8915..000000000000 --- a/net-im/climm/files/patch-src::util.c +++ /dev/null @@ -1,46 +0,0 @@ -*** src/util.c.orig Sat May 11 03:01:05 2002 ---- src/util.c Sat May 11 20:10:23 2002 -*************** -*** 319,325 **** - - timeval = time (0); - va_start (args, str); -! sprintf (buf, "\n%-24.24s ", ctime (&timeval)); - vsprintf (&buf[strlen (buf)], str, args); - va_end (args); - ---- 319,325 ---- - - timeval = time (0); - va_start (args, str); -! snprintf (buf, sizeof(buf), "\n%-24.24s ", ctime (&timeval)); - vsprintf (&buf[strlen (buf)], str, args); - va_end (args); - -*************** -*** 332,343 **** - else - return -1; - } -! sprintf (buffer, "%suin%ld.log", prG->logplace, uin); - - #if HAVE_SYMLINK - if (ContactFindNick (uin)) - { -! sprintf (symbuf, "%s%s.log", prG->logplace, ContactFindNick (uin)); - for (b = symbuf + strlen (prG->logplace); (b = strchr (b, '/')); ) - *b = '_'; - symlink (buffer, symbuf); ---- 332,343 ---- - else - return -1; - } -! snprintf (buffer, sizeof (buffer), "%suin%ld.log", prG->logplace, uin); - - #if HAVE_SYMLINK - if (ContactFindNick (uin)) - { -! snprintf (symbuf, sizeof (symbuf), "%s%s.log", prG->logplace, ContactFindNick (uin)); - for (b = symbuf + strlen (prG->logplace); (b = strchr (b, '/')); ) - *b = '_'; - symlink (buffer, symbuf); diff --git a/net-im/climm/pkg-plist b/net-im/climm/pkg-plist index adcbb62f1623..6928e5531520 100644 --- a/net-im/climm/pkg-plist +++ b/net-im/climm/pkg-plist @@ -1,7 +1,8 @@ bin/micq +%%PORTDOCS%%share/doc/micq/icq091.txt +%%PORTDOCS%%share/doc/micq/icqv7.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 @@ -17,7 +18,6 @@ share/micq/ru.i18n share/micq/se.i18n share/micq/uk.i18n share/micq/yu.i18n -%%PORTDOCS%%share/doc/micq/icq091.txt -%%PORTDOCS%%share/doc/micq/icqv7.txt -@dirrm share/micq +share/micq/zh_CN.i18n %%PORTDOCS%%@dirrm share/doc/micq +@dirrm share/micq |