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

dmichelsen at users.sourceforge.net dmichelsen at users.sourceforge.net
Thu Jan 6 13:28:51 CET 2011


Revision: 12218
          http://gar.svn.sourceforge.net/gar/?rev=12218&view=rev
Author:   dmichelsen
Date:     2011-01-06 12:28:51 +0000 (Thu, 06 Jan 2011)

Log Message:
-----------
tmux: Update to 1.4 and adjust to new libevent2_0_5

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

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

Removed 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-fix-for-missing-MAXHOSTNAMELEN.patch
    csw/mgar/pkg/tmux/trunk/files/COPYING

Modified: csw/mgar/pkg/tmux/trunk/Makefile
===================================================================
--- csw/mgar/pkg/tmux/trunk/Makefile	2011-01-06 12:24:20 UTC (rev 12217)
+++ csw/mgar/pkg/tmux/trunk/Makefile	2011-01-06 12:28:51 UTC (rev 12218)
@@ -1,17 +1,15 @@
 NAME = tmux
-VERSION = 1.3
+VERSION = 1.4
 CATEGORIES = apps
 
 DESCRIPTION = Terminal Multiplexer
 
-SF_PROJ = $(NAME)
 MASTER_SITES = $(SF_MIRRORS)
 DISTFILES  = $(NAME)-$(VERSION).tar.gz
-DISTFILES += COPYING
 
-PATCHFILES  = 0001-old-style-patch-0000-stdint.patch
-PATCHFILES += 0002-Fix-one-more-inttypes.h.patch
-PATCHFILES += 0003-Add-fix-for-missing-MAXHOSTNAMELEN.patch
+# Use patch unless this is fixed:
+#   https://sourceforge.net/tracker/?func=detail&aid=3152389&group_id=200378&atid=973264
+PATCHFILES = 0001-Use-inttypes.h-if-stdint.h-is-not-available.patch
 
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = -(\d+(?:\.\d+)*).tar.gz
@@ -19,6 +17,9 @@
 RUNTIME_DEP_PKGS = CSWlibevent
 BUILD_DEP_PKGS = CSWlibevent-devel
 
+LICENSE = NOTES
+VENDOR_URL = http://tmux.sourceforge.net
+
 CONFIGURE_ARGS = 
 
 EXTRA_CPPFLAGS = -D__inline=inline
@@ -28,6 +29,10 @@
 
 INSTALL_SCRIPTS = custom
 
+# New libevent2_0_5 has not been released, remove after release
+CHECKPKG_OVERRIDES_CSWtmux += soname-not-found|libevent-2.0.so.5|is|needed|by|opt/csw/bin/tmux
+CHECKPKG_OVERRIDES_CSWtmux += surplus-dependency|CSWlibevent
+
 include gar/category.mk
 
 PATH := /opt/csw/gnu:$(PATH)

Modified: csw/mgar/pkg/tmux/trunk/checksums
===================================================================
--- csw/mgar/pkg/tmux/trunk/checksums	2011-01-06 12:24:20 UTC (rev 12217)
+++ csw/mgar/pkg/tmux/trunk/checksums	2011-01-06 12:28:51 UTC (rev 12218)
@@ -1,5 +1 @@
-58b41f4648140297ed218db06a023450  0001-old-style-patch-0000-stdint.patch
-6d6be91f763e1b4c15ec8145efbda66e  0002-Fix-one-more-inttypes.h.patch
-2a87ff8258d61d719a3b046a6d68d2d2  0003-Add-fix-for-missing-MAXHOSTNAMELEN.patch
-8ad333c4590c5ed45f1b4d0218ede7a7  COPYING
-96e60cb206de2db0610b9fb6a64c2251  tmux-1.3.tar.gz
+0bfc7dd9a5bab192406167589c716a21  tmux-1.4.tar.gz

Added: 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	                        (rev 0)
+++ csw/mgar/pkg/tmux/trunk/files/0001-Use-inttypes.h-if-stdint.h-is-not-available.patch	2011-01-06 12:28:51 UTC (rev 12218)
@@ -0,0 +1,28 @@
+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
+

Deleted: csw/mgar/pkg/tmux/trunk/files/0001-old-style-patch-0000-stdint.patch
===================================================================
--- csw/mgar/pkg/tmux/trunk/files/0001-old-style-patch-0000-stdint.patch	2011-01-06 12:24:20 UTC (rev 12217)
+++ csw/mgar/pkg/tmux/trunk/files/0001-old-style-patch-0000-stdint.patch	2011-01-06 12:28:51 UTC (rev 12218)
@@ -1,81 +0,0 @@
-From a2255d651e3a64c0133d56533d934260b71d1cc5 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 +-
- osdep-freebsd.c |    2 +-
- tmux.h          |    2 +-
- window.c        |    2 +-
- xmalloc.c       |    2 +-
- 5 files changed, 5 insertions(+), 5 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/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 c8b48f3..d78b46e 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 13439c9..e1506a5 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.1
-

Deleted: 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	2011-01-06 12:24:20 UTC (rev 12217)
+++ csw/mgar/pkg/tmux/trunk/files/0002-Fix-one-more-inttypes.h.patch	2011-01-06 12:28:51 UTC (rev 12218)
@@ -1,25 +0,0 @@
-From 5b87d0623c11043f670ec4e2d11197a9030edda1 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.1
-

Deleted: csw/mgar/pkg/tmux/trunk/files/0003-Add-fix-for-missing-MAXHOSTNAMELEN.patch
===================================================================
--- csw/mgar/pkg/tmux/trunk/files/0003-Add-fix-for-missing-MAXHOSTNAMELEN.patch	2011-01-06 12:24:20 UTC (rev 12217)
+++ csw/mgar/pkg/tmux/trunk/files/0003-Add-fix-for-missing-MAXHOSTNAMELEN.patch	2011-01-06 12:28:51 UTC (rev 12218)
@@ -1,26 +0,0 @@
-From 374b542205a8ebee89c123f203600c627a1bdd45 Mon Sep 17 00:00:00 2001
-From: Dagobert Michelsen <dam at opencsw.org>
-Date: Fri, 23 Jul 2010 11:25:22 +0200
-Subject: [PATCH 3/3] Add fix for missing MAXHOSTNAMELEN
-
----
- screen.c |    3 +++
- 1 files changed, 3 insertions(+), 0 deletions(-)
-
-diff --git a/screen.c b/screen.c
-index e6d56c9..ee36024 100644
---- a/screen.c
-+++ b/screen.c
-@@ -22,6 +22,9 @@
- #include <string.h>
- #include <unistd.h>
- 
-+/* For MAXHOSTNAMELEN */
-+#include <netdb.h>
-+
- #include "tmux.h"
- 
- void	screen_resize_x(struct screen *, u_int);
--- 
-1.7.1
-

Deleted: csw/mgar/pkg/tmux/trunk/files/COPYING
===================================================================
--- csw/mgar/pkg/tmux/trunk/files/COPYING	2011-01-06 12:24:20 UTC (rev 12217)
+++ csw/mgar/pkg/tmux/trunk/files/COPYING	2011-01-06 12:28:51 UTC (rev 12218)
@@ -1,8 +0,0 @@
-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