Sun Oct 21 21:22:47 2018 UTC ()
tmux: Update misc/tmux to 2.8
pkgsrc changes:
- Address -Wint-conversion warnings and properly cast to long, patch by
<christos> from NetBSD, thanks!
- Remove patch-server-client.c, timersub() was added in compat.h
since tmux-1.9 and is no longer needed
- Take MAINTAINERship
Changes:
2.8
---
* Make display-panes block the client until a pane is chosen or it
times out.
* Clear history on RIS like most other terminals do.
* Add an "Any" key to run a command if a key is pressed that is not
bound in the current key table.
* Expand formats in load-buffer and save-buffer.
* Add a rectangle_toggle format.
* Add set-hook -R to run a hook immediately.
* Add README.ja.
* Add pane focus hooks.
* Allow any punctuation as separator for s/x/y not only /.
* Improve resizing with the mouse (fix resizing the wrong pane in some
layouts, and allow resizing multiple panes at the same time).
* Allow , and } to be escaped in formats as #, and #}.
* Add KRB5CCNAME to update-environment.
* Change meaning of -c to display-message so the client is used if it
matches the session given to -t.
* Fixes to : form of SGR.
* Add x and X to choose-tree to kill sessions, windows or panes.
(leot)
diff -r1.45 -r1.46 pkgsrc/misc/tmux/Makefile
diff -r1.36 -r1.37 pkgsrc/misc/tmux/distinfo
diff -r1.4 -r1.5 pkgsrc/misc/tmux/patches/patch-Makefile.in
diff -r1.5 -r0 pkgsrc/misc/tmux/patches/patch-server-client.c
diff -r0 -r1.1 pkgsrc/misc/tmux/patches/patch-tty-term.c
--- pkgsrc/misc/tmux/Makefile 2018/06/09 11:23:05 1.45
+++ pkgsrc/misc/tmux/Makefile 2018/10/21 21:22:47 1.46
| @@ -1,22 +1,21 @@ | | | @@ -1,22 +1,21 @@ |
1 | # $NetBSD: Makefile,v 1.45 2018/06/09 11:23:05 leot Exp $ | | 1 | # $NetBSD: Makefile,v 1.46 2018/10/21 21:22:47 leot Exp $ |
2 | | | 2 | |
3 | DISTNAME= tmux-2.7 | | 3 | DISTNAME= tmux-2.8 |
4 | PKGREVISION= 1 | | | |
5 | CATEGORIES= misc | | 4 | CATEGORIES= misc |
6 | MASTER_SITES= ${MASTER_SITE_GITHUB:=tmux/} | | 5 | MASTER_SITES= ${MASTER_SITE_GITHUB:=tmux/} |
7 | GITHUB_RELEASE= ${PKGVERSION_NOREV} | | 6 | GITHUB_RELEASE= ${PKGVERSION_NOREV} |
8 | | | 7 | |
9 | MAINTAINER= pkgsrc-users@NetBSD.org | | 8 | MAINTAINER= leot@NetBSD.org |
10 | HOMEPAGE= http://tmux.github.io/ | | 9 | HOMEPAGE= http://tmux.github.io/ |
11 | COMMENT= BSD-licensed terminal multiplexer (GNU Screen alternative) | | 10 | COMMENT= BSD-licensed terminal multiplexer (GNU Screen alternative) |
12 | LICENSE= modified-bsd | | 11 | LICENSE= modified-bsd |
13 | | | 12 | |
14 | GNU_CONFIGURE= yes | | 13 | GNU_CONFIGURE= yes |
15 | USE_TERMINFO= yes | | 14 | USE_TERMINFO= yes |
16 | | | 15 | |
17 | USE_TOOLS+= pkg-config | | 16 | USE_TOOLS+= pkg-config |
18 | | | 17 | |
19 | SUBST_CLASSES+= sysconfdir | | 18 | SUBST_CLASSES+= sysconfdir |
20 | SUBST_STAGE.sysconfdir= pre-configure | | 19 | SUBST_STAGE.sysconfdir= pre-configure |
21 | SUBST_MESSAGE.sysconfdir= Do not force sysconfdir to /etc | | 20 | SUBST_MESSAGE.sysconfdir= Do not force sysconfdir to /etc |
22 | SUBST_FILES.sysconfdir= configure configure.ac | | 21 | SUBST_FILES.sysconfdir= configure configure.ac |
--- pkgsrc/misc/tmux/distinfo 2018/05/26 17:05:28 1.36
+++ pkgsrc/misc/tmux/distinfo 2018/10/21 21:22:47 1.37
| @@ -1,8 +1,8 @@ | | | @@ -1,8 +1,8 @@ |
1 | $NetBSD: distinfo,v 1.36 2018/05/26 17:05:28 leot Exp $ | | 1 | $NetBSD: distinfo,v 1.37 2018/10/21 21:22:47 leot Exp $ |
2 | | | 2 | |
3 | SHA1 (tmux-2.7.tar.gz) = a12bb094bf0baf0275b6d5cc718c938639712e97 | | 3 | SHA1 (tmux-2.8.tar.gz) = 6a469769a242c95dc8aec443b436d4f8f279f517 |
4 | RMD160 (tmux-2.7.tar.gz) = 0f36f35969fb61b8d2771845deba2596b047b7b7 | | 4 | RMD160 (tmux-2.8.tar.gz) = 13f097f02b2d3f489fb00af5b3f702cb2eae523f |
5 | SHA512 (tmux-2.7.tar.gz) = 7839ef748ea55df8c02c727047f65bd235b5e3b8ab23157246071e1b9954fa269594da9fbd0fabf6a850e3b5dfda962a0a067c1507411c92a84d1db2666ecf37 | | 5 | SHA512 (tmux-2.8.tar.gz) = e382aec122a10624953432b3c869b21d69390bc2e7d459440a46950802e39503eafb398178f8085191261925e4f0872bb99b19e0403e7beb56d3ceecc4c86b09 |
6 | Size (tmux-2.7.tar.gz) = 487585 bytes | | 6 | Size (tmux-2.8.tar.gz) = 491195 bytes |
7 | SHA1 (patch-Makefile.in) = fa9ec654cf6dad2b49b10ab981275d193d8b97c8 | | 7 | SHA1 (patch-Makefile.in) = dc8a351b06bf2f9f96b3dc4d944a174ef3c8d9db |
8 | SHA1 (patch-server-client.c) = a0949d4fdba20aaffce6cd56eedd47b7cc64e1bc | | 8 | SHA1 (patch-tty-term.c) = 20bf235e61e6650bec3e7e94ea79859898039eba |
--- pkgsrc/misc/tmux/patches/Attic/patch-Makefile.in 2016/05/09 12:39:05 1.4
+++ pkgsrc/misc/tmux/patches/Attic/patch-Makefile.in 2018/10/21 21:22:47 1.5
| @@ -1,17 +1,21 @@ | | | @@ -1,17 +1,21 @@ |
1 | $NetBSD: patch-Makefile.in,v 1.4 2016/05/09 12:39:05 fhajny Exp $ | | 1 | $NetBSD: patch-Makefile.in,v 1.5 2018/10/21 21:22:47 leot Exp $ |
2 | | | 2 | |
3 | At least on SunOS, lang/nawk (nawk-20050424nb3) insists on | | 3 | At least on SunOS, lang/nawk (nawk-20050424nb3) insists on |
4 | a space between -f and the program file name, by penalty of | | 4 | a space between -f and the program file name, by penalty of |
5 | "/opt/local/bin/nawk: no program filename" | | 5 | "/opt/local/bin/nawk: no program filename" |
6 | | | 6 | |
| | | 7 | This was applied upstream via: |
| | | 8 | |
| | | 9 | <https://github.com/tmux/tmux/pull/1464> |
| | | 10 | |
7 | --- Makefile.in.orig 2016-04-11 00:01:16.000000000 +0000 | | 11 | --- Makefile.in.orig 2016-04-11 00:01:16.000000000 +0000 |
8 | +++ Makefile.in | | 12 | +++ Makefile.in |
9 | @@ -1231,7 +1231,7 @@ install-exec-hook: | | 13 | @@ -1231,7 +1231,7 @@ install-exec-hook: |
10 | >$(srcdir)/tmux.1.mdoc; \ | | 14 | >$(srcdir)/tmux.1.mdoc; \ |
11 | else \ | | 15 | else \ |
12 | sed -e "s|@SYSCONFDIR@|$(sysconfdir)|g" $(srcdir)/tmux.1| \ | | 16 | sed -e "s|@SYSCONFDIR@|$(sysconfdir)|g" $(srcdir)/tmux.1| \ |
13 | - $(AWK) -f$(srcdir)/mdoc2man.awk >$(srcdir)/tmux.1.man; \ | | 17 | - $(AWK) -f$(srcdir)/mdoc2man.awk >$(srcdir)/tmux.1.man; \ |
14 | + $(AWK) -f $(srcdir)/mdoc2man.awk >$(srcdir)/tmux.1.man; \ | | 18 | + $(AWK) -f $(srcdir)/mdoc2man.awk >$(srcdir)/tmux.1.man; \ |
15 | fi | | 19 | fi |
16 | $(mkdir_p) $(DESTDIR)$(mandir)/man1 | | 20 | $(mkdir_p) $(DESTDIR)$(mandir)/man1 |
17 | $(INSTALL_DATA) $(srcdir)/tmux.1.@MANFORMAT@ \ | | 21 | $(INSTALL_DATA) $(srcdir)/tmux.1.@MANFORMAT@ \ |
$NetBSD: patch-tty-term.c,v 1.1 2018/10/21 21:22:47 leot Exp $
Address -Wint-conversion warnings and properly cast to long, from
NetBSD external/bsd/tmux/dist/tty-term.c patch by <christos>.
This was applied upstream via:
<https://github.com/tmux/tmux/pull/1465>
--- tty-term.c.orig 2018-07-27 13:01:14.000000000 +0000
+++ tty-term.c
@@ -616,14 +616,14 @@ tty_term_string3(struct tty_term *term,
const char *
tty_term_ptr1(struct tty_term *term, enum tty_code_code code, const void *a)
{
- return (tparm((char *) tty_term_string(term, code), a, 0, 0, 0, 0, 0, 0, 0, 0));
+ return (tparm((char *) tty_term_string(term, code), (long)a, 0, 0, 0, 0, 0, 0, 0, 0));
}
const char *
tty_term_ptr2(struct tty_term *term, enum tty_code_code code, const void *a,
const void *b)
{
- return (tparm((char *) tty_term_string(term, code), a, b, 0, 0, 0, 0, 0, 0, 0));
+ return (tparm((char *) tty_term_string(term, code), (long)a, (long)b, 0, 0, 0, 0, 0, 0, 0));
}
int