tmux: update to 2.9a

pkgsrc changes:
---------------
* patches removed, since applied upstream

upstream changes:
-----------------
CHANGES FROM 2.9 to 2.9a

* Fix bugs in select-pane and the main-horizontal and main-vertical layouts.

CHANGES FROM 2.8 to 2.9

* Attempt to preserve horizontal cursor position as well as vertical with
  reflow.

* Rewrite main-vertical and horizontal and change layouts to better handle the
  case where all panes won't fit into the window size, reduce problems with
  pane border status lines and fix other bugs mostly found by Thomas Sattler.

* Add format variables for the default formats in the various modes
  (tree_mode_format and so on) and add a -a flag to display-message to list
  variables with values.

* Add a -v flag to display-message to show verbose messages as the format is
  parsed, this allows formats to be debugged

* Add support for HPA (\033[`).

* Add support for origin mode (\033[?6h).

* No longer clear history on RIS.

* Extend the #[] style syntax and use that together with previous format
  changes to allow the status line to be entirely configured with a single
  option.

  Now that it is possible to configure their content, enable the existing code
  that lets the status line be multiple lines in height. The status option can
  now take a value of 2, 3, 4 or 5 (as well as the previous on or off) to
  configure more than one line. The new status-format array option configures
  the format of each line, the default just references the existing status-*
  options, although some of the more obscure status options may be eliminated
  in time.

  Additions to the #[] syntax are: "align" to specify alignment (left, centre,
  right), "list" for the window list and "range" to configure ranges of text
  for the mouse bindings.

  The "align" keyword can also be used to specify alignment of entries in tree
  mode and the pane status lines.

* Add E: and T: format modifiers to expand a format twice (useful to expand the
  value of an option).

* The individual -fg, -bg and -attr options have been removed; they
  were superseded by -style options in tmux 1.9.

* Allow more than one mode to be opened in a pane. Modes are kept on a stack
  and retrieved if the same mode is entered again. Exiting the active mode goes
  back to the previous one.

* When showing command output in copy mode, call it view mode instead (affects
  pane_mode format).

* Add -b to display-panes like run-shell.

* Handle UTF-8 in word-separators option.

* New "terminal" colour allowing options to use the terminal default colour
  rather than inheriting the default from a parent option.

* Do not move the cursor in copy mode when the mouse wheel is used.

* Use the same working directory rules for jobs as new windows rather than
  always starting in the user's home.

* Allow panes to be one line or column in size.

* Go to last line when goto-line number is out of range in copy mode.

* Yank previously cut text if any with C-y in the command prompt, only use the
  buffer if no text has been cut.

* Add q: format modifier to quote shell special characters.

* Add StatusLeft and StatusRight mouse locations (keys such as
  MouseDown1StatusLeft) for the status-left and status-right areas of the
  status line.

* Add -Z to find-window.

* Support for windows larger than the client. This adds two new options,
  window-size and default-size, and a new command, resize-window. The
  force-width and force-height options and the session_width and session_height
  formats have been removed.

  The new window-size option tells tmux how to work out the size of windows:
  largest means it picks the size of the largest session, smallest the smallest
  session (similar to the old behaviour) and manual means that it does not
  automatically resize windows. aggressive-resize modifies the choice of
  session for largest and smallest as it did before.

  If a window is in a session attached to a client that is too small, only part
  of the window is shown. tmux attempts to keep the cursor visible, so the part
  of the window displayed is changed as the cursor moves (with a small delay,
  to try and avoid excess redrawing when applications redraw status lines or
  similar that are not currently visible).

  Drawing windows which are larger than the client is not as efficient as those
  which fit, particularly when the cursor moves, so it is recommended to avoid
  using this on slow machines or networks (set window-size to smallest or
  manual).

  The resize-window command can be used to resize a window manually. If it is
  used, the window-size option is automatically set to manual for the window
  (undo this with "setw -u window-size"). resize-window works in a similar way
  to resize-pane (-U -D -L -R -x -y flags) but also has -a and -A flags. -a
  sets the window to the size of the smallest client (what it would be if
  window-size was smallest) and -A the largest.

  For the same behaviour as force-width or force-height, use resize-window -x
  or -y.

  If the global window-size option is set to manual, the default-size option is
  used for new windows. If -x or -y is used with new-session, that sets the
  default-size option for the new session.

  The maximum size of a window is 10000x10000. But expect applications to
  complain and higher memory use if making a window that big. The minimum size
  is the size required for the current layout including borders.

  The refresh-client command can be used to pan around a window, -U -D -L -R
  moves up, down, left or right and -c returns to automatic cursor
tracking. The position is reset when the current window is changed.

5 files changed, 8 insertions, 108 deletions

diff --git a/misc/tmux/Makefile b/misc/tmux/Makefile
index ae5fdc56e81..a022909db17 100644
--- a/misc/tmux/Makefile
+++ b/misc/tmux/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.47 2018/11/28 14:45:19 leot Exp $
+# $NetBSD: Makefile,v 1.48 2019/05/03 10:49:35 triaxx Exp $
 
-DISTNAME=	tmux-2.8
-PKGREVISION=	1
+DISTNAME=	tmux-2.9a
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_GITHUB:=tmux/}
 GITHUB_RELEASE=	${PKGVERSION_NOREV}
@@ -31,7 +30,7 @@ BUILDLINK_TRANSFORM+=	opt:-D_XPG4_2:-D_XPG6
 .endif
 
 # https://trac.macports.org/changeset/127986
-.if !empty(MACHINE_PLATFORM:MDarwin-1[0-9]*)
+.if !empty(MACHINE_PLATFORM:MDarwin-1[0-9].*)
 CPPFLAGS+=	-D__DARWIN_VERS_1050=0
 .endif
 
diff --git a/misc/tmux/distinfo b/misc/tmux/distinfo
index b4c0e5c0fd0..818330e2e6b 100644
--- a/misc/tmux/distinfo
+++ b/misc/tmux/distinfo
@@ -1,9 +1,6 @@
-$NetBSD: distinfo,v 1.39 2018/11/29 10:51:34 leot Exp $
+$NetBSD: distinfo,v 1.40 2019/05/03 10:49:35 triaxx Exp $
 
-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-osdep-netbsd.c) = 9b4859afed8524cb1966fb473cf49bb576e02885
-SHA1 (patch-tty-term.c) = 20bf235e61e6650bec3e7e94ea79859898039eba
+SHA1 (tmux-2.9a.tar.gz) = 33cba73e64c62f46bd244d4472c59371fb747f56
+RMD160 (tmux-2.9a.tar.gz) = e5460971073abb865adcea2a6711e82d84c53838
+SHA512 (tmux-2.9a.tar.gz) = aca6882688727c10c5647443fdd18bbd6c0f80b7a3bf9667903d1b89d523e604cd715f176f33f2e5673258f00e626a6dc273f80fe97ae4f91621814d89985713
+Size (tmux-2.9a.tar.gz) = 510915 bytes
diff --git a/misc/tmux/patches/patch-Makefile.in b/misc/tmux/patches/patch-Makefile.in
deleted file mode 100644
index a1787686c53..00000000000
--- a/misc/tmux/patches/patch-Makefile.in
+++ /dev/null
@@ -1,21 +0,0 @@
-$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:
- 			>$(srcdir)/tmux.1.mdoc; \
- 	else \
- 		sed -e "s|@SYSCONFDIR@|$(sysconfdir)|g" $(srcdir)/tmux.1| \
--			$(AWK) -f$(srcdir)/mdoc2man.awk >$(srcdir)/tmux.1.man; \
-+			$(AWK) -f $(srcdir)/mdoc2man.awk >$(srcdir)/tmux.1.man; \
- 	fi
- 	$(mkdir_p) $(DESTDIR)$(mandir)/man1
- 	$(INSTALL_DATA) $(srcdir)/tmux.1.@MANFORMAT@ \
diff --git a/misc/tmux/patches/patch-osdep-netbsd.c b/misc/tmux/patches/patch-osdep-netbsd.c
deleted file mode 100644
index 750626194da..00000000000
--- a/misc/tmux/patches/patch-osdep-netbsd.c
+++ /dev/null
@@ -1,47 +0,0 @@
-$NetBSD: patch-osdep-netbsd.c,v 1.2 2018/11/29 10:51:34 leot Exp $
-
-Implement osdep_get_cwd() via mount_procfs(8) (inspired by osdep-sunos.c).
-
-This was applied upstream via:
-
- <https://github.com/tmux/tmux/pull/1556>
-
---- osdep-netbsd.c.orig	2016-01-21 00:00:28.000000000 +0000
-+++ osdep-netbsd.c
-@@ -23,10 +23,13 @@
- 
- #include <errno.h>
- #include <event.h>
-+#include <limits.h>
- #include <stdlib.h>
- #include <string.h>
- #include <unistd.h>
- 
-+#include "tmux.h"
-+
- #define is_runnable(p) \
-         ((p)->p_stat == LSRUN || (p)->p_stat == SIDL)
- #define is_stopped(p) \
-@@ -127,6 +130,22 @@ error:
- char *
- osdep_get_cwd(int fd)
- {
-+	static char	target[PATH_MAX + 1];
-+	char		*path;
-+	pid_t		pgrp;
-+	ssize_t		n;
-+
-+	if ((pgrp = tcgetpgrp(fd)) == -1)
-+		return (NULL);
-+
-+	xasprintf(&path, "/proc/%lld/cwd", (long long) pgrp);
-+	n = readlink(path, target, sizeof(target) - 1);
-+	free(path);
-+	if (n > 0) {
-+		target[n] = '\0';
-+		return (target);
-+	}
-+
- 	return (NULL);
- }
- 
diff --git a/misc/tmux/patches/patch-tty-term.c b/misc/tmux/patches/patch-tty-term.c
deleted file mode 100644
index ed3ba8a8b15..00000000000
--- a/misc/tmux/patches/patch-tty-term.c
+++ /dev/null
@@ -1,28 +0,0 @@
-$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