Fix broken build (and some related problems) on 64-bit platforms.

4 files changed, 69 insertions, 1 deletions

diff --git a/mail/elm/distinfo b/mail/elm/distinfo
index 42dee01b793..37a03cf7377 100644
--- a/mail/elm/distinfo
+++ b/mail/elm/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.12 2006/07/17 17:41:00 wiz Exp $
+$NetBSD: distinfo,v 1.13 2008/07/21 05:35:37 dholland Exp $
 
 SHA1 (elm2.5.8.tar.gz) = bf09df75d0dc9097a1e69591bfb4872f860e00c7
 RMD160 (elm2.5.8.tar.gz) = c12dbefd0bf9d47ee4438673507a4693c4a6808c
@@ -16,3 +16,6 @@ SHA1 (patch-aj) = e129e633f8def8cd529b03014d6818b1eb59d220
 SHA1 (patch-ak) = 7e3fe79d140cd205a910b8a9a56327dc19e3359e
 SHA1 (patch-al) = fe79a8d235c815728398e8052005755ea44c257a
 SHA1 (patch-am) = d406ae06488b85b33b03d860b37398849dce7832
+SHA1 (patch-an) = d33ce57ed4e86e5b7a7f5347250458c51d19ec0d
+SHA1 (patch-ao) = 001eee84bc6e6239cfed31d4d9bf571a00220af0
+SHA1 (patch-ap) = 6240a5d8a0d376bc896c3f18e6ed6bed597d758e
diff --git a/mail/elm/patches/patch-an b/mail/elm/patches/patch-an
new file mode 100644
index 00000000000..4951be6c217
--- /dev/null
+++ b/mail/elm/patches/patch-an
@@ -0,0 +1,13 @@
+$NetBSD: patch-an,v 1.1 2008/07/21 05:35:37 dholland Exp $
+
+--- nls/gencat/genlib.c.orig	2005-08-18 08:49:24.000000000 -0400
++++ nls/gencat/genlib.c	2008-07-21 01:07:43.000000000 -0400
+@@ -42,6 +42,8 @@
+ #include <stdio.h>
+ #include <sys/types.h>
+ #if defined(SYSV) || defined(__STDC__)
++# include <stdlib.h>
++# include <string.h>
+ # include <fcntl.h>
+ # include <unistd.h>
+ # define L_SET SEEK_SET
diff --git a/mail/elm/patches/patch-ao b/mail/elm/patches/patch-ao
new file mode 100644
index 00000000000..3b05b2304d9
--- /dev/null
+++ b/mail/elm/patches/patch-ao
@@ -0,0 +1,31 @@
+$NetBSD: patch-ao,v 1.1 2008/07/21 05:35:37 dholland Exp $
+
+--- lib/msgcat.c.orig	2005-08-18 08:49:24.000000000 -0400
++++ lib/msgcat.c	2008-07-21 01:22:41.000000000 -0400
+@@ -60,6 +60,8 @@ up-to-date.  Many thanks.
+ #include <sys/stat.h>
+ #include <fcntl.h>
+ #include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
+ 
+ #ifdef MIPS
+ #include <unistd.h>
+@@ -86,8 +88,6 @@ char	*MCAppPath = NULL;
+ static nl_catd loadCat();
+ static nl_catd loadSet();
+ 
+-extern char *malloc(), *getenv();
+-    
+ nl_catd 	catopen( name, type)
+ char *name;
+ int type;
+@@ -283,7 +283,7 @@ nl_catd catd;
+     for (i = 0; i < cat->numSets; ++i) {
+ 	set = cat->sets + i;
+ 	if (!set->invalid) {
+-	    free(set->data);
++	    free(set->data.str);
+ 	    free(set->u.msgs);
+ 	}
+     }
diff --git a/mail/elm/patches/patch-ap b/mail/elm/patches/patch-ap
new file mode 100644
index 00000000000..20365f789ea
--- /dev/null
+++ b/mail/elm/patches/patch-ap
@@ -0,0 +1,21 @@
+$NetBSD: patch-ap,v 1.1 2008/07/21 05:35:37 dholland Exp $
+
+--- src/savecopy.c~	2005-08-18 08:49:24.000000000 -0400
++++ src/savecopy.c	2008-07-21 01:27:53.000000000 -0400
+@@ -51,6 +51,7 @@ static char rcsid[] = "@(#)$Id: savecopy
+ 
+ 
+ char *format_long();
++char *address_to_alias P_((char *address));
+ 
+ static const char *cf_english P_((const char *));
+ 
+@@ -81,7 +82,7 @@ int form;
+ 	/* if save_by_name or save_by_alias wanted */
+ 	if((strcmp(fname_dest, "=") == 0)  || (strcmp(fname_dest, "=?") == 0)) {
+ 	    if ((save_by_alias &&
+-		   (return_alias = (char *) address_to_alias(shdr->expanded_to)) != NULL))
++		   (return_alias = address_to_alias(shdr->expanded_to)) != NULL))
+ 		strcpy(buffer, return_alias);
+ 	    else
+ 	        if (save_by_name)