Import of pkgsrc-2013Q2

misc/tmux/DESCR

@@ -0,0 +1,4 @@
+Tmux is a "terminal multiplexer", it enables a number of terminals
+(or windows) to be accessed and controlled from a single terminal.
+Tmux is intended to be a simple, modern, BSD-licensed alternative
+to programs such as GNU screen.

misc/tmux/Makefile

@@ -0,0 +1,26 @@
+# $NetBSD: Makefile,v 1.23 2013/05/08 18:03:44 minskim Exp $
+
+DISTNAME=	tmux-1.8
+PKGREVISION=	1
+CATEGORIES=	misc
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=tmux/}
+
+MAINTAINER=	pkgsrc-users@NetBSD.org
+HOMEPAGE=	http://tmux.sourceforge.net/
+COMMENT=	BSD-licensed terminal multiplexer (GNU Screen alternative)
+LICENSE=	modified-bsd
+
+GNU_CONFIGURE=	yes
+USE_TERMINFO=	yes
+
+.include "../../mk/bsd.prefs.mk"
+.include "../../mk/compiler.mk"
+.if !empty(MACHINE_PLATFORM:MSunOS-5.1[0-9]-*) && \
+    !empty(CC_VERSION:Mgcc-4.[6-9].*)
+BUILDLINK_TRANSFORM+=	rename:-D_XPG4_2:-D_XPG6
+.endif
+
+.include "../../devel/libevent/buildlink3.mk"
+BUILDLINK_API_DEPENDS.libevent+=	libevent>=2.0.10
+.include "../../mk/terminfo.buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"

misc/tmux/PLIST

@@ -0,0 +1,3 @@
+@comment $NetBSD: PLIST,v 1.1.1.1 2009/03/06 12:16:17 hasso Exp $
+bin/tmux
+man/man1/tmux.1

misc/tmux/distinfo

@@ -0,0 +1,9 @@
+$NetBSD: distinfo,v 1.22 2013/05/08 18:03:44 minskim 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

misc/tmux/patches/patch-client.c

@@ -0,0 +1,55 @@
+$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

misc/tmux/patches/patch-osdep-darwin.c

@@ -0,0 +1,28 @@
+$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);
+ }
+ 

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

@@ -0,0 +1,17 @@
+$NetBSD: patch-server-client.c,v 1.1 2013/04/02 10:59:50 fhajny Exp $
+
+SunOS errno support needs the right include.
+
+--- server-client.c.orig	2013-04-02 10:54:02.404886167 +0000
++++ server-client.c
+@@ -26,6 +26,10 @@
+ #include <time.h>
+ #include <unistd.h>
+ 
++#ifdef __sun
++#include <errno.h>
++#endif
++
+ #include "tmux.h"
+ 
+ void	server_client_check_focus(struct window_pane *);

misc/tmux/patches/patch-utf8.c

@@ -0,0 +1,16 @@
+$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 },