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

dmichelsen at users.sourceforge.net dmichelsen at users.sourceforge.net
Wed May 12 15:07:53 CEST 2010


Revision: 9856
          http://gar.svn.sourceforge.net/gar/?rev=9856&view=rev
Author:   dmichelsen
Date:     2010-05-12 13:07:53 +0000 (Wed, 12 May 2010)

Log Message:
-----------
tmux: Add patches

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

Added Paths:
-----------
    csw/mgar/pkg/tmux/trunk/files/0001-old-style-patch-0000-stdint.patch
    csw/mgar/pkg/tmux/trunk/files/0002-Fix-one-more-inttypes.h.patch
    csw/mgar/pkg/tmux/trunk/files/0003-Add-definitions-for-CMSG_SPACE.patch
    csw/mgar/pkg/tmux/trunk/files/0004-Add-substitues-form-setenv-and-unsetenv.patch
    csw/mgar/pkg/tmux/trunk/files/COPYING

Removed Paths:
-------------
    csw/mgar/pkg/tmux/trunk/files/0000-stdint.patch

Modified: csw/mgar/pkg/tmux/trunk/Makefile
===================================================================
--- csw/mgar/pkg/tmux/trunk/Makefile	2010-05-12 09:28:44 UTC (rev 9855)
+++ csw/mgar/pkg/tmux/trunk/Makefile	2010-05-12 13:07:53 UTC (rev 9856)
@@ -7,17 +7,26 @@
 SF_PROJ = $(GARNAME)
 MASTER_SITES = $(SF_MIRRORS)
 DISTFILES  = $(GARNAME)-$(GARVERSION).tar.gz
-PATCHFILES = 0000-stdint.patch
+DISTFILES += COPYING
+PATCHFILES  = 0001-old-style-patch-0000-stdint.patch
+PATCHFILES += 0002-Fix-one-more-inttypes.h.patch
+PATCHFILES += 0003-Add-definitions-for-CMSG_SPACE.patch
 
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = -(\d+(?:\.\d+)*).tar.gz
 
-RUNTIME_DEP_PKGS_CSWtmux += CSWlibevent
-BUILDDEPS = libevent_devel
+RUNTIME_DEP_PKGS = CSWlibevent
+BUILD_DEP_PKGS = CSWlibevent-devel
 
 CONFIGURE_ARGS = 
-INSTALL_ARGS = PREFIX=/opt/csw INSTALLDIR="/opt/csw/bin/ginstall -d" INSTALLBIN="/opt/csw/bin/ginstall -m 555" INSTALLMAN="/opt/csw/bin/ginstall -m 444"
 
+EXTRA_CPPFLAGS = -D__inline=inline
+
+INSTALL_ARGS  = PREFIX=/opt/csw
+INSTALL_ARGS += INSTALLDIR="/opt/csw/bin/ginstall -d"
+INSTALL_ARGS += INSTALLBIN="/opt/csw/bin/ginstall -m 555"
+INSTALL_ARGS += INSTALLMAN="/opt/csw/bin/ginstall -m 444"
+
 SKIPTEST = 1
 
 include gar/category.mk

Modified: csw/mgar/pkg/tmux/trunk/checksums
===================================================================
--- csw/mgar/pkg/tmux/trunk/checksums	2010-05-12 09:28:44 UTC (rev 9855)
+++ csw/mgar/pkg/tmux/trunk/checksums	2010-05-12 13:07:53 UTC (rev 9856)
@@ -1,2 +1,4 @@
-02d06d80759e841c396058406c25ca58  0000-stdint.patch
+eb2b06cbb9c101e1687caf727e747c68  0001-old-style-patch-0000-stdint.patch
+3a7d0d4c2610a3c0fb418d1db40be856  0002-Fix-one-more-inttypes.h.patch
+53b2c368d0e3746fe4c36c4e1a1bc81b  0003-Add-definitions-for-CMSG_SPACE.patch
 748fbe7bb5f86812e19bd6005ff21a5a  tmux-1.2.tar.gz

Deleted: csw/mgar/pkg/tmux/trunk/files/0000-stdint.patch
===================================================================
--- csw/mgar/pkg/tmux/trunk/files/0000-stdint.patch	2010-05-12 09:28:44 UTC (rev 9855)
+++ csw/mgar/pkg/tmux/trunk/files/0000-stdint.patch	2010-05-12 13:07:53 UTC (rev 9856)
@@ -1,75 +0,0 @@
-Only in tmux-1.2-fixed: .Makefile.swp
-Only in tmux-1.2-fixed: config.h
-Only in tmux-1.2-fixed: config.mk
-diff -r -u work/build-isa-i386/tmux-1.2/input-keys.c tmux-1.2-fixed/input-keys.c
---- work/build-isa-i386/tmux-1.2/input-keys.c	2009-12-04 23:14:47.000000000 +0100
-+++ tmux-1.2-fixed/input-keys.c	2010-05-11 14:01:19.197440406 +0200
-@@ -18,7 +18,7 @@
- 
- #include <sys/types.h>
- 
--#include <stdint.h>
-+#include <sys/inttypes.h>
- #include <stdlib.h>
- #include <string.h>
- 
-diff -r -u work/build-isa-i386/tmux-1.2/input.c tmux-1.2-fixed/input.c
---- work/build-isa-i386/tmux-1.2/input.c	2010-02-08 19:32:34.000000000 +0100
-+++ tmux-1.2-fixed/input.c	2010-05-11 14:01:19.202535746 +0200
-@@ -18,7 +18,7 @@
- 
- #include <sys/types.h>
- 
--#include <stdint.h>
-+#include <sys/inttypes.h>
- #include <stdlib.h>
- #include <string.h>
- 
-diff -r -u work/build-isa-i386/tmux-1.2/osdep-freebsd.c tmux-1.2-fixed/osdep-freebsd.c
---- work/build-isa-i386/tmux-1.2/osdep-freebsd.c	2009-08-09 20:00:45.000000000 +0200
-+++ tmux-1.2-fixed/osdep-freebsd.c	2010-05-11 14:01:19.190049473 +0200
-@@ -24,7 +24,7 @@
- 
- #include <err.h>
- #include <errno.h>
--#include <stdint.h>
-+#include <sys/inttypes.h>
- #include <stdlib.h>
- #include <string.h>
- #include <unistd.h>
-diff -r -u work/build-isa-i386/tmux-1.2/tmux.h tmux-1.2-fixed/tmux.h
---- work/build-isa-i386/tmux-1.2/tmux.h	2010-03-08 16:02:07.000000000 +0100
-+++ tmux-1.2-fixed/tmux.h	2010-05-11 14:01:19.191746514 +0200
-@@ -31,7 +31,7 @@
- #include <limits.h>
- #include <signal.h>
- #include <stdarg.h>
--#include <stdint.h>
-+#include <sys/inttypes.h>
- #include <stdio.h>
- #include <termios.h>
- 
-diff -r -u work/build-isa-i386/tmux-1.2/window.c tmux-1.2-fixed/window.c
---- work/build-isa-i386/tmux-1.2/window.c	2010-02-08 19:10:07.000000000 +0100
-+++ tmux-1.2-fixed/window.c	2010-05-11 14:01:19.186240214 +0200
-@@ -24,7 +24,7 @@
- #include <fnmatch.h>
- #include <pwd.h>
- #include <signal.h>
--#include <stdint.h>
-+#include <sys/inttypes.h>
- #include <stdlib.h>
- #include <string.h>
- #include <termios.h>
-diff -r -u work/build-isa-i386/tmux-1.2/xmalloc.c tmux-1.2-fixed/xmalloc.c
---- work/build-isa-i386/tmux-1.2/xmalloc.c	2009-10-29 00:12:38.000000000 +0100
-+++ tmux-1.2-fixed/xmalloc.c	2010-05-11 14:01:19.179268582 +0200
-@@ -20,7 +20,7 @@
- 
- #include <errno.h>
- #include <libgen.h>
--#include <stdint.h>
-+#include <sys/inttypes.h>
- #include <stdlib.h>
- #include <string.h>
- 

Copied: csw/mgar/pkg/tmux/trunk/files/0001-old-style-patch-0000-stdint.patch (from rev 9853, csw/mgar/pkg/tmux/trunk/files/0000-stdint.patch)
===================================================================
--- csw/mgar/pkg/tmux/trunk/files/0001-old-style-patch-0000-stdint.patch	                        (rev 0)
+++ csw/mgar/pkg/tmux/trunk/files/0001-old-style-patch-0000-stdint.patch	2010-05-12 13:07:53 UTC (rev 9856)
@@ -0,0 +1,95 @@
+From aa5dc9009a7a677c50d1205b69bbcd6191e3adf3 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Wed, 12 May 2010 10:21:45 +0200
+Subject: [PATCH 1/3] old style patch: 0000-stdint.patch
+
+---
+ input-keys.c    |    2 +-
+ input.c         |    2 +-
+ osdep-freebsd.c |    2 +-
+ tmux.h          |    2 +-
+ window.c        |    2 +-
+ xmalloc.c       |    2 +-
+ 6 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/input-keys.c b/input-keys.c
+index 1e2b18e..afcecaa 100644
+--- a/input-keys.c
++++ b/input-keys.c
+@@ -18,7 +18,7 @@
+ 
+ #include <sys/types.h>
+ 
+-#include <stdint.h>
++#include <sys/inttypes.h>
+ #include <stdlib.h>
+ #include <string.h>
+ 
+diff --git a/input.c b/input.c
+index 0928195..180bb96 100644
+--- a/input.c
++++ b/input.c
+@@ -18,7 +18,7 @@
+ 
+ #include <sys/types.h>
+ 
+-#include <stdint.h>
++#include <sys/inttypes.h>
+ #include <stdlib.h>
+ #include <string.h>
+ 
+diff --git a/osdep-freebsd.c b/osdep-freebsd.c
+index ddd865e..4dad659 100644
+--- a/osdep-freebsd.c
++++ b/osdep-freebsd.c
+@@ -24,7 +24,7 @@
+ 
+ #include <err.h>
+ #include <errno.h>
+-#include <stdint.h>
++#include <sys/inttypes.h>
+ #include <stdlib.h>
+ #include <string.h>
+ #include <unistd.h>
+diff --git a/tmux.h b/tmux.h
+index 1f7c010..918aba5 100644
+--- a/tmux.h
++++ b/tmux.h
+@@ -31,7 +31,7 @@
+ #include <limits.h>
+ #include <signal.h>
+ #include <stdarg.h>
+-#include <stdint.h>
++#include <sys/inttypes.h>
+ #include <stdio.h>
+ #include <termios.h>
+ 
+diff --git a/window.c b/window.c
+index 8629943..a8668db 100644
+--- a/window.c
++++ b/window.c
+@@ -24,7 +24,7 @@
+ #include <fnmatch.h>
+ #include <pwd.h>
+ #include <signal.h>
+-#include <stdint.h>
++#include <sys/inttypes.h>
+ #include <stdlib.h>
+ #include <string.h>
+ #include <termios.h>
+diff --git a/xmalloc.c b/xmalloc.c
+index e9f96a1..96b59f7 100644
+--- a/xmalloc.c
++++ b/xmalloc.c
+@@ -20,7 +20,7 @@
+ 
+ #include <errno.h>
+ #include <libgen.h>
+-#include <stdint.h>
++#include <sys/inttypes.h>
+ #include <stdlib.h>
+ #include <string.h>
+ 
+-- 
+1.7.0
+

Added: csw/mgar/pkg/tmux/trunk/files/0002-Fix-one-more-inttypes.h.patch
===================================================================
--- csw/mgar/pkg/tmux/trunk/files/0002-Fix-one-more-inttypes.h.patch	                        (rev 0)
+++ csw/mgar/pkg/tmux/trunk/files/0002-Fix-one-more-inttypes.h.patch	2010-05-12 13:07:53 UTC (rev 9856)
@@ -0,0 +1,25 @@
+From e64811a62b8fefe02d0fbc6c406e629c35d93f7a Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Wed, 12 May 2010 14:38:28 +0200
+Subject: [PATCH 2/3] Fix one more inttypes.h
+
+---
+ compat/asprintf.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/compat/asprintf.c b/compat/asprintf.c
+index cb5282b..66b73d5 100644
+--- a/compat/asprintf.c
++++ b/compat/asprintf.c
+@@ -18,7 +18,7 @@
+ 
+ #include <stdarg.h>
+ #include <stdio.h>
+-#include <stdint.h>
++#include <inttypes.h>
+ #include <string.h>
+ 
+ #include "tmux.h"
+-- 
+1.7.0
+

Added: csw/mgar/pkg/tmux/trunk/files/0003-Add-definitions-for-CMSG_SPACE.patch
===================================================================
--- csw/mgar/pkg/tmux/trunk/files/0003-Add-definitions-for-CMSG_SPACE.patch	                        (rev 0)
+++ csw/mgar/pkg/tmux/trunk/files/0003-Add-definitions-for-CMSG_SPACE.patch	2010-05-12 13:07:53 UTC (rev 9856)
@@ -0,0 +1,66 @@
+From b60fa77597ce86a19c9fc45b658e193498956268 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Wed, 12 May 2010 14:39:14 +0200
+Subject: [PATCH 3/3] Add definitions for CMSG_SPACE
+
+---
+ compat/imsg-buffer.c    |    1 +
+ compat/imsg.c           |    1 +
+ compat/solaris-compat.h |   21 +++++++++++++++++++++
+ 3 files changed, 23 insertions(+), 0 deletions(-)
+ create mode 100644 compat/solaris-compat.h
+
+diff --git a/compat/imsg-buffer.c b/compat/imsg-buffer.c
+index 7baaa42..8da71f8 100644
+--- a/compat/imsg-buffer.c
++++ b/compat/imsg-buffer.c
+@@ -27,6 +27,7 @@
+ #include <unistd.h>
+ 
+ #include "tmux.h"
++#include "compat/solaris-compat.h"
+ 
+ int	buf_realloc(struct buf *, size_t);
+ void	buf_enqueue(struct msgbuf *, struct buf *);
+diff --git a/compat/imsg.c b/compat/imsg.c
+index 1bc6062..f209fe0 100644
+--- a/compat/imsg.c
++++ b/compat/imsg.c
+@@ -27,6 +27,7 @@
+ #include <unistd.h>
+ 
+ #include "tmux.h"
++#include "compat/solaris-compat.h"
+ 
+ int	 imsg_get_fd(struct imsgbuf *);
+ 
+diff --git a/compat/solaris-compat.h b/compat/solaris-compat.h
+new file mode 100644
+index 0000000..57bbb51
+--- /dev/null
++++ b/compat/solaris-compat.h
+@@ -0,0 +1,21 @@
++/*
++ * CMS_SPACE etc. definitions for Solaris from
++ *   http://mailman.videolan.org/pipermail/vlc-devel/2006-May/024402.html
++ */
++
++#ifndef CMSG_ALIGN
++#   ifdef __sun__
++#       define CMSG_ALIGN _CMSG_DATA_ALIGN
++#   else
++#       define CMSG_ALIGN(len) (((len)+sizeof(long)-1) & ~(sizeof(long)-1))
++#   endif
++#endif
++
++#ifndef CMSG_SPACE
++#   define CMSG_SPACE(len) (CMSG_ALIGN(sizeof(struct cmsghdr))+CMSG_ALIGN(len))
++#endif
++
++#ifndef CMSG_LEN
++#   define CMSG_LEN(len) (CMSG_ALIGN(sizeof(struct cmsghdr))+(len))
++#endif
++
+-- 
+1.7.0
+

Added: csw/mgar/pkg/tmux/trunk/files/0004-Add-substitues-form-setenv-and-unsetenv.patch
===================================================================
--- csw/mgar/pkg/tmux/trunk/files/0004-Add-substitues-form-setenv-and-unsetenv.patch	                        (rev 0)
+++ csw/mgar/pkg/tmux/trunk/files/0004-Add-substitues-form-setenv-and-unsetenv.patch	2010-05-12 13:07:53 UTC (rev 9856)
@@ -0,0 +1,41 @@
+From 245b536b83117992d5cb13b766d592497b448a7c Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Wed, 12 May 2010 15:04:26 +0200
+Subject: [PATCH 4/4] Add substitues form setenv and unsetenv
+
+---
+ window.c |   18 ++++++++++++++++++
+ 1 files changed, 18 insertions(+), 0 deletions(-)
+
+diff --git a/window.c b/window.c
+index a8668db..d28efc9 100644
+--- a/window.c
++++ b/window.c
+@@ -32,6 +32,24 @@
+ 
+ #include "tmux.h"
+ 
++#ifdef __sun
++void setenv(char *n, char *v, int x) {
++  char buf[256];
++  snprintf(buf,sizeof(buf),"%s=%s",n,v);
++  putenv(buf);
++}
++
++void unsetenv(char *env_name) {
++  extern char **environ;
++  char **cc;
++  int l;
++  l=strlen(env_name);
++  for (cc=environ;*cc!=NULL;cc++) {
++    if (strncmp(env_name,*cc,l)==0 && ((*cc)[l]=='='||(*cc)[l]=='\0')) break;
++  } for (; *cc != NULL; cc++) *cc=cc[1];
++}
++#endif
++
+ /*
+  * Each window is attached to a number of panes, each of which is a pty. This
+  * file contains code to handle them.
+-- 
+1.7.0
+

Added: csw/mgar/pkg/tmux/trunk/files/COPYING
===================================================================
--- csw/mgar/pkg/tmux/trunk/files/COPYING	                        (rev 0)
+++ csw/mgar/pkg/tmux/trunk/files/COPYING	2010-05-12 13:07:53 UTC (rev 9856)
@@ -0,0 +1,8 @@
+This file and the CHANGES, FAQ and TODO files are licensed under the ISC
+license. Files under examples/ remain copyright their authors unless otherwise
+stated in the file but permission has been received to distribute them with
+tmux. All other files have a license and copyright notice at their
+start. Please contact me with any queries.
+
+-- Nicholas Marriott <nicm at users.sf.net>
+


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