1
0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-22 08:58:47 +00:00

upgrade to 7.2.8.1

Submitted by:	MAINTAINER
This commit is contained in:
Max Khon 2002-11-11 21:31:53 +00:00
parent 636fcbf7ab
commit 677fc59f97
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=69927
16 changed files with 80 additions and 190 deletions

View File

@ -6,23 +6,26 @@
#
PORTNAME= ysm
PORTVERSION= 7.2.7.1
PORTREVISION= 1
PORTVERSION= 7.2.8.1
CATEGORIES= net
MASTER_SITES= ftp://vampiro.rootshell.ru/pub/warez/ \
MASTER_SITES= ftp://vampiro.rootshell.ru/pub/FreeBSD/distfiles/ \
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
DISTNAME= ysmv7_2_8_1
EXTRACT_SUFX= .tgz
MAINTAINER= vampiro@rootshell.ru
LIB_DEPENDS= iconv.3:${PORTSDIR}/converters/libiconv
USE_GMAKE= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
CFLAGS="-DYSM_USE_ICONV" \
LDFLAGS="-lcipher -L${LOCALBASE}/lib -liconv"
MAN1= ysm.1
MANCOMPRESSED= yes
.include <bsd.port.mk>

View File

@ -1 +1 @@
MD5 (ysmv7_2_7_1.tgz) = 75cca9a9c9b48374fdfbbc8469ef54af
MD5 (ysmv7_2_8_1.tgz) = 02e690f25b15feb63d9b9c479488f7a7

View File

@ -1,13 +0,0 @@
--- Makefile.orig Thu Jan 1 06:00:00 1970
+++ Makefile Tue May 28 12:06:00 2002
@@ -0,0 +1,10 @@
+PROG= ysm
+CFLAGS+= -Wall -ansi -I/usr/local/include -DYSM_USE_ICONV
+LDADD+= -L/usr/local/lib -liconv
+PREFIX?= /usr/local
+BINDIR?= ${PREFIX}/bin
+SRCS= YSM_Main.c YSM_Network.c YSM_Prompt.c YSM_Setup.c \
+ YSM_ToolBox.c YSM_Slaves.c YSM_Help.c YSM_Win32.c
+MAN= docs/ysm.1
+MANDIR= ${PREFIX}/man/man
+.include <bsd.prog.mk>

View File

@ -0,0 +1,13 @@
--- 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@

View File

@ -0,0 +1,11 @@
--- configure.orig Sun Oct 27 09:09:53 2002
+++ configure Fri Nov 1 16:45:23 2002
@@ -2124,7 +2124,7 @@
int
main ()
{
-pthread_create ();
+pthread_create_pthread_stuff_looks_ugly_feel_free_to_make_it_working ();
;
return 0;
}

View File

@ -1,24 +0,0 @@
--- YSM_ToolBox.c.orig Fri Apr 12 11:07:38 2002
+++ YSM_ToolBox.c Tue May 28 11:19:33 2002
@@ -45,6 +45,7 @@
#include "YSM.h"
/* International Languages Charset Convertion! */
#include "YSM_Iconv.h"
+#include <iconv.h>
static struct timeval tv;
@@ -428,9 +429,12 @@
bytes_in = strlen(buf_from) + 1;
bytes_out = maxlen - 1;
conv_d = iconv_open(charset_to, charset_from);
- bytes_res = iconv(conv_d, &inptr, &bytes_in, &outptr, &bytes_out);
+ if ( conv_d == (iconv_t)( -1)) { perror("iconv_open:"); return -1; }
+ else {
+ bytes_res = iconv(conv_d, (const char **)&inptr, &bytes_in, &outptr, &bytes_out);
iconv_close(conv_d);
return 0;
+ }
}
#endif

View File

@ -1,46 +0,0 @@
--- YSM_Network.c.orig Fri Apr 12 11:07:38 2002
+++ YSM_Network.c Tue May 28 11:18:47 2002
@@ -1547,8 +1547,8 @@
int log_len = 0;
#ifdef YSM_USE_ICONV
- if( YSM_Iconv( YSM_SETTING_CHARSET_TRANS,
- YSM_SETTING_CHARSET_LOCAL,
+ if( YSM_Iconv( YSM_SETTING_CHARSET_LOCAL,
+ YSM_SETTING_CHARSET_TRANS,
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;

View File

@ -1,11 +1,12 @@
--- YSM_Setup.c.orig Fri Apr 12 11:07:38 2002
+++ YSM_Setup.c Tue May 28 11:21:08 2002
@@ -441,7 +441,7 @@
--- 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\n");
+ fprintf(YSM_CFGFD,"\n# Russian Generic are TRANS: CP1251 LOCAL: KOI8-R\n");
- 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

View File

@ -6,23 +6,26 @@
#
PORTNAME= ysm
PORTVERSION= 7.2.7.1
PORTREVISION= 1
PORTVERSION= 7.2.8.1
CATEGORIES= net
MASTER_SITES= ftp://vampiro.rootshell.ru/pub/warez/ \
MASTER_SITES= ftp://vampiro.rootshell.ru/pub/FreeBSD/distfiles/ \
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
DISTNAME= ysmv7_2_8_1
EXTRACT_SUFX= .tgz
MAINTAINER= vampiro@rootshell.ru
LIB_DEPENDS= iconv.3:${PORTSDIR}/converters/libiconv
USE_GMAKE= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
CFLAGS="-DYSM_USE_ICONV" \
LDFLAGS="-lcipher -L${LOCALBASE}/lib -liconv"
MAN1= ysm.1
MANCOMPRESSED= yes
.include <bsd.port.mk>

View File

@ -1 +1 @@
MD5 (ysmv7_2_7_1.tgz) = 75cca9a9c9b48374fdfbbc8469ef54af
MD5 (ysmv7_2_8_1.tgz) = 02e690f25b15feb63d9b9c479488f7a7

View File

@ -1,13 +0,0 @@
--- Makefile.orig Thu Jan 1 06:00:00 1970
+++ Makefile Tue May 28 12:06:00 2002
@@ -0,0 +1,10 @@
+PROG= ysm
+CFLAGS+= -Wall -ansi -I/usr/local/include -DYSM_USE_ICONV
+LDADD+= -L/usr/local/lib -liconv
+PREFIX?= /usr/local
+BINDIR?= ${PREFIX}/bin
+SRCS= YSM_Main.c YSM_Network.c YSM_Prompt.c YSM_Setup.c \
+ YSM_ToolBox.c YSM_Slaves.c YSM_Help.c YSM_Win32.c
+MAN= docs/ysm.1
+MANDIR= ${PREFIX}/man/man
+.include <bsd.prog.mk>

View File

@ -0,0 +1,13 @@
--- 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@

View File

@ -0,0 +1,11 @@
--- configure.orig Sun Oct 27 09:09:53 2002
+++ configure Fri Nov 1 16:45:23 2002
@@ -2124,7 +2124,7 @@
int
main ()
{
-pthread_create ();
+pthread_create_pthread_stuff_looks_ugly_feel_free_to_make_it_working ();
;
return 0;
}

View File

@ -1,24 +0,0 @@
--- YSM_ToolBox.c.orig Fri Apr 12 11:07:38 2002
+++ YSM_ToolBox.c Tue May 28 11:19:33 2002
@@ -45,6 +45,7 @@
#include "YSM.h"
/* International Languages Charset Convertion! */
#include "YSM_Iconv.h"
+#include <iconv.h>
static struct timeval tv;
@@ -428,9 +429,12 @@
bytes_in = strlen(buf_from) + 1;
bytes_out = maxlen - 1;
conv_d = iconv_open(charset_to, charset_from);
- bytes_res = iconv(conv_d, &inptr, &bytes_in, &outptr, &bytes_out);
+ if ( conv_d == (iconv_t)( -1)) { perror("iconv_open:"); return -1; }
+ else {
+ bytes_res = iconv(conv_d, (const char **)&inptr, &bytes_in, &outptr, &bytes_out);
iconv_close(conv_d);
return 0;
+ }
}
#endif

View File

@ -1,46 +0,0 @@
--- YSM_Network.c.orig Fri Apr 12 11:07:38 2002
+++ YSM_Network.c Tue May 28 11:18:47 2002
@@ -1547,8 +1547,8 @@
int log_len = 0;
#ifdef YSM_USE_ICONV
- if( YSM_Iconv( YSM_SETTING_CHARSET_TRANS,
- YSM_SETTING_CHARSET_LOCAL,
+ if( YSM_Iconv( YSM_SETTING_CHARSET_LOCAL,
+ YSM_SETTING_CHARSET_TRANS,
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;

View File

@ -1,11 +1,12 @@
--- YSM_Setup.c.orig Fri Apr 12 11:07:38 2002
+++ YSM_Setup.c Tue May 28 11:21:08 2002
@@ -441,7 +441,7 @@
--- 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\n");
+ fprintf(YSM_CFGFD,"\n# Russian Generic are TRANS: CP1251 LOCAL: KOI8-R\n");
- 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