Date: Fri, 15 Nov 2002 10:05:55 +0600 (OMST) From: El Vampiro <vampiro@rootshell.ru> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/45304: use right tarball, enable threaded networking Message-ID: <20021115040555.DDE715460@vampiro.rootshell.ru>
next in thread | raw e-mail | index | archive | help
>Number: 45304 >Category: ports >Synopsis: use right tarball, enable threaded networking >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Thu Nov 14 20:10:01 PST 2002 >Closed-Date: >Last-Modified: >Originator: El Vampiro >Release: FreeBSD 4.7-STABLE i386 >Organization: >Environment: System: FreeBSD vampiro.rsb.local 4.7-STABLE FreeBSD 4.7-STABLE #0: Thu Nov 14 19:22:11 OMST 2002 root@vampiro.rsb.local:/usr/obj/usr/src/sys/VAMPIRO i386 >Description: Update port: net/ysm - enable threaded networking, use right tarball New files: files/patch-YSM_ToolBox.c, files/patch-YSM_Network.c Files to be deleted: patch-configure >How-To-Repeat: >Fix: diff -ruN ysm.wrong/Makefile ysm/Makefile --- ysm.wrong/Makefile Wed Nov 13 17:59:49 2002 +++ ysm/Makefile Fri Nov 15 09:00:36 2002 @@ -7,6 +7,7 @@ PORTNAME= ysm PORTVERSION= 7.2.8.1 +PORTREVISION= 1 CATEGORIES= net MASTER_SITES= ftp://vampiro.rootshell.ru/pub/FreeBSD/distfiles/ \ http://vampiro.rootshell.ru/ \ @@ -14,17 +15,17 @@ ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} DISTNAME= ysmv7_2_8_1 -EXTRACT_SUFX= .tgz MAINTAINER= vampiro@rootshell.ru LIB_DEPENDS= iconv.3:${PORTSDIR}/converters/libiconv +USE_BZIP2= yes USE_GMAKE= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - CFLAGS="-DYSM_USE_ICONV" \ - LDFLAGS="-lcipher -L${LOCALBASE}/lib -liconv" +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \ + CFLAGS="-DYSM_USE_ICONV ${PTHREAD_CFLAGS}" \ + LDFLAGS="${PTHREAD_LIBS} -lcipher -L${LOCALBASE}/lib -liconv" MAN1= ysm.1 diff -ruN ysm.wrong/distinfo ysm/distinfo --- ysm.wrong/distinfo Wed Nov 13 17:59:49 2002 +++ ysm/distinfo Thu Nov 14 14:27:30 2002 @@ -1 +1 @@ -MD5 (ysmv7_2_8_1.tgz) = 02e690f25b15feb63d9b9c479488f7a7 +MD5 (ysmv7_2_8_1.tar.bz2) = a01d246644b8c55be80e0bb3ab1b707a diff -ruN ysm.wrong/files/patch-YSM_Network.c ysm/files/patch-YSM_Network.c --- ysm.wrong/files/patch-YSM_Network.c Thu Jan 1 06:00:00 1970 +++ ysm/files/patch-YSM_Network.c Thu Nov 14 14:33:20 2002 @@ -0,0 +1,40 @@ +--- 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.wrong/files/patch-YSM_ToolBox.c ysm/files/patch-YSM_ToolBox.c --- ysm.wrong/files/patch-YSM_ToolBox.c Thu Jan 1 06:00:00 1970 +++ ysm/files/patch-YSM_ToolBox.c Thu Nov 14 14:33:29 2002 @@ -0,0 +1,11 @@ +--- 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.wrong/files/patch-configure ysm/files/patch-configure --- ysm.wrong/files/patch-configure Wed Nov 13 17:59:49 2002 +++ ysm/files/patch-configure Thu Jan 1 06:00:00 1970 @@ -1,11 +0,0 @@ ---- 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; - } >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20021115040555.DDE715460>