Upgrade to version 3.9.2 of screen, the multi-screen window manager.

Changes include:
* real multiuser support
* split screen support
* hardstatus emulation support
* configurable window seperator and hardstatus strings
* permanent window seperator
* many new escapes
* logfile timestamps and flush timeout
* configurable breaktype
* other new commands:
* optional builtin telnet.
* remote detach and reattach change:
* support for history compaction
* optional Braille support.

6 files changed, 39 insertions, 57 deletions

diff --git a/misc/screen/Makefile b/misc/screen/Makefile
index 9829c6135f7..6c59b0d5006 100644
--- a/misc/screen/Makefile
+++ b/misc/screen/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.15 1999/04/25 23:38:12 tv Exp $
+# $NetBSD: Makefile,v 1.16 1999/08/10 09:18:01 agc Exp $
 # FreeBSD Id: Makefile,v 1.17 1997/06/16 06:39:51 max Exp
 #
 
-DISTNAME=       screen-3.7.6
+DISTNAME=       screen-3.9.2
 CATEGORIES=	misc
-MASTER_SITES=	${MASTER_SITE_GNU:=screen/} \
-		ftp://ftp.uni-erlangen.de/pub/utilities/screen/
+MASTER_SITES=	ftp://ftp.uni-erlangen.de/pub/utilities/screen/ \
+		${MASTER_SITE_GNU:=screen/}
 
 MAINTAINER=	hubertf@netbsd.org
 
diff --git a/misc/screen/files/md5 b/misc/screen/files/md5
index de7666d768b..e731577605e 100644
--- a/misc/screen/files/md5
+++ b/misc/screen/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.4 1998/11/30 17:45:17 tv Exp $
+$NetBSD: md5,v 1.5 1999/08/10 09:18:01 agc Exp $
 
-MD5 (screen-3.7.6.tar.gz) = 9a353b828d79c3c143109265cae663a7
+MD5 (screen-3.9.2.tar.gz) = 9c66010ad215e57f7cde223fca33fa60
diff --git a/misc/screen/files/patch-sum b/misc/screen/files/patch-sum
index 8993b16bd2f..9102bc766f4 100644
--- a/misc/screen/files/patch-sum
+++ b/misc/screen/files/patch-sum
@@ -1,8 +1,8 @@
-$NetBSD: patch-sum,v 1.1 1999/07/09 14:09:19 agc Exp $
+$NetBSD: patch-sum,v 1.2 1999/08/10 09:18:01 agc Exp $
 
-MD5 (patch-aa) = 8169187e5e498a7667e70b95454b3a5c
+MD5 (patch-aa) = 8e06f73eb8c0167051d17a71f0267ebb
 MD5 (patch-ab) = 920428b30aea59e0863697bc37b4dd74
 MD5 (patch-ac) = b64706d3cce162a05421ee7bbded5d7d
-MD5 (patch-ad) = 2239eba1252a373e56a5c943d4628455
+MD5 (patch-ad) = d8635ceee1f95901b6084a432313e658
 MD5 (patch-ae) = 30e1c69f8ee8ca6fee2b602a009957cf
 MD5 (patch-af) = d9d6407efeb7271b43d97b0838eeb5ff
diff --git a/misc/screen/patches/patch-aa b/misc/screen/patches/patch-aa
index b0b155ff3bb..a957f9c908e 100644
--- a/misc/screen/patches/patch-aa
+++ b/misc/screen/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.3 1998/08/07 11:10:32 agc Exp $
+$NetBSD: patch-aa,v 1.4 1999/08/10 09:18:02 agc Exp $
 
 --- Makefile.in	Mon Jun 23 17:05:42 1997
 +++ Makefile.in	Mon Nov  3 00:06:51 1997
@@ -10,12 +10,3 @@ $NetBSD: patch-aa,v 1.3 1998/08/07 11:10:32 agc Exp $
  LDFLAGS =
  LIBS = @LIBS@
  
-@@ -79,7 +78,7 @@
- 
- install: installdirs install_bin
- 	cd doc ; $(MAKE) install
--	-tic ${srcdir}/terminfo/screeninfo.src
-+#	-tic ${srcdir}/terminfo/screeninfo.src
- # Better do this by hand. E.g. under RCS...
- #	cat ${srcdir}/terminfo/screencap >> /etc/termcap
- 	@echo "termcap entry (${srcdir}/terminfo/screencap) should be installed manually."
diff --git a/misc/screen/patches/patch-ad b/misc/screen/patches/patch-ad
index de2ad30a1e3..2b8658a7c9e 100644
--- a/misc/screen/patches/patch-ad
+++ b/misc/screen/patches/patch-ad
@@ -1,44 +1,35 @@
-$NetBSD: patch-ad,v 1.5 1998/11/30 17:45:18 tv Exp $
+$NetBSD: patch-ad,v 1.6 1999/08/10 09:18:02 agc Exp $
 
---- configure.orig	Sun Oct 18 16:37:39 1998
-+++ configure	Mon Nov 30 11:03:01 1998
-@@ -2163,7 +2163,7 @@
+--- configure.orig	Mon Aug  2 13:26:53 1999
++++ configure	Tue Aug 10 10:03:01 1999
+@@ -2706,7 +2706,7 @@
  
  _CUT_HERE_
  
--#if ((defined(hp300) && !defined(__hpux)) || defined(sun) || (defined(ultrix) && defined(mips)) || defined(_SEQUENT_) || defined(sgi) || defined(SVR4) || defined(sony_news) || (!defined(__osf__) && defined(__alpha)) || defined(_IBMR2) || defined(_AUX_SOURCE) || defined(AUX) || defined(m88k))
-+#if (((defined(hp300) && !defined(__hpux)) || defined(sun) || (defined(ultrix) && defined(mips)) || defined(_SEQUENT_) || defined(sgi) || defined(SVR4) || defined(sony_news) || (!defined(__osf__) && defined(__alpha)) || defined(_IBMR2) || defined(_AUX_SOURCE) || defined(AUX) || defined(m88k))) && !defined(__NetBSD__)
+-#if ((defined(hp300) && !defined(__hpux)) || defined(sun) || (defined(ultrix) && defined(mips)) || defined(_SEQUENT_) || defined(sgi) || defined(SVR4) || defined(sony_news) || !(defined(__osf__) && defined(__alpha)) || defined(_IBMR2) || defined(_AUX_SOURCE) || defined(AUX) || defined(m88k))
++#if (((defined(hp300) && !defined(__hpux)) || defined(sun) || (defined(ultrix) && defined(mips)) || defined(_SEQUENT_) || defined(sgi) || defined(SVR4) || defined(sony_news) || !(defined(__osf__) && defined(__alpha)) || defined(_IBMR2) || defined(_AUX_SOURCE) || defined(AUX) || defined(m88k))) && !defined(__NetBSD__)
  loadtype=long
  # if defined(apollo) || defined(_IBMR2) || defined(_AUX_SOURCE) || defined(AUX)
  loadscale=65536
-@@ -2702,17 +2702,6 @@
- fi
- rm -f /tmp/conftest*
+@@ -3248,6 +3248,10 @@
  
--test -n "$silent" || echo "checking for vsprintf"
--cat > conftest.${ac_ext} <<EOF
--#include "confdefs.h"
--
--int main() { return 0; }
--int t() { vsprintf(0,0,0);; return 0; }
--EOF
--if eval $ac_compile; then
--  rm -rf conftest*
--  
--{
- test -n "$verbose" && \
- echo "	defining USEVARARGS"
- echo "#define" USEVARARGS "1" >> confdefs.h
-@@ -2721,12 +2710,6 @@
- \${ac_uA}USEVARARGS\${ac_uB}USEVARARGS\${ac_uC}1\${ac_uD}
- \${ac_eA}USEVARARGS\${ac_eB}USEVARARGS\${ac_eC}1\${ac_eD}
- "
--}
--
--
--fi
--rm -f conftest*
--
- 
- test -n "$silent" || echo "checking for directory library header"
- ac_dir_header=
+ echo $ac_n "checking for vsprintf""... $ac_c" 1>&6
+ echo "configure:3251: checking for vsprintf" >&5
++vsprintf_endowed=0
++if true; then
++vsprintf_endowed=1
++else
+ cat > conftest.$ac_ext <<EOF
+ #line 3253 "configure"
+ #include "confdefs.h"
+@@ -3257,6 +3261,10 @@
+ ; return 0; }
+ EOF
+ if { (eval echo configure:3260: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++ vsprintf_endowed=1
++fi
++fi
++if [ "$vsprintf_endowed" = "1" ]; then
+   rm -rf conftest*
+   echo "$ac_t""yes" 1>&6;cat >> confdefs.h <<\EOF
+ #define USEVARARGS 1
diff --git a/misc/screen/pkg/PLIST b/misc/screen/pkg/PLIST
index 7a4937ad696..bc65fb7b634 100644
--- a/misc/screen/pkg/PLIST
+++ b/misc/screen/pkg/PLIST
@@ -1,6 +1,6 @@
-@comment $NetBSD: PLIST,v 1.8 1999/02/11 19:17:33 tv Exp $
+@comment $NetBSD: PLIST,v 1.9 1999/08/10 09:18:02 agc Exp $
 bin/screen
-bin/screen-3.7.6
+bin/screen-3.9.2
 man/man1/screen.1.gz
 @unexec install-info --delete %D/info/screen.info %D/info/dir
 info/screen.info