summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doc/CHANGES3
-rw-r--r--misc/screen/Makefile5
-rw-r--r--misc/screen/distinfo10
-rw-r--r--misc/screen/patches/patch-ae12
-rw-r--r--misc/screen/patches/patch-ak11
5 files changed, 19 insertions, 22 deletions
diff --git a/doc/CHANGES b/doc/CHANGES
index 30b02158cf8..e2aa43569aa 100644
--- a/doc/CHANGES
+++ b/doc/CHANGES
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES,v 1.461 2002/11/04 19:30:03 wiz Exp $
+$NetBSD: CHANGES,v 1.462 2002/11/04 22:40:06 hubertf Exp $
Changes to the packages collection and infrastructure in 2002:
@@ -3531,3 +3531,4 @@ Changes to the packages collection and infrastructure in 2002:
Updated cyrus-imapd to 2.0.16nb3 [seb 2002-11-04]
Updated wv to 0.7.2nb1 [wiz 2002-11-04]
Updated pkgconfig to 0.14.0 [wiz 2002-11-04]
+ Updated screen to 3.9.13 [hubertf 2002-11-04]
diff --git a/misc/screen/Makefile b/misc/screen/Makefile
index 08e9ea3b354..8593ba85c34 100644
--- a/misc/screen/Makefile
+++ b/misc/screen/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.35 2002/09/15 06:51:35 kim Exp $
+# $NetBSD: Makefile,v 1.36 2002/11/04 22:39:17 hubertf Exp $
-DISTNAME= screen-3.9.11
-PKGREVISION= 2
+DISTNAME= screen-3.9.13
CATEGORIES= misc
MASTER_SITES= ftp://ftp.uni-erlangen.de/pub/utilities/screen/ \
${MASTER_SITE_GNU:=screen/}
diff --git a/misc/screen/distinfo b/misc/screen/distinfo
index b82e826fb5b..03a0920f938 100644
--- a/misc/screen/distinfo
+++ b/misc/screen/distinfo
@@ -1,13 +1,13 @@
-$NetBSD: distinfo,v 1.8 2002/09/15 06:51:36 kim Exp $
+$NetBSD: distinfo,v 1.9 2002/11/04 22:39:18 hubertf Exp $
-SHA1 (screen-3.9.11.tar.gz) = bcf97667f6018e82f566f363f4905d2c7d0c33a6
-Size (screen-3.9.11.tar.gz) = 722396 bytes
+SHA1 (screen-3.9.13.tar.gz) = b4b8fff955b19ddb88a1ec4ee8dd371e20b3caf4
+Size (screen-3.9.13.tar.gz) = 728037 bytes
SHA1 (patch-aa) = 57a7800823cf46c42011f7703fd9949bc614736d
SHA1 (patch-ab) = 97a465b4eefb0ec0cae3cd077f7c880cf46f3355
-SHA1 (patch-ae) = 488f9df708f28ee1411afc48a2239e11ecbf7809
+SHA1 (patch-ae) = dcdbb1ca08e36308f5659a90a5b6f31fb3a45691
SHA1 (patch-ai) = a3d2c7d2ef3db9deb7a5e70ed7f906efd3196af6
SHA1 (patch-aj) = 8aa5c79e483e500ca9b3ed978835bbf1a866a5dc
-SHA1 (patch-ak) = d80a6b113d31014bb643dae5b04b8dd7510462c5
+SHA1 (patch-ak) = 1e83c3406fb862e15f0fd5b90da8cf5310fbb68b
SHA1 (patch-al) = 2f042d43030a9166f4c1bf19e4d473d1031aba4e
SHA1 (patch-am) = 5fdc32f33ebbb5385292919f6cd01bedc30491d9
SHA1 (patch-an) = 9c5f451edb228f10daf593eba79f1fb11b4ffb24
diff --git a/misc/screen/patches/patch-ae b/misc/screen/patches/patch-ae
index d4ad6fb3a14..92dd45a441e 100644
--- a/misc/screen/patches/patch-ae
+++ b/misc/screen/patches/patch-ae
@@ -1,4 +1,4 @@
-$NetBSD: patch-ae,v 1.3 2001/08/18 09:53:02 wiz Exp $
+$NetBSD: patch-ae,v 1.4 2002/11/04 22:39:18 hubertf Exp $
1. Don't pollute G1 to allow 8-bit encondings.
@@ -6,8 +6,8 @@ $NetBSD: patch-ae,v 1.3 2001/08/18 09:53:02 wiz Exp $
longer than 1023 bytes, which cause problems.
This is a quick hack but works with our termcap.
---- termcap.c.orig Tue May 8 11:02:24 2001
-+++ termcap.c
+--- termcap.c.orig Wed Aug 21 11:24:41 2002
++++ termcap.c Mon Nov 4 23:10:06 2002
@@ -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\
@@ -17,12 +17,12 @@ $NetBSD: patch-ae,v 1.3 2001/08/18 09:53:02 wiz Exp $
char *
gettermcapstring(s)
-@@ -707,7 +707,7 @@
+@@ -705,7 +705,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)
+- if (tcLineLen + (n = strlen(s)) > 55 && Termcaplen < TERMCAP_BUFSIZE - 4 - 1)
++ if (tcLineLen + (n = strlen(s)) > 69 && Termcaplen < TERMCAP_BUFSIZE - 4 - 1)
{
strcpy(Termcap + Termcaplen, "\\\n\t:");
Termcaplen += 4;
diff --git a/misc/screen/patches/patch-ak b/misc/screen/patches/patch-ak
index 368c68741d0..2fe3fc425eb 100644
--- a/misc/screen/patches/patch-ak
+++ b/misc/screen/patches/patch-ak
@@ -1,11 +1,8 @@
-$NetBSD: patch-ak,v 1.1 2002/09/15 06:51:38 kim Exp $
+$NetBSD: patch-ak,v 1.2 2002/11/04 22:39:19 hubertf Exp $
-The configure.in patch manually applied to configure, as
-our autoreconf produces an extensively different result.
-
---- configure.orig Thu Feb 14 08:11:21 2002
-+++ configure Sat Sep 14 23:44:07 2002
-@@ -4077,9 +4077,15 @@
+--- configure.orig Mon Aug 12 16:34:23 2002
++++ configure
+@@ -4984,9 +4984,15 @@
#include <time.h> /* to get time_t on SCO */
#include <sys/types.h>