Update to 3.9.11:

* windowlist, bound to ^A"
* support for other encodings, e.g. big5, koi8r, cp1251
    new commands 'encoding', 'defencoding'
    'register', 'readreg', 'readbuf', 'writebuf' now understand
    an extra encoding parameter
* support for double utf-8 characters
* lots of new string escapes and extensions to existsing ones:
    %LD, %LM, %Lw, %W, %-w, %+w, %H, %f, %F, %l, %=, %<, %>
* new commands: 'source', 'eval', 'deflog', 'ignorecase', 'setsid'
* command key classes: 'bind', 'command' and 'help' understand
  a '-c <class>' parameter. See the man page for examples
* new login state: always - don't remove slot even if screen gets
  detached
* 256 color support (experimental)
* configurable time format string (for ^At)
* config option to use localized month/week names
* new option '-h' for hardcopy: also dump the scrollback buffer

XXX: SunOS PLIST untested.

6 files changed, 54 insertions, 42 deletions

diff --git a/misc/screen/Makefile b/misc/screen/Makefile
index f9ac4aae4c1..5ac623dbaec 100644
--- a/misc/screen/Makefile
+++ b/misc/screen/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.28 2001/09/07 06:12:53 itojun Exp $
+# $NetBSD: Makefile,v 1.29 2002/02/16 11:18:34 wiz Exp $
 #
 
-DISTNAME=	screen-3.9.10
+DISTNAME=	screen-3.9.11
 CATEGORIES=	misc
 MASTER_SITES=	ftp://ftp.uni-erlangen.de/pub/utilities/screen/ \
 		${MASTER_SITE_GNU:=screen/}
diff --git a/misc/screen/PLIST b/misc/screen/PLIST
index 56a22c25e05..f3a98adb7ab 100644
--- a/misc/screen/PLIST
+++ b/misc/screen/PLIST
@@ -1,10 +1,33 @@
-@comment $NetBSD: PLIST,v 1.2 2002/02/15 10:12:52 skrll Exp $
+@comment $NetBSD: PLIST,v 1.3 2002/02/16 11:18:35 wiz Exp $
 bin/screen
 bin/${DISTNAME}
 man/man1/screen.1
 @unexec install-info --delete %D/info/screen.info %D/info/dir
 info/screen.info
+info/screen.info-1
+info/screen.info-2
+info/screen.info-3
+info/screen.info-4
+info/screen.info-5
 @exec install-info %D/info/screen.info %D/info/dir
 @unexec if [ -f %D/bin/screen.old ]; then ${RM} -f %D/bin/screen.old ; fi
 share/examples/screen/screenrc
+share/screen/utf8encodings/01
+share/screen/utf8encodings/02
+share/screen/utf8encodings/03
+share/screen/utf8encodings/04
+share/screen/utf8encodings/18
+share/screen/utf8encodings/a1
+share/screen/utf8encodings/bf
+share/screen/utf8encodings/c2
+share/screen/utf8encodings/c3
+share/screen/utf8encodings/c4
+share/screen/utf8encodings/c6
+share/screen/utf8encodings/c7
+share/screen/utf8encodings/c8
+share/screen/utf8encodings/cc
+share/screen/utf8encodings/cd
+share/screen/utf8encodings/d6
+@dirrm share/screen/utf8encodings
+@dirrm share/screen
 @dirrm share/examples/screen
diff --git a/misc/screen/PLIST.SunOS b/misc/screen/PLIST.SunOS
index ee762b34933..ae34c919ba1 100644
--- a/misc/screen/PLIST.SunOS
+++ b/misc/screen/PLIST.SunOS
@@ -1,12 +1,35 @@
-@comment $NetBSD: PLIST.SunOS,v 1.2 2002/02/15 10:12:52 skrll Exp $
+@comment $NetBSD: PLIST.SunOS,v 1.3 2002/02/16 11:18:35 wiz Exp $
 bin/screen
 bin/${DISTNAME}
 man/man1/screen.1
 @unexec install-info --delete %D/info/screen.info %D/info/dir
 info/screen.info
+info/screen.info-1
+info/screen.info-2
+info/screen.info-3
+info/screen.info-4
+info/screen.info-5
 @exec install-info %D/info/screen.info %D/info/dir
 @unexec if [ -f %D/bin/screen.old ]; then ${RM} -f %D/bin/screen.old ; fi
 share/examples/screen/screenrc
-@dirrm share/examples/screen
 share/lib/terminfo/s/screen
 share/lib/terminfo/s/screen-w
+share/screen/utf8encodings/01
+share/screen/utf8encodings/02
+share/screen/utf8encodings/03
+share/screen/utf8encodings/04
+share/screen/utf8encodings/18
+share/screen/utf8encodings/a1
+share/screen/utf8encodings/bf
+share/screen/utf8encodings/c2
+share/screen/utf8encodings/c3
+share/screen/utf8encodings/c4
+share/screen/utf8encodings/c6
+share/screen/utf8encodings/c7
+share/screen/utf8encodings/c8
+share/screen/utf8encodings/cc
+share/screen/utf8encodings/cd
+share/screen/utf8encodings/d6
+@dirrm share/screen/utf8encodings
+@dirrm share/screen
+@dirrm share/examples/screen
diff --git a/misc/screen/distinfo b/misc/screen/distinfo
index 57979bc3426..db82b966710 100644
--- a/misc/screen/distinfo
+++ b/misc/screen/distinfo
@@ -1,8 +1,6 @@
-$NetBSD: distinfo,v 1.5 2001/09/07 06:12:53 itojun Exp $
+$NetBSD: distinfo,v 1.6 2002/02/16 11:18:35 wiz Exp $
 
-SHA1 (screen-3.9.10.tar.gz) = 3ec786bb53ba5e0991337efb5eca99f3ec0b9b26
-Size (screen-3.9.10.tar.gz) = 521262 bytes
+SHA1 (screen-3.9.11.tar.gz) = bcf97667f6018e82f566f363f4905d2c7d0c33a6
+Size (screen-3.9.11.tar.gz) = 722396 bytes
 SHA1 (patch-ab) = 97a465b4eefb0ec0cae3cd077f7c880cf46f3355
-SHA1 (patch-ac) = 1025b6a67b20c2f6111d400b29e1e1ab1a7792fa
 SHA1 (patch-ae) = 488f9df708f28ee1411afc48a2239e11ecbf7809
-SHA1 (patch-af) = cedca19cfc7ac8063490acf927e87cdcce0db9fc
diff --git a/misc/screen/patches/patch-ac b/misc/screen/patches/patch-ac
deleted file mode 100644
index 1b1e3462c48..00000000000
--- a/misc/screen/patches/patch-ac
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ac,v 1.4 2001/08/18 09:53:02 wiz Exp $
-
---- doc/screen.texinfo.orig	Fri May 25 16:40:02 2001
-+++ doc/screen.texinfo
-@@ -3,6 +3,9 @@
- @c vi:set wm=5
- @setfilename screen.info
- @settitle Screen User's Manual
-+@direntry
-+* Screen: (screen).             Full-screen window manager.
-+@end direntry
- @finalout
- @setchapternewpage odd
- @c %**end of header
diff --git a/misc/screen/patches/patch-af b/misc/screen/patches/patch-af
deleted file mode 100644
index 49df3cb0630..00000000000
--- a/misc/screen/patches/patch-af
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-af,v 1.4 2001/08/18 11:21:20 itojun Exp $
-
-support multibyte escape sequences other than Japanese.
-
---- display.c	Wed May  9 19:01:53 2001
-+++ display.c	Sat Aug 18 20:10:43 2001
-@@ -1807,7 +1807,10 @@
- #ifdef KANJI
-   else if (new < ' ')
-     {
--      AddStr("\033$");
-+      if (new + '@' == '@' || new + '@' == 'A' || new + '@' == 'B')
-+	AddStr("\033$");
-+      else
-+	AddStr("\033$(");
-       AddChar(new + '@');
-     }
- #endif