Wed Jul 8 20:59:12 2009 UTC ()
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.


(hasso)
diff -r1.4 -r1.5 pkgsrc/misc/tmux/Makefile
diff -r1.5 -r1.6 pkgsrc/misc/tmux/distinfo
diff -r1.5 -r1.6 pkgsrc/misc/tmux/patches/patch-aa
diff -r1.3 -r1.4 pkgsrc/misc/tmux/patches/patch-ab
diff -r1.3 -r0 pkgsrc/misc/tmux/patches/patch-ac
cvs diff -r1.4 -r1.5 pkgsrc/misc/tmux/Makefile (expand / switch to unified diff)

--- pkgsrc/misc/tmux/Makefile 2009/06/08 19:26:29 1.4
+++ pkgsrc/misc/tmux/Makefile 2009/07/08 20:59:11 1.5
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1# $NetBSD: Makefile,v 1.4 2009/06/08 19:26:29 hasso Exp $ 1# $NetBSD: Makefile,v 1.5 2009/07/08 20:59:11 hasso Exp $
2 2
3DISTNAME= tmux-0.8 3DISTNAME= tmux-0.9
4CATEGORIES= misc 4CATEGORIES= misc
5MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=tmux/} 5MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=tmux/}
6 6
7MAINTAINER= hasso@NetBSD.org 7MAINTAINER= hasso@NetBSD.org
8HOMEPAGE= http://tmux.sourceforge.net/ 8HOMEPAGE= http://tmux.sourceforge.net/
9COMMENT= BSD-licensed terminal multiplexer (GNU Screen alternative) 9COMMENT= BSD-licensed terminal multiplexer (GNU Screen alternative)
10LICENSE= modified-bsd 10LICENSE= modified-bsd
11 11
12PKG_DESTDIR_SUPPORT= user-destdir 12PKG_DESTDIR_SUPPORT= user-destdir
13 13
14NO_CONFIGURE= yes 14HAS_CONFIGURE= yes
15USE_NCURSES= yes 15USE_NCURSES= yes
16 16
17.include "../../devel/ncurses/buildlink3.mk" 17.include "../../devel/ncurses/buildlink3.mk"
18.include "../../mk/bsd.pkg.mk" 18.include "../../mk/bsd.pkg.mk"
cvs diff -r1.5 -r1.6 pkgsrc/misc/tmux/distinfo (expand / switch to unified diff)

--- pkgsrc/misc/tmux/distinfo 2009/06/04 21:49:18 1.5
+++ pkgsrc/misc/tmux/distinfo 2009/07/08 20:59:11 1.6
@@ -1,8 +1,7 @@ @@ -1,8 +1,7 @@
1$NetBSD: distinfo,v 1.5 2009/06/04 21:49:18 minskim Exp $ 1$NetBSD: distinfo,v 1.6 2009/07/08 20:59:11 hasso Exp $
2 2
3SHA1 (tmux-0.8.tar.gz) = 87a9db829ff36cc432114672f7354a74d673832b 3SHA1 (tmux-0.9.tar.gz) = b00283291b642c8db654bee78fcf5453ba248c66
4RMD160 (tmux-0.8.tar.gz) = 81f828e0af59a994e0b4ba86ab17421ffd7d7e98 4RMD160 (tmux-0.9.tar.gz) = 9847514485d2ad0f948def777fa8a2abd99cf34b
5Size (tmux-0.8.tar.gz) = 175515 bytes 5Size (tmux-0.9.tar.gz) = 179064 bytes
6SHA1 (patch-aa) = c634803fb173803ee7470eb29ad13eb0cb287a17 6SHA1 (patch-aa) = e50976effc9fa43044d45055aabd86a69d9d9047
7SHA1 (patch-ab) = 713c4beb17bf2a250fdd26e458d8621c1bfb2c79 7SHA1 (patch-ab) = 61f6c2b8478c563adaa3def1466ea7d98f8d83c5
8SHA1 (patch-ac) = d99a96c138d4aea84f8d78ff947d6e5411fc0ecf 
cvs diff -r1.5 -r1.6 pkgsrc/misc/tmux/patches/Attic/patch-aa (expand / switch to unified diff)

--- pkgsrc/misc/tmux/patches/Attic/patch-aa 2009/06/04 21:49:18 1.5
+++ pkgsrc/misc/tmux/patches/Attic/patch-aa 2009/07/08 20:59:11 1.6
@@ -1,60 +1,16 @@ @@ -1,60 +1,16 @@
1$NetBSD: patch-aa,v 1.5 2009/06/04 21:49:18 minskim Exp $ 1$NetBSD: patch-aa,v 1.6 2009/07/08 20:59:11 hasso Exp $
2 2
3--- Makefile.orig 2009-04-21 13:10:22.000000000 -0700 3--- Makefile.orig 2009-07-04 00:42:13.000000000 +0100
4+++ Makefile 4+++ Makefile
5@@ -79,7 +79,18 @@ LDFLAGS+= -L/usr/local/lib 5@@ -56,7 +56,7 @@ clean-all: clean
6 .ifdef PROFILE 6 rm -f config.h config.mk
7 LDFLAGS+= -pg 
8 .endif 
9-LIBS+= -lutil -lncurses 
10+.if ${OS} == "SunOS" 
11+LIBS+= -lsocket -lnsl 
12+.else 
13+LIBS+= -lutil 
14+.endif 
15+LIBS+= -lncurses 
16+ 
17+# Darwin 
18+.if ${OS} == "Darwin" 
19+SRCS+= compat/strtonum.c compat/vis.c 
20+CFLAGS+= -DNO_SETPROCTITLE -DNO_STRTONUM -DNO_QUEUE_H -DNO_TREE_H 
21+.endif 
22  
23 # FreeBSD and DragonFly 
24 .if ${OS} == "FreeBSD" || ${OS} == "DragonFly" 
25@@ -91,10 +102,21 @@ LIBS+= -lcrypt 
26  
27 # NetBSD 
28 .if ${OS} == "NetBSD" 
29-INCDIRS= -Icompat 
30+INCDIRS+= -Icompat 
31 SRCS+= compat/strtonum.c compat/vis.c 
32 LIBS+= -lcrypt 
33-CFLAGS+=-DNO_STRTONUM 
34+CFLAGS+=-DNO_STRTONUM -DNO_QUEUE_H -DNO_TREE_H 
35+.endif 
36+ 
37+# SunOS 
38+.if ${OS} == "SunOS" 
39+INCDIRS+= -Icompat 
40+SRCS+= compat/asprintf.c compat/daemon.c compat/fgetln.c \ 
41+ compat/forkpty-sunos.c compat/getopt_long.c compat/strtonum.c \ 
42+ compat/vis.c 
43+CFLAGS+= -DNO_ASPRINTF -DNO_CDEFS_H -DNO_DAEMON -DNO_FGETLN -DNO_FORKPTY \ 
44+ -DNO_PATHS_H -DNO_PROGNAME -DNO_QUEUE_H -DNO_SETPROCTITLE \ 
45+ -DNO_STRTONUM -DNO_TREE_H 
46 .endif 
47  
48 OBJS= ${SRCS:S/.c/.o/:S/.y/.o/} 
49@@ -152,7 +174,7 @@ update-index.html: 
50 sed "s/%%VERSION%%/${VERSION}/g" index.html.in >index.html 
51  7
52 install: all 8 install: all
53- ${INSTALLDIR} ${DESTDIR}${PREFIX}/bin 9- ${INSTALLDIR} ${DESTDIR}${PREFIX}/bin
54- ${INSTALLBIN} ${PROG} ${DESTDIR}${PREFIX}/bin/ 10- ${INSTALLBIN} tmux ${DESTDIR}${PREFIX}/bin/
55- ${INSTALLDIR} ${DESTDIR}${PREFIX}/man/man1 11- ${INSTALLDIR} ${DESTDIR}${PREFIX}/man/man1
56- ${INSTALLMAN} ${PROG}.1 ${DESTDIR}${PREFIX}/man/man1/ 12- ${INSTALLMAN} tmux.1 ${DESTDIR}${PREFIX}/man/man1/
57+ ${BSD_INSTALL_PROGRAM_DIR} ${DESTDIR}${PREFIX}/bin 13+ ${BSD_INSTALL_PROGRAM_DIR} ${DESTDIR}${PREFIX}/bin
58+ ${BSD_INSTALL_PROGRAM} ${PROG} ${DESTDIR}${PREFIX}/bin/ 14+ ${BSD_INSTALL_PROGRAM} tmux ${DESTDIR}${PREFIX}/bin/
59+ ${BSD_INSTALL_MAN_DIR} ${DESTDIR}${PREFIX}/man/man1 15+ ${BSD_INSTALL_MAN_DIR} ${DESTDIR}${PREFIX}/man/man1
60+ ${BSD_INSTALL_MAN} ${PROG}.1 ${DESTDIR}${PREFIX}/man/man1/ 16+ ${BSD_INSTALL_MAN} tmux.1 ${DESTDIR}${PREFIX}/man/man1/
cvs diff -r1.3 -r1.4 pkgsrc/misc/tmux/patches/Attic/patch-ab (expand / switch to unified diff)

--- pkgsrc/misc/tmux/patches/Attic/patch-ab 2009/06/04 21:49:18 1.3
+++ pkgsrc/misc/tmux/patches/Attic/patch-ab 2009/07/08 20:59:11 1.4
@@ -1,14 +1,46 @@ @@ -1,14 +1,46 @@
1$NetBSD: patch-ab,v 1.3 2009/06/04 21:49:18 minskim Exp $ 1$NetBSD: patch-ab,v 1.4 2009/07/08 20:59:11 hasso Exp $
2 2
3--- compat/getopt.h.orig 2009-03-31 21:21:36.000000000 +0000 3--- configure.orig 2009-07-08 23:25:25 +0300
4+++ compat/getopt.h 4+++ configure 2009-07-08 23:27:03 +0300
5@@ -33,7 +33,9 @@ 5@@ -157,7 +157,7 @@ SRCS+= osdep-darwin.c \
6 #ifndef _GETOPT_H_ 6 EOF
7 #define _GETOPT_H_ 7 ;;
8  8 # ------------------------------------------------------------------------------
9+#ifndef NO_CDEFS_H 9- FreeBSD|DragonFly)
10 #include <sys/cdefs.h> 10+ FreeBSD)
11+#endif 11 cat <<EOF >>$CONFIG_H
12  12 #define HAVE_ASPRINTF
13 /* 13 #define HAVE_DAEMON
14 * GNU-like getopt_long() and 4.4BSD getsubopt()/optreset extensions 14@@ -180,6 +180,32 @@ SRCS+= osdep-freebsd.c \
 15 LIBS+= -lcrypt -lutil
 16 EOF
 17 ;;
 18+
 19+# ------------------------------------------------------------------------------
 20+ DragonFly)
 21+ cat <<EOF >>$CONFIG_H
 22+#define HAVE_ASPRINTF
 23+#define HAVE_DAEMON
 24+#define HAVE_FGETLN
 25+#define HAVE_FORKPTY
 26+#define HAVE_GETOPT
 27+#define HAVE_LIBUTIL_H
 28+#define HAVE_PATHS_H
 29+#define HAVE_POLL
 30+#define HAVE_PROGNAME
 31+#define HAVE_SETPROCTITLE
 32+#define HAVE_STRCASESTR
 33+#define HAVE_STRLCAT
 34+#define HAVE_STRLCPY
 35+#define HAVE_STRTONUM
 36+EOF
 37+ cat <<EOF >>$CONFIG_MK
 38+SRCS+= osdep-unknown.c \
 39+ compat/vis.c
 40+LIBS+= -lcrypt -lutil
 41+EOF
 42+ ;;
 43+
 44 # ------------------------------------------------------------------------------
 45 NetBSD)
 46 cat <<EOF >>$CONFIG_H
File Deleted: pkgsrc/misc/tmux/patches/Attic/patch-ac