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.

5 files changed, 43 insertions, 37 deletions

diff --git a/misc/tmux/Makefile b/misc/tmux/Makefile
index 47d3220aa1d..9ae65d07cc0 100644
--- a/misc/tmux/Makefile
+++ b/misc/tmux/Makefile
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.45 2018/06/09 11:23:05 leot Exp $
+# $NetBSD: Makefile,v 1.46 2018/10/21 21:22:47 leot Exp $
 
-DISTNAME=	tmux-2.7
-PKGREVISION=	1
+DISTNAME=	tmux-2.8
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_GITHUB:=tmux/}
 GITHUB_RELEASE=	${PKGVERSION_NOREV}
 
-MAINTAINER=	pkgsrc-users@NetBSD.org
+MAINTAINER=	leot@NetBSD.org
 HOMEPAGE=	http://tmux.github.io/
 COMMENT=	BSD-licensed terminal multiplexer (GNU Screen alternative)
 LICENSE=	modified-bsd
diff --git a/misc/tmux/distinfo b/misc/tmux/distinfo
index e6a9dea596a..2018d8de8d6 100644
--- a/misc/tmux/distinfo
+++ b/misc/tmux/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.36 2018/05/26 17:05:28 leot Exp $
+$NetBSD: distinfo,v 1.37 2018/10/21 21:22:47 leot Exp $
 
-SHA1 (tmux-2.7.tar.gz) = a12bb094bf0baf0275b6d5cc718c938639712e97
-RMD160 (tmux-2.7.tar.gz) = 0f36f35969fb61b8d2771845deba2596b047b7b7
-SHA512 (tmux-2.7.tar.gz) = 7839ef748ea55df8c02c727047f65bd235b5e3b8ab23157246071e1b9954fa269594da9fbd0fabf6a850e3b5dfda962a0a067c1507411c92a84d1db2666ecf37
-Size (tmux-2.7.tar.gz) = 487585 bytes
-SHA1 (patch-Makefile.in) = fa9ec654cf6dad2b49b10ab981275d193d8b97c8
-SHA1 (patch-server-client.c) = a0949d4fdba20aaffce6cd56eedd47b7cc64e1bc
+SHA1 (tmux-2.8.tar.gz) = 6a469769a242c95dc8aec443b436d4f8f279f517
+RMD160 (tmux-2.8.tar.gz) = 13f097f02b2d3f489fb00af5b3f702cb2eae523f
+SHA512 (tmux-2.8.tar.gz) = e382aec122a10624953432b3c869b21d69390bc2e7d459440a46950802e39503eafb398178f8085191261925e4f0872bb99b19e0403e7beb56d3ceecc4c86b09
+Size (tmux-2.8.tar.gz) = 491195 bytes
+SHA1 (patch-Makefile.in) = dc8a351b06bf2f9f96b3dc4d944a174ef3c8d9db
+SHA1 (patch-tty-term.c) = 20bf235e61e6650bec3e7e94ea79859898039eba
diff --git a/misc/tmux/patches/patch-Makefile.in b/misc/tmux/patches/patch-Makefile.in
index 65e60a55a6b..a1787686c53 100644
--- a/misc/tmux/patches/patch-Makefile.in
+++ b/misc/tmux/patches/patch-Makefile.in
@@ -1,9 +1,13 @@
-$NetBSD: patch-Makefile.in,v 1.4 2016/05/09 12:39:05 fhajny Exp $
+$NetBSD: patch-Makefile.in,v 1.5 2018/10/21 21:22:47 leot Exp $
 
 At least on SunOS, lang/nawk (nawk-20050424nb3) insists on
 a space between -f and the program file name, by penalty of
 "/opt/local/bin/nawk: no program filename"
 
+This was applied upstream via:
+ 
+ <https://github.com/tmux/tmux/pull/1464>
+
 --- Makefile.in.orig	2016-04-11 00:01:16.000000000 +0000
 +++ Makefile.in
 @@ -1231,7 +1231,7 @@ install-exec-hook:
diff --git a/misc/tmux/patches/patch-server-client.c b/misc/tmux/patches/patch-server-client.c
deleted file mode 100644
index 661d36ef56e..00000000000
--- a/misc/tmux/patches/patch-server-client.c
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-server-client.c,v 1.5 2017/04/21 11:55:37 fhajny Exp $
-
-* timersub is missing on Solaris10
-
---- server-client.c.orig	2017-04-20 10:29:06.000000000 +0000
-+++ server-client.c
-@@ -30,6 +30,18 @@
- 
- #include "tmux.h"
- 
-+#ifndef timersub
-+# define timersub(a, b, result)                     \
-+    do {                                \
-+        (result)->tv_sec = (a)->tv_sec - (b)->tv_sec;       \
-+        (result)->tv_usec = (a)->tv_usec - (b)->tv_usec;        \
-+        if ((result)->tv_usec < 0) {                            \
-+            --(result)->tv_sec;             \
-+            (result)->tv_usec += 1000000;           \
-+        }                                                       \
-+    } while (0)
-+#endif
-+
- static void	server_client_free(int, short, void *);
- static void	server_client_check_focus(struct window_pane *);
- static void	server_client_check_resize(struct window_pane *);
diff --git a/misc/tmux/patches/patch-tty-term.c b/misc/tmux/patches/patch-tty-term.c
new file mode 100644
index 00000000000..ed3ba8a8b15
--- /dev/null
+++ b/misc/tmux/patches/patch-tty-term.c
@@ -0,0 +1,28 @@
+$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