Update misc/tmux to 2.2.

Use release tarballs instead of tagged archives, simplifies
patching and rids us of automake dep.

CHANGES FROM 2.1 to 2.2 10 April 2016

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

* The format strings which referenced time have been removed.
  Instead:

  #{t:window_activity}

can be used.

* Support for TMPDIR has been removed.  Use TMUX_TMPDIR instead.
  UTF8 detection how happens automatically if the client supports
  it, hence the:

  mouse-utf8
  utf8

  options has been removed.

* The:

  mouse_utf8_flag

  format string has been removed.

* The -I option to show-messages has been removed.  See:

  #{t:start_time}

  format option instead.

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

* Panes are unzoomed with selectp -LRUD
* New formats added:

  #{scroll_position}
  #{socket_path}
  #{=10:...} -- limit to N characters (from the start)
  #{=-10:...} -- limit to N characters (from the end)
  #{t:...} -- used to format time-based formats
  #{b:...} -- used to ascertain basename from string
  #{d:...} -- used to ascertain dirname from string
  #{s:...} -- used to perform substitutions on a string

* Job output is run via the format system, so formats work again
* If display-time is set to 0, then the indicators wait for a key
  to be pressed.
* list-keys and list-commands can be run without starting the tmux
  server.
* kill-session learns -C to clear all alerts in all windows of the
  session.
* Support for hooks (internal for now), but hooks for the
  following have been implemented:

  alert-bell
  alert-silence
  alert-activity
  client-attached
  client-detached
  client-resized
  pane-died
  pane-exited

* RGB (24bit) colour support.  The 'Tc' flag must be set in the
  external TERM entry (using terminal-overrides or a custom terminfo entry).

5 files changed, 23 insertions, 53 deletions

diff --git a/misc/tmux/Makefile b/misc/tmux/Makefile
index db46154f6b2..2f7f49d97ca 100644
--- a/misc/tmux/Makefile
+++ b/misc/tmux/Makefile
@@ -1,21 +1,20 @@
-# $NetBSD: Makefile,v 1.34 2016/03/05 11:28:58 jperkin Exp $
+# $NetBSD: Makefile,v 1.35 2016/05/09 12:39:05 fhajny Exp $
 
-DISTNAME=	tmux-2.1
-PKGREVISION=	1
+DISTNAME=	tmux-2.2
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_GITHUB:=tmux/}
-GITHUB_PROJECT=	tmux
-GITHUB_TAG=	2.1
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://tmux.github.io/
 COMMENT=	BSD-licensed terminal multiplexer (GNU Screen alternative)
 LICENSE=	modified-bsd
 
+GITHUB_RELEASE=	${PKGVERSION_NOREV}
+
 GNU_CONFIGURE=	yes
 USE_TERMINFO=	yes
 
-USE_TOOLS+=	automake pkg-config
+USE_TOOLS+=	pkg-config
 
 .include "../../mk/bsd.prefs.mk"
 .include "../../mk/compiler.mk"
@@ -24,17 +23,11 @@ USE_TOOLS+=	automake pkg-config
 BUILDLINK_TRANSFORM+=	opt:-D_XPG4_2:-D_XPG6
 .endif
 
-# https://trac.macports.org/changeset/127986
+# https://trac.macports.org/changeset/127986
 .if !empty(MACHINE_PLATFORM:MDarwin-1[0-9]*)
 CPPFLAGS+=	-D__DARWIN_VERS_1050=0
 .endif
 
-pre-configure:
-	set -e; cd ${WRKSRC}; \
-	mkdir -p etc; \
-	aclocal; \
-	automake --add-missing --force-missing --copy --foreign; autoreconf
-
 .include "../../devel/libevent/buildlink3.mk"
 BUILDLINK_API_DEPENDS.libevent+=	libevent>=2.0.10
 .include "../../mk/terminfo.buildlink3.mk"
diff --git a/misc/tmux/distinfo b/misc/tmux/distinfo
index fac38a00848..54fa6fb375c 100644
--- a/misc/tmux/distinfo
+++ b/misc/tmux/distinfo
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.30 2016/01/09 11:13:15 wiz Exp $
+$NetBSD: distinfo,v 1.31 2016/05/09 12:39:05 fhajny Exp $
 
-SHA1 (tmux-2.1.tar.gz) = df182bd69b2f9b5c238c2a777d92a37479fd4b30
-RMD160 (tmux-2.1.tar.gz) = 993ab8b4bbb5ff7ccf146910dfe821b8c5499ada
-SHA512 (tmux-2.1.tar.gz) = 73e917125413917f5a6edd105aa3fdcb5655fa96def26d7e7f1b75a598062d15124960fe38e2a7eafec950ad8039e4f783cb6c533ca7872ac64795425e750a2a
-Size (tmux-2.1.tar.gz) = 588644 bytes
-SHA1 (patch-Makefile.am) = 4578ec2aa2c4e0f3c81801568b1eaecdf7b67cf1
-SHA1 (patch-configure.ac) = 92458929d7fb1ed5997443f394e253409422d11f
-SHA1 (patch-server-client.c) = 64bd26054f220d80f3ba1cf117425f216a004987
+SHA1 (tmux-2.2.tar.gz) = 5ed1430bc7ef44c227e64e9401c686573dd0791a
+RMD160 (tmux-2.2.tar.gz) = 5d636bb7a4c5d80e2dba4179ddd65bc49f471e37
+SHA512 (tmux-2.2.tar.gz) = 4d4fc316c78aab0d13f7f15098d952f01d7da7d74d46251ae2dd90440522f07c785afe984d82de2b4518fb67ea441f5a5a46c357c87ddc6ddbfba4b7f08be7bf
+Size (tmux-2.2.tar.gz) = 466852 bytes
+SHA1 (patch-Makefile.in) = fa9ec654cf6dad2b49b10ab981275d193d8b97c8
+SHA1 (patch-server-client.c) = 642991c6853762228ac6c1d5aaa470a1c9397ede
diff --git a/misc/tmux/patches/patch-Makefile.am b/misc/tmux/patches/patch-Makefile.in
index e744b6980ad..65e60a55a6b 100644
--- a/misc/tmux/patches/patch-Makefile.am
+++ b/misc/tmux/patches/patch-Makefile.in
@@ -1,12 +1,12 @@
-$NetBSD: patch-Makefile.am,v 1.1 2015/12/31 07:07:16 ryoon Exp $
+$NetBSD: patch-Makefile.in,v 1.4 2016/05/09 12:39:05 fhajny 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.am.orig	2015-10-18 17:10:43.000000000 +0000
-+++ Makefile.am
-@@ -242,7 +242,7 @@ install-exec-hook:
+--- 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| \
diff --git a/misc/tmux/patches/patch-configure.ac b/misc/tmux/patches/patch-configure.ac
deleted file mode 100644
index aae36fead05..00000000000
--- a/misc/tmux/patches/patch-configure.ac
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-configure.ac,v 1.4 2016/01/09 11:13:15 wiz Exp $
-
-Fix quoting issue. If the macro is put in square brackets,
-it's not expanded.
-
---- configure.ac.orig	2015-10-18 17:10:43.000000000 +0000
-+++ configure.ac
-@@ -130,14 +130,12 @@ PKG_CHECK_MODULES(
- 		LIBS="$LIBEVENT_LIBS $LIBS"
- 		found_libevent=yes
- 	],
--	[
- 		AC_SEARCH_LIBS(
- 			event_init,
- 			[event event-1.4 event2],
- 			found_libevent=yes,
- 			found_libevent=no
- 		)
--	]
- )
- if test "x$found_libevent" = xno; then
- 	AC_MSG_ERROR("libevent not found")
diff --git a/misc/tmux/patches/patch-server-client.c b/misc/tmux/patches/patch-server-client.c
index 106c71fd425..3885a7ab4d8 100644
--- a/misc/tmux/patches/patch-server-client.c
+++ b/misc/tmux/patches/patch-server-client.c
@@ -1,11 +1,11 @@
-$NetBSD: patch-server-client.c,v 1.3 2015/12/31 07:07:16 ryoon Exp $
+$NetBSD: patch-server-client.c,v 1.4 2016/05/09 12:39:05 fhajny Exp $
 
 * SunOS errno support needs the right include.
 * timersub is missing on Solaris10
 
---- server-client.c.orig	2015-10-18 17:10:43.000000000 +0000
+--- server-client.c.orig	2016-04-04 00:16:53.000000000 +0000
 +++ server-client.c
-@@ -29,6 +29,18 @@
+@@ -30,6 +30,18 @@
  
  #include "tmux.h"
  
@@ -21,6 +21,6 @@ $NetBSD: patch-server-client.c,v 1.3 2015/12/31 07:07:16 ryoon Exp $
 +    } while (0)
 +#endif
 +
- void	server_client_key_table(struct client *, const char *);
- void	server_client_free(int, short, void *);
- void	server_client_check_focus(struct window_pane *);
+ void		server_client_free(int, short, void *);
+ void		server_client_check_focus(struct window_pane *);
+ void		server_client_check_resize(struct window_pane *);