Import of pkgsrc-2016Q3

misc/tmux/Makefile

@@ -1,18 +1,21 @@
-# $NetBSD: Makefile,v 1.30 2015/08/18 07:31:14 wiz Exp $
+# $NetBSD: Makefile,v 1.35 2016/05/09 12:39:05 fhajny Exp $
 
-DISTNAME=	tmux-2.0
-PKGREVISION=	2
+DISTNAME=	tmux-2.2
 CATEGORIES=	misc
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=tmux/}
+MASTER_SITES=	${MASTER_SITE_GITHUB:=tmux/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://tmux.sourceforge.net/
+HOMEPAGE=	http://tmux.github.io/
 COMMENT=	BSD-licensed terminal multiplexer (GNU Screen alternative)
 LICENSE=	modified-bsd
 
+GITHUB_RELEASE=	${PKGVERSION_NOREV}
+
 GNU_CONFIGURE=	yes
 USE_TERMINFO=	yes
 
+USE_TOOLS+=	pkg-config
+
 .include "../../mk/bsd.prefs.mk"
 .include "../../mk/compiler.mk"
 .if !empty(MACHINE_PLATFORM:MSunOS-5.1[0-9]-*) && \
@@ -20,7 +23,7 @@ USE_TERMINFO=	yes
 BUILDLINK_TRANSFORM+=	opt:-D_XPG4_2:-D_XPG6
 .endif
 
-# https://trac.macports.org/changeset/127986
+# https://trac.macports.org/changeset/127986
 .if !empty(MACHINE_PLATFORM:MDarwin-1[0-9]*)
 CPPFLAGS+=	-D__DARWIN_VERS_1050=0
 .endif

misc/tmux/distinfo

@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.27 2015/05/16 20:27:49 ryoon Exp $
+$NetBSD: distinfo,v 1.31 2016/05/09 12:39:05 fhajny Exp $
 
-SHA1 (tmux-2.0.tar.gz) = 977871e7433fe054928d86477382bd5f6794dc3d
-RMD160 (tmux-2.0.tar.gz) = 5114e1e9d78667291375efcbd9be657b4f175806
-Size (tmux-2.0.tar.gz) = 455754 bytes
-SHA1 (patch-Makefile.in) = 9908c1f23603a735dd7b083b35cbfa7fc1fb4b3a
-SHA1 (patch-server-client.c) = 1cd724559d5cac935b4bbb1d02a7927ae54ae3fc
+SHA1 (tmux-2.2.tar.gz) = 5ed1430bc7ef44c227e64e9401c686573dd0791a
+RMD160 (tmux-2.2.tar.gz) = 5d636bb7a4c5d80e2dba4179ddd65bc49f471e37
+SHA512 (tmux-2.2.tar.gz) = 4d4fc316c78aab0d13f7f15098d952f01d7da7d74d46251ae2dd90440522f07c785afe984d82de2b4518fb67ea441f5a5a46c357c87ddc6ddbfba4b7f08be7bf
+Size (tmux-2.2.tar.gz) = 466852 bytes
+SHA1 (patch-Makefile.in) = fa9ec654cf6dad2b49b10ab981275d193d8b97c8
+SHA1 (patch-server-client.c) = 642991c6853762228ac6c1d5aaa470a1c9397ede

misc/tmux/patches/patch-Makefile.in

@@ -1,12 +1,12 @@
-$NetBSD: patch-Makefile.in,v 1.2 2015/05/16 20:27:49 ryoon Exp $
+$NetBSD: patch-Makefile.in,v 1.4 2016/05/09 12:39:05 fhajny 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"
 
---- Makefile.in.orig	2015-05-06 22:49:42.000000000 +0000
+--- Makefile.in.orig	2016-04-11 00:01:16.000000000 +0000
 +++ Makefile.in
-@@ -1208,7 +1208,7 @@ install-exec-hook:
+@@ -1231,7 +1231,7 @@ install-exec-hook:
  			>$(srcdir)/tmux.1.mdoc; \
  	else \
  		sed -e "s|@SYSCONFDIR@|$(sysconfdir)|g" $(srcdir)/tmux.1| \

misc/tmux/patches/patch-server-client.c

@@ -1,18 +1,12 @@
-$NetBSD: patch-server-client.c,v 1.2 2013/10/06 09:01:41 obache Exp $
+$NetBSD: patch-server-client.c,v 1.4 2016/05/09 12:39:05 fhajny Exp $
 
 * SunOS errno support needs the right include.
 * timersub is missing on Solaris10
 
---- server-client.c.orig	2013-03-26 19:22:31.000000000 +0000
+--- server-client.c.orig	2016-04-04 00:16:53.000000000 +0000
 +++ server-client.c
-@@ -26,8 +26,24 @@
- #include <time.h>
- #include <unistd.h>
+@@ -30,6 +30,18 @@
  
-+#ifdef __sun
-+#include <errno.h>
-+#endif
-+
  #include "tmux.h"
  
 +#ifndef timersub
@@ -27,6 +21,6 @@ $NetBSD: patch-server-client.c,v 1.2 2013/10/06 09:01:41 obache Exp $
 +    } while (0)
 +#endif
 +
- void	server_client_check_focus(struct window_pane *);
- void	server_client_check_resize(struct window_pane *);
- void	server_client_check_mouse(struct client *, struct window_pane *);
+ void		server_client_free(int, short, void *);
+ void		server_client_check_focus(struct window_pane *);
+ void		server_client_check_resize(struct window_pane *);