diff options
author | mrg <mrg@pkgsrc.org> | 2019-01-17 05:21:24 +0000 |
---|---|---|
committer | mrg <mrg@pkgsrc.org> | 2019-01-17 05:21:24 +0000 |
commit | 4bfa7270706b72f11415404c312eedecdf08a772 (patch) | |
tree | 608ef6dcbd029b96309b59ff47d558d01586d57c /chat/ircII | |
parent | 0417a7125a089b5e5274cb3e52ca22f6e746ee7e (diff) | |
download | pkgsrc-4bfa7270706b72f11415404c312eedecdf08a772.tar.gz |
update to ircII 20190116. changes include:
o new /lastlog commands -saveall and -loadall that save and load the
current window's lastlog, allowing session restoring
o new REFRESH_WINDOW_LASTLOG binding that will fully redraw the
current window, using data from the lastlog, leaving it in a
scrollable manner
o fix run-time errors on macOS
o ircII is now cross compileable
o add a basic help2html.pl script that converts the help pages into
(poorly so far) formatted html pages, many help issues pages fixed
o restore case-insensitive /lastlog, accidentally broken in 20161207
o fix input line scrolling problem where it would not keep any of the
existing input line.
Diffstat (limited to 'chat/ircII')
-rw-r--r-- | chat/ircII/Makefile | 5 | ||||
-rw-r--r-- | chat/ircII/PLIST | 17 | ||||
-rw-r--r-- | chat/ircII/distinfo | 15 | ||||
-rw-r--r-- | chat/ircII/patches/patch-Makefile.in | 24 | ||||
-rw-r--r-- | chat/ircII/patches/patch-ac | 38 | ||||
-rw-r--r-- | chat/ircII/patches/patch-include_irc.h | 14 | ||||
-rw-r--r-- | chat/ircII/patches/patch-ircaux.c | 34 | ||||
-rw-r--r-- | chat/ircII/patches/patch-source_names.c | 22 |
8 files changed, 42 insertions, 127 deletions
diff --git a/chat/ircII/Makefile b/chat/ircII/Makefile index 7e9c5db0f90..1ee18b79aff 100644 --- a/chat/ircII/Makefile +++ b/chat/ircII/Makefile @@ -1,11 +1,10 @@ -# $NetBSD: Makefile,v 1.80 2018/09/26 10:38:26 mrg Exp $ +# $NetBSD: Makefile,v 1.81 2019/01/17 05:21:24 mrg Exp $ DISTNAME= ircii-${VERS} PKGNAME= ircII-${VERS} CATEGORIES= chat MASTER_SITES= http://ircii.warped.com/ EXTRACT_SUFX= .tar.bz2 -PKGREVISION= 2 MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.eterna.com.au/ircii/ @@ -14,7 +13,7 @@ LICENSE= modified-bsd CONFLICTS= blackened-[0-9]* -VERS= 20170704 +VERS= 20190116 PLIST_SUBST+= VERS=${VERS:Q} .include "../../mk/bsd.prefs.mk" diff --git a/chat/ircII/PLIST b/chat/ircII/PLIST index a07d162887c..c751d809c4c 100644 --- a/chat/ircII/PLIST +++ b/chat/ircII/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.27 2015/09/17 07:06:48 tron Exp $ +@comment $NetBSD: PLIST,v 1.28 2019/01/17 05:21:24 mrg Exp $ bin/irc bin/irc-${VERS} bin/ircbug @@ -119,6 +119,7 @@ share/irc/help/exec${GZSUFFIX} share/irc/help/exit${GZSUFFIX} share/irc/help/expressions${GZSUFFIX} share/irc/help/flush${GZSUFFIX} +share/irc/help/for${GZSUFFIX} share/irc/help/foreach${GZSUFFIX} share/irc/help/help${GZSUFFIX} share/irc/help/history${GZSUFFIX} @@ -130,7 +131,11 @@ share/irc/help/info${GZSUFFIX} share/irc/help/input${GZSUFFIX} share/irc/help/intro${GZSUFFIX} share/irc/help/invite${GZSUFFIX} +share/irc/help/ircii/command_line_args${GZSUFFIX} share/irc/help/ircii/copyright${GZSUFFIX} +share/irc/help/ircii/environment_vars${GZSUFFIX} +share/irc/help/ircii/programming${GZSUFFIX} +share/irc/help/ircii/server_lists${GZSUFFIX} share/irc/help/ison${GZSUFFIX} share/irc/help/join${GZSUFFIX} share/irc/help/kick${GZSUFFIX} @@ -290,11 +295,9 @@ share/irc/help/on/send_dcc_chat${GZSUFFIX} share/irc/help/on/send_msg${GZSUFFIX} share/irc/help/on/send_notice${GZSUFFIX} share/irc/help/on/send_public${GZSUFFIX} -share/irc/help/on/send_talk${GZSUFFIX} share/irc/help/on/serial_numbers${GZSUFFIX} share/irc/help/on/server_notice${GZSUFFIX} share/irc/help/on/signoff${GZSUFFIX} -share/irc/help/on/talk${GZSUFFIX} share/irc/help/on/timer${GZSUFFIX} share/irc/help/on/topic${GZSUFFIX} share/irc/help/on/wall${GZSUFFIX} @@ -350,10 +353,6 @@ share/irc/help/set/debug${GZSUFFIX} share/irc/help/set/decrypt_program${GZSUFFIX} share/irc/help/set/display${GZSUFFIX} share/irc/help/set/display_encoding${GZSUFFIX} -share/irc/help/set/ssl_ca_path${GZSUFFIX} -share/irc/help/set/ssl_ca_file${GZSUFFIX} -share/irc/help/set/ssl_ca_chain_file${GZSUFFIX} -share/irc/help/set/ssl_ca_private_key_file${GZSUFFIX} share/irc/help/set/eight_bit_characters${GZSUFFIX} share/irc/help/set/encrypt_program${GZSUFFIX} share/irc/help/set/exec_protection${GZSUFFIX} @@ -417,6 +416,10 @@ share/irc/help/set/show_numerics${GZSUFFIX} share/irc/help/set/show_stars${GZSUFFIX} share/irc/help/set/show_status_all${GZSUFFIX} share/irc/help/set/show_who_hopcount${GZSUFFIX} +share/irc/help/set/ssl_ca_chain_file${GZSUFFIX} +share/irc/help/set/ssl_ca_file${GZSUFFIX} +share/irc/help/set/ssl_ca_path${GZSUFFIX} +share/irc/help/set/ssl_ca_private_key_file${GZSUFFIX} share/irc/help/set/star_prefix${GZSUFFIX} share/irc/help/set/status_away${GZSUFFIX} share/irc/help/set/status_channel${GZSUFFIX} diff --git a/chat/ircII/distinfo b/chat/ircII/distinfo index 8a5ddfd1a46..2a8187b6903 100644 --- a/chat/ircII/distinfo +++ b/chat/ircII/distinfo @@ -1,10 +1,7 @@ -$NetBSD: distinfo,v 1.48 2018/09/26 10:38:26 mrg Exp $ +$NetBSD: distinfo,v 1.49 2019/01/17 05:21:24 mrg Exp $ -SHA1 (ircii-20170704.tar.bz2) = 88f55a59af48d7ed131895d68354fe7f566e3180 -RMD160 (ircii-20170704.tar.bz2) = b857a49c6d843748b0bcbccf9e3aec16d7be974b -SHA512 (ircii-20170704.tar.bz2) = a0cdc5603fab040fa2f7d2b3d7a564e9eeac4b402329cba5c6f1a97aa6e587a53ffc4141420dde97dc2cadf22581e74058a0357c6b4b0d0b03f5dea7fa8cbc3a -Size (ircii-20170704.tar.bz2) = 596535 bytes -SHA1 (patch-ac) = 9f6f3b27670b63ff00b55c5431ec1da5219369ff -SHA1 (patch-include_irc.h) = 257e7879461d88d9e8e05205e96cdec702e9e458 -SHA1 (patch-ircaux.c) = ab4d614cc20b3591a276b27ac818ed409c2116f6 -SHA1 (patch-source_names.c) = 53b22dcf43f274bb4a67c6ee016260e76c090756 +SHA1 (ircii-20190116.tar.bz2) = 5e30b6180a74b81695ecdee46e8385c680b3a93d +RMD160 (ircii-20190116.tar.bz2) = e1624c193e2ad4f6ce291ee8c41d15998daf4fa1 +SHA512 (ircii-20190116.tar.bz2) = a55d545ae5ba4d0b2b63abcee0666fff42642994d6f3569f8c17ef2312a5e9a9bd1b56951f00b26e1aadd36aafe8c4a41399f76cb0b75a32b6e70f77cd22742d +Size (ircii-20190116.tar.bz2) = 607829 bytes +SHA1 (patch-Makefile.in) = 77fd2cfb1ef528faf03a3ef61c4802917fb6c8d5 diff --git a/chat/ircII/patches/patch-Makefile.in b/chat/ircII/patches/patch-Makefile.in new file mode 100644 index 00000000000..72a784aa01d --- /dev/null +++ b/chat/ircII/patches/patch-Makefile.in @@ -0,0 +1,24 @@ +$NetBSD: patch-Makefile.in,v 1.1 2019/01/17 05:21:24 mrg Exp $ + +--- Makefile.in.orig 2019-01-16 07:47:45.000000000 +0000 ++++ Makefile.in 2019-01-17 04:58:52.733449626 +0000 +@@ -128,8 +128,8 @@ + CP = cp + MV = mv + SED = sed +-INSTALL = $(topdir)/bsdinstall -c -m 755 +-INSTALL_DATA = $(topdir)/bsdinstall -c -m 644 ++INSTALL = $(BSD_INSTALL_PROGRAM) ++INSTALL_DATA = $(BSD_INSTALL_DATA) + + VERSION = @VERSION@ + +@@ -150,7 +150,7 @@ + + installirc: irc installdirs + $(INSTALL) irc $(INSTALL_IRC)-$(VERSION) +- $(INSTALL) ircbug $(bindir)/ircbug ++ $(BSD_INSTALL_SCRIPT) ircbug $(bindir)/ircbug + $(RM) $(INSTALL_IRC) + $(LN) $(INSTALL_IRC_NAME)-$(VERSION) $(INSTALL_IRC) + diff --git a/chat/ircII/patches/patch-ac b/chat/ircII/patches/patch-ac deleted file mode 100644 index 1861f85df6f..00000000000 --- a/chat/ircII/patches/patch-ac +++ /dev/null @@ -1,38 +0,0 @@ -$NetBSD: patch-ac,v 1.8 2014/01/02 07:57:49 mrg Exp $ - ---- Makefile.in.orig 2013-12-30 08:42:37.000000000 -0800 -+++ Makefile.in 2014-01-01 23:21:21.000000000 -0800 -@@ -127,8 +127,8 @@ - CP = cp - MV = mv - SED = sed --INSTALL = $(topdir)/bsdinstall -c -m 755 --INSTALL_DATA = $(topdir)/bsdinstall -c -m 644 -+INSTALL = $(BSD_INSTALL_PROGRAM) -+INSTALL_DATA = $(BSD_INSTALL_DATA) - - VERSION = @VERSION@ - -@@ -149,11 +149,9 @@ - - installirc: irc installdirs - $(INSTALL) irc $(INSTALL_IRC)-$(VERSION) -- $(INSTALL) ircbug $(bindir)/ircbug -- @if test -f $(INSTALL_IRC).old; then $(RM) $(INSTALL_IRC).old; fi -- @if test -f $(INSTALL_IRC); then $(MV) $(INSTALL_IRC) $(INSTALL_IRC).old; fi -+ $(BSD_INSTALL_SCRIPT) ircbug $(bindir)/ircbug - $(RM) $(INSTALL_IRC) -- $(LN) $(INSTALL_IRC_NAME)-$(VERSION) $(INSTALL_IRC) -+ cd ${bindir}; $(LN) irc-$(VERSION) irc - - installscript: installdirs - ( \ -@@ -193,7 +191,7 @@ - # $(INSTALL_DATA) $(topdir)/doc/query-pr.1 $(mandir) - - installdirs: -- umask 022; $(topdir)/mkinstalldirs $(IRCLIB) $(bindir) $(mandir) \ -+ $(topdir)/mkinstalldirs $(IRCLIB) $(bindir) $(mandir) \ - $(INSTALL_SCRIPT) $(HELP_DIR) $(libexecdir) - - clena clean: diff --git a/chat/ircII/patches/patch-include_irc.h b/chat/ircII/patches/patch-include_irc.h deleted file mode 100644 index d6b43c55bc1..00000000000 --- a/chat/ircII/patches/patch-include_irc.h +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-include_irc.h,v 1.1 2017/07/22 15:13:41 maya Exp $ - -limits.h for PATH_MAX - ---- include/irc.h.orig 2017-07-03 12:44:25.000000000 +0000 -+++ include/irc.h -@@ -92,6 +92,7 @@ - # include <fcntl.h> - #endif /* HAVE_FCNTL_H */ - -+#include <limits.h> - #include <unistd.h> - - #ifdef HAVE_SYS_FILE_H diff --git a/chat/ircII/patches/patch-ircaux.c b/chat/ircII/patches/patch-ircaux.c deleted file mode 100644 index 5eca6162069..00000000000 --- a/chat/ircII/patches/patch-ircaux.c +++ /dev/null @@ -1,34 +0,0 @@ -$NetBSD: patch-ircaux.c,v 1.1 2018/09/26 10:38:26 mrg Exp $ - -avoid trailing garbage in some variable assignments. - -Index: source/ircaux.c -=================================================================== -RCS file: /home/cvs/ircii/source/ircaux.c,v -retrieving revision 1.123 -retrieving revision 1.124 -diff -p -u -r1.123 -r1.124 ---- source/ircaux.c 4 Jul 2017 12:10:22 -0000 1.123 -+++ source/ircaux.c 13 Sep 2017 21:24:56 -0000 1.124 -@@ -946,7 +946,7 @@ double_quote_work(u_char *str, u_char *s - } - if (dst && pos < dstlen) - dst[pos] = '\0'; -- return pos; -+ return pos + 1; - } - - /* -@@ -961,10 +961,10 @@ double_quote(u_char *str, u_char *stuff) - size_t len, len2; - - len = double_quote_work(str, stuff, NULL, 0); -- if (len == 0) -+ if (len == 1) - return empty_string(); - -- dst = new_malloc(len + 1); -+ dst = new_malloc(len); - len2 = double_quote_work(str, stuff, dst, len); - if (len != len2) - yell("--- double_quote() error: len %zu len2 %zu", len, len2); diff --git a/chat/ircII/patches/patch-source_names.c b/chat/ircII/patches/patch-source_names.c deleted file mode 100644 index 5e1b7e68e50..00000000000 --- a/chat/ircII/patches/patch-source_names.c +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-source_names.c,v 1.1 2018/07/19 22:22:21 mrg Exp $ - -fix a problem with reconnecting to the wrong window and also -join channels with the wrong key. - -Index: source/names.c -=================================================================== -RCS file: /home/cvs/ircii/source/names.c,v -retrieving revision 1.143 -retrieving revision 1.144 -diff -p -u -u -r1.143 -r1.144 ---- source/names.c 4 Jul 2017 08:08:23 -0000 1.143 -+++ source/names.c 6 Sep 2017 04:47:48 -0000 1.144 -@@ -202,6 +202,8 @@ add_channel(u_char *channel, u_char *key - new->limit = 0; - do_add = 1; - full_list = server_get_chan_list(server); -+ if ((new->window = is_bound(channel, server)) == NULL) -+ new->window = curr_scr_win; - add_to_list((List **)(void *)&full_list, (List *) new); - server_set_chan_list(server, full_list); - } |