diff options
author | fjoe <fjoe@FreeBSD.org> | 2002-06-28 02:40:54 +0800 |
---|---|---|
committer | fjoe <fjoe@FreeBSD.org> | 2002-06-28 02:40:54 +0800 |
commit | 3c5f990ea128bc051270a34c2ff9a7002efbe4b6 (patch) | |
tree | 5197356c22371efa5875260d55509c0dc9a11a8a | |
parent | 56662121c84fbc9387cf71d21146210eee6aa946 (diff) | |
download | freebsd-ports-gnome-3c5f990ea128bc051270a34c2ff9a7002efbe4b6.tar.gz freebsd-ports-gnome-3c5f990ea128bc051270a34c2ff9a7002efbe4b6.tar.zst freebsd-ports-gnome-3c5f990ea128bc051270a34c2ff9a7002efbe4b6.zip |
- add recoding of offline messages
- add more MASTER_SITES
- push MASTER_SITES_SOURCEFORGE to the end of MASTER_SITES
PR: 38650
Submitted by: MAINTAINER
-rw-r--r-- | net-im/ysm/Makefile | 8 | ||||
-rw-r--r-- | net-im/ysm/files/patch-network | 33 | ||||
-rw-r--r-- | net/ysm/Makefile | 8 | ||||
-rw-r--r-- | net/ysm/files/patch-network | 33 |
4 files changed, 78 insertions, 4 deletions
diff --git a/net-im/ysm/Makefile b/net-im/ysm/Makefile index 85c72be7cc8c..b8dce41dadde 100644 --- a/net-im/ysm/Makefile +++ b/net-im/ysm/Makefile @@ -7,9 +7,13 @@ PORTNAME= ysm PORTVERSION= 7.2.7.1 +PORTREVISION= 1 CATEGORIES= net -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \ - ftp://vampiro.rootshell.ru/pub/warez/ +MASTER_SITES= ftp://vampiro.rootshell.ru/pub/warez/ \ + http://vampiro.rootshell.ru/ \ + ftp://ftp.treasury.ru/pub/unix/ \ + http://www.treasury.ru/ \ + ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} DISTNAME= ysmv7_2_7_1 EXTRACT_SUFX= .tgz diff --git a/net-im/ysm/files/patch-network b/net-im/ysm/files/patch-network index 4d3590511652..e7a2bc696e3d 100644 --- a/net-im/ysm/files/patch-network +++ b/net-im/ysm/files/patch-network @@ -11,3 +11,36 @@ data, &data_conv, YSM_ICONV_MAXLEN) < 0 ) +@@ -2638,6 +2638,7 @@ + /* offline message variables */ + int uin,mlen; + char *message,MsgType,MsgFlags,Msglen[2]; ++ char *data_conv = 0; + + /* its a TLV(1) at the very beggining, always. */ + tsize += 4; +@@ -2745,13 +2746,22 @@ + "\nMessage received when you were %soffline%s:\n", + BRIGHT_BLUE, + NORMAL); +- ++#ifdef YSM_USE_ICONV ++ if( YSM_Iconv( YSM_SETTING_CHARSET_TRANS, ++ YSM_SETTING_CHARSET_LOCAL, ++ message, ++ &data_conv, ++ YSM_ICONV_MAXLEN) < 0 ) ++#endif ++ { data_conv = strdup (message); } ++ + YSM_DisplayMsg (YSM_MESSAGE_NORMAL, + uin, + 0x0, +- mlen, message, ++ mlen, data_conv, + YSM_Query->NickName, + !YSM_Query ? 0x0 : YSM_Query->LogFlag ); ++ free(data_conv); + + break; + diff --git a/net/ysm/Makefile b/net/ysm/Makefile index 85c72be7cc8c..b8dce41dadde 100644 --- a/net/ysm/Makefile +++ b/net/ysm/Makefile @@ -7,9 +7,13 @@ PORTNAME= ysm PORTVERSION= 7.2.7.1 +PORTREVISION= 1 CATEGORIES= net -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \ - ftp://vampiro.rootshell.ru/pub/warez/ +MASTER_SITES= ftp://vampiro.rootshell.ru/pub/warez/ \ + http://vampiro.rootshell.ru/ \ + ftp://ftp.treasury.ru/pub/unix/ \ + http://www.treasury.ru/ \ + ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} DISTNAME= ysmv7_2_7_1 EXTRACT_SUFX= .tgz diff --git a/net/ysm/files/patch-network b/net/ysm/files/patch-network index 4d3590511652..e7a2bc696e3d 100644 --- a/net/ysm/files/patch-network +++ b/net/ysm/files/patch-network @@ -11,3 +11,36 @@ data, &data_conv, YSM_ICONV_MAXLEN) < 0 ) +@@ -2638,6 +2638,7 @@ + /* offline message variables */ + int uin,mlen; + char *message,MsgType,MsgFlags,Msglen[2]; ++ char *data_conv = 0; + + /* its a TLV(1) at the very beggining, always. */ + tsize += 4; +@@ -2745,13 +2746,22 @@ + "\nMessage received when you were %soffline%s:\n", + BRIGHT_BLUE, + NORMAL); +- ++#ifdef YSM_USE_ICONV ++ if( YSM_Iconv( YSM_SETTING_CHARSET_TRANS, ++ YSM_SETTING_CHARSET_LOCAL, ++ message, ++ &data_conv, ++ YSM_ICONV_MAXLEN) < 0 ) ++#endif ++ { data_conv = strdup (message); } ++ + YSM_DisplayMsg (YSM_MESSAGE_NORMAL, + uin, + 0x0, +- mlen, message, ++ mlen, data_conv, + YSM_Query->NickName, + !YSM_Query ? 0x0 : YSM_Query->LogFlag ); ++ free(data_conv); + + break; + |