- Make gcc4 happy

PR:		ports/106818
Submitted by:	Jean-Francois Dockes <jean-francois.dockes at wanadoo.fr> (maintainer)

10 files changed, 179 insertions, 0 deletions

diff --git a/mail/metamail/files/patch-metamail_codes.c b/mail/metamail/files/patch-metamail_codes.c
new file mode 100644
index 00000000000..140597ac45e
--- /dev/null
+++ b/mail/metamail/files/patch-metamail_codes.c
@@ -0,0 +1,10 @@
+--- metamail/codes.c.orig	Mon Sep 20 15:13:22 1993
++++ metamail/codes.c	Mon Dec 18 11:46:21 2006
+@@ -13,6 +13,7 @@
+ WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
+ */
+ #include <stdio.h>
++#include <string.h>
+ #include <ctype.h>
+ #include <config.h>
+ 
diff --git a/mail/metamail/files/patch-metamail_mailto.c b/mail/metamail/files/patch-metamail_mailto.c
index e240ede37c9..42c6451cada 100644
--- a/mail/metamail/files/patch-metamail_mailto.c
+++ b/mail/metamail/files/patch-metamail_mailto.c
@@ -1,5 +1,22 @@
 --- metamail/mailto.c.orig	Wed Feb  9 21:30:26 1994
 +++ metamail/mailto.c	Mon Dec 18 11:46:21 2006
+@@ -37,6 +37,8 @@
+ */
+ 
+ #include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
+ #include <ctype.h>
+ #include <config.h>
+ #include <pwd.h>
+@@ -60,7 +62,6 @@
+ #include <unistd.h>
+ #endif
+ 
+-extern char *malloc(), *realloc(), *index(), *getmyname();
+ struct mailpart *CreateNewPart();
+ 
+ /* The main data structure for the multiple parts of the mail */
 @@ -570,6 +571,7 @@
          if (isupper(*sdum)) *sdum = tolower(*sdum);
      }
diff --git a/mail/metamail/files/patch-metamail_metamail.c b/mail/metamail/files/patch-metamail_metamail.c
index ed211c08cdd..0f3c728e0cf 100644
--- a/mail/metamail/files/patch-metamail_metamail.c
+++ b/mail/metamail/files/patch-metamail_metamail.c
@@ -1,5 +1,14 @@
 --- metamail/metamail.c.orig	Thu Feb 17 02:57:19 1994
 +++ metamail/metamail.c	Mon Dec 18 11:46:22 2006
+@@ -20,6 +20,8 @@
+ 
+  ******************************************************* */
+ #include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
+ #include <ctype.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
 @@ -83,7 +85,7 @@
  #define MAX_FILE_NAME_SIZE 256
  #define WRITE_BINARY	"w"
@@ -9,6 +18,28 @@
  #define CATCOMMAND  "cat"
  #define CATTEMPLATE "cat %s"
  #define METAMAIL    "metamail"
+@@ -100,6 +102,7 @@
+ #define CMDSIZE 1200 /* Maximum size of command to execute */
+ 
+ #define LINE_BUF_SIZE       2000
++#if 0
+ #ifndef MICROSOFT
+ extern char *malloc();
+ extern char *realloc();
+@@ -107,10 +110,12 @@
+ extern char *getenv();
+ extern char *index();
+ extern char *rindex();
++extern FILE *popen();
++#endif
++
+ char fileToDelete[MAX_FILE_NAME_SIZE];
+ 
+ char *FindParam();
+-extern FILE *popen();
+ static char *nomem = "Out of memory!";
+ static char *mmversion = MM_VERSTRING;
+ static char *NoAskDefault = "text,text/plain,text/richtext";
 @@ -540,6 +545,7 @@
                      ans = 2;
                  } else {
diff --git a/mail/metamail/files/patch-metamail_mmencode.c b/mail/metamail/files/patch-metamail_mmencode.c
new file mode 100644
index 00000000000..e7e0fce9c70
--- /dev/null
+++ b/mail/metamail/files/patch-metamail_mmencode.c
@@ -0,0 +1,10 @@
+--- metamail/mmencode.c.orig	Wed Jan 26 19:47:37 1994
++++ metamail/mmencode.c	Mon Dec 18 11:46:22 2006
+@@ -13,6 +13,7 @@
+ WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
+ */
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <config.h>
+ #ifdef MSDOS
+ #include <fcntl.h>
diff --git a/mail/metamail/files/patch-metamail_putenv.c b/mail/metamail/files/patch-metamail_putenv.c
new file mode 100644
index 00000000000..72b2806df1b
--- /dev/null
+++ b/mail/metamail/files/patch-metamail_putenv.c
@@ -0,0 +1,11 @@
+--- metamail/putenv.c.orig	Tue Oct 12 17:17:43 1993
++++ metamail/putenv.c	Mon Dec 18 11:46:22 2006
+@@ -17,6 +17,8 @@
+ Cambridge, MA 02139, USA.  */
+ 
+ #include <config.h>
++#include <stdlib.h>
++#include <string.h>
+ #include <sys/types.h>
+ #include <errno.h>
+ #ifdef STDC_HEADERS
diff --git a/mail/metamail/files/patch-metamail_shared.c b/mail/metamail/files/patch-metamail_shared.c
new file mode 100644
index 00000000000..d32011ea658
--- /dev/null
+++ b/mail/metamail/files/patch-metamail_shared.c
@@ -0,0 +1,17 @@
+--- metamail/shared.c.orig	Sun May 16 20:19:32 1993
++++ metamail/shared.c	Mon Dec 18 11:46:22 2006
+@@ -1,4 +1,6 @@
+ #include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
+ #include <ctype.h>
+ #include <config.h>
+ #ifdef SYSV
+@@ -6,7 +8,6 @@
+ #include <sys/utsname.h>
+ #endif
+ 
+-extern char *malloc();
+ char **Exceptions;
+ int *NeedsPortableNewlines;
+ int ExceptionsAlloced = 0, ExceptionsUsed = 0;
diff --git a/mail/metamail/files/patch-metamail_splitmail.c b/mail/metamail/files/patch-metamail_splitmail.c
index 6e26b97c43b..5f28a98298d 100644
--- a/mail/metamail/files/patch-metamail_splitmail.c
+++ b/mail/metamail/files/patch-metamail_splitmail.c
@@ -1,5 +1,23 @@
 --- metamail/splitmail.c.orig	Mon Jan 31 23:23:14 1994
 +++ metamail/splitmail.c	Mon Dec 18 11:46:22 2006
+@@ -21,6 +21,8 @@
+  ******************************************************* */
+ 
+ #include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <config.h>
+@@ -28,7 +30,7 @@
+ #include <time.h>
+ 
+ #define MINCHUNKSIZE 20000 /* Better be enough to hold the headers, or we die! */
+-extern char *malloc(), *index(), *getmyname();
++extern char *getmyname();
+ 
+ #ifdef AMIGA
+ #define Prototype   extern
 @@ -41,8 +43,8 @@
  #define VERBOSEDELIVERYCMD VerboseDeliveryCmd
  #else
diff --git a/mail/metamail/files/patch-richmail_richlex.c b/mail/metamail/files/patch-richmail_richlex.c
new file mode 100644
index 00000000000..df1ad530eef
--- /dev/null
+++ b/mail/metamail/files/patch-richmail_richlex.c
@@ -0,0 +1,10 @@
+--- richmail/richlex.c.orig	Thu Feb  3 03:29:37 1994
++++ richmail/richlex.c	Mon Dec 18 11:46:22 2006
+@@ -42,6 +42,7 @@
+ -------------------------------------------------------------------------*/
+ 
+ #include <stdio.h>
++#include <string.h>
+ #include <ctype.h>
+ #include "richlex.h"
+ #include "richset.h"
diff --git a/mail/metamail/files/patch-richmail_richset.c b/mail/metamail/files/patch-richmail_richset.c
new file mode 100644
index 00000000000..26eb086d5bc
--- /dev/null
+++ b/mail/metamail/files/patch-richmail_richset.c
@@ -0,0 +1,10 @@
+--- richmail/richset.c.orig	Wed Oct 21 19:04:19 1992
++++ richmail/richset.c	Mon Dec 18 11:46:22 2006
+@@ -34,6 +34,7 @@
+ -------------------------------------------------------------------------*/
+ 
+ #include <stdio.h>
++#include <stdlib.h>
+ #include "richlex.h"
+ #include "richset.h"
+ 
diff --git a/mail/metamail/files/patch-richmail_richtext.c b/mail/metamail/files/patch-richmail_richtext.c
new file mode 100644
index 00000000000..2dd6b686a41
--- /dev/null
+++ b/mail/metamail/files/patch-richmail_richtext.c
@@ -0,0 +1,45 @@
+--- richmail/richtext.c.orig	Wed Feb  9 17:31:18 1994
++++ richmail/richtext.c	Mon Dec 18 11:46:22 2006
+@@ -14,6 +14,8 @@
+ */
+ 
+ #include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
+ #include <ctype.h>
+ #include <signal.h>
+ #include "richlex.h"
+@@ -155,6 +157,16 @@
+     exit(-1);
+ #endif
+ }
++static lc2strcmp(s1, s2)
++char *s1, *s2;
++{
++    if (!s1 || !s2) return (-1);
++    while (*s1 && *s2) {
++	if (*s1 != *s2 && (tolower(*s1) != *s2)) return(-1);
++	++s1; ++s2;
++    }
++    return((*s1 == *s2) ? 0 : -1);
++}
+ 
+ #ifndef	RICHTEXT_LIBRARY
+ 
+@@ -989,16 +1001,6 @@
+     while(*s) (*RichtextPutc)((int)(*s++),fp);
+ }
+ 
+-static lc2strcmp(s1, s2)
+-char *s1, *s2;
+-{
+-    if (!s1 || !s2) return (-1);
+-    while (*s1 && *s2) {
+-	if (*s1 != *s2 && (tolower(*s1) != *s2)) return(-1);
+-	++s1; ++s2;
+-    }
+-    return((*s1 == *s2) ? 0 : -1);
+-}
+ 
+ static lc2strncmp(s1, s2, len)
+ char *s1, *s2;