Index: head/sysutils/tmux/Makefile
===================================================================
--- head/sysutils/tmux/Makefile	(revision 422990)
+++ head/sysutils/tmux/Makefile	(revision 422991)
@@ -1,65 +1,64 @@
 # Created by: Wen Heping <wenheping@gmail.com>
 # $FreeBSD$
 
 PORTNAME=	tmux
-PORTVERSION=	2.2
-PORTREVISION=	1
+PORTVERSION=	2.3
 CATEGORIES=	sysutils
 MASTER_SITES=	https://github.com/tmux/tmux/releases/download/${PORTVERSION}/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	mat@FreeBSD.org
 COMMENT=	Terminal Multiplexer
 
 LICENSE=	ISCL
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		pkgconfig ncurses
 
 USE_GITHUB=	nodefault
-GH_TUPLE=	imomaliev:tmux-bash-completion:e0f7021:bash
+GH_TUPLE=	imomaliev:tmux-bash-completion:ef56d3e:bash
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--sysconfdir=${PREFIX}/etc
 
 PLIST_FILES=	bin/tmux \
 		man/man1/tmux.1.gz \
 		etc/bash_completion.d/tmux
 
 PORTDOCS=	CHANGES FAQ README TODO
 PORTEXAMPLES=	*
 
 OPTIONS_DEFINE=	DOCS EXAMPLES LIBEVENT_STATIC BACKSPACE
 
 LIBEVENT_STATIC_DESC=	Build with static libevent
 BACKSPACE_DESC=	Build with tty/keys patch
 
 BACKSPACE_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-tty-keys.c
 
 LIBEVENT_STATIC_LIB_DEPENDS_OFF=	libevent.so:devel/libevent2
 LIBEVENT_STATIC_BUILD_DEPENDS=	${LOCALBASE}/lib/libevent.a:devel/libevent2
 LIBEVENT_STATIC_VARS=	LESTATIC=${LOCALBASE}/lib/libevent.a
 
 post-patch:
 	@${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}|' \
 		${WRKSRC}/${MAKEFILE}
 
 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_bash}/completions/tmux ${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}/example* ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>
Index: head/sysutils/tmux/distinfo
===================================================================
--- head/sysutils/tmux/distinfo	(revision 422990)
+++ head/sysutils/tmux/distinfo	(revision 422991)
@@ -1,5 +1,5 @@
-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
+TIMESTAMP = 1475246504
+SHA256 (tmux-2.3.tar.gz) = 55313e132f0f42de7e020bf6323a1939ee02ab79c48634aa07475db41573852b
+SIZE (tmux-2.3.tar.gz) = 473944
+SHA256 (imomaliev-tmux-bash-completion-ef56d3e_GH0.tar.gz) = 2f8f3fe586bbdeec9b251ce3ef74f5edef19ba371968a8011acef860ddac59e1
+SIZE (imomaliev-tmux-bash-completion-ef56d3e_GH0.tar.gz) = 1526
Index: head/sysutils/tmux/files/patch-utf8.c
===================================================================
--- head/sysutils/tmux/files/patch-utf8.c	(revision 422990)
+++ head/sysutils/tmux/files/patch-utf8.c	(nonexistent)
@@ -1,34 +0,0 @@
-commit 65e4c57d3a554940ed5cada6dfeff403ae8d9572
-Author: Nicholas Marriott <nicholas.marriott@gmail.com>
-Date:   2016-04-29 12:47:15 +0100
-
-    Only assume width 1 when wcwidth() returns -1 on non-OpenBSD platforms.
-
---- utf8.c.orig	2016-03-02 18:29:06 UTC
-+++ utf8.c
-@@ -115,8 +115,24 @@ utf8_width(wchar_t wc)
- 	int	width;
- 
- 	width = wcwidth(wc);
--	if (width < 0 || width > 0xff)
-+	if (width < 0 || width > 0xff) {
-+		log_debug("Unicode %04x, wcwidth() %d", wc, width);
-+
-+#ifndef __OpenBSD__
-+		/*
-+		 * Many platforms (particularly and inevitably OS X) have no
-+		 * width for relatively common characters (wcwidth() returns
-+		 * -1); assume width 1 in this case. This will be wrong for
-+		 * genuinely nonprintable characters, but they should be
-+		 * rare. We may pass through stuff that ideally we would block,
-+		 * but this is no worse than sending the same to the terminal
-+		 * without tmux.
-+		 */
-+		if (width < 0)
-+			return (1);
-+#endif
- 		return (-1);
-+	}
- 	return (width);
- }
- 

Property changes on: head/sysutils/tmux/files/patch-utf8.c
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/sysutils/tmux/files/extra-patch-tty-keys.c
===================================================================
--- head/sysutils/tmux/files/extra-patch-tty-keys.c	(revision 422990)
+++ head/sysutils/tmux/files/extra-patch-tty-keys.c	(revision 422991)
@@ -1,11 +1,11 @@
---- tty-keys.c.orig	2016-03-02 18:08:46 UTC
+--- tty-keys.c.orig	2016-04-30 12:46:35 UTC
 +++ tty-keys.c
-@@ -572,8 +572,6 @@ first_key:
+@@ -628,8 +628,6 @@ complete_key:
  	 * used. termios should have a better idea.
  	 */
  	bspace = tty->tio.c_cc[VERASE];
--	if (bspace != _POSIX_VDISABLE && key == bspace)
--		key = KEYC_BSPACE;
+-	if (bspace != _POSIX_VDISABLE && (key & KEYC_MASK_KEY) == bspace)
+-		key = (key & KEYC_MASK_MOD) | KEYC_BSPACE;
  
- 	goto complete_key;
- 
+ 	/* Remove data from buffer. */
+ 	evbuffer_drain(tty->event->input, size);