Import of pkgsrc-2014Q1
This commit is contained in:
@@ -1,7 +1,6 @@
|
||||
# $NetBSD: Makefile,v 1.23 2013/05/08 18:03:44 minskim Exp $
|
||||
# $NetBSD: Makefile,v 1.26 2014/02/22 23:32:30 wiz Exp $
|
||||
|
||||
DISTNAME= tmux-1.8
|
||||
PKGREVISION= 1
|
||||
DISTNAME= tmux-1.9a
|
||||
CATEGORIES= misc
|
||||
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=tmux/}
|
||||
|
||||
|
||||
@@ -1,9 +1,7 @@
|
||||
$NetBSD: distinfo,v 1.22 2013/05/08 18:03:44 minskim Exp $
|
||||
$NetBSD: distinfo,v 1.26 2014/02/27 15:56:53 hauke 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 (patch-server-client.c) = 6c8dd82e2dc1965b8c8f9a8808a262366c80d6b4
|
||||
SHA1 (patch-utf8.c) = d1703d90131f32eef8688f6255e84a315fccfa1d
|
||||
SHA1 (tmux-1.9a.tar.gz) = 815264268e63c6c85fe8784e06a840883fcfc6a2
|
||||
RMD160 (tmux-1.9a.tar.gz) = 29ae5f12aa71ee800643fb2df23573bee83f5965
|
||||
Size (tmux-1.9a.tar.gz) = 447938 bytes
|
||||
SHA1 (patch-Makefile.in) = b902156666e515e6c763eee6ffde8ba2ff4c7f98
|
||||
SHA1 (patch-server-client.c) = 1cd724559d5cac935b4bbb1d02a7927ae54ae3fc
|
||||
|
||||
19
misc/tmux/patches/patch-Makefile.in
Normal file
19
misc/tmux/patches/patch-Makefile.in
Normal file
@@ -0,0 +1,19 @@
|
||||
$NetBSD: patch-Makefile.in,v 1.1 2014/02/27 15:56:54 hauke 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 2014-02-22 20:56:13.000000000 +0000
|
||||
+++ Makefile.in
|
||||
@@ -1221,8 +1221,8 @@ install-exec-hook:
|
||||
sed -e "s|@SYSCONFDIR@|$(sysconfdir)|g" $(srcdir)/tmux.1 \
|
||||
>$(srcdir)/tmux.1.mdoc; \
|
||||
else \
|
||||
- sed -e "s|@SYSCONFDIR@|$(sysconfdir)|g" $(srcdir)/tmux.1| \
|
||||
- $(AWK) -fmdoc2man.awk >$(srcdir)/tmux.1.man; \
|
||||
+ sed -e "s|@SYSCONFDIR@|$(sysconfdir)|g" $(srcdir)/tmux.1 | \
|
||||
+ $(AWK) -f mdoc2man.awk >$(srcdir)/tmux.1.man; \
|
||||
fi
|
||||
$(MKDIR_P) $(DESTDIR)$(mandir)/man1
|
||||
$(INSTALL_DATA) $(srcdir)/tmux.1.@MANFORMAT@ \
|
||||
@@ -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
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
@@ -1,10 +1,11 @@
|
||||
$NetBSD: patch-server-client.c,v 1.1 2013/04/02 10:59:50 fhajny Exp $
|
||||
$NetBSD: patch-server-client.c,v 1.2 2013/10/06 09:01:41 obache Exp $
|
||||
|
||||
SunOS errno support needs the right include.
|
||||
* SunOS errno support needs the right include.
|
||||
* timersub is missing on Solaris10
|
||||
|
||||
--- server-client.c.orig 2013-04-02 10:54:02.404886167 +0000
|
||||
--- server-client.c.orig 2013-03-26 19:22:31.000000000 +0000
|
||||
+++ server-client.c
|
||||
@@ -26,6 +26,10 @@
|
||||
@@ -26,8 +26,24 @@
|
||||
#include <time.h>
|
||||
#include <unistd.h>
|
||||
|
||||
@@ -14,4 +15,18 @@ SunOS errno support needs the right include.
|
||||
+
|
||||
#include "tmux.h"
|
||||
|
||||
+#ifndef timersub
|
||||
+# define timersub(a, b, result) \
|
||||
+ do { \
|
||||
+ (result)->tv_sec = (a)->tv_sec - (b)->tv_sec; \
|
||||
+ (result)->tv_usec = (a)->tv_usec - (b)->tv_usec; \
|
||||
+ if ((result)->tv_usec < 0) { \
|
||||
+ --(result)->tv_sec; \
|
||||
+ (result)->tv_usec += 1000000; \
|
||||
+ } \
|
||||
+ } 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 *);
|
||||
|
||||
@@ -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 },
|
||||
Reference in New Issue
Block a user