[58563] trunk/dports/sysutils/tmux

[toby at macports.org]

Revision: 58563
          http://trac.macports.org/changeset/58563
Author:   toby at macports.org
Date:     2009-09-30 23:24:06 -0700 (Wed, 30 Sep 2009)
Log Message:
-----------
likely fix for #18357 (tmux needs to fix its bootstrap)

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

Added Paths:
-----------
    trunk/dports/sysutils/tmux/files/server.c.diff

Modified: trunk/dports/sysutils/tmux/Portfile
===================================================================
--- trunk/dports/sysutils/tmux/Portfile	2009-10-01 06:04:16 UTC (rev 58562)
+++ trunk/dports/sysutils/tmux/Portfile	2009-10-01 06:24:06 UTC (rev 58563)
@@ -4,7 +4,7 @@
 
 name             tmux
 version          1.0
-revision         1
+revision         2
 categories       sysutils
 maintainers      toby
 description      terminal multiplexer
@@ -23,7 +23,7 @@
 
 depends_lib      port:ncurses
 
-patchfiles       GNUmakefile.diff osdep-darwin.c.diff
+patchfiles       GNUmakefile.diff osdep-darwin.c.diff server.c.diff
 
 post-configure {
 	reinplace "s|__PREFIX__|${prefix}|g" "${worksrcpath}/GNUmakefile"

Added: trunk/dports/sysutils/tmux/files/server.c.diff
===================================================================
--- trunk/dports/sysutils/tmux/files/server.c.diff	                        (rev 0)
+++ trunk/dports/sysutils/tmux/files/server.c.diff	2009-10-01 06:24:06 UTC (rev 58563)
@@ -0,0 +1,22 @@
+--- server.c.orig	2009-09-20 11:11:24.000000000 -0700
++++ server.c	2009-09-30 23:20:05.000000000 -0700
+@@ -34,6 +34,8 @@
+ #include <time.h>
+ #include <unistd.h>
+ 
++void *_vprocmgr_detach_from_console(unsigned int flags);
++
+ #include "tmux.h"
+ 
+ /*
+@@ -146,8 +148,8 @@
+ 	 * Must daemonise before loading configuration as the PID changes so
+ 	 * $TMUX would be wrong for sessions created in the config file.
+ 	 */
+-	if (daemon(1, 0) != 0)
+-		fatal("daemon failed");
++	if (_vprocmgr_detach_from_console(0) != NULL)
++		fatalx("_vprocmgr_detach_from_console failed");
+ 
+ 	logfile("server");
+ 	log_debug("server started, pid %ld", (long) getpid());
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090930/4e9dce41/attachment.html>