Update "mutt" package to version 1.2i - there is not crippled version any

more. Change since version 1.0.1i:
- heavily improved IMAP support (thanks to Brandon Long
  and Brendan Cully for their work),
- support for using IMAP over SSL (thanks to Tommi
  Kommulainen),
- a completely changed interface for configuring mutt's
  PGP support.  It's now format-based, and much more
  flexible than it used to be in the past.
- a split of the old edit-message command into
  resend-message and edit-message.  While the former gives
  you what could be described as "recall from arbitrary
  folders", the latter can be used to low-level modify
  messages.
- the weeding paradigma has changed.  Instead of options
  controlling weeding behaviour for all kinds of purposes,
  there is one global $weed option which is toggled when
  you use what used to be known as display-headers (now
  display-toggle-weed).  That is, you have some kind of
  "WYSIWYG" support with weeding.
- we have a muttrc (5) manual page now, and it's even
  up-to-date.
- you can better control your messages' header and
  envelope from headers
- the message commands on the attachment menu have been
  rewritten.  Just try replying to an attachment, and
  you'll see what happens. ;-)
- mailing list support has changed.  You may wish to
  rename your "lists" commands to "subscribe".  But please
  read README.UPGRADE before!
- Bug fixes of all sorts.

1 files changed, 7 insertions, 16 deletions

diff --git a/mail/mutt/Makefile b/mail/mutt/Makefile
index cf8bda6835b..f53c656aeee 100644
--- a/mail/mutt/Makefile
+++ b/mail/mutt/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.41 2000/02/09 01:12:13 tron Exp $
+# $NetBSD: Makefile,v 1.42 2000/05/09 18:09:06 tron Exp $
 
-DISTNAME=	mutt-${MUTT_VERSION}
+DISTNAME=	mutt-1.2i
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.mutt.org/pub/mutt/ \
-		ftp://ftp.gbnet.net/pub/mutt-international/ \
 		ftp://ftp.funet.fi/pub/unix/mail/mutt/ \
 		ftp://ftp.uib.no/pub/mutt/ \
 		ftp://uiarchive.cso.uiuc.edu/pub/packages/mail/mutt/
@@ -14,6 +13,9 @@ HOMEPAGE=	http://www.mutt.org/
 BUILD_DEPENDS+=	${LOCALBASE}/bin/autoconf:../../devel/autoconf
 BUILD_DEPENDS+=	${LOCALBASE}/bin/automake:../../devel/automake
 
+MIRROR_DISTFILE=no
+RESTRICTED=	"Contains PGP code"
+
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 CONFIGURE_ARGS+= --with-curses=${LOCALBASE} --with-exec-shell=/bin/ksh \
@@ -21,6 +23,8 @@ CONFIGURE_ARGS+= --with-curses=${LOCALBASE} --with-exec-shell=/bin/ksh \
 		 --enable-pop --enable-imap
 LDFLAGS+=	-s
 
+WRKSRC=		${WRKDIR}/${DISTNAME:S/i//}
+
 .include "../../mk/bsd.prefs.mk"
 
 .if ${OPSYS} == "SunOS"
@@ -34,16 +38,3 @@ DEPENDS+=	ncurses>=4.2:../../devel/ncurses
 .endif
 
 .include "../../mk/bsd.pkg.mk"
-
-MUTT_BASE_VERSION=	1.0.1
-.if defined(MUTT_INTERNATIONAL) && ${MUTT_INTERNATIONAL} == YES
-MUTT_VERSION=		${MUTT_BASE_VERSION}i
-
-MIRROR_DISTFILE=	no
-RESTRICTED=		"Contains PGP code"
-WRKSRC=			${WRKDIR}/${DISTNAME:C/i$//}
-.else
-MUTT_VERSION=		${MUTT_BASE_VERSION}
-
-WRKSRC=			${WRKDIR}/${DISTNAME}-us
-.endif