Add some prototypes, missing headers and redefine log() to not conflict

with libm.

7 files changed, 97 insertions, 1 deletions

diff --git a/mail/ezmlm/distinfo b/mail/ezmlm/distinfo
index e9f2e9fb5a9..08c52fd8139 100644
--- a/mail/ezmlm/distinfo
+++ b/mail/ezmlm/distinfo
@@ -1,7 +1,13 @@
-$NetBSD: distinfo,v 1.4 2012/03/12 21:52:07 joerg Exp $
+$NetBSD: distinfo,v 1.5 2013/02/26 11:26:02 joerg Exp $
 
 SHA1 (ezmlm-0.53.tar.gz) = 3a7b618737fed8b774bec69c272d70f4142c1e30
 RMD160 (ezmlm-0.53.tar.gz) = 6d366de2d7028a984ba454f1bec9d2d9f495c88b
 Size (ezmlm-0.53.tar.gz) = 62693 bytes
 SHA1 (patch-MAN) = 4becf683f615bacf236abedee3ab6574bdcc0e10
 SHA1 (patch-aa) = c10560c71a137b138af325c6382e498ec466ec06
+SHA1 (patch-ezmlm-manage.c) = 8345b8849d16884bfd0d87df7bbc4c14762bd41d
+SHA1 (patch-ezmlm-return.c) = 3fd771df609ab0d8de59df6b656ad5d98d7315c3
+SHA1 (patch-log.c) = a402c27d45f8b534e4dabbe9c65ad16db3c9dea2
+SHA1 (patch-log.h) = a6deca4e422d2b2ef2c0ebb9e7e0ffa2e43709ca
+SHA1 (patch-readwrite.h) = 7038c0cf68f928700bb657fb856817af2171627b
+SHA1 (patch-stralloc.h) = 25285f91f2c39d244e62fb76c588d4db12fdc4c7
diff --git a/mail/ezmlm/patches/patch-ezmlm-manage.c b/mail/ezmlm/patches/patch-ezmlm-manage.c
new file mode 100644
index 00000000000..9aa754c7081
--- /dev/null
+++ b/mail/ezmlm/patches/patch-ezmlm-manage.c
@@ -0,0 +1,23 @@
+$NetBSD: patch-ezmlm-manage.c,v 1.1 2013/02/26 11:26:03 joerg Exp $
+
+--- ezmlm-manage.c.orig	2013-02-25 16:48:08.000000000 +0000
++++ ezmlm-manage.c
+@@ -22,6 +22,7 @@
+ #include "fmt.h"
+ #include "subscribe.h"
+ #include "cookie.h"
++#include "log.h"
+ 
+ #define FATAL "ezmlm-manage: fatal: "
+ void die_usage() { strerr_die1x(100,"ezmlm-manage: usage: ezmlm-manage dir"); }
+@@ -129,9 +130,7 @@ char *fn;
+ 
+ stralloc mydtline = {0};
+ 
+-void main(argc,argv)
+-int argc;
+-char **argv;
++int main(int argc, char **argv)
+ {
+   char *dir;
+   char *sender;
diff --git a/mail/ezmlm/patches/patch-ezmlm-return.c b/mail/ezmlm/patches/patch-ezmlm-return.c
new file mode 100644
index 00000000000..1d751a127b2
--- /dev/null
+++ b/mail/ezmlm/patches/patch-ezmlm-return.c
@@ -0,0 +1,12 @@
+$NetBSD: patch-ezmlm-return.c,v 1.1 2013/02/26 11:26:03 joerg Exp $
+
+--- ezmlm-return.c.orig	2013-02-25 16:48:52.000000000 +0000
++++ ezmlm-return.c
+@@ -17,6 +17,7 @@
+ #include "cookie.h"
+ #include "subscribe.h"
+ #include "issub.h"
++#include "log.h"
+ 
+ #define FATAL "ezmlm-return: fatal: "
+ void die_usage() { strerr_die1x(100,"ezmlm-return: usage: ezmlm-return dir"); }
diff --git a/mail/ezmlm/patches/patch-log.c b/mail/ezmlm/patches/patch-log.c
new file mode 100644
index 00000000000..50b66fe1b3a
--- /dev/null
+++ b/mail/ezmlm/patches/patch-log.c
@@ -0,0 +1,15 @@
+$NetBSD: patch-log.c,v 1.1 2013/02/26 11:26:03 joerg Exp $
+
+--- log.c.orig	2013-02-25 16:47:16.000000000 +0000
++++ log.c
+@@ -11,9 +11,7 @@ static char buf[1];
+ static char num[FMT_ULONG];
+ static stralloc line = {0};
+ 
+-void log(event,addr)
+-char *event;
+-char *addr;
++void log(char *event, char *addr)
+ {
+   char ch;
+   int fd;
diff --git a/mail/ezmlm/patches/patch-log.h b/mail/ezmlm/patches/patch-log.h
new file mode 100644
index 00000000000..ec6d8e919f4
--- /dev/null
+++ b/mail/ezmlm/patches/patch-log.h
@@ -0,0 +1,13 @@
+$NetBSD: patch-log.h,v 1.1 2013/02/26 11:26:03 joerg Exp $
+
+--- log.h.orig	2013-02-25 16:47:13.000000000 +0000
++++ log.h
+@@ -1,6 +1,7 @@
+ #ifndef LOG_H
+ #define LOG_H
+ 
+-extern void log();
++#define log(x,y) my_log(x,y)
++extern void log(char *, char *);
+ 
+ #endif
diff --git a/mail/ezmlm/patches/patch-readwrite.h b/mail/ezmlm/patches/patch-readwrite.h
new file mode 100644
index 00000000000..c20e8b68110
--- /dev/null
+++ b/mail/ezmlm/patches/patch-readwrite.h
@@ -0,0 +1,13 @@
+$NetBSD: patch-readwrite.h,v 1.1 2013/02/26 11:26:03 joerg Exp $
+
+--- readwrite.h.orig	2013-02-25 16:49:34.000000000 +0000
++++ readwrite.h
+@@ -1,7 +1,6 @@
+ #ifndef READWRITE_H
+ #define READWRITE_H
+ 
+-extern int read();
+-extern int write();
++#include <unistd.h>
+ 
+ #endif
diff --git a/mail/ezmlm/patches/patch-stralloc.h b/mail/ezmlm/patches/patch-stralloc.h
new file mode 100644
index 00000000000..155fe4fda10
--- /dev/null
+++ b/mail/ezmlm/patches/patch-stralloc.h
@@ -0,0 +1,14 @@
+$NetBSD: patch-stralloc.h,v 1.1 2013/02/26 11:26:03 joerg Exp $
+
+--- stralloc.h.orig	2013-02-25 16:49:07.000000000 +0000
++++ stralloc.h
+@@ -1,6 +1,9 @@
+ #ifndef STRALLOC_H
+ #define STRALLOC_H
+ 
++#include <stdlib.h>
++#include <unistd.h>
++
+ #include "gen_alloc.h"
+ 
+ GEN_ALLOC_typedef(stralloc,char,s,len,a)