diff options
| -rw-r--r-- | misc/tmux/Makefile | 17 | ||||
| -rw-r--r-- | misc/tmux/distinfo | 14 | ||||
| -rw-r--r-- | misc/tmux/patches/patch-Makefile.am (renamed from misc/tmux/patches/patch-Makefile.in) | 8 | ||||
| -rw-r--r-- | misc/tmux/patches/patch-server-client.c | 16 |
4 files changed, 29 insertions, 26 deletions
diff --git a/misc/tmux/Makefile b/misc/tmux/Makefile index fee765a3667..fd5b2980a1c 100644 --- a/misc/tmux/Makefile +++ b/misc/tmux/Makefile @@ -1,9 +1,10 @@ -# $NetBSD: Makefile,v 1.31 2015/11/16 03:16:50 ryoon Exp $ +# $NetBSD: Makefile,v 1.32 2015/12/31 07:07:16 ryoon Exp $ -DISTNAME= tmux-2.0 -PKGREVISION= 2 +DISTNAME= tmux-2.1 CATEGORIES= misc -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=tmux/} +MASTER_SITES= ${MASTER_SITE_GITHUB:=tmux/} +GITHUB_PROJECT= tmux +GITHUB_TAG= 2.1 MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://tmux.github.io/ @@ -13,6 +14,8 @@ LICENSE= modified-bsd GNU_CONFIGURE= yes USE_TERMINFO= yes +USE_TOOLS+= automake + .include "../../mk/bsd.prefs.mk" .include "../../mk/compiler.mk" .if !empty(MACHINE_PLATFORM:MSunOS-5.1[0-9]-*) && \ @@ -25,6 +28,12 @@ BUILDLINK_TRANSFORM+= opt:-D_XPG4_2:-D_XPG6 CPPFLAGS+= -D__DARWIN_VERS_1050=0 .endif +pre-configure: + set -e; cd ${WRKSRC}; \ + mkdir -p etc; \ + aclocal; \ + automake --add-missing --force-missing --copy --foreign; autoreconf + .include "../../devel/libevent/buildlink3.mk" BUILDLINK_API_DEPENDS.libevent+= libevent>=2.0.10 .include "../../mk/terminfo.buildlink3.mk" diff --git a/misc/tmux/distinfo b/misc/tmux/distinfo index 38b98af1559..7e5fffd909d 100644 --- a/misc/tmux/distinfo +++ b/misc/tmux/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.28 2015/11/03 23:49:53 agc Exp $ +$NetBSD: distinfo,v 1.29 2015/12/31 07:07:16 ryoon Exp $ -SHA1 (tmux-2.0.tar.gz) = 977871e7433fe054928d86477382bd5f6794dc3d -RMD160 (tmux-2.0.tar.gz) = 5114e1e9d78667291375efcbd9be657b4f175806 -SHA512 (tmux-2.0.tar.gz) = 8a4be40ceb9b371a91107173de08348c4379b103454fa397ee326506f78a5fda1034dc7148c090c687221eddb8a2fc0c3aeb85da57841df6bcd74fb5f4f5f53d -Size (tmux-2.0.tar.gz) = 455754 bytes -SHA1 (patch-Makefile.in) = 9908c1f23603a735dd7b083b35cbfa7fc1fb4b3a -SHA1 (patch-server-client.c) = 1cd724559d5cac935b4bbb1d02a7927ae54ae3fc +SHA1 (tmux-2.1.tar.gz) = df182bd69b2f9b5c238c2a777d92a37479fd4b30 +RMD160 (tmux-2.1.tar.gz) = 993ab8b4bbb5ff7ccf146910dfe821b8c5499ada +SHA512 (tmux-2.1.tar.gz) = 73e917125413917f5a6edd105aa3fdcb5655fa96def26d7e7f1b75a598062d15124960fe38e2a7eafec950ad8039e4f783cb6c533ca7872ac64795425e750a2a +Size (tmux-2.1.tar.gz) = 588644 bytes +SHA1 (patch-Makefile.am) = 4578ec2aa2c4e0f3c81801568b1eaecdf7b67cf1 +SHA1 (patch-server-client.c) = 64bd26054f220d80f3ba1cf117425f216a004987 diff --git a/misc/tmux/patches/patch-Makefile.in b/misc/tmux/patches/patch-Makefile.am index db8d1e40941..e744b6980ad 100644 --- a/misc/tmux/patches/patch-Makefile.in +++ b/misc/tmux/patches/patch-Makefile.am @@ -1,12 +1,12 @@ -$NetBSD: patch-Makefile.in,v 1.2 2015/05/16 20:27:49 ryoon Exp $ +$NetBSD: patch-Makefile.am,v 1.1 2015/12/31 07:07:16 ryoon 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 -@@ -1208,7 +1208,7 @@ install-exec-hook: +--- Makefile.am.orig 2015-10-18 17:10:43.000000000 +0000 ++++ Makefile.am +@@ -242,7 +242,7 @@ install-exec-hook: >$(srcdir)/tmux.1.mdoc; \ else \ sed -e "s|@SYSCONFDIR@|$(sysconfdir)|g" $(srcdir)/tmux.1| \ diff --git a/misc/tmux/patches/patch-server-client.c b/misc/tmux/patches/patch-server-client.c index 98dc9e52327..106c71fd425 100644 --- a/misc/tmux/patches/patch-server-client.c +++ b/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.3 2015/12/31 07:07:16 ryoon 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 2015-10-18 17:10:43.000000000 +0000 +++ server-client.c -@@ -26,8 +26,24 @@ - #include <time.h> - #include <unistd.h> +@@ -29,6 +29,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_key_table(struct client *, const char *); + void server_client_free(int, short, void *); 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 *); |