From bc998c9be31c5fa3004155b8cab60ca8983134a4 Mon Sep 17 00:00:00 2001
From: markd <markd@pkgsrc.org>
Date: Wed, 5 Apr 2006 22:22:16 +0000
Subject: Pass the correct sized argument to sbrk() when trying to reduce the
 break so that on 64bit systems it is actually a negative number, not a very
 large positive one.  Should fix PR pkg/29351. Thanks to Martijn van Buul for
 giving me access to an amd64 box so I could track this down.  Bump
 PKGREVISION.

---
 editors/emacs-nox11/Makefile   |  4 ++--
 editors/emacs/Makefile         |  4 ++--
 editors/emacs/distinfo         |  3 ++-
 editors/emacs/patches/patch-az | 13 +++++++++++++
 4 files changed, 19 insertions(+), 5 deletions(-)
 create mode 100644 editors/emacs/patches/patch-az

(limited to 'editors')

diff --git a/editors/emacs-nox11/Makefile b/editors/emacs-nox11/Makefile
index 9a72e88bef5..29368dda7ce 100644
--- a/editors/emacs-nox11/Makefile
+++ b/editors/emacs-nox11/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.20 2006/02/05 23:08:55 joerg Exp $
+# $NetBSD: Makefile,v 1.21 2006/04/05 22:22:16 markd Exp $
 
 DISTNAME=	emacs-${EMACSVERSION}a
 PKGNAME=	emacs-nox11-${EMACSVERSION}a
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	editors
 COMMENT=	GNU editing macros (editor) - non X11 version
 
diff --git a/editors/emacs/Makefile b/editors/emacs/Makefile
index ab51c57487d..a7ff624edc6 100644
--- a/editors/emacs/Makefile
+++ b/editors/emacs/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.91 2006/02/20 12:16:24 markd Exp $
+# $NetBSD: Makefile,v 1.92 2006/04/05 22:22:16 markd Exp $
 
 DISTNAME=	emacs-${EMACSVERSION}a
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	editors
 COMMENT=	GNU editing macros (editor)
 
diff --git a/editors/emacs/distinfo b/editors/emacs/distinfo
index 194f375a034..97a59e1c010 100644
--- a/editors/emacs/distinfo
+++ b/editors/emacs/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.26 2006/03/25 02:48:22 uebayasi Exp $
+$NetBSD: distinfo,v 1.27 2006/04/05 22:22:16 markd Exp $
 
 SHA1 (emacs-21.4a.tar.gz) = cdb33731180fe4a912838af805dd35e3f55394d4
 RMD160 (emacs-21.4a.tar.gz) = c312e739935b56d08783bbfe97992297a363cb8a
@@ -22,5 +22,6 @@ SHA1 (patch-as) = 15ab1dcc2d6a445b119b7f2bb8a8331b4aa1fbd0
 SHA1 (patch-at) = bdd1bf7eea72a0b81677817d9b36cddaa07a189c
 SHA1 (patch-au) = e5d90961b4d78c37dec196097a16e0b6ac22e3bb
 SHA1 (patch-av) = 9b6ea439df406a55310e2ca1af45ed56f1663263
+SHA1 (patch-az) = 43753accb1b9ffc2c63e638c31236b8e4880080b
 SHA1 (patch-bg) = 567ccce83e2b6d898a87f20763d5ff4b19c30deb
 SHA1 (patch-xx) = cf1cb21e0bd96202622ff54e39d202bdae78c942
diff --git a/editors/emacs/patches/patch-az b/editors/emacs/patches/patch-az
new file mode 100644
index 00000000000..83b044fe648
--- /dev/null
+++ b/editors/emacs/patches/patch-az
@@ -0,0 +1,13 @@
+$NetBSD: patch-az,v 1.14 2006/04/05 22:22:16 markd Exp $
+
+--- src/ralloc.c.orig	2001-02-20 01:19:40.000000000 +1300
++++ src/ralloc.c
+@@ -328,7 +328,7 @@ static void
+ relinquish ()
+ {
+   register heap_ptr h;
+-  int excess = 0;
++  long excess = 0;
+ 
+   /* Add the amount of space beyond break_value
+      in all heaps which have extend beyond break_value at all.  */
-- 
cgit v1.2.3