diff options
| author | salo <salo> | 2006-04-26 15:20:27 +0000 |
|---|---|---|
| committer | salo <salo> | 2006-04-26 15:20:27 +0000 |
| commit | 55b0856c08038ade46dec2cdf57714fa00962c42 (patch) | |
| tree | d58c3412dd6eb2efc7407bccab516460e1fecf8d | |
| parent | 13812b761aa194b1dce13679eb8ae6ccd2d57ec0 (diff) | |
| download | pkgsrc-55b0856c08038ade46dec2cdf57714fa00962c42.tar.gz | |
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.
| -rw-r--r-- | editors/emacs-nox11/Makefile | 4 | ||||
| -rw-r--r-- | editors/emacs/Makefile | 4 | ||||
| -rw-r--r-- | editors/emacs/distinfo | 3 | ||||
| -rw-r--r-- | editors/emacs/patches/patch-az | 13 |
4 files changed, 19 insertions, 5 deletions
diff --git a/editors/emacs-nox11/Makefile b/editors/emacs-nox11/Makefile index 9a72e88bef5..d55b687a8e1 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.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 --git a/editors/emacs/Makefile b/editors/emacs/Makefile index ab51c57487d..ad0f89fde8d 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.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 --git a/editors/emacs/distinfo b/editors/emacs/distinfo index 194f375a034..1e5e91453e0 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.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-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..f3ded6a9bc6 --- /dev/null +++ b/editors/emacs/patches/patch-az @@ -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. */ |