Update to 2.1

Changes:	https://github.com/tmux/tmux/blob/2.1/CHANGES
Sponsored by:	Absolight

6 files changed, 12 insertions, 101 deletions

diff --git a/sysutils/tmux/Makefile b/sysutils/tmux/Makefile
index 0bf70adb6cbf..51196dbc15b2 100644
--- a/sysutils/tmux/Makefile
+++ b/sysutils/tmux/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	tmux
-PORTVERSION=	2.0
-PORTREVISION=	2
+PORTVERSION=	2.1
 CATEGORIES=	sysutils
 MASTER_SITES=	https://github.com/tmux/tmux/releases/download/${PORTVERSION}/ \
 		SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION:S/a$//}
@@ -14,8 +13,7 @@ COMMENT=	Terminal Multiplexer
 LICENSE=	ISCL
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-USES=		pkgconfig shebangfix ncurses
-SHEBANG_FILES=	examples/tmux_backup.sh
+USES=		pkgconfig ncurses
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--sysconfdir=${PREFIX}/etc
@@ -39,7 +37,8 @@ LIBEVENT_STATIC_BUILD_DEPENDS=	${LOCALBASE}/lib/libevent.a:${PORTSDIR}/devel/lib
 LIBEVENT_STATIC_VARS=	LESTATIC=${LOCALBASE}/lib/libevent.a
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|/etc/tmux.conf|${PREFIX}/etc/tmux.conf|g' ${WRKSRC}/CHANGES
+	@${REINPLACE_CMD} -e 's|/etc/tmux.conf|${PREFIX}/etc/tmux.conf|g' ${WRKSRC}/CHANGES \
+		${WRKSRC}/tmux.h
 
 post-configure-LIBEVENT_STATIC-on:
 	${REINPLACE_CMD} -e '/LIBS/s|-levent[^[:blank:]]*|${LESTATIC}|' \
@@ -50,8 +49,12 @@ do-install:
 	${INSTALL_MAN} ${WRKSRC}/tmux.1 ${STAGEDIR}${MANPREFIX}/man/man1
 	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/bash_completion.d
 	${INSTALL_DATA} ${WRKSRC}/examples/bash_completion_tmux.sh ${STAGEDIR}${PREFIX}/etc/bash_completion.d/tmux
+
+do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	(cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR})
+
+do-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/examples/* ${STAGEDIR}${EXAMPLESDIR}
 
diff --git a/sysutils/tmux/distinfo b/sysutils/tmux/distinfo
index 69ea64d8ea4c..02b441e0932d 100644
--- a/sysutils/tmux/distinfo
+++ b/sysutils/tmux/distinfo
@@ -1,2 +1,2 @@
-SHA256 (tmux-2.0.tar.gz) = 795f4b4446b0ea968b9201c25e8c1ef8a6ade710ebca4657dd879c35916ad362
-SIZE (tmux-2.0.tar.gz) = 455754
+SHA256 (tmux-2.1.tar.gz) = 31564e7bf4bcef2defb3cb34b9e596bd43a3937cad9e5438701a81a5a9af6176
+SIZE (tmux-2.1.tar.gz) = 462965
diff --git a/sysutils/tmux/files/extra-patch-tty-keys.c b/sysutils/tmux/files/extra-patch-tty-keys.c
index 4d68636f3dc9..9a62a99916f2 100644
--- a/sysutils/tmux/files/extra-patch-tty-keys.c
+++ b/sysutils/tmux/files/extra-patch-tty-keys.c
@@ -1,6 +1,6 @@
---- tty-keys.c.orig	2015-05-05 20:21:51 UTC
+--- tty-keys.c.orig	2015-09-27 09:42:08 UTC
 +++ tty-keys.c
-@@ -556,8 +556,6 @@ first_key:
+@@ -545,8 +545,6 @@ first_key:
  	 * used. termios should have a better idea.
  	 */
  	bspace = tty->tio.c_cc[VERASE];
diff --git a/sysutils/tmux/files/patch-compat_imsg.c b/sysutils/tmux/files/patch-compat_imsg.c
deleted file mode 100644
index a0203c44fa4e..000000000000
--- a/sysutils/tmux/files/patch-compat_imsg.c
+++ /dev/null
@@ -1,17 +0,0 @@
---- compat/imsg.c.orig	2015-10-14 13:20:40 UTC
-+++ compat/imsg.c
-@@ -54,8 +54,12 @@ available_fds(unsigned int n)
- 	for (i = 0; i < n; i++) {
- 		fds[i] = -1;
- 		if ((fds[i] = socket(AF_INET, SOCK_DGRAM, 0)) < 0) {
--			ret = 1;
--			break;
-+			if (errno == EAFNOSUPPORT || errno == EPROTONOSUPPORT)
-+				fds[i] = socket(AF_INET6, SOCK_DGRAM, 0);
-+			if (fds[i] < 0) {
-+				ret = 1;
-+				break;
-+			}
- 		}
- 	}
- 
diff --git a/sysutils/tmux/files/patch-configure b/sysutils/tmux/files/patch-configure
deleted file mode 100644
index 1455ad8bf0f5..000000000000
--- a/sysutils/tmux/files/patch-configure
+++ /dev/null
@@ -1,40 +0,0 @@
---- configure.orig	2015-05-06 22:49:42 UTC
-+++ configure
-@@ -5002,7 +5002,7 @@ return setupterm ();
-   return 0;
- }
- _ACEOF
--for ac_lib in '' terminfo curses ncurses tinfo; do
-+for ac_lib in '' terminfo ncurses tinfo; do
-   if test -z "$ac_lib"; then
-     ac_res="none required"
-   else
-@@ -5755,6 +5755,28 @@ $as_echo "yes" >&6; }
- 	fi
- fi
- if test "x$found_strnvis" = xyes; then
-+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking if strnvis is broken" >&5
-+$as_echo_n "checking if strnvis is broken... " >&6; }
-+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <vis.h>
-+
-+_ACEOF
-+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-+  $EGREP "strnvis\(char \*, const char \*, size_t, int\)" >/dev/null 2>&1; then :
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+else
-+  found_strnvis=no
-+fi
-+rm -f conftest*
-+
-+   if test "x$found_strnvis" = xno; then
-+       { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-+$as_echo "yes" >&6; }
-+   fi
-+fi
-+if test "x$found_strnvis" = xyes; then
- 	$as_echo "#define HAVE_VIS 1" >>confdefs.h
- 
- fi
diff --git a/sysutils/tmux/files/patch-git_2c53b23d b/sysutils/tmux/files/patch-git_2c53b23d
deleted file mode 100644
index 7076db980eac..000000000000
--- a/sysutils/tmux/files/patch-git_2c53b23d
+++ /dev/null
@@ -1,35 +0,0 @@
-commit 2c53b23d5968da2e796ead6ed9f8ff3c33b8bbfb
-Author: nicm <nicm>
-Date:   Tue May 19 08:48:37 2015 +0000
-
-    In terminfo, sometimes cvvis implies cnorm and sometimes it doesn't, so
-    don't assume it does. Fixes missing cursor with emacs-in-tmux-in-tmux.
-
---- tty.c
-+++ tty.c
-@@ -507,14 +507,17 @@ tty_update_mode(struct tty *tty, int mode, struct screen *s)
- 		mode &= ~MODE_CURSOR;
- 
- 	changed = mode ^ tty->mode;
--	if (changed & (MODE_CURSOR|MODE_BLINKING)) {
--		if (mode & MODE_CURSOR) {
--			if (mode & MODE_BLINKING &&
--			    tty_term_has(tty->term, TTYC_CVVIS))
--				tty_putcode(tty, TTYC_CVVIS);
--			else
--				tty_putcode(tty, TTYC_CNORM);
--		} else
-+	if (changed & MODE_BLINKING) {
-+		if (tty_term_has(tty->term, TTYC_CVVIS))
-+			tty_putcode(tty, TTYC_CVVIS);
-+		else
-+			tty_putcode(tty, TTYC_CNORM);
-+		changed |= MODE_CURSOR;
-+	}
-+	if (changed & MODE_CURSOR) {
-+		if (mode & MODE_CURSOR)
-+			tty_putcode(tty, TTYC_CNORM);
-+		else
- 			tty_putcode(tty, TTYC_CIVIS);
- 	}
- 	if (s != NULL && tty->cstyle != s->cstyle) {