Fix for alpha.

 - remove 'long time()' and add '#include <time.h>'.

9 files changed, 160 insertions, 40 deletions

diff --git a/mail/mh/files/patch-ad b/mail/mh/files/patch-ad
index f806e2f15993..a296c2edaf90 100644
--- a/mail/mh/files/patch-ad
+++ b/mail/mh/files/patch-ad
@@ -165,37 +165,6 @@ The following patch adds shared library support for FreeBSD to MH
   #ifdef	SYS5
   #define	u_short	ushort
   #define u_long  ulong
-*** ../mh-6.8.3.orig/support/pop/mmdfII/pop/lock.c	Wed Dec  1 06:01:30 1993
---- support/pop/mmdfII/pop/lock.c	Tue Dec 27 19:58:05 1994
-***************
-*** 47,52 ****
---- 47,56 ----
-  #include <sys/file.h>
-  #endif
-  
-+ #ifdef __FreeBSD__
-+ #include <fcntl.h>
-+ #endif
-+ 
-  #ifdef	SYS5
-  #define	u_short	ushort
-  #define u_long  ulong
-diff -cdr ../mh-6.8.3.orig/zotnet/mts/lock.c ./zotnet/mts/lock.c
-*** ../mh-6.8.3.orig/zotnet/mts/lock.c	Wed Dec  1 06:01:30 1993
---- zotnet/mts/lock.c	Tue Dec 27 19:58:05 1994
-***************
-*** 47,52 ****
---- 47,56 ----
-  #include <sys/file.h>
-  #endif
-  
-+ #ifdef __FreeBSD__
-+ #include <fcntl.h>
-+ #endif
-+ 
-  #ifdef	SYS5
-  #define	u_short	ushort
-  #define u_long  ulong
 --- conf/makefiles/sbr.orig	Tue Sep 22 16:38:28 1998
 +++ conf/makefiles/sbr	Tue Sep 22 16:51:48 1998
 @@ -157,6 +157,7 @@
diff --git a/mail/mh/files/patch-ae b/mail/mh/files/patch-ae
index 0b86d3f2676b..ccf7a3365462 100644
--- a/mail/mh/files/patch-ae
+++ b/mail/mh/files/patch-ae
@@ -53,9 +53,26 @@ interesting fields when you do a "show":
  
  @BEGIN: SHAREDLIB
  ODEFS	=	formatdef.o m_msgdef.o
---- sbr/formatsbr.c.orig	Sat Oct 12 23:05:07 1996
-+++ sbr/formatsbr.c	Sun Oct 13 00:08:31 1996
-@@ -114,13 +114,13 @@
+--- sbr/formatsbr.c.orig	Sat Jan 16 20:25:54 1999
++++ sbr/formatsbr.c	Sat Jan 16 20:48:58 1999
+@@ -12,6 +12,7 @@
+ #include <stdio.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
++#include <time.h>
+ 
+ /*  */
+ 
+@@ -32,8 +33,6 @@
+ struct mailname fmt_mnull;
+ 
+ 
+-long	time ();
+-
+ /*  */
+ 
+ /* MAJOR HACK:	See MHCHANGES for discussion */
+@@ -114,13 +113,13 @@
   */
  
  static int match (str, sub)
@@ -73,7 +90,7 @@ interesting fields when you do a "show":
  
  #ifdef LOCALE
      while (c1 = *sub) {
-@@ -203,14 +203,14 @@
+@@ -203,14 +202,14 @@
  					i++;\
  				}\
  			} else {\
@@ -91,7 +108,7 @@ interesting fields when you do a "show":
  						sp++;\
  					    *cp++ = ' ';\
  				}\
-@@ -221,13 +221,13 @@
+@@ -221,13 +220,13 @@
  	}
  #define PUTS(cp, str) {\
  		if (sp = (str)) {\
@@ -108,7 +125,7 @@ interesting fields when you do a "show":
  				sp++;\
  			    *cp++ = ' ';\
  			}\
-@@ -358,15 +358,30 @@
+@@ -358,15 +357,30 @@
      long l;
      char        *savestr;
      char	buffer[BUFSIZ];
@@ -139,7 +156,7 @@ interesting fields when you do a "show":
  	    break;
  
  	case FT_LIT:
-@@ -500,6 +515,10 @@
+@@ -500,6 +514,10 @@
  
  	case FT_LS_COMP:
  	    str = fmt->f_comp->c_text;
@@ -150,7 +167,7 @@ interesting fields when you do a "show":
  	    break;
  	case FT_LS_LIT:
  	    str = fmt->f_text;
-@@ -722,6 +741,10 @@
+@@ -722,6 +740,10 @@
  			    else
  				break;
  		    }
@@ -161,7 +178,7 @@ interesting fields when you do a "show":
  		    if (*str)
  			break;
  		}	    
-@@ -744,6 +767,10 @@
+@@ -744,6 +766,10 @@
  			break;
  		}
  	    }
diff --git a/mail/mh/files/patch-ai b/mail/mh/files/patch-ai
new file mode 100644
index 000000000000..2d5d79ce586b
--- /dev/null
+++ b/mail/mh/files/patch-ai
@@ -0,0 +1,11 @@
+--- zotnet/tws/dtime.c.orig	Wed Dec  1 13:01:43 1993
++++ zotnet/tws/dtime.c	Sat Jan 16 20:46:59 1999
+@@ -107,8 +107,6 @@
+ 
+ #define CENTURY 1900
+ 
+-long    time ();
+-struct tm *localtime ();
+ 
+ /*  */
+ 
diff --git a/mail/mh/files/patch-aj b/mail/mh/files/patch-aj
new file mode 100644
index 000000000000..328a342ee2d2
--- /dev/null
+++ b/mail/mh/files/patch-aj
@@ -0,0 +1,20 @@
+--- sbr/fmtcompile.c.orig	Wed Dec  1 13:01:22 1993
++++ sbr/fmtcompile.c	Sat Jan 16 20:48:09 1999
+@@ -12,6 +12,7 @@
+ #include <stdio.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
++#include <time.h>
+ 
+ static struct format *formatvec;	/* array to hold formats */
+ static struct format *next_fp;		/* next free format slot */
+@@ -128,9 +129,6 @@
+ 
+     (char *)0,	0,		0,		0,		0    
+ };
+-
+-
+-long time ();
+ 
+ static struct ftable *lookup(name)
+     register char *name;
diff --git a/mail/mh/files/patch-ak b/mail/mh/files/patch-ak
new file mode 100644
index 000000000000..77295877bc45
--- /dev/null
+++ b/mail/mh/files/patch-ak
@@ -0,0 +1,18 @@
+--- uip/sendsbr.c.orig	Wed Dec  1 13:01:38 1993
++++ uip/sendsbr.c	Sat Jan 16 20:42:58 1999
+@@ -9,6 +9,7 @@
+ #include <signal.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
++#include <time.h>
+ 
+ static		alert(), anno(), annoaux();
+ static int	tmp_fd();
+@@ -39,7 +40,6 @@
+ 
+ char   *getusr ();
+ off_t	lseek ();
+-long	time ();
+ 
+ /*  */
+ 
diff --git a/mail/mh/files/patch-al b/mail/mh/files/patch-al
new file mode 100644
index 000000000000..4aec8ee25d06
--- /dev/null
+++ b/mail/mh/files/patch-al
@@ -0,0 +1,21 @@
+--- zotnet/tws/phoon/dtime.c.orig	Wed Dec  1 13:01:44 1993
++++ zotnet/tws/phoon/dtime.c	Sat Jan 16 20:56:24 1999
+@@ -26,6 +26,8 @@
+ extern char *tzname[];
+ #endif	SYS5
+ 
++#include<time.h>
++
+ /*  */
+ 
+ #define	abs(a) ( a >= 0 ? a : -a )
+@@ -86,9 +88,6 @@
+ 	NULL };
+ 
+ #define CENTURY 19
+-
+-long time( );
+-struct tm *localtime( );
+ 
+ /*  */
+ 
diff --git a/mail/mh/files/patch-am b/mail/mh/files/patch-am
new file mode 100644
index 000000000000..bee55ca99e66
--- /dev/null
+++ b/mail/mh/files/patch-am
@@ -0,0 +1,23 @@
+--- zotnet/mts/lock.c.orig	Wed Dec  1 13:01:30 1993
++++ zotnet/mts/lock.c	Sat Jan 16 20:52:20 1999
+@@ -47,6 +47,11 @@
+ #include <sys/file.h>
+ #endif
+ 
++#ifdef __FreeBSD__
++#include <fcntl.h>
++#endif
++#include <time.h>
++
+ #ifdef	SYS5
+ #define	u_short	ushort
+ #define u_long  ulong
+@@ -71,8 +76,6 @@
+ 
+ static int	b_lkopen(), lockit(), f_lkopen();
+ static		lockname(), timerON(), timerOFF();
+-
+-long	time ();
+ 
+ /*  */
+ 
diff --git a/mail/mh/files/patch-an b/mail/mh/files/patch-an
new file mode 100644
index 000000000000..9c2cd890a62c
--- /dev/null
+++ b/mail/mh/files/patch-an
@@ -0,0 +1,23 @@
+--- support/pop/mmdfII/pop/lock.c.orig	Wed Dec  1 13:01:30 1993
++++ support/pop/mmdfII/pop/lock.c	Sat Jan 16 20:57:44 1999
+@@ -47,6 +47,11 @@
+ #include <sys/file.h>
+ #endif
+ 
++#ifdef __FreeBSD__
++#include <fcntl.h>
++#endif
++#include <time.h>
++
+ #ifdef	SYS5
+ #define	u_short	ushort
+ #define u_long  ulong
+@@ -71,8 +76,6 @@
+ 
+ static int	b_lkopen(), lockit(), f_lkopen();
+ static		lockname(), timerON(), timerOFF();
+-
+-long	time ();
+ 
+ /*  */
+ 
diff --git a/mail/mh/files/patch-ao b/mail/mh/files/patch-ao
new file mode 100644
index 000000000000..88e052be6895
--- /dev/null
+++ b/mail/mh/files/patch-ao
@@ -0,0 +1,18 @@
+--- uip/forw.c.orig	Sat Jan 16 21:06:24 1999
++++ uip/forw.c	Sat Jan 16 21:07:07 1999
+@@ -12,6 +12,7 @@
+ #ifdef LOCALE
+ #include	<locale.h>
+ #endif
++#include <time.h>
+ 
+ #ifndef	MIME
+ #define	MIMEminc(a)	(a)
+@@ -133,7 +134,6 @@
+ static struct msgs *mp = NULL;		/* used a lot */
+ 
+ 
+-long	time ();
+ off_t	lseek();
+ 
+ /*  */