5 files changed, 8 insertions, 108 deletions
diff --git a/misc/tmux/Makefile b/misc/tmux/Makefile
index ae5fdc56e81..a022909db17 100644
--- a/misc/tmux/Makefile
+++ b/misc/tmux/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.47 2018/11/28 14:45:19 leot Exp $
+# $NetBSD: Makefile,v 1.48 2019/05/03 10:49:35 triaxx Exp $
 
-DISTNAME=	tmux-2.8
-PKGREVISION=	1
+DISTNAME=	tmux-2.9a
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_GITHUB:=tmux/}
 GITHUB_RELEASE=	${PKGVERSION_NOREV}
@@ -31,7 +30,7 @@ BUILDLINK_TRANSFORM+=	opt:-D_XPG4_2:-D_XPG6
 .endif
 
 # https://trac.macports.org/changeset/127986
-.if !empty(MACHINE_PLATFORM:MDarwin-1[0-9]*)
+.if !empty(MACHINE_PLATFORM:MDarwin-1[0-9].*)
 CPPFLAGS+=	-D__DARWIN_VERS_1050=0
 .endif
 
diff --git a/misc/tmux/distinfo b/misc/tmux/distinfo
index b4c0e5c0fd0..818330e2e6b 100644
--- a/misc/tmux/distinfo
+++ b/misc/tmux/distinfo
@@ -1,9 +1,6 @@
-$NetBSD: distinfo,v 1.39 2018/11/29 10:51:34 leot Exp $
+$NetBSD: distinfo,v 1.40 2019/05/03 10:49:35 triaxx Exp $
 
-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-osdep-netbsd.c) = 9b4859afed8524cb1966fb473cf49bb576e02885
-SHA1 (patch-tty-term.c) = 20bf235e61e6650bec3e7e94ea79859898039eba
+SHA1 (tmux-2.9a.tar.gz) = 33cba73e64c62f46bd244d4472c59371fb747f56
+RMD160 (tmux-2.9a.tar.gz) = e5460971073abb865adcea2a6711e82d84c53838
+SHA512 (tmux-2.9a.tar.gz) = aca6882688727c10c5647443fdd18bbd6c0f80b7a3bf9667903d1b89d523e604cd715f176f33f2e5673258f00e626a6dc273f80fe97ae4f91621814d89985713
+Size (tmux-2.9a.tar.gz) = 510915 bytes
diff --git a/misc/tmux/patches/patch-Makefile.in b/misc/tmux/patches/patch-Makefile.in
deleted file mode 100644
index a1787686c53..00000000000
--- a/misc/tmux/patches/patch-Makefile.in
+++ /dev/null
@@ -1,21 +0,0 @@
-$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:
- 			>$(srcdir)/tmux.1.mdoc; \
- 	else \
- 		sed -e "s|@SYSCONFDIR@|$(sysconfdir)|g" $(srcdir)/tmux.1| \
--			$(AWK) -f$(srcdir)/mdoc2man.awk >$(srcdir)/tmux.1.man; \
-+			$(AWK) -f $(srcdir)/mdoc2man.awk >$(srcdir)/tmux.1.man; \
- 	fi
- 	$(mkdir_p) $(DESTDIR)$(mandir)/man1
- 	$(INSTALL_DATA) $(srcdir)/tmux.1.@MANFORMAT@ \
diff --git a/misc/tmux/patches/patch-osdep-netbsd.c b/misc/tmux/patches/patch-osdep-netbsd.c
deleted file mode 100644
index 750626194da..00000000000
--- a/misc/tmux/patches/patch-osdep-netbsd.c
+++ /dev/null
@@ -1,47 +0,0 @@
-$NetBSD: patch-osdep-netbsd.c,v 1.2 2018/11/29 10:51:34 leot Exp $
-
-Implement osdep_get_cwd() via mount_procfs(8) (inspired by osdep-sunos.c).
-
-This was applied upstream via:
-
- <https://github.com/tmux/tmux/pull/1556>
-
---- osdep-netbsd.c.orig	2016-01-21 00:00:28.000000000 +0000
-+++ osdep-netbsd.c
-@@ -23,10 +23,13 @@
- 
- #include <errno.h>
- #include <event.h>
-+#include <limits.h>
- #include <stdlib.h>
- #include <string.h>
- #include <unistd.h>
- 
-+#include "tmux.h"
-+
- #define is_runnable(p) \
-         ((p)->p_stat == LSRUN || (p)->p_stat == SIDL)
- #define is_stopped(p) \
-@@ -127,6 +130,22 @@ error:
- char *
- osdep_get_cwd(int fd)
- {
-+	static char	target[PATH_MAX + 1];
-+	char		*path;
-+	pid_t		pgrp;
-+	ssize_t		n;
-+
-+	if ((pgrp = tcgetpgrp(fd)) == -1)
-+		return (NULL);
-+
-+	xasprintf(&path, "/proc/%lld/cwd", (long long) pgrp);
-+	n = readlink(path, target, sizeof(target) - 1);
-+	free(path);
-+	if (n > 0) {
-+		target[n] = '\0';
-+		return (target);
-+	}
-+
- 	return (NULL);
- }
- 
diff --git a/misc/tmux/patches/patch-tty-term.c b/misc/tmux/patches/patch-tty-term.c
deleted file mode 100644
index ed3ba8a8b15..00000000000
--- a/misc/tmux/patches/patch-tty-term.c
+++ /dev/null
@@ -1,28 +0,0 @@
-$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