--- a/.hgignore Sat Nov 16 17:36:17 2013 +0000
+++ b/.hgignore Sat Nov 16 18:43:16 2013 +0000
@@ -30,6 +30,7 @@
components/sic_team/java-jss/mozilla*
components/sic_team/mozilla-nspr/nspr-*
components/sic_team/mozilla-nss/nss-*
+components/tmux/tmux-1.8*
i386*
tools/python/pkglint/__init__.pyc
tools/python/pkglint/userland.pyc
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/tmux/Makefile Sat Nov 16 18:43:16 2013 +0000
@@ -0,0 +1,37 @@
+#
+# This file and its contents are supplied under the terms of the
+# Common Development and Distribution License ("CDDL)". You may
+# only use this file in accordance with the terms of the CDDL.
+#
+# A full copy of the text of the CDDL should have accompanied this
+# source. A copy of the CDDL is also available via the Internet at
+# http://www.illumos.org/license/CDDL.
+#
+
+#
+# Copyright 2011, 2013, EveryCity Ltd. All rights reserved.
+#
+
+include ../../make-rules/shared-macros.mk
+
+COMPONENT_NAME= tmux
+COMPONENT_VERSION= 1.8
+COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION)
+COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.gz
+COMPONENT_ARCHIVE_HASH= sha256:f265401ca890f8223e09149fcea5abcd6dfe75d597ab106e172b01e9d0c9cd44
+COMPONENT_ARCHIVE_URL= http://downloads.sourceforge.net/$(COMPONENT_NAME)/$(COMPONENT_ARCHIVE)
+
+include ../../make-rules/prep.mk
+include ../../make-rules/configure.mk
+include ../../make-rules/ips.mk
+
+COMPILER = gcc
+
+CONFIGURE_OPTIONS += CFLAGS="$(CFLAGS)"
+CONFIGURE_OPTIONS += CXXFLAGS="$(CXXFLAGS)"
+
+build: $(BUILD_32)
+
+install: $(INSTALL_32)
+
+include ../../make-rules/depend.mk
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/tmux/patches/client.c.patch Sat Nov 16 18:43:16 2013 +0000
@@ -0,0 +1,29 @@
+--- tmux-1.8/client.c.~1~ 2013-03-17 14:03:37.000000000 +0000
++++ tmux-1.8/client.c 2013-06-07 13:31:23.282270747 +0100
+@@ -78,8 +78,8 @@
+ if ((lockfd = open(lockfile, O_WRONLY|O_CREAT, 0600)) == -1)
+ fatal("open failed");
+
+- if (flock(lockfd, LOCK_EX|LOCK_NB) == -1 && errno == EWOULDBLOCK) {
+- while (flock(lockfd, LOCK_EX) == -1 && errno == EINTR)
++ if (lockf(lockfd, F_TLOCK, 0) == -1 && errno == EAGAIN) {
++ while (lockf(lockfd, F_LOCK, 0) == -1 && errno == EINTR)
+ /* nothing */;
+ close(lockfd);
+ return (-1);
+@@ -244,7 +244,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
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/tmux/patches/errno.h.patch Sat Nov 16 18:43:16 2013 +0000
@@ -0,0 +1,13 @@
+--- tmux-1.8/server-client.c.orig 2013-06-07 13:26:07.138580151 +0100
++++ tmux-1.8/server-client.c 2013-06-07 13:26:30.782621611 +0100
+@@ -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 *);
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/tmux/patches/remove_xopen.patch Sat Nov 16 18:43:16 2013 +0000
@@ -0,0 +1,11 @@
+--- tmux-1.5/configure.old 2011-07-09 17:12:35.000000000 +0100
++++ tmux-1.5/configure 2011-08-23 17:13:39.706752362 +0100
+@@ -4986,7 +4986,7 @@
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $found_cmsg_data" >&5
+ $as_echo "$found_cmsg_data" >&6; }
+ if test "x$found_cmsg_data" = xyes; then
+- XOPEN_DEFINES="-D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED"
++ XOPEN_DEFINES="" #-xc99 -D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED"
+ else
+ as_fn_error "\"CMSG_DATA not found\"" "$LINENO" 5
+ fi
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/tmux/tmux.license Sat Nov 16 18:43:16 2013 +0000
@@ -0,0 +1,15 @@
+/*
+ * Copyright (c) 2007 Nicholas Marriott <[email protected]>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER
+ * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/tmux/tmux.p5m Sat Nov 16 18:43:16 2013 +0000
@@ -0,0 +1,31 @@
+#
+# This file and its contents are supplied under the terms of the
+# Common Development and Distribution License ("CDDL)". You may
+# only use this file in accordance with the terms of the CDDL.
+#
+# A full copy of the text of the CDDL should have accompanied this
+# source. A copy of the CDDL is also available via the Internet at
+# http://www.illumos.org/license/CDDL.
+#
+
+#
+# Copyright 2011, 2013, EveryCity Ltd. All rights reserved.
+#
+
+<transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
+
+set name=pkg.fmri value=pkg:/terminal/tmux@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary value="tmux terminal multiplexer"
+set name=info.upstream-url value="http://tmux.sourceforge.net/"
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=variant.arch value=$(MACH)
+
+license tmux.license license="BSD"
+
+dir path=usr
+dir path=usr/bin
+dir path=usr/share
+dir path=usr/share/man
+dir path=usr/share/man/man1
+file path=usr/bin/tmux
+file path=usr/share/man/man1/tmux.1