Fix build with gcc 4.2.

7 files changed, 115 insertions, 4 deletions

diff --git a/japanese/mimekit/Makefile b/japanese/mimekit/Makefile
index 45e2443570c7..6238d18398b6 100644
--- a/japanese/mimekit/Makefile
+++ b/japanese/mimekit/Makefile
@@ -21,10 +21,6 @@ PORTDOCS=	README README-LIB README-PGP
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} >= 700042
-BROKEN=		Broken with gcc 4.2
-.endif
-
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/deMime ${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/enMime ${PREFIX}/bin
diff --git a/japanese/mimekit/files/patch-JIS.c b/japanese/mimekit/files/patch-JIS.c
new file mode 100644
index 000000000000..e35f4f6bc676
--- /dev/null
+++ b/japanese/mimekit/files/patch-JIS.c
@@ -0,0 +1,30 @@
+--- ../rary/JIS.c.orig	2007-11-11 18:13:21.000000000 +0900
++++ ../rary/JIS.c	2007-11-11 18:21:18.000000000 +0900
+@@ -18,7 +18,7 @@
+ //////////////////////////////////////////////////////////////////////#*/
+ #include "ystring.h"
+ #include <ctype.h>
+-char *malloc();
++#include <stdlib.h>
+ #include <stdio.h>
+ extern FILE *fopen_LIBPATH();
+ extern char *getTMPDIR();
+@@ -92,6 +92,9 @@
+ 	IS_EUC_HI(hi) && (IS_EUC_LOS(lo) || IS_EUC_LOX(lo)))
+ 
+ 
++static UTF8toLocal(int ch1, int ch2, int ch3, int charset, unsigned char *op, unsigned char *ox);
++static EUCtoUTF8(int euc, char *us, char *ux);
++
+ IS_SJIS_CHAR(ch1,ch2,in_sjis)
+ {
+ 	if( ch1 & 0x80 ){
+@@ -1457,6 +1460,8 @@
+ unsigned short	u_u2lmap[0x10000];
+ 	int	u_init;
+ } UcsX;
++static loadUnicodeMappings(char *jumap, UcsX *ucx, unsigned short l2ucnt[], unsigned short u2lcnt[]);
++
+ #define L2Umap	ucx->u_l2umap
+ #define U2Lmap	ucx->u_u2lmap
+ static UcsX **UcsXtab;
diff --git a/japanese/mimekit/files/patch-TLEX.c b/japanese/mimekit/files/patch-TLEX.c
new file mode 100644
index 000000000000..bfbaabd4b2cf
--- /dev/null
+++ b/japanese/mimekit/files/patch-TLEX.c
@@ -0,0 +1,21 @@
+--- ../rary/TLEX.c.orig	2007-11-11 18:06:18.000000000 +0900
++++ ../rary/TLEX.c	2007-11-11 18:10:29.000000000 +0900
+@@ -23,6 +23,8 @@
+ 	980604	added atbitrary string "**", char "[]" and frex_*()
+ //////////////////////////////////////////////////////////////////////#*/
+ 
++#include <stdio.h>
++#include <stdlib.h>
+ #include <string.h>
+ 
+ #ifndef NULL
+@@ -78,6 +80,9 @@
+ #define NEXT(fsp,ch) \
+ 	( fsp->Nstat ? fsp->Nstat->nvec[ch] : fsp->nnexts ? next(fsp,ch) : 0 )
+ 
++static fa_stvec_alloc(FaStat *fsp);
++static fa_rexp(FaStat *ofsp, unsigned char *regexp, int class);
++
+ static FaStat*
+ next1(fsp,ch)
+ 	FaStat *fsp;
diff --git a/japanese/mimekit/files/patch-html.c b/japanese/mimekit/files/patch-html.c
new file mode 100644
index 000000000000..758fbfc34a3c
--- /dev/null
+++ b/japanese/mimekit/files/patch-html.c
@@ -0,0 +1,22 @@
+--- ../rary/html.c.orig	2007-11-11 18:21:43.000000000 +0900
++++ ../rary/html.c	2007-11-11 18:25:11.000000000 +0900
+@@ -26,6 +26,8 @@
+ 	941002	extracted from http.c
+ 	990331	extracted attrWithURL() and made it custmizable
+ //////////////////////////////////////////////////////////////////////#*/
++#include <stdio.h>
++#include <string.h>
+ #include "ystring.h"
+ /*
+ #define isAlpha(ch)	(isalpha(ch) || ch == '-')
+@@ -38,6 +40,10 @@
+ int HTMLCONV_DEBUG = 0;
+ int URL_SEARCH;
+ 
++static addTAGelem(char *name);
++static addTAGattr(char *attr);
++static count_convs(int convtype);
++
+ static hconv1(conv)
+ 	char *conv;
+ {	int onoff;
diff --git a/japanese/mimekit/files/patch-mime.c b/japanese/mimekit/files/patch-mime.c
new file mode 100644
index 000000000000..062b42eb60d0
--- /dev/null
+++ b/japanese/mimekit/files/patch-mime.c
@@ -0,0 +1,11 @@
+--- mime.c.orig	2007-11-11 17:58:01.000000000 +0900
++++ mime.c	2007-11-11 17:59:42.000000000 +0900
+@@ -54,6 +54,8 @@
+ static int got_EOR;
+ static int addQY;
+ 
++static scan_charset(char *header, char *chset, int len);
++
+ #define DEBUG	syslog_DEBUG
+ 
+ #define O_HEAD	1
diff --git a/japanese/mimekit/files/patch-mime.h b/japanese/mimekit/files/patch-mime.h
new file mode 100644
index 000000000000..85c493426d74
--- /dev/null
+++ b/japanese/mimekit/files/patch-mime.h
@@ -0,0 +1,19 @@
+--- mime.h.orig	2007-11-11 17:53:39.000000000 +0900
++++ mime.h	2007-11-11 17:54:14.000000000 +0900
+@@ -23,6 +23,7 @@
+ extern char *MimeKit_Version;
+ 
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <ctype.h>
+ #include "ystring.h"
+ 
+@@ -31,8 +32,6 @@
+ #endif
+ #define substr(s1,s2)	(strncasecmp(s1,s2,strlen(s2)) == 0)
+ 
+-extern char *malloc();
+-extern char *realloc();
+ extern char *findFieldValue();
+ extern FILE *TMPFILE();
+ 
diff --git a/japanese/mimekit/files/patch-pgp.c b/japanese/mimekit/files/patch-pgp.c
new file mode 100644
index 000000000000..ca8677a09317
--- /dev/null
+++ b/japanese/mimekit/files/patch-pgp.c
@@ -0,0 +1,12 @@
+--- pgp.c.orig	2007-11-11 18:01:44.000000000 +0900
++++ pgp.c	2007-11-11 18:05:31.000000000 +0900
+@@ -47,6 +47,9 @@
+ #define LEOLINE	"\n"
+ #endif
+ 
++static putENCRIPTED(FILE *src, FILE *dst, char *boundary, char *EOL);
++static putSIGNED(FILE *src, FILE* sign, FILE *dst, char *boundary, char *EOL);
++
+ static pgp1(arg)
+ 	char *arg;
+ {