Update to 1.3. Tested on NetBSD-current/amd64 and Mac OS X 10.6.

CHANGES FROM 1.2 TO 1.3, 18 July 2010

* New input parser.
* Flags to move through panes -UDLR added to select-pane.
* Commands up-pane, and down-pane removed, since equivalent behaviour is now
  available through the target flag (-t:+ and -t:-).
* Jump-forward/backward in copy move (based on vi's F, and f commands).
* Make paste-buffer accept a pane as a target.
* Flag -a added to new-window to insert a window after an existing one, moving
  windows up if necessary.
* Merge more mode into copy mode.
* Run job commands explicitly in the global environment (which can be modified
  with setenv -g), rather than with the environment tmux started with.
* Use the machine's hostname as the default title, instead of an empty string.
* Prevent double free if the window option remain-on-exit is set.
* Key string conversions rewritten.
* Mark zombie windows as dead in the choose-window list.
* Tiled layout added.
* Signal handling reworked.
* Reset SIGCHLD after fork to fix problems with some shells.
* Select-prompt command removed. Therefore, bound ' to command-prompt -p index
  "select-window -t:%%" by default.
* Catch SIGHUP and terminate if running as a client, thus avoiding clients from
  being left hanging around when, for instance, a SSH session is disconnected.
* Solaris 9 fixes (such as adding compat {get,set}env(3) code).
* Accept none instead of default for attributes.
* Window options window-status-alert-{alert,bg,fg} added.
* Flag -s added to the paste-buffer command to specify a custom separator.
* Allow dragging to make a selection in copy mode if the mode-mouse option is
  set.
* Support the mouse scroll wheel.
* Make pipe-pane accept special character sequences (eg #I).
* Fix problems with window sizing when starting tmux from .xinitrc.
* Give tmux sockets (but not the containing folder) group permissions.
* Extend the target flags (ie -t) to accept an offset (for example -t:+2), and
  make it wrap windows, and panes.
* New command choose-buffer added.
* New server option detach-on-destroy to set what happens to a client when the
  session it is attached to is destroyed. If on (default), the client is
  detached. Otherwise, the client is switched to the most recently active of
  the remaining sessions.
* The commands load-buffer, and save-buffer now accept a dash (-) as the file
  to read from stdin, or write to stdout.
* Custom layouts added.
* Additional code reduction, bug fixes, and manpage enhancements.

CHANGES FROM 1.1 TO 1.2, 10 March 2010

* Switch to libevent.
* Emulate the ri (reverse index) capability, ergo allowing tmux to at least
  start on Sun consoles (TERM=sun, or sun-color).
* Assign each entry a number, or lowercase letter in choose mode, and accept
  that as a shortcut key.
* Permit top-bit-set characters to be entered in the status line.
* Mark no-prefix keys with (no prefix), rather than [] in list-keys.
* New command show-messages (alias showmsgs), and new session option
  message-limit, to show a per-client log of status lines messages up to the
  number defined by message-limit.
* Do not interpret #() for display-message to avoid leaking commands.
* New window options window-status-format, and window-status-current-format to
  control the format of each window in the status line.
* Add a -p flag to display-message to print the output, instead of displaying
  it in the status line.
* Emulate il1, dl1, ich1 to run with vt100 feature set.
* New command capture-pane (alias capturep) to copy the entire pane contents
  to a paste buffer.
* Avoid duplicating code by adding a -w flag to set-option, and show-options to
  set, and show window options. The commands set-window-option, and
  show-window-options are now aliases.
* Panes can now be referred to as top, bottom, top-left, etc.
* Add server-wide options, which can be set with set-option -s, and shown with
  show-options -s.
* New server option quiet (like -q from the command line).
* New server option escape-time to set the timeout used to detect if escapes
  are alone, part of a function key, or meta sequence.
* New session options pane-active-border-bg, pane-active-border-fg,
  pane-border-bg, and pane-border-fg to set pane colours.
* Make split-window accept a pane target, instead of a window.
* New command join-pane (alias joinp) to split, and move an existing pane into
  the space (the opposite of break-pane), thus simplifying calls to
  split-window, followed by move-window.
* Permit S- prefix on keys for shift when the terminal/terminfo supports them.
* Window targets (-t flag) can now refer to the last window (!), next (+), and
  previous (-) window by number.
* Mode keys to jump to the bottom/top of history, end of the next word, scroll
  up/down, and reverse search in copy mode.
* New session option display-panes-active-colour to display the active pane in
  a different colour with the display-panes command.
* Read the socket path from $TMUX if it's present, and -L, and -S are not
  given.
* Vi-style mode keys B, W, and E to navigate between words in copy mode.
* Start in more mode when configuration file errors are detected.
* Rectangle copy support added.
* If attach-session was specified with the -r flag, make the client read-only.
* Per-window alternate-screen option.
* Make load-buffer work with FIFOs.
* New window option word-separators to set the characters considered as word
  separators in copy mode.
* Permit keys in copy mode to be prefixed by a repeat count, entered with [1-9]
  in vi mode, or M-[1-9] in emacs mode.
* utf8 improvements.
* As usual, additional code reduction, bug fixes, and manpage enhancements.

4 files changed, 13 insertions, 36 deletions

diff --git a/misc/tmux/Makefile b/misc/tmux/Makefile
index a64af627883..646df6ed9b3 100644
--- a/misc/tmux/Makefile
+++ b/misc/tmux/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.9 2010/02/23 10:56:04 drochner Exp $
+# $NetBSD: Makefile,v 1.10 2010/12/21 12:55:54 jmmv Exp $
 
-DISTNAME=	tmux-1.1
-PKGREVISION=	1
+DISTNAME=	tmux-1.3
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=tmux/}
 
@@ -15,5 +14,6 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 HAS_CONFIGURE=	yes
 USE_TERMINFO=	yes
 
+.include "../../devel/libevent/buildlink3.mk"
 .include "../../devel/ncurses/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/tmux/distinfo b/misc/tmux/distinfo
index 8d69507472d..31e3cb5f686 100644
--- a/misc/tmux/distinfo
+++ b/misc/tmux/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.10 2010/02/22 19:07:41 drochner Exp $
+$NetBSD: distinfo,v 1.11 2010/12/21 12:55:54 jmmv Exp $
 
-SHA1 (tmux-1.1.tar.gz) = 8dc57a70605930bbe61664bd52ed2c8081ea5a1c
-RMD160 (tmux-1.1.tar.gz) = 9f03922c0be46e9259202ed2fdc0834dcf01581c
-Size (tmux-1.1.tar.gz) = 230955 bytes
+SHA1 (tmux-1.3.tar.gz) = 4d132a5fa25ef049e023f154824f39b0d7e72ab0
+RMD160 (tmux-1.3.tar.gz) = 7c895562c7810117d610c420901110c7e206bebf
+Size (tmux-1.3.tar.gz) = 251999 bytes
 SHA1 (patch-aa) = e50976effc9fa43044d45055aabd86a69d9d9047
-SHA1 (patch-ab) = 8309eeec1f1ea1222b52fcd6940b9d49feb9e94c
-SHA1 (patch-ac) = e308390602756b03197715de648710ea6441f348
+SHA1 (patch-ab) = b47bc0846aa8b732d3600e9917011d8e79311408
diff --git a/misc/tmux/patches/patch-ab b/misc/tmux/patches/patch-ab
index 7aa1735e3ee..19c9554cced 100644
--- a/misc/tmux/patches/patch-ab
+++ b/misc/tmux/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.6 2010/02/22 19:07:42 drochner Exp $
+$NetBSD: patch-ab,v 1.7 2010/12/21 12:55:55 jmmv Exp $
 
---- configure.orig	2009-10-25 22:09:56.000000000 +0000
+--- configure.orig	2010-06-06 13:00:47.000000000 +0000
 +++ configure
-@@ -200,7 +200,7 @@ SRCS+= osdep-darwin.c \
+@@ -205,7 +205,7 @@ SRCS+= osdep-darwin.c \
  EOF
  	;;
  # ------------------------------------------------------------------------------
@@ -10,8 +10,8 @@ $NetBSD: patch-ab,v 1.6 2010/02/22 19:07:42 drochner Exp $
 +    FreeBSD)
  	cat <<EOF >>$CONFIG_H
  #define HAVE_ASPRINTF
- #define HAVE_BZERO
-@@ -230,6 +230,38 @@ SRCS+= osdep-freebsd.c \
+ #define HAVE_BROKEN_KQUEUE
+@@ -236,6 +236,38 @@ SRCS+= osdep-freebsd.c \
  EOF
  	;;
  # ------------------------------------------------------------------------------
@@ -50,12 +50,3 @@ $NetBSD: patch-ab,v 1.6 2010/02/22 19:07:42 drochner Exp $
      NetBSD)
  	cat <<EOF >>$CONFIG_H
  #define HAVE_ASPRINTF
-@@ -252,7 +284,7 @@ EOF
- 	cat <<EOF >>$CONFIG_MK
- CPPFLAGS+= -I/usr/pkg/include
- LDFLAGS+= -L/usr/pkg/lib
--LIBS+= -lncurses -lcrypt -lutil
-+LIBS+= -lcurses -lcrypt -lutil
- SRCS+= osdep-netbsd.c \
- 	compat/strtonum.c \
- 	compat/vis.c \
diff --git a/misc/tmux/patches/patch-ac b/misc/tmux/patches/patch-ac
deleted file mode 100644
index 7f365312add..00000000000
--- a/misc/tmux/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.5 2009/09/25 16:38:22 hasso Exp $
-
---- tty-term.c.orig	2009-09-24 15:58:21.000000000 +0200
-+++ tty-term.c
-@@ -18,7 +18,7 @@
- 
- #include <sys/types.h>
- 
--#include <curses.h>
-+#include <ncurses.h>
- #include <fnmatch.h>
- #include <stdlib.h>
- #include <string.h>