CVS commit: pkgsrc/misc/tmux

["Leonardo Taccari" <leot%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   leot
Date:           Sun Oct 21 21:22:47 UTC 2018

Modified Files:
        pkgsrc/misc/tmux: Makefile distinfo
        pkgsrc/misc/tmux/patches: patch-Makefile.in
Added Files:
        pkgsrc/misc/tmux/patches: patch-tty-term.c
Removed Files:
        pkgsrc/misc/tmux/patches: patch-server-client.c

Log Message:
tmux: Update misc/tmux to 2.8

pkgsrc changes:
 - Address -Wint-conversion warnings and properly cast to long, patch by
   <christos> from NetBSD, thanks!
 - Remove patch-server-client.c, timersub() was added in compat.h
   since tmux-1.9 and is no longer needed
 - Take MAINTAINERship

Changes:
2.8
---
 * Make display-panes block the client until a pane is chosen or it
   times out.
 * Clear history on RIS like most other terminals do.
 * Add an "Any" key to run a command if a key is pressed that is not
   bound in the current key table.
 * Expand formats in load-buffer and save-buffer.
 * Add a rectangle_toggle format.
 * Add set-hook -R to run a hook immediately.
 * Add README.ja.
 * Add pane focus hooks.
 * Allow any punctuation as separator for s/x/y not only /.
 * Improve resizing with the mouse (fix resizing the wrong pane in some
   layouts, and allow resizing multiple panes at the same time).
 * Allow , and } to be escaped in formats as #, and #}.
 * Add KRB5CCNAME to update-environment.
 * Change meaning of -c to display-message so the client is used if it
   matches the session given to -t.
 * Fixes to : form of SGR.
 * Add x and X to choose-tree to kill sessions, windows or panes.


To generate a diff of this commit:
cvs rdiff -u -r1.45 -r1.46 pkgsrc/misc/tmux/Makefile
cvs rdiff -u -r1.36 -r1.37 pkgsrc/misc/tmux/distinfo
cvs rdiff -u -r1.4 -r1.5 pkgsrc/misc/tmux/patches/patch-Makefile.in
cvs rdiff -u -r1.5 -r0 pkgsrc/misc/tmux/patches/patch-server-client.c
cvs rdiff -u -r0 -r1.1 pkgsrc/misc/tmux/patches/patch-tty-term.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/misc/tmux/Makefile
diff -u pkgsrc/misc/tmux/Makefile:1.45 pkgsrc/misc/tmux/Makefile:1.46
--- pkgsrc/misc/tmux/Makefile:1.45      Sat Jun  9 11:23:05 2018
+++ pkgsrc/misc/tmux/Makefile   Sun Oct 21 21:22:47 2018
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.45 2018/06/09 11:23:05 leot Exp $
+# $NetBSD: Makefile,v 1.46 2018/10/21 21:22:47 leot Exp $
 
-DISTNAME=      tmux-2.7
-PKGREVISION=   1
+DISTNAME=      tmux-2.8
 CATEGORIES=    misc
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=tmux/}
 GITHUB_RELEASE=        ${PKGVERSION_NOREV}
 
-MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
+MAINTAINER=    leot%NetBSD.org@localhost
 HOMEPAGE=      http://tmux.github.io/
 COMMENT=       BSD-licensed terminal multiplexer (GNU Screen alternative)
 LICENSE=       modified-bsd

Index: pkgsrc/misc/tmux/distinfo
diff -u pkgsrc/misc/tmux/distinfo:1.36 pkgsrc/misc/tmux/distinfo:1.37
--- pkgsrc/misc/tmux/distinfo:1.36      Sat May 26 17:05:28 2018
+++ pkgsrc/misc/tmux/distinfo   Sun Oct 21 21:22:47 2018
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.36 2018/05/26 17:05:28 leot Exp $
+$NetBSD: distinfo,v 1.37 2018/10/21 21:22:47 leot Exp $
 
-SHA1 (tmux-2.7.tar.gz) = a12bb094bf0baf0275b6d5cc718c938639712e97
-RMD160 (tmux-2.7.tar.gz) = 0f36f35969fb61b8d2771845deba2596b047b7b7
-SHA512 (tmux-2.7.tar.gz) = 7839ef748ea55df8c02c727047f65bd235b5e3b8ab23157246071e1b9954fa269594da9fbd0fabf6a850e3b5dfda962a0a067c1507411c92a84d1db2666ecf37
-Size (tmux-2.7.tar.gz) = 487585 bytes
-SHA1 (patch-Makefile.in) = fa9ec654cf6dad2b49b10ab981275d193d8b97c8
-SHA1 (patch-server-client.c) = a0949d4fdba20aaffce6cd56eedd47b7cc64e1bc
+SHA1 (tmux-2.8.tar.gz) = 6a469769a242c95dc8aec443b436d4f8f279f517
+RMD160 (tmux-2.8.tar.gz) = 13f097f02b2d3f489fb00af5b3f702cb2eae523f
+SHA512 (tmux-2.8.tar.gz) = e382aec122a10624953432b3c869b21d69390bc2e7d459440a46950802e39503eafb398178f8085191261925e4f0872bb99b19e0403e7beb56d3ceecc4c86b09
+Size (tmux-2.8.tar.gz) = 491195 bytes
+SHA1 (patch-Makefile.in) = dc8a351b06bf2f9f96b3dc4d944a174ef3c8d9db
+SHA1 (patch-tty-term.c) = 20bf235e61e6650bec3e7e94ea79859898039eba

Index: pkgsrc/misc/tmux/patches/patch-Makefile.in
diff -u pkgsrc/misc/tmux/patches/patch-Makefile.in:1.4 pkgsrc/misc/tmux/patches/patch-Makefile.in:1.5
--- pkgsrc/misc/tmux/patches/patch-Makefile.in:1.4      Mon May  9 12:39:05 2016
+++ pkgsrc/misc/tmux/patches/patch-Makefile.in  Sun Oct 21 21:22:47 2018
@@ -1,9 +1,13 @@
-$NetBSD: patch-Makefile.in,v 1.4 2016/05/09 12:39:05 fhajny Exp $
+$NetBSD: patch-Makefile.in,v 1.5 2018/10/21 21:22:47 leot Exp $
 
 At least on SunOS, lang/nawk (nawk-20050424nb3) insists on
 a space between -f and the program file name, by penalty of
 "/opt/local/bin/nawk: no program filename"
 
+This was applied upstream via:
+ 
+ <https://github.com/tmux/tmux/pull/1464>
+
 --- Makefile.in.orig   2016-04-11 00:01:16.000000000 +0000
 +++ Makefile.in
 @@ -1231,7 +1231,7 @@ install-exec-hook:

Added files:

Index: pkgsrc/misc/tmux/patches/patch-tty-term.c
diff -u /dev/null pkgsrc/misc/tmux/patches/patch-tty-term.c:1.1
--- /dev/null   Sun Oct 21 21:22:47 2018
+++ pkgsrc/misc/tmux/patches/patch-tty-term.c   Sun Oct 21 21:22:47 2018
@@ -0,0 +1,28 @@
+$NetBSD: patch-tty-term.c,v 1.1 2018/10/21 21:22:47 leot Exp $
+
+Address -Wint-conversion warnings and properly cast to long, from
+NetBSD external/bsd/tmux/dist/tty-term.c patch by <christos>.
+
+This was applied upstream via:
+
+ <https://github.com/tmux/tmux/pull/1465>
+
+--- tty-term.c.orig    2018-07-27 13:01:14.000000000 +0000
++++ tty-term.c
+@@ -616,14 +616,14 @@ tty_term_string3(struct tty_term *term, 
+ const char *
+ tty_term_ptr1(struct tty_term *term, enum tty_code_code code, const void *a)
+ {
+-      return (tparm((char *) tty_term_string(term, code), a, 0, 0, 0, 0, 0, 0, 0, 0));
++      return (tparm((char *) tty_term_string(term, code), (long)a, 0, 0, 0, 0, 0, 0, 0, 0));
+ }
+ 
+ const char *
+ tty_term_ptr2(struct tty_term *term, enum tty_code_code code, const void *a,
+     const void *b)
+ {
+-      return (tparm((char *) tty_term_string(term, code), a, b, 0, 0, 0, 0, 0, 0, 0));
++      return (tparm((char *) tty_term_string(term, code), (long)a, (long)b, 0, 0, 0, 0, 0, 0, 0));
+ }
+ 
+ int