Fix LP64 issues.

Add -fno-zero-initialized-in-bss when compiling with gcc3 (this is not
needed for all configurations, but it does never hurt).

Bump PKGREVISION.

10 files changed, 116 insertions, 3 deletions

diff --git a/editors/emacs20/Makefile b/editors/emacs20/Makefile
index ec1be00e033..5df5239ec10 100644
--- a/editors/emacs20/Makefile
+++ b/editors/emacs20/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2004/02/28 20:57:48 kristerw Exp $
+# $NetBSD: Makefile,v 1.12 2004/03/25 22:13:34 kristerw Exp $
 
 DISTNAME=	emacs-20.7
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	editors
 MASTER_SITES=	${MASTER_SITE_GNU:=emacs/} \
 		${MASTER_SITE_LOCAL}
@@ -74,6 +74,11 @@ CONFIGURE_ARGS+=--without-ipv6
 .endif
 MAKE_ENV+=	INSTALL_STRIP=${_STRIPFLAG_INSTALL}
 
+.include "../../mk/compiler.mk"
+.if !empty(CC_VERSION:Mgcc-3.*)
+CFLAGS+=	-fno-zero-initialized-in-bss
+.endif
+
 INFO_FILES=	emacs vip viper forms gnus mh-e cl sc dired-x ediff \
 		    ccmode message widget reftex
 
diff --git a/editors/emacs20/distinfo b/editors/emacs20/distinfo
index cf71759b0e2..03c585bf28f 100644
--- a/editors/emacs20/distinfo
+++ b/editors/emacs20/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2004/02/28 20:57:48 kristerw Exp $
+$NetBSD: distinfo,v 1.5 2004/03/25 22:13:34 kristerw Exp $
 
 SHA1 (emacs-20.7.tar.gz) = ef0168b927fb633bc9b14e2249431f26ff8b8452
 Size (emacs-20.7.tar.gz) = 15043428 bytes
@@ -39,3 +39,11 @@ SHA1 (patch-bo) = f9b8b73af91a445dbf50f9e862b84c7abc2b730e
 SHA1 (patch-bp) = bb7b824378b25ab1229fe21bd888170f023a774c
 SHA1 (patch-bq) = 142a3b447560b617c5d20a40d38e24b6530bf4ba
 SHA1 (patch-br) = c14d33970609c65a22944514bc5b133d024b062e
+SHA1 (patch-bs) = bc8d0b83efd20cf67e657b955def8f3ce329a687
+SHA1 (patch-bt) = 29c8049c6dcd780190774173a1c64c7009685c92
+SHA1 (patch-bu) = 99374b0ca8402f6971c5a56c4e2ed0bc9ba8667e
+SHA1 (patch-bv) = fa51f5ad5152c344e83f056a3c565129a9b7a1ef
+SHA1 (patch-bw) = 5de9f12d129b2f13a1d9c1702c7a889cd6b922f4
+SHA1 (patch-bx) = 27713e1812240f9ed137aa793cbb5a4fa2cad33b
+SHA1 (patch-by) = a383206a32e902c448a1b529cf1eefc485f5beab
+SHA1 (patch-bz) = ef28314afc69c37da92ec208252e477bbb522458
diff --git a/editors/emacs20/patches/patch-bs b/editors/emacs20/patches/patch-bs
new file mode 100644
index 00000000000..f0d3ac44e8d
--- /dev/null
+++ b/editors/emacs20/patches/patch-bs
@@ -0,0 +1,12 @@
+$NetBSD: patch-bs,v 1.1 2004/03/25 22:13:34 kristerw Exp $
+
+--- src/xmenu.c.orig	2004-03-25 22:06:49.000000000 +0100
++++ src/xmenu.c	2004-03-25 22:07:45.000000000 +0100
+@@ -35,6 +35,7 @@
+ #include <config.h>
+ 
+ #include <stdio.h>
++#include <stdlib.h>
+ #include "lisp.h"
+ #include "termhooks.h"
+ #include "frame.h"
diff --git a/editors/emacs20/patches/patch-bt b/editors/emacs20/patches/patch-bt
new file mode 100644
index 00000000000..edefcdc39b9
--- /dev/null
+++ b/editors/emacs20/patches/patch-bt
@@ -0,0 +1,14 @@
+$NetBSD: patch-bt,v 1.1 2004/03/25 22:13:34 kristerw Exp $
+
+--- src/buffer.h.orig	1998-10-08 08:44:42.000000000 +0200
++++ src/buffer.h	2004-03-25 22:51:09.000000000 +0100
+@@ -762,6 +762,9 @@
+ /* Allocation of buffer text.  */
+ 
+ #ifdef REL_ALLOC
++void* r_alloc(void*, unsigned long);
++void r_alloc_free(void*);
++void* r_re_alloc(void*, unsigned long);
+ #define BUFFER_ALLOC(data,size) ((unsigned char *) r_alloc (&data, (size)))
+ #define BUFFER_REALLOC(data,size) ((unsigned char *) r_re_alloc (&data, (size)))
+ #define BUFFER_FREE(data) (r_alloc_free (&data))
diff --git a/editors/emacs20/patches/patch-bu b/editors/emacs20/patches/patch-bu
new file mode 100644
index 00000000000..839431ec7fa
--- /dev/null
+++ b/editors/emacs20/patches/patch-bu
@@ -0,0 +1,12 @@
+$NetBSD: patch-bu,v 1.1 2004/03/25 22:13:34 kristerw Exp $
+
+--- src/xterm.c.orig	2004-03-25 22:14:27.000000000 +0100
++++ src/xterm.c	2004-03-25 22:14:43.000000000 +0100
+@@ -28,6 +28,7 @@
+ #include <config.h>
+ 
+ #include <stdio.h>
++#include <stdlib.h>
+ 
+ #ifdef HAVE_X_WINDOWS
+ 
diff --git a/editors/emacs20/patches/patch-bv b/editors/emacs20/patches/patch-bv
new file mode 100644
index 00000000000..99c903a5d1e
--- /dev/null
+++ b/editors/emacs20/patches/patch-bv
@@ -0,0 +1,13 @@
+$NetBSD: patch-bv,v 1.1 2004/03/25 22:13:34 kristerw Exp $
+
+--- src/ralloc.c.orig	2004-03-25 22:18:49.000000000 +0100
++++ src/ralloc.c	2004-03-25 22:20:22.000000000 +0100
+@@ -80,6 +80,8 @@
+ 
+ #endif	/* not emacs */
+ 
++#include <stdlib.h>
++
+ #include "getpagesize.h"
+ 
+ #define NIL ((POINTER) 0)
diff --git a/editors/emacs20/patches/patch-bw b/editors/emacs20/patches/patch-bw
new file mode 100644
index 00000000000..e7b901959b5
--- /dev/null
+++ b/editors/emacs20/patches/patch-bw
@@ -0,0 +1,12 @@
+$NetBSD: patch-bw,v 1.1 2004/03/25 22:13:34 kristerw Exp $
+
+--- lwlib/lwlib-utils.c.orig	2004-03-25 22:58:34.000000000 +0100
++++ lwlib/lwlib-utils.c	2004-03-25 22:59:20.000000000 +0100
+@@ -29,6 +29,7 @@
+ #undef index
+ #undef rindex
+ 
++#include <stdlib.h>
+ #include <X11/Xatom.h>
+ #include <X11/IntrinsicP.h>
+ #include <X11/ObjectP.h>
diff --git a/editors/emacs20/patches/patch-bx b/editors/emacs20/patches/patch-bx
new file mode 100644
index 00000000000..bf091afed8c
--- /dev/null
+++ b/editors/emacs20/patches/patch-bx
@@ -0,0 +1,13 @@
+$NetBSD: patch-bx,v 1.1 2004/03/25 22:13:34 kristerw Exp $
+
+--- src/tparam.c.orig	2004-03-25 22:23:54.000000000 +0100
++++ src/tparam.c	2004-03-25 22:26:40.000000000 +0100
+@@ -36,6 +36,8 @@
+ 
+ #endif /* not emacs */
+ 
++#include "lisp.h"
++
+ #ifndef NULL
+ #define NULL (char *) 0
+ #endif
diff --git a/editors/emacs20/patches/patch-by b/editors/emacs20/patches/patch-by
new file mode 100644
index 00000000000..538fbeb3cd7
--- /dev/null
+++ b/editors/emacs20/patches/patch-by
@@ -0,0 +1,12 @@
+$NetBSD: patch-by,v 1.1 2004/03/25 22:13:34 kristerw Exp $
+
+--- lib-src/make-docfile.c.orig	2004-03-25 22:56:07.000000000 +0100
++++ lib-src/make-docfile.c	2004-03-25 22:56:42.000000000 +0100
+@@ -36,6 +36,7 @@
+ #include <../src/config.h>
+ 
+ #include <stdio.h>
++#include <stdlib.h>
+ #ifdef MSDOS
+ #include <fcntl.h>
+ #endif /* MSDOS */
diff --git a/editors/emacs20/patches/patch-bz b/editors/emacs20/patches/patch-bz
new file mode 100644
index 00000000000..e605cfcc9ee
--- /dev/null
+++ b/editors/emacs20/patches/patch-bz
@@ -0,0 +1,12 @@
+$NetBSD: patch-bz,v 1.1 2004/03/25 22:13:34 kristerw Exp $
+
+--- lib-src/emacsserver.c.orig	2004-03-25 22:57:10.000000000 +0100
++++ lib-src/emacsserver.c	2004-03-25 22:57:32.000000000 +0100
+@@ -26,6 +26,7 @@
+    up to the Emacs which then executes them.  */
+ 
+ #define NO_SHORTNAMES
++#include <stdlib.h>
+ #include <signal.h>
+ #include <../src/config.h>
+ #undef read