- Update to 1.5.11

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

13 files changed, 103 insertions, 360 deletions

diff --git a/mail/mutt-devel/Makefile b/mail/mutt-devel/Makefile
index 8ab757eb1317..2241f9465e9d 100644
--- a/mail/mutt-devel/Makefile
+++ b/mail/mutt-devel/Makefile
@@ -28,9 +28,9 @@
 #  WITH_MUTT_HTML
 #  This is a default knob and can be disabled by WITHOUT_MUTT_HTML
 #
-# If you do not want that the documentation is rebuilt using sgmlformat
+# If you do not want that the documentation is rebuilt using the xml tools
 # define:
-#  WITHOUT_MUTT_SGMLFORMAT
+#  WITHOUT_MUTT_XML
 #    (this can only be stated if WITHOUT_MUTT_HTML is defined)
 #
 # If you want to access compressed email folders define:
@@ -95,7 +95,7 @@
 #
 
 PORTNAME=	mutt-devel
-PORTVERSION=	1.5.10
+PORTVERSION=	1.5.11
 CATEGORIES+=	mail ipv6
 .if defined(WITH_MUTT_NNTP)
 CATEGORIES+=	news
@@ -110,8 +110,9 @@ MASTER_SITES=	ftp://ftp.mutt.org/mutt/devel/ \
 		ftp://ftp.mutt.org.ua/pub/mutt/mutt-${VVV_PATCH_VERSION}/:vvv \
 		ftp://ftp3.mutt.org.ua/pub/mutt/mutt-${VVV_PATCH_VERSION}/:vvv \
 		http://www.spinnaker.de/mutt/compressed/:rr \
+		http://cedricduval.free.fr/mutt/patches/download/:cd \
 		http://thomer.com/mutt/:thomer
-DISTNAME=	mutt-${PORTVERSION}i
+DISTNAME=	mutt-${PORTVERSION}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
@@ -190,7 +191,7 @@ WITH_MUTT_IMAP_HEADER_CACHE=	yes
 .endif
 
 .if defined (MUTT_LITE)
-WITHOUT_MUTT_SGMLFORMAT=		yes
+WITHOUT_MUTT_XML=			yes
 WITHOUT_MUTT_COMPRESSED_FOLDERS=	yes
 WITHOUT_MUTT_QUOTE_PATCH=		yes
 WITHOUT_MUTT_HTML=			yes
@@ -244,10 +245,13 @@ MUTT_USES_NCURSES=	yes
 MUTT_USES_SLANG=	yes
 .endif
 .if defined(WITHOUT_MUTT_SGMLFORMAT)
-SGML_USED=	no
+XML_USED=	no
+.endif
+.if defined(WITHOUT_MUTT_XML)
+XML_USED=	no
 .endif
-.if !defined(SGML_USED)
-SGML_USED=	no
+.if !defined(XML_USED)
+XML_USED=	no
 .endif
 .if !defined(WITHOUT_NLS)
 USE_GETTEXT=	yes
@@ -256,7 +260,7 @@ USE_GETTEXT=	yes
 USE_ICONV=	yes
 .endif
 .if defined(NOPORTDOCS)
-SGML_USED=	no
+XML_USED=	no
 .endif
 .if defined(MUTT_USES_NCURSES) && ${OSVERSION} < 400000
 LIB_DEPENDS+=	ncurses.5:${PORTSDIR}/devel/ncurses
@@ -344,7 +348,7 @@ PATCH_DIST_STRIP=	-p1
 .if ! defined (WITHOUT_MUTT_COMPRESSED_FOLDERS)
 DISTFILES+=	patch-${RR_PATCH_VERSION}.rr.compressed.gz:vvv
 CONFIGURE_ARGS+=	--enable-compressed
-SGML_NEEDED=	yes
+XML_NEEDED=	yes
 pre-patch::
 	@${GUNZIP_CMD} -c ${DISTDIR}/${DIST_SUBDIR}/patch-${RR_PATCH_VERSION}.rr.compressed.gz > ${WRKDIR}/patch-compressed
 	@${REINPLACE_CMD} -E '/^diff.*\/doc\/manual.txt$$/,/^diff/d' \
@@ -354,7 +358,7 @@ pre-patch::
 .if defined(WITH_MUTT_NNTP)
 DISTFILES+=	patch-${VVV_PATCH_VERSION}.vvv.nntp.gz:vvv
 CONFIGURE_ARGS+=	--enable-nntp
-SGML_NEEDED=	yes
+XML_NEEDED=	yes
 pre-patch::
 	@${GUNZIP_CMD} -c ${DISTDIR}/${DIST_SUBDIR}/patch-${VVV_PATCH_VERSION}.vvv.nntp.gz > ${WRKDIR}/patch-nntp
 	@${REINPLACE_CMD} -E '/^diff.*\/doc\/manual.txt$$/,/^diff/d' \
@@ -364,15 +368,20 @@ pre-patch::
 .if ! defined(WITHOUT_MUTT_QUOTE_PATCH)
 PATCHFILES+=	patch-${VVV_PATCH_VERSION}.vvv.initials.gz:vvv \
 		patch-${VVV_PATCH_VERSION}.vvv.quote.gz:vvv
-SGML_NEEDED=	yes
+XML_NEEDED=	yes
 .endif
 .if defined(WITH_MUTT_SIGNATURE_MENU)
 PATCHFILES+=	patch-${CD_PATCH_VERSION}.cd.signatures_menu.2.1:cd
-SGML_NEEDED=	yes
+XML_NEEDED=	yes
 .endif
 .if defined(WITH_MUTT_IFDEF_PATCH)
-PATCHFILES+=	patch-${CD_IFDEF_PATCH_VERSION}.cd.ifdef.1:cd
-SGML_NEEDED=	yes
+DISTFILES+=	patch-${CD_IFDEF_PATCH_VERSION}.cd.ifdef.1:cd
+#XML_NEEDED=	yes
+pre-patch::
+	${CAT} ${DISTDIR}/${DIST_SUBDIR}/patch-${CD_IFDEF_PATCH_VERSION}.cd.ifdef.1 > ${WRKDIR}/patch-ifdef
+	${REINPLACE_CMD} -E '/^diff.*\/doc\/manual.sgml.head$$/,/^diff/d' \
+		 ${WRKDIR}/patch-ifdef
+	${PATCH} ${PATCH_ARGS} -p1 < ${WRKDIR}/patch-ifdef
 .endif
 .if defined(WITH_MUTT_MBOX_HOOK_PATCH)
 PATCHFILES+=	p0-patch-${DW_MBOX_PATCH_VERSION}.dw.mbox-hook.1:dw
@@ -380,7 +389,7 @@ PATCHFILES+=	p0-patch-${DW_MBOX_PATCH_VERSION}.dw.mbox-hook.1:dw
 .if defined(WITH_MUTT_SIDEBAR_PATCH)
 SIDEBAR_PATCH=	patch-1.5.10i.sidebar.20050816.txt
 DISTFILES+=	${SIDEBAR_PATCH}:thomer
-SGML_NEEDED=	yes
+XML_NEEDED=	yes
 pre-patch::
 	@${GUNZIP_CMD} -c ${DISTDIR}/${DIST_SUBDIR}/${SIDEBAR_PATCH} > ${WRKDIR}/patch-sidebar
 	@${REINPLACE_CMD} -E '/^diff.*\/Makefile.in$$/,/^diff/d' \
@@ -455,21 +464,21 @@ post-build:
 		-e 's|\$$\{EXAMPLESDIR\}|${EXAMPLESDIR}|g' \
 		${WRKSRC}/doc/muttrc.man
 .if ! defined(WITHOUT_MUTT_HTML)
-SGML_USED=	yes
+XML_USED=	yes
 .endif
-.if defined(SGML_NEEDED) && !defined(WITHOUT_MUTT_SGMLFORMAT)
-SGML_USED=	yes
+.if defined(XML_NEEDED) && !defined(WITHOUT_MUTT_XML)
+XML_USED=	yes
 .endif
 .else 	# ! NOPORTDOCS
 post-patch::
 	@${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-nodoc-contrib
 .endif # ! NOPORTDOCS
 
-.if ${SGML_USED} == yes
-SCRIPTS_ENV+=	MUTT_SGML="yes"
-BUILD_DEPENDS+=	sgmlfmt:${PORTSDIR}/textproc/sgmlformat
+.if ${XML_USED} == yes
+#BUILD_DEPENDS+=	xsltproc:${PORTSDIR}/textproc/libxslt \
+#		lynx:${PORTSDIR}/www/lynx
 post-patch::
-	@${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-sgmlformat
+	@${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-doc-xml
 .endif
 
 pre-install:
@@ -483,9 +492,6 @@ post-install:
 	@${MKDIR} ${DOCSDIR} && ${CHMOD} a+rx ${DOCSDIR}
 	@cd ${WRKSRC}/doc ; ${INSTALL_MAN} manual.txt PGP-Notes.txt \
 		../ABOUT-NLS ../contrib/language*  ${DOCSDIR}
-.if ${SGML_USED} == yes
-	@cd ${WRKSRC}/doc ; ${INSTALL_MAN} manual.latin1 manual.ps ${DOCSDIR}
-.endif
 .if defined(WITH_MUTT_NNTP)
 	@cd ${WRKSRC} ; ${INSTALL_MAN} ChangeLog.nntp ${DOCSDIR}
 .endif
diff --git a/mail/mutt-devel/distinfo b/mail/mutt-devel/distinfo
index 3a9481c22d55..0de5a739d80b 100644
--- a/mail/mutt-devel/distinfo
+++ b/mail/mutt-devel/distinfo
@@ -1,13 +1,13 @@
-MD5 (mutt/mutt-1.5.10i.tar.gz) = 59400d12c6b5b3d122531000e53d1914
-SIZE (mutt/mutt-1.5.10i.tar.gz) = 3156345
-MD5 (mutt/patch-1.5.10.rr.compressed.gz) = f6cd5bd6c030d5d691d347a6e9d75b6a
-SIZE (mutt/patch-1.5.10.rr.compressed.gz) = 10095
-MD5 (mutt/patch-1.5.10.vvv.nntp.gz) = ac9a4c8bf25a96648bb08cde4ced4c05
-SIZE (mutt/patch-1.5.10.vvv.nntp.gz) = 98153
-MD5 (mutt/patch-1.5.10.vvv.initials.gz) = 91eea7344625830bf4231dc1d56cb799
-SIZE (mutt/patch-1.5.10.vvv.initials.gz) = 682
-MD5 (mutt/patch-1.5.10.vvv.quote.gz) = a447f9362a9ef37c8fdc58efa73ed326
-SIZE (mutt/patch-1.5.10.vvv.quote.gz) = 1963
+MD5 (mutt/mutt-1.5.11.tar.gz) = 00e6f8f7c37d4840e5e30583ebee21ce
+SIZE (mutt/mutt-1.5.11.tar.gz) = 3187375
+MD5 (mutt/patch-1.5.11.rr.compressed.gz) = 95ec112ae0ce2cbd1b67bcc68756bf97
+SIZE (mutt/patch-1.5.11.rr.compressed.gz) = 9995
+MD5 (mutt/patch-1.5.11.vvv.nntp.gz) = f5a2f99940a4bbeef2d1062e9280462c
+SIZE (mutt/patch-1.5.11.vvv.nntp.gz) = 54943
+MD5 (mutt/patch-1.5.11.vvv.initials.gz) = 1d6e82f41b96a47862f6cd7cfd943ec6
+SIZE (mutt/patch-1.5.11.vvv.initials.gz) = 684
+MD5 (mutt/patch-1.5.11.vvv.quote.gz) = 5409e89072f83ffbe87d2358948816db
+SIZE (mutt/patch-1.5.11.vvv.quote.gz) = 1958
 MD5 (mutt/patch-1.5.4.cd.ifdef.1) = a545036cdb55519154d0b35465f52daa
 SIZE (mutt/patch-1.5.4.cd.ifdef.1) = 3545
 MD5 (mutt/p0-patch-1.5.6.dw.mbox-hook.1) = 9e29a6778ab07a4de3442691e4573fea
diff --git a/mail/mutt-devel/files/extra-patch-sgmlformat b/mail/mutt-devel/files/extra-patch-doc-xml
index 4cc9982d2807..60e38afca3f3 100644
--- a/mail/mutt-devel/files/extra-patch-sgmlformat
+++ b/mail/mutt-devel/files/extra-patch-doc-xml
@@ -4,8 +4,8 @@
  topsrcdir_DOCFILES = COPYRIGHT GPL INSTALL ChangeLog	\
  	README NEWS TODO README.SECURITY README.SSL 
  
--all: mutt.1
-+all: mutt.1 muttrc.man try-html try-txt try-latin1 try-ps
+-all: mutt.1 muttrc.man
++all: mutt.1 muttrc.man manual.html stamp-doc-chunked manual.txt
  
  try-html: ../makedoc
  	rm -f *.html && $(MAKE) manual.html || cp $(srcdir)/manual*.html ./
diff --git a/mail/mutt-devel/files/extra-patch-nodoc-contrib b/mail/mutt-devel/files/extra-patch-nodoc-contrib
index c6341803f43e..e8ff8296c475 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.in.orig	Sun Aug 14 11:35:31 2005
-+++ doc/Makefile.in	Sun Aug 14 11:37:23 2005
-@@ -93,14 +93,6 @@
+--- doc/Makefile.in.orig	Sun Sep 18 16:56:56 2005
++++ doc/Makefile.in	Sun Sep 18 17:00:01 2005
+@@ -81,14 +81,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
@@ -22,7 +22,7 @@
 -	for f in $(srcdir_DOCFILES) ; do \
 -		$(INSTALL) -m 644 $(srcdir)/$$f $(DESTDIR)$(docdir) ; \
 -	done
--	$(INSTALL) -m 644 manual.txt $(DESTDIR)$(docdir) || true
+-	-$(INSTALL) -m 644 manual.txt $(DESTDIR)$(docdir)
  
  uninstall:
  	for f in mutt.1 mutt_dotlock.1 flea.1 muttbug.1 ; do \
diff --git a/mail/mutt-devel/files/patch-02 b/mail/mutt-devel/files/patch-02
index a30021c7e42e..2cd035888a3e 100644
--- a/mail/mutt-devel/files/patch-02
+++ b/mail/mutt-devel/files/patch-02
@@ -1,66 +1,38 @@
---- doc/Makefile.in.orig	Thu Aug 11 21:37:02 2005
-+++ doc/Makefile.in	Sun Aug 14 11:09:10 2005
-@@ -64,13 +64,23 @@
+--- doc/Makefile.in.orig	Sun Sep 18 19:42:14 2005
++++ doc/Makefile.in	Sun Sep 18 19:44:13 2005
+@@ -68,7 +68,7 @@
  	ChangeLog.old					\
  	README NEWS TODO README.SECURITY README.SSL 
  
--all: mutt.1 muttrc.man try-html try-txt
-+all: mutt.1
- 
- try-html: ../makedoc$(EXEEXT)
--	test -f manual.html || $(MAKE) manual.html || cp $(srcdir)/manual*.html ./
-+	rm -f *.html && $(MAKE) manual.html || cp $(srcdir)/manual*.html ./
-+	touch $@
- 
- try-txt: ../makedoc$(EXEEXT)
--	test -f manual.txt || $(MAKE) manual.txt || cp $(srcdir)/manual.txt ./
-+	$(MAKE) manual.txt || cp $(srcdir)/manual.txt ./
-+	touch $@
-+
-+try-latin1: ../makedoc$(EXEEXT)
-+	$(MAKE) manual.latin1 || cp $(srcdir)/manual.latin1 ./
-+	touch $@
-+
-+try-ps: ../makedoc$(EXEEXT)
-+	$(MAKE) manual.ps || cp $(srcdir)/manual.latin1 ./
-+	touch $@
+-all: mutt.1 muttrc.man manual.html stamp-doc-chunked manual.txt
++all: mutt.1 muttrc.man
  
  install: all instdoc
  	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/man1
-@@ -91,10 +101,6 @@
+@@ -89,9 +89,6 @@
  		$(INSTALL) -m 644 $(srcdir)/$$f $(DESTDIR)$(docdir) ; \
  	done
- 	$(INSTALL) -m 644 manual.txt $(DESTDIR)$(docdir) || true
--	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(docdir)/html
--	for file in manual*.html ; do	\
--		$(INSTALL) -m 644 $$file $(DESTDIR)$(docdir)/html/ || true ;\
+ 	-$(INSTALL) -m 644 manual.txt $(DESTDIR)$(docdir)
+-	-for f in $(HTML_DOCFILES) ; do \
+-		$(INSTALL) -m 644 $$f $(DESTDIR)$(docdir) ; \
 -	done
  
  uninstall:
  	for f in mutt.1 mutt_dotlock.1 flea.1 muttbug.1 ; do \
-@@ -114,17 +120,20 @@
+@@ -108,13 +105,13 @@
  
  check:
- manual.txt: manual.sgml
--	if linuxdoc -B txt -c latin --pass='-P -c' manual ; then \
--		uniq < manual.txt | expand > _manual.txt ; \
--		rm manual.txt ; \
-+	if sgmlfmt -f ascii manual; then \
-+		uniq < manual.ascii | expand > _manual.txt ; \
-+		rm -f manual.txt manual.ascii; \
- 		mv _manual.txt manual.txt ;\
- 	fi
+ manual.txt: manual.html
+-	-lynx -dump -nolist -with_backspaces $^ > $@ || w3m -dump $^ > $@
++#	-lynx -dump -nolist -with_backspaces manual.html > $@
  
- manual.html: manual.sgml
--	sgml2html manual  || true
-+	sgmlfmt -f html manual || true
-+
-+manual.latin1: manual.sgml
-+	sgmlfmt -f latin1 manual || true
+ manual.html: $(srcdir)/html.xsl manual.xml
+-	-xsltproc --nonet -o $@ $^
++#	-xsltproc --nonet -o $@ $(srcdir)/html.xsl manual.xml
  
- manual.ps: manual.sgml
--	sgml2latex --output=ps manual || true
-+	sgmlfmt -f ps manual || true
+ manual-chunked stamp-doc-chunked: $(srcdir)/chunk.xsl manual.xml
+-	-xsltproc --nonet $^
++#	-xsltproc --nonet $(srcdir)/chunk.xsl manual.xml
+ 	touch stamp-doc-chunked
  
- clean: 
- 	rm -f *~ *.html *.orig *.rej  stamp-doc-sgml stamp-doc-man *.ps
+ manual.pdf: stamp-doc-tex
diff --git a/mail/mutt-devel/files/patch-03 b/mail/mutt-devel/files/patch-03
deleted file mode 100644
index b870f7f7aaec..000000000000
--- a/mail/mutt-devel/files/patch-03
+++ /dev/null
@@ -1,13 +0,0 @@
---- doc/manual.sgml.orig	Tue May  9 17:15:26 2000
-+++ doc/manual.sgml	Fri May 12 11:05:40 2000
-@@ -1,5 +1,8 @@
--<!doctype linuxdoc system>
--
-+<!DOCTYPE linuxdoc PUBLIC "-//FreeBSD//DTD linuxdoc//EN" [
-+<!ENTITY dquot "&#34;">
-+]>
-+<linuxdoc>
-+  
- <article>
- 
- <title>The Mutt E-Mail Client
diff --git a/mail/mutt-devel/files/patch-doc-manual.sgml.head b/mail/mutt-devel/files/patch-doc-manual.sgml.head
deleted file mode 100644
index f06411bc3688..000000000000
--- a/mail/mutt-devel/files/patch-doc-manual.sgml.head
+++ /dev/null
@@ -1,113 +0,0 @@
---- doc/manual.sgml.head.orig	Sat Jan 15 10:42:44 2005
-+++ doc/manual.sgml.head	Fri Feb  4 08:05:59 2005
-@@ -125,24 +125,24 @@
- <tscreen><verb>
- ^A or <Home>    bol             move to the start of the line
- ^B or <Left>    backward-char   move back one char
--Esc B		backward-word	move back one word
-+Esc B           backward-word   move back one word
- ^D or <Delete>  delete-char     delete the char under the cursor
- ^E or <End>     eol             move to the end of the line
- ^F or <Right>   forward-char    move forward one char
--Esc F		forward-word	move forward one word
-+Esc F           forward-word    move forward one word
- <Tab>           complete        complete filename or alias
- ^T              complete-query  complete address with query
- ^K              kill-eol        delete to the end of the line
--ESC d		kill-eow	delete to the end ot the word
-+ESC d           kill-eow        delete to the end ot the word
- ^W              kill-word       kill the word in front of the cursor
- ^U              kill-line       delete entire line
- ^V              quote-char      quote the next typed key
- <Up>            history-up      recall previous string from history
- <Down>          history-down    recall next string from history
- <BackSpace>     backspace       kill the char in front of the cursor
--Esc u		upcase-word	convert word to upper case
--Esc l		downcase-word	convert word to lower case
--Esc c		capitalize-word capitalize the word
-+Esc u           upcase-word     convert word to upper case
-+Esc l           downcase-word   convert word to lower case
-+Esc c           capitalize-word capitalize the word
- ^G              n/a             abort
- <Return>        n/a             finish editing
- </verb></tscreen>
-@@ -325,8 +325,8 @@
- ESC p   previous-subthread      jump to the start of the previous subthread
- ESC r   read-subthread          mark the current subthread as read
- ESC t   tag-thread              toggle the tag on the current thread
--ESC v	collapse-thread		toggle collapse for the current thread
--ESC V	collapse-all		toggle collapse for all threads
-+ESC v   collapse-thread         toggle collapse for the current thread
-+ESC V   collapse-all            toggle collapse for all threads
- P       parent-message          jump to parent message in thread
- </verb></tscreen>
- 
-@@ -513,7 +513,7 @@
- 
- <tscreen><verb>
- a       attach-file             attach a file
--A	attach-message		attach message(s) to the message
-+A       attach-message          attach message(s) to the message
- ESC k   attach-key              attach a PGP public key
- d       edit-description        edit description on attachment
- D       detach-file             detach a file
-@@ -529,7 +529,7 @@
- p       pgp-menu                select PGP options
- P       postpone-message        postpone this message until later
- q       quit                    quit (abort) sending the message
--w	write-fcc		write the message to a folder
-+w       write-fcc               write the message to a folder
- i       ispell                  check spelling (if available on your system)
- ^F      forget-passphrase       wipe passphrase(s) from memory
- </verb></tscreen>
-@@ -1876,7 +1876,7 @@
- ~G              cryptographically encrypted messages
- ~H EXPR         messages with a spam attribute matching EXPR
- ~h EXPR         messages which contain EXPR in the message header
--~k		message contains PGP key material
-+~k              message contains PGP key material
- ~i ID           message which match ID in the ``Message-ID'' field
- ~L EXPR         message is either originated or received by EXPR
- ~l              message is addressed to a known mailing list
-@@ -1894,13 +1894,13 @@
- ~T              tagged messages
- ~t USER         messages addressed to USER
- ~U              unread messages
--~v		message is part of a collapsed thread.
--~V		cryptographically verified messages
-+~v              message is part of a collapsed thread.
-+~V              cryptographically verified messages
- ~x EXPR         messages which contain EXPR in the `References' field
- ~y EXPR         messages which contain EXPR in the `X-Label' field
- ~z [MIN]-[MAX]  messages with a size in the range MIN to MAX *)
--~=		duplicated messages (see $duplicate_threads)
--~$		unreferenced messages (requires threaded view)
-+~=              duplicated messages (see $duplicate_threads)
-+~$              unreferenced messages (requires threaded view)
- </verb></tscreen>
- 
- Where EXPR, USER, ID, and SUBJECT are 
-@@ -2003,10 +2003,10 @@
- An error margin is a sign (+ or -), followed by a digit, followed by
- one of the following units:
- <verb>
--y	years
--m	months
--w	weeks
--d	days
-+y       years
-+m       months
-+w       weeks
-+d       days
- </verb>
- As a special case, you can replace the sign by a ``*'' character,
- which is equivalent to giving identical plus and minus error margins.
-@@ -3044,7 +3044,7 @@
- to send messages from the command line as well.
- 
- <tscreen><verb>
---A	expand an alias
-+-A      expand an alias
- -a      attach a file to a message
- -b      specify a blind carbon-copy (BCC) address
- -c      specify a carbon-copy (Cc) address
diff --git a/mail/mutt-devel/files/patch-doc-mutt.1 b/mail/mutt-devel/files/patch-doc-mutt.1
deleted file mode 100644
index 6443adb8c9cb..000000000000
--- a/mail/mutt-devel/files/patch-doc-mutt.1
+++ /dev/null
@@ -1,11 +0,0 @@
---- doc/Makefile.in.orig	Sun Aug 14 11:27:21 2005
-+++ doc/Makefile.in	Sun Aug 14 11:28:38 2005
-@@ -179,7 +179,7 @@
- 	-e 's,@docdir\@,$(docdir),g'
- 
- mutt.1: $(srcdir)/mutt.man
--	$(EDIT) $< > $@
-+	$(EDIT) $(srcdir)/mutt.man > $@
- 
- muttrc.man stamp-doc-man: ../makedoc$(EXEEXT) $(top_srcdir)/init.h muttrc.man.head muttrc.man.tail
- 	$(MAKEDOC_CPP) $(top_srcdir)/init.h | ../makedoc -m | 	    \
diff --git a/mail/mutt-devel/files/patch-doc-mutt.man b/mail/mutt-devel/files/patch-doc-mutt.man
deleted file mode 100644
index 8fdd16a03194..000000000000
--- a/mail/mutt-devel/files/patch-doc-mutt.man
+++ /dev/null
@@ -1,20 +0,0 @@
---- doc/muttrc.man.orig	Wed Mar 19 22:55:03 2003
-+++ doc/muttrc.man	Sun Oct 26 11:16:05 2003
-@@ -1031,7 +1031,7 @@
- .B dotlock_program
- .nf
- Type: path
--Default: \(lq/usr/local/bin/mutt_dotlock\(rq
-+Default: \(lq${PREFIX}/bin/mutt_dotlock\(rq
- .fi
- .IP
- Contains the path of the mutt_dotlock (8) binary to be used by
-@@ -4410,7 +4410,7 @@
- instead of a raw socket. You may be able to use this to set up
- preauthenticated connections to your IMAP/POP3 server. Example:
- .IP
--tunnel=\(rqssh -q mailhost.net /usr/local/libexec/imapd\(rq
-+tunnel=\(rqssh -q mailhost.net ${PREFIX}/libexec/imapd\(rq
- .IP
- NOTE: For this example to work you must be able to log in to the remote
- machine without having to enter a password.
diff --git a/mail/mutt-devel/files/patch-examples b/mail/mutt-devel/files/patch-examples
index 91fb73ceaad7..3f523836f0bb 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	Wed Mar 19 23:30:56 2003
-+++ doc/manual.txt	Wed Mar 26 16:07:20 2003
-@@ -4954,8 +4954,8 @@
+--- doc/manual.txt.orig	Thu Sep 15 16:22:18 2005
++++ doc/manual.txt	Sun Sep 18 15:31:13 2005
+@@ -5004,8 +5004,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)
-+  files in the 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)
  
-   66..33..114433..  ppggpp__ggeettkkeeyyss__ccoommmmaanndd
+ 6.3.160. pgp_getkeys_command
  
-@@ -5147,8 +5147,8 @@
-         ``$smime_ca_location''" or "-CAfile ``$smime_ca_location''".
+@@ -5203,8 +5203,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)
-+  the 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)
  
-   66..33..116622..  ssmmiimmee__vveerriiffyy__ccoommmmaanndd
+ 6.3.179. smime_verify_command
  
diff --git a/mail/mutt-devel/files/patch-pgp.c b/mail/mutt-devel/files/patch-pgp.c
deleted file mode 100644
index ae926fbc2b1d..000000000000
--- a/mail/mutt-devel/files/patch-pgp.c
+++ /dev/null
@@ -1,27 +0,0 @@
---- pgp.c.orig	Thu Aug 11 23:22:41 2005
-+++ pgp.c	Thu Aug 25 08:01:22 2005
-@@ -381,16 +381,21 @@
- 	}
- 	
-         /* treat empty result as sign of failure */
--	rewind (pgpout);
--        if ((c = fgetc (pgpout)) == EOF)
-+	if (pgpout)
-+	{
-+	  rewind (pgpout);
-+	  c = fgetc (pgpout);
-+	  ungetc (c, pgpout);
-+	}
-+        if (!clearsign && (!pgpout || c == EOF))
- 	{
-           mutt_error _("Could not decrypt PGP message");
-+	  mutt_sleep (1);
-           pgp_void_passphrase ();
-           rc = -1;
-           
-           goto out;
-         }
--	ungetc (c, pgpout);
-       }
-       
-       /*
diff --git a/mail/mutt-devel/files/patch-threadcomplete b/mail/mutt-devel/files/patch-threadcomplete
index 6034ece2bd99..195c9a736126 100644
--- a/mail/mutt-devel/files/patch-threadcomplete
+++ b/mail/mutt-devel/files/patch-threadcomplete
@@ -3,18 +3,6 @@ diff -Nru a/PATCHES b/PATCHES
 +++ PATCHES
 @@ -0,0 +1 @@
 +patch-1.5.6+20040904.tg.mutt-thread.3
-diff -Nru a/doc/manual.sgml.head b/doc/manual.sgml.head
---- doc/manual.sgml.head.orig	Fri Feb  4 08:15:50 2005
-+++ doc/manual.sgml.head	Fri Feb  4 08:19:51 2005
-@@ -1903,6 +1903,8 @@
- ~z [MIN]-[MAX]  messages with a size in the range MIN to MAX *)
- ~=              duplicated messages (see $duplicate_threads)
- ~$              unreferenced messages (requires threaded view)
-+~(PATTERN)      messages in threads containing messages matching a certain
-+                pattern, e.g. all threads containing messages from you: ~(~P)
- </verb></tscreen>
- 
- Where EXPR, USER, ID, and SUBJECT are 
 diff -Nru a/mutt.h b/mutt.h
 --- mutt.h	2004-07-24 12:27:21 +02:00
 +++ mutt.h	2004-09-04 12:36:18 +02:00
@@ -117,17 +105,6 @@ diff -Nru a/pattern.c b/pattern.c
      case M_ALL:
        return (!pat->not);
      case M_EXPIRED:
---- doc/manual.sgml.head.orig2	Mon Sep  6 09:24:16 2004
-+++ doc/manual.sgml.head	Mon Sep  6 09:25:41 2004
-@@ -1773,6 +1773,8 @@
- messages:
- 
- <tscreen><verb>
-+~a              messages in threads that contain at least one tagged message;
-+                this is the same as ~(~T) [see below for ~(..)]
- ~A              all messages
- ~b EXPR         messages which contain EXPR in the message body
- ~B EXPR         messages which contain EXPR in the whole message
 --- mutt.h.orig2	Mon Sep  6 09:24:17 2004
 +++ mutt.h	Mon Sep  6 09:27:04 2004
 @@ -212,6 +212,7 @@
@@ -138,9 +115,9 @@ diff -Nru a/pattern.c b/pattern.c
  
    /* actions for mutt_pattern_comp/mutt_pattern_exec */
    M_AND,
---- pattern.c.orig2	Sun Feb 13 09:05:57 2005
-+++ pattern.c	Sun Feb 13 09:08:06 2005
-@@ -48,6 +48,7 @@
+--- pattern.c.orig2	Sun Sep 18 15:17:46 2005
++++ pattern.c	Sun Sep 18 15:19:48 2005
+@@ -54,6 +54,7 @@
  }
  Flags[] =
  {
@@ -148,10 +125,10 @@ diff -Nru a/pattern.c b/pattern.c
    { 'A', M_ALL,			0,		NULL },
    { 'b', M_BODY,		M_FULL_MSG,	eat_regexp },
    { 'B', M_WHOLE_MSG,		M_FULL_MSG,	eat_regexp },
-@@ -1085,6 +1086,16 @@
- 					pat->alladdr, 2, h->env->to, h->env->cc)));
-     case M_LIST:
-       return (pat->not ^ (h->env && mutt_is_list_recipient (pat->alladdr, h->env->to, h->env->cc)));
+@@ -1139,6 +1140,16 @@
+                                              2, h->env->to, h->env->cc));
+     case M_LIST:	/* known list, subscribed or not */
+       return (pat->not ^ mutt_is_list_cc (pat->alladdr, h->env->to, h->env->cc));
 +    case M_THREADCOMPLETE:
 +      { static pattern_t tmp;
 +        static short pattern_set = 0;
@@ -162,6 +139,6 @@ diff -Nru a/pattern.c b/pattern.c
 +        }
 +        return (pat->not ^ (h->env && match_threadcomplete(&tmp, flags, ctx, h->thread, 1, 1, 1, 1)));
 +      } 
+     case M_SUBSCRIBED_LIST:
+       return (pat->not ^ mutt_is_list_recipient (pat->alladdr, h->env->to, h->env->cc));
      case M_PERSONAL_RECIP:
-       return (pat->not ^ (h->env && match_user (pat->alladdr, h->env->to, h->env->cc)));
-     case M_PERSONAL_FROM:
diff --git a/mail/mutt-devel/scripts/generate-plist b/mail/mutt-devel/scripts/generate-plist
index 55ab47a754ea..6032f67a851d 100644
--- a/mail/mutt-devel/scripts/generate-plist
+++ b/mail/mutt-devel/scripts/generate-plist
@@ -120,44 +120,16 @@ EOF
   if [ "$MUTT_NNTP" = "yes" ]; then
     echo "%%DOCSDIR%%/ChangeLog.nntp" >> $tmp_first
   fi
-  if [ "$MUTT_SGML" = "yes" ]; then
-    echo "%%DOCSDIR%%/manual.latin1" >> $tmp_first
-    echo "%%DOCSDIR%%/manual.ps" >> $tmp_first
-  fi
 
   if [ "$MUTT_HTML" = "yes" ]; then
-    html=395
-    if [ "$MUTT_COMPRESSED_FOLDERS" = "yes" ]; then
-      html=$(($html + 5))
-    fi
-    if [ "$MUTT_NNTP" = "yes" ]; then
-      html=$(($html + 22))
-    fi
-    if [ "$MUTT_QUOTE_PATCH" = "yes" ]; then
-      html=$(($html + 2))
-    fi
-    if [ "$MUTT_SIDEBAR_PATCH" = "yes" ]; then
-      html=$(($html + 2))
-    fi
-    if [ "$MUTT_SIGNATURE_MENU" = "yes" ]; then
-      html=$(($html + 1))
-    fi
-    if [ "$MUTT_IFDEF_PATCH" = "yes" ]; then
-      html=$(($html + 1))
-    fi
-    if [ "$MUTT_REVERSE_REPLY_PATCH" = "yes" ]; then
-      html=$(($html + 1))
-    fi
-    if [ "$MUTT_SLAVE_HTML_PAGES" != "" ]; then
-      html=$(($html + $MUTT_SLAVE_HTML_PAGES))
-    fi
+    echo "%%DOCSDIR%%/html/advancedusage.html" >> $tmp_first
+    echo "%%DOCSDIR%%/html/configuration.html" >> $tmp_first
+    echo "%%DOCSDIR%%/html/gettingstarted.html" >> $tmp_first
+    echo "%%DOCSDIR%%/html/index.html" >> $tmp_first
     echo "%%DOCSDIR%%/html/manual.html" >> $tmp_first
-    echo "%%DOCSDIR%%/html/manual_toc.html" >> $tmp_first 
-    i=1
-    while [ $i -le $html ]; do
-      echo "%%DOCSDIR%%/html/manual$i.html" >> $tmp_first 
-      i=$(($i + 1))
-    done
+    echo "%%DOCSDIR%%/html/mimesupport.html" >> $tmp_first
+    echo "%%DOCSDIR%%/html/miscellany.html" >> $tmp_first
+    echo "%%DOCSDIR%%/html/reference.html" >> $tmp_first
     echo "@dirrm %%DOCSDIR%%/html" >> $tmp_last
   fi
   cat >> $tmp_last <<EOF