Sun Mar 6 03:47:27 2011 UTC ()
Fix glaring LP64 problems; build no longer hangs on amd64 as reported
in PR 44682.


(dholland)
diff -r1.20 -r1.21 pkgsrc/mail/mailagent/Makefile
diff -r1.3 -r1.4 pkgsrc/mail/mailagent/distinfo
diff -r1.3 -r1.4 pkgsrc/mail/mailagent/patches/patch-aa
diff -r1.3 -r1.4 pkgsrc/mail/mailagent/patches/patch-ac
diff -r0 -r1.1 pkgsrc/mail/mailagent/patches/patch-ab
diff -r0 -r1.1 pkgsrc/mail/mailagent/patches/patch-ad
diff -r0 -r1.1 pkgsrc/mail/mailagent/patches/patch-ae
cvs diff -r1.20 -r1.21 pkgsrc/mail/mailagent/Makefile (expand / switch to unified diff)

--- pkgsrc/mail/mailagent/Makefile 2010/10/09 07:26:04 1.20
+++ pkgsrc/mail/mailagent/Makefile 2011/03/06 03:47:26 1.21
@@ -1,16 +1,17 @@ @@ -1,16 +1,17 @@
1# $NetBSD: Makefile,v 1.20 2010/10/09 07:26:04 obache Exp $ 1# $NetBSD: Makefile,v 1.21 2011/03/06 03:47:26 dholland Exp $
2 2
3DISTNAME= mailagent-3.0.73 3DISTNAME= mailagent-3.0.73
 4PKGREVISION= 1
4CATEGORIES= mail 5CATEGORIES= mail
5MASTER_SITES= ${MASTER_SITE_PERL_CPAN:S/by-module/by-authors\/id\/RAM/g} 6MASTER_SITES= ${MASTER_SITE_PERL_CPAN:S/by-module/by-authors\/id\/RAM/g}
6 7
7MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
8COMMENT= Sophisticated automatic mail-processing tool 9COMMENT= Sophisticated automatic mail-processing tool
9 10
10PKG_DESTDIR_SUPPORT= user-destdir 11PKG_DESTDIR_SUPPORT= user-destdir
11 12
12USE_TOOLS+= perl:run 13USE_TOOLS+= perl:run
13 14
14RESTRICTED= Correct FQDN needs to be hardcoded 15RESTRICTED= Correct FQDN needs to be hardcoded
15NO_BIN_ON_FTP= ${RESTRICTED} 16NO_BIN_ON_FTP= ${RESTRICTED}
16NO_BIN_ON_CDROM= ${RESTRICTED} 17NO_BIN_ON_CDROM= ${RESTRICTED}
cvs diff -r1.3 -r1.4 pkgsrc/mail/mailagent/distinfo (expand / switch to unified diff)

--- pkgsrc/mail/mailagent/distinfo 2005/02/24 09:59:23 1.3
+++ pkgsrc/mail/mailagent/distinfo 2011/03/06 03:47:26 1.4
@@ -1,14 +1,17 @@ @@ -1,14 +1,17 @@
1$NetBSD: distinfo,v 1.3 2005/02/24 09:59:23 agc Exp $ 1$NetBSD: distinfo,v 1.4 2011/03/06 03:47:26 dholland Exp $
2 2
3SHA1 (mailagent-3.0.73.tar.gz) = c8a0329d79c98cb25bb53c79f06fcd63df58c418 3SHA1 (mailagent-3.0.73.tar.gz) = c8a0329d79c98cb25bb53c79f06fcd63df58c418
4RMD160 (mailagent-3.0.73.tar.gz) = 70b2804fdd0602a20cb5a9f3391d460f47972570 4RMD160 (mailagent-3.0.73.tar.gz) = 70b2804fdd0602a20cb5a9f3391d460f47972570
5Size (mailagent-3.0.73.tar.gz) = 533579 bytes 5Size (mailagent-3.0.73.tar.gz) = 533579 bytes
6SHA1 (patch-aa) = 83e2e7725f2f69fd5174c708d3e146f2a1db34e4 6SHA1 (patch-aa) = 3a54c5549bb38050871546b9ab9b58c30349c7a7
7SHA1 (patch-ac) = eb44cf215dd18fc6ea1179ef05251a1eb0d0cbf5 7SHA1 (patch-ab) = 06234ca205484e24dc175d828c6ecc82d4dc3342
 8SHA1 (patch-ac) = 2431b92220a17eb8125eb31fabbd4a0827a150b3
 9SHA1 (patch-ad) = d3e3e39c41219f8cbcff506046e2f00c0d659792
 10SHA1 (patch-ae) = 9ba2345d2446321d7777bad4be74e8e8012529be
8SHA1 (patch-ag) = 2b7a56038d697f70f6aff2bd3538609a649f389d 11SHA1 (patch-ag) = 2b7a56038d697f70f6aff2bd3538609a649f389d
9SHA1 (patch-ah) = 3c147f73ed410fe810b303da0be53d53f3ee5aa5 12SHA1 (patch-ah) = 3c147f73ed410fe810b303da0be53d53f3ee5aa5
10SHA1 (patch-ai) = 5567148613abb872caff6b9869a4593f2ebdd5ec 13SHA1 (patch-ai) = 5567148613abb872caff6b9869a4593f2ebdd5ec
11SHA1 (patch-aj) = cf12ed5cbc336c365cffde62476fe7c19e348766 14SHA1 (patch-aj) = cf12ed5cbc336c365cffde62476fe7c19e348766
12SHA1 (patch-ak) = b5f64263fda76827a1ed68b16f48f8970de3dd19 15SHA1 (patch-ak) = b5f64263fda76827a1ed68b16f48f8970de3dd19
13SHA1 (patch-al) = db3f6453b5bc324587b967109dcc0e971ae51ac2 16SHA1 (patch-al) = db3f6453b5bc324587b967109dcc0e971ae51ac2
14SHA1 (patch-am) = e3857d6b364a3a22b9e82abb2c30297010a48a57 17SHA1 (patch-am) = e3857d6b364a3a22b9e82abb2c30297010a48a57
cvs diff -r1.3 -r1.4 pkgsrc/mail/mailagent/patches/patch-aa (expand / switch to unified diff)

--- pkgsrc/mail/mailagent/patches/patch-aa 2001/04/08 00:24:56 1.3
+++ pkgsrc/mail/mailagent/patches/patch-aa 2011/03/06 03:47:27 1.4
@@ -1,14 +1,38 @@ @@ -1,14 +1,38 @@
1$NetBSD: patch-aa,v 1.3 2001/04/08 00:24:56 itojun Exp $ 1$NetBSD: patch-aa,v 1.4 2011/03/06 03:47:27 dholland Exp $
2 2
3--- agent/filter/logfile.c.orig Sun Mar 18 03:31:21 2001 3Header fixes.
4+++ agent/filter/logfile.c Sun Apr 8 09:10:12 2001 4
5@@ -71,6 +71,9 @@ 5--- agent/filter/logfile.c.orig 2001-03-17 18:31:21.000000000 +0000
 6+++ agent/filter/logfile.c
 7@@ -45,6 +45,10 @@
 8 #include "config.h"
 9 #include "portable.h"
 10 #include <stdio.h>
 11+#include <stdlib.h>
 12+#include <string.h>
 13+#include <errno.h>
 14+#include <time.h>
 15 #include <sys/types.h>
 16
 17 #ifdef I_TIME
 18@@ -71,6 +75,9 @@
6 #include <sys/fcntl.h> /* Try this one in last resort */ 19 #include <sys/fcntl.h> /* Try this one in last resort */
7 #endif 20 #endif
8 #endif 21 #endif
9+#ifdef I_SYS_PARAM 22+#ifdef I_SYS_PARAM
10+# include <sys/param.h> 23+# include <sys/param.h>
11+#endif 24+#endif
12  25
13 #include "confmagic.h" 26 #include "confmagic.h"
14  27
 28@@ -86,10 +93,7 @@ private int add_errcode(); /* Print th
 29 public char *progname = "ram"; /* Program name */
 30 public Pid_t progpid = 0; /* Program PID */
 31
 32-extern Time_t time(); /* Time in seconds since the Epoch */
 33-extern char *malloc(); /* Memory allocation */
 34 extern char *strsave(); /* Save string in memory */
 35-extern int errno; /* System error report variable */
 36
 37 /* VARARGS2 */
 38 public void add_log(level, format, arg1, arg2, arg3, arg4, arg5)
cvs diff -r1.3 -r1.4 pkgsrc/mail/mailagent/patches/patch-ac (expand / switch to unified diff)

--- pkgsrc/mail/mailagent/patches/patch-ac 2001/04/08 00:24:56 1.3
+++ pkgsrc/mail/mailagent/patches/patch-ac 2011/03/06 03:47:27 1.4
@@ -1,23 +1,41 @@ @@ -1,23 +1,41 @@
1$NetBSD: patch-ac,v 1.3 2001/04/08 00:24:56 itojun Exp $ 1$NetBSD: patch-ac,v 1.4 2011/03/06 03:47:27 dholland Exp $
2 2
3--- agent/filter/io.c.orig Sun Mar 18 03:31:20 2001 3--- agent/filter/io.c.orig 2001-03-17 18:31:20.000000000 +0000
4+++ agent/filter/io.c Sun Apr 8 09:11:37 2001 4+++ agent/filter/io.c
5@@ -130,6 +130,9 @@ 5@@ -97,6 +97,7 @@
 6 #include "portable.h"
 7 #include <sys/types.h>
 8 #include <stdio.h>
 9+#include <stdlib.h>
 10 #include <errno.h>
 11 #include <sys/stat.h>
 12
 13@@ -130,6 +131,9 @@
6 #ifdef I_SYS_IOCTL 14 #ifdef I_SYS_IOCTL
7 #include <sys/ioctl.h> 15 #include <sys/ioctl.h>
8 #endif 16 #endif
9+#ifdef I_SYS_PARAM 17+#ifdef I_SYS_PARAM
10+#include <sys/param.h> 18+#include <sys/param.h>
11+#endif 19+#endif
12  20
13 /* 21 /*
14 * The following should be defined in <sys/stat.h>. 22 * The following should be defined in <sys/stat.h>.
15@@ -724,7 +727,7 @@ 23@@ -217,9 +221,6 @@ struct pool {
 24 private int queued = 0; /* True when mail queued safely */
 25 private struct mail mail; /* Where mail is expected to lie */
 26
 27-extern int errno; /* System call error status */
 28-extern char *malloc(); /* Memory allocation */
 29-extern char *realloc(); /* Re-allocation of memory pool */
 30 extern char *logname(); /* User's login name */
 31 extern char *strsave(); /* Save string somewhere in core */
 32 extern int loglvl; /* Logging level */
 33@@ -724,7 +725,7 @@ char *location;
16 */ 34 */
17  35
18 char **envp; /* Environment pointer */ 36 char **envp; /* Environment pointer */
19-#ifdef UNION_WAIT 37-#ifdef UNION_WAIT
20+#if defined(UNION_WAIT) && (!defined(BSD) || BSD < 199306) 38+#if defined(UNION_WAIT) && (!defined(BSD) || BSD < 199306)
21 union wait status; /* Waiting status */ 39 union wait status; /* Waiting status */
22 #else 40 #else
23 int status; /* Status from command */ 41 int status; /* Status from command */
File Added: pkgsrc/mail/mailagent/patches/patch-ab
$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)
File Added: pkgsrc/mail/mailagent/patches/patch-ad
$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)
File Added: pkgsrc/mail/mailagent/patches/patch-ae
$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;
 {