- Update to 1.5.18

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

9 files changed, 59 insertions, 84 deletions

diff --git a/mail/mutt-devel/Makefile b/mail/mutt-devel/Makefile
index 1507de467623..99544a6ee277 100644
--- a/mail/mutt-devel/Makefile
+++ b/mail/mutt-devel/Makefile
@@ -109,7 +109,7 @@
 #
 
 PORTNAME=	mutt-devel
-PORTVERSION=	1.5.17
+PORTVERSION=	1.5.18
 PORTREVISION?=	0
 CATEGORIES+=	mail ipv6
 .if defined(WITH_MUTT_NNTP)
@@ -438,10 +438,11 @@ pre-patch::
 	@${PATCH} ${PATCH_ARGS} -p1 < ${WRKDIR}/patch-ifdef
 .endif
 .if defined(WITH_MUTT_MBOX_HOOK_PATCH)
+IGNORE=	The WITH_MUTT_MBOX_HOOK_PATCH does not work at the moment.
 PATCHFILES+=	p0-patch-${DW_MBOX_PATCH_VERSION}.dw.mbox-hook.1:dw
 .endif
 .if defined(WITH_MUTT_SIDEBAR_PATCH)
-SIDEBAR_PATCH=	patch-1.5.17.sidebar.20071102.txt
+SIDEBAR_PATCH=	patch-1.5.18.sidebar.20080517.txt
 DISTFILES+=	${SIDEBAR_PATCH}:tchan
 XML_NEEDED=	yes
 pre-patch::
@@ -549,7 +550,7 @@ pre-install:
 
 post-install:
 	@${ECHO} > ${PKGMESSAGE}
-	${INSTALL_DATA} ${WRKSRC}/Muttrc ${PREFIX}/etc/Muttrc.dist
+	${INSTALL_DATA} ${WRKSRC}/doc/Muttrc ${PREFIX}/etc/Muttrc.dist
 .if !defined(NOPORTDOCS)
 	@${ECHO} "===>   Installing Mutt documentation"
 	@${MKDIR} ${DOCSDIR} && ${CHMOD} a+rx ${DOCSDIR}
diff --git a/mail/mutt-devel/distinfo b/mail/mutt-devel/distinfo
index f5f459b77a8c..7bc15db8255a 100644
--- a/mail/mutt-devel/distinfo
+++ b/mail/mutt-devel/distinfo
@@ -1,27 +1,27 @@
-MD5 (mutt/mutt-1.5.17.tar.gz) = 49387458be0cb52b85ae0d73af699aae
-SHA256 (mutt/mutt-1.5.17.tar.gz) = 17865b1a10e23ccf8757c05657c7d7f7055457f0a04eeacd9ee560eeb6defa81
-SIZE (mutt/mutt-1.5.17.tar.gz) = 3572651
-MD5 (mutt/patch-1.5.17.rr.compressed.gz) = 4f8edaa937d308d80f0f585b1c7fe47c
-SHA256 (mutt/patch-1.5.17.rr.compressed.gz) = ffef4854a558264b6873517f4b4be8e3390eeacec03f2f5aef0cf5c2d43953ad
-SIZE (mutt/patch-1.5.17.rr.compressed.gz) = 10124
-MD5 (mutt/patch-1.5.17.vvv.nntp.gz) = 42945bbe500e8e016d6760a05fd2e8ed
-SHA256 (mutt/patch-1.5.17.vvv.nntp.gz) = 2bc47e018a2188d429ddf6189de83a7a4c30d55f1131dfb09d667237787a09e3
-SIZE (mutt/patch-1.5.17.vvv.nntp.gz) = 55463
+MD5 (mutt/mutt-1.5.18.tar.gz) = 27c30037120189b9f9c0d3e76361b8f8
+SHA256 (mutt/mutt-1.5.18.tar.gz) = 8bb6d69ea2c72030b66ec9bb4bd4007ba6d8dc5f60fdfde7b712e2784e08bfb3
+SIZE (mutt/mutt-1.5.18.tar.gz) = 3602632
+MD5 (mutt/patch-1.5.18.rr.compressed.gz) = 75abcdfb9f524f4cdc26049918aae265
+SHA256 (mutt/patch-1.5.18.rr.compressed.gz) = c09fbe38d6faaff7ea8164adc12e1a70ba27c33c35a8b6e1fe5db4a4854893e9
+SIZE (mutt/patch-1.5.18.rr.compressed.gz) = 10082
+MD5 (mutt/patch-1.5.18.vvv.nntp.gz) = b642b723363dc2e172d34f63e077831b
+SHA256 (mutt/patch-1.5.18.vvv.nntp.gz) = 4dd82e79f9179570e8a2d27c272a1de74a098cdd49eb7d461c76b47e893030cd
+SIZE (mutt/patch-1.5.18.vvv.nntp.gz) = 55263
 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.17.vvv.initials.gz) = 08849d642e467bbd17eb7411ba63bf48
-SHA256 (mutt/patch-1.5.17.vvv.initials.gz) = 6b1829032a8cfc527f7d1abc6f7a2af6c8fdb8cd080b03a96f94e72cc75ad29c
-SIZE (mutt/patch-1.5.17.vvv.initials.gz) = 679
-MD5 (mutt/patch-1.5.17.vvv.quote.gz) = d93d91a70d9c25ca917d56738dd57246
-SHA256 (mutt/patch-1.5.17.vvv.quote.gz) = fc68dac081bea1b5a9d345c75e2861db2cdc00341fd17b6f0ccd454c02bc4767
-SIZE (mutt/patch-1.5.17.vvv.quote.gz) = 2105
+MD5 (mutt/patch-1.5.18.vvv.initials.gz) = a73d9cb673b5976b562c124cb748b98d
+SHA256 (mutt/patch-1.5.18.vvv.initials.gz) = d0efc55b7b1cff4770c1e15b7710d11e19cd28a91714155636ad87556318f3f0
+SIZE (mutt/patch-1.5.18.vvv.initials.gz) = 679
+MD5 (mutt/patch-1.5.18.vvv.quote.gz) = 67c3582b272d71612bef6216f028d960
+SHA256 (mutt/patch-1.5.18.vvv.quote.gz) = 9f77848a63e6775a88e84901b9fcad743985f481b5f7a9249df5603d871277a0
+SIZE (mutt/patch-1.5.18.vvv.quote.gz) = 1736
 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/mutt-1.5.16.vc.greeting) = 4bd9beeb74d075e4418e86e8ed887aa0
 SHA256 (mutt/mutt-1.5.16.vc.greeting) = cf05aeab5f1813864aa72b68f59a579c46dacf2fbd8e5fd064b920012320b986
 SIZE (mutt/mutt-1.5.16.vc.greeting) = 4526
-MD5 (mutt/patch-1.5.17.sidebar.20071102.txt) = 93890c4a5bc1628018a701946a0c3ff5
-SHA256 (mutt/patch-1.5.17.sidebar.20071102.txt) = 1d8dda9fed1e1592ff9004e2c776c2f4a84e4e75ca872542e8e07113516fc27b
-SIZE (mutt/patch-1.5.17.sidebar.20071102.txt) = 50439
+MD5 (mutt/patch-1.5.18.sidebar.20080517.txt) = 93baec963e44d05a9fb39112eb4a0d7e
+SHA256 (mutt/patch-1.5.18.sidebar.20080517.txt) = a46e4842eb44cf268ccf50281348564524ebe22f42a25d27d23ac347c5093add
+SIZE (mutt/patch-1.5.18.sidebar.20080517.txt) = 51974
diff --git a/mail/mutt-devel/files/extra-patch-aspell b/mail/mutt-devel/files/extra-patch-aspell
index bae66411cca7..05a3706764e5 100644
--- a/mail/mutt-devel/files/extra-patch-aspell
+++ b/mail/mutt-devel/files/extra-patch-aspell
@@ -1,5 +1,5 @@
---- Muttrc.head.orig	Thu Jan 24 13:10:47 2002
-+++ Muttrc.head	Tue Nov  9 08:53:14 2004
+--- doc/Muttrc.head.orig	Thu Jan 24 13:10:47 2002
++++ doc/Muttrc.head	Tue Nov  9 08:53:14 2004
 @@ -19,6 +19,8 @@
  macro index   <f1> "!less @docdir@/manual.txt\n" "Show Mutt documentation"
  macro pager   <f1> "!less @docdir@/manual.txt\n" "Show Mutt documentation"
diff --git a/mail/mutt-devel/files/extra-patch-nodoc-contrib b/mail/mutt-devel/files/extra-patch-nodoc-contrib
index 47e741b2b7cc..3a079bb2cdeb 100644
--- a/mail/mutt-devel/files/extra-patch-nodoc-contrib
+++ b/mail/mutt-devel/files/extra-patch-nodoc-contrib
@@ -9,9 +9,9 @@
  
  bin_SCRIPTS = muttbug flea @SMIMEAUX_TARGET@
  
---- doc/Makefile.am.orig3	Tue Mar  6 17:51:02 2007
-+++ doc/Makefile.am	Tue Mar  6 17:51:45 2007
-@@ -55,14 +55,6 @@
+--- doc/Makefile.am.orig	2008-05-19 19:43:38.000000000 +0200
++++ doc/Makefile.am	2008-05-19 19:45:35.000000000 +0200
+@@ -60,14 +60,6 @@
  	./instdoc muttrc.man $(DESTDIR)$(mandir)/man5/muttrc.5
  	./instdoc $(srcdir)/mbox.man $(DESTDIR)$(mandir)/man5/mbox.5
  	./instdoc $(srcdir)/mmdf.man $(DESTDIR)$(mandir)/man5/mmdf.5
@@ -23,6 +23,6 @@
 -		$(INSTALL) -m 644 $(srcdir)/$$f $(DESTDIR)$(docdir) ; \
 -	done
 -	-$(INSTALL) -m 644 manual.txt $(DESTDIR)$(docdir)
- 
- uninstall-local:
- 	for f in mutt.1 mutt_dotlock.1 flea.1 muttbug.1 ; do \
+ 	$(INSTALL) -m 644 Muttrc $(DESTDIR)$(sysconfdir)/Muttrc.dist
+ 	-if [ -f $(DESTDIR)$(pkgdatadir)/Muttrc ] ; then \
+ 		mv $(DESTDIR)$(pkgdatadir)/Muttrc* $(DESTDIR)$(sysconfdir) ; \
diff --git a/mail/mutt-devel/files/patch-02 b/mail/mutt-devel/files/patch-02
index ff8bd8eafb40..62c954a354b7 100644
--- a/mail/mutt-devel/files/patch-02
+++ b/mail/mutt-devel/files/patch-02
@@ -1,32 +1,34 @@
---- doc/Makefile.am.orig	Wed Jun 13 10:15:07 2007
-+++ doc/Makefile.am	Wed Jun 13 10:17:15 2007
-@@ -41,7 +41,7 @@
- all:
- 	$(MAKE) makedoc-all
+--- doc/Makefile.am.orig	2008-01-30 05:26:50.000000000 +0100
++++ doc/Makefile.am	2008-05-19 19:24:02.000000000 +0200
+@@ -45,7 +45,7 @@
  
--makedoc-all: mutt.1 muttrc.man manual.html stamp-doc-chunked manual.txt
+ all: makedoc-all
+ 
+-makedoc-all: mutt.1 muttrc.man manual.html stamp-doc-rc stamp-doc-chunked manual.txt
 +makedoc-all: mutt.1 muttrc.man
  
  install-data-local: makedoc-all instdoc
  	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/man1
-@@ -62,9 +62,6 @@
+@@ -67,9 +67,6 @@
  		$(INSTALL) -m 644 $(srcdir)/$$f $(DESTDIR)$(docdir) ; \
  	done
  	-$(INSTALL) -m 644 manual.txt $(DESTDIR)$(docdir)
 -	-for f in $(HTML_DOCFILES) ; do \
 -		$(INSTALL) -m 644 $$f $(DESTDIR)$(docdir) ; \
 -	done
- 
- uninstall-local:
- 	for f in mutt.1 mutt_dotlock.1 flea.1 muttbug.1 ; do \
-@@ -81,9 +78,7 @@
+ 	$(INSTALL) -m 644 Muttrc $(DESTDIR)$(sysconfdir)/Muttrc.dist
+ 	-if [ -f $(DESTDIR)$(pkgdatadir)/Muttrc ] ; then \
+ 		mv $(DESTDIR)$(pkgdatadir)/Muttrc* $(DESTDIR)$(sysconfdir) ; \
+@@ -100,10 +97,8 @@
  
  check:
- manual.txt: manual.html
--	-lynx -dump -nolist -with_backspaces $^ > $@ || \
--	w3m -dump $^ > $@ || \
--	elinks -dump -no-numbering -no-references $^ > $@
-+	-lynx -dump -nolist -with_backspaces manual.html > $@
+ manual.txt: manual.html db-cleanup.xsl
+-	-xsltproc --nonet -o manual-txt.html $(srcdir)/db-cleanup.xsl manual.html || cp manual.html manual-txt.html
+-	-lynx -dump -nolist -with_backspaces manual-txt.html > $@ || \
+-	w3m -dump manual-txt.html > $@ || \
+-	elinks -dump -no-numbering -no-references manual-txt.html > $@
++	-xsltproc --nonet -o manual-txt.out $(srcdir)/db-cleanup.xsl manual.html || cp manual.html manual-txt.out
++	-lynx -dump -nolist -with_backspaces manual-txt.out > $@
+ 
+ Muttrc: stamp-doc-rc
  
- manual.html: $(srcdir)/html.xsl stamp-doc-xml
- 	-xsltproc --nonet -o $@ $(srcdir)/html.xsl manual.xml
diff --git a/mail/mutt-devel/files/patch-08 b/mail/mutt-devel/files/patch-08
index 3e50cbd13779..69d353f64b40 100644
--- a/mail/mutt-devel/files/patch-08
+++ b/mail/mutt-devel/files/patch-08
@@ -1,5 +1,5 @@
---- Muttrc.orig	Sat May 13 08:30:44 2000
-+++ Muttrc	Sat May 13 08:32:05 2000
+--- doc/Muttrc.orig	Sat May 13 08:30:44 2000
++++ doc/Muttrc	Sat May 13 08:32:05 2000
 @@ -629,6 +629,7 @@
  # Type: boolean
  # Default: yes
diff --git a/mail/mutt-devel/files/patch-Makefile.am b/mail/mutt-devel/files/patch-Makefile.am
index affe34892017..ac0403811365 100644
--- a/mail/mutt-devel/files/patch-Makefile.am
+++ b/mail/mutt-devel/files/patch-Makefile.am
@@ -1,19 +1,13 @@
---- 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
+--- Makefile.am.orig	2008-05-19 19:00:44.000000000 +0200
++++ Makefile.am	2008-05-19 19:03:20.000000000 +0200
+@@ -136,10 +136,6 @@
+ 
+ install-data-local:
  	$(srcdir)/mkinstalldirs $(DESTDIR)$(sysconfdir)
- 	$(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 \
- 	 	mv $(DESTDIR)$(pkgdatadir)/../Muttrc* $(DESTDIR)$(sysconfdir) ; \
- 	elif [ ! -f $(DESTDIR)$(sysconfdir)/Muttrc ] ; then \
- 		$(INSTALL) -m 644 Muttrc $(DESTDIR)$(sysconfdir) ; \
--	fi
 -	-if [ ! -f $(DESTDIR)$(sysconfdir)/mime.types ]; then \
 -		$(INSTALL) -m 644 $(srcdir)/mime.types $(DESTDIR)$(sysconfdir); \
- 	fi
+-	fi
  
  uninstall-local:
+ 	for i in mime.types ; do \
diff --git a/mail/mutt-devel/files/patch-configure.ac b/mail/mutt-devel/files/patch-configure.ac
deleted file mode 100644
index bfe29b70d9d6..000000000000
--- a/mail/mutt-devel/files/patch-configure.ac
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./configure.ac.orig	2007-11-01 22:10:06.000000000 +0300
-+++ ./configure.ac	2008-02-11 00:32:50.000000000 +0300
-@@ -904,7 +904,7 @@
-                 bdbpfx="$bdbpfx $d/$v"
-             done
-         done
--        BDB_VERSIONS="db-4 db4 db-4.5 db4.5 db45 db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db ''"
-+        BDB_VERSIONS="db-4 db4 db-4.6 db4.6 db46 db-4.5 db4.5 db45 db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db ''"
-         AC_MSG_CHECKING([for BerkeleyDB > 4.0])
-         for d in $bdbpfx; do
-             BDB_INCLUDE_DIR=""
diff --git a/mail/mutt-devel/files/patch-examples b/mail/mutt-devel/files/patch-examples
index 2e7737ea76ca..987f065c82a1 100644
--- a/mail/mutt-devel/files/patch-examples
+++ b/mail/mutt-devel/files/patch-examples
@@ -48,17 +48,6 @@
    ** (S/MIME only)
    */
    { "smime_verify_command", 	DT_STR, R_NONE, UL &SmimeVerifyCommand, 0},
---- Makefile.am.orig	Mon Apr  9 15:21:50 2007
-+++ Makefile.am	Mon Apr  9 15:24:06 2007
-@@ -13,7 +13,7 @@
- 
- bin_SCRIPTS = muttbug flea @SMIMEAUX_TARGET@
- 
--BUILT_SOURCES = keymap_defs.h patchlist.c reldate.h hcversion.h
-+BUILT_SOURCES = keymap_defs.h patchlist.c reldate.h hcversion.h Muttrc
- 
- bin_PROGRAMS = mutt @DOTLOCK_TARGET@ @PGPAUX_TARGET@
- mutt_SOURCES = $(BUILT_SOURCES) \
 --- INSTALL.orig	Mon Nov 25 15:16:46 2002
 +++ INSTALL	Wed Mar 26 15:59:57 2003
 @@ -225,13 +225,13 @@