From 66474ebf0b57c055e9e7d17e930871547c7b7921 Mon Sep 17 00:00:00 2001
From: roy <roy>
Date: Wed, 20 Jan 2010 03:21:20 +0000
Subject: When running terminfo but compiled for termcap, we cannot assume that
 we actually have anything useable in termcap_term_buffer so just use the
 terminfo fixed size defined ealier.

---
 editors/emacs20/Makefile         |  4 ++--
 editors/emacs20/distinfo         |  9 +++++----
 editors/emacs20/patches/patch-cf | 18 ++++++++++++++++++
 3 files changed, 25 insertions(+), 6 deletions(-)
 create mode 100644 editors/emacs20/patches/patch-cf

(limited to 'editors/emacs20')

diff --git a/editors/emacs20/Makefile b/editors/emacs20/Makefile
index 5f7b39b2b4a..617fd212d54 100644
--- a/editors/emacs20/Makefile
+++ b/editors/emacs20/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.37 2009/04/30 17:22:06 hasso Exp $
+# $NetBSD: Makefile,v 1.38 2010/01/20 03:21:21 roy Exp $
 
 DISTNAME=	emacs-20.7
-PKGREVISION=	12
+PKGREVISION=	13
 CATEGORIES=	editors
 MASTER_SITES=	http://ftp.gnu.org/pub/old-gnu/emacs/	\
 		ftp://ftp.gnu.org/pub/old-gnu/emacs
diff --git a/editors/emacs20/distinfo b/editors/emacs20/distinfo
index c7c237ba7f8..b559ddd7596 100644
--- a/editors/emacs20/distinfo
+++ b/editors/emacs20/distinfo
@@ -1,14 +1,14 @@
-$NetBSD: distinfo,v 1.13 2008/07/13 17:28:33 dholland Exp $
+$NetBSD: distinfo,v 1.14 2010/01/20 03:21:21 roy Exp $
 
-SHA1 (emacs-20.7.tar.gz) = ef0168b927fb633bc9b14e2249431f26ff8b8452
-RMD160 (emacs-20.7.tar.gz) = f3b8ea8d6f6ad52ccdd7ca74c84e87a7409fc270
-Size (emacs-20.7.tar.gz) = 15043428 bytes
 SHA1 (emacs-20.7-mule-4.1b-elc.tar.gz) = 3894fb2b81bb326545f6ccc3bf0a8405c23004ff
 RMD160 (emacs-20.7-mule-4.1b-elc.tar.gz) = c675b31dafaa4321a453af9d87eddf051ee71b1f
 Size (emacs-20.7-mule-4.1b-elc.tar.gz) = 70474 bytes
 SHA1 (emacs-20.7-mule-4.1b.patch) = 2c5538198a4d032a9e987d810fe5c26407d968eb
 RMD160 (emacs-20.7-mule-4.1b.patch) = ffb90549dad55edef3042a2d68fd29d78b9cb500
 Size (emacs-20.7-mule-4.1b.patch) = 79729 bytes
+SHA1 (emacs-20.7.tar.gz) = ef0168b927fb633bc9b14e2249431f26ff8b8452
+RMD160 (emacs-20.7.tar.gz) = f3b8ea8d6f6ad52ccdd7ca74c84e87a7409fc270
+Size (emacs-20.7.tar.gz) = 15043428 bytes
 SHA1 (emacs20-xim-20000713.diff) = 5bed39e7b8a52941f77088529566aaa3bcf06670
 RMD160 (emacs20-xim-20000713.diff) = 5887a4d43ee92e8cad65d6412c9ecbce08e781da
 Size (emacs20-xim-20000713.diff) = 21296 bytes
@@ -65,3 +65,4 @@ SHA1 (patch-cb) = a7e3926f4b8a107e004b731f2064493e7d436cd4
 SHA1 (patch-cc) = 2b474603b922383b6d239e7e2e14f144bd52df6b
 SHA1 (patch-cd) = 22b29708e0730275984dc2d8e7a304932d6b66fb
 SHA1 (patch-ce) = df4d2a5639a72d2c719662496f17db35686f4ac2
+SHA1 (patch-cf) = d15c7fbbafb75632ba7c2edb2ccaeaff06c202c6
diff --git a/editors/emacs20/patches/patch-cf b/editors/emacs20/patches/patch-cf
new file mode 100644
index 00000000000..cf3203bf1df
--- /dev/null
+++ b/editors/emacs20/patches/patch-cf
@@ -0,0 +1,18 @@
+When running terminfo but compiled for termcap, we cannot assume
+that we actually have anything useable in termcap_term_buffer so just
+use the terminfo fixed size defined ealier.
+
+--- src/term.c	2010-01-14 21:25:59.000000000 +0000
++++ src/term.c	2010-01-14 21:26:27.000000000 +0000
+@@ -1647,11 +1647,7 @@
+ 	     terminal_type);
+ #endif
+     }
+-#ifdef TERMINFO
+   area = (char *) xmalloc (2044);
+-#else
+-  area = (char *) xmalloc (strlen (buffer));
+-#endif /* not TERMINFO */
+   if (area == 0)
+     abort ();
+ 
-- 
cgit v1.2.3