CVS commit: pkgsrc/editors/emacs20

["David A. Holland" <dholland%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   dholland
Date:           Wed Dec 29 03:26:32 UTC 2021

Modified Files:
        pkgsrc/editors/emacs20: distinfo
        pkgsrc/editors/emacs20/patches: patch-br

Log Message:
emacs20: Fix broken build on alpha.


To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.41 pkgsrc/editors/emacs20/distinfo
cvs rdiff -u -r1.1.1.1 -r1.2 pkgsrc/editors/emacs20/patches/patch-br

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/editors/emacs20/distinfo
diff -u pkgsrc/editors/emacs20/distinfo:1.40 pkgsrc/editors/emacs20/distinfo:1.41
--- pkgsrc/editors/emacs20/distinfo:1.40        Sat Dec 25 22:11:50 2021
+++ pkgsrc/editors/emacs20/distinfo     Wed Dec 29 03:26:32 2021
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.40 2021/12/25 22:11:50 dholland Exp $
+$NetBSD: distinfo,v 1.41 2021/12/29 03:26:32 dholland Exp $
 
 BLAKE2s (emacs-20.7-mule-4.1b-elc.tar.gz) = 8d3116a8037014bdeece76148aeb0ae72adcb003fd67922650793302197d62bf
 SHA512 (emacs-20.7-mule-4.1b-elc.tar.gz) = db4020ef7e428c99dffd3873485ce5d0ee4ad2c2bf87ec3b5f84dbf36fa2c398f3c0e02651cae3565acd2e7cbf504f66507c08b578f91247e9a27280226fb8d4
@@ -44,7 +44,7 @@ SHA1 (patch-bj) = 6dba88723ee632b67fcf6a
 SHA1 (patch-bl) = f2cd03713d7cdb6cb41119569031249d7d708b13
 SHA1 (patch-bm) = 2f00f63120a90477c6f5c63ac6ca23fc508b9e54
 SHA1 (patch-bp) = 7b9ad94ac9d09fbb2173fdd3efd04faa0a668a91
-SHA1 (patch-br) = c14d33970609c65a22944514bc5b133d024b062e
+SHA1 (patch-br) = f8b100fda2e3eb1ea8da4af3ba45e6dba1f8807c
 SHA1 (patch-bs) = d588828d66a4aa1f18a7df74bb1527e45b9c9d2a
 SHA1 (patch-bt) = 29c8049c6dcd780190774173a1c64c7009685c92
 SHA1 (patch-bx) = 27713e1812240f9ed137aa793cbb5a4fa2cad33b

Index: pkgsrc/editors/emacs20/patches/patch-br
diff -u pkgsrc/editors/emacs20/patches/patch-br:1.1.1.1 pkgsrc/editors/emacs20/patches/patch-br:1.2
--- pkgsrc/editors/emacs20/patches/patch-br:1.1.1.1     Fri Apr 11 00:31:45 2003
+++ pkgsrc/editors/emacs20/patches/patch-br     Wed Dec 29 03:26:32 2021
@@ -1,8 +1,19 @@
-$NetBSD: patch-br,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
+$NetBSD: patch-br,v 1.2 2021/12/29 03:26:32 dholland Exp $
 
---- src/m/alpha.h.orig Fri Feb  4 12:25:47 2000
-+++ src/m/alpha.h      Fri Jul 19 02:56:24 2002
-@@ -147,7 +147,9 @@
+- Fix extra declarations of allocator functions that are out of sync
+with the rest of the tree.
+
+- Disable -fno-common on NetBSD (XXX why? The patch's original commit
+message from 2002 says
+    -fno-common is not necessary on NetBSD/alpha (or any ELF platform,
+     really)
+but I don't see why that's true given the associated comment, which
+seems valid. (Or at least it is for alpha and mips, where non-library
+code is built as PIC.)
+
+--- src/m/alpha.h.orig 2000-02-04 12:25:47.000000000 +0000
++++ src/m/alpha.h
+@@ -147,7 +147,9 @@ NOTE-END
     GNU libc, __malloc_initialized would normally be resolved to the
     shared library's .bss section, which is fatal.  */
  # ifdef __GNUC__
@@ -13,3 +24,15 @@ $NetBSD: patch-br,v 1.1.1.1 2003/04/11 0
  # else
  #  error What gives?  Fix me if DEC Unix supports ELF now.
  # endif
+@@ -279,8 +281,9 @@ extern long *xmalloc (), *xrealloc ();
+ /* "char *" because ralloc.c defines it that way.  gmalloc.c thinks it
+    is allowed to prototype these as "void *" so we don't prototype in
+    that case.  You're right: it stinks!  */
+-extern char *r_alloc (), *r_re_alloc ();
+-extern void r_alloc_free ();
++extern void *r_alloc(void *, unsigned long);
++extern void *r_re_alloc(void *, unsigned long);
++extern void r_alloc_free(void *);
+ #endif /* not _MALLOC_INTERNAL */
+ #endif /* REL_ALLOC */
+