>Number:         10989
>Category:       pkg
>Synopsis:       upgrade misc/screen to 3.9.8
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Mon Sep 11 07:30:00 PDT 2000
>Closed-Date:
>Last-Modified:
>Originator:     Jun-ichiro itojun Hagino
>Release:        NetBSD-current, like today
>Organization:
	itojun.org
>Environment:
System: NetBSD starfruit.itojun.org 1.5E NetBSD 1.5E (STARFRUIT) #110: Mon Sep 11 15:51:45 JST 2000 itojun@starfruit.itojun.org:/usr/home/itojun/NetBSD/src/sys/arch/i386/compile/STARFRUIT i386


>Description:
	the patch upgrades misc/screen to 3.9.8.  
	(maybe after pkg freeze)

>How-To-Repeat:
>Fix:
Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/misc/screen/Makefile,v
retrieving revision 1.22
diff -u -r1.22 Makefile
--- Makefile	2000/09/01 14:39:51	1.22
+++ Makefile	2000/09/11 13:25:31
@@ -2,8 +2,8 @@
 # FreeBSD Id: Makefile,v 1.17 1997/06/16 06:39:51 max Exp
 #
 
-DISTNAME=	screen-3.9.5
-PKGNAME=	screen-3.9.5nb1
+DISTNAME=	screen-3.9.8
+PKGNAME=	screen-3.9.8
 CATEGORIES=	misc
 MASTER_SITES=	ftp://ftp.uni-erlangen.de/pub/utilities/screen/ \
 		${MASTER_SITE_GNU:=screen/}
Index: files/md5
===================================================================
RCS file: /cvsroot/pkgsrc/misc/screen/files/md5,v
retrieving revision 1.8
diff -u -r1.8 md5
--- files/md5	1999/09/03 15:44:43	1.8
+++ files/md5	2000/09/11 13:25:31
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.8 1999/09/03 15:44:43 tron Exp $
+$NetBSD$
 
-MD5 (screen-3.9.5.tar.gz) = ac7dd525b0920bc98e4af75b0f73c73e
+MD5 (screen-3.9.8.tar.gz) = 8ddfebe32c2d45410ce89ea9779bb1cf
Index: files/patch-sum
===================================================================
RCS file: /cvsroot/pkgsrc/misc/screen/files/patch-sum,v
retrieving revision 1.9
diff -u -r1.9 patch-sum
--- files/patch-sum	2000/09/01 15:23:51	1.9
+++ files/patch-sum	2000/09/11 13:25:31
@@ -1,9 +1,7 @@
 $NetBSD: patch-sum,v 1.9 2000/09/01 15:23:51 kim Exp $
 
-MD5 (patch-aa) = aa7ea3e8fe85944c0eb23d41d00881bb
+MD5 (patch-aa) = 5e0fb78700376d971e183fb7affc1c86
 MD5 (patch-ab) = d88350439f619c44db4f395aebadf5c0
 MD5 (patch-ac) = 7f58f1b66bf0b84221c2b8821c123c74
-MD5 (patch-ad) = d8635ceee1f95901b6084a432313e658
-MD5 (patch-ae) = 30e1c69f8ee8ca6fee2b602a009957cf
+MD5 (patch-ae) = 2f09b325df3c95c549a196524c215d4a
 MD5 (patch-ag) = 95e34aa096d3e70488771065745135ac
-MD5 (patch-ah) = 8fc80dc27e69aee3c80a3ac79fd704b8
Index: patches/patch-aa
===================================================================
RCS file: /cvsroot/pkgsrc/misc/screen/patches/patch-aa,v
retrieving revision 1.5
diff -u -r1.5 patch-aa
--- patches/patch-aa	1999/08/13 14:04:16	1.5
+++ patches/patch-aa	2000/09/11 13:25:31
@@ -1,21 +1,8 @@
-$NetBSD: patch-aa,v 1.5 1999/08/13 14:04:16 agc Exp $
+$NetBSD$
 
---- 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@
Index: patches/patch-ad
===================================================================
RCS file: patch-ad
diff -N patch-ad
--- /tmp/cvs00235ae	Mon Sep 11 16:25:31 2000
+++ /dev/null	Mon Sep 11 03:23:33 2000
@@ -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
Index: patches/patch-ae
===================================================================
RCS file: /cvsroot/pkgsrc/misc/screen/patches/patch-ae,v
retrieving revision 1.1
diff -u -r1.1 patch-ae
--- patches/patch-ae	1999/03/20 02:42:06	1.1
+++ patches/patch-ae	2000/09/11 13:25:31
@@ -6,23 +6,15 @@
     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;
Index: patches/patch-ah
===================================================================
RCS file: patch-ah
diff -N patch-ah
--- /tmp/cvs00235ag	Mon Sep 11 16:25:31 2000
+++ /dev/null	Mon Sep 11 03:23:33 2000
@@ -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;
>Release-Note:
>Audit-Trail:
>Unformatted: