mirror of
https://git.FreeBSD.org/ports.git
synced 2025-01-23 09:10:43 +00:00
PR: 86853
Submitted by: Travis Poppe <tlp@liquidx.org> (maintainer) Reviewed by: me Approved by: novel (mentor)
This commit is contained in:
parent
71acde0232
commit
ea215da20b
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=144146
@ -6,35 +6,36 @@
|
||||
#
|
||||
|
||||
PORTNAME= naim
|
||||
PORTVERSION= 0.11.7.3.1
|
||||
PORTREVISION= 1
|
||||
PORTVERSION= 0.11.8
|
||||
CATEGORIES= net irc
|
||||
MASTER_SITES= http://shell.n.ml.org/n/naim/
|
||||
MASTER_SITES= http://www.liquidx.org/distfiles/ \
|
||||
http://shell.n.ml.org/n/naim/
|
||||
|
||||
MAINTAINER= tlp@LiquidX.org
|
||||
COMMENT= Console ncurses-based AIM, ICQ, IRC, and Lily client
|
||||
|
||||
USE_BZIP2= yes
|
||||
GNU_CONFIGURE= yes
|
||||
CONFIGURE_ARGS= --with-pkgdocdir=${DOCSDIR} \
|
||||
--mandir=${MANPREFIX}/man
|
||||
GNU_CONFIGURE= yes
|
||||
USE_BZIP2= yes
|
||||
|
||||
CONFIGURE_ARGS+= --mandir=${MANPREFIX}/man
|
||||
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
|
||||
|
||||
MAN1= naim.1
|
||||
MLINKS= naim.1 nirc.1 naim.1 nicq.1 naim.1 nlily.1
|
||||
PORTDOCS= FAQ README commands.txt keyboard.txt
|
||||
|
||||
OPTIONS= DETACH "Enable 'detach' feature (requires misc/screen)" off
|
||||
|
||||
.include <bsd.port.pre.mk>
|
||||
|
||||
.if !defined(NOPORTDOCS)
|
||||
CONFIGURE_ARGS+= --with-pkgdocdir=${DOCSDIR}
|
||||
.else
|
||||
CONFIGURE_ARGS+= --without-pkgdocdir
|
||||
.endif
|
||||
.if defined(WITH_DETACH)
|
||||
BUILD_DEPENDS= screen:${PORTSDIR}/misc/screen
|
||||
RUN_DEPENDS= screen:${PORTSDIR}/misc/screen
|
||||
|
||||
CONFIGURE_ARGS+= --enable-detach
|
||||
.endif
|
||||
|
||||
pre-fetch:
|
||||
@ ${ECHO} ""
|
||||
@ ${ECHO} "You can use the following build option(s):"
|
||||
@ ${ECHO} ""
|
||||
@ ${ECHO} " WITH_DETACH=yes Enables /detach (requires screen)"
|
||||
@ ${ECHO} ""
|
||||
|
||||
.include <bsd.port.mk>
|
||||
.include <bsd.port.post.mk>
|
||||
|
@ -1,2 +1,2 @@
|
||||
MD5 (naim-0.11.7.3.1.tar.bz2) = 8efe3f267d9c192abc41885865f12734
|
||||
SIZE (naim-0.11.7.3.1.tar.bz2) = 461778
|
||||
MD5 (naim-0.11.8.tar.bz2) = e66f29057ffc4016e814134b8d1f8681
|
||||
SIZE (naim-0.11.8.tar.bz2) = 409608
|
||||
|
@ -1,92 +0,0 @@
|
||||
--- firetalk/toc.c.orig Sun Jul 18 21:10:04 2004
|
||||
+++ firetalk/toc.c Fri Aug 26 13:09:16 2005
|
||||
@@ -1415,28 +1415,28 @@
|
||||
} else if (strcmp(arg0, "PAUSE") == 0) {
|
||||
c->connectstate = 1;
|
||||
firetalk_internal_set_connectstate(c, FCS_WAITING_SIGNON);
|
||||
- } else if (strcmp(arg0, "IM_IN") == 0) {
|
||||
- args = toc_parse_args(data, 4);
|
||||
+ } else if (strcmp(arg0, "IM_IN2") == 0) {
|
||||
+ args = toc_parse_args(data, 5);
|
||||
if ((args[1] == NULL) || (args[2] == NULL) || (args[3] == NULL)) {
|
||||
(void)toc_internal_disconnect(c, FE_INVALIDFORMAT);
|
||||
return FE_INVALIDFORMAT;
|
||||
}
|
||||
- (void)aim_handle_ect(c, args[1], args[3], args[2][0] == 'T'?1:0);
|
||||
- if (strlen(args[3]) > 0) {
|
||||
+ (void)aim_handle_ect(c, args[1], args[4], args[2][0] == 'T'?1:0);
|
||||
+ if (strlen(args[4]) > 0) {
|
||||
char *mestart;
|
||||
|
||||
- if (strncasecmp(args[3],"/me ",4) == 0)
|
||||
- firetalk_callback_im_getaction(c, args[1], args[2][0] == 'T'?1:0, &args[3][4]);
|
||||
- else if ((mestart = strstr(args[3],">/me ")) != NULL)
|
||||
+ if (strncasecmp(args[4],"/me ",4) == 0)
|
||||
+ firetalk_callback_im_getaction(c, args[1], args[2][0] == 'T'?1:0, &args[4][4]);
|
||||
+ else if ((mestart = strstr(args[4],">/me ")) != NULL)
|
||||
firetalk_callback_im_getaction(c, args[1], args[2][0] == 'T'?1:0, &mestart[5]);
|
||||
else {
|
||||
if (args[2][0] == 'T') /* interpolate only auto-messages */
|
||||
- firetalk_callback_im_getmessage(c, args[1], 1, aim_interpolate_variables(args[3], c->nickname));
|
||||
+ firetalk_callback_im_getmessage(c, args[1], 1, aim_interpolate_variables(args[4], c->nickname));
|
||||
else
|
||||
- firetalk_callback_im_getmessage(c, args[1], 0, args[3]);
|
||||
+ firetalk_callback_im_getmessage(c, args[1], 0, args[4]);
|
||||
}
|
||||
}
|
||||
- } else if (strcmp(arg0, "UPDATE_BUDDY") == 0) {
|
||||
+ } else if (strcmp(arg0, "UPDATE_BUDDY2") == 0) {
|
||||
args = toc_parse_args(data,7);
|
||||
if (!args[1] || !args[2] || !args[3] || !args[4] || !args[5] || !args[6]) {
|
||||
(void)toc_internal_disconnect(c, FE_INVALIDFORMAT);
|
||||
@@ -1609,6 +1609,7 @@
|
||||
char *tempchr2;
|
||||
int permit_mode;
|
||||
firetalk_t fchandle;
|
||||
+ int magicnum;
|
||||
|
||||
got_data_connecting_start:
|
||||
r = toc_find_packet(c,buffer,bufferpos,data,c->connectstate == 0 ? SFLAP_FRAME_SIGNON : SFLAP_FRAME_DATA,&length);
|
||||
@@ -1641,7 +1642,23 @@
|
||||
firetalk_callback_needpass(c,password,128);
|
||||
|
||||
c->connectstate = 1;
|
||||
- r = toc_send_printf(c,"toc_signon login.oscar.aol.com 5190 %s %s english \"" PACKAGE_NAME ":" PACKAGE_VERSION ":contact " PACKAGE_BUGREPORT "\"",c->nickname,toc_hash_password(password));
|
||||
+
|
||||
+ magicnum = 0;
|
||||
+ {
|
||||
+ /* see www.snaphat.com/toc2.txt */
|
||||
+ int a, b, cnum, sn, pw;
|
||||
+
|
||||
+ sn = c->nickname[0] - 96;
|
||||
+ pw = (int)(password[0]) - 96;
|
||||
+
|
||||
+ a = sn * 7696 + 738816;
|
||||
+ b = sn * 746512;
|
||||
+ cnum = pw * a;
|
||||
+
|
||||
+ magicnum = cnum - a + b + 71665152;
|
||||
+ }
|
||||
+
|
||||
+ r = toc_send_printf(c,"toc2_signon login.oscar.aol.com 5190 %s %s english \"TIC:naim\" 160 %d",c->nickname,toc_hash_password(password), magicnum);
|
||||
if (r != FE_SUCCESS) {
|
||||
firetalk_callback_connectfailed(c,r,"Error sending login string");
|
||||
return r;
|
||||
@@ -1701,7 +1718,7 @@
|
||||
abort();
|
||||
}
|
||||
c->connectstate = 3;
|
||||
- } else if (strcmp(arg0,"CONFIG") == 0) {
|
||||
+ } else if (strcmp(arg0,"CONFIG2") == 0) {
|
||||
char *group;
|
||||
|
||||
group = strdup("Saved buddy");
|
||||
@@ -1711,7 +1728,7 @@
|
||||
fchandle = firetalk_find_handle(c);
|
||||
args = toc_parse_args(data,2);
|
||||
if (!args[1]) {
|
||||
- firetalk_callback_connectfailed(c,FE_INVALIDFORMAT,"CONFIG");
|
||||
+ firetalk_callback_connectfailed(c,FE_INVALIDFORMAT,"CONFIG2");
|
||||
return FE_INVALIDFORMAT;
|
||||
}
|
||||
tempchr1 = args[1];
|
@ -7,9 +7,4 @@ include/firetalk.h
|
||||
include/naim/modutil.h
|
||||
include/naim/naim.h
|
||||
include/naim/secs.h
|
||||
share/doc/naim/FAQ
|
||||
share/doc/naim/README
|
||||
share/doc/naim/commands.txt
|
||||
share/doc/naim/keyboard.txt
|
||||
@dirrm include/naim
|
||||
@dirrm share/doc/naim
|
||||
|
@ -6,35 +6,36 @@
|
||||
#
|
||||
|
||||
PORTNAME= naim
|
||||
PORTVERSION= 0.11.7.3.1
|
||||
PORTREVISION= 1
|
||||
PORTVERSION= 0.11.8
|
||||
CATEGORIES= net irc
|
||||
MASTER_SITES= http://shell.n.ml.org/n/naim/
|
||||
MASTER_SITES= http://www.liquidx.org/distfiles/ \
|
||||
http://shell.n.ml.org/n/naim/
|
||||
|
||||
MAINTAINER= tlp@LiquidX.org
|
||||
COMMENT= Console ncurses-based AIM, ICQ, IRC, and Lily client
|
||||
|
||||
USE_BZIP2= yes
|
||||
GNU_CONFIGURE= yes
|
||||
CONFIGURE_ARGS= --with-pkgdocdir=${DOCSDIR} \
|
||||
--mandir=${MANPREFIX}/man
|
||||
GNU_CONFIGURE= yes
|
||||
USE_BZIP2= yes
|
||||
|
||||
CONFIGURE_ARGS+= --mandir=${MANPREFIX}/man
|
||||
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
|
||||
|
||||
MAN1= naim.1
|
||||
MLINKS= naim.1 nirc.1 naim.1 nicq.1 naim.1 nlily.1
|
||||
PORTDOCS= FAQ README commands.txt keyboard.txt
|
||||
|
||||
OPTIONS= DETACH "Enable 'detach' feature (requires misc/screen)" off
|
||||
|
||||
.include <bsd.port.pre.mk>
|
||||
|
||||
.if !defined(NOPORTDOCS)
|
||||
CONFIGURE_ARGS+= --with-pkgdocdir=${DOCSDIR}
|
||||
.else
|
||||
CONFIGURE_ARGS+= --without-pkgdocdir
|
||||
.endif
|
||||
.if defined(WITH_DETACH)
|
||||
BUILD_DEPENDS= screen:${PORTSDIR}/misc/screen
|
||||
RUN_DEPENDS= screen:${PORTSDIR}/misc/screen
|
||||
|
||||
CONFIGURE_ARGS+= --enable-detach
|
||||
.endif
|
||||
|
||||
pre-fetch:
|
||||
@ ${ECHO} ""
|
||||
@ ${ECHO} "You can use the following build option(s):"
|
||||
@ ${ECHO} ""
|
||||
@ ${ECHO} " WITH_DETACH=yes Enables /detach (requires screen)"
|
||||
@ ${ECHO} ""
|
||||
|
||||
.include <bsd.port.mk>
|
||||
.include <bsd.port.post.mk>
|
||||
|
@ -1,2 +1,2 @@
|
||||
MD5 (naim-0.11.7.3.1.tar.bz2) = 8efe3f267d9c192abc41885865f12734
|
||||
SIZE (naim-0.11.7.3.1.tar.bz2) = 461778
|
||||
MD5 (naim-0.11.8.tar.bz2) = e66f29057ffc4016e814134b8d1f8681
|
||||
SIZE (naim-0.11.8.tar.bz2) = 409608
|
||||
|
@ -1,92 +0,0 @@
|
||||
--- firetalk/toc.c.orig Sun Jul 18 21:10:04 2004
|
||||
+++ firetalk/toc.c Fri Aug 26 13:09:16 2005
|
||||
@@ -1415,28 +1415,28 @@
|
||||
} else if (strcmp(arg0, "PAUSE") == 0) {
|
||||
c->connectstate = 1;
|
||||
firetalk_internal_set_connectstate(c, FCS_WAITING_SIGNON);
|
||||
- } else if (strcmp(arg0, "IM_IN") == 0) {
|
||||
- args = toc_parse_args(data, 4);
|
||||
+ } else if (strcmp(arg0, "IM_IN2") == 0) {
|
||||
+ args = toc_parse_args(data, 5);
|
||||
if ((args[1] == NULL) || (args[2] == NULL) || (args[3] == NULL)) {
|
||||
(void)toc_internal_disconnect(c, FE_INVALIDFORMAT);
|
||||
return FE_INVALIDFORMAT;
|
||||
}
|
||||
- (void)aim_handle_ect(c, args[1], args[3], args[2][0] == 'T'?1:0);
|
||||
- if (strlen(args[3]) > 0) {
|
||||
+ (void)aim_handle_ect(c, args[1], args[4], args[2][0] == 'T'?1:0);
|
||||
+ if (strlen(args[4]) > 0) {
|
||||
char *mestart;
|
||||
|
||||
- if (strncasecmp(args[3],"/me ",4) == 0)
|
||||
- firetalk_callback_im_getaction(c, args[1], args[2][0] == 'T'?1:0, &args[3][4]);
|
||||
- else if ((mestart = strstr(args[3],">/me ")) != NULL)
|
||||
+ if (strncasecmp(args[4],"/me ",4) == 0)
|
||||
+ firetalk_callback_im_getaction(c, args[1], args[2][0] == 'T'?1:0, &args[4][4]);
|
||||
+ else if ((mestart = strstr(args[4],">/me ")) != NULL)
|
||||
firetalk_callback_im_getaction(c, args[1], args[2][0] == 'T'?1:0, &mestart[5]);
|
||||
else {
|
||||
if (args[2][0] == 'T') /* interpolate only auto-messages */
|
||||
- firetalk_callback_im_getmessage(c, args[1], 1, aim_interpolate_variables(args[3], c->nickname));
|
||||
+ firetalk_callback_im_getmessage(c, args[1], 1, aim_interpolate_variables(args[4], c->nickname));
|
||||
else
|
||||
- firetalk_callback_im_getmessage(c, args[1], 0, args[3]);
|
||||
+ firetalk_callback_im_getmessage(c, args[1], 0, args[4]);
|
||||
}
|
||||
}
|
||||
- } else if (strcmp(arg0, "UPDATE_BUDDY") == 0) {
|
||||
+ } else if (strcmp(arg0, "UPDATE_BUDDY2") == 0) {
|
||||
args = toc_parse_args(data,7);
|
||||
if (!args[1] || !args[2] || !args[3] || !args[4] || !args[5] || !args[6]) {
|
||||
(void)toc_internal_disconnect(c, FE_INVALIDFORMAT);
|
||||
@@ -1609,6 +1609,7 @@
|
||||
char *tempchr2;
|
||||
int permit_mode;
|
||||
firetalk_t fchandle;
|
||||
+ int magicnum;
|
||||
|
||||
got_data_connecting_start:
|
||||
r = toc_find_packet(c,buffer,bufferpos,data,c->connectstate == 0 ? SFLAP_FRAME_SIGNON : SFLAP_FRAME_DATA,&length);
|
||||
@@ -1641,7 +1642,23 @@
|
||||
firetalk_callback_needpass(c,password,128);
|
||||
|
||||
c->connectstate = 1;
|
||||
- r = toc_send_printf(c,"toc_signon login.oscar.aol.com 5190 %s %s english \"" PACKAGE_NAME ":" PACKAGE_VERSION ":contact " PACKAGE_BUGREPORT "\"",c->nickname,toc_hash_password(password));
|
||||
+
|
||||
+ magicnum = 0;
|
||||
+ {
|
||||
+ /* see www.snaphat.com/toc2.txt */
|
||||
+ int a, b, cnum, sn, pw;
|
||||
+
|
||||
+ sn = c->nickname[0] - 96;
|
||||
+ pw = (int)(password[0]) - 96;
|
||||
+
|
||||
+ a = sn * 7696 + 738816;
|
||||
+ b = sn * 746512;
|
||||
+ cnum = pw * a;
|
||||
+
|
||||
+ magicnum = cnum - a + b + 71665152;
|
||||
+ }
|
||||
+
|
||||
+ r = toc_send_printf(c,"toc2_signon login.oscar.aol.com 5190 %s %s english \"TIC:naim\" 160 %d",c->nickname,toc_hash_password(password), magicnum);
|
||||
if (r != FE_SUCCESS) {
|
||||
firetalk_callback_connectfailed(c,r,"Error sending login string");
|
||||
return r;
|
||||
@@ -1701,7 +1718,7 @@
|
||||
abort();
|
||||
}
|
||||
c->connectstate = 3;
|
||||
- } else if (strcmp(arg0,"CONFIG") == 0) {
|
||||
+ } else if (strcmp(arg0,"CONFIG2") == 0) {
|
||||
char *group;
|
||||
|
||||
group = strdup("Saved buddy");
|
||||
@@ -1711,7 +1728,7 @@
|
||||
fchandle = firetalk_find_handle(c);
|
||||
args = toc_parse_args(data,2);
|
||||
if (!args[1]) {
|
||||
- firetalk_callback_connectfailed(c,FE_INVALIDFORMAT,"CONFIG");
|
||||
+ firetalk_callback_connectfailed(c,FE_INVALIDFORMAT,"CONFIG2");
|
||||
return FE_INVALIDFORMAT;
|
||||
}
|
||||
tempchr1 = args[1];
|
@ -7,9 +7,4 @@ include/firetalk.h
|
||||
include/naim/modutil.h
|
||||
include/naim/naim.h
|
||||
include/naim/secs.h
|
||||
share/doc/naim/FAQ
|
||||
share/doc/naim/README
|
||||
share/doc/naim/commands.txt
|
||||
share/doc/naim/keyboard.txt
|
||||
@dirrm include/naim
|
||||
@dirrm share/doc/naim
|
||||
|
Loading…
Reference in New Issue
Block a user