Fix glaring LP64 problems; build no longer hangs on amd64 as reported

in PR 44682.

7 files changed, 124 insertions, 13 deletions

diff --git a/mail/mailagent/Makefile b/mail/mailagent/Makefile
index de016849940..524cdefe6d7 100644
--- a/mail/mailagent/Makefile
+++ b/mail/mailagent/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.20 2010/10/09 07:26:04 obache Exp $
+# $NetBSD: Makefile,v 1.21 2011/03/06 03:47:26 dholland Exp $
 
 DISTNAME=		mailagent-3.0.73
+PKGREVISION=		1
 CATEGORIES=		mail
 MASTER_SITES=		${MASTER_SITE_PERL_CPAN:S/by-module/by-authors\/id\/RAM/g}
 
diff --git a/mail/mailagent/distinfo b/mail/mailagent/distinfo
index 98186d9dc49..a889ac29155 100644
--- a/mail/mailagent/distinfo
+++ b/mail/mailagent/distinfo
@@ -1,10 +1,13 @@
-$NetBSD: distinfo,v 1.3 2005/02/24 09:59:23 agc Exp $
+$NetBSD: distinfo,v 1.4 2011/03/06 03:47:26 dholland Exp $
 
 SHA1 (mailagent-3.0.73.tar.gz) = c8a0329d79c98cb25bb53c79f06fcd63df58c418
 RMD160 (mailagent-3.0.73.tar.gz) = 70b2804fdd0602a20cb5a9f3391d460f47972570
 Size (mailagent-3.0.73.tar.gz) = 533579 bytes
-SHA1 (patch-aa) = 83e2e7725f2f69fd5174c708d3e146f2a1db34e4
-SHA1 (patch-ac) = eb44cf215dd18fc6ea1179ef05251a1eb0d0cbf5
+SHA1 (patch-aa) = 3a54c5549bb38050871546b9ab9b58c30349c7a7
+SHA1 (patch-ab) = 06234ca205484e24dc175d828c6ecc82d4dc3342
+SHA1 (patch-ac) = 2431b92220a17eb8125eb31fabbd4a0827a150b3
+SHA1 (patch-ad) = d3e3e39c41219f8cbcff506046e2f00c0d659792
+SHA1 (patch-ae) = 9ba2345d2446321d7777bad4be74e8e8012529be
 SHA1 (patch-ag) = 2b7a56038d697f70f6aff2bd3538609a649f389d
 SHA1 (patch-ah) = 3c147f73ed410fe810b303da0be53d53f3ee5aa5
 SHA1 (patch-ai) = 5567148613abb872caff6b9869a4593f2ebdd5ec
diff --git a/mail/mailagent/patches/patch-aa b/mail/mailagent/patches/patch-aa
index 9b8a901c694..d7fd10f9e96 100644
--- a/mail/mailagent/patches/patch-aa
+++ b/mail/mailagent/patches/patch-aa
@@ -1,8 +1,21 @@
-$NetBSD: patch-aa,v 1.3 2001/04/08 00:24:56 itojun Exp $
+$NetBSD: patch-aa,v 1.4 2011/03/06 03:47:27 dholland Exp $
 
---- agent/filter/logfile.c.orig	Sun Mar 18 03:31:21 2001
-+++ agent/filter/logfile.c	Sun Apr  8 09:10:12 2001
-@@ -71,6 +71,9 @@
+Header fixes.
+
+--- agent/filter/logfile.c.orig	2001-03-17 18:31:21.000000000 +0000
++++ agent/filter/logfile.c
+@@ -45,6 +45,10 @@
+ #include "config.h"
+ #include "portable.h"
+ #include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
++#include <errno.h>
++#include <time.h>
+ #include <sys/types.h>
+ 
+ #ifdef I_TIME
+@@ -71,6 +75,9 @@
  #include <sys/fcntl.h>	/* Try this one in last resort */
  #endif
  #endif
@@ -12,3 +25,14 @@ $NetBSD: patch-aa,v 1.3 2001/04/08 00:24:56 itojun Exp $
  
  #include "confmagic.h"
  
+@@ -86,10 +93,7 @@ private int add_errcode();			/* Print th
+ public char *progname = "ram";	/* Program name */
+ public Pid_t progpid = 0;		/* Program PID */
+ 
+-extern Time_t time();			/* Time in seconds since the Epoch */
+-extern char *malloc();			/* Memory allocation */
+ extern char *strsave();			/* Save string in memory */
+-extern int errno;				/* System error report variable */
+ 
+ /* VARARGS2 */
+ public void add_log(level, format, arg1, arg2, arg3, arg4, arg5)
diff --git a/mail/mailagent/patches/patch-ab b/mail/mailagent/patches/patch-ab
new file mode 100644
index 00000000000..893936ce6fb
--- /dev/null
+++ b/mail/mailagent/patches/patch-ab
@@ -0,0 +1,20 @@
+$NetBSD: patch-ab,v 1.1 2011/03/06 03:47:27 dholland Exp $
+
+--- agent/filter/environ.c~	2001-03-17 18:31:20.000000000 +0000
++++ agent/filter/environ.c
+@@ -38,6 +38,7 @@
+ #include "portable.h"
+ #include "hash.h"
+ #include <stdio.h>
++#include <stdlib.h>
+ 
+ #ifdef I_STRING
+ #include <string.h>
+@@ -56,7 +57,6 @@
+  */
+ private struct htable henv;			/* The associative array for env */
+ 
+-extern char *malloc();				/* Memory allocation */
+ extern char *strsave();				/* String saving */
+ 
+ public void print_env(fd, envp)
diff --git a/mail/mailagent/patches/patch-ac b/mail/mailagent/patches/patch-ac
index 466601d646a..c9677cb595c 100644
--- a/mail/mailagent/patches/patch-ac
+++ b/mail/mailagent/patches/patch-ac
@@ -1,8 +1,16 @@
-$NetBSD: patch-ac,v 1.3 2001/04/08 00:24:56 itojun Exp $
+$NetBSD: patch-ac,v 1.4 2011/03/06 03:47:27 dholland Exp $
 
---- agent/filter/io.c.orig	Sun Mar 18 03:31:20 2001
-+++ agent/filter/io.c	Sun Apr  8 09:11:37 2001
-@@ -130,6 +130,9 @@
+--- agent/filter/io.c.orig	2001-03-17 18:31:20.000000000 +0000
++++ agent/filter/io.c
+@@ -97,6 +97,7 @@
+ #include "portable.h"
+ #include <sys/types.h>
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <errno.h>
+ #include <sys/stat.h>
+ 
+@@ -130,6 +131,9 @@
  #ifdef I_SYS_IOCTL
  #include <sys/ioctl.h>
  #endif
@@ -12,7 +20,17 @@ $NetBSD: patch-ac,v 1.3 2001/04/08 00:24:56 itojun Exp $
  
  /*
   * The following should be defined in <sys/stat.h>.
-@@ -724,7 +727,7 @@
+@@ -217,9 +221,6 @@ struct pool {
+ private int queued = 0;			/* True when mail queued safely */
+ private struct mail mail;		/* Where mail is expected to lie */
+ 
+-extern int errno;				/* System call error status */
+-extern char *malloc();			/* Memory allocation */
+-extern char *realloc();			/* Re-allocation of memory pool */
+ extern char *logname();			/* User's login name */
+ extern char *strsave();			/* Save string somewhere in core */
+ extern int loglvl;				/* Logging level */
+@@ -724,7 +725,7 @@ char *location;
  	 */
  
  	char **envp;			/* Environment pointer */
diff --git a/mail/mailagent/patches/patch-ad b/mail/mailagent/patches/patch-ad
new file mode 100644
index 00000000000..3f75074b459
--- /dev/null
+++ b/mail/mailagent/patches/patch-ad
@@ -0,0 +1,23 @@
+$NetBSD: patch-ad,v 1.1 2011/03/06 03:47:27 dholland Exp $
+
+--- agent/filter/hash.c~	2001-03-17 18:31:20.000000000 +0000
++++ agent/filter/hash.c
+@@ -27,6 +27,9 @@
+  *
+  */
+ 
++#include <stdlib.h>
++#include <string.h>
++
+ #include "config.h"
+ #include "portable.h"
+ #include "hash.h"
+@@ -41,8 +44,6 @@ private uint32 hashcode();			/* The hahs
+ private int prime();				/* Is a number a prime one? */
+ private uint32 nprime();			/* Find next prime number */
+ 
+-extern char *malloc();				/* Memory allocation */
+-extern char *calloc();				/* Character allocation */
+ extern char *strsave();				/* Save string in memory */
+ 
+ public int ht_create(ht, n)
diff --git a/mail/mailagent/patches/patch-ae b/mail/mailagent/patches/patch-ae
new file mode 100644
index 00000000000..9aee28c045f
--- /dev/null
+++ b/mail/mailagent/patches/patch-ae
@@ -0,0 +1,22 @@
+$NetBSD: patch-ae,v 1.1 2011/03/06 03:47:27 dholland Exp $
+
+--- agent/filter/misc.c~	2001-03-17 18:31:21.000000000 +0000
++++ agent/filter/misc.c
+@@ -36,14 +36,15 @@
+  *
+  */
+ 
++#include <stdlib.h>
++#include <string.h>
++
+ #include "config.h"
+ #include "portable.h"
+ #include <ctype.h>
+ #include "sysexits.h"
+ #include "confmagic.h"
+ 
+-extern char *malloc();				/* Memory allocation */
+-
+ public char *strsave(string)
+ char *string;
+ {