diff options
Diffstat (limited to 'misc/tmux')
| -rw-r--r-- | misc/tmux/Makefile | 5 | ||||
| -rw-r--r-- | misc/tmux/distinfo | 11 | ||||
| -rw-r--r-- | misc/tmux/patches/patch-client.c | 55 | ||||
| -rw-r--r-- | misc/tmux/patches/patch-osdep-darwin.c | 28 | ||||
| -rw-r--r-- | misc/tmux/patches/patch-utf8.c | 16 |
5 files changed, 6 insertions, 109 deletions
diff --git a/misc/tmux/Makefile b/misc/tmux/Makefile index b0127092108..9051a013629 100644 --- a/misc/tmux/Makefile +++ b/misc/tmux/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.24 2014/02/12 23:18:16 tron Exp $ +# $NetBSD: Makefile,v 1.25 2014/02/22 14:41:57 wiz Exp $ -DISTNAME= tmux-1.8 -PKGREVISION= 2 +DISTNAME= tmux-1.9 CATEGORIES= misc MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=tmux/} diff --git a/misc/tmux/distinfo b/misc/tmux/distinfo index f67a3c5c494..63f5f5447bc 100644 --- a/misc/tmux/distinfo +++ b/misc/tmux/distinfo @@ -1,9 +1,6 @@ -$NetBSD: distinfo,v 1.23 2013/10/06 09:01:41 obache Exp $ +$NetBSD: distinfo,v 1.24 2014/02/22 14:41:57 wiz Exp $ -SHA1 (tmux-1.8.tar.gz) = 08677ea914e1973ce605b0008919717184cbd033 -RMD160 (tmux-1.8.tar.gz) = b267ab54f6f55292fa1fa9cd0e892bfd5fd27cfb -Size (tmux-1.8.tar.gz) = 417537 bytes -SHA1 (patch-client.c) = e37053d721bd26d31783af883a7d1f6870095325 -SHA1 (patch-osdep-darwin.c) = 259230c4437364fc3c956f2ab1429316e697d228 +SHA1 (tmux-1.9.tar.gz) = 43197e69716a0430a9e856c13df8ceae31783078 +RMD160 (tmux-1.9.tar.gz) = 2907b50214ad26ada43d05c8db8032af5fb83acf +Size (tmux-1.9.tar.gz) = 447027 bytes SHA1 (patch-server-client.c) = 1cd724559d5cac935b4bbb1d02a7927ae54ae3fc -SHA1 (patch-utf8.c) = d1703d90131f32eef8688f6255e84a315fccfa1d diff --git a/misc/tmux/patches/patch-client.c b/misc/tmux/patches/patch-client.c deleted file mode 100644 index 0d127013c93..00000000000 --- a/misc/tmux/patches/patch-client.c +++ /dev/null @@ -1,55 +0,0 @@ -$NetBSD: patch-client.c,v 1.1 2013/01/08 12:36:07 jperkin Exp $ - -Add Solaris compatability. - ---- client.c.orig 2012-10-11 16:51:06.000000000 +0000 -+++ client.c 2013-01-08 12:21:54.006769094 +0000 -@@ -74,16 +74,32 @@ - client_get_lock(char *lockfile) - { - int lockfd; -+#ifdef __sun -+ struct flock lock; -+ lock.l_type= F_WRLCK; -+ lock.l_whence= SEEK_SET; -+ lock.l_start= 0; -+ lock.l_len= 0; -+#endif - - if ((lockfd = open(lockfile, O_WRONLY|O_CREAT, 0600)) == -1) - fatal("open failed"); - -+#ifdef __sun -+ if (fcntl(lockfd, F_SETLK, &lock) == -1) { -+ while (fcntl(lockfd, F_SETLKW, &lock) == -1 && errno == EINTR) -+ /* nothing */; -+ close(lockfd); -+ return(-1); -+ } -+#else - if (flock(lockfd, LOCK_EX|LOCK_NB) == -1 && errno == EWOULDBLOCK) { - while (flock(lockfd, LOCK_EX) == -1 && errno == EINTR) - /* nothing */; - close(lockfd); - return (-1); - } -+#endif - - return (lockfd); - } -@@ -243,7 +259,15 @@ - strerror(errno)); - return (1); - } -+#ifdef __sun -+ tio.c_iflag &= ~(IMAXBEL|IGNBRK|BRKINT|PARMRK|ISTRIP|INLCR|IGNCR|ICRNL|IXON); -+ tio.c_oflag &= ~OPOST; -+ tio.c_lflag &= ~(ECHO|ECHONL|ICANON|ISIG|IEXTEN); -+ tio.c_cflag &= ~(CSIZE|PARENB); -+ tio.c_cflag |= CS8; -+#else - cfmakeraw(&tio); -+#endif - tio.c_iflag = ICRNL|IXANY; - tio.c_oflag = OPOST|ONLCR; - #ifdef NOKERNINFO diff --git a/misc/tmux/patches/patch-osdep-darwin.c b/misc/tmux/patches/patch-osdep-darwin.c deleted file mode 100644 index 4b8dd5facbd..00000000000 --- a/misc/tmux/patches/patch-osdep-darwin.c +++ /dev/null @@ -1,28 +0,0 @@ -$NetBSD: patch-osdep-darwin.c,v 1.1 2013/04/07 04:00:40 schmonz Exp $ - -Fix build on OS X 10.6.8, from <https://trac.macports.org/ticket/38588>. - ---- osdep-darwin.c.orig 2013-02-24 12:42:49.000000000 +0000 -+++ osdep-darwin.c -@@ -33,17 +33,17 @@ struct event_base *osdep_event_init(void - char * - osdep_get_name(int fd, unused char *tty) - { -- struct proc_bsdshortinfo bsdinfo; -+ struct proc_bsdinfo bsdinfo; - pid_t pgrp; - int ret; - - if ((pgrp = tcgetpgrp(fd)) == -1) - return (NULL); - -- ret = proc_pidinfo(pgrp, PROC_PIDT_SHORTBSDINFO, 0, -+ ret = proc_pidinfo(pgrp, PROC_PIDTBSDINFO, 0, - &bsdinfo, sizeof bsdinfo); -- if (ret == sizeof bsdinfo && *bsdinfo.pbsi_comm != '\0') -- return (strdup(bsdinfo.pbsi_comm)); -+ if (ret == sizeof bsdinfo && *bsdinfo.pbi_comm != '\0') -+ return (strdup(bsdinfo.pbi_comm)); - return (NULL); - } - diff --git a/misc/tmux/patches/patch-utf8.c b/misc/tmux/patches/patch-utf8.c deleted file mode 100644 index 3c8c64fcfda..00000000000 --- a/misc/tmux/patches/patch-utf8.c +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-utf8.c,v 1.1 2013/05/08 18:03:44 minskim Exp $ - -Remove some Korean characters from the zero-width list. -(http://sourceforge.net/p/tmux/tickets/41/) - ---- utf8.c.orig 2013-02-10 16:20:15.000000000 +0000 -+++ utf8.c -@@ -173,7 +173,7 @@ struct utf8_width_entry utf8_width_table - { 0x30000, 0x3fffd, 2, NULL, NULL }, - { 0x00711, 0x00711, 0, NULL, NULL }, - { 0x0fe00, 0x0fe0f, 0, NULL, NULL }, -- { 0x01160, 0x011ff, 0, NULL, NULL }, -+ { 0x01160, 0x011ff, 1, NULL, NULL }, - { 0x0180b, 0x0180d, 0, NULL, NULL }, - { 0x10a3f, 0x10a3f, 0, NULL, NULL }, - { 0x00981, 0x00981, 0, NULL, NULL }, |