Attachment #32164 for bug #53270

View | Details | Raw Unified | Return to bug 53270
Collapse All | Expand All




#

PORTNAME=	ysm
PORTVERSION=	7.2.9.0
PORTREVISION=	1
CATEGORIES=	net
MASTER_SITES=	ftp://rusunix.org/pub/FreeBSD/distfiles/ \
		http://aquatique.rusunix.org/ \
		ftp://ftp.treasury.ru/pub/unix/ \
		${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR=	${PORTNAME}
DISTNAME=	ysmv7_2_9_0

MAINTAINER=	vampiro@rusunix.org
COMMENT=	Command line ICQ client with ICQ2000 and recoding support

USE_BZIP2=      yes
USE_GMAKE=	yes
GNU_CONFIGURE=	yes
CONFIGURE_ENV=  CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
		CFLAGS+="-I${LOCALBASE}/include" \
		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib -liconv"

MAN1=		ysm.1


Line 1 Link Here

(-)ysm/distinfo (-1 / +1 lines)
1	MD5 (ysmv7_2_8_1.tar.bz2) = a01d246644b8c55be80e0bb3ab1b707a	1	MD5 (ysmv7_2_9_0.tar.bz2) = db80a0b66317719b34a2669c6c04f997




--- 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@




--- 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;
 

Lines 1-11 Link Here

(-)ysm/files/patch-YSM_ToolBox.c (-11 lines)
1	--- src/YSM_ToolBox.c.orig Wed Nov 13 18:26:47 2002
2	+++ src/YSM_ToolBox.c Wed Nov 13 18:28:38 2002
3	@@ -468,7 +468,7 @@
4	return 1;
5	}
6
7	- bytes_res = iconv(conv_d, &inptr,
8	+ bytes_res = iconv(conv_d, (const char **)&inptr,
9	&bytes_in, &outptr, &bytes_out);
10	iconv_close(conv_d);
11




--- 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

Lines 4-7 Link Here

(-)ysm/pkg-descr (-1 / +1 lines)
4	run in Linux, but it has been successfully tested in FreeBSD, Win32, BeOS,	4	run in Linux, but it has been successfully tested in FreeBSD, Win32, BeOS,
5	and QNX. YSM is based on the last ICQ protocol version, v7/8.	5	and QNX. YSM is based on the last ICQ protocol version, v7/8.
6		6
7	WWW: http://ysmv7.sourceforge.net/	7	WWW: http://www.ysm.com.ar

Return to bug 53270

Lines 6-20 Link Here

(-)ysm/Makefile (-8 / +7 lines)
6	#	6	#
7		7
8	PORTNAME= ysm	8	PORTNAME= ysm
9	PORTVERSION= 7.2.8.1	9	PORTVERSION= 7.2.9.0
10	PORTREVISION= 1	10	PORTREVISION= 1
11	CATEGORIES= net	11	CATEGORIES= net
12	MASTER_SITES= ftp://vampiro.rootshell.ru/pub/FreeBSD/distfiles/ \	12	MASTER_SITES= ftp://rusunix.org/pub/FreeBSD/distfiles/ \
13	http://vampiro.rootshell.ru/ \	13	http://aquatique.rusunix.org/ \
14	ftp://ftp.treasury.ru/pub/unix/ \
15	${MASTER_SITE_SOURCEFORGE}	14	${MASTER_SITE_SOURCEFORGE}
16	MASTER_SITE_SUBDIR= ${PORTNAME}	15	MASTER_SITE_SUBDIR= ${PORTNAME}
17	DISTNAME= ysmv7_2_8_1	16	DISTNAME= ysmv7_2_9_0
18		17
19	MAINTAINER= vampiro@rusunix.org	18	MAINTAINER= vampiro@rusunix.org
20	COMMENT= Command line ICQ client with ICQ2000 and recoding support	19	COMMENT= Command line ICQ client with ICQ2000 and recoding support
Lines 24-32 Link Here
24	USE_BZIP2= yes	23	USE_BZIP2= yes
25	USE_GMAKE= yes	24	USE_GMAKE= yes
26	GNU_CONFIGURE= yes	25	GNU_CONFIGURE= yes
27	CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \	26	CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
28	CFLAGS="-DYSM_USE_ICONV ${PTHREAD_CFLAGS}" \	27	CFLAGS+="-I${LOCALBASE}/include" \
29	LDFLAGS="${PTHREAD_LIBS} -lcipher -L${LOCALBASE}/lib -liconv"	28	LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib -liconv"
30		29
31	MAN1= ysm.1	30	MAN1= ysm.1
32		31

Lines 1-13 Link Here

(-)ysm/files/patch-Makefile.in (-13 lines)
1	--- src/Makefile.in.orig Fri Nov 1 16:26:19 2002
2	+++ src/Makefile.in Fri Nov 1 16:26:30 2002
3	@@ -6,8 +6,8 @@
4
5	CC= @CC@
6	CFLAGS= @CFLAGS@
7	-CPPFLAGS= -I. -Irijndael
8	-LIBS= @LIBS@
9	+CPPFLAGS= -I. -Irijndael @CPPFLAGS@
10	+LIBS= @LIBS@ @LDFLAGS@
11
12	INSTALL= @INSTALL@
13	prefix= @prefix@

Lines 1-40 Link Here

(-)ysm/files/patch-YSM_Network.c (-40 lines)
1	--- src/YSM_Network.c.orig Wed Nov 13 18:18:35 2002
2	+++ src/YSM_Network.c Wed Nov 13 18:26:12 2002
3	@@ -3977,6 +3977,7 @@
4	/* offline message variables */
5	int uin,mlen;
6	char *message,MsgType,MsgFlags,Msglen[2];
7	+char *data_conv = 0;
8	char o_month = 0, o_day = 0, o_hour = 0, o_minutes = 0;
9	YSM_SLAVE *YSM_Query;
10
11	@@ -4140,13 +4141,28 @@
12	o_hour,
13	o_minutes,
14	NORMAL);
15	-
16	+#ifdef YSM_USE_ICONV
17	+ if( YSM_Iconv( YSM_SETTING_CHARSET_TRANS,
18	+ YSM_SETTING_CHARSET_LOCAL,
19	+ message,
20	+ &data_conv,
21	+ YSM_ICONV_MAXLEN) < 0 )
22	+ data_conv = strdup (message);
23	+ YSM_DisplayMsg (YSM_MESSAGE_NORMAL,
24	+ uin,
25	+ 0x0,
26	+ mlen, data_conv,
27	+ YSM_Query ? YSM_Query->NickName : NULL,
28	+ YSM_Query ? YSM_Query->LogFlag : 0x0);
29	+ free(data_conv);
30	+#else
31	YSM_DisplayMsg (YSM_MESSAGE_NORMAL,
32	uin,
33	0x0,
34	mlen, message,
35	YSM_Query ? YSM_Query->NickName : NULL,
36	YSM_Query ? YSM_Query->LogFlag : 0x0);
37	+#endif
38
39	break;
40

Lines 1-12 Link Here

(-)ysm/files/patch-setup (-12 lines)
1	--- src/YSM_Setup.c.orig Fri Nov 1 15:34:33 2002
2	+++ src/YSM_Setup.c Fri Nov 1 15:34:56 2002
3	@@ -596,8 +596,7 @@
4
5	fprintf(YSM_CFGFD,"\n# TRANS_CHARSET is charset for transfering/receiving of messages");
6	fprintf(YSM_CFGFD,"\n# LOCAL_CHARSET is charset for displaying/inputting of messages");
7	- fprintf(YSM_CFGFD,"\n# Russian Generic are TRANS: CP1251 LOCAL: KOI8R");
8	- fprintf(YSM_CFGFD,"\n# FreeBSD users please use those in lowercase.\n");
9	+ fprintf(YSM_CFGFD,"\n# Russian Generic are TRANS: CP1251 LOCAL: KOI8-R");
10	fprintf(YSM_CFGFD,"\nCHARSET_TRANS>0");
11	fprintf(YSM_CFGFD,"\nCHARSET_LOCAL>0");
12	#endif