- Update to 1.5.14

PR:             109679
Submitted by:   Udo Schweigert <udo.schweigert@siemens.com> (maintainer)

5 files changed, 43 insertions, 42 deletions

diff --git a/mail/mutt-devel/Makefile b/mail/mutt-devel/Makefile
index bb7846894a56..bd1bd653b48f 100644
--- a/mail/mutt-devel/Makefile
+++ b/mail/mutt-devel/Makefile
@@ -109,8 +109,8 @@
 #
 
 PORTNAME=	mutt-devel
-PORTVERSION=	1.5.13
-PORTREVISION?=	1
+PORTVERSION=	1.5.14
+PORTREVISION?=	0
 CATEGORIES+=	mail ipv6
 .if defined(WITH_MUTT_NNTP)
 CATEGORIES+=	news
@@ -436,7 +436,7 @@ pre-patch::
 PATCHFILES+=	p0-patch-${DW_MBOX_PATCH_VERSION}.dw.mbox-hook.1:dw
 .endif
 .if defined(WITH_MUTT_SIDEBAR_PATCH)
-SIDEBAR_PATCH=	patch-1.5.13.sidebar.20060828.txt
+SIDEBAR_PATCH=	patch-1.5.14.sidebar.20070223.txt
 DISTFILES+=	${SIDEBAR_PATCH}:tchan
 XML_NEEDED=	yes
 pre-patch::
diff --git a/mail/mutt-devel/distinfo b/mail/mutt-devel/distinfo
index b784bc92e516..7ab264943320 100644
--- a/mail/mutt-devel/distinfo
+++ b/mail/mutt-devel/distinfo
@@ -1,27 +1,27 @@
-MD5 (mutt/mutt-1.5.13.tar.gz) = 456a138680a6726f14983cb3e9ff4e22
-SHA256 (mutt/mutt-1.5.13.tar.gz) = e0481690c0caf23b5c88359b2dbac70308f8f138663e8fee482b163562fe8da9
-SIZE (mutt/mutt-1.5.13.tar.gz) = 3442681
-MD5 (mutt/patch-1.5.13.rr.compressed.gz) = 2f1d2b9defc3ad81ab3893aefdaa8fe4
-SHA256 (mutt/patch-1.5.13.rr.compressed.gz) = 236ea2ed2c5b0195d1f72647d17de5c4cbe7faf78de4cdeb983ab6799baf2f7d
-SIZE (mutt/patch-1.5.13.rr.compressed.gz) = 10058
-MD5 (mutt/patch-1.5.13.vvv.nntp.gz) = 68af2e3641d2e46546ad29d66781a700
-SHA256 (mutt/patch-1.5.13.vvv.nntp.gz) = bfd8431c35dfd47fe8de502ae93cb9969c18ea464ed1fe832c6443f9e12a5577
-SIZE (mutt/patch-1.5.13.vvv.nntp.gz) = 54834
+MD5 (mutt/mutt-1.5.14.tar.gz) = 6d33b4f0074e39772021d947c49b30c6
+SHA256 (mutt/mutt-1.5.14.tar.gz) = 9dbee28bd48a0f1779ba3b00f98dda74a3f629e8109f1842616d48b85013946a
+SIZE (mutt/mutt-1.5.14.tar.gz) = 3441678
+MD5 (mutt/patch-1.5.14.rr.compressed.gz) = 383897af9c41a95a3c36d76ee206811d
+SHA256 (mutt/patch-1.5.14.rr.compressed.gz) = 34b6f642d1daab31acb655d008ccba92aefadc4730c3b12ee64265285f8f34d7
+SIZE (mutt/patch-1.5.14.rr.compressed.gz) = 10168
+MD5 (mutt/patch-1.5.14.vvv.nntp.gz) = 3c1554f33161329225900fee899cd2b8
+SHA256 (mutt/patch-1.5.14.vvv.nntp.gz) = 415fe575b895a79ddf91ff81566a88b12268076ccf870b1306741e4dfbe781ee
+SIZE (mutt/patch-1.5.14.vvv.nntp.gz) = 54928
 MD5 (mutt/patch-1.5.4.cd.ifdef.1) = a545036cdb55519154d0b35465f52daa
 SHA256 (mutt/patch-1.5.4.cd.ifdef.1) = 7d11892bcc688bbc82b5996ca0fda2d4446d8e928bec50b2731f8a3a5d9be373
 SIZE (mutt/patch-1.5.4.cd.ifdef.1) = 3545
-MD5 (mutt/patch-1.5.13.vvv.initials.gz) = 52df400d31e225c02bea2f575db03b2a
-SHA256 (mutt/patch-1.5.13.vvv.initials.gz) = b6e1dc90fc871ea6227da33f7c69d12175836eac0d98154096f51dfee5568914
-SIZE (mutt/patch-1.5.13.vvv.initials.gz) = 682
-MD5 (mutt/patch-1.5.13.vvv.quote.gz) = 3afa1bb8065ff207420ba9bc4fe2ae8c
-SHA256 (mutt/patch-1.5.13.vvv.quote.gz) = 77f3d497796a1112f1908ac9bdc12babaa6146824e878f8cb284accda0499de7
-SIZE (mutt/patch-1.5.13.vvv.quote.gz) = 1965
+MD5 (mutt/patch-1.5.14.vvv.initials.gz) = 60ca699e3959db53dec418ca08d028e1
+SHA256 (mutt/patch-1.5.14.vvv.initials.gz) = 0c71d08ff4fa82208f59567c6f2666a58a5bd2664c0ef57f5ababedb0f0bb0f8
+SIZE (mutt/patch-1.5.14.vvv.initials.gz) = 692
+MD5 (mutt/patch-1.5.14.vvv.quote.gz) = fb4bf5bd63d219205447009c2270676b
+SHA256 (mutt/patch-1.5.14.vvv.quote.gz) = 0b64a611a638ecf1298db85b614454630ffedf26095c9b7c2a77b47db5a5bd9f
+SIZE (mutt/patch-1.5.14.vvv.quote.gz) = 1962
 MD5 (mutt/p0-patch-1.5.6.dw.mbox-hook.1) = 9e29a6778ab07a4de3442691e4573fea
 SHA256 (mutt/p0-patch-1.5.6.dw.mbox-hook.1) = ec9511b86a595f9b4f1f96b05d9e9e12e997bc62b0a0f2b5a36e2817dee61406
 SIZE (mutt/p0-patch-1.5.6.dw.mbox-hook.1) = 6405
-MD5 (mutt/patch-1.5.13.sidebar.20060828.txt) = b1e18dcdfdb33cfcf8965f332b9f3f9f
-SHA256 (mutt/patch-1.5.13.sidebar.20060828.txt) = bafb6fed5057d1b78544a06c192bc67fca259c5cccd15312b292824849e3aa20
-SIZE (mutt/patch-1.5.13.sidebar.20060828.txt) = 49483
+MD5 (mutt/patch-1.5.14.sidebar.20070223.txt) = b4cb93ec7053ca2be1f4253d8c545937
+SHA256 (mutt/patch-1.5.14.sidebar.20070223.txt) = 56c5fc62a50ef2031736e6e4aee81931444e4545b86f05636496284e4a88f331
+SIZE (mutt/patch-1.5.14.sidebar.20070223.txt) = 50978
 MD5 (mutt/patch-1.5.9.tt.assumed_charset.2.gz) = 45cacc5155f1865ace31c72e2bffee63
 SHA256 (mutt/patch-1.5.9.tt.assumed_charset.2.gz) = 41ae6d049d2d39c3bb01d534a760372ec571bc51e90c259f529c477aa41d3d7e
 SIZE (mutt/patch-1.5.9.tt.assumed_charset.2.gz) = 2555
diff --git a/mail/mutt-devel/files/patch-Makefile.am b/mail/mutt-devel/files/patch-Makefile.am
index 4d2accd84dd8..affe34892017 100644
--- a/mail/mutt-devel/files/patch-Makefile.am
+++ b/mail/mutt-devel/files/patch-Makefile.am
@@ -1,10 +1,10 @@
---- Makefile.am.orig2	Fri Sep  1 14:27:36 2006
-+++ Makefile.am	Fri Sep  1 14:28:47 2006
-@@ -145,16 +145,12 @@
+--- Makefile.am.orig	Wed Feb 28 14:24:22 2007
++++ Makefile.am	Wed Feb 28 14:26:20 2007
+@@ -146,16 +146,12 @@
  install-data-local: Muttrc
  	$(srcdir)/mkinstalldirs $(DESTDIR)$(sysconfdir)
- 	$(INSTALL) -m644 Muttrc $(DESTDIR)$(sysconfdir)/Muttrc.dist
--	$(INSTALL) -m644 $(srcdir)/mime.types $(DESTDIR)$(sysconfdir)/mime.types.dist
+ 	$(INSTALL) -m 644 Muttrc $(DESTDIR)$(sysconfdir)/Muttrc.dist
+-	$(INSTALL) -m 644 $(srcdir)/mime.types $(DESTDIR)$(sysconfdir)/mime.types.dist
  	-if [ -f $(DESTDIR)$(pkgdatadir)/Muttrc ] ; then \
  		mv $(DESTDIR)$(pkgdatadir)/Muttrc* $(DESTDIR)$(sysconfdir) ; \
  	elif [ -f $(DESTDIR)$(pkgdatadir)/../Muttrc ] ; then \
diff --git a/mail/mutt-devel/files/patch-examples b/mail/mutt-devel/files/patch-examples
index 5b530c4d92fd..6240da00148b 100644
--- a/mail/mutt-devel/files/patch-examples
+++ b/mail/mutt-devel/files/patch-examples
@@ -77,27 +77,27 @@
  
  into your system's global Muttrc, which normally resides in /etc or
  /usr/local/etc.
---- doc/manual.txt.orig	Mon Aug 14 16:10:04 2006
-+++ doc/manual.txt	Wed Aug 30 14:34:46 2006
-@@ -5971,8 +5971,8 @@
+--- doc/manual.txt.orig	Fri Feb 23 18:15:51 2007
++++ doc/manual.txt	Wed Feb 28 14:30:48 2007
+@@ -6219,8 +6219,8 @@
  
-    For examples on how to configure these formats for the various versions of
-    PGP which are floating around, see the pgp*.rc and gpg.rc files in the
--   samples/ subdirectory which has been installed on your system alongside the
--   documentation. (PGP only)
-+   share/examples/mutt/ subdirectory which has been installed on your system
-+   alongside the documentation. (PGP only)
+    For examples on how to configure these formats for the various
+    versions of PGP which are floating around, see the pgp*.rc and gpg.rc
+-   files in the samples/ subdirectory which has been installed on your
+-   system alongside the documentation. (PGP only)
++   files in the share/examples/mutt/ subdirectory which has been installed
++   on your system alongside the documentation. (PGP only)
  
  3.163. pgp_getkeys_command
  
-@@ -6164,8 +6164,8 @@
-           "-CAfile $smime_ca_location".
+@@ -6418,8 +6418,8 @@
+           $$ssmmiimmee__ccaa__llooccaattiioonn" or "-CAfile $$ssmmiimmee__ccaa__llooccaattiioonn".
  
-    For examples on how to configure these formats, see the smime.rc in the
--   samples/ subdirectory which has been installed on your system alongside the
--   documentation. (S/MIME only)
-+   share/examples/mutt/ subdirectory which has been installed on your system
-+   alongside the documentation. (S/MIME only)
+    For examples on how to configure these formats, see the smime.rc in
+-   the samples/ subdirectory which has been installed on your system
+-   alongside the documentation. (S/MIME only)
++   the share/examples/mutt/ subdirectory which has been installed on your
++   system alongside the documentation. (S/MIME only)
  
  3.182. smime_verify_command
  
diff --git a/mail/mutt-devel/scripts/generate-plist b/mail/mutt-devel/scripts/generate-plist
index 03d4a8fa5263..22ebd8eb6ea0 100644
--- a/mail/mutt-devel/scripts/generate-plist
+++ b/mail/mutt-devel/scripts/generate-plist
@@ -133,6 +133,7 @@ EOF
     echo "%%DOCSDIR%%/html/mimesupport.html" >> $tmp_first
     echo "%%DOCSDIR%%/html/miscellany.html" >> $tmp_first
     echo "%%DOCSDIR%%/html/reference.html" >> $tmp_first
+    echo "%%DOCSDIR%%/html/tuning.html" >> $tmp_first
     if [ "$MUTT_COMPRESSED_FOLDERS" = "yes" ]; then
       echo "%%DOCSDIR%%/html/compressed-folders.html" >> $tmp_first
     fi