Update to 2.0

Changelog:
CHANGES FROM 1.9a to 2.0 6 March 2015

Incompatible Changes
====================

* The choose-list command has been removed.
* 'terminal-overrides' is now a server option, not a session option.
* 'message-limit' is now a server option, not a session option.
* 'monitor-content' option has been removed.
* 'pane_start_path' option has been removed.
* The "info" mechanism which used to (for some commands) provide feedback
  has been removed, and like other commands, they now produce nothing on
  success.

Normal Changes
==============

* tmux can now write an entry to utmp if the library 'utempter' is present
  at compile time.
* set-buffer learned append mode (-a), and a corresponding
  'append-selection' command has been added to copy-mode.
* choose-mode now has the following commands which can be bound:
	- start-of-list
	- end-of-list
	- top-line
	- bottom-line

* choose-buffer now understands UTF-8.
* Pane navigation has changed:
	- The old way of always using the top or left if the choice is ambiguous.
	- The new way of remembering the last used pane is annoying if the
	  layout is balanced and the leftmost is obvious to the user (because
	  clearly if we go right from the top-left in a tiled set of four we want
	  to end up in top-right, even if we were last using the bottom-right).

      So instead, use a combination of both: if there is only one possible
      pane alongside the current pane, move to it, otherwise choose the most
      recently used of the choice.
* 'set-buffer' can now be told to give names to buffers.
* The 'new-session', 'new-window', 'split-window', and 'respawn-pane' commands
  now understand multiple arguments and handle quoting problems correctly.
* 'capture-pane' understands '-S-' to mean the start of the pane, and '-E-' to
  mean the end of the pane.
* Support for function keys beyond F12 has changed.  The following explains:
	- F13-F24 are S-F1 to S-F12
	- F25-F36 are C-F1 to C-F12
	- F37-F48 are C-S-F1 to C-S-F12
	- F49-F60 are M-F1 to M-F12
	- F61-F63 are M-S-F1 to M-S-F3

 Therefore, F13 becomes a binding of S-F1, etc.
* Support using pane id as part of session or window specifier (so % means
  session-of-%1 or window-of-%1) and window id as part of session
  (so @1 means session-of-@1).
* 'copy-pipe' command now understands formats via -F
* 'if-shell'  command now understands formats via -F
* 'split-window' and 'join-window' understand -b to create the pane to the left
  or above the target pane.

3 files changed, 14 insertions, 16 deletions

diff --git a/misc/tmux/Makefile b/misc/tmux/Makefile
index c5e03614d87..e77812bc9ec 100644
--- a/misc/tmux/Makefile
+++ b/misc/tmux/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.27 2014/12/15 11:46:36 jperkin Exp $
+# $NetBSD: Makefile,v 1.28 2015/05/16 20:27:49 ryoon Exp $
 
-DISTNAME=	tmux-1.9a
+DISTNAME=	tmux-2.0
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=tmux/}
 
diff --git a/misc/tmux/distinfo b/misc/tmux/distinfo
index 3a80732e0f2..e398a464aef 100644
--- a/misc/tmux/distinfo
+++ b/misc/tmux/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.26 2014/02/27 15:56:53 hauke Exp $
+$NetBSD: distinfo,v 1.27 2015/05/16 20:27:49 ryoon Exp $
 
-SHA1 (tmux-1.9a.tar.gz) = 815264268e63c6c85fe8784e06a840883fcfc6a2
-RMD160 (tmux-1.9a.tar.gz) = 29ae5f12aa71ee800643fb2df23573bee83f5965
-Size (tmux-1.9a.tar.gz) = 447938 bytes
-SHA1 (patch-Makefile.in) = b902156666e515e6c763eee6ffde8ba2ff4c7f98
+SHA1 (tmux-2.0.tar.gz) = 977871e7433fe054928d86477382bd5f6794dc3d
+RMD160 (tmux-2.0.tar.gz) = 5114e1e9d78667291375efcbd9be657b4f175806
+Size (tmux-2.0.tar.gz) = 455754 bytes
+SHA1 (patch-Makefile.in) = 9908c1f23603a735dd7b083b35cbfa7fc1fb4b3a
 SHA1 (patch-server-client.c) = 1cd724559d5cac935b4bbb1d02a7927ae54ae3fc
diff --git a/misc/tmux/patches/patch-Makefile.in b/misc/tmux/patches/patch-Makefile.in
index 9fa277ae4e1..db8d1e40941 100644
--- a/misc/tmux/patches/patch-Makefile.in
+++ b/misc/tmux/patches/patch-Makefile.in
@@ -1,19 +1,17 @@
-$NetBSD: patch-Makefile.in,v 1.1 2014/02/27 15:56:54 hauke Exp $
+$NetBSD: patch-Makefile.in,v 1.2 2015/05/16 20:27:49 ryoon 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"
 
---- Makefile.in.orig	2014-02-22 20:56:13.000000000 +0000
+--- Makefile.in.orig	2015-05-06 22:49:42.000000000 +0000
 +++ Makefile.in
-@@ -1221,8 +1221,8 @@ install-exec-hook:
- 		sed -e "s|@SYSCONFDIR@|$(sysconfdir)|g" $(srcdir)/tmux.1 \
+@@ -1208,7 +1208,7 @@ install-exec-hook:
  			>$(srcdir)/tmux.1.mdoc; \
  	else \
--		sed -e "s|@SYSCONFDIR@|$(sysconfdir)|g" $(srcdir)/tmux.1| \
--			$(AWK) -fmdoc2man.awk >$(srcdir)/tmux.1.man; \
-+		sed -e "s|@SYSCONFDIR@|$(sysconfdir)|g" $(srcdir)/tmux.1 | \
-+			$(AWK) -f mdoc2man.awk >$(srcdir)/tmux.1.man; \
+ 		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
+ 	$(mkdir_p) $(DESTDIR)$(mandir)/man1
  	$(INSTALL_DATA) $(srcdir)/tmux.1.@MANFORMAT@ \