4 files changed, 10 insertions, 79 deletions
diff --git a/misc/screen/patches/patch-aa b/misc/screen/patches/patch-aa
index 8dd36f0ad62..791e226a55a 100644
--- a/misc/screen/patches/patch-aa
+++ b/misc/screen/patches/patch-aa
@@ -1,21 +1,8 @@
-$NetBSD: patch-aa,v 1.5 1999/08/13 14:04:16 agc Exp $
+$NetBSD: patch-aa,v 1.6 2000/09/11 14:43:14 itojun Exp $
 
---- Makefile.in.orig	Wed Aug 11 21:19:51 1999
-+++ Makefile.in	Fri Aug 13 14:56:14 1999
-@@ -21,7 +21,6 @@
- ETCSCREENRC = `sed < config.h -n -e '/define ETCSCREENRC/s/^.*"\([^"]*\)"/\1/p'`
- 
+--- 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
- LDFLAGS =
- LIBS = @LIBS@
- 
-@@ -84,7 +83,7 @@
- install: installdirs install_bin
- 	cd doc ; $(MAKE) install
- 	-if [ -d /usr/lib/terminfo ]; then \
--		PATH="$PATH:/usr/5bin" tic ${srcdir}/terminfo/screeninfo.src; \
-+		PATH="$$PATH:/usr/5bin" tic ${srcdir}/terminfo/screeninfo.src; \
- 		chmod 644 /usr/lib/terminfo/s/screen*; \
- 	fi
- # Better do this by hand. E.g. under RCS...
+ CPPFLAGS = @CPPFLAGS@
diff --git a/misc/screen/patches/patch-ad b/misc/screen/patches/patch-ad
deleted file mode 100644
index 2b8658a7c9e..00000000000
--- a/misc/screen/patches/patch-ad
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD: patch-ad,v 1.6 1999/08/10 09:18:02 agc Exp $
-
---- 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__)
- loadtype=long
- # if defined(apollo) || defined(_IBMR2) || defined(_AUX_SOURCE) || defined(AUX)
- loadscale=65536
-@@ -3248,6 +3248,10 @@
- 
- 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/patches/patch-ae b/misc/screen/patches/patch-ae
index e4d2a9fd09a..0f17b68466c 100644
--- a/misc/screen/patches/patch-ae
+++ b/misc/screen/patches/patch-ae
@@ -1,4 +1,4 @@
-$NetBSD: patch-ae,v 1.1 1999/03/20 02:42:06 itohy Exp $
+$NetBSD: patch-ae,v 1.2 2000/09/11 14:43:15 itojun Exp $
 
  1. Don't pollute G1 to allow 8-bit encondings.
 
@@ -6,23 +6,15 @@ $NetBSD: patch-ae,v 1.1 1999/03/20 02:42:06 itohy Exp $
     longer than 1023 bytes, which cause problems.
     This is a quick hack but works with our termcap.
 
---- termcap.c.orig	Thu Nov 26 01:12:23 1998
-+++ termcap.c	Fri Mar 19 23:38:57 1999
-@@ -74,7 +74,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\
+--- termcap.c.orig	Wed Jul  5 21:33:30 2000
++++ termcap.c	Mon Sep 11 22:01:00 2000
+@@ -77,3 +77,3 @@
  \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:";
  
- char *
- gettermcapstring(s)
-@@ -669,7 +669,7 @@
- {
-   register int n;
+@@ -699,3 +699,3 @@
  
 -  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-ah b/misc/screen/patches/patch-ah
deleted file mode 100644
index 0c8b6e104bd..00000000000
--- a/misc/screen/patches/patch-ah
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ah,v 1.2 2000/09/01 15:23:51 kim Exp $
-
---- screen.c.orig	Wed Sep  1 17:57:25 1999
-+++ screen.c	Fri Sep  1 11:22:45 2000
-@@ -2311,7 +2311,7 @@
- 	      else if (visual && !D_VB && (!D_status || !D_status_bell))
- 		{
- 		  D_status_delayed = -1;
--		  Msg(0, VisualBellString);
-+		  Msg(0, "%s", VisualBellString);
- 		  if (D_status)
- 		    {
- 		      D_status_bell = 1;