Update to 3.9.9. Changes since 3.9.8:

* new '-X' option to send commands to screen sessions.
* added a possibility to change the attributes/color in caption or
  hardstatus strings:
    caption always "%3n %{r}%t%{-}%? @%u%?%? %{g}[%h]%{-}%?"
* new 'dinfo' command to show what screen thinks about your terminal.
* new 'attrcolor' command to map attributes to color codes:
* support for UTF-8: new commands 'utf8', 'defutf8' to change the
  encoding of a window, plus a '-U' option to tell screen that
  your terminal sends/receives UTF-8 codes.
* support for 16 colors.

7 files changed, 37 insertions, 52 deletions

diff --git a/misc/screen/Makefile b/misc/screen/Makefile
index d06cfed86ec..407cb8515b4 100644
--- a/misc/screen/Makefile
+++ b/misc/screen/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.26 2001/03/02 14:56:15 tron Exp $
-# FreeBSD Id: Makefile,v 1.17 1997/06/16 06:39:51 max Exp
+# $NetBSD: Makefile,v 1.27 2001/08/18 09:53:01 wiz Exp $
 #
 
-DISTNAME=	screen-3.9.8
+DISTNAME=	screen-3.9.9
 CATEGORIES=	misc
 MASTER_SITES=	ftp://ftp.uni-erlangen.de/pub/utilities/screen/ \
 		${MASTER_SITE_GNU:=screen/}
@@ -11,9 +10,10 @@ MAINTAINER=	hubertf@netbsd.org
 HOMEPAGE=	http://www.gnu.org/software/screen/screen.html
 COMMENT=	Multi-screen window manager
 
-GNU_CONFIGURE=	yes
-INFO_FILES=	screen.info
-PLIST_SUBST=	DISTNAME=${DISTNAME}
+GNU_CONFIGURE=		yes
+INFO_FILES=		screen.info
+PLIST_SUBST=		DISTNAME=${DISTNAME}
+USE_BUILDLINK_ONLY=	yes
 
 .include "../../mk/bsd.prefs.mk"
 .if (${OPSYS} == SunOS)
diff --git a/misc/screen/distinfo b/misc/screen/distinfo
index 5f63009e5db..732937708a0 100644
--- a/misc/screen/distinfo
+++ b/misc/screen/distinfo
@@ -1,9 +1,7 @@
-$NetBSD: distinfo,v 1.2 2001/04/20 13:52:20 agc Exp $
+$NetBSD: distinfo,v 1.3 2001/08/18 09:53:01 wiz Exp $
 
-SHA1 (screen-3.9.8.tar.gz) = 9f0c93d3f1f84e4d23cd58c9c62a8fb525f71f6c
-Size (screen-3.9.8.tar.gz) = 505018 bytes
-SHA1 (patch-aa) = 996ca04a1218bc477742cd9df15a2a899a66bc0a
-SHA1 (patch-ab) = 11c75244a3f00d5cf46feb00a45cfd2eb3303daa
-SHA1 (patch-ac) = dfd1ca3973f7b85a77d4ad87e82e2dbc9baa0d2c
-SHA1 (patch-ae) = 296709d031fe4c55e2c2e23d3090d98954178db4
-SHA1 (patch-ag) = 296102be5e5fc520e0e1a346347d2bb5972f90e4
+SHA1 (screen-3.9.9.tar.gz) = e9336f92fc323ebababc671a381c8dfd94d8ccae
+Size (screen-3.9.9.tar.gz) = 524834 bytes
+SHA1 (patch-ab) = 97a465b4eefb0ec0cae3cd077f7c880cf46f3355
+SHA1 (patch-ac) = 1025b6a67b20c2f6111d400b29e1e1ab1a7792fa
+SHA1 (patch-ae) = 488f9df708f28ee1411afc48a2239e11ecbf7809
diff --git a/misc/screen/patches/patch-aa b/misc/screen/patches/patch-aa
deleted file mode 100644
index 791e226a55a..00000000000
--- a/misc/screen/patches/patch-aa
+++ /dev/null
@@ -1,8 +0,0 @@
-$NetBSD: patch-aa,v 1.6 2000/09/11 14:43:14 itojun Exp $
-
---- Makefile.in.orig	Mon Sep 11 21:55:06 2000
-+++ Makefile.in	Mon Sep 11 21:56:08 2000
-@@ -23,3 +23,2 @@
- CC = @CC@
--CFLAGS = -O
- CPPFLAGS = @CPPFLAGS@
diff --git a/misc/screen/patches/patch-ab b/misc/screen/patches/patch-ab
index 8e0e8da7756..0c02b664ffe 100644
--- a/misc/screen/patches/patch-ab
+++ b/misc/screen/patches/patch-ab
@@ -1,23 +1,22 @@
-$NetBSD: patch-ab,v 1.5 1999/09/03 15:44:43 tron Exp $
+$NetBSD: patch-ab,v 1.6 2001/08/18 09:53:02 wiz Exp $
 
---- doc/Makefile.in.orig	Tue Aug 10 17:06:30 1999
-+++ doc/Makefile.in	Tue Aug 10 19:35:35 1999
-@@ -20,7 +20,8 @@
- 	$(TEXI2DVI) $(srcdir)/screen.texinfo
+--- doc/Makefile.in.orig	Fri May 25 16:50:55 2001
++++ doc/Makefile.in
+@@ -27,7 +27,7 @@
  
  info screen.info: screen.texinfo
+ 	@rm -f screen.info*
 -	$(MAKEINFO) $(srcdir)/screen.texinfo -o screen.info
-+	rm -f ./screen.info*
 +	$(MAKEINFO) --no-split $(srcdir)/screen.texinfo -o screen.info
  
  install: installdirs
- 	$(INSTALL_DATA) $(srcdir)/screen.1 $(mandir)/man1/screen.1
-@@ -28,9 +29,6 @@
+ 	$(INSTALL_DATA) $(srcdir)/screen.1 $(DESTDIR)$(mandir)/man1/screen.1
+@@ -35,9 +35,6 @@
  	-if test -f screen.info; then d=.; else d=$(srcdir); fi; \
  	if test -f $$d/screen.info; then \
- 	for f in $$d/screen.info*; do $(INSTALL_DATA) $$f $(infodir);done; \
+ 	for f in $$d/screen.info*; do $(INSTALL_DATA) $$f $(DESTDIR)$(infodir);done; \
 -	if $(SHELL) -c 'install-info --version' >/dev/null 2>&1; then \
--	  install-info --info-dir=$(infodir) $$d/screen.info; \
+-	  install-info --info-dir=$(DESTDIR)$(infodir) $$d/screen.info; \
 -	else true; fi; \
  	fi
  
diff --git a/misc/screen/patches/patch-ac b/misc/screen/patches/patch-ac
index b7c6a3c7fda..1b1e3462c48 100644
--- a/misc/screen/patches/patch-ac
+++ b/misc/screen/patches/patch-ac
@@ -1,7 +1,7 @@
-$NetBSD: patch-ac,v 1.3 1999/11/19 12:21:14 agc Exp $
+$NetBSD: patch-ac,v 1.4 2001/08/18 09:53:02 wiz Exp $
 
---- doc/screen.texinfo.orig	Fri Nov 19 12:14:51 1999
-+++ doc/screen.texinfo	Fri Nov 19 12:14:51 1999
+--- 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
diff --git a/misc/screen/patches/patch-ae b/misc/screen/patches/patch-ae
index 0f17b68466c..d4ad6fb3a14 100644
--- a/misc/screen/patches/patch-ae
+++ b/misc/screen/patches/patch-ae
@@ -1,4 +1,4 @@
-$NetBSD: patch-ae,v 1.2 2000/09/11 14:43:15 itojun Exp $
+$NetBSD: patch-ae,v 1.3 2001/08/18 09:53:02 wiz Exp $
 
  1. Don't pollute G1 to allow 8-bit encondings.
 
@@ -6,15 +6,23 @@ $NetBSD: patch-ae,v 1.2 2000/09/11 14:43:15 itojun Exp $
     longer than 1023 bytes, which cause problems.
     This is a quick hack but works with our termcap.
 
---- termcap.c.orig	Wed Jul  5 21:33:30 2000
-+++ termcap.c	Mon Sep 11 22:01:00 2000
-@@ -77,3 +77,3 @@
+--- termcap.c.orig	Tue May  8 11:02:24 2001
++++ termcap.c
+@@ -75,7 +75,7 @@
+ \t:DO=\\E[%dB:LE=\\E[%dD:RI=\\E[%dC:UP=\\E[%dA:bs:bt=\\E[Z:\\\n\
+ \t:cd=\\E[J:ce=\\E[K:cl=\\E[H\\E[J:cm=\\E[%i%d;%dH:ct=\\E[3g:\\\n\
  \t:do=^J:nd=\\E[C:pt:rc=\\E8:rs=\\Ec:sc=\\E7:st=\\EH:up=\\EM:\\\n\
 -\t:le=^H:bl=^G:cr=^M:it#8:ho=\\E[H:nw=\\EE:ta=^I:is=\\E)0:";
 +\t:le=^H:bl=^G:cr=^M:it#8:ho=\\E[H:nw=\\EE:ta=^I:is=\\E(B:";
  
-@@ -699,3 +699,3 @@
+ char *
+ gettermcapstring(s)
+@@ -707,7 +707,7 @@
+ {
+   register int n;
  
 -  if (tcLineLen + (n = strlen(s)) > 55 && Termcaplen < TERMCAP_BUFSIZE + 8 - 4)
 +  if (tcLineLen + (n = strlen(s)) > 69 && Termcaplen < TERMCAP_BUFSIZE + 8 - 4)
      {
+       strcpy(Termcap + Termcaplen, "\\\n\t:");
+       Termcaplen += 4;
diff --git a/misc/screen/patches/patch-ag b/misc/screen/patches/patch-ag
deleted file mode 100644
index aa27ec5cc2a..00000000000
--- a/misc/screen/patches/patch-ag
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ag,v 1.1 1999/08/10 17:43:56 tron Exp $
-
---- teln.c.orig	Wed Jul 28 14:50:22 1999
-+++ teln.c	Tue Aug 10 19:18:25 1999
-@@ -28,6 +28,7 @@
- #include <sys/socket.h>
- #include <fcntl.h>
- #include <netdb.h>
-+#include <netinet/in.h>
- #include <arpa/inet.h>
- 
- #include "config.h"