summaryrefslogtreecommitdiff
path: root/editors
diff options
context:
space:
mode:
Diffstat (limited to 'editors')
-rw-r--r--editors/emacs-snapshot/Makefile4
-rw-r--r--editors/emacs-snapshot/distinfo3
-rw-r--r--editors/emacs-snapshot/patches/patch-ag14
-rw-r--r--editors/emacs/Makefile4
-rw-r--r--editors/emacs/distinfo3
-rw-r--r--editors/emacs/patches/patch-ag14
-rw-r--r--editors/emacs20/Makefile4
-rw-r--r--editors/emacs20/distinfo9
-rw-r--r--editors/emacs20/patches/patch-cf18
-rw-r--r--editors/emacs21/Makefile4
-rw-r--r--editors/emacs21/distinfo3
-rw-r--r--editors/emacs21/patches/patch-cf18
-rw-r--r--editors/emacs22/Makefile4
-rw-r--r--editors/emacs22/distinfo3
-rw-r--r--editors/emacs22/patches/patch-ba14
15 files changed, 102 insertions, 17 deletions
diff --git a/editors/emacs-snapshot/Makefile b/editors/emacs-snapshot/Makefile
index 1bdd06821be..ae371e3d759 100644
--- a/editors/emacs-snapshot/Makefile
+++ b/editors/emacs-snapshot/Makefile
@@ -1,4 +1,6 @@
-# $NetBSD: Makefile,v 1.7 2010/01/18 19:34:20 minskim Exp $
+# $NetBSD: Makefile,v 1.8 2010/01/20 03:21:21 roy Exp $
+
+PKGREVISION= 1
CONFLICTS+= emacs-nox11-[0-9]*
diff --git a/editors/emacs-snapshot/distinfo b/editors/emacs-snapshot/distinfo
index b9931584fd4..36baa3207a0 100644
--- a/editors/emacs-snapshot/distinfo
+++ b/editors/emacs-snapshot/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.5 2010/01/18 19:34:20 minskim Exp $
+$NetBSD: distinfo,v 1.6 2010/01/20 03:21:21 roy Exp $
SHA1 (emacs-snapshot_20100111.orig.tar.gz) = 9bf3f29885b8577cc2b540352e2398650c1f09ac
RMD160 (emacs-snapshot_20100111.orig.tar.gz) = 5445b39aaf0c3509084f3d1dea7c7f4ff1276951
Size (emacs-snapshot_20100111.orig.tar.gz) = 30259529 bytes
SHA1 (patch-ab) = 53fd489995efae908827d7a3de4811daf156fd0a
SHA1 (patch-ac) = 9378586aa9720beebf19b9d54e94ef4f08e50745
+SHA1 (patch-ag) = a96da5ce63b384aaa55ad901a429b8a2fb590c64
diff --git a/editors/emacs-snapshot/patches/patch-ag b/editors/emacs-snapshot/patches/patch-ag
new file mode 100644
index 00000000000..18eba154d40
--- /dev/null
+++ b/editors/emacs-snapshot/patches/patch-ag
@@ -0,0 +1,14 @@
+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 22:17:00.000000000 +0000
++++ src/term.c 2010-01-14 22:22:09.000000000 +0000
+@@ -3593,7 +3593,6 @@
+ #ifndef TERMINFO
+ if (strlen (tty->termcap_term_buffer) >= buffer_size)
+ abort ();
+- buffer_size = strlen (tty->termcap_term_buffer);
+ #endif
+ tty->termcap_strings_buffer = area = (char *) xmalloc (buffer_size);
+ tty->TS_ins_line = tgetstr ("al", address);
diff --git a/editors/emacs/Makefile b/editors/emacs/Makefile
index a508b034b2f..b64f0a0193c 100644
--- a/editors/emacs/Makefile
+++ b/editors/emacs/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.125 2009/10/07 10:56:40 obache Exp $
+# $NetBSD: Makefile,v 1.126 2010/01/20 03:21:20 roy Exp $
-PKGREVISION= 2
+PKGREVISION= 3
CONFLICTS+= emacs-nox11-[0-9]*
diff --git a/editors/emacs/distinfo b/editors/emacs/distinfo
index ef256c45e0a..2974ad7c124 100644
--- a/editors/emacs/distinfo
+++ b/editors/emacs/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.42 2009/10/07 10:56:40 obache Exp $
+$NetBSD: distinfo,v 1.43 2010/01/20 03:21:20 roy Exp $
SHA1 (emacs-23.1.tar.gz) = e993445d14d2fdedd1418bc32c8c4ea30442bc51
RMD160 (emacs-23.1.tar.gz) = c557149f59916b82f0ae156f87406126b03671b4
@@ -8,3 +8,4 @@ SHA1 (patch-ab) = dcd6903d62b58b5c587001b26f0d300bcb54fe6d
SHA1 (patch-ac) = 9afbc10d2bd0f32cdfde8ae6a32236182dbac558
SHA1 (patch-ae) = 2b016d6b4bb796cf5bddc55f104139e01209adb6
SHA1 (patch-af) = c888cd3863e533d38f437292d9f800bcd3159529
+SHA1 (patch-ag) = a1d242d5781eef4c8c27e8c3bbb6d1cdf105dc32
diff --git a/editors/emacs/patches/patch-ag b/editors/emacs/patches/patch-ag
new file mode 100644
index 00000000000..783fa76db30
--- /dev/null
+++ b/editors/emacs/patches/patch-ag
@@ -0,0 +1,14 @@
+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-06 10:11:04.000000000 +0000
++++ src/term.c 2010-01-06 10:11:53.000000000 +0000
+@@ -3593,7 +3593,6 @@
+ #ifndef TERMINFO
+ if (strlen (tty->termcap_term_buffer) >= buffer_size)
+ abort ();
+- buffer_size = strlen (tty->termcap_term_buffer);
+ #endif
+ tty->termcap_strings_buffer = area = (char *) xmalloc (buffer_size);
+ tty->TS_ins_line = tgetstr ("al", address);
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 ();
+
diff --git a/editors/emacs21/Makefile b/editors/emacs21/Makefile
index e09ce6d2e8f..1bd14e4bea0 100644
--- a/editors/emacs21/Makefile
+++ b/editors/emacs21/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.12 2009/08/26 19:58:43 sno Exp $
+# $NetBSD: Makefile,v 1.13 2010/01/20 03:21:21 roy Exp $
-PKGREVISION= 15
+PKGREVISION= 16
CATEGORIES= editors
COMMENT= GNU editing macros (editor)
diff --git a/editors/emacs21/distinfo b/editors/emacs21/distinfo
index b1fc10ebb30..13d72da0708 100644
--- a/editors/emacs21/distinfo
+++ b/editors/emacs21/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2008/07/13 18:03:01 dholland Exp $
+$NetBSD: distinfo,v 1.8 2010/01/20 03:21:21 roy Exp $
SHA1 (emacs-21.4a.tar.gz) = cdb33731180fe4a912838af805dd35e3f55394d4
RMD160 (emacs-21.4a.tar.gz) = c312e739935b56d08783bbfe97992297a363cb8a
@@ -31,4 +31,5 @@ SHA1 (patch-az) = 43753accb1b9ffc2c63e638c31236b8e4880080b
SHA1 (patch-ba) = ae05985ce8cabffdfbfb84905e1d6b0de7690b25
SHA1 (patch-bb) = bf748292c57459b1240da01f9d3df16e4dc40fa2
SHA1 (patch-bg) = 567ccce83e2b6d898a87f20763d5ff4b19c30deb
+SHA1 (patch-cf) = d15c7fbbafb75632ba7c2edb2ccaeaff06c202c6
SHA1 (patch-xx) = cf1cb21e0bd96202622ff54e39d202bdae78c942
diff --git a/editors/emacs21/patches/patch-cf b/editors/emacs21/patches/patch-cf
new file mode 100644
index 00000000000..cf3203bf1df
--- /dev/null
+++ b/editors/emacs21/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 ();
+
diff --git a/editors/emacs22/Makefile b/editors/emacs22/Makefile
index 323fe337b82..bd07a5823aa 100644
--- a/editors/emacs22/Makefile
+++ b/editors/emacs22/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.4 2009/10/07 10:50:59 obache Exp $
+# $NetBSD: Makefile,v 1.5 2010/01/20 03:21:21 roy Exp $
PKGNAME?= ${DISTNAME}
COMMENT?= GNU editing macros (editor)
DISTNAME= emacs-22.3
-PKGREVISION= 5
+PKGREVISION= 6
CATEGORIES= editors
MASTER_SITES= ${MASTER_SITE_GNU:=emacs/}
diff --git a/editors/emacs22/distinfo b/editors/emacs22/distinfo
index 68b02eb51a5..ec22e058f99 100644
--- a/editors/emacs22/distinfo
+++ b/editors/emacs22/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2009/10/07 10:50:59 obache Exp $
+$NetBSD: distinfo,v 1.6 2010/01/20 03:21:21 roy Exp $
SHA1 (emacs-22.3.tar.gz) = 5e9b3e0205099a83be7198fd43ba1c9442a3feb0
RMD160 (emacs-22.3.tar.gz) = a7eed5099d0cab25f34152f1b18b5c1b4e2e0746
@@ -22,4 +22,5 @@ SHA1 (patch-au) = e4a525ed182c3b8f3f7365ee01e186ad5d1b0c7e
SHA1 (patch-av) = f2fcb0ccbddba1683cc7f1744bca8b171f83c0e7
SHA1 (patch-aw) = 575ffdbf0cf9554dee32aa88fd5a5f49c5ab2bf1
SHA1 (patch-ax) = 4a9a795fd08eedcd83c1c92ede566fd63f365bec
+SHA1 (patch-ba) = 8930ab9f08c93a88db68378f1a5ec97587ebdf16
SHA1 (patch-xx) = 3b66bbad50cef9d248a6f1d49b9d31150e14d6e1
diff --git a/editors/emacs22/patches/patch-ba b/editors/emacs22/patches/patch-ba
new file mode 100644
index 00000000000..0c928bd4b6c
--- /dev/null
+++ b/editors/emacs22/patches/patch-ba
@@ -0,0 +1,14 @@
+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:56:53.000000000 +0000
++++ src/term.c 2010-01-14 21:57:25.000000000 +0000
+@@ -2400,7 +2400,6 @@
+ #ifndef TERMINFO
+ if (strlen (buffer) >= buffer_size)
+ abort ();
+- buffer_size = strlen (buffer);
+ #endif
+ area = (char *) xmalloc (buffer_size);
+