diff --git a/net/pork/Makefile b/net/pork/Makefile index ad0c9ef3647..78085c54eee 100644 --- a/net/pork/Makefile +++ b/net/pork/Makefile @@ -1,8 +1,7 @@ -# $OpenBSD: Makefile,v 1.8 2003/07/19 05:59:41 jolan Exp $ +# $OpenBSD: Makefile,v 1.9 2003/11/16 22:54:02 jolan Exp $ COMMENT= "programmable ncurses-based AIM client" -DISTNAME= pork-0.99.1 -PKGNAME= ${DISTNAME}p0 +DISTNAME= pork-0.99.2 CATEGORIES= net MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=ojnk/} diff --git a/net/pork/distinfo b/net/pork/distinfo index 5669ae3a64d..893c6d760c3 100644 --- a/net/pork/distinfo +++ b/net/pork/distinfo @@ -1,3 +1,3 @@ -MD5 (pork-0.99.1.tar.gz) = 0c4bcb533b595a66fb8a59801a936ba7 -RMD160 (pork-0.99.1.tar.gz) = 196f32128075ce1b271fd30c04581e117b018142 -SHA1 (pork-0.99.1.tar.gz) = a06321241e9f819b2bab2e8134f8f7aa99c2c098 +MD5 (pork-0.99.2.tar.gz) = 79ecb69343d56253d0008d6ddbb6fe8c +RMD160 (pork-0.99.2.tar.gz) = 4dc19ecf0668c5bc5e1f9aca1063478caafce4af +SHA1 (pork-0.99.2.tar.gz) = f85a4c6b8181719d4aff32ffb4c5505254388267 diff --git a/net/pork/patches/patch-doc_Makefile_in b/net/pork/patches/patch-doc_Makefile_in index 4a0b963d64a..76669b7e648 100644 --- a/net/pork/patches/patch-doc_Makefile_in +++ b/net/pork/patches/patch-doc_Makefile_in @@ -1,7 +1,7 @@ -$OpenBSD: patch-doc_Makefile_in,v 1.2 2003/04/28 23:00:40 margarida Exp $ ---- doc/Makefile.in.orig Sat Apr 26 20:57:40 2003 -+++ doc/Makefile.in Mon Apr 28 16:55:39 2003 -@@ -125,7 +125,7 @@ target_alias = @target_alias@ +$OpenBSD: patch-doc_Makefile_in,v 1.3 2003/11/16 22:54:02 jolan Exp $ +--- doc/Makefile.in.orig 2003-11-16 01:28:48.000000000 -0600 ++++ doc/Makefile.in 2003-11-16 16:18:03.000000000 -0600 +@@ -127,7 +127,7 @@ target_alias = @target_alias@ SUBDIRS = help pork_DATA = porkrc diff --git a/net/pork/patches/patch-examples_perl_Makefile_in b/net/pork/patches/patch-examples_perl_Makefile_in index 7bbe95ff94d..7057d9db510 100644 --- a/net/pork/patches/patch-examples_perl_Makefile_in +++ b/net/pork/patches/patch-examples_perl_Makefile_in @@ -1,7 +1,7 @@ -$OpenBSD: patch-examples_perl_Makefile_in,v 1.2 2003/04/28 23:00:40 margarida Exp $ ---- examples/perl/Makefile.in.orig Sat Apr 26 20:57:42 2003 -+++ examples/perl/Makefile.in Mon Apr 28 16:55:39 2003 -@@ -128,7 +128,7 @@ perl_DATA = \ +$OpenBSD: patch-examples_perl_Makefile_in,v 1.3 2003/11/16 22:54:02 jolan Exp $ +--- examples/perl/Makefile.in.orig 2003-11-16 01:28:51.000000000 -0600 ++++ examples/perl/Makefile.in 2003-11-16 16:18:03.000000000 -0600 +@@ -130,7 +130,7 @@ perl_DATA = \ np.pl diff --git a/net/pork/patches/patch-src_Makefile_in b/net/pork/patches/patch-src_Makefile_in index 0da1453ea13..78f45ec6210 100644 --- a/net/pork/patches/patch-src_Makefile_in +++ b/net/pork/patches/patch-src_Makefile_in @@ -1,12 +1,12 @@ -$OpenBSD: patch-src_Makefile_in,v 1.2 2003/04/28 23:00:40 margarida Exp $ ---- src/Makefile.in.orig Sat Apr 26 20:57:43 2003 -+++ src/Makefile.in Mon Apr 28 16:55:39 2003 -@@ -125,7 +125,7 @@ target_alias = @target_alias@ - SUBDIRS = missing libfaim +$OpenBSD: patch-src_Makefile_in,v 1.3 2003/11/16 22:54:02 jolan Exp $ +--- src/Makefile.in.orig 2003-11-16 01:28:51.000000000 -0600 ++++ src/Makefile.in 2003-11-16 16:19:49.000000000 -0600 +@@ -132,7 +132,7 @@ target_alias = @target_alias@ + SUBDIRS = missing libfaim $(irc_dir) bin_PROGRAMS = pork --AM_CFLAGS = -funsigned-char -Imissing -Wall -Ilibfaim -DHELP_PATH=\"$(pkgdatadir)/help\" -DSYSTEM_PORKRC=\"$(pkgdatadir)/porkrc\" $(PERL_CFLAGS) $(DEBUG_CFLAGS) -+AM_CFLAGS = -funsigned-char -Imissing -Wall -Ilibfaim -DHELP_PATH=\"$(pkgdatadir)/help\" -DSYSTEM_PORKRC=\"$(sysconfdir)/porkrc\" $(PERL_CFLAGS) $(DEBUG_CFLAGS) +-AM_CFLAGS = -funsigned-char -Imissing -Wall -Ilibfaim $(irc_include_path) -DHELP_PATH=\"$(pkgdatadir)/help\" -DSYSTEM_PORKRC=\"$(pkgdatadir)/porkrc\" $(PERL_CFLAGS) $(DEBUG_CFLAGS) ++AM_CFLAGS = -funsigned-char -Imissing -Wall -Ilibfaim $(irc_include_path) -DHELP_PATH=\"$(pkgdatadir)/help\" -DSYSTEM_PORKRC=\"$(sysconfdir)/porkrc\" $(PERL_CFLAGS) $(DEBUG_CFLAGS) - pork_LDFLAGS = -Lmissing -Llibfaim - pork_LDADD = -lmissing -lfaim -lncurses $(PERL_LIBS) $(DEBUG_LIBS) + pork_LDFLAGS = -Lmissing -Llibfaim $(irc_link_path) + pork_LDADD = -lmissing -lfaim -lncurses $(PERL_LIBS) $(DEBUG_LIBS) $(irc_link_libs) diff --git a/net/pork/patches/patch-src_pork_aim_c b/net/pork/patches/patch-src_pork_aim_c deleted file mode 100644 index 606aa18ef52..00000000000 --- a/net/pork/patches/patch-src_pork_aim_c +++ /dev/null @@ -1,48 +0,0 @@ -$OpenBSD: patch-src_pork_aim_c,v 1.1 2003/07/19 05:59:41 jolan Exp $ ---- src/pork_aim.c.orig Thu Jul 10 09:14:49 2003 -+++ src/pork_aim.c Sat Jul 19 00:01:07 2003 -@@ -2177,18 +2177,10 @@ static int aim_send_msg_auto(struct pork - } - - static int aim_send_msg(struct pork_acct *acct, char *dest, char *msg) { -- int ret; - struct aim_priv *priv = acct->data; - char *msg_html = text_to_html(msg); - -- ret = aim_im_sendch1(&priv->aim_session, dest, 0, msg_html); -- -- if (acct->away_msg != NULL) { -- if (opt_get_bool(OPT_SEND_REMOVES_AWAY)) -- aim_set_away(acct, NULL); -- } -- -- return (ret); -+ return (aim_im_sendch1(&priv->aim_session, dest, 0, msg_html)); - } - - static int aim_add_block(struct pork_acct *acct, char *target) { -@@ -2733,7 +2725,7 @@ static int aim_chat_print_users(struct p - if (i > 0 && buf[i - 1] == ' ') - buf[i - 1] = '\0'; - -- screen_win_msg(win, 0, 0, 1, "%s", buf); -+ screen_write(win, buf); - return (0); - } - -@@ -3040,7 +3032,6 @@ int aim_proto_init(struct pork_proto *pr - proto->buddy_permit = aim_add_permit; - proto->buddy_remove = aim_buddy_remove; - proto->buddy_remove_permit = aim_remove_permit; -- proto->buddy_search = aim_search; - proto->buddy_unblock = aim_unblock; - proto->buddy_update = aim_update_buddy; - -@@ -3054,6 +3045,7 @@ int aim_proto_init(struct pork_proto *pr - proto->chat_users = aim_chat_print_users; - proto->chat_who = aim_chat_print_users; - -+ proto->who = aim_search; - proto->connect = aim_connect; - proto->free = aim_acct_free; - proto->get_away_msg = aim_get_away_msg; diff --git a/net/pork/patches/patch-src_pork_chat_c b/net/pork/patches/patch-src_pork_chat_c deleted file mode 100644 index bb5362f9c25..00000000000 --- a/net/pork/patches/patch-src_pork_chat_c +++ /dev/null @@ -1,30 +0,0 @@ -$OpenBSD: patch-src_pork_chat_c,v 1.1 2003/07/19 05:59:41 jolan Exp $ ---- src/pork_chat.c.orig Thu Jul 10 13:52:40 2003 -+++ src/pork_chat.c Thu Jul 17 16:00:57 2003 -@@ -453,6 +453,9 @@ struct chat_user *chat_user_joined( stru - struct chat_user *chat_user; - char buf[512]; - -+ if (chat_find_user(acct, chat, user) != NULL) -+ return (NULL); -+ - chat->num_users++; - - acct->proto->normalize(user, buf, sizeof(buf)); -@@ -519,14 +522,13 @@ int chat_user_left( struct pork_acct *ac - char buf[512]; - - node = chat_find_user_node(acct, chat, user); -- if (node == NULL) -- return (-1); -- -+ if (node == NULL) { - chat->num_users--; - - chat_user = node->data; - chat->user_list = dlist_remove(chat->user_list, node); - chat_destroy_user_list_cb(acct, chat_user); -+ } - - if (event_generate(acct->events, EVENT_RECV_CHAT_LEAVE, - chat->title, user, acct->refnum)) diff --git a/net/pork/patches/patch-src_pork_command_c b/net/pork/patches/patch-src_pork_command_c deleted file mode 100644 index 48c4cf351d8..00000000000 --- a/net/pork/patches/patch-src_pork_command_c +++ /dev/null @@ -1,101 +0,0 @@ -$OpenBSD: patch-src_pork_command_c,v 1.3 2003/07/19 05:59:41 jolan Exp $ ---- src/pork_command.c.orig Thu Jul 10 11:25:24 2003 -+++ src/pork_command.c Sat Jul 19 00:12:47 2003 -@@ -103,6 +103,7 @@ static const struct command command[] = - { "timer", cmd_timer }, - { "unalias", cmd_unalias }, - { "unbind", cmd_unbind }, -+ { "who", cmd_who }, - { "win", cmd_win }, - }; - -@@ -678,7 +679,7 @@ USER_COMMAND(cmd_history_list) { - if (cur == NULL) - return; - -- screen_win_msg(win, 0, 0, 0, "Command history:"); -+ screen_write(win, "Command history:"); - - do { - char *entry = (char *) cur->data; -@@ -718,7 +719,7 @@ static const struct command buddy_comman - { "remove_group", cmd_buddy_remove_group }, - { "remove_permit", cmd_buddy_remove_permit }, - { "report_idle", cmd_buddy_report_idle }, -- { "search", cmd_buddy_search }, -+ { "search", cmd_who }, - { "seen", cmd_buddy_seen }, - { "unblock", cmd_buddy_unblock }, - { "warn", cmd_buddy_warn }, -@@ -1067,13 +1068,6 @@ USER_COMMAND(cmd_buddy_report_idle) { - acct->username, (acct->report_idle ? "enabled" : "disabled")); - } - --USER_COMMAND(cmd_buddy_search) { -- struct pork_acct *acct = cur_window()->owner; -- -- if (acct->proto->buddy_search != NULL && args != NULL) -- acct->proto->buddy_search(acct, args); --} -- - USER_COMMAND(cmd_buddy_seen) { - struct pork_acct *acct = cur_window()->owner; - struct buddy *buddy; -@@ -1941,14 +1935,14 @@ USER_COMMAND(cmd_connect) { - acct = imwindow->owner; - } - -- if (acct->proto->connect == NULL) -- return; -- - if (!acct->can_connect) { - screen_err_msg("You must specify a screen name before connecting"); - return; - } - -+ if (acct->proto->connect == NULL) -+ return; -+ - if (acct->proto->connect(acct, args) == -1) { - screen_err_msg("Unable to login as %s", acct->username); - pork_acct_del_refnum(acct->refnum); -@@ -1959,7 +1953,7 @@ USER_COMMAND(cmd_connect) { - - USER_COMMAND(cmd_echo) { - if (args != NULL) -- screen_win_msg(cur_window(), 0, 0, 1, "%s", args); -+ screen_write(cur_window(), args); - } - - USER_COMMAND(cmd_disconnect) { -@@ -2022,12 +2016,12 @@ USER_COMMAND(cmd_help) { - screen_err_msg("Help: Error: No such command or section: %s", - section); - } else { -+ struct imwindow *win = cur_window(); - if (pork_help_get_cmds(section, buf, sizeof(buf)) != -1) { -- screen_win_msg(cur_window(), 0, 0, 0, " "); -+ screen_write(win, " "); - strtoupper(section); -- screen_win_msg(cur_window(), 0, 0, 1, "%%W%s COMMANDS", -- section); -- screen_win_msg(cur_window(), 0, 0, 1, "\t%s", buf); -+ screen_win_msg(cur_window(), 0, 0, 1, "%%W%s COMMANDS", section); -+ screen_win_msg(win, 0, 0, 1, "\t%s", buf); - screen_output("Type /help %s for the help text for a particular %s command.", - section, section); - } -@@ -2235,6 +2229,13 @@ USER_COMMAND(cmd_email) { - } - - USER_COMMAND(cmd_passwd) { -+} -+ -+USER_COMMAND(cmd_who) { -+ struct pork_acct *acct = cur_window()->owner; -+ -+ if (acct->proto->who != NULL && args != NULL) -+ acct->proto->who(acct, args); - } - - USER_COMMAND(cmd_perl) { diff --git a/net/pork/patches/patch-src_pork_command_defs_h b/net/pork/patches/patch-src_pork_command_defs_h deleted file mode 100644 index fc4f466cfea..00000000000 --- a/net/pork/patches/patch-src_pork_command_defs_h +++ /dev/null @@ -1,20 +0,0 @@ -$OpenBSD: patch-src_pork_command_defs_h,v 1.1 2003/07/19 05:59:41 jolan Exp $ ---- src/pork_command_defs.h.orig Mon Jul 7 23:52:27 2003 -+++ src/pork_command_defs.h Sat Jul 19 00:14:42 2003 -@@ -41,7 +41,7 @@ USER_COMMAND(cmd_send); - USER_COMMAND(cmd_set); - USER_COMMAND(cmd_unbind); - USER_COMMAND(cmd_unalias); --USER_COMMAND(cmd_xecho); -+USER_COMMAND(cmd_who); - - USER_COMMAND(cmd_file); - USER_COMMAND(cmd_file_cancel); -@@ -118,7 +118,6 @@ USER_COMMAND(cmd_buddy_remove); - USER_COMMAND(cmd_buddy_remove_group); - USER_COMMAND(cmd_buddy_remove_permit); - USER_COMMAND(cmd_buddy_report_idle); --USER_COMMAND(cmd_buddy_search); - USER_COMMAND(cmd_buddy_seen); - USER_COMMAND(cmd_buddy_unblock); - USER_COMMAND(cmd_buddy_warn); diff --git a/net/pork/patches/patch-src_pork_msg_c b/net/pork/patches/patch-src_pork_msg_c deleted file mode 100644 index 6c74401404d..00000000000 --- a/net/pork/patches/patch-src_pork_msg_c +++ /dev/null @@ -1,24 +0,0 @@ -$OpenBSD: patch-src_pork_msg_c,v 1.1 2003/07/19 05:59:41 jolan Exp $ ---- src/pork_msg.c.orig Tue Jul 8 13:03:38 2003 -+++ src/pork_msg.c Sat Jul 19 00:17:51 2003 -@@ -44,7 +44,7 @@ int pork_msg_send_auto(struct pork_acct - u_int32_t hash_val; - int ret = 0; - -- if (acct->proto->send_msg_auto == NULL) -+ if (acct->away_msg != NULL && acct->proto->send_msg_auto == NULL) - return (-1); - - hash_val = string_hash(sender, acct->autoreply.order); -@@ -196,6 +196,11 @@ int pork_msg_send(struct pork_acct *acct - dest); - } else { - struct imwindow *win; -+ -+ if (acct->away_msg != NULL) { -+ if (opt_get_bool(OPT_SEND_REMOVES_AWAY)) -+ pork_set_back(acct); -+ } - - win = imwindow_find(acct, dest); - if (win == NULL || win->type != TYPE_PRIVMSG) { diff --git a/net/pork/patches/patch-src_pork_perl_xs_c b/net/pork/patches/patch-src_pork_perl_xs_c deleted file mode 100644 index 215c4903370..00000000000 --- a/net/pork/patches/patch-src_pork_perl_xs_c +++ /dev/null @@ -1,21 +0,0 @@ -$OpenBSD: patch-src_pork_perl_xs_c,v 1.1 2003/07/19 05:59:41 jolan Exp $ ---- src/pork_perl_xs.c.orig Sat Jul 19 00:18:01 2003 -+++ src/pork_perl_xs.c Sat Jul 19 00:19:07 2003 -@@ -195,7 +195,7 @@ XS(PORK_echo) { - XSRETURN_IV(-1); - - msg = SvPV(ST(0), notused); -- screen_win_msg(cur_window(), 0, 0, 1, "%s", msg); -+ screen_write(cur_window(), msg); - XSRETURN_IV(0); - } - -@@ -825,7 +825,7 @@ XS(PORK_search) { - if (!acct->connected) - XSRETURN_IV(-1); - -- XSRETURN_IV(acct->proto->buddy_search(acct, target)); -+ XSRETURN_IV(acct->proto->who(acct, target)); - } - - XS(PORK_set_away) { diff --git a/net/pork/patches/patch-src_pork_proto_h b/net/pork/patches/patch-src_pork_proto_h deleted file mode 100644 index aac06e75804..00000000000 --- a/net/pork/patches/patch-src_pork_proto_h +++ /dev/null @@ -1,19 +0,0 @@ -$OpenBSD: patch-src_pork_proto_h,v 1.1 2003/07/19 05:59:41 jolan Exp $ ---- src/pork_proto.h.orig Wed Jul 2 11:47:10 2003 -+++ src/pork_proto.h Sat Jul 19 00:20:55 2003 -@@ -33,7 +33,6 @@ struct pork_proto { - int (*buddy_permit)(struct pork_acct *, char *); - int (*buddy_unblock)(struct pork_acct *, char *); - int (*buddy_remove_permit)(struct pork_acct *, char *); -- int (*buddy_search)(struct pork_acct *, char *str); - int (*buddy_add)(struct pork_acct *, struct buddy *); - int (*buddy_alias)(struct pork_acct *, struct buddy *); - int (*buddy_remove)(struct pork_acct *, struct buddy *); -@@ -80,6 +79,7 @@ struct pork_proto { - int (*update)(struct pork_acct *); - int (*user_compare)(const char *u1, const char *u2); - int (*normalize)(const char *str, char *buf, size_t len); -+ int (*who)(struct pork_acct *, char *str); - }; - - int proto_init(u_int32_t protocol, int (*init_func)(struct pork_proto *)); diff --git a/net/pork/patches/patch-src_pork_screen_cmd_c b/net/pork/patches/patch-src_pork_screen_cmd_c deleted file mode 100644 index ecbd8e2f7d1..00000000000 --- a/net/pork/patches/patch-src_pork_screen_cmd_c +++ /dev/null @@ -1,18 +0,0 @@ -$OpenBSD: patch-src_pork_screen_cmd_c,v 1.1 2003/07/19 05:59:41 jolan Exp $ ---- src/pork_screen_cmd.c.orig Tue Jul 8 14:26:29 2003 -+++ src/pork_screen_cmd.c Sat Jul 19 00:25:39 2003 -@@ -299,6 +299,14 @@ inline void screen_win_msg( struct imwin - va_end(ap); - } - -+inline void screen_write(struct imwindow *win, char *buf) { -+ chtype ch[4096]; -+ size_t chlen = array_elem(ch); -+ -+ plaintext_to_cstr(buf, ch, chlen); -+ imwindow_add(win, ch, 0); -+} -+ - inline void screen_status_msg(char *fmt, ...) { - va_list ap; - diff --git a/net/pork/patches/patch-src_pork_screen_cmd_h b/net/pork/patches/patch-src_pork_screen_cmd_h deleted file mode 100644 index 9e10ecb2f8c..00000000000 --- a/net/pork/patches/patch-src_pork_screen_cmd_h +++ /dev/null @@ -1,11 +0,0 @@ -$OpenBSD: patch-src_pork_screen_cmd_h,v 1.1 2003/07/19 05:59:41 jolan Exp $ ---- src/pork_screen_cmd.h.orig Sun Jun 15 14:44:25 2003 -+++ src/pork_screen_cmd.h Sat Jul 19 00:22:44 2003 -@@ -19,6 +19,7 @@ void screen_win_msg(struct imwindow *win - int color, - char *fmt, ...) __format((printf, 5, 6)); - -+inline void screen_write(struct imwindow *win, char *buf); - inline void screen_nocolor_msg(char *fmt, ...) __format((printf, 1, 2)); - inline void screen_status_msg(char *fmt, ...) __format((printf, 1, 2)); - inline void screen_err_msg(char *fmt, ...) __format((printf, 1, 2)); diff --git a/net/pork/pkg/DESCR b/net/pork/pkg/DESCR index 37cced05c98..995ddc84980 100644 --- a/net/pork/pkg/DESCR +++ b/net/pork/pkg/DESCR @@ -3,5 +3,3 @@ feels like ircII. To begin using pork quickly, consult the installed quick start guide which may be found at: ${PREFIX}/share/doc/pork/QUICK_START - -WWW: ${HOMEPAGE}