[145953] trunk/dports/sysutils/tmux

[cal at macports.org]

Revision: 145953
          https://trac.macports.org/changeset/145953
Author:   cal at macports.org
Date:     2016-02-22 11:33:34 -0800 (Mon, 22 Feb 2016)
Log Message:
-----------
tmux-devel: update to current dev version, #50691

Patch from maintainer, moves the patch from r145951 and r145936 to tmux only
and drops it from tmux-devel.

Revision Links:
--------------
    https://trac.macports.org/changeset/145951
    https://trac.macports.org/changeset/145936

Modified Paths:
--------------
    trunk/dports/sysutils/tmux/Portfile

Added Paths:
-----------
    trunk/dports/sysutils/tmux/files/fix-reattach-with-session-list.patch

Modified: trunk/dports/sysutils/tmux/Portfile
===================================================================
--- trunk/dports/sysutils/tmux/Portfile	2016-02-22 18:57:55 UTC (rev 145952)
+++ trunk/dports/sysutils/tmux/Portfile	2016-02-22 19:33:34 UTC (rev 145953)
@@ -6,13 +6,13 @@
 
 github.setup    tmux tmux 2.1
 if {${subport} eq ${name}} {
-    revision        2
+    revision        3
     conflicts       tmux-devel
 }
 subport tmux-devel {
-    github.setup    tmux tmux 7120ab2f161a5762d16aba54451d29dcd0fbbeeb
-    version         20150926-[string range ${github.version} 0 6]
-    revision        2
+    github.setup    tmux tmux e9d369a09e48ea8f940958025c8444988d31e840
+    version         20160219-[string range ${github.version} 0 6]
+    revision        0
     conflicts       tmux
 }
 categories      sysutils
@@ -33,10 +33,11 @@
     github.tarball_from     releases
     checksums               rmd160  db078b7149e009aecb200c4cbb39be72190a14dc \
                             sha256  31564e7bf4bcef2defb3cb34b9e596bd43a3937cad9e5438701a81a5a9af6176
+    patchfiles              fix-reattach-with-session-list.patch
 }
 subport tmux-devel {
-    checksums               rmd160  75deb03c7b1aadd65699d0616180f7448e4672c7 \
-                            sha256  a88e5bad3db5547df7bcdf6eef9dde1bc76822f722c2126cfd6a5d482de0c763
+    checksums               rmd160  c38a7cc9800025436a419690940c26a370828cc9 \
+                            sha256  2a48ff122f22de57855f80cec9acc74ec886a8fcf4a0236d8421cd048771a3ad
 
     use_autoreconf          yes
     autoreconf.cmd          ./autogen.sh

Copied: trunk/dports/sysutils/tmux/files/fix-reattach-with-session-list.patch (from rev 145950, trunk/dports/sysutils/tmux/files/fix-reattach-with-session-list.patch)
===================================================================
--- trunk/dports/sysutils/tmux/files/fix-reattach-with-session-list.patch	                        (rev 0)
+++ trunk/dports/sysutils/tmux/files/fix-reattach-with-session-list.patch	2016-02-22 19:33:34 UTC (rev 145953)
@@ -0,0 +1,20 @@
+Detach the right seesion with -d
+
+Fixes a bug that would detach the wrong session when running
+attach-session -dt $sessionname. See
+  https://trac.macports.org/ticket/50623
+for the report. This has been fixed upstream, but the backported patch
+looks different because of changes to upstream source code.
+
+Upstream-Status: Backport [https://github.com/tmux/tmux/commit/f2ec911b8a0bb88d23f16b7d9e0f41f29d4ac541]
+--- cmd-attach-session.c.old	2015-12-21 05:01:35.060975526 -0800
++++ cmd-attach-session.c	2015-12-21 05:01:40.179848875 -0800
+@@ -120,7 +120,7 @@
+ 			TAILQ_FOREACH(c_loop, &clients, entry) {
+ 				if (c_loop->session != s || c == c_loop)
+ 					continue;
+-				server_write_client(c, MSG_DETACH,
++				server_write_client(c_loop, MSG_DETACH,
+ 				    c_loop->session->name,
+ 				    strlen(c_loop->session->name) + 1);
+ 			}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160222/7d91d8d5/attachment.html>