diff options
author | Sergey A. Osokin <osa@FreeBSD.org> | 2003-06-15 10:17:27 +0000 |
---|---|---|
committer | Sergey A. Osokin <osa@FreeBSD.org> | 2003-06-15 10:17:27 +0000 |
commit | 46d1bb292c35488f49e55def79b23f00fd2ccc66 (patch) | |
tree | ef6ddb546a10503656ce32431b9ba01b1ed4531f /net-im/ysm/files | |
parent | dcb33419dfbcdb6cf570ff416bca92e1d8c1eaa9 (diff) |
Update to 7.2.9.0, fix building on -CURRENT
Submitted by: maintainer
PR: 53270
Approved by: fjoe (implicit)
Notes
Notes:
svn path=/head/; revision=83011
Diffstat (limited to 'net-im/ysm/files')
-rw-r--r-- | net-im/ysm/files/patch-Makefile.in | 13 | ||||
-rw-r--r-- | net-im/ysm/files/patch-YSM_Network.c | 40 | ||||
-rw-r--r-- | net-im/ysm/files/patch-YSM_ToolBox.c | 11 | ||||
-rw-r--r-- | net-im/ysm/files/patch-setup | 12 |
4 files changed, 0 insertions, 76 deletions
diff --git a/net-im/ysm/files/patch-Makefile.in b/net-im/ysm/files/patch-Makefile.in deleted file mode 100644 index 6fab81ddcb7e..000000000000 --- a/net-im/ysm/files/patch-Makefile.in +++ /dev/null @@ -1,13 +0,0 @@ ---- src/Makefile.in.orig Fri Nov 1 16:26:19 2002 -+++ src/Makefile.in Fri Nov 1 16:26:30 2002 -@@ -6,8 +6,8 @@ - - CC= @CC@ - CFLAGS= @CFLAGS@ --CPPFLAGS= -I. -Irijndael --LIBS= @LIBS@ -+CPPFLAGS= -I. -Irijndael @CPPFLAGS@ -+LIBS= @LIBS@ @LDFLAGS@ - - INSTALL= @INSTALL@ - prefix= @prefix@ diff --git a/net-im/ysm/files/patch-YSM_Network.c b/net-im/ysm/files/patch-YSM_Network.c deleted file mode 100644 index 343da5c304f5..000000000000 --- a/net-im/ysm/files/patch-YSM_Network.c +++ /dev/null @@ -1,40 +0,0 @@ ---- src/YSM_Network.c.orig Wed Nov 13 18:18:35 2002 -+++ src/YSM_Network.c Wed Nov 13 18:26:12 2002 -@@ -3977,6 +3977,7 @@ - /* offline message variables */ - int uin,mlen; - char *message,MsgType,MsgFlags,Msglen[2]; -+char *data_conv = 0; - char o_month = 0, o_day = 0, o_hour = 0, o_minutes = 0; - YSM_SLAVE *YSM_Query; - -@@ -4140,13 +4141,28 @@ - o_hour, - o_minutes, - NORMAL); -- -+#ifdef YSM_USE_ICONV -+ if( YSM_Iconv( YSM_SETTING_CHARSET_TRANS, -+ YSM_SETTING_CHARSET_LOCAL, -+ message, -+ &data_conv, -+ YSM_ICONV_MAXLEN) < 0 ) -+ data_conv = strdup (message); -+ YSM_DisplayMsg (YSM_MESSAGE_NORMAL, -+ uin, -+ 0x0, -+ mlen, data_conv, -+ YSM_Query ? YSM_Query->NickName : NULL, -+ YSM_Query ? YSM_Query->LogFlag : 0x0); -+ free(data_conv); -+#else - YSM_DisplayMsg (YSM_MESSAGE_NORMAL, - uin, - 0x0, - mlen, message, - YSM_Query ? YSM_Query->NickName : NULL, - YSM_Query ? YSM_Query->LogFlag : 0x0); -+#endif - - break; - diff --git a/net-im/ysm/files/patch-YSM_ToolBox.c b/net-im/ysm/files/patch-YSM_ToolBox.c deleted file mode 100644 index 614d96b74719..000000000000 --- a/net-im/ysm/files/patch-YSM_ToolBox.c +++ /dev/null @@ -1,11 +0,0 @@ ---- src/YSM_ToolBox.c.orig Wed Nov 13 18:26:47 2002 -+++ src/YSM_ToolBox.c Wed Nov 13 18:28:38 2002 -@@ -468,7 +468,7 @@ - return 1; - } - -- bytes_res = iconv(conv_d, &inptr, -+ bytes_res = iconv(conv_d, (const char **)&inptr, - &bytes_in, &outptr, &bytes_out); - iconv_close(conv_d); - diff --git a/net-im/ysm/files/patch-setup b/net-im/ysm/files/patch-setup deleted file mode 100644 index d286710e8713..000000000000 --- a/net-im/ysm/files/patch-setup +++ /dev/null @@ -1,12 +0,0 @@ ---- src/YSM_Setup.c.orig Fri Nov 1 15:34:33 2002 -+++ src/YSM_Setup.c Fri Nov 1 15:34:56 2002 -@@ -596,8 +596,7 @@ - - fprintf(YSM_CFGFD,"\n# TRANS_CHARSET is charset for transfering/receiving of messages"); - fprintf(YSM_CFGFD,"\n# LOCAL_CHARSET is charset for displaying/inputting of messages"); -- fprintf(YSM_CFGFD,"\n# Russian Generic are TRANS: CP1251 LOCAL: KOI8R"); -- fprintf(YSM_CFGFD,"\n# FreeBSD users please use those in lowercase.\n"); -+ fprintf(YSM_CFGFD,"\n# Russian Generic are TRANS: CP1251 LOCAL: KOI8-R"); - fprintf(YSM_CFGFD,"\nCHARSET_TRANS>0"); - fprintf(YSM_CFGFD,"\nCHARSET_LOCAL>0"); - #endif |