FreeBSD Bugzilla – Attachment 32164 Details for
Bug 53270
update net/ysm to current version; make it compile on -CURRENT
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
file.diff
file.diff (text/plain), 4.71 KB, created by
El Vampiro
on 2003-06-13 09:40:13 UTC
(
hide
)
Description:
file.diff
Filename:
MIME Type:
Creator:
El Vampiro
Created:
2003-06-13 09:40:13 UTC
Size:
4.71 KB
patch
obsolete
>diff -ruN ysm.OLD/Makefile ysm/Makefile >--- ysm.OLD/Makefile Fri Feb 21 19:15:08 2003 >+++ ysm/Makefile Fri Jun 13 15:15:38 2003 >@@ -6,15 +6,14 @@ > # > > PORTNAME= ysm >-PORTVERSION= 7.2.8.1 >+PORTVERSION= 7.2.9.0 > PORTREVISION= 1 > CATEGORIES= net >-MASTER_SITES= ftp://vampiro.rootshell.ru/pub/FreeBSD/distfiles/ \ >- http://vampiro.rootshell.ru/ \ >- ftp://ftp.treasury.ru/pub/unix/ \ >+MASTER_SITES= ftp://rusunix.org/pub/FreeBSD/distfiles/ \ >+ http://aquatique.rusunix.org/ \ > ${MASTER_SITE_SOURCEFORGE} > MASTER_SITE_SUBDIR= ${PORTNAME} >-DISTNAME= ysmv7_2_8_1 >+DISTNAME= ysmv7_2_9_0 > > MAINTAINER= vampiro@rusunix.org > COMMENT= Command line ICQ client with ICQ2000 and recoding support >@@ -24,9 +23,9 @@ > USE_BZIP2= yes > USE_GMAKE= yes > GNU_CONFIGURE= yes >-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \ >- CFLAGS="-DYSM_USE_ICONV ${PTHREAD_CFLAGS}" \ >- LDFLAGS="${PTHREAD_LIBS} -lcipher -L${LOCALBASE}/lib -liconv" >+CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \ >+ CFLAGS+="-I${LOCALBASE}/include" \ >+ LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib -liconv" > > MAN1= ysm.1 > >diff -ruN ysm.OLD/distinfo ysm/distinfo >--- ysm.OLD/distinfo Fri Nov 15 14:15:50 2002 >+++ ysm/distinfo Mon May 19 13:50:03 2003 >@@ -1 +1 @@ >-MD5 (ysmv7_2_8_1.tar.bz2) = a01d246644b8c55be80e0bb3ab1b707a >+MD5 (ysmv7_2_9_0.tar.bz2) = db80a0b66317719b34a2669c6c04f997 >diff -ruN ysm.OLD/files/patch-Makefile.in ysm/files/patch-Makefile.in >--- ysm.OLD/files/patch-Makefile.in Tue Nov 12 03:31:53 2002 >+++ ysm/files/patch-Makefile.in Thu Jan 1 06:00:00 1970 >@@ -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 -ruN ysm.OLD/files/patch-YSM_Network.c ysm/files/patch-YSM_Network.c >--- ysm.OLD/files/patch-YSM_Network.c Fri Nov 15 14:15:50 2002 >+++ ysm/files/patch-YSM_Network.c Thu Jan 1 06:00:00 1970 >@@ -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 -ruN ysm.OLD/files/patch-YSM_ToolBox.c ysm/files/patch-YSM_ToolBox.c >--- ysm.OLD/files/patch-YSM_ToolBox.c Fri Nov 15 14:15:50 2002 >+++ ysm/files/patch-YSM_ToolBox.c Thu Jan 1 06:00:00 1970 >@@ -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 -ruN ysm.OLD/files/patch-setup ysm/files/patch-setup >--- ysm.OLD/files/patch-setup Tue Nov 12 03:31:53 2002 >+++ ysm/files/patch-setup Thu Jan 1 06:00:00 1970 >@@ -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 >diff -ruN ysm.OLD/pkg-descr ysm/pkg-descr >--- ysm.OLD/pkg-descr Tue May 28 14:52:19 2002 >+++ ysm/pkg-descr Mon May 19 10:20:06 2003 >@@ -4,4 +4,4 @@ > run in Linux, but it has been successfully tested in FreeBSD, Win32, BeOS, > and QNX. YSM is based on the last ICQ protocol version, v7/8. > >-WWW: http://ysmv7.sourceforge.net/ >+WWW: http://www.ysm.com.ar
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 53270
: 32164