Update "mutt" package to version 0.95, the first beta version.

Also invent new configuration flag "MUTT_INTERNATIONAL". If it is set to
"YES" the export restricted PGP version is built. Otherwise you get the
unrestricted US version.

3 files changed, 200 insertions, 10 deletions

diff --git a/mail/mutt/Makefile b/mail/mutt/Makefile
index 4c34822da6e..7206ceb157a 100644
--- a/mail/mutt/Makefile
+++ b/mail/mutt/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.14 1998/08/20 15:17:10 tsarna Exp $
+# $NetBSD: Makefile,v 1.15 1998/12/12 17:21:04 tron Exp $
 
-DISTNAME=	mutt-0.93.2i
+DISTNAME=	mutt-${MUTT_VERSION}
 CATEGORIES=	mail
 MASTER_SITES=	ftp://riemann.iam.uni-bonn.de/pub/mutt/ \
 		ftp://ftp.gbnet.net/pub/mutt-international/ \
@@ -13,10 +13,8 @@ HOMEPAGE=	http://www.mutt.org/
 
 DEPENDS+=	ncurses-1.9.9g:../../devel/ncurses
 
-CONFLICTS=	mutt-0.89.1i mutt-0.91i mutt-0.91.1i mutt-0.93i mutt-0.93.1i
+CONFLICTS=	mutt-*
 
-RESTRICTED=	"Contains PGP code"
-MIRROR_DISTFILE= no
 NO_PATCH=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+= --with-curses=${PREFIX} --with-exec-shell=/bin/ksh \
@@ -24,3 +22,16 @@ CONFIGURE_ARGS+= --with-curses=${PREFIX} --with-exec-shell=/bin/ksh \
 CONFIGURE_ENV+=	LDFLAGS=-s
 
 .include "../../mk/bsd.pkg.mk"
+
+MUTT_BASE_VERSION=	0.95
+.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
diff --git a/mail/mutt/files/md5 b/mail/mutt/files/md5
index bcc0b20172e..c91b646d044 100644
--- a/mail/mutt/files/md5
+++ b/mail/mutt/files/md5
@@ -1,3 +1,4 @@
-$NetBSD: md5,v 1.7 1998/08/07 13:25:02 agc Exp $
+$NetBSD: md5,v 1.8 1998/12/12 17:21:05 tron Exp $
 
-MD5 (mutt-0.93.2i.tar.gz) = 9ce8f1020a638d07cb3772b1ebe9887d
+MD5 (mutt-0.95.tar.gz) = cf941c62503071cff4ac1049cba533d0
+MD5 (mutt-0.95i.tar.gz) = 875564c734fb72d88b43e97394de3290
diff --git a/mail/mutt/pkg/PLIST b/mail/mutt/pkg/PLIST
index 1987e71b872..4e5fdac8ad5 100644
--- a/mail/mutt/pkg/PLIST
+++ b/mail/mutt/pkg/PLIST
@@ -1,8 +1,186 @@
-@comment $NetBSD: PLIST,v 1.2 1998/07/10 18:46:00 tron Exp $
+@comment $NetBSD: PLIST,v 1.3 1998/12/12 17:21:05 tron Exp $
 bin/mutt
+etc/Muttrc
+etc/mime.types
 man/man1/mutt.1
-share/misc/Muttrc
-share/misc/mime.types
+man/man1/mutt_dotlock.1
+share/locale/de/LC_MESSAGES/mutt.mo
+share/locale/fr/LC_MESSAGES/mutt.mo
+share/locale/es/LC_MESSAGES/mutt.mo
+share/locale/ru/LC_MESSAGES/mutt.mo
+share/locale/it/LC_MESSAGES/mutt.mo
+share/locale/uk/LC_MESSAGES/mutt.mo
+share/doc/mutt/applying-patches.txt
+share/doc/mutt/devel-notes.txt
+share/doc/mutt/COPYRIGHT
+share/doc/mutt/GPL
+share/doc/mutt/INSTALL
+share/doc/mutt/ChangeLog
+share/doc/mutt/README
+share/doc/mutt/NEWS
+share/doc/mutt/TODO
 share/doc/mutt/manual.txt
 share/doc/mutt/PGP-Notes.txt
+share/mutt/charsets/ansi-x3-110-1983
+share/mutt/charsets/ansi-x3-4-1968
+share/mutt/charsets/asmo-449
+share/mutt/charsets/baltic
+share/mutt/charsets/bs-4730
+share/mutt/charsets/bs-viewdata
+share/mutt/charsets/cp1250
+share/mutt/charsets/cp1251
+share/mutt/charsets/cp1252
+share/mutt/charsets/cp1253
+share/mutt/charsets/cp1254
+share/mutt/charsets/cp1255
+share/mutt/charsets/cp1256
+share/mutt/charsets/cp1257
+share/mutt/charsets/csa-z243-4-1985-1
+share/mutt/charsets/csa-z243-4-1985-2
+share/mutt/charsets/csa-z243-4-1985-gr
+share/mutt/charsets/csn-369103
+share/mutt/charsets/cwi
+share/mutt/charsets/dec-mcs
+share/mutt/charsets/din-66003
+share/mutt/charsets/ds-2089
+share/mutt/charsets/ebcdic-at-de
+share/mutt/charsets/ebcdic-at-de-a
+share/mutt/charsets/ebcdic-es
+share/mutt/charsets/ebcdic-ca-fr
+share/mutt/charsets/ebcdic-dk-no
+share/mutt/charsets/ebcdic-dk-no-a
+share/mutt/charsets/ebcdic-es-a
+share/mutt/charsets/ebcdic-es-s
+share/mutt/charsets/ebcdic-fi-se
+share/mutt/charsets/ebcdic-fi-se-a
+share/mutt/charsets/ebcdic-fr
+share/mutt/charsets/ebcdic-is-friss
+share/mutt/charsets/ebcdic-it
+share/mutt/charsets/ebcdic-pt
+share/mutt/charsets/ebcdic-uk
+share/mutt/charsets/ebcdic-us
+share/mutt/charsets/ecma-cyrillic
+share/mutt/charsets/es
+share/mutt/charsets/es2
+share/mutt/charsets/gb-1988-80
+share/mutt/charsets/gost-19768-74
+share/mutt/charsets/greek7
+share/mutt/charsets/greek7-old
+share/mutt/charsets/greek-ccitt
+share/mutt/charsets/hp-roman8
+share/mutt/charsets/ibm037
+share/mutt/charsets/ibm038
+share/mutt/charsets/ibm1004
+share/mutt/charsets/it
+share/mutt/charsets/ibm1026
+share/mutt/charsets/ibm1047
+share/mutt/charsets/ibm256
+share/mutt/charsets/ibm273
+share/mutt/charsets/ibm274
+share/mutt/charsets/ibm275
+share/mutt/charsets/ibm277
+share/mutt/charsets/ibm278
+share/mutt/charsets/ibm280
+share/mutt/charsets/ibm281
+share/mutt/charsets/ibm284
+share/mutt/charsets/ibm285
+share/mutt/charsets/ibm290
+share/mutt/charsets/ibm297
+share/mutt/charsets/ibm420
+share/mutt/charsets/ibm423
+share/mutt/charsets/ibm424
+share/mutt/charsets/ibm437
+share/mutt/charsets/ibm500
+share/mutt/charsets/ibm850
+share/mutt/charsets/ibm851
+share/mutt/charsets/ibm852
+share/mutt/charsets/ibm855
+share/mutt/charsets/ibm857
+share/mutt/charsets/ibm860
+share/mutt/charsets/ibm861
+share/mutt/charsets/ibm862
+share/mutt/charsets/ibm863
+share/mutt/charsets/ibm864
+share/mutt/charsets/ibm865
+share/mutt/charsets/ibm868
+share/mutt/charsets/ibm869
+share/mutt/charsets/ibm870
+share/mutt/charsets/ibm871
+share/mutt/charsets/ibm875
+share/mutt/charsets/ibm880
+share/mutt/charsets/ibm891
+share/mutt/charsets/ibm903
+share/mutt/charsets/ibm904
+share/mutt/charsets/ibm905
+share/mutt/charsets/ibm918
+share/mutt/charsets/iec-p27-1
+share/mutt/charsets/inis
+share/mutt/charsets/inis-8
+share/mutt/charsets/inis-cyrillic
+share/mutt/charsets/invariant
+share/mutt/charsets/iso-10367-box
+share/mutt/charsets/iso-2033-1983
+share/mutt/charsets/iso-5427
+share/mutt/charsets/iso-5427-ext
+share/mutt/charsets/iso-5428
+share/mutt/charsets/iso-646-basic
+share/mutt/charsets/iso-646-irv
+share/mutt/charsets/iso-6937
+share/mutt/charsets/iso-6937-2-25
+share/mutt/charsets/iso-6937-2-add
+share/mutt/charsets/iso-8859-1
+share/mutt/charsets/iso-8859-10
+share/mutt/charsets/iso-8859-2
+share/mutt/charsets/iso-8859-3
+share/mutt/charsets/iso-8859-4
+share/mutt/charsets/iso-8859-5
+share/mutt/charsets/iso-8859-6
+share/mutt/charsets/iso-8859-7
+share/mutt/charsets/iso-8859-8
+share/mutt/charsets/iso-8859-9
+share/mutt/charsets/iso-8859-supp
+share/mutt/charsets/iso-ir-90
+share/mutt/charsets/jis-c6220-1969-jp
+share/mutt/charsets/jis-c6220-1969-ro
+share/mutt/charsets/jis-c6229-1984-a
+share/mutt/charsets/jis-c6229-1984-b
+share/mutt/charsets/jis-c6229-1984-b-add
+share/mutt/charsets/jis-c6229-1984-hand
+share/mutt/charsets/jis-c6229-1984-hand-add
+share/mutt/charsets/jis-c6229-1984-kana
+share/mutt/charsets/jis-x0201
+share/mutt/charsets/jus-i-b1-002
+share/mutt/charsets/jus-i-b1-003-mac
+share/mutt/charsets/jus-i-b1-003-serb
+share/mutt/charsets/koi-8
+share/mutt/charsets/koi8-r
+share/mutt/charsets/ksc5636
+share/mutt/charsets/latin-greek
+share/mutt/charsets/latin-greek-1
+share/mutt/charsets/macintosh
+share/mutt/charsets/mac-is
+share/mutt/charsets/msz-7795-3
+share/mutt/charsets/nats-dano
+share/mutt/charsets/nats-dano-add
+share/mutt/charsets/nats-sefi
+share/mutt/charsets/nats-sefi-add
+share/mutt/charsets/nc-nc00-10
+share/mutt/charsets/nextstep
+share/mutt/charsets/nf-z-62-010
+share/mutt/charsets/nf-z-62-010-(1973)
+share/mutt/charsets/ns-4551-1
+share/mutt/charsets/ns-4551-2
+share/mutt/charsets/pt
+share/mutt/charsets/pt2
+share/mutt/charsets/sami
+share/mutt/charsets/sen-850200-b
+share/mutt/charsets/sen-850200-c
+share/mutt/charsets/t-101-g2
+share/mutt/charsets/t-61-7bit
+share/mutt/charsets/t-61-8bit
+share/mutt/charsets/videotex-suppl
+share/mutt/charsets/charsets.alias.dist
+share/mutt/charsets/charsets.alias
+@dirrm share/mutt/charsets
+@dirrm share/mutt
 @dirrm share/doc/mutt