svn commit: r418701 - in head/sysutils/tmux: . files

[Mathieu Arnold]

Author: mat
Date: Mon Jul 18 13:23:16 2016
New Revision: 418701
URL: https://svnweb.freebsd.org/changeset/ports/418701

Log:
  Update to 2.2.
  
  PR:		211103
  Reported by:	Iblis Lin
  Sponsored by:	Absolight

Deleted:
  head/sysutils/tmux/files/patch-server-client.c
Modified:
  head/sysutils/tmux/Makefile   (contents, props changed)
  head/sysutils/tmux/distinfo   (contents, props changed)
  head/sysutils/tmux/files/extra-patch-tty-keys.c   (contents, props changed)

Modified: head/sysutils/tmux/Makefile
==============================================================================
--- head/sysutils/tmux/Makefile	Mon Jul 18 13:23:05 2016	(r418700)
+++ head/sysutils/tmux/Makefile	Mon Jul 18 13:23:16 2016	(r418701)
@@ -2,11 +2,10 @@
 # $FreeBSD$
 
 PORTNAME=	tmux
-PORTVERSION=	2.1
-PORTREVISION=	1
+PORTVERSION=	2.2
 CATEGORIES=	sysutils
-MASTER_SITES=	https://github.com/tmux/tmux/releases/download/${PORTVERSION}/ \
-		SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION:S/a$//}
+MASTER_SITES=	https://github.com/tmux/tmux/releases/download/${PORTVERSION}/
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	mat at FreeBSD.org
 COMMENT=	Terminal Multiplexer
@@ -16,6 +15,9 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		pkgconfig ncurses
 
+USE_GITHUB=	nodefault
+GH_TUPLE=	imomaliev:tmux-bash-completion:e0f7021:bash
+
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--sysconfdir=${PREFIX}/etc
 
@@ -49,7 +51,7 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/tmux ${STAGEDIR}${PREFIX}/bin
 	${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
+	${INSTALL_DATA} ${WRKSRC_bash}/completions/tmux ${STAGEDIR}${PREFIX}/etc/bash_completion.d/tmux
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
@@ -57,6 +59,6 @@ do-install-DOCS-on:
 
 do-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
-	${INSTALL_DATA} ${WRKSRC}/examples/* ${STAGEDIR}${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/example* ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>

Modified: head/sysutils/tmux/distinfo
==============================================================================
--- head/sysutils/tmux/distinfo	Mon Jul 18 13:23:05 2016	(r418700)
+++ head/sysutils/tmux/distinfo	Mon Jul 18 13:23:16 2016	(r418701)
@@ -1,2 +1,5 @@
-SHA256 (tmux-2.1.tar.gz) = 31564e7bf4bcef2defb3cb34b9e596bd43a3937cad9e5438701a81a5a9af6176
-SIZE (tmux-2.1.tar.gz) = 462965
+TIMESTAMP = 1468847551
+SHA256 (tmux-2.2.tar.gz) = bc28541b64f99929fe8e3ae7a02291263f3c97730781201824c0f05d7c8e19e4
+SIZE (tmux-2.2.tar.gz) = 466852
+SHA256 (imomaliev-tmux-bash-completion-e0f7021_GH0.tar.gz) = 5957606b43ec4010084e20d7028044e23cc516ea100c4138d48984de53a7941b
+SIZE (imomaliev-tmux-bash-completion-e0f7021_GH0.tar.gz) = 1661

Modified: head/sysutils/tmux/files/extra-patch-tty-keys.c
==============================================================================
--- head/sysutils/tmux/files/extra-patch-tty-keys.c	Mon Jul 18 13:23:05 2016	(r418700)
+++ head/sysutils/tmux/files/extra-patch-tty-keys.c	Mon Jul 18 13:23:16 2016	(r418701)
@@ -1,6 +1,6 @@
---- tty-keys.c.orig	2015-09-27 09:42:08 UTC
+--- tty-keys.c.orig	2016-03-02 18:08:46 UTC
 +++ tty-keys.c
-@@ -545,8 +545,6 @@ first_key:
+@@ -572,8 +572,6 @@ first_key:
  	 * used. termios should have a better idea.
  	 */
  	bspace = tty->tio.c_cc[VERASE];