Update to 0.9, thanks to Adrian Portelli. Changes since 0.8:

* Major changes to build infrastructure: cleanup of makefiles and addition
  of a configure script.
* monitor-content window option to monitor a window for a specific fnmatch(3)
  pattern. The find-window command also now accepts fnmatch(3) patterns.
* previous-layout and select-layout commands, and a main-horizontal layout.
* Recreate the server socket on SIGUSR1.
* clear-history command.
* Use ACS line drawing characters for pane separator lines.
* UTF-8 improvements, and code to detect UTF-8 support by looking at
  environment variables.
* The resize-pane-up and resize-pane-down commands are now merged together
  into a new resize-pane command with -U and -D flags.
* confirm-before command to request a yes/no answer before executing dangerous
  commands.
* Status line bug fixes, support for UTF-8 (status-utf8 option), and a key to
  paste from the paste buffer.
* Support for some additional escape sequences and terminal features, including
  better support for insert mode and tab stops.
* Improved window resizing behaviour, modelled after xterm.
* Some code reduction and a number of miscellaneous bug fixes.

5 files changed, 62 insertions, 89 deletions

diff --git a/misc/tmux/Makefile b/misc/tmux/Makefile
index ba94a8af419..5facebda042 100644
--- a/misc/tmux/Makefile
+++ b/misc/tmux/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.4 2009/06/08 19:26:29 hasso Exp $
+# $NetBSD: Makefile,v 1.5 2009/07/08 20:59:11 hasso Exp $
 
-DISTNAME=	tmux-0.8
+DISTNAME=	tmux-0.9
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=tmux/}
 
@@ -11,7 +11,7 @@ LICENSE=	modified-bsd
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-NO_CONFIGURE=	yes
+HAS_CONFIGURE=	yes
 USE_NCURSES=	yes
 
 .include "../../devel/ncurses/buildlink3.mk"
diff --git a/misc/tmux/distinfo b/misc/tmux/distinfo
index 5d7621b6fa2..cb480794e10 100644
--- a/misc/tmux/distinfo
+++ b/misc/tmux/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.5 2009/06/04 21:49:18 minskim Exp $
+$NetBSD: distinfo,v 1.6 2009/07/08 20:59:11 hasso Exp $
 
-SHA1 (tmux-0.8.tar.gz) = 87a9db829ff36cc432114672f7354a74d673832b
-RMD160 (tmux-0.8.tar.gz) = 81f828e0af59a994e0b4ba86ab17421ffd7d7e98
-Size (tmux-0.8.tar.gz) = 175515 bytes
-SHA1 (patch-aa) = c634803fb173803ee7470eb29ad13eb0cb287a17
-SHA1 (patch-ab) = 713c4beb17bf2a250fdd26e458d8621c1bfb2c79
-SHA1 (patch-ac) = d99a96c138d4aea84f8d78ff947d6e5411fc0ecf
+SHA1 (tmux-0.9.tar.gz) = b00283291b642c8db654bee78fcf5453ba248c66
+RMD160 (tmux-0.9.tar.gz) = 9847514485d2ad0f948def777fa8a2abd99cf34b
+Size (tmux-0.9.tar.gz) = 179064 bytes
+SHA1 (patch-aa) = e50976effc9fa43044d45055aabd86a69d9d9047
+SHA1 (patch-ab) = 61f6c2b8478c563adaa3def1466ea7d98f8d83c5
diff --git a/misc/tmux/patches/patch-aa b/misc/tmux/patches/patch-aa
index f44622a7f8b..30ab3abfd8c 100644
--- a/misc/tmux/patches/patch-aa
+++ b/misc/tmux/patches/patch-aa
@@ -1,60 +1,16 @@
-$NetBSD: patch-aa,v 1.5 2009/06/04 21:49:18 minskim Exp $
+$NetBSD: patch-aa,v 1.6 2009/07/08 20:59:11 hasso Exp $
 
---- Makefile.orig	2009-04-21 13:10:22.000000000 -0700
+--- Makefile.orig	2009-07-04 00:42:13.000000000 +0100
 +++ Makefile
-@@ -79,7 +79,18 @@ LDFLAGS+= -L/usr/local/lib
- .ifdef PROFILE
- LDFLAGS+= -pg
- .endif
--LIBS+= -lutil -lncurses
-+.if ${OS} == "SunOS"
-+LIBS+= -lsocket -lnsl
-+.else
-+LIBS+= -lutil
-+.endif
-+LIBS+= -lncurses
-+
-+# Darwin
-+.if ${OS} == "Darwin"
-+SRCS+= compat/strtonum.c compat/vis.c
-+CFLAGS+= -DNO_SETPROCTITLE -DNO_STRTONUM -DNO_QUEUE_H -DNO_TREE_H
-+.endif
- 
- # FreeBSD and DragonFly
- .if ${OS} == "FreeBSD" || ${OS} == "DragonFly"
-@@ -91,10 +102,21 @@ LIBS+= -lcrypt
- 
- # NetBSD
- .if ${OS} == "NetBSD"
--INCDIRS= -Icompat
-+INCDIRS+= -Icompat
- SRCS+= compat/strtonum.c compat/vis.c
- LIBS+= -lcrypt
--CFLAGS+=-DNO_STRTONUM
-+CFLAGS+=-DNO_STRTONUM -DNO_QUEUE_H -DNO_TREE_H
-+.endif
-+
-+# SunOS
-+.if ${OS} == "SunOS"
-+INCDIRS+= -Icompat
-+SRCS+= compat/asprintf.c compat/daemon.c compat/fgetln.c \
-+	compat/forkpty-sunos.c compat/getopt_long.c compat/strtonum.c \
-+	compat/vis.c
-+CFLAGS+= -DNO_ASPRINTF -DNO_CDEFS_H -DNO_DAEMON -DNO_FGETLN -DNO_FORKPTY \
-+	-DNO_PATHS_H -DNO_PROGNAME -DNO_QUEUE_H -DNO_SETPROCTITLE \
-+	-DNO_STRTONUM -DNO_TREE_H
- .endif
- 
- OBJS= ${SRCS:S/.c/.o/:S/.y/.o/}
-@@ -152,7 +174,7 @@ update-index.html:
- 		sed "s/%%VERSION%%/${VERSION}/g" index.html.in >index.html
+@@ -56,7 +56,7 @@ clean-all:	clean
+ 		rm -f config.h config.mk
  
  install:	all
 -		${INSTALLDIR} ${DESTDIR}${PREFIX}/bin
--		${INSTALLBIN} ${PROG} ${DESTDIR}${PREFIX}/bin/
+-		${INSTALLBIN} tmux ${DESTDIR}${PREFIX}/bin/
 -		${INSTALLDIR} ${DESTDIR}${PREFIX}/man/man1
--		${INSTALLMAN} ${PROG}.1 ${DESTDIR}${PREFIX}/man/man1/
+-		${INSTALLMAN} tmux.1 ${DESTDIR}${PREFIX}/man/man1/
 +		${BSD_INSTALL_PROGRAM_DIR} ${DESTDIR}${PREFIX}/bin
-+		${BSD_INSTALL_PROGRAM} ${PROG} ${DESTDIR}${PREFIX}/bin/
++		${BSD_INSTALL_PROGRAM} tmux ${DESTDIR}${PREFIX}/bin/
 +		${BSD_INSTALL_MAN_DIR} ${DESTDIR}${PREFIX}/man/man1
-+		${BSD_INSTALL_MAN} ${PROG}.1 ${DESTDIR}${PREFIX}/man/man1/
++		${BSD_INSTALL_MAN} tmux.1 ${DESTDIR}${PREFIX}/man/man1/
diff --git a/misc/tmux/patches/patch-ab b/misc/tmux/patches/patch-ab
index 74051aa6383..17691ed1922 100644
--- a/misc/tmux/patches/patch-ab
+++ b/misc/tmux/patches/patch-ab
@@ -1,14 +1,46 @@
-$NetBSD: patch-ab,v 1.3 2009/06/04 21:49:18 minskim Exp $
+$NetBSD: patch-ab,v 1.4 2009/07/08 20:59:11 hasso Exp $
 
---- compat/getopt.h.orig	2009-03-31 21:21:36.000000000 +0000
-+++ compat/getopt.h
-@@ -33,7 +33,9 @@
- #ifndef _GETOPT_H_
- #define _GETOPT_H_
- 
-+#ifndef NO_CDEFS_H
- #include <sys/cdefs.h>
-+#endif
- 
- /*
-  * GNU-like getopt_long() and 4.4BSD getsubopt()/optreset extensions
+--- configure.orig	2009-07-08 23:25:25 +0300
++++ configure	2009-07-08 23:27:03 +0300
+@@ -157,7 +157,7 @@ SRCS+= osdep-darwin.c \
+ EOF
+ 	;;
+ # ------------------------------------------------------------------------------
+-    FreeBSD|DragonFly)
++    FreeBSD)
+ 	cat <<EOF >>$CONFIG_H
+ #define HAVE_ASPRINTF
+ #define HAVE_DAEMON
+@@ -180,6 +180,32 @@ SRCS+= osdep-freebsd.c \
+ LIBS+= -lcrypt -lutil
+ EOF
+ 	;;
++
++# ------------------------------------------------------------------------------
++    DragonFly)
++	cat <<EOF >>$CONFIG_H
++#define HAVE_ASPRINTF
++#define HAVE_DAEMON
++#define HAVE_FGETLN
++#define HAVE_FORKPTY
++#define HAVE_GETOPT
++#define HAVE_LIBUTIL_H
++#define HAVE_PATHS_H
++#define HAVE_POLL
++#define HAVE_PROGNAME
++#define HAVE_SETPROCTITLE
++#define HAVE_STRCASESTR
++#define HAVE_STRLCAT
++#define HAVE_STRLCPY
++#define HAVE_STRTONUM
++EOF
++	cat <<EOF >>$CONFIG_MK
++SRCS+= osdep-unknown.c \
++	compat/vis.c
++LIBS+= -lcrypt -lutil
++EOF
++	;;
++
+ # ------------------------------------------------------------------------------
+     NetBSD)
+ 	cat <<EOF >>$CONFIG_H
diff --git a/misc/tmux/patches/patch-ac b/misc/tmux/patches/patch-ac
deleted file mode 100644
index effc5a6268b..00000000000
--- a/misc/tmux/patches/patch-ac
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ac,v 1.3 2009/06/04 21:49:18 minskim Exp $
-
---- compat/vis.h.orig	2009-03-31 21:21:28.000000000 +0000
-+++ compat/vis.h
-@@ -71,7 +71,9 @@
-  */
- #define	UNVIS_END	1	/* no more characters */
- 
-+#ifndef NO_CDEFS_H
- #include <sys/cdefs.h>
-+#endif
- 
- char	*vis(char *, int, int, int);
- int	strvis(char *, const char *, int);