Index: head/sysutils/tmux/Makefile
===================================================================
--- head/sysutils/tmux/Makefile	(revision 394576)
+++ head/sysutils/tmux/Makefile	(revision 394577)
@@ -1,66 +1,67 @@
 # Created by: Wen Heping <wenheping@gmail.com>
 # $FreeBSD$
 
 PORTNAME=	tmux
 PORTVERSION=	2.0
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION:S/a$//}
 
 MAINTAINER=	mat@FreeBSD.org
 COMMENT=	Terminal Multiplexer
 
 LICENSE=	ISCL
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		pkgconfig shebangfix ncurses
 SHEBANG_FILES=	examples/tmux_backup.sh
 
 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:${PORTSDIR}/devel/libevent2
 LIBEVENT_STATIC_BUILD_DEPENDS=	${LOCALBASE}/lib/libevent.a:${PORTSDIR}/devel/libevent2
 
 .include <bsd.port.options.mk>
 
 .if ${OSVERSION} < 900004
 LIB_DEPENDS+=   libutempter.so:${PORTSDIR}/sysutils/libutempter
 CFLAGS+=        -I${LOCALBASE}/include
 LDFLAGS+=       -L${LOCALBASE}/lib
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/etc/tmux.conf|${PREFIX}/etc/tmux.conf|g' ${WRKSRC}/CHANGES
 
 .if ${PORT_OPTIONS:MLIBEVENT_STATIC}
 LESTATIC=	${LOCALBASE}/lib/libevent.a
 post-configure:
 	${REINPLACE_CMD} -e '/LIBS/s|-levent[^[:blank:]]*|${LESTATIC}|' \
 		${WRKSRC}/${MAKEFILE}
 .endif
 
 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
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	(cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR})
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/examples/* ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>
Index: head/sysutils/tmux/files/patch-git_2c53b23d
===================================================================
--- head/sysutils/tmux/files/patch-git_2c53b23d	(nonexistent)
+++ head/sysutils/tmux/files/patch-git_2c53b23d	(revision 394577)
@@ -0,0 +1,35 @@
+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) {

Property changes on: head/sysutils/tmux/files/patch-git_2c53b23d
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property