Update mail/mutt-devel to 1.5.14

Changelog:
- many bugfixes
* curs_lib.c: Clear the progress bar when the current operation
	has completed.
* lib.c: Even more paranoid temporary file creation.

5 files changed, 33 insertions, 32 deletions

diff --git a/mail/mutt-devel/Makefile b/mail/mutt-devel/Makefile
index 69b3879165e..e0b663225b3 100644
--- a/mail/mutt-devel/Makefile
+++ b/mail/mutt-devel/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.55 2006/12/11 12:47:13 salo Exp $
+# $NetBSD: Makefile,v 1.56 2007/03/04 13:43:44 tonio Exp $
 
-DISTNAME=		mutt-1.5.13
-PKGREVISION=		2
+DISTNAME=		mutt-1.5.14
 CATEGORIES=		mail
 MUTT_SITES=		ftp://ftp.mutt.org/mutt/ \
 			ftp://ftp.stealth.net/pub/mirrors/ftp.mutt.org/pub/mutt/ \
@@ -28,7 +27,7 @@ CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}		\
 			--without-included-gettext			\
 			--enable-pop					\
 			--enable-imap
-MAKE_ENV+=		CHGRP=${CHGRP:Q}
+MAKE_ENV+=		CHGRP=${CHGRP:Q} CHMOD=${CHMOD:Q}
 
 .if (${OPSYS} == "SunOS")
 CONFIGURE_ARGS+=	--without-wc-funcs
diff --git a/mail/mutt-devel/distinfo b/mail/mutt-devel/distinfo
index 8e9bdd88d6c..c1650e1e409 100644
--- a/mail/mutt-devel/distinfo
+++ b/mail/mutt-devel/distinfo
@@ -1,17 +1,16 @@
-$NetBSD: distinfo,v 1.36 2006/12/11 12:47:13 salo Exp $
+$NetBSD: distinfo,v 1.37 2007/03/04 13:43:44 tonio Exp $
 
-SHA1 (mutt-1.5.13.tar.gz) = 6d5b88d33e1727bf0342c31f06d55d7a3d2d4e0a
-RMD160 (mutt-1.5.13.tar.gz) = 9327b7f928aad78a20c2395629113ac2519bb945
-Size (mutt-1.5.13.tar.gz) = 3442681 bytes
-SHA1 (patch-1.5.13.rr.compressed.1.gz) = f8a999d79a1c89db7caa6e99028b8f4b65eef29d
-RMD160 (patch-1.5.13.rr.compressed.1.gz) = 2808b8935616d4ec6c1ebdd7710ab6219da655f1
-Size (patch-1.5.13.rr.compressed.1.gz) = 10517 bytes
+SHA1 (mutt-1.5.14.tar.gz) = 7be098c13302fab8a954095d17a9a64e1e1519c1
+RMD160 (mutt-1.5.14.tar.gz) = ed4eeaf75d37757ed5b370e9763b6f8524df5ca7
+Size (mutt-1.5.14.tar.gz) = 3441678 bytes
+SHA1 (patch-1.5.14.rr.compressed.1.gz) = c0a74886515fed94826b1d5f8d2a7c42a9ea6f26
+RMD160 (patch-1.5.14.rr.compressed.1.gz) = 0756a878cc309636df164cfe21507e8554142c4f
+Size (patch-1.5.14.rr.compressed.1.gz) = 10558 bytes
 SHA1 (patch-aa) = 59d89dce24110be2927c8a1ea1fa5b780d644372
-SHA1 (patch-ab) = 67e0deb5af56830397d897979ac806f9c16fdbda
+SHA1 (patch-ab) = a9538c692e0d3d0a6d341e3dc003304e3f85a122
 SHA1 (patch-ac) = b48ff9f66ff2b483b5aa0c312e08bd22c7cf03be
 SHA1 (patch-ad) = ecfa994c7c5e494b6eb7356327b96de6559146fc
-SHA1 (patch-ae) = 1ff6efde4e7d380008c466800d6164b51a4b3414
 SHA1 (patch-ag) = 84637d95fa9aa0cf58a6e6b2c82b783efa21cf66
 SHA1 (patch-ah) = 4227c5768b900e58fa4a679e6ad67efc974a70b5
 SHA1 (patch-ai) = 7d9883198a22615fb1792a41fce3ee9821f48f08
-SHA1 (patch-al) = a35a9d3b73bedc92167e418eed9c6c989ad39581
+SHA1 (patch-al) = c803e21197de3317f42e073da5731b1b4371eabd
diff --git a/mail/mutt-devel/options.mk b/mail/mutt-devel/options.mk
index 9c4f6dd3c99..a001a43c1cc 100644
--- a/mail/mutt-devel/options.mk
+++ b/mail/mutt-devel/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.21 2006/10/18 20:06:13 tonio Exp $
+# $NetBSD: options.mk,v 1.22 2007/03/04 13:43:44 tonio Exp $
 
 # Global and legacy options
 
@@ -87,7 +87,7 @@ CONFIGURE_ARGS+=	--disable-hcache
 ###
 .if !empty(PKG_OPTIONS:Mmutt-compressed-mbox)
 PATCH_SITES+=		http://www.spinnaker.de/mutt/compressed/
-PATCHFILES+=		patch-1.5.13.rr.compressed.1.gz
+PATCHFILES+=		patch-1.5.14.rr.compressed.1.gz
 PATCH_DIST_STRIP=	-p1
 CONFIGURE_ARGS+=	--enable-compressed
 .endif
diff --git a/mail/mutt-devel/patches/patch-ab b/mail/mutt-devel/patches/patch-ab
index 91f0c71b31a..2755fad6c45 100644
--- a/mail/mutt-devel/patches/patch-ab
+++ b/mail/mutt-devel/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.8 2006/08/16 10:42:05 tonio Exp $
+$NetBSD: patch-ab,v 1.9 2007/03/04 13:43:44 tonio Exp $
 
---- Makefile.in.orig	2006-08-14 16:09:29.000000000 +0200
+--- Makefile.in.orig	2007-03-04 13:33:38.000000000 +0100
 +++ Makefile.in
 @@ -170,7 +170,7 @@ DEBUGGER = @DEBUGGER@
  # 	@rm -rf makedoc
@@ -11,20 +11,23 @@ $NetBSD: patch-ab,v 1.8 2006/08/16 10:42:05 tonio Exp $
  	-DHAVE_CONFIG_H=1
  
  DEPDIR = @DEPDIR@
-@@ -279,6 +279,7 @@ install_sh = @install_sh@
+@@ -279,7 +279,7 @@ infodir = @infodir@
+ install_sh = @install_sh@
  libdir = @libdir@
  libexecdir = @libexecdir@
+-localedir = @localedir@
++localedir = /usr/pkg/share/locale
  localstatedir = @localstatedir@
-+localedir = $(prefix)/share/locale
  mandir = @mandir@
  mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
-@@ -1029,7 +1030,7 @@ install-exec-hook:
+@@ -1035,8 +1035,8 @@ install-exec-hook:
  		ln -sf $(DESTDIR)$(bindir)/mutt_dotlock $(DESTDIR)$(bindir)/mutt.dotlock ; \
  	fi
  	if test -f $(DESTDIR)$(bindir)/mutt_dotlock && test x@DOTLOCK_GROUP@ != x ; then \
 -		chgrp @DOTLOCK_GROUP@ $(DESTDIR)$(bindir)/mutt_dotlock && \
-+		$(CHGRP) @DOTLOCK_GROUP@ $(DESTDIR)$(bindir)/mutt_dotlock && \
- 		chmod @DOTLOCK_PERMISSION@ $(DESTDIR)$(bindir)/mutt_dotlock || \
+-		chmod @DOTLOCK_PERMISSION@ $(DESTDIR)$(bindir)/mutt_dotlock || \
++		${CHGRP} @DOTLOCK_GROUP@ $(DESTDIR)$(bindir)/mutt_dotlock && \
++		${CHMOD} @DOTLOCK_PERMISSION@ $(DESTDIR)$(bindir)/mutt_dotlock || \
  		{ echo "Can't fix mutt_dotlock's permissions!" >&2 ; exit 1 ; } \
  	fi
+ 
diff --git a/mail/mutt-devel/patches/patch-al b/mail/mutt-devel/patches/patch-al
index 5dbf67455be..d31cce3a744 100644
--- a/mail/mutt-devel/patches/patch-al
+++ b/mail/mutt-devel/patches/patch-al
@@ -1,17 +1,17 @@
-$NetBSD: patch-al,v 1.4 2006/07/15 19:34:15 tonio Exp $
+$NetBSD: patch-al,v 1.5 2007/03/04 13:43:45 tonio Exp $
 
---- configure.orig	2006-07-14 20:15:42.000000000 +0200
+--- configure.orig	2006-09-01 09:01:21.000000000 +0200
 +++ configure
-@@ -15076,6 +15076,7 @@ if test "${with_bdb+set}" = set; then
-   withval="$with_bdb"
-   ac_bdb_prefix=$withval
- fi;
+@@ -17512,6 +17512,7 @@ if test "${with_bdb+set}" = set; then
+   withval=$with_bdb; ac_bdb_prefix=$withval
+ fi
+ 
 +    if test x$BDB_INCLUDE_DIR = x -o test x$BDB_LIB_DIR = x -o test x$BDB_LIB = x; then
      if test x$ac_bdb_prefix != xno -a x$ac_cv_gdbmopen != xyes -a x$ac_cv_vlopen != xyes; then
          test x$ac_bdb_prefix = xyes && ac_bdb_prefix="$mutt_cv_prefix /opt/csw/bdb4 /opt /usr/local /usr"
          for d in $ac_bdb_prefix; do
-@@ -15168,6 +15169,9 @@ echo "${ECHO_T}yes" >&6
- echo "${ECHO_T}no" >&6
+@@ -17618,6 +17619,9 @@ echo "${ECHO_T}yes" >&6; }
+ echo "${ECHO_T}no" >&6; }
          fi
      fi
 +    else