[145951] trunk/dports/sysutils/tmux

[cal at macports.org]

Revision: 145951
          https://trac.macports.org/changeset/145951
Author:   cal at macports.org
Date:     2016-02-22 09:34:35 -0800 (Mon, 22 Feb 2016)
Log Message:
-----------
tmux: revert r145936 at maintainer request, #50623

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

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

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

Property Changed:
----------------
    trunk/dports/sysutils/tmux/files/

Modified: trunk/dports/sysutils/tmux/Portfile
===================================================================
--- trunk/dports/sysutils/tmux/Portfile	2016-02-22 13:44:06 UTC (rev 145950)
+++ trunk/dports/sysutils/tmux/Portfile	2016-02-22 17:34:35 UTC (rev 145951)
@@ -6,13 +6,13 @@
 
 github.setup    tmux tmux 2.1
 if {${subport} eq ${name}} {
-    revision        1
+    revision        2
     conflicts       tmux-devel
 }
 subport tmux-devel {
     github.setup    tmux tmux 7120ab2f161a5762d16aba54451d29dcd0fbbeeb
     version         20150926-[string range ${github.version} 0 6]
-    revision        1
+    revision        2
     conflicts       tmux
 }
 categories      sysutils
@@ -27,8 +27,6 @@
 platforms       darwin
 license         BSD
 
-patchfiles      fix-reattach-with-session-list.patch
-
 depends_lib     port:libevent port:ncurses
 
 if {${subport} eq ${name}} {


Property changes on: trunk/dports/sysutils/tmux/files
___________________________________________________________________
Deleted: svn:mergeinfo
   - /branches/mld-qt-481/dports/sysutils/tmux/files:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856

Deleted: trunk/dports/sysutils/tmux/files/fix-reattach-with-session-list.patch
===================================================================
--- trunk/dports/sysutils/tmux/files/fix-reattach-with-session-list.patch	2016-02-22 13:44:06 UTC (rev 145950)
+++ trunk/dports/sysutils/tmux/files/fix-reattach-with-session-list.patch	2016-02-22 17:34:35 UTC (rev 145951)
@@ -1,20 +0,0 @@
-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/61849232/attachment-0001.html>