Upgrade to version 0.89.

NOTE, this is now the full version.  Michael has pushed the PGP hooks
development off-shore.  This port now fetches from there.  Mutt does
not contain crypo, just hooks to run an extern application.  All I've
talked to feel ITAR does NOT prohibit this -- as Mutt isn't using the
PGP ABI.  In fact, our current Elm package is built with PGP hooks and
we do not control it, so I am treaing Mutt in the same way.

12 files changed, 312 insertions, 51 deletions

diff --git a/mail/mutt-devel/Makefile b/mail/mutt-devel/Makefile
index 434e9bdaece1..698f66711682 100644
--- a/mail/mutt-devel/Makefile
+++ b/mail/mutt-devel/Makefile
@@ -1,38 +1,40 @@
 # ex:ts=8
-# New ports collection makefile for:    mutt
+# New ports collection makefile for:    mutt w/pgp hooks
 # Version required:     0.xy
 # Date created:         Thur July 25, 1996
 # Whom:                 David O'Brien (obrien@NUXI.com)
 #
-# $Id: Makefile,v 1.38 1997/10/01 11:27:35 obrien Exp $
+# $Id: Makefile,v 1.44 1997/11/16 01:57:55 obrien Exp $
 
-DISTNAME=	${PKGNAME}e
-PKGNAME=	mutt-0.88
+DISTNAME=	${PKGNAME}i
+PKGNAME=	mutt-0.89
 CATEGORIES=	mail
-MASTER_SITES=	ftp://ftp.cs.hmc.edu/pub/me/mutt/  \
-		ftp://ftp.ibp.fr/pub/unix/mail/mutt/  \
-		ftp://ftp.fu-berlin.de/pub/unix/mail/mutt/  \
-		ftp://ftp.teuto.de/pub/user/lmb/  \
-		ftp://ftp.funet.fi/pub/unix/mail/mutt/
+MASTER_SITES=	ftp://riemann.iam.uni-bonn.de/pub/mutt/  \
+		ftp://ftp.gbnet.net/pub/mutt-international/  \
+		ftp://ftp.fu-berlin.de/pub/unix/mail/mutt/mutt-international/ \
+		ftp://ftp.gwdg.de/pub/unix/mail/mutt/international/  \
+		ftp://ftp.iks-jena.de/pub/mitarb/lutz/crypt/software/pgp/mutt/
 
-PATCH_SITES=	ftp://ftp.nuxi.com/pub/mutt/${PKGNAME:S/^mutt-//}/  \
-		http://www.frmug.org/mutt/mutt/${PKGNAME:S/^mutt-//}/  \
+PATCH_SITES=	http://www.frmug.org/mutt/mutt/${PKGNAME:S/^mutt-//}/  \
 		http://www.math.fu-berlin.de/~leitner/mutt/${PKGNAME:S/^mutt-//}/  \
 		http://www.efrei.fr/~parmelan/mutt/${PKGNAME:S/^mutt-//}/  \
-		ftp://www.frmug.org/pub/mutt/mutt/${PKGNAME:S/^mutt-//}/
+		ftp://www.frmug.org/pub/mutt/mutt/${PKGNAME:S/^mutt-//}/  \
+		ftp://ftp.nuxi.com/pub/mutt/${PKGNAME:S/^mutt-//}/
 PATCHFILES=
 
 MAINTAINER=     obrien@FreeBSD.org
 
+.if defined(BATCH)
+RUN_DEPENDS=	ispell:${PORTSDIR}/textproc/ispell
+.endif
+
 DIST_SUBDIR=	mutt
-WRKSRC=		${WRKDIR}/${PKGNAME}
 PATCH_DIST_STRIP=	-p1
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS= --enable-dsn --enable-pop --enable-flock \
 		--disable-fcntl --enable-hidden-host
 MAN1=		mutt.1
 
-
 post-install:
 	@strip ${PREFIX}/bin/mutt
 .if !defined(NOPORTDOCS)
diff --git a/mail/mutt-devel/distinfo b/mail/mutt-devel/distinfo
index b283b81e5f34..c0245b64d332 100644
--- a/mail/mutt-devel/distinfo
+++ b/mail/mutt-devel/distinfo
@@ -1 +1 @@
-MD5 (mutt/mutt-0.88e.tar.gz) = 8ba48e79c22a156998293ffc35ab431a
+MD5 (mutt/mutt-0.89i.tar.gz) = 06446691f18b8293b82c713232050134
diff --git a/mail/mutt-devel/files/patch-05 b/mail/mutt-devel/files/patch-05
new file mode 100644
index 000000000000..51d1db250510
--- /dev/null
+++ b/mail/mutt-devel/files/patch-05
@@ -0,0 +1,81 @@
+--- acconfig.h.orig	Tue Mar 11 17:04:02 1997
++++ acconfig.h	Sat Mar 15 22:23:06 1997
+@@ -18,6 +18,9 @@
+ #undef DOMAIN
+ @TOP@
+ 
++/* gethostname() can be used to obtain the domain name */
++#undef GETHOSTNAME_DOMAIN
++
+ /* use dotlocking to lock mailboxes? */
+ #undef USE_DOTLOCK
+ 
+--- config.h.in.orig	Wed Mar 12 17:46:39 1997
++++ config.h.in	Sat Mar 15 22:27:01 1997
+@@ -18,6 +18,9 @@
+ /* What is your domain name? */
+ #undef DOMAIN
+ 
++/* gethostname() can be used to obtain the domain name */
++/* #define GETHOSTNAME_DOMAIN 1 */
++
+ /* Define as the return type of signal handlers (int or void).  */
+ #undef RETSIGTYPE
+ 
+--- init.c.orig	Tue Mar 11 17:29:14 1997
++++ init.c	Sat Mar 15 22:26:44 1997
+@@ -961,6 +961,19 @@
+   if (debuglevel > 0) start_debug();
+ #endif
+ 
++#ifdef GETHOSTNAME_DOMAIN
++  /* Get host and domain name */
++  gethostname (Hostname, sizeof (Hostname));
++  Hostname[sizeof (Hostname) - 1] = 0;
++  if ((p = strchr (Hostname, '.')) == NULL)
++    /* blech */
++	domain = "";
++  else
++    {
++	  *p++ = 0;
++	  domain = p;
++    }
++#else
+   /* And about the host... */
+   uname (&utsname);
+   strfcpy (Hostname, utsname.nodename, sizeof (Hostname));
+@@ -971,6 +984,7 @@
+     *p++ = 0;
+     strfcpy (buffer, p, sizeof (buffer)); /* save the domain for below */
+   }
++#endif
+ 
+ #ifdef USE_DOMAIN
+ 
+--- globals.h.orig	Mon Mar 10 14:34:27 1997
++++ globals.h	Sat Mar 15 22:29:01 1997
+@@ -130,6 +130,13 @@
+ WHERE gid_t UserGid;
+ #endif /* USE_SETGID */
+ 
++/* if your gethostname() returns the domainname too */
++#ifdef GETHOSTNAME_DOMAIN
++WHERE char *domain;
++#undef DOMAIN
++#define DOMAIN domain
++#endif
++
+ #ifdef MAIN_C
+ const char *Weekdays[] = { "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat" };
+ const char *Months[] = { "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec", "ERR" };
+--- main.c.orig	Fri Mar  7 18:57:24 1997
++++ main.c	Sat Mar 15 22:28:14 1997
+@@ -114,7 +114,7 @@
+ 
+   puts ("\n\nCompile time definitions:");
+ 
+-#ifdef DOMAIN
++#if defined(DOMAIN) && !defined(GETHOSTNAME_DOMAIN)
+   printf ("DOMAIN=\"%s\"\n", DOMAIN);
+ #else
+   puts ("-DOMAIN");
diff --git a/mail/mutt-devel/pkg-plist b/mail/mutt-devel/pkg-plist
index a79c4d9050bf..efdd00a3b89a 100644
--- a/mail/mutt-devel/pkg-plist
+++ b/mail/mutt-devel/pkg-plist
@@ -2,5 +2,9 @@ bin/mutt
 man/man1/mutt.1.gz
 share/misc/Muttrc
 share/misc/mime.types
-@unexec /bin/rm -rf %D/share/doc/mutt
-share/doc/mutt
+share/doc/mutt/manual.txt
+share/doc/mutt/pgp-Notes.txt
+share/doc/mutt/sample.muttrc
+share/doc/mutt/Mush.rc
+share/doc/mutt/Pine.rc
+@dirrm share/doc/mutt
diff --git a/mail/mutt/Makefile b/mail/mutt/Makefile
index 434e9bdaece1..698f66711682 100644
--- a/mail/mutt/Makefile
+++ b/mail/mutt/Makefile
@@ -1,38 +1,40 @@
 # ex:ts=8
-# New ports collection makefile for:    mutt
+# New ports collection makefile for:    mutt w/pgp hooks
 # Version required:     0.xy
 # Date created:         Thur July 25, 1996
 # Whom:                 David O'Brien (obrien@NUXI.com)
 #
-# $Id: Makefile,v 1.38 1997/10/01 11:27:35 obrien Exp $
+# $Id: Makefile,v 1.44 1997/11/16 01:57:55 obrien Exp $
 
-DISTNAME=	${PKGNAME}e
-PKGNAME=	mutt-0.88
+DISTNAME=	${PKGNAME}i
+PKGNAME=	mutt-0.89
 CATEGORIES=	mail
-MASTER_SITES=	ftp://ftp.cs.hmc.edu/pub/me/mutt/  \
-		ftp://ftp.ibp.fr/pub/unix/mail/mutt/  \
-		ftp://ftp.fu-berlin.de/pub/unix/mail/mutt/  \
-		ftp://ftp.teuto.de/pub/user/lmb/  \
-		ftp://ftp.funet.fi/pub/unix/mail/mutt/
+MASTER_SITES=	ftp://riemann.iam.uni-bonn.de/pub/mutt/  \
+		ftp://ftp.gbnet.net/pub/mutt-international/  \
+		ftp://ftp.fu-berlin.de/pub/unix/mail/mutt/mutt-international/ \
+		ftp://ftp.gwdg.de/pub/unix/mail/mutt/international/  \
+		ftp://ftp.iks-jena.de/pub/mitarb/lutz/crypt/software/pgp/mutt/
 
-PATCH_SITES=	ftp://ftp.nuxi.com/pub/mutt/${PKGNAME:S/^mutt-//}/  \
-		http://www.frmug.org/mutt/mutt/${PKGNAME:S/^mutt-//}/  \
+PATCH_SITES=	http://www.frmug.org/mutt/mutt/${PKGNAME:S/^mutt-//}/  \
 		http://www.math.fu-berlin.de/~leitner/mutt/${PKGNAME:S/^mutt-//}/  \
 		http://www.efrei.fr/~parmelan/mutt/${PKGNAME:S/^mutt-//}/  \
-		ftp://www.frmug.org/pub/mutt/mutt/${PKGNAME:S/^mutt-//}/
+		ftp://www.frmug.org/pub/mutt/mutt/${PKGNAME:S/^mutt-//}/  \
+		ftp://ftp.nuxi.com/pub/mutt/${PKGNAME:S/^mutt-//}/
 PATCHFILES=
 
 MAINTAINER=     obrien@FreeBSD.org
 
+.if defined(BATCH)
+RUN_DEPENDS=	ispell:${PORTSDIR}/textproc/ispell
+.endif
+
 DIST_SUBDIR=	mutt
-WRKSRC=		${WRKDIR}/${PKGNAME}
 PATCH_DIST_STRIP=	-p1
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS= --enable-dsn --enable-pop --enable-flock \
 		--disable-fcntl --enable-hidden-host
 MAN1=		mutt.1
 
-
 post-install:
 	@strip ${PREFIX}/bin/mutt
 .if !defined(NOPORTDOCS)
diff --git a/mail/mutt/distinfo b/mail/mutt/distinfo
index b283b81e5f34..c0245b64d332 100644
--- a/mail/mutt/distinfo
+++ b/mail/mutt/distinfo
@@ -1 +1 @@
-MD5 (mutt/mutt-0.88e.tar.gz) = 8ba48e79c22a156998293ffc35ab431a
+MD5 (mutt/mutt-0.89i.tar.gz) = 06446691f18b8293b82c713232050134
diff --git a/mail/mutt/files/patch-05 b/mail/mutt/files/patch-05
new file mode 100644
index 000000000000..51d1db250510
--- /dev/null
+++ b/mail/mutt/files/patch-05
@@ -0,0 +1,81 @@
+--- acconfig.h.orig	Tue Mar 11 17:04:02 1997
++++ acconfig.h	Sat Mar 15 22:23:06 1997
+@@ -18,6 +18,9 @@
+ #undef DOMAIN
+ @TOP@
+ 
++/* gethostname() can be used to obtain the domain name */
++#undef GETHOSTNAME_DOMAIN
++
+ /* use dotlocking to lock mailboxes? */
+ #undef USE_DOTLOCK
+ 
+--- config.h.in.orig	Wed Mar 12 17:46:39 1997
++++ config.h.in	Sat Mar 15 22:27:01 1997
+@@ -18,6 +18,9 @@
+ /* What is your domain name? */
+ #undef DOMAIN
+ 
++/* gethostname() can be used to obtain the domain name */
++/* #define GETHOSTNAME_DOMAIN 1 */
++
+ /* Define as the return type of signal handlers (int or void).  */
+ #undef RETSIGTYPE
+ 
+--- init.c.orig	Tue Mar 11 17:29:14 1997
++++ init.c	Sat Mar 15 22:26:44 1997
+@@ -961,6 +961,19 @@
+   if (debuglevel > 0) start_debug();
+ #endif
+ 
++#ifdef GETHOSTNAME_DOMAIN
++  /* Get host and domain name */
++  gethostname (Hostname, sizeof (Hostname));
++  Hostname[sizeof (Hostname) - 1] = 0;
++  if ((p = strchr (Hostname, '.')) == NULL)
++    /* blech */
++	domain = "";
++  else
++    {
++	  *p++ = 0;
++	  domain = p;
++    }
++#else
+   /* And about the host... */
+   uname (&utsname);
+   strfcpy (Hostname, utsname.nodename, sizeof (Hostname));
+@@ -971,6 +984,7 @@
+     *p++ = 0;
+     strfcpy (buffer, p, sizeof (buffer)); /* save the domain for below */
+   }
++#endif
+ 
+ #ifdef USE_DOMAIN
+ 
+--- globals.h.orig	Mon Mar 10 14:34:27 1997
++++ globals.h	Sat Mar 15 22:29:01 1997
+@@ -130,6 +130,13 @@
+ WHERE gid_t UserGid;
+ #endif /* USE_SETGID */
+ 
++/* if your gethostname() returns the domainname too */
++#ifdef GETHOSTNAME_DOMAIN
++WHERE char *domain;
++#undef DOMAIN
++#define DOMAIN domain
++#endif
++
+ #ifdef MAIN_C
+ const char *Weekdays[] = { "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat" };
+ const char *Months[] = { "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec", "ERR" };
+--- main.c.orig	Fri Mar  7 18:57:24 1997
++++ main.c	Sat Mar 15 22:28:14 1997
+@@ -114,7 +114,7 @@
+ 
+   puts ("\n\nCompile time definitions:");
+ 
+-#ifdef DOMAIN
++#if defined(DOMAIN) && !defined(GETHOSTNAME_DOMAIN)
+   printf ("DOMAIN=\"%s\"\n", DOMAIN);
+ #else
+   puts ("-DOMAIN");
diff --git a/mail/mutt/pkg-plist b/mail/mutt/pkg-plist
index a79c4d9050bf..efdd00a3b89a 100644
--- a/mail/mutt/pkg-plist
+++ b/mail/mutt/pkg-plist
@@ -2,5 +2,9 @@ bin/mutt
 man/man1/mutt.1.gz
 share/misc/Muttrc
 share/misc/mime.types
-@unexec /bin/rm -rf %D/share/doc/mutt
-share/doc/mutt
+share/doc/mutt/manual.txt
+share/doc/mutt/pgp-Notes.txt
+share/doc/mutt/sample.muttrc
+share/doc/mutt/Mush.rc
+share/doc/mutt/Pine.rc
+@dirrm share/doc/mutt
diff --git a/mail/mutt14/Makefile b/mail/mutt14/Makefile
index 434e9bdaece1..698f66711682 100644
--- a/mail/mutt14/Makefile
+++ b/mail/mutt14/Makefile
@@ -1,38 +1,40 @@
 # ex:ts=8
-# New ports collection makefile for:    mutt
+# New ports collection makefile for:    mutt w/pgp hooks
 # Version required:     0.xy
 # Date created:         Thur July 25, 1996
 # Whom:                 David O'Brien (obrien@NUXI.com)
 #
-# $Id: Makefile,v 1.38 1997/10/01 11:27:35 obrien Exp $
+# $Id: Makefile,v 1.44 1997/11/16 01:57:55 obrien Exp $
 
-DISTNAME=	${PKGNAME}e
-PKGNAME=	mutt-0.88
+DISTNAME=	${PKGNAME}i
+PKGNAME=	mutt-0.89
 CATEGORIES=	mail
-MASTER_SITES=	ftp://ftp.cs.hmc.edu/pub/me/mutt/  \
-		ftp://ftp.ibp.fr/pub/unix/mail/mutt/  \
-		ftp://ftp.fu-berlin.de/pub/unix/mail/mutt/  \
-		ftp://ftp.teuto.de/pub/user/lmb/  \
-		ftp://ftp.funet.fi/pub/unix/mail/mutt/
+MASTER_SITES=	ftp://riemann.iam.uni-bonn.de/pub/mutt/  \
+		ftp://ftp.gbnet.net/pub/mutt-international/  \
+		ftp://ftp.fu-berlin.de/pub/unix/mail/mutt/mutt-international/ \
+		ftp://ftp.gwdg.de/pub/unix/mail/mutt/international/  \
+		ftp://ftp.iks-jena.de/pub/mitarb/lutz/crypt/software/pgp/mutt/
 
-PATCH_SITES=	ftp://ftp.nuxi.com/pub/mutt/${PKGNAME:S/^mutt-//}/  \
-		http://www.frmug.org/mutt/mutt/${PKGNAME:S/^mutt-//}/  \
+PATCH_SITES=	http://www.frmug.org/mutt/mutt/${PKGNAME:S/^mutt-//}/  \
 		http://www.math.fu-berlin.de/~leitner/mutt/${PKGNAME:S/^mutt-//}/  \
 		http://www.efrei.fr/~parmelan/mutt/${PKGNAME:S/^mutt-//}/  \
-		ftp://www.frmug.org/pub/mutt/mutt/${PKGNAME:S/^mutt-//}/
+		ftp://www.frmug.org/pub/mutt/mutt/${PKGNAME:S/^mutt-//}/  \
+		ftp://ftp.nuxi.com/pub/mutt/${PKGNAME:S/^mutt-//}/
 PATCHFILES=
 
 MAINTAINER=     obrien@FreeBSD.org
 
+.if defined(BATCH)
+RUN_DEPENDS=	ispell:${PORTSDIR}/textproc/ispell
+.endif
+
 DIST_SUBDIR=	mutt
-WRKSRC=		${WRKDIR}/${PKGNAME}
 PATCH_DIST_STRIP=	-p1
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS= --enable-dsn --enable-pop --enable-flock \
 		--disable-fcntl --enable-hidden-host
 MAN1=		mutt.1
 
-
 post-install:
 	@strip ${PREFIX}/bin/mutt
 .if !defined(NOPORTDOCS)
diff --git a/mail/mutt14/distinfo b/mail/mutt14/distinfo
index b283b81e5f34..c0245b64d332 100644
--- a/mail/mutt14/distinfo
+++ b/mail/mutt14/distinfo
@@ -1 +1 @@
-MD5 (mutt/mutt-0.88e.tar.gz) = 8ba48e79c22a156998293ffc35ab431a
+MD5 (mutt/mutt-0.89i.tar.gz) = 06446691f18b8293b82c713232050134
diff --git a/mail/mutt14/files/patch-05 b/mail/mutt14/files/patch-05
new file mode 100644
index 000000000000..51d1db250510
--- /dev/null
+++ b/mail/mutt14/files/patch-05
@@ -0,0 +1,81 @@
+--- acconfig.h.orig	Tue Mar 11 17:04:02 1997
++++ acconfig.h	Sat Mar 15 22:23:06 1997
+@@ -18,6 +18,9 @@
+ #undef DOMAIN
+ @TOP@
+ 
++/* gethostname() can be used to obtain the domain name */
++#undef GETHOSTNAME_DOMAIN
++
+ /* use dotlocking to lock mailboxes? */
+ #undef USE_DOTLOCK
+ 
+--- config.h.in.orig	Wed Mar 12 17:46:39 1997
++++ config.h.in	Sat Mar 15 22:27:01 1997
+@@ -18,6 +18,9 @@
+ /* What is your domain name? */
+ #undef DOMAIN
+ 
++/* gethostname() can be used to obtain the domain name */
++/* #define GETHOSTNAME_DOMAIN 1 */
++
+ /* Define as the return type of signal handlers (int or void).  */
+ #undef RETSIGTYPE
+ 
+--- init.c.orig	Tue Mar 11 17:29:14 1997
++++ init.c	Sat Mar 15 22:26:44 1997
+@@ -961,6 +961,19 @@
+   if (debuglevel > 0) start_debug();
+ #endif
+ 
++#ifdef GETHOSTNAME_DOMAIN
++  /* Get host and domain name */
++  gethostname (Hostname, sizeof (Hostname));
++  Hostname[sizeof (Hostname) - 1] = 0;
++  if ((p = strchr (Hostname, '.')) == NULL)
++    /* blech */
++	domain = "";
++  else
++    {
++	  *p++ = 0;
++	  domain = p;
++    }
++#else
+   /* And about the host... */
+   uname (&utsname);
+   strfcpy (Hostname, utsname.nodename, sizeof (Hostname));
+@@ -971,6 +984,7 @@
+     *p++ = 0;
+     strfcpy (buffer, p, sizeof (buffer)); /* save the domain for below */
+   }
++#endif
+ 
+ #ifdef USE_DOMAIN
+ 
+--- globals.h.orig	Mon Mar 10 14:34:27 1997
++++ globals.h	Sat Mar 15 22:29:01 1997
+@@ -130,6 +130,13 @@
+ WHERE gid_t UserGid;
+ #endif /* USE_SETGID */
+ 
++/* if your gethostname() returns the domainname too */
++#ifdef GETHOSTNAME_DOMAIN
++WHERE char *domain;
++#undef DOMAIN
++#define DOMAIN domain
++#endif
++
+ #ifdef MAIN_C
+ const char *Weekdays[] = { "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat" };
+ const char *Months[] = { "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec", "ERR" };
+--- main.c.orig	Fri Mar  7 18:57:24 1997
++++ main.c	Sat Mar 15 22:28:14 1997
+@@ -114,7 +114,7 @@
+ 
+   puts ("\n\nCompile time definitions:");
+ 
+-#ifdef DOMAIN
++#if defined(DOMAIN) && !defined(GETHOSTNAME_DOMAIN)
+   printf ("DOMAIN=\"%s\"\n", DOMAIN);
+ #else
+   puts ("-DOMAIN");
diff --git a/mail/mutt14/pkg-plist b/mail/mutt14/pkg-plist
index a79c4d9050bf..efdd00a3b89a 100644
--- a/mail/mutt14/pkg-plist
+++ b/mail/mutt14/pkg-plist
@@ -2,5 +2,9 @@ bin/mutt
 man/man1/mutt.1.gz
 share/misc/Muttrc
 share/misc/mime.types
-@unexec /bin/rm -rf %D/share/doc/mutt
-share/doc/mutt
+share/doc/mutt/manual.txt
+share/doc/mutt/pgp-Notes.txt
+share/doc/mutt/sample.muttrc
+share/doc/mutt/Mush.rc
+share/doc/mutt/Pine.rc
+@dirrm share/doc/mutt