aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--net-im/ysm/Makefile9
-rw-r--r--net-im/ysm/distinfo2
-rw-r--r--net-im/ysm/files/patch-YSM_Network.c40
-rw-r--r--net-im/ysm/files/patch-YSM_ToolBox.c11
-rw-r--r--net-im/ysm/files/patch-configure11
-rw-r--r--net/ysm/Makefile9
-rw-r--r--net/ysm/distinfo2
-rw-r--r--net/ysm/files/patch-YSM_Network.c40
-rw-r--r--net/ysm/files/patch-YSM_ToolBox.c11
-rw-r--r--net/ysm/files/patch-configure11
10 files changed, 114 insertions, 32 deletions
diff --git a/net-im/ysm/Makefile b/net-im/ysm/Makefile
index f971e75ddcbc..49755103529b 100644
--- a/net-im/ysm/Makefile
+++ b/net-im/ysm/Makefile
@@ -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_SITES= ftp://vampiro.rootshell.ru/pub/FreeBSD/distfiles/ \
${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 --git a/net-im/ysm/distinfo b/net-im/ysm/distinfo
index d29bc3c09a7a..2a0dd2f2c157 100644
--- a/net-im/ysm/distinfo
+++ b/net-im/ysm/distinfo
@@ -1 +1 @@
-MD5 (ysmv7_2_8_1.tgz) = 02e690f25b15feb63d9b9c479488f7a7
+MD5 (ysmv7_2_8_1.tar.bz2) = a01d246644b8c55be80e0bb3ab1b707a
diff --git a/net-im/ysm/files/patch-YSM_Network.c b/net-im/ysm/files/patch-YSM_Network.c
new file mode 100644
index 000000000000..343da5c304f5
--- /dev/null
+++ b/net-im/ysm/files/patch-YSM_Network.c
@@ -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 --git a/net-im/ysm/files/patch-YSM_ToolBox.c b/net-im/ysm/files/patch-YSM_ToolBox.c
new file mode 100644
index 000000000000..614d96b74719
--- /dev/null
+++ b/net-im/ysm/files/patch-YSM_ToolBox.c
@@ -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 --git a/net-im/ysm/files/patch-configure b/net-im/ysm/files/patch-configure
deleted file mode 100644
index c30d0b360806..000000000000
--- a/net-im/ysm/files/patch-configure
+++ /dev/null
@@ -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;
- }
diff --git a/net/ysm/Makefile b/net/ysm/Makefile
index f971e75ddcbc..49755103529b 100644
--- a/net/ysm/Makefile
+++ b/net/ysm/Makefile
@@ -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_SITES= ftp://vampiro.rootshell.ru/pub/FreeBSD/distfiles/ \
${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 --git a/net/ysm/distinfo b/net/ysm/distinfo
index d29bc3c09a7a..2a0dd2f2c157 100644
--- a/net/ysm/distinfo
+++ b/net/ysm/distinfo
@@ -1 +1 @@
-MD5 (ysmv7_2_8_1.tgz) = 02e690f25b15feb63d9b9c479488f7a7
+MD5 (ysmv7_2_8_1.tar.bz2) = a01d246644b8c55be80e0bb3ab1b707a
diff --git a/net/ysm/files/patch-YSM_Network.c b/net/ysm/files/patch-YSM_Network.c
new file mode 100644
index 000000000000..343da5c304f5
--- /dev/null
+++ b/net/ysm/files/patch-YSM_Network.c
@@ -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 --git a/net/ysm/files/patch-YSM_ToolBox.c b/net/ysm/files/patch-YSM_ToolBox.c
new file mode 100644
index 000000000000..614d96b74719
--- /dev/null
+++ b/net/ysm/files/patch-YSM_ToolBox.c
@@ -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 --git a/net/ysm/files/patch-configure b/net/ysm/files/patch-configure
deleted file mode 100644
index c30d0b360806..000000000000
--- a/net/ysm/files/patch-configure
+++ /dev/null
@@ -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;
- }
generated by cgit (git 2.34.1) at 2024-11-20 03:33:08 +0800