[csw-devel] SF.net SVN: gar:[19492] csw/mgar/pkg/tmux/trunk

dmichelsen at users.sourceforge.net dmichelsen at users.sourceforge.net
Wed Oct 24 07:35:21 CEST 2012


Revision: 19492
          http://gar.svn.sourceforge.net/gar/?rev=19492&view=rev
Author:   dmichelsen
Date:     2012-10-24 05:35:20 +0000 (Wed, 24 Oct 2012)
Log Message:
-----------
tmux: Update to 1.7 and patches

Modified Paths:
--------------
    csw/mgar/pkg/tmux/trunk/Makefile
    csw/mgar/pkg/tmux/trunk/checksums

Added Paths:
-----------
    csw/mgar/pkg/tmux/trunk/files/tmux-01-include-netdb.h.diff
    csw/mgar/pkg/tmux/trunk/files/tmux-02-u-for-process-group.patch

Removed Paths:
-------------
    csw/mgar/pkg/tmux/trunk/files/0001-Use-inttypes.h-if-stdint.h-is-not-available.patch

Modified: csw/mgar/pkg/tmux/trunk/Makefile
===================================================================
--- csw/mgar/pkg/tmux/trunk/Makefile	2012-10-23 22:42:19 UTC (rev 19491)
+++ csw/mgar/pkg/tmux/trunk/Makefile	2012-10-24 05:35:20 UTC (rev 19492)
@@ -1,5 +1,5 @@
 NAME = tmux
-VERSION = 1.5
+VERSION = 1.7
 CATEGORIES = apps
 GARTYPE = v2
 
@@ -8,23 +8,33 @@
 MASTER_SITES = $(SF_MIRRORS)
 DISTFILES  = $(DISTNAME).tar.gz
 
+# From http://pkgbuild.svn.sourceforge.net/viewvc/pkgbuild/spec-files-extra/trunk/patches/
+PATCHFILES += tmux-01-include-netdb.h.diff
+#PATCHFILES += tmux-02-u-for-process-group.patch
+
 RUNTIME_DEP_PKGS = CSWlibevent2-0-5
-BUILD_DEP_PKGS = CSWlibevent-devel
+BUILD_DEP_PKGS = CSWlibevent-dev
 
 LICENSE = NOTES
 VENDOR_URL = http://tmux.sourceforge.net
 
-EXTRA_CPPFLAGS += -I/opt/csw/include/ncursesw
-EXTRA_CPPFLAGS += -D__inline=inline
+# EXTRA_CPPFLAGS += -I/opt/csw/include/ncursesw
+#EXTRA_CPPFLAGS += -D__inline=inline
 # Grabbed from Solaris 10 /usr/include/iso/math_c99.h
-EXTRA_CPPFLAGS += -DINFINITY=__builtin_infinity
+#EXTRA_CPPFLAGS += -DINFINITY=__builtin_infinity
 
-include gar/category.mk
+# Make sure tmux.conf is found in /etc/opt/csw as reported in #4696
+REINPLACEMENTS += tmuxconf
+REINPLACE_MATCH_tmuxconf = /etc/tmux\.conf
+REINPLACE_WITH_tmuxconf = $(sysconfdir)/tmux.conf
+REINPLACE_FILES_tmuxconf += tmux.h
+REINPLACE_FILES_tmuxconf += tmux.1
 
-PATH := /opt/csw/gnu:$(PATH)
+# For LOCK_EX
+EXTRA_CPPFLAGS += -I/usr/ucbinclude
 
-post-extract-modulated:
-	@# Make sure tmux.conf is found in /etc/opt/csw as reported in #4696
-	perl -pi -e 's,/etc/tmux\.conf,$(sysconfdir)/tmux.conf,g' \
-		$(WORKSRC)/tmux.h \
-		$(WORKSRC)/tmux.1
+CONFIGURE_ENV_PATH = /opt/csw/gnu:$(PATH)
+
+PRESERVECONF += $(sysconfdir)/tmux.conf
+
+include gar/category.mk

Modified: csw/mgar/pkg/tmux/trunk/checksums
===================================================================
--- csw/mgar/pkg/tmux/trunk/checksums	2012-10-23 22:42:19 UTC (rev 19491)
+++ csw/mgar/pkg/tmux/trunk/checksums	2012-10-24 05:35:20 UTC (rev 19492)
@@ -1 +1 @@
-3d4b683572af34e83bc8b183a8285263  tmux-1.5.tar.gz
+2c48fb9beb22eedba7a5de3b78dd0c03  tmux-1.7.tar.gz

Deleted: csw/mgar/pkg/tmux/trunk/files/0001-Use-inttypes.h-if-stdint.h-is-not-available.patch
===================================================================
--- csw/mgar/pkg/tmux/trunk/files/0001-Use-inttypes.h-if-stdint.h-is-not-available.patch	2012-10-23 22:42:19 UTC (rev 19491)
+++ csw/mgar/pkg/tmux/trunk/files/0001-Use-inttypes.h-if-stdint.h-is-not-available.patch	2012-10-24 05:35:20 UTC (rev 19492)
@@ -1,28 +0,0 @@
-From d8dfa3860ec279f387c66e9c994bac7518e13ab0 Mon Sep 17 00:00:00 2001
-From: Dagobert Michelsen <dam at opencsw.org>
-Date: Thu, 6 Jan 2011 13:18:50 +0100
-Subject: [PATCH] Use inttypes.h if stdint.h is not available
-
----
- compat/asprintf.c |    4 ++++
- 1 files changed, 4 insertions(+), 0 deletions(-)
-
-diff --git a/compat/asprintf.c b/compat/asprintf.c
-index cb5282b..ab45110 100644
---- a/compat/asprintf.c
-+++ b/compat/asprintf.c
-@@ -18,7 +18,11 @@
- 
- #include <stdarg.h>
- #include <stdio.h>
-+#ifdef HAVE_STDINT_H
- #include <stdint.h>
-+#else
-+#include <inttypes.h>
-+#endif
- #include <string.h>
- 
- #include "tmux.h"
--- 
-1.7.3.2
-

Added: csw/mgar/pkg/tmux/trunk/files/tmux-01-include-netdb.h.diff
===================================================================
--- csw/mgar/pkg/tmux/trunk/files/tmux-01-include-netdb.h.diff	                        (rev 0)
+++ csw/mgar/pkg/tmux/trunk/files/tmux-01-include-netdb.h.diff	2012-10-24 05:35:20 UTC (rev 19492)
@@ -0,0 +1,13 @@
+diff -ur tmux-1.3.orig/screen.c tmux-1.3/screen.c
+--- tmux-1.3.orig/screen.c	2010-04-07 00:01:32.000000000 +0200
++++ tmux-1.3/screen.c	2010-10-21 21:39:15.000000000 +0200
+@@ -21,6 +21,9 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <unistd.h>
++#ifdef __sun
++#include <netdb.h>
++#endif
+ 
+ #include "tmux.h"
+ 

Added: csw/mgar/pkg/tmux/trunk/files/tmux-02-u-for-process-group.patch
===================================================================
--- csw/mgar/pkg/tmux/trunk/files/tmux-02-u-for-process-group.patch	                        (rev 0)
+++ csw/mgar/pkg/tmux/trunk/files/tmux-02-u-for-process-group.patch	2012-10-24 05:35:20 UTC (rev 19492)
@@ -0,0 +1,20 @@
+http://tmux.svn.sourceforge.net/viewvc/tmux?view=revision&revision=2589
+--- trunk/osdep-sunos.c	2011/07/09 09:42:33	2553
++++ trunk/osdep-sunos.c	2011/09/11 23:54:32	2589
+@@ -41,14 +41,13 @@
+ 	if ((f = open(tty, O_RDONLY)) < 0)
+ 		return (NULL);
+ 
+-	if ((fstat(f, &st) != 0) ||
+-	    (ioctl(f, TIOCGPGRP, &pgrp) != 0)) {
++	if (fstat(f, &st) != 0 || ioctl(f, TIOCGPGRP, &pgrp) != 0) {
+ 		close(f);
+ 		return (NULL);
+ 	}
+ 	close(f);
+ 
+-	xasprintf(&path, "/proc/%hu/psinfo", pgrp);
++	xasprintf(&path, "/proc/%u/psinfo", (u_int) pgrp);
+ 	f = open(path, O_RDONLY);
+ 	xfree(path);
+ 	if (f < 0)

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.



More information about the devel mailing list