[61753] trunk/dports/sysutils/tmux

[toby at macports.org]

Revision: 61753
          http://trac.macports.org/changeset/61753
Author:   toby at macports.org
Date:     2009-12-20 16:59:35 -0800 (Sun, 20 Dec 2009)
Log Message:
-----------
adjustments

Modified Paths:
--------------
    trunk/dports/sysutils/tmux/Portfile
    trunk/dports/sysutils/tmux/files/GNUmakefile.diff

Removed Paths:
-------------
    trunk/dports/sysutils/tmux/files/osdep-darwin.c.diff
    trunk/dports/sysutils/tmux/files/server.c.diff

Modified: trunk/dports/sysutils/tmux/Portfile
===================================================================
--- trunk/dports/sysutils/tmux/Portfile	2009-12-21 00:54:20 UTC (rev 61752)
+++ trunk/dports/sysutils/tmux/Portfile	2009-12-21 00:59:35 UTC (rev 61753)
@@ -4,7 +4,7 @@
 
 name            tmux
 version         1.1
-revision        1
+revision        2
 categories      sysutils
 maintainers     toby
 description     terminal multiplexer
@@ -24,7 +24,6 @@
 depends_lib     port:ncurses
 
 patchfiles      GNUmakefile.diff \
-                osdep-darwin.c.diff \
                 tmux.1.diff \
                 tmux.h.diff
 

Modified: trunk/dports/sysutils/tmux/files/GNUmakefile.diff
===================================================================
--- trunk/dports/sysutils/tmux/files/GNUmakefile.diff	2009-12-21 00:54:20 UTC (rev 61752)
+++ trunk/dports/sysutils/tmux/files/GNUmakefile.diff	2009-12-21 00:59:35 UTC (rev 61753)
@@ -1,5 +1,5 @@
---- GNUmakefile.orig	2009-09-21 18:26:58.000000000 -0700
-+++ GNUmakefile	2009-09-21 18:31:03.000000000 -0700
+--- GNUmakefile.orig	2009-11-05 04:30:55.000000000 -0800
++++ GNUmakefile	2009-12-20 16:58:44.000000000 -0800
 @@ -21,9 +21,9 @@
  
  #FDEBUG= 1
@@ -13,19 +13,7 @@
  LIBS+=
  
  # Sun CC 
-@@ -34,27 +34,27 @@
- 
- ifdef FDEBUG
- CFLAGS+= -g -ggdb -DDEBUG
-+endif
- CFLAGS+= -Wno-long-long -Wall -W -Wnested-externs -Wformat=2
- CFLAGS+= -Wmissing-prototypes -Wstrict-prototypes -Wmissing-declarations
- CFLAGS+= -Wwrite-strings -Wshadow -Wpointer-arith -Wsign-compare
- CFLAGS+= -Wundef -Wbad-function-cast -Winline -Wcast-align
--endif
- 
- # This sort of sucks but gets rid of the stupid warning and should work on
- # most platforms...
+@@ -45,16 +45,16 @@
  ifeq ($(shell (LC_ALL=C $(CC) -v 2>&1|awk '/gcc version 4|clang/') || true), )
  CPPFLAGS:= -I. -I- $(CPPFLAGS)
  else

Deleted: trunk/dports/sysutils/tmux/files/osdep-darwin.c.diff
===================================================================
--- trunk/dports/sysutils/tmux/files/osdep-darwin.c.diff	2009-12-21 00:54:20 UTC (rev 61752)
+++ trunk/dports/sysutils/tmux/files/osdep-darwin.c.diff	2009-12-21 00:59:35 UTC (rev 61753)
@@ -1,35 +0,0 @@
---- osdep-darwin.c.orig	2009-09-30 20:30:00.000000000 -0700
-+++ osdep-darwin.c	2009-09-30 20:30:25.000000000 -0700
-@@ -19,6 +19,7 @@
- #include <sys/types.h>
- #include <sys/sysctl.h>
- 
-+#include <libproc.h>
- #include <stdlib.h>
- #include <string.h>
- #include <unistd.h>
-@@ -30,18 +31,15 @@
- char *
- osdep_get_name(int fd, unused char *tty)
- {
--	int	mib[4] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, 0 };
--        size_t	size;
--	struct kinfo_proc kp;
-+	int pid;
-+	char name[PATH_MAX], *p;
- 
--	if ((mib[3] = tcgetpgrp(fd)) == -1)
-+	if ((pid = tcgetpgrp(fd)) == -1)
- 		return (NULL);
- 
--	size = sizeof kp;
--	if (sysctl(mib, 4, &kp, &size, NULL, 0) == -1)
--		return (NULL);
--	if (*kp.kp_proc.p_comm == '\0')
-+	if (proc_pidpath(pid, name, sizeof name) <= 0)
- 		return (NULL);
- 
--	return (strdup(kp.kp_proc.p_comm));
-+	p = strrchr(name, '/');
-+	return (strdup(p ? p + 1 : name));
- }

Deleted: trunk/dports/sysutils/tmux/files/server.c.diff
===================================================================
--- trunk/dports/sysutils/tmux/files/server.c.diff	2009-12-21 00:54:20 UTC (rev 61752)
+++ trunk/dports/sysutils/tmux/files/server.c.diff	2009-12-21 00:59:35 UTC (rev 61753)
@@ -1,22 +0,0 @@
---- 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"
- 
- /*
-@@ -246,8 +248,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/20091220/034d6baf/attachment.html>