pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/pkgsrc-2006Q1]: pkgsrc/editors Pullup ticket 1452 - requested by markd



details:   https://anonhg.NetBSD.org/pkgsrc/rev/b64191ec26c5
branches:  pkgsrc-2006Q1
changeset: 510237:b64191ec26c5
user:      salo <salo%pkgsrc.org@localhost>
date:      Wed Apr 26 15:20:27 2006 +0000

description:
Pullup ticket 1452 - requested by markd
portability fix for emacs

Revisions pulled up:
- pkgsrc/editors/emacs/Makefile                 1.92
- pkgsrc/editors/emacs/distinfo                 1.27
- pkgsrc/editors/emacs/patches/patch-az         1.14
- pkgsrc/editors/emacs-nox11/Makefile           1.21

   Module Name:         pkgsrc
   Committed By:        markd
   Date:                Wed Apr  5 22:22:16 UTC 2006

   Modified Files:
        pkgsrc/editors/emacs: Makefile distinfo
        pkgsrc/editors/emacs-nox11: Makefile
   Added Files:
        pkgsrc/editors/emacs/patches: patch-az

   Log Message:
   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.

diffstat:

 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(-)

diffs (60 lines):

diff -r e39d7f943d87 -r b64191ec26c5 editors/emacs-nox11/Makefile
--- a/editors/emacs-nox11/Makefile      Wed Apr 26 14:59:05 2006 +0000
+++ b/editors/emacs-nox11/Makefile      Wed Apr 26 15:20:27 2006 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.20 2006/02/05 23:08:55 joerg Exp $
+# $NetBSD: Makefile,v 1.20.2.1 2006/04/26 15:20:27 salo 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 -r e39d7f943d87 -r b64191ec26c5 editors/emacs/Makefile
--- a/editors/emacs/Makefile    Wed Apr 26 14:59:05 2006 +0000
+++ b/editors/emacs/Makefile    Wed Apr 26 15:20:27 2006 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.91 2006/02/20 12:16:24 markd Exp $
+# $NetBSD: Makefile,v 1.91.2.1 2006/04/26 15:20:27 salo Exp $
 
 DISTNAME=      emacs-${EMACSVERSION}a
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    editors
 COMMENT=       GNU editing macros (editor)
 
diff -r e39d7f943d87 -r b64191ec26c5 editors/emacs/distinfo
--- a/editors/emacs/distinfo    Wed Apr 26 14:59:05 2006 +0000
+++ b/editors/emacs/distinfo    Wed Apr 26 15:20:27 2006 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.26 2006/03/25 02:48:22 uebayasi Exp $
+$NetBSD: distinfo,v 1.26.2.1 2006/04/26 15:20:27 salo Exp $
 
 SHA1 (emacs-21.4a.tar.gz) = cdb33731180fe4a912838af805dd35e3f55394d4
 RMD160 (emacs-21.4a.tar.gz) = c312e739935b56d08783bbfe97992297a363cb8a
@@ -22,5 +22,6 @@
 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 -r e39d7f943d87 -r b64191ec26c5 editors/emacs/patches/patch-az
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/editors/emacs/patches/patch-az    Wed Apr 26 15:20:27 2006 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-az,v 1.13.20.1 2006/04/26 15:20:27 salo 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.  */



Home | Main Index | Thread Index | Old Index