Update "mutt-unstable" package to version "1.3.17.20010415i". A list of

the changes can be found in the "ChangeLog" file. This snapshot contains
the fix for bug#472 fixed by "patch-aa" before.

5 files changed, 27 insertions, 23 deletions

diff --git a/mail/mutt-unstable/Makefile b/mail/mutt-unstable/Makefile
index 1c43d37328d..38b1edee898 100644
--- a/mail/mutt-unstable/Makefile
+++ b/mail/mutt-unstable/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2001/03/27 03:20:05 hubertf Exp $
+# $NetBSD: Makefile,v 1.6 2001/04/16 01:47:17 tron Exp $
 
-DISTNAME=	mutt-unstable-20010212
-PKGNAME=	mutt-1.3.14.20010212i
+DISTNAME=	mutt-unstable-20010415
+PKGNAME=	mutt-1.3.17.20010415i
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.mutt.org/pub/mutt/snapshots/
 
@@ -11,9 +11,9 @@ COMMENT=	text-based MIME mail client with PGP support
 
 BUILD_DEPENDS+=	autoconf-2.13:../../devel/autoconf
 BUILD_DEPENDS+=	automake-1.4:../../devel/automake
-BUILD_USES_MSGFMT=	yes
 DEPENDS+=	libiconv>=1.5:../../converters/libiconv
 
+BUILD_USES_MSGFMT=	YES
 USE_LIBINTL=		YES
 MAKE_ENV+=		CPPFLAGS=-I${LOCALBASE}/include LIBS=-lintl
 CONFIGURE_ENV+=		LIBS=-lintl
diff --git a/mail/mutt-unstable/files/md5 b/mail/mutt-unstable/files/md5
index 3f25f6c1a78..b019b44cb7a 100644
--- a/mail/mutt-unstable/files/md5
+++ b/mail/mutt-unstable/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.1.1.1 2001/02/12 18:34:38 tron Exp $
+$NetBSD: md5,v 1.2 2001/04/16 01:47:18 tron Exp $
 
-MD5 (mutt-unstable-20010212.tar.gz) = 4703f4bffbb243b49514e890be637a8d
+MD5 (mutt-unstable-20010415.tar.gz) = 99ae13e783d8a619616bf8fca33dd9ac
diff --git a/mail/mutt-unstable/files/patch-sum b/mail/mutt-unstable/files/patch-sum
deleted file mode 100644
index 97b68710dc2..00000000000
--- a/mail/mutt-unstable/files/patch-sum
+++ /dev/null
@@ -1,3 +0,0 @@
-$NetBSD: patch-sum,v 1.1.1.1 2001/02/12 18:34:38 tron Exp $
-
-MD5 (patch-aa) = f6f2759768a4493db3901a8d3ce22fca
diff --git a/mail/mutt-unstable/patches/patch-aa b/mail/mutt-unstable/patches/patch-aa
deleted file mode 100644
index 56e8fa4bdf1..00000000000
--- a/mail/mutt-unstable/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2001/02/12 18:34:38 tron Exp $
-
---- mutt_socket.c.orig	Mon Oct 16 11:48:29 2000
-+++ mutt_socket.c	Mon Feb 12 17:07:32 2001
-@@ -340,7 +340,7 @@
-     fd = socket (cur->ai_family, cur->ai_socktype, cur->ai_protocol);
-     if (fd >= 0)
-     {
--      if ((rc = socket_connect (fd, res->ai_addr)) == 0)
-+      if ((rc = socket_connect (fd, cur->ai_addr)) == 0)
-       {
- 	conn->fd = fd;
- 	break;
diff --git a/mail/mutt-unstable/pkg/PLIST b/mail/mutt-unstable/pkg/PLIST
index e2d51b4a90a..50f6f9218bf 100644
--- a/mail/mutt-unstable/pkg/PLIST
+++ b/mail/mutt-unstable/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2001/02/26 20:19:46 tron Exp $
+@comment $NetBSD: PLIST,v 1.5 2001/04/16 01:47:19 tron Exp $
 bin/flea
 bin/mutt
 bin/muttbug
@@ -29,6 +29,24 @@ share/doc/mutt/samples/Mush.rc
 share/doc/mutt/samples/Pine.rc
 share/doc/mutt/samples/Tin.rc
 share/doc/mutt/samples/gpg.rc
+share/doc/mutt/samples/iconv/iconv.aix-3.2.5.rc
+share/doc/mutt/samples/iconv/iconv.aix-4.1.5.rc
+share/doc/mutt/samples/iconv/iconv.aix-4.2.0.rc
+share/doc/mutt/samples/iconv/iconv.aix-4.3.2.rc
+share/doc/mutt/samples/iconv/iconv.freebsd-3.3.rc
+share/doc/mutt/samples/iconv/iconv.glibc-2.1.3.rc
+share/doc/mutt/samples/iconv/iconv.glibc-2.1.90.rc
+share/doc/mutt/samples/iconv/iconv.hpux-10.01.rc
+share/doc/mutt/samples/iconv/iconv.hpux-10.20.rc
+share/doc/mutt/samples/iconv/iconv.hpux-11.00.rc
+share/doc/mutt/samples/iconv/iconv.irix-6.5.rc
+share/doc/mutt/samples/iconv/iconv.osf1-4.0a.rc
+share/doc/mutt/samples/iconv/iconv.osf1-4.0d.rc
+share/doc/mutt/samples/iconv/iconv.solaris-2.4.rc
+share/doc/mutt/samples/iconv/iconv.solaris-2.5.1.rc
+share/doc/mutt/samples/iconv/iconv.solaris-2.6-cjk.rc
+share/doc/mutt/samples/iconv/iconv.solaris-2.6.rc
+share/doc/mutt/samples/iconv/iconv.solaris-2.7.rc
 share/doc/mutt/samples/pgp2.rc
 share/doc/mutt/samples/pgp5.rc
 share/doc/mutt/samples/pgp6.rc
@@ -45,6 +63,7 @@ ${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/mutt.mo
 ${PKGLOCALEDIR}/locale/gl/LC_MESSAGES/mutt.mo
 ${PKGLOCALEDIR}/locale/id/LC_MESSAGES/mutt.mo
 ${PKGLOCALEDIR}/locale/it/LC_MESSAGES/mutt.mo
+${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/mutt.mo
 ${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/mutt.mo
 ${PKGLOCALEDIR}/locale/lt/LC_MESSAGES/mutt.mo
 ${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/mutt.mo
@@ -59,6 +78,7 @@ ${PKGLOCALEDIR}/locale/zh_CN.GB2312/LC_MESSAGES/mutt.mo
 ${PKGLOCALEDIR}/locale/zh_TW.Big5/LC_MESSAGES/mutt.mo
 @exec mkdir -p %D/share/mutt
 @dirrm share/mutt
+@dirrm share/doc/mutt/samples/iconv
 @dirrm share/doc/mutt/samples
 @dirrm share/doc/mutt/html
 @dirrm share/doc/mutt