Date: Tue, 11 Feb 2020 14:15:02 +0000 (UTC) From: Mathieu Arnold <mat@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r525824 - in head/sysutils/tmux: . files Message-ID: <202002111415.01BEF2Cp022055@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mat Date: Tue Feb 11 14:15:01 2020 New Revision: 525824 URL: https://svnweb.freebsd.org/changeset/ports/525824 Log: Fix utempter usage[1] and disable utf8proc[2] by default. 1) utempter support was broken starting in 3.0, it was not registering panes as being logged in. 2) using utf8proc seems to create mor problems than it solves, so disable it for now. PR: 243440[1] 234822[2] Submitted by: Yasuhiro KIMURA[1] Added: head/sysutils/tmux/files/patch-spawn.c (contents, props changed) Modified: head/sysutils/tmux/Makefile (contents, props changed) Modified: head/sysutils/tmux/Makefile ============================================================================== --- head/sysutils/tmux/Makefile Tue Feb 11 14:14:58 2020 (r525823) +++ head/sysutils/tmux/Makefile Tue Feb 11 14:15:01 2020 (r525824) @@ -3,6 +3,7 @@ PORTNAME= tmux PORTVERSION= 3.0a +PORTREVISION= 1 CATEGORIES= sysutils MASTER_SITES= https://github.com/tmux/tmux/releases/download/${PORTVERSION}/ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} @@ -13,38 +14,38 @@ 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 \ Added: head/sysutils/tmux/files/patch-spawn.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/tmux/files/patch-spawn.c Tue Feb 11 14:15:01 2020 (r525824) @@ -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; +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202002111415.01BEF2Cp022055>