Index: head/sysutils/tmux/Makefile
===================================================================
--- head/sysutils/tmux/Makefile	(revision 525823)
+++ head/sysutils/tmux/Makefile	(revision 525824)
@@ -1,69 +1,70 @@
 # Created by: Wen Heping <wenheping@gmail.com>
 # $FreeBSD$
 
 PORTNAME=	tmux
 PORTVERSION=	3.0a
+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
 
-CONFLICTS_INSTALL=	tmux23
+USES=		ncurses pkgconfig
 
-USES=		pkgconfig ncurses
-
 USE_GITHUB=	nodefault
 GH_TUPLE=	imomaliev:tmux-bash-completion:ef56d3e:bash
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--sysconfdir=${PREFIX}/etc --enable-utempter
+CONFIGURE_ARGS=	--enable-utempter \
+		--sysconfdir=${PREFIX}/etc
 
+CONFLICTS_INSTALL=	tmux23
+
 PLIST_FILES=	bin/tmux \
-		man/man1/tmux.1.gz \
-		etc/bash_completion.d/tmux
+		etc/bash_completion.d/tmux \
+		man/man1/tmux.1.gz
 
 PORTDOCS=	CHANGES README
 PORTEXAMPLES=	*
 
-OPTIONS_DEFINE=	DOCS EXAMPLES LIBEVENT_STATIC BACKSPACE UTF8PROC
-OPTIONS_DEFAULT=	UTF8PROC
+OPTIONS_DEFINE=	BACKSPACE DOCS EXAMPLES LIBEVENT_STATIC UTF8PROC
 
+BACKSPACE_DESC=		Build with tty/keys patch
 LIBEVENT_STATIC_DESC=	Build with static libevent
-BACKSPACE_DESC=	Build with tty/keys patch
-UTF8PROC_DESC=	Build with utf8proc support
+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_BUILD_DEPENDS=	${LOCALBASE}/lib/libevent.a:devel/libevent
-LIBEVENT_STATIC_VARS=	LESTATIC=${LOCALBASE}/lib/libevent.a
+LIBEVENT_STATIC_VARS=			LESTATIC=${LOCALBASE}/lib/libevent.a
 
 UTF8PROC_CONFIGURE_ENABLE=	utf8proc
-UTF8PROC_LIB_DEPENDS=	libutf8proc.so:textproc/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-spawn.c
===================================================================
--- head/sysutils/tmux/files/patch-spawn.c	(nonexistent)
+++ head/sysutils/tmux/files/patch-spawn.c	(revision 525824)
@@ -0,0 +1,23 @@
+From 54efe337993b5571728a09b247c7f39d493659a8 Mon Sep 17 00:00:00 2001
+From: Nicholas Marriott <nicholas.marriott@gmail.com>
+Date: Wed, 18 Dec 2019 15:58:06 +0000
+Subject: [PATCH] Add back utempter code, reported by Peter Schellenbach.
+
+--- spawn.c.orig	2019-12-01 08:47:31 UTC
++++ spawn.c
+@@ -424,6 +424,15 @@ spawn_pane(struct spawn_context *sc, char **cause)
+ 	_exit(1);
+ 
+ complete:
++#ifdef HAVE_UTEMPTER
++	if (~new_wp->flags & PANE_EMPTY) {
++		xasprintf(&cp, "tmux(%lu).%%%u", (long)getpid(), new_wp->id);
++		utempter_add_record(new_wp->fd, cp);
++		kill(getpid(), SIGCHLD);
++		free(cp);
++	}
++#endif
++
+ 	new_wp->pipe_off = 0;
+ 	new_wp->flags &= ~PANE_EXITED;
+ 

Property changes on: head/sysutils/tmux/files/patch-spawn.c
___________________________________________________________________
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