Index: head/sysutils/tmux/Makefile
===================================================================
--- head/sysutils/tmux/Makefile	(revision 533902)
+++ head/sysutils/tmux/Makefile	(revision 533903)
@@ -1,69 +1,70 @@
 # Created by: Wen Heping <wenheping@gmail.com>
 # $FreeBSD$
 
 PORTNAME=	tmux
 PORTVERSION=	3.1a
+PORTREVISION=	1
 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=		ncurses pkgconfig
 
 USE_GITHUB=	nodefault
 GH_TUPLE=	imomaliev:tmux-bash-completion:ef56d3e:bash
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-utempter \
 		--sysconfdir=${PREFIX}/etc
 
 CONFLICTS_INSTALL=	tmux23
 
 PLIST_FILES=	bin/tmux \
 		etc/bash_completion.d/tmux \
 		man/man1/tmux.1.gz
 
 PORTDOCS=	CHANGES README
 PORTEXAMPLES=	*
 
 OPTIONS_DEFINE=	BACKSPACE DOCS EXAMPLES LIBEVENT_STATIC UTF8PROC
 
 BACKSPACE_DESC=		Build with tty/keys patch
 LIBEVENT_STATIC_DESC=	Build with static libevent
 UTF8PROC_DESC=		Build with utf8proc support
 
 BACKSPACE_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-tty-keys.c
 
 LIBEVENT_STATIC_BUILD_DEPENDS=		${LOCALBASE}/lib/libevent.a:devel/libevent
 LIBEVENT_STATIC_LIB_DEPENDS_OFF=	libevent.so:devel/libevent
 LIBEVENT_STATIC_VARS=			LESTATIC=${LOCALBASE}/lib/libevent.a
 
 UTF8PROC_CONFIGURE_ENABLE=	utf8proc
 UTF8PROC_LIB_DEPENDS=		libutf8proc.so:textproc/utf8proc
 
 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}
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/bash_completion.d
 	${INSTALL_DATA} ${WRKSRC_bash}/completions/tmux ${STAGEDIR}${PREFIX}/etc/bash_completion.d/tmux
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	(cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR})
 
 post-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/example* ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>
Index: head/sysutils/tmux/files/patch-6a33a12798b2afeee6fb7bba74d86d628137921e
===================================================================
--- head/sysutils/tmux/files/patch-6a33a12798b2afeee6fb7bba74d86d628137921e	(nonexistent)
+++ head/sysutils/tmux/files/patch-6a33a12798b2afeee6fb7bba74d86d628137921e	(revision 533903)
@@ -0,0 +1,18 @@
+From 6a33a12798b2afeee6fb7bba74d86d628137921e Mon Sep 17 00:00:00 2001
+From: Nicholas Marriott <nicholas.marriott@gmail.com>
+Date: Thu, 30 Apr 2020 15:20:08 +0100
+Subject: [PATCH] Do not remove the automatic-rename option from the global
+ set, only from the window (it must stay in the global set or tmux will
+ crash). GitHub issue 2188.
+
+--- input.c.orig	2020-04-29 20:01:18 UTC
++++ input.c
+@@ -2304,7 +2304,7 @@ input_exit_rename(struct input_ctx *ictx)
+ 		return;
+ 
+ 	if (ictx->input_len == 0) {
+-		oe = options_get(wp->window->options, "automatic-rename");
++		oe = options_get_only(wp->window->options, "automatic-rename");
+ 		if (oe != NULL)
+ 			options_remove(oe);
+ 		return;

Property changes on: head/sysutils/tmux/files/patch-6a33a12798b2afeee6fb7bba74d86d628137921e
___________________________________________________________________
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