tmux: Add references to pull ups and little adjustements

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

Module Name:	pkgsrc-wip
Committed By:	Leonardo Taccari <leot%NetBSD.org@localhost>
Pushed By:	leot
Date:		Wed Sep 5 18:52:41 2018 +0200
Changeset:	b6e2c3a4a94b976bdaa14e45d7579b5030c85be2

Modified Files:
	tmux/distinfo
	tmux/patches/patch-Makefile.in
	tmux/patches/patch-tty-term.c

Log Message:
tmux: Add references to pull ups and little adjustements

- Adjust patch-tty-term.c as was applied upstream.
- Add a reference to all pull ups, all pkgsrc patches are now applied upstream

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=b6e2c3a4a94b976bdaa14e45d7579b5030c85be2

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

diffstat:
 tmux/distinfo                  |  4 ++--
 tmux/patches/patch-Makefile.in |  4 ++++
 tmux/patches/patch-tty-term.c  | 12 ++++++++----
 3 files changed, 14 insertions(+), 6 deletions(-)

diffs:
diff --git a/tmux/distinfo b/tmux/distinfo
index 3633cb62fd..1759221931 100644
--- a/tmux/distinfo
+++ b/tmux/distinfo
@@ -4,5 +4,5 @@ SHA1 (tmux-2.8-rc.tar.gz) = 1838a1f79b4c900b175be1c07e9733cc074a1f6a
 RMD160 (tmux-2.8-rc.tar.gz) = 4d28ec01780e6ab4e2bdb257e713c16e17c272ea
 SHA512 (tmux-2.8-rc.tar.gz) = 3e961450c7ce48671a4ccf7f053e4387c02b677f308531f78dc6f162304c1493ad2f927abd07ec1b9f9678c7fbc64f557a2c2e269e059c9610ae7571581fe3f4
 Size (tmux-2.8-rc.tar.gz) = 491679 bytes
-SHA1 (patch-Makefile.in) = fa9ec654cf6dad2b49b10ab981275d193d8b97c8
-SHA1 (patch-tty-term.c) = 486b64b5762a35986ca39a93efd1d29a79920193
+SHA1 (patch-Makefile.in) = dc8a351b06bf2f9f96b3dc4d944a174ef3c8d9db
+SHA1 (patch-tty-term.c) = 20bf235e61e6650bec3e7e94ea79859898039eba
diff --git a/tmux/patches/patch-Makefile.in b/tmux/patches/patch-Makefile.in
index 65e60a55a6..8b9d63a52c 100644
--- a/tmux/patches/patch-Makefile.in
+++ b/tmux/patches/patch-Makefile.in
@@ -4,6 +4,10 @@ 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:
diff --git a/tmux/patches/patch-tty-term.c b/tmux/patches/patch-tty-term.c
index e894ddbe44..8a16271ac4 100644
--- a/tmux/patches/patch-tty-term.c
+++ b/tmux/patches/patch-tty-term.c
@@ -1,7 +1,11 @@
 $NetBSD$
 
-Address -Wint-conversion warnings and properly cast to intptr_t,
-from NetBSD external/bsd/tmux/dist/tty-term.c,-r1.5 by <christos>.
+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
@@ -10,7 +14,7 @@ from NetBSD external/bsd/tmux/dist/tty-term.c,-r1.5 by <christos>.
  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), (intptr_t)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 *
@@ -18,7 +22,7 @@ from NetBSD external/bsd/tmux/dist/tty-term.c,-r1.5 by <christos>.
      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), (intptr_t)a, (intptr_t)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