The mh port was marked FORBIDDEN for security reasons 2 years and 7 months

ago.  Remove it.

22 files changed, 0 insertions, 1205 deletions

diff --git a/mail/Makefile b/mail/Makefile
index 3718e355b917..44d5e1e29888 100644
--- a/mail/Makefile
+++ b/mail/Makefile
@@ -121,7 +121,6 @@
     SUBDIR += mew2-emacs20
     SUBDIR += mew2-xemacs21
     SUBDIR += mew2-xemacs21-mule
-    SUBDIR += mh
     SUBDIR += mimedefang
     SUBDIR += minimalist
     SUBDIR += ml
diff --git a/mail/mh/Makefile b/mail/mh/Makefile
deleted file mode 100644
index ae7fe9f30b1f..000000000000
--- a/mail/mh/Makefile
+++ /dev/null
@@ -1,32 +0,0 @@
-# New ports collection makefile for:	mh
-# Date created:		Oct 4, 1994
-# Whom:			pst
-#
-# $FreeBSD$
-#
-
-PORTNAME=	mh
-PORTVERSION=	6.8.4
-CATEGORIES=	mail
-MASTER_SITES=	ftp://ftp.ics.uci.edu/pub/mh/tar/
-DISTNAME=	${PORTNAME}-6.8.3
-EXTRACT_SUFX=	.tar.Z
-
-PATCH_SITES=	ftp://ftp.ics.uci.edu/pub/mh/updates/
-PATCHFILES=	MH.6.8.4.Z
-
-MAINTAINER=	pst@FreeBSD.org
-
-FORBIDDEN=	"Buffer overflow in MIME parsing code, exploitable via email. Since mh is no longer actively developed, this bug may not get fixed - consider using the nmh port in ${PORTSDIR}/mail/nmh, which is the successor to mh"
-
-INSTALLS_SHLIB=	yes
-
-MAN1=	ali.1 anno.1 burst.1 comp.1 dist.1 folder.1 forw.1 inc.1 mark.1  \
-	mh-chart.1 mh.1 mhl.1 mhook.1 mhmail.1 mhn.1 mhparam.1 mhpath.1  \
-	msgchk.1 msh.1 next.1 packf.1 pick.1 prev.1 prompter.1 rcvstore.1 \
-	refile.1 repl.1 rmf.1 rmm.1 scan.1 send.1 show.1 slocal.1 sortm.1  \
-	vmh.1 whatnow.1 whom.1
-MAN5=	mh-alias.5 mh-format.5 mh-mail.5 mh-profile.5 mh-sequence.5 mh-tailor.5
-MAN8=	ap.8 conflict.8 dp.8 install-mh.8 post.8 fmtdump.8
-
-.include <bsd.port.mk>
diff --git a/mail/mh/distinfo b/mail/mh/distinfo
deleted file mode 100644
index eb4db643eb92..000000000000
--- a/mail/mh/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (mh-6.8.3.tar.Z) = 70bd6efcdeb3ba9d8a0484098e15b830
-MD5 (MH.6.8.4.Z) = a4a68d15743d43ce60d2fa4b8dfda63c
diff --git a/mail/mh/files/patch-aa b/mail/mh/files/patch-aa
deleted file mode 100644
index 308f3edc1220..000000000000
--- a/mail/mh/files/patch-aa
+++ /dev/null
@@ -1,33 +0,0 @@
-*** /dev/null	Sat Apr 27 10:54:01 1996
---- conf/FreeBSD	Sat Apr 27 11:12:47 1996
-***************
-*** 0 ****
---- 1,28 ----
-+ # @(#)$Id: patch-aa,v 1.3 1996/02/23 01:25:08 pst Exp $
-+ # FreeBSD running sendmail
-+ 
-+ bin	/usr/local/bin
-+ etc	/usr/local/lib/mh
-+ mandir	/usr/local/man
-+ mail	/var/mail
-+ chown	/usr/sbin/chown
-+ mts	sendmail/smtp
-+ cc	cc
-+ signal	void
-+ remove	rm -f
-+ 
-+ # Good options for all MH installations (personal preferences)
-+ options	ATHENA DUMB FOLDPROT='"0700"' MHE MHRC RPATHS SBACKUP='"\\043"'
-+ 
-+ # FreeBSD specific options (for FreeBSD-1.x, remove BSD44)
-+ options	BSD42 BSD43 BSD44 WAITINT UNISTD VSPRINTF MORE='"/usr/bin/more"'
-+ options	NORUSERPASS DBMPWD POSIX NTOHLSWAP SYS5DIR OVERHEAD MSGID FCNTL
-+ options	BIND MIME SENDMTS SMTP WHATNOW ZONEINFO
-+ options GCOS_HACK RENAME LOCALE
-+ 
-+ # If you want POP support, this will help you get started,  but feel
-+ # free to customize it.
-+ pop		on
-+ popdir		/usr/local/libexec
-+ options		RPOP APOP='"/usr/local/etc/pop.auth"' POPSERVICE='"pop3"'
-+ ldoptlibs	-lcrypt
diff --git a/mail/mh/files/patch-ab b/mail/mh/files/patch-ab
deleted file mode 100644
index b5d02ae2d62c..000000000000
--- a/mail/mh/files/patch-ab
+++ /dev/null
@@ -1,16 +0,0 @@
-*** folder.c.orig	Tue Nov 30 20:01:36 1993
---- uip/folder.c	Fri Jul  1 13:11:16 1994
-***************
-*** 551,556 ****
---- 551,561 ----
-  
-      base = strcmp (name, "./") ? name : name + 2;/* hack */
-  
-+      /* short-cut to see if directory has any sub-directories */
-+ 
-+      if (stat (name, &st) != NOTOK && st.st_nlink == 2)
-+ 	return;
-+ 
-      if ((dd = opendir (name)) == NULL) {
-  	admonish (name, "unable to read directory ");
-  	return;
diff --git a/mail/mh/files/patch-ac b/mail/mh/files/patch-ac
deleted file mode 100644
index 09da93c5c6c9..000000000000
--- a/mail/mh/files/patch-ac
+++ /dev/null
@@ -1,247 +0,0 @@
-*** slocal.c.orig	Tue Nov 30 20:01:38 1993
---- uip/slocal.c	Tue Apr 23 10:57:56 1996
-***************
-*** 44,49 ****
---- 44,59 ----
-  
-  #ifdef	MSGID
-  
-+ #ifdef	BSD44
-+ #define	MSGID_PAGFILE ".maildelivery.db"
-+ #define	MSGID_PAGFNO	dbm_dirfno
-+ #else
-+ #define	MSGID_PAGFILE ".maildelivery.pag"
-+ #define	MSGID_PAGFNO	dbm_pagfno
-+ #endif
-+ 
-+ static int check_msgid (int, char *);
-+ 
-  #undef	DBM		/* used by ndbm.h */
-  #include <ndbm.h>
-  #include <stdio.h>
-***************
-*** 173,178 ****
---- 183,190 ----
-      NULL
-  };
-  
-+ static char *rcvstore;
-+ 
-  /*  */
-  
-  extern char **environ;
-***************
-*** 299,304 ****
---- 311,318 ----
-  
-  /*  */
-  
-+     rcvstore = getcpy(libpath("rcvstore"));
-+ 
-      if (addr == NULL)
-  	addr = getusr ();
-      if (user == NULL)
-***************
-*** 378,387 ****
-  {
-  #ifdef	MSGID
-      struct stat st;
-  
-!     if (stat (".maildelivery.pag", &st) != NOTOK
-! 	    && check_msgid (fd, ".maildelivery") == DONE)
-! 	return OK;
-  #endif
-  
-      if (usr_delivery (fd, mdlvr ? mdlvr : ".maildelivery", 0, from) != NOTOK)
---- 392,412 ----
-  {
-  #ifdef	MSGID
-      struct stat st;
-+     static int first = 1;
-  
-!     if (stat (MSGID_PAGFILE, &st) != NOTOK) {
-! 	/*
-! 	 * Allow a user to trigger the database by creating an
-! 	 * empty database file.  That gets us here, now we need
-! 	 * to remove it so DBM will create and initialize it properly.
-! 	 */
-! 	if (st.st_size == 0 && first) {
-! 	    first = 0;
-! 	    (void) unlink(MSGID_PAGFILE);
-! 	}
-! 	if (check_msgid (fd, ".maildelivery") == DONE)
-! 	    return OK;
-!     }
-  #endif
-  
-      if (usr_delivery (fd, mdlvr ? mdlvr : ".maildelivery", 0, from) != NOTOK)
-***************
-*** 543,549 ****
---- 568,590 ----
-  		status = usr_pipe (fd, tmpbuf, "/bin/sh", vec + 2);
-  		break;
-  
-+ 	    case '+':
-+ 	    dofolder:
-+ 		if (*string == '+')
-+ 		    strcpy(tmpbuf, string);
-+ 		else
-+ 		    sprintf(tmpbuf, "+%s", string);
-+ 		vec[2] = "rcvstore";
-+ 		vec[3] = tmpbuf;
-+ 		vec[4] = NULL;
-+ 		if (verbose)
-+ 		    printf("rcvstore %s", vec[3]);
-+ 		status = usr_pipe(fd, "rcvstore", rcvstore, vec + 2);
-+ 		break;
-+ 
-  	    case 'f': 
-+ 		if (uleq(action, "folder"))
-+ 		    goto dofolder;
-  		if (!uleq (action, "file"))
-  		    continue;	/* else fall */
-  	    case '>': 
-***************
-*** 818,824 ****
-      if (utmped)
-  	return utmped;
-  
-!     if ((uf = fopen ("/etc/utmp", "r")) == NULL)
-  	return NOTOK;
-  
-      while (fread ((char *) &ut, sizeof ut, 1, uf) == 1)
---- 859,865 ----
-      if (utmped)
-  	return utmped;
-  
-!     if ((uf = fopen (_PATH_UTMP, "r")) == NULL)
-  	return NOTOK;
-  
-      while (fread ((char *) &ut, sizeof ut, 1, uf) == 1)
-***************
-*** 1314,1332 ****
-  		    fl.l_whence = 0;
-  		    fl.l_start = 0;
-  		    fl.l_len = 0;
-! 		    if (fcntl (dbm_pagfno (db), F_SETLK, &fl) == -1) {
-  			advise (file, "unable to perform flock on");
-  			goto out;
-  		    }
-  		}
-  #else
-  #ifdef LOCKF
-! 		if (lockf (dbm_pagfno (db), F_LOCK) == NOTOK) {
-  		    advise (file, "unable to perform lockf on");
-  		    goto out;
-  		}
-  #else
-! 		if (flock (dbm_pagfno (db), LOCK_EX) == NOTOK) {
-  		    advise (file, "unable to perform flock on");
-  		    goto out;
-  		}
---- 1355,1373 ----
-  		    fl.l_whence = 0;
-  		    fl.l_start = 0;
-  		    fl.l_len = 0;
-! 		    if (fcntl (MSGID_PAGFNO (db), F_SETLK, &fl) == -1) {
-  			advise (file, "unable to perform flock on");
-  			goto out;
-  		    }
-  		}
-  #else
-  #ifdef LOCKF
-! 		if (lockf (MSGID_PAGFNO (db), F_LOCK) == NOTOK) {
-  		    advise (file, "unable to perform lockf on");
-  		    goto out;
-  		}
-  #else
-! 		if (flock (MSGID_PAGFNO (db), LOCK_EX) == NOTOK) {
-  		    advise (file, "unable to perform flock on");
-  		    goto out;
-  		}
-*** popauth.c.orig	Tue Nov 30 20:01:34 1993
---- support/pop/popauth.c	Thu Feb 22 13:00:20 1996
-***************
-*** 18,23 ****
---- 18,28 ----
-  #include "../zotnet/bboards.h"
-  #include "../zotnet/mts.h"
-  
-+ #ifdef	dbm_pagfno
-+ #undef	dbm_pagfno
-+ #define	dbm_pagfno	dbm_dirfno
-+ #endif
-+ 
-  /*  */
-  
-  static struct swit switches[] = {
-***************
-*** 130,137 ****
-  	if ((db = dbm_open (APOP, O_RDWR | O_CREAT, 0600)) == NULL)
-  	    adios (APOP, "unable to create POP authorization DB");
-  	if (fchown (dbm_dirfno (db), pw -> pw_uid, pw -> pw_gid) == NOTOK
-! 	        || fchown (dbm_pagfno (db), pw -> pw_uid, pw -> pw_gid)
-! 	    		== NOTOK)
-  	    advise (" ", "error setting ownership of POP authorization DB");
-  
-  	done (0);
---- 135,144 ----
-  	if ((db = dbm_open (APOP, O_RDWR | O_CREAT, 0600)) == NULL)
-  	    adios (APOP, "unable to create POP authorization DB");
-  	if (fchown (dbm_dirfno (db), pw -> pw_uid, pw -> pw_gid) == NOTOK
-! #ifndef	BSD44
-! 	    || fchown (dbm_pagfno (db), pw -> pw_uid, pw -> pw_gid) == NOTOK
-! #endif
-! 	    )
-  	    advise (" ", "error setting ownership of POP authorization DB");
-  
-  	done (0);
-*** popser.c.orig	Tue Nov 30 20:01:34 1993
---- support/pop/popser.c	Thu Feb 22 12:58:31 1996
-***************
-*** 666,671 ****
---- 665,674 ----
-  #include <fcntl.h>
-  #endif
-  
-+ #ifdef	dbm_pagfno
-+ #undef	dbm_pagfno
-+ #define	dbm_pagfno	dbm_dirfno
-+ #endif
-  
-  static int apop (vec)
-  register char  **vec;
---- conf/config/mts.c	Mon Sep 22 10:44:37 1997
-+++ conf/config/mts.c	Mon Sep 22 10:40:14 1997
-@@ -13,6 +13,7 @@
- #include "../h/strings.h"
- #include <ctype.h>
- #include <stdio.h>
-+#include <paths.h>
- #include "mts.h"
- #ifdef	NETWORK
- #if	defined(BSD42) || defined(SOCKETS)
-@@ -119,7 +120,7 @@
- 
- #ifdef	SENDMTS
- char   *hostable = "@(MHETCPATH)/hosts";
--char   *sendmail = "/usr/lib/sendmail";
-+char   *sendmail = _PATH_SENDMAIL;
- #endif /* SENDMTS */
- 
- 
---- conf/doc/slocal.rf	Tue Nov 30 20:00:20 1993
-+++ conf/doc/slocal.rf	Mon Sep 22 10:41:16 1997
-@@ -294,9 +294,9 @@
- .Uh "Duplicate Message Suppression"
- \fIslocal\fR is able to detect and supress duplicate messages.
- To enable this,
--create two empty files in your $HOME directory:
--\&.maildelivery.pag and \&.maildelivery.dir.
--These are ndbm files which are used to store the Message-IDs of
-+create an empty file in your $HOME directory:
-+\&.maildelivery.db.
-+These is a db files which are used to store the Message-IDs of
- incoming messages.
- @END: MSGID
- .Fi
diff --git a/mail/mh/files/patch-ad b/mail/mh/files/patch-ad
deleted file mode 100644
index a296c2edaf90..000000000000
--- a/mail/mh/files/patch-ad
+++ /dev/null
@@ -1,196 +0,0 @@
-The following patch adds shared library support for FreeBSD to MH
-
-*** ../mh-6.8.3.orig/conf/FreeBSD	Tue Dec 27 20:36:52 1994
---- conf/FreeBSD	Tue Dec 27 19:10:35 1994
-***************
-*** 10,15 ****
---- 10,17 ----
-  cc	cc
-  signal	void
-  remove	rm -f
-+ sharedlib fbsd
-+ slflags	-fpic
-  
-  # Good options for all MH installations (personal preferences)
-  options	ATHENA DUMB FOLDPROT='"0700"' MHE MHRC RPATHS SBACKUP='"\\043"'
-*** ../mh-6.8.3.orig/conf/makefiles/sbr	Wed Dec  1 06:00:23 1993
---- conf/makefiles/sbr	Tue Dec 27 19:01:07 1994
-***************
-*** 123,128 ****
---- 123,131 ----
-  @BEGIN: SYS5SHLIB
-  		(cd shared; ld -G -o ../$@ -h $@.$(SLIBVER) $(OFILES))
-  @END: SYS5SHLIB
-+ @BEGIN: FBSDSHLIB
-+ 		(cd shared; ld -Bshareable -o ../$@ $(OFILES))
-+ @END: FBSDSHLIB
-  		-@rm -f $@.$(SLIBVER)
-  		ln $@ $@.$(SLIBVER)
-  		-@ls -l $@*
-*** ../mh-6.8.3.orig/conf/makefiles/uip	Wed Dec  1 06:00:23 1993
---- conf/makefiles/uip	Tue Dec 27 19:30:22 1994
-***************
-*** 138,147 ****
-  SLIBVER	=	.@(SLIBVER)
-  @END: SUN4SHLIB
-  @BEGIN: SHAREDLIB
-! LIBES	=	../config/config.o ../sbr/libmh.so ../mts/libmts.a \
-! 		../zotnet/libzot.a
-  LDLIBES	=	../config/config.o -Bdynamic @(SLDFLAG) -lmh$(SLIBVER) \
-  		../mts/libmts.a  ../zotnet/libzot.a
-  LDLIBS	=	$(LDLIBES) ../config/version.o $(LDOPTLIB)
-  @END: SHAREDLIB
-  LINT	=	lint
---- 138,157 ----
-  SLIBVER	=	.@(SLIBVER)
-  @END: SUN4SHLIB
-  @BEGIN: SHAREDLIB
-! @BEGIN: SUN4SHLIB
-! LDLIBES	=	../config/config.o -Bdynamic @(SLDFLAG) -lmh$(SLIBVER) \
-! 		../mts/libmts.a  ../zotnet/libzot.a
-! @END: SUN4SHLIB
-! @BEGIN: SYS5SHLIB
-  LDLIBES	=	../config/config.o -Bdynamic @(SLDFLAG) -lmh$(SLIBVER) \
-  		../mts/libmts.a  ../zotnet/libzot.a
-+ @END: SYS5SHLIB
-+ @BEGIN: FBSDSHLIB
-+ LDLIBES	=	../config/config.o @(SLDFLAG) -L../sbr -lmh$(SLIBVER) \
-+ 		../mts/libmts.a  ../zotnet/libzot.a
-+ @END: FBSDSHLIB
-+ LIBES	=	../config/config.o ../sbr/libmh.so ../mts/libmts.a \
-+ 		../zotnet/libzot.a
-  LDLIBS	=	$(LDLIBES) ../config/version.o $(LDOPTLIB)
-  @END: SHAREDLIB
-  LINT	=	lint
-*** ../mh-6.8.3.orig/conf/makefiles/support/pop.orig	Thu Feb 22 13:05:50 1996
---- conf/makefiles/support/pop	Thu Feb 22 13:10:18 1996
-***************
-*** 59,67 ****
-  @BEGIN: SHAREDLIB
-  LIBES2	=	../../config/config.o ../../sbr/libmh.so $(LIBES1)
-  LDLIBS1	=	$(LIBES1) $(LDOPTLIB)
-  LDLIBS2	=	../../config/config.o ../../config/version.o \
-  		-Bdynamic @(SLDFLAG) -lmh$(SLIBVER) $(LIBES1) $(LDOPTLIB)
-! @END: SHAREDLIB
-  
-  LINT	=	lint
-  LFLAGS	=	-bhu $(OPTIONS)
---- 59,77 ----
-  @BEGIN: SHAREDLIB
-  LIBES2	=	../../config/config.o ../../sbr/libmh.so $(LIBES1)
-  LDLIBS1	=	$(LIBES1) $(LDOPTLIB)
-+ @END: SHAREDLIB
-+ @BEGIN: SUN4SHLIB
-  LDLIBS2	=	../../config/config.o ../../config/version.o \
-  		-Bdynamic @(SLDFLAG) -lmh$(SLIBVER) $(LIBES1) $(LDOPTLIB)
-! @END: SUN4SHLIB
-! @BEGIN: SYS5SHLIB
-! LDLIBS2	=	../../config/config.o ../../config/version.o \
-! 		-Bdynamic @(SLDFLAG) -lmh$(SLIBVER) $(LIBES1) $(LDOPTLIB)
-! @END: SYS5SHLIB
-! @BEGIN: FBSDSHLIB
-! LDLIBS2	=	../../config/config.o ../../config/version.o \
-! 		@(SLDFLAG) -L../../sbr -lmh$(SLIBVER) $(LIBES1) $(LDOPTLIB)
-! @END: FBSDSHLIB
-  
-  LINT	=	lint
-  LFLAGS	=	-bhu $(OPTIONS)
-*** ../mh-6.8.3.orig/conf/mhconfig.c	Wed Dec  1 06:00:24 1993
---- conf/mhconfig.c	Tue Dec 27 19:08:40 1994
-***************
-*** 32,38 ****
-  #define	MHRELEASE	"6.8.3"		/* for version: "Maj.min.pat" */
-  #define	MHCENTERFOOT	"MH.6.8"	/* for nroff page footers */
-  #define	MHLEFTFOOT	"[mh.6]"	/* [mh.6]    MH.6.6   page# */
-! #define	MHSLIBVER	"3.2"		/* SunOS4 shared library version */
-  
-  #define	NOTOK	(-1)
-  
---- 32,40 ----
-  #define	MHRELEASE	"6.8.3"		/* for version: "Maj.min.pat" */
-  #define	MHCENTERFOOT	"MH.6.8"	/* for nroff page footers */
-  #define	MHLEFTFOOT	"[mh.6]"	/* [mh.6]    MH.6.6   page# */
-! #ifndef MHSLIBVER
-! #define	MHSLIBVER	"3.2"		/* Shared library version */
-! #endif
-  
-  #define	NOTOK	(-1)
-  
-***************
-*** 456,461 ****
---- 456,465 ----
-  	fprintf (fp, "/^@BEGIN: SYS5SHLIB$/d\n/^@END: SYS5SHLIB$/d\n");
-      else
-  	fprintf (fp, "/^@BEGIN: SYS5SHLIB$/,/^@END: SYS5SHLIB$/d\n");
-+     if (strcmp (sharedlib, "fbsd") == 0)
-+ 	fprintf (fp, "/^@BEGIN: FBSDSHLIB$/d\n/^@END: FBSDSHLIB$/d\n");
-+     else
-+ 	fprintf (fp, "/^@BEGIN: FBSDSHLIB$/,/^@END: FBSDSHLIB$/d\n");
-  
-  /*  */
-  
-***************
-*** 774,782 ****
-  
-      if (strcmp (sharedlib, "on") && strcmp (sharedlib, "off")
-  	    && strcmp (sharedlib, "sun4") && strcmp (sharedlib, "sys5")
-! 	    && strcmp (sharedlib, "secure"))
-  	adios (NULLCP,
-! 	    "sharedlib should be either \"sun4\", \"sys5\", or \"off\", not %s",
-  	    sharedlib);
-  
-      (void) sprintf(buffer, "TYPESIG=%s", signl);
---- 778,786 ----
-  
-      if (strcmp (sharedlib, "on") && strcmp (sharedlib, "off")
-  	    && strcmp (sharedlib, "sun4") && strcmp (sharedlib, "sys5")
-! 	    && strcmp (sharedlib, "fbsd") && strcmp (sharedlib, "secure"))
-  	adios (NULLCP,
-! 	    "sharedlib should be either \"sun4\", \"sys5\", \"fbsd\" or \"off\", not %s",
-  	    sharedlib);
-  
-      (void) sprintf(buffer, "TYPESIG=%s", signl);
-*** ../mh-6.8.3.orig/support/bboards/mmdfII/bboards/lock.c	Wed Dec  1 06:01:30 1993
---- support/bboards/mmdfII/bboards/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 @@
- inst-lib:	libmh.so $(LIBSA)
- 		-rm -f $(SLIBDIR)/libmh.so.$(SLIBVER)
- 		cp libmh.so.$(SLIBVER) $(SLIBDIR)/libmh.so.$(SLIBVER)
-+		ln -s libmh.so.$(SLIBVER) $(SLIBDIR)/libmh.so
- 		-@chmod $(PGMPROT) $(SLIBDIR)/libmh.so.$(SLIBVER)
- 		-@ls -l $(SLIBDIR)/libmh.so.*
- 		-@echo "Shared library installed normally"
---- conf/Makefile.orig	Wed Sep 23 10:27:39 1998
-+++ conf/Makefile	Wed Sep 23 10:27:25 1998
-@@ -6,10 +6,15 @@
- SHELL	=	/bin/sh
- 
- CC      =   	cc
--CFLAGS  =   	-O
- LFLAGS  =   	-bhu
- LDFLAGS =
- LIBES   =
-+
-+.if ${PORTOBJFORMAT} == "elf"
-+CFLAGS  =   	-O -DMHSLIBVER=\"3\"
-+.else
-+CFLAGS  =   	-O -DMHSLIBVER=\"3.2\"
-+.endif
- 
- 
- ######################################################################
diff --git a/mail/mh/files/patch-ae b/mail/mh/files/patch-ae
deleted file mode 100644
index ccf7a3365462..000000000000
--- a/mail/mh/files/patch-ae
+++ /dev/null
@@ -1,378 +0,0 @@
-The following patches enable RFC1342 compatible decoding of header fields
-for non-ascii character sets.
-
-Additional tips:
-	setenv MM_CHARSET <rfc1342 charset>
-	setenv LC_TYPE	  <proper locale>
-
-e.g.	setenv MM_CHARSET KOI8-R
-	setenv LC_TYPE    ru_RU.KOI8-R
-
-or	setenv MM_CHARSET iso-8859-1
-	setenv LC_TYPE    iso_8859_1
-
-Change your mhl.format to read so that the new code will be invoked on
-interesting fields when you do a "show":
-
-	From:formatfield="%(comp{text})"
-	Reply-To:formatfield="%(comp{text})"
-	To:formatfield="%(comp{text})"
-	cc:formatfield="%(comp{text})"
-
-	---------------------------------------------------------
-
-
---- conf/FreeBSD.orig	Sat Oct 12 23:04:23 1996
-+++ conf/FreeBSD	Sat Oct 12 23:36:19 1996
-@@ -18,7 +20,7 @@
- options	BSD42 BSD43 BSD44 WAITINT UNISTD VSPRINTF MORE='"/usr/bin/more"'
- options	NORUSERPASS DBMPWD POSIX NTOHLSWAP SYS5DIR OVERHEAD MSGID FCNTL
- options	BIND MIME SENDMTS SMTP WHATNOW ZONEINFO
--options GCOS_HACK RENAME LOCALE
-+options GCOS_HACK RENAME LOCALE RFC1342
- 
- # If you want POP support, this will help you get started,  but feel
- # free to customize it.
---- conf/makefiles/sbr.864	Sun Oct 13 01:15:28 1996
-+++ conf/makefiles/sbr	Sun Oct 13 01:15:50 1996
-@@ -50,7 +50,7 @@
- 		ruserpass.c \
- @END: NORUSERPASS
- 		showfile.c smatch.c sprintb.c ssequal.c strindex.c trimcpy.c \
--		uleq.c uprf.c vfgets.c formatdef.c m_msgdef.c
-+		uleq.c uprf.c vfgets.c formatdef.c m_msgdef.c rfc1342.c
- 
- 
- OFILES	=	add.o adios.o admonish.o addrsbr.o advertise.o advise.o \
-@@ -69,7 +69,7 @@
- 		ruserpass.o \
- @END: NORUSERPASS
- 		showfile.o smatch.o sprintb.o ssequal.o strindex.o trimcpy.o \
--		uleq.o uprf.o vfgets.o formatdef.o m_msgdef.o
-+		uleq.o uprf.o vfgets.o formatdef.o m_msgdef.o rfc1342.o
- 
- @BEGIN: SHAREDLIB
- ODEFS	=	formatdef.o m_msgdef.o
---- 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)
--register char  *str,
--               *sub;
-+register unsigned char  *str,
-+                        *sub;
- {
-     register int    c1;
-     register int    c2;
--    register char   *s1;
--    register char   *s2;
-+    register unsigned char   *s1;
-+    register unsigned char   *s2;
- 
- #ifdef LOCALE
-     while (c1 = *sub) {
-@@ -203,14 +202,14 @@
- 					i++;\
- 				}\
- 			} else {\
--			    while ((c = *sp) && (iscntrl(c) || isspace(c)))\
-+			    while ((c = (unsigned char) *sp) && (iscntrl(c) || isspace(c)))\
- 				sp++;\
- 			}\
--			while ((c = *sp++) && --i >= 0 && cp < ep)\
-+			while ((c = (unsigned char) *sp++) && --i >= 0 && cp < ep)\
- 				if (isgraph(c)) \
- 				    *cp++ = c;\
- 				else {\
--					while ((c = *sp) && (iscntrl(c) || isspace(c)))\
-+					while ((c = (unsigned char) *sp) && (iscntrl(c) || isspace(c)))\
- 						sp++;\
- 					    *cp++ = ' ';\
- 				}\
-@@ -221,13 +220,13 @@
- 	}
- #define PUTS(cp, str) {\
- 		if (sp = (str)) {\
--		    while ((c = *sp) && (iscntrl(c) || isspace(c)))\
-+		    while ((c = (unsigned char) *sp) && (iscntrl(c) || isspace(c)))\
- 			sp++;\
--		    while((c = *sp++) && cp < ep)\
-+		    while((c = (unsigned char) *sp++) && cp < ep)\
- 			if (isgraph(c)) \
- 			    *cp++ = c;\
- 			else {\
--			    while ((c = *sp) && (iscntrl(c) || isspace(c)))\
-+			    while ((c = (unsigned char) *sp) && (iscntrl(c) || isspace(c)))\
- 				sp++;\
- 			    *cp++ = ' ';\
- 			}\
-@@ -358,15 +357,30 @@
-     long l;
-     char        *savestr;
-     char	buffer[BUFSIZ];
-+    char	workbuff[BUFSIZ];
- 
-     while (cp < ep) {
- 	switch (fmt->f_type) {
- 
- 	case FT_COMP:
-+#ifdef RFC1342
-+	    str = fmt->f_comp->c_text;
-+	    if (maybe_decode_rfc1342(str, buffer))
-+		str = buffer;
-+	    PUTS (cp, str);
-+#else       
- 	    PUTS (cp, fmt->f_comp->c_text);
-+#endif
- 	    break;
- 	case FT_COMPF:
-+#ifdef RFC1342
-+	    str = fmt->f_comp->c_text;
-+	    if (maybe_decode_rfc1342(str, buffer))
-+		str = buffer;
-+	    PUTSF (cp, str, fmt->f_width, fmt->f_fill);
-+#else           
- 	    PUTSF (cp, fmt->f_comp->c_text, fmt->f_width, fmt->f_fill);
-+#endif
- 	    break;
- 
- 	case FT_LIT:
-@@ -500,6 +514,10 @@
- 
- 	case FT_LS_COMP:
- 	    str = fmt->f_comp->c_text;
-+#ifdef RFC1342
-+	    if (maybe_decode_rfc1342(str, buffer))
-+		str = buffer;
-+#endif
- 	    break;
- 	case FT_LS_LIT:
- 	    str = fmt->f_text;
-@@ -722,6 +740,10 @@
- 			    else
- 				break;
- 		    }
-+#ifdef	RFC1342
-+		    if (maybe_decode_rfc1342(str, workbuff))
-+			str = workbuff;
-+#endif	/* RFC1342 */
- 		    if (*str)
- 			break;
- 		}	    
-@@ -744,6 +766,10 @@
- 			break;
- 		}
- 	    }
-+#ifdef	RFC1342
-+	    if (maybe_decode_rfc1342(str, workbuff))
-+		str = workbuff;
-+#endif	/* RFC1342 */
- #endif	/* BERK */
- 	    break;
- 
---- /dev/null	Sat Oct 12 23:27:32 1996
-+++ sbr/rfc1342.c	Sun Oct 13 00:02:22 1996
-@@ -0,0 +1,184 @@
-+/* rfc1342.c */ 
-+/*
-+ * Decode RFC1342 header format 
-+ */
-+
-+#ifdef RFC1342
-+static char hexindex[] = {
-+    -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
-+    -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
-+    -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
-+     0, 1, 2, 3, 4, 5, 6, 7, 8, 9,-1,-1,-1,-1,-1,-1,
-+    -1,10,11,12,13,14,15,-1,-1,-1,-1,-1,-1,-1,-1,-1,
-+    -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
-+    -1,10,11,12,13,14,15,-1,-1,-1,-1,-1,-1,-1,-1,-1,
-+    -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1
-+};
-+
-+static char index_64[128] = {
-+    -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1,
-+    -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1,
-+    -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,62, -1,-1,-1,63,
-+    52,53,54,55, 56,57,58,59, 60,61,-1,-1, -1,-1,-1,-1,
-+    -1, 0, 1, 2,  3, 4, 5, 6,  7, 8, 9,10, 11,12,13,14,
-+    15,16,17,18, 19,20,21,22, 23,24,25,-1, -1,-1,-1,-1,
-+    -1,26,27,28, 29,30,31,32, 33,34,35,36, 37,38,39,40,
-+    41,42,43,44, 45,46,47,48, 49,50,51,-1, -1,-1,-1,-1
-+};
-+
-+#define char64(c)  (((c) < 0 || (c) > 127) ? -1 : index_64[(c)])
-+
-+static int
-+unqp (byte1, byte2)
-+	char byte1;
-+	char byte2;
-+{
-+  if (hexindex[byte1] == -1 || hexindex[byte2] == -1)
-+    return -1;
-+  return hexindex[byte1]<<4 | hexindex[byte2];
-+}
-+
-+int
-+maybe_decode_rfc1342 (src, dst) 
-+	char *src;
-+	char *dst;
-+{
-+	static char *mm_charset = 0;
-+	static char *alt_charset = 0;
-+	extern char *getenv();
-+	char *p;
-+	char *q;
-+	char *pp;
-+	char *startofmime = 0;
-+	char *endofmime = 0;
-+	int c;
-+	int quoted_printable;
-+
-+	if (!mm_charset) {
-+		mm_charset = getenv ("MM_CHARSET");
-+		if (mm_charset && strcasecmp(mm_charset, "iso-8859-1") == 0) {
-+		  alt_charset = "us-ascii"; /* Accept a common subset */
-+		}
-+	}
-+	if (!mm_charset || src == 0)
-+		return 0;
-+
-+	for (p = src, q = dst; *p; p++) {
-+		*q++ = *p;
-+		if (*p == '=' && p[1] && p[1] == '?' && p[2]) {
-+			/* Have: =? */
-+			startofmime = p + 2;
-+			if (strncasecmp(startofmime, mm_charset, 
-+					strlen(mm_charset)) == 0) {
-+			  startofmime += strlen (mm_charset);
-+			} else if (alt_charset &&
-+				   (strncasecmp(startofmime, alt_charset, 
-+						strlen(alt_charset)) == 0)) {
-+			  startofmime += strlen (alt_charset);
-+			} else {
-+			  continue;
-+			}
-+			/* Have: =?charset */
-+			if (startofmime[0] != '?')
-+				continue;
-+			/* Have: =?charset? */
-+			startofmime++;
-+			if (*startofmime != 'B' &&
-+			    *startofmime != 'b' &&
-+			    *startofmime != 'Q' &&
-+			    *startofmime != 'q')
-+				continue;
-+			/* Have: =?charset?E */
-+			quoted_printable = *startofmime == 'Q' ||
-+					   *startofmime == 'q';;
-+			startofmime++;
-+			if (*startofmime != '?')
-+				continue;
-+			/* Have: =?charset?E? */
-+			startofmime++;
-+			for (pp = startofmime; *pp && *(pp+1); pp++)
-+				if (*pp == '?' && pp[1] == '=') {
-+					endofmime = pp;
-+					break;
-+				}
-+			/* Have: =?charset?E?text?= */
-+			if (endofmime) {
-+				q--;
-+				if (quoted_printable)
-+					for (pp = startofmime; pp < endofmime; pp++) {
-+						if (*pp == '=') {
-+							c =  unqp (pp[1], pp[2]);
-+							if ( c == -1)
-+								continue;
-+							if ( c != 0)
-+							  *q++ = c;
-+							pp += 2;
-+						} else if (*pp == '_')
-+							*q++ = ' ';
-+						else
-+							*q++ = *pp;
-+					}
-+				else {	/* base64 */
-+				  int c1, c2, c3, c4;
-+				  pp = startofmime;
-+				  while (pp < endofmime) {
-+				    /* 6 + 2 bits */
-+				    while ((pp < endofmime) &&
-+					   ((c1 = char64(*pp)) == -1)) {
-+				      pp++;
-+				    }
-+				    if (pp < endofmime) {
-+				      pp++;
-+				    }
-+				    while ((pp < endofmime) &&
-+					   ((c2 = char64(*pp)) == -1)) {
-+				      pp++;
-+				    }
-+				    if (pp < endofmime && c1 != -1 && c2 != -1) {
-+				      *q++ = (c1 << 2) | (c2 >> 4);
-+				      pp++;
-+				    }
-+				    /* 4 + 4 bits */
-+				    while ((pp < endofmime) &&
-+					   ((c3 = char64(*pp)) == -1)) {
-+				      pp++;
-+				    }
-+				    if (pp < endofmime && c2 != -1 && c3 != -1) {
-+				      *q++ = ((c2 & 0xF) << 4) | (c3 >> 2);
-+				      pp++;
-+				    }
-+				    /* 2 + 6 bits */
-+				    while ((pp < endofmime) &&
-+					   ((c4 = char64(*pp)) == -1)) {
-+				      pp++;
-+				    }
-+				    if (pp < endofmime && c3 != -1 && c4 != -1) {
-+				      *q++ = ((c3 & 0x3) << 6) | (c4);
-+				      pp++;
-+				    }
-+				  }
-+				}
-+				p = endofmime + 1;
-+				if (*p == ' ')
-+					p++;
-+			}
-+		}
-+	}
-+	*q = 0;
-+	return endofmime != 0;
-+}
-+#endif
-+
-+#ifdef notdef	/* For debugging */
-+int
-+main(argc, argv)
-+	int argc;
-+	char **argv;
-+{
-+	char buff[100];
-+	if (maybe_decode_rfc1342 (argv[1], buff))
-+		puts (buff);
-+	else
-+		puts ("NEI!");
-+}
-+#endif
diff --git a/mail/mh/files/patch-af b/mail/mh/files/patch-af
deleted file mode 100644
index b8532b1d887b..000000000000
--- a/mail/mh/files/patch-af
+++ /dev/null
@@ -1,11 +0,0 @@
---- uip/rcvtty.c.orig	Tue Jan  7 18:04:11 1997
-+++ uip/rcvtty.c	Tue Jan  7 18:13:50 1997
-@@ -158,7 +158,7 @@
- 
-     user = getusr ();
- #ifndef	TTYD
--    if ((uf = fopen ("/etc/utmp", "r")) == NULL)
-+    if ((uf = fopen (_PATH_UTMP, "r")) == NULL)
- 	exit (RCV_MBX);
-     while (fread ((char *) &ut, sizeof ut, 1, uf) == 1)
- 	if (ut.ut_name[0] != 0
diff --git a/mail/mh/files/patch-ag b/mail/mh/files/patch-ag
deleted file mode 100644
index 519cd0ebbc28..000000000000
--- a/mail/mh/files/patch-ag
+++ /dev/null
@@ -1,12 +0,0 @@
---- sbr/m_atoi.c.orig	Wed Dec  1 13:01:23 1993
-+++ sbr/m_atoi.c	Tue Jan  7 18:53:15 1997
-@@ -19,6 +19,9 @@
- 	i *= 10;
- 	i += *cp++ - '0';
-     }
-+    if (*cp) { /* non-digit ended string -- return 0. */
-+	return 0;
-+    }
- #else
-     while (*cp) {
- 	if (*cp < '0' || *cp > '9')
diff --git a/mail/mh/files/patch-ah b/mail/mh/files/patch-ah
deleted file mode 100644
index 27b9b88d77d9..000000000000
--- a/mail/mh/files/patch-ah
+++ /dev/null
@@ -1,53 +0,0 @@
---- sbr/m_seq.c.dist	Wed Dec  1 12:01:24 1993
-+++ sbr/m_seq.c	Mon Feb  3 12:39:31 1997
-@@ -16,7 +16,7 @@
- 	int mask;
- 	register int i, j;
- 	register char *bp;
--	static char buffer[BUFSIZ*2];	/* for big sequences */
-+	static char buffer[BUFSIZ * 4];	/* for big sequences */
- 
- 	if (strcmp (current, cp) == 0) {
- 	    /* assume this is in sync with msgstats["cur"] */
---- sbr/m_gmsg.c.dist	Wed Dec  1 12:01:24 1993
-+++ sbr/m_gmsg.c	Mon Feb  3 12:40:25 1997
-@@ -211,7 +211,7 @@
-             state;
-     register char  *cp;
-     char    name[NAMESZ],
--            field[BUFSIZ * 2];
-+            field[BUFSIZ * 4];
-     register struct node   *np;
-     register    FILE * fp;
- 
---- sbr/m_sync.c.dist	Wed Dec  1 12:01:25 1993
-+++ sbr/m_sync.c	Mon Feb  3 12:41:21 1997
-@@ -26,7 +26,7 @@
-     register char  *cp;
-     char    flags,
- 	    attr[BUFSIZ],
--	    seq[BUFSIZ * 2];
-+	    seq[BUFSIZ * 4];
-     register FILE  *fp;
- #ifndef	BSD42
-     TYPESIG (*hstat) (), (*istat) (), (*qstat) (), (*tstat) ();
---- uip/vmhsbr.c.dist	Wed Dec  1 12:01:39 1993
-+++ uip/vmhsbr.c	Mon Feb  3 12:42:08 1997
-@@ -197,7 +197,7 @@
- {
-     int     eindex = errno;
-     register char  *bp;
--    char    buffer[BUFSIZ * 2];
-+    char    buffer[BUFSIZ * 4];
- 
-     (void) sprintf (buffer, fmt, a, b, c, d, e, f);
-     bp = buffer + strlen (buffer);
-@@ -230,7 +230,7 @@
-        *e,
-        *f;
- {
--    static char buffer[BUFSIZ * 2];
-+    static char buffer[BUFSIZ * 4];
- 
-     (void) sprintf (buffer, fmt, a, b, c, d, e, f);
- 
diff --git a/mail/mh/files/patch-ai b/mail/mh/files/patch-ai
deleted file mode 100644
index 2d5d79ce586b..000000000000
--- a/mail/mh/files/patch-ai
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
deleted file mode 100644
index 328a342ee2d2..000000000000
--- a/mail/mh/files/patch-aj
+++ /dev/null
@@ -1,20 +0,0 @@
---- 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
deleted file mode 100644
index 77295877bc45..000000000000
--- a/mail/mh/files/patch-ak
+++ /dev/null
@@ -1,18 +0,0 @@
---- 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
deleted file mode 100644
index 4aec8ee25d06..000000000000
--- a/mail/mh/files/patch-al
+++ /dev/null
@@ -1,21 +0,0 @@
---- 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
deleted file mode 100644
index bee55ca99e66..000000000000
--- a/mail/mh/files/patch-am
+++ /dev/null
@@ -1,23 +0,0 @@
---- 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
deleted file mode 100644
index 9c2cd890a62c..000000000000
--- a/mail/mh/files/patch-an
+++ /dev/null
@@ -1,23 +0,0 @@
---- 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
deleted file mode 100644
index 88e052be6895..000000000000
--- a/mail/mh/files/patch-ao
+++ /dev/null
@@ -1,18 +0,0 @@
---- 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();
- 
- /*  */
diff --git a/mail/mh/pkg-comment b/mail/mh/pkg-comment
deleted file mode 100644
index 16ed4920774d..000000000000
--- a/mail/mh/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Rand MH mail handling system
diff --git a/mail/mh/pkg-descr b/mail/mh/pkg-descr
deleted file mode 100644
index 97c78ad773d1..000000000000
--- a/mail/mh/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-This is the MH mail user agent (reader/sender), a command line
-based mail reader that is powerful and extensible.  MH is an
-excellent choice for people who receive and process a LOT of mail.
diff --git a/mail/mh/pkg-plist b/mail/mh/pkg-plist
deleted file mode 100644
index b16d3db1d7d1..000000000000
--- a/mail/mh/pkg-plist
+++ /dev/null
@@ -1,77 +0,0 @@
-bin/ali
-bin/anno
-bin/burst
-bin/comp
-bin/dist
-bin/folder
-bin/folders
-bin/forw
-bin/inc
-bin/mark
-bin/mhmail
-bin/mhn
-bin/mhparam
-bin/mhpath
-bin/msgchk
-bin/msh
-bin/next
-bin/packf
-bin/pgped
-bin/pgpshow
-bin/pick
-bin/prev
-bin/prompter
-bin/refile
-bin/repl
-bin/rmf
-bin/rmm
-bin/scan
-bin/send
-bin/show
-bin/sortm
-bin/vmh
-bin/whatnow
-bin/whom
-lib/mh/MailAliases
-lib/mh/ap
-lib/mh/components
-lib/mh/conflict
-lib/mh/digestcomps
-lib/mh/distcomps
-lib/mh/dp
-lib/mh/fmtdump
-lib/mh/forwcomps
-lib/mh/install-mh
-lib/mh/mhl
-lib/mh/mhl.body
-lib/mh/mhl.digest
-lib/mh/mhl.format
-lib/mh/mhl.forward
-lib/mh/mhl.headers
-lib/mh/mhn_defaults
-lib/mh/mtstailor
-lib/mh/packmbox
-lib/mh/pgped.tcl
-lib/mh/popaka
-lib/mh/popwrd
-lib/mh/post
-lib/mh/rcvdist
-lib/mh/rcvdistcomps
-lib/mh/rcvpack
-lib/mh/rcvstore
-lib/mh/rcvtty
-lib/mh/replcomps
-lib/mh/scan.default
-lib/mh/scan.mailx
-lib/mh/scan.size
-lib/mh/scan.time
-lib/mh/scan.timely
-lib/mh/slocal
-lib/mh/spop
-lib/mh/spost
-lib/mh/tmac.h
-lib/mh/viamail
-lib/libmh.so
-lib/libmh.so.3.2
-libexec/popd
-@dirrm lib/mh
diff --git a/mail/mh/scripts/configure b/mail/mh/scripts/configure
deleted file mode 100644
index 135141de869e..000000000000
--- a/mail/mh/scripts/configure
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-#
-# Configure MH
-#
-cd $WRKSRC/conf
-make
-./mhconfig FreeBSD
-cd ..
-make clean